hiifong/pmd
1
0
Fork 0
forked from phoedos/pmd
Code Pull Requests Activity

Remove ruleset schema 3.0.0

Browse Source
This commit is contained in:
Andreas Dangel
2017-09-29 10:49:58 +02:00
parent b42ba5ea45
commit f7d67df442
13 changed files with 42 additions and 242 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pmd-test/src/main/java/net/sourceforge/pmd/AbstractRuleSetFactoryTest.java
View File

@@ -300,9 +300,6 @@ public abstract class AbstractRuleSetFactoryTest {
inputStream.close();
String rulesetNamespace = RuleSetWriter.RULESET_2_0_0_NS_URI;
if (file.contains(RuleSetWriter.RULESET_3_0_0_NS_URI)) {
rulesetNamespace = RuleSetWriter.RULESET_3_0_0_NS_URI;
}
// Remove XML Schema stuff, replace with DTD
file = file.replaceAll("<\\?xml [ a-zA-Z0-9=\".-]*\\?>", "");
@@ -314,9 +311,6 @@ public abstract class AbstractRuleSetFactoryTest {
if (rulesetNamespace.equals(RuleSetWriter.RULESET_2_0_0_NS_URI)) {
file = "<?xml version=\"1.0\"?>" + PMD.EOL + "<!DOCTYPE ruleset SYSTEM "
+ "\"http://pmd.sourceforge.net/ruleset_2_0_0.dtd\">" + PMD.EOL + file;
} else if (rulesetNamespace.equals(RuleSetWriter.RULESET_3_0_0_NS_URI)) {
file = "<?xml version=\"1.0\"?>" + PMD.EOL + "<!DOCTYPE ruleset SYSTEM "
+ "\"http://pmd.sourceforge.net/ruleset_3_0_0.dtd\">" + PMD.EOL + file;
} else {
file = "<?xml version=\"1.0\"?>" + PMD.EOL + "<!DOCTYPE ruleset>" + PMD.EOL + file;
}
@@ -503,10 +497,7 @@ public abstract class AbstractRuleSetFactoryTest {
ValidateDefaultHandler() {
schemaMapping = new HashMap<>();
schemaMapping.put("http://pmd.sourceforge.net/ruleset_2_0_0.xsd", "ruleset_2_0_0.xsd");
schemaMapping.put("http://pmd.sourceforge.net/ruleset_3_0_0.xsd", "ruleset_3_0_0.xsd");
schemaMapping.put("http://pmd.sourceforge.net/ruleset_2_0_0.dtd", "ruleset_2_0_0.dtd");
schemaMapping.put("http://pmd.sourceforge.net/ruleset_3_0_0.dtd", "ruleset_3_0_0.dtd");
}
public ValidateDefaultHandler resetValid() {