[jboss-cvs] JBossAS SVN: r67360 - trunk/tomcat.

[jboss-cvs-commits at lists.jboss.org]

Author: dimitris at jboss.org
Date: 2007-11-21 15:49:45 -0500 (Wed, 21 Nov 2007)
New Revision: 67360

Modified:
   trunk/tomcat/build.xml
Log:
disable filtering when copying ROOT.war; it modifies logo.gif

Modified: trunk/tomcat/build.xml
===================================================================
--- trunk/tomcat/build.xml	2007-11-21 20:43:25 UTC (rev 67359)
+++ trunk/tomcat/build.xml	2007-11-21 20:49:45 UTC (rev 67360)
@@ -201,16 +201,16 @@
   <!-- Compile manifests -->
   <target name="compile-etc" depends="init">
     <mkdir dir="${build.etc}"/>
-   <copy todir="${build.etc}" filtering="yes">
-     <fileset dir="${source.etc}">
-       <include name="**"/>
-     </fileset>
-   </copy>
-   <copy todir="${build.deploy}" filtering="yes">
-     <fileset dir="${source.webapps}">
-       <include name="**"/>
-     </fileset>
-   </copy>
+    <copy todir="${build.etc}" filtering="yes">
+       <fileset dir="${source.etc}">
+         <include name="**"/>
+       </fileset>
+    </copy>
+    <copy todir="${build.deploy}">
+      <fileset dir="${source.webapps}">
+        <include name="**"/>
+      </fileset>
+    </copy>
   </target>
 
   <!--
@@ -227,13 +227,13 @@
     <mkdir dir="${build.deploy}/jboss-web.deployer/META-INF"/>
 
     <!-- Build the jboss-web.deployer -->
-  	 <copy todir="${build.deploy}/jboss-web.deployer/META-INF">
-  	 	<fileset dir="${build.resources}">
-  	 		<include name="jboss-structure.xml" />
-  	 		<include name="war-deployers-beans.xml" />
-  	 		<include name="webserver-xmbean.xml" />
-  	 	</fileset>
-  	 </copy>	
+    <copy todir="${build.deploy}/jboss-web.deployer/META-INF">
+       <fileset dir="${build.resources}">
+          <include name="jboss-structure.xml" />
+          <include name="war-deployers-beans.xml" />
+          <include name="webserver-xmbean.xml" />
+       </fileset>
+    </copy>	
     <copy file="${build.resources}/context.xml"
       todir="${build.deploy}/jboss-web.deployer"/>
     <copy file="${build.resources}/web.xml"
@@ -304,8 +304,8 @@
    <mkdir dir="${build.deploy}/cluster"/>
    <copy todir="${build.deploy}/cluster"
          file="${build.lib}/jbossweb-cluster.aop"/>
-  	<copy tofile="${build.deploy}/cluster/jbossweb-cluster-beans.xml"
-  	      file="${build.resources}/jbossweb-cluster-beans.xml"/>
+   <copy tofile="${build.deploy}/cluster/jbossweb-cluster-beans.xml"
+         file="${build.resources}/jbossweb-cluster-beans.xml"/>
    <copy tofile="${build.deploy}/cluster/jbossweb-clusteredsso-beans.xml"
          file="${build.resources}/jbossweb-clusteredsso-beans.xml"/>