Added annotation scheme in config & fixed authentication exceptions.
Change-Id: I19dd25b99f34c7aa51b2f1aea04837b2337838d8
diff --git a/lite/src/main/java/de/ids_mannheim/korap/web/service/light/LightService.java b/lite/src/main/java/de/ids_mannheim/korap/web/service/light/LightService.java
index 1b745b7..572b176 100644
--- a/lite/src/main/java/de/ids_mannheim/korap/web/service/light/LightService.java
+++ b/lite/src/main/java/de/ids_mannheim/korap/web/service/light/LightService.java
@@ -33,8 +33,8 @@
import de.ids_mannheim.korap.resource.rewrite.RewriteHandler;
import de.ids_mannheim.korap.utils.KoralCollectionQueryBuilder;
import de.ids_mannheim.korap.web.ClientsHandler;
+import de.ids_mannheim.korap.web.CoreResponseHandler;
import de.ids_mannheim.korap.web.SearchKrill;
-import de.ids_mannheim.korap.web.utils.KustvaktResponseHandler;
/**
* @author hanl
@@ -58,7 +58,7 @@
private static Logger jlog = LoggerFactory.getLogger(LightService.class);
@Autowired
- KustvaktResponseHandler kustvaktResponseHandler;
+ CoreResponseHandler kustvaktResponseHandler;
@Autowired
private SearchKrill searchKrill;
private ClientsHandler graphDBhandler;
diff --git a/lite/src/main/resources/light-config.xml b/lite/src/main/resources/light-config.xml
index 6b1fa49..b219666 100644
--- a/lite/src/main/resources/light-config.xml
+++ b/lite/src/main/resources/light-config.xml
@@ -36,7 +36,7 @@
</bean>
<bean id="kustvakt_response"
- class="de.ids_mannheim.korap.web.utils.KustvaktResponseHandler">
+ class="de.ids_mannheim.korap.web.CoreResponseHandler">
<constructor-arg index="0" name="iface" ref="kustvakt_auditing"/>
</bean>
@@ -49,6 +49,10 @@
class="de.ids_mannheim.korap.interfaces.defaults.DefaultEncryption">
</bean>
+ <bean id="kustvakt_rewrite" class="de.ids_mannheim.korap.resource.rewrite.RewriteHandler">
+ <constructor-arg ref="kustvakt_config" />
+ </bean>
+
<bean id="search_krill"
class="de.ids_mannheim.korap.web.SearchKrill">
<constructor-arg value="${krill.indexDir}"/>
diff --git a/lite/src/main/resources/test-config.xml b/lite/src/main/resources/test-config.xml
index 6b1fa49..b219666 100644
--- a/lite/src/main/resources/test-config.xml
+++ b/lite/src/main/resources/test-config.xml
@@ -36,7 +36,7 @@
</bean>
<bean id="kustvakt_response"
- class="de.ids_mannheim.korap.web.utils.KustvaktResponseHandler">
+ class="de.ids_mannheim.korap.web.CoreResponseHandler">
<constructor-arg index="0" name="iface" ref="kustvakt_auditing"/>
</bean>
@@ -49,6 +49,10 @@
class="de.ids_mannheim.korap.interfaces.defaults.DefaultEncryption">
</bean>
+ <bean id="kustvakt_rewrite" class="de.ids_mannheim.korap.resource.rewrite.RewriteHandler">
+ <constructor-arg ref="kustvakt_config" />
+ </bean>
+
<bean id="search_krill"
class="de.ids_mannheim.korap.web.SearchKrill">
<constructor-arg value="${krill.indexDir}"/>