You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by dl...@apache.org on 2001/03/05 23:58:16 UTC
cvs commit: jakarta-turbine/src/java/org/apache/turbine/services/webmacro TurbineWebMacroService.java
dlr 01/03/05 14:58:16
Modified: src/java/org/apache/turbine/services/webmacro
TurbineWebMacroService.java
Log:
clean up
Revision Changes Path
1.22 +6 -7 jakarta-turbine/src/java/org/apache/turbine/services/webmacro/TurbineWebMacroService.java
Index: TurbineWebMacroService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/webmacro/TurbineWebMacroService.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- TurbineWebMacroService.java 2001/02/23 22:19:00 1.21
+++ TurbineWebMacroService.java 2001/03/05 22:58:16 1.22
@@ -91,7 +91,7 @@
* @author <a href="mailto:mbryson@mont.mindspring.com">Dave Bryson</a>
* @author <a href="mailto:krzewski@e-point.pl">Rafal Krzewski</a>
* @author <a href="mailto:dlr@collab.net">Daniel Rall</a>
- * @version $Id: TurbineWebMacroService.java,v 1.21 2001/02/23 22:19:00 dlr Exp $
+ * @version $Id: TurbineWebMacroService.java,v 1.22 2001/03/05 22:58:16 dlr Exp $
*/
public class TurbineWebMacroService
extends TurbineBaseService
@@ -306,10 +306,10 @@
{
Properties props = getProperties();
- String WMProperties = props.getProperty("properties",null);
- String WMTemplates = props.getProperty("templates",null);
+ String WMProperties = props.getProperty("properties", null);
+ String WMTemplates = props.getProperty("templates", null);
String WMTemplateProvider =
- props.getProperty("templates.provider",null);
+ props.getProperty("templates.provider", null);
//debug
org.apache.turbine.util.Log.info("WebMacroService properties:");
@@ -324,8 +324,7 @@
if(WMProperties != null)
{
// If possible, transform paths to be webapp root relative.
- WMProperties = ServletUtils.expandRelative(config,
- WMProperties);
+ WMProperties = ServletUtils.expandRelative(config, WMProperties);
//debug
org.apache.turbine.util.Log.info("Creating WM object using " +
@@ -373,7 +372,7 @@
// Update templates path in WebMacro config broker, for
// WebMacro based providers.
- map.put("TemplatePath",WMTemplates);
+ map.put("TemplatePath", WMTemplates);
// NOTE! This requires modified WebMacro, to allow mutable
// configuration entries. A patch is available at