diff --git a/pmd/ReadMe.txt b/pmd-core/ReadMe.txt similarity index 100% rename from pmd/ReadMe.txt rename to pmd-core/ReadMe.txt diff --git a/pmd/etc/checkstyle-config.xml b/pmd-core/etc/checkstyle-config.xml similarity index 100% rename from pmd/etc/checkstyle-config.xml rename to pmd-core/etc/checkstyle-config.xml diff --git a/pmd/etc/checkstyle-suppressions.xml b/pmd-core/etc/checkstyle-suppressions.xml similarity index 100% rename from pmd/etc/checkstyle-suppressions.xml rename to pmd-core/etc/checkstyle-suppressions.xml diff --git a/pmd/etc/default-clover-report.xml b/pmd-core/etc/default-clover-report.xml similarity index 100% rename from pmd/etc/default-clover-report.xml rename to pmd-core/etc/default-clover-report.xml diff --git a/pmd/etc/grammar/Java.jjt b/pmd-core/etc/grammar/Java.jjt similarity index 100% rename from pmd/etc/grammar/Java.jjt rename to pmd-core/etc/grammar/Java.jjt diff --git a/pmd/etc/grammar/dummy.jjt b/pmd-core/etc/grammar/dummy.jjt similarity index 100% rename from pmd/etc/grammar/dummy.jjt rename to pmd-core/etc/grammar/dummy.jjt diff --git a/pmd/etc/test-data.xsd b/pmd-core/etc/test-data.xsd similarity index 100% rename from pmd/etc/test-data.xsd rename to pmd-core/etc/test-data.xsd diff --git a/pmd/etc/xslt/arrow_down.gif b/pmd-core/etc/xslt/arrow_down.gif similarity index 100% rename from pmd/etc/xslt/arrow_down.gif rename to pmd-core/etc/xslt/arrow_down.gif diff --git a/pmd/etc/xslt/arrow_up.gif b/pmd-core/etc/xslt/arrow_up.gif similarity index 100% rename from pmd/etc/xslt/arrow_up.gif rename to pmd-core/etc/xslt/arrow_up.gif diff --git a/pmd/etc/xslt/corley-pmd-report.xslt b/pmd-core/etc/xslt/corley-pmd-report.xslt similarity index 100% rename from pmd/etc/xslt/corley-pmd-report.xslt rename to pmd-core/etc/xslt/corley-pmd-report.xslt diff --git a/pmd/etc/xslt/cpdhtml.xslt b/pmd-core/etc/xslt/cpdhtml.xslt similarity index 100% rename from pmd/etc/xslt/cpdhtml.xslt rename to pmd-core/etc/xslt/cpdhtml.xslt diff --git a/pmd/etc/xslt/fcoltable.css b/pmd-core/etc/xslt/fcoltable.css similarity index 100% rename from pmd/etc/xslt/fcoltable.css rename to pmd-core/etc/xslt/fcoltable.css diff --git a/pmd/etc/xslt/fcoltable.js b/pmd-core/etc/xslt/fcoltable.js similarity index 100% rename from pmd/etc/xslt/fcoltable.js rename to pmd-core/etc/xslt/fcoltable.js diff --git a/pmd/etc/xslt/junit-txt-output.xsl b/pmd-core/etc/xslt/junit-txt-output.xsl similarity index 100% rename from pmd/etc/xslt/junit-txt-output.xsl rename to pmd-core/etc/xslt/junit-txt-output.xsl diff --git a/pmd/etc/xslt/only-prio1.xslt b/pmd-core/etc/xslt/only-prio1.xslt similarity index 100% rename from pmd/etc/xslt/only-prio1.xslt rename to pmd-core/etc/xslt/only-prio1.xslt diff --git a/pmd/etc/xslt/only-prio2.xslt b/pmd-core/etc/xslt/only-prio2.xslt similarity index 100% rename from pmd/etc/xslt/only-prio2.xslt rename to pmd-core/etc/xslt/only-prio2.xslt diff --git a/pmd/etc/xslt/only-prio3.xslt b/pmd-core/etc/xslt/only-prio3.xslt similarity index 100% rename from pmd/etc/xslt/only-prio3.xslt rename to pmd-core/etc/xslt/only-prio3.xslt diff --git a/pmd/etc/xslt/only-prio4.xslt b/pmd-core/etc/xslt/only-prio4.xslt similarity index 100% rename from pmd/etc/xslt/only-prio4.xslt rename to pmd-core/etc/xslt/only-prio4.xslt diff --git a/pmd/etc/xslt/only-prio5.xslt b/pmd-core/etc/xslt/only-prio5.xslt similarity index 100% rename from pmd/etc/xslt/only-prio5.xslt rename to pmd-core/etc/xslt/only-prio5.xslt diff --git a/pmd/etc/xslt/pmd-report-per-class.xslt b/pmd-core/etc/xslt/pmd-report-per-class.xslt similarity index 100% rename from pmd/etc/xslt/pmd-report-per-class.xslt rename to pmd-core/etc/xslt/pmd-report-per-class.xslt diff --git a/pmd/etc/xslt/pmd-report.xslt b/pmd-core/etc/xslt/pmd-report.xslt similarity index 100% rename from pmd/etc/xslt/pmd-report.xslt rename to pmd-core/etc/xslt/pmd-report.xslt diff --git a/pmd/etc/xslt/pmd-xmlfilter-prio1.xsl b/pmd-core/etc/xslt/pmd-xmlfilter-prio1.xsl similarity index 100% rename from pmd/etc/xslt/pmd-xmlfilter-prio1.xsl rename to pmd-core/etc/xslt/pmd-xmlfilter-prio1.xsl diff --git a/pmd/etc/xslt/pmd-xmlfilter-prio2.xsl b/pmd-core/etc/xslt/pmd-xmlfilter-prio2.xsl similarity index 100% rename from pmd/etc/xslt/pmd-xmlfilter-prio2.xsl rename to pmd-core/etc/xslt/pmd-xmlfilter-prio2.xsl diff --git a/pmd/etc/xslt/pmd-xmlfilter-prio3.xsl b/pmd-core/etc/xslt/pmd-xmlfilter-prio3.xsl similarity index 100% rename from pmd/etc/xslt/pmd-xmlfilter-prio3.xsl rename to pmd-core/etc/xslt/pmd-xmlfilter-prio3.xsl diff --git a/pmd/etc/xslt/pmd-xmlfilter-prio4.xsl b/pmd-core/etc/xslt/pmd-xmlfilter-prio4.xsl similarity index 100% rename from pmd/etc/xslt/pmd-xmlfilter-prio4.xsl rename to pmd-core/etc/xslt/pmd-xmlfilter-prio4.xsl diff --git a/pmd/etc/xslt/pmd-xmlfilter-prio5.xsl b/pmd-core/etc/xslt/pmd-xmlfilter-prio5.xsl similarity index 100% rename from pmd/etc/xslt/pmd-xmlfilter-prio5.xsl rename to pmd-core/etc/xslt/pmd-xmlfilter-prio5.xsl diff --git a/pmd/etc/xslt/pmd-xmlfilter-upto-prio2.xsl b/pmd-core/etc/xslt/pmd-xmlfilter-upto-prio2.xsl similarity index 100% rename from pmd/etc/xslt/pmd-xmlfilter-upto-prio2.xsl rename to pmd-core/etc/xslt/pmd-xmlfilter-upto-prio2.xsl diff --git a/pmd/etc/xslt/pmd-xmlfilter-upto-prio3.xsl b/pmd-core/etc/xslt/pmd-xmlfilter-upto-prio3.xsl similarity index 100% rename from pmd/etc/xslt/pmd-xmlfilter-upto-prio3.xsl rename to pmd-core/etc/xslt/pmd-xmlfilter-upto-prio3.xsl diff --git a/pmd/etc/xslt/pmd-xmlfilter-upto-prio4.xsl b/pmd-core/etc/xslt/pmd-xmlfilter-upto-prio4.xsl similarity index 100% rename from pmd/etc/xslt/pmd-xmlfilter-upto-prio4.xsl rename to pmd-core/etc/xslt/pmd-xmlfilter-upto-prio4.xsl diff --git a/pmd/etc/xslt/sorttable.js b/pmd-core/etc/xslt/sorttable.js similarity index 100% rename from pmd/etc/xslt/sorttable.js rename to pmd-core/etc/xslt/sorttable.js diff --git a/pmd/etc/xslt/wz-pmd-report.xslt b/pmd-core/etc/xslt/wz-pmd-report.xslt similarity index 100% rename from pmd/etc/xslt/wz-pmd-report.xslt rename to pmd-core/etc/xslt/wz-pmd-report.xslt diff --git a/pmd/licences/clover2.license b/pmd-core/licences/clover2.license similarity index 100% rename from pmd/licences/clover2.license rename to pmd-core/licences/clover2.license diff --git a/pmd/pom.xml b/pmd-core/pom.xml similarity index 98% rename from pmd/pom.xml rename to pmd-core/pom.xml index 78e8a1508f..9f167cdf40 100644 --- a/pmd/pom.xml +++ b/pmd-core/pom.xml @@ -1,12 +1,12 @@ 4.0.0 - pmd + pmd-core PMD Core net.sourceforge.pmd - pmd-aggregate + pmd 5.1.4-SNAPSHOT diff --git a/pmd/src/main/ant/alljavacc.xml b/pmd-core/src/main/ant/alljavacc.xml similarity index 100% rename from pmd/src/main/ant/alljavacc.xml rename to pmd-core/src/main/ant/alljavacc.xml diff --git a/pmd/src/main/java/net/sourceforge/pmd/AbstractConfiguration.java b/pmd-core/src/main/java/net/sourceforge/pmd/AbstractConfiguration.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/AbstractConfiguration.java rename to pmd-core/src/main/java/net/sourceforge/pmd/AbstractConfiguration.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/AbstractPropertySource.java b/pmd-core/src/main/java/net/sourceforge/pmd/AbstractPropertySource.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/AbstractPropertySource.java rename to pmd-core/src/main/java/net/sourceforge/pmd/AbstractPropertySource.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/NumericPropertyDescriptor.java b/pmd-core/src/main/java/net/sourceforge/pmd/NumericPropertyDescriptor.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/NumericPropertyDescriptor.java rename to pmd-core/src/main/java/net/sourceforge/pmd/NumericPropertyDescriptor.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/PMD.java b/pmd-core/src/main/java/net/sourceforge/pmd/PMD.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/PMD.java rename to pmd-core/src/main/java/net/sourceforge/pmd/PMD.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/PMDConfiguration.java b/pmd-core/src/main/java/net/sourceforge/pmd/PMDConfiguration.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/PMDConfiguration.java rename to pmd-core/src/main/java/net/sourceforge/pmd/PMDConfiguration.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/PMDException.java b/pmd-core/src/main/java/net/sourceforge/pmd/PMDException.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/PMDException.java rename to pmd-core/src/main/java/net/sourceforge/pmd/PMDException.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/PropertyDescriptor.java b/pmd-core/src/main/java/net/sourceforge/pmd/PropertyDescriptor.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/PropertyDescriptor.java rename to pmd-core/src/main/java/net/sourceforge/pmd/PropertyDescriptor.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/PropertyDescriptorFactory.java b/pmd-core/src/main/java/net/sourceforge/pmd/PropertyDescriptorFactory.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/PropertyDescriptorFactory.java rename to pmd-core/src/main/java/net/sourceforge/pmd/PropertyDescriptorFactory.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/PropertyDescriptorFields.java b/pmd-core/src/main/java/net/sourceforge/pmd/PropertyDescriptorFields.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/PropertyDescriptorFields.java rename to pmd-core/src/main/java/net/sourceforge/pmd/PropertyDescriptorFields.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/PropertySource.java b/pmd-core/src/main/java/net/sourceforge/pmd/PropertySource.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/PropertySource.java rename to pmd-core/src/main/java/net/sourceforge/pmd/PropertySource.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/Report.java b/pmd-core/src/main/java/net/sourceforge/pmd/Report.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/Report.java rename to pmd-core/src/main/java/net/sourceforge/pmd/Report.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/ReportListener.java b/pmd-core/src/main/java/net/sourceforge/pmd/ReportListener.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/ReportListener.java rename to pmd-core/src/main/java/net/sourceforge/pmd/ReportListener.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/Rule.java b/pmd-core/src/main/java/net/sourceforge/pmd/Rule.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/Rule.java rename to pmd-core/src/main/java/net/sourceforge/pmd/Rule.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/RuleChain.java b/pmd-core/src/main/java/net/sourceforge/pmd/RuleChain.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/RuleChain.java rename to pmd-core/src/main/java/net/sourceforge/pmd/RuleChain.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/RuleContext.java b/pmd-core/src/main/java/net/sourceforge/pmd/RuleContext.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/RuleContext.java rename to pmd-core/src/main/java/net/sourceforge/pmd/RuleContext.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/RulePriority.java b/pmd-core/src/main/java/net/sourceforge/pmd/RulePriority.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/RulePriority.java rename to pmd-core/src/main/java/net/sourceforge/pmd/RulePriority.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/RuleSet.java b/pmd-core/src/main/java/net/sourceforge/pmd/RuleSet.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/RuleSet.java rename to pmd-core/src/main/java/net/sourceforge/pmd/RuleSet.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/RuleSetFactory.java b/pmd-core/src/main/java/net/sourceforge/pmd/RuleSetFactory.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/RuleSetFactory.java rename to pmd-core/src/main/java/net/sourceforge/pmd/RuleSetFactory.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/RuleSetNotFoundException.java b/pmd-core/src/main/java/net/sourceforge/pmd/RuleSetNotFoundException.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/RuleSetNotFoundException.java rename to pmd-core/src/main/java/net/sourceforge/pmd/RuleSetNotFoundException.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/RuleSetReference.java b/pmd-core/src/main/java/net/sourceforge/pmd/RuleSetReference.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/RuleSetReference.java rename to pmd-core/src/main/java/net/sourceforge/pmd/RuleSetReference.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/RuleSetReferenceId.java b/pmd-core/src/main/java/net/sourceforge/pmd/RuleSetReferenceId.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/RuleSetReferenceId.java rename to pmd-core/src/main/java/net/sourceforge/pmd/RuleSetReferenceId.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/RuleSetWriter.java b/pmd-core/src/main/java/net/sourceforge/pmd/RuleSetWriter.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/RuleSetWriter.java rename to pmd-core/src/main/java/net/sourceforge/pmd/RuleSetWriter.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/RuleSets.java b/pmd-core/src/main/java/net/sourceforge/pmd/RuleSets.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/RuleSets.java rename to pmd-core/src/main/java/net/sourceforge/pmd/RuleSets.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/RuleViolation.java b/pmd-core/src/main/java/net/sourceforge/pmd/RuleViolation.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/RuleViolation.java rename to pmd-core/src/main/java/net/sourceforge/pmd/RuleViolation.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/RuleViolationComparator.java b/pmd-core/src/main/java/net/sourceforge/pmd/RuleViolationComparator.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/RuleViolationComparator.java rename to pmd-core/src/main/java/net/sourceforge/pmd/RuleViolationComparator.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/RulesetsFactoryUtils.java b/pmd-core/src/main/java/net/sourceforge/pmd/RulesetsFactoryUtils.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/RulesetsFactoryUtils.java rename to pmd-core/src/main/java/net/sourceforge/pmd/RulesetsFactoryUtils.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/SourceCodeProcessor.java b/pmd-core/src/main/java/net/sourceforge/pmd/SourceCodeProcessor.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/SourceCodeProcessor.java rename to pmd-core/src/main/java/net/sourceforge/pmd/SourceCodeProcessor.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/SynchronizedReportListener.java b/pmd-core/src/main/java/net/sourceforge/pmd/SynchronizedReportListener.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/SynchronizedReportListener.java rename to pmd-core/src/main/java/net/sourceforge/pmd/SynchronizedReportListener.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/ant/Formatter.java b/pmd-core/src/main/java/net/sourceforge/pmd/ant/Formatter.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/ant/Formatter.java rename to pmd-core/src/main/java/net/sourceforge/pmd/ant/Formatter.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/ant/PMDTask.java b/pmd-core/src/main/java/net/sourceforge/pmd/ant/PMDTask.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/ant/PMDTask.java rename to pmd-core/src/main/java/net/sourceforge/pmd/ant/PMDTask.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/ant/RuleSetWrapper.java b/pmd-core/src/main/java/net/sourceforge/pmd/ant/RuleSetWrapper.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/ant/RuleSetWrapper.java rename to pmd-core/src/main/java/net/sourceforge/pmd/ant/RuleSetWrapper.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/ant/SourceLanguage.java b/pmd-core/src/main/java/net/sourceforge/pmd/ant/SourceLanguage.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/ant/SourceLanguage.java rename to pmd-core/src/main/java/net/sourceforge/pmd/ant/SourceLanguage.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/benchmark/Benchmark.java b/pmd-core/src/main/java/net/sourceforge/pmd/benchmark/Benchmark.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/benchmark/Benchmark.java rename to pmd-core/src/main/java/net/sourceforge/pmd/benchmark/Benchmark.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/benchmark/BenchmarkReport.java b/pmd-core/src/main/java/net/sourceforge/pmd/benchmark/BenchmarkReport.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/benchmark/BenchmarkReport.java rename to pmd-core/src/main/java/net/sourceforge/pmd/benchmark/BenchmarkReport.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/benchmark/BenchmarkResult.java b/pmd-core/src/main/java/net/sourceforge/pmd/benchmark/BenchmarkResult.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/benchmark/BenchmarkResult.java rename to pmd-core/src/main/java/net/sourceforge/pmd/benchmark/BenchmarkResult.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/benchmark/Benchmarker.java b/pmd-core/src/main/java/net/sourceforge/pmd/benchmark/Benchmarker.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/benchmark/Benchmarker.java rename to pmd-core/src/main/java/net/sourceforge/pmd/benchmark/Benchmarker.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/benchmark/RuleDuration.java b/pmd-core/src/main/java/net/sourceforge/pmd/benchmark/RuleDuration.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/benchmark/RuleDuration.java rename to pmd-core/src/main/java/net/sourceforge/pmd/benchmark/RuleDuration.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/benchmark/StringBuilderCR.java b/pmd-core/src/main/java/net/sourceforge/pmd/benchmark/StringBuilderCR.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/benchmark/StringBuilderCR.java rename to pmd-core/src/main/java/net/sourceforge/pmd/benchmark/StringBuilderCR.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/benchmark/TextReport.java b/pmd-core/src/main/java/net/sourceforge/pmd/benchmark/TextReport.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/benchmark/TextReport.java rename to pmd-core/src/main/java/net/sourceforge/pmd/benchmark/TextReport.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/cli/PMDCommandLineInterface.java b/pmd-core/src/main/java/net/sourceforge/pmd/cli/PMDCommandLineInterface.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/cli/PMDCommandLineInterface.java rename to pmd-core/src/main/java/net/sourceforge/pmd/cli/PMDCommandLineInterface.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/cli/PMDParameters.java b/pmd-core/src/main/java/net/sourceforge/pmd/cli/PMDParameters.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/cli/PMDParameters.java rename to pmd-core/src/main/java/net/sourceforge/pmd/cli/PMDParameters.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/cli/XPathCLI.java b/pmd-core/src/main/java/net/sourceforge/pmd/cli/XPathCLI.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/cli/XPathCLI.java rename to pmd-core/src/main/java/net/sourceforge/pmd/cli/XPathCLI.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/cpd/AbstractLanguage.java b/pmd-core/src/main/java/net/sourceforge/pmd/cpd/AbstractLanguage.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/cpd/AbstractLanguage.java rename to pmd-core/src/main/java/net/sourceforge/pmd/cpd/AbstractLanguage.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/cpd/AbstractTokenizer.java b/pmd-core/src/main/java/net/sourceforge/pmd/cpd/AbstractTokenizer.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/cpd/AbstractTokenizer.java rename to pmd-core/src/main/java/net/sourceforge/pmd/cpd/AbstractTokenizer.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/cpd/AnyLanguage.java b/pmd-core/src/main/java/net/sourceforge/pmd/cpd/AnyLanguage.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/cpd/AnyLanguage.java rename to pmd-core/src/main/java/net/sourceforge/pmd/cpd/AnyLanguage.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/cpd/AnyTokenizer.java b/pmd-core/src/main/java/net/sourceforge/pmd/cpd/AnyTokenizer.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/cpd/AnyTokenizer.java rename to pmd-core/src/main/java/net/sourceforge/pmd/cpd/AnyTokenizer.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/cpd/CPD.java b/pmd-core/src/main/java/net/sourceforge/pmd/cpd/CPD.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/cpd/CPD.java rename to pmd-core/src/main/java/net/sourceforge/pmd/cpd/CPD.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/cpd/CPDCommandLineInterface.java b/pmd-core/src/main/java/net/sourceforge/pmd/cpd/CPDCommandLineInterface.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/cpd/CPDCommandLineInterface.java rename to pmd-core/src/main/java/net/sourceforge/pmd/cpd/CPDCommandLineInterface.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/cpd/CPDConfiguration.java b/pmd-core/src/main/java/net/sourceforge/pmd/cpd/CPDConfiguration.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/cpd/CPDConfiguration.java rename to pmd-core/src/main/java/net/sourceforge/pmd/cpd/CPDConfiguration.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/cpd/CPDListener.java b/pmd-core/src/main/java/net/sourceforge/pmd/cpd/CPDListener.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/cpd/CPDListener.java rename to pmd-core/src/main/java/net/sourceforge/pmd/cpd/CPDListener.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/cpd/CPDNullListener.java b/pmd-core/src/main/java/net/sourceforge/pmd/cpd/CPDNullListener.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/cpd/CPDNullListener.java rename to pmd-core/src/main/java/net/sourceforge/pmd/cpd/CPDNullListener.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/cpd/CPDTask.java b/pmd-core/src/main/java/net/sourceforge/pmd/cpd/CPDTask.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/cpd/CPDTask.java rename to pmd-core/src/main/java/net/sourceforge/pmd/cpd/CPDTask.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/cpd/CSVRenderer.java b/pmd-core/src/main/java/net/sourceforge/pmd/cpd/CSVRenderer.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/cpd/CSVRenderer.java rename to pmd-core/src/main/java/net/sourceforge/pmd/cpd/CSVRenderer.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/cpd/CsLanguage.java b/pmd-core/src/main/java/net/sourceforge/pmd/cpd/CsLanguage.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/cpd/CsLanguage.java rename to pmd-core/src/main/java/net/sourceforge/pmd/cpd/CsLanguage.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/cpd/CsTokenizer.java b/pmd-core/src/main/java/net/sourceforge/pmd/cpd/CsTokenizer.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/cpd/CsTokenizer.java rename to pmd-core/src/main/java/net/sourceforge/pmd/cpd/CsTokenizer.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/cpd/FileReporter.java b/pmd-core/src/main/java/net/sourceforge/pmd/cpd/FileReporter.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/cpd/FileReporter.java rename to pmd-core/src/main/java/net/sourceforge/pmd/cpd/FileReporter.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/cpd/GUI.java b/pmd-core/src/main/java/net/sourceforge/pmd/cpd/GUI.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/cpd/GUI.java rename to pmd-core/src/main/java/net/sourceforge/pmd/cpd/GUI.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/cpd/GridBagHelper.java b/pmd-core/src/main/java/net/sourceforge/pmd/cpd/GridBagHelper.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/cpd/GridBagHelper.java rename to pmd-core/src/main/java/net/sourceforge/pmd/cpd/GridBagHelper.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/cpd/Language.java b/pmd-core/src/main/java/net/sourceforge/pmd/cpd/Language.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/cpd/Language.java rename to pmd-core/src/main/java/net/sourceforge/pmd/cpd/Language.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/cpd/LanguageFactory.java b/pmd-core/src/main/java/net/sourceforge/pmd/cpd/LanguageFactory.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/cpd/LanguageFactory.java rename to pmd-core/src/main/java/net/sourceforge/pmd/cpd/LanguageFactory.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/cpd/Match.java b/pmd-core/src/main/java/net/sourceforge/pmd/cpd/Match.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/cpd/Match.java rename to pmd-core/src/main/java/net/sourceforge/pmd/cpd/Match.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/cpd/MatchAlgorithm.java b/pmd-core/src/main/java/net/sourceforge/pmd/cpd/MatchAlgorithm.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/cpd/MatchAlgorithm.java rename to pmd-core/src/main/java/net/sourceforge/pmd/cpd/MatchAlgorithm.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/cpd/MatchCollector.java b/pmd-core/src/main/java/net/sourceforge/pmd/cpd/MatchCollector.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/cpd/MatchCollector.java rename to pmd-core/src/main/java/net/sourceforge/pmd/cpd/MatchCollector.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/cpd/Renderer.java b/pmd-core/src/main/java/net/sourceforge/pmd/cpd/Renderer.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/cpd/Renderer.java rename to pmd-core/src/main/java/net/sourceforge/pmd/cpd/Renderer.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/cpd/ReportException.java b/pmd-core/src/main/java/net/sourceforge/pmd/cpd/ReportException.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/cpd/ReportException.java rename to pmd-core/src/main/java/net/sourceforge/pmd/cpd/ReportException.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/cpd/SimpleRenderer.java b/pmd-core/src/main/java/net/sourceforge/pmd/cpd/SimpleRenderer.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/cpd/SimpleRenderer.java rename to pmd-core/src/main/java/net/sourceforge/pmd/cpd/SimpleRenderer.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/cpd/SourceCode.java b/pmd-core/src/main/java/net/sourceforge/pmd/cpd/SourceCode.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/cpd/SourceCode.java rename to pmd-core/src/main/java/net/sourceforge/pmd/cpd/SourceCode.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/cpd/TokenEntry.java b/pmd-core/src/main/java/net/sourceforge/pmd/cpd/TokenEntry.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/cpd/TokenEntry.java rename to pmd-core/src/main/java/net/sourceforge/pmd/cpd/TokenEntry.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/cpd/Tokenizer.java b/pmd-core/src/main/java/net/sourceforge/pmd/cpd/Tokenizer.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/cpd/Tokenizer.java rename to pmd-core/src/main/java/net/sourceforge/pmd/cpd/Tokenizer.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/cpd/Tokens.java b/pmd-core/src/main/java/net/sourceforge/pmd/cpd/Tokens.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/cpd/Tokens.java rename to pmd-core/src/main/java/net/sourceforge/pmd/cpd/Tokens.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/cpd/VSRenderer.java b/pmd-core/src/main/java/net/sourceforge/pmd/cpd/VSRenderer.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/cpd/VSRenderer.java rename to pmd-core/src/main/java/net/sourceforge/pmd/cpd/VSRenderer.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/cpd/XMLRenderer.java b/pmd-core/src/main/java/net/sourceforge/pmd/cpd/XMLRenderer.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/cpd/XMLRenderer.java rename to pmd-core/src/main/java/net/sourceforge/pmd/cpd/XMLRenderer.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/dcd/ClassLoaderUtil.java b/pmd-core/src/main/java/net/sourceforge/pmd/dcd/ClassLoaderUtil.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/dcd/ClassLoaderUtil.java rename to pmd-core/src/main/java/net/sourceforge/pmd/dcd/ClassLoaderUtil.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/dcd/DCD.java b/pmd-core/src/main/java/net/sourceforge/pmd/dcd/DCD.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/dcd/DCD.java rename to pmd-core/src/main/java/net/sourceforge/pmd/dcd/DCD.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/dcd/DumpNodeVisitor.java b/pmd-core/src/main/java/net/sourceforge/pmd/dcd/DumpNodeVisitor.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/dcd/DumpNodeVisitor.java rename to pmd-core/src/main/java/net/sourceforge/pmd/dcd/DumpNodeVisitor.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/dcd/UsageNodeVisitor.java b/pmd-core/src/main/java/net/sourceforge/pmd/dcd/UsageNodeVisitor.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/dcd/UsageNodeVisitor.java rename to pmd-core/src/main/java/net/sourceforge/pmd/dcd/UsageNodeVisitor.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/dcd/asm/PrintVisitor.java b/pmd-core/src/main/java/net/sourceforge/pmd/dcd/asm/PrintVisitor.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/dcd/asm/PrintVisitor.java rename to pmd-core/src/main/java/net/sourceforge/pmd/dcd/asm/PrintVisitor.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/dcd/asm/TypeSignatureVisitor.java b/pmd-core/src/main/java/net/sourceforge/pmd/dcd/asm/TypeSignatureVisitor.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/dcd/asm/TypeSignatureVisitor.java rename to pmd-core/src/main/java/net/sourceforge/pmd/dcd/asm/TypeSignatureVisitor.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/dcd/graph/ClassNode.java b/pmd-core/src/main/java/net/sourceforge/pmd/dcd/graph/ClassNode.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/dcd/graph/ClassNode.java rename to pmd-core/src/main/java/net/sourceforge/pmd/dcd/graph/ClassNode.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/dcd/graph/ClassNodeComparator.java b/pmd-core/src/main/java/net/sourceforge/pmd/dcd/graph/ClassNodeComparator.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/dcd/graph/ClassNodeComparator.java rename to pmd-core/src/main/java/net/sourceforge/pmd/dcd/graph/ClassNodeComparator.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/dcd/graph/ConstructorNode.java b/pmd-core/src/main/java/net/sourceforge/pmd/dcd/graph/ConstructorNode.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/dcd/graph/ConstructorNode.java rename to pmd-core/src/main/java/net/sourceforge/pmd/dcd/graph/ConstructorNode.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/dcd/graph/FieldNode.java b/pmd-core/src/main/java/net/sourceforge/pmd/dcd/graph/FieldNode.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/dcd/graph/FieldNode.java rename to pmd-core/src/main/java/net/sourceforge/pmd/dcd/graph/FieldNode.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/dcd/graph/MemberNode.java b/pmd-core/src/main/java/net/sourceforge/pmd/dcd/graph/MemberNode.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/dcd/graph/MemberNode.java rename to pmd-core/src/main/java/net/sourceforge/pmd/dcd/graph/MemberNode.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/dcd/graph/MemberNodeComparator.java b/pmd-core/src/main/java/net/sourceforge/pmd/dcd/graph/MemberNodeComparator.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/dcd/graph/MemberNodeComparator.java rename to pmd-core/src/main/java/net/sourceforge/pmd/dcd/graph/MemberNodeComparator.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/dcd/graph/MethodNode.java b/pmd-core/src/main/java/net/sourceforge/pmd/dcd/graph/MethodNode.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/dcd/graph/MethodNode.java rename to pmd-core/src/main/java/net/sourceforge/pmd/dcd/graph/MethodNode.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/dcd/graph/NodeVisitor.java b/pmd-core/src/main/java/net/sourceforge/pmd/dcd/graph/NodeVisitor.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/dcd/graph/NodeVisitor.java rename to pmd-core/src/main/java/net/sourceforge/pmd/dcd/graph/NodeVisitor.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/dcd/graph/NodeVisitorAcceptor.java b/pmd-core/src/main/java/net/sourceforge/pmd/dcd/graph/NodeVisitorAcceptor.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/dcd/graph/NodeVisitorAcceptor.java rename to pmd-core/src/main/java/net/sourceforge/pmd/dcd/graph/NodeVisitorAcceptor.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/dcd/graph/NodeVisitorAdapter.java b/pmd-core/src/main/java/net/sourceforge/pmd/dcd/graph/NodeVisitorAdapter.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/dcd/graph/NodeVisitorAdapter.java rename to pmd-core/src/main/java/net/sourceforge/pmd/dcd/graph/NodeVisitorAdapter.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/dcd/graph/UsageGraph.java b/pmd-core/src/main/java/net/sourceforge/pmd/dcd/graph/UsageGraph.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/dcd/graph/UsageGraph.java rename to pmd-core/src/main/java/net/sourceforge/pmd/dcd/graph/UsageGraph.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/dcd/graph/UsageGraphBuilder.java b/pmd-core/src/main/java/net/sourceforge/pmd/dcd/graph/UsageGraphBuilder.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/dcd/graph/UsageGraphBuilder.java rename to pmd-core/src/main/java/net/sourceforge/pmd/dcd/graph/UsageGraphBuilder.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/AbstractLanguageVersionHandler.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/AbstractLanguageVersionHandler.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/lang/AbstractLanguageVersionHandler.java rename to pmd-core/src/main/java/net/sourceforge/pmd/lang/AbstractLanguageVersionHandler.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/AbstractParser.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/AbstractParser.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/lang/AbstractParser.java rename to pmd-core/src/main/java/net/sourceforge/pmd/lang/AbstractParser.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/BaseLanguageModule.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/BaseLanguageModule.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/lang/BaseLanguageModule.java rename to pmd-core/src/main/java/net/sourceforge/pmd/lang/BaseLanguageModule.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/DataFlowHandler.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/DataFlowHandler.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/lang/DataFlowHandler.java rename to pmd-core/src/main/java/net/sourceforge/pmd/lang/DataFlowHandler.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/Language.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/Language.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/lang/Language.java rename to pmd-core/src/main/java/net/sourceforge/pmd/lang/Language.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/LanguageFilenameFilter.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/LanguageFilenameFilter.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/lang/LanguageFilenameFilter.java rename to pmd-core/src/main/java/net/sourceforge/pmd/lang/LanguageFilenameFilter.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/LanguageRegistry.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/LanguageRegistry.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/lang/LanguageRegistry.java rename to pmd-core/src/main/java/net/sourceforge/pmd/lang/LanguageRegistry.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/LanguageVersion.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/LanguageVersion.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/lang/LanguageVersion.java rename to pmd-core/src/main/java/net/sourceforge/pmd/lang/LanguageVersion.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/LanguageVersionDiscoverer.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/LanguageVersionDiscoverer.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/lang/LanguageVersionDiscoverer.java rename to pmd-core/src/main/java/net/sourceforge/pmd/lang/LanguageVersionDiscoverer.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/LanguageVersionHandler.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/LanguageVersionHandler.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/lang/LanguageVersionHandler.java rename to pmd-core/src/main/java/net/sourceforge/pmd/lang/LanguageVersionHandler.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/Parser.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/Parser.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/lang/Parser.java rename to pmd-core/src/main/java/net/sourceforge/pmd/lang/Parser.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/ParserOptions.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/ParserOptions.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/lang/ParserOptions.java rename to pmd-core/src/main/java/net/sourceforge/pmd/lang/ParserOptions.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/TokenManager.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/TokenManager.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/lang/TokenManager.java rename to pmd-core/src/main/java/net/sourceforge/pmd/lang/TokenManager.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/VisitorStarter.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/VisitorStarter.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/lang/VisitorStarter.java rename to pmd-core/src/main/java/net/sourceforge/pmd/lang/VisitorStarter.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/XPathHandler.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/XPathHandler.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/lang/XPathHandler.java rename to pmd-core/src/main/java/net/sourceforge/pmd/lang/XPathHandler.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/ast/AbstractNode.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/AbstractNode.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/lang/ast/AbstractNode.java rename to pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/AbstractNode.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/ast/AbstractTokenManager.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/AbstractTokenManager.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/lang/ast/AbstractTokenManager.java rename to pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/AbstractTokenManager.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/ast/Node.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/Node.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/lang/ast/Node.java rename to pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/Node.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/ast/ParseException.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/ParseException.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/lang/ast/ParseException.java rename to pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/ParseException.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/ast/RootNode.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/RootNode.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/lang/ast/RootNode.java rename to pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/RootNode.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/ast/xpath/AbstractASTXPathHandler.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/xpath/AbstractASTXPathHandler.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/lang/ast/xpath/AbstractASTXPathHandler.java rename to pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/xpath/AbstractASTXPathHandler.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/ast/xpath/Attribute.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/xpath/Attribute.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/lang/ast/xpath/Attribute.java rename to pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/xpath/Attribute.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/ast/xpath/AttributeAxisIterator.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/xpath/AttributeAxisIterator.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/lang/ast/xpath/AttributeAxisIterator.java rename to pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/xpath/AttributeAxisIterator.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/ast/xpath/AttributeNode.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/xpath/AttributeNode.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/lang/ast/xpath/AttributeNode.java rename to pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/xpath/AttributeNode.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/ast/xpath/DocumentNavigator.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/xpath/DocumentNavigator.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/lang/ast/xpath/DocumentNavigator.java rename to pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/xpath/DocumentNavigator.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/ast/xpath/NodeIterator.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/xpath/NodeIterator.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/lang/ast/xpath/NodeIterator.java rename to pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/xpath/NodeIterator.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/ast/xpath/saxon/AbstractNodeInfo.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/xpath/saxon/AbstractNodeInfo.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/lang/ast/xpath/saxon/AbstractNodeInfo.java rename to pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/xpath/saxon/AbstractNodeInfo.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/ast/xpath/saxon/AttributeAxisIterator.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/xpath/saxon/AttributeAxisIterator.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/lang/ast/xpath/saxon/AttributeAxisIterator.java rename to pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/xpath/saxon/AttributeAxisIterator.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/ast/xpath/saxon/AttributeNode.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/xpath/saxon/AttributeNode.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/lang/ast/xpath/saxon/AttributeNode.java rename to pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/xpath/saxon/AttributeNode.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/ast/xpath/saxon/DocumentNode.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/xpath/saxon/DocumentNode.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/lang/ast/xpath/saxon/DocumentNode.java rename to pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/xpath/saxon/DocumentNode.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/ast/xpath/saxon/ElementNode.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/xpath/saxon/ElementNode.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/lang/ast/xpath/saxon/ElementNode.java rename to pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/xpath/saxon/ElementNode.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/ast/xpath/saxon/IdGenerator.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/xpath/saxon/IdGenerator.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/lang/ast/xpath/saxon/IdGenerator.java rename to pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/xpath/saxon/IdGenerator.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/dfa/AbstractDataFlowNode.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/dfa/AbstractDataFlowNode.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/lang/dfa/AbstractDataFlowNode.java rename to pmd-core/src/main/java/net/sourceforge/pmd/lang/dfa/AbstractDataFlowNode.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/dfa/DFAGraphMethod.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/dfa/DFAGraphMethod.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/lang/dfa/DFAGraphMethod.java rename to pmd-core/src/main/java/net/sourceforge/pmd/lang/dfa/DFAGraphMethod.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/dfa/DFAGraphRule.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/dfa/DFAGraphRule.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/lang/dfa/DFAGraphRule.java rename to pmd-core/src/main/java/net/sourceforge/pmd/lang/dfa/DFAGraphRule.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/dfa/DataFlowNode.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/dfa/DataFlowNode.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/lang/dfa/DataFlowNode.java rename to pmd-core/src/main/java/net/sourceforge/pmd/lang/dfa/DataFlowNode.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/dfa/Linker.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/dfa/Linker.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/lang/dfa/Linker.java rename to pmd-core/src/main/java/net/sourceforge/pmd/lang/dfa/Linker.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/dfa/LinkerException.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/dfa/LinkerException.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/lang/dfa/LinkerException.java rename to pmd-core/src/main/java/net/sourceforge/pmd/lang/dfa/LinkerException.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/dfa/NodeType.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/dfa/NodeType.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/lang/dfa/NodeType.java rename to pmd-core/src/main/java/net/sourceforge/pmd/lang/dfa/NodeType.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/dfa/SequenceChecker.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/dfa/SequenceChecker.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/lang/dfa/SequenceChecker.java rename to pmd-core/src/main/java/net/sourceforge/pmd/lang/dfa/SequenceChecker.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/dfa/SequenceException.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/dfa/SequenceException.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/lang/dfa/SequenceException.java rename to pmd-core/src/main/java/net/sourceforge/pmd/lang/dfa/SequenceException.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/dfa/StackObject.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/dfa/StackObject.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/lang/dfa/StackObject.java rename to pmd-core/src/main/java/net/sourceforge/pmd/lang/dfa/StackObject.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/dfa/StartOrEndDataFlowNode.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/dfa/StartOrEndDataFlowNode.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/lang/dfa/StartOrEndDataFlowNode.java rename to pmd-core/src/main/java/net/sourceforge/pmd/lang/dfa/StartOrEndDataFlowNode.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/dfa/Structure.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/dfa/Structure.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/lang/dfa/Structure.java rename to pmd-core/src/main/java/net/sourceforge/pmd/lang/dfa/Structure.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/dfa/VariableAccess.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/dfa/VariableAccess.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/lang/dfa/VariableAccess.java rename to pmd-core/src/main/java/net/sourceforge/pmd/lang/dfa/VariableAccess.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/dfa/VariableAccessException.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/dfa/VariableAccessException.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/lang/dfa/VariableAccessException.java rename to pmd-core/src/main/java/net/sourceforge/pmd/lang/dfa/VariableAccessException.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/dfa/pathfinder/CurrentPath.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/dfa/pathfinder/CurrentPath.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/lang/dfa/pathfinder/CurrentPath.java rename to pmd-core/src/main/java/net/sourceforge/pmd/lang/dfa/pathfinder/CurrentPath.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/dfa/pathfinder/DAAPathFinder.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/dfa/pathfinder/DAAPathFinder.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/lang/dfa/pathfinder/DAAPathFinder.java rename to pmd-core/src/main/java/net/sourceforge/pmd/lang/dfa/pathfinder/DAAPathFinder.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/dfa/pathfinder/Executable.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/dfa/pathfinder/Executable.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/lang/dfa/pathfinder/Executable.java rename to pmd-core/src/main/java/net/sourceforge/pmd/lang/dfa/pathfinder/Executable.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/dfa/pathfinder/PathElement.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/dfa/pathfinder/PathElement.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/lang/dfa/pathfinder/PathElement.java rename to pmd-core/src/main/java/net/sourceforge/pmd/lang/dfa/pathfinder/PathElement.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/dfa/report/AbstractReportNode.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/dfa/report/AbstractReportNode.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/lang/dfa/report/AbstractReportNode.java rename to pmd-core/src/main/java/net/sourceforge/pmd/lang/dfa/report/AbstractReportNode.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/dfa/report/ClassNode.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/dfa/report/ClassNode.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/lang/dfa/report/ClassNode.java rename to pmd-core/src/main/java/net/sourceforge/pmd/lang/dfa/report/ClassNode.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/dfa/report/PackageNode.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/dfa/report/PackageNode.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/lang/dfa/report/PackageNode.java rename to pmd-core/src/main/java/net/sourceforge/pmd/lang/dfa/report/PackageNode.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/dfa/report/ReportHTMLPrintVisitor.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/dfa/report/ReportHTMLPrintVisitor.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/lang/dfa/report/ReportHTMLPrintVisitor.java rename to pmd-core/src/main/java/net/sourceforge/pmd/lang/dfa/report/ReportHTMLPrintVisitor.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/dfa/report/ReportTree.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/dfa/report/ReportTree.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/lang/dfa/report/ReportTree.java rename to pmd-core/src/main/java/net/sourceforge/pmd/lang/dfa/report/ReportTree.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/dfa/report/ReportVisitor.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/dfa/report/ReportVisitor.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/lang/dfa/report/ReportVisitor.java rename to pmd-core/src/main/java/net/sourceforge/pmd/lang/dfa/report/ReportVisitor.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/dfa/report/ViolationNode.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/dfa/report/ViolationNode.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/lang/dfa/report/ViolationNode.java rename to pmd-core/src/main/java/net/sourceforge/pmd/lang/dfa/report/ViolationNode.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/rule/AbstractDelegateRule.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/AbstractDelegateRule.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/lang/rule/AbstractDelegateRule.java rename to pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/AbstractDelegateRule.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/rule/AbstractRule.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/AbstractRule.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/lang/rule/AbstractRule.java rename to pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/AbstractRule.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/rule/AbstractRuleChainVisitor.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/AbstractRuleChainVisitor.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/lang/rule/AbstractRuleChainVisitor.java rename to pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/AbstractRuleChainVisitor.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/rule/AbstractRuleViolationFactory.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/AbstractRuleViolationFactory.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/lang/rule/AbstractRuleViolationFactory.java rename to pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/AbstractRuleViolationFactory.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/rule/ImmutableLanguage.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/ImmutableLanguage.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/lang/rule/ImmutableLanguage.java rename to pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/ImmutableLanguage.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/rule/ImportWrapper.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/ImportWrapper.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/lang/rule/ImportWrapper.java rename to pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/ImportWrapper.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/rule/MockRule.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/MockRule.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/lang/rule/MockRule.java rename to pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/MockRule.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/rule/ParametricRuleViolation.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/ParametricRuleViolation.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/lang/rule/ParametricRuleViolation.java rename to pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/ParametricRuleViolation.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/rule/RuleChainVisitor.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/RuleChainVisitor.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/lang/rule/RuleChainVisitor.java rename to pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/RuleChainVisitor.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/rule/RuleReference.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/RuleReference.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/lang/rule/RuleReference.java rename to pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/RuleReference.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/rule/RuleViolationFactory.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/RuleViolationFactory.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/lang/rule/RuleViolationFactory.java rename to pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/RuleViolationFactory.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/rule/XPathRule.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/XPathRule.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/lang/rule/XPathRule.java rename to pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/XPathRule.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/rule/properties/AbstractDelimitedProperty.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/properties/AbstractDelimitedProperty.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/lang/rule/properties/AbstractDelimitedProperty.java rename to pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/properties/AbstractDelimitedProperty.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/rule/properties/AbstractEnumeratedProperty.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/properties/AbstractEnumeratedProperty.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/lang/rule/properties/AbstractEnumeratedProperty.java rename to pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/properties/AbstractEnumeratedProperty.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/rule/properties/AbstractMultiNumericProperty.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/properties/AbstractMultiNumericProperty.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/lang/rule/properties/AbstractMultiNumericProperty.java rename to pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/properties/AbstractMultiNumericProperty.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/rule/properties/AbstractMultiPackagedProperty.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/properties/AbstractMultiPackagedProperty.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/lang/rule/properties/AbstractMultiPackagedProperty.java rename to pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/properties/AbstractMultiPackagedProperty.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/rule/properties/AbstractNumericProperty.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/properties/AbstractNumericProperty.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/lang/rule/properties/AbstractNumericProperty.java rename to pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/properties/AbstractNumericProperty.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/rule/properties/AbstractPackagedProperty.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/properties/AbstractPackagedProperty.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/lang/rule/properties/AbstractPackagedProperty.java rename to pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/properties/AbstractPackagedProperty.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/rule/properties/AbstractProperty.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/properties/AbstractProperty.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/lang/rule/properties/AbstractProperty.java rename to pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/properties/AbstractProperty.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/rule/properties/AbstractScalarProperty.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/properties/AbstractScalarProperty.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/lang/rule/properties/AbstractScalarProperty.java rename to pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/properties/AbstractScalarProperty.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/rule/properties/BooleanMultiProperty.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/properties/BooleanMultiProperty.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/lang/rule/properties/BooleanMultiProperty.java rename to pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/properties/BooleanMultiProperty.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/rule/properties/BooleanProperty.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/properties/BooleanProperty.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/lang/rule/properties/BooleanProperty.java rename to pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/properties/BooleanProperty.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/rule/properties/CharacterMultiProperty.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/properties/CharacterMultiProperty.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/lang/rule/properties/CharacterMultiProperty.java rename to pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/properties/CharacterMultiProperty.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/rule/properties/CharacterProperty.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/properties/CharacterProperty.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/lang/rule/properties/CharacterProperty.java rename to pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/properties/CharacterProperty.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/rule/properties/DoubleMultiProperty.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/properties/DoubleMultiProperty.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/lang/rule/properties/DoubleMultiProperty.java rename to pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/properties/DoubleMultiProperty.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/rule/properties/DoubleProperty.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/properties/DoubleProperty.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/lang/rule/properties/DoubleProperty.java rename to pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/properties/DoubleProperty.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/rule/properties/EnumeratedMultiProperty.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/properties/EnumeratedMultiProperty.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/lang/rule/properties/EnumeratedMultiProperty.java rename to pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/properties/EnumeratedMultiProperty.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/rule/properties/EnumeratedProperty.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/properties/EnumeratedProperty.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/lang/rule/properties/EnumeratedProperty.java rename to pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/properties/EnumeratedProperty.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/rule/properties/FileProperty.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/properties/FileProperty.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/lang/rule/properties/FileProperty.java rename to pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/properties/FileProperty.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/rule/properties/FloatMultiProperty.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/properties/FloatMultiProperty.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/lang/rule/properties/FloatMultiProperty.java rename to pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/properties/FloatMultiProperty.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/rule/properties/FloatProperty.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/properties/FloatProperty.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/lang/rule/properties/FloatProperty.java rename to pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/properties/FloatProperty.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/rule/properties/IntegerMultiProperty.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/properties/IntegerMultiProperty.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/lang/rule/properties/IntegerMultiProperty.java rename to pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/properties/IntegerMultiProperty.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/rule/properties/IntegerProperty.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/properties/IntegerProperty.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/lang/rule/properties/IntegerProperty.java rename to pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/properties/IntegerProperty.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/rule/properties/LongMultiProperty.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/properties/LongMultiProperty.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/lang/rule/properties/LongMultiProperty.java rename to pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/properties/LongMultiProperty.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/rule/properties/LongProperty.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/properties/LongProperty.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/lang/rule/properties/LongProperty.java rename to pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/properties/LongProperty.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/rule/properties/MethodMultiProperty.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/properties/MethodMultiProperty.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/lang/rule/properties/MethodMultiProperty.java rename to pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/properties/MethodMultiProperty.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/rule/properties/MethodProperty.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/properties/MethodProperty.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/lang/rule/properties/MethodProperty.java rename to pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/properties/MethodProperty.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/rule/properties/PropertyDescriptorFactory.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/properties/PropertyDescriptorFactory.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/lang/rule/properties/PropertyDescriptorFactory.java rename to pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/properties/PropertyDescriptorFactory.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/rule/properties/PropertyDescriptorWrapper.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/properties/PropertyDescriptorWrapper.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/lang/rule/properties/PropertyDescriptorWrapper.java rename to pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/properties/PropertyDescriptorWrapper.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/rule/properties/StringMultiProperty.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/properties/StringMultiProperty.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/lang/rule/properties/StringMultiProperty.java rename to pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/properties/StringMultiProperty.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/rule/properties/StringProperty.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/properties/StringProperty.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/lang/rule/properties/StringProperty.java rename to pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/properties/StringProperty.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/rule/properties/TypeMultiProperty.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/properties/TypeMultiProperty.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/lang/rule/properties/TypeMultiProperty.java rename to pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/properties/TypeMultiProperty.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/rule/properties/TypeProperty.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/properties/TypeProperty.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/lang/rule/properties/TypeProperty.java rename to pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/properties/TypeProperty.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/rule/properties/factories/BasicPropertyDescriptorFactory.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/properties/factories/BasicPropertyDescriptorFactory.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/lang/rule/properties/factories/BasicPropertyDescriptorFactory.java rename to pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/properties/factories/BasicPropertyDescriptorFactory.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/rule/properties/factories/PropertyDescriptorUtil.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/properties/factories/PropertyDescriptorUtil.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/lang/rule/properties/factories/PropertyDescriptorUtil.java rename to pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/properties/factories/PropertyDescriptorUtil.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/rule/stat/StatisticalRule.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/stat/StatisticalRule.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/lang/rule/stat/StatisticalRule.java rename to pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/stat/StatisticalRule.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/rule/stat/StatisticalRuleHelper.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/stat/StatisticalRuleHelper.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/lang/rule/stat/StatisticalRuleHelper.java rename to pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/stat/StatisticalRuleHelper.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/rule/xpath/AbstractXPathRuleQuery.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/xpath/AbstractXPathRuleQuery.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/lang/rule/xpath/AbstractXPathRuleQuery.java rename to pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/xpath/AbstractXPathRuleQuery.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/rule/xpath/JaxenXPathRuleQuery.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/xpath/JaxenXPathRuleQuery.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/lang/rule/xpath/JaxenXPathRuleQuery.java rename to pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/xpath/JaxenXPathRuleQuery.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/rule/xpath/SaxonXPathRuleQuery.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/xpath/SaxonXPathRuleQuery.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/lang/rule/xpath/SaxonXPathRuleQuery.java rename to pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/xpath/SaxonXPathRuleQuery.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/rule/xpath/XPathRuleQuery.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/xpath/XPathRuleQuery.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/lang/rule/xpath/XPathRuleQuery.java rename to pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/xpath/XPathRuleQuery.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/symboltable/AbstractNameDeclaration.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/symboltable/AbstractNameDeclaration.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/lang/symboltable/AbstractNameDeclaration.java rename to pmd-core/src/main/java/net/sourceforge/pmd/lang/symboltable/AbstractNameDeclaration.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/symboltable/AbstractScope.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/symboltable/AbstractScope.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/lang/symboltable/AbstractScope.java rename to pmd-core/src/main/java/net/sourceforge/pmd/lang/symboltable/AbstractScope.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/symboltable/NameDeclaration.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/symboltable/NameDeclaration.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/lang/symboltable/NameDeclaration.java rename to pmd-core/src/main/java/net/sourceforge/pmd/lang/symboltable/NameDeclaration.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/symboltable/NameOccurrence.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/symboltable/NameOccurrence.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/lang/symboltable/NameOccurrence.java rename to pmd-core/src/main/java/net/sourceforge/pmd/lang/symboltable/NameOccurrence.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/symboltable/Scope.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/symboltable/Scope.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/lang/symboltable/Scope.java rename to pmd-core/src/main/java/net/sourceforge/pmd/lang/symboltable/Scope.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/symboltable/ScopedNode.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/symboltable/ScopedNode.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/lang/symboltable/ScopedNode.java rename to pmd-core/src/main/java/net/sourceforge/pmd/lang/symboltable/ScopedNode.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/xpath/Initializer.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/xpath/Initializer.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/lang/xpath/Initializer.java rename to pmd-core/src/main/java/net/sourceforge/pmd/lang/xpath/Initializer.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/xpath/MatchesFunction.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/xpath/MatchesFunction.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/lang/xpath/MatchesFunction.java rename to pmd-core/src/main/java/net/sourceforge/pmd/lang/xpath/MatchesFunction.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/xpath/PMDFunctions.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/xpath/PMDFunctions.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/lang/xpath/PMDFunctions.java rename to pmd-core/src/main/java/net/sourceforge/pmd/lang/xpath/PMDFunctions.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/package.html b/pmd-core/src/main/java/net/sourceforge/pmd/package.html similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/package.html rename to pmd-core/src/main/java/net/sourceforge/pmd/package.html diff --git a/pmd/src/main/java/net/sourceforge/pmd/processor/AbstractPMDProcessor.java b/pmd-core/src/main/java/net/sourceforge/pmd/processor/AbstractPMDProcessor.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/processor/AbstractPMDProcessor.java rename to pmd-core/src/main/java/net/sourceforge/pmd/processor/AbstractPMDProcessor.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/processor/MonoThreadProcessor.java b/pmd-core/src/main/java/net/sourceforge/pmd/processor/MonoThreadProcessor.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/processor/MonoThreadProcessor.java rename to pmd-core/src/main/java/net/sourceforge/pmd/processor/MonoThreadProcessor.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/processor/MultiThreadProcessor.java b/pmd-core/src/main/java/net/sourceforge/pmd/processor/MultiThreadProcessor.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/processor/MultiThreadProcessor.java rename to pmd-core/src/main/java/net/sourceforge/pmd/processor/MultiThreadProcessor.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/processor/PmdRunnable.java b/pmd-core/src/main/java/net/sourceforge/pmd/processor/PmdRunnable.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/processor/PmdRunnable.java rename to pmd-core/src/main/java/net/sourceforge/pmd/processor/PmdRunnable.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/processor/PmdThreadFactory.java b/pmd-core/src/main/java/net/sourceforge/pmd/processor/PmdThreadFactory.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/processor/PmdThreadFactory.java rename to pmd-core/src/main/java/net/sourceforge/pmd/processor/PmdThreadFactory.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/renderers/AbstractAccumulatingRenderer.java b/pmd-core/src/main/java/net/sourceforge/pmd/renderers/AbstractAccumulatingRenderer.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/renderers/AbstractAccumulatingRenderer.java rename to pmd-core/src/main/java/net/sourceforge/pmd/renderers/AbstractAccumulatingRenderer.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/renderers/AbstractIncrementingRenderer.java b/pmd-core/src/main/java/net/sourceforge/pmd/renderers/AbstractIncrementingRenderer.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/renderers/AbstractIncrementingRenderer.java rename to pmd-core/src/main/java/net/sourceforge/pmd/renderers/AbstractIncrementingRenderer.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/renderers/AbstractRenderer.java b/pmd-core/src/main/java/net/sourceforge/pmd/renderers/AbstractRenderer.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/renderers/AbstractRenderer.java rename to pmd-core/src/main/java/net/sourceforge/pmd/renderers/AbstractRenderer.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/renderers/CSVRenderer.java b/pmd-core/src/main/java/net/sourceforge/pmd/renderers/CSVRenderer.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/renderers/CSVRenderer.java rename to pmd-core/src/main/java/net/sourceforge/pmd/renderers/CSVRenderer.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/renderers/CSVWriter.java b/pmd-core/src/main/java/net/sourceforge/pmd/renderers/CSVWriter.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/renderers/CSVWriter.java rename to pmd-core/src/main/java/net/sourceforge/pmd/renderers/CSVWriter.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/renderers/ColumnDescriptor.java b/pmd-core/src/main/java/net/sourceforge/pmd/renderers/ColumnDescriptor.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/renderers/ColumnDescriptor.java rename to pmd-core/src/main/java/net/sourceforge/pmd/renderers/ColumnDescriptor.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/renderers/EmacsRenderer.java b/pmd-core/src/main/java/net/sourceforge/pmd/renderers/EmacsRenderer.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/renderers/EmacsRenderer.java rename to pmd-core/src/main/java/net/sourceforge/pmd/renderers/EmacsRenderer.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/renderers/HTMLRenderer.java b/pmd-core/src/main/java/net/sourceforge/pmd/renderers/HTMLRenderer.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/renderers/HTMLRenderer.java rename to pmd-core/src/main/java/net/sourceforge/pmd/renderers/HTMLRenderer.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/renderers/IDEAJRenderer.java b/pmd-core/src/main/java/net/sourceforge/pmd/renderers/IDEAJRenderer.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/renderers/IDEAJRenderer.java rename to pmd-core/src/main/java/net/sourceforge/pmd/renderers/IDEAJRenderer.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/renderers/Renderer.java b/pmd-core/src/main/java/net/sourceforge/pmd/renderers/Renderer.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/renderers/Renderer.java rename to pmd-core/src/main/java/net/sourceforge/pmd/renderers/Renderer.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/renderers/RendererFactory.java b/pmd-core/src/main/java/net/sourceforge/pmd/renderers/RendererFactory.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/renderers/RendererFactory.java rename to pmd-core/src/main/java/net/sourceforge/pmd/renderers/RendererFactory.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/renderers/SummaryHTMLRenderer.java b/pmd-core/src/main/java/net/sourceforge/pmd/renderers/SummaryHTMLRenderer.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/renderers/SummaryHTMLRenderer.java rename to pmd-core/src/main/java/net/sourceforge/pmd/renderers/SummaryHTMLRenderer.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/renderers/TextColorRenderer.java b/pmd-core/src/main/java/net/sourceforge/pmd/renderers/TextColorRenderer.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/renderers/TextColorRenderer.java rename to pmd-core/src/main/java/net/sourceforge/pmd/renderers/TextColorRenderer.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/renderers/TextPadRenderer.java b/pmd-core/src/main/java/net/sourceforge/pmd/renderers/TextPadRenderer.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/renderers/TextPadRenderer.java rename to pmd-core/src/main/java/net/sourceforge/pmd/renderers/TextPadRenderer.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/renderers/TextRenderer.java b/pmd-core/src/main/java/net/sourceforge/pmd/renderers/TextRenderer.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/renderers/TextRenderer.java rename to pmd-core/src/main/java/net/sourceforge/pmd/renderers/TextRenderer.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/renderers/VBHTMLRenderer.java b/pmd-core/src/main/java/net/sourceforge/pmd/renderers/VBHTMLRenderer.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/renderers/VBHTMLRenderer.java rename to pmd-core/src/main/java/net/sourceforge/pmd/renderers/VBHTMLRenderer.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/renderers/XMLRenderer.java b/pmd-core/src/main/java/net/sourceforge/pmd/renderers/XMLRenderer.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/renderers/XMLRenderer.java rename to pmd-core/src/main/java/net/sourceforge/pmd/renderers/XMLRenderer.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/renderers/XSLTRenderer.java b/pmd-core/src/main/java/net/sourceforge/pmd/renderers/XSLTRenderer.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/renderers/XSLTRenderer.java rename to pmd-core/src/main/java/net/sourceforge/pmd/renderers/XSLTRenderer.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/renderers/YAHTMLRenderer.java b/pmd-core/src/main/java/net/sourceforge/pmd/renderers/YAHTMLRenderer.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/renderers/YAHTMLRenderer.java rename to pmd-core/src/main/java/net/sourceforge/pmd/renderers/YAHTMLRenderer.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/stat/DataPoint.java b/pmd-core/src/main/java/net/sourceforge/pmd/stat/DataPoint.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/stat/DataPoint.java rename to pmd-core/src/main/java/net/sourceforge/pmd/stat/DataPoint.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/stat/Metric.java b/pmd-core/src/main/java/net/sourceforge/pmd/stat/Metric.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/stat/Metric.java rename to pmd-core/src/main/java/net/sourceforge/pmd/stat/Metric.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/util/ClassUtil.java b/pmd-core/src/main/java/net/sourceforge/pmd/util/ClassUtil.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/util/ClassUtil.java rename to pmd-core/src/main/java/net/sourceforge/pmd/util/ClassUtil.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/util/ClasspathClassLoader.java b/pmd-core/src/main/java/net/sourceforge/pmd/util/ClasspathClassLoader.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/util/ClasspathClassLoader.java rename to pmd-core/src/main/java/net/sourceforge/pmd/util/ClasspathClassLoader.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/util/CollectionUtil.java b/pmd-core/src/main/java/net/sourceforge/pmd/util/CollectionUtil.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/util/CollectionUtil.java rename to pmd-core/src/main/java/net/sourceforge/pmd/util/CollectionUtil.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/util/CompoundIterator.java b/pmd-core/src/main/java/net/sourceforge/pmd/util/CompoundIterator.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/util/CompoundIterator.java rename to pmd-core/src/main/java/net/sourceforge/pmd/util/CompoundIterator.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/util/DateTimeUtil.java b/pmd-core/src/main/java/net/sourceforge/pmd/util/DateTimeUtil.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/util/DateTimeUtil.java rename to pmd-core/src/main/java/net/sourceforge/pmd/util/DateTimeUtil.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/util/EmptyIterator.java b/pmd-core/src/main/java/net/sourceforge/pmd/util/EmptyIterator.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/util/EmptyIterator.java rename to pmd-core/src/main/java/net/sourceforge/pmd/util/EmptyIterator.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/util/FileFinder.java b/pmd-core/src/main/java/net/sourceforge/pmd/util/FileFinder.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/util/FileFinder.java rename to pmd-core/src/main/java/net/sourceforge/pmd/util/FileFinder.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/util/FileIterable.java b/pmd-core/src/main/java/net/sourceforge/pmd/util/FileIterable.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/util/FileIterable.java rename to pmd-core/src/main/java/net/sourceforge/pmd/util/FileIterable.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/util/FileUtil.java b/pmd-core/src/main/java/net/sourceforge/pmd/util/FileUtil.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/util/FileUtil.java rename to pmd-core/src/main/java/net/sourceforge/pmd/util/FileUtil.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/util/IOUtil.java b/pmd-core/src/main/java/net/sourceforge/pmd/util/IOUtil.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/util/IOUtil.java rename to pmd-core/src/main/java/net/sourceforge/pmd/util/IOUtil.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/util/NumericConstants.java b/pmd-core/src/main/java/net/sourceforge/pmd/util/NumericConstants.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/util/NumericConstants.java rename to pmd-core/src/main/java/net/sourceforge/pmd/util/NumericConstants.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/util/ResourceLoader.java b/pmd-core/src/main/java/net/sourceforge/pmd/util/ResourceLoader.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/util/ResourceLoader.java rename to pmd-core/src/main/java/net/sourceforge/pmd/util/ResourceLoader.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/util/StringUtil.java b/pmd-core/src/main/java/net/sourceforge/pmd/util/StringUtil.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/util/StringUtil.java rename to pmd-core/src/main/java/net/sourceforge/pmd/util/StringUtil.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/util/SystemUtils.java b/pmd-core/src/main/java/net/sourceforge/pmd/util/SystemUtils.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/util/SystemUtils.java rename to pmd-core/src/main/java/net/sourceforge/pmd/util/SystemUtils.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/util/TypeMap.java b/pmd-core/src/main/java/net/sourceforge/pmd/util/TypeMap.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/util/TypeMap.java rename to pmd-core/src/main/java/net/sourceforge/pmd/util/TypeMap.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/util/UnaryFunction.java b/pmd-core/src/main/java/net/sourceforge/pmd/util/UnaryFunction.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/util/UnaryFunction.java rename to pmd-core/src/main/java/net/sourceforge/pmd/util/UnaryFunction.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/util/database/DBMSMetadata.java b/pmd-core/src/main/java/net/sourceforge/pmd/util/database/DBMSMetadata.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/util/database/DBMSMetadata.java rename to pmd-core/src/main/java/net/sourceforge/pmd/util/database/DBMSMetadata.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/util/database/DBType.java b/pmd-core/src/main/java/net/sourceforge/pmd/util/database/DBType.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/util/database/DBType.java rename to pmd-core/src/main/java/net/sourceforge/pmd/util/database/DBType.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/util/database/DBURI.java b/pmd-core/src/main/java/net/sourceforge/pmd/util/database/DBURI.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/util/database/DBURI.java rename to pmd-core/src/main/java/net/sourceforge/pmd/util/database/DBURI.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/util/database/ResourceLoader.java b/pmd-core/src/main/java/net/sourceforge/pmd/util/database/ResourceLoader.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/util/database/ResourceLoader.java rename to pmd-core/src/main/java/net/sourceforge/pmd/util/database/ResourceLoader.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/util/database/ResourceResolver.java b/pmd-core/src/main/java/net/sourceforge/pmd/util/database/ResourceResolver.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/util/database/ResourceResolver.java rename to pmd-core/src/main/java/net/sourceforge/pmd/util/database/ResourceResolver.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/util/database/SourceObject.java b/pmd-core/src/main/java/net/sourceforge/pmd/util/database/SourceObject.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/util/database/SourceObject.java rename to pmd-core/src/main/java/net/sourceforge/pmd/util/database/SourceObject.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/util/datasource/DataSource.java b/pmd-core/src/main/java/net/sourceforge/pmd/util/datasource/DataSource.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/util/datasource/DataSource.java rename to pmd-core/src/main/java/net/sourceforge/pmd/util/datasource/DataSource.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/util/datasource/FileDataSource.java b/pmd-core/src/main/java/net/sourceforge/pmd/util/datasource/FileDataSource.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/util/datasource/FileDataSource.java rename to pmd-core/src/main/java/net/sourceforge/pmd/util/datasource/FileDataSource.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/util/datasource/ReaderDataSource.java b/pmd-core/src/main/java/net/sourceforge/pmd/util/datasource/ReaderDataSource.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/util/datasource/ReaderDataSource.java rename to pmd-core/src/main/java/net/sourceforge/pmd/util/datasource/ReaderDataSource.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/util/datasource/ZipDataSource.java b/pmd-core/src/main/java/net/sourceforge/pmd/util/datasource/ZipDataSource.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/util/datasource/ZipDataSource.java rename to pmd-core/src/main/java/net/sourceforge/pmd/util/datasource/ZipDataSource.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/util/designer/CodeEditorTextPane.java b/pmd-core/src/main/java/net/sourceforge/pmd/util/designer/CodeEditorTextPane.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/util/designer/CodeEditorTextPane.java rename to pmd-core/src/main/java/net/sourceforge/pmd/util/designer/CodeEditorTextPane.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/util/designer/CreateXMLRulePanel.java b/pmd-core/src/main/java/net/sourceforge/pmd/util/designer/CreateXMLRulePanel.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/util/designer/CreateXMLRulePanel.java rename to pmd-core/src/main/java/net/sourceforge/pmd/util/designer/CreateXMLRulePanel.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/util/designer/DFAPanel.java b/pmd-core/src/main/java/net/sourceforge/pmd/util/designer/DFAPanel.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/util/designer/DFAPanel.java rename to pmd-core/src/main/java/net/sourceforge/pmd/util/designer/DFAPanel.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/util/designer/Designer.java b/pmd-core/src/main/java/net/sourceforge/pmd/util/designer/Designer.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/util/designer/Designer.java rename to pmd-core/src/main/java/net/sourceforge/pmd/util/designer/Designer.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/util/designer/LineGetter.java b/pmd-core/src/main/java/net/sourceforge/pmd/util/designer/LineGetter.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/util/designer/LineGetter.java rename to pmd-core/src/main/java/net/sourceforge/pmd/util/designer/LineGetter.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/util/filter/AbstractCompoundFilter.java b/pmd-core/src/main/java/net/sourceforge/pmd/util/filter/AbstractCompoundFilter.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/util/filter/AbstractCompoundFilter.java rename to pmd-core/src/main/java/net/sourceforge/pmd/util/filter/AbstractCompoundFilter.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/util/filter/AbstractDelegateFilter.java b/pmd-core/src/main/java/net/sourceforge/pmd/util/filter/AbstractDelegateFilter.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/util/filter/AbstractDelegateFilter.java rename to pmd-core/src/main/java/net/sourceforge/pmd/util/filter/AbstractDelegateFilter.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/util/filter/AndFilter.java b/pmd-core/src/main/java/net/sourceforge/pmd/util/filter/AndFilter.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/util/filter/AndFilter.java rename to pmd-core/src/main/java/net/sourceforge/pmd/util/filter/AndFilter.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/util/filter/DirectoryFilter.java b/pmd-core/src/main/java/net/sourceforge/pmd/util/filter/DirectoryFilter.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/util/filter/DirectoryFilter.java rename to pmd-core/src/main/java/net/sourceforge/pmd/util/filter/DirectoryFilter.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/util/filter/FileExtensionFilter.java b/pmd-core/src/main/java/net/sourceforge/pmd/util/filter/FileExtensionFilter.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/util/filter/FileExtensionFilter.java rename to pmd-core/src/main/java/net/sourceforge/pmd/util/filter/FileExtensionFilter.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/util/filter/Filter.java b/pmd-core/src/main/java/net/sourceforge/pmd/util/filter/Filter.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/util/filter/Filter.java rename to pmd-core/src/main/java/net/sourceforge/pmd/util/filter/Filter.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/util/filter/Filters.java b/pmd-core/src/main/java/net/sourceforge/pmd/util/filter/Filters.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/util/filter/Filters.java rename to pmd-core/src/main/java/net/sourceforge/pmd/util/filter/Filters.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/util/filter/NotFilter.java b/pmd-core/src/main/java/net/sourceforge/pmd/util/filter/NotFilter.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/util/filter/NotFilter.java rename to pmd-core/src/main/java/net/sourceforge/pmd/util/filter/NotFilter.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/util/filter/OrFilter.java b/pmd-core/src/main/java/net/sourceforge/pmd/util/filter/OrFilter.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/util/filter/OrFilter.java rename to pmd-core/src/main/java/net/sourceforge/pmd/util/filter/OrFilter.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/util/filter/RegexStringFilter.java b/pmd-core/src/main/java/net/sourceforge/pmd/util/filter/RegexStringFilter.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/util/filter/RegexStringFilter.java rename to pmd-core/src/main/java/net/sourceforge/pmd/util/filter/RegexStringFilter.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/util/log/AntLogHandler.java b/pmd-core/src/main/java/net/sourceforge/pmd/util/log/AntLogHandler.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/util/log/AntLogHandler.java rename to pmd-core/src/main/java/net/sourceforge/pmd/util/log/AntLogHandler.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/util/log/ConsoleLogHandler.java b/pmd-core/src/main/java/net/sourceforge/pmd/util/log/ConsoleLogHandler.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/util/log/ConsoleLogHandler.java rename to pmd-core/src/main/java/net/sourceforge/pmd/util/log/ConsoleLogHandler.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/util/log/PmdLogFormatter.java b/pmd-core/src/main/java/net/sourceforge/pmd/util/log/PmdLogFormatter.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/util/log/PmdLogFormatter.java rename to pmd-core/src/main/java/net/sourceforge/pmd/util/log/PmdLogFormatter.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/util/log/ScopedLogHandlersManager.java b/pmd-core/src/main/java/net/sourceforge/pmd/util/log/ScopedLogHandlersManager.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/util/log/ScopedLogHandlersManager.java rename to pmd-core/src/main/java/net/sourceforge/pmd/util/log/ScopedLogHandlersManager.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/util/viewer/Viewer.java b/pmd-core/src/main/java/net/sourceforge/pmd/util/viewer/Viewer.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/util/viewer/Viewer.java rename to pmd-core/src/main/java/net/sourceforge/pmd/util/viewer/Viewer.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/util/viewer/gui/ASTPanel.java b/pmd-core/src/main/java/net/sourceforge/pmd/util/viewer/gui/ASTPanel.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/util/viewer/gui/ASTPanel.java rename to pmd-core/src/main/java/net/sourceforge/pmd/util/viewer/gui/ASTPanel.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/util/viewer/gui/ActionCommands.java b/pmd-core/src/main/java/net/sourceforge/pmd/util/viewer/gui/ActionCommands.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/util/viewer/gui/ActionCommands.java rename to pmd-core/src/main/java/net/sourceforge/pmd/util/viewer/gui/ActionCommands.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/util/viewer/gui/EvaluationResultsPanel.java b/pmd-core/src/main/java/net/sourceforge/pmd/util/viewer/gui/EvaluationResultsPanel.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/util/viewer/gui/EvaluationResultsPanel.java rename to pmd-core/src/main/java/net/sourceforge/pmd/util/viewer/gui/EvaluationResultsPanel.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/util/viewer/gui/MainFrame.java b/pmd-core/src/main/java/net/sourceforge/pmd/util/viewer/gui/MainFrame.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/util/viewer/gui/MainFrame.java rename to pmd-core/src/main/java/net/sourceforge/pmd/util/viewer/gui/MainFrame.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/util/viewer/gui/ParseExceptionHandler.java b/pmd-core/src/main/java/net/sourceforge/pmd/util/viewer/gui/ParseExceptionHandler.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/util/viewer/gui/ParseExceptionHandler.java rename to pmd-core/src/main/java/net/sourceforge/pmd/util/viewer/gui/ParseExceptionHandler.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/util/viewer/gui/SourceCodePanel.java b/pmd-core/src/main/java/net/sourceforge/pmd/util/viewer/gui/SourceCodePanel.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/util/viewer/gui/SourceCodePanel.java rename to pmd-core/src/main/java/net/sourceforge/pmd/util/viewer/gui/SourceCodePanel.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/util/viewer/gui/XPathPanel.java b/pmd-core/src/main/java/net/sourceforge/pmd/util/viewer/gui/XPathPanel.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/util/viewer/gui/XPathPanel.java rename to pmd-core/src/main/java/net/sourceforge/pmd/util/viewer/gui/XPathPanel.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/util/viewer/gui/menu/ASTNodePopupMenu.java b/pmd-core/src/main/java/net/sourceforge/pmd/util/viewer/gui/menu/ASTNodePopupMenu.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/util/viewer/gui/menu/ASTNodePopupMenu.java rename to pmd-core/src/main/java/net/sourceforge/pmd/util/viewer/gui/menu/ASTNodePopupMenu.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/util/viewer/gui/menu/AttributesSubMenu.java b/pmd-core/src/main/java/net/sourceforge/pmd/util/viewer/gui/menu/AttributesSubMenu.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/util/viewer/gui/menu/AttributesSubMenu.java rename to pmd-core/src/main/java/net/sourceforge/pmd/util/viewer/gui/menu/AttributesSubMenu.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/util/viewer/gui/menu/SimpleNodeSubMenu.java b/pmd-core/src/main/java/net/sourceforge/pmd/util/viewer/gui/menu/SimpleNodeSubMenu.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/util/viewer/gui/menu/SimpleNodeSubMenu.java rename to pmd-core/src/main/java/net/sourceforge/pmd/util/viewer/gui/menu/SimpleNodeSubMenu.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/util/viewer/gui/menu/XPathFragmentAddingItem.java b/pmd-core/src/main/java/net/sourceforge/pmd/util/viewer/gui/menu/XPathFragmentAddingItem.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/util/viewer/gui/menu/XPathFragmentAddingItem.java rename to pmd-core/src/main/java/net/sourceforge/pmd/util/viewer/gui/menu/XPathFragmentAddingItem.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/util/viewer/model/ASTModel.java b/pmd-core/src/main/java/net/sourceforge/pmd/util/viewer/model/ASTModel.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/util/viewer/model/ASTModel.java rename to pmd-core/src/main/java/net/sourceforge/pmd/util/viewer/model/ASTModel.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/util/viewer/model/AttributeToolkit.java b/pmd-core/src/main/java/net/sourceforge/pmd/util/viewer/model/AttributeToolkit.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/util/viewer/model/AttributeToolkit.java rename to pmd-core/src/main/java/net/sourceforge/pmd/util/viewer/model/AttributeToolkit.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/util/viewer/model/SimpleNodeTreeNodeAdapter.java b/pmd-core/src/main/java/net/sourceforge/pmd/util/viewer/model/SimpleNodeTreeNodeAdapter.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/util/viewer/model/SimpleNodeTreeNodeAdapter.java rename to pmd-core/src/main/java/net/sourceforge/pmd/util/viewer/model/SimpleNodeTreeNodeAdapter.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/util/viewer/model/ViewerModel.java b/pmd-core/src/main/java/net/sourceforge/pmd/util/viewer/model/ViewerModel.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/util/viewer/model/ViewerModel.java rename to pmd-core/src/main/java/net/sourceforge/pmd/util/viewer/model/ViewerModel.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/util/viewer/model/ViewerModelEvent.java b/pmd-core/src/main/java/net/sourceforge/pmd/util/viewer/model/ViewerModelEvent.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/util/viewer/model/ViewerModelEvent.java rename to pmd-core/src/main/java/net/sourceforge/pmd/util/viewer/model/ViewerModelEvent.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/util/viewer/model/ViewerModelListener.java b/pmd-core/src/main/java/net/sourceforge/pmd/util/viewer/model/ViewerModelListener.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/util/viewer/model/ViewerModelListener.java rename to pmd-core/src/main/java/net/sourceforge/pmd/util/viewer/model/ViewerModelListener.java diff --git a/pmd/src/main/java/net/sourceforge/pmd/util/viewer/util/NLS.java b/pmd-core/src/main/java/net/sourceforge/pmd/util/viewer/util/NLS.java similarity index 100% rename from pmd/src/main/java/net/sourceforge/pmd/util/viewer/util/NLS.java rename to pmd-core/src/main/java/net/sourceforge/pmd/util/viewer/util/NLS.java diff --git a/pmd/src/main/resources/META-INF/services/net.sourceforge.pmd.lang.Language b/pmd-core/src/main/resources/META-INF/services/net.sourceforge.pmd.lang.Language similarity index 100% rename from pmd/src/main/resources/META-INF/services/net.sourceforge.pmd.lang.Language rename to pmd-core/src/main/resources/META-INF/services/net.sourceforge.pmd.lang.Language diff --git a/pmd/src/main/resources/net/sourceforge/pmd/util/database/DBType/oci.properties b/pmd-core/src/main/resources/net/sourceforge/pmd/util/database/DBType/oci.properties similarity index 100% rename from pmd/src/main/resources/net/sourceforge/pmd/util/database/DBType/oci.properties rename to pmd-core/src/main/resources/net/sourceforge/pmd/util/database/DBType/oci.properties diff --git a/pmd/src/main/resources/net/sourceforge/pmd/util/database/DBType/oci8.properties b/pmd-core/src/main/resources/net/sourceforge/pmd/util/database/DBType/oci8.properties similarity index 100% rename from pmd/src/main/resources/net/sourceforge/pmd/util/database/DBType/oci8.properties rename to pmd-core/src/main/resources/net/sourceforge/pmd/util/database/DBType/oci8.properties diff --git a/pmd/src/main/resources/net/sourceforge/pmd/util/database/DBType/ora.properties b/pmd-core/src/main/resources/net/sourceforge/pmd/util/database/DBType/ora.properties similarity index 100% rename from pmd/src/main/resources/net/sourceforge/pmd/util/database/DBType/ora.properties rename to pmd-core/src/main/resources/net/sourceforge/pmd/util/database/DBType/ora.properties diff --git a/pmd/src/main/resources/net/sourceforge/pmd/util/database/DBType/postgresql.properties b/pmd-core/src/main/resources/net/sourceforge/pmd/util/database/DBType/postgresql.properties similarity index 100% rename from pmd/src/main/resources/net/sourceforge/pmd/util/database/DBType/postgresql.properties rename to pmd-core/src/main/resources/net/sourceforge/pmd/util/database/DBType/postgresql.properties diff --git a/pmd/src/main/resources/net/sourceforge/pmd/util/database/DBType/thin.properties b/pmd-core/src/main/resources/net/sourceforge/pmd/util/database/DBType/thin.properties similarity index 100% rename from pmd/src/main/resources/net/sourceforge/pmd/util/database/DBType/thin.properties rename to pmd-core/src/main/resources/net/sourceforge/pmd/util/database/DBType/thin.properties diff --git a/pmd/src/main/resources/net/sourceforge/pmd/util/viewer/resources/viewer_strings.properties b/pmd-core/src/main/resources/net/sourceforge/pmd/util/viewer/resources/viewer_strings.properties similarity index 100% rename from pmd/src/main/resources/net/sourceforge/pmd/util/viewer/resources/viewer_strings.properties rename to pmd-core/src/main/resources/net/sourceforge/pmd/util/viewer/resources/viewer_strings.properties diff --git a/pmd/src/main/resources/pmd-nicerhtml.xsl b/pmd-core/src/main/resources/pmd-nicerhtml.xsl similarity index 100% rename from pmd/src/main/resources/pmd-nicerhtml.xsl rename to pmd-core/src/main/resources/pmd-nicerhtml.xsl diff --git a/pmd/src/main/resources/ruleset_2_0_0.dtd b/pmd-core/src/main/resources/ruleset_2_0_0.dtd similarity index 100% rename from pmd/src/main/resources/ruleset_2_0_0.dtd rename to pmd-core/src/main/resources/ruleset_2_0_0.dtd diff --git a/pmd/src/main/resources/ruleset_2_0_0.xsd b/pmd-core/src/main/resources/ruleset_2_0_0.xsd similarity index 100% rename from pmd/src/main/resources/ruleset_2_0_0.xsd rename to pmd-core/src/main/resources/ruleset_2_0_0.xsd diff --git a/pmd/src/main/resources/rulesets/internal/all-ecmascript.xml b/pmd-core/src/main/resources/rulesets/internal/all-ecmascript.xml similarity index 100% rename from pmd/src/main/resources/rulesets/internal/all-ecmascript.xml rename to pmd-core/src/main/resources/rulesets/internal/all-ecmascript.xml diff --git a/pmd/src/main/resources/rulesets/internal/all-java.xml b/pmd-core/src/main/resources/rulesets/internal/all-java.xml similarity index 100% rename from pmd/src/main/resources/rulesets/internal/all-java.xml rename to pmd-core/src/main/resources/rulesets/internal/all-java.xml diff --git a/pmd/src/main/resources/rulesets/internal/dogfood-goal.xml b/pmd-core/src/main/resources/rulesets/internal/dogfood-goal.xml similarity index 100% rename from pmd/src/main/resources/rulesets/internal/dogfood-goal.xml rename to pmd-core/src/main/resources/rulesets/internal/dogfood-goal.xml diff --git a/pmd/src/main/resources/rulesets/internal/dogfood.xml b/pmd-core/src/main/resources/rulesets/internal/dogfood.xml similarity index 100% rename from pmd/src/main/resources/rulesets/internal/dogfood.xml rename to pmd-core/src/main/resources/rulesets/internal/dogfood.xml diff --git a/pmd/src/main/resources/rulesets/internal/pmdspecific.xml b/pmd-core/src/main/resources/rulesets/internal/pmdspecific.xml similarity index 100% rename from pmd/src/main/resources/rulesets/internal/pmdspecific.xml rename to pmd-core/src/main/resources/rulesets/internal/pmdspecific.xml diff --git a/pmd/src/main/resources/rulesets/internal/regress-dogfood-goal.xml b/pmd-core/src/main/resources/rulesets/internal/regress-dogfood-goal.xml similarity index 100% rename from pmd/src/main/resources/rulesets/internal/regress-dogfood-goal.xml rename to pmd-core/src/main/resources/rulesets/internal/regress-dogfood-goal.xml diff --git a/pmd/src/main/resources/rulesets/internal/regress-dogfood.xml b/pmd-core/src/main/resources/rulesets/internal/regress-dogfood.xml similarity index 100% rename from pmd/src/main/resources/rulesets/internal/regress-dogfood.xml rename to pmd-core/src/main/resources/rulesets/internal/regress-dogfood.xml diff --git a/pmd/src/main/resources/rulesets/releases/33.xml b/pmd-core/src/main/resources/rulesets/releases/33.xml similarity index 100% rename from pmd/src/main/resources/rulesets/releases/33.xml rename to pmd-core/src/main/resources/rulesets/releases/33.xml diff --git a/pmd/src/main/resources/rulesets/releases/34.xml b/pmd-core/src/main/resources/rulesets/releases/34.xml similarity index 100% rename from pmd/src/main/resources/rulesets/releases/34.xml rename to pmd-core/src/main/resources/rulesets/releases/34.xml diff --git a/pmd/src/main/resources/rulesets/releases/35.xml b/pmd-core/src/main/resources/rulesets/releases/35.xml similarity index 100% rename from pmd/src/main/resources/rulesets/releases/35.xml rename to pmd-core/src/main/resources/rulesets/releases/35.xml diff --git a/pmd/src/main/resources/rulesets/releases/36.xml b/pmd-core/src/main/resources/rulesets/releases/36.xml similarity index 100% rename from pmd/src/main/resources/rulesets/releases/36.xml rename to pmd-core/src/main/resources/rulesets/releases/36.xml diff --git a/pmd/src/main/resources/rulesets/releases/37-jsp.xml b/pmd-core/src/main/resources/rulesets/releases/37-jsp.xml similarity index 100% rename from pmd/src/main/resources/rulesets/releases/37-jsp.xml rename to pmd-core/src/main/resources/rulesets/releases/37-jsp.xml diff --git a/pmd/src/main/resources/rulesets/releases/37.xml b/pmd-core/src/main/resources/rulesets/releases/37.xml similarity index 100% rename from pmd/src/main/resources/rulesets/releases/37.xml rename to pmd-core/src/main/resources/rulesets/releases/37.xml diff --git a/pmd/src/main/resources/rulesets/releases/38.xml b/pmd-core/src/main/resources/rulesets/releases/38.xml similarity index 100% rename from pmd/src/main/resources/rulesets/releases/38.xml rename to pmd-core/src/main/resources/rulesets/releases/38.xml diff --git a/pmd/src/main/resources/rulesets/releases/39.xml b/pmd-core/src/main/resources/rulesets/releases/39.xml similarity index 100% rename from pmd/src/main/resources/rulesets/releases/39.xml rename to pmd-core/src/main/resources/rulesets/releases/39.xml diff --git a/pmd/src/main/resources/rulesets/releases/40rc1.xml b/pmd-core/src/main/resources/rulesets/releases/40rc1.xml similarity index 100% rename from pmd/src/main/resources/rulesets/releases/40rc1.xml rename to pmd-core/src/main/resources/rulesets/releases/40rc1.xml diff --git a/pmd/src/main/resources/rulesets/releases/41.xml b/pmd-core/src/main/resources/rulesets/releases/41.xml similarity index 100% rename from pmd/src/main/resources/rulesets/releases/41.xml rename to pmd-core/src/main/resources/rulesets/releases/41.xml diff --git a/pmd/src/main/resources/rulesets/releases/42.xml b/pmd-core/src/main/resources/rulesets/releases/42.xml similarity index 100% rename from pmd/src/main/resources/rulesets/releases/42.xml rename to pmd-core/src/main/resources/rulesets/releases/42.xml diff --git a/pmd/src/main/resources/rulesets/releases/50.xml b/pmd-core/src/main/resources/rulesets/releases/50.xml similarity index 100% rename from pmd/src/main/resources/rulesets/releases/50.xml rename to pmd-core/src/main/resources/rulesets/releases/50.xml diff --git a/pmd/src/main/resources/rulesets/releases/501.xml b/pmd-core/src/main/resources/rulesets/releases/501.xml similarity index 100% rename from pmd/src/main/resources/rulesets/releases/501.xml rename to pmd-core/src/main/resources/rulesets/releases/501.xml diff --git a/pmd/src/main/resources/rulesets/releases/510.xml b/pmd-core/src/main/resources/rulesets/releases/510.xml similarity index 100% rename from pmd/src/main/resources/rulesets/releases/510.xml rename to pmd-core/src/main/resources/rulesets/releases/510.xml diff --git a/pmd/src/main/resources/rulesets/releases/512.xml b/pmd-core/src/main/resources/rulesets/releases/512.xml similarity index 100% rename from pmd/src/main/resources/rulesets/releases/512.xml rename to pmd-core/src/main/resources/rulesets/releases/512.xml diff --git a/pmd/src/main/resources/rulesets/releases/514.xml b/pmd-core/src/main/resources/rulesets/releases/514.xml similarity index 100% rename from pmd/src/main/resources/rulesets/releases/514.xml rename to pmd-core/src/main/resources/rulesets/releases/514.xml diff --git a/pmd/src/site/markdown/index.md b/pmd-core/src/site/markdown/index.md similarity index 100% rename from pmd/src/site/markdown/index.md rename to pmd-core/src/site/markdown/index.md diff --git a/pmd/src/site/site.xml b/pmd-core/src/site/site.xml similarity index 100% rename from pmd/src/site/site.xml rename to pmd-core/src/site/site.xml diff --git a/pmd/src/test/java/net/sourceforge/pmd/AbstractRuleTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/AbstractRuleTest.java similarity index 100% rename from pmd/src/test/java/net/sourceforge/pmd/AbstractRuleTest.java rename to pmd-core/src/test/java/net/sourceforge/pmd/AbstractRuleTest.java diff --git a/pmd/src/test/java/net/sourceforge/pmd/ConfigurationTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/ConfigurationTest.java similarity index 100% rename from pmd/src/test/java/net/sourceforge/pmd/ConfigurationTest.java rename to pmd-core/src/test/java/net/sourceforge/pmd/ConfigurationTest.java diff --git a/pmd/src/test/java/net/sourceforge/pmd/FileSelectorTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/FileSelectorTest.java similarity index 100% rename from pmd/src/test/java/net/sourceforge/pmd/FileSelectorTest.java rename to pmd-core/src/test/java/net/sourceforge/pmd/FileSelectorTest.java diff --git a/pmd/src/test/java/net/sourceforge/pmd/FooRule.java b/pmd-core/src/test/java/net/sourceforge/pmd/FooRule.java similarity index 100% rename from pmd/src/test/java/net/sourceforge/pmd/FooRule.java rename to pmd-core/src/test/java/net/sourceforge/pmd/FooRule.java diff --git a/pmd/src/test/java/net/sourceforge/pmd/ReadableDurationTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/ReadableDurationTest.java similarity index 100% rename from pmd/src/test/java/net/sourceforge/pmd/ReadableDurationTest.java rename to pmd-core/src/test/java/net/sourceforge/pmd/ReadableDurationTest.java diff --git a/pmd/src/test/java/net/sourceforge/pmd/ReportTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/ReportTest.java similarity index 100% rename from pmd/src/test/java/net/sourceforge/pmd/ReportTest.java rename to pmd-core/src/test/java/net/sourceforge/pmd/ReportTest.java diff --git a/pmd/src/test/java/net/sourceforge/pmd/RuleContextTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/RuleContextTest.java similarity index 100% rename from pmd/src/test/java/net/sourceforge/pmd/RuleContextTest.java rename to pmd-core/src/test/java/net/sourceforge/pmd/RuleContextTest.java diff --git a/pmd/src/test/java/net/sourceforge/pmd/RuleReferenceTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/RuleReferenceTest.java similarity index 100% rename from pmd/src/test/java/net/sourceforge/pmd/RuleReferenceTest.java rename to pmd-core/src/test/java/net/sourceforge/pmd/RuleReferenceTest.java diff --git a/pmd/src/test/java/net/sourceforge/pmd/RuleSetFactoryTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/RuleSetFactoryTest.java similarity index 100% rename from pmd/src/test/java/net/sourceforge/pmd/RuleSetFactoryTest.java rename to pmd-core/src/test/java/net/sourceforge/pmd/RuleSetFactoryTest.java diff --git a/pmd/src/test/java/net/sourceforge/pmd/RuleSetReferenceIdTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/RuleSetReferenceIdTest.java similarity index 100% rename from pmd/src/test/java/net/sourceforge/pmd/RuleSetReferenceIdTest.java rename to pmd-core/src/test/java/net/sourceforge/pmd/RuleSetReferenceIdTest.java diff --git a/pmd/src/test/java/net/sourceforge/pmd/RuleSetTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/RuleSetTest.java similarity index 100% rename from pmd/src/test/java/net/sourceforge/pmd/RuleSetTest.java rename to pmd-core/src/test/java/net/sourceforge/pmd/RuleSetTest.java diff --git a/pmd/src/test/java/net/sourceforge/pmd/RuleSetWriterTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/RuleSetWriterTest.java similarity index 100% rename from pmd/src/test/java/net/sourceforge/pmd/RuleSetWriterTest.java rename to pmd-core/src/test/java/net/sourceforge/pmd/RuleSetWriterTest.java diff --git a/pmd/src/test/java/net/sourceforge/pmd/RuleViolationComparatorTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/RuleViolationComparatorTest.java similarity index 100% rename from pmd/src/test/java/net/sourceforge/pmd/RuleViolationComparatorTest.java rename to pmd-core/src/test/java/net/sourceforge/pmd/RuleViolationComparatorTest.java diff --git a/pmd/src/test/java/net/sourceforge/pmd/RuleViolationTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/RuleViolationTest.java similarity index 100% rename from pmd/src/test/java/net/sourceforge/pmd/RuleViolationTest.java rename to pmd-core/src/test/java/net/sourceforge/pmd/RuleViolationTest.java diff --git a/pmd/src/test/java/net/sourceforge/pmd/ant/CPDTaskTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/ant/CPDTaskTest.java similarity index 100% rename from pmd/src/test/java/net/sourceforge/pmd/ant/CPDTaskTest.java rename to pmd-core/src/test/java/net/sourceforge/pmd/ant/CPDTaskTest.java diff --git a/pmd/src/test/java/net/sourceforge/pmd/ant/FormatterTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/ant/FormatterTest.java similarity index 100% rename from pmd/src/test/java/net/sourceforge/pmd/ant/FormatterTest.java rename to pmd-core/src/test/java/net/sourceforge/pmd/ant/FormatterTest.java diff --git a/pmd/src/test/java/net/sourceforge/pmd/ant/PMDTaskTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/ant/PMDTaskTest.java similarity index 100% rename from pmd/src/test/java/net/sourceforge/pmd/ant/PMDTaskTest.java rename to pmd-core/src/test/java/net/sourceforge/pmd/ant/PMDTaskTest.java diff --git a/pmd/src/test/java/net/sourceforge/pmd/cli/PMDCommandLineInterfaceTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/cli/PMDCommandLineInterfaceTest.java similarity index 100% rename from pmd/src/test/java/net/sourceforge/pmd/cli/PMDCommandLineInterfaceTest.java rename to pmd-core/src/test/java/net/sourceforge/pmd/cli/PMDCommandLineInterfaceTest.java diff --git a/pmd/src/test/java/net/sourceforge/pmd/cpd/AnyTokenizerTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/cpd/AnyTokenizerTest.java similarity index 100% rename from pmd/src/test/java/net/sourceforge/pmd/cpd/AnyTokenizerTest.java rename to pmd-core/src/test/java/net/sourceforge/pmd/cpd/AnyTokenizerTest.java diff --git a/pmd/src/test/java/net/sourceforge/pmd/cpd/CPDTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/cpd/CPDTest.java similarity index 100% rename from pmd/src/test/java/net/sourceforge/pmd/cpd/CPDTest.java rename to pmd-core/src/test/java/net/sourceforge/pmd/cpd/CPDTest.java diff --git a/pmd/src/test/java/net/sourceforge/pmd/cpd/CpddummyLanguage.java b/pmd-core/src/test/java/net/sourceforge/pmd/cpd/CpddummyLanguage.java similarity index 100% rename from pmd/src/test/java/net/sourceforge/pmd/cpd/CpddummyLanguage.java rename to pmd-core/src/test/java/net/sourceforge/pmd/cpd/CpddummyLanguage.java diff --git a/pmd/src/test/java/net/sourceforge/pmd/cpd/CsTokenizerTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/cpd/CsTokenizerTest.java similarity index 100% rename from pmd/src/test/java/net/sourceforge/pmd/cpd/CsTokenizerTest.java rename to pmd-core/src/test/java/net/sourceforge/pmd/cpd/CsTokenizerTest.java diff --git a/pmd/src/test/java/net/sourceforge/pmd/cpd/FileReporterTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/cpd/FileReporterTest.java similarity index 100% rename from pmd/src/test/java/net/sourceforge/pmd/cpd/FileReporterTest.java rename to pmd-core/src/test/java/net/sourceforge/pmd/cpd/FileReporterTest.java diff --git a/pmd/src/test/java/net/sourceforge/pmd/cpd/LanguageFactoryTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/cpd/LanguageFactoryTest.java similarity index 100% rename from pmd/src/test/java/net/sourceforge/pmd/cpd/LanguageFactoryTest.java rename to pmd-core/src/test/java/net/sourceforge/pmd/cpd/LanguageFactoryTest.java diff --git a/pmd/src/test/java/net/sourceforge/pmd/cpd/MatchTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/cpd/MatchTest.java similarity index 100% rename from pmd/src/test/java/net/sourceforge/pmd/cpd/MatchTest.java rename to pmd-core/src/test/java/net/sourceforge/pmd/cpd/MatchTest.java diff --git a/pmd/src/test/java/net/sourceforge/pmd/cpd/SourceCodeTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/cpd/SourceCodeTest.java similarity index 100% rename from pmd/src/test/java/net/sourceforge/pmd/cpd/SourceCodeTest.java rename to pmd-core/src/test/java/net/sourceforge/pmd/cpd/SourceCodeTest.java diff --git a/pmd/src/test/java/net/sourceforge/pmd/cpd/TokenEntryTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/cpd/TokenEntryTest.java similarity index 100% rename from pmd/src/test/java/net/sourceforge/pmd/cpd/TokenEntryTest.java rename to pmd-core/src/test/java/net/sourceforge/pmd/cpd/TokenEntryTest.java diff --git a/pmd/src/test/java/net/sourceforge/pmd/cpd/XMLRendererTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/cpd/XMLRendererTest.java similarity index 100% rename from pmd/src/test/java/net/sourceforge/pmd/cpd/XMLRendererTest.java rename to pmd-core/src/test/java/net/sourceforge/pmd/cpd/XMLRendererTest.java diff --git a/pmd/src/test/java/net/sourceforge/pmd/jaxen/AttributeAxisIteratorTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/jaxen/AttributeAxisIteratorTest.java similarity index 100% rename from pmd/src/test/java/net/sourceforge/pmd/jaxen/AttributeAxisIteratorTest.java rename to pmd-core/src/test/java/net/sourceforge/pmd/jaxen/AttributeAxisIteratorTest.java diff --git a/pmd/src/test/java/net/sourceforge/pmd/jaxen/AttributeTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/jaxen/AttributeTest.java similarity index 100% rename from pmd/src/test/java/net/sourceforge/pmd/jaxen/AttributeTest.java rename to pmd-core/src/test/java/net/sourceforge/pmd/jaxen/AttributeTest.java diff --git a/pmd/src/test/java/net/sourceforge/pmd/jaxen/MatchesFunctionTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/jaxen/MatchesFunctionTest.java similarity index 100% rename from pmd/src/test/java/net/sourceforge/pmd/jaxen/MatchesFunctionTest.java rename to pmd-core/src/test/java/net/sourceforge/pmd/jaxen/MatchesFunctionTest.java diff --git a/pmd/src/test/java/net/sourceforge/pmd/lang/Dummy2LanguageModule.java b/pmd-core/src/test/java/net/sourceforge/pmd/lang/Dummy2LanguageModule.java similarity index 100% rename from pmd/src/test/java/net/sourceforge/pmd/lang/Dummy2LanguageModule.java rename to pmd-core/src/test/java/net/sourceforge/pmd/lang/Dummy2LanguageModule.java diff --git a/pmd/src/test/java/net/sourceforge/pmd/lang/DummyLanguageModule.java b/pmd-core/src/test/java/net/sourceforge/pmd/lang/DummyLanguageModule.java similarity index 100% rename from pmd/src/test/java/net/sourceforge/pmd/lang/DummyLanguageModule.java rename to pmd-core/src/test/java/net/sourceforge/pmd/lang/DummyLanguageModule.java diff --git a/pmd/src/test/java/net/sourceforge/pmd/lang/ast/DummyNode.java b/pmd-core/src/test/java/net/sourceforge/pmd/lang/ast/DummyNode.java similarity index 100% rename from pmd/src/test/java/net/sourceforge/pmd/lang/ast/DummyNode.java rename to pmd-core/src/test/java/net/sourceforge/pmd/lang/ast/DummyNode.java diff --git a/pmd/src/test/java/net/sourceforge/pmd/lang/ast/xpath/AttributeAxisIteratorTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/lang/ast/xpath/AttributeAxisIteratorTest.java similarity index 100% rename from pmd/src/test/java/net/sourceforge/pmd/lang/ast/xpath/AttributeAxisIteratorTest.java rename to pmd-core/src/test/java/net/sourceforge/pmd/lang/ast/xpath/AttributeAxisIteratorTest.java diff --git a/pmd/src/test/java/net/sourceforge/pmd/lang/ast/xpath/DocumentNavigatorTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/lang/ast/xpath/DocumentNavigatorTest.java similarity index 100% rename from pmd/src/test/java/net/sourceforge/pmd/lang/ast/xpath/DocumentNavigatorTest.java rename to pmd-core/src/test/java/net/sourceforge/pmd/lang/ast/xpath/DocumentNavigatorTest.java diff --git a/pmd/src/test/java/net/sourceforge/pmd/lang/dfa/report/ViolationNodeTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/lang/dfa/report/ViolationNodeTest.java similarity index 100% rename from pmd/src/test/java/net/sourceforge/pmd/lang/dfa/report/ViolationNodeTest.java rename to pmd-core/src/test/java/net/sourceforge/pmd/lang/dfa/report/ViolationNodeTest.java diff --git a/pmd/src/test/java/net/sourceforge/pmd/properties/AbstractPropertyDescriptorTester.java b/pmd-core/src/test/java/net/sourceforge/pmd/properties/AbstractPropertyDescriptorTester.java similarity index 100% rename from pmd/src/test/java/net/sourceforge/pmd/properties/AbstractPropertyDescriptorTester.java rename to pmd-core/src/test/java/net/sourceforge/pmd/properties/AbstractPropertyDescriptorTester.java diff --git a/pmd/src/test/java/net/sourceforge/pmd/properties/BooleanPropertyTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/properties/BooleanPropertyTest.java similarity index 100% rename from pmd/src/test/java/net/sourceforge/pmd/properties/BooleanPropertyTest.java rename to pmd-core/src/test/java/net/sourceforge/pmd/properties/BooleanPropertyTest.java diff --git a/pmd/src/test/java/net/sourceforge/pmd/properties/CharacterPropertyTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/properties/CharacterPropertyTest.java similarity index 100% rename from pmd/src/test/java/net/sourceforge/pmd/properties/CharacterPropertyTest.java rename to pmd-core/src/test/java/net/sourceforge/pmd/properties/CharacterPropertyTest.java diff --git a/pmd/src/test/java/net/sourceforge/pmd/properties/DoublePropertyTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/properties/DoublePropertyTest.java similarity index 100% rename from pmd/src/test/java/net/sourceforge/pmd/properties/DoublePropertyTest.java rename to pmd-core/src/test/java/net/sourceforge/pmd/properties/DoublePropertyTest.java diff --git a/pmd/src/test/java/net/sourceforge/pmd/properties/EnumeratedPropertyTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/properties/EnumeratedPropertyTest.java similarity index 100% rename from pmd/src/test/java/net/sourceforge/pmd/properties/EnumeratedPropertyTest.java rename to pmd-core/src/test/java/net/sourceforge/pmd/properties/EnumeratedPropertyTest.java diff --git a/pmd/src/test/java/net/sourceforge/pmd/properties/FloatPropertyTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/properties/FloatPropertyTest.java similarity index 100% rename from pmd/src/test/java/net/sourceforge/pmd/properties/FloatPropertyTest.java rename to pmd-core/src/test/java/net/sourceforge/pmd/properties/FloatPropertyTest.java diff --git a/pmd/src/test/java/net/sourceforge/pmd/properties/IntegerPropertyTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/properties/IntegerPropertyTest.java similarity index 100% rename from pmd/src/test/java/net/sourceforge/pmd/properties/IntegerPropertyTest.java rename to pmd-core/src/test/java/net/sourceforge/pmd/properties/IntegerPropertyTest.java diff --git a/pmd/src/test/java/net/sourceforge/pmd/properties/MethodPropertyTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/properties/MethodPropertyTest.java similarity index 100% rename from pmd/src/test/java/net/sourceforge/pmd/properties/MethodPropertyTest.java rename to pmd-core/src/test/java/net/sourceforge/pmd/properties/MethodPropertyTest.java diff --git a/pmd/src/test/java/net/sourceforge/pmd/properties/NonRuleWithAllPropertyTypes.java b/pmd-core/src/test/java/net/sourceforge/pmd/properties/NonRuleWithAllPropertyTypes.java similarity index 100% rename from pmd/src/test/java/net/sourceforge/pmd/properties/NonRuleWithAllPropertyTypes.java rename to pmd-core/src/test/java/net/sourceforge/pmd/properties/NonRuleWithAllPropertyTypes.java diff --git a/pmd/src/test/java/net/sourceforge/pmd/properties/PropertyAccessorTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/properties/PropertyAccessorTest.java similarity index 100% rename from pmd/src/test/java/net/sourceforge/pmd/properties/PropertyAccessorTest.java rename to pmd-core/src/test/java/net/sourceforge/pmd/properties/PropertyAccessorTest.java diff --git a/pmd/src/test/java/net/sourceforge/pmd/properties/StringPropertyTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/properties/StringPropertyTest.java similarity index 100% rename from pmd/src/test/java/net/sourceforge/pmd/properties/StringPropertyTest.java rename to pmd-core/src/test/java/net/sourceforge/pmd/properties/StringPropertyTest.java diff --git a/pmd/src/test/java/net/sourceforge/pmd/properties/TypePropertyTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/properties/TypePropertyTest.java similarity index 100% rename from pmd/src/test/java/net/sourceforge/pmd/properties/TypePropertyTest.java rename to pmd-core/src/test/java/net/sourceforge/pmd/properties/TypePropertyTest.java diff --git a/pmd/src/test/java/net/sourceforge/pmd/renderers/AbstractRendererTst.java b/pmd-core/src/test/java/net/sourceforge/pmd/renderers/AbstractRendererTst.java similarity index 100% rename from pmd/src/test/java/net/sourceforge/pmd/renderers/AbstractRendererTst.java rename to pmd-core/src/test/java/net/sourceforge/pmd/renderers/AbstractRendererTst.java diff --git a/pmd/src/test/java/net/sourceforge/pmd/renderers/CSVRendererTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/renderers/CSVRendererTest.java similarity index 100% rename from pmd/src/test/java/net/sourceforge/pmd/renderers/CSVRendererTest.java rename to pmd-core/src/test/java/net/sourceforge/pmd/renderers/CSVRendererTest.java diff --git a/pmd/src/test/java/net/sourceforge/pmd/renderers/EmacsRendererTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/renderers/EmacsRendererTest.java similarity index 100% rename from pmd/src/test/java/net/sourceforge/pmd/renderers/EmacsRendererTest.java rename to pmd-core/src/test/java/net/sourceforge/pmd/renderers/EmacsRendererTest.java diff --git a/pmd/src/test/java/net/sourceforge/pmd/renderers/HTMLRendererTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/renderers/HTMLRendererTest.java similarity index 100% rename from pmd/src/test/java/net/sourceforge/pmd/renderers/HTMLRendererTest.java rename to pmd-core/src/test/java/net/sourceforge/pmd/renderers/HTMLRendererTest.java diff --git a/pmd/src/test/java/net/sourceforge/pmd/renderers/IDEAJRendererTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/renderers/IDEAJRendererTest.java similarity index 100% rename from pmd/src/test/java/net/sourceforge/pmd/renderers/IDEAJRendererTest.java rename to pmd-core/src/test/java/net/sourceforge/pmd/renderers/IDEAJRendererTest.java diff --git a/pmd/src/test/java/net/sourceforge/pmd/renderers/PapariTextRendererTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/renderers/PapariTextRendererTest.java similarity index 100% rename from pmd/src/test/java/net/sourceforge/pmd/renderers/PapariTextRendererTest.java rename to pmd-core/src/test/java/net/sourceforge/pmd/renderers/PapariTextRendererTest.java diff --git a/pmd/src/test/java/net/sourceforge/pmd/renderers/RenderersTests.java b/pmd-core/src/test/java/net/sourceforge/pmd/renderers/RenderersTests.java similarity index 100% rename from pmd/src/test/java/net/sourceforge/pmd/renderers/RenderersTests.java rename to pmd-core/src/test/java/net/sourceforge/pmd/renderers/RenderersTests.java diff --git a/pmd/src/test/java/net/sourceforge/pmd/renderers/SummaryHTMLRendererTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/renderers/SummaryHTMLRendererTest.java similarity index 100% rename from pmd/src/test/java/net/sourceforge/pmd/renderers/SummaryHTMLRendererTest.java rename to pmd-core/src/test/java/net/sourceforge/pmd/renderers/SummaryHTMLRendererTest.java diff --git a/pmd/src/test/java/net/sourceforge/pmd/renderers/TextPadRendererTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/renderers/TextPadRendererTest.java similarity index 100% rename from pmd/src/test/java/net/sourceforge/pmd/renderers/TextPadRendererTest.java rename to pmd-core/src/test/java/net/sourceforge/pmd/renderers/TextPadRendererTest.java diff --git a/pmd/src/test/java/net/sourceforge/pmd/renderers/TextRendererTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/renderers/TextRendererTest.java similarity index 100% rename from pmd/src/test/java/net/sourceforge/pmd/renderers/TextRendererTest.java rename to pmd-core/src/test/java/net/sourceforge/pmd/renderers/TextRendererTest.java diff --git a/pmd/src/test/java/net/sourceforge/pmd/renderers/VBHTMLRendererTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/renderers/VBHTMLRendererTest.java similarity index 100% rename from pmd/src/test/java/net/sourceforge/pmd/renderers/VBHTMLRendererTest.java rename to pmd-core/src/test/java/net/sourceforge/pmd/renderers/VBHTMLRendererTest.java diff --git a/pmd/src/test/java/net/sourceforge/pmd/renderers/XMLRendererTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/renderers/XMLRendererTest.java similarity index 100% rename from pmd/src/test/java/net/sourceforge/pmd/renderers/XMLRendererTest.java rename to pmd-core/src/test/java/net/sourceforge/pmd/renderers/XMLRendererTest.java diff --git a/pmd/src/test/java/net/sourceforge/pmd/renderers/XSLTRendererTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/renderers/XSLTRendererTest.java similarity index 100% rename from pmd/src/test/java/net/sourceforge/pmd/renderers/XSLTRendererTest.java rename to pmd-core/src/test/java/net/sourceforge/pmd/renderers/XSLTRendererTest.java diff --git a/pmd/src/test/java/net/sourceforge/pmd/renderers/YAHTMLRendererTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/renderers/YAHTMLRendererTest.java similarity index 100% rename from pmd/src/test/java/net/sourceforge/pmd/renderers/YAHTMLRendererTest.java rename to pmd-core/src/test/java/net/sourceforge/pmd/renderers/YAHTMLRendererTest.java diff --git a/pmd/src/test/java/net/sourceforge/pmd/stat/MetricTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/stat/MetricTest.java similarity index 100% rename from pmd/src/test/java/net/sourceforge/pmd/stat/MetricTest.java rename to pmd-core/src/test/java/net/sourceforge/pmd/stat/MetricTest.java diff --git a/pmd/src/test/java/net/sourceforge/pmd/stat/MockStatisticalRule.java b/pmd-core/src/test/java/net/sourceforge/pmd/stat/MockStatisticalRule.java similarity index 100% rename from pmd/src/test/java/net/sourceforge/pmd/stat/MockStatisticalRule.java rename to pmd-core/src/test/java/net/sourceforge/pmd/stat/MockStatisticalRule.java diff --git a/pmd/src/test/java/net/sourceforge/pmd/stat/StatTests.java b/pmd-core/src/test/java/net/sourceforge/pmd/stat/StatTests.java similarity index 100% rename from pmd/src/test/java/net/sourceforge/pmd/stat/StatTests.java rename to pmd-core/src/test/java/net/sourceforge/pmd/stat/StatTests.java diff --git a/pmd/src/test/java/net/sourceforge/pmd/stat/StatisticalRuleTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/stat/StatisticalRuleTest.java similarity index 100% rename from pmd/src/test/java/net/sourceforge/pmd/stat/StatisticalRuleTest.java rename to pmd-core/src/test/java/net/sourceforge/pmd/stat/StatisticalRuleTest.java diff --git a/pmd/src/test/java/net/sourceforge/pmd/util/CompoundListTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/util/CompoundListTest.java similarity index 100% rename from pmd/src/test/java/net/sourceforge/pmd/util/CompoundListTest.java rename to pmd-core/src/test/java/net/sourceforge/pmd/util/CompoundListTest.java diff --git a/pmd/src/test/java/net/sourceforge/pmd/util/DateTimeUtilTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/util/DateTimeUtilTest.java similarity index 100% rename from pmd/src/test/java/net/sourceforge/pmd/util/DateTimeUtilTest.java rename to pmd-core/src/test/java/net/sourceforge/pmd/util/DateTimeUtilTest.java diff --git a/pmd/src/test/java/net/sourceforge/pmd/util/StringUtilTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/util/StringUtilTest.java similarity index 100% rename from pmd/src/test/java/net/sourceforge/pmd/util/StringUtilTest.java rename to pmd-core/src/test/java/net/sourceforge/pmd/util/StringUtilTest.java diff --git a/pmd/src/test/java/net/sourceforge/pmd/util/TypeMapTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/util/TypeMapTest.java similarity index 100% rename from pmd/src/test/java/net/sourceforge/pmd/util/TypeMapTest.java rename to pmd-core/src/test/java/net/sourceforge/pmd/util/TypeMapTest.java diff --git a/pmd/src/test/java/net/sourceforge/pmd/util/database/DBMSMetadataTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/util/database/DBMSMetadataTest.java similarity index 100% rename from pmd/src/test/java/net/sourceforge/pmd/util/database/DBMSMetadataTest.java rename to pmd-core/src/test/java/net/sourceforge/pmd/util/database/DBMSMetadataTest.java diff --git a/pmd/src/test/java/net/sourceforge/pmd/util/database/DBTypeTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/util/database/DBTypeTest.java similarity index 100% rename from pmd/src/test/java/net/sourceforge/pmd/util/database/DBTypeTest.java rename to pmd-core/src/test/java/net/sourceforge/pmd/util/database/DBTypeTest.java diff --git a/pmd/src/test/java/net/sourceforge/pmd/util/database/DBURITest.java b/pmd-core/src/test/java/net/sourceforge/pmd/util/database/DBURITest.java similarity index 100% rename from pmd/src/test/java/net/sourceforge/pmd/util/database/DBURITest.java rename to pmd-core/src/test/java/net/sourceforge/pmd/util/database/DBURITest.java diff --git a/pmd/src/test/java/net/sourceforge/pmd/util/database/ResourceLoaderTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/util/database/ResourceLoaderTest.java similarity index 100% rename from pmd/src/test/java/net/sourceforge/pmd/util/database/ResourceLoaderTest.java rename to pmd-core/src/test/java/net/sourceforge/pmd/util/database/ResourceLoaderTest.java diff --git a/pmd/src/test/java/net/sourceforge/pmd/util/database/ResourceResolverTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/util/database/ResourceResolverTest.java similarity index 100% rename from pmd/src/test/java/net/sourceforge/pmd/util/database/ResourceResolverTest.java rename to pmd-core/src/test/java/net/sourceforge/pmd/util/database/ResourceResolverTest.java diff --git a/pmd/src/test/java/net/sourceforge/pmd/util/designer/DesignerTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/util/designer/DesignerTest.java similarity index 100% rename from pmd/src/test/java/net/sourceforge/pmd/util/designer/DesignerTest.java rename to pmd-core/src/test/java/net/sourceforge/pmd/util/designer/DesignerTest.java diff --git a/pmd/src/test/java/net/sourceforge/pmd/util/filter/RegexStringFilterTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/util/filter/RegexStringFilterTest.java similarity index 100% rename from pmd/src/test/java/net/sourceforge/pmd/util/filter/RegexStringFilterTest.java rename to pmd-core/src/test/java/net/sourceforge/pmd/util/filter/RegexStringFilterTest.java diff --git a/pmd/src/test/resources/META-INF/services/net.sourceforge.pmd.lang.Language b/pmd-core/src/test/resources/META-INF/services/net.sourceforge.pmd.lang.Language similarity index 100% rename from pmd/src/test/resources/META-INF/services/net.sourceforge.pmd.lang.Language rename to pmd-core/src/test/resources/META-INF/services/net.sourceforge.pmd.lang.Language diff --git a/pmd/src/test/resources/net/sourceforge/pmd/TestRuleset1.xml b/pmd-core/src/test/resources/net/sourceforge/pmd/TestRuleset1.xml similarity index 100% rename from pmd/src/test/resources/net/sourceforge/pmd/TestRuleset1.xml rename to pmd-core/src/test/resources/net/sourceforge/pmd/TestRuleset1.xml diff --git a/pmd/src/test/resources/net/sourceforge/pmd/TestRuleset2.xml b/pmd-core/src/test/resources/net/sourceforge/pmd/TestRuleset2.xml similarity index 100% rename from pmd/src/test/resources/net/sourceforge/pmd/TestRuleset2.xml rename to pmd-core/src/test/resources/net/sourceforge/pmd/TestRuleset2.xml diff --git a/pmd/src/test/resources/net/sourceforge/pmd/TestRuleset3.xml b/pmd-core/src/test/resources/net/sourceforge/pmd/TestRuleset3.xml similarity index 100% rename from pmd/src/test/resources/net/sourceforge/pmd/TestRuleset3.xml rename to pmd-core/src/test/resources/net/sourceforge/pmd/TestRuleset3.xml diff --git a/pmd/src/test/resources/net/sourceforge/pmd/TestRuleset4.xml b/pmd-core/src/test/resources/net/sourceforge/pmd/TestRuleset4.xml similarity index 100% rename from pmd/src/test/resources/net/sourceforge/pmd/TestRuleset4.xml rename to pmd-core/src/test/resources/net/sourceforge/pmd/TestRuleset4.xml diff --git a/pmd/src/test/resources/net/sourceforge/pmd/ant/xml/cpdtasktest.xml b/pmd-core/src/test/resources/net/sourceforge/pmd/ant/xml/cpdtasktest.xml similarity index 100% rename from pmd/src/test/resources/net/sourceforge/pmd/ant/xml/cpdtasktest.xml rename to pmd-core/src/test/resources/net/sourceforge/pmd/ant/xml/cpdtasktest.xml diff --git a/pmd/src/test/resources/net/sourceforge/pmd/ant/xml/pmdtasktest.xml b/pmd-core/src/test/resources/net/sourceforge/pmd/ant/xml/pmdtasktest.xml similarity index 100% rename from pmd/src/test/resources/net/sourceforge/pmd/ant/xml/pmdtasktest.xml rename to pmd-core/src/test/resources/net/sourceforge/pmd/ant/xml/pmdtasktest.xml diff --git a/pmd/src/test/resources/net/sourceforge/pmd/cpd/files/real-file.txt b/pmd-core/src/test/resources/net/sourceforge/pmd/cpd/files/real-file.txt similarity index 100% rename from pmd/src/test/resources/net/sourceforge/pmd/cpd/files/real-file.txt rename to pmd-core/src/test/resources/net/sourceforge/pmd/cpd/files/real-file.txt diff --git a/pmd/src/test/resources/net/sourceforge/pmd/external-reference-ruleset.xml b/pmd-core/src/test/resources/net/sourceforge/pmd/external-reference-ruleset.xml similarity index 100% rename from pmd/src/test/resources/net/sourceforge/pmd/external-reference-ruleset.xml rename to pmd-core/src/test/resources/net/sourceforge/pmd/external-reference-ruleset.xml diff --git a/pmd/src/test/resources/net/sourceforge/pmd/rulesets/foo-project/foo-rules b/pmd-core/src/test/resources/net/sourceforge/pmd/rulesets/foo-project/foo-rules similarity index 100% rename from pmd/src/test/resources/net/sourceforge/pmd/rulesets/foo-project/foo-rules rename to pmd-core/src/test/resources/net/sourceforge/pmd/rulesets/foo-project/foo-rules diff --git a/pmd/src/test/resources/net/sourceforge/pmd/rulesets/reference-ruleset.xml b/pmd-core/src/test/resources/net/sourceforge/pmd/rulesets/reference-ruleset.xml similarity index 100% rename from pmd/src/test/resources/net/sourceforge/pmd/rulesets/reference-ruleset.xml rename to pmd-core/src/test/resources/net/sourceforge/pmd/rulesets/reference-ruleset.xml diff --git a/pmd/src/test/resources/net/sourceforge/pmd/util/database/DBType/include.properties b/pmd-core/src/test/resources/net/sourceforge/pmd/util/database/DBType/include.properties similarity index 100% rename from pmd/src/test/resources/net/sourceforge/pmd/util/database/DBType/include.properties rename to pmd-core/src/test/resources/net/sourceforge/pmd/util/database/DBType/include.properties diff --git a/pmd/src/test/resources/net/sourceforge/pmd/util/database/DBType/test.properties b/pmd-core/src/test/resources/net/sourceforge/pmd/util/database/DBType/test.properties similarity index 100% rename from pmd/src/test/resources/net/sourceforge/pmd/util/database/DBType/test.properties rename to pmd-core/src/test/resources/net/sourceforge/pmd/util/database/DBType/test.properties diff --git a/pmd/src/test/resources/net/sourceforge/pmd/util/database/DBType/testdefault.properties b/pmd-core/src/test/resources/net/sourceforge/pmd/util/database/DBType/testdefault.properties similarity index 100% rename from pmd/src/test/resources/net/sourceforge/pmd/util/database/DBType/testdefault.properties rename to pmd-core/src/test/resources/net/sourceforge/pmd/util/database/DBType/testdefault.properties diff --git a/pmd/src/test/resources/net/sourceforge/pmd/xml/j2ee.xml b/pmd-core/src/test/resources/net/sourceforge/pmd/xml/j2ee.xml similarity index 100% rename from pmd/src/test/resources/net/sourceforge/pmd/xml/j2ee.xml rename to pmd-core/src/test/resources/net/sourceforge/pmd/xml/j2ee.xml diff --git a/pmd/src/test/resources/rulesets/dummy/basic.xml b/pmd-core/src/test/resources/rulesets/dummy/basic.xml similarity index 100% rename from pmd/src/test/resources/rulesets/dummy/basic.xml rename to pmd-core/src/test/resources/rulesets/dummy/basic.xml diff --git a/pmd/src/test/resources/rulesets/dummy/unusedcode.xml b/pmd-core/src/test/resources/rulesets/dummy/unusedcode.xml similarity index 100% rename from pmd/src/test/resources/rulesets/dummy/unusedcode.xml rename to pmd-core/src/test/resources/rulesets/dummy/unusedcode.xml diff --git a/pmd/src/test/resources/rulesets/dummy2/basic.xml b/pmd-core/src/test/resources/rulesets/dummy2/basic.xml similarity index 100% rename from pmd/src/test/resources/rulesets/dummy2/basic.xml rename to pmd-core/src/test/resources/rulesets/dummy2/basic.xml diff --git a/pmd-cpp/pom.xml b/pmd-cpp/pom.xml index a9fec4a315..d6db77c536 100644 --- a/pmd-cpp/pom.xml +++ b/pmd-cpp/pom.xml @@ -6,12 +6,12 @@ net.sourceforge.pmd - pmd-aggregate + pmd 5.1.4-SNAPSHOT - ${basedir}/../pmd + ${basedir}/../pmd-core @@ -79,7 +79,7 @@ net.sourceforge.pmd - pmd + pmd-core ${project.version} diff --git a/pmd-dist/pom.xml b/pmd-dist/pom.xml index 637e52cc36..4a232903ef 100644 --- a/pmd-dist/pom.xml +++ b/pmd-dist/pom.xml @@ -7,12 +7,12 @@ net.sourceforge.pmd - pmd-aggregate + pmd 5.1.4-SNAPSHOT - ${basedir}/../pmd + ${basedir}/../pmd-core @@ -60,7 +60,7 @@ net.sourceforge.pmd - pmd + pmd-core ${project.version} diff --git a/pmd-fortran/pom.xml b/pmd-fortran/pom.xml index 5e2e298953..1a43a9459a 100644 --- a/pmd-fortran/pom.xml +++ b/pmd-fortran/pom.xml @@ -6,12 +6,12 @@ net.sourceforge.pmd - pmd-aggregate + pmd 5.1.4-SNAPSHOT - ${basedir}/../pmd + ${basedir}/../pmd-core @@ -30,7 +30,7 @@ net.sourceforge.pmd - pmd + pmd-core ${project.version} diff --git a/pmd-java/pom.xml b/pmd-java/pom.xml index 50d1529b36..fa42816779 100644 --- a/pmd-java/pom.xml +++ b/pmd-java/pom.xml @@ -6,12 +6,12 @@ net.sourceforge.pmd - pmd-aggregate + pmd 5.1.4-SNAPSHOT - ${basedir}/../pmd + ${basedir}/../pmd-core @@ -107,7 +107,7 @@ net.sourceforge.pmd - pmd + pmd-core ${project.version} diff --git a/pmd-javascript/pom.xml b/pmd-javascript/pom.xml index 525b91d29f..d0b3c3a36b 100644 --- a/pmd-javascript/pom.xml +++ b/pmd-javascript/pom.xml @@ -6,12 +6,12 @@ net.sourceforge.pmd - pmd-aggregate + pmd 5.1.4-SNAPSHOT - ${basedir}/../pmd + ${basedir}/../pmd-core @@ -55,7 +55,7 @@ net.sourceforge.pmd - pmd + pmd-core ${project.version} diff --git a/pmd-jsp/pom.xml b/pmd-jsp/pom.xml index 0381f54597..f5d69d7274 100644 --- a/pmd-jsp/pom.xml +++ b/pmd-jsp/pom.xml @@ -6,12 +6,12 @@ net.sourceforge.pmd - pmd-aggregate + pmd 5.1.4-SNAPSHOT - ${basedir}/../pmd + ${basedir}/../pmd-core @@ -96,7 +96,7 @@ net.sourceforge.pmd - pmd + pmd-core ${project.version} diff --git a/pmd-php/pom.xml b/pmd-php/pom.xml index ec0775fc8d..02746eb79a 100644 --- a/pmd-php/pom.xml +++ b/pmd-php/pom.xml @@ -6,12 +6,12 @@ net.sourceforge.pmd - pmd-aggregate + pmd 5.1.4-SNAPSHOT - ${basedir}/../pmd + ${basedir}/../pmd-core @@ -30,7 +30,7 @@ net.sourceforge.pmd - pmd + pmd-core ${project.version} diff --git a/pmd-plsql/pom.xml b/pmd-plsql/pom.xml index 88916ca35a..b101f661f6 100644 --- a/pmd-plsql/pom.xml +++ b/pmd-plsql/pom.xml @@ -6,12 +6,12 @@ net.sourceforge.pmd - pmd-aggregate + pmd 5.1.4-SNAPSHOT - ${basedir}/../pmd + ${basedir}/../pmd-core @@ -96,7 +96,7 @@ net.sourceforge.pmd - pmd + pmd-core ${project.version} diff --git a/pmd-ruby/pom.xml b/pmd-ruby/pom.xml index 0100d77666..39da97b7eb 100644 --- a/pmd-ruby/pom.xml +++ b/pmd-ruby/pom.xml @@ -6,18 +6,18 @@ net.sourceforge.pmd - pmd-aggregate + pmd 5.1.4-SNAPSHOT - ${basedir}/../pmd + ${basedir}/../pmd-core net.sourceforge.pmd - pmd + pmd-core ${project.version} diff --git a/pmd-test/pom.xml b/pmd-test/pom.xml index c2b6eac391..07b6a9b107 100644 --- a/pmd-test/pom.xml +++ b/pmd-test/pom.xml @@ -6,18 +6,18 @@ net.sourceforge.pmd - pmd-aggregate + pmd 5.1.4-SNAPSHOT - ${basedir}/../pmd + ${basedir}/../pmd-core net.sourceforge.pmd - pmd + pmd-core ${project.version} diff --git a/pmd-vm/pom.xml b/pmd-vm/pom.xml index 5d86749348..d5b488266b 100644 --- a/pmd-vm/pom.xml +++ b/pmd-vm/pom.xml @@ -6,12 +6,12 @@ net.sourceforge.pmd - pmd-aggregate + pmd 5.1.4-SNAPSHOT - ${basedir}/../pmd + ${basedir}/../pmd-core @@ -96,7 +96,7 @@ net.sourceforge.pmd - pmd + pmd-core ${project.version} diff --git a/pmd-xml/pom.xml b/pmd-xml/pom.xml index 60c299f820..891d97a7b7 100644 --- a/pmd-xml/pom.xml +++ b/pmd-xml/pom.xml @@ -6,12 +6,12 @@ net.sourceforge.pmd - pmd-aggregate + pmd 5.1.4-SNAPSHOT - ${basedir}/../pmd + ${basedir}/../pmd-core @@ -55,7 +55,7 @@ net.sourceforge.pmd - pmd + pmd-core ${project.version} diff --git a/pom.xml b/pom.xml index 8c877e5bfd..05b81fa2ee 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 net.sourceforge.pmd - pmd-aggregate + pmd 5.1.4-SNAPSHOT pom PMD @@ -835,7 +835,7 @@ - pmd + pmd-core pmd-cpp pmd-dist pmd-fortran