remove deprecated MOA-ID 2.x configuration DAO functionality

4 files changed, 12 insertions, 10 deletions

diff --git a/id/server/modules/module-stork/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/tasks/CreateStorkAuthRequestFormTask.java b/id/server/modules/module-stork/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/tasks/CreateStorkAuthRequestFormTask.java
index 849ce72fe..32915f5e6 100644
--- a/id/server/modules/module-stork/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/tasks/CreateStorkAuthRequestFormTask.java
+++ b/id/server/modules/module-stork/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/tasks/CreateStorkAuthRequestFormTask.java
@@ -52,7 +52,7 @@ import at.gv.egovernment.moa.id.auth.exception.MOAIDException;
 import at.gv.egovernment.moa.id.auth.exception.WrongParametersException;

 import at.gv.egovernment.moa.id.auth.modules.AbstractAuthServletTask;

 import at.gv.egovernment.moa.id.auth.modules.TaskExecutionException;

-import at.gv.egovernment.moa.id.commons.db.ConfigurationDBUtils;

+

 import at.gv.egovernment.moa.id.commons.db.ex.MOADatabaseException;

 import at.gv.egovernment.moa.id.config.ConfigurationException;

 import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProviderFactory;

@@ -152,7 +152,7 @@ public class CreateStorkAuthRequestFormTask extends AbstractAuthServletTask {
 		}

 

 		finally {

-			ConfigurationDBUtils.closeSession();

+			

 		}

 	}

 	

diff --git a/id/server/modules/module-stork/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/tasks/PepsConnectorHandleLocalSignResponseTask.java b/id/server/modules/module-stork/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/tasks/PepsConnectorHandleLocalSignResponseTask.java
index 1ae66f24e..10eeea97a 100644
--- a/id/server/modules/module-stork/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/tasks/PepsConnectorHandleLocalSignResponseTask.java
+++ b/id/server/modules/module-stork/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/tasks/PepsConnectorHandleLocalSignResponseTask.java
@@ -24,13 +24,14 @@ import at.gv.egovernment.moa.id.auth.exception.AuthenticationException;
 import at.gv.egovernment.moa.id.auth.exception.MOAIDException;

 import at.gv.egovernment.moa.id.auth.modules.TaskExecutionException;

 import at.gv.egovernment.moa.id.auth.stork.STORKException;

-import at.gv.egovernment.moa.id.commons.db.ConfigurationDBUtils;

+

 import at.gv.egovernment.moa.id.moduls.ModulUtils;

 import at.gv.egovernment.moa.id.process.api.ExecutionContext;

 import at.gv.egovernment.moa.id.storage.AuthenticationSessionStoreage;

 import at.gv.egovernment.moa.id.util.VelocityProvider;

 import at.gv.egovernment.moa.logging.Logger;

 import at.gv.egovernment.moa.spss.api.xmlverify.VerifyXMLSignatureResponse;

+import at.gv.egovernment.moa.util.Base64Utils;

 import eu.stork.oasisdss.api.ApiUtils;

 import eu.stork.oasisdss.profile.SignResponse;

 import eu.stork.peps.auth.commons.IPersonalAttributeList;

@@ -113,7 +114,7 @@ public class PepsConnectorHandleLocalSignResponseTask extends AbstractPepsConnec
 

 			pendingRequestID = AuthenticationSessionStoreage.getPendingRequestID(moaSessionID);

 			Logger.info("pendingRequestID:" + pendingRequestID);

-			String signResponseString = new String(Base64.decodeBase64(signResponse), "UTF8");

+			String signResponseString = new String(Base64Utils.decode(signResponse, false), "UTF8");

 			Logger.info("RECEIVED signresponse:" + signResponseString);

 			// create SignResponse object

 			Source response1 = new StreamSource(new java.io.StringReader(signResponseString));

@@ -211,7 +212,7 @@ public class PepsConnectorHandleLocalSignResponseTask extends AbstractPepsConnec
 		}

 

 		finally {

-			ConfigurationDBUtils.closeSession();

+			

 		}

 	}

 

diff --git a/id/server/modules/module-stork/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/tasks/PepsConnectorHandleResponseWithoutSignatureTask.java b/id/server/modules/module-stork/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/tasks/PepsConnectorHandleResponseWithoutSignatureTask.java
index 7a98abaff..d16719b3b 100644
--- a/id/server/modules/module-stork/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/tasks/PepsConnectorHandleResponseWithoutSignatureTask.java
+++ b/id/server/modules/module-stork/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/tasks/PepsConnectorHandleResponseWithoutSignatureTask.java
@@ -29,7 +29,7 @@ import at.gv.egovernment.moa.id.auth.exception.MOAIDException;
 import at.gv.egovernment.moa.id.auth.modules.TaskExecutionException;

 import at.gv.egovernment.moa.id.auth.stork.STORKException;

 import at.gv.egovernment.moa.id.auth.stork.STORKResponseProcessor;

-import at.gv.egovernment.moa.id.commons.db.ConfigurationDBUtils;

+

 import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProviderFactory;

 import at.gv.egovernment.moa.id.config.stork.StorkAttributeProviderPlugin;

 import at.gv.egovernment.moa.id.moduls.ModulUtils;

@@ -38,6 +38,7 @@ import at.gv.egovernment.moa.id.storage.AuthenticationSessionStoreage;
 import at.gv.egovernment.moa.id.util.HTTPUtils;

 import at.gv.egovernment.moa.id.util.VelocityProvider;

 import at.gv.egovernment.moa.logging.Logger;

+import at.gv.egovernment.moa.util.Base64Utils;

 import at.gv.egovernment.moa.util.StringUtils;

 import eu.stork.oasisdss.api.ApiUtils;

 import eu.stork.oasisdss.profile.SignRequest;

@@ -411,7 +412,7 @@ public class PepsConnectorHandleResponseWithoutSignatureTask extends AbstractPep
 		}

 

 		finally {

-			ConfigurationDBUtils.closeSession();

+			

 		}

 

 	}

@@ -431,7 +432,7 @@ public class PepsConnectorHandleResponseWithoutSignatureTask extends AbstractPep
 			SignRequest signRequest = ApiUtils.unmarshal(signDoc, SignRequest.class);

 			signRequest.setReturnURL("TODO");

 			signRequestString = IOUtils.toString(ApiUtils.marshalToInputStream(signRequest));

-			context.put("signrequest", Base64.encodeBase64String(signRequestString.getBytes("UTF8")));

+			context.put("signrequest", Base64Utils.encode(signRequestString.getBytes("UTF8")));

 			context.put("clienturl", url);

 			context.put("action", oasisDssWebFormURL);

 

diff --git a/id/server/modules/module-stork/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/tasks/PepsConnectorTask.java b/id/server/modules/module-stork/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/tasks/PepsConnectorTask.java
index 9bbd7e46f..fa1b0472c 100644
--- a/id/server/modules/module-stork/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/tasks/PepsConnectorTask.java
+++ b/id/server/modules/module-stork/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/tasks/PepsConnectorTask.java
@@ -44,7 +44,7 @@ import at.gv.egovernment.moa.id.auth.modules.TaskExecutionException;
 import at.gv.egovernment.moa.id.auth.parser.IdentityLinkAssertionParser;

 import at.gv.egovernment.moa.id.auth.stork.STORKException;

 import at.gv.egovernment.moa.id.auth.stork.STORKResponseProcessor;

-import at.gv.egovernment.moa.id.commons.db.ConfigurationDBUtils;

+

 import at.gv.egovernment.moa.id.config.auth.AuthConfiguration;

 import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProviderFactory;

 import at.gv.egovernment.moa.id.config.auth.OAAuthParameter;

@@ -630,7 +630,7 @@ public class PepsConnectorTask extends AbstractAuthServletTask {
 		}

 

 		finally {

-			ConfigurationDBUtils.closeSession();

+			

 		}

 

 	}