Eliminate references to the deprecated LogOutputStream API.
diff --git a/modules/codegen/src/org/apache/axis2/wsdl/codegen/jaxws/JAXWSCodeGenerationEngine.java b/modules/codegen/src/org/apache/axis2/wsdl/codegen/jaxws/JAXWSCodeGenerationEngine.java
index 14a686c..77d9b11 100644
--- a/modules/codegen/src/org/apache/axis2/wsdl/codegen/jaxws/JAXWSCodeGenerationEngine.java
+++ b/modules/codegen/src/org/apache/axis2/wsdl/codegen/jaxws/JAXWSCodeGenerationEngine.java
@@ -26,12 +26,13 @@
import java.util.List;
import java.util.Map;
-import org.apache.axiom.om.util.LogOutputStream;
import org.apache.axis2.util.CommandLineOption;
import org.apache.axis2.util.CommandLineOptionConstants;
import org.apache.axis2.util.CommandLineOptionParser;
+import org.apache.axis2.util.LogWriter;
import org.apache.axis2.wsdl.codegen.CodeGenConfiguration;
import org.apache.axis2.wsdl.codegen.CodeGenerationException;
+import org.apache.commons.io.output.WriterOutputStream;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -89,10 +90,7 @@
* the code generation exception
*/
public void generate() throws CodeGenerationException {
-
- LogOutputStream logOutputStream = new LogOutputStream(log,
- Integer.MAX_VALUE);
- WsimportTool importTool = new WsimportTool(logOutputStream);
+ WsimportTool importTool = new WsimportTool(new WriterOutputStream(new LogWriter(log)));
ArrayList<String> args = new ArrayList<String>();
configurImportToolOptions(args);
mergeOriginalArgs(args);
diff --git a/modules/java2wsdl/src/org/apache/ws/java2wsdl/jaxws/JAXWS2WSDLCodegenEngine.java b/modules/java2wsdl/src/org/apache/ws/java2wsdl/jaxws/JAXWS2WSDLCodegenEngine.java
index 609293f..471feac 100644
--- a/modules/java2wsdl/src/org/apache/ws/java2wsdl/jaxws/JAXWS2WSDLCodegenEngine.java
+++ b/modules/java2wsdl/src/org/apache/ws/java2wsdl/jaxws/JAXWS2WSDLCodegenEngine.java
@@ -26,8 +26,9 @@
import java.util.List;
import java.util.Map;
-import org.apache.axiom.om.util.LogOutputStream;
import org.apache.axis2.description.java2wsdl.Java2WSDLConstants;
+import org.apache.axis2.util.LogWriter;
+import org.apache.commons.io.output.WriterOutputStream;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.ws.java2wsdl.utils.Java2WSDLCommandLineOption;
@@ -71,9 +72,7 @@
* the exception
*/
public void generate() throws Exception {
- LogOutputStream logOutputStream = new LogOutputStream(log,
- Integer.MAX_VALUE);
- WsgenTool genTool = new WsgenTool(logOutputStream);
+ WsgenTool genTool = new WsgenTool(new WriterOutputStream(new LogWriter(log)));
List<String> args = new ArrayList<String>();
configurImportToolOptions(args);
diff --git a/modules/transport/mail/src/main/java/org/apache/axis2/transport/mail/LogWriter.java b/modules/kernel/src/org/apache/axis2/util/LogWriter.java
similarity index 97%
rename from modules/transport/mail/src/main/java/org/apache/axis2/transport/mail/LogWriter.java
rename to modules/kernel/src/org/apache/axis2/util/LogWriter.java
index 766e9e6..0043608 100644
--- a/modules/transport/mail/src/main/java/org/apache/axis2/transport/mail/LogWriter.java
+++ b/modules/kernel/src/org/apache/axis2/util/LogWriter.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.axis2.transport.mail;
+package org.apache.axis2.util;
import java.io.Writer;
diff --git a/modules/transport/mail/src/main/java/org/apache/axis2/transport/mail/MailUtils.java b/modules/transport/mail/src/main/java/org/apache/axis2/transport/mail/MailUtils.java
index b759e93..6c0069c 100644
--- a/modules/transport/mail/src/main/java/org/apache/axis2/transport/mail/MailUtils.java
+++ b/modules/transport/mail/src/main/java/org/apache/axis2/transport/mail/MailUtils.java
@@ -26,6 +26,7 @@
import org.apache.axis2.AxisFault;
import org.apache.axis2.description.ParameterInclude;
import org.apache.axis2.transport.base.ParamUtils;
+import org.apache.axis2.util.LogWriter;
import org.apache.commons.io.output.WriterOutputStream;
import org.apache.commons.logging.Log;
