Added admin-related SQL codes, updated AdminDao & group list controller.
Change-Id: I0000000000000000000000000000000000000000
diff --git a/core/Changes b/core/Changes
index 0ad7a54..00b1efe 100644
--- a/core/Changes
+++ b/core/Changes
@@ -1,3 +1,8 @@
+version 0.60.1
+14/03/2018
+ - removed AdminHandlerIface (margaretha)
+ - removed isSystemAdmin in User class (margaretha)
+
version 0.60
13/03/2018
- removed old policy and deprecated code (margaretha)
diff --git a/core/pom.xml b/core/pom.xml
index 9b8bce9..9f94268 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.60</version>
+ <version>0.60.1</version>
<properties>
<java.version>1.8</java.version>
diff --git a/core/src/main/java/de/ids_mannheim/korap/config/ContextHolder.java b/core/src/main/java/de/ids_mannheim/korap/config/ContextHolder.java
index 4139f5b..b32bb3b 100644
--- a/core/src/main/java/de/ids_mannheim/korap/config/ContextHolder.java
+++ b/core/src/main/java/de/ids_mannheim/korap/config/ContextHolder.java
@@ -106,11 +106,6 @@
return getBean(KUSTVAKT_USERDB);
}
- public AdminHandlerIface getAdminDBHandler () {
- return getBean(KUSTVAKT_ADMINDB);
- }
-
-
public PolicyHandlerIface getPolicyDbProvider () {
Object b = getBean(KUSTVAKT_POLICIES);
return (PolicyHandlerIface) b;
diff --git a/core/src/main/java/de/ids_mannheim/korap/interfaces/db/AdminHandlerIface.java b/core/src/main/java/de/ids_mannheim/korap/interfaces/db/AdminHandlerIface.java
deleted file mode 100644
index f9f56d6..0000000
--- a/core/src/main/java/de/ids_mannheim/korap/interfaces/db/AdminHandlerIface.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package de.ids_mannheim.korap.interfaces.db;
-
-import de.ids_mannheim.korap.exceptions.KustvaktException;
-import de.ids_mannheim.korap.user.User;
-
-/**
- * @author margaretha
- */
-public interface AdminHandlerIface {
-
- int updateAccount (User user) throws KustvaktException;
-
-
- int addAccount (User user) throws KustvaktException;
-
-
- int deleteAccount (Integer userid) throws KustvaktException;
-
-
- int truncate () throws KustvaktException;
-
- boolean isAdmin(int userId);
-
-}
diff --git a/core/src/main/java/de/ids_mannheim/korap/user/User.java b/core/src/main/java/de/ids_mannheim/korap/user/User.java
index 3cba4a2..871beb8 100644
--- a/core/src/main/java/de/ids_mannheim/korap/user/User.java
+++ b/core/src/main/java/de/ids_mannheim/korap/user/User.java
@@ -48,7 +48,7 @@
private List<Userdata> userdata;
- private boolean isSystemAdmin;
+// private boolean isSystemAdmin;
// Values for corpusAccess:
public enum CorpusAccess {