From 24b66722d2b4c0431e28d69c4073c73601d06ee1 Mon Sep 17 00:00:00 2001
From: mdb <mdb@6335cc39-0255-0410-8fd6-9bcaacd3b74c>
Date: Fri, 2 Nov 2001 18:46:48 +0000
Subject: [PATCH] Geir didn't like velocityWillInit(), so he created
 initVelocity() which we override when setting the application context.

git-svn-id: https://samskivert.googlecode.com/svn/trunk@417 6335cc39-0255-0410-8fd6-9bcaacd3b74c
---
 .../src/java/com/samskivert/velocity/DispatcherServlet.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/projects/samskivert/src/java/com/samskivert/velocity/DispatcherServlet.java b/projects/samskivert/src/java/com/samskivert/velocity/DispatcherServlet.java
index 9d1a50b2..9332ecb3 100644
--- a/projects/samskivert/src/java/com/samskivert/velocity/DispatcherServlet.java
+++ b/projects/samskivert/src/java/com/samskivert/velocity/DispatcherServlet.java
@@ -1,5 +1,5 @@
 //
-// $Id: DispatcherServlet.java,v 1.7 2001/11/02 02:30:54 mdb Exp $
+// $Id: DispatcherServlet.java,v 1.8 2001/11/02 18:46:48 mdb Exp $
 //
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001 Michael Bayne
@@ -194,10 +194,12 @@ public class DispatcherServlet extends VelocityServlet
     }
 
     // documentation inherited
-    protected void velocityWillInit (Properties props)
+    protected void initVelocity (ServletConfig config)
+         throws ServletException
     {
         // stick the servlet context into the Velocity application context
         Velocity.setApplicationContext(getServletContext());
+        super.initVelocity(config);
     }
 
     /**