axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject cvs commit: ws-axis/java/src/org/apache/axis/deployment/wsdd WSDDDocumentation.java
Date Thu, 02 Dec 2004 13:04:17 GMT
dims        2004/12/02 05:04:17

  Modified:    java/src/org/apache/axis/configuration FileProvider.java
               java/src/org/apache/axis/deployment/wsdd
                        WSDDDocumentation.java
  Log:
  Fix for AXIS-1694 - problem with accentued characters : server-config.wsdd is not a valid
UTF-8 file
  from CÚdric Chabanois (cchabanois@natsystem.fr)
  
  Revision  Changes    Path
  1.54      +6 -1      ws-axis/java/src/org/apache/axis/configuration/FileProvider.java
  
  Index: FileProvider.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/configuration/FileProvider.java,v
  retrieving revision 1.53
  retrieving revision 1.54
  diff -u -r1.53 -r1.54
  --- FileProvider.java	27 Sep 2004 05:12:38 -0000	1.53
  +++ FileProvider.java	2 Dec 2004 13:04:17 -0000	1.54
  @@ -16,11 +16,14 @@
   
   package org.apache.axis.configuration;
   
  +import java.io.BufferedWriter;
   import java.io.File;
   import java.io.FileInputStream;
   import java.io.FileOutputStream;
   import java.io.InputStream;
  +import java.io.OutputStreamWriter;
   import java.io.PrintWriter;
  +import java.io.Writer;
   import java.util.Hashtable;
   import java.util.Iterator;
   import java.util.List;
  @@ -196,7 +199,9 @@
           if (!readOnly) {
               try {
                   Document doc = Admin.listConfig(engine);
  -                PrintWriter writer = new PrintWriter(new FileOutputStream(configFile));
  +                Writer osWriter = new OutputStreamWriter(
  +                        new FileOutputStream(configFile),XMLUtils.getEncoding());
  +                PrintWriter writer = new PrintWriter(new BufferedWriter(osWriter));
                   XMLUtils.DocumentToWriter(doc, writer);
                   writer.println();
                   writer.close();
  
  
  
  1.12      +1 -1      ws-axis/java/src/org/apache/axis/deployment/wsdd/WSDDDocumentation.java
  
  Index: WSDDDocumentation.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/deployment/wsdd/WSDDDocumentation.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- WSDDDocumentation.java	25 Feb 2004 14:02:34 -0000	1.11
  +++ WSDDDocumentation.java	2 Dec 2004 13:04:17 -0000	1.12
  @@ -78,7 +78,7 @@
               throws IOException
       {
           context.startElement(QNAME_DOC, null);
  -        context.writeString(value);
  +        context.writeSafeString(value);
           context.endElement();
       }
   }
  
  
  

Mime
View raw message