db-torque-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From henn...@apache.org
Subject cvs commit: db-torque/src/java/org/apache/torque TorqueSingleton.java
Date Sun, 22 Jun 2003 19:37:04 GMT
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();
  
  
  

Mime
View raw message