If I get no response from Paul (or anyone else on this), I'll revert the change for the release. I'm currently planning to prepare the distribution next monday.
Carsten Carsten Ziegeler wrote: > At least the resources have been copied with filtering "off" before. As > the resources contain images and other binary stuff, this changes > breakes definitly the build as binary files have to be copied with > filtering turned off. > > Apart from that, I'm wondering what this change tries to fix. > > So Paul, please comment on this issue. > > Thanks > Carsten > > Antonio Gallardo wrote: >> Hi solprovider, >> >> I am wondering if a simple >> >> filtering="on" statement can replace the previous code. I recall issues >> with files that become broken on the resources if we use filtering. And >> also some files we don't want on the final webapp. >> >> Best Regards, >> >> Antonio Gallardo. >> >> >> [EMAIL PROTECTED] escribió: >>> Author: solprovider >>> Date: Mon Dec 24 14:03:31 2007 >>> New Revision: 606743 >>> >>> URL: http://svn.apache.org/viewvc?rev=606743&view=rev >>> Log: >>> The build process carefully adds each of the standard files in the >>> webapp directory. New applications are not included in the build >>> process. No files need to be excluded. This change copies the entire >>> directory. (COCOON-2074) >>> >>> Modified: >>> cocoon/branches/BRANCH_2_1_X/tools/targets/webapp-build.xml >>> >>> Modified: cocoon/branches/BRANCH_2_1_X/tools/targets/webapp-build.xml >>> URL: >>> http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/tools/targets/webapp-build.xml?rev=606743&r1=606742&r2=606743&view=diff >>> >>> ============================================================================== >>> >>> --- cocoon/branches/BRANCH_2_1_X/tools/targets/webapp-build.xml >>> (original) >>> +++ cocoon/branches/BRANCH_2_1_X/tools/targets/webapp-build.xml Mon >>> Dec 24 14:03:31 2007 >>> @@ -25,33 +25,9 @@ >>> <target name="prepare-webapp" depends="blocks, package"> >>> <mkdir dir="${build.webapp}"/> >>> >>> - <copy file="${webapp}/welcome.xml" >>> tofile="${build.webapp}/welcome.xml" filtering="on"/> >>> - <copy file="${webapp}/not-found.xml" >>> tofile="${build.webapp}/not-found.xml" filtering="on"/> >>> - <copy file="${webapp}/welcome.xslt" >>> tofile="${build.webapp}/welcome.xslt" filtering="on"/> >>> - <copy file="${webapp}/sitemap.xmap" >>> tofile="${build.webapp}/sitemap.xmap"/> >>> - >>> - <!-- generate sitemap entries >>> - <sitemap-components sitemap="${build.webapp}/sitemap.xmap" >>> source="${java}"/> >>> - --> >>> - >>> - <copy todir="${build.webapp}/stylesheets" filtering="on"> >>> - <fileset dir="${webapp}/stylesheets"> >>> - <include name="**/*.xslt"/> >>> - </fileset> >>> - </copy> >>> - >>> - <copy todir="${build.webapp}/resources" filtering="off"> >>> - <fileset dir="${webapp}/resources"/> >>> - </copy> >>> - >>> - <copy todir="${build.webapp}/WEB-INF" filtering="on"> >>> - <fileset dir="${webapp}/WEB-INF"> >>> - <include name="entities/**"/> >>> - <include name="classes/**"/> >>> - <include name="*.x*"/> >>> - <include name="properties/**"/> >>> - </fileset> >>> - </copy> >>> + <copy todir="${build.webapp}" filtering="on"> >>> + <fileset dir="${webapp}"/> >>> + </copy> >>> >>> <copy file="${build}/${name}.jar" >>> tofile="${build.webapp.lib}/${name}-${version}.jar"/> >>> >>> >> > > -- Carsten Ziegeler [EMAIL PROTECTED]
