<div dir="ltr">Please push this too. <div><br></div><div>Someday we will attempt to have some discipline and straighten this duplication out.</div></div><div class="gmail_extra"><br><br><div class="gmail_quote">On Wed, Jun 5, 2013 at 7:19 AM, Simon Lukasik <span dir="ltr"><<a href="mailto:isimluk@fedoraproject.org" target="_blank">isimluk@fedoraproject.org</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">From: Simon Lukasik <<a href="mailto:slukasik@redhat.com">slukasik@redhat.com</a>><br>
<br>
---<br>
OpenStack/Makefile | 3 ++-<br>
OpenStack/transforms/add_xccdf_namespace.xslt | 15 +++++++++++++++<br>
OpenStack/transforms/shorthand2xccdf.xslt | 3 ---<br>
RHEVM3/Makefile | 3 ++-<br>
RHEVM3/transforms/add_xccdf_namespace.xslt | 15 +++++++++++++++<br>
RHEVM3/transforms/shorthand2xccdf.xslt | 3 ---<br>
6 files changed, 34 insertions(+), 8 deletions(-)<br>
create mode 100644 OpenStack/transforms/add_xccdf_namespace.xslt<br>
create mode 100644 RHEVM3/transforms/add_xccdf_namespace.xslt<br>
<br>
diff --git a/OpenStack/Makefile b/OpenStack/Makefile<br>
index f1c49b2..69280a1 100644<br>
--- a/OpenStack/Makefile<br>
+++ b/OpenStack/Makefile<br>
@@ -14,7 +14,8 @@ shorthand-guide:<br>
xmllint --format --output $(OUT)/openstack-shorthand.xml $(OUT)/openstack-shorthand.xml<br>
<br>
shorthand2xccdf: shorthand-guide<br>
- xsltproc -o $(OUT)/unlinked-noprofiles-openstack-xccdf.xml $(TRANS)/shorthand2xccdf.xslt $(OUT)/openstack-shorthand.xml<br>
+ xsltproc -o $(OUT)/unlinked-noprofiles-openstack-shorthand.xml $(TRANS)/shorthand2xccdf.xslt $(OUT)/openstack-shorthand.xml<br>
+ xsltproc -o $(OUT)/unlinked-noprofiles-openstack-xccdf.xml $(TRANS)/add_xccdf_namespace.xslt $(OUT)/unlinked-noprofiles-openstack-shorthand.xml<br>
xsltproc -stringparam profile "allprofiles" -o $(OUT)/unlinked-openstack-xccdf-prerefs.xml \<br>
$(TRANS)/xccdf-addprofiles.xslt $(OUT)/unlinked-noprofiles-openstack-xccdf.xml<br>
xsltproc -stringparam profile "stig-openstack-server" -o $(OUT)/unlinked-openstack-xccdf.xml \<br>
diff --git a/OpenStack/transforms/add_xccdf_namespace.xslt b/OpenStack/transforms/add_xccdf_namespace.xslt<br>
new file mode 100644<br>
index 0000000..3acd511<br>
--- /dev/null<br>
+++ b/OpenStack/transforms/add_xccdf_namespace.xslt<br>
@@ -0,0 +1,15 @@<br>
+<?xml version="1.0"?><br>
+<xsl:stylesheet version="1.0" xmlns:xsl="<a href="http://www.w3.org/1999/XSL/Transform" target="_blank">http://www.w3.org/1999/XSL/Transform</a>"><br>
+ <!-- Add the XCCDF 1.1 namespace to all elements without namespace. --><br>
+ <xsl:template match="node()|@*"><br>
+ <xsl:copy><br>
+ <xsl:apply-templates select="node()|@*"/><br>
+ </xsl:copy><br>
+ </xsl:template><br>
+<br>
+ <xsl:template match="*[namespace-uri()='']"><br>
+ <xsl:element name="{local-name()}" namespace="<a href="http://checklists.nist.gov/xccdf/1.1" target="_blank">http://checklists.nist.gov/xccdf/1.1</a>"><br>
+ <xsl:apply-templates select="node()|@*" /><br>
+ </xsl:element><br>
+ </xsl:template><br>
+</xsl:stylesheet><br>
diff --git a/OpenStack/transforms/shorthand2xccdf.xslt b/OpenStack/transforms/shorthand2xccdf.xslt<br>
index c25323d..ef6be4b 100644<br>
--- a/OpenStack/transforms/shorthand2xccdf.xslt<br>
+++ b/OpenStack/transforms/shorthand2xccdf.xslt<br>
@@ -16,9 +16,6 @@ exclude-result-prefixes="xccdf xhtml dc"><br>
<!-- Content:template --><br>
<xsl:template match="Benchmark"><br>
<xsl:copy><br>
- <xsl:attribute name="xmlns"><br>
- <xsl:text><a href="http://checklists.nist.gov/xccdf/1.1" target="_blank">http://checklists.nist.gov/xccdf/1.1</a></xsl:text><br>
- </xsl:attribute><br>
<xsl:apply-templates select="@*|node()" /><br>
</xsl:copy><br>
</xsl:template><br>
diff --git a/RHEVM3/Makefile b/RHEVM3/Makefile<br>
index c5d1c29..9f523ed 100644<br>
--- a/RHEVM3/Makefile<br>
+++ b/RHEVM3/Makefile<br>
@@ -14,7 +14,8 @@ shorthand-guide:<br>
xmllint --format --output $(OUT)/rhevm3-shorthand.xml $(OUT)/rhevm3-shorthand.xml<br>
<br>
shorthand2xccdf: shorthand-guide<br>
- xsltproc -o $(OUT)/unlinked-noprofiles-rhevm3-xccdf.xml $(TRANS)/shorthand2xccdf.xslt $(OUT)/rhevm3-shorthand.xml<br>
+ xsltproc -o $(OUT)/unlinked-noprofiles-rhevm3-shorthand.xml $(TRANS)/shorthand2xccdf.xslt $(OUT)/rhevm3-shorthand.xml<br>
+ xsltproc -o $(OUT)/unlinked-noprofiles-rhevm3-xccdf.xml $(TRANS)/add_xccdf_namespace.xslt $(OUT)/unlinked-noprofiles-rhevm3-shorthand.xml<br>
xsltproc -stringparam profile "allprofiles" -o $(OUT)/unlinked-rhevm3-xccdf-prerefs.xml \<br>
$(TRANS)/xccdf-addprofiles.xslt $(OUT)/unlinked-noprofiles-rhevm3-xccdf.xml<br>
xsltproc -stringparam profile "stig-rhevm3-server" -o $(OUT)/unlinked-rhevm3-xccdf.xml \<br>
diff --git a/RHEVM3/transforms/add_xccdf_namespace.xslt b/RHEVM3/transforms/add_xccdf_namespace.xslt<br>
new file mode 100644<br>
index 0000000..3acd511<br>
--- /dev/null<br>
+++ b/RHEVM3/transforms/add_xccdf_namespace.xslt<br>
@@ -0,0 +1,15 @@<br>
+<?xml version="1.0"?><br>
+<xsl:stylesheet version="1.0" xmlns:xsl="<a href="http://www.w3.org/1999/XSL/Transform" target="_blank">http://www.w3.org/1999/XSL/Transform</a>"><br>
+ <!-- Add the XCCDF 1.1 namespace to all elements without namespace. --><br>
+ <xsl:template match="node()|@*"><br>
+ <xsl:copy><br>
+ <xsl:apply-templates select="node()|@*"/><br>
+ </xsl:copy><br>
+ </xsl:template><br>
+<br>
+ <xsl:template match="*[namespace-uri()='']"><br>
+ <xsl:element name="{local-name()}" namespace="<a href="http://checklists.nist.gov/xccdf/1.1" target="_blank">http://checklists.nist.gov/xccdf/1.1</a>"><br>
+ <xsl:apply-templates select="node()|@*" /><br>
+ </xsl:element><br>
+ </xsl:template><br>
+</xsl:stylesheet><br>
diff --git a/RHEVM3/transforms/shorthand2xccdf.xslt b/RHEVM3/transforms/shorthand2xccdf.xslt<br>
index aa50713..54a0d68 100644<br>
--- a/RHEVM3/transforms/shorthand2xccdf.xslt<br>
+++ b/RHEVM3/transforms/shorthand2xccdf.xslt<br>
@@ -16,9 +16,6 @@ exclude-result-prefixes="xccdf xhtml dc"><br>
<!-- Content:template --><br>
<xsl:template match="Benchmark"><br>
<xsl:copy><br>
- <xsl:attribute name="xmlns"><br>
- <xsl:text><a href="http://checklists.nist.gov/xccdf/1.1" target="_blank">http://checklists.nist.gov/xccdf/1.1</a></xsl:text><br>
- </xsl:attribute><br>
<xsl:apply-templates select="@*|node()" /><br>
</xsl:copy><br>
</xsl:template><br>
<span class="HOEnZb"><font color="#888888">--<br>
1.8.2.1<br>
<br>
_______________________________________________<br>
scap-security-guide mailing list<br>
<a href="mailto:scap-security-guide@lists.fedorahosted.org">scap-security-guide@lists.fedorahosted.org</a><br>
<a href="https://lists.fedorahosted.org/mailman/listinfo/scap-security-guide" target="_blank">https://lists.fedorahosted.org/mailman/listinfo/scap-security-guide</a><br>
</font></span></blockquote></div><br></div>