#186 - Change artifactId to "dkpro-core-XXX"

- Fixed package name constants in test code and data files
dkpro · Apr 29, 2019 · 6335a9b · 6335a9b
1 parent b29ddc8
commit 6335a9b
Show file tree

Hide file tree

Showing 14 changed files with 28 additions and 28 deletions.
diff --git a/...o-core-api-datasets-asl/src/test/java/org/dkpro/core/api/datasets/DatasetFactoryTest.java b/...o-core-api-datasets-asl/src/test/java/org/dkpro/core/api/datasets/DatasetFactoryTest.java
@@ -67,7 +67,7 @@ public void testLoadAll()
         }
     }
 
-    //@Ignore("Used at times for offline testing / development")
+    @Ignore("Used at times for offline testing / development")
     @Test
     public void testShared()
         throws Exception

diff --git a/...-core-api-io-asl/src/test/java/org/dkpro/core/api/io/FileSetCollectionReaderBaseTest.java b/...-core-api-io-asl/src/test/java/org/dkpro/core/api/io/FileSetCollectionReaderBaseTest.java
@@ -41,7 +41,7 @@ public void testBaseUri()
     {
         CollectionReader reader = createReader(DummyReader.class,
                 createTypeSystemDescription(), FileSetCollectionReaderBase.PARAM_SOURCE_LOCATION,
-                "src/main/java/de/tudarmstadt/ukp/", FileSetCollectionReaderBase.PARAM_PATTERNS,
+                "src/main/java/org/", FileSetCollectionReaderBase.PARAM_PATTERNS,
                 new String[] { "[+]**/*.java" });
 
         checkBaseUri(reader);
@@ -56,7 +56,7 @@ public void checkBaseUri(CollectionReader aReader)
 
             DocumentMetaData meta = DocumentMetaData.get(cas);
             String baseUri = meta.getDocumentBaseUri();
-            assertTrue(baseUri.endsWith("src/main/java/de/tudarmstadt/ukp/"));
+            assertTrue(baseUri.endsWith("src/main/java/org/"));
 
             cas.reset();
         }

diff --git a/...core-api-io-asl/src/test/java/org/dkpro/core/api/io/ResourceCollectionReaderBaseTest.java b/...core-api-io-asl/src/test/java/org/dkpro/core/api/io/ResourceCollectionReaderBaseTest.java
@@ -20,6 +20,8 @@
 
 import static org.apache.uima.fit.factory.CollectionReaderFactory.createReader;
 import static org.apache.uima.fit.factory.ExternalResourceFactory.createExternalResourceDescription;
+import static org.dkpro.core.api.io.ResourceCollectionReaderBase.PARAM_PATTERNS;
+import static org.dkpro.core.api.io.ResourceCollectionReaderBase.PARAM_SOURCE_LOCATION;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
@@ -56,7 +58,7 @@ public void testClasspath()
     {
         CollectionReader reader = createReader(DummyReader.class,
                 ResourceCollectionReaderBase.PARAM_SOURCE_LOCATION,
-                "classpath*:/de/tudarmstadt/ukp/", ResourceCollectionReaderBase.PARAM_PATTERNS,
+                "classpath*:/org/", ResourceCollectionReaderBase.PARAM_PATTERNS,
                 new String[] { "[+]**/FileSetCollectionReaderBase.class",
                         "[-]**/ResourceCollectionReaderBase.class" });
 
@@ -153,7 +155,7 @@ public void testFile()
     {
         CollectionReader reader = createReader(DummyReader.class,
                 ResourceCollectionReaderBase.PARAM_SOURCE_LOCATION,
-                "file:src/main/java/de/tudarmstadt/ukp/",
+                "file:src/main/java/org/",
                 ResourceCollectionReaderBase.PARAM_PATTERNS, new String[] {
                         "[+]**/FileSetCollectionReaderBase.java",
                         "[-]**/ResourceCollectionReaderBase.java" });
@@ -167,7 +169,7 @@ public void testFileNoPrefix()
     {
         CollectionReader reader = createReader(DummyReader.class,
                 ResourceCollectionReaderBase.PARAM_SOURCE_LOCATION,
-                "file:src/main/java/de/tudarmstadt/ukp/",
+                "file:src/main/java/org/",
                 ResourceCollectionReaderBase.PARAM_PATTERNS, new String[] {
                         "**/FileSetCollectionReaderBase.java",
                         "[-]**/ResourceCollectionReaderBase.java" });
@@ -181,7 +183,7 @@ public void testFileNoPattern1()
     {
         CollectionReader reader = createReader(DummyReader.class,
                 ResourceCollectionReaderBase.PARAM_SOURCE_LOCATION,
-                "file:src/main/java/de/tudarmstadt/ukp/**/FileSetCollectionReaderBase.java");
+                "file:src/main/java/org/**/FileSetCollectionReaderBase.java");
 
         searchForResourceCollectionReaderBase(reader);
     }
@@ -192,7 +194,7 @@ public void testFileNoPattern2()
     {
         CollectionReader reader = createReader(DummyReader.class,
                 ResourceCollectionReaderBase.PARAM_SOURCE_LOCATION,
-                "file:src/main/java/de/tudarmstadt/ukp/dkpro/core/api/io/FileSetCollectionReaderBase.java");
+                "file:src/main/java/org/dkpro/core/api/io/FileSetCollectionReaderBase.java");
 
         searchForResourceCollectionReaderBase(reader);
     }
@@ -203,7 +205,7 @@ public void testFileNoPattern3()
     {
         CollectionReader reader = createReader(DummyReader.class,
                 ResourceCollectionReaderBase.PARAM_SOURCE_LOCATION,
-                "s*/main/java/de/tudarmstadt/ukp/dkpro/core/api/io/FileSetCollectionReaderBase.java");
+                "s*/main/java/org/dkpro/core/api/io/FileSetCollectionReaderBase.java");
 
         searchForResourceCollectionReaderBase(reader);
     }
@@ -213,8 +215,8 @@ public void testFileNoPattern4()
         throws Exception
     {
         CollectionReader reader = createReader(DummyReader.class,
-                ResourceCollectionReaderBase.PARAM_SOURCE_LOCATION,
-                "file:s*/main/java/de/tudarmstadt/ukp/dkpro/core/api/io/FileSetCollectionReaderBase.java");
+                PARAM_SOURCE_LOCATION,
+                "file:s*/main/java/org/dkpro/core/api/io/FileSetCollectionReaderBase.java");
 
         searchForResourceCollectionReaderBase(reader);
     }
@@ -224,8 +226,7 @@ public void testFileNoSource()
         throws Exception
     {
         CollectionReader reader = createReader(DummyReader.class,
-                ResourceCollectionReaderBase.PARAM_PATTERNS,
-                "src/main/java/de/tudarmstadt/ukp/**/FileSetCollectionReaderBase.java");
+                PARAM_PATTERNS, "src/main/java/org/**/FileSetCollectionReaderBase.java");
 
         searchForResourceCollectionReaderBase(reader);
     }
@@ -235,10 +236,8 @@ public void testBrokenPattern()
         throws Exception
     {
         CollectionReader reader = createReader(DummyReader.class,
-                ResourceCollectionReaderBase.PARAM_SOURCE_LOCATION,
-                "file:src/main/java/de/tudarmstadt/ukp/",
-                ResourceCollectionReaderBase.PARAM_PATTERNS,
-                new String[] { "[?]**/FileSetCollectionReaderBase.java" });
+                PARAM_SOURCE_LOCATION, "file:src/main/java/org/",
+                PARAM_PATTERNS, new String[] { "[?]**/FileSetCollectionReaderBase.java" });
 
         searchForResourceCollectionReaderBase(reader);
     }
@@ -251,7 +250,7 @@ public void testExternalLoaderLocator()
                 ResourceLoaderLocator.class);
         CollectionReader reader = createReader(DummyReader.class,
                 ResourceCollectionReaderBase.PARAM_SOURCE_LOCATION,
-                "file:src/main/java/de/tudarmstadt/ukp/",
+                "file:src/main/java/org/",
                 ResourceCollectionReaderBase.PARAM_PATTERNS, new String[] {
                         "[+]**/FileSetCollectionReaderBase.java",
                         "[-]**/ResourceCollectionReaderBase.java" },

diff --git a/...-core-api-resources-asl/src/test/java/org/dkpro/core/api/resources/ResourceUtilsTest.java b/...-core-api-resources-asl/src/test/java/org/dkpro/core/api/resources/ResourceUtilsTest.java
@@ -61,7 +61,7 @@ public void testClasspathAsFolder()
         throws Exception
     {
         File file = ResourceUtils
-                .getClasspathAsFolder("classpath:/de/tudarmstadt/ukp/dkpro/core/api", true);
+                .getClasspathAsFolder("classpath:/org/dkpro/core/api", true);
 
         List<Path> paths = new ArrayList<Path>();
         for (File f : FileUtils.listFiles(file, null, true)) {

diff --git a/...yntax-asl/src/main/resources/org/dkpro/core/api/syntax/tagset/bg-default-constituency.map b/...yntax-asl/src/main/resources/org/dkpro/core/api/syntax/tagset/bg-default-constituency.map
@@ -1,2 +1,2 @@
-__META_REDIRECT__=classpath:/de/tudarmstadt/ukp/dkpro/core/api/syntax/tagset/bg-btb-constituency.map
+__META_REDIRECT__=classpath:/org/dkpro/core/api/syntax/tagset/bg-btb-constituency.map
 __META_OVERRIDE__.chunk.tagset=btb
diff --git a/...e-api-syntax-asl/src/main/resources/org/dkpro/core/api/syntax/tagset/de-default-chunk.map b/...e-api-syntax-asl/src/main/resources/org/dkpro/core/api/syntax/tagset/de-default-chunk.map
@@ -1,2 +1,2 @@
-__META_REDIRECT__=classpath:/de/tudarmstadt/ukp/dkpro/core/api/syntax/tagset/de-tt-chunk.map
+__META_REDIRECT__=classpath:/org/dkpro/core/api/syntax/tagset/de-tt-chunk.map
 __META_OVERRIDE__.chunk.tagset=tt
diff --git a/...yntax-asl/src/main/resources/org/dkpro/core/api/syntax/tagset/de-default-constituency.map b/...yntax-asl/src/main/resources/org/dkpro/core/api/syntax/tagset/de-default-constituency.map
@@ -1,2 +1,2 @@
-__META_REDIRECT__=classpath:/de/tudarmstadt/ukp/dkpro/core/api/syntax/tagset/de-tiger-constituency.map
+__META_REDIRECT__=classpath:/org/dkpro/core/api/syntax/tagset/de-tiger-constituency.map
 __META_OVERRIDE__.chunk.tagset=negra
diff --git a/...-syntax-asl/src/main/resources/org/dkpro/core/api/syntax/tagset/de-default-dependency.map b/...-syntax-asl/src/main/resources/org/dkpro/core/api/syntax/tagset/de-default-dependency.map
@@ -1,2 +1,2 @@
-__META_REDIRECT__=classpath:/de/tudarmstadt/ukp/dkpro/core/api/syntax/tagset/de-tiger-dependency.map
+__META_REDIRECT__=classpath:/org/dkpro/core/api/syntax/tagset/de-tiger-dependency.map
 __META_OVERRIDE__.chunk.tagset=negra
diff --git a/...e-api-syntax-asl/src/main/resources/org/dkpro/core/api/syntax/tagset/en-default-chunk.map b/...e-api-syntax-asl/src/main/resources/org/dkpro/core/api/syntax/tagset/en-default-chunk.map
@@ -1,2 +1,2 @@
-__META_REDIRECT__=classpath:/de/tudarmstadt/ukp/dkpro/core/api/syntax/tagset/en-conll2000-chunk.map
+__META_REDIRECT__=classpath:/org/dkpro/core/api/syntax/tagset/en-conll2000-chunk.map
 __META_OVERRIDE__.chunk.tagset=conll2000
diff --git a/...yntax-asl/src/main/resources/org/dkpro/core/api/syntax/tagset/en-default-constituency.map b/...yntax-asl/src/main/resources/org/dkpro/core/api/syntax/tagset/en-default-constituency.map
@@ -1,2 +1,2 @@
-__META_REDIRECT__=classpath:/de/tudarmstadt/ukp/dkpro/core/api/syntax/tagset/en-ptb-constituency.map
+__META_REDIRECT__=classpath:/org/dkpro/core/api/syntax/tagset/en-ptb-constituency.map
 __META_OVERRIDE__.chunk.tagset=ptb
diff --git a/...-syntax-asl/src/main/resources/org/dkpro/core/api/syntax/tagset/en-default-dependency.map b/...-syntax-asl/src/main/resources/org/dkpro/core/api/syntax/tagset/en-default-dependency.map
@@ -1,2 +1,2 @@
-__META_REDIRECT__=classpath:/de/tudarmstadt/ukp/dkpro/core/api/syntax/tagset/en-stanford341-dependency.map
+__META_REDIRECT__=classpath:/org/dkpro/core/api/syntax/tagset/en-stanford341-dependency.map
 __META_OVERRIDE__.chunk.tagset=stanford341
diff --git a/...yntax-asl/src/main/resources/org/dkpro/core/api/syntax/tagset/fr-default-constituency.map b/...yntax-asl/src/main/resources/org/dkpro/core/api/syntax/tagset/fr-default-constituency.map
@@ -1,2 +1,2 @@
-__META_REDIRECT__=classpath:/de/tudarmstadt/ukp/dkpro/core/api/syntax/tagset/fr-ftb-constituency.map
+__META_REDIRECT__=classpath:/org/dkpro/core/api/syntax/tagset/fr-ftb-constituency.map
 __META_OVERRIDE__.chunk.tagset=ftb
diff --git a/...-syntax-asl/src/main/resources/org/dkpro/core/api/syntax/tagset/zh-default-dependency.map b/...-syntax-asl/src/main/resources/org/dkpro/core/api/syntax/tagset/zh-default-dependency.map
@@ -1,2 +1,2 @@
-__META_REDIRECT__=classpath:/de/tudarmstadt/ukp/dkpro/core/api/syntax/tagset/zh-stanford341-dependency.map
+__META_REDIRECT__=classpath:/org/dkpro/core/api/syntax/tagset/zh-stanford341-dependency.map
 __META_OVERRIDE__.chunk.tagset=stanford341
diff --git a/dkpro-core-tokit-asl/src/main/java/org/dkpro/core/tokit/TokenMerger.java b/dkpro-core-tokit-asl/src/main/java/org/dkpro/core/tokit/TokenMerger.java
@@ -45,6 +45,7 @@
 import org.apache.uima.resource.ResourceInitializationException;
 import org.dkpro.core.api.parameter.ComponentParameters;
 import org.dkpro.core.api.resources.MappingProvider;
+
 import de.tudarmstadt.ukp.dkpro.core.api.lexmorph.type.pos.POS;
 import de.tudarmstadt.ukp.dkpro.core.api.segmentation.type.Lemma;
 import de.tudarmstadt.ukp.dkpro.core.api.segmentation.type.Token;