db-torque-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t.@apache.org
Subject svn commit: r466087 [1/3] - in /db/torque/runtime/trunk/src/java/org/apache/torque: ./ adapter/ avalon/ dsfactory/ manager/ map/ oid/ om/ util/
Date Fri, 20 Oct 2006 12:20:05 GMT
Author: tv
Date: Fri Oct 20 05:20:01 2006
New Revision: 466087

URL: http://svn.apache.org/viewvc?view=rev&rev=466087
Log:
Preparation for release:
- "wrestled" the code (thanks to Henning)
-- removed trailing blanks
-- Relicensed with copyright -2006
- Fixed some checkstyle complaints

Modified:
    db/torque/runtime/trunk/src/java/org/apache/torque/Database.java
    db/torque/runtime/trunk/src/java/org/apache/torque/NoRowsException.java
    db/torque/runtime/trunk/src/java/org/apache/torque/TooManyRowsException.java
    db/torque/runtime/trunk/src/java/org/apache/torque/Torque.java
    db/torque/runtime/trunk/src/java/org/apache/torque/TorqueException.java
    db/torque/runtime/trunk/src/java/org/apache/torque/TorqueInstance.java
    db/torque/runtime/trunk/src/java/org/apache/torque/TorqueRuntimeException.java
    db/torque/runtime/trunk/src/java/org/apache/torque/adapter/AbstractDBAdapter.java
    db/torque/runtime/trunk/src/java/org/apache/torque/adapter/DB.java
    db/torque/runtime/trunk/src/java/org/apache/torque/adapter/DBAxion.java
    db/torque/runtime/trunk/src/java/org/apache/torque/adapter/DBCloudscape.java
    db/torque/runtime/trunk/src/java/org/apache/torque/adapter/DBDB2400.java
    db/torque/runtime/trunk/src/java/org/apache/torque/adapter/DBDB2App.java
    db/torque/runtime/trunk/src/java/org/apache/torque/adapter/DBDerby.java
    db/torque/runtime/trunk/src/java/org/apache/torque/adapter/DBFactory.java
    db/torque/runtime/trunk/src/java/org/apache/torque/adapter/DBFirebird.java
    db/torque/runtime/trunk/src/java/org/apache/torque/adapter/DBInformix.java
    db/torque/runtime/trunk/src/java/org/apache/torque/adapter/DBInstantDB.java
    db/torque/runtime/trunk/src/java/org/apache/torque/adapter/DBInterbase.java
    db/torque/runtime/trunk/src/java/org/apache/torque/adapter/DBMM.java
    db/torque/runtime/trunk/src/java/org/apache/torque/adapter/DBMSSQL.java
    db/torque/runtime/trunk/src/java/org/apache/torque/adapter/DBNone.java
    db/torque/runtime/trunk/src/java/org/apache/torque/adapter/DBOdbc.java
    db/torque/runtime/trunk/src/java/org/apache/torque/adapter/DBOracle.java
    db/torque/runtime/trunk/src/java/org/apache/torque/adapter/DBPostgres.java
    db/torque/runtime/trunk/src/java/org/apache/torque/adapter/DBSapDB.java
    db/torque/runtime/trunk/src/java/org/apache/torque/adapter/DBSybase.java
    db/torque/runtime/trunk/src/java/org/apache/torque/adapter/DBWeblogic.java
    db/torque/runtime/trunk/src/java/org/apache/torque/adapter/IDMethod.java
    db/torque/runtime/trunk/src/java/org/apache/torque/adapter/package.html
    db/torque/runtime/trunk/src/java/org/apache/torque/avalon/Torque.java
    db/torque/runtime/trunk/src/java/org/apache/torque/avalon/TorqueComponent.java
    db/torque/runtime/trunk/src/java/org/apache/torque/dsfactory/AbstractDataSourceFactory.java
    db/torque/runtime/trunk/src/java/org/apache/torque/dsfactory/DataSourceFactory.java
    db/torque/runtime/trunk/src/java/org/apache/torque/dsfactory/JndiDataSourceFactory.java
    db/torque/runtime/trunk/src/java/org/apache/torque/dsfactory/PerUserPoolDataSourceFactory.java
    db/torque/runtime/trunk/src/java/org/apache/torque/dsfactory/SharedPoolDataSourceFactory.java
    db/torque/runtime/trunk/src/java/org/apache/torque/manager/AbstractBaseManager.java
    db/torque/runtime/trunk/src/java/org/apache/torque/manager/CacheListener.java
    db/torque/runtime/trunk/src/java/org/apache/torque/manager/MethodCacheKey.java
    db/torque/runtime/trunk/src/java/org/apache/torque/manager/MethodResultCache.java
    db/torque/runtime/trunk/src/java/org/apache/torque/manager/NoOpMethodResultCache.java
    db/torque/runtime/trunk/src/java/org/apache/torque/manager/package.html
    db/torque/runtime/trunk/src/java/org/apache/torque/map/ColumnMap.java
    db/torque/runtime/trunk/src/java/org/apache/torque/map/DatabaseMap.java
    db/torque/runtime/trunk/src/java/org/apache/torque/map/InheritanceMap.java
    db/torque/runtime/trunk/src/java/org/apache/torque/map/MapBuilder.java
    db/torque/runtime/trunk/src/java/org/apache/torque/map/TableMap.java
    db/torque/runtime/trunk/src/java/org/apache/torque/map/package.html
    db/torque/runtime/trunk/src/java/org/apache/torque/oid/AutoIncrementIdGenerator.java
    db/torque/runtime/trunk/src/java/org/apache/torque/oid/IDBroker.java
    db/torque/runtime/trunk/src/java/org/apache/torque/oid/IDGeneratorFactory.java
    db/torque/runtime/trunk/src/java/org/apache/torque/oid/IdGenerator.java
    db/torque/runtime/trunk/src/java/org/apache/torque/oid/SequenceIdGenerator.java
    db/torque/runtime/trunk/src/java/org/apache/torque/om/BaseObject.java
    db/torque/runtime/trunk/src/java/org/apache/torque/om/ComboKey.java
    db/torque/runtime/trunk/src/java/org/apache/torque/om/DateKey.java
    db/torque/runtime/trunk/src/java/org/apache/torque/om/NumberKey.java
    db/torque/runtime/trunk/src/java/org/apache/torque/om/ObjectKey.java
    db/torque/runtime/trunk/src/java/org/apache/torque/om/Persistent.java
    db/torque/runtime/trunk/src/java/org/apache/torque/om/SimpleKey.java
    db/torque/runtime/trunk/src/java/org/apache/torque/om/StringKey.java
    db/torque/runtime/trunk/src/java/org/apache/torque/om/package.html
    db/torque/runtime/trunk/src/java/org/apache/torque/util/BasePeer.java
    db/torque/runtime/trunk/src/java/org/apache/torque/util/CountHelper.java
    db/torque/runtime/trunk/src/java/org/apache/torque/util/Criteria.java
    db/torque/runtime/trunk/src/java/org/apache/torque/util/JoinBuilder.java
    db/torque/runtime/trunk/src/java/org/apache/torque/util/LargeSelect.java
    db/torque/runtime/trunk/src/java/org/apache/torque/util/Query.java
    db/torque/runtime/trunk/src/java/org/apache/torque/util/SQLBuilder.java
    db/torque/runtime/trunk/src/java/org/apache/torque/util/SqlEnum.java
    db/torque/runtime/trunk/src/java/org/apache/torque/util/SqlExpression.java
    db/torque/runtime/trunk/src/java/org/apache/torque/util/Transaction.java
    db/torque/runtime/trunk/src/java/org/apache/torque/util/VillageUtils.java
    db/torque/runtime/trunk/src/java/org/apache/torque/util/package.html

Modified: db/torque/runtime/trunk/src/java/org/apache/torque/Database.java
URL: http://svn.apache.org/viewvc/db/torque/runtime/trunk/src/java/org/apache/torque/Database.java?view=diff&rev=466087&r1=466086&r2=466087
==============================================================================
--- db/torque/runtime/trunk/src/java/org/apache/torque/Database.java (original)
+++ db/torque/runtime/trunk/src/java/org/apache/torque/Database.java Fri Oct 20 05:20:01 2006
@@ -1,218 +1,218 @@
-package org.apache.torque;
-
-/*
- * Copyright 2006 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 org.apache.torque.adapter.DB;
-import org.apache.torque.dsfactory.DataSourceFactory;
-import org.apache.torque.map.DatabaseMap;
-import org.apache.torque.oid.IDBroker;
-import org.apache.torque.oid.IdGenerator;
-
-/**
- * Bundles all information about a database. This includes the database adapter,
- * the database Map and the Data Source Factory.
- */
-public class Database
-{
-    /** 
-     * The name of the database. Must be the same as the key in Torque's 
-     * databaseMap.
-     */
-    private String name;
-    
-    /**
-     * The Database adapter which encapsulates database-specific peculiarities. 
-     */
-    private DB adapter;
-    
-    /**
-     * the Map of this database.
-     */
-    private DatabaseMap databaseMap;
-    
-    /**
-     * The DataSourceFactory to optain connections to this database. 
-     */
-    private DataSourceFactory dataSourceFactory;
-    
-    /**
-     * Creates a new Database with the given name.
-     *
-     * @param name the name of the database, not null.
-     */
-    Database(String name)
-    {
-        this.name = name;
-    }
-    
-    /**
-     * returns the name of the database.
-     *
-     * @return the name of the database. May be null.
-     */
-    public String getName()
-    {
-        return name;
-    }
-
-    /**
-     * Returns the adapther to this database.
-     *
-     * @return the adapter to this database, or null if no adapter is set.
-     */
-    public DB getAdapter()
-    {
-        return adapter;
-    }
-
-    /**
-     * Sets the adapter for this database.
-     *
-     * @param adapter The adapter for this database, or null to remove the 
-     *        current adapter from this database.
-     */
-    public void setAdapter(DB adapter)
-    {
-        this.adapter = adapter;
-    }
-
-    /**
-     * Returns the database map for this database.
-     * If the database map does not exist yet, it is created by this method.
-     */
-    public synchronized DatabaseMap getDatabaseMap()
-    {
-        if (databaseMap == null)
-        {
-            databaseMap = new DatabaseMap(name);
-        }
-        return databaseMap;
-    }
-
-    /**
-     * Returns the DataSourceFactory for this database. 
-     * The DataSourceFactory is responsible to create connections 
-     * to this database.
-     * 
-     * @return the DataSourceFactory for this database, or null if no 
-     *         DataSourceFactory exists for this database.
-     */
-    public DataSourceFactory getDataSourceFactory()
-    {
-        return dataSourceFactory;
-    }
-
-    /**
-     * Sets the DataSourceFactory for this database.
-     * The DataSourceFactory is responsible to create connections
-     * to this database.
-     * 
-     * @param dataSourceFactory The new DataSorceFactory for this database,
-     *        or null to remove the current DataSourceFactory.
-     */
-    public void setDataSourceFactory(DataSourceFactory dataSourceFactory)
-    {
-        this.dataSourceFactory = dataSourceFactory;
-    }
-    
-    /**
-     * Get the IDBroker for this database.
-     *
-     * @return The IDBroker for this database, or null if no IdBroker has 
-     *         been started for this database.
-     */
-    public IDBroker getIDBroker()
-    {
-        if (databaseMap == null)
-        {
-            return null;
-        }
-        return databaseMap.getIDBroker();
-    }
-    
-    /**
-     * Creates the IDBroker for this DatabaseMap and starts it for the 
-     * given database.
-     * The information about the IdTable is stored in the databaseMap.
-     * If an IDBroker already exists for the DatabaseMap, the method 
-     * does nothing.
-     *
-     * @return true if a new IDBroker was created, false otherwise. 
-     */
-    public synchronized boolean startIDBroker()
-    {
-        DatabaseMap databaseMap = getDatabaseMap();
-        if (databaseMap.getIDBroker() != null)
-        {
-            return false;
-        }
-        return databaseMap.startIdBroker();
-    }
-
-    /**
-     * Returns the IdGenerator of the given type for this Database.
-     * @param type The type (i.e.name) of the IdGenerator
-     * @return The IdGenerator of the requested type, or null if no IdGenerator
-     *         exists for the requested type.
-     */
-    public IdGenerator getIdGenerator(String type)
-    {
-        if (databaseMap == null)
-        {
-            return null;
-        }
-        return databaseMap.getIdGenerator(type);
-    }
-
-    /**
-     * Adds an IdGenerator to the database.
-     * @param type The type of the IdGenerator
-     * @param idGen The new IdGenerator for the type, or null
-     *        to remove the IdGenerator of the given type.
-     */
-    public void addIdGenerator(String type, IdGenerator idGen)
-    {
-        getDatabaseMap().addIdGenerator(type, idGen);
-    }
-
-    /**
-     * Returns the database schema for this Database.
-     * @return the database schema for this database, or null if no schema
-     *         has been set.
-     */
-    public String getSchema()
-    {
-        DataSourceFactory dsf = getDataSourceFactory();
-        if (dsf == null)
-        {
-            return null;
-        }
-        return dsf.getSchema();
-    }
-    
-    /**
-     * Sets the schema for this database. 
-     * @param schema the name of the database schema to set, or null to remove
-     *        the current schema.
-     * @throws NullPointerException if no DatasourceFactory exists for this 
-     *         database.
-     */
-    public void setSchema(String schema)
-    {
-        getDataSourceFactory().setSchema(schema);
-    }
-}
\ No newline at end of file
+package org.apache.torque;
+
+/*
+ * Copyright 2001-2006 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 org.apache.torque.adapter.DB;
+import org.apache.torque.dsfactory.DataSourceFactory;
+import org.apache.torque.map.DatabaseMap;
+import org.apache.torque.oid.IDBroker;
+import org.apache.torque.oid.IdGenerator;
+
+/**
+ * Bundles all information about a database. This includes the database adapter,
+ * the database Map and the Data Source Factory.
+ */
+public class Database
+{
+    /**
+     * The name of the database. Must be the same as the key in Torque's
+     * databaseMap.
+     */
+    private String name;
+
+    /**
+     * The Database adapter which encapsulates database-specific peculiarities.
+     */
+    private DB adapter;
+
+    /**
+     * the Map of this database.
+     */
+    private DatabaseMap databaseMap;
+
+    /**
+     * The DataSourceFactory to optain connections to this database.
+     */
+    private DataSourceFactory dataSourceFactory;
+
+    /**
+     * Creates a new Database with the given name.
+     *
+     * @param aName the name of the database, not null.
+     */
+    Database(String aName)
+    {
+        this.name = aName;
+    }
+
+    /**
+     * returns the name of the database.
+     *
+     * @return the name of the database. May be null.
+     */
+    public String getName()
+    {
+        return name;
+    }
+
+    /**
+     * Returns the adapther to this database.
+     *
+     * @return the adapter to this database, or null if no adapter is set.
+     */
+    public DB getAdapter()
+    {
+        return adapter;
+    }
+
+    /**
+     * Sets the adapter for this database.
+     *
+     * @param anAdapter The adapter for this database, or null to remove the
+     *        current adapter from this database.
+     */
+    public void setAdapter(DB anAdapter)
+    {
+        this.adapter = anAdapter;
+    }
+
+    /**
+     * Returns the database map for this database.
+     * If the database map does not exist yet, it is created by this method.
+     */
+    public synchronized DatabaseMap getDatabaseMap()
+    {
+        if (databaseMap == null)
+        {
+            databaseMap = new DatabaseMap(name);
+        }
+        return databaseMap;
+    }
+
+    /**
+     * Returns the DataSourceFactory for this database.
+     * The DataSourceFactory is responsible to create connections
+     * to this database.
+     *
+     * @return the DataSourceFactory for this database, or null if no
+     *         DataSourceFactory exists for this database.
+     */
+    public DataSourceFactory getDataSourceFactory()
+    {
+        return dataSourceFactory;
+    }
+
+    /**
+     * Sets the DataSourceFactory for this database.
+     * The DataSourceFactory is responsible to create connections
+     * to this database.
+     *
+     * @param aDataSourceFactory The new DataSorceFactory for this database,
+     *        or null to remove the current DataSourceFactory.
+     */
+    public void setDataSourceFactory(DataSourceFactory aDataSourceFactory)
+    {
+        this.dataSourceFactory = aDataSourceFactory;
+    }
+
+    /**
+     * Get the IDBroker for this database.
+     *
+     * @return The IDBroker for this database, or null if no IdBroker has
+     *         been started for this database.
+     */
+    public IDBroker getIDBroker()
+    {
+        if (databaseMap == null)
+        {
+            return null;
+        }
+        return databaseMap.getIDBroker();
+    }
+
+    /**
+     * Creates the IDBroker for this DatabaseMap and starts it for the
+     * given database.
+     * The information about the IdTable is stored in the databaseMap.
+     * If an IDBroker already exists for the DatabaseMap, the method
+     * does nothing.
+     *
+     * @return true if a new IDBroker was created, false otherwise.
+     */
+    public synchronized boolean startIDBroker()
+    {
+        DatabaseMap databaseMap = getDatabaseMap();
+        if (databaseMap.getIDBroker() != null)
+        {
+            return false;
+        }
+        return databaseMap.startIdBroker();
+    }
+
+    /**
+     * Returns the IdGenerator of the given type for this Database.
+     * @param type The type (i.e.name) of the IdGenerator
+     * @return The IdGenerator of the requested type, or null if no IdGenerator
+     *         exists for the requested type.
+     */
+    public IdGenerator getIdGenerator(String type)
+    {
+        if (databaseMap == null)
+        {
+            return null;
+        }
+        return databaseMap.getIdGenerator(type);
+    }
+
+    /**
+     * Adds an IdGenerator to the database.
+     * @param type The type of the IdGenerator
+     * @param idGen The new IdGenerator for the type, or null
+     *        to remove the IdGenerator of the given type.
+     */
+    public void addIdGenerator(String type, IdGenerator idGen)
+    {
+        getDatabaseMap().addIdGenerator(type, idGen);
+    }
+
+    /**
+     * Returns the database schema for this Database.
+     * @return the database schema for this database, or null if no schema
+     *         has been set.
+     */
+    public String getSchema()
+    {
+        DataSourceFactory dsf = getDataSourceFactory();
+        if (dsf == null)
+        {
+            return null;
+        }
+        return dsf.getSchema();
+    }
+
+    /**
+     * Sets the schema for this database.
+     * @param schema the name of the database schema to set, or null to remove
+     *        the current schema.
+     * @throws NullPointerException if no DatasourceFactory exists for this
+     *         database.
+     */
+    public void setSchema(String schema)
+    {
+        getDataSourceFactory().setSchema(schema);
+    }
+}

Modified: db/torque/runtime/trunk/src/java/org/apache/torque/NoRowsException.java
URL: http://svn.apache.org/viewvc/db/torque/runtime/trunk/src/java/org/apache/torque/NoRowsException.java?view=diff&rev=466087&r1=466086&r2=466087
==============================================================================
--- db/torque/runtime/trunk/src/java/org/apache/torque/NoRowsException.java (original)
+++ db/torque/runtime/trunk/src/java/org/apache/torque/NoRowsException.java Fri Oct 20 05:20:01 2006
@@ -1,7 +1,7 @@
 package org.apache.torque;
 
 /*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Copyright 2001-2006 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/torque/runtime/trunk/src/java/org/apache/torque/TooManyRowsException.java
URL: http://svn.apache.org/viewvc/db/torque/runtime/trunk/src/java/org/apache/torque/TooManyRowsException.java?view=diff&rev=466087&r1=466086&r2=466087
==============================================================================
--- db/torque/runtime/trunk/src/java/org/apache/torque/TooManyRowsException.java (original)
+++ db/torque/runtime/trunk/src/java/org/apache/torque/TooManyRowsException.java Fri Oct 20 05:20:01 2006
@@ -1,7 +1,7 @@
 package org.apache.torque;
 
 /*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Copyright 2001-2006 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/torque/runtime/trunk/src/java/org/apache/torque/Torque.java
URL: http://svn.apache.org/viewvc/db/torque/runtime/trunk/src/java/org/apache/torque/Torque.java?view=diff&rev=466087&r1=466086&r2=466087
==============================================================================
--- db/torque/runtime/trunk/src/java/org/apache/torque/Torque.java (original)
+++ db/torque/runtime/trunk/src/java/org/apache/torque/Torque.java Fri Oct 20 05:20:01 2006
@@ -1,7 +1,7 @@
 package org.apache.torque;
 
 /*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Copyright 2001-2006 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.
@@ -46,7 +46,7 @@
     public static final String TORQUE_KEY = "torque";
 
     /**
-     * The prefix for configuring the database adapters 
+     * The prefix for configuring the database adapters
      * and the default database.
      */
     public static final String DATABASE_KEY = "database";
@@ -117,7 +117,7 @@
      *
      * @param instance Our singleton.
      */
-    public synchronized static void setInstance(TorqueInstance instance)
+    public static synchronized void setInstance(TorqueInstance instance)
     {
         torqueSingleton = instance;
     }
@@ -363,13 +363,13 @@
     {
         return getInstance().getSchema(name);
     }
-    
+
     /**
      * Returns the database for the given key.
      *
      * @param name The database name.
      * @return the Database for the given name, or null if no database exists
-     *         for the given name. 
+     *         for the given name.
      * @throws TorqueException if Torque is not yet initialized.
      */
     public static Database getDatabase(String name) throws TorqueException
@@ -379,15 +379,15 @@
 
     /**
      * Returns a Map containing all Databases registered to Torque.
-     * The key of the Map is the name of the database, and the value is the 
+     * The key of the Map is the name of the database, and the value is the
      * database instance. <br/>
-     * Note that in the very special case where a new database which 
-     * is not configured in Torque's configuration gets known to Torque 
+     * Note that in the very special case where a new database which
+     * is not configured in Torque's configuration gets known to Torque
      * at a later time, the returned map may change, and there is no way to
      * protect you against this. However, Databases should be initialized
      * in the init() method, so this will not happen if Torque is used
      * properly.
-     * 
+     *
      * @return a Map containing all Databases known to Torque, never null.
      * @throws TorqueException if Torque is not yet initialized.
      */
@@ -395,4 +395,4 @@
     {
         return getInstance().getDatabases();
     }
-}
\ No newline at end of file
+}

Modified: db/torque/runtime/trunk/src/java/org/apache/torque/TorqueException.java
URL: http://svn.apache.org/viewvc/db/torque/runtime/trunk/src/java/org/apache/torque/TorqueException.java?view=diff&rev=466087&r1=466086&r2=466087
==============================================================================
--- db/torque/runtime/trunk/src/java/org/apache/torque/TorqueException.java (original)
+++ db/torque/runtime/trunk/src/java/org/apache/torque/TorqueException.java Fri Oct 20 05:20:01 2006
@@ -1,7 +1,7 @@
 package org.apache.torque;
 
 /*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Copyright 2001-2006 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/torque/runtime/trunk/src/java/org/apache/torque/TorqueInstance.java
URL: http://svn.apache.org/viewvc/db/torque/runtime/trunk/src/java/org/apache/torque/TorqueInstance.java?view=diff&rev=466087&r1=466086&r2=466087
==============================================================================
--- db/torque/runtime/trunk/src/java/org/apache/torque/TorqueInstance.java (original)
+++ db/torque/runtime/trunk/src/java/org/apache/torque/TorqueInstance.java Fri Oct 20 05:20:01 2006
@@ -66,11 +66,11 @@
 
     /** The db name that is specified as the default in the property file */
     private String defaultDBName = null;
-    
-    /** 
+
+    /**
      * The Map which contains all known databases. All iterations over the map
      * and other operations where the databaase map needs to stay
-     * in a defined state must be synchronized to this map. 
+     * in a defined state must be synchronized to this map.
      */
     private Map databases = Collections.synchronizedMap(new HashMap());
 
@@ -82,13 +82,13 @@
 
     /** flag to set to true once this class has been initialized */
     private boolean isInit = false;
-    
-    /** 
+
+    /**
      * a flag which indicates whether the DataSourceFactory in the database
      * named <code>DEFAULT</code> is a reference to another
-     * DataSourceFactory. This is important to know when closing the 
-     * DataSourceFactories on shutdown(); 
-     */ 
+     * DataSourceFactory. This is important to know when closing the
+     * DataSourceFactories on shutdown();
+     */
     private boolean defaultDsfIsReference = false;
 
     /**
@@ -170,7 +170,7 @@
 
 
     /**
-     * Initializes the name of the default database and 
+     * Initializes the name of the default database and
      * associates the database with the name <code>DEFAULT_NAME</code>
      * to the default database.
      *
@@ -178,7 +178,7 @@
      *        of the properties file.
      * @throws TorqueException if the appropriate key is not set.
      */
-    private final void initDefaultDbName(Configuration conf)
+    private void initDefaultDbName(Configuration conf)
             throws TorqueException
     {
         // Determine default database name.
@@ -203,7 +203,7 @@
 
     /**
      * Reads the adapter settings from the configuration and
-     * assigns the appropriate database adapters and Id Generators 
+     * assigns the appropriate database adapters and Id Generators
      * to the databases.
      *
      * @param conf the Configuration representing the torque section of the
@@ -211,7 +211,7 @@
      * @throws TorqueException Any exceptions caught during processing will be
      *         rethrown wrapped into a TorqueException.
      */
-    private final void initAdapters(Configuration conf)
+    private void initAdapters(Configuration conf)
             throws TorqueException
     {
         log.debug("initAdapters(" + conf + ")");
@@ -231,7 +231,7 @@
 
         try
         {
-            for (Iterator it = c.getKeys(); it.hasNext(); )
+            for (Iterator it = c.getKeys(); it.hasNext();)
             {
                 String key = (String) it.next();
                 if (key.endsWith(DB.ADAPTER_KEY)
@@ -239,11 +239,11 @@
                 {
                     String adapter = c.getString(key);
                     String handle = key.substring(0, key.indexOf('.'));
-                    
+
                     DB db;
-                    
+
                     db = DBFactory.create(adapter);
-                    
+
                     // Not supported, try manually defined adapter class
                     if (db == null)
                     {
@@ -252,20 +252,20 @@
                     }
 
                     Database database = getOrCreateDatabase(handle);
-                    
+
                     // register the adapter for this name
                     database.setAdapter(db);
-                    log.debug("Adding " + adapter + " -> " 
+                    log.debug("Adding " + adapter + " -> "
                             + handle + " as Adapter");
-                    
+
                     // add Id generators
-                    
+
                     // first make sure that the dtabaseMap exists for the name
                     // as the idGenerators are still stored in the database map
                     // TODO: change when the idGenerators are stored in the
                     // database
                     getDatabaseMap(handle);
-                    for (int i = 0; 
+                    for (int i = 0;
                             i < IDGeneratorFactory.ID_GENERATOR_METHODS.length;
                             i++)
                     {
@@ -289,7 +289,7 @@
         }
 
         // check that at least the default database has got an adapter.
-        Database defaultDatabase 
+        Database defaultDatabase
                 = (Database) databases.get(Torque.getDefaultDB());
         if (defaultDatabase == null
             || defaultDatabase.getAdapter() == null)
@@ -312,11 +312,11 @@
     /**
      * Reads the settings for the DataSourceFactories from the configuration
      * and creates and/or cinfigures the DataSourceFactories for the databases.
-     * If no DataSorceFactory is assigned to the database with the name 
-     * <code>DEFAULT_NAME</code>, a reference to the DataSourceFactory 
-     * of the default daztabase is made from the database with the name 
+     * If no DataSorceFactory is assigned to the database with the name
+     * <code>DEFAULT_NAME</code>, a reference to the DataSourceFactory
+     * of the default daztabase is made from the database with the name
      * <code>DEFAULT_NAME</code>.
-     *  
+     *
      * @param conf the Configuration representing the properties file
      * @throws TorqueException Any exceptions caught during processing will be
      *         rethrown wrapped into a TorqueException.
@@ -355,7 +355,7 @@
                             (DataSourceFactory) dsfClass.newInstance();
                     dsf.initialize(c.subset(handle));
 
-                    Database database = getOrCreateDatabase(handle);                    
+                    Database database = getOrCreateDatabase(handle);
                     database.setDataSourceFactory(dsf);
                 }
             }
@@ -371,9 +371,9 @@
             throw new TorqueException(e);
         }
 
-        Database defaultDatabase 
+        Database defaultDatabase
                 = (Database) databases.get(defaultDBName);
-        if (defaultDatabase == null 
+        if (defaultDatabase == null
             || defaultDatabase.getDataSourceFactory() == null)
         {
             String error = "Invalid configuration : "
@@ -405,7 +405,7 @@
         //
 
         {
-            Database databaseInfoForKeyDefault 
+            Database databaseInfoForKeyDefault
                     = getOrCreateDatabase(DEFAULT_NAME);
             if ((!defaultDBName.equals(DEFAULT_NAME))
                 && databaseInfoForKeyDefault.getDataSourceFactory() == null)
@@ -567,7 +567,7 @@
     /**
      * Sets the configuration for Torque and all dependencies.
      * The prefix <code>TORQUE_KEY</code> needs to be removed from the
-     * configuration keys for the provided configuration. 
+     * configuration keys for the provided configuration.
      *
      * @param conf the Configuration.
      */
@@ -655,7 +655,7 @@
         {
             for (Iterator it = databases.values().iterator(); it.hasNext();)
             {
-                Database database = (Database) it.next();               
+                Database database = (Database) it.next();
                 IDBroker idBroker = database.getIDBroker();
                 if (idBroker != null)
                 {
@@ -663,7 +663,7 @@
                 }
             }
         }
-        
+
         // shut down the data source factories
         TorqueException exception = null;
         synchronized (databases)
@@ -671,22 +671,22 @@
             for (Iterator it = databases.keySet().iterator(); it.hasNext();)
             {
                 Object databaseKey = it.next();
-    
+
                 Database database
                         = (Database) databases.get(databaseKey);
                 if (DEFAULT_NAME.equals(databaseKey) && defaultDsfIsReference)
                 {
                     // the DataSourceFactory of the database with the name
-                    // DEFAULT_NAME is just a reference to aynother entry. 
-                    // Do not close because this leads to closing 
+                    // DEFAULT_NAME is just a reference to aynother entry.
+                    // Do not close because this leads to closing
                     // the same DataSourceFactory twice.
                     database.setDataSourceFactory(null);
                     break;
                 }
-    
+
                 try
                 {
-                    DataSourceFactory dataSourceFactory 
+                    DataSourceFactory dataSourceFactory
                             = database.getDataSourceFactory();
                     if (dataSourceFactory != null)
                     {
@@ -701,7 +701,7 @@
                             e);
                     if (exception == null)
                     {
-                    	exception = e;
+                        exception = e;
                     }
                 }
             }
@@ -783,12 +783,12 @@
     }
 
     /**
-     * Returns a database connection to the database with the key 
+     * Returns a database connection to the database with the key
      * <code>name</code>.
      * @param name The database name.
      * @return a database connection, never null.
-     * @throws TorqueException If no DataSourceFactory is configured for the 
-     *         named database, the connection information is wrong, or the 
+     * @throws TorqueException If no DataSourceFactory is configured for the
+     *         named database, the connection information is wrong, or the
      *         connection cannot be returned for any other reason.
      */
     public Connection getConnection(String name)
@@ -801,19 +801,19 @@
                     .getDataSource()
                     .getConnection();
         }
-        catch(SQLException se)
+        catch (SQLException se)
         {
             throw new TorqueException(se);
         }
     }
 
     /**
-     * Returns the DataSourceFactory for the database with the name 
+     * Returns the DataSourceFactory for the database with the name
      * <code>name</code>.
      *
      * @param name The name of the database to get the DSF for.
      * @return A DataSourceFactory object, never null.
-     * @throws TorqueException if Torque is not initiliaized, or 
+     * @throws TorqueException if Torque is not initiliaized, or
      *         no DatasourceFactory is configured for the given name.
      */
     public DataSourceFactory getDataSourceFactory(String name)
@@ -821,7 +821,7 @@
     {
         Database database = getDatabase(name);
 
-    	DataSourceFactory dsf = null;
+        DataSourceFactory dsf = null;
         if (database != null)
         {
             dsf = database.getDataSourceFactory();
@@ -858,7 +858,7 @@
             return getDataSourceFactory(name)
                     .getDataSource().getConnection(username, password);
         }
-        catch(SQLException se)
+        catch (SQLException se)
         {
             throw new TorqueException(se);
         }
@@ -950,7 +950,7 @@
 
     /**
      * Returns the database for the key <code>databaseName</code>.
-     * 
+     *
      * @param databaseName the key to get the database for.
      * @return the database for the specified key, or null if the database
      *         does not exist.
@@ -964,16 +964,16 @@
         }
         return (Database) databases.get(databaseName);
     }
-    
+
     /**
      * Returns a Map containing all Databases registered to Torque.
-     * The key of the Map is the name of the database, and the value is the 
+     * The key of the Map is the name of the database, and the value is the
      * database instance. <br/>
-     * Note that in the very special case where a new database which 
-     * is not configured in Torque's configuration gets known to Torque 
+     * Note that in the very special case where a new database which
+     * is not configured in Torque's configuration gets known to Torque
      * at a later time, the returned map may change, and there is no way to
      * protect you against this.
-     * 
+     *
      * @return a Map containing all Databases known to Torque, never null.
      * @throws TorqueException if Torque is not yet initialized.
      */
@@ -985,7 +985,7 @@
         }
         return Collections.unmodifiableMap(databases);
     }
-    
+
     /**
      * Returns the database for the key <code>databaseName</code>.
      * If no database is associated to the specified key,
@@ -1003,7 +1003,7 @@
             if (result == null)
             {
                 result = new Database(databaseName);
-                databases.put(databaseName, result);                
+                databases.put(databaseName, result);
             }
             return result;
         }

Modified: db/torque/runtime/trunk/src/java/org/apache/torque/TorqueRuntimeException.java
URL: http://svn.apache.org/viewvc/db/torque/runtime/trunk/src/java/org/apache/torque/TorqueRuntimeException.java?view=diff&rev=466087&r1=466086&r2=466087
==============================================================================
--- db/torque/runtime/trunk/src/java/org/apache/torque/TorqueRuntimeException.java (original)
+++ db/torque/runtime/trunk/src/java/org/apache/torque/TorqueRuntimeException.java Fri Oct 20 05:20:01 2006
@@ -1,7 +1,7 @@
 package org.apache.torque;
 
 /*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Copyright 2001-2006 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/torque/runtime/trunk/src/java/org/apache/torque/adapter/AbstractDBAdapter.java
URL: http://svn.apache.org/viewvc/db/torque/runtime/trunk/src/java/org/apache/torque/adapter/AbstractDBAdapter.java?view=diff&rev=466087&r1=466086&r2=466087
==============================================================================
--- db/torque/runtime/trunk/src/java/org/apache/torque/adapter/AbstractDBAdapter.java (original)
+++ db/torque/runtime/trunk/src/java/org/apache/torque/adapter/AbstractDBAdapter.java Fri Oct 20 05:20:01 2006
@@ -1,7 +1,7 @@
 package org.apache.torque.adapter;
 
 /*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Copyright 2001-2006 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.
@@ -177,7 +177,7 @@
      * @param query The query to modify
      * @param offset the offset Value
      * @param limit the limit Value
-     * 
+     *
      * @throws TorqueException if any error occurs when building the query
      */
     public void generateLimits(Query query, int offset, int limit)
@@ -207,7 +207,7 @@
      * limiting the size of the resultset.
      *
      * @return The limit style for the database.
-     * @deprecated This should not be exposed to the outside     
+     * @deprecated This should not be exposed to the outside
      */
     public int getLimitStyle()
     {
@@ -246,4 +246,4 @@
     {
         return (Boolean.TRUE.equals(b) ? "1" : "0");
     }
-}
\ No newline at end of file
+}

Modified: db/torque/runtime/trunk/src/java/org/apache/torque/adapter/DB.java
URL: http://svn.apache.org/viewvc/db/torque/runtime/trunk/src/java/org/apache/torque/adapter/DB.java?view=diff&rev=466087&r1=466086&r2=466087
==============================================================================
--- db/torque/runtime/trunk/src/java/org/apache/torque/adapter/DB.java (original)
+++ db/torque/runtime/trunk/src/java/org/apache/torque/adapter/DB.java Fri Oct 20 05:20:01 2006
@@ -1,7 +1,7 @@
 package org.apache.torque.adapter;
 
 /*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Copyright 2001-2006 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.
@@ -26,7 +26,7 @@
 
 /**
  * <code>DB</code> defines the interface for a Torque database
- * adapter.  Support for new databases is added by implementing this 
+ * adapter.  Support for new databases is added by implementing this
  * interface. A couple of default settings is provided by
  * subclassing <code>AbstractDBAdapter</code>. The new database adapter
  * and its corresponding JDBC driver need to be registered in the service
@@ -59,45 +59,45 @@
  */
 public interface DB extends Serializable, IDMethod
 {
-    /** Database does not support limiting result sets. 
-     *  @deprecated This should not be exposed to the outside     
+    /** Database does not support limiting result sets.
+     *  @deprecated This should not be exposed to the outside
      */
-    public static final int LIMIT_STYLE_NONE = 0;
+    int LIMIT_STYLE_NONE = 0;
 
-    /** <code>SELECT ... LIMIT <limit>, [&lt;offset&gt;]</code> 
-     *  @deprecated This should not be exposed to the outside     
+    /** <code>SELECT ... LIMIT <limit>, [&lt;offset&gt;]</code>
+     *  @deprecated This should not be exposed to the outside
      */
-    public static final int LIMIT_STYLE_POSTGRES = 1;
+    int LIMIT_STYLE_POSTGRES = 1;
 
-    /** <code>SELECT ... LIMIT [<offset>, ] &lt;offset&gt;</code> 
-     *  @deprecated This should not be exposed to the outside     
+    /** <code>SELECT ... LIMIT [<offset>, ] &lt;offset&gt;</code>
+     *  @deprecated This should not be exposed to the outside
      */
-    public static final int LIMIT_STYLE_MYSQL = 2;
+    int LIMIT_STYLE_MYSQL = 2;
 
-    /** <code>SET ROWCOUNT &lt;offset&gt; SELECT ... SET ROWCOUNT 0</code> 
-     *  @deprecated This should not be exposed to the outside     
+    /** <code>SET ROWCOUNT &lt;offset&gt; SELECT ... SET ROWCOUNT 0</code>
+     *  @deprecated This should not be exposed to the outside
      */
-    public static final int LIMIT_STYLE_SYBASE = 3;
+    int LIMIT_STYLE_SYBASE = 3;
 
-    /** <code><pre>SELECT ... WHERE ... AND ROWNUM < <limit></pre></code> 
-     *  @deprecated This should not be exposed to the outside     
+    /** <code><pre>SELECT ... WHERE ... AND ROWNUM < <limit></pre></code>
+     *  @deprecated This should not be exposed to the outside
      */
-    public static final int LIMIT_STYLE_ORACLE = 4;
+    int LIMIT_STYLE_ORACLE = 4;
 
-    /** <code><pre>SELECT ... WHERE ... AND ROW_NUMBER() OVER() < <limit></pre></code> 
-     *  @deprecated This should not be exposed to the outside     
+    /** <code><pre>SELECT ... WHERE ... AND ROW_NUMBER() OVER() < <limit></pre></code>
+     *  @deprecated This should not be exposed to the outside
      */
-    public static final int LIMIT_STYLE_DB2 = 5;
+    int LIMIT_STYLE_DB2 = 5;
 
-	/**
-	 * Key for the configuration which contains database adapters.
-	 */
-	public static final String ADAPTER_KEY = "adapter";
+    /**
+     * Key for the configuration which contains database adapters.
+     */
+    String ADAPTER_KEY = "adapter";
 
     /**
      * Key for the configuration which contains database drivers.
      */
-    public static final String DRIVER_KEY = "driver";
+    String DRIVER_KEY = "driver";
 
     /**
      * This method is used to ignore case.
@@ -105,7 +105,7 @@
      * @param in The string to transform to upper case.
      * @return The upper case string.
      */
-    public String toUpperCase(String in);
+    String toUpperCase(String in);
 
     /**
      * Returns the character used to indicate the beginning and end of
@@ -114,7 +114,7 @@
      *
      * @return The text delimeter.
      */
-    public char getStringDelimiter();
+    char getStringDelimiter();
 
     /**
      * Returns the constant from the {@link
@@ -123,7 +123,7 @@
      *
      * @return IDMethod constant
      */
-    public String getIDMethodType();
+    String getIDMethodType();
 
     /**
      * Returns SQL used to get the most recently inserted primary key.
@@ -133,7 +133,7 @@
      * @param obj Information used for key generation.
      * @return The most recently inserted database key.
      */
-    public String getIDMethodSQL(Object obj);
+    String getIDMethodSQL(Object obj);
 
     /**
      * Locks the specified table.
@@ -142,7 +142,7 @@
      * @param table The name of the table to lock.
      * @throws SQLException No Statement could be created or executed.
      */
-    public void lockTable(Connection con, String table)
+    void lockTable(Connection con, String table)
             throws SQLException;
 
     /**
@@ -152,7 +152,7 @@
      * @param table The name of the table to unlock.
      * @throws SQLException No Statement could be created or executed.
      */
-    public void unlockTable(Connection con, String table)
+    void unlockTable(Connection con, String table)
             throws SQLException;
 
     /**
@@ -161,7 +161,7 @@
      * @param in The string whose case to ignore.
      * @return The string in a case that can be ignored.
      */
-    public String ignoreCase(String in);
+    String ignoreCase(String in);
 
     /**
      * This method is used to ignore case in an ORDER BY clause.
@@ -172,7 +172,7 @@
      * @param in The string whose case to ignore.
      * @return The string in a case that can be ignored.
      */
-    public String ignoreCaseInOrderBy(String in);
+    String ignoreCaseInOrderBy(String in);
 
     /**
      * This method is used to check whether the database natively
@@ -181,7 +181,7 @@
      * @return True if the database natively supports limiting the
      * size of the resultset.
      */
-    public boolean supportsNativeLimit();
+    boolean supportsNativeLimit();
 
     /**
      * This method is used to check whether the database natively
@@ -191,7 +191,7 @@
      * @return True if the database natively supports returning
      * results starting at an offset position other than 0.
      */
-    public boolean supportsNativeOffset();
+    boolean supportsNativeOffset();
 
     /**
      * This method is used to generate the database specific query
@@ -200,10 +200,10 @@
      * @param query The query to modify
      * @param offset the offset Value
      * @param limit the limit Value
-     * 
+     *
      * @throws TorqueException if any error occurs when building the query
      */
-    public void generateLimits(Query query, int offset, int limit)
+    void generateLimits(Query query, int offset, int limit)
         throws TorqueException;
 
     /**
@@ -214,16 +214,16 @@
     * @return true if the database needs to escape text in SqlExpressions.
     */
 
-    public boolean escapeText();
+    boolean escapeText();
 
     /**
      * This method is used to check whether the database supports
      * limiting the size of the resultset.
      *
      * @return The limit style for the database.
-     * @deprecated This should not be exposed to the outside     
+     * @deprecated This should not be exposed to the outside
      */
-    public int getLimitStyle();
+    int getLimitStyle();
 
     /**
      * This method is used to format any date string.
@@ -232,7 +232,7 @@
      * @param date the Date to format
      * @return The proper date formatted String.
      */
-    public String getDateString(Date date);
+    String getDateString(Date date);
 
     /**
      * This method is used to format a boolean string.
@@ -240,5 +240,5 @@
      * @param b the Boolean to format
      * @return The proper date formatted String.
      */
-    public String getBooleanString(Boolean b);
-}
\ No newline at end of file
+    String getBooleanString(Boolean b);
+}

Modified: db/torque/runtime/trunk/src/java/org/apache/torque/adapter/DBAxion.java
URL: http://svn.apache.org/viewvc/db/torque/runtime/trunk/src/java/org/apache/torque/adapter/DBAxion.java?view=diff&rev=466087&r1=466086&r2=466087
==============================================================================
--- db/torque/runtime/trunk/src/java/org/apache/torque/adapter/DBAxion.java (original)
+++ db/torque/runtime/trunk/src/java/org/apache/torque/adapter/DBAxion.java Fri Oct 20 05:20:01 2006
@@ -1,7 +1,7 @@
 package org.apache.torque.adapter;
 
 /*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Copyright 2001-2006 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/torque/runtime/trunk/src/java/org/apache/torque/adapter/DBCloudscape.java
URL: http://svn.apache.org/viewvc/db/torque/runtime/trunk/src/java/org/apache/torque/adapter/DBCloudscape.java?view=diff&rev=466087&r1=466086&r2=466087
==============================================================================
--- db/torque/runtime/trunk/src/java/org/apache/torque/adapter/DBCloudscape.java (original)
+++ db/torque/runtime/trunk/src/java/org/apache/torque/adapter/DBCloudscape.java Fri Oct 20 05:20:01 2006
@@ -1,7 +1,7 @@
 package org.apache.torque.adapter;
 
 /*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Copyright 2001-2006 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/torque/runtime/trunk/src/java/org/apache/torque/adapter/DBDB2400.java
URL: http://svn.apache.org/viewvc/db/torque/runtime/trunk/src/java/org/apache/torque/adapter/DBDB2400.java?view=diff&rev=466087&r1=466086&r2=466087
==============================================================================
--- db/torque/runtime/trunk/src/java/org/apache/torque/adapter/DBDB2400.java (original)
+++ db/torque/runtime/trunk/src/java/org/apache/torque/adapter/DBDB2400.java Fri Oct 20 05:20:01 2006
@@ -1,7 +1,7 @@
 package org.apache.torque.adapter;
 
 /*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Copyright 2001-2006 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/torque/runtime/trunk/src/java/org/apache/torque/adapter/DBDB2App.java
URL: http://svn.apache.org/viewvc/db/torque/runtime/trunk/src/java/org/apache/torque/adapter/DBDB2App.java?view=diff&rev=466087&r1=466086&r2=466087
==============================================================================
--- db/torque/runtime/trunk/src/java/org/apache/torque/adapter/DBDB2App.java (original)
+++ db/torque/runtime/trunk/src/java/org/apache/torque/adapter/DBDB2App.java Fri Oct 20 05:20:01 2006
@@ -112,7 +112,7 @@
      * limiting the size of the resultset.
      *
      * @return LIMIT_STYLE_DB2.
-     * @deprecated This should not be exposed to the outside     
+     * @deprecated This should not be exposed to the outside
      */
     public int getLimitStyle()
     {
@@ -163,12 +163,12 @@
         StringBuffer postLimit = new StringBuffer()
                 .append(" ) A ")
                 .append(" ) B WHERE ");
-        
+
         if (offset > 0)
         {
             postLimit.append(" B.TORQUE$ROWNUM > ")
                     .append(offset);
-        
+
             if (limit >= 0)
             {
                 postLimit.append(" AND B.TORQUE$ROWNUM <= ")
@@ -180,7 +180,7 @@
             postLimit.append(" B.TORQUE$ROWNUM <= ")
                     .append(limit);
         }
-        
+
         query.setPreLimit(preLimit.toString());
         query.setPostLimit(postLimit.toString());
         query.setLimit(null);

Modified: db/torque/runtime/trunk/src/java/org/apache/torque/adapter/DBDerby.java
URL: http://svn.apache.org/viewvc/db/torque/runtime/trunk/src/java/org/apache/torque/adapter/DBDerby.java?view=diff&rev=466087&r1=466086&r2=466087
==============================================================================
--- db/torque/runtime/trunk/src/java/org/apache/torque/adapter/DBDerby.java (original)
+++ db/torque/runtime/trunk/src/java/org/apache/torque/adapter/DBDerby.java Fri Oct 20 05:20:01 2006
@@ -1,7 +1,7 @@
 package org.apache.torque.adapter;
 
 /*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Copyright 2001-2006 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.
@@ -76,9 +76,9 @@
 
     /**
      * Returns the SQL to get the database key of the last row
-     * inserted, which in this case is 
+     * inserted, which in this case is
      * <code>VALUES IDENTITY_VAL_LOCAL()</code>.
-     * 
+     *
      * @see org.apache.torque.adapter.DB#getIDMethodSQL(Object obj)
      */
     public String getIDMethodSQL(Object obj)

Modified: db/torque/runtime/trunk/src/java/org/apache/torque/adapter/DBFactory.java
URL: http://svn.apache.org/viewvc/db/torque/runtime/trunk/src/java/org/apache/torque/adapter/DBFactory.java?view=diff&rev=466087&r1=466086&r2=466087
==============================================================================
--- db/torque/runtime/trunk/src/java/org/apache/torque/adapter/DBFactory.java (original)
+++ db/torque/runtime/trunk/src/java/org/apache/torque/adapter/DBFactory.java Fri Oct 20 05:20:01 2006
@@ -1,7 +1,7 @@
 package org.apache.torque.adapter;
 
 /*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Copyright 2001-2006 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.
@@ -47,7 +47,7 @@
         adapters.put("COM.ibm.db2.jdbc.app.DB2Driver", DBDB2App.class);
         adapters.put("COM.ibm.db2.jdbc.net.DB2Driver", DBDB2Net.class);
         adapters.put("COM.cloudscape.core.JDBCDriver", DBCloudscape.class);
-        adapters.put("org.firebirdsql.jdbc.FBDriver",DBFirebird.class);
+        adapters.put("org.firebirdsql.jdbc.FBDriver", DBFirebird.class);
         adapters.put("org.hsql.jdbcDriver", DBHypersonicSQL.class);
         adapters.put("org.hsqldb.jdbcDriver", DBHypersonicSQL.class);
         adapters.put("interbase.interclient.Driver", DBInterbase.class);
@@ -103,7 +103,7 @@
      * @param key The fully-qualified name of the JDBC driver
      *        or a shorter form adapter key.
      * @return An instance of a Torque database adapter, or null if
-     *         no adapter exists for the given key. 
+     *         no adapter exists for the given key.
      * @throws InstantiationException throws if the adapter could not be
      *         instantiated
      */
@@ -147,7 +147,7 @@
         throws InstantiationException
     {
         Class adapterClass;
-        
+
         try
         {
             adapterClass = (Class) Class.forName(className);
@@ -155,7 +155,7 @@
         catch (ClassNotFoundException e)
         {
             throw new InstantiationException(
-                    "Could not find adapter " 
+                    "Could not find adapter "
                     + className
                     + " for key "
                     + key

Modified: db/torque/runtime/trunk/src/java/org/apache/torque/adapter/DBFirebird.java
URL: http://svn.apache.org/viewvc/db/torque/runtime/trunk/src/java/org/apache/torque/adapter/DBFirebird.java?view=diff&rev=466087&r1=466086&r2=466087
==============================================================================
--- db/torque/runtime/trunk/src/java/org/apache/torque/adapter/DBFirebird.java (original)
+++ db/torque/runtime/trunk/src/java/org/apache/torque/adapter/DBFirebird.java Fri Oct 20 05:20:01 2006
@@ -1,153 +1,153 @@
-package org.apache.torque.adapter;
-
-/*
- * Copyright 2001-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.sql.Connection;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.util.Date;
-import java.text.SimpleDateFormat;
-
-/**
- * This code should be used for a Firebird database pool.
- *
- * @author Joerg Friedrich
- * @version $Id: DBInterbase.java 239630 2005-08-24 12:25:32Z henning $
- */
-public class DBFirebird extends AbstractDBAdapter
-{
-    /**
-     * Serial version
-     */
-    private static final long serialVersionUID = -2782124791802056450L;
-
-    private static final String DATE_FORMAT = "yyyy-MM-dd HH:MM:ss";
-
-    /**
-     * This method is used to ignore case.
-     *
-     * @param in The string to transform to upper case.
-     * @return The upper case string.
-     */
-    public String toUpperCase(String in)
-    {
-        return new StringBuffer("UPPER(").append(in).append(")").toString();
-    }
-
-    /**
-     * This method is used to ignore case.
-     *
-     * @param in The string whose case to ignore.
-     * @return The string in a case that can be ignored.
-     */
-    public String ignoreCase(String in)
-    {
-        return new StringBuffer("UPPER(").append(in).append(")").toString();
-    }
-
-    /**
-     * This method is used to ignore case in an ORDER BY clause.
-     * Usually it is the same as ignoreCase, but some databases
-     * (Interbase for example) does not use the same SQL in ORDER BY
-     * and other clauses.
-     *
-     * @param in The string whose case to ignore.
-     * @return The string in a case that can be ignored.
-     */
-    public String ignoreCaseInOrderBy(String in)
-    {
-        return in;
-    }
-
-    /**
-     * Gets the string delimiter (usually '\'').
-     *
-     * @return The delimiter.
-     */
-    public char getStringDelimiter()
-    {
-        return '\'';
-    }
-
-    /**
-     * @see org.apache.torque.adapter.DB#getIDMethodType()
-     */
-    public String getIDMethodType()
-    {
-        return NO_ID_METHOD;
-    }
-
-    /**
-     * @see org.apache.torque.adapter.DB#getIDMethodSQL(Object obj)
-     */
-    public String getIDMethodSQL(Object obj)
-    {
-        return null;
-    }
-
-    /**
-     * Locks the specified table.
-     *
-     * @param con The JDBC connection to use.
-     * @param table The name of the table to lock.
-     * @exception SQLException No Statement could be created or executed.
-     */
-    public void lockTable(Connection con, String table) throws SQLException
-    {
-        Statement statement = con.createStatement();
-
-        StringBuffer stmt = new StringBuffer();
-        stmt.append("SET TRANSACTION ")
-                .append("ISOLATION LEVEL READ COMMITTED ")
-                .append("NO RECORD_VERSION WAIT ")
-                .append("RESERVING ")
-                .append(table)
-                .append(" FOR PROTECTED WRITE");
-
-        statement.executeQuery(stmt.toString());
-    }
-
-    /**
-     * Unlocks the specified table.
-     *
-     * @param con The JDBC connection to use.
-     * @param table The name of the table to unlock.
-     * @exception SQLException No Statement could be created or executed.
-     */
-    public void unlockTable(Connection con, String table) throws SQLException
-    {
-        // Tables in Interbase are unlocked when a commit is issued.
-        // The user may have issued a commit but do it here to be
-        // sure.
-        con.commit();
-    }
-
-
-    /**
-     * This method overrides the JDBC escapes used to format dates
-     * using a <code>DateFormat</code>.  As of version 2.0.11, the MM
-     * JDBC driver does not implement JDBC 3.0 escapes.
-     *
-     * @param date the date to format
-     * @return The properly formatted date String.
-     */
-    public String getDateString(Date date)
-    {
-        char delim = getStringDelimiter();
-        return (delim + new SimpleDateFormat(DATE_FORMAT).format(date) + delim);
-    }
-}
+package org.apache.torque.adapter;
+
+/*
+ * Copyright 2001-2006 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.sql.Connection;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.Date;
+import java.text.SimpleDateFormat;
+
+/**
+ * This code should be used for a Firebird database pool.
+ *
+ * @author Joerg Friedrich
+ * @version $Id: DBInterbase.java 239630 2005-08-24 12:25:32Z henning $
+ */
+public class DBFirebird extends AbstractDBAdapter
+{
+    /**
+     * Serial version
+     */
+    private static final long serialVersionUID = -2782124791802056450L;
+
+    private static final String DATE_FORMAT = "yyyy-MM-dd HH:MM:ss";
+
+    /**
+     * This method is used to ignore case.
+     *
+     * @param in The string to transform to upper case.
+     * @return The upper case string.
+     */
+    public String toUpperCase(String in)
+    {
+        return new StringBuffer("UPPER(").append(in).append(")").toString();
+    }
+
+    /**
+     * This method is used to ignore case.
+     *
+     * @param in The string whose case to ignore.
+     * @return The string in a case that can be ignored.
+     */
+    public String ignoreCase(String in)
+    {
+        return new StringBuffer("UPPER(").append(in).append(")").toString();
+    }
+
+    /**
+     * This method is used to ignore case in an ORDER BY clause.
+     * Usually it is the same as ignoreCase, but some databases
+     * (Interbase for example) does not use the same SQL in ORDER BY
+     * and other clauses.
+     *
+     * @param in The string whose case to ignore.
+     * @return The string in a case that can be ignored.
+     */
+    public String ignoreCaseInOrderBy(String in)
+    {
+        return in;
+    }
+
+    /**
+     * Gets the string delimiter (usually '\'').
+     *
+     * @return The delimiter.
+     */
+    public char getStringDelimiter()
+    {
+        return '\'';
+    }
+
+    /**
+     * @see org.apache.torque.adapter.DB#getIDMethodType()
+     */
+    public String getIDMethodType()
+    {
+        return NO_ID_METHOD;
+    }
+
+    /**
+     * @see org.apache.torque.adapter.DB#getIDMethodSQL(Object obj)
+     */
+    public String getIDMethodSQL(Object obj)
+    {
+        return null;
+    }
+
+    /**
+     * Locks the specified table.
+     *
+     * @param con The JDBC connection to use.
+     * @param table The name of the table to lock.
+     * @exception SQLException No Statement could be created or executed.
+     */
+    public void lockTable(Connection con, String table) throws SQLException
+    {
+        Statement statement = con.createStatement();
+
+        StringBuffer stmt = new StringBuffer();
+        stmt.append("SET TRANSACTION ")
+                .append("ISOLATION LEVEL READ COMMITTED ")
+                .append("NO RECORD_VERSION WAIT ")
+                .append("RESERVING ")
+                .append(table)
+                .append(" FOR PROTECTED WRITE");
+
+        statement.executeQuery(stmt.toString());
+    }
+
+    /**
+     * Unlocks the specified table.
+     *
+     * @param con The JDBC connection to use.
+     * @param table The name of the table to unlock.
+     * @exception SQLException No Statement could be created or executed.
+     */
+    public void unlockTable(Connection con, String table) throws SQLException
+    {
+        // Tables in Interbase are unlocked when a commit is issued.
+        // The user may have issued a commit but do it here to be
+        // sure.
+        con.commit();
+    }
+
+
+    /**
+     * This method overrides the JDBC escapes used to format dates
+     * using a <code>DateFormat</code>.  As of version 2.0.11, the MM
+     * JDBC driver does not implement JDBC 3.0 escapes.
+     *
+     * @param date the date to format
+     * @return The properly formatted date String.
+     */
+    public String getDateString(Date date)
+    {
+        char delim = getStringDelimiter();
+        return (delim + new SimpleDateFormat(DATE_FORMAT).format(date) + delim);
+    }
+}

Modified: db/torque/runtime/trunk/src/java/org/apache/torque/adapter/DBInformix.java
URL: http://svn.apache.org/viewvc/db/torque/runtime/trunk/src/java/org/apache/torque/adapter/DBInformix.java?view=diff&rev=466087&r1=466086&r2=466087
==============================================================================
--- db/torque/runtime/trunk/src/java/org/apache/torque/adapter/DBInformix.java (original)
+++ db/torque/runtime/trunk/src/java/org/apache/torque/adapter/DBInformix.java Fri Oct 20 05:20:01 2006
@@ -1,7 +1,7 @@
 package org.apache.torque.adapter;
 
 /*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Copyright 2001-2006 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/torque/runtime/trunk/src/java/org/apache/torque/adapter/DBInstantDB.java
URL: http://svn.apache.org/viewvc/db/torque/runtime/trunk/src/java/org/apache/torque/adapter/DBInstantDB.java?view=diff&rev=466087&r1=466086&r2=466087
==============================================================================
--- db/torque/runtime/trunk/src/java/org/apache/torque/adapter/DBInstantDB.java (original)
+++ db/torque/runtime/trunk/src/java/org/apache/torque/adapter/DBInstantDB.java Fri Oct 20 05:20:01 2006
@@ -1,7 +1,7 @@
 package org.apache.torque.adapter;
 
 /*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Copyright 2001-2006 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/torque/runtime/trunk/src/java/org/apache/torque/adapter/DBInterbase.java
URL: http://svn.apache.org/viewvc/db/torque/runtime/trunk/src/java/org/apache/torque/adapter/DBInterbase.java?view=diff&rev=466087&r1=466086&r2=466087
==============================================================================
--- db/torque/runtime/trunk/src/java/org/apache/torque/adapter/DBInterbase.java (original)
+++ db/torque/runtime/trunk/src/java/org/apache/torque/adapter/DBInterbase.java Fri Oct 20 05:20:01 2006
@@ -1,7 +1,7 @@
 package org.apache.torque.adapter;
 
 /*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Copyright 2001-2006 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/torque/runtime/trunk/src/java/org/apache/torque/adapter/DBMM.java
URL: http://svn.apache.org/viewvc/db/torque/runtime/trunk/src/java/org/apache/torque/adapter/DBMM.java?view=diff&rev=466087&r1=466086&r2=466087
==============================================================================
--- db/torque/runtime/trunk/src/java/org/apache/torque/adapter/DBMM.java (original)
+++ db/torque/runtime/trunk/src/java/org/apache/torque/adapter/DBMM.java Fri Oct 20 05:20:01 2006
@@ -165,7 +165,7 @@
      * limiting the size of the resultset.
      *
      * @return LIMIT_STYLE_MYSQL.
-     * @deprecated This should not be exposed to the outside     
+     * @deprecated This should not be exposed to the outside
      */
     public int getLimitStyle()
     {

Modified: db/torque/runtime/trunk/src/java/org/apache/torque/adapter/DBMSSQL.java
URL: http://svn.apache.org/viewvc/db/torque/runtime/trunk/src/java/org/apache/torque/adapter/DBMSSQL.java?view=diff&rev=466087&r1=466086&r2=466087
==============================================================================
--- db/torque/runtime/trunk/src/java/org/apache/torque/adapter/DBMSSQL.java (original)
+++ db/torque/runtime/trunk/src/java/org/apache/torque/adapter/DBMSSQL.java Fri Oct 20 05:20:01 2006
@@ -1,7 +1,7 @@
 package org.apache.torque.adapter;
 
 /*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Copyright 2001-2006 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/torque/runtime/trunk/src/java/org/apache/torque/adapter/DBNone.java
URL: http://svn.apache.org/viewvc/db/torque/runtime/trunk/src/java/org/apache/torque/adapter/DBNone.java?view=diff&rev=466087&r1=466086&r2=466087
==============================================================================
--- db/torque/runtime/trunk/src/java/org/apache/torque/adapter/DBNone.java (original)
+++ db/torque/runtime/trunk/src/java/org/apache/torque/adapter/DBNone.java Fri Oct 20 05:20:01 2006
@@ -1,7 +1,7 @@
 package org.apache.torque.adapter;
 
 /*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Copyright 2001-2006 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/torque/runtime/trunk/src/java/org/apache/torque/adapter/DBOdbc.java
URL: http://svn.apache.org/viewvc/db/torque/runtime/trunk/src/java/org/apache/torque/adapter/DBOdbc.java?view=diff&rev=466087&r1=466086&r2=466087
==============================================================================
--- db/torque/runtime/trunk/src/java/org/apache/torque/adapter/DBOdbc.java (original)
+++ db/torque/runtime/trunk/src/java/org/apache/torque/adapter/DBOdbc.java Fri Oct 20 05:20:01 2006
@@ -1,7 +1,7 @@
 package org.apache.torque.adapter;
 
 /*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Copyright 2001-2006 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/torque/runtime/trunk/src/java/org/apache/torque/adapter/DBOracle.java
URL: http://svn.apache.org/viewvc/db/torque/runtime/trunk/src/java/org/apache/torque/adapter/DBOracle.java?view=diff&rev=466087&r1=466086&r2=466087
==============================================================================
--- db/torque/runtime/trunk/src/java/org/apache/torque/adapter/DBOracle.java (original)
+++ db/torque/runtime/trunk/src/java/org/apache/torque/adapter/DBOracle.java Fri Oct 20 05:20:01 2006
@@ -152,7 +152,7 @@
      * limiting the size of the resultset.
      *
      * @return LIMIT_STYLE_ORACLE.
-     * @deprecated This should not be exposed to the outside     
+     * @deprecated This should not be exposed to the outside
      */
     public int getLimitStyle()
     {
@@ -203,12 +203,12 @@
         StringBuffer postLimit = new StringBuffer()
                 .append(" ) A ")
                 .append(" ) B WHERE ");
-        
+
         if (offset > 0)
         {
             postLimit.append(" B.TORQUE$ROWNUM > ")
                     .append(offset);
-        
+
             if (limit >= 0)
             {
                 postLimit.append(" AND B.TORQUE$ROWNUM <= ")
@@ -220,7 +220,7 @@
             postLimit.append(" B.TORQUE$ROWNUM <= ")
                     .append(limit);
         }
-        
+
         query.setPreLimit(preLimit.toString());
         query.setPostLimit(postLimit.toString());
         query.setLimit(null);

Modified: db/torque/runtime/trunk/src/java/org/apache/torque/adapter/DBPostgres.java
URL: http://svn.apache.org/viewvc/db/torque/runtime/trunk/src/java/org/apache/torque/adapter/DBPostgres.java?view=diff&rev=466087&r1=466086&r2=466087
==============================================================================
--- db/torque/runtime/trunk/src/java/org/apache/torque/adapter/DBPostgres.java (original)
+++ db/torque/runtime/trunk/src/java/org/apache/torque/adapter/DBPostgres.java Fri Oct 20 05:20:01 2006
@@ -1,7 +1,7 @@
 package org.apache.torque.adapter;
 
 /*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Copyright 2001-2006 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.
@@ -122,7 +122,7 @@
      * limiting the size of the resultset.
      *
      * @return LIMIT_STYLE_POSTGRES.
-     * @deprecated This should not be exposed to the outside     
+     * @deprecated This should not be exposed to the outside
      */
     public int getLimitStyle()
     {

Modified: db/torque/runtime/trunk/src/java/org/apache/torque/adapter/DBSapDB.java
URL: http://svn.apache.org/viewvc/db/torque/runtime/trunk/src/java/org/apache/torque/adapter/DBSapDB.java?view=diff&rev=466087&r1=466086&r2=466087
==============================================================================
--- db/torque/runtime/trunk/src/java/org/apache/torque/adapter/DBSapDB.java (original)
+++ db/torque/runtime/trunk/src/java/org/apache/torque/adapter/DBSapDB.java Fri Oct 20 05:20:01 2006
@@ -1,7 +1,7 @@
 package org.apache.torque.adapter;
 
 /*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Copyright 2001-2006 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/torque/runtime/trunk/src/java/org/apache/torque/adapter/DBSybase.java
URL: http://svn.apache.org/viewvc/db/torque/runtime/trunk/src/java/org/apache/torque/adapter/DBSybase.java?view=diff&rev=466087&r1=466086&r2=466087
==============================================================================
--- db/torque/runtime/trunk/src/java/org/apache/torque/adapter/DBSybase.java (original)
+++ db/torque/runtime/trunk/src/java/org/apache/torque/adapter/DBSybase.java Fri Oct 20 05:20:01 2006
@@ -1,7 +1,7 @@
 package org.apache.torque.adapter;
 
 /*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Copyright 2001-2006 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.
@@ -135,7 +135,7 @@
      * limiting the size of the resultset.
      *
      * @return LIMIT_STYLE_SYBASE.
-     * @deprecated This should not be exposed to the outside     
+     * @deprecated This should not be exposed to the outside
      */
     public int getLimitStyle()
     {
@@ -157,7 +157,7 @@
      * @param query The query to modify
      * @param offset the offset Value
      * @param limit the limit Value
-     * 
+     *
      * @throws TorqueException if any error occurs when building the query
      */
     public void generateLimits(Query query, int offset, int limit)

Modified: db/torque/runtime/trunk/src/java/org/apache/torque/adapter/DBWeblogic.java
URL: http://svn.apache.org/viewvc/db/torque/runtime/trunk/src/java/org/apache/torque/adapter/DBWeblogic.java?view=diff&rev=466087&r1=466086&r2=466087
==============================================================================
--- db/torque/runtime/trunk/src/java/org/apache/torque/adapter/DBWeblogic.java (original)
+++ db/torque/runtime/trunk/src/java/org/apache/torque/adapter/DBWeblogic.java Fri Oct 20 05:20:01 2006
@@ -1,7 +1,7 @@
 package org.apache.torque.adapter;
 
 /*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Copyright 2001-2006 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/torque/runtime/trunk/src/java/org/apache/torque/adapter/IDMethod.java
URL: http://svn.apache.org/viewvc/db/torque/runtime/trunk/src/java/org/apache/torque/adapter/IDMethod.java?view=diff&rev=466087&r1=466086&r2=466087
==============================================================================
--- db/torque/runtime/trunk/src/java/org/apache/torque/adapter/IDMethod.java (original)
+++ db/torque/runtime/trunk/src/java/org/apache/torque/adapter/IDMethod.java Fri Oct 20 05:20:01 2006
@@ -1,7 +1,7 @@
 package org.apache.torque.adapter;
 
 /*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Copyright 2001-2006 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/torque/runtime/trunk/src/java/org/apache/torque/adapter/package.html
URL: http://svn.apache.org/viewvc/db/torque/runtime/trunk/src/java/org/apache/torque/adapter/package.html?view=diff&rev=466087&r1=466086&r2=466087
==============================================================================
--- db/torque/runtime/trunk/src/java/org/apache/torque/adapter/package.html (original)
+++ db/torque/runtime/trunk/src/java/org/apache/torque/adapter/package.html Fri Oct 20 05:20:01 2006
@@ -1,5 +1,5 @@
 <!--
- Copyright 2001-2005 The Apache Software Foundation.
+ Copyright 2001-2006 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/torque/runtime/trunk/src/java/org/apache/torque/avalon/Torque.java
URL: http://svn.apache.org/viewvc/db/torque/runtime/trunk/src/java/org/apache/torque/avalon/Torque.java?view=diff&rev=466087&r1=466086&r2=466087
==============================================================================
--- db/torque/runtime/trunk/src/java/org/apache/torque/avalon/Torque.java (original)
+++ db/torque/runtime/trunk/src/java/org/apache/torque/avalon/Torque.java Fri Oct 20 05:20:01 2006
@@ -1,7 +1,7 @@
 package org.apache.torque.avalon;
 
 /*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Copyright 2001-2006 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.
@@ -51,14 +51,14 @@
      *
      * @return true if Torque is already initialized
      */
-    public boolean isInit();
+    boolean isInit();
 
     /**
      * Get the configuration for this component.
      *
      * @return the Configuration
      */
-    public org.apache.commons.configuration.Configuration getConfiguration();
+    org.apache.commons.configuration.Configuration getConfiguration();
 
     /**
      * This method returns a Manager for the given name.
@@ -66,7 +66,7 @@
      * @param name name of the manager
      * @return a Manager
      */
-    public AbstractBaseManager getManager(String name);
+    AbstractBaseManager getManager(String name);
 
     /**
      * This methods returns either the Manager from the configuration file,
@@ -76,7 +76,7 @@
      * @param defaultClassName the class to use if name has not been configured
      * @return a Manager
      */
-    public AbstractBaseManager getManager(String name, String defaultClassName);
+    AbstractBaseManager getManager(String name, String defaultClassName);
 
     /**
      * Returns the default database map information.
@@ -85,7 +85,7 @@
      * @throws TorqueException Any exceptions caught during processing will be
      *         rethrown wrapped into a TorqueException.
      */
-    public DatabaseMap getDatabaseMap() throws TorqueException;
+    DatabaseMap getDatabaseMap() throws TorqueException;
 
     /**
      * Returns the database map information. Name relates to the name
@@ -97,14 +97,14 @@
      * @throws TorqueException Any exceptions caught during processing will be
      *         rethrown wrapped into a TorqueException.
      */
-    public DatabaseMap getDatabaseMap(String name) throws TorqueException;
+    DatabaseMap getDatabaseMap(String name) throws TorqueException;
 
     /**
      * Register a MapBuilder
      *
      * @param className the MapBuilder
      */
-    public void registerMapBuilder(String className);
+    void registerMapBuilder(String className);
 
     /**
      * This method returns a Connection from the default pool.
@@ -113,7 +113,7 @@
      * @throws TorqueException Any exceptions caught during processing will be
      *         rethrown wrapped into a TorqueException.
      */
-    public Connection getConnection() throws TorqueException;
+    Connection getConnection() throws TorqueException;
 
     /**
      *
@@ -122,7 +122,7 @@
      * @throws TorqueException Any exceptions caught during processing will be
      *         rethrown wrapped into a TorqueException.
      */
-    public Connection getConnection(String name) throws TorqueException;
+    Connection getConnection(String name) throws TorqueException;
 
     /**
      * This method returns a Connecton using the given parameters.
@@ -136,7 +136,7 @@
      * @throws TorqueException Any exceptions caught during processing will be
      *         rethrown wrapped into a TorqueException.
      */
-    public Connection getConnection(String name, String username, String password)
+    Connection getConnection(String name, String username, String password)
             throws TorqueException;
 
     /**
@@ -147,21 +147,21 @@
      * @throws TorqueException Any exceptions caught during processing will be
      *         rethrown wrapped into a TorqueException.
      */
-    public DB getDB(String name) throws TorqueException;
+    DB getDB(String name) throws TorqueException;
 
     /**
      * Returns the name of the default database.
      *
      * @return name of the default DB
      */
-    public String getDefaultDB();
+    String getDefaultDB();
 
     /**
      * Closes a connection.
      *
      * @param con A Connection to close.
      */
-    public void closeConnection(Connection con);
+    void closeConnection(Connection con);
 
     /**
      * Sets the current schema for a database connection
@@ -171,7 +171,7 @@
      * @throws TorqueException Any exceptions caught during processing will be
      *         rethrown wrapped into a TorqueException.
      */
-    public void setSchema(String name, String schema) throws TorqueException;
+    void setSchema(String name, String schema) throws TorqueException;
 
     /**
      * This method returns the current schema for a database connection
@@ -181,32 +181,32 @@
      * @throws TorqueException Any exceptions caught during processing will be
      *         rethrown wrapped into a TorqueException.
      */
-    public String getSchema(String name) throws TorqueException;
+    String getSchema(String name) throws TorqueException;
 
     /**
      * Returns the database for the key <code>databaseName</code>.
-     * 
+     *
      * @param databaseName the key to get the database for.
      * @return the database for the specified key, or null if the database
      *         does not exist.
      * @throws TorqueException if Torque is not yet initialized.
      */
-    public Database getDatabase(String databaseName) throws TorqueException;
-    
+    Database getDatabase(String databaseName) throws TorqueException;
+
     /**
      * Returns a Map containing all Databases registered to Torque.
-     * The key of the Map is the name of the database, and the value is the 
+     * The key of the Map is the name of the database, and the value is the
      * database instance. <br/>
-     * Note that in the very special case where a new database which 
-     * is not configured in Torque's configuration gets known to Torque 
+     * Note that in the very special case where a new database which
+     * is not configured in Torque's configuration gets known to Torque
      * at a later time, the returned map may change, and there is no way to
      * protect you against this.
-     * 
+     *
      * @return a Map containing all Databases known to Torque, never null.
      * @throws TorqueException if Torque is not yet initialized.
      */
-    public Map getDatabases() throws TorqueException;
-    
+    Map getDatabases() throws TorqueException;
+
     /**
      * Returns the database for the key <code>databaseName</code>.
      * If no database is associated to the specified key,
@@ -216,5 +216,5 @@
      * @return the database associated with specified key, or the newly created
      *         database, never null.
      */
-    public Database getOrCreateDatabase(String databaseName);
+    Database getOrCreateDatabase(String databaseName);
 }

Modified: db/torque/runtime/trunk/src/java/org/apache/torque/avalon/TorqueComponent.java
URL: http://svn.apache.org/viewvc/db/torque/runtime/trunk/src/java/org/apache/torque/avalon/TorqueComponent.java?view=diff&rev=466087&r1=466086&r2=466087
==============================================================================
--- db/torque/runtime/trunk/src/java/org/apache/torque/avalon/TorqueComponent.java (original)
+++ db/torque/runtime/trunk/src/java/org/apache/torque/avalon/TorqueComponent.java Fri Oct 20 05:20:01 2006
@@ -52,10 +52,10 @@
 {
     /** The Avalon Application Root */
     private String appRoot = null;
-    
+
     /** The Avalon Logger */
     private Logger logger = null;
-    
+
     /** The configuration file name. */
     private String configFile = null;
 
@@ -66,7 +66,7 @@
     public TorqueComponent()
     {
         super();
-        
+
         // Provide the singleton instance to the static accessor
         org.apache.torque.Torque.setInstance(this);
     }
@@ -82,9 +82,9 @@
     /**
      * @see org.apache.avalon.framework.logger.LogEnabled#enableLogging(org.apache.avalon.framework.logger.Logger)
      */
-    public void enableLogging(Logger logger)
+    public void enableLogging(Logger aLogger)
     {
-        this.logger = logger;
+        this.logger = aLogger;
     }
 
     /**
@@ -96,7 +96,8 @@
     }
 
     /**
-     * @see org.apache.avalon.framework.configuration.Configurable#configure(org.apache.avalon.framework.configuration.Configuration)
+     * @see
+     * org.apache.avalon.framework.configuration.Configurable#configure(org.apache.avalon.framework.configuration.Configuration)
      */
     public void configure(Configuration configuration)
             throws ConfigurationException
@@ -122,7 +123,7 @@
         }
 
         getLogger().debug("Config File is " + configFile);
-        
+
         this.configFile = configFile;
     }
 
@@ -135,7 +136,7 @@
         // check context Merlin and YAAFI style
         try
         {
-            appRoot = ((File)context.get("urn:avalon:home")).getAbsolutePath();
+            appRoot = ((File) context.get("urn:avalon:home")).getAbsolutePath();
         }
         catch (ContextException ce)
         {
@@ -184,7 +185,7 @@
         getLogger().debug("stop()");
         try
         {
-        	shutdown();
+            shutdown();
         }
         catch (Exception e)
         {

Modified: db/torque/runtime/trunk/src/java/org/apache/torque/dsfactory/AbstractDataSourceFactory.java
URL: http://svn.apache.org/viewvc/db/torque/runtime/trunk/src/java/org/apache/torque/dsfactory/AbstractDataSourceFactory.java?view=diff&rev=466087&r1=466086&r2=466087
==============================================================================
--- db/torque/runtime/trunk/src/java/org/apache/torque/dsfactory/AbstractDataSourceFactory.java (original)
+++ db/torque/runtime/trunk/src/java/org/apache/torque/dsfactory/AbstractDataSourceFactory.java Fri Oct 20 05:20:01 2006
@@ -1,7 +1,7 @@
 package org.apache.torque.dsfactory;
 
 /*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Copyright 2001-2006 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.
@@ -260,7 +260,7 @@
      * @return The current schema name. Null means, no schema has been set.
      * @throws TorqueException Any exceptions caught during processing will be
      *         rethrown wrapped into a TorqueException.
-     * @deprecated use DatabaseInfo.setSchema() instead. Will be removed 
+     * @deprecated use DatabaseInfo.setSchema() instead. Will be removed
      *             in a future version of Torque.
      */
     public String getSchema()



---------------------------------------------------------------------
To unsubscribe, e-mail: torque-dev-unsubscribe@db.apache.org
For additional commands, e-mail: torque-dev-help@db.apache.org


Mime
View raw message