commit 3af22a417b177652ae37d8df3f665a8a4a414c47
author margaretha <margaretha@ids-mannheim.de> Fri Apr 21 15:31:58 2023 +0200
committer margaretha <margaretha@ids-mannheim.de> Mon Apr 24 11:57:38 2023 +0200
tree 92364702a945f60b0ec4bd892cb95d61233324c1
parent d31f0829af9ed63ce86c6dd9a88e00158e899a69

Updated the icc configuration and documentation.

Change-Id: I37a434c9b227beccd2c232cb62cd8e43b372da2f

full/src/test/java/de/ids_mannheim/korap/scenario/ICCTest.java

diff --git a/full/src/test/java/de/ids_mannheim/korap/scenario/ICCTest.java b/full/src/test/java/de/ids_mannheim/korap/scenario/ICCTest.java
index 25e3eb5..24f78ba 100644
--- a/full/src/test/java/de/ids_mannheim/korap/scenario/ICCTest.java
+++ b/full/src/test/java/de/ids_mannheim/korap/scenario/ICCTest.java
@@ -27,21 +27,25 @@
  * The instance requires user authentication and access to data is
  * restricted to only logged-in users.
  * 
+ * 
  * This class uses <em>test-config-icc.xml</em> spring XML config
  * defining the location of a specific kustvakt configuration file for
- * this instance:<em>kustvakt-icc.conf</em>. These files are not
- * included in a Kustvakt jar file.
+ * this instance:<em>kustvakt-icc.conf</em>. 
  * 
- * When running a Kustvakt jar file, these files must be included in
- * the classpath. In the example below, the files are placed together
- * in the a folder named <em>config</em> and it is included in the
- * classpath. Besides, <em>jdbc.properties</em> is required at the
- * same folder as the jar.
+ * <p>
+ * To run a Kustvakt jar with ICC setup, the following files are needed:
+ * </p>
+ * <ul>
+ * <li>a Spring configuration file</li>
+ * <li>a Kustvakt configuration file that must be placed at the jar folder</li>
+ * <li>a JDBC properties file that must be placed at the jar folder</li>
+ * </ul>
+ * 
+ * Example:
  * 
  * <p>
  * <code>
- * java -cp Kustvakt-full-0.69.3.jar:config
- * de.ids_mannheim.korap.server.KustvaktServer --spring-config
+ * java -jar Kustvakt-full-0.69.3.jar --spring-config
  * test-config-icc.xml
  * </code>
  * </p>
@@ -60,8 +64,7 @@
  * 
  * <pre><code>
  * &lt;bean id="basic_auth"
- * class="de.ids_mannheim.korap.authentication.BasicAuthentication"
- * /&gt;
+ * class="de.ids_mannheim.korap.authentication.BasicAuthentication"/&gt;
  * 
  * &lt;util:list id="kustvakt_authproviders"
  * value-type="de.ids_mannheim.korap.interfaces.AuthenticationIface"&gt;
@@ -69,9 +72,21 @@
  * </code>
  * </pre>
  * 
+ * <p>For production, the init-method of Initializator should be changed to init.</p>
+ * 
+ * <pre>
+ * <code>
+ * &lt;bean id="initializator" class="de.ids_mannheim.de.init.Initializator"
+   init-method="init"&gt;&lt;/bean&gt;
+ * </code>
+ * </pre>
+ * 
  * <h1>Kustvakt configuration file</h1>
+ * 
+ * <p>
  * The configuration file: <em>kustvakt-icc.conf</em> includes the
  * following setup:
+ * </p>
  * 
  * <ul>
  * <li>
@@ -99,9 +114,6 @@
  * <code>search.resource.filters=AuthenticationFilter </code>
  * </p>
  * 
- * 
- * 
- * 
  * <li><em>oauth2.password.authentication</em> indicating the
  * authentication method to match usernames and password.
  * <code>TEST</code> is a dummy authentication that doesn't do any

full/src/test/resources/kustvakt-icc.conf

diff --git a/full/src/test/resources/kustvakt-icc.conf b/full/src/test/resources/kustvakt-icc.conf
index c029395..6864df8 100644
--- a/full/src/test/resources/kustvakt-icc.conf
+++ b/full/src/test/resources/kustvakt-icc.conf
@@ -6,7 +6,7 @@
 krill.index.commit.auto = 500
 krill.index.relations.max = 100
 # Directory path of virtual corpora to cache
-krill.namedVC = vc
+#krill.namedVC = vc
 krill.test = true
 
 # LDAP