From 02be9260fa6b3c84a9cbd7df2c53c7a4ec9e1dd6 Mon Sep 17 00:00:00 2001 From: Thomas Lenz Date: Thu, 23 Jul 2015 14:53:03 +0200 Subject: update log messages with loglevel INFO --- .../moa/id/auth/builder/AuthenticationBlockAssertionBuilder.java | 4 ++-- .../main/java/at/gv/egovernment/moa/id/auth/builder/BPKBuilder.java | 4 ++-- .../id/auth/modules/internal/tasks/FinalizeAuthenticationTask.java | 5 ++--- .../auth/modules/internal/tasks/PrepareAuthBlockSignatureTask.java | 4 ---- .../moa/id/auth/servlet/GenerateIFrameTemplateServlet.java | 4 +++- .../egovernment/moa/id/auth/servlet/ProcessEngineSignalServlet.java | 2 +- .../gv/egovernment/moa/id/auth/servlet/SSOSendAssertionServlet.java | 2 +- 7 files changed, 11 insertions(+), 14 deletions(-) (limited to 'id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth') diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/AuthenticationBlockAssertionBuilder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/AuthenticationBlockAssertionBuilder.java index 81699bcdf..760d28d5b 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/AuthenticationBlockAssertionBuilder.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/AuthenticationBlockAssertionBuilder.java @@ -267,7 +267,7 @@ public class AuthenticationBlockAssertionBuilder extends AuthenticationAssertion try { OAAuthParameter oaparam = AuthConfigurationProviderFactory.getInstance().getOnlineApplicationParameter(session.getPublicOAURLPrefix()); if (MiscUtil.isNotEmpty(oaparam.getAditionalAuthBlockText())) { - Logger.info("Use addional AuthBlock Text from OA=" + oaparam.getPublicURLPrefix()); + Logger.debug("Use addional AuthBlock Text from OA=" + oaparam.getPublicURLPrefix()); text = oaparam.getAditionalAuthBlockText(); } @@ -422,7 +422,7 @@ public class AuthenticationBlockAssertionBuilder extends AuthenticationAssertion try { OAAuthParameter oaparam = AuthConfigurationProviderFactory.getInstance().getOnlineApplicationParameter(session.getPublicOAURLPrefix()); if (MiscUtil.isNotEmpty(oaparam.getAditionalAuthBlockText())) { - Logger.info("Use addional AuthBlock Text from OA=" + oaparam.getPublicURLPrefix()); + Logger.debug("Use addional AuthBlock Text from OA=" + oaparam.getPublicURLPrefix()); text = oaparam.getAditionalAuthBlockText(); } } catch (ConfigurationException e) { diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/BPKBuilder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/BPKBuilder.java index 063d7d8e4..1cf6929e6 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/BPKBuilder.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/BPKBuilder.java @@ -245,7 +245,7 @@ public class BPKBuilder { identificationValue = calculateStorkeIdentifierBase(baseID, sourceCountry, destinationCountry); } else { // if not, sector identification value is already calculated by BKU - Logger.info("STORK eIdentifier already provided by BKU"); + Logger.debug("STORK eIdentifier already provided by BKU"); identificationValue = baseID; } @@ -267,7 +267,7 @@ public class BPKBuilder { private String calculateStorkeIdentifierBase(String baseID, String sourceCountry, String destinationCountry) throws BuildException { String basisbegriff = baseID + "+" + Constants.URN_PREFIX_STORK + "+" + sourceCountry + "+" + destinationCountry; - Logger.info("Building STORK identification from: [identValue]+" + Constants.URN_PREFIX_STORK + "+" + sourceCountry + "+" + destinationCountry); + Logger.debug("Building STORK identification from: [identValue]+" + Constants.URN_PREFIX_STORK + "+" + sourceCountry + "+" + destinationCountry); return calculatebPKwbPK(basisbegriff); } diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/tasks/FinalizeAuthenticationTask.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/tasks/FinalizeAuthenticationTask.java index 45b5e3a7e..28bed7713 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/tasks/FinalizeAuthenticationTask.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/tasks/FinalizeAuthenticationTask.java @@ -93,10 +93,9 @@ public class FinalizeAuthenticationTask extends AbstractAuthServletTask { //Session is implicte stored in changeSessionID!!! String newMOASessionID = AuthenticationSessionStoreage.changeSessionID(session); - - Logger.info("Changed MOASession " + oldsessionID + " to Session " + newMOASessionID); - Logger.info("Daten angelegt zu MOASession " + newMOASessionID); + Logger.info("AuthProcess finished. Redirect to Protocol Dispatcher."); + String redirectURL = new DataURLBuilder().buildDataURL(session.getAuthURL(), ModulUtils.buildAuthURL(session.getModul(), session.getAction(), pendingReq.getRequestID()), newMOASessionID); diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/tasks/PrepareAuthBlockSignatureTask.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/tasks/PrepareAuthBlockSignatureTask.java index c172fc6f3..4dcd48f57 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/tasks/PrepareAuthBlockSignatureTask.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/tasks/PrepareAuthBlockSignatureTask.java @@ -72,10 +72,6 @@ public class PrepareAuthBlockSignatureTask extends AbstractAuthServletTask { // change MOASessionID sessionID = AuthenticationSessionStoreage.changeSessionID(session); - Logger.info("Normal"); - - // TODO[branch]: Default behaviour; respond with CXSR for authblock signature, dataURL "/VerifyAuthBlock" - OAAuthParameter oaParam = AuthConfigurationProviderFactory.getInstance().getOnlineApplicationParameter( session.getPublicOAURLPrefix()); AuthConfiguration authConf = AuthConfigurationProviderFactory.getInstance(); diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GenerateIFrameTemplateServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GenerateIFrameTemplateServlet.java index b7b2ea95f..c33cb3d81 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GenerateIFrameTemplateServlet.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GenerateIFrameTemplateServlet.java @@ -63,7 +63,7 @@ public class GenerateIFrameTemplateServlet extends AuthServlet { protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { - Logger.info("Receive " + GenerateIFrameTemplateServlet.class + " Request"); + Logger.debug("Receive " + GenerateIFrameTemplateServlet.class + " Request"); String pendingRequestID = null; @@ -194,6 +194,8 @@ public class GenerateIFrameTemplateServlet extends AuthServlet { throw new MOAIDException("init.04", new Object[] { moasession.getSessionID() }); } + Logger.info("BKU is selected -> Start BKU communication ..."); + // start process getProcessEngine().start(processInstanceId); diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/ProcessEngineSignalServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/ProcessEngineSignalServlet.java index 0f9eed8ec..ee995e16b 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/ProcessEngineSignalServlet.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/ProcessEngineSignalServlet.java @@ -100,7 +100,7 @@ public class ProcessEngineSignalServlet extends AuthServlet { handleError(null, ex, req, resp, pendingRequestID); } finally { - MOASessionDBUtils.closeSession(); + //MOASessionDBUtils.closeSession(); TransactionIDUtils.removeTransactionId(); TransactionIDUtils.removeSessionId(); diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/SSOSendAssertionServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/SSOSendAssertionServlet.java index d116f473c..600ef2c76 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/SSOSendAssertionServlet.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/SSOSendAssertionServlet.java @@ -59,7 +59,7 @@ public class SSOSendAssertionServlet extends AuthServlet{ throws ServletException, IOException { String id = null; - Logger.info("Receive " + SSOSendAssertionServlet.class + " Request"); + Logger.debug("Receive " + SSOSendAssertionServlet.class + " Request"); try { Object idObject = req.getParameter(ID); -- cgit v1.2.3