From 31cc3b64155e46efcd2184d86d333c465d09e67d Mon Sep 17 00:00:00 2001
From: kstranacher_eGovL
 <kstranacher_eGovL@d688527b-c9ab-4aba-bd8d-4036d912da1d>
Date: Wed, 18 Jul 2012 09:17:08 +0000
Subject: Update configuration and parameter check: TrustedTemplateURLs

git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@1287 d688527b-c9ab-4aba-bd8d-4036d912da1d
---
 id/oa/.settings/org.eclipse.jdt.core.prefs         |   7 +-
 id/oa/.settings/org.eclipse.wst.common.component   |   4 +-
 id/server/auth/src/main/webapp/iframeHandyBKU.html |   7 +-
 .../auth/src/main/webapp/iframeOnlineBKU.html      |   6 +-
 id/server/auth/src/main/webapp/index.html          |  14 +-
 .../auth/src/main/webapp/template_handyBKU.html    |   1 +
 .../auth/src/main/webapp/template_localBKU.html    |   3 +-
 .../auth/src/main/webapp/template_onlineBKU.html   |   3 +-
 .../conf/moa-id/SampleMOAIDConfiguration.xml       |   6 +
 .../conf/moa-id/SampleMOAIDConfigurationProxy.xml  |   6 +
 .../SampleMOAIDConfiguration_withTestBKs.xml       |   6 +
 .../SampleMOAIDConfiguration_withTestBKsProxy.xml  |   6 +
 .../conf/moa-id/SampleMOAWIDConfiguration.xml      |   6 +
 .../conf/moa-id/SampleMOAWIDConfigurationProxy.xml |   6 +
 .../SampleMOAWIDConfiguration_withTestBKs.xml      |   6 +
 .../SampleMOAWIDConfiguration_withTestBKsProxy.xml |   6 +
 id/server/doc/moa_id/id-admin_2.htm                |  10 +-
 .../moa/id/auth/AuthenticationServer.java          |   6 +-
 .../moa/id/auth/servlet/GetForeignIDServlet.java   |   2 +-
 .../moa/id/config/ConfigurationBuilder.java        |  21 ++
 .../id/config/auth/AuthConfigurationProvider.java  |  13 ++
 .../moa/id/util/ParamValidatorUtils.java           | 214 ++++++---------------
 .../.settings/org.eclipse.wst.common.component     | 151 ++-------------
 id/templates/.project                              |  18 +-
 .../.settings/org.eclipse.wst.common.component     |   4 +-
 25 files changed, 197 insertions(+), 335 deletions(-)

(limited to 'id')

diff --git a/id/oa/.settings/org.eclipse.jdt.core.prefs b/id/oa/.settings/org.eclipse.jdt.core.prefs
index 6d046587d..f2c34578f 100644
--- a/id/oa/.settings/org.eclipse.jdt.core.prefs
+++ b/id/oa/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,8 @@
+#Tue Jul 17 08:40:59 CEST 2012
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
+org.eclipse.jdt.core.compiler.compliance=1.4
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.3
diff --git a/id/oa/.settings/org.eclipse.wst.common.component b/id/oa/.settings/org.eclipse.wst.common.component
index 7e38d20b7..3bc38ebcc 100644
--- a/id/oa/.settings/org.eclipse.wst.common.component
+++ b/id/oa/.settings/org.eclipse.wst.common.component
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project-modules id="moduleCoreId" project-version="2.0">
+<project-modules id="moduleCoreId" project-version="1.5.0">
   <wb-module deploy-name="moa-id-oa">
     <property name="context-root" value="moa-id-oa"/>
     <wb-resource deploy-path="/" source-path="src/main/webapp"/>
     <property name="java-output-path" value="/target/classes"/>
   </wb-module>
-</project-modules>
\ No newline at end of file
+</project-modules>
diff --git a/id/server/auth/src/main/webapp/iframeHandyBKU.html b/id/server/auth/src/main/webapp/iframeHandyBKU.html
index b5936679f..0f6e1e282 100644
--- a/id/server/auth/src/main/webapp/iframeHandyBKU.html
+++ b/id/server/auth/src/main/webapp/iframeHandyBKU.html
@@ -8,11 +8,11 @@
     	<script type="text/javascript">
 			// [MUSS] Geben Sie hier die URL zum Aufruf von MOA-ID an
            	// z.B.: https://yoururl.at/moa-id-auth/StartAuthentication?Target=IT&OA=https://youronlineapplication.at
-			var MOA_ID_STARTAUTHENTICATION = "https://localhost:8443/moa-id-auth/StartAuthentication?Target=ZU&OA=https://localhost:8443/TestMOAID_OA/LoginServletExample";
+			var MOA_ID_STARTAUTHENTICATION = "[MOA_ID_STARTAUTHENTICATION]";
 				
 			// [MUSS] Geben Sie hier die URL zum MOA-ID Template fuer die Handy Signatur an -->
 			<!-- z.B.: value="https://yoururl.at/moa-id-auth/template_handyBKU.html"-->
-			var URL_TO_HANDYSIGNATUR_TEMPLATE = "https://localhost:8443/moa-id-auth/template_handyBKU.html";
+			var URL_TO_HANDYSIGNATUR_TEMPLATE = "[URL_TO_HANDYSIGNATUR_TEMPLATE]";
 				
 				
 			window.onload=function() {
@@ -49,8 +49,7 @@
 	    Bitte warten...
 		<form name="moaidform" method="post" id="moaidform">
 			<input type="hidden" name="Template" id="Template">
-			<!--  <input type="hidden" name="bkuURI" value="https://www.handy-signatur.at/mobile/https-security-layer-request/default.aspx"> -->
-			 <input type="hidden" name="bkuURI" value="https://test1.a-trust.at/https-security-layer-request/default.aspx"> 
+			<input type="hidden" name="bkuURI" value="https://www.handy-signatur.at/mobile/https-security-layer-request/default.aspx">
 			<input type="hidden" name="useMandate" id="useMandate">
 		</form>		
 		<hr>
diff --git a/id/server/auth/src/main/webapp/iframeOnlineBKU.html b/id/server/auth/src/main/webapp/iframeOnlineBKU.html
index 7f6efb241..3ff0dac89 100644
--- a/id/server/auth/src/main/webapp/iframeOnlineBKU.html
+++ b/id/server/auth/src/main/webapp/iframeOnlineBKU.html
@@ -8,16 +8,16 @@
 	    <script type="text/javascript">
 			// [MUSS] Geben Sie hier die URL zum Aufruf von MOA-ID an
             // z.B.: https://yoururl.at/moa-id-auth/StartAuthentication?Target=IT&OA=https://youronlineapplication.at
-			var MOA_ID_STARTAUTHENTICATION = "https://localhost:8443/moa-id-auth/StartAuthentication?Target=ZU&OA=https://localhost:8443/TestMOAID_OA/LoginServletExample&sourceID=ABC123-_ABC123";
+			var MOA_ID_STARTAUTHENTICATION = "[MOA_ID_STARTAUTHENTICATION]";
 			
 			// [MUSS] Geben Sie hier die URL zum MOA-ID Template fuer die Online BKU an
 			// z.B.: "https://yoururl.at/moa-id-auth/template_onlineBKU.html"
-			var URL_TO_ONLINEBKU_TEMPLATE = "https://localhost:8443/moa-id-auth/template_onlineBKU.html";
+			var URL_TO_ONLINEBKU_TEMPLATE = "[URL_TO_ONLINEBKU_TEMPLATE]";
 			
 			// [MUSS] Geben Sie hier die URL zur Online BKU an
 			// z.B.: value="https://yoururl.at/bkuonline/https-security-layer-request"
 			// Hinweis: Diese URL muss auch bei den vertrauenswürdigen BKUs in der MOA-ID Konfiguration angegeben werden (siehe Element MOA-IDConfiguration/TrustedBKUs/BKUURL)
-			var URL_TO_ONLINEBKU = "https://localhost:8444/bkuonline/https-security-layer-request";
+			var URL_TO_ONLINEBKU = "[URL_TO_ONLINEBKU]";
 				
 			window.onload=function() {
 				document.getElementById('moaidform').action = MOA_ID_STARTAUTHENTICATION;
diff --git a/id/server/auth/src/main/webapp/index.html b/id/server/auth/src/main/webapp/index.html
index 03123c2a7..9eb0bc46e 100644
--- a/id/server/auth/src/main/webapp/index.html
+++ b/id/server/auth/src/main/webapp/index.html
@@ -11,11 +11,11 @@
         <script type="text/javascript">
 			// [MUSS] Geben Sie hier die URL zum Aufruf von MOA-ID an
             // z.B.: https://yoururl.at/moa-id-auth/StartAuthentication?Target=IT&OA=https://youronlineapplication.at
-			var MOA_ID_STARTAUTHENTICATION = "https://localhost:8443/moa-id-auth/StartAuthentication?Target=ZU&OA=https://localhost:8443/TestMOAID_OA/LoginServletExample";	
+			var MOA_ID_STARTAUTHENTICATION = "[MOA_ID_STARTAUTHENTICATION]";			
 			
 			// [MUSS] Geben Sie hier die URL zum MOA-ID Template fuer die lokale BKU an
             // z.B.: https://yoururl.at/moa-id-auth/template_localBKU.html
-			var URL_TO_LOKALBKU_TEMPLATE = "https://localhost:8443/moa-id-auth/template_localBKU.html";
+			var URL_TO_LOKALBKU_TEMPLATE = "[URL_TO_LOKALBKU_TEMPLATE]";
 			
 			
 			window.onload=function() {
@@ -156,7 +156,7 @@
                 	        <!-- Block "KARTE": Anmeldung mit lokaler BKU *ohne* Vollmacht (No-Script Variante) -->
                     	    <!-- [MUSS] Geben Sie hier die URL zum Aufruf von MOA-ID an (inkl. Template-URL, bkuURI und useMandate Parameter!) -->			         
                         	<!-- z.B.: https://yoururl.at/moa-id-auth/StartAuthentication?Target=IT&OA=https://youronlineapplication.at&Template=https://yoururl.at/moa-id-auth/template_localBKU.html&bkuURI=https://127.0.0.1:3496/https-security-layer-request&useMandate=false -->
-			                <a href="https://localhost:8443/moa-id-auth/StartAuthentication?Target=ZU&OA=https://localhost:8443/TestMOAID_OA/LoginServletExample&Template=https://localhost:8443/moa-id-auth/template_localBKU.html&bkuURI=https://127.0.0.1:3496/https-security-layer-request&useMandate=false">					
+			                <a href="[MOA_ID_STARTAUTHENTICATION]&Template=[URL_TO_LOKALBKU_TEMPLATE]&bkuURI=https://127.0.0.1:3496/https-security-layer-request&useMandate=false">					
     	                    	<div id="bkukarte" class="hell">
         	                		<button name="bkuButton" type="button">KARTE</button>
 	        	                </div>
@@ -166,7 +166,7 @@
                     	    <!-- Block "KARTE+Vollmacht": Anmeldung mit lokaler BKU *mit* Vollmacht (No-Script Variante) -->
                         	<!-- [MUSS] Geben Sie hier die URL zum Aufruf von MOA-ID an (inkl. Template-URL, bkuURI und useMandate Parameter!) -->
 		                    <!-- z.B.: https://yoururl.at/moa-id-auth/StartAuthentication?Target=IT&OA=https://youronlineapplication.at&Template=https://yoururl.at/moa-id-auth/template_localBKU.html&bkuURI=https://127.0.0.1:3496/https-security-layer-request&useMandate=true -->
-		                    <!-- <a href="https://localhost:8443/moa-id-auth/StartAuthentication?Target=ZU&OA=https://localhost:8443/TestMOAID_OA/LoginServletExample&Template=https://localhost:8443/moa-id-auth/template_localBKU.html&bkuURI=https://127.0.0.1:3496/https-security-layer-request&useMandate=true">					
+		                    <!-- <a href="[MOA_ID_STARTAUTHENTICATION]&Template=[URL_TO_LOKALBKU_TEMPLATE]&bkuURI=https://127.0.0.1:3496/https-security-layer-request&useMandate=true">					
         	                	<div id="bkukarte" class="hell">
             	            		<button name="bkuButton" type="button">KARTE+<br>Vollmacht</button>
 	            	            </div>
@@ -176,7 +176,7 @@
 							<!-- Block "HANDY": Anmeldung mit Handysignatur *ohne* Vollmacht (No-Script Variante) -->
 		                    <!-- [MUSS] Geben Sie hier die URL zum Aufruf von MOA-ID an (inkl. Template-URL, bkuURI und useMandate Parameter!) -->
    		                    <!-- z.B.: https://yoururl.at/moa-id-auth/StartAuthentication?Target=IT&OA=https://youronlineapplication.at&Template=https://yoururl.at/moa-id-auth/template_handyBKU.html&bkuURI=https://www.handy-signatur.at/mobile/https-security-layer-request/default.aspx&useMandate=false -->
-							<a href="https://localhost:8443/moa-id-auth/StartAuthentication?Target=ZU&OA=https://localhost:8443/TestMOAID_OA/LoginServletExample&Template=https://localhost:8443/moa-id-auth/template_localBKU.html&bkuURI=https://www.handy-signatur.at/mobile/https-security-layer-request/default.aspx&useMandate=false">
+							<a href="[MOA_ID_STARTAUTHENTICATION]&Template=[URL_TO_HANDYSIGNATUR_TEMPLATE]&bkuURI=https://www.handy-signatur.at/mobile/https-security-layer-request/default.aspx&useMandate=false">
 								<div id="bkuhandy" class="hell">
 		                          	<button name="bkuButton" type="button">HANDY</button>
 								</div>
@@ -185,7 +185,7 @@
 	                        <!-- Block "HANDY+Vollnacht": Anmeldung mit Handysignatur *mit* Vollmacht (No-Script Variante) -->
 		                    <!-- [MUSS] Geben Sie hier die URL zum Aufruf von MOA-ID an (inkl. Template-URL, bkuURI und useMandate Parameter!) -->
    	    	                <!-- z.B.: https://yoururl.at/moa-id-auth/StartAuthentication?Target=IT&OA=https://youronlineapplication.at&Template=https://yoururl.at/moa-id-auth/template_handyBKU.html&bkuURI=https://www.handy-signatur.at/mobile/https-security-layer-request/default.aspx&useMandate=true -->
-							<!-- <a href="https://localhost:8443/moa-id-auth/StartAuthentication?Target=ZU&OA=https://localhost:8443/TestMOAID_OA/LoginServletExample&Template=https://localhost:8443/moa-id-auth/template_localBKU.html&bkuURI=https://www.handy-signatur.at/mobile/https-security-layer-request/default.aspx&useMandate=true">
+							<!-- <a href="[MOA_ID_STARTAUTHENTICATION]&Template=[URL_TO_HANDYSIGNATUR_TEMPLATE]&bkuURI=https://www.handy-signatur.at/mobile/https-security-layer-request/default.aspx&useMandate=true">
 								<div id="bkuhandy" class="hell">
 		                          	<button name="bkuButton" type="button">HANDY</button>
 								</div>
@@ -202,7 +202,7 @@
     	            	    </div>
         	                <div id="stork" class="hell" align="center"> 
                            		<p>
-            	                	<form name="storkForm" method="POST" action="https://localhost:8443/moa-id-auth/StartAuthentication?Target=ZU&OA=https://localhost:8443/TestMOAID_OA/LoginServletExample&Template=https://localhost:8443/moa-id-auth/template_localBKU.html&bkuURI=https://127.0.0.1:3496/https-security-layer-request">
+            	                	<form name="storkForm" method="POST" action="[MOA_ID_STARTAUTHENTICATION]&Template=[URL_TO_LOKALBKU_TEMPLATE]&bkuURI=https://127.0.0.1:3496/https-security-layer-request">
        	    	                		<select name="CCC" size="1" style="width:120px">
            		                			<option value="BE">België/Belgique</option>
 											<option value="EE">Eesti</option>
diff --git a/id/server/auth/src/main/webapp/template_handyBKU.html b/id/server/auth/src/main/webapp/template_handyBKU.html
index 27834cd91..0ad73a6f3 100644
--- a/id/server/auth/src/main/webapp/template_handyBKU.html
+++ b/id/server/auth/src/main/webapp/template_handyBKU.html
@@ -12,6 +12,7 @@
 	</head>
 	<body onLoad="onAnmeldeSubmit()">		 
       <form name="CustomizedForm" action="<BKU>" method="post" enctype="multipart/form-data<>">
+			Falls Sie nicht automatisch weitergeleitet werden klicken Sie bitte hier:
      		<input class="button" type="submit" value="Starte Anmeldung" name="Senden">
 			<input type="hidden" name="XMLRequest" value="<XMLRequest>">
 			<input type="hidden" name="DataURL" value="<DataURL>">
diff --git a/id/server/auth/src/main/webapp/template_localBKU.html b/id/server/auth/src/main/webapp/template_localBKU.html
index 64275391a..f197d2c5c 100644
--- a/id/server/auth/src/main/webapp/template_localBKU.html
+++ b/id/server/auth/src/main/webapp/template_localBKU.html
@@ -11,7 +11,8 @@
 		</script>
 	</head>
 	<body onLoad="onAnmeldeSubmit()">	   
-		<form name="CustomizedForm" action="<BKU>" method="post" enctype="multipart/form-data<>">			
+		<form name="CustomizedForm" action="<BKU>" method="post" enctype="multipart/form-data<>">
+			Falls Sie nicht automatisch weitergeleitet werden klicken Sie bitte hier: 
      		<input class="button" type="submit" value="Starte Anmeldung" name="Senden">
 			<input type="hidden" name="XMLRequest" value="<XMLRequest>">
 			<input type="hidden" name="DataURL" value="<DataURL>">
diff --git a/id/server/auth/src/main/webapp/template_onlineBKU.html b/id/server/auth/src/main/webapp/template_onlineBKU.html
index b8cd19866..565955538 100644
--- a/id/server/auth/src/main/webapp/template_onlineBKU.html
+++ b/id/server/auth/src/main/webapp/template_onlineBKU.html
@@ -11,7 +11,8 @@
 		</script>
 	</head>
 	<body onLoad="onAnmeldeSubmit()">	 
-		<form name="CustomizedForm" action="<BKU>" method="post" enctype="multipart/form-data<>">			
+		<form name="CustomizedForm" action="<BKU>" method="post" enctype="multipart/form-data<>">
+			Falls Sie nicht automatisch weitergeleitet werden klicken Sie bitte hier: 
 		    <input class="button" type="hidden" value="Starte Anmeldung" name="Senden">
 			<input type="hidden" name="XMLRequest" value="<XMLRequest>">
 			<input type="hidden" name="DataURL" value="<DataURL>">
diff --git a/id/server/data/deploy/conf/moa-id/SampleMOAIDConfiguration.xml b/id/server/data/deploy/conf/moa-id/SampleMOAIDConfiguration.xml
index 109a59d6b..a8a9b95da 100644
--- a/id/server/data/deploy/conf/moa-id/SampleMOAIDConfiguration.xml
+++ b/id/server/data/deploy/conf/moa-id/SampleMOAIDConfiguration.xml
@@ -155,4 +155,10 @@
 		<BKUURL>https://www.handy-signatur.at/mobile/https-security-layer-request/default.aspx</BKUURL>
 		<BKUURL>https://www.a-trust.at/mobile/https-security-layer-request/default.aspx</BKUURL>
 	</TrustedBKUs>
+	<!-- URL Liste der vertrauenwürdigen Templates -->
+	<!--<TrustedTemplateURLs>
+		<TemplateURL>https://[SERVER]/template_onlineBKU.html</TemplateURL>
+		<TemplateURL>https://[SERVER]/template_handyBKU.html</TemplateURL>
+		<TemplateURL>https://[SERVER]/template_localBKU.html</TemplateURL>
+	</TrustedTemplateURLs>-->
 </MOA-IDConfiguration>
diff --git a/id/server/data/deploy/conf/moa-id/SampleMOAIDConfigurationProxy.xml b/id/server/data/deploy/conf/moa-id/SampleMOAIDConfigurationProxy.xml
index f292a7c64..204fe6df9 100644
--- a/id/server/data/deploy/conf/moa-id/SampleMOAIDConfigurationProxy.xml
+++ b/id/server/data/deploy/conf/moa-id/SampleMOAIDConfigurationProxy.xml
@@ -176,4 +176,10 @@
 		<BKUURL>https://www.handy-signatur.at/mobile/https-security-layer-request/default.aspx</BKUURL>
 		<BKUURL>https://www.a-trust.at/mobile/https-security-layer-request/default.aspx</BKUURL>
 	</TrustedBKUs>
+	<!-- URL Liste der vertrauenwürdigen Templates -->
+	<!--<TrustedTemplateURLs>
+		<TemplateURL>https://[SERVER]/template_onlineBKU.html</TemplateURL>
+		<TemplateURL>https://[SERVER]/template_handyBKU.html</TemplateURL>
+		<TemplateURL>https://[SERVER]/template_localBKU.html</TemplateURL>
+	</TrustedTemplateURLs>-->	
 </MOA-IDConfiguration>
diff --git a/id/server/data/deploy/conf/moa-id/SampleMOAIDConfiguration_withTestBKs.xml b/id/server/data/deploy/conf/moa-id/SampleMOAIDConfiguration_withTestBKs.xml
index b4735db0d..6f5a68d8b 100644
--- a/id/server/data/deploy/conf/moa-id/SampleMOAIDConfiguration_withTestBKs.xml
+++ b/id/server/data/deploy/conf/moa-id/SampleMOAIDConfiguration_withTestBKs.xml
@@ -157,4 +157,10 @@
 		<BKUURL>https://www.handy-signatur.at/mobile/https-security-layer-request/default.aspx</BKUURL>
 		<BKUURL>https://www.a-trust.at/mobile/https-security-layer-request/default.aspx</BKUURL>
 	</TrustedBKUs>
+	<!-- URL Liste der vertrauenwürdigen Templates -->
+	<!--<TrustedTemplateURLs>
+		<TemplateURL>https://[SERVER]/template_onlineBKU.html</TemplateURL>
+		<TemplateURL>https://[SERVER]/template_handyBKU.html</TemplateURL>
+		<TemplateURL>https://[SERVER]/template_localBKU.html</TemplateURL>
+	</TrustedTemplateURLs>-->	
 </MOA-IDConfiguration>
diff --git a/id/server/data/deploy/conf/moa-id/SampleMOAIDConfiguration_withTestBKsProxy.xml b/id/server/data/deploy/conf/moa-id/SampleMOAIDConfiguration_withTestBKsProxy.xml
index 9c5223de5..f9ab3469b 100644
--- a/id/server/data/deploy/conf/moa-id/SampleMOAIDConfiguration_withTestBKsProxy.xml
+++ b/id/server/data/deploy/conf/moa-id/SampleMOAIDConfiguration_withTestBKsProxy.xml
@@ -177,4 +177,10 @@
 		<BKUURL>https://www.handy-signatur.at/mobile/https-security-layer-request/default.aspx</BKUURL>
 		<BKUURL>https://www.a-trust.at/mobile/https-security-layer-request/default.aspx</BKUURL>
 	</TrustedBKUs>
+	<!-- URL Liste der vertrauenwürdigen Templates -->
+	<!--<TrustedTemplateURLs>
+		<TemplateURL>https://[SERVER]/template_onlineBKU.html</TemplateURL>
+		<TemplateURL>https://[SERVER]/template_handyBKU.html</TemplateURL>
+		<TemplateURL>https://[SERVER]/template_localBKU.html</TemplateURL>
+	</TrustedTemplateURLs>-->	
 </MOA-IDConfiguration>
diff --git a/id/server/data/deploy/conf/moa-id/SampleMOAWIDConfiguration.xml b/id/server/data/deploy/conf/moa-id/SampleMOAWIDConfiguration.xml
index bf6a7b489..563236463 100644
--- a/id/server/data/deploy/conf/moa-id/SampleMOAWIDConfiguration.xml
+++ b/id/server/data/deploy/conf/moa-id/SampleMOAWIDConfiguration.xml
@@ -65,4 +65,10 @@
 		<BKUURL>https://www.handy-signatur.at/mobile/https-security-layer-request/default.aspx</BKUURL>
 		<BKUURL>https://www.a-trust.at/mobile/https-security-layer-request/default.aspx</BKUURL>
 	</TrustedBKUs>
+	<!-- URL Liste der vertrauenwürdigen Templates -->
+	<!--<TrustedTemplateURLs>
+		<TemplateURL>https://[SERVER]/template_onlineBKU.html</TemplateURL>
+		<TemplateURL>https://[SERVER]/template_handyBKU.html</TemplateURL>
+		<TemplateURL>https://[SERVER]/template_localBKU.html</TemplateURL>
+	</TrustedTemplateURLs>-->	
 </MOA-IDConfiguration>
diff --git a/id/server/data/deploy/conf/moa-id/SampleMOAWIDConfigurationProxy.xml b/id/server/data/deploy/conf/moa-id/SampleMOAWIDConfigurationProxy.xml
index f54f3df3e..7ff50bcf7 100644
--- a/id/server/data/deploy/conf/moa-id/SampleMOAWIDConfigurationProxy.xml
+++ b/id/server/data/deploy/conf/moa-id/SampleMOAWIDConfigurationProxy.xml
@@ -85,4 +85,10 @@
 		<BKUURL>https://www.handy-signatur.at/mobile/https-security-layer-request/default.aspx</BKUURL>
 		<BKUURL>https://www.a-trust.at/mobile/https-security-layer-request/default.aspx</BKUURL>
 	</TrustedBKUs>
+	<!-- URL Liste der vertrauenwürdigen Templates -->
+	<!--<TrustedTemplateURLs>
+		<TemplateURL>https://[SERVER]/template_onlineBKU.html</TemplateURL>
+		<TemplateURL>https://[SERVER]/template_handyBKU.html</TemplateURL>
+		<TemplateURL>https://[SERVER]/template_localBKU.html</TemplateURL>
+	</TrustedTemplateURLs>-->
 </MOA-IDConfiguration>
diff --git a/id/server/data/deploy/conf/moa-id/SampleMOAWIDConfiguration_withTestBKs.xml b/id/server/data/deploy/conf/moa-id/SampleMOAWIDConfiguration_withTestBKs.xml
index 1472571fc..f3e0b777a 100644
--- a/id/server/data/deploy/conf/moa-id/SampleMOAWIDConfiguration_withTestBKs.xml
+++ b/id/server/data/deploy/conf/moa-id/SampleMOAWIDConfiguration_withTestBKs.xml
@@ -66,4 +66,10 @@
 		<BKUURL>https://www.handy-signatur.at/mobile/https-security-layer-request/default.aspx</BKUURL>
 		<BKUURL>https://www.a-trust.at/mobile/https-security-layer-request/default.aspx</BKUURL>
 	</TrustedBKUs>
+	<!-- URL Liste der vertrauenwürdigen Templates -->
+	<!--<TrustedTemplateURLs>
+		<TemplateURL>https://[SERVER]/template_onlineBKU.html</TemplateURL>
+		<TemplateURL>https://[SERVER]/template_handyBKU.html</TemplateURL>
+		<TemplateURL>https://[SERVER]/template_localBKU.html</TemplateURL>
+	</TrustedTemplateURLs>-->	
 </MOA-IDConfiguration>
diff --git a/id/server/data/deploy/conf/moa-id/SampleMOAWIDConfiguration_withTestBKsProxy.xml b/id/server/data/deploy/conf/moa-id/SampleMOAWIDConfiguration_withTestBKsProxy.xml
index ea8260a91..530540dce 100644
--- a/id/server/data/deploy/conf/moa-id/SampleMOAWIDConfiguration_withTestBKsProxy.xml
+++ b/id/server/data/deploy/conf/moa-id/SampleMOAWIDConfiguration_withTestBKsProxy.xml
@@ -86,4 +86,10 @@
 		<BKUURL>https://www.handy-signatur.at/mobile/https-security-layer-request/default.aspx</BKUURL>
 		<BKUURL>https://www.a-trust.at/mobile/https-security-layer-request/default.aspx</BKUURL>
 	</TrustedBKUs>
+	<!-- URL Liste der vertrauenwürdigen Templates -->
+	<!--<TrustedTemplateURLs>
+		<TemplateURL>https://[SERVER]/template_onlineBKU.html</TemplateURL>
+		<TemplateURL>https://[SERVER]/template_handyBKU.html</TemplateURL>
+		<TemplateURL>https://[SERVER]/template_localBKU.html</TemplateURL>
+	</TrustedTemplateURLs>-->	
 </MOA-IDConfiguration>
diff --git a/id/server/doc/moa_id/id-admin_2.htm b/id/server/doc/moa_id/id-admin_2.htm
index c5ba8827b..5252c34f5 100644
--- a/id/server/doc/moa_id/id-admin_2.htm
+++ b/id/server/doc/moa_id/id-admin_2.htm
@@ -90,6 +90,7 @@ Projekt <span style="font-size:48pt; ">moa</span>&#160;
 <a href="#TrustedCACertificates">TrustedCACertificates</a><br />
 <a href="#GenericConfiguration">GenericConfiguration</a><br />
 <a href="#TrustedBKUs">TrustedBKUs</a><br />
+<a href="#TrustedTemplateURLs">TrustedTemplateURLs</a><br />
 <br />
 <a href="#oa-config"><b>Konfiguration<br />der Online-Applikation</b></a><br />
 <br />
@@ -1314,7 +1315,14 @@ Hinweis: Um den Online-Vollmachten Modus f&uuml;r eine Online Applikation zu akt
                                     <p id="block"> <b>TrustedBKUs</b><br />
                                       Das Element <tt>TrustedBKUs</tt>
                                       erm&ouml;glicht das Setzen von vertrauensw&uuml;rdigen B&uuml;rgerkartenumgebungen.
-                                      In <tt>BKUURL</tt> Unterelementen werden die vertrauensw&uuml;rdigen URLs eingetragen. Diese Liste von URLs wird mit dem Parameter bkuURI abgeglichen. Lokale B&uuml;rgerkartenumgebungen m&uuml;ssen nicht eingetragen werden - diesen wird automatisch vertraut.
+                                      In <tt>BKUURL</tt> Unterelementen werden die vertrauensw&uuml;rdigen URLs eingetragen. Diese Liste von URLs wird mit dem Aufruf-Parameter bkuURI abgeglichen. Lokale B&uuml;rgerkartenumgebungen m&uuml;ssen nicht eingetragen werden - diesen wird automatisch vertraut.
+                                    </p>
+                                  </div>
+                                  <div id="TrustedTemplateURLs" />
+                                    <p id="block"> <b>TrustedTemplateURLs</b><br />
+                                      Das Element <tt>TrustedTemplateURLs</tt>
+                                      erm&ouml;glicht das Setzen von vertrauensw&uuml;rdigen Templates, die sich auf externen Servern befinden.
+                                      In <tt>TemplateURL</tt> Unterelementen werden die vertrauensw&uuml;rdigen URLs eingetragen. Diese Liste von URLs wird mit dem Aufruf-Parameter template abgeglichen. 
                                     </p>
                                   </div>
                                 </div>
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java
index a57ab5262..2964f8a88 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java
@@ -570,16 +570,16 @@ public class AuthenticationServer implements MOAIDAuthConstants {
 		int b = xmlInfoboxReadResponse.indexOf(se);
 		if (b != -1) { // no identity link found
 			Logger
-					.info("Es konnte keine Personenbindung auf der Karte gefunden werden. Versuche Anmeldung als ausl�ndische eID.");
+					.info("Es konnte keine Personenbindung auf der Karte gefunden werden. Versuche Anmeldung als auslaendische eID.");
 			return null;
 		}
-		// spezifikationsgem��er (SL1.2) Errorcode
+		// spezifikationsgemaess (SL1.2) Errorcode
 		se = "ErrorCode>4002";
 		// b = xmlInfoboxReadResponse.contains(se);
 		b = xmlInfoboxReadResponse.indexOf(se);
 		if (b != -1) { // Unbekannter Infoboxbezeichner
 			Logger
-					.info("Unbekannter Infoboxbezeichner. Versuche Anmeldung als ausl�ndische eID.");
+					.info("Unbekannter Infoboxbezeichner. Versuche Anmeldung als auslaendische eID.");
 			return null;
 		}
 
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GetForeignIDServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GetForeignIDServlet.java
index bf7a0f714..6516e64b7 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GetForeignIDServlet.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GetForeignIDServlet.java
@@ -210,7 +210,7 @@ public class GetForeignIDServlet extends AuthServlet {
   
   
   /**
-   * Builds the szrgw:GetIdentityLinkRequest f�r the SZR-GW
+   * Builds the szrgw:GetIdentityLinkRequest fuer the SZR-GW
    * @param givenname
    * @param familyname
    * @param birthday
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/ConfigurationBuilder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/ConfigurationBuilder.java
index 13e7cb0f1..839de48bf 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/ConfigurationBuilder.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/ConfigurationBuilder.java
@@ -210,6 +210,10 @@ public class ConfigurationBuilder {
   /** an XPATH-Expression */ 
   protected static final String TRUSTED_BKUS =
     ROOT + CONF + "TrustedBKUs/" + CONF + "BKUURL";
+
+  protected static final String TRUSTED_TEMPLATEURLS =
+	    ROOT + CONF + "TrustedTemplateURLs/" + CONF + "TemplateURL";
+
   
   /** an XPATH-Expression */ 
   protected static final String CHAINING_MODES_XPATH =
@@ -500,6 +504,23 @@ public class ConfigurationBuilder {
 	      return trustedBKUs;
 	  
   }
+  
+public List getTrustedTemplateURLs() {
+	  
+	  List trustedTemplateURLs = new ArrayList();
+	    
+	      NodeIterator bkuIter = XPathUtils.selectNodeIterator(configElem_, TRUSTED_TEMPLATEURLS);
+	      
+	      Element vtElem;
+
+	      while ((vtElem = (Element) bkuIter.nextNode()) != null) {
+		      	String bkuURL = DOMUtils.getText(vtElem);
+		      	trustedTemplateURLs.add(bkuURL);
+	      }
+	      
+	      return trustedTemplateURLs;
+	  
+  }
 
   /**
    * Returns a list containing all X509 Subject Names 
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/AuthConfigurationProvider.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/AuthConfigurationProvider.java
index b6ffb0c59..b86b2ec68 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/AuthConfigurationProvider.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/AuthConfigurationProvider.java
@@ -187,6 +187,11 @@ public class AuthConfigurationProvider extends ConfigurationProvider {
    */
   private List trustedBKUs;
   
+  /**
+   * Parameter for trusted Template URLs
+   */
+  private List trustedTemplateURLs;
+  
   /**
    * Holds general information for STORK (e.g. C-PEPS connection parameter, SAML signing parameters, etc.)
    */
@@ -307,6 +312,7 @@ public class AuthConfigurationProvider extends ConfigurationProvider {
     	trustedCACertificates = builder.getTrustedCACertificates();
     	trustedCACertificates = FileUtils.makeAbsoluteURL(trustedCACertificates, rootConfigFileDir);
     	trustedBKUs = builder.getTrustedBKUs();
+    	trustedTemplateURLs = builder.getTrustedTemplateURLs();
     	storkConfig = new STORKConfig(builder.buildSTORKSignatureCreationParameter(),builder.buildSTORKSignatureVerificationParameter(), builder.buildSTORKcPEPSMap());
 
     } catch (Throwable t) {
@@ -466,6 +472,13 @@ public class AuthConfigurationProvider extends ConfigurationProvider {
     return this.trustedBKUs;
   }
 
+  /**
+   * Returns the trustedTemplateURLs.
+   * @return List
+   */
+  public List getTrustedTemplateURLs() {
+    return this.trustedTemplateURLs;
+  }
 
   /**
    * Returns the bKUConnectionParameter.
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/ParamValidatorUtils.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/ParamValidatorUtils.java
index 0862371dd..bd79f88b7 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/ParamValidatorUtils.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/ParamValidatorUtils.java
@@ -28,6 +28,7 @@ import java.io.IOException;
 import java.io.StringReader;
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.util.Iterator;
 import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -55,7 +56,7 @@ public class ParamValidatorUtils {
     */
    public static boolean isValidTarget(String target) {
    
-	   Logger.debug("�berpr�fe Parameter Target");
+	   Logger.debug("Ueberpruefe Parameter Target");
 	   
       // if non parameter is given return true
       if (StringUtils.isEmpty(target)) {
@@ -68,11 +69,11 @@ public class ParamValidatorUtils {
       Matcher matcher = pattern.matcher(target);
       boolean b = matcher.matches();
       if (b) {
-    	Logger.debug("Parameter Target erfolgreich �berpr�ft");
+    	Logger.debug("Parameter Target erfolgreich ueberprueft");
     	return true;
       }
       else {
-    	  Logger.error("Fehler �berpr�fung Parameter Target. Target entspricht nicht den Kriterien (nur Zeichen a-z, A-Z und -, sowie 1-5 Zeichen lang)");
+    	  Logger.error("Fehler Ueberpruefung Parameter Target. Target entspricht nicht den Kriterien (nur Zeichen a-z, A-Z und -, sowie 1-5 Zeichen lang)");
     	  return false;  
       }
             
@@ -85,7 +86,7 @@ public class ParamValidatorUtils {
     */
    public static boolean isValidCCC(String ccc) {
    
-	   Logger.debug("�berpr�fe Parameter CCC");
+	   Logger.debug("Ueberpruefe Parameter CCC");
 	   
       // if non parameter is given return true
       if (StringUtils.isEmpty(ccc)) {
@@ -98,11 +99,11 @@ public class ParamValidatorUtils {
       Matcher matcher = pattern.matcher(ccc);
       boolean b = matcher.matches();
       if (b) {
-    	Logger.debug("Parameter CCC erfolgreich �berpr�ft");
+    	Logger.debug("Parameter CCC erfolgreich ueberprueft");
     	return true;
       }
       else {
-    	  Logger.error("Fehler �berpr�fung Parameter CCC. CCC entspricht nicht den Kriterien (nur Zeichen a-z, A-Z, sowie 2 Zeichen lang)");
+    	  Logger.error("Fehler Ueberpruefung Parameter CCC. CCC entspricht nicht den Kriterien (nur Zeichen a-z, A-Z, sowie 2 Zeichen lang)");
     	  return false;  
       }
             
@@ -115,7 +116,7 @@ public class ParamValidatorUtils {
     */
    public static boolean isValidSourceID(String sourceID) {
    
-	   Logger.debug("�berpr�fe Parameter sourceID");
+	   Logger.debug("Ueberpruefe Parameter sourceID");
 	   
       // if non parameter is given return true
       if (StringUtils.isEmpty(sourceID)) {
@@ -128,11 +129,11 @@ public class ParamValidatorUtils {
       Matcher matcher = pattern.matcher(sourceID);
       boolean b = matcher.matches();
       if (b) {
-    	Logger.debug("Parameter sourceID erfolgreich �berpr�ft");
+    	Logger.debug("Parameter sourceID erfolgreich ueberprueft");
     	return true;
       }
       else {
-    	  Logger.error("Fehler �berpr�fung Parameter sourceID. SourceID entspricht nicht den Kriterien (nur Zeichen a-z, A-Z, - und _, sowie 1-20 Zeichen lang)");
+    	  Logger.error("Fehler Ueberpruefung Parameter sourceID. SourceID entspricht nicht den Kriterien (nur Zeichen a-z, A-Z, - und _, sowie 1-20 Zeichen lang)");
     	  return false;  
       }
             
@@ -145,7 +146,7 @@ public class ParamValidatorUtils {
     */
    public static boolean isValidUseMandate(String usemandate) {
    
-	   Logger.debug("�berpr�fe Parameter useMandate");
+	   Logger.debug("Ueberpruefe Parameter useMandate");
 	   
       // if non parameter is given return true
       if (StringUtils.isEmpty(usemandate)) {
@@ -155,11 +156,11 @@ public class ParamValidatorUtils {
          
       
       if (usemandate.compareToIgnoreCase("true") == 0 || usemandate.compareToIgnoreCase("false") == 0) {
-    	  Logger.debug("Parameter useMandate erfolgreich �berpr�ft");
+    	  Logger.debug("Parameter useMandate erfolgreich ueberprueft");
     	  return true;
       }
       else {
-    	  Logger.error("Fehler �berpr�fung Parameter useMandate. useMandate ist weder 'true' noch 'false')");
+    	  Logger.error("Fehler Ueberpruefung Parameter useMandate. useMandate ist weder 'true' noch 'false')");
     	  return false;
       }
     	  
@@ -175,7 +176,7 @@ public class ParamValidatorUtils {
     * @return 
     */
    public static boolean isValidBKUURI(String bkuURI) {
-	   Logger.debug("�berpr�fe Parameter bkuURI");
+	   Logger.debug("Ueberpruefe Parameter bkuURI");
 	   
 	   // if non parameter is given return true
 	      if (StringUtils.isEmpty(bkuURI)) {
@@ -194,20 +195,20 @@ public class ParamValidatorUtils {
 	    			  bkuURI.compareToIgnoreCase("http://localhost:3495/http-security-layer-request") == 0 ||
 	    			  bkuURI.compareToIgnoreCase("http://127.0.0.1:3495/http-security-layer-request") == 0 ||
 	    			  bkuURI.compareToIgnoreCase("https://127.0.0.1:3496/https-security-layer-request") == 0) {
-	    			  Logger.debug("Parameter bkuURI erfolgreich �berpr�ft");
+	    			  Logger.debug("Parameter bkuURI erfolgreich ueberprueft");
 	    			  return true;
 	    		  }
 	    		  else {
-	    			  Logger.debug("Parameter bkuURI ist keine lokale BKU. �berpr�fe Liste der vertrauensw�rdigen BKUs.");
+	    			  Logger.debug("Parameter bkuURI ist keine lokale BKU. Ueberpruefe Liste der vertrauenswuerdigen BKUs.");
 	    			  AuthConfigurationProvider authConf = AuthConfigurationProvider.getInstance();
 		    		  List trustedBKUs = authConf.getTrustedBKUs();
 		    		  boolean b = trustedBKUs.contains(bkuURI);
 		    		  if (b) {
-		    			  Logger.debug("Parameter bkuURI erfolgreich �berpr�ft");
+		    			  Logger.debug("Parameter bkuURI erfolgreich ueberprueft");
 		    			  return true;
 		    		  }
 		    		  else {
-		    			  Logger.error("Fehler �berpr�fung Parameter bkuURI. bkuURI ist nicht auf Liste der vertrauensw�rdigen BKUs (Konfigurationselement: MOA-IDConfiguration/TrustedBKUs)");  
+		    			  Logger.error("Fehler Ueberpruefung Parameter bkuURI. bkuURI ist nicht auf Liste der vertrauenswuerdigen BKUs (Konfigurationselement: MOA-IDConfiguration/TrustedBKUs)");  
 		    			  return false;
 		    		  }  
 	    		  }
@@ -215,126 +216,20 @@ public class ParamValidatorUtils {
 	    			
 	    	  }
 	    	  else {
-	    		  Logger.error("Fehler �berpr�fung Parameter bkuURI. bkuURI beginnt nicht mit http or https");
+	    		  Logger.error("Fehler Ueberpruefung Parameter bkuURI. bkuURI beginnt nicht mit http or https");
 	    		  return false;
 	    	  }
 	    	  
 	            
 	      } catch (MalformedURLException e) {
-	    	  Logger.error("Fehler �berpr�fung Parameter bkuURI", e);
+	    	  Logger.error("Fehler Ueberpruefung Parameter bkuURI", e);
 	         return false;
 	      } catch (ConfigurationException e) {
-	    	  Logger.error("Fehler �berpr�fung Parameter bkuURI", e);
+	    	  Logger.error("Fehler Ueberpruefung Parameter bkuURI", e);
 	    	  return false;
 		}
    }
    
-//   private static boolean testBKUConnection(URL url) {
-//	
-//	   // make NullOperationRequest
-//	   //String request = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><sl:NullOperationRequest xmlns:sl=\"http://www.buergerkarte.at/namespaces/securitylayer/1.2#\"/>";
-//	   String request = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><sl:GetPropertiesRequest xmlns:sl=\"http://www.buergerkarte.at/namespaces/securitylayer/1.2#\"/>";
-//	   	   
-//	   HttpURLConnection connection;
-//	   if (url != null) {
-//		   try {
-//			    if (url.toExternalForm().startsWith("https")) {
-//					connection = (HttpsURLConnection)url.openConnection();
-//				}
-//				else { 
-//					connection = (HttpURLConnection)url.openConnection();
-//				}
-//				
-//				connection.setRequestMethod("POST");
-//			    connection.setDoOutput(true);
-//			      
-//			    connection.setRequestProperty("Content-Type", "application/x-www-form-urlencoded");
-//			      
-//			    String toSend = URLEncoder.encode(request, "UTF-8");
-//			    toSend = "XMLRequest=" + toSend;
-//			    connection.setRequestProperty("Content-Length", String.valueOf(toSend.getBytes().length));
-//	
-//			    Logger.debug("Send NullOperationRequest to BKU.");
-//			    
-//			    OutputStream out = connection.getOutputStream();
-//			    out.write(toSend.getBytes());
-//			      
-//			    // get response
-//			    connection.connect();
-//			    int responseCode = connection.getResponseCode();
-//		      
-//			    if (responseCode != 200) {
-//			    	InputStream is = connection.getErrorStream();
-//			    	int ch;
-//			    	String ret = "";
-//			    	while ((ch = is.read()) != -1) 
-//			    		ret += (char)ch;
-//			    	
-//			    	is.close();
-//			    	
-//			    	System.out.println("ret: " + ret);
-//			    	
-//			    	Logger.error("Fehler �berpr�fung Parameter bkuURI. Antwortcode von BKU ist nicht 200.");
-//			    	return false;
-//			    }
-//		      
-//			    DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();	
-//			    factory.setNamespaceAware(true);
-//			    DocumentBuilder builder = factory.newDocumentBuilder();
-//			    
-//			    //Document doc = builder.parse(connection.getInputStream());
-//			    
-//			    System.out.println(convertStreamToString(connection.getInputStream()));
-//			    
-////			    NodeList l = doc.getElementsByTagNameNS(Constants.SL12_NS_URI, "ErrorResponse");		    	
-////		    	if (l.getLength() != 0) {
-////		    		Logger.error("Fehler �berpr�fung Parameter bkuURI. ErrorResponse von BKU empfangen.");
-////		    		return false;			    	
-////		    	}
-//		    	
-//		    	Logger.debug("Parameter Template bkuURI erfolgreich �berpr�ft");
-//			    return true;
-//			    
-////		   } catch (SAXException e) {
-////				Logger.error("Fehler �berpr�fung Parameter bkuURI.", e);
-////				return false;
-//			} catch (IOException e) {
-//				Logger.error("Fehler �berpr�fung Parameter bkuURI.", e);
-//				return false;
-//			} catch (ParserConfigurationException e) {
-//				Logger.error("Fehler �berpr�fung Parameter bkuURI.", e);
-//				return false;
-//			}
-//		}
-//	   else {
-//		   Logger.error("Fehler �berpr�fung Parameter bkuURI. bkuURI ist null.");
-//		   return false;
-//	   }
-//		    
-//
-//   }
-   
-//   public static String convertStreamToString(InputStream is)  {
-//	   if (is != null) {
-//		   Writer writer = new StringWriter();
-//   
-//		   char[] buffer = new char[1024];
-//		   try {
-//			   Reader reader = new BufferedReader(new InputStreamReader(is, "UTF-8"));
-//			   int n;
-//			   while ((n = reader.read(buffer)) != -1) {
-//				   writer.write(buffer, 0, n);
-//			   }
-//		   } catch (IOException e) {			
-//			e.printStackTrace();
-//		} 
-//		   
-//		   	return writer.toString();
-//	   }	
-//	   else {       
-//		   return "";
-//	   }
-//   }
    
    /**
     * Checks if the given template is valid
@@ -344,7 +239,7 @@ public class ParamValidatorUtils {
     */
    public static boolean isValidTemplate(HttpServletRequest req, String template) {
    
-	   Logger.debug("�berpr�fe Parameter Template bzw. bkuSelectionTemplateURL");
+	   Logger.debug("Ueberpruefe Parameter Template bzw. bkuSelectionTemplateURL");
 	   
       // if non parameter is given return true
       if (StringUtils.isEmpty(template)) {
@@ -365,25 +260,39 @@ public class ParamValidatorUtils {
     		  
     		  if (template.startsWith(httpName) || template.startsWith(httpsName)) {
     			 new URL(template);
-    			 Logger.debug("Parameter Template bzw. bkuSelectionTemplateURL erfolgreich �berpr�ft");
+    			 Logger.debug("Parameter Template bzw. bkuSelectionTemplateURL erfolgreich ueberprueft");
      	         return true;
     		  }
-    		  else {
-    			  Logger.error("Fehler �berpr�fung Parameter Template bzw. bkuSelectionTemplateURL. Parameter liegt nicht am gleichen Server wie die MOA-Instanz (" + req.getServerName() + ")");
-    			  return false;
+    		  else {
+    			  //check against configured trustet template urls
+    			  AuthConfigurationProvider authConf = AuthConfigurationProvider.getInstance();
+    			  List trustedTemplateURLs = authConf.getTrustedTemplateURLs();
+	    		  boolean b = trustedTemplateURLs.contains(template);
+	    		  if (b) {
+	    			  Logger.debug("Parameter Template erfolgreich ueberprueft");
+	    			  return true;
+	    		  }
+	    		  else {
+	    			  Logger.error("Fehler Ueberpruefung Parameter Template bzw. bkuSelectionTemplateURL. Parameter liegt nicht am gleichen Server wie die MOA-Instanz (" + req.getServerName() + ") bzw. ist nicht auf Liste der vertrauenswuerdigen Template URLs (Konfigurationselement: MOA-IDConfiguration/TrustedTemplateURLs)");  
+	    			  return false;
+	    		  }  
+    			  
     		  }
     		  
     	  }
     	  else {
-    		  Logger.error("Fehler �berpr�fung Parameter Template bzw. bkuSelectionTemplateURL. Paramter beginnt nicht mit http oder https.");
+    		  Logger.error("Fehler Ueberpruefung Parameter Template bzw. bkuSelectionTemplateURL. Paramter beginnt nicht mit http oder https.");
     		  return false;
     	  }
     	  
             
       } catch (MalformedURLException e) {
-    	 Logger.error("Fehler �berpr�fung Parameter Template bzw. bkuSelectionTemplateURL.", e);
+    	 Logger.error("Fehler Ueberpruefung Parameter Template bzw. bkuSelectionTemplateURL.", e);
          return false;
-      }
+      } catch (ConfigurationException e) {
+    	  Logger.error("Fehler Ueberpruefung Parameter Template bzw. bkuSelectionTemplateURL.", e);
+    	  return false;
+	}
    }
    
    /**
@@ -392,7 +301,7 @@ public class ParamValidatorUtils {
     * @return 
     */
    public static boolean isValidSessionID(String sessionID) {
-	   Logger.debug("�berpr�fe Parameter MOASessionId");
+	   Logger.debug("Ueberpruefe Parameter MOASessionId");
 	   
       // if non parameter is given return true
       if (StringUtils.isEmpty(sessionID)) {
@@ -405,18 +314,13 @@ public class ParamValidatorUtils {
       Matcher matcher = pattern.matcher(sessionID);
       boolean b = matcher.matches();
       if (b) {
-    	  Logger.debug("Parameter MOASessionId erfolgreich �berpr�ft");
+    	  Logger.debug("Parameter MOASessionId erfolgreich ueberprueft");
     	  return true;
       }
       else {
-    	  Logger.error("Fehler �berpr�fung Parameter MOASessionId. MOASessionId entspricht nicht den Kriterien (nur Zeichen 0-9 und -)");
+    	  Logger.error("Fehler Ueberpruefung Parameter MOASessionId. MOASessionId entspricht nicht den Kriterien (nur Zeichen 0-9 und -)");
     	  return false;
       }
-
-      
-  	  
-      
-      
    }
    
    /**
@@ -425,7 +329,7 @@ public class ParamValidatorUtils {
     * @return 
     */
    public static boolean isValidOA(String oa) {
-	   Logger.debug("�berpr�fe Parameter oa");
+	   Logger.debug("Ueberpruefe Parameter oa");
 	   // if non parameter is given return true
 	   if (StringUtils.isEmpty(oa)) {
 		   Logger.debug("Parameter oa ist null");
@@ -438,16 +342,16 @@ public class ParamValidatorUtils {
 		   // check if template url starts with http or https 
 		   if (oa.startsWith("http") || oa.startsWith("https")) {
 			   new URL(oa);
-			   Logger.debug("Parameter oa erfolgreich �berpr�ft");
+			   Logger.debug("Parameter oa erfolgreich ueberprueft");
 			   return true;	    		  
 	    	  }
 	    	  else  {
-	    		  Logger.error("Fehler �berpr�fung Parameter oa. oa beginnt nicht mit http or https");
+	    		  Logger.error("Fehler Ueberpruefung Parameter oa. oa beginnt nicht mit http or https");
 	    		  return false;    	  
 	    	  }
 	            
 	      } catch (MalformedURLException e) {
-	    	  Logger.error("Fehler �berpr�fung Parameter oa", e);
+	    	  Logger.error("Fehler Ueberpruefung Parameter oa", e);
 	         return false;
 	      }
 	   
@@ -460,7 +364,7 @@ public class ParamValidatorUtils {
     */
    public static boolean isValidSignUrl(String signurl) {
 	   
-	   Logger.debug("�berpr�fe Parameter signurl");
+	   Logger.debug("Ueberpruefe Parameter signurl");
    
 	   // if non parameter is given return true
 	   if (StringUtils.isEmpty(signurl)) {
@@ -474,16 +378,16 @@ public class ParamValidatorUtils {
 		   // check if signurl starts with http or https 
 		   if (signurl.startsWith("http") || signurl.startsWith("https")) {
 			   new URL(signurl);
-			   Logger.debug("Parameter signurl erfolgreich �berpr�ft");
+			   Logger.debug("Parameter signurl erfolgreich ueberprueft");
 			   return true;	    		  
 	    	  }
 	    	  else {
-	    		  Logger.error("Fehler �berpr�fung Parameter signurl. signurl beginnt nicht mit http or https");
+	    		  Logger.error("Fehler Ueberpruefung Parameter signurl. signurl beginnt nicht mit http or https");
 	    		  return false;
 	    	  }	    	  
 	            
 	      } catch (MalformedURLException e) {
-	    	  Logger.error("Fehler �berpr�fung Parameter signurl", e);
+	    	  Logger.error("Fehler Ueberpruefung Parameter signurl", e);
 	         return false;
 	      }
 	   
@@ -542,24 +446,24 @@ public class ParamValidatorUtils {
 	   if (StringUtils.isEmpty(document))
 		   return false;
 	   
-	   Logger.debug("Überprüfe Parameter XMLDocument");
+	   Logger.debug("Ueberpruefe Parameter XMLDocument");
 	   try {   
 		   DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
 		   DocumentBuilder builder = factory.newDocumentBuilder();
 		   InputSource is = new InputSource(new StringReader(document));
 		   builder.parse(is);
 		   
-		   Logger.debug("Parameter XMLDocument erfolgreich überprüft");
+		   Logger.debug("Parameter XMLDocument erfolgreich ueberprueft");
 		   return true;
 	   
 	   } catch (ParserConfigurationException e) {
-		   Logger.error("Fehler Überprüfung Parameter XMLDocument", e);
+		   Logger.error("Fehler Ueberpruefung Parameter XMLDocument", e);
 		   return false;
 	   } catch (SAXException e) {
-		   Logger.error("Fehler Überprüfung Parameter XMLDocument", e);
+		   Logger.error("Fehler Ueberpruefung Parameter XMLDocument", e);
 		   return false;
 	   } catch (IOException e) {
-		   Logger.error("Fehler Überprüfung Parameter XMLDocument", e);
+		   Logger.error("Fehler Ueberpruefung Parameter XMLDocument", e);
 		   return false;
 	   }	
 	   
diff --git a/id/server/proxy/.settings/org.eclipse.wst.common.component b/id/server/proxy/.settings/org.eclipse.wst.common.component
index dbb1dc825..fa97f3880 100644
--- a/id/server/proxy/.settings/org.eclipse.wst.common.component
+++ b/id/server/proxy/.settings/org.eclipse.wst.common.component
@@ -1,143 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project-modules id="moduleCoreId" project-version="2.0">
+<project-modules id="moduleCoreId" project-version="1.5.0">
   <wb-module deploy-name="moa-id-proxy">
+        <dependent-module deploy-path="/WEB-INF/lib" handle="module:/resource/moa-spss-lib/moa-spss-lib">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module deploy-path="/WEB-INF/lib" handle="module:/resource/moa-common/moa-common">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module deploy-path="/WEB-INF/lib" handle="module:/resource/moa-id-lib/moa-id-lib">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module deploy-path="/WEB-INF/lib" handle="module:/resource/stork-saml-engine/stork-saml-engine">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
     <property name="context-root" value="moa-id-proxy"/>
     <wb-resource deploy-path="/" source-path="src/main/webapp"/>
     <property name="java-output-path" value="/target/classes"/>
-    <dependent-module archiveName="axis-1.1.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/axis/axis/1.1/axis-1.1.jar">
-      <dependency-type>uses</dependency-type>
-    </dependent-module>
-    <dependent-module archiveName="moa-spss-lib.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/moa-spss-lib/moa-spss-lib">
-      <dependency-type>uses</dependency-type>
-    </dependent-module>
-    <dependent-module archiveName="axis-jaxrpc-1.4.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/apache/axis/axis-jaxrpc/1.4/axis-jaxrpc-1.4.jar">
-      <dependency-type>uses</dependency-type>
-    </dependent-module>
-    <dependent-module archiveName="axis-saaj-1.4.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/apache/axis/axis-saaj/1.4/axis-saaj-1.4.jar">
-      <dependency-type>uses</dependency-type>
-    </dependent-module>
-    <dependent-module archiveName="axis-wsdl4j-1.5.1.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/axis/axis-wsdl4j/1.5.1/axis-wsdl4j-1.5.1.jar">
-      <dependency-type>uses</dependency-type>
-    </dependent-module>
-    <dependent-module archiveName="commons-discovery-0.2.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/commons-discovery/commons-discovery/0.2/commons-discovery-0.2.jar">
-      <dependency-type>uses</dependency-type>
-    </dependent-module>
-    <dependent-module archiveName="commons-logging-1.0.4.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar">
-      <dependency-type>uses</dependency-type>
-    </dependent-module>
-    <dependent-module archiveName="activation-1.1.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/javax/activation/activation/1.1/activation-1.1.jar">
-      <dependency-type>uses</dependency-type>
-    </dependent-module>
-    <dependent-module archiveName="mail-1.4.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/javax/mail/mail/1.4/mail-1.4.jar">
-      <dependency-type>uses</dependency-type>
-    </dependent-module>
-    <dependent-module archiveName="log4j-1.2.14.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar">
-      <dependency-type>uses</dependency-type>
-    </dependent-module>
-    <dependent-module archiveName="postgresql-7.2.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/postgresql/postgresql/7.2/postgresql-7.2.jar">
-      <dependency-type>uses</dependency-type>
-    </dependent-module>
-    <dependent-module archiveName="iaik_moa-1.32.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/iaik/prod/iaik_moa/1.32/iaik_moa-1.32.jar">
-      <dependency-type>uses</dependency-type>
-    </dependent-module>
-    <dependent-module archiveName="iaik_ixsil-1.2.2.5.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/iaik/prod/iaik_ixsil/1.2.2.5/iaik_ixsil-1.2.2.5.jar">
-      <dependency-type>uses</dependency-type>
-    </dependent-module>
-    <dependent-module archiveName="iaik_cms-4.1_MOA.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/iaik/prod/iaik_cms/4.1_MOA/iaik_cms-4.1_MOA.jar">
-      <dependency-type>uses</dependency-type>
-    </dependent-module>
-    <dependent-module archiveName="moa-common.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/moa-common/moa-common">
-      <dependency-type>uses</dependency-type>
-    </dependent-module>
-    <dependent-module archiveName="jaxen-1.0-FCS.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/jaxen/jaxen/1.0-FCS/jaxen-1.0-FCS.jar">
-      <dependency-type>uses</dependency-type>
-    </dependent-module>
-    <dependent-module archiveName="saxpath-1.0-FCS.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/saxpath/saxpath/1.0-FCS/saxpath-1.0-FCS.jar">
-      <dependency-type>uses</dependency-type>
-    </dependent-module>
-    <dependent-module archiveName="joda-time-1.6.2.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/joda-time/joda-time/1.6.2/joda-time-1.6.2.jar">
-      <dependency-type>uses</dependency-type>
-    </dependent-module>
-    <dependent-module archiveName="moa-id-lib.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/moa-id-lib/moa-id-lib">
-      <dependency-type>uses</dependency-type>
-    </dependent-module>
-    <dependent-module archiveName="commons-fileupload-1.1.1.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/commons-fileupload/commons-fileupload/1.1.1/commons-fileupload-1.1.1.jar">
-      <dependency-type>uses</dependency-type>
-    </dependent-module>
-    <dependent-module archiveName="commons-io-1.1.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/commons-io/commons-io/1.1/commons-io-1.1.jar">
-      <dependency-type>uses</dependency-type>
-    </dependent-module>
-    <dependent-module archiveName="commons-httpclient-3.1.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar">
-      <dependency-type>uses</dependency-type>
-    </dependent-module>
-    <dependent-module archiveName="commons-codec-1.2.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/commons-codec/commons-codec/1.2/commons-codec-1.2.jar">
-      <dependency-type>uses</dependency-type>
-    </dependent-module>
-    <dependent-module archiveName="dav4j-0.1.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/dav4j/dav4j/0.1/dav4j-0.1.jar">
-      <dependency-type>uses</dependency-type>
-    </dependent-module>
-    <dependent-module archiveName="httpsclient-JSSE-1.0.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/httpsclient/httpsclient/JSSE-1.0/httpsclient-JSSE-1.0.jar">
-      <dependency-type>uses</dependency-type>
-    </dependent-module>
-    <dependent-module archiveName="iaik_X509TrustManager-0.2.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/iaik/prod/iaik_X509TrustManager/0.2/iaik_X509TrustManager-0.2.jar">
-      <dependency-type>uses</dependency-type>
-    </dependent-module>
-    <dependent-module archiveName="regexp-1.3.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/regexp/regexp/1.3/regexp-1.3.jar">
-      <dependency-type>uses</dependency-type>
-    </dependent-module>
-    <dependent-module archiveName="commons-lang-2.6.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/commons-lang/commons-lang/2.6/commons-lang-2.6.jar">
-      <dependency-type>uses</dependency-type>
-    </dependent-module>
-    <dependent-module archiveName="stork-saml-engine.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/stork-saml-engine/stork-saml-engine">
-      <dependency-type>uses</dependency-type>
-    </dependent-module>
-    <dependent-module archiveName="opensaml-2.5.3.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/opensaml/opensaml/2.5.3/opensaml-2.5.3.jar">
-      <dependency-type>uses</dependency-type>
-    </dependent-module>
-    <dependent-module archiveName="openws-1.4.4.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/opensaml/openws/1.4.4/openws-1.4.4.jar">
-      <dependency-type>uses</dependency-type>
-    </dependent-module>
-    <dependent-module archiveName="xmltooling-1.3.4.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/opensaml/xmltooling/1.3.4/xmltooling-1.3.4.jar">
-      <dependency-type>uses</dependency-type>
-    </dependent-module>
-    <dependent-module archiveName="bcprov-jdk15-1.46.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/bouncycastle/bcprov-jdk15/1.46/bcprov-jdk15-1.46.jar">
-      <dependency-type>uses</dependency-type>
-    </dependent-module>
-    <dependent-module archiveName="not-yet-commons-ssl-0.3.9.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/ca/juliusdavies/not-yet-commons-ssl/0.3.9/not-yet-commons-ssl-0.3.9.jar">
-      <dependency-type>uses</dependency-type>
-    </dependent-module>
-    <dependent-module archiveName="xmlsec-1.4.5.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/apache/santuario/xmlsec/1.4.5/xmlsec-1.4.5.jar">
-      <dependency-type>uses</dependency-type>
-    </dependent-module>
-    <dependent-module archiveName="xml-apis-2.10.0.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/apache/xerces/xml-apis/2.10.0/xml-apis-2.10.0.jar">
-      <dependency-type>uses</dependency-type>
-    </dependent-module>
-    <dependent-module archiveName="xercesImpl-2.10.0.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/apache/xerces/xercesImpl/2.10.0/xercesImpl-2.10.0.jar">
-      <dependency-type>uses</dependency-type>
-    </dependent-module>
-    <dependent-module archiveName="serializer-2.10.0.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/apache/xerces/serializer/2.10.0/serializer-2.10.0.jar">
-      <dependency-type>uses</dependency-type>
-    </dependent-module>
-    <dependent-module archiveName="xml-resolver-1.2.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/xml-resolver/xml-resolver/1.2/xml-resolver-1.2.jar">
-      <dependency-type>uses</dependency-type>
-    </dependent-module>
-    <dependent-module archiveName="xalan-2.7.1.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/xalan/xalan/2.7.1/xalan-2.7.1.jar">
-      <dependency-type>uses</dependency-type>
-    </dependent-module>
-    <dependent-module archiveName="slf4j-api-1.6.4.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/slf4j/slf4j-api/1.6.4/slf4j-api-1.6.4.jar">
-      <dependency-type>uses</dependency-type>
-    </dependent-module>
-    <dependent-module archiveName="commons-collections-3.2.1.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.jar">
-      <dependency-type>uses</dependency-type>
-    </dependent-module>
-    <dependent-module archiveName="velocity-1.5.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/velocity/velocity/1.5/velocity-1.5.jar">
-      <dependency-type>uses</dependency-type>
-    </dependent-module>
-    <dependent-module archiveName="esapi-2.0.1.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/owasp/esapi/esapi/2.0.1/esapi-2.0.1.jar">
-      <dependency-type>uses</dependency-type>
-    </dependent-module>
-    <dependent-module archiveName="slf4j-log4j12-1.6.4.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/slf4j/slf4j-log4j12/1.6.4/slf4j-log4j12-1.6.4.jar">
-      <dependency-type>uses</dependency-type>
-    </dependent-module>
   </wb-module>
-</project-modules>
\ No newline at end of file
+</project-modules>
diff --git a/id/templates/.project b/id/templates/.project
index b96a8a898..88ec78d38 100644
--- a/id/templates/.project
+++ b/id/templates/.project
@@ -4,29 +4,17 @@
   <comment>NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment>
   <projects/>
   <buildSpec>
-    <buildCommand>
-      <name>org.eclipse.wst.common.project.facet.core.builder</name>
-    </buildCommand>
     <buildCommand>
       <name>org.eclipse.jdt.core.javabuilder</name>
     </buildCommand>
     <buildCommand>
       <name>org.eclipse.wst.validation.validationbuilder</name>
     </buildCommand>
-    <buildCommand>
-      <name>org.maven.ide.eclipse.maven2Builder</name>
-    </buildCommand>
-    <buildCommand>
-      <name>org.eclipse.m2e.core.maven2Builder</name>
-    </buildCommand>
   </buildSpec>
   <natures>
-    <nature>org.eclipse.m2e.core.maven2Nature</nature>
-    <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
-    <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
-    <nature>org.maven.ide.eclipse.maven2Nature</nature>
-    <nature>org.eclipse.jdt.core.javanature</nature>
     <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
-    <nature>org.eclipse.wst.jsdt.core.jsNature</nature>
+    <nature>org.eclipse.jdt.core.javanature</nature>
+    <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+    <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
   </natures>
 </projectDescription>
\ No newline at end of file
diff --git a/id/templates/.settings/org.eclipse.wst.common.component b/id/templates/.settings/org.eclipse.wst.common.component
index 0d2cb24b4..83be1588d 100644
--- a/id/templates/.settings/org.eclipse.wst.common.component
+++ b/id/templates/.settings/org.eclipse.wst.common.component
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project-modules id="moduleCoreId" project-version="2.0">
+<project-modules id="moduleCoreId" project-version="1.5.0">
   <wb-module deploy-name="moa-id-templates">
     <property name="context-root" value="moa-id-templates"/>
     <wb-resource deploy-path="/" source-path="src/main/webapp"/>
     <property name="java-output-path" value="/target/classes"/>
   </wb-module>
-</project-modules>
\ No newline at end of file
+</project-modules>
-- 
cgit v1.2.3