svn commit: r630647 - /incubator/jspwiki/trunk/tests/etc/webtests.xml

[aj...@apache.org]

Author: ajaquith
Date: Sun Feb 24 10:17:33 2008
New Revision: 630647

URL: http://svn.apache.org/viewvc?rev=630647&view=rev
Log:
[JSPWIKI-195]: Superfluous WEB-INF/i18n directory created during war build. Also, several unneeded JARs were also being included.

Modified:
    incubator/jspwiki/trunk/tests/etc/webtests.xml

Modified: incubator/jspwiki/trunk/tests/etc/webtests.xml
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/etc/webtests.xml?rev=630647&r1=630646&r2=630647&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/etc/webtests.xml (original)
+++ incubator/jspwiki/trunk/tests/etc/webtests.xml Sun Feb 24 10:17:33 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" />