Removed VCLoader.
Change-Id: Ieb93cc690d37c14d2f3bff95706863a959a1f5b8
diff --git a/core/Changes b/core/Changes
index 512689c..771026d 100644
--- a/core/Changes
+++ b/core/Changes
@@ -1,3 +1,8 @@
+# version 0.65.2
+
+2022-03-03
+ - Removed VCLoader.
+
# version 0.65.1
# version 0.65
diff --git a/core/pom.xml b/core/pom.xml
index b3ae940..44ce9da 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>de.ids_mannheim.korap</groupId>
<artifactId>Kustvakt-core</artifactId>
- <version>0.65.1</version>
+ <version>0.65.2</version>
<properties>
<java.version>1.8</java.version>
diff --git a/core/src/main/java/de/ids_mannheim/de/init/VCLoader.java b/core/src/main/java/de/ids_mannheim/de/init/VCLoader.java
deleted file mode 100644
index b6a3e92..0000000
--- a/core/src/main/java/de/ids_mannheim/de/init/VCLoader.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package de.ids_mannheim.de.init;
-
-@Deprecated
-public interface VCLoader {
-
- void recachePredefinedVC();
-}
diff --git a/full/Changes b/full/Changes
index bce8bd0..43369bc 100644
--- a/full/Changes
+++ b/full/Changes
@@ -1,3 +1,8 @@
+# version 0.65.2
+
+2022-03-03
+ - Removed VCLoader.
+
# version 0.65.1
2022-03-01
diff --git a/full/pom.xml b/full/pom.xml
index 3bd91f4..278ce60 100644
--- a/full/pom.xml
+++ b/full/pom.xml
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>de.ids_mannheim.korap</groupId>
<artifactId>Kustvakt-full</artifactId>
- <version>0.65.1</version>
+ <version>0.65.2</version>
<properties>
<java.version>1.8</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/full/src/main/java/de/ids_mannheim/de/init/VCLoaderImpl.java b/full/src/main/java/de/ids_mannheim/de/init/VCLoaderImpl.java
deleted file mode 100644
index 6c00e4c..0000000
--- a/full/src/main/java/de/ids_mannheim/de/init/VCLoaderImpl.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package de.ids_mannheim.de.init;
-
-import org.springframework.beans.factory.annotation.Autowired;
-
-import de.ids_mannheim.korap.KrillCollection;
-import de.ids_mannheim.korap.config.NamedVCLoader;
-
-public class VCLoaderImpl implements VCLoader{
-
- @Autowired
- private NamedVCLoader vcLoader;
-
- @Override
- public void recachePredefinedVC () {
-// KrillCollection.cache.removeAll();
- Thread t = new Thread(vcLoader);
- t.start();
- }
-}
diff --git a/full/src/main/resources/default-config.xml b/full/src/main/resources/default-config.xml
index f5c1352..86f686e 100644
--- a/full/src/main/resources/default-config.xml
+++ b/full/src/main/resources/default-config.xml
@@ -115,7 +115,7 @@
<!-- <property name="dataSource" ref="dataSource" /> -->
<property name="dataSource" ref="sqliteDataSource" />
<!-- <property name="dataSource" ref="c3p0DataSource" /> -->
-
+ <property name="outOfOrder" value="true" />
</bean>
<bean id="flyway" class="org.flywaydb.core.Flyway" init-method="migrate">
@@ -198,8 +198,6 @@
init-method="init">
</bean>
- <bean id="vcLoader" class="de.ids_mannheim.de.init.VCLoaderImpl"/>
-
<!-- Krill -->
<bean id="search_krill" class="de.ids_mannheim.korap.web.SearchKrill">
<constructor-arg value="${krill.indexDir}" />
diff --git a/full/src/test/resources/test-config.xml b/full/src/test/resources/test-config.xml
index de438a1..dbcd8b9 100644
--- a/full/src/test/resources/test-config.xml
+++ b/full/src/test/resources/test-config.xml
@@ -105,6 +105,7 @@
<property name="locations" value="#{'${jdbc.schemaPath}'.split(',')}"/>
<property name="dataSource" ref="sqliteDataSource" />
<!-- <property name="dataSource" ref="dataSource" /> -->
+ <property name="outOfOrder" value="true" />
</bean>
<bean id="flyway" class="org.flywaydb.core.Flyway" init-method="migrate">
@@ -179,8 +180,6 @@
init-method="initTest">
</bean>
- <bean id="vcLoader" class="de.ids_mannheim.de.init.VCLoaderImpl"/>
-
<!-- Krill -->
<bean id="search_krill" class="de.ids_mannheim.korap.web.SearchKrill">
<constructor-arg value="${krill.indexDir}" />
diff --git a/lite/Changes b/lite/Changes
index 7f231be..c4752f2 100644
--- a/lite/Changes
+++ b/lite/Changes
@@ -1,3 +1,8 @@
+# version 0.65.2
+
+2022-03-03
+ - Removed VCLoader.
+
# version 0.65.1
# version 0.65
diff --git a/lite/pom.xml b/lite/pom.xml
index 11a617f..ce1a234 100644
--- a/lite/pom.xml
+++ b/lite/pom.xml
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>de.ids_mannheim.korap</groupId>
<artifactId>Kustvakt-lite</artifactId>
- <version>0.65.1</version>
+ <version>0.65.2</version>
<properties>
<java.version>1.8</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/lite/src/main/java/de/ids_mannheim/de/init/VCLoaderImpl.java b/lite/src/main/java/de/ids_mannheim/de/init/VCLoaderImpl.java
deleted file mode 100644
index b015e43..0000000
--- a/lite/src/main/java/de/ids_mannheim/de/init/VCLoaderImpl.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package de.ids_mannheim.de.init;
-
-public class VCLoaderImpl implements VCLoader {
-
- @Override
- public void recachePredefinedVC () {
- // TODO Auto-generated method stub
-
- }
-
-}
diff --git a/lite/src/main/resources/lite-config.xml b/lite/src/main/resources/lite-config.xml
index a019736..3e7aacd 100644
--- a/lite/src/main/resources/lite-config.xml
+++ b/lite/src/main/resources/lite-config.xml
@@ -77,6 +77,7 @@
<!-- <property name="cleanOnValidationError" value="true" /> -->
<property name="locations" value="#{'${jdbc.schemaPath}'.split(',')}"/>
<property name="dataSource" ref="sqliteDataSource" />
+ <property name="outOfOrder" value="true" />
</bean>
<bean id="flyway" class="org.flywaydb.core.Flyway" init-method="migrate">
@@ -136,8 +137,6 @@
<bean id="annotationParser" class="de.ids_mannheim.korap.annotation.AnnotationParser"
scope="singleton" />
- <bean id="vcLoader" class="de.ids_mannheim.de.init.VCLoaderImpl"/>
-
<!-- Krill -->
<bean id="search_krill" class="de.ids_mannheim.korap.web.SearchKrill">
<constructor-arg value="${krill.indexDir}" />
diff --git a/lite/src/test/resources/test-config.xml b/lite/src/test/resources/test-config.xml
index cbc883f..6eec95f 100644
--- a/lite/src/test/resources/test-config.xml
+++ b/lite/src/test/resources/test-config.xml
@@ -76,6 +76,7 @@
<!-- <property name="cleanOnValidationError" value="true" /> -->
<property name="locations" value="#{'${jdbc.schemaPath}'.split(',')}"/>
<property name="dataSource" ref="sqliteDataSource" />
+ <property name="outOfOrder" value="true" />
</bean>
<bean id="flyway" class="org.flywaydb.core.Flyway" init-method="migrate">
@@ -127,8 +128,6 @@
<property name="dataSource" ref="sqliteDataSource" />
</bean>
- <bean id="vcLoader" class="de.ids_mannheim.de.init.VCLoaderImpl"/>
-
<!-- Krill -->
<bean id="search_krill" class="de.ids_mannheim.korap.web.SearchKrill">
<constructor-arg value="${krill.indexDir}" />