Refactored war creation, servlet.jar no longer part of messenger.jar.

git-svn-id: http://svn.igniterealtime.org/svn/repos/messenger/trunk@280 b35dd754-fafc-0310-a699-88a17e54d16e

build/build.xml

@@ -5,7 +5,8 @@
     $Revision$
     $Date$
 
-    LICENSE INFO HERE
+    This software is published under the terms of the GNU Public License (GPL),
+    a copy of which is included in this distribution.
 -->
 
 <!--
@@ -83,6 +84,7 @@
     <path id="javadoc.dependencies">
         <fileset dir="${lib.build.dir}" includes="*.jar" excludes="junit.jar" />
         <fileset dir="${lib.merge.dir}" includes="*.jar" />
+        <fileset dir="${lib.dist.dir}" includes="servlet.jar" />
     </path>
 
     <path id="compile.dependencies">
@@ -229,8 +231,9 @@
         <!-- Make the war -->
         <war destfile="${war.dest.dir}/${war.name}" basedir="${web.dir}"
                 webxml="${war.dest.dir}/build/web.xml"
-                excludes="WEB-INF/web.xml.startup.servlet, WEB-INF/lib/jasper*.jar">
+                excludes="WEB-INF/web.xml.startup.servlet">
             <patternset refid="web.sources" />
+            <lib dir="${jar.dest.dir}" excludes="jasper*.jar, servlet.jar" />
         </war>
         <!-- Create a Messenger home -->
         <copy todir="${war.dest.dir}/messengerHome">