You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by ep...@apache.org on 2004/02/02 12:19:43 UTC
cvs commit: jakarta-turbine-3/src/java/org/apache/turbine Turbine.java
epugh 2004/02/02 03:19:42
Modified: src/java/org/apache/turbine Turbine.java
Log:
Use already loaded Configuration object instead of looking for old TR.props.
Revision Changes Path
1.47 +7 -6 jakarta-turbine-3/src/java/org/apache/turbine/Turbine.java
Index: Turbine.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-3/src/java/org/apache/turbine/Turbine.java,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- Turbine.java 31 Jan 2004 01:34:50 -0000 1.46
+++ Turbine.java 2 Feb 2004 11:19:42 -0000 1.47
@@ -78,6 +78,7 @@
import org.apache.fulcrum.TurbineServices;
import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration.ConfigurationConverter;
import org.apache.commons.configuration.ConfigurationFactory;
import org.apache.commons.configuration.PropertiesConfiguration;
@@ -668,14 +669,14 @@
// ${webapp} in log4j properties. We need this
// so that the log files can be placed in
// the webapp space.
- String trProps =
+ /* String trProps =
findInitParameter(context, config,
TurbineConfig.PROPERTIES_KEY,
"TurbineResources.properties");
- String trPropsFile = getRealPath(trProps);
- Properties p = new Properties();
- p.load(new FileInputStream(trPropsFile));
- p.setProperty(APPLICATION_ROOT, getApplicationRoot());
+ String trPropsFile = getRealPath(trProps);*/
+ Properties p = ConfigurationConverter.getProperties(configuration);
+ /* p.load(new FileInputStream(trPropsFile));
+ p.setProperty(APPLICATION_ROOT, getApplicationRoot());*/
// FIXME: Configures log4j directly with the supplied properties. The
// plan is to eliminate this, and instead allow logging to be
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org