portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From morci...@apache.org
Subject cvs commit: jakarta-jetspeed/xdocs changes.xml
Date Thu, 17 Apr 2003 15:47:23 GMT
morciuch    2003/04/17 08:47:23

  Modified:    docs/site changes.html
               src/java/org/apache/jetspeed/portal/portlets
                        WebPagePortlet.java
               xdocs    changes.xml
  Log:
  Bug # 14464 - Fix to WebPagePortlet supports iso-8859-1 only problem, patch by Mamoru Watanabe
  
  Revision  Changes    Path
  1.131     +3 -0      jakarta-jetspeed/docs/site/changes.html
  
  Index: changes.html
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/docs/site/changes.html,v
  retrieving revision 1.130
  retrieving revision 1.131
  diff -u -r1.130 -r1.131
  --- changes.html	17 Apr 2003 15:28:56 -0000	1.130
  +++ changes.html	17 Apr 2003 15:47:22 -0000	1.131
  @@ -133,6 +133,9 @@
   </li>
   -->
   <li>
  +  Fix -   Bug # 14464 - 2003/04/17 - Fix to WebPagePortlet supports iso-8859-1 only problem,
patch by Mamoru Watanabe (MO)
  +</li>
  +<li>
     Fix -   Bug # 16627 - 2003/04/17 - Fix to Psml browser error when language specific psml
exists (addition to fixes from 3/25), patch by Jeremy Ford (MO)
   </li>
   <li>
  
  
  
  1.14      +20 -4     jakarta-jetspeed/src/java/org/apache/jetspeed/portal/portlets/WebPagePortlet.java
  
  Index: WebPagePortlet.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/portlets/WebPagePortlet.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- WebPagePortlet.java	24 Oct 2002 14:59:25 -0000	1.13
  +++ WebPagePortlet.java	17 Apr 2003 15:47:22 -0000	1.14
  @@ -74,6 +74,7 @@
   import java.io.Reader;
   import java.net.URL;
   import java.net.URLConnection;
  +import java.util.StringTokenizer;
   
   /**
    * A class that loads a web page and filters it to have certain features
  @@ -169,14 +170,29 @@
           }
           
           long           pageExpiration = pageConn.getExpiration();
  -        String         encoding = pageConn.getContentEncoding();
  +        String         encoding = "iso-8859-1";
  +        String         contentType = pageConn.getContentType();
           String         tempString = null;
           String         noCache = "no-cache";
           
  -        if(encoding == null)
  +        if (contentType != null)
           {
  -            // Standard HTTP encoding
  -            encoding = "iso-8859-1";
  +            StringTokenizer st = new StringTokenizer(contentType, "; =");
  +            while (st.hasMoreTokens())
  +            {
  +                if (st.nextToken().equalsIgnoreCase("charset"))
  +                {
  +                    try
  +                    {
  +                        encoding = st.nextToken();
  +                        break;
  +                    }
  +                    catch (Exception e)
  +                    {
  +                        break;
  +                    }
  +                }
  +            }
           }
   
           /*
  
  
  
  1.152     +4 -1      jakarta-jetspeed/xdocs/changes.xml
  
  Index: changes.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/xdocs/changes.xml,v
  retrieving revision 1.151
  retrieving revision 1.152
  diff -u -r1.151 -r1.152
  --- changes.xml	17 Apr 2003 15:28:57 -0000	1.151
  +++ changes.xml	17 Apr 2003 15:47:23 -0000	1.152
  @@ -23,6 +23,9 @@
   </li>
   -->
   <li>
  +  Fix -   Bug # 14464 - 2003/04/17 - Fix to WebPagePortlet supports iso-8859-1 only problem,
patch by Mamoru Watanabe (MO)
  +</li>
  +<li>
     Fix -   Bug # 16627 - 2003/04/17 - Fix to Psml browser error when language specific psml
exists (addition to fixes from 3/25), patch by Jeremy Ford (MO)
   </li>
   <li>
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jetspeed-dev-help@jakarta.apache.org


Mime
View raw message