use old ConfigTool

1 files changed, 17 insertions, 15 deletions

diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/ListOAsAction.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/ListOAsAction.java
index 37727c0f0..c6b0965fe 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/ListOAsAction.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/ListOAsAction.java
@@ -35,9 +35,7 @@ import org.apache.struts2.interceptor.ServletResponseAware;
 
 import com.opensymphony.xwork2.ActionSupport;
 
-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.validation.ValidationHelper;
 import at.gv.egovernment.moa.id.config.webgui.exception.ConfigurationException;
@@ -75,13 +73,17 @@ public class ListOAsAction extends BasicAction {
 		List<OnlineApplication> dbOAs = null;
 		
 		if (authUser.isAdmin()) {
-			dbOAs = ConfigurationDBRead.getAllOnlineApplications();
+			dbOAs = configuration.getDbRead().getAllOnlineApplications();
 			
 		} else {
-			UserDatabase authUserDB = ConfigurationDBRead.getUserWithID(authUser.getUserID());
+			UserDatabase authUserDB = configuration.getUserManagement().getUserWithID(authUser.getUserID());
 			
-			if (authUserDB != null)
-				dbOAs = authUserDB.getOnlineApplication();
+			if (authUserDB != null) {
+				for (String el : authUserDB.getOnlineApplication()) {
+					dbOAs.add(configuration.getDbRead().getOnlineApplication(Long.valueOf(el)));
+					
+				}
+			}
 		}
 					
 		if (dbOAs == null || dbOAs.size() == 0) {
@@ -94,7 +96,6 @@ public class ListOAsAction extends BasicAction {
 		session.setAttribute(Constants.SESSION_RETURNAREA, 
 				Constants.STRUTS_RETURNAREA_VALUES.main.name());
 		
-		ConfigurationDBUtils.closeSession();
 		
 		return Constants.STRUTS_SUCCESS;
 	}
@@ -142,19 +143,21 @@ public class ListOAsAction extends BasicAction {
 		List<OnlineApplication> dbOAs = null;
 		
 		if (authUser.isAdmin()) {
-			dbOAs = ConfigurationDBRead.searchOnlineApplications(friendlyname);
+			dbOAs = configuration.getDbRead().searchOnlineApplications(friendlyname);
 			
 		} else {
-			UserDatabase authUserDB = ConfigurationDBRead.getUserWithID(authUser.getUserID());
+			UserDatabase authUserDB = configuration.getUserManagement().getUserWithID(authUser.getUserID());
 			if (authUserDB != null) {
-				List<OnlineApplication> alldbOAs = authUserDB.getOnlineApplication();
+				List<String> alldbOAs = authUserDB.getOnlineApplication();
 				
 				dbOAs = new ArrayList<OnlineApplication>();
 				
-				for (OnlineApplication el : alldbOAs) {
-					if (el.getPublicURLPrefix()
+				for (String el : alldbOAs) {
+					OnlineApplication oa = configuration.getDbRead().getOnlineApplication(Long.valueOf(el));
+					
+					if (oa.getPublicURLPrefix()
 							.toLowerCase().indexOf(friendlyname.toLowerCase()) > -1)
-						dbOAs.add(el);
+						dbOAs.add(oa);
 				}
 			}
 		}
@@ -168,7 +171,6 @@ public class ListOAsAction extends BasicAction {
 			
 		}
 		
-		ConfigurationDBUtils.closeSession();
 	
 		return Constants.STRUTS_SUCCESS;	
 	}