svn commit: rev 43475 - forrest/trunk/src/core

[ni...@apache.org]

Author: nicolaken
Date: Tue Sep  7 08:46:14 2004
New Revision: 43475

Modified:
   forrest/trunk/src/core/forrest.build.xml
Log:
Fix a type on the skinconf load targets and add the catalog to the xslt transform that strips it.

Modified: forrest/trunk/src/core/forrest.build.xml
==============================================================================
--- forrest/trunk/src/core/forrest.build.xml	(original)
+++ forrest/trunk/src/core/forrest.build.xml	Tue Sep  7 08:46:14 2004
@@ -260,7 +260,9 @@
   <target name="load-project-props" depends="validation-props, prepare-context" if="skinconf.present">
     <xslt in="${skinconf}" 
           out="${project.temp-dir}/no-doctype-project-skinconf.xml" 
-          style="${forrest.home/}/context/resources/stylesheets/strip-doctype.xsl"/>
+          style="${forrest.home}/context/resources/stylesheets/strip-doctype.xsl">
+        <xmlcatalog refid="fcatalog"/>
+    </xslt>              
 
     <xmlproperty file="${project.temp-dir}/no-doctype-project-skinconf.xml" 
                  collapseattributes="true"/>
@@ -270,7 +272,9 @@
   <target name="load-forrest-props" unless="skinconf.present">
      <xslt in="${forrest.home}/context/skinconf.xml" 
            out="${project.temp-dir}/no-doctype-forrest-skinconf.xml" 
-           style="${forrest.home/}/context/resources/stylesheets/strip-doctype.xsl"/>
+           style="${forrest.home}/context/resources/stylesheets/strip-doctype.xsl">
+        <xmlcatalog refid="fcatalog"/>
+    </xslt> 
 
     <!-- Forrest skinconf should have been previously validated in build.xml -->
     <xmlproperty file="${project.temp-dir}/no-doctype-forrest-skinconf.xml"