You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by ja...@apache.org on 2009/04/13 17:09:41 UTC
svn commit: r764498 - /incubator/jspwiki/trunk/build.xml
Author: jalkanen
Date: Mon Apr 13 15:09:41 2009
New Revision: 764498
URL: http://svn.apache.org/viewvc?rev=764498&view=rev
Log:
web-fragment.xml is now called web-fragment.xmlf, since it's an XML fragment, not a valid XML file (which was throwing off e.g. Eclipse's automatic XML validator).
Modified:
incubator/jspwiki/trunk/build.xml
Modified: incubator/jspwiki/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/build.xml?rev=764498&r1=764497&r2=764498&view=diff
==============================================================================
--- incubator/jspwiki/trunk/build.xml (original)
+++ incubator/jspwiki/trunk/build.xml Mon Apr 13 15:09:41 2009
@@ -435,7 +435,7 @@
outputDir="${war.build}/java"
poolingEnabled="false"
package="org.apache.wiki.jsp"
- webXmlFragment="${war.build}/web-fragment.xml" />
+ webXmlFragment="${war.build}/web-fragment.xmlf" />
<!-- Compile the generated Java sources -->
<mkdir dir="${war.build}/classes"/>
<javac srcdir="${war.build}/java" destdir="${war.build}/classes">
@@ -446,7 +446,7 @@
</javac>
<!-- Inject JSP mappings into web.xml -->
<echo message="Adding JSP servlet mappings to web.xml" />
- <loadfile property="generated-web.xml" srcFile="${war.build}/web-fragment.xml"/>
+ <loadfile property="generated-web.xml" srcFile="${war.build}/web-fragment.xmlf"/>
<copy file="${code.web}/WEB-INF/web.xml" toFile="${war.build}/web.xml" overwrite="true">
<filterset begintoken="<!--" endtoken="-->">
<filter token=" PLACEHOLDER FOR PRE-COMPILED JSP SERVLETS " value="${generated-web.xml}" />