Changeset 20157

Timestamp:

2009-08-05T16:14:28+12:00 (15 years ago)

Author:

kjdon

Message:

explicitly write out the xsl:stylesheet element with its namespaces as they don't seem to come through with new xalan.

File:

• greenstone3/trunk/web/ui/xslt/preProcess.xsl (modified) (3 diffs)

greenstone3/trunk/web/ui/xslt/preProcess.xsl

@@ -13 +13 @@
 
   <xsl:output method="xml"/>
+  <xsl:namespace-alias
+    stylesheet-prefix="xslt" result-prefix="xsl"/>
 
   <xsl:template match="/">
 
-    <xsl:for-each select="/skinAndLibraryXsl/skinXsl/xsl:stylesheet">
+    <!-- explicitly output the stylesheet element here so we can include the
+    namespace declarations. They were going missing before with the new xalan/xerces-->
+    <xslt:stylesheet version="1.0" 
+      xmlns:gsf="http://www.greenstone.org/greenstone3/schema/ConfigFormat"
+      xmlns:gslib="http://www.greenstone.org/skinning"
+      xmlns:java="http://xml.apache.org/xslt/java"
+      xmlns:util="xalan://org.greenstone.gsdl3.util.XSLTUtil"
+      xmlns:xalan="http://xml.apache.org/xalan"
+      xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
+      xmlns:xslt="output.xsl" 
+      xmlns:gs3="http://www.greenstone.org/gs3">
       
-      <!-- produce an exact copy of skin stylesheet, with gslib nodes expanded. -->
-      <xsl:variable name="element-name" select="name()"/>
-      <xsl:element name="{$element-name}">
+      <xsl:for-each select="/skinAndLibraryXsl/skinXsl/xsl:stylesheet">
+    
+    <!-- produce an exact copy of skin stylesheet, with gslib nodes expanded. -->
     <xsl:for-each select="@*">
       <xsl:variable name="attribute-name" select="name()"/>
@@ -27 +39 @@
       </xsl:attribute>
     </xsl:for-each>
-    
     <!-- merge the attributes of the library stylesheet -->
     <xsl:for-each select="/skinAndLibraryXsl/libraryXsl/xsl:stylesheet/@*">
@@ -43 +54 @@
     </xsl:for-each>
     
-
-      </xsl:element>
-      
-      
-    </xsl:for-each>
+      </xsl:for-each>
+    </xslt:stylesheet>
+    
+    
   </xsl:template>