Author: ajaquith
Date: Sun Feb 24 10:33:08 2008
New Revision: 630654
URL: http://svn.apache.org/viewvc?rev=630654&view=rev
Log:
Ported fix from HEAD for i18n directory creation in WARs.
Modified:
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/build.xml
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/etc/webtests.xml
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/build.xml
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/build.xml?rev=630654&r1=630653&r2=630654&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/build.xml (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/build.xml Sun Feb 24
10:33:08 2008
@@ -391,7 +391,16 @@
<fileset dir="${code.src}/webdocs" includes="**" excludes="**/*.jsp" />
<fileset dir="${code.src}/webdocs-stripes" />
<webinf dir="${code.src}/webdocs-stripes/WEB-INF" />
- <webinf dir="etc" includes="**" excludes="**.tmpl web.xml ini/** *.jks
db/** lib/** classes/**/*.class jspwiki-container.policy" />
+ <webinf dir="etc">
+ <include name="dtd/**" />
+ <include name="commons-logging.properties" />
+ <include name="jspwiki.jaas" />
+ <include name="jspwiki.policy" />
+ <include name="jspwiki.properties" />
+ <include name="*.tld" />
+ <include name="userdatabase.xml" />
+ <include name="groupdatabase.xml" />
+ </webinf>
<classes dir="etc" includes="oscache.properties" />
</war>
Modified:
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/etc/webtests.xml
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/etc/webtests.xml?rev=630654&r1=630653&r2=630654&view=diff
==============================================================================
---
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/etc/webtests.xml
(original)
+++
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/etc/webtests.xml
Sun Feb 24 10:33:08 2008
@@ -203,13 +203,18 @@
<!-- Build the war -->
<war warfile="${tests.build}/@{context}/@{context}.war"
webxml="@{webxml}">
- <lib dir="lib" includes="*.jar" />
+ <lib dir="lib" includes="*.jar" excludes="servlet-api.jar
jsp-api.jar"/>
<lib file="${jarfile}" />
<lib file="${jdbc.driver.jar}" />
<fileset dir="${code.src}/webdocs" includes="**" />
- <webinf dir="etc"
- includes="**"
- excludes="jspwiki.properties userdatabase.xml db/** **.tmpl
web.xml" />
+ <webinf dir="etc">
+ <include name="dtd/**" />
+ <include name="commons-logging.properties" />
+ <include name="jspwiki.jaas" />
+ <include name="jspwiki.policy" />
+ <include name="*.tld" />
+ <include name="groupdatabase.xml" />
+ </webinf>
<webinf dir="${tests.build}/@{context}"
includes="jspwiki.properties userdatabase.xml" />
<classes dir="etc" includes="oscache.properties" />
