Return-Path: <henning@apache.org>
Mailing-List: contact torque-dev-help@db.apache.org; run by ezmlm
Delivered-To: mailing list torque-dev@db.apache.org
Received: (qmail 51239 invoked by uid 500); 22 Jun 2003 19:37:05 -0000
Received: (qmail 51235 invoked from network); 22 Jun 2003 19:37:05 -0000
Received: from icarus.apache.org (208.185.179.13)
  by daedalus.apache.org with SMTP; 22 Jun 2003 19:37:05 -0000
Received: (qmail 96527 invoked by uid 1332); 22 Jun 2003 19:37:04 -0000
Date: 22 Jun 2003 19:37:04 -0000
Message-ID: <20030622193704.96526.qmail@icarus.apache.org>
From: henning@apache.org
To: db-torque-cvs@apache.org
Subject: cvs commit: db-torque/src/java/org/apache/torque TorqueSingleton.java
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N

henning     2003/06/22 12:37:04

  Modified:    src/java/org/apache/torque TorqueSingleton.java
  Log:
  Remove that ugly wart that was checking for the old and obsolete
  Turbine namespace in Torque.properties. We carried this around with us
  all through 3.0 and now it should go.
  
  Revision  Changes    Path
  1.3       +2 -19     db-torque/src/java/org/apache/torque/TorqueSingleton.java
  
  Index: TorqueSingleton.java
  ===================================================================
  RCS file: /home/cvs/db-torque/src/java/org/apache/torque/TorqueSingleton.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- TorqueSingleton.java	22 Jun 2003 19:33:35 -0000	1.2
  +++ TorqueSingleton.java	22 Jun 2003 19:37:04 -0000	1.3
  @@ -205,24 +205,7 @@
   
           if (conf == null || conf.isEmpty())
           {
  -            // If there are no properties in the "torque" namespace
  -            // then try the "services.DatabaseService" namespace. This
  -            // is deprecated and will be removed t
  -            conf = originalConf.subset("services.DatabaseService");
  -            if (conf != null && !conf.isEmpty())
  -            {
  -                /*
  -                  logger.warn("Torque's 'services.DatabaseService.' " +
  -                  "configuration prefix has been deprecated in " +
  -                  "favor of the 'torque.' prefix");
  -                */
  -            }
  -            else
  -            {
  -                // Assume the original configuration already had any
  -                // prefixes stripped.
  -                conf = originalConf;
  -            }
  +            conf = originalConf;
           }
   
           dbMaps = new HashMap();