Build xml regenerated to fix jar overriding issue.

cmsWebApp/build.xml

@@ -8,6 +8,14 @@
 <property name="nodelete.appwar" value="${nodelete}"/>
 <path id="cmsWebApp.lib">
 <pathelement location="${build.target.dir}/overlay/CougarCMS8.2/bin/cmsWebApp"/>
+<fileset dir="${cmsWebApp.lib.dir}">
+<include name="**/*.jar"/>
+<include name="**/*.zip"/>
+<exclude name="**/.new*"/>
+</fileset>
+</path>
+<target name="copylib">
+<jsync todir="${cmsWebApp.lib.dir}" flatten="true">
 <fileset dir="${build.target.dir}/overlay/CougarCMS8.2/lib/cmsWebApp">
 <include name="**/*.jar"/>
 <include name="**/*.zip"/>
@@ -32,20 +40,14 @@
 <include name="*/lib-no-deploy/*.zip"/>
 <exclude name="*/lib/.new*"/>
 </fileset>
-<fileset dir="${libnodeploy.dir}">
+<fileset dir="../../CougarCMS8.2/cmsWebApp/lib-no-deploy">
 <include name="**/*.jar"/>
 <include name="**/*.zip"/>
 </fileset>
-<fileset dir="../../CougarCMS8.2/cmsWebApp/lib-no-deploy">
+<fileset dir="${libnodeploy.dir}">
 <include name="**/*.jar"/>
 <include name="**/*.zip"/>
 </fileset>
-</path>
-<target name="copylib">
-<jsync todir="${cmsWebApp.lib.dir}">
-<fileset dir="${lib.dir}">
-<exclude name="**/.new*"/>
-</fileset>
 </jsync>
 </target>
 <target name="execute-overlays">