Author: mrdon
Date: Wed Apr 12 11:31:57 2006
New Revision: 393568
URL: http://svn.apache.org/viewcvs?rev=393568&view=rev
Log:
Renaming showcase webwork.properties, fixing error template to handle when
column number is at the end of line
Added:
incubator/webwork2/webapps/showcase/src/main/webapp/WEB-INF/classes/struts.properties
- copied, changed from r393559,
incubator/webwork2/webapps/showcase/src/main/webapp/WEB-INF/classes/webwork.properties
Removed:
incubator/webwork2/webapps/showcase/src/main/webapp/WEB-INF/classes/webwork.properties
Modified:
incubator/webwork2/action/src/main/resources/org/apache/struts/action2/dispatcher/error.ftl
Modified:
incubator/webwork2/action/src/main/resources/org/apache/struts/action2/dispatcher/error.ftl
URL:
http://svn.apache.org/viewcvs/incubator/webwork2/action/src/main/resources/org/apache/struts/action2/dispatcher/error.ftl?rev=393568&r1=393567&r2=393568&view=diff
==============================================================================
---
incubator/webwork2/action/src/main/resources/org/apache/struts/action2/dispatcher/error.ftl
(original)
+++
incubator/webwork2/action/src/main/resources/org/apache/struts/action2/dispatcher/error.ftl
Wed Apr 12 11:31:57 2006
@@ -21,7 +21,7 @@
<td>
<#if (msgs?size > 1)>
<ol>
- <#list msgs as mgs>
+ <#list msgs as msg>
<li>${msg}</li>
</#list>
</ol>
@@ -56,7 +56,7 @@
<#list snippet as line>
<#if (line_index == 2)>
- <pre
style="background:yellow">${(line[0..(exception.location.columnNumber-2)]?html)}<span
style="background:red">${(line[(exception.location.columnNumber-1)]?html)}</span>${(line[exception.location.columnNumber..]?html)}</pre>
+ <pre
style="background:yellow">${(line[0..(exception.location.columnNumber-3)]?html)}<span
style="background:red">${(line[(exception.location.columnNumber-2)]?html)}</span><#if
((exception.location.columnNumber)>line.length())>${(line[(exception.location.columnNumber-1)..]?html)}</#if></pre>
<#else>
<pre>${line?html}</pre>
</#if>
Copied:
incubator/webwork2/webapps/showcase/src/main/webapp/WEB-INF/classes/struts.properties
(from r393559,
incubator/webwork2/webapps/showcase/src/main/webapp/WEB-INF/classes/webwork.properties)
URL:
http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/main/webapp/WEB-INF/classes/struts.properties?p2=incubator/webwork2/webapps/showcase/src/main/webapp/WEB-INF/classes/struts.properties&p1=incubator/webwork2/webapps/showcase/src/main/webapp/WEB-INF/classes/webwork.properties&r1=393559&r2=393568&rev=393568&view=diff
==============================================================================
---
incubator/webwork2/webapps/showcase/src/main/webapp/WEB-INF/classes/webwork.properties
(original)
+++
incubator/webwork2/webapps/showcase/src/main/webapp/WEB-INF/classes/struts.properties
Wed Apr 12 11:31:57 2006
@@ -1,8 +1,8 @@
-webwork.i18n.reload=true
-webwork.devMode = true
-webwork.configuration.xml.reload=true
-webwork.continuations.package = org.apache.struts.action2.showcase
-webwork.objectFactory = spring
-webwork.custom.i18n.resources=globalMessages
-#webwork.action.extension=jspa
-webwork.url.http.port = 8080
+struts.i18n.reload=true
+struts.devMode = true
+struts.configuration.xml.reload=true
+struts.continuations.package = org.apache.struts.action2.showcase
+struts.objectFactory = spring
+struts.custom.i18n.resources=globalMessages
+#struts.action.extension=jspa
+struts.url.http.port = 8080
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
