dlr 02/03/14 09:52:49
Modified: src/java/org/apache/torque Torque.java
Log:
Prepping for deprecation of the "services.DatabaseService." prefix on
Torque configuration.
Revision Changes Path
1.50 +12 -4 jakarta-turbine-torque/src/java/org/apache/torque/Torque.java
Index: Torque.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/src/java/org/apache/torque/Torque.java,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -u -r1.49 -r1.50
--- Torque.java 13 Mar 2002 21:31:23 -0000 1.49
+++ Torque.java 14 Mar 2002 17:52:49 -0000 1.50
@@ -90,7 +90,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Rafal Krzewski</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Martin Poeschl</a>
- * @version $Id: Torque.java,v 1.49 2002/03/13 21:31:23 jmcnally Exp $
+ * @version $Id: Torque.java,v 1.50 2002/03/14 17:52:49 dlr Exp $
*/
public class Torque implements Initializable, Configurable
{
@@ -203,10 +203,18 @@
// than try the "services.DatabaseService" namespace. This
// will soon be deprecated.
configuration = originalConf.subset("services.DatabaseService");
-
- // the configuration may already have any prefixes stripped
- if (configuration == null || configuration.isEmpty())
+ if (configuration != null && !configuration.isEmpty())
+ {
+ /*
+ category.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.
configuration = originalConf;
}
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
