Changeset 20160 for greenstone3/trunk/web

Timestamp:

2009-08-05T18:54:53+12:00 (14 years ago)

Author:

oranfry

Message:

• let the xsl transformer copy the xmlns declarations instead of entering them explicitly
• added a missing namespace declaration in util of default skin
• svn:ignored xalan.jar as it exists in the repository as xalan.jar.tmp

Location:

greenstone3/trunk/web

Files:

• WEB-INF/lib (modified) (1 prop)
• interfaces/default/transform/util.xsl (modified) (1 diff)
• ui/xslt/preProcess.xsl (modified) (1 diff)

greenstone3/trunk/web/WEB-INF/lib

@@ -10 +10 @@
 gsdl3.jar
 GAI.jar
+xalan.jar

@@ -10 +10 @@
 gsdl3.jar
 GAI.jar
+xalan.jar

greenstone3/trunk/web/interfaces/default/transform/util.xsl

@@ -3 +3 @@
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
   xmlns:gslib="http://www.greenstone.org/XSL/Library"
+  xmlns:gsf="http://www.greenstone.org/greenstone3/schema/ConfigFormat"
   xmlns:util="http://org.greenstone.gsdl3.util.XSLTUtil"
-  exclude-result-prefixes="util gslib gsf xslt">
+  exclude-result-prefixes="util gslib gsf">
   
   <!-- some global parameters - these are set by whoever is invoking the transformation -->

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

@@ -20 +20 @@
     <!-- 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">
+    <xslt:stylesheet>
       
       <xsl:for-each select="/skinAndLibraryXsl/skinXsl/xsl:stylesheet">

@@ -10 +10 @@
 gsdl3.jar
 GAI.jar
+xalan.jar