db-ddlutils-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From to...@apache.org
Subject svn commit: r292045 [1/5] - in /db/ddlutils/trunk: ./ lib/ lib/build-only/ src/check/ src/doc/src/documentation/ src/doc/src/documentation/content/xdocs/ src/java/org/apache/ddlutils/ src/java/org/apache/ddlutils/builder/ src/java/org/apache/ddlutils/d...
Date Tue, 27 Sep 2005 21:03:01 GMT
Author: tomdz
Date: Tue Sep 27 13:55:42 2005
New Revision: 292045

URL: http://svn.apache.org/viewcvs?rev=292045&view=rev
Log:
Source:
  Updated to commons-beanutils 1.7
  Fixed bug in Microsoft Sql Server and Sybase sql builders
  Removed superfluous org.apache.ddlutils.type package

Documentation
  Updated Ant task and Api usage documentation
  Updated documentation to Forrest 0.7
  Added Checkstyle target to the build file that (for now) checks the Javadoc of DdlUtils
  Enhanced Javadoc and fixed Javadoc errors
  Added package.html files

Added:
    db/ddlutils/trunk/build-test.xml
    db/ddlutils/trunk/lib/build-only/
    db/ddlutils/trunk/lib/build-only/antlr.jar   (with props)
    db/ddlutils/trunk/lib/build-only/checkstyle-4.0-beta6.jar   (with props)
    db/ddlutils/trunk/lib/build-only/commons-cli.jar   (with props)
    db/ddlutils/trunk/lib/commons-beanutils-1.7.0.jar   (with props)
    db/ddlutils/trunk/src/check/
    db/ddlutils/trunk/src/check/ddlutils-checks.xml
    db/ddlutils/trunk/src/check/license-check.txt
    db/ddlutils/trunk/src/java/org/apache/ddlutils/io/converters/package.html
    db/ddlutils/trunk/src/java/org/apache/ddlutils/package.html
    db/ddlutils/trunk/src/java/org/apache/ddlutils/platform/package.html
    db/ddlutils/trunk/src/java/org/apache/ddlutils/util/package.html
    db/ddlutils/trunk/src/test/org/apache/ddlutils/dynabean/package.html
    db/ddlutils/trunk/src/test/org/apache/ddlutils/io/package.html
    db/ddlutils/trunk/src/test/org/apache/ddlutils/model/package.html
    db/ddlutils/trunk/src/test/org/apache/ddlutils/package.html
    db/ddlutils/trunk/src/test/org/apache/ddlutils/platform/package.html
Removed:
    db/ddlutils/trunk/lib/commons-beanutils-1.6.1.jar
    db/ddlutils/trunk/src/java/org/apache/ddlutils/type/Mapping.betwixt
    db/ddlutils/trunk/src/java/org/apache/ddlutils/type/Mapping.java
    db/ddlutils/trunk/src/java/org/apache/ddlutils/type/Type.betwixt
    db/ddlutils/trunk/src/java/org/apache/ddlutils/type/Type.java
    db/ddlutils/trunk/src/java/org/apache/ddlutils/type/TypeMap.java
    db/ddlutils/trunk/src/java/org/apache/ddlutils/type/TypeMapping.java
    db/ddlutils/trunk/src/java/org/apache/ddlutils/type/Types.betwixt
    db/ddlutils/trunk/src/java/org/apache/ddlutils/type/Types.java
    db/ddlutils/trunk/src/java/org/apache/ddlutils/type/TypesFactory.java
    db/ddlutils/trunk/src/java/org/apache/ddlutils/type/TypesReader.java
    db/ddlutils/trunk/src/java/org/apache/ddlutils/type/TypesWriter.java
    db/ddlutils/trunk/src/java/org/apache/ddlutils/util/DataSourceWrapper.java
Modified:
    db/ddlutils/trunk/.classpath
    db/ddlutils/trunk/build.properties
    db/ddlutils/trunk/build.xml
    db/ddlutils/trunk/src/doc/src/documentation/content/xdocs/ant-tasks.xml
    db/ddlutils/trunk/src/doc/src/documentation/content/xdocs/api-usage.xml
    db/ddlutils/trunk/src/doc/src/documentation/content/xdocs/site.xml
    db/ddlutils/trunk/src/doc/src/documentation/skinconf.xml
    db/ddlutils/trunk/src/java/org/apache/ddlutils/DdlUtilsException.java
    db/ddlutils/trunk/src/java/org/apache/ddlutils/DynaSqlException.java
    db/ddlutils/trunk/src/java/org/apache/ddlutils/Platform.java
    db/ddlutils/trunk/src/java/org/apache/ddlutils/PlatformFactory.java
    db/ddlutils/trunk/src/java/org/apache/ddlutils/PlatformInfo.java
    db/ddlutils/trunk/src/java/org/apache/ddlutils/PlatformUtils.java
    db/ddlutils/trunk/src/java/org/apache/ddlutils/builder/AxionBuilder.java
    db/ddlutils/trunk/src/java/org/apache/ddlutils/builder/CloudscapeBuilder.java
    db/ddlutils/trunk/src/java/org/apache/ddlutils/builder/Db2Builder.java
    db/ddlutils/trunk/src/java/org/apache/ddlutils/builder/DerbyBuilder.java
    db/ddlutils/trunk/src/java/org/apache/ddlutils/builder/HsqlDbBuilder.java
    db/ddlutils/trunk/src/java/org/apache/ddlutils/builder/InterbaseBuilder.java
    db/ddlutils/trunk/src/java/org/apache/ddlutils/builder/MSSqlBuilder.java
    db/ddlutils/trunk/src/java/org/apache/ddlutils/builder/MckoiBuilder.java
    db/ddlutils/trunk/src/java/org/apache/ddlutils/builder/MySqlBuilder.java
    db/ddlutils/trunk/src/java/org/apache/ddlutils/builder/OracleBuilder.java
    db/ddlutils/trunk/src/java/org/apache/ddlutils/builder/PostgreSqlBuilder.java
    db/ddlutils/trunk/src/java/org/apache/ddlutils/builder/SapDbBuilder.java
    db/ddlutils/trunk/src/java/org/apache/ddlutils/builder/SqlBuilder.java
    db/ddlutils/trunk/src/java/org/apache/ddlutils/builder/SybaseBuilder.java
    db/ddlutils/trunk/src/java/org/apache/ddlutils/builder/package.html
    db/ddlutils/trunk/src/java/org/apache/ddlutils/dynabean/DynaClassCache.java
    db/ddlutils/trunk/src/java/org/apache/ddlutils/dynabean/DynaSqlIterator.java
    db/ddlutils/trunk/src/java/org/apache/ddlutils/dynabean/SqlDynaBean.java
    db/ddlutils/trunk/src/java/org/apache/ddlutils/dynabean/SqlDynaClass.java
    db/ddlutils/trunk/src/java/org/apache/ddlutils/dynabean/SqlDynaProperty.java
    db/ddlutils/trunk/src/java/org/apache/ddlutils/io/DataConverterRegistration.java
    db/ddlutils/trunk/src/java/org/apache/ddlutils/io/DataDtdWriter.java
    db/ddlutils/trunk/src/java/org/apache/ddlutils/io/DataReader.java
    db/ddlutils/trunk/src/java/org/apache/ddlutils/io/DataSink.java
    db/ddlutils/trunk/src/java/org/apache/ddlutils/io/DataSinkException.java
    db/ddlutils/trunk/src/java/org/apache/ddlutils/io/DataToDatabaseSink.java
    db/ddlutils/trunk/src/java/org/apache/ddlutils/io/DataWriter.java
    db/ddlutils/trunk/src/java/org/apache/ddlutils/io/DatabaseIO.java
    db/ddlutils/trunk/src/java/org/apache/ddlutils/io/DigesterRules.java
    db/ddlutils/trunk/src/java/org/apache/ddlutils/io/DynaSqlCreateRule.java
    db/ddlutils/trunk/src/java/org/apache/ddlutils/io/Identity.java
    db/ddlutils/trunk/src/java/org/apache/ddlutils/io/JdbcModelReader.java
    db/ddlutils/trunk/src/java/org/apache/ddlutils/io/LocalEntityResolver.java
    db/ddlutils/trunk/src/java/org/apache/ddlutils/io/SetColumnPropertyFromSubElementRule.java
    db/ddlutils/trunk/src/java/org/apache/ddlutils/io/SetColumnPropertyRule.java
    db/ddlutils/trunk/src/java/org/apache/ddlutils/io/WaitingObject.java
    db/ddlutils/trunk/src/java/org/apache/ddlutils/io/converters/DateConverter.java
    db/ddlutils/trunk/src/java/org/apache/ddlutils/io/converters/NumberConverter.java
    db/ddlutils/trunk/src/java/org/apache/ddlutils/io/converters/SqlTypeConverter.java
    db/ddlutils/trunk/src/java/org/apache/ddlutils/io/converters/TimeConverter.java
    db/ddlutils/trunk/src/java/org/apache/ddlutils/io/converters/TimestampConverter.java
    db/ddlutils/trunk/src/java/org/apache/ddlutils/model/Column.java
    db/ddlutils/trunk/src/java/org/apache/ddlutils/model/Database.java
    db/ddlutils/trunk/src/java/org/apache/ddlutils/model/ForeignKey.java
    db/ddlutils/trunk/src/java/org/apache/ddlutils/model/Index.java
    db/ddlutils/trunk/src/java/org/apache/ddlutils/model/IndexColumn.java
    db/ddlutils/trunk/src/java/org/apache/ddlutils/model/ModelException.java
    db/ddlutils/trunk/src/java/org/apache/ddlutils/model/NonUniqueIndex.java
    db/ddlutils/trunk/src/java/org/apache/ddlutils/model/Reference.java
    db/ddlutils/trunk/src/java/org/apache/ddlutils/model/Table.java
    db/ddlutils/trunk/src/java/org/apache/ddlutils/model/TypeMap.java
    db/ddlutils/trunk/src/java/org/apache/ddlutils/model/UniqueIndex.java
    db/ddlutils/trunk/src/java/org/apache/ddlutils/platform/AxionPlatform.java
    db/ddlutils/trunk/src/java/org/apache/ddlutils/platform/CloudscapePlatform.java
    db/ddlutils/trunk/src/java/org/apache/ddlutils/platform/Db2Platform.java
    db/ddlutils/trunk/src/java/org/apache/ddlutils/platform/DerbyPlatform.java
    db/ddlutils/trunk/src/java/org/apache/ddlutils/platform/FirebirdPlatform.java
    db/ddlutils/trunk/src/java/org/apache/ddlutils/platform/HsqlDbPlatform.java
    db/ddlutils/trunk/src/java/org/apache/ddlutils/platform/InterbasePlatform.java
    db/ddlutils/trunk/src/java/org/apache/ddlutils/platform/MSSqlPlatform.java
    db/ddlutils/trunk/src/java/org/apache/ddlutils/platform/MaxDbPlatform.java
    db/ddlutils/trunk/src/java/org/apache/ddlutils/platform/MckoiPlatform.java
    db/ddlutils/trunk/src/java/org/apache/ddlutils/platform/MySqlPlatform.java
    db/ddlutils/trunk/src/java/org/apache/ddlutils/platform/Oracle8Platform.java
    db/ddlutils/trunk/src/java/org/apache/ddlutils/platform/Oracle9Platform.java
    db/ddlutils/trunk/src/java/org/apache/ddlutils/platform/PlatformImplBase.java
    db/ddlutils/trunk/src/java/org/apache/ddlutils/platform/PostgreSqlPlatform.java
    db/ddlutils/trunk/src/java/org/apache/ddlutils/platform/SapDbPlatform.java
    db/ddlutils/trunk/src/java/org/apache/ddlutils/platform/SybasePlatform.java
    db/ddlutils/trunk/src/java/org/apache/ddlutils/task/Command.java
    db/ddlutils/trunk/src/java/org/apache/ddlutils/task/CreateDatabaseCommand.java
    db/ddlutils/trunk/src/java/org/apache/ddlutils/task/DatabaseCommand.java
    db/ddlutils/trunk/src/java/org/apache/ddlutils/task/DatabaseTaskBase.java
    db/ddlutils/trunk/src/java/org/apache/ddlutils/task/DatabaseToDdlTask.java
    db/ddlutils/trunk/src/java/org/apache/ddlutils/task/DdlToDatabaseTask.java
    db/ddlutils/trunk/src/java/org/apache/ddlutils/task/DropDatabaseCommand.java
    db/ddlutils/trunk/src/java/org/apache/ddlutils/task/DumpMetadataTask.java
    db/ddlutils/trunk/src/java/org/apache/ddlutils/task/Parameter.java
    db/ddlutils/trunk/src/java/org/apache/ddlutils/task/WriteDataToDatabaseCommand.java
    db/ddlutils/trunk/src/java/org/apache/ddlutils/task/WriteDataToFileCommand.java
    db/ddlutils/trunk/src/java/org/apache/ddlutils/task/WriteDataToSpecifiedDatabaseCommand.java
    db/ddlutils/trunk/src/java/org/apache/ddlutils/task/WriteDtdToFileCommand.java
    db/ddlutils/trunk/src/java/org/apache/ddlutils/task/WriteSchemaSqlToFileCommand.java
    db/ddlutils/trunk/src/java/org/apache/ddlutils/task/WriteSchemaToDatabaseCommand.java
    db/ddlutils/trunk/src/java/org/apache/ddlutils/task/WriteSchemaToFileCommand.java
    db/ddlutils/trunk/src/java/org/apache/ddlutils/util/DatabaseTestHelper.java
    db/ddlutils/trunk/src/java/org/apache/ddlutils/util/Jdbc3Utils.java
    db/ddlutils/trunk/src/java/org/apache/ddlutils/util/JdbcSupport.java
    db/ddlutils/trunk/src/test/jdbc.properties.postgresql
    db/ddlutils/trunk/src/test/org/apache/ddlutils/RunAllTests.java
    db/ddlutils/trunk/src/test/org/apache/ddlutils/TestDatabaseWriterBase.java
    db/ddlutils/trunk/src/test/org/apache/ddlutils/TestPlatformBase.java
    db/ddlutils/trunk/src/test/org/apache/ddlutils/dynabean/TestDynaSqlQueries.java
    db/ddlutils/trunk/src/test/org/apache/ddlutils/io/TestAgainstAxionDb.java
    db/ddlutils/trunk/src/test/org/apache/ddlutils/io/TestDataReader.java
    db/ddlutils/trunk/src/test/org/apache/ddlutils/io/TestDatabaseIO.java
    db/ddlutils/trunk/src/test/org/apache/ddlutils/model/TestArrayAccessAtTable.java
    db/ddlutils/trunk/src/test/org/apache/ddlutils/platform/TestAxionPlatform.java
    db/ddlutils/trunk/src/test/org/apache/ddlutils/platform/TestCloudscapePlatform.java
    db/ddlutils/trunk/src/test/org/apache/ddlutils/platform/TestDB2Platform.java
    db/ddlutils/trunk/src/test/org/apache/ddlutils/platform/TestDerbyPlatform.java
    db/ddlutils/trunk/src/test/org/apache/ddlutils/platform/TestFirebirdPlatform.java
    db/ddlutils/trunk/src/test/org/apache/ddlutils/platform/TestHsqlDbPlatform.java
    db/ddlutils/trunk/src/test/org/apache/ddlutils/platform/TestInterbasePlatform.java
    db/ddlutils/trunk/src/test/org/apache/ddlutils/platform/TestMSSqlPlatform.java
    db/ddlutils/trunk/src/test/org/apache/ddlutils/platform/TestMaxDbPlatform.java
    db/ddlutils/trunk/src/test/org/apache/ddlutils/platform/TestMcKoiPlatform.java
    db/ddlutils/trunk/src/test/org/apache/ddlutils/platform/TestMySqlPlatform.java
    db/ddlutils/trunk/src/test/org/apache/ddlutils/platform/TestOracle8Platform.java
    db/ddlutils/trunk/src/test/org/apache/ddlutils/platform/TestOracle9Platform.java
    db/ddlutils/trunk/src/test/org/apache/ddlutils/platform/TestPlatformUtils.java
    db/ddlutils/trunk/src/test/org/apache/ddlutils/platform/TestPostgresqlPlatform.java
    db/ddlutils/trunk/src/test/org/apache/ddlutils/platform/TestSapDbPlatform.java
    db/ddlutils/trunk/src/test/org/apache/ddlutils/platform/TestSybasePlatform.java

Modified: db/ddlutils/trunk/.classpath
URL: http://svn.apache.org/viewcvs/db/ddlutils/trunk/.classpath?rev=292045&r1=292044&r2=292045&view=diff
==============================================================================
--- db/ddlutils/trunk/.classpath (original)
+++ db/ddlutils/trunk/.classpath Tue Sep 27 13:55:42 2005
@@ -6,12 +6,12 @@
 	<classpathentry kind="lib" path="lib/commons-logging-1.0.4.jar"/>
 	<classpathentry kind="lib" path="lib/junit-3.8.1.jar"/>
 	<classpathentry kind="lib" path="lib/dom4j-1.4.jar"/>
-	<classpathentry kind="lib" path="lib/commons-beanutils-1.6.1.jar"/>
 	<classpathentry kind="lib" path="lib/commons-collections-3.1.jar"/>
 	<classpathentry kind="lib" path="lib/commons-dbcp-1.2.1.jar"/>
 	<classpathentry kind="lib" path="lib/commons-lang-2.0.jar"/>
 	<classpathentry kind="lib" path="lib/commons-digester-1.7.jar"/>
 	<classpathentry kind="lib" path="lib/commons-betwixt-0.7.jar"/>
 	<classpathentry kind="lib" path="lib/ant-1.6.5.jar"/>
+	<classpathentry kind="lib" path="lib/commons-beanutils-1.7.0.jar"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

Added: db/ddlutils/trunk/build-test.xml
URL: http://svn.apache.org/viewcvs/db/ddlutils/trunk/build-test.xml?rev=292045&view=auto
==============================================================================
--- db/ddlutils/trunk/build-test.xml (added)
+++ db/ddlutils/trunk/build-test.xml Tue Sep 27 13:55:42 2005
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project default="test" name="DdlUtils Test" basedir=".">
+  <!-- Allow values set at the commandline or in the environment to override the defaults -->
+  <property environment="env"/>
+  <!-- Load the build properties -->
+  <property file="build.properties"/>
+
+  <!-- The classpath used for compiling and generating the documentation -->
+  <path id="runtime-classpath">
+    <pathelement path="${build.java.dir}"/>
+    <fileset dir="${lib.dir}">
+      <include name="**/*.jar"/>
+      <include name="**/*.zip"/>
+    </fileset>
+  </path>
+
+  <target name="test">
+    <taskdef name="ddlToDatabase"
+             classname="org.apache.ddlutils.task.DdlToDatabaseTask">
+      <classpath refid="runtime-classpath"/>
+    </taskdef>
+    <taskdef name="databaseToDdl"
+             classname="org.apache.ddlutils.task.DatabaseToDdlTask">
+      <classpath refid="runtime-classpath"/>
+    </taskdef>
+    <taskdef name="dumpMetadata"
+             classname="org.apache.ddlutils.task.DumpMetadataTask">
+      <classpath refid="runtime-classpath"/>
+    </taskdef>
+<!--
+    <dumpMetadata outputFile="metadata.xml">
+      <database url="jdbc:postgresql://localhost/visite"
+                driverClassName="org.postgresql.Driver"
+                username="postgres"
+                password="root123"/>
+    </dumpMetadata>
+-->
+<!--
+    <databaseToDdl databaseType="postgresql" schema="public" tableTypes="TABLE">
+      <database url="jdbc:postgresql://localhost/visite"
+                driverClassName="org.postgresql.Driver"
+                username="postgres"
+                password="root123"/>
+      <writeSchemaToFile outputFile="test.xml"/>
+    </databaseToDdl>
+-->
+<!--
+    <databaseToDdl databaseType="postgresql">
+      <database url="jdbc:postgresql://localhost/ddlutils"
+                driverClassName="org.postgresql.Driver"
+                username="postgres"
+                password="postgres123"/>
+      <writeSchemaToFile outputFile="test.xml"/>
+    </databaseToDdl>
+-->
+<!-- 
+    <ddlToDatabase>
+      <fileset dir=".">
+        <include name="test-db.xml"/>
+      </fileset>
+      <writeSchemaToDatabase databaseType="postgresql">
+        <database url="jdbc:postgresql://localhost/ddlutils"
+                  driverClassName="org.postgresql.Driver"
+                  username="postgres"
+                  password="root123"/>
+      </writeSchemaToDatabase>
+      <writeDataToDatabase databaseType="postgresql" dataFile="test-data.xml">
+        <database url="jdbc:postgresql://localhost/ddlutils"
+                  driverClassName="org.postgresql.Driver"
+                  username="postgres"
+                  password="root123"/>
+      </writeDataToDatabase>
+    </ddlToDatabase>
+-->
+    <ddlToDatabase>
+      <database url="jdbc:postgresql://localhost/ddlutilstest"
+                driverClassName="org.postgresql.Driver"
+                username="postgres"
+                password="root123"/>
+      <createDatabase> 
+         <parameter name="ENCODING" value="'LATIN9'"/> 
+      </createDatabase> 
+    </ddlToDatabase>
+<!--
+    <ddlToDatabase>
+      <fileset dir="src/test-input">
+        <include name="datamodel.xml"/>
+      </fileset>
+      <writeDtdToFile outputFile="test.dtd"/>
+      <writeSchemaSqlToFile outputFile="test.sql" databaseType="cloudscape">
+        <database url="jdbc:derby:ddlutils"
+                  driverClassName="org.apache.derby.jdbc.EmbeddedDriver"
+                  username=""
+                  password=""/>
+      </writeSchemaSqlToFile>
+      <writeSchemaToDatabase databaseType="cloudscape">
+        <database url="jdbc:derby:ddlutils"
+                  driverClassName="org.apache.derby.jdbc.EmbeddedDriver"
+                  username=""
+                  password=""/>
+      </writeSchemaToDatabase>
+    </ddlToDatabase>
+    <databaseToDdl databaseType="cloudscape">
+      <database url="jdbc:derby:ddlutils"
+                driverClassName="org.apache.derby.jdbc.EmbeddedDriver"
+                username=""
+                password=""/>
+      <writeSchemaToFile outputFile="test.xml"/>
+    </databaseToDdl>
+-->
+
+  </target>
+</project>

Modified: db/ddlutils/trunk/build.properties
URL: http://svn.apache.org/viewcvs/db/ddlutils/trunk/build.properties?rev=292045&r1=292044&r2=292045&view=diff
==============================================================================
--- db/ddlutils/trunk/build.properties (original)
+++ db/ddlutils/trunk/build.properties Tue Sep 27 13:55:42 2005
@@ -19,12 +19,14 @@
 src.test.dir=${src.dir}/test
 src.resources.dir=${src.dir}/resources
 src.doc.dir=${src.dir}/doc
+src.check.dir=${src.dir}/check
 
 build.dir=target
 build.java.dir=${build.dir}/classes
 build.test.dir=${build.dir}/test
 build.javadoc.dir=${build.dir}/javadoc
 build.doc.dir=${build.dir}/doc
+build.check.dir=${build.dir}/check
 
 dist.dir=dist
 doc.dir=doc
@@ -33,12 +35,16 @@
 version=1.0-dev
 dist-filename-prefix=${project-name}-${version}
 
+checkstyle.version.pattern=\\$Revision.*\\$
+checkstyle.author.pattern=\\S
+checkstyle.license.file=${src.check.dir}/license-check.txt
+
 #
 # Documentation properties
 #
 
 javadoc.title=${project-name} ${version} API Documentation
-javadoc.footer=Copyright &amp;copy;  Apache Software Foundation. All Rights Reserved.
+javadoc.footer=Copyright &copy; 2005 Apache Software Foundation. All Rights Reserved.
 
 forrest.javadoc.destdir=${build.doc.dir}/src/documentation/content/api
 forrest.output.dir=${build.doc.dir}/build/site

Modified: db/ddlutils/trunk/build.xml
URL: http://svn.apache.org/viewcvs/db/ddlutils/trunk/build.xml?rev=292045&r1=292044&r2=292045&view=diff
==============================================================================
--- db/ddlutils/trunk/build.xml (original)
+++ db/ddlutils/trunk/build.xml Tue Sep 27 13:55:42 2005
@@ -20,231 +20,245 @@
 <project default="dist"
 	     name="DdlUtils"
 	     basedir=".">
-    <!-- Allow values set at the commandline or in the environment to override the defaults -->
-	  <property environment="env"/>
-    <!-- Load the build properties -->
-    <property file="build.properties"/>
-
-    <!-- The classpath used for compiling and generating the documentation -->
-    <path id="compilation-classpath">
-        <fileset dir="${lib.dir}">
-            <include name="**/*.jar"/>
-            <include name="**/*.zip"/>
-        </fileset>
-        <pathelement path="${build.java.dir}"/>
-        <pathelement path="${build.test.dir}"/>
-    </path>
-
-    <target name="init"
-            description="Initializes the build process">
-        <tstamp/>
-        <mkdir dir="${build.dir}"/>
-        <mkdir dir="${build.java.dir}"/>
-        <mkdir dir="${dist.dir}"/>
-    </target>
-
-    <target name="compile"
-            description="Compiles the code"
-            depends="init">
-        <javac srcdir="${src.java.dir}"
-               destdir="${build.java.dir}"
-               deprecation="true"
-               debug="true"
-               source="1.2"
-               target="1.2"
-               optimize="false">
-            <classpath refid="compilation-classpath"/>
-        </javac>
-    </target>
-
-    <target name="jar"
-            description="Creates the jar"
-            depends="compile">
-        <copy todir="${build.java.dir}/resources">
-            <fileset dir="${src.resources.dir}"/>
-        </copy>
-        <copy todir="${build.java.dir}">
-            <fileset dir="${src.java.dir}"
-                     excludes="**/*.java"/>
-        </copy>
-        <jar jarfile="${dist.dir}/${dist-filename-prefix}.jar"
-             basedir="${build.java.dir}"/>
-    </target>
-
-    <target name="clean"
-            description="Cleans up the generated directories">
-        <delete failonerror="false"
-                dir="${build.dir}"/>
-        <delete failonerror="false"
-                dir="${dist.dir}"/>
-    </target>
-
-    <!-- ================================================================== -->
-    <!-- Build the documentation                                            -->
-    <!-- ================================================================== -->
-    <target name="doc"
-    	    depends="javadoc"
-            description="Builds the complete documentation using Forrest">
-        <fail message="Please set the FORREST_HOME environment variable to the 'src/core' subdirectory of your Forrest installation. If you don't have yet installed Forrest, you can get it from http://forrest.apache.org.">
-            <condition>
-                <not>
-                    <isset property="env.FORREST_HOME"/>
-                </not>
-            </condition>
-        </fail>
-        <available classname="org.apache.xml.resolver.Resolver" property="commons.resolver.available"/>
-        <fail unless="commons.resolver.available" message="Please make the Apache XML Commons Resolver library available in the classpath, e.g. by copying the xml-commons-resolver jar file from the 'tools/ant/lib' subdirectory of your Forrest installation (${env.FORREST_HOME}/tools/ant/lib) into the lib subdirectory of your Ant installation (${env.ANT_HOME}/lib)."/>
-
-        <delete dir="${build.doc.dir}"
-        	      failonerror="false"/>
-        <mkdir dir="${build.doc.dir}"/>
-
-        <!-- Copy all forrest src stuff to a temporary directoy -->
-        <copy todir="${build.doc.dir}">
-            <fileset dir="${src.doc.dir}"/>
-        </copy>
-    	<!-- We're copying the contents of the ToDo.txt and ReleaseNotes.txt into
-    	     the corresponding documentation source files, otherwise we would loose the
-    	     menu when the user clicks on the corresponding menu entries -->
-        <loadfile property="todo.content" srcfile="${basedir}/ToDo.txt"/>
-        <loadfile property="release-notes.content" srcfile="${basedir}/ReleaseNotes.txt"/>
-        <replace file="${build.doc.dir}/src/documentation/content/xdocs/to-do.xml" token="@@content@@" value="${todo.content}"/>
-        <replace file="${build.doc.dir}/src/documentation/content/xdocs/release-notes.xml" token="@@content@@" value="${release-notes.content}"/>
-
-        <!-- Copy generated javadoc into the forrest structure in the temporary directoy -->
-        <copy todir="${forrest.javadoc.destdir}">
-            <fileset dir="${build.javadoc.dir}"/>
-        </copy>
-
-        <ant antfile="${env.FORREST_HOME}/main/forrest.build.xml"
-             dir="${build.doc.dir}"
-             inheritall="false"
-             target="site">
-            <property name="forrest.home" value="${env.FORREST_HOME}"/>
-        </ant>
-        <!-- Finally we can copy the generated documentation to its designated place -->
-     <!-- 
-        <mkdir dir="${doc.dir}"/>
-        <copy todir="${doc.dir}">
-            <fileset dir="${forrest.output.dir}"/>
-        </copy>
-     -->
-    </target>
-
-    <!-- ================================================================== -->
-    <!-- Build the API JavaDocs                                             -->
-    <!-- ================================================================== -->
-    <target name="javadoc"
-            depends="init"
-            description="Builds the API javadocs.">
-        <mkdir dir="${build.javadoc.dir}"/>
-        <javadoc sourcepath="${src.java.dir}"
-        		 classpathref="compilation-classpath"
-                 destdir="${build.javadoc.dir}"
-                 doctitle="${javadoc.title}"
-                 windowtitle="${javadoc.title} API documentation"
-                 bottom="${javadoc.footer}"
-            	 protected="true"
-                 author="true"
-                 version="true"
-                 packagenames="org.*"/>
-    </target>
-
-    <!-- ================================================================== -->
-    <!-- Build the doc archive                                              -->
-    <!-- ================================================================== -->
-    <target name="doc-archive" depends="doc"
-            description="Builds the complete documentation archive.">
-        <zip zipfile="${dist.dir}/${dist-filename-prefix}-doc.zip"
-             basedir="."
-             includes="doc/**"/>
-    </target>
-
-    <!-- ================================================================== -->
-    <!-- Creates the DdlUtils distribution                                  -->
-    <!-- ================================================================== -->
-    <target name="dist"
-            description="Creates the distribution"
-            depends="jar, doc-archive"/>
-
-    <target name="compile-tests"
-            description="Compiles the unit tests"
-            depends="compile">
-        <mkdir dir="${build.test.dir}"/>
-        <javac srcdir="${src.test.dir}"
-               destdir="${build.test.dir}"
-               deprecation="true"
-               debug="true"
-               optimize="false">
-            <classpath refid="compilation-classpath"/>
-        </javac>
-    </target>
+  <!-- Allow values set at the commandline or in the environment to override the defaults -->
+  <property environment="env"/>
+  <!-- Load the build properties -->
+  <property file="build.properties"/>
+
+  <!-- The classpath used for compiling and generating the documentation -->
+  <path id="compilation-classpath">
+    <fileset dir="${lib.dir}">
+        <include name="**/*.jar"/>
+        <include name="**/*.zip"/>
+    </fileset>
+    <pathelement path="${build.java.dir}"/>
+    <pathelement path="${build.test.dir}"/>
+  </path>
+
+  <target name="init"
+          description="Initializes the build process">
+      <tstamp/>
+      <mkdir dir="${build.dir}"/>
+      <mkdir dir="${build.java.dir}"/>
+      <mkdir dir="${dist.dir}"/>
+  </target>
+
+  <target name="compile"
+          description="Compiles the code"
+          depends="init">
+    <javac srcdir="${src.java.dir}"
+           destdir="${build.java.dir}"
+           deprecation="true"
+           debug="true"
+           source="1.2"
+           target="1.2"
+           optimize="false">
+      <classpath refid="compilation-classpath"/>
+    </javac>
+  </target>
+
+  <target name="jar"
+          description="Creates the jar"
+          depends="compile">
+    <copy todir="${build.java.dir}/resources">
+      <fileset dir="${src.resources.dir}"/>
+    </copy>
+    <copy todir="${build.java.dir}">
+      <fileset dir="${src.java.dir}"
+               excludes="**/*.java"/>
+    </copy>
+    <jar jarfile="${dist.dir}/${dist-filename-prefix}.jar"
+         basedir="${build.java.dir}"/>
+  </target>
+
+  <target name="clean"
+          description="Cleans up the generated directories">
+    <delete failonerror="false"
+            dir="${build.dir}"/>
+    <delete failonerror="false"
+            dir="${dist.dir}"/>
+  </target>
+
+  <!-- ================================================================== -->
+  <!-- Build the documentation                                            -->
+  <!-- ================================================================== -->
+  <target name="doc"
+  	    depends="javadoc"
+          description="Builds the complete documentation using Forrest">
+    <fail message="Please set the FORREST_HOME environment variable to the 'src/core' subdirectory of your Forrest installation. If you don't have yet installed Forrest, you can get it from http://forrest.apache.org.">
+      <condition>
+        <not>
+          <isset property="env.FORREST_HOME"/>
+        </not>
+      </condition>
+    </fail>
+    <available classname="org.apache.xml.resolver.Resolver" property="commons.resolver.available"/>
+    <fail unless="commons.resolver.available" message="Please make the Apache XML Commons Resolver library available in the classpath, e.g. by copying the xml-commons-resolver jar file from the 'tools/ant/lib' subdirectory of your Forrest installation (${env.FORREST_HOME}/tools/ant/lib) into the lib subdirectory of your Ant installation (${env.ANT_HOME}/lib)."/>
+
+    <delete dir="${build.doc.dir}"
+    	      failonerror="false"/>
+    <mkdir dir="${build.doc.dir}"/>
+
+    <!-- Copy all forrest src stuff to a temporary directoy -->
+    <copy todir="${build.doc.dir}">
+      <fileset dir="${src.doc.dir}"/>
+    </copy>
+  	<!-- We're copying the contents of the ToDo.txt and ReleaseNotes.txt into
+  	     the corresponding documentation source files, otherwise we would loose the
+  	     menu when the user clicks on the corresponding menu entries -->
+    <loadfile property="todo.content" srcfile="${basedir}/ToDo.txt"/>
+    <loadfile property="release-notes.content" srcfile="${basedir}/ReleaseNotes.txt"/>
+    <replace file="${build.doc.dir}/src/documentation/content/xdocs/to-do.xml" token="@@content@@" value="${todo.content}"/>
+    <replace file="${build.doc.dir}/src/documentation/content/xdocs/release-notes.xml" token="@@content@@" value="${release-notes.content}"/>
+
+    <!-- Copy generated javadoc into the forrest structure in the temporary directoy -->
+    <copy todir="${forrest.javadoc.destdir}">
+      <fileset dir="${build.javadoc.dir}"/>
+    </copy>
+
+    <ant antfile="${env.FORREST_HOME}/main/forrest.build.xml"
+         dir="${build.doc.dir}"
+         inheritall="false"
+         target="site">
+      <property name="forrest.home" value="${env.FORREST_HOME}"/>
+    </ant>
+    <!-- Finally we can copy the generated documentation to its designated place -->
+    <mkdir dir="${doc.dir}"/>
+    <copy todir="${doc.dir}">
+      <fileset dir="${forrest.output.dir}"/>
+    </copy>
+  </target>
+
+  <!-- ================================================================== -->
+  <!-- Build the API JavaDocs                                             -->
+  <!-- ================================================================== -->
+  <target name="javadoc"
+          depends="init"
+          description="Builds the API javadocs.">
+    <mkdir dir="${build.javadoc.dir}"/>
+    <javadoc sourcepath="${src.java.dir}"
+    		     classpathref="compilation-classpath"
+             destdir="${build.javadoc.dir}"
+             doctitle="${javadoc.title}"
+             windowtitle="${javadoc.title} API documentation"
+             bottom="${javadoc.footer}"
+        	   protected="true"
+             author="true"
+             version="true"
+             packagenames="org.*">
+      <link href="http://java.sun.com/j2se/1.4.2/docs/api/"/> 
+      <link href="http://jakarta.apache.org/commons/lang/apidocs/"/>
+      <link href="http://jakarta.apache.org/commons/beanutils/apidocs/"/>
+      <link href="http://jakarta.apache.org/commons/digester/apidocs/"/>
+      <link href="http://jakarta.apache.org/commons/betwixt/apidocs/"/>
+    </javadoc> 
+  </target>
+
+  <!-- ================================================================== -->
+  <!-- Build the doc archive                                              -->
+  <!-- ================================================================== -->
+  <target name="doc-archive" depends="doc"
+          description="Builds the complete documentation archive.">
+    <zip zipfile="${dist.dir}/${dist-filename-prefix}-doc.zip"
+         basedir="."
+         includes="doc/**"/>
+  </target>
+
+  <!-- ================================================================== -->
+  <!-- Creates the DdlUtils distribution                                  -->
+  <!-- ================================================================== -->
+  <target name="dist"
+          description="Creates the distribution"
+          depends="jar, doc-archive"/>
+
+  <target name="compile-tests"
+          description="Compiles the unit tests"
+          depends="compile">
+    <mkdir dir="${build.test.dir}"/>
+    <javac srcdir="${src.test.dir}"
+           destdir="${build.test.dir}"
+           deprecation="true"
+           debug="true"
+           optimize="false">
+      <classpath refid="compilation-classpath"/>
+    </javac>
+  </target>
 
+  <!-- ================================================================== -->
+  <!-- Runs the test cases                                                -->
+  <!-- ================================================================== -->
   <target name="junit"
           description="Runs the test cases against the default database (Hsqldb)">
     <antcall target="junit-hsqldb"/>
  	</target>
 
+  <!-- ================================================================== -->
+  <!-- Runs the test cases against HsqlDb                                 -->
+  <!-- ================================================================== -->
   <target name="junit-hsqldb"
           description="Runs the test cases against Hsqldb">
     <property name="jdbc.properties.file" value="/jdbc.properties.hsqldb"/>
-    <antcall target="junit-internal"/>
+    <antcall target="-junit-internal"/>
   </target>
 
+  <!-- ================================================================== -->
+  <!-- Runs the test cases against PostgreSQL                             -->
+  <!-- ================================================================== -->
   <target name="junit-postgresql"
           description="Runs the test cases against PostgreSQL">
     <property name="jdbc.properties.file" value="/jdbc.properties.postgresql"/>
-    <antcall target="junit-internal"/>
+    <antcall target="-junit-internal"/>
   </target>
 
-  <target name="junit-internal"
-          description="Actually runs the test cases"
+  <target name="-junit-internal"
           depends="compile-tests">
-        <junit dir="."
-               printSummary="yes"
-               fork="true"
-               haltonerror="false">
-            <sysproperty key="jdbc.properties.file" value="${jdbc.properties.file}"/> 
-            <formatter type="xml"/>
-            <formatter type="plain"/>
-            <classpath refid="compilation-classpath"/>
-            <batchtest todir="${build.test.dir}">
-                <fileset dir="${src.test.dir}"
-                         includes="**/Test*.java"/>
-            </batchtest>
-        </junit>
-    </target>
-
-    <target name="junit-report"
-            description="Creates a test report in html form">
-        <junitreport todir="${build.test.dir}">
-            <fileset dir="${build.test.dir}" casesensitive="false">
-                <include name="test*.xml"/>
-            </fileset>
-            <report format="frames"
-                    todir="${build.test.dir}"/>
-        </junitreport>
-    </target>
-
-<!--
-    <target name="doc" description="Creates documentation via XSLT">
-        <mkdir dir="${build.doc.dir}"/>
-        <style basedir="${src.doc.dir}"
-               destdir="${build.doc.dir}"
-               extension=".html"
-               style="${src.doc.dir}/stylesheets/site.xsl"
-               excludes="empty.xml"
-               includes="**/*.xml">
-          <param name="relative-path" expression="."/>
-        </style>
-        <copy todir="${build.doc.dir}/images" filtering="no">
-          <fileset dir="${src.doc.dir}/images">
-            <include name="**/*.gif"/>
-            <include name="**/*.jpeg"/>
-            <include name="**/*.jpg"/>
-            <include name="**/*.png"/>
-          </fileset>
-        </copy>
-    </target>
--->
+    <junit dir="."
+           printSummary="yes"
+           fork="true"
+           haltonerror="false">
+      <sysproperty key="jdbc.properties.file" value="${jdbc.properties.file}"/> 
+      <formatter type="xml"/>
+      <formatter type="plain"/>
+      <classpath refid="compilation-classpath"/>
+      <batchtest todir="${build.test.dir}">
+          <fileset dir="${src.test.dir}"
+                   includes="**/Test*.java"/>
+      </batchtest>
+    </junit>
+  </target>
+
+  <!-- ================================================================== -->
+  <!-- Creates the test report                                            -->
+  <!-- ================================================================== -->
+  <target name="junit-report"
+          description="Creates a test report in html form">
+    <junitreport todir="${build.test.dir}">
+      <fileset dir="${build.test.dir}" casesensitive="false">
+          <include name="test*.xml"/>
+      </fileset>
+      <report format="frames"
+              todir="${build.test.dir}"/>
+    </junitreport>
+  </target>
+
+  <!-- ================================================================== -->
+  <!-- Runs Checkstyle over DdlUtils                                      -->
+  <!-- ================================================================== -->
+  <target name="checkstyle"
+          description="Checks the sourcecode via Checkstyle">
+    <taskdef resource="checkstyletask.properties"
+             classpathref="compilation-classpath"/>
+
+    <checkstyle config="${src.check.dir}/ddlutils-checks.xml"
+                failOnViolation="false">
+      <fileset dir="${src.java.dir}"
+               includes="**/*.java"/>
+      <fileset dir="${src.test.dir}"
+               includes="**/*.java"/>
+
+      <formatter type="plain"/>
+      <!-- Location of cache-file (project specific) -->
+      <property key="checkstyle.cache.file" file="${build.check.dir}/checkstyle/cachefile"/>
+    </checkstyle>
+  </target>
 </project>

Added: db/ddlutils/trunk/lib/build-only/antlr.jar
URL: http://svn.apache.org/viewcvs/db/ddlutils/trunk/lib/build-only/antlr.jar?rev=292045&view=auto
==============================================================================
Binary file - no diff available.

Propchange: db/ddlutils/trunk/lib/build-only/antlr.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: db/ddlutils/trunk/lib/build-only/checkstyle-4.0-beta6.jar
URL: http://svn.apache.org/viewcvs/db/ddlutils/trunk/lib/build-only/checkstyle-4.0-beta6.jar?rev=292045&view=auto
==============================================================================
Binary file - no diff available.

Propchange: db/ddlutils/trunk/lib/build-only/checkstyle-4.0-beta6.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: db/ddlutils/trunk/lib/build-only/commons-cli.jar
URL: http://svn.apache.org/viewcvs/db/ddlutils/trunk/lib/build-only/commons-cli.jar?rev=292045&view=auto
==============================================================================
Binary file - no diff available.

Propchange: db/ddlutils/trunk/lib/build-only/commons-cli.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: db/ddlutils/trunk/lib/commons-beanutils-1.7.0.jar
URL: http://svn.apache.org/viewcvs/db/ddlutils/trunk/lib/commons-beanutils-1.7.0.jar?rev=292045&view=auto
==============================================================================
Binary file - no diff available.

Propchange: db/ddlutils/trunk/lib/commons-beanutils-1.7.0.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: db/ddlutils/trunk/src/check/ddlutils-checks.xml
URL: http://svn.apache.org/viewcvs/db/ddlutils/trunk/src/check/ddlutils-checks.xml?rev=292045&view=auto
==============================================================================
--- db/ddlutils/trunk/src/check/ddlutils-checks.xml (added)
+++ db/ddlutils/trunk/src/check/ddlutils-checks.xml Tue Sep 27 13:55:42 2005
@@ -0,0 +1,139 @@
+<?xml version="1.0"?>
+<!DOCTYPE module PUBLIC
+    "-//Puppy Crawl//DTD Check Configuration 1.2//EN"
+    "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
+
+<module name="Checker">
+    <property name="severity" value="error"/>
+
+    <module name="PackageHtml"/>
+
+    <module name="TreeWalker">
+        <property name="tabWidth" value="4" />
+
+        <module name="JavadocType">
+            <property name="versionFormat" value="${checkstyle.version.pattern}"/>
+            <property name="authorFormat" value="${checkstyle.author.pattern}"/>
+        </module>
+
+        <module name="JavadocMethod">
+            <property name="allowMissingThrowsTags" value="true"/>
+            <property name="allowThrowsTagsForSubclasses" value="true"/>
+        </module>
+
+        <module name="JavadocVariable"/>
+
+        <module name="JavadocStyle">
+            <property name="checkEmptyJavadoc" value="true"/>
+        </module>
+
+        <module name="RegexpHeader">
+            <property name="headerFile"
+                      value='${checkstyle.license.file}'/>
+        </module>
+<!-- 
+
+        <module name="GenericIllegalRegexp">
+            <property name="format" value="\s$"/>
+        </module>
+
+        <module name="AvoidStarImport"/>
+        <module name="ConstantName"/>
+        <module name="EmptyBlock"/>
+        <module name="EmptyForIteratorPad"/>
+        <module name="EqualsHashCode"/>
+        <module name="FileLength" />
+        <module name="Header">
+          <property name="headerFile" value="${checkstyle.header.file}"/>
+        </module>
+
+        <module name="ImportControl">
+          <property name="file" value="${checkstyle.importcontrol.file}"/>
+        </module>
+        <module name="IllegalImport"/>
+        <module name="IllegalInstantiation"/>
+        <module name="IllegalThrows"/>
+        <module name="InnerAssignment"/>
+
+        <module name="LeftCurly">
+            <property name="tokens" value="CLASS_DEF,INTERFACE_DEF,METHOD_DEF,CTOR_DEF"/>
+            <property name="option" value="nl"/>
+        </module>
+        <module name="LeftCurly">
+            <property name="tokens" value="LITERAL_CATCH,LITERAL_DO,LITERAL_ELSE,LITERAL_FINALLY,LITERAL_FOR,LITERAL_IF,LITERAL_SWITCH,LITERAL_SYNCHRONIZED,LITERAL_TRY,LITERAL_WHILE"/>
+            <property name="option" value="nlow"/>
+        </module>
+
+        <module name="LineLength">
+            <property name="ignorePattern" value="^ *\* *[^ ]+$"/>
+        </module>
+
+        <module name="LocalFinalVariableName"/>
+        <module name="LocalVariableName"/>
+        <module name="MemberName">
+            <property name="format" value="^m[A-Z][a-zA-Z0-9]*$"/>
+        </module>
+        <module name="MethodLength"/>
+        <module name="MethodName"/>
+        <module name="MethodParamPad"/>
+        <module name="ModifierOrder"/>
+        <module name="NeedBraces"/>
+        <module name="NoWhitespaceAfter"/>
+
+        <module name="NoWhitespaceBefore"/>
+        <module name="NoWhitespaceBefore">
+            <property name="tokens" value="DOT"/>
+            <property name="allowLineBreaks" value="true"/>
+        </module>
+
+        <module name="OperatorWrap"/>
+        <module name="OperatorWrap">
+            <property name="tokens" value="ASSIGN, DIV_ASSIGN, PLUS_ASSIGN, MINUS_ASSIGN, STAR_ASSIGN, MOD_ASSIGN, SR_ASSIGN, BSR_ASSIGN, SL_ASSIGN, BXOR_ASSIGN, BOR_ASSIGN, BAND_ASSIGN"/>
+            <property name="option" value="eol"/>
+        </module>
+        <module name="PackageName"/>
+        <module name="ParameterName">
+            <property name="format" value="^a[A-Z][a-zA-Z0-9]*$"/>
+        </module>
+        <module name="ParameterNumber"/>
+        <module name="ParenPad"/>
+        <module name="TypecastParenPad"/>
+        <module name="RedundantImport"/>
+        <module name="RedundantModifier"/>
+        <module name="RightCurly">
+            <property name="option" value="alone"/>
+        </module>
+        <module name="SimplifyBooleanExpression"/>
+        <module name="SimplifyBooleanReturn"/>
+        <module name="StaticVariableName">
+            <property name="format" value="^s[A-Z][a-zA-Z0-9]*$"/>
+        </module>
+        <module name="TabCharacter"/>
+        <module name="TypeName"/>
+        <module name="UnusedImports"/>
+        <module name="UpperEll"/>
+        <module name="VisibilityModifier"/>
+        <module name="WhitespaceAfter"/>
+        <module name="WhitespaceAround"/>
+        <module name="FinalClass"/>
+        <module name="MissingSwitchDefault"/>
+        <module name="MagicNumber"/>
+        <module name="Indentation">
+            <property name="basicOffset" value="4"/>
+            <property name="braceAdjustment" value="0"/>
+            <property name="caseIndent" value="0"/>
+        </module>
+        <module name="ArrayTrailingComma"/>
+
+        <module name="CyclomaticComplexity">
+            <property name="severity" value="ignore"/>
+        </module>
+
+        <module name="NestedIfDepth">
+            <property name="max" value="3"/>
+        </module>
+        <module name="NestedTryDepth"/>
+        <module name="ExplicitInitialization"/>
+-->
+    </module>
+</module>

Added: db/ddlutils/trunk/src/check/license-check.txt
URL: http://svn.apache.org/viewcvs/db/ddlutils/trunk/src/check/license-check.txt?rev=292045&view=auto
==============================================================================
--- db/ddlutils/trunk/src/check/license-check.txt (added)
+++ db/ddlutils/trunk/src/check/license-check.txt Tue Sep 27 13:55:42 2005
@@ -0,0 +1,17 @@
+package .*
+
+\/*
+ * Copyright .*2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 \(the "License"\);
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *\/

Modified: db/ddlutils/trunk/src/doc/src/documentation/content/xdocs/ant-tasks.xml
URL: http://svn.apache.org/viewcvs/db/ddlutils/trunk/src/doc/src/documentation/content/xdocs/ant-tasks.xml?rev=292045&r1=292044&r2=292045&view=diff
==============================================================================
--- db/ddlutils/trunk/src/doc/src/documentation/content/xdocs/ant-tasks.xml (original)
+++ db/ddlutils/trunk/src/doc/src/documentation/content/xdocs/ant-tasks.xml Tue Sep 27 13:55:42 2005
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-15"?>
 <!--
-  Copyright 2002-2004 The Apache Software Foundation
+  Copyright 2002-2005 The Apache Software Foundation
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.

Modified: db/ddlutils/trunk/src/doc/src/documentation/content/xdocs/api-usage.xml
URL: http://svn.apache.org/viewcvs/db/ddlutils/trunk/src/doc/src/documentation/content/xdocs/api-usage.xml?rev=292045&r1=292044&r2=292045&view=diff
==============================================================================
--- db/ddlutils/trunk/src/doc/src/documentation/content/xdocs/api-usage.xml (original)
+++ db/ddlutils/trunk/src/doc/src/documentation/content/xdocs/api-usage.xml Tue Sep 27 13:55:42 2005
@@ -45,21 +45,14 @@
         accomplished with a few lines of code:
       </p>
       <source><![CDATA[
-import java.beans.IntrospectionException;
-import java.io.IOException;
-import org.apache.ddlutils.io.DatabaseReader;
+import org.apache.ddlutils.io.DatabaseIO;
 import org.apache.ddlutils.model.Database;
-import org.xml.sax.SAXException;
 
 ...
 
-public Database readDatabaseFromXML(String fileName) throws IOException,
-                                                            SAXException,
-                                                            IntrospectionException
+public Database readDatabaseFromXML(String fileName)
 {
-    DatabaseReader reader = new DatabaseReader();
-
-    return (Database)reader.parse(fileName);
+    return new DatabaseIO().read(fileName);
 }]]></source>
     </section>
     <section>
@@ -68,22 +61,14 @@
         Writing a model to XML is just as easy as reading from XML:
       </p>
       <source><![CDATA[
-import java.beans.IntrospectionException;
-import java.io.FileWriter;
-import java.io.IOException;
-import org.apache.ddlutils.io.DatabaseWriter;
+import org.apache.ddlutils.io.DatabaseIO;
 import org.apache.ddlutils.model.Database;
-import org.xml.sax.SAXException;
 
 ...
 
-public void writeDatabaseToXML(Database db, String fileName) throws IOException,
-                                                                    SAXException,
-                                                                    IntrospectionException
+public void writeDatabaseToXML(Database db, String fileName)
 {
-    DatabaseWriter writer = new DatabaseWriter(new FileWriter(fileName));
-
-    writer.write(db);
+    new DatabaseIO().write(db, fileName);
 }]]></source>
     </section>
     <section>
@@ -133,57 +118,26 @@
         is the same: create the sql and execute it:
       </p>
       <source><![CDATA[
-import java.io.IOException;
-import java.io.StringWriter;
-import java.sql.Connection;
-import java.sql.SQLException;
 import javax.sql.DataSource;
-import org.apache.ddlutils.builder.SqlBuilder;
-import org.apache.ddlutils.builder.SqlBuilderFactory;
+import org.apache.ddlutils.Platform;
+import org.apache.ddlutils.PlatformFactory;
 import org.apache.ddlutils.model.Database;
-import org.apache.ddlutils.util.DDLExecutor;
 
 ...
 
 public void changeDatabase(DataSource dataSource,
-                           String     databaseName,
                            Database   targetModel,
-                           boolean    alterDb) throws IllegalAccessException,
-                                                      InstantiationException,
-                                                      IOException,
-                                                      SQLException
-{
-    SqlBuilder   builder    = SqlBuilderFactory.newSqlBuilder(databaseName);
-    StringWriter writer     = new StringWriter();
-    Connection   connection = null;
-
-    builder.setWriter(writer);
-    try
+                           boolean    alterDb)
+{
+    Platform platform = PlatformFactory.createNewPlatformInstance(dataSource);
+    
+    if (alterDb)
     {
-        connection = dataSource.getConnection();
-        if (alterDb)
-        {
-            builder.alterDatabase(targetModel, connection, true, true);
-        }
-        else
-        {
-            builder.createDatabase(targetModel);
-        }
-        
-        String sql = writer.toString();
-
-        // you could dump the SQL to a file here
-
-        DDLExecutor executor = new DDLExecutor(dataSource);
-
-        executor.evaluateBatch(sql);
+        platform.alterTables(targetModel, true, alterDb, false);
     }
-    finally
+    else
     {
-        if (connection != null)
-        {
-            connection.close();
-        }
+        platform.createTables(targetModel, true, false);
     }
 }]]></source>
     </section>
@@ -198,33 +152,27 @@
         which can be inserted by DdlUtils into the database:
       </p>
       <source><![CDATA[
-import java.sql.SQLException;
 import javax.sql.DataSource;
 import org.apache.commons.beanutils.DynaBean;
-import org.apache.ddlutils.builder.SqlBuilder;
-import org.apache.ddlutils.builder.SqlBuilderFactory;
-import org.apache.ddlutils.dynabean.DynaSql;
+import org.apache.ddlutils.Platform;
+import org.apache.ddlutils.PlatformFactory;
 import org.apache.ddlutils.model.Database;
 
 ...
 
 public void insertData(DataSource dataSource,
-                       String     databaseName,
-                       Database   database) throws IllegalAccessException,
-                                                   InstantiationException,
-                                                   SQLException
+                       Database   database)
 {
-    SqlBuilder builder = SqlBuilderFactory.newSqlBuilder(databaseName);
-    DynaSql    dynaSql = new DynaSql(builder, dataSource, database);
-
+    Platform platform = PlatformFactory.createNewPlatformInstance(dataSource);
+    
     // "author" is a table of the model
-    DynaBean author = dynaSql.newInstance("author");
-
+    DynaBean author = database.createDynaBeanFor("author", false);
+    
     // "name" and "whatever" are columns of table "author"
     author.set("name",     "James");
     author.set("whatever", new Integer(1234));
-
-    dynaSql.insert(author);
+    
+    platform.insert(database, author);
 }]]></source>
     </section>
     <section>
@@ -240,38 +188,28 @@
         to stdout:
       </p>
       <source><![CDATA[
-import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Iterator;
-
 import javax.sql.DataSource;
-
 import org.apache.commons.beanutils.DynaBean;
-import org.apache.ddlutils.builder.SqlBuilder;
-import org.apache.ddlutils.builder.SqlBuilderFactory;
-import org.apache.ddlutils.dynabean.DynaSql;
+import org.apache.ddlutils.Platform;
+import org.apache.ddlutils.PlatformFactory;
 import org.apache.ddlutils.model.Database;
 
 ...
 
 public void dumpBooks(DataSource dataSource,
-                      String   databaseName,
-                      Database database) throws IllegalAccessException,
-                                                InstantiationException,
-                                                SQLException
-{
-    SqlBuilder builder = SqlBuilderFactory.newSqlBuilder(databaseName);
-    DynaSql    dynaSql = new DynaSql(builder, dataSource, database);
-    ArrayList  params  = new ArrayList();
-
+                      Database database)
+{
+    Platform  platform = PlatformFactory.createNewPlatformInstance(dataSource);
+    ArrayList params   = new ArrayList();
+    
     params.add("Some title");
 
-    Iterator iter = dynaSql.query("select * from book where title = ?", params);
-
-    while (iter.hasNext())
+    for (Iterator it = platform.query(database, "select * from book where title = ?", params); it.hasNext();)
     {
-        DynaBean book = (DynaBean)iter.next();
-
+        DynaBean book = (DynaBean)it.next();
+        
         System.out.println(book.get("title"));
     }
 }]]></source>

Modified: db/ddlutils/trunk/src/doc/src/documentation/content/xdocs/site.xml
URL: http://svn.apache.org/viewcvs/db/ddlutils/trunk/src/doc/src/documentation/content/xdocs/site.xml?rev=292045&r1=292044&r2=292045&view=diff
==============================================================================
--- db/ddlutils/trunk/src/doc/src/documentation/content/xdocs/site.xml (original)
+++ db/ddlutils/trunk/src/doc/src/documentation/content/xdocs/site.xml Tue Sep 27 13:55:42 2005
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-15"?>
 <!--
-  Copyright 2002-2004 The Apache Software Foundation
+  Copyright 2002-2005 The Apache Software Foundation
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -55,8 +55,8 @@
   </documentation>
 
   <all label="Whole site">
-    <whole_site_html label="Whole site as HTML" href="site.html"/>
-    <whole_site_pdf label="Whole site as PDF" href="site.pdf"/>
+    <all_site label="Full HTML" href="wholesite.html"/>
+    <all_sitePDF label="Full PDF" href="wholesite.pdf"/>
   </all>
 
   <external-refs>

Modified: db/ddlutils/trunk/src/doc/src/documentation/skinconf.xml
URL: http://svn.apache.org/viewcvs/db/ddlutils/trunk/src/doc/src/documentation/skinconf.xml?rev=292045&r1=292044&r2=292045&view=diff
==============================================================================
--- db/ddlutils/trunk/src/doc/src/documentation/skinconf.xml (original)
+++ db/ddlutils/trunk/src/doc/src/documentation/skinconf.xml Tue Sep 27 13:55:42 2005
@@ -30,7 +30,7 @@
     no search box. @domain will enable sitesearch for the specific domain with google.
     In other words google will search the @domain for the query string.
   -->
-  <search name="DdlUtils" domain="http://db.apache.org/dbutils" provider="google"/>
+  <search name="DdlUtils" domain="http://db.apache.org/ddlutils" provider="google"/>
 
   <!-- Disable the print link? If enabled, invalid HTML 4.0.1 -->
   <disable-print-link>true</disable-print-link>  

Modified: db/ddlutils/trunk/src/java/org/apache/ddlutils/DdlUtilsException.java
URL: http://svn.apache.org/viewcvs/db/ddlutils/trunk/src/java/org/apache/ddlutils/DdlUtilsException.java?rev=292045&r1=292044&r2=292045&view=diff
==============================================================================
--- db/ddlutils/trunk/src/java/org/apache/ddlutils/DdlUtilsException.java (original)
+++ db/ddlutils/trunk/src/java/org/apache/ddlutils/DdlUtilsException.java Tue Sep 27 13:55:42 2005
@@ -1,7 +1,7 @@
 package org.apache.ddlutils;
 
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
+ * Copyright 1999-2005 The Apache Software Foundation.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,11 +19,14 @@
 import org.apache.commons.lang.exception.NestableRuntimeException;
 
 /**
- * Base class for DdlUtils exceptions
+ * Base class for DdlUtils exceptions.
+ * 
+ * @author Thomas Dudziak
+ * @version $Revision: 289996 $
  */
 public class DdlUtilsException extends NestableRuntimeException 
 {
-    /** Constant for serializing instances of this class */
+    /** Constant for serializing instances of this class. */
     private static final long serialVersionUID = 5624776387174310551L;
 
     /**

Modified: db/ddlutils/trunk/src/java/org/apache/ddlutils/DynaSqlException.java
URL: http://svn.apache.org/viewcvs/db/ddlutils/trunk/src/java/org/apache/ddlutils/DynaSqlException.java?rev=292045&r1=292044&r2=292045&view=diff
==============================================================================
--- db/ddlutils/trunk/src/java/org/apache/ddlutils/DynaSqlException.java (original)
+++ db/ddlutils/trunk/src/java/org/apache/ddlutils/DynaSqlException.java Tue Sep 27 13:55:42 2005
@@ -1,7 +1,7 @@
 package org.apache.ddlutils;
 
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
+ * Copyright 1999-2005 The Apache Software Foundation.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,15 +16,15 @@
  * limitations under the License.
  */
 
-
 /**
- * Is thrown when by the {@link org.apache.ddlutils.dynabean.DynaSql} and
- * related classes when a database operation fails, but a normal
- * {@link java.sql.SQLException} cannot be generated.
+ * This exception is thrown when a database operation failed.
+ * 
+ * @author Thomas Dudziak
+ * @version $Revision: 289996 $
  */
 public class DynaSqlException extends DdlUtilsException 
 {
-    /** Constant for serializing instances of this class */
+    /** Constant for serializing instances of this class. */
     private static final long serialVersionUID = 7524362294381844776L;
 
     /**

Modified: db/ddlutils/trunk/src/java/org/apache/ddlutils/Platform.java
URL: http://svn.apache.org/viewcvs/db/ddlutils/trunk/src/java/org/apache/ddlutils/Platform.java?rev=292045&r1=292044&r2=292045&view=diff
==============================================================================
--- db/ddlutils/trunk/src/java/org/apache/ddlutils/Platform.java (original)
+++ db/ddlutils/trunk/src/java/org/apache/ddlutils/Platform.java Tue Sep 27 13:55:42 2005
@@ -1,7 +1,7 @@
 package org.apache.ddlutils;
 
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
+ * Copyright 1999-2005 The Apache Software Foundation.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,7 +33,7 @@
  * A platform encapsulates the database-related functionality such as performing queries
  * and manipulations. It also contains an sql builder that is specific to this platform.
  * 
- * @author <a href="mailto:tomdz@apache.org">Thomas Dudziak</a>
+ * @author Thomas Dudziak
  * @version $Revision: 231110 $
  */
 public interface Platform
@@ -92,7 +92,6 @@
      * configured as {@link PlatformInfo#getSqlCommandDelimiter()} of the info object
      * of this platform.
      * 
-     * @param connection      The connection to the database
      * @param sql             The sql statements to execute
      * @param continueOnError Whether to continue executing the sql commands when an error occurred
      * @return The number of errors
@@ -166,17 +165,19 @@
      * Alters the database schema so that it match the given model. Drops and table modifications will
      * not be made.
      *
-     * @param desiredDb The desired database schema
+     * @param desiredDb       The desired database schema
+     * @param continueOnError Whether to continue with the next sql statement when an error occurred
      */
     public void alterTables(Database desiredDb, boolean continueOnError) throws DynaSqlException;
 
     /**
      * Alters the database schema so that it match the given model.
      *
-     * @param desiredDb     The desired database schema
-     * @param doDrops       Whether columns, tables and indexes should be dropped if not in the
-     *                      new schema
-     * @param modifyColumns Whether columns should be altered for datatype, size as required
+     * @param desiredDb       The desired database schema
+     * @param doDrops         Whether columns, tables and indexes should be dropped if not in the
+     *                        new schema
+     * @param modifyColumns   Whether columns should be altered for datatype, size as required
+     * @param continueOnError Whether to continue with the next sql statement when an error occurred
      */
     public void alterTables(Database desiredDb, boolean doDrops, boolean modifyColumns, boolean continueOnError) throws DynaSqlException;
 
@@ -184,26 +185,27 @@
      * Alters the database schema so that it match the given model. Drops and table modifications will
      * not be made.
      *
-     * @param connection A connection to the existing database that shall be modified
-     * @param desiredDb  The desired database schema
+     * @param connection      A connection to the existing database that shall be modified
+     * @param desiredDb       The desired database schema
+     * @param continueOnError Whether to continue with the next sql statement when an error occurred
      */
     public void alterTables(Connection connection, Database desiredDb, boolean continueOnError) throws DynaSqlException;
 
     /**
      * Alters the database schema so that it match the given model.
      *
-     * @param connection    A connection to the existing database that shall be modified
-     * @param desiredDb     The desired database schema
-     * @param doDrops       Whether columns, tables and indexes should be dropped if not in the
-     *                      new schema
-     * @param modifyColumns Whether columns should be altered for datatype, size as required
+     * @param connection      A connection to the existing database that shall be modified
+     * @param desiredDb       The desired database schema
+     * @param doDrops         Whether columns, tables and indexes should be dropped if not in the
+     *                        new schema
+     * @param modifyColumns   Whether columns should be altered for datatype, size as required
+     * @param continueOnError Whether to continue with the next sql statement when an error occurred
      */
     public void alterTables(Connection connection, Database desiredDb, boolean doDrops, boolean modifyColumns, boolean continueOnError) throws DynaSqlException;
 
     /**
      * Drops the tables defined in the given database.
      * 
-     * @param connection      The connection to the database
      * @param model           The database model
      * @param continueOnError Whether to continue executing the sql commands when an error occurred
      */
@@ -260,7 +262,7 @@
 
     /**
      * Queries for a list of dyna beans representing rows of the given query.
-     * In contrast to the {@link #query(String)} method all beans will be
+     * In contrast to the {@link #query(Database, String)} method all beans will be
      * materialized and the connection will be closed before returning the beans. 
      * 
      * @param model The database model to use
@@ -271,9 +273,11 @@
 
     /**
      * Queries for a list of dyna beans representing rows of the given query.
-     * In contrast to the {@link #query(String, Collection)} method all beans will be
-     * materialized and the connection will be closed before returning the beans. 
+     * In contrast to the {@link #query(Database, String, Collection)} method
+     * all beans will be materialized and the connection will be closed before
+     * returning the beans. 
      * 
+     * @param model      The database model to use
      * @param sql        The parameterized query
      * @param parameters The parameter values
      * @return The dyna beans resulting from the query
@@ -282,7 +286,7 @@
 
     /**
      * Queries for a list of dyna beans representing rows of the given query.
-     * In contrast to the {@link #query(String)} method all beans will be
+     * In contrast to the {@link #query(Database, String)} method all beans will be
      * materialized and the connection will be closed before returning the beans. 
      * 
      * @param model      The database model to use
@@ -294,9 +298,11 @@
 
     /**
      * Queries for a list of dyna beans representing rows of the given query.
-     * In contrast to the {@link #query(String, Collection)} method all beans will be
-     * materialized and the connection will be closed before returning the beans. 
+     * In contrast to the {@link #query(Database, String, Collection)} method
+     * all beans will be materialized and the connection will be closed before
+     * returning the beans. 
      * 
+     * @param model      The database model to use
      * @param sql        The parameterized query
      * @param parameters The parameter values
      * @param queryHints The tables that are queried (optional)
@@ -306,7 +312,7 @@
 
     /**
      * Queries for a list of dyna beans representing rows of the given query.
-     * In contrast to the {@link #query(String)} method all beans will be
+     * In contrast to the {@link #query(Database, String)} method all beans will be
      * materialized and the connection will be closed before returning the beans.
      * Also, the two int parameters specify which rows of the result set to use.
      * If there are more rows than desired, they will be ignored (and not read
@@ -322,11 +328,11 @@
 
     /**
      * Queries for a list of dyna beans representing rows of the given query.
-     * In contrast to the {@link #query(String, Collection)} method all beans will be
-     * materialized and the connection will be closed before returning the beans.
-     * Also, the two int parameters specify which rows of the result set to use.
-     * If there are more rows than desired, they will be ignored (and not read
-     * from the database).
+     * In contrast to the {@link #query(Database, String, Collection)} method all
+     * beans will be materialized and the connection will be closed before returning
+     * the beans. Also, the two int parameters specify which rows of the result set
+     * to use. If there are more rows than desired, they will be ignored (and not
+     * read from the database).
      * 
      * @param model      The database model to use
      * @param sql        The parameterized sql query
@@ -339,11 +345,11 @@
 
     /**
      * Queries for a list of dyna beans representing rows of the given query.
-     * In contrast to the {@link #query(String)} method all beans will be
-     * materialized and the connection will be closed before returning the beans.
-     * Also, the two int parameters specify which rows of the result set to use.
-     * If there are more rows than desired, they will be ignored (and not read
-     * from the database).
+     * In contrast to the {@link #query(Database, String, Table[])} method all
+     * beans will be materialized and the connection will be closed before
+     * returning the beans. Also, the two int parameters specify which rows of
+     * the result set to use. If there are more rows than desired, they will be
+     * ignored (and not read from the database).
      * 
      * @param model      The database model to use
      * @param sql        The sql query
@@ -356,11 +362,11 @@
 
     /**
      * Queries for a list of dyna beans representing rows of the given query.
-     * In contrast to the {@link #query(String, Collection)} method all beans will be
-     * materialized and the connection will be closed before returning the beans.
-     * Also, the two int parameters specify which rows of the result set to use.
-     * If there are more rows than desired, they will be ignored (and not read
-     * from the database).
+     * In contrast to the {@link #query(Database, String, Collection, Table[])}
+     * method all beans will be materialized and the connection will be closed
+     * before returning the beans. Also, the two int parameters specify which
+     * rows of the result set to use. If there are more rows than desired, they
+     * will be ignored (and not read from the database).
      * 
      * @param model      The database model to use
      * @param sql        The parameterized sql query
@@ -384,6 +390,7 @@
     /**
      * Returns the sql for inserting the given bean.
      * 
+     * @param model    The database model to use
      * @param dynaBean The bean
      * @return The insert sql
      */

Modified: db/ddlutils/trunk/src/java/org/apache/ddlutils/PlatformFactory.java
URL: http://svn.apache.org/viewcvs/db/ddlutils/trunk/src/java/org/apache/ddlutils/PlatformFactory.java?rev=292045&r1=292044&r2=292045&view=diff
==============================================================================
--- db/ddlutils/trunk/src/java/org/apache/ddlutils/PlatformFactory.java (original)
+++ db/ddlutils/trunk/src/java/org/apache/ddlutils/PlatformFactory.java Tue Sep 27 13:55:42 2005
@@ -1,7 +1,7 @@
 package org.apache.ddlutils;
 
 /*
- * Copyright 1999-2002,2004 The Apache Software Foundation.
+ * Copyright 1999-2005 The Apache Software Foundation.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -41,13 +41,13 @@
  * insensitive database name. Note that this is a convenience class as the platforms
  * can also simply be created via their constructors.
  * 
- * @author <a href="mailto:jstrachan@apache.org">James Strachan</a>
- * @author <a href="mailto:tomdz@apache.org">Thomas Dudziak</a>
+ * @author James Strachan
+ * @author Thomas Dudziak
  * @version $Revision: 209952 $
  */
 public class PlatformFactory
 {
-    /** The database name -> platform map */
+    /** The database name -> platform map. */
     private static Map _platforms = null;
 
     /**
@@ -104,14 +104,18 @@
     /**
      * Creates a new platform for the specified database. This is a shortcut method that uses
      * {@link PlatformUtils#determineDatabaseType(DataSource)} to determine the parameter
-     * for {@link #createNewPlatformInstance(String)}.
+     * for {@link #createNewPlatformInstance(String)}. Note that this method sets the data source
+     * at the returned platform instance (method {@link Platform#setDataSource(DataSource)}).
      * 
      * @param dataSource The data source for the database
      * @return The platform or <code>null</code> if the database is not supported
      */
     public static synchronized Platform createNewPlatformInstance(DataSource dataSource) throws DdlUtilsException
     {
-        return createNewPlatformInstance(new PlatformUtils().determineDatabaseType(dataSource));
+        Platform platform = createNewPlatformInstance(new PlatformUtils().determineDatabaseType(dataSource));
+
+        platform.setDataSource(dataSource);
+        return platform;
     }
 
     /**

Modified: db/ddlutils/trunk/src/java/org/apache/ddlutils/PlatformInfo.java
URL: http://svn.apache.org/viewcvs/db/ddlutils/trunk/src/java/org/apache/ddlutils/PlatformInfo.java?rev=292045&r1=292044&r2=292045&view=diff
==============================================================================
--- db/ddlutils/trunk/src/java/org/apache/ddlutils/PlatformInfo.java (original)
+++ db/ddlutils/trunk/src/java/org/apache/ddlutils/PlatformInfo.java Tue Sep 27 13:55:42 2005
@@ -1,5 +1,21 @@
 package org.apache.ddlutils;
 
+/*
+ * Copyright 1999-2005 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 import java.lang.reflect.Field;
 import java.sql.Types;
 import java.util.HashMap;
@@ -10,68 +26,71 @@
 
 /**
  * Conatains information about the database platform such as supported features and native type mappings.
+ * 
+ * @author Thomas Dudziak
+ * @version $Revision: 289996 $
  */
 public class PlatformInfo
 {
     /** The Log to which logging calls will be made. */
     private final Log _log = LogFactory.getLog(PlatformInfo.class);
 
-    /** Whether the database requires the explicit stating of NULL as the default value */
+    /** Whether the database requires the explicit stating of NULL as the default value. */
     private boolean _requiringNullAsDefaultValue = false;
 
-    /** Whether primary key constraints are embedded inside the create table statement */
+    /** Whether primary key constraints are embedded inside the create table statement. */
     private boolean _primaryKeyEmbedded = true;
     
-    /** Whether foreign key constraints are embedded inside the create table statement */
+    /** Whether foreign key constraints are embedded inside the create table statement. */
     private boolean _foreignKeysEmbedded = false;
 
-    /** Whether indices are embedded inside the create table statement */
+    /** Whether indices are embedded inside the create table statement. */
     private boolean _indicesEmbedded = false;
 
-    /** Whether embedded foreign key constraints are explicitly named */
+    /** Whether embedded foreign key constraints are explicitly named. */
     private boolean _embeddedForeignKeysNamed = false;
 
-    /** Is an ALTER TABLE needed to drop indexes? */
+    /** Whether an ALTER TABLE is needed to drop indexes. */
     private boolean _useAlterTableForDrop = false;
 
     /** Specifies the maximum length that an identifier (name of a table, column, constraint etc.)
-     *  can have for this database; use -1 if there is no limit */
+        can have for this database; use -1 if there is no limit. */
     private int _maxIdentifierLength = -1;
 
-    /** Whether identifiers are case sensitive or not */
+    /** Whether identifiers are case sensitive or not. */
     private boolean _caseSensitive = false;
 
-    /** Whether delimited identifiers are used or not */
+    /** Whether delimited identifiers are used or not. */
     private boolean _useDelimitedIdentifiers = true;
 
     /** The string used for delimiting SQL identifiers, eg. table names, column names etc. */
     private String _delimiterToken = "\"";
 
-    /** The string used for escaping values when generating textual SQL statements */
+    /** The string used for escaping values when generating textual SQL statements. */
     private String _valueQuoteToken = "'";
 
-    /** Whether comments are supported */
+    /** Whether comments are supported. */
     private boolean _commentsSupported = true;
 
-    /** The string that starts a comment */
+    /** The string that starts a comment. */
     private String _commentPrefix = "--";
 
-    /** The string that ends a comment */
+    /** The string that ends a comment. */
     private String _commentSuffix = "";
 
-    /** The text separating individual sql commands */
+    /** The text separating individual sql commands. */
     private String _sqlCommandDelimiter = ";";
 
-    /** Contains non-default mappings from jdbc to native types */
+    /** Contains non-default mappings from jdbc to native types. */
     private HashMap _nativeTypes = new HashMap();
 
-    /** Contains those JDBC types whose corresponding native types have a null value as the default value */
+    /** Contains those JDBC types whose corresponding native types have a null value as the default value. */
     private HashSet _typesWithNullDefault = new HashSet();
 
-    /** Contains those JDBC types whose corresponding native types are types that have a size on this platform */
+    /** Contains those JDBC types whose corresponding native types are types that have a size on this platform. */
     private HashSet _typesWithSize = new HashSet();
 
-    /** Contains those JDBC types whose corresponding native types are types that have precision and scale on this platform */
+    /** Contains those JDBC types whose corresponding native types are types that have precision and scale on this platform. */
     private HashSet _typesWithPrecisionAndScale = new HashSet();
 
     /**



Mime
View raw message