Updated war target to work with app-servers. JM-71

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

build/build.xml

@@ -354,7 +354,7 @@
         <mkdir dir="${war.dest.dir}/build"/>
         <!-- Make a new web.xml file in the build dir -->
         <loadfile property="startup-def" srcFile="${web.dir}/WEB-INF/web.xml.startup.servlet"/>
-        <copy file="${web.dir}/WEB-INF/web.xml" toFile="${war.dest.dir}/build/web.xml" overwrite="${overwrite}">
+        <copy file="${webapp.dest.dir}/WEB-INF/web.xml" toFile="${war.dest.dir}/build/web.xml" overwrite="${overwrite}">
             <filterset begintoken="&lt;!--@@" endtoken="@@--&gt;">
                 <filter token="STARTUP-SERVLET" value="${startup-def}"/>
             </filterset>
@@ -362,19 +362,22 @@
         <!-- 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">
+            excludes="*.jsp*,WEB-INF/web.xml.startup.servlet">
             <patternset refid="web.sources"/>
-            <lib dir="${jar.dest.dir}" excludes="jasper*.jar, servlet.jar"/>
+            <lib dir="${jar.dest.dir}" excludes="jasper*.jar, servlet.jar, startup.jar"/>
         </war>
         <!-- Create a Messenger home -->
         <copy todir="${war.dest.dir}/messengerHome">
             <fileset dir="${target.dir}">
                 <include name="conf/**/*.*"/>
-                <include name="resources/**/*.*"/>
+                <include name="resources/**/*"/>
+                <include name="plugins/*.*"/>
             </fileset>
         </copy>
         <!-- Force create the logs dir (will be empty) -->
         <mkdir dir="${war.dest.dir}/messengerHome/logs"/>
+        <!-- Force create the plugins dir (will be empty) -->
+        <mkdir dir="${war.dest.dir}/messengerHome/plugins"/>
     </target>
 
     <!-- javadoc =============================================================================== -->