You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@velocity.apache.org by nb...@apache.org on 2004/11/11 05:50:45 UTC
cvs commit: jakarta-velocity-tools/src/java/org/apache/velocity/tools/view/servlet VelocityLayoutServlet.java
nbubna 2004/11/10 20:50:45
Modified: src/java/org/apache/velocity/tools/view/servlet
VelocityLayoutServlet.java
Log:
convert from singleton to VelocityEngine
Revision Changes Path
1.9 +12 -11 jakarta-velocity-tools/src/java/org/apache/velocity/tools/view/servlet/VelocityLayoutServlet.java
Index: VelocityLayoutServlet.java
===================================================================
RCS file: /home/cvs/jakarta-velocity-tools/src/java/org/apache/velocity/tools/view/servlet/VelocityLayoutServlet.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- VelocityLayoutServlet.java 30 Jul 2004 17:14:19 -0000 1.8
+++ VelocityLayoutServlet.java 11 Nov 2004 04:50:45 -0000 1.9
@@ -26,12 +26,11 @@
import java.io.UnsupportedEncodingException;
import org.apache.velocity.Template;
-import org.apache.velocity.app.Velocity;
+import org.apache.velocity.app.VelocityEngine;
import org.apache.velocity.context.Context;
import org.apache.velocity.exception.MethodInvocationException;
import org.apache.velocity.exception.ParseErrorException;
import org.apache.velocity.exception.ResourceNotFoundException;
-import org.apache.velocity.runtime.RuntimeSingleton;
import org.apache.velocity.tools.view.servlet.VelocityViewServlet;
@@ -134,6 +133,8 @@
protected String layoutDir;
protected String defaultLayout;
+ // keep a local reference for convenience
+ private VelocityEngine velocity = super.getVelocityEngine();
/**
* Initializes Velocity, the view servlet and checks for changes to
@@ -148,11 +149,11 @@
// check for default template path overrides
errorTemplate =
- RuntimeSingleton.getString(PROPERTY_ERROR_TEMPLATE, DEFAULT_ERROR_TEMPLATE);
+ getVelocityProperty(PROPERTY_ERROR_TEMPLATE, DEFAULT_ERROR_TEMPLATE);
layoutDir =
- RuntimeSingleton.getString(PROPERTY_LAYOUT_DIR, DEFAULT_LAYOUT_DIR);
+ getVelocityProperty(PROPERTY_LAYOUT_DIR, DEFAULT_LAYOUT_DIR);
defaultLayout =
- RuntimeSingleton.getString(PROPERTY_DEFAULT_LAYOUT, DEFAULT_DEFAULT_LAYOUT);
+ getVelocityProperty(PROPERTY_DEFAULT_LAYOUT, DEFAULT_DEFAULT_LAYOUT);
// preventive error checking! directory must end in /
if (!layoutDir.endsWith("/"))
@@ -161,9 +162,9 @@
}
// log the current settings
- Velocity.info("VelocityLayoutServlet: Error screen is '"+errorTemplate+"'");
- Velocity.info("VelocityLayoutServlet: Layout directory is '"+layoutDir+"'");
- Velocity.info("VelocityLayoutServlet: Default layout template is '"+defaultLayout+"'");
+ velocity.info("VelocityLayoutServlet: Error screen is '"+errorTemplate+"'");
+ velocity.info("VelocityLayoutServlet: Layout directory is '"+layoutDir+"'");
+ velocity.info("VelocityLayoutServlet: Default layout template is '"+defaultLayout+"'");
// for efficiency's sake, make defaultLayout a full path now
defaultLayout = layoutDir + defaultLayout;
@@ -241,7 +242,7 @@
}
catch (Exception e)
{
- Velocity.error("VelocityLayoutServlet: Can't load layout \"" +
+ velocity.error("VelocityLayoutServlet: Can't load layout \"" +
layout + "\": " + e);
// if it was an alternate layout we couldn't get...
@@ -298,7 +299,7 @@
catch (Exception e2)
{
// d'oh! log this
- Velocity.error("VelocityLayoutServlet: " +
+ velocity.error("VelocityLayoutServlet: " +
" Error during error template rendering - " + e2);
// then punt the original to a higher authority
super.error(request, response, e);
---------------------------------------------------------------------
To unsubscribe, e-mail: velocity-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: velocity-dev-help@jakarta.apache.org