dims 2002/12/19 07:12:25
Modified: java/src/org/apache/axis/wsdl/toJava JavaDeployWriter.java
JavaUndeployWriter.java
java/src/org/apache/axis/utils XMLUtils.java
Log:
Fixes for:
Bug 13318 - simple fix to make Java2WSDL i18n comliant
Bug 13319 - simple fix to make WSDD generation i18n comliant
Bug 15173 - Character encoding problems on OS/390
Notes:
- Use "UTF-8" for wsdl and wsdd files.
Revision Changes Path
1.71 +12 -0
xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaDeployWriter.java
Index: JavaDeployWriter.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaDeployWriter.java,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- JavaDeployWriter.java 11 Dec 2002 22:38:30 -0000 1.70
+++ JavaDeployWriter.java 19 Dec 2002 15:12:24 -0000 1.71
@@ -80,6 +80,9 @@
import javax.xml.namespace.QName;
import java.io.IOException;
import java.io.PrintWriter;
+import java.io.OutputStreamWriter;
+import java.io.FileOutputStream;
+import java.io.File;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.Map;
@@ -505,5 +508,14 @@
} else {
return "OUT";
}
+ }
+
+ protected PrintWriter getPrintWriter(String filename) throws IOException {
+ File file = new File(filename);
+ File parent = new File(file.getParent());
+ parent.mkdirs();
+ FileOutputStream out = new FileOutputStream(file);
+ OutputStreamWriter writer = new OutputStreamWriter(out, "UTF-8");
+ return new PrintWriter(writer);
}
} // class JavaDeployWriter
1.14 +11 -0
xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaUndeployWriter.java
Index: JavaUndeployWriter.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaUndeployWriter.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- JavaUndeployWriter.java 11 Dec 2002 22:38:30 -0000 1.13
+++ JavaUndeployWriter.java 19 Dec 2002 15:12:24 -0000 1.14
@@ -63,6 +63,9 @@
import javax.wsdl.Service;
import java.io.IOException;
import java.io.PrintWriter;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.OutputStreamWriter;
import java.util.Iterator;
import java.util.Map;
@@ -154,4 +157,12 @@
pw.println(" <service name=\"" + serviceName + "\"/>");
} //writeDeployPort
+ protected PrintWriter getPrintWriter(String filename) throws IOException {
+ File file = new File(filename);
+ File parent = new File(file.getParent());
+ parent.mkdirs();
+ FileOutputStream out = new FileOutputStream(file);
+ OutputStreamWriter writer = new OutputStreamWriter(out, "UTF-8");
+ return new PrintWriter(writer);
+ }
} // class JavaUndeployWriter
1.75 +15 -4 xml-axis/java/src/org/apache/axis/utils/XMLUtils.java
Index: XMLUtils.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/utils/XMLUtils.java,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- XMLUtils.java 11 Dec 2002 22:38:27 -0000 1.74
+++ XMLUtils.java 19 Dec 2002 15:12:25 -0000 1.75
@@ -394,12 +394,12 @@
}
public static void ElementToStream(Element element, OutputStream out) {
- Writer writer = new OutputStreamWriter(out);
+ Writer writer = getWriter(out);
privateElementToWriter(element, writer, true, false);
}
public static void PrettyElementToStream(Element element, OutputStream out) {
- Writer writer = new OutputStreamWriter(out);
+ Writer writer = getWriter(out);
privateElementToWriter(element, writer, true, true);
}
@@ -412,13 +412,24 @@
}
public static void DocumentToStream(Document doc, OutputStream out) {
- Writer writer = new OutputStreamWriter(out);
+ Writer writer = getWriter(out);
privateElementToWriter(doc.getDocumentElement(), writer, false, false);
}
public static void PrettyDocumentToStream(Document doc, OutputStream out) {
- Writer writer = new OutputStreamWriter(out);
+ Writer writer = getWriter(out);
privateElementToWriter(doc.getDocumentElement(), writer, false, true);
+ }
+
+ private static Writer getWriter(OutputStream os) {
+ Writer writer = null;
+ try {
+ writer = new OutputStreamWriter(os, "UTF-8");
+ } catch (UnsupportedEncodingException uee) {
+ log.error(Messages.getMessage("exception00"), uee);
+ writer = new OutputStreamWriter(os);
+ }
+ return writer;
}
public static void DocumentToWriter(Document doc, Writer writer) {
