Return-Path: X-Original-To: apmail-db-torque-dev-archive@www.apache.org Delivered-To: apmail-db-torque-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 7E6B07473 for ; Wed, 28 Sep 2011 11:59:34 +0000 (UTC) Received: (qmail 60083 invoked by uid 500); 28 Sep 2011 11:59:34 -0000 Delivered-To: apmail-db-torque-dev-archive@db.apache.org Received: (qmail 60040 invoked by uid 500); 28 Sep 2011 11:59:33 -0000 Mailing-List: contact torque-dev-help@db.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Help: List-Post: List-Id: "Apache Torque Developers List" Reply-To: "Apache Torque Developers List" Delivered-To: mailing list torque-dev@db.apache.org Received: (qmail 60030 invoked by uid 500); 28 Sep 2011 11:59:33 -0000 Received: (qmail 60027 invoked by uid 99); 28 Sep 2011 11:59:33 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 28 Sep 2011 11:59:33 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 28 Sep 2011 11:59:30 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id E379D23888FE; Wed, 28 Sep 2011 11:59:08 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1176836 - in /db/torque/torque4/trunk/torque-runtime: pom.xml src/main/java/org/apache/torque/TorqueInstance.java src/main/java/org/apache/torque/adapter/DB.java src/main/java/org/apache/torque/adapter/DBFactory.java Date: Wed, 28 Sep 2011 11:59:08 -0000 To: torque-commits@db.apache.org From: tfischer@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20110928115908.E379D23888FE@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: tfischer Date: Wed Sep 28 11:59:08 2011 New Revision: 1176836 URL: http://svn.apache.org/viewvc?rev=1176836&view=rev Log: cleanup code - removed tabs - removed trailing spaces - fixed imports - removed superfluous semicolon Modified: db/torque/torque4/trunk/torque-runtime/pom.xml db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/TorqueInstance.java db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/adapter/DB.java db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/adapter/DBFactory.java Modified: db/torque/torque4/trunk/torque-runtime/pom.xml URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/pom.xml?rev=1176836&r1=1176835&r2=1176836&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-runtime/pom.xml (original) +++ db/torque/torque4/trunk/torque-runtime/pom.xml Wed Sep 28 11:59:08 2011 @@ -46,10 +46,10 @@ commons-configuration 1.6 - - commons-beanutils - commons-beanutils - + + commons-beanutils + commons-beanutils + @@ -109,7 +109,7 @@ fulcrum-yaafi 1.0.6 test - + Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/TorqueInstance.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/TorqueInstance.java?rev=1176836&r1=1176835&r2=1176836&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/TorqueInstance.java (original) +++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/TorqueInstance.java Wed Sep 28 11:59:08 2011 @@ -102,7 +102,6 @@ public class TorqueInstance */ private Map mapBuilderCache = Collections.synchronizedMap(new HashMap()); -; /** * Creates a new instance with default configuration. @@ -291,24 +290,24 @@ public class TorqueInstance if (StringUtils.equals(DB.AUTODETECT_ADAPTER, adapter)) { - Connection con = null; - try - { - con = database.getDataSourceFactory().getDataSource().getConnection(); - db = DBFactory.autoDetectAdapter(con); - } - catch (SQLException e) - { - log.error("Could not get product information from JDBC", e); - } - finally - { - closeConnection(con); - } + Connection con = null; + try + { + con = database.getDataSourceFactory().getDataSource().getConnection(); + db = DBFactory.autoDetectAdapter(con); + } + catch (SQLException e) + { + log.error("Could not get product information from JDBC", e); + } + finally + { + closeConnection(con); + } } else { - db = DBFactory.create(adapter); + db = DBFactory.create(adapter); } // Not supported, try manually defined adapter class Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/adapter/DB.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/adapter/DB.java?rev=1176836&r1=1176835&r2=1176836&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/adapter/DB.java (original) +++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/adapter/DB.java Wed Sep 28 11:59:08 2011 @@ -26,10 +26,7 @@ import java.util.Date; import org.apache.torque.TorqueException; import org.apache.torque.sql.Query; -import org.apache.torque.util.functions.AbstractFunction; -import org.apache.torque.util.functions.Aggregate; import org.apache.torque.util.functions.FunctionEnum; -import org.apache.torque.util.functions.SQLFunction; /** * DB defines the interface for a Torque database @@ -288,9 +285,9 @@ public interface DB extends Serializable * @return The SQLFunction implementation for a function of this type that * will work with this type of DB. Null indicates a class was not * found. - * @see SQLFunction - * @see AbstractFunction - * @see Aggregate + * @see org.apache.torque.util.functions.AbstractFunction + * @see org.apache.torque.util.functions.Aggregate + * @see org.apache.torque.util.functions.SQLFunction */ Class getFunctionClass(FunctionEnum function); } Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/adapter/DBFactory.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/adapter/DBFactory.java?rev=1176836&r1=1176835&r2=1176836&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/adapter/DBFactory.java (original) +++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/adapter/DBFactory.java Wed Sep 28 11:59:08 2011 @@ -42,10 +42,10 @@ import org.apache.commons.logging.LogFac */ public final class DBFactory { - /** Local logger */ - private static final Log log = LogFactory.getLog(DBFactory.class); + /** Local logger */ + private static final Log log = LogFactory.getLog(DBFactory.class); - /** + /** * JDBC driver to Torque Adapter map. */ private static Map> adapters @@ -149,12 +149,12 @@ public final class DBFactory public static DB autoDetectAdapter(Connection con) throws InstantiationException, SQLException { - DatabaseMetaData dmd = con.getMetaData(); + DatabaseMetaData dmd = con.getMetaData(); String dbmsName = dmd.getDatabaseProductName(); - Class adapterClass = adapters.get(dbmsName); + Class adapterClass = adapters.get(dbmsName); - if (adapterClass == null) + if (adapterClass == null) { throw new InstantiationException("Could not detect adapter for database: " + dbmsName); } --------------------------------------------------------------------- To unsubscribe, e-mail: torque-dev-unsubscribe@db.apache.org For additional commands, e-mail: torque-dev-help@db.apache.org