use old ConfigTool

1 files changed, 19 insertions, 30 deletions

diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/InterfederationIDPAction.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/InterfederationIDPAction.java
index eead280be..8be24edb4 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/InterfederationIDPAction.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/InterfederationIDPAction.java
@@ -28,12 +28,10 @@ import java.util.List;
 
 import org.apache.log4j.Logger;
 
-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.AttributeProviderPlugin;
-import at.gv.egovernment.moa.id.commons.db.dao.config.IdentificationNumber;
-import at.gv.egovernment.moa.id.commons.db.dao.config.MOAIDConfiguration;
-import at.gv.egovernment.moa.id.commons.db.dao.config.OnlineApplication;
+import at.gv.egovernment.moa.id.commons.db.dao.config.deprecated.AttributeProviderPlugin;
+import at.gv.egovernment.moa.id.commons.db.dao.config.deprecated.IdentificationNumber;
+import at.gv.egovernment.moa.id.commons.db.dao.config.deprecated.MOAIDConfiguration;
+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;
@@ -80,7 +78,7 @@ public class InterfederationIDPAction extends BasicOAAction {
 			populateBasicInformations();
 
 			if (authUser.isAdmin()) {				
-				List<OnlineApplication> dbOAs = ConfigurationDBRead.getAllOnlineApplications();
+				List<OnlineApplication> dbOAs = configuration.getDbRead().getAllOnlineApplications();
 				
 				if (dbOAs == null || dbOAs.size() == 0) {
 					addActionError(LanguageHelper.getErrorString("errors.listOAs.noOA", request));
@@ -104,7 +102,6 @@ public class InterfederationIDPAction extends BasicOAAction {
 			return Constants.STRUTS_ERROR;
 			
 		} finally {
-			ConfigurationDBUtils.closeSession();
 			
 		}
 	}
@@ -147,7 +144,6 @@ public class InterfederationIDPAction extends BasicOAAction {
 			return Constants.STRUTS_ERROR;
 			
 		} finally {
-			ConfigurationDBUtils.closeSession();
 			
 		}
         
@@ -204,7 +200,6 @@ public class InterfederationIDPAction extends BasicOAAction {
 			return e.getStrutsReturnValue();
 			
 		} finally {
-			ConfigurationDBUtils.closeSession();
 			
 		}
 	}
@@ -281,7 +276,7 @@ public class InterfederationIDPAction extends BasicOAAction {
 						onlineapplication.setTarget("MOA-IDP");
 					
 					try {
-						ConfigurationDBUtils.saveOrUpdate(onlineapplication);
+						save(onlineapplication);
 
 			        } catch (MOADatabaseException e) {
 			            log.warn("Online-Application can not be stored.", e);
@@ -292,7 +287,6 @@ public class InterfederationIDPAction extends BasicOAAction {
 	        
 	        //remove session attributes
 	        session.setAttribute(Constants.SESSION_OAID, null);
-	        ConfigurationDBUtils.closeSession();
 	        
 	        addActionMessage(LanguageHelper.getGUIString("webpages.idp.success", getGeneralOA().getIdentifier(), request));
 	        return Constants.STRUTS_SUCCESS;
@@ -306,7 +300,6 @@ public class InterfederationIDPAction extends BasicOAAction {
 			return e.getStrutsReturnValue();
 			
 		} finally {
-			ConfigurationDBUtils.closeSession();
 			
 		}
 	}
@@ -323,7 +316,6 @@ public class InterfederationIDPAction extends BasicOAAction {
 			
 	        session.setAttribute(Constants.SESSION_OAID, null);
 	        addActionMessage(LanguageHelper.getGUIString("webpages.idp.cancle", getGeneralOA().getIdentifier(), request));
-	        ConfigurationDBUtils.closeSession();
 	
 	        return Constants.STRUTS_SUCCESS;
         
@@ -331,7 +323,6 @@ public class InterfederationIDPAction extends BasicOAAction {
 			return Constants.STRUTS_ERROR;
 			
 		} finally {
-			ConfigurationDBUtils.closeSession();
 			
 		}
 	}
@@ -350,21 +341,21 @@ public class InterfederationIDPAction extends BasicOAAction {
 			oaidentifier  = preProcessDeleteOnlineApplication();
 	        
 			session.setAttribute(Constants.SESSION_OAID, null);
-	        OnlineApplication onlineapplication = ConfigurationDBRead.getOnlineApplication(oaidentifier);
+	        OnlineApplication onlineapplication = configuration.getDbRead().getOnlineApplication(oaidentifier);
 	        
-	        try {
-	            if (onlineapplication.getAuthComponentOA().getOAPVP2() != null &&
-	            		MiscUtil.isNotEmpty(onlineapplication.getAuthComponentOA().getOAPVP2().getMetadataURL())) {
-	                MOAIDConfiguration moaconfig = ConfigurationDBRead.getMOAIDConfiguration();
-	                moaconfig.setPvp2RefreshItem(new Date());
-	                ConfigurationDBUtils.saveOrUpdate(moaconfig);
+//	        try {
+//	            if (onlineapplication.getAuthComponentOA().getOAPVP2() != null &&
+//	            		MiscUtil.isNotEmpty(onlineapplication.getAuthComponentOA().getOAPVP2().getMetadataURL())) {
+//	                MOAIDConfiguration moaconfig = configuration.getDbRead().getMOAIDConfiguration();
+//	                moaconfig.setPvp2RefreshItem(new Date());
+//	                ConfigurationDBUtils.saveOrUpdate(moaconfig);
+//	
+//	            }
+//	        } catch (Throwable e) {
+//	            log.info("Found no MetadataURL in OA-Databaseconfig!", e);
+//	        }
 	
-	            }
-	        } catch (Throwable e) {
-	            log.info("Found no MetadataURL in OA-Databaseconfig!", e);
-	        }
-	
-	        if (ConfigurationDBUtils.delete(onlineapplication)) {
+	        if (delete(onlineapplication)) {
 	            addActionMessage(LanguageHelper.getGUIString("webpages.oaconfig.delete.message", oaidentifier, request));
 	            return Constants.STRUTS_SUCCESS;
 	
@@ -381,7 +372,6 @@ public class InterfederationIDPAction extends BasicOAAction {
 			return e.getStrutsReturnValue();
 			
 		} finally {
-			ConfigurationDBUtils.closeSession();
 			
 		}
 		
@@ -404,7 +394,6 @@ public class InterfederationIDPAction extends BasicOAAction {
 
         setNewOA(false);
         
-        ConfigurationDBUtils.closeSession();
 
         formID = Random.nextRandom();
         session.setAttribute(Constants.SESSION_FORMID, formID);