jakarta-cactus-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jru...@apache.org
Subject cvs commit: jakarta-cactus/integration/ant/src/scripts/share build-share.xml
Date Tue, 08 Apr 2003 17:46:13 GMT
jruaux      2003/04/08 10:46:13

  Modified:    integration/ant/src/scripts/share build-share.xml
  Log:
  Effectively perform the web.xml merge
  
  Revision  Changes    Path
  1.17      +4 -8      jakarta-cactus/integration/ant/src/scripts/share/build-share.xml
  
  Index: build-share.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/integration/ant/src/scripts/share/build-share.xml,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- build-share.xml	3 Apr 2003 09:15:10 -0000	1.16
  +++ build-share.xml	8 Apr 2003 17:46:13 -0000	1.17
  @@ -143,7 +143,7 @@
   		<webxmlmerge 
   		  srcfile="${cactus.target.dir}/${cactus.context}/WEB-INF/web.xml"
   		  mergefile="${cactus.conf.dir}/web.xml"
  -		  destfile="${cactus.target.dir}/${cactus.context}/WEB-INF/web.xml">
  +		  destfile="${cactus.target.dir}/${cactus.context}/WEB-INF/web-temp.xml">
               <xmlcatalog>
                   <dtd
                     publicId="-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
  @@ -154,13 +154,9 @@
               </xmlcatalog>
   		</webxmlmerge>
   
  -        <!-- Copy the Cactus web.xml -->
  -        <copy todir="${cactus.target.dir}/${cactus.context}/WEB-INF" 
  -        	overwrite="true">
  -            <fileset dir="${cactus.conf.dir}">
  -                <include name="web.xml"/>
  -            </fileset>
  -        </copy>
  +        <!-- Rename the merged web.xml -->
  +        <move file="${cactus.target.dir}/${cactus.context}/WEB-INF/web-temp.xml"
  +            tofile="${cactus.target.dir}/${cactus.context}/WEB-INF/web.xml"/>
   
           <!-- Copy the log4j configuration files -->
           <copy tofile="${cactus.target.dir}/${cactus.context}/WEB-INF/classes/log4j.properties"
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: cactus-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: cactus-dev-help@jakarta.apache.org


Mime
View raw message