Lets try to fix the first issue on your list.

The last target in src/targets/webapp-build.xml is "custom-conf".
This is the only place the "customconf" property is used.
Notice that the "customconf" property is applied to the included
filename, not to the "srcdir" attribute:

  <xpatch file="${build.webapp}/WEB-INF/cocoon.xconf" srcdir="" addComments="true">
    <include name="${customconf}/*.xconf" />
  </xpatch>

If I read the xpatch source code correctly, this limits the customconf to
only working with subdirectories.  I think we can fix this by changing the
target to apply the customconf to the srcdir instead of to the included
filename, like this:

  <xpatch file="${build.webapp}/WEB-INF/cocoon.xconf" srcdir="${customconf}" 
addComments="true">
     <include name="*.xconf" />
  </xpatch>

Here is the whole converted target if you would not mind testing it
with your desired configuration:

  <target name="custom-conf" depends="init-tasks" description="Uses Cocoon's xpatch 
task to
customize runtime configuration">
    <xpatch file="${build.webapp}/sitemap.xmap" srcdir="${customconf}">
       <include name="*.xmap" />
       <include name="*.xpipe" />
    </xpatch>
    <xpatch file="${build.webapp}/WEB-INF/cocoon.xconf" srcdir="${customconf}" 
addComments="true">
       <include name="*.xconf" />
    </xpatch>
    <xpatch file="${build.webapp}/WEB-INF/logkit.xconf" srcdir="${customconf}">
       <include name="*.xlog" />
    </xpatch>
    <xpatch file="${build.webapp}/WEB-INF/web.xml" srcdir="${customconf}">
       <include name="*.xweb" />
    </xpatch>
  </target>

Please let me know how this goes,
--Tim Larson

--- Tomasz Nowak <[EMAIL PROTECTED]> wrote:
...
> 1. customconf property doesn't work properly at my linuxbox :(
>    I have some .xweb, .xconf and .xmap files in 'myconf'
>    directory but they are not seen by buildtools when
>    'myconf' is outside cocoon source directory.
> 
>    customconf=../myconf <- doesn't work.
>    after moving it into cocoonsrc dir ($ mv ../myconf .)
>    and changing customconf in local.build.properties to:
>    customconf=myconf
>    everything works fine.
> 
>    Of course file permis and modes are ok. Is this a bug?
...


__________________________________
Do you Yahoo!?
The New Yahoo! Search - Faster. Easier. Bingo.
http://search.yahoo.com

Reply via email to