From 7e853bf1c8e738e05544795fc7200a2c5d213a00 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Tue, 28 Nov 2017 10:54:59 +0100
Subject: Remove unused configuration values

---
 .../deploy/conf/moa-id/oa/BasicOAConfiguration.xml |   9 --
 .../conf/moa-id/oa/HeaderOAConfiguration.xml       |  10 --
 .../deploy/conf/moa-id/oa/ParamOAConfiguration.xml |  10 --
 .../conf/moa-id/oa/SampleOAConfiguration.xml       |   9 --
 .../conf/moa-id/oa/SamplewbPKOAConfiguration.xml   |   9 --
 .../data/deploy/conf/moa-id/stork/SamlEngine.xml   |  70 -----------
 .../conf/moa-id/stork/SignModule_incoming.xml      |  12 --
 .../conf/moa-id/stork/SignModule_incoming_attr.xml |  12 --
 .../conf/moa-id/stork/SignModule_outgoing.xml      |  12 --
 .../conf/moa-id/stork/StorkSamlEngine_VIDP.xml     | 127 --------------------
 .../conf/moa-id/stork/StorkSamlEngine_incoming.xml | 100 ----------------
 .../moa-id/stork/StorkSamlEngine_incoming_attr.xml |  98 ----------------
 .../conf/moa-id/stork/StorkSamlEngine_outgoing.xml | 130 ---------------------
 .../deploy/conf/moa-id/stork/storkDemoKeysPT.jks   | Bin 3013 -> 0 bytes
 .../moa-id/stork/storkDemoKeys_minividp_old.jks    | Bin 4592 -> 0 bytes
 15 files changed, 608 deletions(-)
 delete mode 100644 id/server/data/deploy/conf/moa-id/oa/BasicOAConfiguration.xml
 delete mode 100644 id/server/data/deploy/conf/moa-id/oa/HeaderOAConfiguration.xml
 delete mode 100644 id/server/data/deploy/conf/moa-id/oa/ParamOAConfiguration.xml
 delete mode 100644 id/server/data/deploy/conf/moa-id/oa/SampleOAConfiguration.xml
 delete mode 100644 id/server/data/deploy/conf/moa-id/oa/SamplewbPKOAConfiguration.xml
 delete mode 100644 id/server/data/deploy/conf/moa-id/stork/SamlEngine.xml
 delete mode 100644 id/server/data/deploy/conf/moa-id/stork/SignModule_incoming.xml
 delete mode 100644 id/server/data/deploy/conf/moa-id/stork/SignModule_incoming_attr.xml
 delete mode 100644 id/server/data/deploy/conf/moa-id/stork/SignModule_outgoing.xml
 delete mode 100644 id/server/data/deploy/conf/moa-id/stork/StorkSamlEngine_VIDP.xml
 delete mode 100644 id/server/data/deploy/conf/moa-id/stork/StorkSamlEngine_incoming.xml
 delete mode 100644 id/server/data/deploy/conf/moa-id/stork/StorkSamlEngine_incoming_attr.xml
 delete mode 100644 id/server/data/deploy/conf/moa-id/stork/StorkSamlEngine_outgoing.xml
 delete mode 100644 id/server/data/deploy/conf/moa-id/stork/storkDemoKeysPT.jks
 delete mode 100644 id/server/data/deploy/conf/moa-id/stork/storkDemoKeys_minividp_old.jks

(limited to 'id/server/data/deploy/conf/moa-id')

diff --git a/id/server/data/deploy/conf/moa-id/oa/BasicOAConfiguration.xml b/id/server/data/deploy/conf/moa-id/oa/BasicOAConfiguration.xml
deleted file mode 100644
index fc99cea79..000000000
--- a/id/server/data/deploy/conf/moa-id/oa/BasicOAConfiguration.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Demokonfiguration fuer eine Online Applikation (OA) welche 401 Basic Authentication zur Uebergabe der Parameter verwendet -->
-<Configuration xmlns="http://www.buergerkarte.at/namespaces/moaconfig#" xmlns:sl10="http://www.buergerkarte.at/namespaces/securitylayer/20020225#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<LoginType>stateless</LoginType>
-	<BasicAuth>
-		<UserID>MOAFamilyName</UserID>
-		<Password>MOAGivenName</Password>
-	</BasicAuth>
-</Configuration>
diff --git a/id/server/data/deploy/conf/moa-id/oa/HeaderOAConfiguration.xml b/id/server/data/deploy/conf/moa-id/oa/HeaderOAConfiguration.xml
deleted file mode 100644
index 4d34c3646..000000000
--- a/id/server/data/deploy/conf/moa-id/oa/HeaderOAConfiguration.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Demokonfiguration fuer eine Online Applikation (OA) welche Header Authentication zur Uebergabe der Parameter verwendet -->
-<Configuration xmlns="http://www.buergerkarte.at/namespaces/moaconfig#" xmlns:sl10="http://www.buergerkarte.at/namespaces/securitylayer/20020225#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<LoginType>stateless</LoginType>
-	<HeaderAuth>
-		<!-- zusaetzlicher Header GivenName -->
-		<Header Name="X-MOAParameterGivenName" Value="MOAGivenName"></Header>
-		<Header Name="X-MOAParameterFamilyName" Value="MOAFamilyName"></Header>
-	</HeaderAuth>
-</Configuration>
diff --git a/id/server/data/deploy/conf/moa-id/oa/ParamOAConfiguration.xml b/id/server/data/deploy/conf/moa-id/oa/ParamOAConfiguration.xml
deleted file mode 100644
index 979faca95..000000000
--- a/id/server/data/deploy/conf/moa-id/oa/ParamOAConfiguration.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Demokonfiguration fuer eine Online Applikation (OA) welche Parameter Authentication verwendet -->
-<Configuration xmlns="http://www.buergerkarte.at/namespaces/moaconfig#" xmlns:sl10="http://www.buergerkarte.at/namespaces/securitylayer/20020225#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<LoginType>stateless</LoginType>
-	<ParamAuth>
-		<!-- URL Parameter GivenName und FamilyName -->
-		<Parameter Name="GivenName" Value="MOAGivenName"></Parameter>
-		<Parameter Name="FamilyName" Value="MOAFamilyName"></Parameter>
-	</ParamAuth>
-</Configuration>
diff --git a/id/server/data/deploy/conf/moa-id/oa/SampleOAConfiguration.xml b/id/server/data/deploy/conf/moa-id/oa/SampleOAConfiguration.xml
deleted file mode 100644
index edbfe7aa5..000000000
--- a/id/server/data/deploy/conf/moa-id/oa/SampleOAConfiguration.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Demokonfiguration fuer Online Applikation (OA) welche 401 Basic Authentication zur Uebergabe der Parameter verwendet -->
-<Configuration xmlns="http://www.buergerkarte.at/namespaces/moaconfig#" xmlns:sl10="http://www.buergerkarte.at/namespaces/securitylayer/20020225#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<LoginType>stateless</LoginType>
-	<BasicAuth>
-		<UserID>MOAFamilyName</UserID>
-		<Password>MOAGivenName</Password>
-	</BasicAuth>
-</Configuration>
diff --git a/id/server/data/deploy/conf/moa-id/oa/SamplewbPKOAConfiguration.xml b/id/server/data/deploy/conf/moa-id/oa/SamplewbPKOAConfiguration.xml
deleted file mode 100644
index 2cff3bd67..000000000
--- a/id/server/data/deploy/conf/moa-id/oa/SamplewbPKOAConfiguration.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Demokonfiguration fuer eine Online Applikation (OA) welche 401 Basic Authentication zur Uebergabe der Parameter verwendet -->
-<Configuration xmlns="http://www.buergerkarte.at/namespaces/moaconfig#" xmlns:sl10="http://www.buergerkarte.at/namespaces/securitylayer/20020225#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<LoginType>stateless</LoginType>
-	<BasicAuth>
-		<UserID>MOAWBPK</UserID>
-		<Password>MOAGivenName</Password>
-	</BasicAuth>
-</Configuration>
diff --git a/id/server/data/deploy/conf/moa-id/stork/SamlEngine.xml b/id/server/data/deploy/conf/moa-id/stork/SamlEngine.xml
deleted file mode 100644
index eca38ec8c..000000000
--- a/id/server/data/deploy/conf/moa-id/stork/SamlEngine.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<instances>
-
-
-	<!-- Configuration name-->
-	<instance name="outgoing">
-		<!-- Configurations parameters StorkSamlEngine  -->
-		<configuration name="SamlEngineConf">			
-			<parameter name="fileConfiguration" value="StorkSamlEngine_outgoing.xml" />
-		</configuration>
-
-		<!-- Settings module signature-->
-		<configuration name="SignatureConf">
-			<!-- Specific signature module -->
-			<parameter name="class" value="eu.stork.peps.auth.engine.core.impl.SignSW" />
-			<!-- Settings specific module -->
-			<parameter name="fileConfiguration" value="SignModule_outgoing.xml" />
-		</configuration>
-	</instance>
-
-        <instance name="incoming">
-                <!-- Configurations parameters StorkSamlEngine  -->
-                <configuration name="SamlEngineConf">
-                        <parameter name="fileConfiguration" value="StorkSamlEngine_incoming.xml" />
-                </configuration>
-
-                <!-- Settings module signature-->
-                <configuration name="SignatureConf">
-                        <!-- Specific signature module -->
-                        <parameter name="class" value="eu.stork.peps.auth.engine.core.impl.SignSW" />
-                        <!-- Settings specific module -->
-                        <parameter name="fileConfiguration" value="SignModule_incoming.xml" />
-                </configuration>
-        </instance>
-
-
-        <instance name="incoming_attr">
-                <!-- Configurations parameters StorkSamlEngine  -->
-                <configuration name="SamlEngineConf">
-                        <parameter name="fileConfiguration" value="StorkSamlEngine_incoming_attr.xml" />
-                </configuration>
-
-                <!-- Settings module signature-->
-                <configuration name="SignatureConf">
-                        <!-- Specific signature module -->
-                        <parameter name="class" value="eu.stork.peps.auth.engine.core.impl.SignSW" />
-                        <!-- Settings specific module -->
-                        <parameter name="fileConfiguration" value="SignModule_incoming_attr.xml" />
-                </configuration>
-        </instance>
-
-
-        <instance name="VIDP">
-                <!-- Configurations parameters StorkSamlEngine  -->
-                <configuration name="SamlEngineConf">
-                        <parameter name="fileConfiguration" value="StorkSamlEngine_VIDP.xml" />
-                </configuration>
-
-                <!-- Settings module signature-->
-                <configuration name="SignatureConf">
-                        <!-- Specific signature module -->
-                        <parameter name="class" value="eu.stork.peps.auth.engine.core.impl.SignSW" />
-                        <!-- Settings specific module -->
-                        <parameter name="fileConfiguration" value="SignModule_VIDP.xml" />
-                </configuration>
-        </instance>
-
-
-	
-</instances>
diff --git a/id/server/data/deploy/conf/moa-id/stork/SignModule_incoming.xml b/id/server/data/deploy/conf/moa-id/stork/SignModule_incoming.xml
deleted file mode 100644
index 68b15e667..000000000
--- a/id/server/data/deploy/conf/moa-id/stork/SignModule_incoming.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
-
-<properties>
-	<comment>SWModule sign with JKS.</comment>
-	<entry key="keystorePath">/home/stork/repos/moa-idspss/id/server/data/deploy/conf/moa-id/stork/storkDemoKeysPT.jks</entry>
-	<entry key="keyStorePassword">local-demo</entry>
-	<entry key="keyPassword">local-demo</entry>
-	<entry key="issuer">CN=local-demo, O=Indra, L=Madrid, ST=Spain, C=ES</entry>	
-	<entry key="serialNumber">4BA89DB2</entry>		
-	<entry key="keystoreType">JKS</entry>
-</properties>
diff --git a/id/server/data/deploy/conf/moa-id/stork/SignModule_incoming_attr.xml b/id/server/data/deploy/conf/moa-id/stork/SignModule_incoming_attr.xml
deleted file mode 100644
index 68b15e667..000000000
--- a/id/server/data/deploy/conf/moa-id/stork/SignModule_incoming_attr.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
-
-<properties>
-	<comment>SWModule sign with JKS.</comment>
-	<entry key="keystorePath">/home/stork/repos/moa-idspss/id/server/data/deploy/conf/moa-id/stork/storkDemoKeysPT.jks</entry>
-	<entry key="keyStorePassword">local-demo</entry>
-	<entry key="keyPassword">local-demo</entry>
-	<entry key="issuer">CN=local-demo, O=Indra, L=Madrid, ST=Spain, C=ES</entry>	
-	<entry key="serialNumber">4BA89DB2</entry>		
-	<entry key="keystoreType">JKS</entry>
-</properties>
diff --git a/id/server/data/deploy/conf/moa-id/stork/SignModule_outgoing.xml b/id/server/data/deploy/conf/moa-id/stork/SignModule_outgoing.xml
deleted file mode 100644
index 7139c5a41..000000000
--- a/id/server/data/deploy/conf/moa-id/stork/SignModule_outgoing.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
-
-<properties>
-	<comment>SWModule sign with JKS.</comment>
-	<entry key="keystorePath">projects/stork2/code/moa-idspss/id/server/stork2-saml-engine/src/test/resources/storkDemoKeys.jks</entry>
-	<entry key="keyStorePassword">local-demo</entry>
-	<entry key="keyPassword">local-demo</entry>
-	<entry key="issuer">CN=local-demo-cert, O=Indra, L=Madrid, ST=Spain, C=ES</entry>
-	<entry key="serialNumber">4BA89DB2</entry> 
-	<entry key="keystoreType">JKS</entry>
-</properties>
\ No newline at end of file
diff --git a/id/server/data/deploy/conf/moa-id/stork/StorkSamlEngine_VIDP.xml b/id/server/data/deploy/conf/moa-id/stork/StorkSamlEngine_VIDP.xml
deleted file mode 100644
index 29973690e..000000000
--- a/id/server/data/deploy/conf/moa-id/stork/StorkSamlEngine_VIDP.xml
+++ /dev/null
@@ -1,127 +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">https://testvidp.buergerkarte.at/moa-id-auth/stork2/SendPEPSAuthnRequest</entry>
-
-        <!--PEPS in the citizen's origin country-->
-        <entry key="responder">https://testvidp.buergerkarte.at/moa-id-auth/stork2/SendPEPSAuthnRequest</entry>
-
-	<!--Subject cannot be confirmed on or after this seconds time (positive number)-->
-	<entry key="timeNotOnOrAfter">600</entry>
-	
-	<!--Validation IP of the response-->
-	<entry key="ipAddrValidation">false</entry>
-
-        <!--One time use-->
-        <entry key="oneTimeUse">true</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="diplomaSupplement">http://www.stork.gov.eu/1.0/diplomaSupplement</entry>
-        <entry key="currentStudiesSupplement">http://www.stork.gov.eu/1.0/currentStudiesSupplement</entry>
-        <entry key="isStudent">http://www.stork.gov.eu/1.0/isStudent</entry>
-        <entry key="isAcademicStaff">http://www.stork.gov.eu/1.0/isAcademicStaff</entry>
-        <entry key="isTeacherOf">http://www.stork.gov.eu/1.0/isTeacherOf</entry>
-        <entry key="isCourseCoordinator">http://www.stork.gov.eu/1.0/isCourseCoordinator</entry>
-        <entry key="isAdminStaff">http://www.stork.gov.eu/1.0/isAdminStaff</entry>
-        <entry key="habilitation">http://www.stork.gov.eu/1.0/habilitation</entry>
-        <entry key="Title">http://www.stork.gov.eu/1.0/Title</entry>
-        <entry key="hasDegree">http://www.stork.gov.eu/1.0/hasDegree</entry>
-        <entry key="hasAccountInBank">http://www.stork.gov.eu/1.0/hasAccountInBank</entry>
-        <entry key="isHealthCareProfessional">http://www.stork.gov.eu/1.0/isHealthCareProfessional</entry>
-
-        <entry key="eLPIdentifier">http://www.stork.gov.eu/1.0/eLPIdentifier</entry>
-        <entry key="legalName">http://www.stork.gov.eu/1.0/legalName</entry>
-        <entry key="alternativeName">http://www.stork.gov.eu/1.0/alternativeName</entry>
-        <entry key="type">http://www.stork.gov.eu/1.0/type</entry>
-        <entry key="translatableType">http://www.stork.gov.eu/1.0/translatableType</entry>
-        <entry key="status">http://www.stork.gov.eu/1.0/status</entry>
-        <entry key="activity">http://www.stork.gov.eu/1.0/activity</entry>
-        <entry key="registeredAddress">http://www.stork.gov.eu/1.0/registeredAddress</entry>
-        <entry key="registeredCanonicalAddress">http://www.stork.gov.eu/1.0/registeredCanonicalAddress</entry>
-        <entry key="contactInformation">http://www.stork.gov.eu/1.0/contactInformation</entry>
-        <entry key="LPFiscalNumber">http://www.stork.gov.eu/1.0/LPFiscalNumber</entry>
-        <entry key="mandate">http://www.stork.gov.eu/1.0/mandate</entry>
-	<entry key="docRequest">http://www.stork.gov.eu/1.0/docRequest</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>
-        
-        <!-- ISA 1.18 attributes-->
-        <entry key="ECApplicationRole">http://www.stork.gov.eu/1.1/ECApplicationRole</entry>
-        <entry key="MSOrganization">http://www.stork.gov.eu/1.1/MSOrganization</entry>
-
-        <entry key="citizenQAALevel">http://www.stork.gov.eu/1.0/citizenQAALevel</entry>
-
-
-</properties>
diff --git a/id/server/data/deploy/conf/moa-id/stork/StorkSamlEngine_incoming.xml b/id/server/data/deploy/conf/moa-id/stork/StorkSamlEngine_incoming.xml
deleted file mode 100644
index a817e29c0..000000000
--- a/id/server/data/deploy/conf/moa-id/stork/StorkSamlEngine_incoming.xml
+++ /dev/null
@@ -1,100 +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="fiscalNumber">http://www.stork.gov.eu/1.0/fiscalNumber</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>
-  
-  <!-- ISA 1.18 attributes-->
-  <entry key="ECApplicationRole">http://www.stork.gov.eu/1.1/ECApplicationRole</entry>
-  <entry key="MSOrganization">http://www.stork.gov.eu/1.1/MSOrganization</entry>
-
-  <entry key="citizenQAALevel">http://www.stork.gov.eu/1.0/citizenQAALevel</entry>
-  	
-</properties>
diff --git a/id/server/data/deploy/conf/moa-id/stork/StorkSamlEngine_incoming_attr.xml b/id/server/data/deploy/conf/moa-id/stork/StorkSamlEngine_incoming_attr.xml
deleted file mode 100644
index 33437c110..000000000
--- a/id/server/data/deploy/conf/moa-id/stork/StorkSamlEngine_incoming_attr.xml
+++ /dev/null
@@ -1,98 +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="fiscalNumber">http://www.stork.gov.eu/1.0/fiscalNumber</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>
-        
-  <!-- ISA 1.18 attributes-->
-  <entry key="ECApplicationRole">http://www.stork.gov.eu/1.1/ECApplicationRole</entry>
-  <entry key="MSOrganization">http://www.stork.gov.eu/1.1/MSOrganization</entry>
-  	
-</properties>
diff --git a/id/server/data/deploy/conf/moa-id/stork/StorkSamlEngine_outgoing.xml b/id/server/data/deploy/conf/moa-id/stork/StorkSamlEngine_outgoing.xml
deleted file mode 100644
index b840b4fe5..000000000
--- a/id/server/data/deploy/conf/moa-id/stork/StorkSamlEngine_outgoing.xml
+++ /dev/null
@@ -1,130 +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="fiscalNumber">http://www.stork.gov.eu/1.0/fiscalNumber</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="diplomaSupplement">http://www.stork.gov.eu/1.0/diplomaSupplement</entry>
-        <entry key="currentStudiesSupplement">http://www.stork.gov.eu/1.0/currentStudiesSupplement</entry>
-        <entry key="isStudent">http://www.stork.gov.eu/1.0/isStudent</entry>
-        <entry key="isAcademicStaff">http://www.stork.gov.eu/1.0/isAcademicStaff</entry>
-        <entry key="isTeacherOf">http://www.stork.gov.eu/1.0/isTeacherOf</entry>
-        <entry key="isCourseCoordinator">http://www.stork.gov.eu/1.0/isCourseCoordinator</entry>
-        <entry key="isAdminStaff">http://www.stork.gov.eu/1.0/isAdminStaff</entry>
-        <entry key="habilitation">http://www.stork.gov.eu/1.0/habilitation</entry>
-        <entry key="Title">http://www.stork.gov.eu/1.0/Title</entry>
-        <entry key="hasDegree">http://www.stork.gov.eu/1.0/hasDegree</entry>
-        <entry key="hasAccountInBank">http://www.stork.gov.eu/1.0/hasAccountInBank</entry>
-        <entry key="isHealthCareProfessional">http://www.stork.gov.eu/1.0/isHealthCareProfessional</entry>
-
-        <entry key="eLPIdentifier">http://www.stork.gov.eu/1.0/eLPIdentifier</entry>
-        <entry key="legalName">http://www.stork.gov.eu/1.0/legalName</entry>
-        <entry key="alternativeName">http://www.stork.gov.eu/1.0/alternativeName</entry>
-        <entry key="type">http://www.stork.gov.eu/1.0/type</entry>
-        <entry key="translatableType">http://www.stork.gov.eu/1.0/translatableType</entry>
-        <entry key="status">http://www.stork.gov.eu/1.0/status</entry>
-        <entry key="activity">http://www.stork.gov.eu/1.0/activity</entry>
-        <entry key="registeredAddress">http://www.stork.gov.eu/1.0/registeredAddress</entry>
-        <entry key="registeredCanonicalAddress">http://www.stork.gov.eu/1.0/registeredCanonicalAddress</entry>
-        <entry key="contactInformation">http://www.stork.gov.eu/1.0/contactInformation</entry>
-        <entry key="LPFiscalNumber">http://www.stork.gov.eu/1.0/LPFiscalNumber</entry>
-        <entry key="mandate">http://www.stork.gov.eu/1.0/mandate</entry>
-	<entry key="docRequest">http://www.stork.gov.eu/1.0/docRequest</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>
-	
-  <!-- ISA 1.18 attributes-->
-  <entry key="ECApplicationRole">http://www.stork.gov.eu/1.1/ECApplicationRole</entry>
-  <entry key="MSOrganization">http://www.stork.gov.eu/1.1/MSOrganization</entry>
-
-        <entry key="citizenQAALevel">http://www.stork.gov.eu/1.0/citizenQAALevel</entry>
-  
-</properties>
diff --git a/id/server/data/deploy/conf/moa-id/stork/storkDemoKeysPT.jks b/id/server/data/deploy/conf/moa-id/stork/storkDemoKeysPT.jks
deleted file mode 100644
index f9baad202..000000000
Binary files a/id/server/data/deploy/conf/moa-id/stork/storkDemoKeysPT.jks and /dev/null differ
diff --git a/id/server/data/deploy/conf/moa-id/stork/storkDemoKeys_minividp_old.jks b/id/server/data/deploy/conf/moa-id/stork/storkDemoKeys_minividp_old.jks
deleted file mode 100644
index efaeac86c..000000000
Binary files a/id/server/data/deploy/conf/moa-id/stork/storkDemoKeys_minividp_old.jks and /dev/null differ
-- 
cgit v1.2.3