Author: nbubna
Date: Thu Feb 24 19:32:51 2005
New Revision: 155295
URL: http://svn.apache.org/viewcvs?view=rev&rev=155295
Log:
allow subclasses to directly set the VelocityEngine the servlet will use (BUG
#32398)
Modified:
jakarta/velocity-tools/trunk/src/java/org/apache/velocity/tools/view/servlet/VelocityViewServlet.java
Modified:
jakarta/velocity-tools/trunk/src/java/org/apache/velocity/tools/view/servlet/VelocityViewServlet.java
URL:
http://svn.apache.org/viewcvs/jakarta/velocity-tools/trunk/src/java/org/apache/velocity/tools/view/servlet/VelocityViewServlet.java?view=diff&r1=155294&r2=155295
==============================================================================
---
jakarta/velocity-tools/trunk/src/java/org/apache/velocity/tools/view/servlet/VelocityViewServlet.java
(original)
+++
jakarta/velocity-tools/trunk/src/java/org/apache/velocity/tools/view/servlet/VelocityViewServlet.java
Thu Feb 24 19:32:51 2005
@@ -254,6 +254,18 @@
return velocity;
}
+ /**
+ * Sets the underlying VelocityEngine
+ */
+ protected void setVelocityEngine(VelocityEngine ve)
+ {
+ if (ve == null)
+ {
+ throw new NullPointerException("Cannot set the VelocityEngine to
null");
+ }
+ this.velocity = ve;
+ }
+
/**
* Initializes the ServletToolboxManager for this servlet's
@@ -294,6 +306,8 @@
protected void initVelocity(ServletConfig config) throws ServletException
{
velocity = new VelocityEngine();
+ setVelocityEngine(velocity);
+
// register this engine to be the default handler of log messages
// if the user points commons-logging to the LogSystemCommonsLog
LogSystemCommonsLog.setVelocityEngine(velocity);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
