Merge remote-tracking branch 'remotes/origin/vidp' into moa2_0_tlenz

Conflicts:
	id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditGeneralConfigAction.java
	id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditOAAction.java
	id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java
	id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/PEPSConnectorServlet.java
	id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/stork/STORKConfig.java
	id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/entrypoints/DispatcherServlet.java
	id/server/idserverlib/src/main/resources/resources/properties/id_messages_de.properties
	id/server/moa-id-commons/pom.xml
	id/server/stork2-saml-engine/pom.xml
	pom.xml
	repository/iaik/iaik_tsl/1.0/iaik_tsl-1.0.jar
	repository/iaik/iaik_tsl/1.0/iaik_tsl-1.0.pom

1 files changed, 0 insertions, 93 deletions

diff --git a/id/server/stork2-saml-engine/src/test/resources/StorkSamlEngine_outgoing.xml b/id/server/stork2-saml-engine/src/test/resources/StorkSamlEngine_outgoing.xml
deleted file mode 100644
index f8fc4f91a..000000000
--- a/id/server/stork2-saml-engine/src/test/resources/StorkSamlEngine_outgoing.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">

-

-<properties>

-	<comment>SAML constants for AuthnRequests and Responses.</comment>

-

-	<!--

-		Types of consent obtained from the user for this authentication and

-		data transfer.

-		Allow values: 'unspecified'.

-	-->

-	<entry key="consentAuthnRequest">unspecified</entry>

-	

-	<!--

-	Allow values: 'obtained', 'prior', 'current-implicit', 'current-explicit', 'unspecified'.

-	-->

-	<entry key="consentAuthnResponse">obtained</entry>

-

-	<!--URI representing the classification of the identifier

-		Allow values: 'entity'.

-	-->

-	<entry key="formatEntity">entity</entry>

-

-	<!--Only HTTP-POST binding is only supported for inter PEPS-->

-	<!--The SOAP binding is only supported for direct communication between SP-MW and VIdP-->

-	<entry key="protocolBinding">HTTP-POST</entry>

-	

-	

-	

-	

-	<!--URI representing the classification of the identifier

-		Allow values: 'entity'.

-		<entry key="eIDSectorShare">true</entry>

-		<entry key="eIDCrossSectorShare">true</entry>

-		<entry key="eIDCrossBorderShare">true</entry>

-	-->

-	

-	

-	

-	<!-- A friendly name for the attribute that can be displayed to a user -->

-	<entry key="friendlyName">false</entry>

-	

-	<!-- A friendly name for the attribute that can be displayed to a user -->

-	<entry key="isRequired">true</entry>

-	

-	<!--PEPS in the Service Provider's country-->

-	<entry key="requester">http://S-PEPS.gov.xx</entry>

-

-	<!--PEPS in the citizen's origin country-->

-	<entry key="responder">http://C-PEPS.gov.xx</entry>

-

-	<!--Subject cannot be confirmed on or after this seconds time (positive number)-->

-	<entry key="timeNotOnOrAfter">300</entry>

-	

-	<!--Validation IP of the response-->

-	<entry key="ipAddrValidation">false</entry>

-	

-	

-	<!--Subject Attribute Definitions-->

-	<entry key="eIdentifier">http://www.stork.gov.eu/1.0/eIdentifier</entry>

-	<entry key="givenName">http://www.stork.gov.eu/1.0/givenName</entry>

-	<entry key="surname">http://www.stork.gov.eu/1.0/surname</entry>

-	<entry key="inheritedFamilyName">http://www.stork.gov.eu/1.0/inheritedFamilyName</entry>

-	<entry key="adoptedFamilyName">http://www.stork.gov.eu/1.0/adoptedFamilyName</entry>

-	<entry key="gender">http://www.stork.gov.eu/1.0/gender</entry>

-	<entry key="dateOfBirth">http://www.stork.gov.eu/1.0/dateOfBirth</entry>

-	<entry key="countryCodeOfBirth">http://www.stork.gov.eu/1.0/countryCodeOfBirth</entry>

-	<entry key="nationalityCode">http://www.stork.gov.eu/1.0/nationalityCode</entry>

-	<entry key="maritalStatus">http://www.stork.gov.eu/1.0/maritalStatus</entry>

-	<entry key="residenceAddress">http://www.stork.gov.eu/1.0/residenceAddress</entry>

-	<entry key="eMail">http://www.stork.gov.eu/1.0/eMail</entry>

-	<entry key="academicTitle">http://www.stork.gov.eu/1.0/academicTitle</entry>

-	<entry key="pseudonym">http://www.stork.gov.eu/1.0/pseudonym</entry>

-	<entry key="age">http://www.stork.gov.eu/1.0/age</entry>

-	<entry key="isAgeOver">http://www.stork.gov.eu/1.0/isAgeOver</entry>

-

-	<entry key="textResidenceAddress">http://www.stork.gov.eu/1.0/textResidenceAddress</entry>

-	<entry key="canonicalResidenceAddress">http://www.stork.gov.eu/1.0/canonicalResidenceAddress</entry>

-

-	<entry key="title">http://www.stork.gov.eu/1.0/title</entry>

-	<entry key="residencePermit">http://www.stork.gov.eu/1.0/residencePermit</entry>

-

-	<entry key="signedDoc">http://www.stork.gov.eu/1.0/signedDoc</entry>

-	<entry key="citizen509Certificate">http://www.stork.gov.eu/1.0/citizen509Certificate</entry>

-	

-	<entry key="newAttribute1">http://www.stork.gov.eu/1.0/newAttribute1</entry>

-	<entry key="newAttribute2">http://www.stork.gov.eu/1.0/newAttribute2</entry>

-	<entry key="hasDegree">http://www.stork.gov.eu/1.0/hasDegree</entry>

-	<entry key="mandateContent">http://www.stork.gov.eu/1.0/mandateContent</entry>

-	<entry key="representative">http://www.stork.gov.eu/1.0/representative</entry>

-	<entry key="represented">http://www.stork.gov.eu/1.0/represented</entry>

-	

-</properties>
\ No newline at end of file