You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by rs...@apache.org on 2002/02/23 00:39:47 UTC
cvs commit: xml-axis/java/test/utils TestMessages.java TestSrcContent.java
rsitze 02/02/22 15:39:47
Modified: java/samples/transport/tcp AdminClient.java
java/src/org/apache/axis AxisEngine.java AxisFault.java
ConfigurationException.java FaultableHandler.java
InternalException.java Message.java
MessageContext.java Part.java SOAPPart.java
SimpleChain.java SimpleTargetedChain.java
java/src/org/apache/axis/attachments AttachmentPart.java
BoundaryDelimitedStream.java
ManagedMemoryDataSource.java MimeUtils.java
MultiPartRelatedInputStream.java
java/src/org/apache/axis/client AdminClient.java
AxisClient.java Call.java
java/src/org/apache/axis/configuration
DefaultEngineConfigurationFactory.java
FileProvider.java
java/src/org/apache/axis/deployment/wsdd WSDDDeployment.java
WSDDDocument.java
java/src/org/apache/axis/encoding
DeserializationContextImpl.java
DeserializerImpl.java FieldTarget.java
MethodTarget.java SerializationContextImpl.java
TypeMappingImpl.java
java/src/org/apache/axis/encoding/ser ArrayDeserializer.java
ArraySerializer.java BeanDeserializer.java
BeanPropertyDescriptor.java BeanPropertyTarget.java
BeanSerializer.java ElementDeserializer.java
EnumSerializer.java JAFDataHandlerDeserializer.java
JAFDataHandlerSerializer.java MapDeserializer.java
MapSerializer.java VectorDeserializer.java
java/src/org/apache/axis/handlers BasicHandler.java
DebugHandler.java EchoHandler.java
ErrorHandler.java JWSHandler.java JWSProcessor.java
LogHandler.java LogMessage.java
MD5AttachHandler.java
SimpleAuthenticationHandler.java
SimpleAuthorizationHandler.java
SimpleSessionHandler.java
java/src/org/apache/axis/handlers/http
HTTPActionHandler.java HTTPAuthHandler.java
URLMapper.java
java/src/org/apache/axis/handlers/soap SOAPService.java
java/src/org/apache/axis/message BodyBuilder.java
InputStreamBody.java MessageElement.java
RPCHandler.java RPCParam.java SAXOutputter.java
SOAPEnvelope.java SymbolTable.java
java/src/org/apache/axis/providers/java JavaProvider.java
RPCProvider.java
java/src/org/apache/axis/security/servlet
ServletSecurityProvider.java
java/src/org/apache/axis/security/simple
SimpleSecurityProvider.java
java/src/org/apache/axis/server AxisServer.java
Transport.java
java/src/org/apache/axis/transport/http AxisServlet.java
HTTPSender.java SimpleAxisServer.java
java/src/org/apache/axis/transport/local LocalResponder.java
LocalSender.java
java/src/org/apache/axis/utils Admin.java JavaUtils.java
NSStack.java Options.java XMLUtils.java
resources.properties
java/src/org/apache/axis/utils/compiler CompilerFactory.java
Javac.java Jikes.java
java/test/utils TestMessages.java TestSrcContent.java
Log:
Replaced (most) calls of form e.printStackTrace with log.error(someMessage, e)
Revision Changes Path
1.16 +1 -1 xml-axis/java/samples/transport/tcp/AdminClient.java
Index: AdminClient.java
===================================================================
RCS file: /home/cvs/xml-axis/java/samples/transport/tcp/AdminClient.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- AdminClient.java 6 Feb 2002 15:27:43 -0000 1.15
+++ AdminClient.java 22 Feb 2002 23:39:42 -0000 1.16
@@ -89,7 +89,7 @@
try {
org.apache.axis.client.AdminClient client =
- new org.apache.axis.client.AdminClient(System.err);
+ new org.apache.axis.client.AdminClient();
System.out.println(client.process(args));
}
1.72 +3 -4 xml-axis/java/src/org/apache/axis/AxisEngine.java
Index: AxisEngine.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/AxisEngine.java,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- AxisEngine.java 22 Feb 2002 15:37:46 -0000 1.71
+++ AxisEngine.java 22 Feb 2002 23:39:42 -0000 1.72
@@ -89,8 +89,8 @@
*/
public abstract class AxisEngine extends BasicHandler
{
- static Log log =
- LogFactory.getLog(AxisEngine.class.getName());
+ protected static Log log =
+ LogFactory.getLog(AxisEngine.class.getName());
// Engine property names
public static final String PROP_XML_DECL = "sendXMLDeclaration";
@@ -221,8 +221,7 @@
try {
config.writeEngineConfig(this);
} catch (Exception e) {
- log.error(JavaUtils.getMessage("saveConfigFail00"));
- e.printStackTrace();
+ log.error(JavaUtils.getMessage("saveConfigFail00"), e);
}
}
1.40 +22 -11 xml-axis/java/src/org/apache/axis/AxisFault.java
Index: AxisFault.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/AxisFault.java,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- AxisFault.java 12 Feb 2002 22:25:25 -0000 1.39
+++ AxisFault.java 22 Feb 2002 23:39:42 -0000 1.40
@@ -60,6 +60,10 @@
import org.apache.axis.message.SOAPFaultElement;
import org.apache.axis.utils.QFault;
import org.apache.axis.utils.XMLUtils;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Text;
@@ -78,6 +82,11 @@
*/
public class AxisFault extends java.rmi.RemoteException {
+ protected static Log log =
+ LogFactory.getLog(AxisFault.class.getName());
+
+ private static final String LS = System.getProperty("line.separator");
+
protected QFault faultCode ;
protected String faultString = "";
protected String faultActor ;
@@ -207,31 +216,33 @@
el = XMLUtils.StringToElement(Constants.AXIS_NS,
"stackTrace",
stream.toString());
-
-
+
faultDetails.add(el);
}
- public void dump() {
- System.out.println(dumpToString());
+ public void dump()
+ {
+ log.debug(dumpToString());
}
-
+
public String dumpToString()
{
String details = new String();
+
if (faultDetails != null) {
for (int i=0; i < faultDetails.size(); i++) {
Element e = (Element) faultDetails.get(i);
Text text = (Text)e.getFirstChild();
- details += "\n\t" + e.getLocalName() + ": " + text.getData();
+ details += LS + "\t" + e.getLocalName() + ": " + text.getData();
}
}
- return "AxisFault\n" +
- " faultCode: " + faultCode + "\n" +
- " faultString: " + faultString + "\n" +
- " faultActor: " + faultActor + "\n" +
- " faultDetail: " + details + "\n";
+ return "AxisFault" + LS
+ + " faultCode: " + faultCode + LS
+ + " faultString: " + faultString + LS
+ + " faultActor: " + faultActor + LS
+ + " faultDetail: " + details + LS
+ ;
}
public void setFaultCode(QFault code) {
1.4 +3 -6 xml-axis/java/src/org/apache/axis/ConfigurationException.java
Index: ConfigurationException.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/ConfigurationException.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ConfigurationException.java 19 Feb 2002 17:38:18 -0000 1.3
+++ ConfigurationException.java 22 Feb 2002 23:39:42 -0000 1.4
@@ -70,8 +70,8 @@
*/
public class ConfigurationException extends IOException {
- private static Log log =
- LogFactory.getLog(ConfigurationException.class.getName());
+ protected static Log log =
+ LogFactory.getLog(ConfigurationException.class.getName());
/**
* Construct a ConfigurationException from a String. The string is wrapped
@@ -91,10 +91,7 @@
// Log the exception the first time it appears.
if (!(e instanceof ConfigurationException)) {
- log.debug(e);
- StringWriter writer = new StringWriter();
- e.printStackTrace(new PrintWriter(writer));
- log.debug(writer.getBuffer().toString());
+ log.debug("Exception: ", e);
}
}
}
1.32 +2 -2 xml-axis/java/src/org/apache/axis/FaultableHandler.java
Index: FaultableHandler.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/FaultableHandler.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- FaultableHandler.java 19 Feb 2002 17:38:18 -0000 1.31
+++ FaultableHandler.java 22 Feb 2002 23:39:42 -0000 1.32
@@ -74,8 +74,8 @@
* @author Glen Daniels (gdaniels@macromedia.com)
*/
public class FaultableHandler extends BasicHandler {
- static Log log =
- LogFactory.getLog(FaultableHandler.class.getName());
+ protected static Log log =
+ LogFactory.getLog(FaultableHandler.class.getName());
protected Handler workHandler ;
1.4 +5 -12 xml-axis/java/src/org/apache/axis/InternalException.java
Index: InternalException.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/InternalException.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- InternalException.java 19 Feb 2002 17:38:18 -0000 1.3
+++ InternalException.java 22 Feb 2002 23:39:42 -0000 1.4
@@ -71,8 +71,8 @@
*/
public class InternalException extends RuntimeException {
- private static Log log =
- LogFactory.getLog(InternalException.class.getName());
+ protected static Log log =
+ LogFactory.getLog(InternalException.class.getName());
/**
* Attribute which controls whether or not logging of such events should
@@ -115,17 +115,10 @@
if (shouldLog) {
// if the exception is merely bubbling up the stack, only log the
// event if debug is turned on.
- if (!(e instanceof InternalException)) {
- log.fatal(e);
+ if (e instanceof InternalException) {
+ log.debug("InternalException: ", e);
} else {
- log.debug(e);
- }
-
- // if the debug is enabled, add a stack trace.
- if (log.isDebugEnabled()) {
- StringWriter writer = new StringWriter();
- e.printStackTrace(new PrintWriter(writer));
- log.debug(writer.getBuffer().toString());
+ log.fatal("Unknown Exception: ", e);
}
}
}
1.62 +2 -4 xml-axis/java/src/org/apache/axis/Message.java
Index: Message.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/Message.java,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- Message.java 22 Feb 2002 15:37:46 -0000 1.61
+++ Message.java 22 Feb 2002 23:39:42 -0000 1.62
@@ -78,8 +78,8 @@
* @author Rick Rineholt
*/
public class Message {
- static Log log =
- LogFactory.getLog(Message.class.getName());
+ protected static Log log =
+ LogFactory.getLog(Message.class.getName());
public static final String REQUEST = "request";
public static final String RESPONSE = "response";
@@ -326,14 +326,12 @@
os.write(mSOAPPart.getAsBytes());
} catch (java.io.IOException e) {
log.error("IOException: ", e);
- e.printStackTrace();
}
} else {
try {
mAttachments.writeContentToStream(os);
} catch (java.lang.Exception e) {
log.error("Exception: ", e);
- e.printStackTrace();
}
}
}
1.77 +2 -2 xml-axis/java/src/org/apache/axis/MessageContext.java
Index: MessageContext.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/MessageContext.java,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- MessageContext.java 20 Feb 2002 18:59:20 -0000 1.76
+++ MessageContext.java 22 Feb 2002 23:39:43 -0000 1.77
@@ -93,8 +93,8 @@
* @author Jacek Kopecky (jacek@idoox.com)
*/
public class MessageContext {
- static Log log =
- LogFactory.getLog(MessageContext.class.getName());
+ protected static Log log =
+ LogFactory.getLog(MessageContext.class.getName());
/**
* The request message. If we're on the client, this is the outgoing
1.5 +5 -4 xml-axis/java/src/org/apache/axis/Part.java
Index: Part.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/Part.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Part.java 22 Feb 2002 15:37:46 -0000 1.4
+++ Part.java 22 Feb 2002 23:39:43 -0000 1.5
@@ -55,6 +55,8 @@
package org.apache.axis;
+import org.apache.axis.utils.JavaUtils;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -81,8 +83,8 @@
public abstract class Part
{
- static Log log =
- LogFactory.getLog(Part.class.getName());
+ protected static Log log =
+ LogFactory.getLog(Part.class.getName());
private Message msg;
private Hashtable headers = new Hashtable();
@@ -233,8 +235,7 @@
thisHost = java.net.InetAddress.getLocalHost().getHostName();
}
catch (java.net.UnknownHostException e) {
- log.error("java.net.UnknownHostException: ", e);
- e.printStackTrace();
+ log.error(JavaUtils.getMessage("javaNetUnknownHostException00"), e);
thisHost = "localhost";
}
1.12 +7 -4 xml-axis/java/src/org/apache/axis/SOAPPart.java
Index: SOAPPart.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/SOAPPart.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- SOAPPart.java 22 Feb 2002 15:37:46 -0000 1.11
+++ SOAPPart.java 22 Feb 2002 23:39:43 -0000 1.12
@@ -61,6 +61,7 @@
import org.apache.axis.encoding.SerializationContextImpl;
import org.apache.axis.message.InputStreamBody;
import org.apache.axis.message.SOAPEnvelope;
+import org.apache.axis.utils.JavaUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -85,8 +86,10 @@
* @author Doug Davis (dug@us.ibm.com)
* @author Glen Daniels (gdaniels@allaire.com)
*/
-public class SOAPPart extends Part {
- static Log log = LogFactory.getLog(Message.class.getName());
+public class SOAPPart extends Part
+{
+ protected static Log log =
+ LogFactory.getLog(SOAPPart.class.getName());
private static final int FORM_STRING = 1;
private static final int FORM_INPUTSTREAM = 2;
@@ -266,7 +269,7 @@
return (byte[])currentMessage;
}
catch( Exception e ) {
- e.printStackTrace( System.err );
+ log.error(JavaUtils.getMessage("exception00"), e);
}
log.debug( "Exit: SOAPPart::getAsByes" );
return null;
@@ -336,7 +339,7 @@
try {
env.output(new SerializationContextImpl(writer, getMessage().getMessageContext()));
} catch (Exception e) {
- e.printStackTrace();
+ log.error(JavaUtils.getMessage("exception00"), e);
return null;
}
setCurrentMessage(writer.getBuffer().toString(), FORM_STRING);
1.41 +2 -2 xml-axis/java/src/org/apache/axis/SimpleChain.java
Index: SimpleChain.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/SimpleChain.java,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- SimpleChain.java 19 Feb 2002 17:38:18 -0000 1.40
+++ SimpleChain.java 22 Feb 2002 23:39:43 -0000 1.41
@@ -84,8 +84,8 @@
* @author Glyn Normington (norm@uk.ibm.com)
*/
public class SimpleChain extends BasicHandler implements Chain {
- static Log log =
- LogFactory.getLog(SimpleChain.class.getName());
+ protected static Log log =
+ LogFactory.getLog(SimpleChain.class.getName());
protected Vector handlers = new Vector();
protected boolean invoked = false;
1.37 +2 -2 xml-axis/java/src/org/apache/axis/SimpleTargetedChain.java
Index: SimpleTargetedChain.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/SimpleTargetedChain.java,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- SimpleTargetedChain.java 19 Feb 2002 17:38:18 -0000 1.36
+++ SimpleTargetedChain.java 22 Feb 2002 23:39:43 -0000 1.37
@@ -74,8 +74,8 @@
*/
public class SimpleTargetedChain extends SimpleChain implements TargetedChain
{
- static Log log =
- LogFactory.getLog(SimpleTargetedChain.class.getName());
+ protected static Log log =
+ LogFactory.getLog(SimpleTargetedChain.class.getName());
protected Handler requestHandler ;
protected Handler pivotHandler ;
1.5 +2 -1 xml-axis/java/src/org/apache/axis/attachments/AttachmentPart.java
Index: AttachmentPart.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/attachments/AttachmentPart.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AttachmentPart.java 19 Feb 2002 17:38:19 -0000 1.4
+++ AttachmentPart.java 22 Feb 2002 23:39:43 -0000 1.5
@@ -82,7 +82,8 @@
import org.apache.axis.transport.http.HTTPConstants ;
public class AttachmentPart extends Part {
- static Log log = LogFactory.getLog(Message.class.getName());
+ protected static Log log =
+ LogFactory.getLog(AttachmentPart.class.getName());
javax.activation.DataHandler datahandler= null;
1.7 +4 -3 xml-axis/java/src/org/apache/axis/attachments/BoundaryDelimitedStream.java
Index: BoundaryDelimitedStream.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/attachments/BoundaryDelimitedStream.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- BoundaryDelimitedStream.java 22 Feb 2002 15:37:47 -0000 1.6
+++ BoundaryDelimitedStream.java 22 Feb 2002 23:39:43 -0000 1.7
@@ -65,9 +65,10 @@
/**
* This class takes the input stream and turns it multiple streams.
*/
-public class BoundaryDelimitedStream extends java.io.FilterInputStream {
- static Log log =
- LogFactory.getLog(BoundaryDelimitedStream.class.getName());
+public class BoundaryDelimitedStream extends java.io.FilterInputStream
+{
+ protected static Log log =
+ LogFactory.getLog(BoundaryDelimitedStream.class.getName());
protected byte[] boundary = null;
int boundaryLen = 0; //The boundary length.
1.10 +28 -25 xml-axis/java/src/org/apache/axis/attachments/ManagedMemoryDataSource.java
Index: ManagedMemoryDataSource.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/attachments/ManagedMemoryDataSource.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ManagedMemoryDataSource.java 22 Feb 2002 15:37:47 -0000 1.9
+++ ManagedMemoryDataSource.java 22 Feb 2002 23:39:43 -0000 1.10
@@ -57,6 +57,7 @@
import org.apache.axis.InternalException;
import org.apache.axis.MessageContext;
+import org.apache.axis.utils.JavaUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -75,8 +76,8 @@
public class ManagedMemoryDataSource implements javax.activation.DataSource
{
- static Log log =
- LogFactory.getLog(ManagedMemoryDataSource.class.getName());
+ protected static Log log =
+ LogFactory.getLog(ManagedMemoryDataSource.class.getName());
protected String contentType = "application/octet-stream"; //Is the default.
java.io.InputStream ss = null; //The incoming source stream.
@@ -385,12 +386,15 @@
return ret;
}
+ // inner classes cannot have static declarations...
+ protected static Log is_log =
+ LogFactory.getLog(Instream.class.getName());
+
/** Inner class to handle getting an input stream to this data source
* Handles creating an input stream to the source.
*/
- private class Instream extends java.io.InputStream {
- Log log =
- LogFactory.getLog(Instream.class.getName());
+ private class Instream extends java.io.InputStream
+ {
protected int bread = 0; //bytes read
java.io.FileInputStream fin = null; //The real stream.
int currentIndex = 0; //The position in the list were we are reading from.
@@ -411,7 +415,7 @@
int ret= totalsz - bread;
- if(debugEnabled) log.debug("available()= "+ ret + ".");
+ if(debugEnabled) is_log.debug("available()= "+ ret + ".");
return ret;
}
@@ -433,7 +437,7 @@
* Not supported.
*/
public boolean markSupported() {
- if(debugEnabled) log.debug("markSupported()= "+ false + ".");
+ if(debugEnabled) is_log.debug("markSupported()= "+ false + ".");
return false;
}
@@ -441,14 +445,14 @@
* Not supported.
*/
public void mark(int readlimit){
- if(debugEnabled) log.debug("mark()");
+ if(debugEnabled) is_log.debug("mark()");
}
/**
* Not supported.
*/
public void reset() throws java.io.IOException {
- if(debugEnabled) log.debug("reset()");
+ if(debugEnabled) is_log.debug("reset()");
throw new java.io.IOException("Reset and mark not supported!");
}
@@ -459,7 +463,7 @@
public long skip(long skipped) throws java.io.IOException {
- if(debugEnabled) log.debug("skip(" +skipped+ ").");
+ if(debugEnabled) is_log.debug("skip(" +skipped+ ").");
if(deleted) throw new java.io.IOException("Resource has been deleted.");
if(readClosed) throw new java.io.IOException("Stream is closed.");
@@ -496,7 +500,7 @@
bread += skipped;
}
- if(debugEnabled) log.debug("skipped " +skipped+ ".");
+ if(debugEnabled) is_log.debug("skipped " +skipped+ ".");
return skipped;
}
@@ -508,7 +512,7 @@
*/
public int read(byte[] b, int off, int len) throws java.io.IOException {
- if(debugEnabled) log.debug(hashCode() + "read(" + off + ", " + len +")");
+ if(debugEnabled) is_log.debug(hashCode() + "read(" + off + ", " + len +")");
if(deleted) throw new java.io.IOException("Resource has been deleted.");
if(readClosed) throw new java.io.IOException("Stream is closed.");
if (b == null) throw new InternalException(
@@ -526,7 +530,7 @@
if ( bread == totalsz) return -1;
java.util.List ml = memorybuflist;
len = Math.min(len, totalsz - bread); //Only return the number of bytes in the data store that is left.
- if(debugEnabled) log.debug("len= " + len);
+ if(debugEnabled) is_log.debug("len= " + len);
if ( ml != null) {
@@ -553,30 +557,30 @@
}
if (bwritten == 0 && null != diskCacheFile) {
- if(debugEnabled) log.debug("reading from disk" + len);
+ if(debugEnabled) is_log.debug("reading from disk" + len);
if (null == fin ) { //we are now reading from disk.
- if(debugEnabled) log.debug("open bread=" + diskCacheFile.getCanonicalPath());
- if(debugEnabled) log.debug("open bread=" + bread);
+ if(debugEnabled) is_log.debug("open bread=" + diskCacheFile.getCanonicalPath());
+ if(debugEnabled) is_log.debug("open bread=" + bread);
fin = new java.io.FileInputStream( diskCacheFile);
if(bread >0) fin.skip(bread); //Skip what we've read so far.
}
if(cachediskstream != null){
- if(debugEnabled) log.debug("flushing");
+ if(debugEnabled) is_log.debug("flushing");
cachediskstream.flush();
}
- if(debugEnabled){ log.debug("flushing");
- log.debug("len=" + len);
- log.debug("off=" + off);
- log.debug("b.length=" + b.length);
+ if(debugEnabled){ is_log.debug("flushing");
+ is_log.debug("len=" + len);
+ is_log.debug("off=" + off);
+ is_log.debug("b.length=" + b.length);
}
bwritten = fin.read(b, off, len);
}
if ( bwritten > 0) bread += bwritten;
}
- if(debugEnabled) log.debug( hashCode() +"read " + bwritten);
+ if(debugEnabled) is_log.debug( hashCode() +"read " + bwritten);
return bwritten;
}
@@ -585,7 +589,7 @@
*/
public synchronized void close() throws java.io.IOException {
- if(debugEnabled) log.debug("close()");
+ if(debugEnabled) is_log.debug("close()");
if(!readClosed){
readers.remove(this);
readClosed= true;
@@ -630,8 +634,7 @@
}
catch ( java.lang.Exception e) {
- log.error("Caught Exception", e);
- e.printStackTrace();
+ log.error(JavaUtils.getMessage("exception00"), e);
}
}
}
1.9 +2 -6 xml-axis/java/src/org/apache/axis/attachments/MimeUtils.java
Index: MimeUtils.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/attachments/MimeUtils.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- MimeUtils.java 22 Feb 2002 15:37:47 -0000 1.8
+++ MimeUtils.java 22 Feb 2002 23:39:43 -0000 1.9
@@ -77,8 +77,8 @@
public class MimeUtils
{
- static Log log =
- LogFactory.getLog(MimeUtils.class.getName());
+ protected static Log log =
+ LogFactory.getLog(MimeUtils.class.getName());
/**
* Determine as efficiently as possible the content length for attachments in a mail Multipart.
@@ -201,11 +201,9 @@
}
catch (javax.mail.MessagingException e) {
log.error("javax.mail.MessagingException: ", e);
- e.printStackTrace();
}
catch (java.io.IOException e) {
log.error("java.io.IOException: ", e);
- e.printStackTrace();
}
}
/**
@@ -284,7 +282,6 @@
}
catch (javax.mail.MessagingException e) {
log.error("javax.mail.MessagingException: ", e);
- e.printStackTrace();
}
return multipart ;
}
@@ -305,7 +302,6 @@
}
catch (java.net.UnknownHostException e) {
log.error("java.net.UknownHostException: ", e);
- e.printStackTrace();
thisHost = "localhost";
}
1.10 +5 -4 xml-axis/java/src/org/apache/axis/attachments/MultiPartRelatedInputStream.java
Index: MultiPartRelatedInputStream.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/attachments/MultiPartRelatedInputStream.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- MultiPartRelatedInputStream.java 19 Feb 2002 17:38:19 -0000 1.9
+++ MultiPartRelatedInputStream.java 22 Feb 2002 23:39:43 -0000 1.10
@@ -71,7 +71,11 @@
/** This simulates the multipart stream
*
*/
-public class MultiPartRelatedInputStream extends java.io.FilterInputStream {
+public class MultiPartRelatedInputStream extends java.io.FilterInputStream
+{
+ protected static Log log =
+ LogFactory.getLog(MultiPartRelatedInputStream.class.getName());
+
public static final String MIME_MULTIPART_RELATED = "multipart/related";
protected java.util.HashMap parts = new java.util.HashMap();
protected java.util.LinkedList orderedParts = new java.util.LinkedList();
@@ -88,9 +92,6 @@
//Still open and a reference to read data in a later attachment occurs.
protected String contentLocation= null;
protected String contentId= null;
-
- static Log log =
- LogFactory.getLog(MultiPartRelatedInputStream.class.getName());
/**
* Multipart stream.
1.54 +21 -54 xml-axis/java/src/org/apache/axis/client/AdminClient.java
Index: AdminClient.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/client/AdminClient.java,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- AdminClient.java 19 Feb 2002 17:38:19 -0000 1.53
+++ AdminClient.java 22 Feb 2002 23:39:43 -0000 1.54
@@ -60,6 +60,7 @@
import org.apache.axis.message.SOAPBodyElement;
import org.apache.axis.utils.JavaUtils;
import org.apache.axis.utils.Options;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -75,10 +76,7 @@
/**
* An admin client object that can be used both from the command line
- * and programmatically. The admin client supports simple logging that
- * allows the output of its operations to be inspected in environments
- * where <code>System.out</code> and <code>System.err</code> should
- * not be used.
+ * and programmatically.
*
* @author Rob Jellinghaus (robj@unrealities.com)
* @author Doug Davis (dug@us.ibm.com)
@@ -87,8 +85,8 @@
public class AdminClient
{
- static Log log =
- LogFactory.getLog(AdminClient.class.getName());
+ protected static Log log =
+ LogFactory.getLog(AdminClient.class.getName());
private static ThreadLocal defaultConfiguration = new ThreadLocal();
@@ -105,7 +103,6 @@
defaultConfiguration.set(config);
}
- protected PrintWriter _log;
protected Call call;
/**
@@ -133,36 +130,6 @@
}
/**
- * Construct an admin client with a logger
- */
- public AdminClient(PrintWriter log)
- {
- this();
- _log = log;
- }
-
- /**
- * Construct an admin client with a logger
- */
- public AdminClient(OutputStream out)
- {
- this();
- _log = new PrintWriter(out);
- }
-
- /**
- * Logs a message if a logger has been provided
- */
- protected void log(String msg) throws IOException
- {
- if (_log != null)
- {
- _log.println(msg);
- _log.flush();
- }
- }
-
- /**
* External access to our Call object
*/
public Call getCall()
@@ -176,7 +143,7 @@
}
public String list() throws Exception {
- log( JavaUtils.getMessage("doList00") );
+ log.debug( JavaUtils.getMessage("doList00") );
String str = "<m:list xmlns:m=\"AdminService\"/>" ;
ByteArrayInputStream input = new ByteArrayInputStream(str.getBytes());
return process(input);
@@ -188,14 +155,14 @@
}
public String quit() throws Exception {
- log(JavaUtils.getMessage("doQuit00"));
+ log.debug(JavaUtils.getMessage("doQuit00"));
String str = "<m:quit xmlns:m=\"AdminService\"/>";
ByteArrayInputStream input = new ByteArrayInputStream(str.getBytes());
return process(input);
}
public String undeployHandler(String handlerName) throws Exception {
- log(JavaUtils.getMessage("doQuit00"));
+ log.debug(JavaUtils.getMessage("doQuit00"));
String str = "<m:undeploy xmlns:m=\"AdminService\">" +
"<handler name=\"" + handlerName + "\"/>"+
"</m:undeploy>" ;
@@ -204,7 +171,7 @@
}
public String undeployService(String serviceName) throws Exception {
- log(JavaUtils.getMessage("doQuit00"));
+ log.debug(JavaUtils.getMessage("doQuit00"));
String str = "<m:undeploy xmlns:m=\"AdminService\">" +
"<service name=\"" + serviceName + "\"/>"+
"</m:undeploy>" ;
@@ -257,7 +224,7 @@
args = opts.getRemainingArgs();
if ( args == null ) {
- log(JavaUtils.getMessage("usage00","AdminClient xml-files | list"));
+ log.info(JavaUtils.getMessage("usage00","AdminClient xml-files | list"));
return null;
}
@@ -269,9 +236,9 @@
else if (args[i].equals("quit"))
sb.append( quit(opts) );
else if (args[i].equals("passwd")) {
- log(JavaUtils.getMessage("changePwd00"));
+ log.info(JavaUtils.getMessage("changePwd00"));
if (args[i + 1] == null) {
- log(JavaUtils.getMessage("needPwd00"));
+ log.error(JavaUtils.getMessage("needPwd00"));
return null;
}
String str = "<m:passwd xmlns:m=\"AdminService\">";
@@ -283,7 +250,7 @@
}
else {
if(args[i].indexOf(java.io.File.pathSeparatorChar)==-1){
- log( JavaUtils.getMessage("processFile00", args[i]) );
+ log.info( JavaUtils.getMessage("processFile00", args[i]) );
sb.append( process(opts, args[i] ) );
} else {
java.util.StringTokenizer tokenizer = null ;
@@ -291,7 +258,7 @@
java.io.File.pathSeparator);
while(tokenizer.hasMoreTokens()) {
String file = tokenizer.nextToken();
- log( JavaUtils.getMessage("processFile00", file) );
+ log.info( JavaUtils.getMessage("processFile00", file) );
sb.append( process(opts, file) );
if(tokenizer.hasMoreTokens())
sb.append("\n");
@@ -361,24 +328,24 @@
/**
* Creates in instance of <code>AdminClient</code> and
* invokes <code>process(args)</code>.
- * <p>Diagnostic output goes to <code>System.out</code>.</p>
+ * <p>Diagnostic output goes to <code>log.info</code>.</p>
* @param args Commands to process
*/
public static void main (String[] args)
{
try {
- AdminClient admin = new AdminClient(System.err);
+ AdminClient admin = new AdminClient();
+
String result = admin.process(args);
if (result != null)
- System.out.println(result);
+ log.info(result);
else
System.exit(1);
+ } catch (AxisFault af) {
+ log.error(af.dumpToString());
+ System.exit(1);
} catch (Exception e) {
- if (e instanceof AxisFault) {
- ((AxisFault)e).dump();
- } else {
- e.printStackTrace();
- }
+ log.error("Exception: ", e);
System.exit(1);
}
}
1.39 +2 -2 xml-axis/java/src/org/apache/axis/client/AxisClient.java
Index: AxisClient.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/client/AxisClient.java,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- AxisClient.java 19 Feb 2002 17:38:19 -0000 1.38
+++ AxisClient.java 22 Feb 2002 23:39:43 -0000 1.39
@@ -76,8 +76,8 @@
* @author Glen Daniels (gdaniels@allaire.com)
*/
public class AxisClient extends AxisEngine {
- static Log log =
- LogFactory.getLog(AxisClient.class.getName());
+ protected static Log log =
+ LogFactory.getLog(AxisClient.class.getName());
public AxisClient(EngineConfiguration config) {
super(config);
1.79 +5 -5 xml-axis/java/src/org/apache/axis/client/Call.java
Index: Call.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/client/Call.java,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- Call.java 22 Feb 2002 20:32:10 -0000 1.78
+++ Call.java 22 Feb 2002 23:39:43 -0000 1.79
@@ -134,8 +134,8 @@
*/
public class Call implements javax.xml.rpc.Call {
- static Log log =
- LogFactory.getLog(Call.class.getName());
+ protected static Log log =
+ LogFactory.getLog(Call.class.getName());
private boolean parmAndRetReq = true ;
private Service service = null ;
@@ -563,10 +563,10 @@
}
}
catch( Exception exp ) {
- exp.printStackTrace();
+ log.error("Exception: ", exp);
// do what?
// throw new AxisFault("Call.setTargetEndpointAddress",
- //"Malformed URL Exception: " + e.getMessage(), null, null);
+ //"Malformed URL Exception: " + e.getMessage(), null, null);
}
}
@@ -1620,7 +1620,7 @@
reqEnv.output(ctx);
writer.close();
} catch (Exception e) {
- e.printStackTrace(new PrintWriter(writer));
+ log.debug("Exception caught while printing request message", e);
} finally {
log.debug(writer.getBuffer().toString());
}
1.5 +9 -2 xml-axis/java/src/org/apache/axis/configuration/DefaultEngineConfigurationFactory.java
Index: DefaultEngineConfigurationFactory.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/configuration/DefaultEngineConfigurationFactory.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DefaultEngineConfigurationFactory.java 14 Feb 2002 17:12:01 -0000 1.4
+++ DefaultEngineConfigurationFactory.java 22 Feb 2002 23:39:43 -0000 1.5
@@ -59,6 +59,9 @@
import org.apache.axis.EngineConfiguration;
import org.apache.axis.Constants;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
import java.io.File;
import java.io.InputStream;
@@ -75,7 +78,11 @@
*
* @author Glyn Normington (glyn@apache.org)
*/
-public class DefaultEngineConfigurationFactory implements EngineConfigurationFactory {
+public class DefaultEngineConfigurationFactory implements EngineConfigurationFactory
+{
+ protected static Log log =
+ LogFactory.getLog(DefaultEngineConfigurationFactory.class.getName());
+
protected static final String CLIENT_CONFIG_FILE = "client-config.wsdd";
protected static final String SERVER_CONFIG_FILE = "server-config.wsdd";
@@ -98,7 +105,7 @@
forName(fClassName).newInstance();
} catch (Exception e) {
// Report diagnostics but use the default factory.
- e.printStackTrace(System.err);
+ log.error("Exception: ", e);
}
}
1.22 +2 -2 xml-axis/java/src/org/apache/axis/configuration/FileProvider.java
Index: FileProvider.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/configuration/FileProvider.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- FileProvider.java 20 Feb 2002 18:59:20 -0000 1.21
+++ FileProvider.java 22 Feb 2002 23:39:43 -0000 1.22
@@ -86,8 +86,8 @@
* @author Glen Daniels (gdaniels@macromedia.com)
*/
public class FileProvider implements EngineConfiguration {
- private static Log log =
- LogFactory.getLog(FileProvider.class.getName());
+ protected static Log log =
+ LogFactory.getLog(FileProvider.class.getName());
protected String sep = System.getProperty("file.separator");
1.27 +2 -2 xml-axis/java/src/org/apache/axis/deployment/wsdd/WSDDDeployment.java
Index: WSDDDeployment.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/deployment/wsdd/WSDDDeployment.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- WSDDDeployment.java 22 Feb 2002 15:37:47 -0000 1.26
+++ WSDDDeployment.java 22 Feb 2002 23:39:44 -0000 1.27
@@ -86,8 +86,8 @@
extends WSDDElement
implements WSDDTypeMappingContainer, EngineConfiguration
{
- static Log log =
- LogFactory.getLog(WSDDDeployment.class.getName());
+ protected static Log log =
+ LogFactory.getLog(WSDDDeployment.class.getName());
private HashMap handlers = new HashMap();
private HashMap services = new HashMap();
1.17 +8 -1 xml-axis/java/src/org/apache/axis/deployment/wsdd/WSDDDocument.java
Index: WSDDDocument.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/deployment/wsdd/WSDDDocument.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- WSDDDocument.java 28 Jan 2002 18:23:00 -0000 1.16
+++ WSDDDocument.java 22 Feb 2002 23:39:44 -0000 1.17
@@ -61,6 +61,10 @@
import org.apache.axis.encoding.*;
import org.apache.axis.utils.XMLUtils;
import org.apache.axis.Constants;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.xml.sax.InputSource;
@@ -75,6 +79,9 @@
*/
public class WSDDDocument
{
+ protected static Log log =
+ LogFactory.getLog(WSDDDocument.class.getName());
+
private Document doc;
private WSDDDeployment deployment;
@@ -134,7 +141,7 @@
try {
deployment.writeToContext(context);
} catch (Exception e) {
- e.printStackTrace();
+ log.error("Caught Exception while writing to context: ", e);
}
try {
writer.close();
1.10 +2 -2 xml-axis/java/src/org/apache/axis/encoding/DeserializationContextImpl.java
Index: DeserializationContextImpl.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/encoding/DeserializationContextImpl.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- DeserializationContextImpl.java 22 Feb 2002 16:15:55 -0000 1.9
+++ DeserializationContextImpl.java 22 Feb 2002 23:39:44 -0000 1.10
@@ -99,8 +99,8 @@
public class DeserializationContextImpl extends DefaultHandler implements DeserializationContext
{
- static Log log =
- LogFactory.getLog(DeserializationContextImpl.class.getName());
+ protected static Log log =
+ LogFactory.getLog(DeserializationContextImpl.class.getName());
private NSStack namespaces = new NSStack();
1.4 +1 -1 xml-axis/java/src/org/apache/axis/encoding/DeserializerImpl.java
Index: DeserializerImpl.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/encoding/DeserializerImpl.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DeserializerImpl.java 21 Feb 2002 19:35:37 -0000 1.3
+++ DeserializerImpl.java 22 Feb 2002 23:39:44 -0000 1.4
@@ -86,7 +86,7 @@
public class DeserializerImpl extends SOAPHandler implements Deserializer
{
- static Log log =
+ protected static Log log =
LogFactory.getLog(DeserializerImpl.class.getName());
protected Object value = null;
1.2 +13 -3 xml-axis/java/src/org/apache/axis/encoding/FieldTarget.java
Index: FieldTarget.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/encoding/FieldTarget.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FieldTarget.java 26 Jan 2002 02:40:33 -0000 1.1
+++ FieldTarget.java 22 Feb 2002 23:39:44 -0000 1.2
@@ -61,10 +61,18 @@
import java.lang.reflect.Method;
import java.util.Enumeration;
import java.util.Vector;
+
import org.apache.axis.encoding.Target;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
// Target is a field. The set method places the value in the field.
-public class FieldTarget implements Target {
+public class FieldTarget implements Target
+{
+ protected static Log log =
+ LogFactory.getLog(FieldTarget.class.getName());
+
private Object targetObject;
private Field targetField;
@@ -86,10 +94,12 @@
try {
targetField.set(targetObject, value);
} catch (IllegalAccessException accEx) {
- accEx.printStackTrace();
+ log.error("IllegalAccessException: transforming to SAXException: ",
+ accEx);
throw new SAXException(accEx);
} catch (IllegalArgumentException argEx) {
- argEx.printStackTrace();
+ log.error("IllegalArgumentException: transforming to SAXException: ",
+ argEx);
throw new SAXException(argEx);
}
}
1.2 +15 -4 xml-axis/java/src/org/apache/axis/encoding/MethodTarget.java
Index: MethodTarget.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/encoding/MethodTarget.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MethodTarget.java 26 Jan 2002 02:40:33 -0000 1.1
+++ MethodTarget.java 22 Feb 2002 23:39:44 -0000 1.2
@@ -59,10 +59,18 @@
import java.lang.reflect.Method;
import java.lang.reflect.InvocationTargetException;
+
import org.apache.axis.encoding.Target;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
// Target is set via a method call. The set method places the value in the field.
-public class MethodTarget implements Target {
+public class MethodTarget implements Target
+{
+ protected static Log log =
+ LogFactory.getLog(MethodTarget.class.getName());
+
private Object targetObject;
private Method targetMethod;
private static final Class [] objArg = new Class [] { Object.class };
@@ -79,13 +87,16 @@
try {
targetMethod.invoke(targetObject, new Object [] { value });
} catch (IllegalAccessException accEx) {
- accEx.printStackTrace();
+ log.error("IllegalAccessException: transforming to SAXException: ",
+ accEx);
throw new SAXException(accEx);
} catch (IllegalArgumentException argEx) {
- argEx.printStackTrace();
+ log.error("IllegalArgumentException: transforming to SAXException: ",
+ argEx);
throw new SAXException(argEx);
} catch (InvocationTargetException targetEx) {
- targetEx.printStackTrace();
+ log.error("InvocationTargetException: transforming to SAXException: ",
+ targetEx);
throw new SAXException(targetEx);
}
}
1.9 +2 -2 xml-axis/java/src/org/apache/axis/encoding/SerializationContextImpl.java
Index: SerializationContextImpl.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/encoding/SerializationContextImpl.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- SerializationContextImpl.java 21 Feb 2002 19:35:37 -0000 1.8
+++ SerializationContextImpl.java 22 Feb 2002 23:39:44 -0000 1.9
@@ -97,8 +97,8 @@
*/
public class SerializationContextImpl implements SerializationContext
{
- static Log log =
- LogFactory.getLog(SerializationContextImpl.class.getName());
+ protected static Log log =
+ LogFactory.getLog(SerializationContextImpl.class.getName());
private NSStack nsStack = new NSStack();
private boolean writingStartTag = false;
1.7 +2 -2 xml-axis/java/src/org/apache/axis/encoding/TypeMappingImpl.java
Index: TypeMappingImpl.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/encoding/TypeMappingImpl.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- TypeMappingImpl.java 22 Feb 2002 15:37:47 -0000 1.6
+++ TypeMappingImpl.java 22 Feb 2002 23:39:44 -0000 1.7
@@ -91,8 +91,8 @@
*/
public class TypeMappingImpl implements TypeMapping
{
- static Log log =
- LogFactory.getLog(TypeMappingImpl.class.getName());
+ protected static Log log =
+ LogFactory.getLog(TypeMappingImpl.class.getName());
public class Pair {
public Class javaType;
1.7 +4 -4 xml-axis/java/src/org/apache/axis/encoding/ser/ArrayDeserializer.java
Index: ArrayDeserializer.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/encoding/ser/ArrayDeserializer.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ArrayDeserializer.java 19 Feb 2002 17:38:20 -0000 1.6
+++ ArrayDeserializer.java 22 Feb 2002 23:39:44 -0000 1.7
@@ -98,10 +98,10 @@
* @author Rich Scheuerle (scheu@us.ibm.com)
*/
public class ArrayDeserializer extends DeserializerImpl
- implements Deserializer {
-
- static Log log =
- LogFactory.getLog(ArrayDeserializer.class.getName());
+ implements Deserializer
+{
+ protected static Log log =
+ LogFactory.getLog(ArrayDeserializer.class.getName());
public QName arrayType = null;
public int curIndex = 0;
1.12 +4 -4 xml-axis/java/src/org/apache/axis/encoding/ser/ArraySerializer.java
Index: ArraySerializer.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/encoding/ser/ArraySerializer.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ArraySerializer.java 19 Feb 2002 17:38:20 -0000 1.11
+++ ArraySerializer.java 22 Feb 2002 23:39:44 -0000 1.12
@@ -99,10 +99,10 @@
* Multi-reference stuff:
* @author Rich Scheuerle (scheu@us.ibm.com)
*/
-public class ArraySerializer implements Serializer {
-
- static Log log =
- LogFactory.getLog(ArraySerializer.class.getName());
+public class ArraySerializer implements Serializer
+{
+ protected static Log log =
+ LogFactory.getLog(ArraySerializer.class.getName());
/**
* Serialize an element that is an array.
1.6 +3 -2 xml-axis/java/src/org/apache/axis/encoding/ser/BeanDeserializer.java
Index: BeanDeserializer.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/encoding/ser/BeanDeserializer.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- BeanDeserializer.java 22 Feb 2002 23:11:34 -0000 1.5
+++ BeanDeserializer.java 22 Feb 2002 23:39:44 -0000 1.6
@@ -93,8 +93,9 @@
* @author Rich Scheuerle <sc...@us.ibm.com>
* @author Tom Jordahl <to...@macromedia.com>
*/
-public class BeanDeserializer extends DeserializerImpl implements Deserializer, Serializable {
- static Log log =
+public class BeanDeserializer extends DeserializerImpl implements Deserializer, Serializable
+{
+ protected static Log log =
LogFactory.getLog(BeanDeserializer.class.getName());
QName xmlType;
1.3 +4 -3 xml-axis/java/src/org/apache/axis/encoding/ser/BeanPropertyDescriptor.java
Index: BeanPropertyDescriptor.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/encoding/ser/BeanPropertyDescriptor.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- BeanPropertyDescriptor.java 19 Feb 2002 17:38:20 -0000 1.2
+++ BeanPropertyDescriptor.java 22 Feb 2002 23:39:44 -0000 1.3
@@ -70,9 +70,10 @@
* that the values in it can be modified.
* @author Rich Scheuerle <sc...@us.ibm.com>
**/
-class BeanPropertyDescriptor {
- static Log log =
- LogFactory.getLog(BeanPropertyDescriptor.class.getName());
+class BeanPropertyDescriptor
+{
+ protected static Log log =
+ LogFactory.getLog(BeanPropertyDescriptor.class.getName());
private String name;
private Method getter;
1.3 +2 -2 xml-axis/java/src/org/apache/axis/encoding/ser/BeanPropertyTarget.java
Index: BeanPropertyTarget.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/encoding/ser/BeanPropertyTarget.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- BeanPropertyTarget.java 19 Feb 2002 17:38:20 -0000 1.2
+++ BeanPropertyTarget.java 22 Feb 2002 23:39:44 -0000 1.3
@@ -67,8 +67,8 @@
* Class which knows how to update a bean property
*/
class BeanPropertyTarget implements Target {
- static Log log =
- LogFactory.getLog(BeanPropertyTarget.class.getName());
+ protected static Log log =
+ LogFactory.getLog(BeanPropertyTarget.class.getName());
private Object object;
private BeanPropertyDescriptor pd;
1.10 +7 -5 xml-axis/java/src/org/apache/axis/encoding/ser/BeanSerializer.java
Index: BeanSerializer.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/encoding/ser/BeanSerializer.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- BeanSerializer.java 22 Feb 2002 23:11:34 -0000 1.9
+++ BeanSerializer.java 22 Feb 2002 23:39:44 -0000 1.10
@@ -77,11 +77,13 @@
import org.apache.axis.wsdl.fromJava.FieldRep;
import org.apache.axis.wsdl.fromJava.Types;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
import java.io.Serializable;
import java.lang.reflect.Method;
import java.beans.IntrospectionException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+
import org.w3c.dom.Element;
import org.w3c.dom.Document;
@@ -103,8 +105,8 @@
*/
public class BeanSerializer implements Serializer, Serializable {
- static Log log =
- LogFactory.getLog(BeanSerializer.class.getName());
+ protected static Log log =
+ LogFactory.getLog(BeanSerializer.class.getName());
private static final Object[] noArgs = new Object[] {}; // For convenience
@@ -201,7 +203,7 @@
}
}
} catch (Exception e) {
- e.printStackTrace();
+ log.error("Exception: transforming to IOException: ", e);
throw new IOException(e.toString());
}
1.2 +8 -2 xml-axis/java/src/org/apache/axis/encoding/ser/ElementDeserializer.java
Index: ElementDeserializer.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/encoding/ser/ElementDeserializer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ElementDeserializer.java 26 Jan 2002 02:40:34 -0000 1.1
+++ ElementDeserializer.java 22 Feb 2002 23:39:44 -0000 1.2
@@ -75,13 +75,19 @@
import org.apache.axis.encoding.DeserializationContext;
import org.apache.axis.encoding.DeserializerImpl;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
/**
* Deserializer for DOM elements
*
* @author Glen Daniels (gdaniels@macromedia.com)
* Modified by @author Rich scheuerle <sc...@us.ibm.com>
*/
-public class ElementDeserializer extends DeserializerImpl implements Deserializer {
+public class ElementDeserializer extends DeserializerImpl implements Deserializer
+{
+ protected static Log log =
+ LogFactory.getLog(ElementDeserializer.class.getName());
public final void onEndElement(String namespace, String localName,
DeserializationContext context)
@@ -99,7 +105,7 @@
}
}
catch( Exception exp ) {
- exp.printStackTrace();
+ log.error("Exception: transforming to SAXException: ", exp);
throw new SAXException( exp );
}
}
1.2 +9 -2 xml-axis/java/src/org/apache/axis/encoding/ser/EnumSerializer.java
Index: EnumSerializer.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/encoding/ser/EnumSerializer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- EnumSerializer.java 26 Jan 2002 02:40:34 -0000 1.1
+++ EnumSerializer.java 22 Feb 2002 23:39:44 -0000 1.2
@@ -71,6 +71,9 @@
import org.apache.axis.encoding.DeserializerImpl;
import org.apache.axis.InternalException;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
import java.io.Serializable;
import java.lang.reflect.Method;
import java.beans.IntrospectionException;
@@ -82,9 +85,13 @@
* @author Rich Scheuerle <sc...@us.ibm.com>
* @author Sam Ruby <ru...@us.ibm.com>
*/
-public class EnumSerializer extends SimpleSerializer implements Serializer {
+public class EnumSerializer extends SimpleSerializer implements Serializer
+{
+ protected static Log log =
+ LogFactory.getLog(EnumSerializer.class.getName());
private java.lang.reflect.Method toStringMethod = null;
+
public EnumSerializer(Class javaType, QName xmlType) {
super(javaType, xmlType);
}
@@ -107,7 +114,7 @@
String propValue = (String) toStringMethod.invoke(value, null);
context.writeString(propValue);
} catch (Exception e) {
- e.printStackTrace();
+ log.error("Exception: transforming to IOException: ", e);
throw new IOException(e.toString());
}
1.3 +2 -2 xml-axis/java/src/org/apache/axis/encoding/ser/JAFDataHandlerDeserializer.java
Index: JAFDataHandlerDeserializer.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/encoding/ser/JAFDataHandlerDeserializer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JAFDataHandlerDeserializer.java 19 Feb 2002 17:38:20 -0000 1.2
+++ JAFDataHandlerDeserializer.java 22 Feb 2002 23:39:44 -0000 1.3
@@ -86,8 +86,8 @@
*/
public class JAFDataHandlerDeserializer extends DeserializerImpl implements Deserializer {
- static Log log =
- LogFactory.getLog(JAFDataHandlerDeserializer.class.getName());
+ protected static Log log =
+ LogFactory.getLog(JAFDataHandlerDeserializer.class.getName());
public void startElement(String namespace, String localName,
String qName, Attributes attributes,
1.4 +2 -2 xml-axis/java/src/org/apache/axis/encoding/ser/JAFDataHandlerSerializer.java
Index: JAFDataHandlerSerializer.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/encoding/ser/JAFDataHandlerSerializer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JAFDataHandlerSerializer.java 19 Feb 2002 17:38:20 -0000 1.3
+++ JAFDataHandlerSerializer.java 22 Feb 2002 23:39:44 -0000 1.4
@@ -96,8 +96,8 @@
*/
public class JAFDataHandlerSerializer implements Serializer {
- static Log log =
- LogFactory.getLog(JAFDataHandlerSerializer.class.getName());
+ protected static Log log =
+ LogFactory.getLog(JAFDataHandlerSerializer.class.getName());
/**
* Serialize a JAF DataHandler quantity.
1.3 +2 -2 xml-axis/java/src/org/apache/axis/encoding/ser/MapDeserializer.java
Index: MapDeserializer.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/encoding/ser/MapDeserializer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MapDeserializer.java 19 Feb 2002 17:38:20 -0000 1.2
+++ MapDeserializer.java 22 Feb 2002 23:39:44 -0000 1.3
@@ -90,8 +90,8 @@
*/
public class MapDeserializer extends DeserializerImpl implements Deserializer {
- static Log log =
- LogFactory.getLog(MapDeserializer.class.getName());
+ protected static Log log =
+ LogFactory.getLog(MapDeserializer.class.getName());
// Fixed objects to act as hints to the set() callback
public static final Object KEYHINT = new Object();
1.5 +4 -4 xml-axis/java/src/org/apache/axis/encoding/ser/MapSerializer.java
Index: MapSerializer.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/encoding/ser/MapSerializer.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- MapSerializer.java 19 Feb 2002 17:38:20 -0000 1.4
+++ MapSerializer.java 22 Feb 2002 23:39:44 -0000 1.5
@@ -92,10 +92,10 @@
* Modified by @author Rich Scheuerle (scheu@us.ibm.com)
*/
-public class MapSerializer implements Serializer {
-
- static Log log =
- LogFactory.getLog(MapSerializer.class.getName());
+public class MapSerializer implements Serializer
+{
+ protected static Log log =
+ LogFactory.getLog(MapSerializer.class.getName());
// QNames we deal with
private static final QName QNAME_KEY = new QName("","key");
1.3 +4 -4 xml-axis/java/src/org/apache/axis/encoding/ser/VectorDeserializer.java
Index: VectorDeserializer.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/encoding/ser/VectorDeserializer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- VectorDeserializer.java 19 Feb 2002 17:38:20 -0000 1.2
+++ VectorDeserializer.java 22 Feb 2002 23:39:44 -0000 1.3
@@ -85,10 +85,10 @@
* @author Carsten Ziegeler (cziegeler@apache.org)
* Modified by @author Rich scheuerle <sc...@us.ibm.com>
*/
-public class VectorDeserializer extends DeserializerImpl implements Deserializer {
-
- static Log log =
- LogFactory.getLog(VectorDeserializer.class.getName());
+public class VectorDeserializer extends DeserializerImpl implements Deserializer
+{
+ protected static Log log =
+ LogFactory.getLog(VectorDeserializer.class.getName());
public int curIndex = 0;
1.25 +2 -2 xml-axis/java/src/org/apache/axis/handlers/BasicHandler.java
Index: BasicHandler.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/handlers/BasicHandler.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- BasicHandler.java 19 Feb 2002 17:38:20 -0000 1.24
+++ BasicHandler.java 22 Feb 2002 23:39:45 -0000 1.25
@@ -78,8 +78,8 @@
* @author Doug Davis (dug@us.ibm.com
*/
public abstract class BasicHandler implements Handler {
- static Log log =
- LogFactory.getLog(BasicHandler.class.getName());
+ protected static Log log =
+ LogFactory.getLog(BasicHandler.class.getName());
protected Hashtable options ;
protected String name;
1.31 +2 -2 xml-axis/java/src/org/apache/axis/handlers/DebugHandler.java
Index: DebugHandler.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/handlers/DebugHandler.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- DebugHandler.java 19 Feb 2002 17:38:20 -0000 1.30
+++ DebugHandler.java 22 Feb 2002 23:39:45 -0000 1.31
@@ -72,8 +72,8 @@
* @author Doug Davis (dug@us.ibm.com)
*/
public class DebugHandler extends BasicHandler {
- static Log log =
- LogFactory.getLog(DebugHandler.class.getName());
+ protected static Log log =
+ LogFactory.getLog(DebugHandler.class.getName());
public void invoke(MessageContext msgContext) throws AxisFault {
log.debug(JavaUtils.getMessage("enter00", "DebugHandler::invoke") );
1.29 +2 -2 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.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- EchoHandler.java 19 Feb 2002 17:38:20 -0000 1.28
+++ EchoHandler.java 22 Feb 2002 23:39:45 -0000 1.29
@@ -72,8 +72,8 @@
* @author Doug Davis (dug@us.ibm.com)
*/
public class EchoHandler extends BasicHandler {
- static Log log =
- LogFactory.getLog(EchoHandler.class.getName());
+ protected static Log log =
+ LogFactory.getLog(EchoHandler.class.getName());
public void invoke(MessageContext msgContext) throws AxisFault {
log.debug(JavaUtils.getMessage("enter00", "EchoHandler::invoke") );
1.18 +2 -2 xml-axis/java/src/org/apache/axis/handlers/ErrorHandler.java
Index: ErrorHandler.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/handlers/ErrorHandler.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ErrorHandler.java 19 Feb 2002 17:38:20 -0000 1.17
+++ ErrorHandler.java 22 Feb 2002 23:39:45 -0000 1.18
@@ -69,8 +69,8 @@
* @author Glen Daniels (gdaniels@allaire.com)
*/
public class ErrorHandler extends BasicHandler {
- static Log log =
- LogFactory.getLog(ErrorHandler.class.getName());
+ protected static Log log =
+ LogFactory.getLog(ErrorHandler.class.getName());
public void invoke(MessageContext msgContext) throws AxisFault {
log.debug(JavaUtils.getMessage("enter00", "ErrorHandler::invoke") );
1.15 +2 -2 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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- JWSHandler.java 20 Feb 2002 18:59:21 -0000 1.14
+++ JWSHandler.java 22 Feb 2002 23:39:45 -0000 1.15
@@ -73,8 +73,8 @@
*/
public class JWSHandler extends BasicHandler
{
- static Log log =
- LogFactory.getLog(JWSHandler.class.getName());
+ protected static Log log =
+ LogFactory.getLog(JWSHandler.class.getName());
// Keep the processor Handler around so we can make it the service
// Handler for this request if appropriate.
1.40 +2 -2 xml-axis/java/src/org/apache/axis/handlers/JWSProcessor.java
Index: JWSProcessor.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/handlers/JWSProcessor.java,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- JWSProcessor.java 22 Feb 2002 20:32:10 -0000 1.39
+++ JWSProcessor.java 22 Feb 2002 23:39:45 -0000 1.40
@@ -97,8 +97,8 @@
*/
public class JWSProcessor extends BasicHandler
{
- static Log log =
- LogFactory.getLog(JWSProcessor.class.getName());
+ protected static Log log =
+ LogFactory.getLog(JWSProcessor.class.getName());
public void invoke(MessageContext msgContext) throws AxisFault
1.25 +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.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- LogHandler.java 19 Feb 2002 17:38:20 -0000 1.24
+++ LogHandler.java 22 Feb 2002 23:39:45 -0000 1.25
@@ -72,8 +72,8 @@
* @author Doug Davis (dug@us.ibm.com)
*/
public class LogHandler extends BasicHandler {
- static Log log =
- LogFactory.getLog(LogHandler.class.getName());
+ protected static Log log =
+ LogFactory.getLog(LogHandler.class.getName());
long start = 0;
1.11 +2 -2 xml-axis/java/src/org/apache/axis/handlers/LogMessage.java
Index: LogMessage.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/handlers/LogMessage.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- LogMessage.java 19 Feb 2002 17:38:20 -0000 1.10
+++ LogMessage.java 22 Feb 2002 23:39:45 -0000 1.11
@@ -68,8 +68,8 @@
*/
public class LogMessage extends BasicHandler
{
- static Log log =
- LogFactory.getLog(LogMessage.class.getName());
+ protected static Log log =
+ LogFactory.getLog(LogMessage.class.getName());
public void invoke(MessageContext context)
{
1.7 +1 -1 xml-axis/java/src/org/apache/axis/handlers/MD5AttachHandler.java
Index: MD5AttachHandler.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/handlers/MD5AttachHandler.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- MD5AttachHandler.java 22 Feb 2002 15:37:47 -0000 1.6
+++ MD5AttachHandler.java 22 Feb 2002 23:39:45 -0000 1.7
@@ -73,7 +73,7 @@
* @author Rick Rineholt
*/
public class MD5AttachHandler extends org.apache.axis.handlers.BasicHandler {
- static Log log =
+ protected static Log log =
LogFactory.getLog(MD5AttachHandler.class.getName());
public void invoke(MessageContext msgContext) throws AxisFault {
1.27 +2 -2 xml-axis/java/src/org/apache/axis/handlers/SimpleAuthenticationHandler.java
Index: SimpleAuthenticationHandler.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/handlers/SimpleAuthenticationHandler.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- SimpleAuthenticationHandler.java 19 Feb 2002 17:38:20 -0000 1.26
+++ SimpleAuthenticationHandler.java 22 Feb 2002 23:39:45 -0000 1.27
@@ -78,8 +78,8 @@
* @author Sam Ruby (rubys@us.ibm.com)
*/
public class SimpleAuthenticationHandler extends BasicHandler {
- static Log log =
- LogFactory.getLog(SimpleAuthenticationHandler.class.getName());
+ protected static Log log =
+ LogFactory.getLog(SimpleAuthenticationHandler.class.getName());
/**
* Authenticate the user and password from the msgContext
1.28 +2 -2 xml-axis/java/src/org/apache/axis/handlers/SimpleAuthorizationHandler.java
Index: SimpleAuthorizationHandler.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/handlers/SimpleAuthorizationHandler.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- SimpleAuthorizationHandler.java 22 Feb 2002 20:32:10 -0000 1.27
+++ SimpleAuthorizationHandler.java 22 Feb 2002 23:39:45 -0000 1.28
@@ -81,8 +81,8 @@
* @author Sam Ruby (rubys@us.ibm.com)
*/
public class SimpleAuthorizationHandler extends BasicHandler {
- static Log log =
- LogFactory.getLog(SimpleAuthorizationHandler.class.getName());
+ protected static Log log =
+ LogFactory.getLog(SimpleAuthorizationHandler.class.getName());
/**
* Authorize the user and targetService from the msgContext
1.14 +2 -2 xml-axis/java/src/org/apache/axis/handlers/SimpleSessionHandler.java
Index: SimpleSessionHandler.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/handlers/SimpleSessionHandler.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- SimpleSessionHandler.java 19 Feb 2002 17:38:20 -0000 1.13
+++ SimpleSessionHandler.java 22 Feb 2002 23:39:45 -0000 1.14
@@ -113,8 +113,8 @@
*/
public class SimpleSessionHandler extends BasicHandler
{
- static Log log =
- LogFactory.getLog(SimpleSessionHandler.class.getName());
+ protected static Log log =
+ LogFactory.getLog(SimpleSessionHandler.class.getName());
public static final String SESSION_ID = "SimpleSession.id";
public static final String SESSION_NS = "http://xml.apache.org/axis/session";
1.17 +2 -2 xml-axis/java/src/org/apache/axis/handlers/http/HTTPActionHandler.java
Index: HTTPActionHandler.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/handlers/http/HTTPActionHandler.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- HTTPActionHandler.java 20 Feb 2002 18:59:21 -0000 1.16
+++ HTTPActionHandler.java 22 Feb 2002 23:39:45 -0000 1.17
@@ -75,8 +75,8 @@
*/
public class HTTPActionHandler extends BasicHandler
{
- static Log log =
- LogFactory.getLog(HTTPActionHandler.class.getName());
+ protected static Log log =
+ LogFactory.getLog(HTTPActionHandler.class.getName());
public void invoke(MessageContext msgContext) throws AxisFault
{
1.13 +2 -2 xml-axis/java/src/org/apache/axis/handlers/http/HTTPAuthHandler.java
Index: HTTPAuthHandler.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/handlers/http/HTTPAuthHandler.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- HTTPAuthHandler.java 19 Feb 2002 17:38:20 -0000 1.12
+++ HTTPAuthHandler.java 22 Feb 2002 23:39:45 -0000 1.13
@@ -73,8 +73,8 @@
*/
public class HTTPAuthHandler extends BasicHandler
{
- static Log log =
- LogFactory.getLog(HTTPAuthHandler.class.getName());
+ protected static Log log =
+ LogFactory.getLog(HTTPAuthHandler.class.getName());
public void invoke(MessageContext msgContext) throws AxisFault
{
1.16 +2 -2 xml-axis/java/src/org/apache/axis/handlers/http/URLMapper.java
Index: URLMapper.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/handlers/http/URLMapper.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- URLMapper.java 20 Feb 2002 18:59:21 -0000 1.15
+++ URLMapper.java 22 Feb 2002 23:39:45 -0000 1.16
@@ -71,8 +71,8 @@
*/
public class URLMapper extends BasicHandler
{
- static Log log =
- LogFactory.getLog(URLMapper.class.getName());
+ protected static Log log =
+ LogFactory.getLog(URLMapper.class.getName());
public void invoke(MessageContext msgContext) throws AxisFault
{
1.47 +4 -4 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.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- SOAPService.java 20 Feb 2002 18:59:21 -0000 1.46
+++ SOAPService.java 22 Feb 2002 23:39:45 -0000 1.47
@@ -93,8 +93,8 @@
*/
public class SOAPService extends SimpleTargetedChain
{
- static Log log =
- LogFactory.getLog(SOAPService.class.getName());
+ protected static Log log =
+ LogFactory.getLog(SOAPService.class.getName());
public static final int STYLE_RPC = 0;
public static final int STYLE_DOCUMENT = 1;
@@ -125,8 +125,8 @@
public void invoke(MessageContext msgContext) throws AxisFault {
// Do SOAP semantics here
- if (log.isDebugEnabled()) {
- log.debug( JavaUtils.getMessage("semanticCheck00"));
+ if (this.log.isDebugEnabled()) {
+ this.log.debug( JavaUtils.getMessage("semanticCheck00"));
}
// This needs to be set to the merged list of service-specific and
1.19 +2 -2 xml-axis/java/src/org/apache/axis/message/BodyBuilder.java
Index: BodyBuilder.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/message/BodyBuilder.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- BodyBuilder.java 22 Feb 2002 16:15:55 -0000 1.18
+++ BodyBuilder.java 22 Feb 2002 23:39:45 -0000 1.19
@@ -75,8 +75,8 @@
public class BodyBuilder extends SOAPHandler
{
- static Log log =
- LogFactory.getLog(BodyBuilder.class.getName());
+ protected static Log log =
+ LogFactory.getLog(BodyBuilder.class.getName());
private SOAPBodyElement element;
boolean gotRPCElement = false;
1.5 +7 -1 xml-axis/java/src/org/apache/axis/message/InputStreamBody.java
Index: InputStreamBody.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/message/InputStreamBody.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- InputStreamBody.java 30 Oct 2001 14:19:29 -0000 1.4
+++ InputStreamBody.java 22 Feb 2002 23:39:45 -0000 1.5
@@ -57,11 +57,17 @@
import org.apache.axis.encoding.SerializationContext;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
import java.io.IOException;
import java.io.InputStream;
public class InputStreamBody extends SOAPBodyElement
{
+ protected static Log log =
+ LogFactory.getLog(InputStreamBody.class.getName());
+
protected InputStream inputStream;
public InputStreamBody(InputStream inputStream)
@@ -81,7 +87,7 @@
throw ex;
}
catch( Exception e ) {
- e.printStackTrace( System.err );
+ log.error("outputImpl: caught Exception: ", e);
}
}
}
1.79 +6 -4 xml-axis/java/src/org/apache/axis/message/MessageElement.java
Index: MessageElement.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/message/MessageElement.java,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- MessageElement.java 22 Feb 2002 20:03:03 -0000 1.78
+++ MessageElement.java 22 Feb 2002 23:39:45 -0000 1.79
@@ -64,8 +64,10 @@
import org.apache.axis.utils.Mapping;
import org.apache.axis.utils.JavaUtils;
import org.apache.axis.utils.XMLUtils;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.xml.sax.Attributes;
@@ -83,8 +85,8 @@
public class MessageElement
{
- static Log log =
- LogFactory.getLog(MessageElement.class.getName());
+ protected static Log log =
+ LogFactory.getLog(MessageElement.class.getName());
protected String name ;
protected String prefix ;
@@ -567,8 +569,8 @@
return getAsString();
}
catch( Exception exp ) {
- exp.printStackTrace();
- return( null );
+ log.error("Exception: ", exp);
+ return null;
}
}
1.28 +2 -2 xml-axis/java/src/org/apache/axis/message/RPCHandler.java
Index: RPCHandler.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/message/RPCHandler.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- RPCHandler.java 20 Feb 2002 18:59:21 -0000 1.27
+++ RPCHandler.java 22 Feb 2002 23:39:46 -0000 1.28
@@ -84,8 +84,8 @@
public class RPCHandler extends SOAPHandler
{
- static Log log =
- LogFactory.getLog(RPCHandler.class.getName());
+ protected static Log log =
+ LogFactory.getLog(RPCHandler.class.getName());
private RPCElement call;
private RPCParam currentParam;
1.32 +1 -1 xml-axis/java/src/org/apache/axis/message/RPCParam.java
Index: RPCParam.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/message/RPCParam.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- RPCParam.java 22 Feb 2002 15:37:47 -0000 1.31
+++ RPCParam.java 22 Feb 2002 23:39:46 -0000 1.32
@@ -71,7 +71,7 @@
*/
public class RPCParam
{
- static Log log =
+ protected static Log log =
LogFactory.getLog(RPCParam.class.getName());
// Who's your daddy?
1.13 +2 -2 xml-axis/java/src/org/apache/axis/message/SAXOutputter.java
Index: SAXOutputter.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/message/SAXOutputter.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- SAXOutputter.java 19 Feb 2002 17:38:21 -0000 1.12
+++ SAXOutputter.java 22 Feb 2002 23:39:46 -0000 1.13
@@ -66,8 +66,8 @@
public class SAXOutputter extends DefaultHandler
{
- static Log log =
- LogFactory.getLog(SAXOutputter.class.getName());
+ protected static Log log =
+ LogFactory.getLog(SAXOutputter.class.getName());
SerializationContext context;
1.57 +5 -3 xml-axis/java/src/org/apache/axis/message/SOAPEnvelope.java
Index: SOAPEnvelope.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/message/SOAPEnvelope.java,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- SOAPEnvelope.java 22 Feb 2002 16:15:55 -0000 1.56
+++ SOAPEnvelope.java 22 Feb 2002 23:39:46 -0000 1.57
@@ -65,8 +65,10 @@
import org.apache.axis.encoding.SerializationContext;
import org.apache.axis.utils.JavaUtils;
import org.apache.axis.utils.Mapping;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+
import org.xml.sax.InputSource;
import org.xml.sax.helpers.AttributesImpl;
@@ -79,8 +81,8 @@
public class SOAPEnvelope extends MessageElement
{
- static Log log =
- LogFactory.getLog(SOAPEnvelope.class.getName());
+ protected static Log log =
+ LogFactory.getLog(SOAPEnvelope.class.getName());
public Vector headers = new Vector();
public Vector bodyElements = new Vector();
@@ -127,7 +129,7 @@
dser.parse();
}
catch( Exception e ) {
- e.printStackTrace();
+ log.error("Exception: transforming to RuntimeException: ", e);
throw new RuntimeException( e.toString() );
}
}
1.8 +2 -2 xml-axis/java/src/org/apache/axis/message/SymbolTable.java
Index: SymbolTable.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/message/SymbolTable.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- SymbolTable.java 22 Feb 2002 15:37:47 -0000 1.7
+++ SymbolTable.java 22 Feb 2002 23:39:46 -0000 1.8
@@ -68,8 +68,8 @@
*/
public class SymbolTable
{
- static Log log =
- LogFactory.getLog(SymbolTable.class.getName());
+ protected static Log log =
+ LogFactory.getLog(SymbolTable.class.getName());
protected static final int TABLE_SIZE = 101;
protected Entry[] fBuckets = new Entry[TABLE_SIZE];
1.40 +4 -3 xml-axis/java/src/org/apache/axis/providers/java/JavaProvider.java
Index: JavaProvider.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/providers/java/JavaProvider.java,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- JavaProvider.java 20 Feb 2002 18:59:21 -0000 1.39
+++ JavaProvider.java 22 Feb 2002 23:39:46 -0000 1.40
@@ -86,9 +86,10 @@
* @author Doug Davis (dug@us.ibm.com)
* @author Carl Woolf (cwoolf@macromedia.com)
*/
-public abstract class JavaProvider extends BasicProvider {
- static Log log =
- LogFactory.getLog(JavaProvider.class.getName());
+public abstract class JavaProvider extends BasicProvider
+{
+ protected static Log log =
+ LogFactory.getLog(JavaProvider.class.getName());
// from the original stubbed-out JavaProvider...
1.41 +4 -3 xml-axis/java/src/org/apache/axis/providers/java/RPCProvider.java
Index: RPCProvider.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/providers/java/RPCProvider.java,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- RPCProvider.java 22 Feb 2002 16:15:55 -0000 1.40
+++ RPCProvider.java 22 Feb 2002 23:39:46 -0000 1.41
@@ -78,9 +78,10 @@
*
* @author Doug Davis (dug@us.ibm.com)
*/
-public class RPCProvider extends JavaProvider {
- static Log log =
- LogFactory.getLog(RPCProvider.class.getName());
+public class RPCProvider extends JavaProvider
+{
+ protected static Log log =
+ LogFactory.getLog(RPCProvider.class.getName());
public void processMessage (MessageContext msgContext,
String serviceName,
1.8 +2 -2 xml-axis/java/src/org/apache/axis/security/servlet/ServletSecurityProvider.java
Index: ServletSecurityProvider.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/security/servlet/ServletSecurityProvider.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ServletSecurityProvider.java 19 Feb 2002 17:38:21 -0000 1.7
+++ ServletSecurityProvider.java 22 Feb 2002 23:39:46 -0000 1.8
@@ -79,8 +79,8 @@
* @author Glen Daniels (gdaniels@macromedia.com)
*/
public class ServletSecurityProvider implements SecurityProvider {
- static Log log =
- LogFactory.getLog(ServletSecurityProvider.class.getName());
+ protected static Log log =
+ LogFactory.getLog(ServletSecurityProvider.class.getName());
static HashMap users = null;
1.14 +2 -2 xml-axis/java/src/org/apache/axis/security/simple/SimpleSecurityProvider.java
Index: SimpleSecurityProvider.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/security/simple/SimpleSecurityProvider.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- SimpleSecurityProvider.java 19 Feb 2002 17:38:21 -0000 1.13
+++ SimpleSecurityProvider.java 22 Feb 2002 23:39:46 -0000 1.14
@@ -75,8 +75,8 @@
* @author Glen Daniels (gdaniels@macromedia.com)
*/
public class SimpleSecurityProvider implements SecurityProvider {
- static Log log =
- LogFactory.getLog(SimpleSecurityProvider.class.getName());
+ protected static Log log =
+ LogFactory.getLog(SimpleSecurityProvider.class.getName());
HashMap users = null;
HashMap perms = null;
1.62 +3 -3 xml-axis/java/src/org/apache/axis/server/AxisServer.java
Index: AxisServer.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/server/AxisServer.java,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- AxisServer.java 22 Feb 2002 20:32:10 -0000 1.61
+++ AxisServer.java 22 Feb 2002 23:39:46 -0000 1.62
@@ -76,8 +76,8 @@
*/
public class AxisServer extends AxisEngine
{
- static Log log =
- LogFactory.getLog(AxisServer.class.getName());
+ protected static Log log =
+ LogFactory.getLog(AxisServer.class.getName());
private static AxisServerFactory factory = null;
@@ -93,7 +93,7 @@
} catch (Exception e) {
// If something goes wrong here, should we just fall
// through and use the default one?
- e.printStackTrace(System.err);
+ log.error("Exception: ", e);
}
}
1.12 +2 -1 xml-axis/java/src/org/apache/axis/server/Transport.java
Index: Transport.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/server/Transport.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Transport.java 19 Feb 2002 17:38:21 -0000 1.11
+++ Transport.java 22 Feb 2002 23:39:46 -0000 1.12
@@ -70,6 +70,7 @@
*/
public class Transport extends SimpleTargetedChain
{
- static Log log = LogFactory.getLog(Transport.class.getName());
+ protected static Log log =
+ LogFactory.getLog(Transport.class.getName());
}
1.84 +7 -6 xml-axis/java/src/org/apache/axis/transport/http/AxisServlet.java
Index: AxisServlet.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/transport/http/AxisServlet.java,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- AxisServlet.java 21 Feb 2002 20:50:27 -0000 1.83
+++ AxisServlet.java 22 Feb 2002 23:39:46 -0000 1.84
@@ -94,14 +94,16 @@
*
* @author Doug Davis (dug@us.ibm.com)
*/
-public class AxisServlet extends HttpServlet {
+public class AxisServlet extends HttpServlet
+{
+ protected static Log log =
+ LogFactory.getLog(AxisServlet.class.getName());
+
// These have default values.
private String transportName = "http";
private AxisEngine engine = null;
private ServletSecurityProvider securityProvider = null;
- static Log log =
- LogFactory.getLog(AxisServlet.class.getName());
/**
* Should we enable the "?list" functionality on GETs? (off by
* default because deployment information is a potential security
@@ -208,7 +210,7 @@
JavaUtils.getMessage("error00") + "</h2>");
writer.println("<p>" +
JavaUtils.getMessage("somethingWrong00") + "</p>");
- writer.println("<pre>" + fault.dumpToString() + " </pre>");
+ writer.println("<pre>" + fault.toString() + " </pre>");
return;
}
}
@@ -363,8 +365,7 @@
JavaUtils.getMessage("error00") + "</h2>");
writer.println("<p>" +
JavaUtils.getMessage("somethingWrong00") + "</p>");
- writer.println("<pre>" + fault.dumpToString() +
- " </pre>");
+ writer.println("<pre>" + fault.toString() + " </pre>");
} catch (Exception e) {
res.setContentType("text/html");
writer.println("<h2>" +
1.50 +2 -2 xml-axis/java/src/org/apache/axis/transport/http/HTTPSender.java
Index: HTTPSender.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/transport/http/HTTPSender.java,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- HTTPSender.java 19 Feb 2002 17:38:22 -0000 1.49
+++ HTTPSender.java 22 Feb 2002 23:39:46 -0000 1.50
@@ -86,8 +86,8 @@
* @author Doug Davis (dug@us.ibm.com)
*/
public class HTTPSender extends BasicHandler {
- static Log log =
- LogFactory.getLog(HTTPSender.class.getName());
+ protected static Log log =
+ LogFactory.getLog(HTTPSender.class.getName());
public void invoke(MessageContext msgContext) throws AxisFault {
if (log.isDebugEnabled()) {
1.51 +5 -5 xml-axis/java/src/org/apache/axis/transport/http/SimpleAxisServer.java
Index: SimpleAxisServer.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/transport/http/SimpleAxisServer.java,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- SimpleAxisServer.java 22 Feb 2002 20:32:11 -0000 1.50
+++ SimpleAxisServer.java 22 Feb 2002 23:39:46 -0000 1.51
@@ -93,8 +93,8 @@
* @author Rob Jellinghaus (robj@unrealities.com)
*/
public class SimpleAxisServer implements Runnable {
- static Log log =
- LogFactory.getLog(SimpleAxisServer.class.getName());
+ protected static Log log =
+ LogFactory.getLog(SimpleAxisServer.class.getName());
// session state.
@@ -458,7 +458,7 @@
} catch (InterruptedIOException iie) {
break;
} catch (Exception e) {
- e.printStackTrace();
+ log.error("Exception: ", e);
} finally {
try {
if (socket!=null) socket.close();
@@ -799,7 +799,7 @@
try {
opts = new Options(args);
} catch (MalformedURLException e) {
- e.printStackTrace();
+ log.error("MalformedURLException", e);
return;
}
@@ -809,7 +809,7 @@
sas.setServerSocket(ss);
sas.run();
} catch (Exception e) {
- e.printStackTrace();
+ log.error("Exception", e);
return;
}
1.13 +2 -2 xml-axis/java/src/org/apache/axis/transport/local/LocalResponder.java
Index: LocalResponder.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/transport/local/LocalResponder.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- LocalResponder.java 19 Feb 2002 17:38:22 -0000 1.12
+++ LocalResponder.java 22 Feb 2002 23:39:46 -0000 1.13
@@ -69,8 +69,8 @@
* @author Glen Daniels (gdaniels@macromedia.com)
*/
public class LocalResponder extends BasicHandler {
- static Log log =
- LogFactory.getLog(LocalResponder.class.getName());
+ protected static Log log =
+ LogFactory.getLog(LocalResponder.class.getName());
public void invoke(MessageContext msgContext) throws AxisFault {
if (log.isDebugEnabled()) {
1.28 +2 -2 xml-axis/java/src/org/apache/axis/transport/local/LocalSender.java
Index: LocalSender.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/transport/local/LocalSender.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- LocalSender.java 19 Feb 2002 17:38:22 -0000 1.27
+++ LocalSender.java 22 Feb 2002 23:39:47 -0000 1.28
@@ -76,8 +76,8 @@
* @author Sam Ruby <ru...@us.ibm.com>
*/
public class LocalSender extends BasicHandler {
- static Log log =
- LogFactory.getLog(LocalSender.class.getName());
+ protected static Log log =
+ LogFactory.getLog(LocalSender.class.getName());
private volatile AxisServer server;
1.104 +7 -9 xml-axis/java/src/org/apache/axis/utils/Admin.java
Index: Admin.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/utils/Admin.java,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- Admin.java 22 Feb 2002 20:32:11 -0000 1.103
+++ Admin.java 22 Feb 2002 23:39:47 -0000 1.104
@@ -98,8 +98,8 @@
*/
public class Admin
{
- static Log log =
- LogFactory.getLog(Admin.class.getName());
+ protected static Log log =
+ LogFactory.getLog(Admin.class.getName());
/**
* Fill in options for a given handler.
@@ -391,7 +391,7 @@
root.appendChild( doc.createTextNode( JavaUtils.getMessage("done00") ) );
}
catch( Exception e ) {
- e.printStackTrace();
+ log.error(JavaUtils.getMessage("exception00"), e);
throw AxisFault.makeFault(e);
}
return doc;
@@ -798,14 +798,12 @@
admin.process(msgContext, doc.getDocumentElement());
}
}
- catch( AxisFault e ) {
- e.dump();
- //System.exit(1);
- throw e;
+ catch( AxisFault af ) {
+ log.error( af.dumpToString() );
+ throw af;
}
catch( Exception e ) {
- log.error( JavaUtils.getMessage("errorProcess00", args[i]) );
- e.printStackTrace( System.err );
+ log.error( JavaUtils.getMessage("errorProcess00", args[i]), e );
//System.exit( 1 );
throw e;
}
1.32 +2 -2 xml-axis/java/src/org/apache/axis/utils/JavaUtils.java
Index: JavaUtils.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/utils/JavaUtils.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- JavaUtils.java 19 Feb 2002 17:38:22 -0000 1.31
+++ JavaUtils.java 22 Feb 2002 23:39:47 -0000 1.32
@@ -79,8 +79,8 @@
*/
public class JavaUtils
{
- static Log log =
- LogFactory.getLog(JavaUtils.class.getName());
+ protected static Log log =
+ LogFactory.getLog(JavaUtils.class.getName());
/**
* It the argument to the convert(...) method implements
1.19 +10 -13 xml-axis/java/src/org/apache/axis/utils/NSStack.java
Index: NSStack.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/utils/NSStack.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- NSStack.java 22 Feb 2002 20:32:11 -0000 1.18
+++ NSStack.java 22 Feb 2002 23:39:47 -0000 1.19
@@ -66,8 +66,8 @@
* @author Glen Daniels (gdaniels@macromedia.com)
*/
public class NSStack {
- static Log log =
- LogFactory.getLog(NSStack.class.getName());
+ protected static Log log =
+ LogFactory.getLog(NSStack.class.getName());
private static final ArrayList EMPTY = new ArrayList();
@@ -206,9 +206,9 @@
return parent.getNamespaceURI(prefix);
if (log.isDebugEnabled()){
- log.debug(JavaUtils.getMessage("noPrefix00", "" + this, prefix));
-
- dump();
+ log.debug("--" + JavaUtils.getMessage("noPrefix00", "" + this, prefix));
+ dump("--");
+ log.debug("--" + JavaUtils.getMessage("end00"));
}
return null;
@@ -234,29 +234,26 @@
return false;
}
- public void dump()
+ public void dump(String dumpPrefix)
{
Enumeration e = stack.elements();
while (e.hasMoreElements()) {
ArrayList list = (ArrayList)e.nextElement();
- log.debug("----");
if (list == null) {
- log.debug(JavaUtils.getMessage("nullTable00"));
+ log.debug(dumpPrefix + JavaUtils.getMessage("nullTable00"));
continue;
}
for (int i = 0; i < list.size(); i++) {
Mapping map = (Mapping)list.get(i);
- log.debug(map.getNamespaceURI() + " -> " + map.getPrefix());
+ log.debug(dumpPrefix + map.getNamespaceURI() + " -> " + map.getPrefix());
}
}
if (parent != null) {
- log.debug("----" + JavaUtils.getMessage("parent00"));
- parent.dump();
+ log.debug(dumpPrefix + "--" + JavaUtils.getMessage("parent00"));
+ parent.dump(dumpPrefix + "--");
}
-
- log.debug("----" + JavaUtils.getMessage("end00"));
}
}
1.25 +2 -2 xml-axis/java/src/org/apache/axis/utils/Options.java
Index: Options.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/utils/Options.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- Options.java 19 Feb 2002 17:38:22 -0000 1.24
+++ Options.java 22 Feb 2002 23:39:47 -0000 1.25
@@ -71,8 +71,8 @@
import java.util.Vector;
public class Options {
- static Log log =
- LogFactory.getLog(Options.class.getName());
+ protected static Log log =
+ LogFactory.getLog(Options.class.getName());
String args[] = null ;
Vector usedArgs = null ;
1.43 +14 -8 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.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- XMLUtils.java 19 Feb 2002 17:38:22 -0000 1.42
+++ XMLUtils.java 22 Feb 2002 23:39:47 -0000 1.43
@@ -56,8 +56,10 @@
package org.apache.axis.utils ;
import org.apache.axis.Constants;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+
import org.w3c.dom.Attr;
import org.w3c.dom.CharacterData;
import org.w3c.dom.Document;
@@ -85,6 +87,9 @@
import java.util.Stack;
public class XMLUtils {
+ protected static Log log =
+ LogFactory.getLog(XMLUtils.class.getName());
+
private static DocumentBuilderFactory dbf = initDOMFactory();
private static SAXParserFactory saxFactory;
private static Stack saxParsers = new Stack();
@@ -169,7 +174,7 @@
dbf.setNamespaceAware(true);
}
catch( Exception e ) {
- e.printStackTrace();
+ log.error(JavaUtils.getMessage("exception00"), e );
}
return( dbf );
}
@@ -186,11 +191,11 @@
return (SAXParser)saxParsers.pop();
}
} catch (ParserConfigurationException e) {
- e.printStackTrace();
+ log.error(JavaUtils.getMessage("parserConfigurationException00"), e);
return null;
} catch (SAXException se) {
- se.printStackTrace();
- return null;
+ log.error(JavaUtils.getMessage("SAXException00"), se);
+ return null;
}
}
@@ -216,7 +221,7 @@
return( db.parse( inp ) );
}
catch( Exception e ) {
- e.printStackTrace();
+ log.error(JavaUtils.getMessage("exception00"), e);
}
return( null );
}
@@ -446,9 +451,10 @@
return strBuf.toString();
}
- public static class ParserErrorHandler implements ErrorHandler {
- static Log log =
- LogFactory.getLog(ParserErrorHandler.class.getName());
+ public static class ParserErrorHandler implements ErrorHandler
+ {
+ protected static Log log =
+ LogFactory.getLog(ParserErrorHandler.class.getName());
/**
* Returns a string describing parse exception details
*/
1.59 +5 -0 xml-axis/java/src/org/apache/axis/utils/resources.properties
Index: resources.properties
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/utils/resources.properties,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- resources.properties 21 Feb 2002 20:02:20 -0000 1.58
+++ resources.properties 22 Feb 2002 23:39:47 -0000 1.59
@@ -652,3 +652,8 @@
badTypeMappingOption00=The -typeMappingVersion argument must be 1.1 or 1.2
j2wopttypeMapping00=indicate 1.1 or 1.2. The default is 1.2 (SOAP 1.2 JAX-RPC compliant)
j2wBadTypeMapping00=The -typeMappingVersion argument must be 1.1 or 1.2
+
+exception00=Exception:
+parserConfigurationException00=ParserConfigurationException:
+SAXException00=SAXException:
+javaNetUnknownHostException00=java.net.UnknownHostException:
\ No newline at end of file
1.4 +4 -4 xml-axis/java/src/org/apache/axis/utils/compiler/CompilerFactory.java
Index: CompilerFactory.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/utils/compiler/CompilerFactory.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- CompilerFactory.java 19 Feb 2002 17:38:22 -0000 1.3
+++ CompilerFactory.java 22 Feb 2002 23:39:47 -0000 1.4
@@ -62,12 +62,13 @@
* This class implements a factory to instantiate a Compiler.
* @author <a href="mailto:dims@yahoo.com">Davanum Srinivas</a>
* @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
- * @version $Revision: 1.3 $ $Date: 2002/02/19 17:38:22 $
+ * @version $Revision: 1.4 $ $Date: 2002/02/22 23:39:47 $
* @since 2.0
*/
public class CompilerFactory {
- static Log log =
- LogFactory.getLog(CompilerFactory.class.getName());
+ protected static Log log =
+ LogFactory.getLog(CompilerFactory.class.getName());
+
public static Compiler getCompiler()
{
String compilerClassName = System.getProperty("axis.Compiler");
@@ -80,7 +81,6 @@
} catch (Exception e) {
// If something goes wrong here, should we just fall
// through and use the default one?
- e.printStackTrace(System.err);
log.error(e.getLocalizedMessage(),e);
}
}
1.5 +5 -5 xml-axis/java/src/org/apache/axis/utils/compiler/Javac.java
Index: Javac.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/utils/compiler/Javac.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Javac.java 19 Feb 2002 17:38:22 -0000 1.4
+++ Javac.java 22 Feb 2002 23:39:47 -0000 1.5
@@ -73,14 +73,14 @@
*
* @author <a href="mailto:dims@yahoo.com">Davanum Srinivas</a>
* @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
- * @version $Revision: 1.4 $ $Date: 2002/02/19 17:38:22 $
+ * @version $Revision: 1.5 $ $Date: 2002/02/22 23:39:47 $
* @since 2.0
*/
-public class Javac extends AbstractCompiler {
-
- static Log log =
- LogFactory.getLog(Javac.class.getName());
+public class Javac extends AbstractCompiler
+{
+ protected static Log log =
+ LogFactory.getLog(Javac.class.getName());
public final static String CLASSIC_CLASS = "sun.tools.javac.Main";
public final static String MODERN_CLASS = "com.sun.tools.javac.Main";
1.4 +4 -4 xml-axis/java/src/org/apache/axis/utils/compiler/Jikes.java
Index: Jikes.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/utils/compiler/Jikes.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Jikes.java 19 Feb 2002 17:38:22 -0000 1.3
+++ Jikes.java 22 Feb 2002 23:39:47 -0000 1.4
@@ -73,13 +73,13 @@
* NOTE: inspired by the Apache Jasper implementation.
* @author <a href="mailto:dims@yahoo.com">Davanum Srinivas</a>
* @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
- * @version $Revision: 1.3 $ $Date: 2002/02/19 17:38:22 $
+ * @version $Revision: 1.4 $ $Date: 2002/02/22 23:39:47 $
* @since 2.0
*/
-public class Jikes extends AbstractCompiler {
-
- static Log log =
+public class Jikes extends AbstractCompiler
+{
+ protected static Log log =
LogFactory.getLog(Jikes.class.getName());
static final int OUTPUT_BUFFER_SIZE = 1024;
1.7 +1 -1 xml-axis/java/test/utils/TestMessages.java
Index: TestMessages.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/utils/TestMessages.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- TestMessages.java 22 Feb 2002 15:21:18 -0000 1.6
+++ TestMessages.java 22 Feb 2002 23:39:47 -0000 1.7
@@ -104,7 +104,7 @@
} // testTestMessages
- private final String LS = System.getProperty("line.separator");
+ private static final String LS = System.getProperty("line.separator");
private String errors = "";
1.3 +2 -4 xml-axis/java/test/utils/TestSrcContent.java
Index: TestSrcContent.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/utils/TestSrcContent.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TestSrcContent.java 22 Feb 2002 15:39:04 -0000 1.2
+++ TestSrcContent.java 22 Feb 2002 23:39:47 -0000 1.3
@@ -48,7 +48,7 @@
return new TestSuite(TestSrcContent.class);
}
- private final String LS = System.getProperty("line.separator");
+ private static final String LS = System.getProperty("line.separator");
private String errors = "";
@@ -150,9 +150,7 @@
//
new FileNameContentPattern(".+([\\\\/])"
+ "java\\1src\\1org\\1apache\\1axis\\1"
- + "(?!AxisFault\\.java"
- + "|client\\1AdminClient\\.java"
- + "|utils\\1tcpmon\\.java"
+ + "(?!utils\\1tcpmon\\.java"
+ "|providers\\1BSFProvider\\.java"
+ "|Version\\.java"
+ "|wsdl\\1)"