svn commit: r1536698 - in /struts/struts2/trunk/plugins/config-browser/src/main/java/org/apache/struts2/config_browser: ActionNamesAction.java ShowConfigAction.java

[lukaszlenart]

Author: lukaszlenart
Date: Tue Oct 29 13:00:58 2013
New Revision: 1536698

URL: http://svn.apache.org/r1536698
Log:
WW-4213 Non-breaking sanitise mechanism

Modified:
    
struts/struts2/trunk/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ActionNamesAction.java
    
struts/struts2/trunk/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ShowConfigAction.java

Modified: 
struts/struts2/trunk/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ActionNamesAction.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ActionNamesAction.java?rev=1536698&r1=1536697&r2=1536698&view=diff
==============================================================================
--- 
struts/struts2/trunk/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ActionNamesAction.java
 (original)
+++ 
struts/struts2/trunk/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ActionNamesAction.java
 Tue Oct 29 13:00:58 2013
@@ -54,11 +54,11 @@ public class ActionNamesAction extends A
     }
 
     public String getNamespace() {
-        return namespace;
+        return StringEscapeUtils.escapeHtml4(namespace);
     }
 
     public void setNamespace(String namespace) {
-        this.namespace = StringEscapeUtils.escapeEcmaScript(namespace);
+        this.namespace = namespace;
     }
 
     @Inject(StrutsConstants.STRUTS_ACTION_EXTENSION)

Modified: 
struts/struts2/trunk/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ShowConfigAction.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ShowConfigAction.java?rev=1536698&r1=1536697&r2=1536698&view=diff
==============================================================================
--- 
struts/struts2/trunk/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ShowConfigAction.java
 (original)
+++ 
struts/struts2/trunk/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ShowConfigAction.java
 Tue Oct 29 13:00:58 2013
@@ -64,7 +64,7 @@ public class ShowConfigAction extends Ac
     }
 
     public String getNamespace() {
-        return namespace;
+        return StringEscapeUtils.escapeHtml4(namespace);
     }
     
     @Inject
@@ -82,7 +82,7 @@ public class ShowConfigAction extends Ac
     }
 
     public void setNamespace(String namespace) {
-        this.namespace = StringEscapeUtils.escapeEcmaScript(namespace);
+        this.namespace = namespace;
     }
 
     public String getActionName() {