svn commit: r1820230 - in /axis/axis2/java/core/trunk/modules: codegen/src/org/apache/axis2/wsdl/codegen/jaxws/ java2wsdl/src/org/apache/ws/java2wsdl/jaxws/ kernel/src/org/apache/axis2/util/ transport/mail/src/main/java/org/apache/axis2/transport/mail/

[veithen]

Author: veithen
Date: Thu Jan  4 22:03:43 2018
New Revision: 1820230

URL: http://svn.apache.org/viewvc?rev=1820230&view=rev
Log:
Eliminate references to the deprecated LogOutputStream API.

Added:
    
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/LogWriter.java
      - copied, changed from r1820229, 
axis/axis2/java/core/trunk/modules/transport/mail/src/main/java/org/apache/axis2/transport/mail/LogWriter.java
Removed:
    
axis/axis2/java/core/trunk/modules/transport/mail/src/main/java/org/apache/axis2/transport/mail/LogWriter.java
Modified:
    
axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/codegen/jaxws/JAXWSCodeGenerationEngine.java
    
axis/axis2/java/core/trunk/modules/java2wsdl/src/org/apache/ws/java2wsdl/jaxws/JAXWS2WSDLCodegenEngine.java
    
axis/axis2/java/core/trunk/modules/transport/mail/src/main/java/org/apache/axis2/transport/mail/MailUtils.java

Modified: 
axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/codegen/jaxws/JAXWSCodeGenerationEngine.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/codegen/jaxws/JAXWSCodeGenerationEngine.java?rev=1820230&r1=1820229&r2=1820230&view=diff
==============================================================================
--- 
axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/codegen/jaxws/JAXWSCodeGenerationEngine.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/codegen/jaxws/JAXWSCodeGenerationEngine.java
 Thu Jan  4 22:03:43 2018
@@ -26,12 +26,13 @@ import java.util.Iterator;
 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 @@ public class JAXWSCodeGenerationEngine {
      *             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);

Modified: 
axis/axis2/java/core/trunk/modules/java2wsdl/src/org/apache/ws/java2wsdl/jaxws/JAXWS2WSDLCodegenEngine.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/java2wsdl/src/org/apache/ws/java2wsdl/jaxws/JAXWS2WSDLCodegenEngine.java?rev=1820230&r1=1820229&r2=1820230&view=diff
==============================================================================
--- 
axis/axis2/java/core/trunk/modules/java2wsdl/src/org/apache/ws/java2wsdl/jaxws/JAXWS2WSDLCodegenEngine.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/java2wsdl/src/org/apache/ws/java2wsdl/jaxws/JAXWS2WSDLCodegenEngine.java
 Thu Jan  4 22:03:43 2018
@@ -26,8 +26,9 @@ import java.util.Iterator;
 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 @@ public class JAXWS2WSDLCodegenEngine {
      *             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);

Copied: 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/LogWriter.java
 (from r1820229, 
axis/axis2/java/core/trunk/modules/transport/mail/src/main/java/org/apache/axis2/transport/mail/LogWriter.java)
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/LogWriter.java?p2=axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/LogWriter.java&p1=axis/axis2/java/core/trunk/modules/transport/mail/src/main/java/org/apache/axis2/transport/mail/LogWriter.java&r1=1820229&r2=1820230&rev=1820230&view=diff
==============================================================================
--- 
axis/axis2/java/core/trunk/modules/transport/mail/src/main/java/org/apache/axis2/transport/mail/LogWriter.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/LogWriter.java
 Thu Jan  4 22:03:43 2018
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.axis2.transport.mail;
+package org.apache.axis2.util;
 
 import java.io.Writer;
 

Modified: 
axis/axis2/java/core/trunk/modules/transport/mail/src/main/java/org/apache/axis2/transport/mail/MailUtils.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/mail/src/main/java/org/apache/axis2/transport/mail/MailUtils.java?rev=1820230&r1=1820229&r2=1820230&view=diff
==============================================================================
--- 
axis/axis2/java/core/trunk/modules/transport/mail/src/main/java/org/apache/axis2/transport/mail/MailUtils.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/transport/mail/src/main/java/org/apache/axis2/transport/mail/MailUtils.java
 Thu Jan  4 22:03:43 2018
@@ -26,6 +26,7 @@ import javax.mail.Session;
 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;