jvanzyl 01/06/28 10:49:31
Added: src/java/org/apache/turbine/modules/screens
VelocityError.java
Removed: src/java/org/apache/turbine/modules/screens
VelocityErrorScreen.java
Log:
- making a standard velocity error screen that matches the
template.error in the TRP these were mismatched before
which made it confusing as there was
screen.error = VelocityErrorScreen
template.error = Error.vm
when all we need is
template.error = VelocityError.vm
and we just need to make sure we have a screen named VelocityError
so that the context will be built before rendering the error
template.
Revision Changes Path
1.1
jakarta-turbine/src/java/org/apache/turbine/modules/screens/VelocityError.java
Index: VelocityError.java
===================================================================
package org.apache.turbine.modules.screens;
/* ====================================================================
* The Apache Software License, Version 1.1
*
* Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* 3. The end-user documentation included with the redistribution,
* if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
* 4. The names "Apache" and "Apache Software Foundation" and
* "Apache Turbine" must not be used to endorse or promote products
* derived from this software without prior written permission. For
* written permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called "Apache",
* "Apache Turbine", nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
// Turbine
import org.apache.turbine.util.RunData;
import org.apache.turbine.services.resources.TurbineResources;
// Velocity
import org.apache.velocity.context.Context;
/**
* VelocityErrorScreen screen - directs errors at the velocity
* error template defined in template.error.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Gonzalo Diethelm</a>
* @version $Id: VelocityError.java,v 1.1 2001/06/28 17:49:29 jvanzyl Exp $
*/
public class VelocityError extends VelocityScreen
{
/**
* Implement this to add information to the context.
*
* @param data Turbine information.
* @param context Context for web pages.
* @exception Exception, a generic exception.
*/
protected void doBuildTemplate( RunData data,
Context context )
throws Exception
{
context.put("processingException",
data.getStackTraceException().toString());
context.put("stackTrace", data.getStackTrace());
String errorTemplate = TurbineResources.getString("template.error",
"/error.vm");
setTemplate(data, errorTemplate);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
