cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject cvs commit: cocoon-2.1/tools/targets webapp-build.xml
Date Mon, 15 Mar 2004 18:11:25 GMT
cziegeler    2004/03/15 10:11:25

  Modified:    .        status.xml
               tools/targets webapp-build.xml
  Log:
     <action dev="CZ" type="fix" fixes-bug="27217" due-to="Andreas Hartmann" due-to-email="andreas@apache.org">
       Build System: Apply filtering to patched configurations coming from the different blocks
(loglevel etc.)
     </action>
  
  Revision  Changes    Path
  1.281     +4 -1      cocoon-2.1/status.xml
  
  Index: status.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/status.xml,v
  retrieving revision 1.280
  retrieving revision 1.281
  diff -u -r1.280 -r1.281
  --- status.xml	15 Mar 2004 11:38:23 -0000	1.280
  +++ status.xml	15 Mar 2004 18:11:24 -0000	1.281
  @@ -212,6 +212,9 @@
     <changes>
   
    <release version="@version@" date="@date@">
  +   <action dev="CZ" type="fix" fixes-bug="27217" due-to="Andreas Hartmann" due-to-email="andreas@apache.org">
  +     Build System: Apply filtering to patched configurations coming from the different
blocks (loglevel etc.)
  +   </action>
      <action dev="CZ" type="fix" fixes-bug="27518" due-to="Michal Durdina" due-to-email="durdina@asset.sk">
        Portal: Fix problems with minimizing/maximizing of portlets.
      </action>
  
  
  
  1.10      +13 -0     cocoon-2.1/tools/targets/webapp-build.xml
  
  Index: webapp-build.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/tools/targets/webapp-build.xml,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- webapp-build.xml	8 Mar 2004 06:07:15 -0000	1.9
  +++ webapp-build.xml	15 Mar 2004 18:11:25 -0000	1.10
  @@ -153,6 +153,19 @@
     </target>
   
     <target name="webapp" depends="prepare-webapp,prepare-webapp-samples,prepare-webapp-docs,prepare-webapp-javadocs,prepare-webapp-deprecated,validate-jars,validate-config,custom-conf"
description="Builds web application folder">
  +    <!-- Filter the patched files again to eventually apply filtering to patched blocks
-->
  +    <copy file="${build.webapp}/sitemap.xmap"
  +          tofile="${build.webapp}/sitemap.xmap"
  +          overwrite="true" filtering="on"/>
  +    <copy file="${build.webapp}/WEB-INF/cocoon.xconf"
  +          tofile="${build.webapp}/WEB-INF/cocoon.xconf"
  +          overwrite="true" filtering="on"/>
  +    <copy file="${build.webapp}/WEB-INF/logkit.xconf"
  +          tofile="${build.webapp}/WEB-INF/logkit.xconf"
  +          overwrite="true" filtering="on"/>
  +    <copy file="${build.webapp}/WEB-INF/web.xml"
  +          tofile="${build.webapp}/WEB-INF/web.xml"
  +          overwrite="true" filtering="on"/>
     </target>
   
     <target name="war" depends="webapp" description="Builds web application archive">
  
  
  

Mime
View raw message