From 38f6c7b91e28ed17078812448b8a0b5a37c29321 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Thu, 3 Apr 2014 10:04:48 +0200
Subject: fix message

---
 .../src/main/resources/applicationResources_en.properties           | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'id/ConfigWebTool/src/main/resources')

diff --git a/id/ConfigWebTool/src/main/resources/applicationResources_en.properties b/id/ConfigWebTool/src/main/resources/applicationResources_en.properties
index 5e116a974..4163cbc37 100644
--- a/id/ConfigWebTool/src/main/resources/applicationResources_en.properties
+++ b/id/ConfigWebTool/src/main/resources/applicationResources_en.properties
@@ -57,7 +57,7 @@ webpages.edit.export=Export
 webpages.inportexport.import.header=MOA-ID 2.x configuration
 webpages.inportexport.import.upload=Import configuration
 webpages.inportexport.import.download=Export configuration
-webpages.inportexport.descripten=WARNING\: The imported configuration will completely replace currently active configuration!
+webpages.inportexport.descripten=WARNING\: The imported configuration will completely replace currently active configuration\!
 
 webpages.usermanagement.newuser=Create new user
 webpages.usermanagement.header=User management
@@ -291,8 +291,8 @@ webpages.oaconfig.vidp.ap.list=List of configured attribute providers
 
 
 message.title=Announcement:
-webpages.oaconfig.success=The Online-Application {0} could not be saved.
-webpages.oaconfig.success.admin=Online-Applikation {0} could not be saved. The activation by the Administrator is necessary.
+webpages.oaconfig.success=The Online-Application {0} could be saved.
+webpages.oaconfig.success.admin=Online-Applikation {0} could be saved. The activation by the Administrator is necessary.
 webpages.oaconfig.cancle=The processing of Online-Applikation {0} was interrupted.
 
 webpages.oaconfig.delete.message=Online-Application {0} was succesfully removed.
-- 
cgit v1.2.3


From 80580d72ba7f5af54b77ef1b47c42005e0b5ded8 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Thu, 3 Apr 2014 10:05:38 +0200
Subject: refactor Struts action classes

---
 id/ConfigWebTool/src/main/resources/struts.xml | 30 +++++++++++---------------
 1 file changed, 12 insertions(+), 18 deletions(-)

(limited to 'id/ConfigWebTool/src/main/resources')

diff --git a/id/ConfigWebTool/src/main/resources/struts.xml b/id/ConfigWebTool/src/main/resources/struts.xml
index 0a2039ced..4b006ffd9 100644
--- a/id/ConfigWebTool/src/main/resources/struts.xml
+++ b/id/ConfigWebTool/src/main/resources/struts.xml
@@ -8,6 +8,8 @@
 	<constant name="struts.custom.i18n.resources" value="webpages" />    
   <constant name="struts.mapper.action.prefix.enabled" value="true" />
   <constant name="struts.mapper.action.prefix.crossNamespaces" value="false" />
+  <constant name="struts.xwork.chaining.copyErrors" value="true"/>
+  <constant name="struts.xwork.chaining.copyMessages" value="true"/>
     
 	<package name="default" namespace="/" extends="struts-default">
 	
@@ -15,14 +17,12 @@
 		
  		<interceptors>
 	    	<interceptor-stack name="OwnStack">
-<!-- 	  			<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="defaultStack" />	
-			</interceptor-stack>
+							name="excludeParams">^class\..*,^dojo\..*,^struts\..*,^session\..*,^request\..*,^application\..*,^servlet(Request|Response)\..*,^parameters\..*,^method:.*</param>
+					</interceptor-ref>
+					<interceptor-ref name="defaultStack" />	
+				</interceptor-stack>
 	  	</interceptors>
 	  	<default-interceptor-ref name="OwnStack"/>
 	  
@@ -34,12 +34,7 @@
 	      </result>
 			  <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"> 
  		    <result name="success" type="redirectAction">
 	          <param name="actionName">main</param>
@@ -91,14 +86,13 @@
 	    
 	   	<interceptors>
 	    	<interceptor-stack name="OwnStack">
-	    	<interceptor-ref name="defaultStack" />
 	  			<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-stack>
+					</interceptor-ref>
+					<interceptor-ref name="chain"/>
+					<interceptor-ref name="defaultStack" />
+				</interceptor-stack>
 	  	</interceptors>
 	  	<default-interceptor-ref name="OwnStack"/>
 	  
-- 
cgit v1.2.3