rsitze 02/02/25 09:38:17
Modified: java/src/org/apache/axis AxisEngine.java
FaultableHandler.java InternalException.java
Message.java SOAPPart.java SimpleChain.java
java/src/org/apache/axis/attachments
ManagedMemoryDataSource.java MimeUtils.java
java/src/org/apache/axis/client AdminClient.java
AxisClient.java Call.java
java/src/org/apache/axis/configuration
DefaultEngineConfigurationFactory.java
java/src/org/apache/axis/deployment/wsdd WSDDDocument.java
java/src/org/apache/axis/encoding
DeserializationContextImpl.java FieldTarget.java
MethodTarget.java
java/src/org/apache/axis/encoding/ser BeanSerializer.java
ElementDeserializer.java EnumSerializer.java
java/src/org/apache/axis/handlers DebugHandler.java
EchoHandler.java JWSProcessor.java LogHandler.java
MD5AttachHandler.java
java/src/org/apache/axis/message InputStreamBody.java
MessageElement.java SOAPEnvelope.java
java/src/org/apache/axis/providers/java JavaProvider.java
java/src/org/apache/axis/security/simple
SimpleSecurityProvider.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
resources.properties
java/src/org/apache/axis/utils/compiler CompilerFactory.java
Javac.java Jikes.java
Log:
Updated use of I18N with logged messages
Revision Changes Path
1.73 +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.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- AxisEngine.java 22 Feb 2002 23:39:42 -0000 1.72
+++ AxisEngine.java 25 Feb 2002 17:38:14 -0000 1.73
@@ -279,7 +279,7 @@
try {
tmr = config.getTypeMappingRegistry();
} catch (ConfigurationException e) {
- log.error(e);
+ log.error(JavaUtils.getMessage("axisConfigurationException00"), e);
}
return tmr;
1.33 +1 -1 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.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- FaultableHandler.java 22 Feb 2002 23:39:42 -0000 1.32
+++ FaultableHandler.java 25 Feb 2002 17:38:14 -0000 1.33
@@ -108,7 +108,7 @@
workHandler.invoke( msgContext );
}
catch( Exception e ) {
- log.error( e );
+ log.error( JavaUtils.getMessage("exception00"), e );
AxisFault fault = AxisFault.makeFault(e);
AxisEngine engine = msgContext.getAxisEngine();
1.5 +3 -1 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- InternalException.java 22 Feb 2002 23:39:42 -0000 1.4
+++ InternalException.java 25 Feb 2002 17:38:14 -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;
@@ -118,7 +120,7 @@
if (e instanceof InternalException) {
log.debug("InternalException: ", e);
} else {
- log.fatal("Unknown Exception: ", e);
+ log.fatal(JavaUtils.getMessage("exception00"), e);
}
}
}
1.63 +9 -5 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.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- Message.java 22 Feb 2002 23:39:42 -0000 1.62
+++ Message.java 25 Feb 2002 17:38:14 -0000 1.63
@@ -57,6 +57,7 @@
import org.apache.axis.attachments.Attachments;
import org.apache.axis.message.SOAPEnvelope;
+import org.apache.axis.utils.JavaUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -249,13 +250,16 @@
//If it can't support it, it wont have a root part.
mSOAPPart = (SOAPPart) mAttachments.getRootPart();
} catch (InvocationTargetException ex) {
- log.fatal(ex);
+ log.fatal(JavaUtils.getMessage("invocationTargetException00"),
+ ex);
throw new RuntimeException(ex.getMessage());
} catch (InstantiationException ex) {
- log.fatal(ex);
+ log.fatal(JavaUtils.getMessage("instantiationException00"),
+ ex);
throw new RuntimeException(ex.getMessage());
} catch (IllegalAccessException ex) {
- log.fatal(ex);
+ log.fatal(JavaUtils.getMessage("illegalAccessException00"),
+ ex);
throw new RuntimeException(ex.getMessage());
}
}
@@ -325,13 +329,13 @@
try {
os.write(mSOAPPart.getAsBytes());
} catch (java.io.IOException e) {
- log.error("IOException: ", e);
+ log.error(JavaUtils.getMessage("javaIOException00"), e);
}
} else {
try {
mAttachments.writeContentToStream(os);
} catch (java.lang.Exception e) {
- log.error("Exception: ", e);
+ log.error(JavaUtils.getMessage("exception00"), e);
}
}
}
1.13 +4 -3 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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- SOAPPart.java 22 Feb 2002 23:39:43 -0000 1.12
+++ SOAPPart.java 25 Feb 2002 17:38:14 -0000 1.13
@@ -246,7 +246,7 @@
try {
getAsSOAPEnvelope();
} catch (Exception e) {
- log.fatal("Couldn't make envelope", e);
+ log.fatal(JavaUtils.getMessage("makeEnvFail00"), e);
return null;
}
}
@@ -296,7 +296,7 @@
return (byte[])currentMessage;
}
- log.error("Can't convert " + currentForm + " to Bytes" );
+ log.error(JavaUtils.getMessage("cantConvert00", ""+currentForm));
log.debug( "Exit: SOAPPart::getAsBytes" );
return null;
@@ -366,7 +366,7 @@
return (String)currentMessage;
}
- log.error("Can't convert form " + currentForm + " to String" );
+ log.error( JavaUtils.getMessage("cantConvert01", ""+currentForm));
log.debug( "Exit: SOAPPart::getAsString" );
return null;
@@ -382,6 +382,7 @@
{
log.debug( "Enter: SOAPPart::getAsSOAPEnvelope; currentForm is "+
formNames[currentForm] );
+
if ( currentForm == FORM_SOAPENVELOPE )
return (SOAPEnvelope)currentMessage;
1.42 +10 -10 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.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- SimpleChain.java 22 Feb 2002 23:39:43 -0000 1.41
+++ SimpleChain.java 25 Feb 2002 17:38:14 -0000 1.42
@@ -114,15 +114,15 @@
public void invoke(MessageContext msgContext) throws AxisFault {
if (log.isDebugEnabled()) {
log.debug(JavaUtils.getMessage("enter00",
- "SimpleChain::invoke"));
+ "SimpleChain::invoke"));
}
invoked = true;
doVisiting(msgContext, iVisitor);
if (log.isDebugEnabled()) {
- log.debug(JavaUtils.getMessage("exit00",
- "SimpleChain::invoke"));
+ log.debug(JavaUtils.getMessage("exit00",
+ "SimpleChain::invoke"));
}
}
@@ -133,7 +133,7 @@
public void generateWSDL(MessageContext msgContext) throws AxisFault {
if (log.isDebugEnabled()) {
log.debug(JavaUtils.getMessage("enter00",
- "SimpleChain::generateWSDL"));
+ "SimpleChain::generateWSDL"));
}
invoked = true;
@@ -141,7 +141,7 @@
if (log.isDebugEnabled()) {
log.debug(JavaUtils.getMessage("exit00",
- "SimpleChain::generateWSDL"));
+ "SimpleChain::generateWSDL"));
}
}
@@ -156,7 +156,7 @@
}
} catch( AxisFault f ) {
// notify fault in reverse order and then rethrow
- log.error( f );
+ log.error( JavaUtils.getMessage("axisFault00"), f );
while( --i >= 0 )
((Handler) handlers.elementAt( i )).onFault( msgContext );
throw f;
@@ -172,7 +172,7 @@
public void onFault(MessageContext msgContext) {
if (log.isDebugEnabled()) {
log.debug(JavaUtils.getMessage("enter00",
- "SimpleChain::onFault"));
+ "SimpleChain::onFault"));
}
for ( int i = handlers.size()-1 ; i >= 0 ; i-- )
@@ -180,7 +180,7 @@
if (log.isDebugEnabled()) {
log.debug(JavaUtils.getMessage("exit00",
- "SimpleChain::onFault"));
+ "SimpleChain::onFault"));
}
}
@@ -220,7 +220,7 @@
public Element getDeploymentData(Document doc) {
if (log.isDebugEnabled()) {
log.debug( JavaUtils.getMessage("enter00",
- "SimpleChain::getDeploymentData") );
+ "SimpleChain::getDeploymentData") );
}
Element root = doc.createElementNS("", "chain" );
@@ -251,7 +251,7 @@
if (log.isDebugEnabled()) {
log.debug(JavaUtils.getMessage("exit00",
- "SimpleChain::getDeploymentData") );
+ "SimpleChain::getDeploymentData") );
}
return( root );
1.11 +1 -1
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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ManagedMemoryDataSource.java 22 Feb 2002 23:39:43 -0000 1.10
+++ ManagedMemoryDataSource.java 25 Feb 2002 17:38:14 -0000 1.11
@@ -342,7 +342,7 @@
diskCacheFile=null;
cachediskstream= null;
maxCached= java.lang.Integer.MAX_VALUE;
- log.info("No disk access using memory only.", se);
+ log.info(JavaUtils.getMessage("nodisk00"), se);
}
}
}
1.10 +6 -5 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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- MimeUtils.java 22 Feb 2002 23:39:43 -0000 1.9
+++ MimeUtils.java 25 Feb 2002 17:38:14 -0000 1.10
@@ -62,6 +62,7 @@
import org.apache.axis.transport.http.HTTPConstants ;
+import org.apache.axis.utils.JavaUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -152,7 +153,7 @@
}
}
catch (Exception e) {
- log.error("Exception: ", e);
+ log.error(JavaUtils.getMessage("exception00"), e);
}
return dataSize + headerLength;
}
@@ -200,10 +201,10 @@
}
catch (javax.mail.MessagingException e) {
- log.error("javax.mail.MessagingException: ", e);
+ log.error(JavaUtils.getMessage("javaxMailMessagingException00"), e);
}
catch (java.io.IOException e) {
- log.error("java.io.IOException: ", e);
+ log.error(JavaUtils.getMessage("javaIOException00"), e);
}
}
/**
@@ -281,7 +282,7 @@
}
}
catch (javax.mail.MessagingException e) {
- log.error("javax.mail.MessagingException: ", e);
+ log.error(JavaUtils.getMessage("javaxMailMessagingException00"), e);
}
return multipart ;
}
@@ -301,7 +302,7 @@
thisHost = java.net.InetAddress.getLocalHost().getHostName();
}
catch (java.net.UnknownHostException e) {
- log.error("java.net.UknownHostException: ", e);
+ log.error(JavaUtils.getMessage("javaNetUnknownHostException00"), e);
thisHost = "localhost";
}
1.55 +3 -3 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.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- AdminClient.java 22 Feb 2002 23:39:43 -0000 1.54
+++ AdminClient.java 25 Feb 2002 17:38:14 -0000 1.55
@@ -338,14 +338,14 @@
String result = admin.process(args);
if (result != null)
- log.info(result);
+ System.out.println(result);
else
System.exit(1);
} catch (AxisFault af) {
- log.error(af.dumpToString());
+ log.error(JavaUtils.getMessage("axisFault01", af.dumpToString()));
System.exit(1);
} catch (Exception e) {
- log.error("Exception: ", e);
+ log.error(JavaUtils.getMessage("exception00"), e);
System.exit(1);
}
}
1.40 +3 -5 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.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- AxisClient.java 22 Feb 2002 23:39:43 -0000 1.39
+++ AxisClient.java 25 Feb 2002 17:38:14 -0000 1.40
@@ -101,8 +101,7 @@
*/
public void invoke(MessageContext msgContext) throws AxisFault {
if (log.isDebugEnabled()) {
- log.debug(JavaUtils.getMessage("enter00",
- "AxisClient::invoke") );
+ log.debug(JavaUtils.getMessage("enter00", "AxisClient::invoke"));
}
String hName = null ;
@@ -194,7 +193,7 @@
} catch( Exception e ) {
// Should we even bother catching it ?
- log.error( e );
+ log.error(JavaUtils.getMessage("exception00"), e);
throw AxisFault.makeFault(e);
} finally {
@@ -203,8 +202,7 @@
}
if (log.isDebugEnabled()) {
- log.debug(JavaUtils.getMessage("exit00",
- "AxisClient::invoke") );
+ log.debug(JavaUtils.getMessage("exit00", "AxisClient::invoke") );
}
};
}
1.81 +8 -8 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.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- Call.java 25 Feb 2002 14:16:26 -0000 1.80
+++ Call.java 25 Feb 2002 17:38:14 -0000 1.81
@@ -563,7 +563,7 @@
}
}
catch( Exception exp ) {
- log.error("Exception: ", exp);
+ log.error(JavaUtils.getMessage("exception00"), exp);
// do what?
// throw new AxisFault("Call.setTargetEndpointAddress",
//"Malformed URL Exception: " + e.getMessage(), null, null);
@@ -1234,7 +1234,7 @@
attachments.setAttachmentParts(attachmentParts);
}catch(org.apache.axis.AxisFault ex){
- log.debug(ex);
+ log.debug(JavaUtils.getMessage("axisFault00"), ex);
throw new RuntimeException(ex.getMessage());
}
}
@@ -1384,7 +1384,7 @@
if (log.isDebugEnabled()) {
log.debug(JavaUtils.getMessage("enter00",
- "Call::invoke(ns, meth, args)") );
+ "Call::invoke(ns, meth, args)") );
}
RPCElement body = new RPCElement(namespace, method, args);
@@ -1393,7 +1393,7 @@
if (log.isDebugEnabled()) {
log.debug(JavaUtils.getMessage("exit00",
- "Call::invoke(ns, meth, args)") );
+ "Call::invoke(ns, meth, args)") );
}
return ret;
@@ -1430,7 +1430,7 @@
public Object invoke( RPCElement body ) throws AxisFault {
if (log.isDebugEnabled()) {
log.debug(JavaUtils.getMessage("enter00",
- "Call::invoke(RPCElement)") );
+ "Call::invoke(RPCElement)") );
}
SOAPEnvelope reqEnv = new SOAPEnvelope();
@@ -1464,7 +1464,7 @@
invoke();
}
catch( Exception e ) {
- log.error( e );
+ log.error( JavaUtils.getMessage("exception00"), e );
throw AxisFault.makeFault(e);
}
@@ -1474,7 +1474,7 @@
body = (RPCElement)resEnv.getFirstBody();
resArgs = body.getParams();
} catch (Exception e) {
- log.error(e);
+ log.error(JavaUtils.getMessage("exception00"), e);
throw AxisFault.makeFault(e);
}
@@ -1516,7 +1516,7 @@
if (log.isDebugEnabled()) {
log.debug(JavaUtils.getMessage("exit00",
- "Call::invoke(RPCElement)") );
+ "Call::invoke(RPCElement)") );
}
return( result );
1.6 +2 -1
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DefaultEngineConfigurationFactory.java 22 Feb 2002 23:39:43 -0000 1.5
+++ DefaultEngineConfigurationFactory.java 25 Feb 2002 17:38:15 -0000 1.6
@@ -58,6 +58,7 @@
import org.apache.axis.EngineConfigurationFactory;
import org.apache.axis.EngineConfiguration;
import org.apache.axis.Constants;
+import org.apache.axis.utils.JavaUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -105,7 +106,7 @@
forName(fClassName).newInstance();
} catch (Exception e) {
// Report diagnostics but use the default factory.
- log.error("Exception: ", e);
+ log.error(JavaUtils.getMessage("exception00"), e);
}
}
1.18 +2 -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.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- WSDDDocument.java 22 Feb 2002 23:39:44 -0000 1.17
+++ WSDDDocument.java 25 Feb 2002 17:38:15 -0000 1.18
@@ -60,6 +60,7 @@
import org.apache.axis.deployment.DeployableItem;
import org.apache.axis.encoding.*;
import org.apache.axis.utils.XMLUtils;
+import org.apache.axis.utils.JavaUtils;
import org.apache.axis.Constants;
import org.apache.commons.logging.Log;
@@ -141,7 +142,7 @@
try {
deployment.writeToContext(context);
} catch (Exception e) {
- log.error("Caught Exception while writing to context: ", e);
+ log.error(JavaUtils.getMessage("exception00"), e);
}
try {
writer.close();
1.12 +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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- DeserializationContextImpl.java 25 Feb 2002 10:53:39 -0000 1.11
+++ DeserializationContextImpl.java 25 Feb 2002 17:38:15 -0000 1.12
@@ -396,13 +396,13 @@
try {
dserF = (DeserializerFactory) getTypeMapping().getDeserializer(xmlType);
} catch (JAXRPCException e) {
- log.error("!! No Factory for " + xmlType);
+ log.error(JavaUtils.getMessage("noFactory00", xmlType.toString()));
}
if (dserF != null) {
try {
dser = (Deserializer) dserF.getDeserializerAs(Constants.AXIS_SAX);
} catch (JAXRPCException e) {
- log.error("!! No Deserializer for " + xmlType);
+ log.error(JavaUtils.getMessage("noDeser00", xmlType.toString()));
}
}
return dser;
1.3 +3 -2 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FieldTarget.java 22 Feb 2002 23:39:44 -0000 1.2
+++ FieldTarget.java 25 Feb 2002 17:38:15 -0000 1.3
@@ -63,6 +63,7 @@
import java.util.Vector;
import org.apache.axis.encoding.Target;
+import org.apache.axis.utils.JavaUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -94,11 +95,11 @@
try {
targetField.set(targetObject, value);
} catch (IllegalAccessException accEx) {
- log.error("IllegalAccessException: transforming to SAXException: ",
+ log.error(JavaUtils.getMessage("illegalAccessException00"),
accEx);
throw new SAXException(accEx);
} catch (IllegalArgumentException argEx) {
- log.error("IllegalArgumentException: transforming to SAXException: ",
+ log.error(JavaUtils.getMessage("illegalArgumentException00"),
argEx);
throw new SAXException(argEx);
}
1.3 +4 -3 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MethodTarget.java 22 Feb 2002 23:39:44 -0000 1.2
+++ MethodTarget.java 25 Feb 2002 17:38:15 -0000 1.3
@@ -61,6 +61,7 @@
import java.lang.reflect.InvocationTargetException;
import org.apache.axis.encoding.Target;
+import org.apache.axis.utils.JavaUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -87,15 +88,15 @@
try {
targetMethod.invoke(targetObject, new Object [] { value });
} catch (IllegalAccessException accEx) {
- log.error("IllegalAccessException: transforming to SAXException: ",
+ log.error(JavaUtils.getMessage("illegalAccessException00"),
accEx);
throw new SAXException(accEx);
} catch (IllegalArgumentException argEx) {
- log.error("IllegalArgumentException: transforming to SAXException: ",
+ log.error(JavaUtils.getMessage("illegalArgumentException00"),
argEx);
throw new SAXException(argEx);
} catch (InvocationTargetException targetEx) {
- log.error("InvocationTargetException: transforming to SAXException: ",
+ log.error(JavaUtils.getMessage("invocationTargetException00"),
targetEx);
throw new SAXException(targetEx);
}
1.11 +1 -1
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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- BeanSerializer.java 22 Feb 2002 23:39:44 -0000 1.10
+++ BeanSerializer.java 25 Feb 2002 17:38:15 -0000 1.11
@@ -203,7 +203,7 @@
}
}
} catch (Exception e) {
- log.error("Exception: transforming to IOException: ", e);
+ log.error(JavaUtils.getMessage("exception00"), e);
throw new IOException(e.toString());
}
1.3 +3 -1
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ElementDeserializer.java 22 Feb 2002 23:39:44 -0000 1.2
+++ ElementDeserializer.java 25 Feb 2002 17:38:15 -0000 1.3
@@ -75,6 +75,8 @@
import org.apache.axis.encoding.DeserializationContext;
import org.apache.axis.encoding.DeserializerImpl;
+import org.apache.axis.utils.JavaUtils;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -105,7 +107,7 @@
}
}
catch( Exception exp ) {
- log.error("Exception: transforming to SAXException: ", exp);
+ log.error(JavaUtils.getMessage("exception00"), exp);
throw new SAXException( exp );
}
}
1.3 +2 -1
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- EnumSerializer.java 22 Feb 2002 23:39:44 -0000 1.2
+++ EnumSerializer.java 25 Feb 2002 17:38:15 -0000 1.3
@@ -70,6 +70,7 @@
import org.apache.axis.encoding.DeserializationContext;
import org.apache.axis.encoding.DeserializerImpl;
import org.apache.axis.InternalException;
+import org.apache.axis.utils.JavaUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -114,7 +115,7 @@
String propValue = (String) toStringMethod.invoke(value, null);
context.writeString(propValue);
} catch (Exception e) {
- log.error("Exception: transforming to IOException: ", e);
+ log.error(JavaUtils.getMessage("exception00"), e);
throw new IOException(e.toString());
}
1.32 +1 -1 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.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- DebugHandler.java 22 Feb 2002 23:39:45 -0000 1.31
+++ DebugHandler.java 25 Feb 2002 17:38:15 -0000 1.32
@@ -97,7 +97,7 @@
}
}
catch( Exception e ) {
- log.error( e );
+ log.error( JavaUtils.getMessage("exception00"), e );
throw AxisFault.makeFault(e);
}
log.debug(JavaUtils.getMessage("exit00", "DebugHandler::invoke") );
1.30 +1 -1 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.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- EchoHandler.java 22 Feb 2002 23:39:45 -0000 1.29
+++ EchoHandler.java 25 Feb 2002 17:38:15 -0000 1.30
@@ -83,7 +83,7 @@
msgContext.setResponseMessage( new Message( env ) );
}
catch( Exception e ) {
- log.error( e );
+ log.error( JavaUtils.getMessage("exception00"), e );
throw AxisFault.makeFault(e);
}
log.debug(JavaUtils.getMessage("exit00", "EchoHandler::invoke") );
1.41 +1 -1 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.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- JWSProcessor.java 22 Feb 2002 23:39:45 -0000 1.40
+++ JWSProcessor.java 25 Feb 2002 17:38:15 -0000 1.41
@@ -283,7 +283,7 @@
rpc.cleanup(); // ??
}
catch( Exception e ) {
- log.error( "JWSProcessor Exception", e );
+ log.error( JavaUtils.getMessage("exception00"), e );
throw AxisFault.makeFault(e);
}
1.26 +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.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- LogHandler.java 22 Feb 2002 23:39:45 -0000 1.25
+++ LogHandler.java 25 Feb 2002 17:38:15 -0000 1.26
@@ -100,7 +100,7 @@
pw.close();
} catch( Exception e ) {
- log.error( e );
+ log.error( JavaUtils.getMessage("exception00"), e );
throw AxisFault.makeFault(e);
}
}
@@ -117,7 +117,7 @@
pw.println( "=====================" );
pw.close();
} catch( Exception e ) {
- log.error( e );
+ log.error( JavaUtils.getMessage("exception00"), e );
}
log.debug(JavaUtils.getMessage("exit00", "LogHandler::undo") );
}
1.8 +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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- MD5AttachHandler.java 22 Feb 2002 23:39:45 -0000 1.7
+++ MD5AttachHandler.java 25 Feb 2002 17:38:15 -0000 1.8
@@ -155,7 +155,7 @@
msgContext.setResponseMessage( msg );
}
catch ( Exception e ) {
- log.error( e );
+ log.error( JavaUtils.getMessage("exception00"), e );
throw AxisFault.makeFault(e);
}
log.debug(JavaUtils.getMessage("exit00", "EchoHandler::invoke") );
1.6 +2 -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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- InputStreamBody.java 22 Feb 2002 23:39:45 -0000 1.5
+++ InputStreamBody.java 25 Feb 2002 17:38:16 -0000 1.6
@@ -56,6 +56,7 @@
package org.apache.axis.message;
import org.apache.axis.encoding.SerializationContext;
+import org.apache.axis.utils.JavaUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -87,7 +88,7 @@
throw ex;
}
catch( Exception e ) {
- log.error("outputImpl: caught Exception: ", e);
+ log.error(JavaUtils.getMessage("exception00"), e);
}
}
}
1.81 +1 -1 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.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- MessageElement.java 25 Feb 2002 14:16:26 -0000 1.80
+++ MessageElement.java 25 Feb 2002 17:38:16 -0000 1.81
@@ -569,7 +569,7 @@
return getAsString();
}
catch( Exception exp ) {
- log.error("Exception: ", exp);
+ log.error(JavaUtils.getMessage("exception00"), exp);
return null;
}
}
1.58 +1 -1 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.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- SOAPEnvelope.java 22 Feb 2002 23:39:46 -0000 1.57
+++ SOAPEnvelope.java 25 Feb 2002 17:38:16 -0000 1.58
@@ -129,7 +129,7 @@
dser.parse();
}
catch( Exception e ) {
- log.error("Exception: transforming to RuntimeException: ", e);
+ log.error(JavaUtils.getMessage("exception00"), e);
throw new RuntimeException( e.toString() );
}
}
1.41 +1 -1
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.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- JavaProvider.java 22 Feb 2002 23:39:46 -0000 1.40
+++ JavaProvider.java 25 Feb 2002 17:38:16 -0000 1.41
@@ -258,7 +258,7 @@
resEnv, jc, obj);
}
catch( Exception exp ) {
- log.error( exp );
+ log.error( JavaUtils.getMessage("exception00"), exp );
throw AxisFault.makeFault(exp);
}
if (log.isDebugEnabled())
1.15 +1 -1
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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- SimpleSecurityProvider.java 22 Feb 2002 23:39:46 -0000 1.14
+++ SimpleSecurityProvider.java 25 Feb 2002 17:38:16 -0000 1.15
@@ -123,7 +123,7 @@
lnr.close();
} catch( Exception e ) {
- log.error( e );
+ log.error( JavaUtils.getMessage("exception00"), e );
return;
}
}
1.63 +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.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- AxisServer.java 22 Feb 2002 23:39:46 -0000 1.62
+++ AxisServer.java 25 Feb 2002 17:38:16 -0000 1.63
@@ -93,7 +93,7 @@
} catch (Exception e) {
// If something goes wrong here, should we just fall
// through and use the default one?
- log.error("Exception: ", e);
+ log.error(JavaUtils.getMessage("exception00"), e);
}
}
@@ -230,7 +230,7 @@
if ((h = hr.find( hName )) != null ) {
h.invoke(msgContext);
} else {
- log.error("Couldn't find transport " + hName);
+ log.error(JavaUtils.getMessage("noTransport02", 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 {
- log.error("Couldn't find transport " + hName);
+ log.error(JavaUtils.getMessage("noTransport02", hName));
}
} else {
// No transport set, so use the default (probably just
1.52 +3 -3
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.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- SimpleAxisServer.java 22 Feb 2002 23:39:46 -0000 1.51
+++ SimpleAxisServer.java 25 Feb 2002 17:38:16 -0000 1.52
@@ -458,7 +458,7 @@
} catch (InterruptedIOException iie) {
break;
} catch (Exception e) {
- log.error("Exception: ", e);
+ log.error(JavaUtils.getMessage("exception00"), e);
} finally {
try {
if (socket!=null) socket.close();
@@ -799,7 +799,7 @@
try {
opts = new Options(args);
} catch (MalformedURLException e) {
- log.error("MalformedURLException", e);
+ log.error(JavaUtils.getMessage("malformedURLException00"), e);
return;
}
@@ -809,7 +809,7 @@
sas.setServerSocket(ss);
sas.run();
} catch (Exception e) {
- log.error("Exception", e);
+ log.error(JavaUtils.getMessage("exception00"), e);
return;
}
1.105 +1 -1 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.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- Admin.java 22 Feb 2002 23:39:47 -0000 1.104
+++ Admin.java 25 Feb 2002 17:38:16 -0000 1.105
@@ -799,7 +799,7 @@
}
}
catch( AxisFault af ) {
- log.error( af.dumpToString() );
+ log.error( JavaUtils.getMessage("axisFault01", af.dumpToString()) );
throw af;
}
catch( Exception e ) {
1.60 +20 -1 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.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- resources.properties 22 Feb 2002 23:39:47 -0000 1.59
+++ resources.properties 25 Feb 2002 17:38:16 -0000 1.60
@@ -653,7 +653,26 @@
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
+nodisk00=No disk access, using memory only.
+
+noFactory00=!! No Factory for {0}
+noDeser00=!! No Deserializer for {0}
+noTransport02=Couldn't find transport {0}
+
+noCompiler00=Compiler found in your classpath. Make sure you added 'tools.jar'
+compilerFail00=Please ensure that you have your JDK's rt.jar listed in your
classpath. Jikes needs it to operate.
+
exception00=Exception:
+axisConfigurationException00=ConfigurationException:
parserConfigurationException00=ParserConfigurationException:
SAXException00=SAXException:
-javaNetUnknownHostException00=java.net.UnknownHostException:
\ No newline at end of file
+javaNetUnknownHostException00=java.net.UnknownHostException:
+javaxMailMessagingException00=javax.mail.MessagingException:
+javaIOException00=java.io.IOException:
+illegalAccessException00=IllegalAccessException:
+illegalArgumentException00=IllegalArgumentException:
+invocationTargetException00=InvocationTargetException:
+instantiationException00=InstantiationException:
+malformedURLException00=MalformedURLException:
+axisFault00=AxisFault:
+axisFault01=AxisFault: {0}
\ No newline at end of file
1.5 +4 -2
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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- CompilerFactory.java 22 Feb 2002 23:39:47 -0000 1.4
+++ CompilerFactory.java 25 Feb 2002 17:38:17 -0000 1.5
@@ -55,6 +55,8 @@
package org.apache.axis.utils.compiler;
+import org.apache.axis.utils.JavaUtils;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -62,7 +64,7 @@
* This class implements a factory to instantiate a Compiler.
* @author <a href="mailto:[EMAIL PROTECTED]";>Davanum Srinivas</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Stefano Mazzocchi</a>
- * @version $Revision: 1.4 $ $Date: 2002/02/22 23:39:47 $
+ * @version $Revision: 1.5 $ $Date: 2002/02/25 17:38:17 $
* @since 2.0
*/
public class CompilerFactory {
@@ -81,7 +83,7 @@
} catch (Exception e) {
// If something goes wrong here, should we just fall
// through and use the default one?
- log.error(e.getLocalizedMessage(),e);
+ log.error(JavaUtils.getMessage("exception00"), e);
}
}
log.debug("Using default compiler Javac");
1.6 +5 -3 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Javac.java 22 Feb 2002 23:39:47 -0000 1.5
+++ Javac.java 25 Feb 2002 17:38:17 -0000 1.6
@@ -55,6 +55,8 @@
package org.apache.axis.utils.compiler;
+import org.apache.axis.utils.JavaUtils;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -73,7 +75,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Davanum Srinivas</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Stefano Mazzocchi</a>
- * @version $Revision: 1.5 $ $Date: 2002/02/22 23:39:47 $
+ * @version $Revision: 1.6 $ $Date: 2002/02/25 17:38:17 $
* @since 2.0
*/
@@ -100,8 +102,8 @@
cl.loadClass(CLASSIC_CLASS);
modern = false;
} catch (Exception ex) {
- log.error("No compiler found in your classpath. Make sure you added
'tools.jar'", ex);
- throw new RuntimeException("No compiler found in your classpath. Make
sure you added 'tools.jar'");
+ log.error(JavaUtils.getMessage("noCompiler00"), ex);
+ throw new RuntimeException(JavaUtils.getMessage("noCompiler00"));
}
}
log.debug("Javac compiler class: " + (modern?MODERN_CLASS:CLASSIC_CLASS));
1.5 +5 -3 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Jikes.java 22 Feb 2002 23:39:47 -0000 1.4
+++ Jikes.java 25 Feb 2002 17:38:17 -0000 1.5
@@ -55,6 +55,8 @@
package org.apache.axis.utils.compiler;
+import org.apache.axis.utils.JavaUtils;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -73,7 +75,7 @@
* NOTE: inspired by the Apache Jasper implementation.
* @author <a href="mailto:[EMAIL PROTECTED]";>Davanum Srinivas</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Stefano Mazzocchi</a>
- * @version $Revision: 1.4 $ $Date: 2002/02/22 23:39:47 $
+ * @version $Revision: 1.5 $ $Date: 2002/02/25 17:38:17 $
* @since 2.0
*/
@@ -271,9 +273,9 @@
endcolumn = Integer.parseInt(tokens.nextToken());
} catch (Exception e) {
// FIXME: VG: This is not needed anymore?
- message.append("Please ensure that you have your JDK's rt.jar listed in
your classpath. Jikes needs it to operate.");
+ message.append(JavaUtils.getMessage("compilerFail00"));
type="error";
- log.error(message.toString(), e);
+ log.error(JavaUtils.getMessage("compilerFail00"), e);
}
if ("".equals(message)) {
