Updated configs.
Change-Id: I99a81881df87619c5175d5220c5cf79d78eceb9a
diff --git a/Changes b/Changes
index b256950..58194d9 100644
--- a/Changes
+++ b/Changes
@@ -1,7 +1,8 @@
# version 0.79
-- Add a test: changing timeout using a pipe
- Implement timeout rewrite
+- Add a test: changing timeout using a pipe
+- Add pipe response rewriting (#794)
# version 0.78.2
diff --git a/src/main/resources/kustvakt-lite.conf b/src/main/resources/kustvakt-lite.conf
index eaa8cd5..ba32850 100644
--- a/src/main/resources/kustvakt-lite.conf
+++ b/src/main/resources/kustvakt-lite.conf
@@ -21,8 +21,12 @@
# default
kustvakt.base.url=/api/*
-# Pipe (Please change or commented for production!)
-pipe.host = http://localhost
+# server
+server.port=8089
+server.host=localhost
+
+# Pipe (optional)
+# pipe.host=https://korap.ids-mannheim.de (default)
# default foundries for layers
default.foundry.partOfSpeech = tt
@@ -32,7 +36,3 @@
default.foundry.constituent = corenlp
default.foundry.morphology = marmot
default.foundry.surface = base
-
-# server
-server.port=8089
-server.host=localhost
diff --git a/src/main/resources/kustvakt.conf b/src/main/resources/kustvakt.conf
index 96a5823..0d261dc 100644
--- a/src/main/resources/kustvakt.conf
+++ b/src/main/resources/kustvakt.conf
@@ -21,6 +21,9 @@
server.port=8089
server.host=localhost
+# Pipe (optional)
+# pipe.host=https://korap.ids-mannheim.de (default)
+
# default foundries for specific layers
default.foundry.partOfSpeech = tt
default.foundry.lemma = tt
@@ -30,11 +33,6 @@
default.foundry.morphology = marmot
default.foundry.surface = base
-# delete configuration (default hard)
-# delete.auto.group = hard
-delete.group = soft
-delete.group.member = soft
-
# Availability regex only support |
# It should be removed/commented when the data doesn't contain availability field.
diff --git a/src/test/resources/kustvakt-dnb.conf b/src/test/resources/kustvakt-dnb.conf
index c940eb8..ed698c6 100644
--- a/src/test/resources/kustvakt-dnb.conf
+++ b/src/test/resources/kustvakt-dnb.conf
@@ -40,12 +40,6 @@
default.foundry.morphology = marmot
default.foundry.surface = base
-# Delete configuration (default hard)
-#
-# delete.auto.group = hard
-delete.group = soft
-delete.group.member = soft
-
# Virtual corpus and queries
max.user.persistent.queries = 5
diff --git a/src/test/resources/kustvakt-icc.conf b/src/test/resources/kustvakt-icc.conf
index 9e851c9..79e472a 100644
--- a/src/test/resources/kustvakt-icc.conf
+++ b/src/test/resources/kustvakt-icc.conf
@@ -30,12 +30,6 @@
default.foundry.morphology = marmot
default.foundry.surface = base
-# delete configuration (default hard)
-# delete.auto.group = hard
-delete.group = soft
-delete.group.member = soft
-
-
# availability regex only support |
# It should be removed/commented when the data doesn't contain availability field.
#
diff --git a/src/test/resources/kustvakt-test.conf b/src/test/resources/kustvakt-test.conf
index a048478..045dda9 100644
--- a/src/test/resources/kustvakt-test.conf
+++ b/src/test/resources/kustvakt-test.conf
@@ -28,12 +28,14 @@
server.port=8089
server.host=localhost
+# Pipe (optional)
+# pipe.host=https://korap.ids-mannheim.de (default)
+# LOCALHOST ONLY FOR TESTING
+pipe.host=http://localhost
+
## Cache
cache.total.results.enabled = true
-# Pipe
-pipe.host=http://localhost
-
# Default foundries for specific layers (optional)
#
default.foundry.partOfSpeech = tt
@@ -44,12 +46,6 @@
default.foundry.morphology = marmot
default.foundry.surface = base
-# Delete configuration (default hard)
-#
-# delete.auto.group = hard
-#delete.group = soft
-delete.group.member = soft
-
# Virtual corpus and queries
max.user.persistent.queries = 5
max.token.context.size = 40
diff --git a/src/test/resources/test-config-lite.xml b/src/test/resources/test-config-lite.xml
index 703ad29..0a3451d 100644
--- a/src/test/resources/test-config-lite.xml
+++ b/src/test/resources/test-config-lite.xml
@@ -30,8 +30,8 @@
<value>classpath:test-jdbc.properties</value>
<value>file:./test-jdbc.properties</value>
<value>classpath:test-hibernate.properties</value>
- <value>classpath:kustvakt-lite.conf</value>
- <value>file:./kustvakt-lite.conf</value>
+ <value>classpath:kustvakt-lite-test.conf</value>
+ <value>file:./kustvakt-lite-test.conf</value>
</array>
</property>
</bean>
@@ -41,8 +41,8 @@
<property name="ignoreResourceNotFound" value="true" />
<property name="locations">
<array>
- <value>classpath:kustvakt-lite.conf</value>
- <value>file:./kustvakt-lite.conf</value>
+ <value>classpath:kustvakt-lite-test.conf</value>
+ <value>file:./kustvakt-lite-test.conf</value>
</array>
</property>
</bean>