--- [EMAIL PROTECTED] wrote:
> geirm 01/08/07 15:26:46
>
> Modified: src/java/org/apache/velocity/servlet
> VelocityServlet.java
> Log:
> Changes to support new runtime model - just a
> naming change - the servlet
> still uses the singleton, of course.
>
> Revision Changes Path
> 1.40 +6 -6
>
jakarta-velocity/src/java/org/apache/velocity/servlet/VelocityServlet.java
>
> Index: VelocityServlet.java
>
>
===================================================================
> RCS file:
>
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/servlet/VelocityServlet.java,v
> retrieving revision 1.39
> retrieving revision 1.40
> diff -u -r1.39 -r1.40
> --- VelocityServlet.java 2001/05/19 17:19:21 1.39
> +++ VelocityServlet.java 2001/08/07 22:26:46 1.40
> @@ -77,7 +77,7 @@
> import javax.servlet.ServletResponse;
>
> import org.apache.velocity.Template;
> -import org.apache.velocity.runtime.Runtime;
> +import
> org.apache.velocity.runtime.RuntimeSingleton;
> import org.apache.velocity.io.VelocityWriter;
> import org.apache.velocity.util.SimplePool;
>
> @@ -129,7 +129,7 @@
> * @author <a href="mailto:[EMAIL PROTECTED]";>Jon
> S. Stevens</a>
> * @author <a
> href="mailto:[EMAIL PROTECTED]";>Geir Magnusson
> Jr.</a>
> * @author <a
> href="[EMAIL PROTECTED]">Kent Johnson</a>
> - * $Id: VelocityServlet.java,v 1.39 2001/05/19
> 17:19:21 geirm Exp $
> + * $Id: VelocityServlet.java,v 1.40 2001/08/07
> 22:26:46 geirm Exp $
> */
> public abstract class VelocityServlet extends
> HttpServlet
> {
> @@ -206,9 +206,9 @@
>
> Velocity.init( props );
>
> - defaultContentType =
> Runtime.getString( CONTENT_TYPE,
> DEFAULT_CONTENT_TYPE);
> + defaultContentType =
> RuntimeSingleton.getString( CONTENT_TYPE,
> DEFAULT_CONTENT_TYPE);
>
> - encoding = Runtime.getString(
> Runtime.OUTPUT_ENCODING, DEFAULT_OUTPUT_ENCODING);
> + encoding =
> RuntimeSingleton.getString(
> RuntimeSingleton.OUTPUT_ENCODING,
> DEFAULT_OUTPUT_ENCODING);
> }
> catch( Exception e )
> {
> @@ -498,7 +498,7 @@
> public Template getTemplate( String name )
> throws ResourceNotFoundException,
> ParseErrorException, Exception
> {
> - return Runtime.getTemplate(name);
> + return
> RuntimeSingleton.getTemplate(name);
> }
>
> /**
> @@ -521,7 +521,7 @@
> public Template getTemplate( String name,
> String encoding )
> throws ResourceNotFoundException,
> ParseErrorException, Exception
> {
> - return Runtime.getTemplate( name,
> encoding );
> + return RuntimeSingleton.getTemplate(
> name, encoding );
> }
>
> /**
>
>
>
__________________________________________________
Do You Yahoo!?
Make international calls for as low as $.04/minute with Yahoo! Messenger
http://phonecard.yahoo.com/
