Author: mrdon
Date: Wed Apr 12 12:34:15 2006
New Revision: 393584
URL: http://svn.apache.org/viewcvs?rev=393584&view=rev
Log:
Fixed compile-optional to include new thirdparty sources, fixed showcase xwork
error,
improved problem report to show full error line
Modified:
incubator/webwork2/action/src/main/resources/org/apache/struts/action2/dispatcher/error.ftl
incubator/webwork2/build.xml
incubator/webwork2/webapps/showcase/src/main/webapp/WEB-INF/classes/xwork.xml
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=393584&r1=393583&r2=393584&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 12:34:15 2006
@@ -63,7 +63,7 @@
<#list snippet as line>
<#if (line_index == 2)>
- <pre
style="background:yellow">${(line[0..(rootloc.columnNumber-3)]?html)}<span
style="background:red">${(line[(rootloc.columnNumber-2)]?html)}</span><#if
((rootloc.columnNumber)>line.length())>${(line[(rootloc.columnNumber-1)..]?html)}</#if></pre>
+ <pre
style="background:yellow">${(line[0..(rootloc.columnNumber-3)]?html)}<span
style="background:red">${(line[(rootloc.columnNumber-2)]?html)}</span><#if
((rootloc.columnNumber)<line.length())>${(line[(rootloc.columnNumber-1)..]?html)}</#if></pre>
<#else>
<pre>${line?html}</pre>
</#if>
Modified: incubator/webwork2/build.xml
URL:
http://svn.apache.org/viewcvs/incubator/webwork2/build.xml?rev=393584&r1=393583&r2=393584&view=diff
==============================================================================
--- incubator/webwork2/build.xml (original)
+++ incubator/webwork2/build.xml Wed Apr 12 12:34:15 2006
@@ -240,7 +240,9 @@
</target>
<target name="compile-optional" depends="compile, init-optional"
description="compile optional files">
- <compile srcdir="${src.java}" destdir="${build.java}"
includes="${optional.sources}" />
+ <compile srcdir="thirdparty/jasperreports/src/main/java"
destdir="${build.java}" />
+ <compile srcdir="thirdparty/pell-file-upload/src/main/java"
destdir="${build.java}" />
+ <compile srcdir="thirdparty/jfreechart/src/main/java"
destdir="${build.java}" />
</target>
</project>
Modified:
incubator/webwork2/webapps/showcase/src/main/webapp/WEB-INF/classes/xwork.xml
URL:
http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/src/main/webapp/WEB-INF/classes/xwork.xml?rev=393584&r1=393583&r2=393584&view=diff
==============================================================================
---
incubator/webwork2/webapps/showcase/src/main/webapp/WEB-INF/classes/xwork.xml
(original)
+++
incubator/webwork2/webapps/showcase/src/main/webapp/WEB-INF/classes/xwork.xml
Wed Apr 12 12:34:15 2006
@@ -5,8 +5,6 @@
<xwork>
<include file="struts-default.xml"/>
-
- <include file="xwork-tmjee.xml" />
<include file="config-browser.xml"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
