? emp ? src/java/com/opensymphony/webwork/views/jsp/template ? src/java/com/opensymphony/webwork/views/velocity/VelocityUITemplateEngine.java ? src/test/com/opensymphony/webwork/views/jsp/template Index: build.xml =================================================================== RCS file: /cvs/webwork/build.xml,v retrieving revision 1.15 diff -u -r1.15 build.xml --- build.xml 23 Nov 2003 19:10:21 -0000 1.15 +++ build.xml 15 Dec 2003 22:11:01 -0000 @@ -65,7 +65,7 @@ - + Index: src/etc/taglib.tld =================================================================== RCS file: /cvs/webwork/src/etc/taglib.tld,v retrieving revision 1.24 diff -u -r1.24 taglib.tld --- src/etc/taglib.tld 9 Dec 2003 14:00:22 -0000 1.24 +++ src/etc/taglib.tld 15 Dec 2003 22:11:03 -0000 @@ -432,6 +432,11 @@ true + suffix + false + true + + label true true @@ -499,6 +504,11 @@ true + suffix + false + true + + label true true @@ -561,6 +571,11 @@ true + suffix + false + true + + label false true @@ -603,6 +618,11 @@ true + suffix + false + true + + openTemplate false true @@ -645,6 +665,11 @@ true + suffix + false + true + + name false true @@ -672,6 +697,11 @@ true + suffix + false + true + + label true true @@ -719,6 +749,11 @@ true + suffix + false + true + + label true true @@ -806,6 +841,11 @@ true + suffix + false + true + + name true true @@ -848,6 +888,11 @@ true + suffix + false + true + + name false true @@ -885,6 +930,11 @@ true + suffix + false + true + + label true true @@ -967,6 +1017,11 @@ false + suffix + false + true + + label true false @@ -1034,6 +1089,11 @@ true + suffix + false + true + + label true true @@ -1131,6 +1191,11 @@ true + suffix + false + true + + label true true @@ -1218,6 +1283,11 @@ true + suffix + false + true + + label true true @@ -1295,6 +1365,11 @@ true + suffix + false + true + + label true true @@ -1372,6 +1447,11 @@ true + suffix + false + true + + label true true @@ -1424,6 +1504,11 @@ false + suffix + false + true + + modelName true false @@ -1459,6 +1544,16 @@ theme false false + + + template + false + true + + + suffix + false + true id Index: src/java/com/opensymphony/webwork/dispatcher/ServletDispatcher.java =================================================================== RCS file: /cvs/webwork/src/java/com/opensymphony/webwork/dispatcher/ServletDispatcher.java,v retrieving revision 1.23 diff -u -r1.23 ServletDispatcher.java --- src/java/com/opensymphony/webwork/dispatcher/ServletDispatcher.java 28 Nov 2003 03:38:59 -0000 1.23 +++ src/java/com/opensymphony/webwork/dispatcher/ServletDispatcher.java 15 Dec 2003 22:11:03 -0000 @@ -11,7 +11,6 @@ import com.opensymphony.webwork.dispatcher.multipart.MultiPartRequest; import com.opensymphony.webwork.dispatcher.multipart.MultiPartRequestWrapper; import com.opensymphony.webwork.util.AttributeMap; -import com.opensymphony.webwork.views.velocity.VelocityManager; import com.opensymphony.xwork.ActionContext; import com.opensymphony.xwork.ActionProxy; @@ -26,7 +25,6 @@ import java.io.IOException; import java.util.HashMap; -import java.util.Iterator; import java.util.Map; import javax.servlet.ServletConfig; @@ -35,7 +33,6 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; - /** * @author Rickard Öberg (rickard@middleware-company.com) * @author Matt Baldree (matt@smallleap.com) @@ -87,8 +84,6 @@ public void init(ServletConfig config) throws ServletException { super.init(config); - // initialize the VelocityEngine - VelocityManager.getInstance().init(config.getServletContext()); LocalizedTextUtil.addDefaultResourceBundle("com/opensymphony/webwork/webwork-messages"); Index: src/java/com/opensymphony/webwork/views/jsp/ParamTag.java =================================================================== RCS file: /cvs/webwork/src/java/com/opensymphony/webwork/views/jsp/ParamTag.java,v retrieving revision 1.10 diff -u -r1.10 ParamTag.java --- src/java/com/opensymphony/webwork/views/jsp/ParamTag.java 17 Nov 2003 03:45:57 -0000 1.10 +++ src/java/com/opensymphony/webwork/views/jsp/ParamTag.java 15 Dec 2003 22:11:03 -0000 @@ -4,12 +4,6 @@ */ package com.opensymphony.webwork.views.jsp; -import com.opensymphony.xwork.util.OgnlValueStack; - -import org.apache.velocity.context.Context; - -import java.io.Writer; - import javax.servlet.jsp.JspException; Index: src/java/com/opensymphony/webwork/views/jsp/ui/AbstractClosingUITag.java =================================================================== RCS file: /cvs/webwork/src/java/com/opensymphony/webwork/views/jsp/ui/AbstractClosingUITag.java,v retrieving revision 1.5 diff -u -r1.5 AbstractClosingUITag.java --- src/java/com/opensymphony/webwork/views/jsp/ui/AbstractClosingUITag.java 4 Nov 2003 03:36:33 -0000 1.5 +++ src/java/com/opensymphony/webwork/views/jsp/ui/AbstractClosingUITag.java 15 Dec 2003 22:11:03 -0000 @@ -9,6 +9,8 @@ import javax.servlet.jsp.JspException; +import com.opensymphony.webwork.views.jsp.template.TemplateEngine; + /** * AbstractClosingUITag @@ -40,8 +42,12 @@ try { evaluateParams(getStack()); - String openTemplateName = buildTemplateName(getOpenTemplate(), getDefaultOpenTemplate()); - mergeTemplate(openTemplateName); + String openTemplateName = buildTemplateName(getOpenTemplate(), getDefaultOpenTemplate(), getTemplateSuffix()); + TemplateEngine templateEngine = templateManager.getEngine(openTemplateName); + if (templateEngine == null){ + throw new JspException("No template engine available for template " + openTemplateName + " in " + this.getClass().getName() + " tag class, doEndTag"); + } + templateEngine.processTemplate(openTemplateName, this, getParams(), pageContext); } catch (Exception e) { LOG.error("Could not open template", e); Index: src/java/com/opensymphony/webwork/views/jsp/ui/AbstractUITag.java =================================================================== RCS file: /cvs/webwork/src/java/com/opensymphony/webwork/views/jsp/ui/AbstractUITag.java,v retrieving revision 1.22 diff -u -r1.22 AbstractUITag.java --- src/java/com/opensymphony/webwork/views/jsp/ui/AbstractUITag.java 1 Dec 2003 14:25:51 -0000 1.22 +++ src/java/com/opensymphony/webwork/views/jsp/ui/AbstractUITag.java 15 Dec 2003 22:11:04 -0000 @@ -5,52 +5,33 @@ package com.opensymphony.webwork.views.jsp.ui; import com.opensymphony.webwork.config.Configuration; -import com.opensymphony.webwork.views.jsp.ParameterizedTagSupport; -import com.opensymphony.webwork.views.velocity.VelocityManager; - +import com.opensymphony.webwork.views.jsp.template.AbstractTemplateTag; import com.opensymphony.xwork.util.OgnlValueStack; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.velocity.Template; -import org.apache.velocity.app.Velocity; -import org.apache.velocity.app.VelocityEngine; -import org.apache.velocity.context.Context; - -import java.io.Writer; - -import java.util.Enumeration; -import java.util.Properties; - -import javax.servlet.ServletConfig; -import javax.servlet.ServletContext; -import javax.servlet.jsp.JspException; - /** * @version $Id: AbstractUITag.java,v 1.22 2003/12/01 14:25:51 mbogaert Exp $ * @author Matt Ho <matt@enginegreen.com> */ -public abstract class AbstractUITag extends ParameterizedTagSupport { +public abstract class AbstractUITag extends AbstractTemplateTag { //~ Static fields/initializers ///////////////////////////////////////////// private static final Log LOG = LogFactory.getLog(AbstractUITag.class); - /** - * The name of the default theme used by WW2. - */ - public static String THEME; - protected static VelocityManager velocityManager = VelocityManager.getInstance(); - protected static VelocityEngine velocityEngine = velocityManager.getVelocityEngine(); static { - try { + if (Configuration.isSet("webwork.ui.theme")) { THEME = Configuration.getString("webwork.ui.theme"); - } catch (IllegalArgumentException e) { - LOG.warn("Unable to find 'webwork.ui.theme' property setting. Defaulting to /template/xhtml/", e); + } else { THEME = "/template/xhtml/"; } + if (Configuration.isSet("webwork.ui.suffix")){ + SUFFIX = Configuration.getString("webwork.ui.suffix"); + } else { + SUFFIX = "vm"; + } } //~ Instance fields //////////////////////////////////////////////////////// @@ -62,8 +43,6 @@ protected String onchangeAttr; protected String requiredAttr; protected String tabindexAttr; - protected String templateAttr; - protected String themeAttr; protected String valueAttr; //~ Methods //////////////////////////////////////////////////////////////// @@ -96,100 +75,14 @@ this.tabindexAttr = tabindex; } - public void setTemplate(String aName) { - templateAttr = aName; - } - - public void setTheme(String aName) { - themeAttr = aName; - } - public void setValue(String aValue) { valueAttr = aValue; } - public int doEndTag() throws JspException { - try { - OgnlValueStack stack = getStack(); - evaluateParams(stack); - - try { - mergeTemplate(this.getTemplateName()); - - return EVAL_PAGE; - } catch (Exception e) { - throw new JspException("Fatal exception caught in " + this.getClass().getName() + " tag class, doEndTag: " + e.getMessage(), e); - } - } finally { - // clean up after ourselves to allow this tag to be reused - this.reset(); - } - } - - public int doStartTag() throws JspException { - return EVAL_BODY_INCLUDE; - } - - /** - * A contract that requires each concrete UI Tag to specify which template should be used as a default. For - * example, the CheckboxTab might return "checkbox.vm" while the RadioTag might return "radio.vm". This value - * not begin with a '/' unless you intend to make the path absolute rather than relative to the - * current theme. - * @return The name of the template to be used as the default. - */ - protected abstract String getDefaultTemplate(); - - /** - * Find the name of the Velocity template that we should use. - * @return The name of the Velocity template that we should use. This value should begin with a '/' - */ - protected String getTemplateName() { - return buildTemplateName(templateAttr, getDefaultTemplate()); - } - protected Class getValueClassType() { return String.class; } - /** - * - * @param myTemplate - * @param myDefaultTemplate - * @return - */ - protected String buildTemplateName(String myTemplate, String myDefaultTemplate) { - /** - * If no used defined template has been speccified, apply the appropriate theme to the default template - */ - if (myTemplate == null) { - if (this.themeAttr == null) { - return THEME + myDefaultTemplate; - } else if (this.themeAttr.endsWith("/")) { - return this.themeAttr + myDefaultTemplate; - } else { - return this.themeAttr + "/" + myDefaultTemplate; - } - - /** - * If a theme has been specified and it begins with a '/', allow this to override any theme value provided. - */ - } else if (myTemplate.startsWith("/")) { - return myTemplate; - - /** - * Otherwise, apply the appropriate theme to the user specified template - */ - } else { - if (this.themeAttr == null) { - return THEME + myTemplate; - } else if (this.themeAttr.endsWith("/")) { - return this.themeAttr + myTemplate; - } else { - return this.themeAttr + "/" + myTemplate; - } - } - } - protected void evaluateExtraParams(OgnlValueStack stack) { } @@ -248,20 +141,4 @@ evaluateExtraParams(stack); } - protected void mergeTemplate(String templateName) throws Exception { - Template t = velocityEngine.getTemplate(templateName); - Context context = velocityManager.createContext(getStack(), pageContext.getRequest(), pageContext.getResponse()); - - Writer outputWriter = pageContext.getOut(); - - /** - * Make the OGNL stack available to the velocityEngine templates. - * todo Consider putting all the VelocityServlet Context values in - after all, if we're already sending - * the request, it might also make sense for consistency to send the page and res and any others. - */ - context.put("tag", this); - context.put("parameters", getParams()); - - t.merge(context, outputWriter); - } } Index: src/java/com/opensymphony/webwork/views/jsp/ui/CheckboxListTag.java =================================================================== RCS file: /cvs/webwork/src/java/com/opensymphony/webwork/views/jsp/ui/CheckboxListTag.java,v retrieving revision 1.2 diff -u -r1.2 CheckboxListTag.java --- src/java/com/opensymphony/webwork/views/jsp/ui/CheckboxListTag.java 17 Oct 2003 15:08:33 -0000 1.2 +++ src/java/com/opensymphony/webwork/views/jsp/ui/CheckboxListTag.java 15 Dec 2003 22:11:04 -0000 @@ -15,7 +15,7 @@ /** * The name of the default template for the RadioTag */ - final public static String TEMPLATE = "checkboxlist.vm"; + final public static String TEMPLATE = "checkboxlist"; //~ Methods //////////////////////////////////////////////////////////////// Index: src/java/com/opensymphony/webwork/views/jsp/ui/CheckboxTag.java =================================================================== RCS file: /cvs/webwork/src/java/com/opensymphony/webwork/views/jsp/ui/CheckboxTag.java,v retrieving revision 1.7 diff -u -r1.7 CheckboxTag.java --- src/java/com/opensymphony/webwork/views/jsp/ui/CheckboxTag.java 19 Nov 2003 07:21:18 -0000 1.7 +++ src/java/com/opensymphony/webwork/views/jsp/ui/CheckboxTag.java 15 Dec 2003 22:11:04 -0000 @@ -17,7 +17,7 @@ /** * The name of the default template for the CheckboxTag */ - final public static String TEMPLATE = "checkbox.vm"; + final public static String TEMPLATE = "checkbox"; //~ Instance fields //////////////////////////////////////////////////////// Index: src/java/com/opensymphony/webwork/views/jsp/ui/ComboBoxTag.java =================================================================== RCS file: /cvs/webwork/src/java/com/opensymphony/webwork/views/jsp/ui/ComboBoxTag.java,v retrieving revision 1.2 diff -u -r1.2 ComboBoxTag.java --- src/java/com/opensymphony/webwork/views/jsp/ui/ComboBoxTag.java 15 Nov 2003 05:56:11 -0000 1.2 +++ src/java/com/opensymphony/webwork/views/jsp/ui/ComboBoxTag.java 15 Dec 2003 22:11:04 -0000 @@ -18,7 +18,7 @@ /** * The name of the default template for the CheckboxTag */ - final public static String TEMPLATE = "combobox.vm"; + final public static String TEMPLATE = "combobox"; //~ Instance fields //////////////////////////////////////////////////////// Index: src/java/com/opensymphony/webwork/views/jsp/ui/ComponentTag.java =================================================================== RCS file: /cvs/webwork/src/java/com/opensymphony/webwork/views/jsp/ui/ComponentTag.java,v retrieving revision 1.2 diff -u -r1.2 ComponentTag.java --- src/java/com/opensymphony/webwork/views/jsp/ui/ComponentTag.java 17 Oct 2003 15:08:34 -0000 1.2 +++ src/java/com/opensymphony/webwork/views/jsp/ui/ComponentTag.java 15 Dec 2003 22:11:04 -0000 @@ -15,7 +15,7 @@ /** * The name of the default template for the ComponentTag */ - private final static String TEMPLATE = "empty.vm"; + private final static String TEMPLATE = "empty"; //~ Methods //////////////////////////////////////////////////////////////// Index: src/java/com/opensymphony/webwork/views/jsp/ui/DoubleSelectTag.java =================================================================== RCS file: /cvs/webwork/src/java/com/opensymphony/webwork/views/jsp/ui/DoubleSelectTag.java,v retrieving revision 1.4 diff -u -r1.4 DoubleSelectTag.java --- src/java/com/opensymphony/webwork/views/jsp/ui/DoubleSelectTag.java 17 Nov 2003 03:45:58 -0000 1.4 +++ src/java/com/opensymphony/webwork/views/jsp/ui/DoubleSelectTag.java 15 Dec 2003 22:11:04 -0000 @@ -15,7 +15,7 @@ /** * The name of the default template for the SelectTag */ - final public static String TEMPLATE = "doubleselect.vm"; + final public static String TEMPLATE = "doubleselect"; //~ Instance fields //////////////////////////////////////////////////////// Index: src/java/com/opensymphony/webwork/views/jsp/ui/FileTag.java =================================================================== RCS file: /cvs/webwork/src/java/com/opensymphony/webwork/views/jsp/ui/FileTag.java,v retrieving revision 1.5 diff -u -r1.5 FileTag.java --- src/java/com/opensymphony/webwork/views/jsp/ui/FileTag.java 4 Nov 2003 06:47:45 -0000 1.5 +++ src/java/com/opensymphony/webwork/views/jsp/ui/FileTag.java 15 Dec 2003 22:11:04 -0000 @@ -17,7 +17,7 @@ /** * The name of the default template for the FileTag */ - final public static String TEMPLATE = "file.vm"; + final public static String TEMPLATE = "file"; //~ Instance fields //////////////////////////////////////////////////////// Index: src/java/com/opensymphony/webwork/views/jsp/ui/FormTag.java =================================================================== RCS file: /cvs/webwork/src/java/com/opensymphony/webwork/views/jsp/ui/FormTag.java,v retrieving revision 1.7 diff -u -r1.7 FormTag.java --- src/java/com/opensymphony/webwork/views/jsp/ui/FormTag.java 4 Nov 2003 06:47:45 -0000 1.7 +++ src/java/com/opensymphony/webwork/views/jsp/ui/FormTag.java 15 Dec 2003 22:11:04 -0000 @@ -7,16 +7,8 @@ import com.opensymphony.webwork.ServletActionContext; import com.opensymphony.webwork.views.util.UrlHelper; -import com.opensymphony.xwork.ActionContext; import com.opensymphony.xwork.util.OgnlValueStack; -import org.apache.velocity.Template; -import org.apache.velocity.context.Context; - -import java.io.IOException; -import java.io.PrintWriter; -import java.io.Writer; - import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -29,8 +21,8 @@ public class FormTag extends AbstractClosingUITag { //~ Static fields/initializers ///////////////////////////////////////////// - final public static String OPEN_TEMPLATE = "form.vm"; - final public static String TEMPLATE = "form-close.vm"; + final public static String OPEN_TEMPLATE = "form"; + final public static String TEMPLATE = "form-close"; //~ Instance fields //////////////////////////////////////////////////////// Index: src/java/com/opensymphony/webwork/views/jsp/ui/HiddenTag.java =================================================================== RCS file: /cvs/webwork/src/java/com/opensymphony/webwork/views/jsp/ui/HiddenTag.java,v retrieving revision 1.2 diff -u -r1.2 HiddenTag.java --- src/java/com/opensymphony/webwork/views/jsp/ui/HiddenTag.java 17 Oct 2003 15:08:34 -0000 1.2 +++ src/java/com/opensymphony/webwork/views/jsp/ui/HiddenTag.java 15 Dec 2003 22:11:04 -0000 @@ -15,7 +15,7 @@ /** * The name of the default template for the LabelTag */ - final public static String TEMPLATE = "hidden.vm"; + final public static String TEMPLATE = "hidden"; //~ Methods //////////////////////////////////////////////////////////////// Index: src/java/com/opensymphony/webwork/views/jsp/ui/LabelTag.java =================================================================== RCS file: /cvs/webwork/src/java/com/opensymphony/webwork/views/jsp/ui/LabelTag.java,v retrieving revision 1.2 diff -u -r1.2 LabelTag.java --- src/java/com/opensymphony/webwork/views/jsp/ui/LabelTag.java 17 Oct 2003 15:08:34 -0000 1.2 +++ src/java/com/opensymphony/webwork/views/jsp/ui/LabelTag.java 15 Dec 2003 22:11:04 -0000 @@ -15,7 +15,7 @@ /** * The name of the default template for the LabelTag */ - final public static String TEMPLATE = "label.vm"; + final public static String TEMPLATE = "label"; //~ Methods //////////////////////////////////////////////////////////////// Index: src/java/com/opensymphony/webwork/views/jsp/ui/PasswordTag.java =================================================================== RCS file: /cvs/webwork/src/java/com/opensymphony/webwork/views/jsp/ui/PasswordTag.java,v retrieving revision 1.5 diff -u -r1.5 PasswordTag.java --- src/java/com/opensymphony/webwork/views/jsp/ui/PasswordTag.java 4 Nov 2003 06:47:45 -0000 1.5 +++ src/java/com/opensymphony/webwork/views/jsp/ui/PasswordTag.java 15 Dec 2003 22:11:04 -0000 @@ -17,7 +17,7 @@ /** * The name of the default template for the PasswordTag */ - final public static String TEMPLATE = "password.vm"; + final public static String TEMPLATE = "password"; //~ Instance fields //////////////////////////////////////////////////////// Index: src/java/com/opensymphony/webwork/views/jsp/ui/RadioTag.java =================================================================== RCS file: /cvs/webwork/src/java/com/opensymphony/webwork/views/jsp/ui/RadioTag.java,v retrieving revision 1.3 diff -u -r1.3 RadioTag.java --- src/java/com/opensymphony/webwork/views/jsp/ui/RadioTag.java 24 Oct 2003 06:12:26 -0000 1.3 +++ src/java/com/opensymphony/webwork/views/jsp/ui/RadioTag.java 15 Dec 2003 22:11:04 -0000 @@ -15,7 +15,7 @@ /** * The name of the default template for the RadioTag */ - final public static String TEMPLATE = "radiomap.vm"; + final public static String TEMPLATE = "radiomap"; //~ Methods //////////////////////////////////////////////////////////////// Index: src/java/com/opensymphony/webwork/views/jsp/ui/SelectTag.java =================================================================== RCS file: /cvs/webwork/src/java/com/opensymphony/webwork/views/jsp/ui/SelectTag.java,v retrieving revision 1.11 diff -u -r1.11 SelectTag.java --- src/java/com/opensymphony/webwork/views/jsp/ui/SelectTag.java 15 Nov 2003 05:56:11 -0000 1.11 +++ src/java/com/opensymphony/webwork/views/jsp/ui/SelectTag.java 15 Dec 2003 22:11:04 -0000 @@ -17,7 +17,7 @@ /** * The name of the default template for the SelectTag */ - final public static String TEMPLATE = "select.vm"; + final public static String TEMPLATE = "select"; //~ Instance fields //////////////////////////////////////////////////////// Index: src/java/com/opensymphony/webwork/views/jsp/ui/SubmitTag.java =================================================================== RCS file: /cvs/webwork/src/java/com/opensymphony/webwork/views/jsp/ui/SubmitTag.java,v retrieving revision 1.5 diff -u -r1.5 SubmitTag.java --- src/java/com/opensymphony/webwork/views/jsp/ui/SubmitTag.java 4 Nov 2003 06:47:45 -0000 1.5 +++ src/java/com/opensymphony/webwork/views/jsp/ui/SubmitTag.java 15 Dec 2003 22:11:04 -0000 @@ -17,7 +17,7 @@ /** * The name of the default template for the LabelTag */ - final public static String TEMPLATE = "submit.vm"; + final public static String TEMPLATE = "submit"; //~ Instance fields //////////////////////////////////////////////////////// Index: src/java/com/opensymphony/webwork/views/jsp/ui/TabbedPaneTag.java =================================================================== RCS file: /cvs/webwork/src/java/com/opensymphony/webwork/views/jsp/ui/TabbedPaneTag.java,v retrieving revision 1.3 diff -u -r1.3 TabbedPaneTag.java --- src/java/com/opensymphony/webwork/views/jsp/ui/TabbedPaneTag.java 19 Nov 2003 06:41:41 -0000 1.3 +++ src/java/com/opensymphony/webwork/views/jsp/ui/TabbedPaneTag.java 15 Dec 2003 22:11:04 -0000 @@ -21,7 +21,7 @@ */ public class TabbedPaneTag extends ComponentTag { - private final static String TEMPLATE = "tabbedpane.vm"; + private final static String TEMPLATE = "tabbedpane"; // Protected -------------------------------------------------------- protected TabbedPane tabPane; Index: src/java/com/opensymphony/webwork/views/jsp/ui/TextFieldTag.java =================================================================== RCS file: /cvs/webwork/src/java/com/opensymphony/webwork/views/jsp/ui/TextFieldTag.java,v retrieving revision 1.10 diff -u -r1.10 TextFieldTag.java --- src/java/com/opensymphony/webwork/views/jsp/ui/TextFieldTag.java 9 Dec 2003 14:00:52 -0000 1.10 +++ src/java/com/opensymphony/webwork/views/jsp/ui/TextFieldTag.java 15 Dec 2003 22:11:04 -0000 @@ -6,8 +6,6 @@ import com.opensymphony.xwork.util.OgnlValueStack; -import javax.servlet.jsp.JspException; - /** * @author $Author: mbogaert $ @@ -19,7 +17,7 @@ /** * The name of the default template for the TextFieldTag */ - final public static String TEMPLATE = "text.vm"; + final public static String TEMPLATE = "text"; //~ Instance fields //////////////////////////////////////////////////////// @@ -48,7 +46,7 @@ public void evaluateExtraParams(OgnlValueStack stack) { super.evaluateExtraParams(stack); - + if (sizeAttr != null) { addParam("size", findValue(sizeAttr, String.class)); } Index: src/java/com/opensymphony/webwork/views/jsp/ui/TextareaTag.java =================================================================== RCS file: /cvs/webwork/src/java/com/opensymphony/webwork/views/jsp/ui/TextareaTag.java,v retrieving revision 1.9 diff -u -r1.9 TextareaTag.java --- src/java/com/opensymphony/webwork/views/jsp/ui/TextareaTag.java 9 Dec 2003 14:00:52 -0000 1.9 +++ src/java/com/opensymphony/webwork/views/jsp/ui/TextareaTag.java 15 Dec 2003 22:11:05 -0000 @@ -17,7 +17,7 @@ /** * The name of the default template for the TextareaTag */ - final public static String TEMPLATE = "textarea.vm"; + final public static String TEMPLATE = "textarea"; //~ Instance fields //////////////////////////////////////////////////////// Index: src/java/com/opensymphony/webwork/views/jsp/ui/TokenTag.java =================================================================== RCS file: /cvs/webwork/src/java/com/opensymphony/webwork/views/jsp/ui/TokenTag.java,v retrieving revision 1.13 diff -u -r1.13 TokenTag.java --- src/java/com/opensymphony/webwork/views/jsp/ui/TokenTag.java 19 Nov 2003 04:39:13 -0000 1.13 +++ src/java/com/opensymphony/webwork/views/jsp/ui/TokenTag.java 15 Dec 2003 22:11:05 -0000 @@ -18,7 +18,7 @@ public class TokenTag extends AbstractUITag { //~ Static fields/initializers ///////////////////////////////////////////// - final public static String TEMPLATE = "token.vm"; + final public static String TEMPLATE = "token"; //~ Methods //////////////////////////////////////////////////////////////// Index: src/test/com/opensymphony/webwork/views/jsp/AbstractUITagTest.java =================================================================== RCS file: /cvs/webwork/src/test/com/opensymphony/webwork/views/jsp/AbstractUITagTest.java,v retrieving revision 1.5 diff -u -r1.5 AbstractUITagTest.java --- src/test/com/opensymphony/webwork/views/jsp/AbstractUITagTest.java 19 Nov 2003 04:39:14 -0000 1.5 +++ src/test/com/opensymphony/webwork/views/jsp/AbstractUITagTest.java 15 Dec 2003 22:11:05 -0000 @@ -4,154 +4,19 @@ */ package com.opensymphony.webwork.views.jsp; -import com.mockobjects.dynamic.C; -import com.mockobjects.dynamic.Mock; - -import com.mockobjects.servlet.MockServletConfig; - -import com.opensymphony.webwork.ServletActionContext; -import com.opensymphony.webwork.views.velocity.VelocityManager; - -import org.apache.velocity.app.Velocity; - -import java.io.File; -import java.io.InputStream; - -import java.net.URL; - -import java.util.Properties; -import java.util.StringTokenizer; - -import javax.servlet.ServletContext; +import com.opensymphony.webwork.views.jsp.template.AbstractTemplateTagTest; +import com.opensymphony.webwork.views.jsp.ui.AbstractUITag; /** * @version $Id: AbstractUITagTest.java,v 1.5 2003/11/19 04:39:14 plightbo Exp $ * @author Matt Ho <matt@indigoegg.com> */ -public abstract class AbstractUITagTest extends AbstractTagTest { - //~ Methods //////////////////////////////////////////////////////////////// - - /** - * Attempt to verify the contents of this.writer against the contents of the URL specified. verify() performs a - * trim on both ends - * @param url the HTML snippet that we want to validate against - * @throws Exception if the validation failed - */ - public void verify(URL url) throws Exception { - if (url == null) { - fail("unable to verify a null URL"); - } else if (this.writer == null) { - fail("AbstractJspWriter.writer not initialized. Unable to verify"); - } - - StringBuffer buffer = new StringBuffer(128); - InputStream in = url.openStream(); - byte[] buf = new byte[4096]; - int nbytes; - - while ((nbytes = in.read(buf)) > 0) { - buffer.append(new String(buf, 0, nbytes)); - } - - in.close(); - - /** - * compare the trimmed values of each buffer and make sure they're equivalent. however, let's make sure to - * normalize the strings first to account for line termination differences between platforms. - */ - String writerString = normalize(writer.getBuffer()); - String bufferString = normalize(buffer); - - if (!writerString.equals(bufferString)) { - StringBuffer gripe = new StringBuffer((writerString.length() * 2) + 64); - gripe.append("\r\n"); - gripe.append("expected: ").append(bufferString).append("\r\n"); - gripe.append("actual: ").append(writerString).append("\r\n"); - gripe.append("file: ").append(url.toExternalForm()).append("\r\n"); - fail(gripe.toString()); - } - } +public abstract class AbstractUITagTest extends AbstractTemplateTagTest { protected void setUp() throws Exception { - Properties props = new Properties(); - props.setProperty("resource.loader", "file1,file2"); - - // adding src/java to the Velocity load path - props.setProperty("file1.resource.loader.description", "Velocity File Resource Loader"); - props.setProperty("file1.resource.loader.class", "org.apache.velocity.runtime.resource.loader.FileResourceLoader"); - props.setProperty("file1.resource.loader.path", System.getProperty("webwork.webapp.path", new File("src/java").getAbsolutePath())); - props.setProperty("file1.resource.loader.cache", "false"); - props.setProperty("file1.resource.loader.modificationCheckInterval", "2"); - - // adding src/test to the Velocity load path - props.setProperty("file2.resource.loader.description", "Velocity File Resource Loader"); - props.setProperty("file2.resource.loader.class", "org.apache.velocity.runtime.resource.loader.FileResourceLoader"); - props.setProperty("file2.resource.loader.path", System.getProperty("webwork.webapp.path", new File("src/test").getAbsolutePath())); - props.setProperty("file2.resource.loader.cache", "false"); - props.setProperty("file2.resource.loader.modificationCheckInterval", "2"); - - props.setProperty("class.resource.loader.description", "Velocity Classpath Resource Loader"); - props.setProperty("class.resource.loader.class", "com.opensymphony.webwork.views.velocity.WebWorkResourceLoader"); - - try { - Velocity.init(props); - } catch (Exception e) { - e.printStackTrace(); //To change body of catch statement use Options | File Templates. - } - - Mock mockServletContext = new Mock(ServletContext.class); - mockServletContext.matchAndReturn("getRealPath", C.ANY_ARGS, new File("nosuchfile.properties").getAbsolutePath()); - - ServletContext servletContext = (ServletContext) mockServletContext.proxy(); - - // ensure that the VelocityManager has been initialized prior to any work going on! - VelocityManager.getInstance().init(servletContext); - - MockServletConfig config = new MockServletConfig(); - - config.setServletContext(servletContext); - config.setInitParameter("resource.loader", "file1,file2"); - - // adding src/java to the Velocity load path - config.setInitParameter("file1.resource.loader.description", "Velocity File Resource Loader"); - config.setInitParameter("file1.resource.loader.class", "org.apache.velocity.runtime.resource.loader.FileResourceLoader"); - config.setInitParameter("file1.resource.loader.path", System.getProperty("webwork.webapp.path", new File("src/java").getAbsolutePath())); - config.setInitParameter("file1.resource.loader.cache", "false"); - config.setInitParameter("file1.resource.loader.modificationCheckInterval", "2"); - - // adding src/test to the Velocity load path - config.setInitParameter("file2.resource.loader.description", "Velocity File Resource Loader"); - config.setInitParameter("file2.resource.loader.class", "org.apache.velocity.runtime.resource.loader.FileResourceLoader"); - config.setInitParameter("file2.resource.loader.path", System.getProperty("webwork.webapp.path", new File("src/test").getAbsolutePath())); - config.setInitParameter("file2.resource.loader.cache", "false"); - config.setInitParameter("file2.resource.loader.modificationCheckInterval", "2"); - - config.setInitParameter("class.resource.loader.description", "Velocity Classpath Resource Loader"); - config.setInitParameter("class.resource.loader.class", "com.opensymphony.webwork.views.velocity.WebWorkResourceLoader"); - ServletActionContext.setServletConfig(config); - + THEME = "/template/xhtml/"; + SUFFIX = "vm"; super.setUp(); - } - - /** - * normalizes a string so that strings generated on different platforms can be compared. any group of one or more - * space, tab, \r, and \n characters are converted to a single space character - * @param obj the object to be normalized. normalize will perform its operation on obj.toString().trim() ; - * @return the normalized string - */ - private String normalize(Object obj) { - StringTokenizer st = new StringTokenizer(obj.toString().trim(), " \t\r\n"); - StringBuffer buffer = new StringBuffer(128); - - while (st.hasMoreTokens()) { - buffer.append(st.nextToken()); - - if (st.hasMoreTokens()) { - buffer.append(" "); - } - } - - return buffer.toString(); } } Index: src/test/com/opensymphony/webwork/views/jsp/ui/CheckboxListTest.java =================================================================== RCS file: /cvs/webwork/src/test/com/opensymphony/webwork/views/jsp/ui/CheckboxListTest.java,v retrieving revision 1.3 diff -u -r1.3 CheckboxListTest.java --- src/test/com/opensymphony/webwork/views/jsp/ui/CheckboxListTest.java 19 Nov 2003 04:39:14 -0000 1.3 +++ src/test/com/opensymphony/webwork/views/jsp/ui/CheckboxListTest.java 15 Dec 2003 22:11:05 -0000 @@ -26,7 +26,7 @@ //~ Methods //////////////////////////////////////////////////////////////// public void testMultiple() throws Exception { - Template template = Velocity.getTemplate(AbstractUITag.THEME + CheckboxListTag.TEMPLATE); + Template template = Velocity.getTemplate(getTemplate(CheckboxListTag.TEMPLATE)); Assert.assertNotNull(template); // ensure this is a valid decorators TestAction testAction = (TestAction) action; @@ -54,7 +54,7 @@ } public void testSimple() throws Exception { - Template template = Velocity.getTemplate(AbstractUITag.THEME + CheckboxListTag.TEMPLATE); + Template template = Velocity.getTemplate(getTemplate(CheckboxListTag.TEMPLATE)); Assert.assertNotNull(template); // ensure this is a valid decorators TestAction testAction = (TestAction) action; Index: src/test/com/opensymphony/webwork/views/jsp/ui/CheckboxTest.java =================================================================== RCS file: /cvs/webwork/src/test/com/opensymphony/webwork/views/jsp/ui/CheckboxTest.java,v retrieving revision 1.6 diff -u -r1.6 CheckboxTest.java --- src/test/com/opensymphony/webwork/views/jsp/ui/CheckboxTest.java 24 Oct 2003 06:12:27 -0000 1.6 +++ src/test/com/opensymphony/webwork/views/jsp/ui/CheckboxTest.java 15 Dec 2003 22:11:05 -0000 @@ -26,7 +26,7 @@ //~ Methods //////////////////////////////////////////////////////////////// public void testChecked() throws Exception { - Template template = Velocity.getTemplate(AbstractUITag.THEME + CheckboxTag.TEMPLATE); + Template template = Velocity.getTemplate(getTemplate(CheckboxTag.TEMPLATE)); Assert.assertNotNull(template); // ensure this is a valid decorators TestAction testAction = (TestAction) action; @@ -41,10 +41,11 @@ int result = tag.doEndTag(); verify(CheckboxTag.class.getResource("Checkbox-1.txt")); + } public void testCheckedWithError() throws Exception { - Template template = Velocity.getTemplate(AbstractUITag.THEME + CheckboxTag.TEMPLATE); + Template template = Velocity.getTemplate(getTemplate(CheckboxTag.TEMPLATE)); Assert.assertNotNull(template); // ensure this is a valid decorators TestAction testAction = (TestAction) action; @@ -64,7 +65,7 @@ } public void testUnchecked() throws Exception { - Template template = Velocity.getTemplate(AbstractUITag.THEME + CheckboxTag.TEMPLATE); + Template template = Velocity.getTemplate(getTemplate(CheckboxTag.TEMPLATE)); Assert.assertNotNull(template); // ensure this is a valid decorators TestAction testAction = (TestAction) action; Index: src/test/com/opensymphony/webwork/views/jsp/ui/ComboBoxTest.java =================================================================== RCS file: /cvs/webwork/src/test/com/opensymphony/webwork/views/jsp/ui/ComboBoxTest.java,v retrieving revision 1.2 diff -u -r1.2 ComboBoxTest.java --- src/test/com/opensymphony/webwork/views/jsp/ui/ComboBoxTest.java 15 Nov 2003 05:56:12 -0000 1.2 +++ src/test/com/opensymphony/webwork/views/jsp/ui/ComboBoxTest.java 15 Dec 2003 22:11:05 -0000 @@ -26,7 +26,7 @@ //~ Methods //////////////////////////////////////////////////////////////// public void testSimple() throws Exception { - Template template = Velocity.getTemplate(AbstractUITag.THEME + ComboBoxTag.TEMPLATE); + Template template = Velocity.getTemplate(getTemplate(ComboBoxTag.TEMPLATE)); Assert.assertNotNull(template); // ensure this is a valid decorators TestAction testAction = (TestAction) action; Index: src/test/com/opensymphony/webwork/views/jsp/ui/FileTest.java =================================================================== RCS file: /cvs/webwork/src/test/com/opensymphony/webwork/views/jsp/ui/FileTest.java,v retrieving revision 1.3 diff -u -r1.3 FileTest.java --- src/test/com/opensymphony/webwork/views/jsp/ui/FileTest.java 18 Oct 2003 03:40:18 -0000 1.3 +++ src/test/com/opensymphony/webwork/views/jsp/ui/FileTest.java 15 Dec 2003 22:11:06 -0000 @@ -27,7 +27,7 @@ //~ Methods //////////////////////////////////////////////////////////////// public void testSimple() throws Exception { - Template template = Velocity.getTemplate(AbstractUITag.THEME + FileTag.TEMPLATE); + Template template = Velocity.getTemplate(getTemplate(FileTag.TEMPLATE)); Assert.assertNotNull(template); // ensure this is a valid decorators TestAction testAction = (TestAction) action; Index: src/test/com/opensymphony/webwork/views/jsp/ui/FormTagTest.java =================================================================== RCS file: /cvs/webwork/src/test/com/opensymphony/webwork/views/jsp/ui/FormTagTest.java,v retrieving revision 1.4 diff -u -r1.4 FormTagTest.java --- src/test/com/opensymphony/webwork/views/jsp/ui/FormTagTest.java 18 Oct 2003 03:40:18 -0000 1.4 +++ src/test/com/opensymphony/webwork/views/jsp/ui/FormTagTest.java 15 Dec 2003 22:11:06 -0000 @@ -22,7 +22,7 @@ //~ Methods //////////////////////////////////////////////////////////////// public void testForm() throws Exception { - Template template = Velocity.getTemplate(AbstractUITag.THEME + FormTag.TEMPLATE); + Template template = Velocity.getTemplate(getTemplate(FormTag.TEMPLATE)); Assert.assertNotNull(template); // ensure this is a valid decorators TestAction testAction = (TestAction) action; Index: src/test/com/opensymphony/webwork/views/jsp/ui/HiddenTest.java =================================================================== RCS file: /cvs/webwork/src/test/com/opensymphony/webwork/views/jsp/ui/HiddenTest.java,v retrieving revision 1.4 diff -u -r1.4 HiddenTest.java --- src/test/com/opensymphony/webwork/views/jsp/ui/HiddenTest.java 18 Oct 2003 03:40:18 -0000 1.4 +++ src/test/com/opensymphony/webwork/views/jsp/ui/HiddenTest.java 15 Dec 2003 22:11:06 -0000 @@ -22,7 +22,7 @@ //~ Methods //////////////////////////////////////////////////////////////// public void testSimple() throws Exception { - Template template = Velocity.getTemplate(AbstractUITag.THEME + HiddenTag.TEMPLATE); + Template template = Velocity.getTemplate(getTemplate(HiddenTag.TEMPLATE)); Assert.assertNotNull(template); // ensure this is a valid decorators TestAction testAction = (TestAction) action; Index: src/test/com/opensymphony/webwork/views/jsp/ui/LabelTest.java =================================================================== RCS file: /cvs/webwork/src/test/com/opensymphony/webwork/views/jsp/ui/LabelTest.java,v retrieving revision 1.9 diff -u -r1.9 LabelTest.java --- src/test/com/opensymphony/webwork/views/jsp/ui/LabelTest.java 19 Nov 2003 04:42:18 -0000 1.9 +++ src/test/com/opensymphony/webwork/views/jsp/ui/LabelTest.java 15 Dec 2003 22:11:06 -0000 @@ -21,7 +21,7 @@ //~ Methods //////////////////////////////////////////////////////////////// public void testSimple() throws Exception { - Template template = Velocity.getTemplate(AbstractUITag.THEME + LabelTag.TEMPLATE); + Template template = Velocity.getTemplate(getTemplate(LabelTag.TEMPLATE)); Assert.assertNotNull(template); // ensure this is a valid decorators TestAction testAction = (TestAction) action; @@ -39,7 +39,7 @@ } public void testWithNoValue() throws Exception { - Template template = Velocity.getTemplate(AbstractUITag.THEME + LabelTag.TEMPLATE); + Template template = Velocity.getTemplate(getTemplate(LabelTag.TEMPLATE)); Assert.assertNotNull(template); // ensure this is a valid decorators TestAction testAction = (TestAction) action; Index: src/test/com/opensymphony/webwork/views/jsp/ui/PasswordTest.java =================================================================== RCS file: /cvs/webwork/src/test/com/opensymphony/webwork/views/jsp/ui/PasswordTest.java,v retrieving revision 1.6 diff -u -r1.6 PasswordTest.java --- src/test/com/opensymphony/webwork/views/jsp/ui/PasswordTest.java 24 Oct 2003 06:12:27 -0000 1.6 +++ src/test/com/opensymphony/webwork/views/jsp/ui/PasswordTest.java 15 Dec 2003 22:11:06 -0000 @@ -21,7 +21,7 @@ //~ Methods //////////////////////////////////////////////////////////////// public void testSimple() throws Exception { - Template template = Velocity.getTemplate(AbstractUITag.THEME + PasswordTag.TEMPLATE); + Template template = Velocity.getTemplate(getTemplate(PasswordTag.TEMPLATE)); Assert.assertNotNull(template); // ensure this is a valid decorators TestAction testAction = (TestAction) action; Index: src/test/com/opensymphony/webwork/views/jsp/ui/RadioTest.java =================================================================== RCS file: /cvs/webwork/src/test/com/opensymphony/webwork/views/jsp/ui/RadioTest.java,v retrieving revision 1.8 diff -u -r1.8 RadioTest.java --- src/test/com/opensymphony/webwork/views/jsp/ui/RadioTest.java 19 Nov 2003 04:39:14 -0000 1.8 +++ src/test/com/opensymphony/webwork/views/jsp/ui/RadioTest.java 15 Dec 2003 22:11:06 -0000 @@ -23,7 +23,7 @@ //~ Methods //////////////////////////////////////////////////////////////// public void testMapChecked() throws Exception { - Template template = Velocity.getTemplate(AbstractUITag.THEME + RadioTag.TEMPLATE); + Template template = Velocity.getTemplate(getTemplate(RadioTag.TEMPLATE)); Assert.assertNotNull(template); // ensure this is a valid decorators TestAction testAction = (TestAction) action; @@ -49,7 +49,7 @@ } public void testSimple() throws Exception { - Template template = Velocity.getTemplate(AbstractUITag.THEME + RadioTag.TEMPLATE); + Template template = Velocity.getTemplate(getTemplate(RadioTag.TEMPLATE)); Assert.assertNotNull(template); // ensure this is a valid decorators TestAction testAction = (TestAction) action; Index: src/test/com/opensymphony/webwork/views/jsp/ui/SelectTest.java =================================================================== RCS file: /cvs/webwork/src/test/com/opensymphony/webwork/views/jsp/ui/SelectTest.java,v retrieving revision 1.13 diff -u -r1.13 SelectTest.java --- src/test/com/opensymphony/webwork/views/jsp/ui/SelectTest.java 19 Nov 2003 04:39:14 -0000 1.13 +++ src/test/com/opensymphony/webwork/views/jsp/ui/SelectTest.java 15 Dec 2003 22:11:06 -0000 @@ -24,7 +24,7 @@ //~ Methods //////////////////////////////////////////////////////////////// public void testMultiple() throws Exception { - Template template = Velocity.getTemplate(AbstractUITag.THEME + SelectTag.TEMPLATE); + Template template = Velocity.getTemplate(getTemplate(SelectTag.TEMPLATE)); Assert.assertNotNull(template); // ensure this is a valid decorators TestAction testAction = (TestAction) action; @@ -53,7 +53,7 @@ } public void testSimple() throws Exception { - Template template = Velocity.getTemplate(AbstractUITag.THEME + SelectTag.TEMPLATE); + Template template = Velocity.getTemplate(getTemplate(SelectTag.TEMPLATE)); Assert.assertNotNull(template); // ensure this is a valid decorators TestAction testAction = (TestAction) action; Index: src/test/com/opensymphony/webwork/views/jsp/ui/SubmitTest.java =================================================================== RCS file: /cvs/webwork/src/test/com/opensymphony/webwork/views/jsp/ui/SubmitTest.java,v retrieving revision 1.3 diff -u -r1.3 SubmitTest.java --- src/test/com/opensymphony/webwork/views/jsp/ui/SubmitTest.java 18 Oct 2003 03:40:18 -0000 1.3 +++ src/test/com/opensymphony/webwork/views/jsp/ui/SubmitTest.java 15 Dec 2003 22:11:06 -0000 @@ -22,7 +22,7 @@ //~ Methods //////////////////////////////////////////////////////////////// public void testDefaultValues() throws Exception { - Template template = Velocity.getTemplate(AbstractUITag.THEME + SubmitTag.TEMPLATE); + Template template = Velocity.getTemplate(getTemplate(SubmitTag.TEMPLATE)); Assert.assertNotNull(template); // ensure this is a valid decorators TestAction testAction = (TestAction) action; @@ -39,7 +39,7 @@ } public void testSimple() throws Exception { - Template template = Velocity.getTemplate(AbstractUITag.THEME + SubmitTag.TEMPLATE); + Template template = Velocity.getTemplate(getTemplate(SubmitTag.TEMPLATE)); Assert.assertNotNull(template); // ensure this is a valid decorators TestAction testAction = (TestAction) action; Index: src/test/com/opensymphony/webwork/views/jsp/ui/TextareaTest.java =================================================================== RCS file: /cvs/webwork/src/test/com/opensymphony/webwork/views/jsp/ui/TextareaTest.java,v retrieving revision 1.6 diff -u -r1.6 TextareaTest.java --- src/test/com/opensymphony/webwork/views/jsp/ui/TextareaTest.java 24 Oct 2003 06:12:27 -0000 1.6 +++ src/test/com/opensymphony/webwork/views/jsp/ui/TextareaTest.java 15 Dec 2003 22:11:06 -0000 @@ -21,7 +21,7 @@ //~ Methods //////////////////////////////////////////////////////////////// public void testSimple() throws Exception { - Template template = Velocity.getTemplate(AbstractUITag.THEME + TextareaTag.TEMPLATE); + Template template = Velocity.getTemplate(getTemplate(TextareaTag.TEMPLATE)); Assert.assertNotNull(template); // ensure this is a valid decorators TestAction testAction = (TestAction) action; Index: src/test/com/opensymphony/webwork/views/jsp/ui/TextfieldTest.java =================================================================== RCS file: /cvs/webwork/src/test/com/opensymphony/webwork/views/jsp/ui/TextfieldTest.java,v retrieving revision 1.9 diff -u -r1.9 TextfieldTest.java --- src/test/com/opensymphony/webwork/views/jsp/ui/TextfieldTest.java 15 Nov 2003 05:56:12 -0000 1.9 +++ src/test/com/opensymphony/webwork/views/jsp/ui/TextfieldTest.java 15 Dec 2003 22:11:06 -0000 @@ -23,7 +23,7 @@ //~ Methods //////////////////////////////////////////////////////////////// public void testErrors() throws Exception { - Template template = Velocity.getTemplate(AbstractUITag.THEME + TextFieldTag.TEMPLATE); + Template template = Velocity.getTemplate(getTemplate(TextFieldTag.TEMPLATE)); Assert.assertNotNull(template); // ensure this is a valid decorators TestAction testAction = (TestAction) action; @@ -42,7 +42,7 @@ } public void testNoLabel() throws Exception { - Template template = Velocity.getTemplate(AbstractUITag.THEME + TextFieldTag.TEMPLATE); + Template template = Velocity.getTemplate(getTemplate(TextFieldTag.TEMPLATE)); Assert.assertNotNull(template); // ensure this is a valid decorators TestAction testAction = (TestAction) action; @@ -60,7 +60,7 @@ } public void testSimple() throws Exception { - Template template = Velocity.getTemplate(AbstractUITag.THEME + TextFieldTag.TEMPLATE); + Template template = Velocity.getTemplate(getTemplate(TextFieldTag.TEMPLATE)); Assert.assertNotNull(template); // ensure this is a valid decorators TestAction testAction = (TestAction) action; Index: src/webapp/tags.jsp =================================================================== RCS file: /cvs/webwork/src/webapp/tags.jsp,v retrieving revision 1.9 diff -u -r1.9 tags.jsp --- src/webapp/tags.jsp 15 Nov 2003 17:17:30 -0000 1.9 +++ src/webapp/tags.jsp 15 Dec 2003 22:11:07 -0000 @@ -12,7 +12,7 @@ - + ms