use old ConfigTool

1 files changed, 11 insertions, 18 deletions

diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/IndexAction.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/IndexAction.java
index 1ec0f4668..040931b42 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/IndexAction.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/IndexAction.java
@@ -77,9 +77,7 @@ import org.opensaml.xml.security.x509.X509Credential;
 import org.opensaml.xml.signature.Signature;
 import org.opensaml.xml.signature.impl.ExplicitKeySignatureTrustEngine;
 
-import at.gv.egovernment.moa.id.commons.db.ConfigurationDBRead;
-import at.gv.egovernment.moa.id.commons.db.ConfigurationDBUtils;
-import at.gv.egovernment.moa.id.commons.db.dao.config.OnlineApplication;
+import at.gv.egovernment.moa.id.commons.db.dao.config.deprecated.OnlineApplication;
 import at.gv.egovernment.moa.id.commons.db.dao.config.UserDatabase;
 import at.gv.egovernment.moa.id.commons.db.ex.MOADatabaseException;
 import at.gv.egovernment.moa.id.commons.validation.ValidationHelper;
@@ -187,7 +185,7 @@ public class IndexAction extends BasicAction {
 		}
 		
 		
-		UserDatabase dbuser = ConfigurationDBRead.getUserWithUserName(username);
+		UserDatabase dbuser = configuration.getUserManagement().getUserWithUserName(username);
 		if (dbuser == null) {
 			log.warn("Unknown Username");
 			addActionError(LanguageHelper.getErrorString("webpages.index.login.notallowed", request));
@@ -238,7 +236,7 @@ public class IndexAction extends BasicAction {
 			dbuser.setLastLogin(DateTimeHelper.getDateTime(new Date()));
 			
 			try {
-				ConfigurationDBUtils.saveOrUpdate(dbuser);
+				configuration.getUserManagement().saveOrUpdate(dbuser);
 				
 			} catch (MOADatabaseException e) {
 				log.warn("UserDatabase communicaton error", e);
@@ -246,7 +244,6 @@ public class IndexAction extends BasicAction {
 				return Constants.STRUTS_ERROR;
 			}
 			finally {
-				ConfigurationDBUtils.closeSession();
 			}
 			
 			HttpSession session = generateNewJSession(request);
@@ -400,7 +397,7 @@ public class IndexAction extends BasicAction {
 								(sessionTimeOut * Constants.ONE_MINUTE_IN_MILLIS));
 						
 						//search user
-						UserDatabase dbuser = ConfigurationDBRead.getUserWithUserBPKWBPK(bpkwbpk);
+						UserDatabase dbuser = configuration.getUserManagement().getUserWithUserBPKWBPK(bpkwbpk);
 						if (dbuser == null) {
 							log.info("No user found with bpk/wbpk " + bpkwbpk);
 							
@@ -456,7 +453,6 @@ public class IndexAction extends BasicAction {
 							session.setAttribute(Constants.SESSION_FORM, user);
 							session.setAttribute(Constants.SESSION_AUTH, authUser);	
 							
-							ConfigurationDBUtils.closeSession();
 							
 							return Constants.STRUTS_NEWUSER;
 							
@@ -516,7 +512,7 @@ public class IndexAction extends BasicAction {
 							dbuser.setLastLogin(DateTimeHelper.getDateTime(new Date()));
 							
 							try {
-								ConfigurationDBUtils.saveOrUpdate(dbuser);
+								configuration.getUserManagement().saveOrUpdate(dbuser);
 								
 							} catch (MOADatabaseException e) {
 								log.warn("UserDatabase communicaton error", e);
@@ -524,7 +520,6 @@ public class IndexAction extends BasicAction {
 								return Constants.STRUTS_ERROR;
 							}
 							finally {
-								ConfigurationDBUtils.closeSession();
 							}
 														
 							HttpSession newsession = generateNewJSession(request);
@@ -693,7 +688,7 @@ public class IndexAction extends BasicAction {
 				dbuser.setIsUsernamePasswordAllowed(false);
 				
 			} else 
-				dbuser = ConfigurationDBRead.getUserWithID(userID);
+				dbuser = configuration.getUserManagement().getUserWithID(userID);
 			
 			dbuser.setMail(user.getMail());
 			dbuser.setPhone(user.getPhone());
@@ -702,7 +697,7 @@ public class IndexAction extends BasicAction {
 			dbuser.setUserRequestTokken(Random.nextRandom());
 						
 			try {
-				ConfigurationDBUtils.saveOrUpdate(dbuser);
+				configuration.getUserManagement().saveOrUpdate(dbuser);
 				
 				MailHelper.sendUserMailAddressVerification(dbuser);
 				
@@ -719,7 +714,6 @@ public class IndexAction extends BasicAction {
 			finally {
 				session.setAttribute(Constants.SESSION_FORM, null);
 				session.setAttribute(Constants.SESSION_AUTH, null);	
-				ConfigurationDBUtils.closeSession();
 			}
 			
 			addActionMessage(LanguageHelper.getGUIString("webpages.edituser.changemailaddress.verify", request));
@@ -758,7 +752,7 @@ public class IndexAction extends BasicAction {
 				return Constants.STRUTS_ERROR;
 			}
 			
-			UserDatabase dbuser = ConfigurationDBRead.getNewUserWithTokken(userrequesttokken);
+			UserDatabase dbuser = configuration.getUserManagement().getNewUserWithTokken(userrequesttokken);
 			if (dbuser != null) {
 				dbuser.setUserRequestTokken(null);
 				dbuser.setIsMailAddressVerified(true);
@@ -767,16 +761,16 @@ public class IndexAction extends BasicAction {
 					dbuser.setIsAdminRequest(false);
 				
 				try {
-					ConfigurationDBUtils.saveOrUpdate(dbuser);
+					configuration.getUserManagement().saveOrUpdate(dbuser);
 					
 					int numoas = 0;
 					int numusers = 0;
 					
-					List<OnlineApplication> openOAs = ConfigurationDBRead.getAllNewOnlineApplications();
+					List<OnlineApplication> openOAs = configuration.getDbRead().getAllNewOnlineApplications();
 					if (openOAs != null)
 						numoas = openOAs.size();
 					
-					List<UserDatabase> openUsers = ConfigurationDBRead.getAllNewUsers();
+					List<UserDatabase> openUsers = configuration.getUserManagement().getAllNewUsers();
 					if (openUsers != null)
 						numusers = openUsers.size();
 					
@@ -792,7 +786,6 @@ public class IndexAction extends BasicAction {
 				}
 				
 				finally {
-					ConfigurationDBUtils.closeSession();
 				}
 				
 				addActionMessage(LanguageHelper.getGUIString("validation.newuser.mailaddress", request));