Add new language selection

Conflicts:
	id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/helper/LanguageHelper.java

2 files changed, 49 insertions, 37 deletions

diff --git a/id/ConfigWebTool/src/main/resources/applicationResources.properties b/id/ConfigWebTool/src/main/resources/applicationResources_de.properties
index f48cac0c8..916206cf1 100644
--- a/id/ConfigWebTool/src/main/resources/applicationResources.properties
+++ b/id/ConfigWebTool/src/main/resources/applicationResources_de.properties
@@ -99,7 +99,7 @@ webpages.moaconfig.save.success=Die MOA-ID Konfiguration wurde erfolgreich gespe
 webpages.moaconfig.header=Allgemeine Konfiguration
 webpages.oaconfig.general.publicURLPreFix=Public URL Prefix
 webpages.moaconfig.defaultbkus.header=Default BKUs
-webpages.moaconfig.slrequesttemplates.header=SecurtiyLayer Request Templates
+webpages.moaconfig.slrequesttemplates.header=SecurityLayer Request Templates
 webpages.moaconfig.slrequesttemplates.local=Locale BKU
 webpages.moaconfig.slrequesttemplates.handy=Handy BKU
 webpages.moaconfig.slrequesttemplates.online=Online BKU
@@ -402,7 +402,7 @@ validation.general.target.valid=Der Target f\u00FCr die Online-Applikation hat k
 validation.general.target.subsector.valid=Der Target-Subsektor hat kein g\u00FCltiges Format.
 validation.general.target.admin.valid=Der Admin-Target f\u00FCr die Online-Applikation hat kein g\u00FCltiges Format.
 validation.general.target.publicserviceurl=Die Domain des eindeutigen Identifiers f\u00FCr die Online-Applikation erlaubt nur Applikationen aus dem privatwirtschaftlichen Bereich.
-validation.general.slversion=Die SecurtiyLayer Version ist kein Zahlenformat.
+validation.general.slversion=Die SecurityLayer Version ist kein Zahlenformat.
 validation.general.slversion.business=Im privatwirtschaftlichen Bereich muss die SecurityLayerversion mindestes 1.2 betragen. Die SLVersion wurde auf 1.2 ge\u00E4ndert.
 validation.general.targetfriendlyname=Der Name des Bereichs (Target) enth\u00E4lt nicht erlaubte Zeichen. Folgende Zeichen sind nicht erlaubt\: {0}
 validation.general.identificationtype.valid=Der Identifikationstype wird nicht unterst\u00FCtzt.
diff --git a/id/ConfigWebTool/src/main/resources/struts.xml b/id/ConfigWebTool/src/main/resources/struts.xml
index 384a0e51e..0a2039ced 100644
--- a/id/ConfigWebTool/src/main/resources/struts.xml
+++ b/id/ConfigWebTool/src/main/resources/struts.xml
@@ -15,12 +15,13 @@
 		
  		<interceptors>
 	    	<interceptor-stack name="OwnStack">
-	    	<interceptor-ref name="defaultStack" />
-	  			<interceptor-ref name="params">
+<!-- 	  			<interceptor-ref name="params">
   					<param
 						name="excludeParams">^class\..*,^dojo\..*,^struts\..*,^session\..*,^request\..*,^application\..*,^servlet(Request|Response)\..*,^parameters\..*,^method:.*</param>
 				</interceptor-ref>
-				<interceptor-ref name="i18n"></interceptor-ref>	
+				<interceptor-ref name="i18n">
+				</interceptor-ref> -->
+				<interceptor-ref name="defaultStack" />	
 			</interceptor-stack>
 	  	</interceptors>
 	  	<default-interceptor-ref name="OwnStack"/>
@@ -31,7 +32,12 @@
 	          <param name="actionName">main</param>
             <param name="namespace">/secure</param>
 	      </result>
-			  <interceptor-ref name="defaultStack"/>
+			  <interceptor-ref name="OwnStack"/>
+		 </action>
+		 
+		  <action name="changeLanguage" method="changeLanguage" class="at.gv.egovernment.moa.id.configuration.struts.action.IndexAction">
+			  <result name="success" type="chain">index</result>
+			  <interceptor-ref name="OwnStack"/>
 		 </action>
 		 
  		 <action name="authenticate" method="authenticate" class="at.gv.egovernment.moa.id.configuration.struts.action.IndexAction"> 
@@ -40,7 +46,7 @@
             <param name="namespace">/secure</param>
 	      </result>
 			  <result name="error">/index.jsp</result>
-			  <interceptor-ref name="defaultStack"/>
+			  <interceptor-ref name="OwnStack"/>
 		 </action>
 		 
  		 <action name="pvp2login" method="pvp2login" class="at.gv.egovernment.moa.id.configuration.struts.action.IndexAction"> 
@@ -50,20 +56,20 @@
 	      </result>
 	      <result name="newuser">/jsp/newUserRequest.jsp</result>
 			  <result name="error">/index.jsp</result>
-			  <interceptor-ref name="defaultStack"/>
+			  <interceptor-ref name="OwnStack"/>
 		 </action>
  		 
  		 <action name="requestNewUser" method="requestNewUser" class="at.gv.egovernment.moa.id.configuration.struts.action.IndexAction">
  		    <result name="newuser">/jsp/newUserRequest.jsp</result>
 			  <result name="success">/index.jsp</result>
 			  <result name="error">/index.jsp</result>
-			  <interceptor-ref name="defaultStack"/>
+			  <interceptor-ref name="OwnStack"/>
 		 </action>
  		 
  		  <action name="mailAddressVerification" method="mailAddressVerification" class="at.gv.egovernment.moa.id.configuration.struts.action.IndexAction">
  		    <result name="error">/index.jsp</result>
 			  <result name="success">/index.jsp</result>
-			  <interceptor-ref name="defaultStack"/>
+			  <interceptor-ref name="OwnStack"/>
 		 </action>
  		 
  		 <action name="logout" method="logout" class="at.gv.egovernment.moa.id.configuration.struts.action.IndexAction">
@@ -72,12 +78,12 @@
             <param name="namespace">/</param>
 	      </result>
 	      <result name="ssologout" type="redirect">${ssologouturl}</result>
-			  <interceptor-ref name="defaultStack"/>
+			  <interceptor-ref name="OwnStack"/>
 		 </action>
  		 
  		 <action name="error" method="error" class="at.gv.egovernment.moa.id.configuration.struts.action.IndexAction">
 			  <result name="error">/error.jsp</result>
-			  <interceptor-ref name="defaultStack"/>
+			  <interceptor-ref name="OwnStack"/>
 		 </action>		    
 	</package>
 	
@@ -90,7 +96,8 @@
   					<param
 						name="excludeParams">^class\..*,^dojo\..*,^struts\..*,^session\..*,^request\..*,^application\..*,^servlet(Request|Response)\..*,^parameters\..*,^method:.*</param>
 				</interceptor-ref>
-				<interceptor-ref name="i18n"></interceptor-ref>		
+				<interceptor-ref name="i18n">
+				</interceptor-ref>		
 			</interceptor-stack>
 	  	</interceptors>
 	  	<default-interceptor-ref name="OwnStack"/>
@@ -102,6 +109,11 @@
 	      </result>
 	  </action>
 	  
+	  <action name="changeLanguage" method="changeLanguage" class="at.gv.egovernment.moa.id.configuration.struts.action.MainAction">
+			  <result name="success" type="chain">main</result>
+			  <interceptor-ref name="OwnStack"/>
+		 </action>
+	  
  		<action name="main" method="generateMainFrame" class="at.gv.egovernment.moa.id.configuration.struts.action.MainAction">
 			<result name="success">/jsp/mainpage.jsp</result>
 			<result name="error">/error.jsp</result>
@@ -109,7 +121,7 @@
 	          <param name="actionName">logout</param>
             <param name="namespace">/</param> 
 	     </result>
-			<interceptor-ref name="defaultStack"/>
+			<interceptor-ref name="OwnStack"/>
 		</action>
 				
  		 <action name="listallapplications" method="listAllOnlineAppliactions" class="at.gv.egovernment.moa.id.configuration.struts.action.ListOAsAction">
@@ -119,7 +131,7 @@
 	          <param name="actionName">logout</param>
             <param name="namespace">/</param> 
 	     </result>
-			<interceptor-ref name="defaultStack"/>
+			<interceptor-ref name="OwnStack"/>
 		</action>
 		
 		<action name="searchOAInit" method="searchOAInit" class="at.gv.egovernment.moa.id.configuration.struts.action.ListOAsAction">
@@ -128,7 +140,7 @@
 	          <param name="actionName">logout</param>
             <param name="namespace">/</param> 
 	     </result>
-			<interceptor-ref name="defaultStack"/>
+			<interceptor-ref name="OwnStack"/>
 		</action>	
  	 	
  	 	<action name="searchOA" method="searchOA" class="at.gv.egovernment.moa.id.configuration.struts.action.ListOAsAction">
@@ -138,7 +150,7 @@
 	          <param name="actionName">logout</param>
             <param name="namespace">/</param> 
 	     </result>
-			<interceptor-ref name="defaultStack"/>
+			<interceptor-ref name="OwnStack"/>
 		</action>	
  		  
  		<action name="newOA" method="newOA" class="at.gv.egovernment.moa.id.configuration.struts.action.EditOAAction">
@@ -149,7 +161,7 @@
 	          <param name="actionName">logout</param>
             <param name="namespace">/</param> 
 	     </result>
-			<interceptor-ref name="defaultStack"/>
+			<interceptor-ref name="OwnStack"/>
 		</action>
  		 		
  		<action name="loadOA" method="inital" class="at.gv.egovernment.moa.id.configuration.struts.action.EditOAAction">
@@ -160,7 +172,7 @@
 	          <param name="actionName">logout</param>
             <param name="namespace">/</param> 
 	     </result>
-			<interceptor-ref name="defaultStack"/>
+			<interceptor-ref name="OwnStack"/>
 		</action>
  		
  		<action name="bkuFramePreview" method="bkuFramePreview" class="at.gv.egovernment.moa.id.configuration.struts.action.EditOAAction">
@@ -168,7 +180,7 @@
     		<param name="contentType">text/html</param>
     		<param name="inputName">stream</param>
     	</result>
-			<interceptor-ref name="defaultStack"/>
+			<interceptor-ref name="OwnStack"/>
 		</action>
  		
  		 <action name="saveOA" method="saveOA" class="at.gv.egovernment.moa.id.configuration.struts.action.EditOAAction">
@@ -179,7 +191,7 @@
 	          <param name="actionName">logout</param>
             <param name="namespace">/</param> 
 	     </result>
-			<interceptor-ref name="defaultStack"/>
+			<interceptor-ref name="OwnStack"/>
 		</action>
 		
  		<action name="cancleandbackOA" method="cancleAndBackOA" class="at.gv.egovernment.moa.id.configuration.struts.action.EditOAAction">
@@ -188,7 +200,7 @@
 	          <param name="actionName">logout</param>
             <param name="namespace">/</param> 
 	     </result>
-			<interceptor-ref name="defaultStack"/>
+			<interceptor-ref name="OwnStack"/>
 		</action> 		
  	
  		<action name="deleteOA" method="deleteOA" class="at.gv.egovernment.moa.id.configuration.struts.action.EditOAAction">
@@ -198,7 +210,7 @@
 	          <param name="actionName">logout</param>
             <param name="namespace">/</param> 
 	     </result>
-			<interceptor-ref name="defaultStack"/>
+			<interceptor-ref name="OwnStack"/>
 		</action> 
  		
  		<action name="loadGeneralConfig" method="loadConfig" class="at.gv.egovernment.moa.id.configuration.struts.action.EditGeneralConfigAction">
@@ -209,7 +221,7 @@
             <param name="namespace">/</param> 
 	     </result>
 			<result name="notallowed" type="chain">main</result>
-			<interceptor-ref name="defaultStack"/>
+			<interceptor-ref name="OwnStack"/>
 		</action>
  		
  		<action name="saveGeneralConfig" method="saveConfig" class="at.gv.egovernment.moa.id.configuration.struts.action.EditGeneralConfigAction">
@@ -221,7 +233,7 @@
             <param name="namespace">/</param> 
 	     </result>
 			<result name="notallowed" type="chain">main</result>
-			<interceptor-ref name="defaultStack"/>
+			<interceptor-ref name="OwnStack"/>
 		</action>
  		
  		<action name="backGeneralConfig" method="back" class="at.gv.egovernment.moa.id.configuration.struts.action.EditGeneralConfigAction">
@@ -231,7 +243,7 @@
 	          <param name="actionName">logout</param>
             <param name="namespace">/</param> 
 	     </result>
-			<interceptor-ref name="defaultStack"/>
+			<interceptor-ref name="OwnStack"/>
 		</action>
  				
  		<action name="importexport" method="init" class="at.gv.egovernment.moa.id.configuration.struts.action.ImportExportAction">
@@ -241,7 +253,7 @@
             <param name="namespace">/</param> 
 	     </result>
 			<result name="notallowed" type="chain">main</result>
-			<interceptor-ref name="defaultStack"/>
+			<interceptor-ref name="OwnStack"/>
 		</action>
  		
  		<action name="importlegacy" method="importLegacyConfig" class="at.gv.egovernment.moa.id.configuration.struts.action.ImportExportAction">
@@ -253,7 +265,7 @@
 	     </result>
 			<result name="notallowed">/jsp/mainpage.jsp</result>
 			<result name="error">/error.jsp</result>
-			<interceptor-ref name="defaultStack"/>
+			<interceptor-ref name="OwnStack"/>
 		</action>
 		
  		<action name="importConfig" method="importXMLConfig" class="at.gv.egovernment.moa.id.configuration.struts.action.ImportExportAction">
@@ -265,7 +277,7 @@
 	     </result>
 			<result name="notallowed">/jsp/mainpage.jsp</result>
 			<result name="error">/error.jsp</result>
-			<interceptor-ref name="defaultStack"/>
+			<interceptor-ref name="OwnStack"/>
 		</action>
  			
 		<action name="exportConfig" method="downloadXMLConfig" class="at.gv.egovernment.moa.id.configuration.struts.action.ImportExportAction">
@@ -282,7 +294,7 @@
 			<result name="error_validation">/jsp/importexport.jsp</result>
 			<result name="notallowed">/jsp/mainpage.jsp</result>
 			<result name="error">/error.jsp</result>
-			<interceptor-ref name="defaultStack"/>
+			<interceptor-ref name="OwnStack"/>
 		</action>
 		
 		<action name="usermanagementInit" method="init" class="at.gv.egovernment.moa.id.configuration.struts.action.UserManagementAction">
@@ -293,7 +305,7 @@
 	          <param name="actionName">logout</param>
             <param name="namespace">/</param> 
 	     </result>
-			<interceptor-ref name="defaultStack"/>
+			<interceptor-ref name="OwnStack"/>
 		</action>
 		
 		<action name="createUser" method="createuser" class="at.gv.egovernment.moa.id.configuration.struts.action.UserManagementAction">
@@ -304,7 +316,7 @@
 	          <param name="actionName">logout</param>
             <param name="namespace">/</param> 
 	     </result>
-			<interceptor-ref name="defaultStack"/>
+			<interceptor-ref name="OwnStack"/>
 		</action>
 			
 		<action name="editUser" method="edituser" class="at.gv.egovernment.moa.id.configuration.struts.action.UserManagementAction">
@@ -314,7 +326,7 @@
 	          <param name="actionName">logout</param>
             <param name="namespace">/</param> 
 	     </result>
-			<interceptor-ref name="defaultStack"/>
+			<interceptor-ref name="OwnStack"/>
 		</action>
 		
 		<action name="deleteUser" method="deleteuser" class="at.gv.egovernment.moa.id.configuration.struts.action.UserManagementAction">
@@ -325,7 +337,7 @@
 	          <param name="actionName">logout</param>
             <param name="namespace">/</param> 
 	     </result>
-			<interceptor-ref name="defaultStack"/>
+			<interceptor-ref name="OwnStack"/>
 		</action>
 		
 		<action name="saveUser" method="saveuser" class="at.gv.egovernment.moa.id.configuration.struts.action.UserManagementAction">
@@ -337,7 +349,7 @@
 	          <param name="actionName">logout</param>
             <param name="namespace">/</param> 
 	     </result>
-			<interceptor-ref name="defaultStack"/>
+			<interceptor-ref name="OwnStack"/>
 		</action>
 		
 		<action name="sendVerificationMail" method="sendVerificationMail" class="at.gv.egovernment.moa.id.configuration.struts.action.UserManagementAction">
@@ -345,7 +357,7 @@
     		<param name="contentType">text/html</param>
     		<param name="inputName">stream</param>
     	</result>
-			<interceptor-ref name="defaultStack"/>
+			<interceptor-ref name="OwnStack"/>
 		</action>
 		
 		<action name="adminRequestsInit" method="init" class="at.gv.egovernment.moa.id.configuration.struts.action.OpenAdminRequestsAction">
@@ -356,7 +368,7 @@
 	          <param name="actionName">logout</param>
             <param name="namespace">/</param> 
 	     </result>
-			<interceptor-ref name="defaultStack"/>
+			<interceptor-ref name="OwnStack"/>
 		</action>
 		
  	</package>