use old ConfigTool

1 files changed, 35 insertions, 37 deletions

diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OAAuthenticationData.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OAAuthenticationData.java
index a9c914f74..0c633f312 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OAAuthenticationData.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OAAuthenticationData.java
@@ -29,20 +29,18 @@ import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
 
-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.AuthComponentOA;
-import at.gv.egovernment.moa.id.commons.db.dao.config.BKUURLS;
-import at.gv.egovernment.moa.id.commons.db.dao.config.DefaultBKUs;
-import at.gv.egovernment.moa.id.commons.db.dao.config.MOAIDConfiguration;
-import at.gv.egovernment.moa.id.commons.db.dao.config.MOAKeyBoxSelector;
-import at.gv.egovernment.moa.id.commons.db.dao.config.Mandates;
-import at.gv.egovernment.moa.id.commons.db.dao.config.OnlineApplication;
-import at.gv.egovernment.moa.id.commons.db.dao.config.TemplateType;
-import at.gv.egovernment.moa.id.commons.db.dao.config.TemplatesType;
-import at.gv.egovernment.moa.id.commons.db.dao.config.TestCredentials;
-import at.gv.egovernment.moa.id.commons.db.dao.config.TestCredentialsCredentialOIDItem;
-import at.gv.egovernment.moa.id.commons.db.dao.config.TransformsInfoType;
+import at.gv.egovernment.moa.id.commons.db.dao.config.deprecated.AuthComponentOA;
+import at.gv.egovernment.moa.id.commons.db.dao.config.deprecated.BKUURLS;
+import at.gv.egovernment.moa.id.commons.db.dao.config.deprecated.DefaultBKUs;
+import at.gv.egovernment.moa.id.commons.db.dao.config.deprecated.MOAIDConfiguration;
+import at.gv.egovernment.moa.id.commons.db.dao.config.deprecated.MOAKeyBoxSelector;
+import at.gv.egovernment.moa.id.commons.db.dao.config.deprecated.Mandates;
+import at.gv.egovernment.moa.id.commons.db.dao.config.deprecated.OnlineApplication;
+import at.gv.egovernment.moa.id.commons.db.dao.config.deprecated.TemplateType;
+import at.gv.egovernment.moa.id.commons.db.dao.config.deprecated.TemplatesType;
+import at.gv.egovernment.moa.id.commons.db.dao.config.deprecated.TestCredentials;
+import at.gv.egovernment.moa.id.commons.db.dao.config.deprecated.TestCredentialsCredentialOIDItem;
+import at.gv.egovernment.moa.id.commons.db.dao.config.deprecated.TransformsInfoType;
 import at.gv.egovernment.moa.id.configuration.Constants;
 import at.gv.egovernment.moa.id.configuration.auth.AuthenticatedUser;
 import at.gv.egovernment.moa.id.configuration.validation.oa.OAAuthenticationDataValidation;
@@ -86,18 +84,18 @@ public class OAAuthenticationData implements IOnlineApplicationData {
 		 
 		 keyBoxIdentifier = MOAKeyBoxSelector.SECURE_SIGNATURE_KEYPAIR.value();
 		 
-		 bkuLocalURL = Constants.DEFAULT_LOCALBKU_URL;
-		 bkuHandyURL = Constants.DEFAULT_HANDYBKU_URL;
-		 
-		 MOAIDConfiguration moaidconfig = ConfigurationDBRead.getMOAIDConfiguration();
-	     if (moaidconfig != null) {
-	    	 DefaultBKUs defaultbkus = moaidconfig.getDefaultBKUs();
-	         if (defaultbkus != null) {
-	             setBkuHandyURL(defaultbkus.getHandyBKU());
-	             setBkuLocalURL(defaultbkus.getLocalBKU());
-	             setBkuOnlineURL(defaultbkus.getOnlineBKU());
-	         }
-	     }		 
+//		 bkuLocalURL = Constants.DEFAULT_LOCALBKU_URL;
+//		 bkuHandyURL = Constants.DEFAULT_HANDYBKU_URL;
+//		 
+//		 MOAIDConfiguration moaidconfig = ConfigurationDBRead.getMOAIDConfiguration();
+//	     if (moaidconfig != null) {
+//	    	 DefaultBKUs defaultbkus = moaidconfig.getDefaultBKUs();
+//	         if (defaultbkus != null) {
+//	             setBkuHandyURL(defaultbkus.getHandyBKU());
+//	             setBkuLocalURL(defaultbkus.getLocalBKU());
+//	             setBkuOnlineURL(defaultbkus.getOnlineBKU());
+//	         }
+//	     }		 
 	}
 	
 	/* (non-Javadoc)
@@ -123,15 +121,15 @@ public class OAAuthenticationData implements IOnlineApplicationData {
 			String defaultlocal = "";
 			String defaultonline = "";
 			
-			MOAIDConfiguration dbconfig = ConfigurationDBRead.getMOAIDConfiguration();
-			if (dbconfig != null) {
-				DefaultBKUs defaultbkus = dbconfig.getDefaultBKUs();
-				if (defaultbkus != null) {
-					defaulthandy = defaultbkus.getHandyBKU();
-					defaultlocal = defaultbkus.getLocalBKU();
-					defaultonline = defaultbkus.getOnlineBKU();
-				}
-			}
+//			MOAIDConfiguration dbconfig = ConfigurationDBRead.getMOAIDConfiguration();
+//			if (dbconfig != null) {
+//				DefaultBKUs defaultbkus = dbconfig.getDefaultBKUs();
+//				if (defaultbkus != null) {
+//					defaulthandy = defaultbkus.getHandyBKU();
+//					defaultlocal = defaultbkus.getLocalBKU();
+//					defaultonline = defaultbkus.getOnlineBKU();
+//				}
+//			}
 			
 			if (bkuurls != null) {
 				
@@ -318,8 +316,8 @@ public class OAAuthenticationData implements IOnlineApplicationData {
         
         if (enableTestCredentials) {
         	TestCredentials testing = authoa.getTestCredentials();        	
-        	if (testing != null)
-        		ConfigurationDBUtils.delete(testing);
+//        	if (testing != null)
+//        		ConfigurationDBUtils.delete(testing);
 
         	testing = new TestCredentials();
     		authoa.setTestCredentials(testing);