Return-Path: Delivered-To: apmail-jakarta-jetspeed-dev-archive@apache.org Received: (qmail 98411 invoked from network); 15 Sep 2002 14:26:26 -0000 Received: from unknown (HELO nagoya.betaversion.org) (192.18.49.131) by daedalus.apache.org with SMTP; 15 Sep 2002 14:26:26 -0000 Received: (qmail 565 invoked by uid 97); 15 Sep 2002 14:27:03 -0000 Delivered-To: qmlist-jakarta-archive-jetspeed-dev@jakarta.apache.org Received: (qmail 511 invoked by uid 97); 15 Sep 2002 14:27:02 -0000 Mailing-List: contact jetspeed-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Jetspeed Developers List" Reply-To: "Jetspeed Developers List" Delivered-To: mailing list jetspeed-dev@jakarta.apache.org Received: (qmail 500 invoked by uid 97); 15 Sep 2002 14:27:01 -0000 X-Antivirus: nagoya (v4218 created Aug 14 2002) Date: 15 Sep 2002 14:26:19 -0000 Message-ID: <20020915142619.31873.qmail@icarus.apache.org> From: paulsp@apache.org To: jakarta-jetspeed-cvs@apache.org Subject: cvs commit: jakarta-jetspeed/docs/site changes.html X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N paulsp 2002/09/15 07:26:19 Modified: xdocs changes.xml src/java/org/apache/jetspeed/services/registry CastorRegistryService.java docs/site changes.html Log: .xreg files are now read and written in UTF-8 encoding PR: 10484 Submitted by: Shinsuke (shinsuke at yahoo.co.jp) Revision Changes Path 1.76 +5 -2 jakarta-jetspeed/xdocs/changes.xml Index: changes.xml =================================================================== RCS file: /home/cvs/jakarta-jetspeed/xdocs/changes.xml,v retrieving revision 1.75 retrieving revision 1.76 diff -u -r1.75 -r1.76 --- changes.xml 15 Sep 2002 00:49:54 -0000 1.75 +++ changes.xml 15 Sep 2002 14:26:19 -0000 1.76 @@ -23,7 +23,10 @@ -->
  • - Update - 2002/09/14 - Updated Commons-Collections to v2.0 (PS) + Fix - Bug # 10484 - 2002/09/15 - .xreg file are now read and written in UTF-8 encoding (PS) Thanks to Shinsuke. +
    • +
  • + Update - 2002/09/14 - Updated Commons-Collections to v2.0 (PS)
  • Add - Bug # 11736 - 2002/09/13 - Implemented automatic password expiration feature, disabled by default (MO) 1.18 +13 -12 jakarta-jetspeed/src/java/org/apache/jetspeed/services/registry/CastorRegistryService.java Index: CastorRegistryService.java =================================================================== RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/services/registry/CastorRegistryService.java,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- CastorRegistryService.java 4 Jul 2002 00:01:09 -0000 1.17 +++ CastorRegistryService.java 15 Sep 2002 14:26:19 -0000 1.18 @@ -72,12 +72,14 @@ import org.apache.xml.serialize.Serializer; import org.apache.xml.serialize.XMLSerializer; import org.apache.xml.serialize.OutputFormat; +import org.w3c.dom.*; //java stuff import java.util.*; import java.io.*; import java.net.*; import javax.servlet.ServletConfig; +import javax.xml.parsers.*; /** *

    This is an implementation of the RegistryService @@ -490,12 +492,15 @@ */ public void loadFragment(String file) { - FileReader reader = null; try { + DocumentBuilderFactory dbfactory = DocumentBuilderFactory.newInstance(); + DocumentBuilder builder = dbfactory.newDocumentBuilder(); + + Document d = builder.parse(file); + Unmarshaller unmarshaller = new Unmarshaller(this.mapping); - reader = new FileReader(file); - RegistryFragment fragment = (RegistryFragment)unmarshaller.unmarshal(reader); + RegistryFragment fragment = (RegistryFragment)unmarshaller.unmarshal((Node)d); // if we get here, we successfully loaded the new fragment updateFragment(file, fragment); @@ -505,10 +510,6 @@ { Log.error( "Could not unmarshal: " + file, t ); } - finally - { - try { reader.close(); } catch (Exception e) {}; - } } @@ -522,7 +523,6 @@ public void createFragment(String name, Reader reader, boolean persistent) { String file = new File( directory, name+extension ).getAbsolutePath(); - FileWriter writer = null; try { Unmarshaller unmarshaller = new Unmarshaller(this.mapping); @@ -542,7 +542,6 @@ finally { try { reader.close(); } catch (Exception e) {}; - try { writer.close(); } catch (Exception e) {}; } // refresh all regsitries to take the new entries into account @@ -554,14 +553,16 @@ * @param file the absolute file path storing this fragment */ public void saveFragment(String file) { - FileWriter writer = null; + OutputStreamWriter writer = null; + String encoding = new String("UTF-8"); RegistryFragment fragment = (RegistryFragment)fragments.get(file); if (fragment != null) { try { - writer = new FileWriter(file); + writer = new OutputStreamWriter(new FileOutputStream(file),encoding); + format.setEncoding(encoding); Serializer serializer = new XMLSerializer(writer, format); Marshaller marshaller = new Marshaller(serializer.asDocumentHandler()); marshaller.setMapping(this.mapping); 1.58 +4 -1 jakarta-jetspeed/docs/site/changes.html Index: changes.html =================================================================== RCS file: /home/cvs/jakarta-jetspeed/docs/site/changes.html,v retrieving revision 1.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- changes.html 15 Sep 2002 00:49:54 -0000 1.57 +++ changes.html 15 Sep 2002 14:26:19 -0000 1.58 @@ -129,7 +129,10 @@

    • -->
  • - Update - 2002/09/14 - Updated Commons-Collections to v2.0 (PS) + Fix - Bug # 10484 - 2002/09/15 - .xreg file are now read and written in UTF-8 encoding (PS) Thanks to Shinsuke. +
    • +
  • + Update - 2002/09/14 - Updated Commons-Collections to v2.0 (PS)
  • Add - Bug # 11736 - 2002/09/13 - Implemented automatic password expiration feature, disabled by default (MO) -- To unsubscribe, e-mail: For additional commands, e-mail: