[seam-commits] Seam SVN: r7523 - in trunk/src/main/org/jboss/seam: core and 1 other directory.

[seam-commits at lists.jboss.org]

Author: norman.richards at jboss.com
Date: 2008-03-10 19:13:31 -0400 (Mon, 10 Mar 2008)
New Revision: 7523

Modified:
   trunk/src/main/org/jboss/seam/core-2.1.xsd
   trunk/src/main/org/jboss/seam/core/Manager.java
Log:
JBSEAM-2710

Modified: trunk/src/main/org/jboss/seam/core/Manager.java
===================================================================
--- trunk/src/main/org/jboss/seam/core/Manager.java	2008-03-10 18:35:14 UTC (rev 7522)
+++ trunk/src/main/org/jboss/seam/core/Manager.java	2008-03-10 23:13:31 UTC (rev 7523)
@@ -47,6 +47,8 @@
    
    public static final String REDIRECT_FROM_MANAGER = "org.jboss.seam.core.Manager";
 
+   private static final String DEFAULT_ENCODING = "UTF-8";
+
    //The id of the current conversation
    private String currentConversationId;
    private List<String> currentConversationIdStack;
@@ -64,6 +66,9 @@
    private String conversationIdParameter = "conversationId";
    private String parentConversationIdParameter = "parentConversationId";
 
+   private String URIEncoding = DEFAULT_ENCODING;
+   
+   
    // DONT BREAK, icefaces uses this
    public String getCurrentConversationId()
    {
@@ -822,7 +827,7 @@
    {
       try
       {
-         return URLEncoder.encode(String.valueOf(value),"UTF-8");
+         return URLEncoder.encode(String.valueOf(value),getUriEncoding());
       }
       catch (UnsupportedEncodingException iee)
       {
@@ -889,4 +894,12 @@
       }
    }
 
+   public String getUriEncoding() {
+       return URIEncoding;
+   }
+
+   public void setUriEncoding(String encoding) {
+       URIEncoding = encoding;
+   }
+
 }

Modified: trunk/src/main/org/jboss/seam/core-2.1.xsd
===================================================================
--- trunk/src/main/org/jboss/seam/core-2.1.xsd	2008-03-10 18:35:14 UTC (rev 7522)
+++ trunk/src/main/org/jboss/seam/core-2.1.xsd	2008-03-10 23:13:31 UTC (rev 7523)
@@ -42,6 +42,7 @@
         <xs:attribute name="conversation-timeout" type="xs:integer"/>
         <xs:attribute name="conversation-id-parameter"/>
         <xs:attribute name="parent-conversation-id-parameter"/>
+        <xs:attribute name="uri-encoding"/>
     </xs:attributeGroup>
     
     <xs:element name="resource-loader">