aboutsummaryrefslogtreecommitdiff
path: root/id/server/idserverlib/src/main
diff options
context:
space:
mode:
authorThomas Lenz <tlenz@iaik.tugraz.at>2013-07-04 10:19:36 +0200
committerThomas Lenz <tlenz@iaik.tugraz.at>2013-07-04 10:19:36 +0200
commit93693295a56548bd40af031ab0df364f0a8dd5dc (patch)
tree0ef22f7c873a27b2cc5b7cd12c3da762b726ff2c /id/server/idserverlib/src/main
parentb73822979de23a3b7236411a7a737e2c93642a7d (diff)
downloadmoa-id-spss-93693295a56548bd40af031ab0df364f0a8dd5dc.tar.gz
moa-id-spss-93693295a56548bd40af031ab0df364f0a8dd5dc.tar.bz2
moa-id-spss-93693295a56548bd40af031ab0df364f0a8dd5dc.zip
Datenbankteile für SSO:
-alte SSO Session IDs -angemeldete OAs
Diffstat (limited to 'id/server/idserverlib/src/main')
-rw-r--r--id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/storage/AssertionStorage.java2
-rw-r--r--id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/storage/AuthenticationSessionStoreage.java12
2 files changed, 7 insertions, 7 deletions
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/storage/AssertionStorage.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/storage/AssertionStorage.java
index adb0b15ab..b5de788af 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/storage/AssertionStorage.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/storage/AssertionStorage.java
@@ -12,7 +12,7 @@ import org.hibernate.Query;
import org.hibernate.Session;
import at.gv.egovernment.moa.id.commons.db.HibernateUtil;
-import at.gv.egovernment.moa.id.commons.db.dao.AssertionStore;
+import at.gv.egovernment.moa.id.commons.db.dao.session.AssertionStore;
import at.gv.egovernment.moa.id.commons.db.ex.MOADatabaseException;
import at.gv.egovernment.moa.logging.Logger;
import at.gv.egovernment.moa.util.MiscUtil;
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/storage/AuthenticationSessionStoreage.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/storage/AuthenticationSessionStoreage.java
index 5664b3b08..70156deb7 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/storage/AuthenticationSessionStoreage.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/storage/AuthenticationSessionStoreage.java
@@ -18,8 +18,8 @@ import at.gv.egovernment.moa.id.AuthenticationException;
import at.gv.egovernment.moa.id.MOAIDException;
import at.gv.egovernment.moa.id.auth.data.AuthenticationSession;
import at.gv.egovernment.moa.id.commons.db.HibernateUtil;
-import at.gv.egovernment.moa.id.commons.db.dao.AssertionStore;
-import at.gv.egovernment.moa.id.commons.db.dao.AuthenticatedSessionStore;
+import at.gv.egovernment.moa.id.commons.db.dao.session.AssertionStore;
+import at.gv.egovernment.moa.id.commons.db.dao.session.AuthenticatedSessionStore;
import at.gv.egovernment.moa.id.commons.db.ex.MOADatabaseException;
import at.gv.egovernment.moa.id.util.Random;
import at.gv.egovernment.moa.logging.Logger;
@@ -199,11 +199,11 @@ public class AuthenticationSessionStoreage {
for(AuthenticatedSessionStore result : results) {
try {
HibernateUtil.delete(result);
- Logger.info("Remove Assertion with Artifact=" + result.getSessionid()
- + " after assertion timeout.");
+ Logger.info("Authenticated session with sessionID=" + result.getSessionid()
+ + " after session timeout.");
} catch (HibernateException e){
- Logger.warn("Assertion with Artifact=" + result.getSessionid()
+ Logger.warn("Authenticated session with sessionID=" + result.getSessionid()
+ " not removed after timeout! (Error during Database communication)", e);
}
@@ -213,7 +213,7 @@ public class AuthenticationSessionStoreage {
@SuppressWarnings("rawtypes")
private static AuthenticatedSessionStore searchInDatabase(String sessionID) throws MOADatabaseException {
- MiscUtil.assertNotNull(sessionID, "artifact");
+ MiscUtil.assertNotNull(sessionID, "moasessionID");
Logger.trace("Get authenticated session with sessionID " + sessionID + " from database.");
Session session = HibernateUtil.getCurrentSession();