cocoon-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From solprovi...@apache.org
Subject Re: svn commit: r606743 - /cocoon/branches/BRANCH_2_1_X/tools/targets/webapp-build.xml
Date Thu, 27 Dec 2007 15:29:50 GMT
Hi All,

Cocoon-2.1 keeps applications ("samples") in the webapp directory.
Newbies would expect to add applications to that directory.  The build
process chooses specific files and directories to copy so new
applications are not copied to the build directory.  The patch removed
the list of specific files to copy the entire webapp directory.  I
closed my Cocoon jiras because a release candidate for Cocoon-2.1.11
is being prepared.

Antonio asked whether ant:copy had the intelligence to understand
binary files should not be affected by text replacement.  I have not
studied ant to discover if the program is sane.

This change passed my testing in May.  The jira from June survived
without comments.  None of the comments in this thread mention real
problems.  The discussion is that nobody trusts ant to work properly
so this patch should be reverted because theoretical problems may
result if the ant developers are poor programmers.  Nobody on the
Cocoon project wants to spend five minutes testing.

I will test more after somebody spends one minute to define the test
expected to fail because of this patch.   The potential bug seems to
require binary files containing strings on ant's filter list.

Does Cocoon need the filtering?  Would filtering=no solve the concerns?

solprovider

On 12/27/07, Thorsten Scherler
<thorsten.scherler.ext@juntadeandalucia.es> wrote:
> On Thu, 2007-12-27 at 13:06 +0100, Carsten Ziegeler wrote:
> > 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.
>
> Yes, please revert the commit.
>
> The fix was to have custom components in cocoon and the build will pick
> it up. But this can be done by a custom target as well. COCOON-2074.
>
> The filtering needs to be off for binary stuff like other have been
> pointed out so it is doing more harm then good.
>
> > 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.
> > >>
> > >>
> > >> solprovider@apache.org 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"/>
> Thorsten Scherler                                 thorsten.at.apache.org
> Open Source Java                      consulting, training and solutions

Mime
View raw message