dims 2003/07/22 08:45:18
Modified: java/src/org/apache/axis/handlers EchoHandler.java
JWSHandler.java LogHandler.java
SOAPMonitorHandler.java
java/src/org/apache/axis/handlers/soap SOAPService.java
Log:
Code cleanup (includes fix to Bug 21778 - Bug in build.xml (missing "exclude" in
"compile" target))
Notes:
- clean imports
- change this.log to log
- get rid of StringBufferInputStream
- remove unused variables.
Revision Changes Path
1.44 +3 -7 xml-axis/java/src/org/apache/axis/handlers/EchoHandler.java
Index: EchoHandler.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/handlers/EchoHandler.java,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- EchoHandler.java 22 Apr 2003 19:34:39 -0000 1.43
+++ EchoHandler.java 22 Jul 2003 15:45:16 -0000 1.44
@@ -55,22 +55,18 @@
package org.apache.axis.handlers ;
-import java.io.StringBufferInputStream;
-import javax.servlet.http.HttpServletRequest;
-
-
import org.apache.axis.AxisFault;
import org.apache.axis.Message;
import org.apache.axis.MessageContext;
import org.apache.axis.components.logger.LogFactory;
import org.apache.axis.message.SOAPEnvelope;
-import org.apache.axis.transport.http.AxisServlet;
-import org.apache.axis.transport.http.HTTPConstants;
import org.apache.axis.utils.Messages;
import org.apache.axis.utils.XMLUtils;
import org.apache.commons.logging.Log;
import org.w3c.dom.Document;
+import java.io.ByteArrayInputStream;
+
/**
*
* @author Doug Davis ([EMAIL PROTECTED])
@@ -195,7 +191,7 @@
try {
String url = msgContext.getStrProp(MessageContext.TRANS_URL);
String wsdlString = wsdlStart + url + wsdlEnd;
- Document doc = XMLUtils.newDocument(new
StringBufferInputStream(wsdlString));
+ Document doc = XMLUtils.newDocument(new
ByteArrayInputStream(wsdlString.getBytes("UTF-8")));
msgContext.setProperty("WSDL", doc);
} catch (Exception e) {
throw AxisFault.makeFault(e);
1.33 +1 -1 xml-axis/java/src/org/apache/axis/handlers/JWSHandler.java
Index: JWSHandler.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/handlers/JWSHandler.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- JWSHandler.java 15 Jul 2003 02:01:39 -0000 1.32
+++ JWSHandler.java 22 Jul 2003 15:45:16 -0000 1.33
@@ -77,12 +77,12 @@
import org.w3c.dom.Element;
import java.io.File;
+import java.io.FileFilter;
import java.io.FileInputStream;
import java.io.FileReader;
import java.io.FileWriter;
import java.io.IOException;
import java.io.InputStream;
-import java.io.FileFilter;
import java.net.URL;
import java.net.URLClassLoader;
import java.util.HashMap;
1.42 +2 -2 xml-axis/java/src/org/apache/axis/handlers/LogHandler.java
Index: LogHandler.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/handlers/LogHandler.java,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- LogHandler.java 22 Apr 2003 19:34:39 -0000 1.41
+++ LogHandler.java 22 Jul 2003 15:45:16 -0000 1.42
@@ -113,7 +113,7 @@
try {
PrintWriter writer = null;
- writer = getWriter(msgContext);
+ writer = getWriter();
Message inMsg = msgContext.getRequestMessage();
Message outMsg = msgContext.getResponseMessage();
@@ -141,7 +141,7 @@
}
}
- private PrintWriter getWriter(MessageContext msgContext) throws IOException {
+ private PrintWriter getWriter() throws IOException {
PrintWriter writer;
// Allow config info to control where we write.
1.5 +0 -5
xml-axis/java/src/org/apache/axis/handlers/SOAPMonitorHandler.java
Index: SOAPMonitorHandler.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/handlers/SOAPMonitorHandler.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SOAPMonitorHandler.java 27 Jun 2003 05:44:17 -0000 1.4
+++ SOAPMonitorHandler.java 22 Jul 2003 15:45:17 -0000 1.5
@@ -62,8 +62,6 @@
import org.apache.axis.monitor.SOAPMonitorConstants;
import org.apache.axis.monitor.SOAPMonitorService;
-import javax.xml.namespace.QName;
-
/**
* This handler is used to route SOAP messages to the
* SOAP monitor service.
@@ -74,9 +72,6 @@
public class SOAPMonitorHandler extends BasicHandler {
private static long next_message_id = 1;
- private String wsdlURL = null;
- private QName serviceQName = null;
- private QName portQName = null;
/**
* Constructor
1.100 +2 -2 xml-axis/java/src/org/apache/axis/handlers/soap/SOAPService.java
Index: SOAPService.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/handlers/soap/SOAPService.java,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- SOAPService.java 9 Jul 2003 22:00:49 -0000 1.99
+++ SOAPService.java 22 Jul 2003 15:45:18 -0000 1.100
@@ -175,8 +175,8 @@
public void invoke(MessageContext msgContext) throws AxisFault {
// Do SOAP semantics here
- if (this.log.isDebugEnabled()) {
- this.log.debug( Messages.getMessage("semanticCheck00"));
+ if (log.isDebugEnabled()) {
+ log.debug( Messages.getMessage("semanticCheck00"));
}
ArrayList acts = getActors();
