Restore concatenated simgle XSLT file to overcome a problem with path…

…s in Java application containers
BorderTech · Jun 21, 2018 · b9d2277 · b9d2277
1 parent 6848307
commit b9d2277
Show file tree

Hide file tree

Showing 51 changed files with 100 additions and 64 deletions.
diff --git a/wcomponents-theme/build-xslt.xml b/wcomponents-theme/build-xslt.xml
@@ -1,18 +1,17 @@
 <project name="BuildXslt" default="build" >
 	<import file="build-import.xml"/>
-
-	<target name="build"
-		description="Copies XSLT artifacts">
-		<!--
-			NOTE: we use two copies here to ensure output order.
-			TODO: remove theme XSLT override.
-		-->
-		<copy todir="${target.rootdir}/xslt" overwrite="true">
-			<fileset dir="${component.rootdir}/src/main/xslt" includes="*.xsl" />
-			<filterchain>
-				<expandproperties/>
-			</filterchain>
-		</copy>
+	<target name="build" description="Builds XSLT artifacts">
+		<concat destfile="${tmp.dir}/all-int.xsl" fixlastline="yes" ignoreempty="false">
+			<header filtering="no">&lt;concat&gt;</header>
+			<footer filtering="no">&lt;/concat&gt;</footer>
+			<fileset dir="${component.rootdir}/src/main/xslt" includes="*.xsl"/>
+		</concat>
+		<copy file="${component.rootdir}/build_all.xsl" todir="${tmp.dir}" overwrite="true"/>
+		<xslt in="${tmp.dir}/all-int.xsl"
+			out="${target.rootdir}/xslt/all.xsl"
+			style="${tmp.dir}/build_all.xsl">
+			<factory name="net.sf.saxon.TransformerFactoryImpl"/>
+		</xslt>
 		<copy file="${target.rootdir}/xslt/all.xsl"
 			tofile="${target.rootdir}/xslt/all_debug.xsl"/>
 		<replaceregexp file="${target.rootdir}/xslt/all_debug.xsl"

diff --git a/wcomponents-theme/build_all.xsl b/wcomponents-theme/build_all.xsl
@@ -0,0 +1,37 @@
+<?xml version="1.0"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:x="https://github.com/bordertech/wcomponents/dummy" version="2.0">
+	<xsl:namespace-alias stylesheet-prefix="x" result-prefix="xsl" />
+
+	<!-- The final output is another xslt stylesheet so needs to be xml. The indent is so that the debug version is human readable.-->
+	<xsl:output method="xml" indent="yes" omit-xml-declaration="no" />
+
+	<!-- Generic match template for all unmatches nodes and attributes. Copies the input to the output. -->
+	<xsl:template match="@*|node()">
+		<xsl:copy>
+			<xsl:apply-templates select="@*|node()" />
+		</xsl:copy>
+	</xsl:template>
+
+	<!--
+		Output the value of the text node. We use the priority here to prevent processor warnings about ambiguous matches caused by the generic
+		@*|node() match above. xsl:value-of is more efficient for text nodes than copy and apply-templates.
+	-->
+	<xsl:template match="text()" priority="5">
+		<xsl:value-of select="." />
+	</xsl:template>
+
+	<!--
+		The interim XML file has a root element of concat. This transforms to the required output xsl:stylesheet
+		structure using the namespace alias defined above.
+	-->
+	<xsl:template match="concat">
+		<x:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:ui="https://github.com/bordertech/wcomponents/namespace/ui/v1.0"
+			xmlns:html="http://www.w3.org/1999/xhtml" version="2.0" exclude-result-prefixes="xsl ui html">
+			<x:output encoding="UTF-8" indent="no" method="html" doctype-system="about:legacy-compat" omit-xml-declaration="yes" />
+			<x:strip-space elements="*" />
+			<xsl:apply-templates select=".//xsl:param[parent::xsl:stylesheet]" />
+			<xsl:apply-templates select=".//xsl:variable[parent::xsl:stylesheet]" />
+			<xsl:apply-templates select=".//xsl:template" />
+		</x:stylesheet>
+	</xsl:template>
+</xsl:stylesheet>
diff --git a/wcomponents-theme/src/main/xslt/all.xsl b/wcomponents-theme/src/main/xslt/all.xsl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	xmlns:ui="https://github.com/bordertech/wcomponents/namespace/ui/v1.0"
 	xmlns:html="http://www.w3.org/1999/xhtml" version="2.0"
@@ -767,7 +767,7 @@
 	###########################################################################
 	###########################################################################
 	-->
-	<xsl:include href="wc.ajax.xsl" />
+	<!--<xsl:include href="wc.ajax.xsl" />
 	<xsl:include href="wc.checkablegroup.xsl" />
 	<xsl:include href="wc.containers.xsl" />
 	<xsl:include href="wc.fileupload.xsl" />
@@ -814,6 +814,6 @@
 	<xsl:include href="wc.ui.togglebutton.xsl" />
 	<xsl:include href="wc.ui.tree.xsl" />
 	<xsl:include href="wc.ui.version.xsl" />
-	<xsl:include href="wc.ui.video.xsl" />
+	<xsl:include href="wc.ui.video.xsl" />-->
 
 </xsl:stylesheet>
diff --git a/wcomponents-theme/src/main/xslt/wc.ajax.xsl b/wcomponents-theme/src/main/xslt/wc.ajax.xsl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	xmlns:ui="https://github.com/bordertech/wcomponents/namespace/ui/v1.0"
 	xmlns:html="http://www.w3.org/1999/xhtml" version="2.0"

diff --git a/wcomponents-theme/src/main/xslt/wc.checkablegroup.xsl b/wcomponents-theme/src/main/xslt/wc.checkablegroup.xsl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	xmlns:ui="https://github.com/bordertech/wcomponents/namespace/ui/v1.0"
 	xmlns:html="http://www.w3.org/1999/xhtml" version="2.0"

diff --git a/wcomponents-theme/src/main/xslt/wc.containers.xsl b/wcomponents-theme/src/main/xslt/wc.containers.xsl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	xmlns:ui="https://github.com/bordertech/wcomponents/namespace/ui/v1.0"
 	xmlns:html="http://www.w3.org/1999/xhtml" version="2.0"

diff --git a/wcomponents-theme/src/main/xslt/wc.fileupload.xsl b/wcomponents-theme/src/main/xslt/wc.fileupload.xsl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	xmlns:ui="https://github.com/bordertech/wcomponents/namespace/ui/v1.0"
 	xmlns:html="http://www.w3.org/1999/xhtml" version="2.0"

diff --git a/wcomponents-theme/src/main/xslt/wc.inputs.xsl b/wcomponents-theme/src/main/xslt/wc.inputs.xsl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	xmlns:ui="https://github.com/bordertech/wcomponents/namespace/ui/v1.0"
 	xmlns:html="http://www.w3.org/1999/xhtml" version="2.0"

diff --git a/wcomponents-theme/src/main/xslt/wc.shuffleable.xsl b/wcomponents-theme/src/main/xslt/wc.shuffleable.xsl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	xmlns:ui="https://github.com/bordertech/wcomponents/namespace/ui/v1.0"
 	xmlns:html="http://www.w3.org/1999/xhtml" version="2.0"

diff --git a/wcomponents-theme/src/main/xslt/wc.toggles.xsl b/wcomponents-theme/src/main/xslt/wc.toggles.xsl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	xmlns:ui="https://github.com/bordertech/wcomponents/namespace/ui/v1.0"
 	xmlns:html="http://www.w3.org/1999/xhtml" version="2.0"

diff --git a/wcomponents-theme/src/main/xslt/wc.ui.application.xsl b/wcomponents-theme/src/main/xslt/wc.ui.application.xsl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	xmlns:ui="https://github.com/bordertech/wcomponents/namespace/ui/v1.0"
 	xmlns:html="http://www.w3.org/1999/xhtml" version="2.0"

diff --git a/wcomponents-theme/src/main/xslt/wc.ui.audio.xsl b/wcomponents-theme/src/main/xslt/wc.ui.audio.xsl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	xmlns:ui="https://github.com/bordertech/wcomponents/namespace/ui/v1.0"
 	xmlns:html="http://www.w3.org/1999/xhtml" version="2.0"

diff --git a/wcomponents-theme/src/main/xslt/wc.ui.collapsible.xsl b/wcomponents-theme/src/main/xslt/wc.ui.collapsible.xsl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	xmlns:ui="https://github.com/bordertech/wcomponents/namespace/ui/v1.0"
 	xmlns:html="http://www.w3.org/1999/xhtml" version="2.0"

diff --git a/wcomponents-theme/src/main/xslt/wc.ui.dateField.xsl b/wcomponents-theme/src/main/xslt/wc.ui.dateField.xsl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	xmlns:ui="https://github.com/bordertech/wcomponents/namespace/ui/v1.0"
 	xmlns:html="http://www.w3.org/1999/xhtml" version="2.0"

diff --git a/wcomponents-theme/src/main/xslt/wc.ui.decoratedLabel.xsl b/wcomponents-theme/src/main/xslt/wc.ui.decoratedLabel.xsl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	xmlns:ui="https://github.com/bordertech/wcomponents/namespace/ui/v1.0"
 	xmlns:html="http://www.w3.org/1999/xhtml" version="2.0"

diff --git a/wcomponents-theme/src/main/xslt/wc.ui.definitionList.xsl b/wcomponents-theme/src/main/xslt/wc.ui.definitionList.xsl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	xmlns:ui="https://github.com/bordertech/wcomponents/namespace/ui/v1.0"
 	xmlns:html="http://www.w3.org/1999/xhtml" version="2.0"

diff --git a/wcomponents-theme/src/main/xslt/wc.ui.dialog.xsl b/wcomponents-theme/src/main/xslt/wc.ui.dialog.xsl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	xmlns:ui="https://github.com/bordertech/wcomponents/namespace/ui/v1.0"
 	xmlns:html="http://www.w3.org/1999/xhtml" version="2.0"

diff --git a/wcomponents-theme/src/main/xslt/wc.ui.dropdown.xsl b/wcomponents-theme/src/main/xslt/wc.ui.dropdown.xsl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	xmlns:ui="https://github.com/bordertech/wcomponents/namespace/ui/v1.0"
 	xmlns:html="http://www.w3.org/1999/xhtml" version="2.0"

diff --git a/wcomponents-theme/src/main/xslt/wc.ui.fieldLayout.xsl b/wcomponents-theme/src/main/xslt/wc.ui.fieldLayout.xsl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	xmlns:ui="https://github.com/bordertech/wcomponents/namespace/ui/v1.0"
 	xmlns:html="http://www.w3.org/1999/xhtml" version="2.0"

diff --git a/wcomponents-theme/src/main/xslt/wc.ui.fieldSet.xsl b/wcomponents-theme/src/main/xslt/wc.ui.fieldSet.xsl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	xmlns:ui="https://github.com/bordertech/wcomponents/namespace/ui/v1.0"
 	xmlns:html="http://www.w3.org/1999/xhtml" version="2.0"

diff --git a/wcomponents-theme/src/main/xslt/wc.ui.fieldindicator.xsl b/wcomponents-theme/src/main/xslt/wc.ui.fieldindicator.xsl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	xmlns:ui="https://github.com/bordertech/wcomponents/namespace/ui/v1.0"
 	xmlns:html="http://www.w3.org/1999/xhtml" version="2.0"

diff --git a/wcomponents-theme/src/main/xslt/wc.ui.figure.xsl b/wcomponents-theme/src/main/xslt/wc.ui.figure.xsl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	xmlns:ui="https://github.com/bordertech/wcomponents/namespace/ui/v1.0"
 	xmlns:html="http://www.w3.org/1999/xhtml" version="2.0"

diff --git a/wcomponents-theme/src/main/xslt/wc.ui.heading.xsl b/wcomponents-theme/src/main/xslt/wc.ui.heading.xsl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	xmlns:ui="https://github.com/bordertech/wcomponents/namespace/ui/v1.0"
 	xmlns:html="http://www.w3.org/1999/xhtml" version="2.0"

diff --git a/wcomponents-theme/src/main/xslt/wc.ui.imageEdit.xsl b/wcomponents-theme/src/main/xslt/wc.ui.imageEdit.xsl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	xmlns:ui="https://github.com/bordertech/wcomponents/namespace/ui/v1.0"
 	xmlns:html="http://www.w3.org/1999/xhtml" version="2.0"

diff --git a/wcomponents-theme/src/main/xslt/wc.ui.label.xsl b/wcomponents-theme/src/main/xslt/wc.ui.label.xsl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	xmlns:ui="https://github.com/bordertech/wcomponents/namespace/ui/v1.0"
 	xmlns:html="http://www.w3.org/1999/xhtml" version="2.0"

diff --git a/wcomponents-theme/src/main/xslt/wc.ui.link.xsl b/wcomponents-theme/src/main/xslt/wc.ui.link.xsl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	xmlns:ui="https://github.com/bordertech/wcomponents/namespace/ui/v1.0"
 	xmlns:html="http://www.w3.org/1999/xhtml" version="2.0"

diff --git a/wcomponents-theme/src/main/xslt/wc.ui.listbox.xsl b/wcomponents-theme/src/main/xslt/wc.ui.listbox.xsl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	xmlns:ui="https://github.com/bordertech/wcomponents/namespace/ui/v1.0"
 	xmlns:html="http://www.w3.org/1999/xhtml" version="2.0"

diff --git a/wcomponents-theme/src/main/xslt/wc.ui.margin.xsl b/wcomponents-theme/src/main/xslt/wc.ui.margin.xsl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	xmlns:ui="https://github.com/bordertech/wcomponents/namespace/ui/v1.0"
 	xmlns:html="http://www.w3.org/1999/xhtml" version="2.0"

diff --git a/wcomponents-theme/src/main/xslt/wc.ui.menu.xsl b/wcomponents-theme/src/main/xslt/wc.ui.menu.xsl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	xmlns:ui="https://github.com/bordertech/wcomponents/namespace/ui/v1.0"
 	xmlns:html="http://www.w3.org/1999/xhtml" version="2.0"

diff --git a/wcomponents-theme/src/main/xslt/wc.ui.messagebox.xsl b/wcomponents-theme/src/main/xslt/wc.ui.messagebox.xsl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	xmlns:ui="https://github.com/bordertech/wcomponents/namespace/ui/v1.0"
 	xmlns:html="http://www.w3.org/1999/xhtml" version="2.0"

diff --git a/wcomponents-theme/src/main/xslt/wc.ui.multidropdown.xsl b/wcomponents-theme/src/main/xslt/wc.ui.multidropdown.xsl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	xmlns:ui="https://github.com/bordertech/wcomponents/namespace/ui/v1.0"
 	xmlns:html="http://www.w3.org/1999/xhtml" version="2.0"

diff --git a/wcomponents-theme/src/main/xslt/wc.ui.multitextfield.xsl b/wcomponents-theme/src/main/xslt/wc.ui.multitextfield.xsl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	xmlns:ui="https://github.com/bordertech/wcomponents/namespace/ui/v1.0"
 	xmlns:html="http://www.w3.org/1999/xhtml" version="2.0"

diff --git a/wcomponents-theme/src/main/xslt/wc.ui.numberfield.xsl b/wcomponents-theme/src/main/xslt/wc.ui.numberfield.xsl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	xmlns:ui="https://github.com/bordertech/wcomponents/namespace/ui/v1.0"
 	xmlns:html="http://www.w3.org/1999/xhtml" version="2.0"

diff --git a/wcomponents-theme/src/main/xslt/wc.ui.optgroup.xsl b/wcomponents-theme/src/main/xslt/wc.ui.optgroup.xsl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	xmlns:ui="https://github.com/bordertech/wcomponents/namespace/ui/v1.0"
 	xmlns:html="http://www.w3.org/1999/xhtml" version="2.0"

diff --git a/wcomponents-theme/src/main/xslt/wc.ui.option.xsl b/wcomponents-theme/src/main/xslt/wc.ui.option.xsl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	xmlns:ui="https://github.com/bordertech/wcomponents/namespace/ui/v1.0"
 	xmlns:html="http://www.w3.org/1999/xhtml" version="2.0"

diff --git a/wcomponents-theme/src/main/xslt/wc.ui.popup.xsl b/wcomponents-theme/src/main/xslt/wc.ui.popup.xsl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	xmlns:ui="https://github.com/bordertech/wcomponents/namespace/ui/v1.0"
 	xmlns:html="http://www.w3.org/1999/xhtml" version="2.0"

diff --git a/wcomponents-theme/src/main/xslt/wc.ui.redirect.xsl b/wcomponents-theme/src/main/xslt/wc.ui.redirect.xsl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	xmlns:ui="https://github.com/bordertech/wcomponents/namespace/ui/v1.0"
 	xmlns:html="http://www.w3.org/1999/xhtml" version="2.0"

diff --git a/wcomponents-theme/src/main/xslt/wc.ui.section.xsl b/wcomponents-theme/src/main/xslt/wc.ui.section.xsl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	xmlns:ui="https://github.com/bordertech/wcomponents/namespace/ui/v1.0"
 	xmlns:html="http://www.w3.org/1999/xhtml" version="2.0"

diff --git a/wcomponents-theme/src/main/xslt/wc.ui.session.xsl b/wcomponents-theme/src/main/xslt/wc.ui.session.xsl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	xmlns:ui="https://github.com/bordertech/wcomponents/namespace/ui/v1.0"
 	xmlns:html="http://www.w3.org/1999/xhtml" version="2.0"

diff --git a/wcomponents-theme/src/main/xslt/wc.ui.skiplinks.xsl b/wcomponents-theme/src/main/xslt/wc.ui.skiplinks.xsl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	xmlns:ui="https://github.com/bordertech/wcomponents/namespace/ui/v1.0"
 	xmlns:html="http://www.w3.org/1999/xhtml" version="2.0"

diff --git a/wcomponents-theme/src/main/xslt/wc.ui.src.xsl b/wcomponents-theme/src/main/xslt/wc.ui.src.xsl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	xmlns:ui="https://github.com/bordertech/wcomponents/namespace/ui/v1.0"
 	xmlns:html="http://www.w3.org/1999/xhtml" version="2.0"

diff --git a/wcomponents-theme/src/main/xslt/wc.ui.subordinate.xsl b/wcomponents-theme/src/main/xslt/wc.ui.subordinate.xsl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	xmlns:ui="https://github.com/bordertech/wcomponents/namespace/ui/v1.0"
 	xmlns:html="http://www.w3.org/1999/xhtml" version="2.0"

diff --git a/wcomponents-theme/src/main/xslt/wc.ui.suggestions.xsl b/wcomponents-theme/src/main/xslt/wc.ui.suggestions.xsl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	xmlns:ui="https://github.com/bordertech/wcomponents/namespace/ui/v1.0"
 	xmlns:html="http://www.w3.org/1999/xhtml" version="2.0"

diff --git a/wcomponents-theme/src/main/xslt/wc.ui.table.xsl b/wcomponents-theme/src/main/xslt/wc.ui.table.xsl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	xmlns:ui="https://github.com/bordertech/wcomponents/namespace/ui/v1.0"
 	xmlns:html="http://www.w3.org/1999/xhtml" version="2.0"

diff --git a/wcomponents-theme/src/main/xslt/wc.ui.tabset.xsl b/wcomponents-theme/src/main/xslt/wc.ui.tabset.xsl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	xmlns:ui="https://github.com/bordertech/wcomponents/namespace/ui/v1.0"
 	xmlns:html="http://www.w3.org/1999/xhtml" version="2.0"

diff --git a/wcomponents-theme/src/main/xslt/wc.ui.text.xsl b/wcomponents-theme/src/main/xslt/wc.ui.text.xsl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	xmlns:ui="https://github.com/bordertech/wcomponents/namespace/ui/v1.0"
 	xmlns:html="http://www.w3.org/1999/xhtml" version="2.0"

diff --git a/wcomponents-theme/src/main/xslt/wc.ui.textarea.xsl b/wcomponents-theme/src/main/xslt/wc.ui.textarea.xsl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	xmlns:ui="https://github.com/bordertech/wcomponents/namespace/ui/v1.0"
 	xmlns:html="http://www.w3.org/1999/xhtml" version="2.0"

diff --git a/wcomponents-theme/src/main/xslt/wc.ui.togglebutton.xsl b/wcomponents-theme/src/main/xslt/wc.ui.togglebutton.xsl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	xmlns:ui="https://github.com/bordertech/wcomponents/namespace/ui/v1.0"
 	xmlns:html="http://www.w3.org/1999/xhtml" version="2.0"

diff --git a/wcomponents-theme/src/main/xslt/wc.ui.tree.xsl b/wcomponents-theme/src/main/xslt/wc.ui.tree.xsl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	xmlns:ui="https://github.com/bordertech/wcomponents/namespace/ui/v1.0"
 	xmlns:html="http://www.w3.org/1999/xhtml" version="2.0"

diff --git a/wcomponents-theme/src/main/xslt/wc.ui.version.xsl b/wcomponents-theme/src/main/xslt/wc.ui.version.xsl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	xmlns:ui="https://github.com/bordertech/wcomponents/namespace/ui/v1.0"
 	xmlns:html="http://www.w3.org/1999/xhtml" version="2.0"

diff --git a/wcomponents-theme/src/main/xslt/wc.ui.video.xsl b/wcomponents-theme/src/main/xslt/wc.ui.video.xsl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	xmlns:ui="https://github.com/bordertech/wcomponents/namespace/ui/v1.0"
 	xmlns:html="http://www.w3.org/1999/xhtml" version="2.0"