Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/AdapterFactory.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/AdapterFactory.java?rev=439738&r1=439737&r2=439738&view=diff ============================================================================== --- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/AdapterFactory.java (original) +++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/AdapterFactory.java Sun Sep 3 00:54:09 2006 @@ -17,12 +17,17 @@ */ package org.apache.struts2.views.xslt; -import org.apache.struts2.StrutsException; -import org.w3c.dom.*; - -import java.util.Map; -import java.util.HashMap; import java.util.Collection; +import java.util.HashMap; +import java.util.Map; + +import org.apache.struts2.StrutsException; +import org.w3c.dom.Attr; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.NamedNodeMap; +import org.w3c.dom.Node; +import org.w3c.dom.Text; /** * AdapterFactory produces Node adapters for Java object types.
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/ArrayAdapter.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/ArrayAdapter.java?rev=439738&r1=439737&r2=439738&view=diff ============================================================================== --- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/ArrayAdapter.java (original) +++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/ArrayAdapter.java Sun Sep 3 00:54:09 2006 @@ -17,12 +17,12 @@ */ package org.apache.struts2.views.xslt; +import java.util.ArrayList; +import java.util.List; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.w3c.dom.Node; - -import java.util.ArrayList; -import java.util.List; /** Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/BeanAdapter.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/BeanAdapter.java?rev=439738&r1=439737&r2=439738&view=diff ============================================================================== --- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/BeanAdapter.java (original) +++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/BeanAdapter.java Sun Sep 3 00:54:09 2006 @@ -17,21 +17,21 @@ */ package org.apache.struts2.views.xslt; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.apache.struts2.StrutsException; -import org.w3c.dom.NodeList; -import org.w3c.dom.Node; - import java.beans.IntrospectionException; import java.beans.Introspector; import java.beans.PropertyDescriptor; -import java.lang.reflect.Method; import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.struts2.StrutsException; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; /** Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/CollectionAdapter.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/CollectionAdapter.java?rev=439738&r1=439737&r2=439738&view=diff ============================================================================== --- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/CollectionAdapter.java (original) +++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/CollectionAdapter.java Sun Sep 3 00:54:09 2006 @@ -17,14 +17,13 @@ */ package org.apache.struts2.views.xslt; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.w3c.dom.Node; - import java.util.ArrayList; import java.util.Collection; -import java.util.Iterator; import java.util.List; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.w3c.dom.Node; /** Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/MapAdapter.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/MapAdapter.java?rev=439738&r1=439737&r2=439738&view=diff ============================================================================== --- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/MapAdapter.java (original) +++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/MapAdapter.java Sun Sep 3 00:54:09 2006 @@ -17,11 +17,11 @@ */ package org.apache.struts2.views.xslt; -import org.w3c.dom.Node; - -import java.util.Map; -import java.util.List; import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +import org.w3c.dom.Node; /** * MapAdapter adapters a java.util.Map type to an XML DOM with the following Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/ProxyElementAdapter.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/ProxyElementAdapter.java?rev=439738&r1=439737&r2=439738&view=diff ============================================================================== --- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/ProxyElementAdapter.java (original) +++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/ProxyElementAdapter.java Sun Sep 3 00:54:09 2006 @@ -17,12 +17,17 @@ */ package org.apache.struts2.views.xslt; -import org.w3c.dom.*; +import java.util.ArrayList; +import java.util.List; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; - -import java.util.List; -import java.util.ArrayList; +import org.w3c.dom.Attr; +import org.w3c.dom.DOMException; +import org.w3c.dom.Element; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; +import org.w3c.dom.TypeInfo; /** * ProxyElementAdapter is a pass-through adapter for objects which already Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/ProxyNamedNodeMap.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/ProxyNamedNodeMap.java?rev=439738&r1=439737&r2=439738&view=diff ============================================================================== --- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/ProxyNamedNodeMap.java (original) +++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/ProxyNamedNodeMap.java Sun Sep 3 00:54:09 2006 @@ -17,9 +17,9 @@ */ package org.apache.struts2.views.xslt; +import org.w3c.dom.DOMException; import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; -import org.w3c.dom.DOMException; /** * A NamedNodeMap that wraps the Nodes returned in their proxies. Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/ProxyNodeAdapter.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/ProxyNodeAdapter.java?rev=439738&r1=439737&r2=439738&view=diff ============================================================================== --- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/ProxyNodeAdapter.java (original) +++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/ProxyNodeAdapter.java Sun Sep 3 00:54:09 2006 @@ -19,9 +19,9 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.w3c.dom.Node; -import org.w3c.dom.NamedNodeMap; import org.w3c.dom.DOMException; +import org.w3c.dom.NamedNodeMap; +import org.w3c.dom.Node; /** * ProxyNodeAdapter is a read-only delegating adapter for objects which already Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/ProxyTextNodeAdapter.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/ProxyTextNodeAdapter.java?rev=439738&r1=439737&r2=439738&view=diff ============================================================================== --- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/ProxyTextNodeAdapter.java (original) +++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/ProxyTextNodeAdapter.java Sun Sep 3 00:54:09 2006 @@ -17,8 +17,8 @@ */ package org.apache.struts2.views.xslt; -import org.w3c.dom.Text; import org.w3c.dom.DOMException; +import org.w3c.dom.Text; /** * ProxyTextNodeAdapter is a pass-through adapter for objects which already Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/ServletURIResolver.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/ServletURIResolver.java?rev=439738&r1=439737&r2=439738&view=diff ============================================================================== --- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/ServletURIResolver.java (original) +++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/ServletURIResolver.java Sun Sep 3 00:54:09 2006 @@ -17,19 +17,20 @@ */ package org.apache.struts2.views.xslt; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import java.io.InputStream; import javax.servlet.ServletContext; import javax.xml.transform.Source; import javax.xml.transform.TransformerException; import javax.xml.transform.URIResolver; import javax.xml.transform.stream.StreamSource; -import java.io.InputStream; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; /** - * ServletURIResolver is a URIResolver that can retrieve resources from the servlet context using the scheme "response". + * ServletURIResolver is a URIResolver that can retrieve resources from the servlet context using the scheme "res". * e.g. * * A URI resolver is called when a stylesheet uses an xsl:include, xsl:import, or document() function to find the @@ -38,7 +39,7 @@ public class ServletURIResolver implements URIResolver { private Log log = LogFactory.getLog(getClass()); - static final String PROTOCOL = "response:"; + static final String PROTOCOL = "res:"; private ServletContext sc; Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/SimpleAdapterDocument.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/SimpleAdapterDocument.java?rev=439738&r1=439737&r2=439738&view=diff ============================================================================== --- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/SimpleAdapterDocument.java (original) +++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/SimpleAdapterDocument.java Sun Sep 3 00:54:09 2006 @@ -17,11 +17,25 @@ */ package org.apache.struts2.views.xslt; -import org.w3c.dom.*; -import org.apache.struts2.StrutsException; - -import java.util.List; import java.util.Arrays; +import java.util.List; + +import org.apache.struts2.StrutsException; +import org.w3c.dom.Attr; +import org.w3c.dom.CDATASection; +import org.w3c.dom.Comment; +import org.w3c.dom.DOMConfiguration; +import org.w3c.dom.DOMException; +import org.w3c.dom.DOMImplementation; +import org.w3c.dom.Document; +import org.w3c.dom.DocumentFragment; +import org.w3c.dom.DocumentType; +import org.w3c.dom.Element; +import org.w3c.dom.EntityReference; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; +import org.w3c.dom.ProcessingInstruction; +import org.w3c.dom.Text; /** * SimpleAdapterDocument adapted a Java object and presents it as Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/SimpleNodeList.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/SimpleNodeList.java?rev=439738&r1=439737&r2=439738&view=diff ============================================================================== --- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/SimpleNodeList.java (original) +++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/SimpleNodeList.java Sun Sep 3 00:54:09 2006 @@ -17,12 +17,12 @@ */ package org.apache.struts2.views.xslt; -import org.w3c.dom.NodeList; -import org.w3c.dom.Node; +import java.util.List; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; - -import java.util.List; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; public class SimpleNodeList implements NodeList { Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/StringAdapter.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/StringAdapter.java?rev=439738&r1=439737&r2=439738&view=diff ============================================================================== --- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/StringAdapter.java (original) +++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/StringAdapter.java Sun Sep 3 00:54:09 2006 @@ -17,19 +17,19 @@ */ package org.apache.struts2.views.xslt; +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; + +import javax.xml.parsers.ParserConfigurationException; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.struts2.StrutsException; import org.w3c.dom.Node; import org.xml.sax.SAXException; -import java.util.List; -import java.util.ArrayList; -import java.io.IOException; - import com.opensymphony.util.XMLUtils; - -import javax.xml.parsers.ParserConfigurationException; /** * StringAdapter adapts a Java String value to a DOM Element with the specified Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/XSLTResult.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/XSLTResult.java?rev=439738&r1=439737&r2=439738&view=diff ============================================================================== --- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/XSLTResult.java (original) +++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/XSLTResult.java Sun Sep 3 00:54:09 2006 @@ -17,27 +17,35 @@ */ package org.apache.struts2.views.xslt; +import java.io.IOException; +import java.io.PrintWriter; +import java.io.Writer; +import java.net.URL; +import java.util.HashMap; +import java.util.Map; + +import javax.servlet.http.HttpServletResponse; +import javax.xml.transform.OutputKeys; +import javax.xml.transform.Source; +import javax.xml.transform.Templates; +import javax.xml.transform.Transformer; +import javax.xml.transform.TransformerException; +import javax.xml.transform.TransformerFactory; +import javax.xml.transform.URIResolver; +import javax.xml.transform.dom.DOMSource; +import javax.xml.transform.stream.StreamResult; +import javax.xml.transform.stream.StreamSource; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.apache.struts2.ServletActionContext; import org.apache.struts2.config.Settings; + import com.opensymphony.xwork2.ActionContext; import com.opensymphony.xwork2.ActionInvocation; import com.opensymphony.xwork2.Result; import com.opensymphony.xwork2.util.OgnlValueStack; import com.opensymphony.xwork2.util.TextParseUtil; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import javax.servlet.http.HttpServletResponse; -import javax.xml.transform.*; -import javax.xml.transform.dom.DOMSource; -import javax.xml.transform.stream.StreamResult; -import javax.xml.transform.stream.StreamSource; -import java.io.IOException; -import java.io.PrintWriter; -import java.io.Writer; -import java.net.URL; -import java.util.HashMap; -import java.util.Map; /** @@ -179,6 +187,10 @@ */ public class XSLTResult implements Result { + /** + * + */ + private static final long serialVersionUID = 6424691441777176763L; private static final Log log = LogFactory.getLog(XSLTResult.class); public static final String DEFAULT_PARAM = "stylesheetLocation"; Modified: struts/struts2/trunk/core/src/main/resources/config-browser/actionNames.ftl URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/config-browser/actionNames.ftl?rev=439738&r1=439737&r2=439738&view=diff ============================================================================== --- struts/struts2/trunk/core/src/main/resources/config-browser/actionNames.ftl (original) +++ struts/struts2/trunk/core/src/main/resources/config-browser/actionNames.ftl Sun Sep 3 00:54:09 2006 @@ -6,10 +6,10 @@ <td> <ul> <#list actionNames as name> - <@s.url id="showConfig" action="showConfig" includeParams="none"> - <@s.param name="namespace">${namespace}</@s.param> - <@s.param name="actionName">${name}</@s.param> - </@s.url> + <@saf.url id="showConfig" action="showConfig" includeParams="none"> + <@saf.param name="namespace">${namespace}</@saf.param> + <@saf.param name="actionName">${name}</@saf.param> + </@saf.url> <li><a href="${showConfig}">${name}</a></li> </#list> </ul> Modified: struts/struts2/trunk/core/src/main/resources/config-browser/page-header.ftl URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/config-browser/page-header.ftl?rev=439738&r1=439737&r2=439738&view=diff ============================================================================== --- struts/struts2/trunk/core/src/main/resources/config-browser/page-header.ftl (original) +++ struts/struts2/trunk/core/src/main/resources/config-browser/page-header.ftl Sun Sep 3 00:54:09 2006 @@ -27,12 +27,12 @@ --> <div id="projecttools" class="toolgroup"> <#if namespaces?exists> <div class="label"><strong>Namespaces</strong></div> <div class="body"> - <#foreach namespace in namespaces> <div><@s.url id="namespaceLink" action="actionNames" includeParams="none"><@s.param name="namespace">${namespace}</@s.param></@s.url><a href="${namespaceLink}"><#if namespace == ""> default <#else> ${namespace} </#if></a></div> + <#foreach namespace in namespaces> <div><@saf.url id="namespaceLink" action="actionNames" includeParams="none"><@saf.param name="namespace">${namespace}</@saf.param></@saf.url><a href="${namespaceLink}"><#if namespace == ""> default <#else> ${namespace} </#if></a></div> </#foreach> </div> </#if> </div> <div class="toolgroup"> <#if actionNames?exists> <div class="label"><strong>Actions in <#if namespace == ""> default <#else> ${namespace} </#if></strong></div> - <#foreach name in actionNames> <div><@s.url id="actionLink" action="showConfig" includeParams="none"><@s.param name="namespace">${namespace}</@s.param><@s.param name="actionName">${name}</@s.param></@s.url><a href="${actionLink}">${name}</a></div> + <#foreach name in actionNames> <div><@saf.url id="actionLink" action="showConfig" includeParams="none"><@saf.param name="namespace">${namespace}</@saf.param><@saf.param name="actionName">${name}</@saf.param></@saf.url><a href="${actionLink}">${name}</a></div> </#foreach> </#if> </div> </div> </td> Modified: struts/struts2/trunk/core/src/main/resources/config-browser/showConfig.ftl URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/config-browser/showConfig.ftl?rev=439738&r1=439737&r2=439738&view=diff ============================================================================== --- struts/struts2/trunk/core/src/main/resources/config-browser/showConfig.ftl (original) +++ struts/struts2/trunk/core/src/main/resources/config-browser/showConfig.ftl Sun Sep 3 00:54:09 2006 @@ -19,10 +19,10 @@ </table> <!-- URLTag is faulty --> -<@s.url id="url" action="showConfig" includeParams="none"> - <@s.param name="namespace">${namespace}</@s.param> - <@s.param name="actionName">${actionName}</@s.param> -</@s.url> +<@saf.url id="url" action="showConfig" includeParams="none"> + <@saf.param name="namespace">${namespace}</@saf.param> + <@saf.param name="actionName">${actionName}</@saf.param> +</@saf.url> <#assign url = url + "&detailView="> <!-- Set all to false --> <#assign detailsSelected = false> @@ -107,10 +107,10 @@ </#list> </table> <#else> - <@s.action name="showValidators" executeResult="true"> - <@s.param name="clazz" value="'${config.className}'"/> - <@s.param name="context" value="'${namespace}'"/> - </@s.action> + <@saf.action name="showValidators" executeResult="true"> + <@saf.param name="clazz" value="'${config.className}'"/> + <@saf.param name="context" value="'${namespace}'"/> + </@saf.action> </#if> <#call endPage> Modified: struts/struts2/trunk/core/src/main/resources/config-browser/tigris-macros.ftl URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/config-browser/tigris-macros.ftl?rev=439738&r1=439737&r2=439738&view=diff ============================================================================== --- struts/struts2/trunk/core/src/main/resources/config-browser/tigris-macros.ftl (original) +++ struts/struts2/trunk/core/src/main/resources/config-browser/tigris-macros.ftl Sun Sep 3 00:54:09 2006 @@ -70,10 +70,10 @@ <strong>${caption}</strong></p> ${message} <#if errors?exists> - <@s.iterator id="e" value="errors"> + <@saf.iterator id="e" value="errors"> <#assign e = stack.findString('top') /> <#call error(e)> - </@s.iterator> + </@saf.iterator> </#if> </p> </div> Modified: struts/struts2/trunk/core/src/main/resources/org/apache/struts2/default.properties URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/org/apache/struts2/default.properties?rev=439738&r1=439737&r2=439738&view=diff ============================================================================== --- struts/struts2/trunk/core/src/main/resources/org/apache/struts2/default.properties (original) +++ struts/struts2/trunk/core/src/main/resources/org/apache/struts2/default.properties Sun Sep 3 00:54:09 2006 @@ -71,11 +71,6 @@ ### headers) struts.serve.static.browserCache=true -### Set this to false if you wish to disable all forms of dynamic method invocation -### via the URL request. This includes URLs like foo!bar.action, as well as params -### like method:bar (but not action:foo). See the DefaultActionMapper for more info. -struts.enable.DynamicMethodInvocation = true - ### use alternative syntax that requires %{} in most places ### to evaluate expressions for String attributes for tags struts.tag.altSyntax=true @@ -96,7 +91,7 @@ ### Specifically, it allows for the "action!method" URL syntax ### that allows methods to be specified in the URL. This behavior has been ### deprecated in favor of explicit wildcards where needed. -struts.compatibilityMode.WebWork = false +struts.compatibilityMode = false ### when set to true, resource bundles will be reloaded on _every_ request. ### this is good during development, but should never be used in production Modified: struts/struts2/trunk/core/src/main/resources/org/apache/struts2/dispatcher/error.ftl URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/org/apache/struts2/dispatcher/error.ftl?rev=439738&r1=439737&r2=439738&view=diff ============================================================================== --- struts/struts2/trunk/core/src/main/resources/org/apache/struts2/dispatcher/error.ftl (original) +++ struts/struts2/trunk/core/src/main/resources/org/apache/struts2/dispatcher/error.ftl Sun Sep 3 00:54:09 2006 @@ -5,7 +5,7 @@ <body> <h2>Struts Problem Report</h2> <p> - Struts has detected an unhandled exception: + The Struts has detected an unhandled exception: </p> <#assign msgs = [] /> Modified: struts/struts2/trunk/core/src/main/resources/org/apache/struts2/interceptor/debugging/console.ftl URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/org/apache/struts2/interceptor/debugging/console.ftl?rev=439738&r1=439737&r2=439738&view=diff ============================================================================== --- struts/struts2/trunk/core/src/main/resources/org/apache/struts2/interceptor/debugging/console.ftl (original) +++ struts/struts2/trunk/core/src/main/resources/org/apache/struts2/interceptor/debugging/console.ftl Sun Sep 3 00:54:09 2006 @@ -1,7 +1,7 @@ <html> <head> <script language="javascript"> - var baseUrl = "<@s.url value="/struts" includeParams="none"/>"; + var baseUrl = "<@saf.url value="/struts" includeParams="none"/>"; window.open(baseUrl+"/webconsole.html", 'OGNL Console','width=500,height=450,'+ 'status=no,toolbar=no,menubar=no'); </script> Modified: struts/struts2/trunk/core/src/main/resources/org/apache/struts2/interceptor/wait.ftl URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/org/apache/struts2/interceptor/wait.ftl?rev=439738&r1=439737&r2=439738&view=diff ============================================================================== --- struts/struts2/trunk/core/src/main/resources/org/apache/struts2/interceptor/wait.ftl (original) +++ struts/struts2/trunk/core/src/main/resources/org/apache/struts2/interceptor/wait.ftl Sun Sep 3 00:54:09 2006 @@ -1,6 +1,6 @@ <html> <head> - <meta http-equiv="refresh" content="5;url=<@s.url includeParams="none"/>"/> + <meta http-equiv="refresh" content="5;url=<@saf.url includeParams="none"/>"/> </head> <body> Please wait while we process your request...
