cvs commit: cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portlet CocoonPortlet.java

[cziegeler]

cziegeler    2004/03/11 01:56:47

  Modified:    .        status.xml
               src/blocks/portal/java/org/apache/cocoon/portlet
                        CocoonPortlet.java
  Log:
     <action dev="CZ" type="update" fixes-bug="27188" due-to-email="[EMAIL 
PROTECTED]">
       Set the default encoding for the Portlet Environment.
     </action>
  
  Revision  Changes    Path
  1.273     +4 -1      cocoon-2.1/status.xml
  
  Index: status.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/status.xml,v
  retrieving revision 1.272
  retrieving revision 1.273
  diff -u -r1.272 -r1.273
  --- status.xml        10 Mar 2004 12:58:03 -0000      1.272
  +++ status.xml        11 Mar 2004 09:56:47 -0000      1.273
  @@ -210,6 +210,9 @@
     <changes>
   
    <release version="@version@" date="@date@">
  +   <action dev="CZ" type="update" fixes-bug="27188" due-to-email="[EMAIL 
PROTECTED]">
  +     Set the default encoding for the Portlet Environment.
  +   </action>
      <action dev="SMS" type="update">
        Move XSP into an own block.
      </action>
  
  
  
  1.3       +2 -1      
cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portlet/CocoonPortlet.java
  
  Index: CocoonPortlet.java
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portlet/CocoonPortlet.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- CocoonPortlet.java        5 Mar 2004 13:02:17 -0000       1.2
  +++ CocoonPortlet.java        11 Mar 2004 09:56:47 -0000      1.3
  @@ -460,6 +460,7 @@
           this.containerEncoding = getInitParameter("container-encoding", 
"ISO-8859-1");
           this.defaultFormEncoding = getInitParameter("form-encoding", 
"ISO-8859-1");
   
  +        this.appContext.put(Constants.CONTEXT_DEFAULT_ENCODING, 
this.defaultFormEncoding);
           this.manageExceptions = 
getInitParameterAsBoolean("manage-exceptions", true);
   
           this.enableInstrumentation = 
getInitParameterAsBoolean("enable-instrumentation", false);