From 15526591d4c86a95bdded1c6fe95d83d2e724d18 Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Fri, 3 Nov 2017 15:31:00 +0100 Subject: [PATCH] [jsp] Move rules and tests to new packages --- .../DuplicateJspImportsRule.java | 2 +- .../NoInlineStyleInformationRule.java | 2 +- .../NoUnsanitizedJSPExpressionRule.java | 2 +- .../resources/category/jsp/bestpractices.xml | 4 +-- .../main/resources/category/jsp/codestyle.xml | 2 +- .../main/resources/category/jsp/design.xml | 2 +- .../main/resources/category/jsp/security.xml | 4 +-- .../lang/jsp/rule/basic/BasicRulesTest.java | 27 ------------------- .../jsp/rule/basicjsf/BasicJsfRulesTest.java | 17 ------------ .../bestpractices/BestPracticesRulesTest.java | 20 ++++++++++++++ .../rule/codestyle/CodeStyleRulesTest.java | 17 ++++++++++++ .../lang/jsp/rule/design/DesignRulesTest.java | 20 ++++++++++++++ .../rule/errorprone/ErrorProneRulesTest.java | 17 ++++++++++++ .../jsp/rule/security/SecurityRulesTest.java | 18 +++++++++++++ .../xml/DontNestJsfInJstlIteration.xml | 0 .../xml/NoClassAttribute.xml | 0 .../xml/NoHtmlComments.xml | 0 .../xml/NoJspForward.xml | 0 .../xml/DuplicateJspImports.xml | 0 .../{basic => design}/xml/NoInlineScript.xml | 0 .../xml/NoInlineStyleInformation.xml | 0 .../{basic => design}/xml/NoLongScripts.xml | 0 .../{basic => design}/xml/NoScriptlets.xml | 0 .../{basic => errorprone}/xml/JspEncoding.xml | 0 .../xml/IframeMissingSrcAttribute.xml | 0 .../xml/NoUnsanitizedJSPExpression.xml | 0 26 files changed, 101 insertions(+), 53 deletions(-) rename pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/rule/{basic => codestyle}/DuplicateJspImportsRule.java (96%) rename pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/rule/{basic => design}/NoInlineStyleInformationRule.java (98%) rename pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/rule/{basic => security}/NoUnsanitizedJSPExpressionRule.java (95%) delete mode 100644 pmd-jsp/src/test/java/net/sourceforge/pmd/lang/jsp/rule/basic/BasicRulesTest.java delete mode 100644 pmd-jsp/src/test/java/net/sourceforge/pmd/lang/jsp/rule/basicjsf/BasicJsfRulesTest.java create mode 100644 pmd-jsp/src/test/java/net/sourceforge/pmd/lang/jsp/rule/bestpractices/BestPracticesRulesTest.java create mode 100644 pmd-jsp/src/test/java/net/sourceforge/pmd/lang/jsp/rule/codestyle/CodeStyleRulesTest.java create mode 100644 pmd-jsp/src/test/java/net/sourceforge/pmd/lang/jsp/rule/design/DesignRulesTest.java create mode 100644 pmd-jsp/src/test/java/net/sourceforge/pmd/lang/jsp/rule/errorprone/ErrorProneRulesTest.java create mode 100644 pmd-jsp/src/test/java/net/sourceforge/pmd/lang/jsp/rule/security/SecurityRulesTest.java rename pmd-jsp/src/test/resources/net/sourceforge/pmd/lang/jsp/rule/{basicjsf => bestpractices}/xml/DontNestJsfInJstlIteration.xml (100%) rename pmd-jsp/src/test/resources/net/sourceforge/pmd/lang/jsp/rule/{basic => bestpractices}/xml/NoClassAttribute.xml (100%) rename pmd-jsp/src/test/resources/net/sourceforge/pmd/lang/jsp/rule/{basic => bestpractices}/xml/NoHtmlComments.xml (100%) rename pmd-jsp/src/test/resources/net/sourceforge/pmd/lang/jsp/rule/{basic => bestpractices}/xml/NoJspForward.xml (100%) rename pmd-jsp/src/test/resources/net/sourceforge/pmd/lang/jsp/rule/{basic => codestyle}/xml/DuplicateJspImports.xml (100%) rename pmd-jsp/src/test/resources/net/sourceforge/pmd/lang/jsp/rule/{basic => design}/xml/NoInlineScript.xml (100%) rename pmd-jsp/src/test/resources/net/sourceforge/pmd/lang/jsp/rule/{basic => design}/xml/NoInlineStyleInformation.xml (100%) rename pmd-jsp/src/test/resources/net/sourceforge/pmd/lang/jsp/rule/{basic => design}/xml/NoLongScripts.xml (100%) rename pmd-jsp/src/test/resources/net/sourceforge/pmd/lang/jsp/rule/{basic => design}/xml/NoScriptlets.xml (100%) rename pmd-jsp/src/test/resources/net/sourceforge/pmd/lang/jsp/rule/{basic => errorprone}/xml/JspEncoding.xml (100%) rename pmd-jsp/src/test/resources/net/sourceforge/pmd/lang/jsp/rule/{basic => security}/xml/IframeMissingSrcAttribute.xml (100%) rename pmd-jsp/src/test/resources/net/sourceforge/pmd/lang/jsp/rule/{basic => security}/xml/NoUnsanitizedJSPExpression.xml (100%) diff --git a/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/rule/basic/DuplicateJspImportsRule.java b/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/rule/codestyle/DuplicateJspImportsRule.java similarity index 96% rename from pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/rule/basic/DuplicateJspImportsRule.java rename to pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/rule/codestyle/DuplicateJspImportsRule.java index 4763d420e8..b02003f632 100644 --- a/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/rule/basic/DuplicateJspImportsRule.java +++ b/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/rule/codestyle/DuplicateJspImportsRule.java @@ -2,7 +2,7 @@ * BSD-style license; for more info see http://pmd.sourceforge.net/license.html */ -package net.sourceforge.pmd.lang.jsp.rule.basic; +package net.sourceforge.pmd.lang.jsp.rule.codestyle; import java.util.HashSet; import java.util.List; diff --git a/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/rule/basic/NoInlineStyleInformationRule.java b/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/rule/design/NoInlineStyleInformationRule.java similarity index 98% rename from pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/rule/basic/NoInlineStyleInformationRule.java rename to pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/rule/design/NoInlineStyleInformationRule.java index de71e01ef5..39c2a37db8 100644 --- a/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/rule/basic/NoInlineStyleInformationRule.java +++ b/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/rule/design/NoInlineStyleInformationRule.java @@ -2,7 +2,7 @@ * BSD-style license; for more info see http://pmd.sourceforge.net/license.html */ -package net.sourceforge.pmd.lang.jsp.rule.basic; +package net.sourceforge.pmd.lang.jsp.rule.design; import java.util.Set; diff --git a/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/rule/basic/NoUnsanitizedJSPExpressionRule.java b/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/rule/security/NoUnsanitizedJSPExpressionRule.java similarity index 95% rename from pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/rule/basic/NoUnsanitizedJSPExpressionRule.java rename to pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/rule/security/NoUnsanitizedJSPExpressionRule.java index 8ebd7f5e5b..a1b995d48f 100644 --- a/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/rule/basic/NoUnsanitizedJSPExpressionRule.java +++ b/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/rule/security/NoUnsanitizedJSPExpressionRule.java @@ -2,7 +2,7 @@ * BSD-style license; for more info see http://pmd.sourceforge.net/license.html */ -package net.sourceforge.pmd.lang.jsp.rule.basic; +package net.sourceforge.pmd.lang.jsp.rule.security; import net.sourceforge.pmd.lang.jsp.ast.ASTElExpression; import net.sourceforge.pmd.lang.jsp.ast.ASTElement; diff --git a/pmd-jsp/src/main/resources/category/jsp/bestpractices.xml b/pmd-jsp/src/main/resources/category/jsp/bestpractices.xml index 072d1814c5..b3dfb1caf9 100644 --- a/pmd-jsp/src/main/resources/category/jsp/bestpractices.xml +++ b/pmd-jsp/src/main/resources/category/jsp/bestpractices.xml @@ -76,7 +76,7 @@ Do not use an attribute called 'class'. Use "styleclass" for CSS styles. since="3.6" message="Use JSP comments instead of HTML comments" class="net.sourceforge.pmd.lang.rule.XPathRule" - externalInfoUrl="${pmd.website.baseurl}/pmd_rules_jsp_basic.html#nohtmlcomments"> + externalInfoUrl="${pmd.website.baseurl}/pmd_rules_jsp_bestpractices.html#nohtmlcomments"> In a production system, HTML comments increase the payload between the application server to the client, and serve @@ -110,7 +110,7 @@ little other purpose. Consider switching to JSP comments. since="3.6" message="Do not do a forward from within a JSP file." class="net.sourceforge.pmd.lang.rule.XPathRule" - externalInfoUrl="${pmd.website.baseurl}/pmd_rules_jsp_basic.html#nojspforward"> + externalInfoUrl="${pmd.website.baseurl}/pmd_rules_jsp_bestpractices.html#nojspforward"> Do not do a forward from within a JSP file. diff --git a/pmd-jsp/src/main/resources/category/jsp/codestyle.xml b/pmd-jsp/src/main/resources/category/jsp/codestyle.xml index 42d030cd19..2a1f887f09 100644 --- a/pmd-jsp/src/main/resources/category/jsp/codestyle.xml +++ b/pmd-jsp/src/main/resources/category/jsp/codestyle.xml @@ -12,7 +12,7 @@ Rules which enforce a specific coding style. Avoid duplicate import statements inside JSP's. diff --git a/pmd-jsp/src/main/resources/category/jsp/design.xml b/pmd-jsp/src/main/resources/category/jsp/design.xml index 20680dd909..054b2e14aa 100644 --- a/pmd-jsp/src/main/resources/category/jsp/design.xml +++ b/pmd-jsp/src/main/resources/category/jsp/design.xml @@ -34,7 +34,7 @@ Externalized script could be reused between pages. Browsers can also cache the Style information should be put in CSS files, not in JSPs. Therefore, don't use <B> or <FONT> diff --git a/pmd-jsp/src/main/resources/category/jsp/security.xml b/pmd-jsp/src/main/resources/category/jsp/security.xml index 6649cda00b..0a5bae64ab 100644 --- a/pmd-jsp/src/main/resources/category/jsp/security.xml +++ b/pmd-jsp/src/main/resources/category/jsp/security.xml @@ -44,9 +44,9 @@ through SSL. See http://support.microsoft.com/default.aspx?scid=kb;EN-US;Q261188 + externalInfoUrl="${pmd.website.baseurl}/pmd_rules_jsp_security.html#nounsanitizedjspexpression"> Avoid using expressions without escaping / sanitizing. This could lead to cross site scripting - as the expression would be interpreted by the browser directly (e.g. "<script>alert('hello');</script>"). diff --git a/pmd-jsp/src/test/java/net/sourceforge/pmd/lang/jsp/rule/basic/BasicRulesTest.java b/pmd-jsp/src/test/java/net/sourceforge/pmd/lang/jsp/rule/basic/BasicRulesTest.java deleted file mode 100644 index 2db83da7a6..0000000000 --- a/pmd-jsp/src/test/java/net/sourceforge/pmd/lang/jsp/rule/basic/BasicRulesTest.java +++ /dev/null @@ -1,27 +0,0 @@ -/** - * BSD-style license; for more info see http://pmd.sourceforge.net/license.html - */ - -package net.sourceforge.pmd.lang.jsp.rule.basic; - -import net.sourceforge.pmd.testframework.SimpleAggregatorTst; - -public class BasicRulesTest extends SimpleAggregatorTst { - - private static final String RULESET = "jsp-basic"; - - @Override - public void setUp() { - addRule(RULESET, "DuplicateJspImports"); - addRule(RULESET, "IframeMissingSrcAttribute"); - addRule(RULESET, "JspEncoding"); - addRule(RULESET, "NoClassAttribute"); - addRule(RULESET, "NoHtmlComments"); - addRule(RULESET, "NoInlineScript"); - addRule(RULESET, "NoInlineStyleInformation"); - addRule(RULESET, "NoJspForward"); - addRule(RULESET, "NoLongScripts"); - addRule(RULESET, "NoScriptlets"); - addRule(RULESET, "NoUnsanitizedJSPExpression"); - } -} diff --git a/pmd-jsp/src/test/java/net/sourceforge/pmd/lang/jsp/rule/basicjsf/BasicJsfRulesTest.java b/pmd-jsp/src/test/java/net/sourceforge/pmd/lang/jsp/rule/basicjsf/BasicJsfRulesTest.java deleted file mode 100644 index 2147a11d43..0000000000 --- a/pmd-jsp/src/test/java/net/sourceforge/pmd/lang/jsp/rule/basicjsf/BasicJsfRulesTest.java +++ /dev/null @@ -1,17 +0,0 @@ -/** - * BSD-style license; for more info see http://pmd.sourceforge.net/license.html - */ - -package net.sourceforge.pmd.lang.jsp.rule.basicjsf; - -import net.sourceforge.pmd.testframework.SimpleAggregatorTst; - -public class BasicJsfRulesTest extends SimpleAggregatorTst { - - private static final String RULESET = "jsp-basic-jsf"; - - @Override - public void setUp() { - addRule(RULESET, "DontNestJsfInJstlIteration"); - } -} diff --git a/pmd-jsp/src/test/java/net/sourceforge/pmd/lang/jsp/rule/bestpractices/BestPracticesRulesTest.java b/pmd-jsp/src/test/java/net/sourceforge/pmd/lang/jsp/rule/bestpractices/BestPracticesRulesTest.java new file mode 100644 index 0000000000..125842e409 --- /dev/null +++ b/pmd-jsp/src/test/java/net/sourceforge/pmd/lang/jsp/rule/bestpractices/BestPracticesRulesTest.java @@ -0,0 +1,20 @@ +/** + * BSD-style license; for more info see http://pmd.sourceforge.net/license.html + */ + +package net.sourceforge.pmd.lang.jsp.rule.bestpractices; + +import net.sourceforge.pmd.testframework.SimpleAggregatorTst; + +public class BestPracticesRulesTest extends SimpleAggregatorTst { + + private static final String RULESET = "category/jsp/bestpractices.xml"; + + @Override + public void setUp() { + addRule(RULESET, "DontNestJsfInJstlIteration"); + addRule(RULESET, "NoClassAttribute"); + addRule(RULESET, "NoHtmlComments"); + addRule(RULESET, "NoJspForward"); + } +} diff --git a/pmd-jsp/src/test/java/net/sourceforge/pmd/lang/jsp/rule/codestyle/CodeStyleRulesTest.java b/pmd-jsp/src/test/java/net/sourceforge/pmd/lang/jsp/rule/codestyle/CodeStyleRulesTest.java new file mode 100644 index 0000000000..ca98179cea --- /dev/null +++ b/pmd-jsp/src/test/java/net/sourceforge/pmd/lang/jsp/rule/codestyle/CodeStyleRulesTest.java @@ -0,0 +1,17 @@ +/** + * BSD-style license; for more info see http://pmd.sourceforge.net/license.html + */ + +package net.sourceforge.pmd.lang.jsp.rule.codestyle; + +import net.sourceforge.pmd.testframework.SimpleAggregatorTst; + +public class CodeStyleRulesTest extends SimpleAggregatorTst { + + private static final String RULESET = "category/jsp/codestyle.xml"; + + @Override + public void setUp() { + addRule(RULESET, "DuplicateJspImports"); + } +} diff --git a/pmd-jsp/src/test/java/net/sourceforge/pmd/lang/jsp/rule/design/DesignRulesTest.java b/pmd-jsp/src/test/java/net/sourceforge/pmd/lang/jsp/rule/design/DesignRulesTest.java new file mode 100644 index 0000000000..5d67ba6bbd --- /dev/null +++ b/pmd-jsp/src/test/java/net/sourceforge/pmd/lang/jsp/rule/design/DesignRulesTest.java @@ -0,0 +1,20 @@ +/** + * BSD-style license; for more info see http://pmd.sourceforge.net/license.html + */ + +package net.sourceforge.pmd.lang.jsp.rule.design; + +import net.sourceforge.pmd.testframework.SimpleAggregatorTst; + +public class DesignRulesTest extends SimpleAggregatorTst { + + private static final String RULESET = "category/jsp/design.xml"; + + @Override + public void setUp() { + addRule(RULESET, "NoInlineScript"); + addRule(RULESET, "NoInlineStyleInformation"); + addRule(RULESET, "NoLongScripts"); + addRule(RULESET, "NoScriptlets"); + } +} diff --git a/pmd-jsp/src/test/java/net/sourceforge/pmd/lang/jsp/rule/errorprone/ErrorProneRulesTest.java b/pmd-jsp/src/test/java/net/sourceforge/pmd/lang/jsp/rule/errorprone/ErrorProneRulesTest.java new file mode 100644 index 0000000000..906477bf25 --- /dev/null +++ b/pmd-jsp/src/test/java/net/sourceforge/pmd/lang/jsp/rule/errorprone/ErrorProneRulesTest.java @@ -0,0 +1,17 @@ +/** + * BSD-style license; for more info see http://pmd.sourceforge.net/license.html + */ + +package net.sourceforge.pmd.lang.jsp.rule.errorprone; + +import net.sourceforge.pmd.testframework.SimpleAggregatorTst; + +public class ErrorProneRulesTest extends SimpleAggregatorTst { + + private static final String RULESET = "category/jsp/errorprone.xml"; + + @Override + public void setUp() { + addRule(RULESET, "JspEncoding"); + } +} diff --git a/pmd-jsp/src/test/java/net/sourceforge/pmd/lang/jsp/rule/security/SecurityRulesTest.java b/pmd-jsp/src/test/java/net/sourceforge/pmd/lang/jsp/rule/security/SecurityRulesTest.java new file mode 100644 index 0000000000..1ab7c9b5d6 --- /dev/null +++ b/pmd-jsp/src/test/java/net/sourceforge/pmd/lang/jsp/rule/security/SecurityRulesTest.java @@ -0,0 +1,18 @@ +/** + * BSD-style license; for more info see http://pmd.sourceforge.net/license.html + */ + +package net.sourceforge.pmd.lang.jsp.rule.security; + +import net.sourceforge.pmd.testframework.SimpleAggregatorTst; + +public class SecurityRulesTest extends SimpleAggregatorTst { + + private static final String RULESET = "category/jsp/security.xml"; + + @Override + public void setUp() { + addRule(RULESET, "IframeMissingSrcAttribute"); + addRule(RULESET, "NoUnsanitizedJSPExpression"); + } +} diff --git a/pmd-jsp/src/test/resources/net/sourceforge/pmd/lang/jsp/rule/basicjsf/xml/DontNestJsfInJstlIteration.xml b/pmd-jsp/src/test/resources/net/sourceforge/pmd/lang/jsp/rule/bestpractices/xml/DontNestJsfInJstlIteration.xml similarity index 100% rename from pmd-jsp/src/test/resources/net/sourceforge/pmd/lang/jsp/rule/basicjsf/xml/DontNestJsfInJstlIteration.xml rename to pmd-jsp/src/test/resources/net/sourceforge/pmd/lang/jsp/rule/bestpractices/xml/DontNestJsfInJstlIteration.xml diff --git a/pmd-jsp/src/test/resources/net/sourceforge/pmd/lang/jsp/rule/basic/xml/NoClassAttribute.xml b/pmd-jsp/src/test/resources/net/sourceforge/pmd/lang/jsp/rule/bestpractices/xml/NoClassAttribute.xml similarity index 100% rename from pmd-jsp/src/test/resources/net/sourceforge/pmd/lang/jsp/rule/basic/xml/NoClassAttribute.xml rename to pmd-jsp/src/test/resources/net/sourceforge/pmd/lang/jsp/rule/bestpractices/xml/NoClassAttribute.xml diff --git a/pmd-jsp/src/test/resources/net/sourceforge/pmd/lang/jsp/rule/basic/xml/NoHtmlComments.xml b/pmd-jsp/src/test/resources/net/sourceforge/pmd/lang/jsp/rule/bestpractices/xml/NoHtmlComments.xml similarity index 100% rename from pmd-jsp/src/test/resources/net/sourceforge/pmd/lang/jsp/rule/basic/xml/NoHtmlComments.xml rename to pmd-jsp/src/test/resources/net/sourceforge/pmd/lang/jsp/rule/bestpractices/xml/NoHtmlComments.xml diff --git a/pmd-jsp/src/test/resources/net/sourceforge/pmd/lang/jsp/rule/basic/xml/NoJspForward.xml b/pmd-jsp/src/test/resources/net/sourceforge/pmd/lang/jsp/rule/bestpractices/xml/NoJspForward.xml similarity index 100% rename from pmd-jsp/src/test/resources/net/sourceforge/pmd/lang/jsp/rule/basic/xml/NoJspForward.xml rename to pmd-jsp/src/test/resources/net/sourceforge/pmd/lang/jsp/rule/bestpractices/xml/NoJspForward.xml diff --git a/pmd-jsp/src/test/resources/net/sourceforge/pmd/lang/jsp/rule/basic/xml/DuplicateJspImports.xml b/pmd-jsp/src/test/resources/net/sourceforge/pmd/lang/jsp/rule/codestyle/xml/DuplicateJspImports.xml similarity index 100% rename from pmd-jsp/src/test/resources/net/sourceforge/pmd/lang/jsp/rule/basic/xml/DuplicateJspImports.xml rename to pmd-jsp/src/test/resources/net/sourceforge/pmd/lang/jsp/rule/codestyle/xml/DuplicateJspImports.xml diff --git a/pmd-jsp/src/test/resources/net/sourceforge/pmd/lang/jsp/rule/basic/xml/NoInlineScript.xml b/pmd-jsp/src/test/resources/net/sourceforge/pmd/lang/jsp/rule/design/xml/NoInlineScript.xml similarity index 100% rename from pmd-jsp/src/test/resources/net/sourceforge/pmd/lang/jsp/rule/basic/xml/NoInlineScript.xml rename to pmd-jsp/src/test/resources/net/sourceforge/pmd/lang/jsp/rule/design/xml/NoInlineScript.xml diff --git a/pmd-jsp/src/test/resources/net/sourceforge/pmd/lang/jsp/rule/basic/xml/NoInlineStyleInformation.xml b/pmd-jsp/src/test/resources/net/sourceforge/pmd/lang/jsp/rule/design/xml/NoInlineStyleInformation.xml similarity index 100% rename from pmd-jsp/src/test/resources/net/sourceforge/pmd/lang/jsp/rule/basic/xml/NoInlineStyleInformation.xml rename to pmd-jsp/src/test/resources/net/sourceforge/pmd/lang/jsp/rule/design/xml/NoInlineStyleInformation.xml diff --git a/pmd-jsp/src/test/resources/net/sourceforge/pmd/lang/jsp/rule/basic/xml/NoLongScripts.xml b/pmd-jsp/src/test/resources/net/sourceforge/pmd/lang/jsp/rule/design/xml/NoLongScripts.xml similarity index 100% rename from pmd-jsp/src/test/resources/net/sourceforge/pmd/lang/jsp/rule/basic/xml/NoLongScripts.xml rename to pmd-jsp/src/test/resources/net/sourceforge/pmd/lang/jsp/rule/design/xml/NoLongScripts.xml diff --git a/pmd-jsp/src/test/resources/net/sourceforge/pmd/lang/jsp/rule/basic/xml/NoScriptlets.xml b/pmd-jsp/src/test/resources/net/sourceforge/pmd/lang/jsp/rule/design/xml/NoScriptlets.xml similarity index 100% rename from pmd-jsp/src/test/resources/net/sourceforge/pmd/lang/jsp/rule/basic/xml/NoScriptlets.xml rename to pmd-jsp/src/test/resources/net/sourceforge/pmd/lang/jsp/rule/design/xml/NoScriptlets.xml diff --git a/pmd-jsp/src/test/resources/net/sourceforge/pmd/lang/jsp/rule/basic/xml/JspEncoding.xml b/pmd-jsp/src/test/resources/net/sourceforge/pmd/lang/jsp/rule/errorprone/xml/JspEncoding.xml similarity index 100% rename from pmd-jsp/src/test/resources/net/sourceforge/pmd/lang/jsp/rule/basic/xml/JspEncoding.xml rename to pmd-jsp/src/test/resources/net/sourceforge/pmd/lang/jsp/rule/errorprone/xml/JspEncoding.xml diff --git a/pmd-jsp/src/test/resources/net/sourceforge/pmd/lang/jsp/rule/basic/xml/IframeMissingSrcAttribute.xml b/pmd-jsp/src/test/resources/net/sourceforge/pmd/lang/jsp/rule/security/xml/IframeMissingSrcAttribute.xml similarity index 100% rename from pmd-jsp/src/test/resources/net/sourceforge/pmd/lang/jsp/rule/basic/xml/IframeMissingSrcAttribute.xml rename to pmd-jsp/src/test/resources/net/sourceforge/pmd/lang/jsp/rule/security/xml/IframeMissingSrcAttribute.xml diff --git a/pmd-jsp/src/test/resources/net/sourceforge/pmd/lang/jsp/rule/basic/xml/NoUnsanitizedJSPExpression.xml b/pmd-jsp/src/test/resources/net/sourceforge/pmd/lang/jsp/rule/security/xml/NoUnsanitizedJSPExpression.xml similarity index 100% rename from pmd-jsp/src/test/resources/net/sourceforge/pmd/lang/jsp/rule/basic/xml/NoUnsanitizedJSPExpression.xml rename to pmd-jsp/src/test/resources/net/sourceforge/pmd/lang/jsp/rule/security/xml/NoUnsanitizedJSPExpression.xml