Replaced annotation parsing with restoring the annotation tables to the
database.
Change-Id: I79b33e4634642bcff42f79d8132964afdc123024
diff --git a/full/src/test/java/de/ids_mannheim/korap/web/controller/AnnotationControllerTest.java b/full/src/test/java/de/ids_mannheim/korap/web/controller/AnnotationControllerTest.java
index 33f34f0..ae52237 100644
--- a/full/src/test/java/de/ids_mannheim/korap/web/controller/AnnotationControllerTest.java
+++ b/full/src/test/java/de/ids_mannheim/korap/web/controller/AnnotationControllerTest.java
@@ -9,7 +9,6 @@
import javax.ws.rs.core.MediaType;
import org.junit.Test;
-import org.springframework.test.context.ContextConfiguration;
import com.fasterxml.jackson.databind.JsonNode;
import com.sun.jersey.api.client.ClientResponse;
@@ -18,7 +17,6 @@
import de.ids_mannheim.korap.exceptions.KustvaktException;
import de.ids_mannheim.korap.utils.JsonUtils;
-@ContextConfiguration("classpath:test-annotation-config.xml")
public class AnnotationControllerTest extends SpringJerseyTest {
@Test
public void testAnnotationLayers () throws KustvaktException {
diff --git a/full/src/test/java/de/ids_mannheim/korap/web/controller/FreeResourceControllerTest.java b/full/src/test/java/de/ids_mannheim/korap/web/controller/FreeResourceControllerTest.java
index dbf62b2..1d9ad73 100644
--- a/full/src/test/java/de/ids_mannheim/korap/web/controller/FreeResourceControllerTest.java
+++ b/full/src/test/java/de/ids_mannheim/korap/web/controller/FreeResourceControllerTest.java
@@ -12,7 +12,7 @@
import de.ids_mannheim.korap.exceptions.KustvaktException;
import de.ids_mannheim.korap.utils.JsonUtils;
-@ContextConfiguration("classpath:test-annotation-config.xml")
+@ContextConfiguration("classpath:test-resource-config.xml")
public class FreeResourceControllerTest extends SpringJerseyTest {
@Test
@@ -22,7 +22,6 @@
String entity = response.getEntity(String.class);
JsonNode n = JsonUtils.readTree(entity).get(0);
-
assertEquals("WPD17",n.at("/resourceId").asText());
assertEquals("Deutsche Wikipedia Artikel 2017", n.at("/titles/de").asText());
assertEquals("German Wikipedia Articles 2017", n.at("/titles/en").asText());
diff --git a/full/src/test/resources/log4j2-test.properties b/full/src/test/resources/log4j2-test.properties
index 477f8a5..7606051 100644
--- a/full/src/test/resources/log4j2-test.properties
+++ b/full/src/test/resources/log4j2-test.properties
@@ -33,4 +33,11 @@
logger.console.level = fatal
logger.console.appenderRefs = stdout
logger.console.appenderRef.file.ref = STDOUT
-logger.console.additivity=false
\ No newline at end of file
+logger.console.additivity=false
+
+loggers=console
+logger.console.name=de.ids_mannheim.korap
+logger.console.level = info
+logger.console.appenderRefs = stdout
+logger.console.appenderRef.file.ref = STDOUT
+logger.console.additivity=false
diff --git a/full/src/test/resources/test-config.xml b/full/src/test/resources/test-config.xml
index d17718c..de438a1 100644
--- a/full/src/test/resources/test-config.xml
+++ b/full/src/test/resources/test-config.xml
@@ -175,7 +175,7 @@
<constructor-arg name="properties" ref="props" />
</bean>
- <bean id="initializator" class="de.ids_mannheim.de.init.InitializatorImpl"
+ <bean id="initializator" class="de.ids_mannheim.de.init.Initializator"
init-method="initTest">
</bean>
diff --git a/full/src/test/resources/test-annotation-config.xml b/full/src/test/resources/test-resource-config.xml
similarity index 96%
rename from full/src/test/resources/test-annotation-config.xml
rename to full/src/test/resources/test-resource-config.xml
index 957a45c..8b5e7d5 100644
--- a/full/src/test/resources/test-annotation-config.xml
+++ b/full/src/test/resources/test-resource-config.xml
@@ -16,8 +16,8 @@
http://www.springframework.org/schema/util/spring-util.xsd">
<import resource="classpath:test-config.xml"/>
- <bean id="initializator" class="de.ids_mannheim.de.init.InitializatorImpl"
- init-method="initAnnotationTest">
+ <bean id="initializator" class="de.ids_mannheim.de.init.Initializator"
+ init-method="initResourceTest">
</bean>
</beans>
\ No newline at end of file