Move forgotten things into language specific packages

pmd-cpp/src/main/java/net/sourceforge/pmd/lang/cpp/CppLanguageModule.java

@@ -4,10 +4,10 @@
 
 package net.sourceforge.pmd.lang.cpp;
 
-import net.sourceforge.pmd.cpd.CPPTokenizer;
 import net.sourceforge.pmd.cpd.Tokenizer;
 import net.sourceforge.pmd.lang.LanguagePropertyBundle;
 import net.sourceforge.pmd.lang.LanguageRegistry;
+import net.sourceforge.pmd.lang.cpp.cpd.CPPTokenizer;
 import net.sourceforge.pmd.lang.impl.CpdOnlyLanguageModuleBase;
 import net.sourceforge.pmd.properties.PropertyDescriptor;
 import net.sourceforge.pmd.properties.PropertyFactory;

pmd-cpp/src/main/java/net/sourceforge/pmd/lang/cpp/cpd/CPPTokenizer.java

@@ -2,12 +2,13 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.cpd;
+package net.sourceforge.pmd.lang.cpp.cpd;
 
 import java.util.regex.Pattern;
 
 import org.apache.commons.lang3.StringUtils;
 
+import net.sourceforge.pmd.cpd.Tokenizer;
 import net.sourceforge.pmd.cpd.impl.JavaCCTokenFilter;
 import net.sourceforge.pmd.cpd.impl.TokenizerBase;
 import net.sourceforge.pmd.lang.LanguagePropertyBundle;

pmd-cpp/src/main/java/net/sourceforge/pmd/lang/cpp/cpd/CppBlockSkipper.java

@@ -2,7 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.cpd;
+package net.sourceforge.pmd.lang.cpp.cpd;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;

pmd-cpp/src/main/java/net/sourceforge/pmd/lang/cpp/cpd/CppEscapeTranslator.java

@@ -2,7 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.cpd;
+package net.sourceforge.pmd.lang.cpp.cpd;
 
 import net.sourceforge.pmd.lang.ast.impl.javacc.BackslashEscapeTranslator;
 import net.sourceforge.pmd.lang.document.Chars;

pmd-cpp/src/test/java/net/sourceforge/pmd/lang/cpp/cpd/CPPTokenizerTest.java

@@ -1,14 +1,16 @@
-/**
+/*
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.cpd;
+package net.sourceforge.pmd.lang.cpp.cpd;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.junit.jupiter.api.Test;
 
+import net.sourceforge.pmd.cpd.Tokenizer;
+import net.sourceforge.pmd.cpd.Tokens;
 import net.sourceforge.pmd.cpd.test.CpdTextComparisonTest;
 import net.sourceforge.pmd.cpd.test.LanguagePropertyConfig;
 import net.sourceforge.pmd.lang.cpp.CppLanguageModule;
@@ -19,11 +21,6 @@ class CPPTokenizerTest extends CpdTextComparisonTest {
         super(CppLanguageModule.getInstance(), ".cpp");
     }
 
-    @Override
-    protected String getResourcePrefix() {
-        return "../lang/cpp/cpd/testdata";
-    }
-
     @Override
     public @NonNull LanguagePropertyConfig defaultProperties() {
         return dontSkipBlocks();

pmd-cpp/src/test/java/net/sourceforge/pmd/lang/cpp/cpd/CppCharStreamTest.java

@@ -2,7 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.cpd;
+package net.sourceforge.pmd.lang.cpp.cpd;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 

pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/PLSQLLanguageModule.java

@@ -4,10 +4,10 @@
 
 package net.sourceforge.pmd.lang.plsql;
 
-import net.sourceforge.pmd.cpd.PLSQLTokenizer;
 import net.sourceforge.pmd.cpd.Tokenizer;
 import net.sourceforge.pmd.lang.LanguagePropertyBundle;
 import net.sourceforge.pmd.lang.impl.SimpleLanguageModuleBase;
+import net.sourceforge.pmd.lang.plsql.cpd.PLSQLTokenizer;
 
 /**
  * Created by christoferdutz on 20.09.14.

pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/cpd/PLSQLTokenizer.java

@@ -2,8 +2,9 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.cpd;
+package net.sourceforge.pmd.lang.plsql.cpd;
 
+import net.sourceforge.pmd.cpd.Tokenizer;
 import net.sourceforge.pmd.cpd.impl.JavaCCTokenizer;
 import net.sourceforge.pmd.lang.LanguagePropertyBundle;
 import net.sourceforge.pmd.lang.TokenManager;

pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/cpd/PLSQLTokenizerTest.java

@@ -1,8 +1,8 @@
-/**
+/*
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.cpd;
+package net.sourceforge.pmd.lang.plsql.cpd;
 
 import org.junit.jupiter.api.Test;
 
@@ -15,12 +15,6 @@ class PLSQLTokenizerTest extends CpdTextComparisonTest {
         super(PLSQLLanguageModule.getInstance(), ".sql");
     }
 
-    @Override
-    protected String getResourcePrefix() {
-        return "../lang/plsql/cpd/testdata";
-    }
-
-
     @Test
     void testSimple() {
         doTest("sample-plsql");