Awesome, please push! On 07/28/2013 11:48 PM, Jeffrey Blank wrote:
I've moved the namespace-assignment templates from shorthand2xccdf.xslt to xccdf-addnamespaces.xslt (which is itself a renamed version of the transform Simon provided to us, to place all un-namespaced elements into the XCCDF namespace). This refactoring seemed to make sense, as it separates the macro expansion activities from the namespace assignment activities.Going forward, I plan to explore: A. Deleting the xccdf-addprofiles.xslt transform entirely, in favor of simply including its functionality directly in input/guide.xslt. B. Further simplification of some of the lines in shorthand2xccdf.xslt, with use of "{}" etc to further shorten overall number of lines. C. Activating (perhaps using xsl:import and @mode) the namespace-specific transformations currently in xccdf-addnamespace.xslt from within shorthand2xccdf.xslt. This would have the benefit of actually producing XCCDF, as the name shorthand2xccdf already suggests... This would also help simplify the Makefile. Jeffrey Blank (3): refactoring of XCCDF shorthand expansion and namespace assignments removing namespaces from no-namespace fragments, transforms renaming namespace addition file, as part of refactoring RHEL6/Makefile | 4 +- RHEL6/input/profiles/CS2.xml | 2 +- RHEL6/input/profiles/common.xml | 2 +- RHEL6/input/profiles/desktop.xml | 2 +- RHEL6/input/profiles/fisma-medium-rhel6-server.xml | 2 +- RHEL6/input/profiles/nist-CL-IL-AL.xml | 2 +- RHEL6/input/profiles/server.xml | 2 +- RHEL6/input/profiles/stig-rhel6-server.xml | 2 +- RHEL6/input/profiles/test.xml | 2 +- RHEL6/input/profiles/usgcb-rhel6-server.xml | 2 +- RHEL6/transforms/add_xccdf_namespace.xslt | 15 --- RHEL6/transforms/shorthand2xccdf.xslt | 108 ++++---------------- RHEL6/transforms/xccdf-addnamespaces.xslt | 49 +++++++++ RHEL6/transforms/xccdf-addprofiles.xslt | 6 +- 14 files changed, 81 insertions(+), 119 deletions(-) delete mode 100644 RHEL6/transforms/add_xccdf_namespace.xslt create mode 100644 RHEL6/transforms/xccdf-addnamespaces.xslt _______________________________________________ scap-security-guide mailing list [email protected] https://lists.fedorahosted.org/mailman/listinfo/scap-security-guide
_______________________________________________ scap-security-guide mailing list [email protected] https://lists.fedorahosted.org/mailman/listinfo/scap-security-guide
