From 2b03551dc4a7d76d6518c67f2d6cb1d2f1e68e6b Mon Sep 17 00:00:00 2001 From: Tom Copeland Date: Wed, 31 May 2006 13:09:31 +0000 Subject: [PATCH] Added munger for rulesets xmlns thing git-svn-id: https://pmd.svn.sourceforge.net/svnroot/pmd/trunk@4395 51baf565-9d33-0410-a72c-fc3788e3496d --- pmd/docs.sh | 14 ++++++++++++-- pmd/etc/changelog.txt | 2 +- pmd/etc/jsl/rule-format.jsl | 4 +++- pmd/munge_rulesets.rb | 6 ++++++ 4 files changed, 22 insertions(+), 4 deletions(-) create mode 100755 pmd/munge_rulesets.rb diff --git a/pmd/docs.sh b/pmd/docs.sh index 1a2f62473e..363b8c1ca7 100755 --- a/pmd/docs.sh +++ b/pmd/docs.sh @@ -4,14 +4,24 @@ option="${1}" if [ -z $option ]; then echo "Generating from pom, regenerating ruleset docs, and transforming" - maven pmd:rulesets-index xdoc:generate-from-pom pmd:ruleset-docs xdoc:transform + maven pmd:rulesets-index xdoc:generate-from-pom + `./munge_rulesets.rb` + maven pmd:ruleset-docs + rm -f rulesets/*.xml + cvs -q up rulesets + maven xdoc:transform elif [ $option = "all" ]; then echo "Running maven site" rm -rf target maven -qb site elif [ $option = "uploadcurrent" ]; then echo "Generating xdocs and uploading" - maven pmd:rulesets-index xdoc:generate-from-pom pmd:ruleset-docs xdoc:transform + maven pmd:rulesets-index xdoc:generate-from-pom + `./munge_rulesets.rb` + maven pmd:ruleset-docs + rm -f rulesets/*.xml + cvs -q up rulesets + maven xdoc:transform DOCS_FILE=docs.tar.gz cp xdocs/cpdresults.txt xdocs/cpp_cpdresults.txt target/docs/ cd target diff --git a/pmd/etc/changelog.txt b/pmd/etc/changelog.txt index 264c53d483..6e661d30c2 100644 --- a/pmd/etc/changelog.txt +++ b/pmd/etc/changelog.txt @@ -1,4 +1,4 @@ -May 26, 2006 - 3.7: +June 1, 2006 - 3.7: New rules: Basic-JSP ruleset: DuplicateJspImport Design ruleset: PreserveStackTrace diff --git a/pmd/etc/jsl/rule-format.jsl b/pmd/etc/jsl/rule-format.jsl index caef3d3e08..cf49ed512b 100644 --- a/pmd/etc/jsl/rule-format.jsl +++ b/pmd/etc/jsl/rule-format.jsl @@ -33,7 +33,9 @@

- + + +

This rule is defined by the following XPath expression:

diff --git a/pmd/munge_rulesets.rb b/pmd/munge_rulesets.rb new file mode 100755 index 0000000000..dbf8392954 --- /dev/null +++ b/pmd/munge_rulesets.rb @@ -0,0 +1,6 @@ +#!/usr/local/bin/ruby + +Dir.glob("rulesets/*.xml").each do |f| + data = File.read(f).sub(/xmlns=\"http:\/\/pmd.sf.net\/ruleset\/1.0.0\"/, '') + File.open(f, "w") {|x| x.write(data) } +end