rsitze 02/02/22 07:37:48
Modified: java/src/org/apache/axis AxisEngine.java Message.java
Part.java SOAPPart.java
java/src/org/apache/axis/attachments
BoundaryDelimitedStream.java
ManagedMemoryDataSource.java MimeUtils.java
java/src/org/apache/axis/deployment/wsdd WSDDDeployment.java
java/src/org/apache/axis/encoding
DeserializationContextImpl.java
TypeMappingImpl.java
java/src/org/apache/axis/handlers MD5AttachHandler.java
java/src/org/apache/axis/message RPCParam.java
SymbolTable.java
java/src/org/apache/axis/server AxisServer.java
java/src/org/apache/axis/transport/http
SimpleAxisServer.java
java/src/org/apache/axis/utils Admin.java NSStack.java
Log:
Replaced System.err.println w/ log.error
Revision Changes Path
1.71 +1 -1 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.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- AxisEngine.java 20 Feb 2002 18:59:20 -0000 1.70
+++ AxisEngine.java 22 Feb 2002 15:37:46 -0000 1.71
@@ -221,7 +221,7 @@
try {
config.writeEngineConfig(this);
} catch (Exception e) {
- System.err.println(JavaUtils.getMessage("saveConfigFail00"));
+ log.error(JavaUtils.getMessage("saveConfigFail00"));
e.printStackTrace();
}
}
1.61 +2 -2 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.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- Message.java 19 Feb 2002 17:38:18 -0000 1.60
+++ Message.java 22 Feb 2002 15:37:46 -0000 1.61
@@ -325,14 +325,14 @@
try {
os.write(mSOAPPart.getAsBytes());
} catch (java.io.IOException e) {
- System.err.println(e);
+ log.error("IOException: ", e);
e.printStackTrace();
}
} else {
try {
mAttachments.writeContentToStream(os);
} catch (java.lang.Exception e) {
- System.err.println(e);
+ log.error("Exception: ", e);
e.printStackTrace();
}
}
1.4 +10 -3 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Part.java 26 Nov 2001 19:09:31 -0000 1.3
+++ Part.java 22 Feb 2002 15:37:46 -0000 1.4
@@ -55,6 +55,9 @@
package org.apache.axis;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
import java.io.IOException;
import java.io.OutputStream;
import java.util.Hashtable;
@@ -76,7 +79,10 @@
import org.apache.axis.transport.http.HTTPConstants;
-public abstract class Part {
+public abstract class Part
+{
+ static Log log =
+ LogFactory.getLog(Part.class.getName());
private Message msg;
private Hashtable headers = new Hashtable();
@@ -227,9 +233,10 @@
thisHost = java.net.InetAddress.getLocalHost().getHostName();
}
catch (java.net.UnknownHostException e) {
- System.err.println("exception:" + e);
- thisHost = "localhost";
+ log.error("java.net.UnknownHostException: ", e);
e.printStackTrace();
+
+ thisHost = "localhost";
}
}
1.11 +16 -15 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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- SOAPPart.java 19 Feb 2002 17:38:18 -0000 1.10
+++ SOAPPart.java 22 Feb 2002 15:37:46 -0000 1.11
@@ -144,7 +144,7 @@
/* This could be rather costly with attachments.
public Object getOriginalMessage() {
- return( originalMessage );
+ return originalMessage;
}
*/
@@ -210,7 +210,7 @@
* TODO: rename this for clarity; should be more like getContents.
*/
public Object getCurrentMessage() {
- return( currentMessage );
+ return currentMessage;
}
/**
@@ -236,7 +236,7 @@
log.debug( "Enter: SOAPPart::getAsBytes" );
if ( currentForm == FORM_BYTES ) {
log.debug( "Exit: SOAPPart::getAsBytes" );
- return( (byte[]) currentMessage );
+ return (byte[])currentMessage;
}
if ( currentForm == FORM_BODYINSTREAM ) {
@@ -263,13 +263,13 @@
// inp.read( buf );
setCurrentMessage( buf, FORM_BYTES );
log.debug( "Exit: SOAPPart::getAsByes" );
- return( (byte[]) currentMessage );
+ return (byte[])currentMessage;
}
catch( Exception e ) {
e.printStackTrace( System.err );
}
log.debug( "Exit: SOAPPart::getAsByes" );
- return( null );
+ return null;
}
if ( currentForm == FORM_SOAPENVELOPE ||
@@ -290,12 +290,13 @@
FORM_BYTES );
}
log.debug( "Exit: SOAPPart::getAsBytes" );
- return( (byte[]) currentMessage );
+ return (byte[])currentMessage;
}
- System.err.println("Can't convert " + currentForm + " to Bytes" );
+ log.error("Can't convert " + currentForm + " to Bytes" );
+
log.debug( "Exit: SOAPPart::getAsBytes" );
- return( null );
+ return null;
}
/**
@@ -307,7 +308,7 @@
if ( currentForm == FORM_STRING ) {
log.debug( "Exit: SOAPPart::getAsString, currentMessage is "+
currentMessage );
- return( (String) currentMessage );
+ return (String)currentMessage;
}
if ( currentForm == FORM_INPUTSTREAM ||
@@ -326,7 +327,7 @@
}
log.debug( "Exit: SOAPPart::getAsString, currentMessage is "+
currentMessage );
- return( (String) currentMessage );
+ return (String)currentMessage;
}
if ( currentForm == FORM_FAULT ) {
@@ -362,10 +363,10 @@
return (String)currentMessage;
}
- System.err.println("Can't convert form " + currentForm +
- " to String" );
+ log.error("Can't convert form " + currentForm + " to String" );
+
log.debug( "Exit: SOAPPart::getAsString" );
- return( null );
+ return null;
}
/**
@@ -379,7 +380,7 @@
log.debug( "Enter: SOAPPart::getAsSOAPEnvelope; currentForm is "+
formNames[currentForm] );
if ( currentForm == FORM_SOAPENVELOPE )
- return( (SOAPEnvelope) currentMessage );
+ return (SOAPEnvelope)currentMessage;
if (currentForm == FORM_BODYINSTREAM) {
InputStreamBody bodyEl =
@@ -412,7 +413,7 @@
setCurrentMessage(dser.getEnvelope(), FORM_SOAPENVELOPE);
log.debug( "Exit: SOAPPart::getAsSOAPEnvelope" );
- return( (SOAPEnvelope) currentMessage );
+ return (SOAPEnvelope)currentMessage;
}
}
1.6 +14 -14
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- BoundaryDelimitedStream.java 19 Feb 2002 17:38:19 -0000 1.5
+++ BoundaryDelimitedStream.java 22 Feb 2002 15:37:47 -0000 1.6
@@ -54,6 +54,7 @@
*/
package org.apache.axis.attachments;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -235,9 +236,9 @@
" from BoundaryDelimitedStream:"+ streamNo+"\"" +
new String(tb) + "\"");
-// System.err.println("Read " + bwritten +
-// " from BoundaryDelimitedStream:"+ streamNo+"\"" +
-// new String(tb) + "\"");
+// log.debug("Read " + bwritten +
+// " from BoundaryDelimitedStream:"+ streamNo+"\"" +
+// new String(tb) + "\"");
}
}
@@ -318,7 +319,7 @@
private int[] skip= null;
private int boundarySearch(final byte[]text,final int start, final int end ) {
-//System.err.println(">>>>" + start + "," + end);
+//log.debug(">>>>" + start + "," + end);
int i, j, k;
@@ -330,23 +331,22 @@
for( k=start + boundaryLen-1; k <=end; k += skip[text[k] & (0xff)] ) {
-// System.err.println(">>>>" + k);
+// log.debug(">>>>" + k);
//printarry(text, k-boundaryLen+1, end);
for( j=boundaryLen-1, i=k; j>=0 && text[i] == boundary[j]; j-- ) i--;
if( j == (-1) ) return i+1;
}
-// System.err.println(">>>> not found" );
+// log.debug(">>>> not found" );
return BOUNDARY_NOT_FOUND;
}
-public static void printarry( byte[] b, int start , int end){
- byte tb[] = new byte[end-start];
-
- System.arraycopy(b, start, tb, 0, end-start);
-
- System.err.println("\"" + new String(tb) + "\"");
-
-}
+ public static void printarry(byte[] b, int start , int end){
+ if (log.isDebugEnabled()) {
+ byte tb[] = new byte[end-start];
+ System.arraycopy(b, start, tb, 0, end-start);
+ log.debug("\"" + new String(tb) + "\"");
+ }
+ }
}
1.9 +11 -6
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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ManagedMemoryDataSource.java 19 Feb 2002 17:38:19 -0000 1.8
+++ ManagedMemoryDataSource.java 22 Feb 2002 15:37:47 -0000 1.9
@@ -54,10 +54,13 @@
*/
package org.apache.axis.attachments;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+
import org.apache.axis.InternalException;
import org.apache.axis.MessageContext;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
import java.io.File;
/**
@@ -70,7 +73,11 @@
* TODO TODO TODO need to delete cached out data sources after a service ends.
*/
-public class ManagedMemoryDataSource implements javax.activation.DataSource {
+public class ManagedMemoryDataSource implements javax.activation.DataSource
+{
+ 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.
public static final int MAX_MEMORY_DISK_CACHED = -1;
@@ -84,8 +91,6 @@
//Memory is allocated in these size chunks.
public static final int READ_CHUNK_SZ = 32 * 1024 ;
- static Log log =
- LogFactory.getLog(ManagedMemoryDataSource.class.getName());
protected boolean debugEnabled= false; //Log debugging if true.
@@ -625,7 +630,7 @@
}
catch ( java.lang.Exception e) {
- System.err.println(e);
+ log.error("Caught Exception", e);
e.printStackTrace();
}
}
1.8 +16 -8 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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- MimeUtils.java 19 Feb 2002 17:38:19 -0000 1.7
+++ MimeUtils.java 22 Feb 2002 15:37:47 -0000 1.8
@@ -61,17 +61,24 @@
package org.apache.axis.attachments;
+import org.apache.axis.transport.http.HTTPConstants ;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
import java.util.Properties;
import javax.mail.*;
import javax.mail.internet.*;
import javax.activation.*;
-import org.apache.axis.transport.http.HTTPConstants ;
/**
* This class is defines utilities for mime.
*/
-public class MimeUtils {
+public class MimeUtils
+{
+ static Log log =
+ LogFactory.getLog(MimeUtils.class.getName());
/**
* Determine as efficiently as possible the content length for attachments in a
mail Multipart.
@@ -145,7 +152,7 @@
}
}
catch (Exception e) {
- System.err.println(e);
+ log.error("Exception: ", e);
}
return dataSize + headerLength;
}
@@ -193,11 +200,11 @@
}
catch (javax.mail.MessagingException e) {
- System.err.println(e);
+ log.error("javax.mail.MessagingException: ", e);
e.printStackTrace();
}
catch (java.io.IOException e) {
- System.err.println(e);
+ log.error("java.io.IOException: ", e);
e.printStackTrace();
}
}
@@ -276,7 +283,7 @@
}
}
catch (javax.mail.MessagingException e) {
- System.err.println(e);
+ log.error("javax.mail.MessagingException: ", e);
e.printStackTrace();
}
return multipart ;
@@ -297,9 +304,10 @@
thisHost = java.net.InetAddress.getLocalHost().getHostName();
}
catch (java.net.UnknownHostException e) {
- System.err.println("exception:" + e);
- thisHost = "localhost";
+ log.error("java.net.UknownHostException: ", e);
e.printStackTrace();
+
+ thisHost = "localhost";
}
}
1.26 +10 -4
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.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- WSDDDeployment.java 20 Feb 2002 18:59:20 -0000 1.25
+++ WSDDDeployment.java 22 Feb 2002 15:37:47 -0000 1.26
@@ -65,6 +65,9 @@
import org.apache.axis.encoding.ser.BaseDeserializerFactory;
import org.apache.axis.encoding.*;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
import javax.xml.rpc.namespace.QName;
import java.util.HashMap;
import java.util.Iterator;
@@ -83,6 +86,9 @@
extends WSDDElement
implements WSDDTypeMappingContainer, EngineConfiguration
{
+ static Log log =
+ LogFactory.getLog(WSDDDeployment.class.getName());
+
private HashMap handlers = new HashMap();
private HashMap services = new HashMap();
private HashMap transports = new HashMap();
@@ -309,14 +315,14 @@
//
// The BaseSerializerFactory createFactory() method is a utility
// that does this for us.
- //System.out.println("start creating sf and df");
+ //log.debug("start creating sf and df");
if (mapping.getSerializerName() != null &&
!mapping.getSerializerName().equals("")) {
ser = BaseSerializerFactory.createFactory(mapping.getSerializer(),
mapping.getLanguageSpecificType(),
mapping.getQName());
}
- //System.out.println("set ser factory");
+ //log.debug("set ser factory");
if (mapping.getDeserializerName() != null &&
!mapping.getDeserializerName().equals("")) {
@@ -324,9 +330,9 @@
mapping.getLanguageSpecificType(),
mapping.getQName());
}
- //System.out.println("set dser factory");
+ //log.debug("set dser factory");
tm.register( mapping.getLanguageSpecificType(), mapping.getQName(),
ser, deser);
- //System.out.println("registered");
+ //log.debug("registered");
}
catch (Exception e) {
throw new WSDDException(e);
1.8 +5 -3
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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- DeserializationContextImpl.java 20 Feb 2002 18:59:21 -0000 1.7
+++ DeserializationContextImpl.java 22 Feb 2002 15:37:47 -0000 1.8
@@ -71,8 +71,10 @@
import org.apache.axis.utils.NSStack;
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.xml.sax.Attributes;
import org.xml.sax.InputSource;
import org.xml.sax.Locator;
@@ -294,7 +296,7 @@
String nsURI = getNamespaceURI(qNameStr.substring(0, i));
- //System.out.println("namespace = " + nsURI);
+ //log.debug("namespace = " + nsURI);
if (nsURI == null)
return null;
@@ -395,13 +397,13 @@
try {
dserF = (DeserializerFactory) getTypeMapping().getDeserializer(xmlType);
} catch (JAXRPCException e) {
- System.out.println("!! No Factory for " + xmlType);
+ log.error("!! No Factory for " + xmlType);
}
if (dserF != null) {
try {
dser = (Deserializer) dserF.getDeserializerAs(Constants.AXIS_SAX);
} catch (JAXRPCException e) {
- System.out.println("!! No Deserializer for " + xmlType);
+ log.error("!! No Deserializer for " + xmlType);
}
}
return dser;
1.6 +11 -5 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TypeMappingImpl.java 1 Feb 2002 22:08:26 -0000 1.5
+++ TypeMappingImpl.java 22 Feb 2002 15:37:47 -0000 1.6
@@ -57,6 +57,9 @@
import org.apache.axis.Constants;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
import javax.xml.rpc.namespace.QName;
import javax.xml.rpc.JAXRPCException;
@@ -86,7 +89,10 @@
* Default TypeMapping or another TypeMapping
*
*/
-public class TypeMappingImpl implements TypeMapping {
+public class TypeMappingImpl implements TypeMapping
+{
+ static Log log =
+ LogFactory.getLog(TypeMappingImpl.class.getName());
public class Pair {
public Class javaType;
@@ -377,7 +383,7 @@
* @return xmlType qname or null
*/
public QName getTypeQName(Class javaType) {
- //System.out.println("getTypeQName javaType =" + javaType);
+ //log.debug("getTypeQName javaType =" + javaType);
QName xmlType = null;
Pair pair = (Pair) class2Pair.get(javaType);
if (pair == null && delegate != null) {
@@ -386,7 +392,7 @@
xmlType = pair.xmlType;
}
- //System.out.println("getTypeQName xmlType =" + xmlType);
+ //log.debug("getTypeQName xmlType =" + xmlType);
return xmlType;
}
@@ -396,7 +402,7 @@
* @return javaType class or type
*/
public Class getClassForQName(QName xmlType) {
- //System.out.println("getClassForQName xmlType =" + xmlType);
+ //log.debug("getClassForQName xmlType =" + xmlType);
Class javaType = null;
Pair pair = (Pair) qName2Pair.get(xmlType);
if (pair == null && delegate != null) {
@@ -405,7 +411,7 @@
javaType = pair.javaType;
}
- //System.out.println("getClassForQName javaType =" + javaType);
+ //log.debug("getClassForQName javaType =" + javaType);
return javaType;
}
}
1.6 +6 -6 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- MD5AttachHandler.java 19 Feb 2002 17:38:20 -0000 1.5
+++ MD5AttachHandler.java 22 Feb 2002 15:37:47 -0000 1.6
@@ -79,7 +79,7 @@
public void invoke(MessageContext msgContext) throws AxisFault {
log.debug(JavaUtils.getMessage("enter00", "EchoHandler::invoke") );
try {
- // System.err.println("IN MD5");
+ // log.debug("IN MD5");
Message msg = msgContext.getRequestMessage();
org.apache.axis.SOAPPart soapPart = (org.apache.axis.SOAPPart)
msg.getSOAPPart();
org.apache.axis.message.SOAPEnvelope env =
(org.apache.axis.message.SOAPEnvelope) soapPart.getAsSOAPEnvelope();
@@ -102,16 +102,16 @@
startTime = Long.parseLong(startTimeStr);
}
- // System.err.println("GOTIT");
+ // log.debug("GOTIT");
long receivedTime = System.currentTimeMillis();
long elapsedTime = -1;
- // System.err.println(startTime);
- // System.err.println(receivedTime);
+ // log.debug("startTime=" + startTime);
+ // log.debug("receivedTime=" + receivedTime);
if (startTime > 0) elapsedTime = receivedTime - startTime;
String elapsedTimeStr = elapsedTime + "";
- // System.err.println(elapsedTimeStr);
+ // log.debug("elapsedTimeStr=" + elapsedTimeStr);
java.security.MessageDigest md =
java.security.MessageDigest.getInstance("MD5");
java.io.InputStream attachmentStream = dh.getInputStream();
@@ -144,7 +144,7 @@
String MD5String = org.apache.axis.encoding.Base64.encode(md.digest());
String senddata = " elapsedTime=" + elapsedTimeStr + " MD5=" +
MD5String;
- // System.err.println(senddata);
+ // log.debug("senddata=" + senddata);
paramElement.appendChild(
paramElement.getOwnerDocument().createTextNode(senddata));
sbe = new org.apache.axis.message.SOAPBodyElement(sbElement);
1.31 +7 -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.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- RPCParam.java 26 Jan 2002 02:47:22 -0000 1.30
+++ RPCParam.java 22 Feb 2002 15:37:47 -0000 1.31
@@ -58,6 +58,9 @@
import org.apache.axis.utils.JavaUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
import javax.xml.rpc.namespace.QName;
import java.io.IOException;
import java.lang.reflect.Field;
@@ -68,6 +71,9 @@
*/
public class RPCParam
{
+ static Log log =
+ LogFactory.getLog(RPCParam.class.getName());
+
// Who's your daddy?
RPCElement myCall;
@@ -81,7 +87,7 @@
try {
valueField = cls.getField("value");
} catch (NoSuchFieldException e) {
- System.err.println(JavaUtils.getMessage("noValue00", "" + e));
+ log.error(JavaUtils.getMessage("noValue00", "" + e));
System.exit(-1);
}
}
1.7 +9 -3 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SymbolTable.java 30 Oct 2001 14:19:29 -0000 1.6
+++ SymbolTable.java 22 Feb 2002 15:37:47 -0000 1.7
@@ -55,6 +55,9 @@
package org.apache.axis.message;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
import java.util.ArrayList;
import java.util.HashMap;
@@ -63,7 +66,10 @@
* out to make it easier for me to see what was going on,
* I'll add them back in later
*/
-public class SymbolTable {
+public class SymbolTable
+{
+ static Log log =
+ LogFactory.getLog(SymbolTable.class.getName());
protected static final int TABLE_SIZE = 101;
protected Entry[] fBuckets = new Entry[TABLE_SIZE];
@@ -107,7 +113,7 @@
}
Entry entry = new Entry(symbol, fBuckets[bucket]);
fBuckets[bucket] = entry;
- System.out.println("Symbol '" + symbol + "' is index " + bucket);
+ log.debug("Symbol '" + symbol + "' is index " + bucket);
return bucket;
*/
}
@@ -129,7 +135,7 @@
}
Entry entry = new Entry(buffer, offset, length, fBuckets[bucket]);
fBuckets[bucket] = entry;
- System.out.println("Symbol '" + entry.symbol + "' is index " + bucket);
+ log.debug("Symbol '" + entry.symbol + "' is index " + bucket);
return bucket;
*/
}
1.60 +2 -2 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.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- AxisServer.java 20 Feb 2002 18:59:22 -0000 1.59
+++ AxisServer.java 22 Feb 2002 15:37:47 -0000 1.60
@@ -230,7 +230,7 @@
if ((h = hr.find( hName )) != null ) {
h.invoke(msgContext);
} else {
- System.err.println("Couldn't find transport " + hName);
+ log.error("Couldn't find transport " + hName);
}
} else {
// No transport set, so use the default (probably just
@@ -379,7 +379,7 @@
if ((h = hr.find( hName )) != null ) {
h.editWSDL(msgContext);
} else {
- System.err.println("Couldn't find transport " + hName);
+ log.error("Couldn't find transport " + hName);
}
} else {
// No transport set, so use the default (probably just
1.49 +3 -1
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.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- SimpleAxisServer.java 19 Feb 2002 17:38:22 -0000 1.48
+++ SimpleAxisServer.java 22 Feb 2002 15:37:48 -0000 1.49
@@ -68,8 +68,10 @@
import org.apache.axis.utils.Options;
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 java.io.IOException;
@@ -456,7 +458,7 @@
}
}
}
- System.out.println(JavaUtils.getMessage("quit00", "SimpleAxisServer"));
+ log.info(JavaUtils.getMessage("quit00", "SimpleAxisServer"));
}
// ASCII character mapping to lower case
1.102 +26 -24 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.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- Admin.java 20 Feb 2002 18:59:22 -0000 1.101
+++ Admin.java 22 Feb 2002 15:37:48 -0000 1.102
@@ -68,8 +68,10 @@
import org.apache.axis.handlers.soap.SOAPService;
import org.apache.axis.handlers.BasicHandler;
import org.apache.axis.server.AxisServer;
+
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.Node;
@@ -94,8 +96,8 @@
* @author Doug Davis ([EMAIL PROTECTED])
* @author Glen Daniels ([EMAIL PROTECTED])
*/
-public class Admin {
-
+public class Admin
+{
static Log log =
LogFactory.getLog(Admin.class.getName());
@@ -174,7 +176,7 @@
Element[] result = new Element[1];
result[0] = doc.getDocumentElement();
log.debug(JavaUtils.getMessage("exit00", "Admin:AdminService") );
- return( result );
+ return result;
}
protected static Document processWSDD(AxisEngine engine, Element root)
@@ -294,7 +296,7 @@
}
if (action.equals("quit")) {
- System.err.println(JavaUtils.getMessage("quitRequest00"));
+ log.error(JavaUtils.getMessage("quitRequest00"));
if (msgContext != null) {
// put a flag into message context so listener will exit after
// sending response
@@ -386,7 +388,7 @@
e.printStackTrace();
throw AxisFault.makeFault(e);
}
- return( doc );
+ return doc;
}
/** Get an XML document representing this engine's configuration.
@@ -734,26 +736,26 @@
if ( args.length < 2 || !(args[0].equals("client") ||
args[0].equals("server")) ) {
- System.err.println( JavaUtils.getMessage("usage00", "Admin
client|server <xml-file>") + "\n" );
+ log.error( JavaUtils.getMessage("usage00", "Admin client|server
<xml-file>") );
- System.err.println( JavaUtils.getMessage("where00", "<xml-file>") );
- System.err.println( "<deploy>" );
+ log.error( JavaUtils.getMessage("where00", "<xml-file>") );
+ log.error( "<deploy>" );
/*
- System.err.println( " <transport name=a request=\"a,b,c\"
sender=\"s\"");
- System.err.println( " response=\"d,e\"/>" );
+ log.error( " <transport name=a request=\"a,b,c\" sender=\"s\"");
+ log.error( " response=\"d,e\"/>" );
*/
- System.err.println( " <handler name=a class=className/>" );
- System.err.println( " <chain name=a flow=\"a,b,c\" />" );
- System.err.println( " <chain name=a request=\"a,b,c\" pivot=\"d\"" );
- System.err.println( " response=\"e,f,g\" />" );
- System.err.println( " <service name=a handler=b />" );
- System.err.println( "</deploy>" );
- System.err.println( "<undeploy>" );
- System.err.println( " <handler name=a/>" );
- System.err.println( " <chain name=a/>" );
- System.err.println( " <service name=a/>" );
- System.err.println( "</undeploy>\n" );
- System.err.println( "<list/>\n" );
+ log.error( " <handler name=a class=className/>" );
+ log.error( " <chain name=a flow=\"a,b,c\" />" );
+ log.error( " <chain name=a request=\"a,b,c\" pivot=\"d\"" );
+ log.error( " response=\"e,f,g\" />" );
+ log.error( " <service name=a handler=b />" );
+ log.error( "</deploy>" );
+ log.error( "<undeploy>" );
+ log.error( " <handler name=a/>" );
+ log.error( " <chain name=a/>" );
+ log.error( " <service name=a/>" );
+ log.error( "</undeploy>" );
+ log.error( "<list/>" );
// throw an Exception which will go uncaught! this way, a test suite
@@ -775,7 +777,7 @@
try {
for ( i = 1 ; i < args.length ; i++ ) {
- System.out.println( JavaUtils.getMessage("process00", args[i]) );
+ log.info( JavaUtils.getMessage("process00", args[i]) );
Document doc = XMLUtils.newDocument( new FileInputStream( args[i] )
);
admin.process(msgContext, doc.getDocumentElement());
}
@@ -786,7 +788,7 @@
throw e;
}
catch( Exception e ) {
- System.err.println( JavaUtils.getMessage("errorProcess00", args[i]) );
+ log.error( JavaUtils.getMessage("errorProcess00", args[i]) );
e.printStackTrace( System.err );
//System.exit( 1 );
throw e;
1.17 +5 -6 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.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- NSStack.java 19 Feb 2002 17:38:22 -0000 1.16
+++ NSStack.java 22 Feb 2002 15:37:48 -0000 1.17
@@ -232,23 +232,22 @@
Enumeration e = stack.elements();
while (e.hasMoreElements()) {
ArrayList list = (ArrayList)e.nextElement();
- System.out.println("----");
+ log.info("----");
if (list == null) {
- System.out.println(JavaUtils.getMessage("nullTable00"));
+ log.info(JavaUtils.getMessage("nullTable00"));
continue;
}
for (int i = 0; i < list.size(); i++) {
Mapping map = (Mapping)list.get(i);
- System.out.println(map.getNamespaceURI() + " -> " +
- map.getPrefix());
+ log.info(map.getNamespaceURI() + " -> " + map.getPrefix());
}
}
if (parent != null) {
- System.out.println("----" + JavaUtils.getMessage("parent00"));
+ log.info("----" + JavaUtils.getMessage("parent00"));
parent.dump();
}
- System.out.println("----" + JavaUtils.getMessage("end00"));
+ log.info("----" + JavaUtils.getMessage("end00"));
}
}
