From 7a090929562b46867469d43e3d89a832b7b6c1a3 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Thu, 27 Mar 2014 15:58:03 +0100
Subject: update default configuration

---
 .../moa-id-configuration/htmlTemplates/loginFormFull.html  | 14 ++------------
 .../deploy/conf/moa-id/htmlTemplates/loginFormFull.html    | 14 ++------------
 id/server/data/deploy/conf/moa-id/moa-id.properties        |  4 ++++
 3 files changed, 8 insertions(+), 24 deletions(-)

(limited to 'id/server/data')

diff --git a/id/server/data/deploy/conf/moa-id-configuration/htmlTemplates/loginFormFull.html b/id/server/data/deploy/conf/moa-id-configuration/htmlTemplates/loginFormFull.html
index b9d3eafa7..ef070b8eb 100644
--- a/id/server/data/deploy/conf/moa-id-configuration/htmlTemplates/loginFormFull.html
+++ b/id/server/data/deploy/conf/moa-id-configuration/htmlTemplates/loginFormFull.html
@@ -815,17 +815,7 @@
                 <h2 id="tabheader" class="dunkel">Home Country Selection</h2>
                 <p>
                   <select name="cccSelection" id="cccSelection" size="1" style="width: 120px; margin-right: 5px;" >
-                    <option value="BE">Belgi&euml;/Belgique</option>
-                    <option value="EE">Eesti</option>
-                    <option value="ES">Espa&ntilde;a</option>
-                    <option value="IS">&Iacute;sland</option>
-                    <option value="IT">Italia</option>
-                    <option value="LI">Liechtenstein</option>
-                    <option value="LT">Lithuania</option>
-                    <option value="PT">Portugal</option>
-                    <option value="SI">Slovenija</option>
-                    <option value="FI">Suomi</option>
-                    <option value="SE">Sverige</option>
+                    #PEPSLIST#
                   </select>
                   <button name="bkuButton" type="button" onClick="storkClicked();">Proceed</button>
                   <a href="info_stork.html" target="_blank" class="infobutton" style="color:#FFF">i</a>
@@ -853,4 +843,4 @@
 		</div>
 	</div>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/id/server/data/deploy/conf/moa-id/htmlTemplates/loginFormFull.html b/id/server/data/deploy/conf/moa-id/htmlTemplates/loginFormFull.html
index b9d3eafa7..ef070b8eb 100644
--- a/id/server/data/deploy/conf/moa-id/htmlTemplates/loginFormFull.html
+++ b/id/server/data/deploy/conf/moa-id/htmlTemplates/loginFormFull.html
@@ -815,17 +815,7 @@
                 <h2 id="tabheader" class="dunkel">Home Country Selection</h2>
                 <p>
                   <select name="cccSelection" id="cccSelection" size="1" style="width: 120px; margin-right: 5px;" >
-                    <option value="BE">Belgi&euml;/Belgique</option>
-                    <option value="EE">Eesti</option>
-                    <option value="ES">Espa&ntilde;a</option>
-                    <option value="IS">&Iacute;sland</option>
-                    <option value="IT">Italia</option>
-                    <option value="LI">Liechtenstein</option>
-                    <option value="LT">Lithuania</option>
-                    <option value="PT">Portugal</option>
-                    <option value="SI">Slovenija</option>
-                    <option value="FI">Suomi</option>
-                    <option value="SE">Sverige</option>
+                    #PEPSLIST#
                   </select>
                   <button name="bkuButton" type="button" onClick="storkClicked();">Proceed</button>
                   <a href="info_stork.html" target="_blank" class="infobutton" style="color:#FFF">i</a>
@@ -853,4 +843,4 @@
 		</div>
 	</div>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/id/server/data/deploy/conf/moa-id/moa-id.properties b/id/server/data/deploy/conf/moa-id/moa-id.properties
index 73627ef9b..7e31f4e5d 100644
--- a/id/server/data/deploy/conf/moa-id/moa-id.properties
+++ b/id/server/data/deploy/conf/moa-id/moa-id.properties
@@ -3,6 +3,10 @@
 #MOA-ID 2.0 XML configuration files (necessary, if inmemory database is used)
 #configuration.xml=$PATH_TO_CONFIG$/conf/moa-id/MOAIDConfiguration-2.0.xml
 
+##For Testing
+configuration.validation.certificate.QC.ignore=false
+protocols.pvp2.assertion.encryption.active=false
+
 ##General MOA-ID 2.0 operations
 #MOA-ID 2.0 session information encryption key (PassPhrase)
 configuration.moasession.key=SessionEncryptionKey
-- 
cgit v1.2.3