From 6335a9bfa14820461f2f3a2b88879fbb575b4347 Mon Sep 17 00:00:00 2001 From: Richard Eckart de Castilho Date: Mon, 29 Apr 2019 12:23:15 +0200 Subject: [PATCH] #186 - Change artifactId to "dkpro-core-XXX" - Fixed package name constants in test code and data files --- .../core/api/datasets/DatasetFactoryTest.java | 2 +- .../io/FileSetCollectionReaderBaseTest.java | 4 +-- .../io/ResourceCollectionReaderBaseTest.java | 29 +++++++++---------- .../core/api/resources/ResourceUtilsTest.java | 2 +- .../syntax/tagset/bg-default-constituency.map | 2 +- .../api/syntax/tagset/de-default-chunk.map | 2 +- .../syntax/tagset/de-default-constituency.map | 2 +- .../syntax/tagset/de-default-dependency.map | 2 +- .../api/syntax/tagset/en-default-chunk.map | 2 +- .../syntax/tagset/en-default-constituency.map | 2 +- .../syntax/tagset/en-default-dependency.map | 2 +- .../syntax/tagset/fr-default-constituency.map | 2 +- .../syntax/tagset/zh-default-dependency.map | 2 +- .../org/dkpro/core/tokit/TokenMerger.java | 1 + 14 files changed, 28 insertions(+), 28 deletions(-) diff --git a/dkpro-core-api-datasets-asl/src/test/java/org/dkpro/core/api/datasets/DatasetFactoryTest.java b/dkpro-core-api-datasets-asl/src/test/java/org/dkpro/core/api/datasets/DatasetFactoryTest.java index 038cfb82dd..846d514c37 100644 --- a/dkpro-core-api-datasets-asl/src/test/java/org/dkpro/core/api/datasets/DatasetFactoryTest.java +++ b/dkpro-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/dkpro-core-api-io-asl/src/test/java/org/dkpro/core/api/io/FileSetCollectionReaderBaseTest.java b/dkpro-core-api-io-asl/src/test/java/org/dkpro/core/api/io/FileSetCollectionReaderBaseTest.java index 223289c5f9..c7eaa41fb7 100644 --- a/dkpro-core-api-io-asl/src/test/java/org/dkpro/core/api/io/FileSetCollectionReaderBaseTest.java +++ b/dkpro-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/dkpro-core-api-io-asl/src/test/java/org/dkpro/core/api/io/ResourceCollectionReaderBaseTest.java b/dkpro-core-api-io-asl/src/test/java/org/dkpro/core/api/io/ResourceCollectionReaderBaseTest.java index ec539e7377..32712cb223 100644 --- a/dkpro-core-api-io-asl/src/test/java/org/dkpro/core/api/io/ResourceCollectionReaderBaseTest.java +++ b/dkpro-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/dkpro-core-api-resources-asl/src/test/java/org/dkpro/core/api/resources/ResourceUtilsTest.java b/dkpro-core-api-resources-asl/src/test/java/org/dkpro/core/api/resources/ResourceUtilsTest.java index 376e6306c8..60efa7aab9 100644 --- a/dkpro-core-api-resources-asl/src/test/java/org/dkpro/core/api/resources/ResourceUtilsTest.java +++ b/dkpro-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 paths = new ArrayList(); for (File f : FileUtils.listFiles(file, null, true)) { diff --git a/dkpro-core-api-syntax-asl/src/main/resources/org/dkpro/core/api/syntax/tagset/bg-default-constituency.map b/dkpro-core-api-syntax-asl/src/main/resources/org/dkpro/core/api/syntax/tagset/bg-default-constituency.map index 7b2f597232..a87e29984a 100644 --- a/dkpro-core-api-syntax-asl/src/main/resources/org/dkpro/core/api/syntax/tagset/bg-default-constituency.map +++ b/dkpro-core-api-syntax-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/dkpro-core-api-syntax-asl/src/main/resources/org/dkpro/core/api/syntax/tagset/de-default-chunk.map b/dkpro-core-api-syntax-asl/src/main/resources/org/dkpro/core/api/syntax/tagset/de-default-chunk.map index c081982f0a..d88e69cfde 100644 --- a/dkpro-core-api-syntax-asl/src/main/resources/org/dkpro/core/api/syntax/tagset/de-default-chunk.map +++ b/dkpro-core-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/dkpro-core-api-syntax-asl/src/main/resources/org/dkpro/core/api/syntax/tagset/de-default-constituency.map b/dkpro-core-api-syntax-asl/src/main/resources/org/dkpro/core/api/syntax/tagset/de-default-constituency.map index abb4a0066a..6454db41ea 100644 --- a/dkpro-core-api-syntax-asl/src/main/resources/org/dkpro/core/api/syntax/tagset/de-default-constituency.map +++ b/dkpro-core-api-syntax-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/dkpro-core-api-syntax-asl/src/main/resources/org/dkpro/core/api/syntax/tagset/de-default-dependency.map b/dkpro-core-api-syntax-asl/src/main/resources/org/dkpro/core/api/syntax/tagset/de-default-dependency.map index dbff1d1612..4e84e777ea 100644 --- a/dkpro-core-api-syntax-asl/src/main/resources/org/dkpro/core/api/syntax/tagset/de-default-dependency.map +++ b/dkpro-core-api-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/dkpro-core-api-syntax-asl/src/main/resources/org/dkpro/core/api/syntax/tagset/en-default-chunk.map b/dkpro-core-api-syntax-asl/src/main/resources/org/dkpro/core/api/syntax/tagset/en-default-chunk.map index d8b301ca6f..9c1b0ea0b2 100644 --- a/dkpro-core-api-syntax-asl/src/main/resources/org/dkpro/core/api/syntax/tagset/en-default-chunk.map +++ b/dkpro-core-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/dkpro-core-api-syntax-asl/src/main/resources/org/dkpro/core/api/syntax/tagset/en-default-constituency.map b/dkpro-core-api-syntax-asl/src/main/resources/org/dkpro/core/api/syntax/tagset/en-default-constituency.map index 345be6461d..ed3c48b373 100644 --- a/dkpro-core-api-syntax-asl/src/main/resources/org/dkpro/core/api/syntax/tagset/en-default-constituency.map +++ b/dkpro-core-api-syntax-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/dkpro-core-api-syntax-asl/src/main/resources/org/dkpro/core/api/syntax/tagset/en-default-dependency.map b/dkpro-core-api-syntax-asl/src/main/resources/org/dkpro/core/api/syntax/tagset/en-default-dependency.map index be96448314..2f1d9b4041 100644 --- a/dkpro-core-api-syntax-asl/src/main/resources/org/dkpro/core/api/syntax/tagset/en-default-dependency.map +++ b/dkpro-core-api-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/dkpro-core-api-syntax-asl/src/main/resources/org/dkpro/core/api/syntax/tagset/fr-default-constituency.map b/dkpro-core-api-syntax-asl/src/main/resources/org/dkpro/core/api/syntax/tagset/fr-default-constituency.map index 0912421c71..1c73a85e1c 100644 --- a/dkpro-core-api-syntax-asl/src/main/resources/org/dkpro/core/api/syntax/tagset/fr-default-constituency.map +++ b/dkpro-core-api-syntax-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/dkpro-core-api-syntax-asl/src/main/resources/org/dkpro/core/api/syntax/tagset/zh-default-dependency.map b/dkpro-core-api-syntax-asl/src/main/resources/org/dkpro/core/api/syntax/tagset/zh-default-dependency.map index 1d614eedca..6c7e277fb8 100644 --- a/dkpro-core-api-syntax-asl/src/main/resources/org/dkpro/core/api/syntax/tagset/zh-default-dependency.map +++ b/dkpro-core-api-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 index ef1e3884d8..8ada9f27e1 100644 --- 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;