Upgrade to 8.2

cmsWebApp/build.xml

@@ -7,22 +7,36 @@
 <property name="libnodeploy.dir" value="lib-no-deploy"/>
 <property name="nodelete.appwar" value="${nodelete}"/>
 <path id="cmsWebApp.lib">
-<pathelement location="${build.target.dir}/overlay/CougarCMS8.1/bin/cmsWebApp"/>
-<fileset dir="${build.target.dir}/overlay/CougarCMS8.1/lib/cmsWebApp">
+<pathelement location="${build.target.dir}/overlay/CougarCMS8.2/bin/cmsWebApp"/>
+<fileset dir="${build.target.dir}/overlay/CougarCMS8.2/lib/cmsWebApp">
 <include name="**/*.jar"/>
 <include name="**/*.zip"/>
 <exclude name="**/.new*"/>
 </fileset>
+<fileset dir="../../CougarCMS8.2/cmsWebApp/webroot/extensions">
+<include name="*/lib/*.jar"/>
+<include name="*/lib/*.zip"/>
+<exclude name="*/lib/.new*"/>
+<include name="*/lib-no-deploy/*.jar"/>
+<include name="*/lib-no-deploy/*.zip"/>
+</fileset>
 <fileset dir="${lib.dir}">
 <include name="**/*.jar"/>
 <include name="**/*.zip"/>
 <exclude name="**/.new*"/>
 </fileset>
+<fileset dir="${extensions.src.dir}">
+<include name="*/lib/*.jar"/>
+<include name="*/lib/*.zip"/>
+<include name="*/lib-no-deploy/*.jar"/>
+<include name="*/lib-no-deploy/*.zip"/>
+<exclude name="*/lib/.new*"/>
+</fileset>
 <fileset dir="${libnodeploy.dir}">
 <include name="**/*.jar"/>
 <include name="**/*.zip"/>
 </fileset>
-<fileset dir="../../CougarCMS8.1/cmsWebApp/lib-no-deploy">
+<fileset dir="../../CougarCMS8.2/cmsWebApp/lib-no-deploy">
 <include name="**/*.jar"/>
 <include name="**/*.zip"/>
 </fileset>
@@ -38,9 +52,9 @@
 <echo level="info" message="Overlays exist"/>
 <mkdir dir="${cmsWebApp.war.dir}"/>
 <property name="overwrite.appwar" value="true"/>
-<echo level="info" message="Executing overlay CougarCMS8.1 cmsWebApp"/>
-<ant dir="../../CougarCMS8.1" target="cmsWebApp" inheritAll="false">
-<property name="build.target.dir" value="${build.target.dir}/overlay/CougarCMS8.1"/>
+<echo level="info" message="Executing overlay CougarCMS8.2 cmsWebApp"/>
+<ant dir="../../CougarCMS8.2" target="cmsWebApp" inheritAll="false">
+<property name="build.target.dir" value="${build.target.dir}/overlay/CougarCMS8.2"/>
 <property name="cmsWebApp.war.dir" value="${cmsWebApp.war.dir}"/>
 <property name="cmsWebApp.app.dir" value="${cmsWebApp.war.dir}"/>
 <property name="tctransform.version" value="${tctransform.version}"/>
@@ -48,18 +62,18 @@
 <property name="overwrite.appwar" value="true"/>
 </ant>
 <copy todir="${build.target.dir}/config" overwrite="true" filtering="true">
-<fileset dir="${build.target.dir}/overlay/CougarCMS8.1/config">
+<fileset dir="${build.target.dir}/overlay/CougarCMS8.2/config">
 <include name="**/*.xml"/>
 <include name="**/*.properties"/>
 </fileset>
 </copy>
 <jsync todir="${build.target.dir}/config" overwrite="true" filtering="false">
-<fileset dir="${build.target.dir}/overlay/CougarCMS8.1/config">
+<fileset dir="${build.target.dir}/overlay/CougarCMS8.2/config">
 <exclude name="**/*.xml"/>
 <exclude name="**/*.properties"/>
 </fileset>
 </jsync>
-<echo level="info" message="Finished overlay CougarCMS8.1 cmsWebApp"/>
+<echo level="info" message="Finished overlay CougarCMS8.2 cmsWebApp"/>
 </target>
 <target name="compiletest">
 <mkdir dir="${cmsWebApp.bin.dir}"/>
@@ -213,6 +227,12 @@
 <exclude name="**/.new*"/>
 </fileset>
 </jsync>
+<jsync todir="${cmsWebApp.war.dir}/WEB-INF/lib" flatten="true">
+<fileset dir="${extensions.src.dir}">
+<include name="*/lib/*"/>
+<exclude name="**/.new*"/>
+</fileset>
+</jsync>
 <jsync todir="${cmsWebApp.war.dir}/WEB-INF/classes">
 <fileset dir="${cmsWebApp.bin.dir}"/>
 </jsync>