Added annotation scheme in config & fixed authentication exceptions.
Change-Id: I19dd25b99f34c7aa51b2f1aea04837b2337838d8
diff --git a/full/src/test/resources/kustvakt-test.conf b/full/src/test/resources/kustvakt-test.conf
index c87ecba..bfb35ee 100644
--- a/full/src/test/resources/kustvakt-test.conf
+++ b/full/src/test/resources/kustvakt-test.conf
@@ -6,27 +6,32 @@
krill.index.commit.auto = 500
krill.index.relations.max = 100
-# default layers
+#LDAP
+ldap.config = file-path-to-ldap-config
+
+# Kustvakt
+
+## server
+server.port=8089
+server.host=localhost
+
+## default layers
default.layer.p = tt
default.layer.l = tt
default.layer.o = opennlp
default.layer.d = mate
default.layer.c = corenlp
-# availability regex
+## availability regex
availability.regex.free = CC-BY.*
availability.regex.public = ACA.*
availability.regex.all = QAO.*
-# port&host added 06.02.17/FB
-server.port=8089
-server.host=localhost
+## authentication
+authentication.scheme = ldap
kustvakt.management.registration=enable
-#LDAP
-ldap.config = /home/elma/.config/ldap.conf
-
## options referring to the security module!
## token expiration time in minutes!
diff --git a/full/src/test/resources/test-config.xml b/full/src/test/resources/test-config.xml
index 1ca00b0..b416f1c 100644
--- a/full/src/test/resources/test-config.xml
+++ b/full/src/test/resources/test-config.xml
@@ -50,7 +50,7 @@
p:configLocation='classpath:ehcache.xml' p:shared='true' />
<!-- props are injected from default-config.xml -->
- <bean id="kustvakt_config" class="de.ids_mannheim.korap.config.KustvaktConfiguration">
+ <bean id="kustvakt_config" class="de.ids_mannheim.korap.config.FullConfiguration">
<constructor-arg name="properties" ref="props" />
</bean>
@@ -157,12 +157,17 @@
<constructor-arg value="${krill.indexDir}"/>
</bean>
+
+ <bean id="kustvakt_rewrite" class="de.ids_mannheim.korap.rewrite.FullRewriteHandler">
+ <constructor-arg ref="kustvakt_config" />
+ </bean>
+
<bean id="kustvakt_auditing" class="de.ids_mannheim.korap.handlers.JDBCAuditing">
<constructor-arg ref="kustvakt_db" />
</bean>
<bean id="kustvakt_response"
- class="de.ids_mannheim.korap.web.utils.KustvaktResponseHandler">
+ class="de.ids_mannheim.korap.web.FullResponseHandler">
<constructor-arg index="0" name="iface" ref="kustvakt_auditing"/>
</bean>