Skip to content

Commit 72d8143

Browse files
committed
Clean up namespaces
Add default XHTML namespace to aid XML-aware editors
1 parent 4e3d125 commit 72d8143

24 files changed

+65
-85
lines changed

src/etc/checkstyle/checkstyle-frames-sortby-check.xsl

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
<?xml version="1.0"?>
2-
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="2.0"
3-
xmlns:lxslt="http://xml.apache.org/xslt"
4-
xmlns:redirect="http://xml.apache.org/xalan/redirect"
5-
extension-element-prefixes="redirect">
2+
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
3+
xmlns:redirect="http://xml.apache.org/xalan/redirect"
4+
extension-element-prefixes="redirect">
65

76
<!--
87
Licensed to the Apache Software Foundation (ASF) under one or more

src/etc/checkstyle/checkstyle-frames.xsl

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
<?xml version="1.0"?>
22
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
3-
xmlns:lxslt="http://xml.apache.org/xslt"
4-
xmlns:redirect="http://xml.apache.org/xalan/redirect"
5-
extension-element-prefixes="redirect">
3+
xmlns:redirect="http://xml.apache.org/xalan/redirect"
4+
extension-element-prefixes="redirect">
65

76
<!--
87
Licensed to the Apache Software Foundation (ASF) under one or more

src/etc/checkstyle/checkstyle-xdoc.xsl

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
<?xml version="1.0"?>
22
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
3-
xmlns:lxslt="http://xml.apache.org/xslt"
4-
xmlns:redirect="org.apache.xalan.lib.Redirect"
5-
extension-element-prefixes="redirect">
3+
xmlns:redirect="http://xml.apache.org/xalan/redirect"
4+
extension-element-prefixes="redirect">
65

76
<!--
87
Licensed to the Apache Software Foundation (ASF) under one or more

src/etc/coverage-frames.xsl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0"?>
22
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
3-
xmlns:lxslt="http://xml.apache.org/xslt"
4-
xmlns:redirect="org.apache.xalan.lib.Redirect"
5-
extension-element-prefixes="redirect">
3+
xmlns="http://www.w3.org/1999/xhtml"
4+
xmlns:redirect="http://xml.apache.org/xalan/redirect"
5+
extension-element-prefixes="redirect">
66
<xsl:output method="html" indent="yes"/>
77
<xsl:decimal-format decimal-separator="." grouping-separator="," />
88
<!--

src/etc/jdepend-frames.xsl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0"?>
2-
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
3-
xmlns:lxslt="http://xml.apache.org/xslt"
4-
xmlns:redirect="org.apache.xalan.lib.Redirect"
5-
extension-element-prefixes="redirect">
2+
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
3+
xmlns="http://www.w3.org/1999/xhtml"
4+
xmlns:redirect="http://xml.apache.org/xalan/redirect"
5+
extension-element-prefixes="redirect">
66
<xsl:output method="html" indent="yes" encoding="US-ASCII"/>
77
<!--
88
Licensed to the Apache Software Foundation (ASF) under one or more

src/etc/jdepend.xsl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0"?>
2-
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
2+
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
3+
xmlns="http://www.w3.org/1999/xhtml">
34

45
<!--
56
Licensed to the Apache Software Foundation (ASF) under one or more

src/etc/junit-frames-saxon.xsl

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
<?xml version="1.0"?>
2-
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
3-
xmlns:xs="http://www.w3.org/2001/XMLSchema"
4-
exclude-result-prefixes="xs"
5-
version="2.0">
2+
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="2.0"
3+
xmlns="http://www.w3.org/1999/xhtml">
64
<xsl:character-map name="no-control-characters">
75
<xsl:output-character character="&#127;" string="&amp;#127;"/>
86
<xsl:output-character character="&#128;" string="&amp;#128;"/>

src/etc/junit-frames-xalan1.xsl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0"?>
22
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
3-
xmlns:lxslt="http://xml.apache.org/xslt"
4-
xmlns:redirect="org.apache.xalan.lib.Redirect"
5-
xmlns:string="xalan://java.lang.String"
6-
xmlns:stringutils="xalan://org.apache.tools.ant.util.StringUtils"
3+
xmlns="http://www.w3.org/1999/xhtml"
4+
xmlns:redirect="org.apache.xalan.lib.Redirect"
5+
xmlns:string="xalan://java.lang.String"
6+
xmlns:stringutils="xalan://org.apache.tools.ant.util.StringUtils"
77
extension-element-prefixes="redirect">
88
<xsl:output method="html" indent="yes" encoding="UTF-8"/>
99
<xsl:decimal-format decimal-separator="." grouping-separator=","/>

src/etc/junit-frames.xsl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0"?>
22
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
3-
xmlns:lxslt="http://xml.apache.org/xslt"
4-
xmlns:redirect="http://xml.apache.org/xalan/redirect"
5-
xmlns:string="xalan://java.lang.String"
6-
extension-element-prefixes="redirect">
3+
xmlns="http://www.w3.org/1999/xhtml"
4+
xmlns:redirect="http://xml.apache.org/xalan/redirect"
5+
xmlns:string="xalan://java.lang.String"
6+
extension-element-prefixes="redirect">
77
<xsl:output method="html" indent="yes" encoding="UTF-8"/>
88
<xsl:decimal-format decimal-separator="." grouping-separator=","/>
99
<!--

src/etc/junit-noframes-saxon.xsl

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
<?xml version="1.0"?>
2-
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
3-
xmlns:xs="http://www.w3.org/2001/XMLSchema"
4-
exclude-result-prefixes="xs"
5-
version="2.0">
2+
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="2.0"
3+
xmlns="http://www.w3.org/1999/xhtml">
64
<xsl:character-map name="no-control-characters">
75
<xsl:output-character character="&#127;" string="&amp;#127;"/>
86
<xsl:output-character character="&#128;" string="&amp;#128;"/>

src/etc/junit-noframes.xsl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0"?>
22
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
3-
xmlns:lxslt="http://xml.apache.org/xslt"
4-
xmlns:string="xalan://java.lang.String">
3+
xmlns="http://www.w3.org/1999/xhtml"
4+
xmlns:string="xalan://java.lang.String">
55
<xsl:output method="html" indent="yes" encoding="UTF-8"
66
doctype-public="-//W3C//DTD HTML 4.01 Transitional//EN" />
77
<xsl:decimal-format decimal-separator="." grouping-separator="," />

src/etc/log.xsl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0"?>
2-
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
2+
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
3+
xmlns="http://www.w3.org/1999/xhtml">
34
<xsl:output method="html" indent="yes" encoding="US-ASCII"/>
45
<!--
56
Licensed to the Apache Software Foundation (ASF) under one or more

src/etc/maudit-frames.xsl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0"?>
22
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
3-
xmlns:lxslt="http://xml.apache.org/xslt"
4-
xmlns:redirect="org.apache.xalan.lib.Redirect"
5-
extension-element-prefixes="redirect">
3+
xmlns="http://www.w3.org/1999/xhtml"
4+
xmlns:redirect="http://xml.apache.org/xalan/redirect"
5+
extension-element-prefixes="redirect">
66
<xsl:output method="html" indent="yes" encoding="US-ASCII"/>
77
<xsl:decimal-format decimal-separator="." grouping-separator="," />
88
<!--

src/etc/mmetrics-frames.xsl

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?xml version="1.0"?>
22
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
3-
xmlns:lxslt="http://xml.apache.org/xslt"
4-
xmlns:xalan="http://xml.apache.org/xalan"
5-
xmlns:redirect="org.apache.xalan.lib.Redirect"
6-
exclude-result-prefixes="xalan"
7-
extension-element-prefixes="redirect">
3+
xmlns="http://www.w3.org/1999/xhtml"
4+
xmlns:exsl="http://exslt.org/common"
5+
xmlns:redirect="http://xml.apache.org/xalan/redirect"
6+
exclude-result-prefixes="exsl"
7+
extension-element-prefixes="redirect">
88
<xsl:output method="html" indent="yes" encoding="US-ASCII"/>
99
<xsl:decimal-format decimal-separator="." grouping-separator="," />
1010
<!--
@@ -59,7 +59,7 @@
5959
</xsl:element>
6060
</xsl:variable>
6161

62-
<xsl:variable name="doctree" select="xalan:nodeset($doctree.var)"/>
62+
<xsl:variable name="doctree" select="exsl:node-set($doctree.var)"/>
6363

6464
<xsl:template match="metrics">
6565

src/etc/tagdiff.xsl

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,8 @@
1616
limitations under the License.
1717
-->
1818
<!-- a stylesheet to display changelogs ala netbeans -->
19-
<xsl:stylesheet
20-
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
21-
version="1.0">
19+
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
20+
xmlns="http://www.w3.org/1999/xhtml">
2221
<xsl:param name="title"/>
2322
<xsl:param name="module"/>
2423
<xsl:param name="cvsweb"/>

src/etc/testcases/taskdefs/optional/junitreport-with-include/junit-frames.xsl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0"?>
22
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
3-
xmlns:lxslt="http://xml.apache.org/xslt"
4-
xmlns:redirect="http://xml.apache.org/xalan/redirect"
5-
xmlns:stringutils="xalan://org.apache.tools.ant.util.StringUtils"
6-
extension-element-prefixes="redirect">
3+
xmlns="http://www.w3.org/1999/xhtml"
4+
xmlns:redirect="http://xml.apache.org/xalan/redirect"
5+
xmlns:stringutils="xalan://org.apache.tools.ant.util.StringUtils"
6+
extension-element-prefixes="redirect">
77
<xsl:import href="junit-import.xsl"/>
88
<xsl:output method="html" indent="yes" encoding="US-ASCII"/>
99
<xsl:decimal-format decimal-separator="." grouping-separator=","/>

src/etc/testcases/taskdefs/optional/junitreport-with-include/junit-import.xsl

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
<?xml version="1.0"?>
2-
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
3-
xmlns:lxslt="http://xml.apache.org/xslt"
4-
xmlns:redirect="http://xml.apache.org/xalan/redirect"
5-
xmlns:stringutils="xalan://org.apache.tools.ant.util.StringUtils"
6-
extension-element-prefixes="redirect">
2+
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
73
<!--
84
Licensed to the Apache Software Foundation (ASF) under one or more
95
contributor license agreements. See the NOTICE file distributed with

src/etc/testcases/taskdefs/optional/junitreport/junit-frames.xsl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0"?>
22
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
3-
xmlns:lxslt="http://xml.apache.org/xslt"
4-
xmlns:redirect="http://xml.apache.org/xalan/redirect"
5-
xmlns:stringutils="xalan://org.apache.tools.ant.util.StringUtils"
6-
extension-element-prefixes="redirect">
3+
xmlns="http://www.w3.org/1999/xhtml"
4+
xmlns:redirect="http://xml.apache.org/xalan/redirect"
5+
xmlns:stringutils="xalan://org.apache.tools.ant.util.StringUtils"
6+
extension-element-prefixes="redirect">
77
<xsl:output method="html" indent="yes" encoding="US-ASCII"/>
88
<xsl:decimal-format decimal-separator="." grouping-separator=","/>
99
<!--

src/etc/testcases/taskdefs/optional/xalan-redirect-in.xsl

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,9 @@
1515
See the License for the specific language governing permissions and
1616
limitations under the License.
1717
-->
18-
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
19-
xmlns:lxslt="http://xml.apache.org/xslt"
20-
xmlns:redirect="http://xml.apache.org/xalan/redirect"
21-
extension-element-prefixes="redirect">
18+
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
19+
xmlns:redirect="http://xml.apache.org/xalan/redirect"
20+
extension-element-prefixes="redirect">
2221
<!--
2322
This is a test to ensure that systemid is set correctly
2423
for a xsl...the behavior might be dependent on Xalan1

src/etc/testcases/taskdefs/optional/xml/doc.xsl

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,7 @@
1515
See the License for the specific language governing permissions and
1616
limitations under the License.
1717
-->
18-
<xsl:stylesheet
19-
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
20-
xmlns:template="struts template"
21-
version="1.0">
18+
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
2219
<xsl:output method="text"/>
2320
<xsl:template match="/">
2421
<xsl:value-of select="/doc/section"/>

src/etc/testcases/taskdefs/style/printParams.xsl

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,7 @@
1616
limitations under the License.
1717
-->
1818

19-
<xsl:stylesheet
20-
version="1.0"
21-
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
22-
xmlns:fo="http://www.w3.org/1999/XSL/Format">
19+
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
2320

2421
<!-- get the xsl-parameter -->
2522
<xsl:param name="set">set default value</xsl:param>

src/tests/antunit/junit-frames.xsl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0"?>
22
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
3-
xmlns:lxslt="http://xml.apache.org/xslt"
4-
xmlns:redirect="http://xml.apache.org/xalan/redirect"
5-
xmlns:stringutils="xalan://org.apache.tools.ant.util.StringUtils"
6-
extension-element-prefixes="redirect">
3+
xmlns="http://www.w3.org/1999/xhtml"
4+
xmlns:redirect="http://xml.apache.org/xalan/redirect"
5+
xmlns:stringutils="xalan://org.apache.tools.ant.util.StringUtils"
6+
extension-element-prefixes="redirect">
77
<xsl:output method="html" indent="yes" encoding="US-ASCII"/>
88
<xsl:decimal-format decimal-separator="." grouping-separator=","/>
99
<!--

src/tests/antunit/junit-noframes.xsl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0"?>
22
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
3-
xmlns:lxslt="http://xml.apache.org/xslt"
4-
xmlns:stringutils="xalan://org.apache.tools.ant.util.StringUtils">
3+
xmlns="http://www.w3.org/1999/xhtml"
4+
xmlns:stringutils="xalan://org.apache.tools.ant.util.StringUtils">
55
<xsl:output method="html" indent="yes" encoding="US-ASCII"
6-
doctype-public="-//W3C//DTD HTML 4.01 Transitional//EN" />
6+
doctype-public="-//W3C//DTD HTML 4.01 Transitional//EN" />
77
<xsl:decimal-format decimal-separator="." grouping-separator="," />
88
<!--
99
Licensed to the Apache Software Foundation (ASF) under one

src/tests/antunit/taskdefs/xslt/printParams-invalid.xsl

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,7 @@
1616
limitations under the License.
1717
-->
1818

19-
<xsl:stylesheet
20-
version="1.0"
21-
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
22-
xmlns:fo="http://www.w3.org/1999/XSL/Format">
19+
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
2320

2421
<!-- get the xsl-parameter -->
2522
<xsl:param name="set">set default value</xsl:param>

0 commit comments

Comments
 (0)