aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpdanner <pdanner@d688527b-c9ab-4aba-bd8d-4036d912da1d>2007-10-19 11:55:03 +0000
committerpdanner <pdanner@d688527b-c9ab-4aba-bd8d-4036d912da1d>2007-10-19 11:55:03 +0000
commite517ea48f034566c0da28c76fcf9d8b33988b69e (patch)
treeaecde45a65df2264ae43d1838d4f601835bf0c45
parent6f2ee1010dac8d42aba52d33a716a91a50f1f136 (diff)
downloadmoa-id-spss-e517ea48f034566c0da28c76fcf9d8b33988b69e.tar.gz
moa-id-spss-e517ea48f034566c0da28c76fcf9d8b33988b69e.tar.bz2
moa-id-spss-e517ea48f034566c0da28c76fcf9d8b33988b69e.zip
Changed party representation process from form based path to security layer path
git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@1027 d688527b-c9ab-4aba-bd8d-4036d912da1d
-rw-r--r--id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/ProcessValidatorInputServlet.java2
-rw-r--r--id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/parep/ParepInputProcessorImpl.java1
-rw-r--r--id/server/idserverlib/src/main/resources/resources/templates/ParepMinTemplate.html5
-rw-r--r--id/server/idserverlib/src/main/resources/resources/templates/ParepTemplate.html5
4 files changed, 8 insertions, 5 deletions
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/ProcessValidatorInputServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/ProcessValidatorInputServlet.java
index c41e39466..89834307d 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/ProcessValidatorInputServlet.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/ProcessValidatorInputServlet.java
@@ -69,7 +69,7 @@ public class ProcessValidatorInputServlet extends AuthServlet {
InfoboxValidator infoboxvalidator = session.getFirstPendingValidator();
String outputStream;
String dataURL = new DataURLBuilder().buildDataURL(
- session.getAuthURL(), AuthenticationServer.REQ_VERIFY_AUTH_BLOCK, sessionID);
+ session.getAuthURL(), AuthenticationServer.REQ_PROCESS_VALIDATOR_INPUT, sessionID);
if (infoboxvalidator!=null) {
outputStream = infoboxvalidator.getForm();
// replace strings the validators can not know
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/parep/ParepInputProcessorImpl.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/parep/ParepInputProcessorImpl.java
index bfbbaede6..1501dad57 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/parep/ParepInputProcessorImpl.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/parep/ParepInputProcessorImpl.java
@@ -235,6 +235,7 @@ public class ParepInputProcessorImpl implements ParepInputProcessor{
instream = new FileInputStream(fileName);
} else {
fileName = parepConfiguration.getFullDirectoryName(fileName);
+ if (fileName.startsWith("file:\\")) fileName = fileName.substring(6);
file = new File(fileName);
if (file.exists()) {
//if this resolves to a file, load it
diff --git a/id/server/idserverlib/src/main/resources/resources/templates/ParepMinTemplate.html b/id/server/idserverlib/src/main/resources/resources/templates/ParepMinTemplate.html
index 84aaf2072..958f486da 100644
--- a/id/server/idserverlib/src/main/resources/resources/templates/ParepMinTemplate.html
+++ b/id/server/idserverlib/src/main/resources/resources/templates/ParepMinTemplate.html
@@ -7,7 +7,7 @@
</head>
<body>
Berufsm&auml;&szlig;ige Parteienvertretung einer nat&uuml;rlichen/juristischen Person
-<form name="ProcessInputForm" method="post" accept-charset="UTF-8" enctype="application/x-www-form-urlencoded" action="<BASE_href>ProcessInput">
+<form name="ProcessInputForm" method="post" accept-charset="UTF-8" enctype="application/x-www-form-urlencoded" action="<BKU>">
<table width="80%" border="0">
<tr/>
<tr/>
@@ -127,7 +127,8 @@ Berufsm&auml;&szlig;ige Parteienvertretung einer nat&uuml;rlichen/juristischen P
</table>
<br/><errortext>
<p><em>Bitte halten Sie Ihre B&uuml;rgerkartenumgebung bereit.</em></p> <p>
- <input name="MOASessionID_" type="hidden" id="MOASessionID" value="<MOASessionID>"/>
+ <input name="XMLRequest" type="hidden" value="&lt;?xml version='1.0' encoding='UTF-8'?>&lt;NullOperationRequest xmlns='http://www.buergerkarte.at/namespaces/securitylayer/1.2#'/>"/>
+ <input name="DataURL" type="hidden" value="<DataURL>"/>
<input type="submit" name="Submit" value=" Weiter "/>
<input name="Clear" type="reset" id="Clear" value="Formular zur&uuml;cksetzen"/> </p></form>
</body>
diff --git a/id/server/idserverlib/src/main/resources/resources/templates/ParepTemplate.html b/id/server/idserverlib/src/main/resources/resources/templates/ParepTemplate.html
index be07400a8..dc35b644c 100644
--- a/id/server/idserverlib/src/main/resources/resources/templates/ParepTemplate.html
+++ b/id/server/idserverlib/src/main/resources/resources/templates/ParepTemplate.html
@@ -42,7 +42,7 @@ Bitte beachten Sie
<h2>Berufsm&auml;&szlig;ige Parteienvertretung einer nat&uuml;rlichen/juristischen Person
</h2>
<div class="boundingbox">
-<form name="ProcessInputForm" method="post" accept-charset="UTF-8" enctype="application/x-www-form-urlencoded" action="<BASE_href>ProcessInput">
+<form name="ProcessInputForm" method="post" accept-charset="UTF-8" enctype="application/x-www-form-urlencoded" action="<BKU>">
<table width="80%" border="0">
<tr/>
<tr/>
@@ -162,7 +162,8 @@ Bitte beachten Sie
</table>
<br/><errortext>
<p><em>Bitte halten Sie Ihre B&uuml;rgerkartenumgebung bereit.</em></p> <p>
- <input name="MOASessionID_" type="hidden" id="MOASessionID" value="<MOASessionID>"/>
+ <input name="XMLRequest" type="hidden" value="&lt;?xml version='1.0' encoding='UTF-8'?>&lt;NullOperationRequest xmlns='http://www.buergerkarte.at/namespaces/securitylayer/1.2#'/>"/>
+ <input name="DataURL" type="hidden" value="<DataURL>"/>
<input type="submit" name="Submit" value=" Weiter "/>
<input name="Clear" type="reset" id="Clear" value="Formular zur&uuml;cksetzen"/> </p></form>