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/05/09 20:25:18 UTC
cvs commit: xml-axis/java/src/org/apache/axis/providers/java JavaProvider.java RPCProvider.java
rsitze 02/05/09 11:25:18
Modified: java/src/org/apache/axis/handlers DebugHandler.java
SimpleAuthorizationHandler.java
MD5AttachHandler.java
SimpleAuthenticationHandler.java LogHandler.java
EchoHandler.java ErrorHandler.java JWSHandler.java
JWSProcessor.java
java/src/org/apache/axis/message BodyBuilder.java
RPCHandler.java
java/src/org/apache/axis/client Call.java
java/src/org/apache/axis SimpleChain.java SOAPPart.java
java/src/org/apache/axis/providers/java JavaProvider.java
RPCProvider.java
Log:
Remove NLS from log.debug entry/exit, as per logging guidelines
Revision Changes Path
1.34 +4 -4 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.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- DebugHandler.java 26 Mar 2002 16:40:35 -0000 1.33
+++ DebugHandler.java 9 May 2002 18:25:17 -0000 1.34
@@ -76,7 +76,7 @@
LogFactory.getLog(DebugHandler.class.getName());
public void invoke(MessageContext msgContext) throws AxisFault {
- log.debug(JavaUtils.getMessage("enter00", "DebugHandler::invoke") );
+ log.debug("Enter: DebugHandler::invoke");
try {
Message msg = msgContext.getRequestMessage();
@@ -100,12 +100,12 @@
log.error( JavaUtils.getMessage("exception00"), e );
throw AxisFault.makeFault(e);
}
- log.debug(JavaUtils.getMessage("exit00", "DebugHandler::invoke") );
+ log.debug("Exit: DebugHandler::invoke");
}
public void onFault(MessageContext msgContext) {
- log.debug(JavaUtils.getMessage("enter00", "DebugHandler::onFault") );
- log.debug(JavaUtils.getMessage("exit00", "DebugHandler::onFault") );
+ log.debug("Enter: DebugHandler::onFault");
+ log.debug("Exit: DebugHandler::onFault");
}
};
1.29 +5 -10 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.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- SimpleAuthorizationHandler.java 22 Feb 2002 23:39:45 -0000 1.28
+++ SimpleAuthorizationHandler.java 9 May 2002 18:25:17 -0000 1.29
@@ -89,8 +89,7 @@
*/
public void invoke(MessageContext msgContext) throws AxisFault {
if (log.isDebugEnabled()) {
- log.debug(JavaUtils.getMessage("enter00",
- "SimpleAuthorizationHandler::invoke") );
+ log.debug("Enter: SimpleAuthorizationHandler::invoke");
}
boolean allowByDefault = false;
@@ -131,8 +130,7 @@
}
if (log.isDebugEnabled()) {
- log.debug(JavaUtils.getMessage("exit00",
- "SimpleAuthorizationHandler::invoke") );
+ log.debug("Exit: SimpleAuthorizationHandler::invoke");
}
return;
}
@@ -152,8 +150,7 @@
}
if (log.isDebugEnabled()) {
- log.debug(JavaUtils.getMessage("exit00",
- "SimpleAuthorizationHandler::invoke") );
+ log.debug("Exit: SimpleAuthorizationHandler::invoke");
}
return;
}
@@ -169,10 +166,8 @@
*/
public void undo(MessageContext msgContext) {
if (log.isDebugEnabled()) {
- log.debug(JavaUtils.getMessage("enter00",
- "SimpleAuthorizationHandler::undo") );
- log.debug(JavaUtils.getMessage("exit00",
- "SimpleAuthorizationHandler::undo") );
+ log.debug("Enter: SimpleAuthorizationHandler::undo");
+ log.debug("Exit: SimpleAuthorizationHandler::undo");
}
}
};
1.9 +3 -2 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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- MD5AttachHandler.java 25 Feb 2002 17:38:15 -0000 1.8
+++ MD5AttachHandler.java 9 May 2002 18:25:17 -0000 1.9
@@ -77,7 +77,7 @@
LogFactory.getLog(MD5AttachHandler.class.getName());
public void invoke(MessageContext msgContext) throws AxisFault {
- log.debug(JavaUtils.getMessage("enter00", "EchoHandler::invoke") );
+ log.debug("Enter: EchoHandler::invoke");
try {
// log.debug("IN MD5");
Message msg = msgContext.getRequestMessage();
@@ -158,7 +158,8 @@
log.error( JavaUtils.getMessage("exception00"), e );
throw AxisFault.makeFault(e);
}
- log.debug(JavaUtils.getMessage("exit00", "EchoHandler::invoke") );
+
+ log.debug("Exit: EchoHandler::invoke");
}
}
1.28 +2 -4 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.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- SimpleAuthenticationHandler.java 22 Feb 2002 23:39:45 -0000 1.27
+++ SimpleAuthenticationHandler.java 9 May 2002 18:25:17 -0000 1.28
@@ -86,8 +86,7 @@
*/
public void invoke(MessageContext msgContext) throws AxisFault {
if (log.isDebugEnabled()) {
- log.debug(JavaUtils.getMessage("enter00",
- "SimpleAuthenticationHandler::invoke"));
+ log.debug("Enter: SimpleAuthenticationHandler::invoke");
}
SecurityProvider provider = (SecurityProvider)msgContext.getProperty("securityProvider");
@@ -129,8 +128,7 @@
}
if (log.isDebugEnabled()) {
- log.debug(JavaUtils.getMessage("exit00",
- "SimpleAuthenticationHandler::invoke") );
+ log.debug("Exit: SimpleAuthenticationHandler::invoke");
}
}
};
1.27 +5 -5 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.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- LogHandler.java 25 Feb 2002 17:38:15 -0000 1.26
+++ LogHandler.java 9 May 2002 18:25:17 -0000 1.27
@@ -78,7 +78,7 @@
long start = 0;
public void invoke(MessageContext msgContext) throws AxisFault {
- log.debug(JavaUtils.getMessage("enter00", "LogHandler::invoke") );
+ log.debug("Enter: LogHandler::invoke");
if (msgContext.getPastPivot() == false) {
start = System.currentTimeMillis();
} else {
@@ -104,11 +104,11 @@
throw AxisFault.makeFault(e);
}
}
- log.debug(JavaUtils.getMessage("exit00", "LogHandler::invoke") );
+ log.debug("Exit: LogHandler::invoke");
}
public void undo(MessageContext msgContext) {
- log.debug(JavaUtils.getMessage("enter00", "LogHandler::undo") );
+ log.debug("Enter: LogHandler::undo");
try {
FileWriter fw = new FileWriter( "axis.log", true );
PrintWriter pw = new PrintWriter( fw );
@@ -117,8 +117,8 @@
pw.println( "=====================" );
pw.close();
} catch( Exception e ) {
- log.error( JavaUtils.getMessage("exception00"), e );
+ log.error(JavaUtils.getMessage("exception00"), e );
}
- log.debug(JavaUtils.getMessage("exit00", "LogHandler::undo") );
+ log.debug("Exit: LogHandler::undo");
}
};
1.31 +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.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- EchoHandler.java 25 Feb 2002 17:38:15 -0000 1.30
+++ EchoHandler.java 9 May 2002 18:25:17 -0000 1.31
@@ -76,7 +76,7 @@
LogFactory.getLog(EchoHandler.class.getName());
public void invoke(MessageContext msgContext) throws AxisFault {
- log.debug(JavaUtils.getMessage("enter00", "EchoHandler::invoke") );
+ log.debug("Enter: EchoHandler::invoke");
try {
Message msg = msgContext.getRequestMessage();
SOAPEnvelope env = (SOAPEnvelope) msg.getSOAPEnvelope();
@@ -86,7 +86,7 @@
log.error( JavaUtils.getMessage("exception00"), e );
throw AxisFault.makeFault(e);
}
- log.debug(JavaUtils.getMessage("exit00", "EchoHandler::invoke") );
+ log.debug("Exit: EchoHandler::invoke");
}
public String wsdlStart = "<?xml version=\"1.0\" encoding=\"utf-8\" ?>" +
1.19 +1 -1 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.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ErrorHandler.java 22 Feb 2002 23:39:45 -0000 1.18
+++ ErrorHandler.java 9 May 2002 18:25:17 -0000 1.19
@@ -73,7 +73,7 @@
LogFactory.getLog(ErrorHandler.class.getName());
public void invoke(MessageContext msgContext) throws AxisFault {
- log.debug(JavaUtils.getMessage("enter00", "ErrorHandler::invoke") );
+ log.debug("Enter: ErrorHandler::invoke");
throw new AxisFault( "Server.Whatever", "ERROR", null, null );
}
1.16 +2 -4 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.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- JWSHandler.java 22 Feb 2002 23:39:45 -0000 1.15
+++ JWSHandler.java 9 May 2002 18:25:17 -0000 1.16
@@ -83,8 +83,7 @@
public void invoke(MessageContext msgContext) throws AxisFault
{
if (log.isDebugEnabled()) {
- log.debug(JavaUtils.getMessage("enter00",
- "JWSHandler::invoke") );
+ log.debug("Enter: JWSHandler::invoke");
}
// FORCE the targetService to be JWS if the URL is right.
@@ -95,8 +94,7 @@
}
if (log.isDebugEnabled()) {
- log.debug(JavaUtils.getMessage("exit00",
- "JWSHandler::invoke") );
+ log.debug("Exit: JWSHandler::invoke");
}
}
1.45 +3 -3 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.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- JWSProcessor.java 15 Apr 2002 19:37:23 -0000 1.44
+++ JWSProcessor.java 9 May 2002 18:25:17 -0000 1.45
@@ -110,7 +110,7 @@
throws AxisFault
{
if (log.isDebugEnabled())
- log.debug(JavaUtils.getMessage("enter00", "JWSProcessor::invoke"));
+ log.debug("Enter: JWSProcessor::invoke");
try {
/* Grab the *.jws filename from the context - should have been */
/* placed there by another handler (ie. HTTPActionHandler) */
@@ -289,12 +289,12 @@
rpc.cleanup(); // ??
}
catch( Exception e ) {
- log.debug( JavaUtils.getMessage("exception00"), e );
+ log.info(JavaUtils.getMessage("toAxisFault00"), e );
throw AxisFault.makeFault(e);
}
if (log.isDebugEnabled())
- log.debug(JavaUtils.getMessage("exit00", "JWSProcessor::invoke") );
+ log.debug("Exit: JWSProcessor::invoke");
}
public void generateWSDL(MessageContext msgContext) throws AxisFault {
1.27 +4 -4 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.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- BodyBuilder.java 23 Apr 2002 03:54:26 -0000 1.26
+++ BodyBuilder.java 9 May 2002 18:25:17 -0000 1.27
@@ -96,7 +96,7 @@
throws SAXException
{
if (log.isDebugEnabled()) {
- log.debug(JavaUtils.getMessage("enter00", "BodyBuilder.onStartChild()"));
+ log.debug("Enter: BodyBuilder::onStartChild()");
}
QName qname = new QName(namespace, localName);
@@ -162,7 +162,7 @@
//context.pushNewElement(element);
if (log.isDebugEnabled()) {
- log.debug(JavaUtils.getMessage("exit00", "BodyBuilder.onStartChild()"));
+ log.debug("Exit: BodyBuilder::onStartChild()");
}
return handler;
}
@@ -171,7 +171,7 @@
DeserializationContext context)
{
if (log.isDebugEnabled()) {
- log.debug(JavaUtils.getMessage("enter00", "BodyBuilder.onEndChild()"));
+ log.debug("Enter: BodyBuilder::onEndChild()");
}
if (element != null) {
@@ -180,7 +180,7 @@
}
if (log.isDebugEnabled()) {
- log.debug(JavaUtils.getMessage("exit00", "BodyBuilder.onEndChild()"));
+ log.debug("Exit: BodyBuilder::onEndChild()");
}
}
}
1.37 +2 -4 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.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- RPCHandler.java 7 May 2002 16:08:50 -0000 1.36
+++ RPCHandler.java 9 May 2002 18:25:17 -0000 1.37
@@ -128,8 +128,7 @@
throws SAXException
{
if (log.isDebugEnabled()) {
- log.debug(JavaUtils.getMessage("enter00",
- "RPCHandler.onStartChild()"));
+ log.debug("Enter: RPCHandler.onStartChild()");
}
if (!context.isDoneParsing()) {
context.pushNewElement(new MessageElement(namespace,
@@ -236,8 +235,7 @@
RPCParam.getValueField()));
if (log.isDebugEnabled()) {
- log.debug(JavaUtils.getMessage("exit00",
- "RPCHandler.onStartChild()"));
+ log.debug("Exit: RPCHandler.onStartChild()");
}
return (SOAPHandler) dser;
}
1.119 +7 -11 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.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- Call.java 29 Apr 2002 19:41:17 -0000 1.118
+++ Call.java 9 May 2002 18:25:17 -0000 1.119
@@ -1428,7 +1428,7 @@
attachments.setAttachmentParts(attachmentParts);
}catch(org.apache.axis.AxisFault ex){
- log.debug(JavaUtils.getMessage("axisFault00"), ex);
+ log.info(JavaUtils.getMessage("axisFault00"), ex);
throw new RuntimeException(ex.getMessage());
}
}
@@ -1592,8 +1592,7 @@
throws AxisFault {
if (log.isDebugEnabled()) {
- log.debug(JavaUtils.getMessage("enter00",
- "Call::invoke(ns, meth, args)") );
+ log.debug("Enter: Call::invoke(ns, meth, args)");
}
/**
@@ -1611,8 +1610,7 @@
Object ret = invoke( body );
if (log.isDebugEnabled()) {
- log.debug(JavaUtils.getMessage("exit00",
- "Call::invoke(ns, meth, args)") );
+ log.debug("Exit: Call::invoke(ns, meth, args)");
}
return ret;
@@ -1648,8 +1646,7 @@
*/
public Object invoke( RPCElement body ) throws AxisFault {
if (log.isDebugEnabled()) {
- log.debug(JavaUtils.getMessage("enter00",
- "Call::invoke(RPCElement)") );
+ log.debug("Enter: Call::invoke(RPCElement)");
}
/**
@@ -1769,8 +1766,7 @@
}
if (log.isDebugEnabled()) {
- log.debug(JavaUtils.getMessage("exit00",
- "Call::invoke(RPCElement)") );
+ log.debug("Exit: Call::invoke(RPCElement)");
}
// Convert type if needed
@@ -1810,7 +1806,7 @@
*/
public void invoke() throws AxisFault {
if (log.isDebugEnabled()) {
- log.debug(JavaUtils.getMessage("enter00", "Call::invoke()") );
+ log.debug("Enter: Call::invoke()");
}
Message reqMsg = null ;
@@ -1928,7 +1924,7 @@
}
if (log.isDebugEnabled()) {
- log.debug(JavaUtils.getMessage("exit00", "Call::invoke()") );
+ log.debug("Exit: Call::invoke()");
}
}
1.44 +7 -14 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.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- SimpleChain.java 6 Mar 2002 20:34:17 -0000 1.43
+++ SimpleChain.java 9 May 2002 18:25:18 -0000 1.44
@@ -113,16 +113,14 @@
*/
public void invoke(MessageContext msgContext) throws AxisFault {
if (log.isDebugEnabled()) {
- log.debug(JavaUtils.getMessage("enter00",
- "SimpleChain::invoke"));
+ log.debug("Enter: SimpleChain::invoke");
}
invoked = true;
doVisiting(msgContext, iVisitor);
if (log.isDebugEnabled()) {
- log.debug(JavaUtils.getMessage("exit00",
- "SimpleChain::invoke"));
+ log.debug("Exit: SimpleChain::invoke");
}
}
@@ -132,16 +130,14 @@
*/
public void generateWSDL(MessageContext msgContext) throws AxisFault {
if (log.isDebugEnabled()) {
- log.debug(JavaUtils.getMessage("enter00",
- "SimpleChain::generateWSDL"));
+ log.debug("Enter: SimpleChain::generateWSDL");
}
invoked = true;
doVisiting(msgContext, wsdlVisitor);
if (log.isDebugEnabled()) {
- log.debug(JavaUtils.getMessage("exit00",
- "SimpleChain::generateWSDL"));
+ log.debug("Exit: SimpleChain::generateWSDL");
}
}
@@ -169,16 +165,14 @@
*/
public void onFault(MessageContext msgContext) {
if (log.isDebugEnabled()) {
- log.debug(JavaUtils.getMessage("enter00",
- "SimpleChain::onFault"));
+ log.debug("Enter: SimpleChain::onFault");
}
for ( int i = handlers.size()-1 ; i >= 0 ; i-- )
((Handler) handlers.elementAt( i )).onFault( msgContext );
if (log.isDebugEnabled()) {
- log.debug(JavaUtils.getMessage("exit00",
- "SimpleChain::onFault"));
+ log.debug("Exit: SimpleChain::onFault");
}
}
@@ -248,8 +242,7 @@
}
if (log.isDebugEnabled()) {
- log.debug(JavaUtils.getMessage("exit00",
- "SimpleChain::getDeploymentData") );
+ log.debug("Exit: SimpleChain::getDeploymentData");
}
return( root );
1.20 +26 -18 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.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- SOAPPart.java 12 Apr 2002 09:46:35 -0000 1.19
+++ SOAPPart.java 9 May 2002 18:25:18 -0000 1.20
@@ -133,6 +133,7 @@
*/
public SOAPPart(Message parent, Object initialContents, boolean isBodyStream) {
super();
+
msgObject=parent;
// originalMessage = initialContents;
int form = FORM_STRING;
@@ -145,10 +146,16 @@
} else if (initialContents instanceof AxisFault) {
form = FORM_FAULT;
}
+
if (log.isDebugEnabled()) {
- log.debug(JavaUtils.getMessage("enter00", "SOAPPart ctor(" + formNames[form] + ")"));
+ log.debug("Enter: SOAPPart ctor(" + formNames[form] + ")");
}
+
setCurrentMessage(initialContents, form);
+
+ if (log.isDebugEnabled()) {
+ log.debug("Exit: SOAPPart ctor()");
+ }
}
/* This could be rather costly with attachments.
@@ -261,9 +268,9 @@
* array. This will force buffering of the message.
*/
public byte[] getAsBytes() throws AxisFault {
- log.debug(JavaUtils.getMessage("enter00", "SOAPPart::getAsBytes"));
+ log.debug("Enter: SOAPPart::getAsBytes");
if ( currentForm == FORM_BYTES ) {
- log.debug(JavaUtils.getMessage("exit00", "SOAPPart::getAsBytes"));
+ log.debug("Exit: SOAPPart::getAsBytes");
return (byte[])currentMessage;
}
@@ -272,6 +279,7 @@
getAsSOAPEnvelope();
} catch (Exception e) {
log.fatal(JavaUtils.getMessage("makeEnvFail00"), e);
+ log.debug("Exit: SOAPPart::getAsBytes");
return null;
}
}
@@ -290,13 +298,13 @@
// byte[] buf = new byte[ len ];
// inp.read( buf );
setCurrentMessage( buf, FORM_BYTES );
- log.debug(JavaUtils.getMessage("exit00", "SOAPPart::getAsBytes"));
+ log.debug("Exit: SOAPPart::getAsBytes");
return (byte[])currentMessage;
}
catch( Exception e ) {
log.error(JavaUtils.getMessage("exception00"), e);
}
- log.debug(JavaUtils.getMessage("exit00", "SOAPPart::getAsBytes"));
+ log.debug("Exit: SOAPPart::getAsBytes");
return null;
}
@@ -305,6 +313,7 @@
try{
return getAsString().getBytes("UTF-8");
}catch(UnsupportedEncodingException ue){
+ log.debug("Exit: SOAPPart::getAsBytes");
return getAsString().getBytes();
}
}
@@ -317,15 +326,14 @@
setCurrentMessage( ((String)currentMessage).getBytes(),
FORM_BYTES );
}
- log.debug(JavaUtils.getMessage("exit00", "SOAPPart::getAsBytes"));
+ log.debug("Exit: SOAPPart::getAsBytes");
return (byte[])currentMessage;
}
log.error(JavaUtils.getMessage("cantConvert00", ""+currentForm));
- log.debug(JavaUtils.getMessage("exit00", "SOAPPart::getAsBytes"));
+ log.debug("Exit: SOAPPart::getAsBytes");
return null;
-
}
/**
@@ -333,10 +341,9 @@
* This will force buffering of the message.
*/
public String getAsString() throws AxisFault {
- log.debug(JavaUtils.getMessage("enter00", "SOAPPart::getAsString"));
+ log.debug("Enter: SOAPPart::getAsString");
if ( currentForm == FORM_STRING ) {
- log.debug(JavaUtils.getMessage("exitCurrMsg",
- "SOAPPart::getAsString", "" + currentMessage));
+ log.debug("Exit: SOAPPart::getAsString(): " + currentMessage);
return (String)currentMessage;
}
@@ -354,8 +361,7 @@
setCurrentMessage( new String((byte[]) currentMessage),
FORM_STRING );
}
- log.debug(JavaUtils.getMessage("exitCurrMsg",
- "SOAPPart::getAsString", "" + currentMessage));
+ log.debug("Exit: SOAPPart::getAsString(): " + currentMessage);
return (String)currentMessage;
}
@@ -369,6 +375,7 @@
return null;
}
setCurrentMessage(writer.getBuffer().toString(), FORM_STRING);
+ log.debug("Exit: SOAPPart::getAsString(): " + currentMessage);
return (String)currentMessage;
}
@@ -381,12 +388,13 @@
throw AxisFault.makeFault(e);
}
setCurrentMessage(writer.getBuffer().toString(), FORM_STRING);
+ log.debug("Exit: SOAPPart::getAsString(): " + currentMessage);
return (String)currentMessage;
}
log.error( JavaUtils.getMessage("cantConvert01", ""+currentForm));
- log.debug(JavaUtils.getMessage("exit00", "SOAPPart::getAsString"));
+ log.debug("Exit: SOAPPart::getAsString()");
return null;
}
@@ -398,8 +406,8 @@
public SOAPEnvelope getAsSOAPEnvelope()
throws AxisFault
{
- log.debug(JavaUtils.getMessage("enter00", "SOAPPart::getAsSOAPEnvelope")
- + JavaUtils.getMessage("currForm", formNames[currentForm]));
+ log.debug("Enter: SOAPPart::getAsSOAPEnvelope()");
+ log.debug(JavaUtils.getMessage("currForm", formNames[currentForm]));
if ( currentForm == FORM_SOAPENVELOPE )
return (SOAPEnvelope)currentMessage;
@@ -434,8 +442,8 @@
}
setCurrentMessage(dser.getEnvelope(), FORM_SOAPENVELOPE);
- log.debug(JavaUtils.getMessage(
- "exit00", "SOAPPart::getAsSOAPEnvelope"));
+
+ log.debug("Exit: SOAPPart::getAsSOAPEnvelope");
return (SOAPEnvelope)currentMessage;
}
1.52 +5 -4 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.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- JavaProvider.java 6 May 2002 19:41:46 -0000 1.51
+++ JavaProvider.java 9 May 2002 18:25:18 -0000 1.52
@@ -238,7 +238,7 @@
*/
public void invoke(MessageContext msgContext) throws AxisFault {
if (log.isDebugEnabled())
- log.debug( JavaUtils.getMessage("enter00", "JavaProvider::invoke (" + this + ")"));
+ log.debug("Enter: JavaProvider::invoke (" + this + ")");
/* Find the service we're invoking so we can grab it's options */
/***************************************************************/
@@ -314,8 +314,9 @@
log.info( JavaUtils.getMessage("toAxisFault00"), exp);
throw AxisFault.makeFault(exp);
}
+
if (log.isDebugEnabled())
- log.debug(JavaUtils.getMessage("exit00", "JavaProvider::invoke (" + this + ")"));
+ log.debug("Exit: JavaProvider::invoke (" + this + ")");
}
/**
@@ -326,7 +327,7 @@
*/
public void generateWSDL(MessageContext msgContext) throws AxisFault {
if (log.isDebugEnabled())
- log.debug(JavaUtils.getMessage("enter00", "JavaProvider::generateWSDL (" + this + ")"));
+ log.debug("Enter: JavaProvider::generateWSDL (" + this + ")");
/* Find the service we're invoking so we can grab it's options */
/***************************************************************/
@@ -392,7 +393,7 @@
}
if (log.isDebugEnabled())
- log.debug(JavaUtils.getMessage("exit00", "JavaProvider::generateWSDL (" + this + ")"));
+ log.debug("Exit: JavaProvider::generateWSDL (" + this + ")");
}
private String getAllowedMethods(Handler service)
1.56 +1 -2 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.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- RPCProvider.java 1 May 2002 01:50:50 -0000 1.55
+++ RPCProvider.java 9 May 2002 18:25:18 -0000 1.56
@@ -99,8 +99,7 @@
throws Exception
{
if (log.isDebugEnabled()) {
- log.debug(JavaUtils.getMessage("enter00",
- "RPCProvider.processMessage()"));
+ log.debug("Enter: RPCProvider.processMessage()");
}
SOAPService service = msgContext.getService();