Return-Path: 
 <jspwiki-commits-return-1404-apmail-incubator-jspwiki-commits-archive=incubator.apache.org@incubator.apache.org>
Delivered-To: apmail-incubator-jspwiki-commits-archive@minotaur.apache.org
Received: (qmail 22143 invoked from network); 13 Apr 2009 15:10:02 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3)
  by minotaur.apache.org with SMTP; 13 Apr 2009 15:10:02 -0000
Received: (qmail 67380 invoked by uid 500); 13 Apr 2009 15:10:02 -0000
Delivered-To: apmail-incubator-jspwiki-commits-archive@incubator.apache.org
Received: (qmail 67362 invoked by uid 500); 13 Apr 2009 15:10:02 -0000
Mailing-List: contact jspwiki-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:jspwiki-commits-help@incubator.apache.org>
List-Unsubscribe: <mailto:jspwiki-commits-unsubscribe@incubator.apache.org>
List-Post: <mailto:jspwiki-commits@incubator.apache.org>
List-Id: <jspwiki-commits.incubator.apache.org>
Reply-To: jspwiki-dev@incubator.apache.org
Delivered-To: mailing list jspwiki-commits@incubator.apache.org
Received: (qmail 67353 invoked by uid 99); 13 Apr 2009 15:10:02 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 13 Apr 2009 15:10:02 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 13 Apr 2009 15:10:01 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 7DDD723888A4; Mon, 13 Apr 2009 15:09:41 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r764498 - /incubator/jspwiki/trunk/build.xml
Date: Mon, 13 Apr 2009 15:09:41 -0000
To: jspwiki-commits@incubator.apache.org
From: jalkanen@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20090413150941.7DDD723888A4@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

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="&lt;!--" endtoken="--&gt;">
         <filter token=" PLACEHOLDER FOR PRE-COMPILED JSP SERVLETS " value="${generated-web.xml}" />