Updated readme (moved further setup to wiki).
Change-Id: Ib78acf9437dceae43bd72d52cbab48e7837ca156
diff --git a/full/Changes b/full/Changes
index 8d9febb..02416e2 100644
--- a/full/Changes
+++ b/full/Changes
@@ -1,5 +1,5 @@
version 0.60 release
-08/03/2018
+13/03/2018
- set up mail settings using localhost port 25 (margaretha)
- added mail template in kustvakt configuration (margaretha)
- added mail settings to readme (margaretha)
diff --git a/full/src/main/java/de/ids_mannheim/korap/web/controller/UserGroupController.java b/full/src/main/java/de/ids_mannheim/korap/web/controller/UserGroupController.java
index f205609..0bb4678 100644
--- a/full/src/main/java/de/ids_mannheim/korap/web/controller/UserGroupController.java
+++ b/full/src/main/java/de/ids_mannheim/korap/web/controller/UserGroupController.java
@@ -119,7 +119,6 @@
*/
@DELETE
@Path("delete")
- @Consumes(MediaType.APPLICATION_JSON)
public Response deleteUserGroup (@Context SecurityContext securityContext,
@QueryParam("groupId") int groupId) {
TokenContext context =
@@ -142,7 +141,6 @@
*/
@DELETE
@Path("member/delete")
- @Consumes(MediaType.APPLICATION_JSON)
public Response deleteUserFromGroup (
@Context SecurityContext securityContext,
@QueryParam("memberId") String memberId,
diff --git a/full/src/main/resources/kustvakt.conf b/full/src/main/resources/kustvakt.conf
index a6b2c1d..31d6f11 100644
--- a/full/src/main/resources/kustvakt.conf
+++ b/full/src/main/resources/kustvakt.conf
@@ -24,11 +24,11 @@
template.group.invitation = notification.vm
## default layers
-default.layer.p = tt
-default.layer.l = tt
-default.layer.o = opennlp
-default.layer.d = mate
-default.layer.c = corenlp
+default.layer.partOfSpeech = tt
+default.layer.lemma = tt
+default.layer.orthography = opennlp
+default.layer.dependency = mate
+default.layer.constituent = corenlp
## delete configuration (default hard)
# delete.auto.group = hard
diff --git a/full/src/test/resources/kustvakt-test.conf b/full/src/test/resources/kustvakt-test.conf
index 8a9f170..c99ee5e 100644
--- a/full/src/test/resources/kustvakt-test.conf
+++ b/full/src/test/resources/kustvakt-test.conf
@@ -24,11 +24,11 @@
template.group.invitation = notification.vm
## default layers
-default.layer.p = tt
-default.layer.l = tt
-default.layer.o = opennlp
-default.layer.d = mate
-default.layer.c = corenlp
+default.layer.partOfSpeech = tt
+default.layer.lemma = tt
+default.layer.orthography = opennlp
+default.layer.dependency = mate
+default.layer.constituent = corenlp
## delete configuration (default hard)
# delete.auto.group = hard