Merged lite into full
Change-Id: I8e496cebcfa91de5077bc938ec00617136037e22
diff --git a/full/Changes b/full/Changes
index 2a58fe7..86653f4 100644
--- a/full/Changes
+++ b/full/Changes
@@ -3,7 +3,7 @@
- Renamed entity and service packages in core
- Renamed web.controller package in core
- Moved SearchNetworkEndpoint to core.service package
-
+- Merged lite into full
# version 0.70
diff --git a/lite/Changes b/full/Changes-Lite
similarity index 100%
rename from lite/Changes
rename to full/Changes-Lite
diff --git a/full/pom.xml b/full/pom.xml
index b57cb4a..a1ff3cb 100644
--- a/full/pom.xml
+++ b/full/pom.xml
@@ -49,19 +49,14 @@
</resource>
</transformer>
</transformers>
- <!-- Additional configuration. apparently there is a securityException -->
<filters>
- <filter>
- <artifact>*:*</artifact>
- <excludes>
- <exclude>META-INF/*.SF</exclude>
- <exclude>META-INF/*.DSA
- </exclude>
- <exclude>META-INF/*.RSA
- </exclude>
- </excludes>
- </filter>
- </filters>
+ <filter>
+ <artifact>*:*</artifact>
+ <excludes>
+ <exclude>db/lite/**</exclude>
+ </excludes>
+ </filter>
+ </filters>
</configuration>
</execution>
</executions>
@@ -69,6 +64,70 @@
</plugins>
</build>
</profile>
+
+
+ <profile>
+ <id>lite</id>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-shade-plugin</artifactId>
+ <version>3.4.1</version>
+ <executions>
+ <!--option 2-->
+ <execution>
+ <id>lite</id>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <configuration>
+ <finalName>
+ Kustvakt-lite-${project.version}
+ </finalName>
+ <transformers>
+ <transformer
+ implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+ <mainClass>
+ de.ids_mannheim.korap.server.KustvaktLiteServer
+ </mainClass>
+ </transformer>
+ <transformer
+ implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
+ <resource>META-INF/spring.handlers
+ </resource>
+ </transformer>
+ <transformer
+ implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
+ <resource>META-INF/spring.schemas
+ </resource>
+ </transformer>
+ </transformers>
+ <filters>
+ <filter>
+ <artifact>*:*</artifact>
+ <excludes>
+ <exclude>db/mysql/**</exclude>
+ <exclude>db/predefined/**</exclude>
+ <exclude>db/sqlite/**</exclude>
+ <exclude>db/test/**</exclude>
+ <exclude>com.novell.ldap</exclude>
+ <exclude>com.unboundid</exclude>
+ <exclude>org.glassfish.jersey.test-framework*</exclude>
+ <exclude>org.apache.velocity*</exclude>
+ <exclude>com.sun.mail</exclude>
+ <exclude>javax.activation</exclude>
+ </excludes>
+ </filter>
+ </filters>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
</profiles>
<build>
<!-- <resources> <resource> <directory>src/main/resources</directory> <filtering>true</filtering>
diff --git a/lite/src/main/java/de/ids_mannheim/korap/authentication/DummyAuthenticationManager.java b/full/src/main/java/de/ids_mannheim/korap/authentication/DummyAuthenticationManager.java
similarity index 100%
rename from lite/src/main/java/de/ids_mannheim/korap/authentication/DummyAuthenticationManager.java
rename to full/src/main/java/de/ids_mannheim/korap/authentication/DummyAuthenticationManager.java
diff --git a/lite/src/main/java/de/ids_mannheim/korap/dao/DummyAdminDaoImpl.java b/full/src/main/java/de/ids_mannheim/korap/dao/DummyAdminDaoImpl.java
similarity index 100%
rename from lite/src/main/java/de/ids_mannheim/korap/dao/DummyAdminDaoImpl.java
rename to full/src/main/java/de/ids_mannheim/korap/dao/DummyAdminDaoImpl.java
diff --git a/lite/src/main/java/de/ids_mannheim/korap/oauth2/service/DummyOAuth2ScopeServiceImpl.java b/full/src/main/java/de/ids_mannheim/korap/oauth2/service/DummyOAuth2ScopeServiceImpl.java
similarity index 88%
rename from lite/src/main/java/de/ids_mannheim/korap/oauth2/service/DummyOAuth2ScopeServiceImpl.java
rename to full/src/main/java/de/ids_mannheim/korap/oauth2/service/DummyOAuth2ScopeServiceImpl.java
index 891dc12..d1e7945 100644
--- a/lite/src/main/java/de/ids_mannheim/korap/oauth2/service/DummyOAuth2ScopeServiceImpl.java
+++ b/full/src/main/java/de/ids_mannheim/korap/oauth2/service/DummyOAuth2ScopeServiceImpl.java
@@ -2,6 +2,7 @@
import de.ids_mannheim.korap.constant.OAuth2Scope;
import de.ids_mannheim.korap.exceptions.KustvaktException;
+import de.ids_mannheim.korap.oauth2.service.OAuth2ScopeService;
import de.ids_mannheim.korap.security.context.TokenContext;
public class DummyOAuth2ScopeServiceImpl implements OAuth2ScopeService {
diff --git a/lite/src/main/java/de/ids_mannheim/korap/server/KustvaktLiteServer.java b/full/src/main/java/de/ids_mannheim/korap/server/KustvaktLiteServer.java
similarity index 82%
rename from lite/src/main/java/de/ids_mannheim/korap/server/KustvaktLiteServer.java
rename to full/src/main/java/de/ids_mannheim/korap/server/KustvaktLiteServer.java
index 2a9ea8b..0a733a0 100644
--- a/lite/src/main/java/de/ids_mannheim/korap/server/KustvaktLiteServer.java
+++ b/full/src/main/java/de/ids_mannheim/korap/server/KustvaktLiteServer.java
@@ -33,6 +33,11 @@
config.loadBasicProperties(properties);
springConfig = "lite-config.xml";
+
+ rootPackages = "de.ids_mannheim.korap.core.web; "
+ + "de.ids_mannheim.korap.web.filter; "
+ + "de.ids_mannheim.korap.web.utils; "
+ + "com.fasterxml.jackson.jaxrs.json;";
server.start();
}
diff --git a/full/src/main/java/de/ids_mannheim/korap/web/OAuth2ResponseHandler.java b/full/src/main/java/de/ids_mannheim/korap/web/OAuth2ResponseHandler.java
index 3c86fd3..2b2dd8e 100644
--- a/full/src/main/java/de/ids_mannheim/korap/web/OAuth2ResponseHandler.java
+++ b/full/src/main/java/de/ids_mannheim/korap/web/OAuth2ResponseHandler.java
@@ -10,7 +10,6 @@
import javax.ws.rs.core.Response.Status;
import org.apache.http.HttpHeaders;
-import org.apache.http.HttpStatus;
import org.apache.oltu.oauth2.common.error.OAuthError;
import org.apache.oltu.oauth2.common.exception.OAuthProblemException;
import org.apache.oltu.oauth2.common.exception.OAuthSystemException;
diff --git a/lite/src/main/resources/db/V1.1__annotation.sql b/full/src/main/resources/db/lite/V1.1__annotation.sql
similarity index 100%
rename from lite/src/main/resources/db/V1.1__annotation.sql
rename to full/src/main/resources/db/lite/V1.1__annotation.sql
diff --git a/lite/src/main/resources/db/V1.2__annotation_layer.sql b/full/src/main/resources/db/lite/V1.2__annotation_layer.sql
similarity index 100%
rename from lite/src/main/resources/db/V1.2__annotation_layer.sql
rename to full/src/main/resources/db/lite/V1.2__annotation_layer.sql
diff --git a/lite/src/main/resources/db/V1.3__annotation_key.sql b/full/src/main/resources/db/lite/V1.3__annotation_key.sql
similarity index 100%
rename from lite/src/main/resources/db/V1.3__annotation_key.sql
rename to full/src/main/resources/db/lite/V1.3__annotation_key.sql
diff --git a/lite/src/main/resources/db/V1.4__annotation_value.sql b/full/src/main/resources/db/lite/V1.4__annotation_value.sql
similarity index 100%
rename from lite/src/main/resources/db/V1.4__annotation_value.sql
rename to full/src/main/resources/db/lite/V1.4__annotation_value.sql
diff --git a/lite/src/main/resources/db/V1__annotation_tables.sql b/full/src/main/resources/db/lite/V1__annotation_tables.sql
similarity index 100%
rename from lite/src/main/resources/db/V1__annotation_tables.sql
rename to full/src/main/resources/db/lite/V1__annotation_tables.sql
diff --git a/lite/src/main/resources/kustvakt-lite.conf b/full/src/main/resources/kustvakt-lite.conf
similarity index 100%
rename from lite/src/main/resources/kustvakt-lite.conf
rename to full/src/main/resources/kustvakt-lite.conf
diff --git a/lite/src/main/resources/lite-config.xml b/full/src/main/resources/lite-config.xml
similarity index 94%
rename from lite/src/main/resources/lite-config.xml
rename to full/src/main/resources/lite-config.xml
index b26c65d..4b6a074 100644
--- a/lite/src/main/resources/lite-config.xml
+++ b/full/src/main/resources/lite-config.xml
@@ -11,12 +11,10 @@
http://www.springframework.org/schema/util
http://www.springframework.org/schema/util/spring-util.xsd">
-
- <context:component-scan
- base-package="de.ids_mannheim.korap.rewrite,
- de.ids_mannheim.korap.core.service,
- de.ids_mannheim.korap.core.web,
- de.ids_mannheim.korap.web.filter,
+ <context:component-scan base-package="
+ de.ids_mannheim.korap.core.service,
+ de.ids_mannheim.korap.core.web,
+ de.ids_mannheim.korap.web.filter,
de.ids_mannheim.korap.web.utils,
de.ids_mannheim.korap.authentication.http" />
<context:annotation-config />
@@ -26,9 +24,9 @@
<property name="ignoreResourceNotFound" value="true" />
<property name="locations">
<array>
- <value>classpath:lite-jdbc.properties</value>
+ <value>classpath:properties/lite-jdbc.properties</value>
<value>file:./lite-jdbc.properties</value>
- <value>classpath:hibernate.properties</value>
+ <value>classpath:properties/hibernate.properties</value>
<value>classpath:kustvakt-lite.conf</value>
<value>file:./kustvakt-lite.conf</value>
</array>
@@ -142,6 +140,7 @@
<bean id="search_krill" class="de.ids_mannheim.korap.web.SearchKrill">
<constructor-arg value="${krill.indexDir}" />
</bean>
+
<!-- Filters -->
<!-- <bean id="APIVersionFilter" class="de.ids_mannheim.korap.web.APIVersionFilter"
@@ -163,7 +162,7 @@
<bean id="searchController" class="de.ids_mannheim.korap.web.controller.SearchController" />
<bean id="statisticController"
class="de.ids_mannheim.korap.web.controller.StatisticController" />
- -->
+ -->
<!-- Services -->
<bean id="scopeService"
class="de.ids_mannheim.korap.oauth2.service.DummyOAuth2ScopeServiceImpl" />
@@ -176,10 +175,11 @@
<bean id="annotationConverter" class="de.ids_mannheim.korap.dto.converter.AnnotationConverter" />
<!-- Rewrite -->
+ <bean id="layerMapper" class="de.ids_mannheim.korap.rewrite.LayerMapper" />
<bean id="foundryInject" class="de.ids_mannheim.korap.rewrite.FoundryInject" />
-
+
<util:list id="rewriteTasks" value-type="de.ids_mannheim.korap.rewrite.RewriteTask">
- <ref bean="foundryInject"/>
+ <ref bean="foundryInject" />
</util:list>
<bean id="rewriteHandler" class="de.ids_mannheim.korap.rewrite.RewriteHandler">
diff --git a/lite/src/main/resources/lite-jdbc.properties b/full/src/main/resources/properties/lite-jdbc.properties
similarity index 90%
rename from lite/src/main/resources/lite-jdbc.properties
rename to full/src/main/resources/properties/lite-jdbc.properties
index a6924c8..c96fc5d 100644
--- a/lite/src/main/resources/lite-jdbc.properties
+++ b/full/src/main/resources/properties/lite-jdbc.properties
@@ -6,4 +6,4 @@
jdbc.url=jdbc:sqlite:data/liteDB.sqlite
jdbc.username=pc
jdbc.password=pc
-jdbc.schemaPath=db
\ No newline at end of file
+jdbc.schemaPath=db/lite
\ No newline at end of file
diff --git a/lite/src/test/java/de/ids_mannheim/korap/config/LiteJerseyTest.java b/full/src/test/java/de/ids_mannheim/korap/config/LiteJerseyTest.java
similarity index 91%
rename from lite/src/test/java/de/ids_mannheim/korap/config/LiteJerseyTest.java
rename to full/src/test/java/de/ids_mannheim/korap/config/LiteJerseyTest.java
index 3b01917..525d24b 100644
--- a/lite/src/test/java/de/ids_mannheim/korap/config/LiteJerseyTest.java
+++ b/full/src/test/java/de/ids_mannheim/korap/config/LiteJerseyTest.java
@@ -17,7 +17,7 @@
import org.glassfish.jersey.test.spi.TestContainerFactory;
@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration("classpath:test-config.xml")
+@ContextConfiguration("classpath:test-config-lite.xml")
public abstract class LiteJerseyTest extends JerseyTest{
public static final String API_VERSION = "v1.0";
@@ -26,8 +26,10 @@
protected GenericApplicationContext applicationContext;
public static String[] classPackages =
- new String[] { "de.ids_mannheim.korap.web",
+ new String[] {
"de.ids_mannheim.korap.core.web",
+ "de.ids_mannheim.korap.web.filter",
+ "de.ids_mannheim.korap.web.utils",
"de.ids_mannheim.korap.test",
"com.fasterxml.jackson.jaxrs.json"};
diff --git a/lite/src/test/java/de/ids_mannheim/korap/web/service/InfoControllerTest.java b/full/src/test/java/de/ids_mannheim/korap/web/lite/InfoControllerTest.java
similarity index 97%
rename from lite/src/test/java/de/ids_mannheim/korap/web/service/InfoControllerTest.java
rename to full/src/test/java/de/ids_mannheim/korap/web/lite/InfoControllerTest.java
index 9a1df6a..6416879 100644
--- a/lite/src/test/java/de/ids_mannheim/korap/web/service/InfoControllerTest.java
+++ b/full/src/test/java/de/ids_mannheim/korap/web/lite/InfoControllerTest.java
@@ -1,4 +1,4 @@
-package de.ids_mannheim.korap.web.service;
+package de.ids_mannheim.korap.web.lite;
import static org.junit.Assert.assertEquals;
diff --git a/lite/src/test/java/de/ids_mannheim/korap/web/service/LiteMultipleCorpusQueryTest.java b/full/src/test/java/de/ids_mannheim/korap/web/lite/LiteMultipleCorpusQueryTest.java
similarity index 98%
rename from lite/src/test/java/de/ids_mannheim/korap/web/service/LiteMultipleCorpusQueryTest.java
rename to full/src/test/java/de/ids_mannheim/korap/web/lite/LiteMultipleCorpusQueryTest.java
index 3379d98..56b861f 100644
--- a/lite/src/test/java/de/ids_mannheim/korap/web/service/LiteMultipleCorpusQueryTest.java
+++ b/full/src/test/java/de/ids_mannheim/korap/web/lite/LiteMultipleCorpusQueryTest.java
@@ -1,4 +1,4 @@
-package de.ids_mannheim.korap.web.service;
+package de.ids_mannheim.korap.web.lite;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
diff --git a/lite/src/test/java/de/ids_mannheim/korap/web/service/LiteSearchControllerTest.java b/full/src/test/java/de/ids_mannheim/korap/web/lite/LiteSearchControllerTest.java
similarity index 99%
rename from lite/src/test/java/de/ids_mannheim/korap/web/service/LiteSearchControllerTest.java
rename to full/src/test/java/de/ids_mannheim/korap/web/lite/LiteSearchControllerTest.java
index f120ff2..a052c70 100644
--- a/lite/src/test/java/de/ids_mannheim/korap/web/service/LiteSearchControllerTest.java
+++ b/full/src/test/java/de/ids_mannheim/korap/web/lite/LiteSearchControllerTest.java
@@ -1,4 +1,4 @@
-package de.ids_mannheim.korap.web.service;
+package de.ids_mannheim.korap.web.lite;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
diff --git a/lite/src/test/java/de/ids_mannheim/korap/web/service/LiteSearchPipeTest.java b/full/src/test/java/de/ids_mannheim/korap/web/lite/LiteSearchPipeTest.java
similarity index 99%
rename from lite/src/test/java/de/ids_mannheim/korap/web/service/LiteSearchPipeTest.java
rename to full/src/test/java/de/ids_mannheim/korap/web/lite/LiteSearchPipeTest.java
index 867a159..80c52ca 100644
--- a/lite/src/test/java/de/ids_mannheim/korap/web/service/LiteSearchPipeTest.java
+++ b/full/src/test/java/de/ids_mannheim/korap/web/lite/LiteSearchPipeTest.java
@@ -1,4 +1,4 @@
-package de.ids_mannheim.korap.web.service;
+package de.ids_mannheim.korap.web.lite;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
diff --git a/lite/src/test/java/de/ids_mannheim/korap/web/service/LiteSearchTokenSnippetTest.java b/full/src/test/java/de/ids_mannheim/korap/web/lite/LiteSearchTokenSnippetTest.java
similarity index 98%
rename from lite/src/test/java/de/ids_mannheim/korap/web/service/LiteSearchTokenSnippetTest.java
rename to full/src/test/java/de/ids_mannheim/korap/web/lite/LiteSearchTokenSnippetTest.java
index 5602657..5a521f8 100644
--- a/lite/src/test/java/de/ids_mannheim/korap/web/service/LiteSearchTokenSnippetTest.java
+++ b/full/src/test/java/de/ids_mannheim/korap/web/lite/LiteSearchTokenSnippetTest.java
@@ -1,4 +1,4 @@
-package de.ids_mannheim.korap.web.service;
+package de.ids_mannheim.korap.web.lite;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
diff --git a/lite/src/test/java/de/ids_mannheim/korap/web/service/LiteStatisticControllerTest.java b/full/src/test/java/de/ids_mannheim/korap/web/lite/LiteStatisticControllerTest.java
similarity index 98%
rename from lite/src/test/java/de/ids_mannheim/korap/web/service/LiteStatisticControllerTest.java
rename to full/src/test/java/de/ids_mannheim/korap/web/lite/LiteStatisticControllerTest.java
index ce873c0..b116e1e 100644
--- a/lite/src/test/java/de/ids_mannheim/korap/web/service/LiteStatisticControllerTest.java
+++ b/full/src/test/java/de/ids_mannheim/korap/web/lite/LiteStatisticControllerTest.java
@@ -1,4 +1,4 @@
-package de.ids_mannheim.korap.web.service;
+package de.ids_mannheim.korap.web.lite;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
diff --git a/lite/src/test/java/de/ids_mannheim/korap/web/service/SearchNetworkEndpointTest.java b/full/src/test/java/de/ids_mannheim/korap/web/lite/SearchNetworkEndpointTest.java
similarity index 98%
rename from lite/src/test/java/de/ids_mannheim/korap/web/service/SearchNetworkEndpointTest.java
rename to full/src/test/java/de/ids_mannheim/korap/web/lite/SearchNetworkEndpointTest.java
index 6377608..f90dde0 100644
--- a/lite/src/test/java/de/ids_mannheim/korap/web/service/SearchNetworkEndpointTest.java
+++ b/full/src/test/java/de/ids_mannheim/korap/web/lite/SearchNetworkEndpointTest.java
@@ -1,4 +1,4 @@
-package de.ids_mannheim.korap.web.service;
+package de.ids_mannheim.korap.web.lite;
import static org.junit.Assert.assertEquals;
import static org.mockserver.integration.ClientAndServer.startClientAndServer;
diff --git a/lite/src/test/resources/test-config.xml b/full/src/test/resources/test-config-lite.xml
similarity index 96%
rename from lite/src/test/resources/test-config.xml
rename to full/src/test/resources/test-config-lite.xml
index b2f6b73..46f46a2 100644
--- a/lite/src/test/resources/test-config.xml
+++ b/full/src/test/resources/test-config-lite.xml
@@ -10,10 +10,8 @@
http://www.springframework.org/schema/context/spring-context.xsd
http://www.springframework.org/schema/util
http://www.springframework.org/schema/util/spring-util.xsd">
-
-
- <context:component-scan
- base-package="de.ids_mannheim.korap.rewrite,
+
+ <context:component-scan base-package="
de.ids_mannheim.korap.core.service,
de.ids_mannheim.korap.core.web,
de.ids_mannheim.korap.web.filter,
@@ -28,7 +26,7 @@
<array>
<value>classpath:test-jdbc.properties</value>
<value>file:./test-jdbc.properties</value>
- <value>classpath:hibernate.properties</value>
+ <value>classpath:test-hibernate.properties</value>
<value>classpath:kustvakt-lite.conf</value>
<value>file:./kustvakt-lite.conf</value>
</array>
@@ -133,6 +131,7 @@
<bean id="search_krill" class="de.ids_mannheim.korap.web.SearchKrill">
<constructor-arg value="${krill.indexDir}" />
</bean>
+
<!-- Filters -->
<!-- <bean id="APIVersionFilter" class="de.ids_mannheim.korap.web.APIVersionFilter"
@@ -147,14 +146,13 @@
</bean>
<!-- Controllers -->
- <!-- added via component-scan
+ <!-- added via component-scan
<bean id="annotationController"
class="de.ids_mannheim.korap.web.controller.AnnotationController" />
<bean id="searchController" class="de.ids_mannheim.korap.web.controller.SearchController" />
<bean id="statisticController"
class="de.ids_mannheim.korap.web.controller.StatisticController" />
- -->
-
+ -->
<!-- Services -->
<bean id="scopeService"
class="de.ids_mannheim.korap.oauth2.service.DummyOAuth2ScopeServiceImpl" />
@@ -167,6 +165,7 @@
<bean id="annotationConverter" class="de.ids_mannheim.korap.dto.converter.AnnotationConverter" />
<!-- Rewrite -->
+ <bean id="layerMapper" class="de.ids_mannheim.korap.rewrite.LayerMapper" />
<bean id="foundryInject" class="de.ids_mannheim.korap.rewrite.FoundryInject" />
<util:list id="rewriteTasks" value-type="de.ids_mannheim.korap.rewrite.RewriteTask">
diff --git a/lite/pom.xml b/lite/pom.xml
deleted file mode 100644
index ff1c486..0000000
--- a/lite/pom.xml
+++ /dev/null
@@ -1,252 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>de.ids_mannheim.korap</groupId>
- <artifactId>Kustvakt-lite</artifactId>
- <version>0.70.1</version>
- <properties>
- <java.version>11</java.version>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <jersey.version>2.39.1</jersey.version>
- </properties>
-
- <build>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- </resource>
- </resources>
- <testResources>
- <testResource>
- <directory>src/test/resources</directory>
- <filtering>true</filtering>
- <includes>
- <include>**/*.prop</include>
- <include>**/*.xml</include>
- <include>**/*.conf</include>
- <include>**/*.info</include>
- <include>**/*.properties</include>
- </includes>
- </testResource>
- <testResource>
- <directory>src/main/resources</directory>
- <filtering>true</filtering>
- <includes>
- <include>**/*.info</include>
- <include>**/*.properties</include>
- </includes>
- </testResource>
- </testResources>
- <plugins>
- <!-- Formatter plugin for Eclipse based coding conventions http://maven-java-formatter-plugin.googlecode.com/svn/site/0.4/usage.html -->
- <plugin>
- <groupId>com.googlecode.maven-java-formatter-plugin</groupId>
- <artifactId>maven-java-formatter-plugin</artifactId>
- <version>0.4</version>
- <configuration>
- <configFile>${project.basedir}/Format.xml</configFile>
- <overrideConfigCompilerVersion>true</overrideConfigCompilerVersion>
- <compilerSource>${java.version}</compilerSource>
- <compilerCompliance>${java.version}</compilerCompliance>
- <compilerTargetPlatform>${java.version}</compilerTargetPlatform>
- </configuration>
- <!-- <executions> <execution> <goals> <goal>format</goal> </goals> </execution>
- </executions> -->
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.11.0</version>
- <configuration>
- <compilerVersion>${java.version}</compilerVersion>
- <source>${java.version}</source>
- <target>${java.version}</target>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>3.1.0</version>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.surefire</groupId>
- <artifactId>surefire-junit47</artifactId>
- <version>3.1.0</version>
- </dependency>
- </dependencies>
- <configuration>
- <useSystemClassLoader>false</useSystemClassLoader>
- <reuseForks>true</reuseForks>
- <forkCount>1</forkCount>
- <threadCount>5</threadCount>
- <argLine>-Xmx512m
- -Djava.util.logging.manager=org.apache.logging.log4j.jul.LogManager</argLine>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-shade-plugin</artifactId>
- <version>3.4.1</version>
- <executions>
- <!-- option 1 -->
- <execution>
- <id>light</id>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- <configuration>
- <finalName>
- Kustvakt-lite-${project.version}
- </finalName>
- <transformers>
- <transformer
- implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
- <mainClass>
- de.ids_mannheim.korap.server.KustvaktLiteServer
- </mainClass>
- </transformer>
- <transformer
- implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
- <resource>META-INF/spring.handlers
- </resource>
- </transformer>
- <transformer
- implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
- <resource>META-INF/spring.schemas
- </resource>
- </transformer>
- </transformers>
- <!-- Additional configuration. -->
- <!-- apparently there is a securityexception -->
- <filters>
- <filter>
- <artifact>*:*</artifact>
- <excludes>
- <exclude>META-INF/*.SF</exclude>
- <exclude>META-INF/*.DSA
- </exclude>
- <exclude>META-INF/*.RSA
- </exclude>
- </excludes>
- </filter>
- </filters>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>cobertura-maven-plugin</artifactId>
- <version>2.7</version>
- <configuration>
- <formats>
- <format>html</format>
- <format>xml</format>
- </formats>
- <check/>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-
- <dependencies>
- <dependency>
- <groupId>de.ids_mannheim.korap</groupId>
- <artifactId>Kustvakt-core</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>de.ids_mannheim.korap</groupId>
- <artifactId>Kustvakt-core</artifactId>
- <version>${project.version}</version>
- <classifier>tests</classifier>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <!-- Jersey test framework -->
- <dependency>
- <groupId>org.glassfish.jersey.test-framework</groupId>
- <artifactId>jersey-test-framework-core</artifactId>
- <version>${jersey.version}</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.test-framework.providers</groupId>
- <artifactId>jersey-test-framework-provider-grizzly2</artifactId>
- <version>${jersey.version}</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <!-- Project Lombok -->
- <dependency>
- <groupId>org.projectlombok</groupId>
- <artifactId>lombok</artifactId>
- <version>1.18.26</version>
- <scope>provided</scope>
- </dependency>
- <!-- https://mvnrepository.com/artifact/org.codehaus.mojo/cobertura-maven-plugin -->
- <dependency>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>cobertura-maven-plugin</artifactId>
- <version>2.7</version>
- <scope>test</scope>
- <exclusions>
- <!-- multiple slf4j binding -->
- <exclusion>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- </exclusion>
- <!-- incompatilibily with eclipse 2021-03 (4.19.0) and java 11 -->
- <exclusion>
- <groupId>com.sun</groupId>
- <artifactId>tools</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <!-- https://mvnrepository.com/artifact/backport-util-concurrent/backport-util-concurrent -->
- <dependency>
- <groupId>backport-util-concurrent</groupId>
- <artifactId>backport-util-concurrent</artifactId>
- <version>3.1</version>
- </dependency>
- <!-- Mockserver -->
- <dependency>
- <groupId>org.mock-server</groupId>
- <artifactId>mockserver-netty</artifactId>
- <version>5.15.0</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-annotations</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- </dependencies>
-</project>
diff --git a/lite/src/main/resources/hibernate.properties b/lite/src/main/resources/hibernate.properties
deleted file mode 100644
index 23979b2..0000000
--- a/lite/src/main/resources/hibernate.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-hibernate.dialect=org.hibernate.dialect.SQLiteDialect
-hibernate.hbm2ddl.auto=none
-hibernate.show_sql=false
-hibernate.cache.use_query_cache=false
-hibernate.cache.use_second_level_cache=false
-hibernate.cache.provider=org.hibernate.cache.EhCacheProvider
-hibernate.cache.region.factory=org.hibernate.cache.ehcache.EhCacheRegionFactory
-hibernate.jdbc.time_zone=UTC
\ No newline at end of file
diff --git a/lite/src/main/resources/kustvakt.info b/lite/src/main/resources/kustvakt.info
deleted file mode 100644
index ea847bb..0000000
--- a/lite/src/main/resources/kustvakt.info
+++ /dev/null
@@ -1,8 +0,0 @@
-kustvakt.version=${project.version}
-kustvakt.name=${project.name}
-
-# use this file to define the properties and logging file names
-kustvakt.properties=./kustvakt-lite.conf
-kustvakt.logging=./log4j.properties
-kustvakt.cache=true
-kustvakt.cache_store=./store
\ No newline at end of file
diff --git a/lite/src/main/resources/log4j2.properties b/lite/src/main/resources/log4j2.properties
deleted file mode 100644
index b0115e7..0000000
--- a/lite/src/main/resources/log4j2.properties
+++ /dev/null
@@ -1,27 +0,0 @@
-appenders = console, file
-appender.console.type = Console
-appender.console.name = STDOUT
-appender.console.layout.type = PatternLayout
-appender.console.layout.pattern = %d{yyyy-MM-dd, HH:mm:ss} %C{6} - %M%n %-5p: %m%n
-
-appender.file.type = File
-appender.file.name = ERRORLOG
-appender.file.fileName=./logs/errors.log
-appender.file.layout.type=PatternLayout
-appender.file.layout.pattern= %d{yyyy-MM-dd, HH:mm:ss} %C{6} - %M%n %-5p: %m%n
-
-rootLogger.level = error
-rootLogger.appenderRefs = stdout
-rootLogger.appenderRef.stdout.ref = STDOUT
-
-loggers=console
-logger.console.name=com.sun.jersey.test.framework.spi.container
-logger.console.level = info
-logger.console.appenderRefs = stdout
-logger.console.appenderRef.file.ref = STDOUT
-
-loggers=file
-logger.file.name=de.ids_mannheim.korap
-logger.file.level = error
-logger.file.appenderRefs = file
-logger.file.appenderRef.file.ref = ERRORLOG
\ No newline at end of file
diff --git a/lite/src/test/java/de/ids_mannheim/korap/config/StaticContextLoaderListener.java b/lite/src/test/java/de/ids_mannheim/korap/config/StaticContextLoaderListener.java
deleted file mode 100644
index 578c94e..0000000
--- a/lite/src/test/java/de/ids_mannheim/korap/config/StaticContextLoaderListener.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package de.ids_mannheim.korap.config;
-
-import org.springframework.web.context.ContextLoaderListener;
-import org.springframework.web.context.WebApplicationContext;
-
-/**
- * A hack to inject the application context generated by
- * SpringJUnit4ClassRunner in the test suite.
- *
- * @author margaretha
- *
- */
-public class StaticContextLoaderListener extends ContextLoaderListener {
-
- public static WebApplicationContext applicationContext;
-
- public StaticContextLoaderListener () {
- super(applicationContext);
- }
-
-
-}
diff --git a/lite/src/test/resources/test-jdbc.properties b/lite/src/test/resources/test-jdbc.properties
deleted file mode 100644
index fe5e550..0000000
--- a/lite/src/test/resources/test-jdbc.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-#-------------------------------------------------------------------------------
-# Sqlite Settings
-
-jdbc.database=sqlite
-jdbc.driverClassName=org.sqlite.JDBC
-jdbc.url=jdbc:sqlite::memory:
-jdbc.username=pc
-jdbc.password=pc
-jdbc.schemaPath=db
\ No newline at end of file