svn commit: r106033 - cocoon/branches/BRANCH_2_1_X/tools/targets

[an...@apache.org]

Author: antonio
Date: Sat Nov 20 14:41:03 2004
New Revision: 106033

Modified:
   cocoon/branches/BRANCH_2_1_X/tools/targets/compile-build.xml
   cocoon/branches/BRANCH_2_1_X/tools/targets/validate-build.xml
Log:
Remove deprecated property: processor='trax' + remove trailing spaces

Modified: cocoon/branches/BRANCH_2_1_X/tools/targets/compile-build.xml
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/tools/targets/compile-build.xml	(original)
+++ cocoon/branches/BRANCH_2_1_X/tools/targets/compile-build.xml	Sat Nov 20 14:41:03 2004
@@ -67,7 +67,7 @@
           unless="internal.exclude.deprecated">
     <mkdir dir="${build.deprecated}"/>
 
-    <xpatch file="${build.dest}/org/apache/cocoon/cocoon.roles" 
+    <xpatch file="${build.dest}/org/apache/cocoon/cocoon.roles"
             srcdir="${deprecated.conf}"
             includes="**/*.xroles"/>
 
@@ -219,7 +219,6 @@
 
     <xslt in="${gump.descriptor}"
           out="${build.temp}/blocks-build.xml"
-          processor="trax"
           style="${tools.src}/blocks-build.xsl"/>
   </target>
 
@@ -240,9 +239,9 @@
   </target>
 
   <target name="call-block-target" depends="prepare">
-    <ant antfile="${build.temp}/blocks-build.xml" 
-         inheritAll="true" 
-         inheritRefs="false" 
+    <ant antfile="${build.temp}/blocks-build.xml"
+         inheritAll="true"
+         inheritRefs="false"
          target="cocoon-block-${block.name}-${target.name}" />
   </target>
 </project>

Modified: cocoon/branches/BRANCH_2_1_X/tools/targets/validate-build.xml
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/tools/targets/validate-build.xml	(original)
+++ cocoon/branches/BRANCH_2_1_X/tools/targets/validate-build.xml	Sat Nov 20 14:41:03 2004
@@ -32,8 +32,8 @@
     </path>
 
     <property name="all.jars" refid="all.jars"/>
-    <copy file="${tools.src}/jars.xml.tmpl" 
-          tofile="${build.temp}/current-jars.xml" 
+    <copy file="${tools.src}/jars.xml.tmpl"
+          tofile="${build.temp}/current-jars.xml"
           filtering="yes" overwrite="yes">
       <filterset>
         <filter token="JARS" value="${all.jars}"/>
@@ -42,32 +42,31 @@
 
     <!-- split the path in 'jar' XML elements -->
     <replace file="${build.temp}/current-jars.xml"
-             token="${path.separator}" 
+             token="${path.separator}"
              value="&lt;/jar&gt;&#xA; &lt;jar&gt;"/>
 
     <!-- relativize file names by removing the current directory -->
-    <replace file="${build.temp}/current-jars.xml" 
-             token="${user}${file.separator}lib${file.separator}" 
+    <replace file="${build.temp}/current-jars.xml"
+             token="${user}${file.separator}lib${file.separator}"
              value=""/>
-    <replace file="${build.temp}/current-jars.xml" 
-             token="${user}${file.separator}${blocks}${file.separator}" 
+    <replace file="${build.temp}/current-jars.xml"
+             token="${user}${file.separator}${blocks}${file.separator}"
              value=""/>
 
     <!-- and incase that fails, remove the base directory -->
-    <replace file="${build.temp}/current-jars.xml" 
-             token="${basedir}${file.separator}lib${file.separator}" 
+    <replace file="${build.temp}/current-jars.xml"
+             token="${basedir}${file.separator}lib${file.separator}"
              value=""/>
-    <replace file="${build.temp}/current-jars.xml" 
-             token="${basedir}${file.separator}${blocks}${file.separator}" 
+    <replace file="${build.temp}/current-jars.xml"
+             token="${basedir}${file.separator}${blocks}${file.separator}"
              value=""/>
 
     <!-- replace platform-dependent path separator by '/' -->
-    <replace file="${build.temp}/current-jars.xml" 
-             token="${file.separator}" 
+    <replace file="${build.temp}/current-jars.xml"
+             token="${file.separator}"
              value="/"/>
 
     <xslt in="${lib}/jars.xml" out="${build.temp}/jars.xml"
-          processor="trax"
           style="${tools}/src/check-jars.xsl">
       <param name="stylesheet-path" expression="${tools}/src"/>
       <param name="current-jars-path" expression="${build.temp}"/>
@@ -96,7 +95,7 @@
     <echo message="Not conducting validation of core XML documentation."/>
     <echo message="Use 'forrest validate-xdocs' instead."/>
 
-<!-- FIXME: 
+<!-- FIXME:
     <echo message="Validating all **/book.xml instances using RELAX NG ..."/>
     <jing rngfile="${webapp}/WEB-INF/entities/book-v01.rng">
       <fileset dir="${build.context}" includes="**/book.xml"/>