axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rsi...@apache.org
Subject cvs commit: xml-axis/java/lib commons-discovery.jar
Date Mon, 09 Sep 2002 17:03:34 GMT
rsitze      2002/09/09 10:03:33

  Modified:    java/src/org/apache/axis/message SOAPFault.java
                        RPCParam.java EnvelopeBuilder.java
                        MessageElement.java InputStreamBody.java
                        SOAPBodyElement.java SOAPHeaderElement.java
                        RPCElement.java RPCHandler.java SOAPEnvelope.java
                        SOAPBody.java BodyBuilder.java SOAPHeader.java
               java/src/org/apache/axis/handlers DebugHandler.java
                        LogHandler.java SimpleSessionHandler.java
                        SimpleAuthorizationHandler.java EchoHandler.java
                        HandlerChainImpl.java
                        SimpleAuthenticationHandler.java
                        MD5AttachHandler.java JWSHandler.java
               java/src/org/apache/axis/configuration
                        EngineConfigurationFactoryFinder.java
                        FileProvider.java
                        EngineConfigurationFactoryServlet.java
               java/src/org/apache/axis/transport/http AdminServlet.java
                        HTTPSender.java CommonsHTTPSender.java
                        SimpleAxisWorker.java SimpleAxisServer.java
                        AxisServlet.java
               java/src/org/apache/axis SOAPPart.java AxisProperties.java
                        SimpleChain.java InternalException.java
                        NoEndPointException.java MessageContext.java
                        Message.java FaultableHandler.java AxisEngine.java
                        Version.java
               java/src/org/apache/axis/providers/java JavaProvider.java
                        MsgProvider.java EJBProvider.java RPCProvider.java
               java/src/org/apache/axis/encoding/ser BeanDeserializer.java
                        BeanSerializer.java EnumSerializer.java
                        DateDeserializer.java ElementDeserializer.java
                        VectorSerializer.java CalendarDeserializer.java
                        ArraySerializer.java BeanPropertyTarget.java
                        ElementSerializer.java MapSerializer.java
                        ArrayDeserializer.java
                        SourceDataHandlerSerializer.java
                        SimpleSerializer.java BaseSerializerFactory.java
                        JAFDataHandlerSerializer.java
                        SimpleDeserializer.java MapDeserializer.java
                        VectorDeserializer.java
                        JAFDataHandlerDeserializer.java
               java/src/org/apache/axis/wsdl/toJava JavaTestCaseWriter.java
                        JavaStubWriter.java JavaServiceIfaceWriter.java
                        JavaServiceImplWriter.java JavaEnumTypeWriter.java
                        JavaSkelWriter.java JavaBindingWriter.java
                        JavaBeanWriter.java JavaClassWriter.java
                        JavaUndeployWriter.java JavaDeployWriter.java
                        JavaBeanHelperWriter.java JavaGeneratorFactory.java
                        JavaWriter.java
               java/src/org/apache/axis/wsdl/symbolTable TypeEntry.java
                        SymbolTable.java
               java/src/org/apache/axis/encoding
                        DefaultTypeMappingImpl.java DeserializerImpl.java
                        TypeMappingDelegate.java MethodTarget.java
                        SerializationContextImpl.java
                        TypeMappingRegistryImpl.java
                        DeserializationContextImpl.java FieldTarget.java
                        TypeMappingImpl.java Base64.java
               java/src/org/apache/axis/attachments
                        MultiPartDimeInputStream.java AttachmentsImpl.java
                        DimeBodyPart.java MultiPartRelatedInputStream.java
                        MimeUtils.java ImageDataSource.java
                        BoundaryDelimitedStream.java
                        DimeTypeNameFormat.java
                        ManagedMemoryDataSource.java AttachmentPart.java
                        AttachmentUtils.java DimeDelimitedInputStream.java
               java/src/org/apache/axis/deployment/wsdd
                        WSDDGlobalConfiguration.java WSDDService.java
                        WSDDTargetedChain.java WSDDProvider.java
                        WSDDDocument.java WSDDElement.java WSDDChain.java
                        WSDDUndeployment.java WSDDHandler.java
                        WSDDTypeMapping.java WSDDJAXRPCHandlerInfo.java
               java/src/org/apache/axis/server AxisServer.java
                        DefaultAxisServerFactory.java
                        JNDIAxisServerFactory.java
               java/src/org/apache/axis/components/image JDK13IO.java
               java/src/org/apache/axis/handlers/soap SOAPService.java
               java/src/org/apache/axis/types UnsignedLong.java Time.java
                        UnsignedByte.java Year.java UnsignedShort.java
                        Token.java Day.java MonthDay.java YearMonth.java
                        Duration.java HexBinary.java NCName.java Month.java
                        UnsignedInt.java NormalizedString.java Name.java
                        NonNegativeInteger.java NMToken.java
               java/src/org/apache/axis/wsdl Java2WSDL.java WSDL2Java.java
               java/samples/echo echoHeaderStructHandler.java
                        echoHeaderStringHandler.java
               java/src/org/apache/axis/security/servlet
                        ServletSecurityProvider.java
               java/src/org/apache/axis/soap SOAPConnectionImpl.java
               java/src/org/apache/axis/utils SessionUtils.java Admin.java
                        NSStack.java BeanUtils.java
                        FieldPropertyDescriptor.java Options.java
                        BeanPropertyDescriptor.java JavaUtils.java
                        XMLUtils.java
               java/src/org/apache/axis/components/compiler Javac.java
                        Jikes.java CompilerFactory.java
               java/src/org/apache/axis/security/simple
                        SimpleSecurityProvider.java
               java/src/org/apache/axis/client AdminClient.java
                        Service.java Call.java Stub.java AxisClient.java
               java/test/utils TestSrcContent.java TestMessages.java
               java/src/org/apache/axis/components/net
                        FakeTrustSocketFactory.java
                        DefaultSocketFactory.java JSSESocketFactory.java
               java/src/org/apache/axis/wsdl/fromJava Types.java
               java/src/org/apache/axis/utils/bytecode ClassReader.java
                        ParamNameExtractor.java ParamReader.java
               java/src/org/apache/axis/wsdl/gen Parser.java WSDL2.java
               java/src/org/apache/axis/description ServiceDesc.java
                        ParameterDesc.java TypeDesc.java
               java/samples/security SignedSOAPEnvelope.java
                        LogHandler.java
               java/src/org/apache/axis/deployment/wsdd/providers
                        WSDDHandlerProvider.java
               java/src/org/apache/axis/enum Enum.java
               java/src/org/apache/axis/handlers/http
                        HTTPActionHandler.java HTTPAuthHandler.java
               java/src/org/apache/axis/transport/local LocalSender.java
               java/lib commons-discovery.jar
  Added:       java/src/org/apache/axis/utils Messages.java
  Log:
  Moved i18n messaging support from o.a.a.utils.JavaUtils to (new class) Messages.
  
  Revision  Changes    Path
  1.6       +2 -1      xml-axis/java/src/org/apache/axis/message/SOAPFault.java
  
  Index: SOAPFault.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/message/SOAPFault.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- SOAPFault.java	26 Jul 2002 20:30:58 -0000	1.5
  +++ SOAPFault.java	9 Sep 2002 17:03:20 -0000	1.6
  @@ -57,6 +57,7 @@
   import org.apache.axis.AxisFault;
   import org.apache.axis.Constants;
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   import org.apache.axis.encoding.DeserializationContext;
   import org.apache.axis.encoding.SerializationContext;
   import org.w3c.dom.Element;
  @@ -258,7 +259,7 @@
        */
       public javax.xml.soap.Detail addDetail() throws SOAPException {
           if(getDetail()!=null){
  -            throw new SOAPException(JavaUtils.getMessage("valuePresent"));
  +            throw new SOAPException(Messages.getMessage("valuePresent"));
           }
           Detail detail = new Detail(fault);
           addChildElement(detail);
  
  
  
  1.48      +2 -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.47
  retrieving revision 1.48
  diff -u -r1.47 -r1.48
  --- RPCParam.java	22 Jul 2002 20:10:05 -0000	1.47
  +++ RPCParam.java	9 Sep 2002 17:03:20 -0000	1.48
  @@ -56,6 +56,7 @@
   
   import org.apache.axis.encoding.SerializationContext;
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   import org.apache.axis.description.ParameterDesc;
   
   import org.apache.axis.components.logger.LogFactory;
  @@ -102,7 +103,7 @@
           try {
               valueSetMethod = cls.getMethod("set", new Class[] {Object.class});
           } catch (NoSuchMethodException e) {
  -            log.error(JavaUtils.getMessage("noValue00", "" + e));
  +            log.error(Messages.getMessage("noValue00", "" + e));
               System.exit(-1);
           }
       }
  
  
  
  1.25      +6 -5      xml-axis/java/src/org/apache/axis/message/EnvelopeBuilder.java
  
  Index: EnvelopeBuilder.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/message/EnvelopeBuilder.java,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- EnvelopeBuilder.java	3 Aug 2002 21:25:25 -0000	1.24
  +++ EnvelopeBuilder.java	9 Sep 2002 17:03:20 -0000	1.25
  @@ -58,6 +58,7 @@
   import org.apache.axis.soap.SOAPConstants;
   import org.apache.axis.encoding.DeserializationContext;
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   import org.xml.sax.Attributes;
   import org.xml.sax.SAXException;
   
  @@ -104,7 +105,7 @@
       {
           if (!localName.equals(Constants.ELEM_ENVELOPE))
               throw new SAXException(
  -                    JavaUtils.getMessage("badTag00", localName));
  +                    Messages.getMessage("badTag00", localName));
   
           if (namespace.equals(Constants.URI_SOAP11_ENV)) {
               // SOAP 1.1
  @@ -114,7 +115,7 @@
               soapConstants = SOAPConstants.SOAP12_CONSTANTS;
           } else {
               throw new SAXException(
  -                    JavaUtils.getMessage("badNamespace00", namespace));
  +                    Messages.getMessage("badNamespace00", namespace));
           }
   
           // Indicate what version of SOAP we're using to anyone else involved
  @@ -137,7 +138,7 @@
           QName thisQName = new QName(namespace, localName);
           if (thisQName.equals(soapConstants.getHeaderQName())) {
               if (gotHeader)
  -                throw new SAXException(JavaUtils.getMessage("only1Header00"));
  +                throw new SAXException(Messages.getMessage("only1Header00"));
   
               gotHeader = true;
               return new HeaderBuilder(envelope);
  @@ -145,14 +146,14 @@
   
           if (thisQName.equals(soapConstants.getBodyQName())) {
               if (gotBody)
  -                throw new SAXException(JavaUtils.getMessage("only1Body00"));
  +                throw new SAXException(Messages.getMessage("only1Body00"));
   
               gotBody = true;
               return new BodyBuilder(envelope);
           }
   
           if (!gotBody)
  -            throw new SAXException(JavaUtils.getMessage("noCustomElems00"));
  +            throw new SAXException(Messages.getMessage("noCustomElems00"));
   
           MessageElement element = new MessageElement(namespace, localName, prefix,
                                        attributes, context);
  
  
  
  1.126     +19 -22    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.125
  retrieving revision 1.126
  diff -u -r1.125 -r1.126
  --- MessageElement.java	8 Sep 2002 01:56:36 -0000	1.125
  +++ MessageElement.java	9 Sep 2002 17:03:20 -0000	1.126
  @@ -64,6 +64,7 @@
   import org.apache.axis.encoding.SerializationContextImpl;
   import org.apache.axis.utils.Mapping;
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   import org.apache.axis.utils.XMLUtils;
   
   import org.apache.axis.components.logger.LogFactory;
  @@ -204,7 +205,7 @@
                      Attributes attributes, DeserializationContext context)
       {
           if (log.isDebugEnabled()) {
  -            log.debug(JavaUtils.getMessage("newElem00", super.toString(),
  +            log.debug(Messages.getMessage("newElem00", super.toString(),
                                               "{" + prefix + "}" + localPart));
               for (int i = 0; attributes != null && i < attributes.getLength(); i++) {
                   log.debug("  " + attributes.getQName(i) + " = '" + attributes.getValue(i) + "'");
  @@ -366,7 +367,7 @@
           }
   
           if(!encodingStyle.equals("") && !Constants.isSOAP_ENC(encodingStyle))
  -                throw new IllegalArgumentException(JavaUtils.getMessage("illegalArgumentException01",encodingStyle));
  +                throw new IllegalArgumentException(Messages.getMessage("illegalArgumentException01",encodingStyle));
   
           this.encodingStyle = encodingStyle;
   
  @@ -397,9 +398,8 @@
       public void addChild(MessageElement el) throws SOAPException
       {
           if (objectValue != null) {
  -            SOAPException exc = new SOAPException(JavaUtils.
  -                                                  getMessage("valuePresent"));
  -            log.error(JavaUtils.getMessage("valuePresent"), exc);
  +            SOAPException exc = new SOAPException(Messages.getMessage("valuePresent"));
  +            log.error(Messages.getMessage("valuePresent"), exc);
               throw exc;
           }
           if (children == null)
  @@ -477,7 +477,7 @@
               return parent.getNamespaceURI(prefix);
   
           if (log.isDebugEnabled()) {
  -            log.debug(JavaUtils.getMessage("noPrefix00", "" + this, prefix));
  +            log.debug(Messages.getMessage("noPrefix00", "" + this, prefix));
           }
   
           return null;
  @@ -510,21 +510,18 @@
        */
       public void setObjectValue(Object newValue) throws SOAPException {
           if (children != null && !children.isEmpty()) {
  -            SOAPException exc = new SOAPException(JavaUtils.
  -                                                  getMessage("childPresent"));
  -            log.error(JavaUtils.getMessage("childPresent"), exc);
  +            SOAPException exc = new SOAPException(Messages.getMessage("childPresent"));
  +            log.error(Messages.getMessage("childPresent"), exc);
               throw exc;
           }
           if (elementRep != null) {
  -            SOAPException exc = new SOAPException(JavaUtils.
  -                                                  getMessage("xmlPresent"));
  -            log.error(JavaUtils.getMessage("xmlPresent"), exc);
  +            SOAPException exc = new SOAPException(Messages.getMessage("xmlPresent"));
  +            log.error(Messages.getMessage("xmlPresent"), exc);
               throw exc;
           }
           if (textRep != null) {
  -            SOAPException exc = new SOAPException(JavaUtils.
  -                                                  getMessage("xmlPresent"));
  -            log.error(JavaUtils.getMessage("xmlPresent"), exc);
  +            SOAPException exc = new SOAPException(Messages.getMessage("xmlPresent"));
  +            log.error(Messages.getMessage("xmlPresent"), exc);
               throw exc;
           }
           this.objectValue = newValue;
  @@ -533,11 +530,11 @@
       public Object getValueAsType(QName type) throws Exception
       {
           if (context == null)
  -            throw new Exception(JavaUtils.getMessage("noContext00"));
  +            throw new Exception(Messages.getMessage("noContext00"));
   
           Deserializer dser = context.getDeserializerForType(type);
           if (dser == null)
  -            throw new Exception(JavaUtils.getMessage("noDeser00", "" + type));
  +            throw new Exception(Messages.getMessage("noDeser00", "" + type));
   
           context.pushElementHandler(new EnvelopeHandler((SOAPHandler)dser));
   
  @@ -647,7 +644,7 @@
           Document doc = XMLUtils.newDocument(new InputSource(reader));
           if (doc == null)
               throw new Exception(
  -                    JavaUtils.getMessage("noDoc00", elementString));
  +                    Messages.getMessage("noDoc00", elementString));
           return doc;
       }
   
  @@ -676,7 +673,7 @@
       public void publishToHandler(ContentHandler handler) throws SAXException
       {
           if (recorder == null)
  -            throw new SAXException(JavaUtils.getMessage("noRecorder00"));
  +            throw new SAXException(Messages.getMessage("noRecorder00"));
   
           recorder.replay(startEventIndex, endEventIndex, handler);
       }
  @@ -684,7 +681,7 @@
       public void publishContents(ContentHandler handler) throws SAXException
       {
           if (recorder == null)
  -            throw new SAXException(JavaUtils.getMessage("noRecorder00"));
  +            throw new SAXException(Messages.getMessage("noRecorder00"));
   
           recorder.replay(startContentsIndex, endEventIndex-1, handler);
       }
  @@ -787,7 +784,7 @@
               return getAsString();
           }
           catch( Exception exp ) {
  -            log.error(JavaUtils.getMessage("exception00"), exp);
  +            log.error(Messages.getMessage("exception00"), exp);
               return null;
           }
       }
  @@ -876,7 +873,7 @@
   
       public void setParentElement(SOAPElement parent) throws SOAPException {
           if(parent == null)
  -            throw new IllegalArgumentException(JavaUtils.getMessage("nullParent00"));
  +            throw new IllegalArgumentException(Messages.getMessage("nullParent00"));
           try {
               setParent((MessageElement)parent);
           } catch (Throwable t) {
  
  
  
  1.12      +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.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- InputStreamBody.java	12 Aug 2002 22:58:47 -0000	1.11
  +++ InputStreamBody.java	9 Sep 2002 17:03:20 -0000	1.12
  @@ -57,6 +57,7 @@
   
   import org.apache.axis.encoding.SerializationContext;
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   
   import org.apache.axis.components.logger.LogFactory;
   import org.apache.commons.logging.Log;
  @@ -89,7 +90,7 @@
               throw ex;
           }
           catch( Exception e ) {
  -            log.error(JavaUtils.getMessage("exception00"), e);
  +            log.error(Messages.getMessage("exception00"), e);
           }        
       }
   }
  
  
  
  1.22      +3 -2      xml-axis/java/src/org/apache/axis/message/SOAPBodyElement.java
  
  Index: SOAPBodyElement.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/message/SOAPBodyElement.java,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- SOAPBodyElement.java	12 Aug 2002 22:58:47 -0000	1.21
  +++ SOAPBodyElement.java	9 Sep 2002 17:03:20 -0000	1.22
  @@ -55,6 +55,7 @@
   package org.apache.axis.message;
   
   import org.apache.axis.encoding.DeserializationContext;
  +import org.apache.axis.utils.Messages;
   import org.apache.axis.utils.XMLUtils;
   import org.apache.axis.utils.JavaUtils;
   import org.w3c.dom.Element;
  @@ -108,10 +109,10 @@
   
       public void setParentElement(SOAPElement parent) throws SOAPException {
           if(parent == null)
  -            throw new IllegalArgumentException(JavaUtils.getMessage("nullParent00")); 
  +            throw new IllegalArgumentException(Messages.getMessage("nullParent00")); 
           // migration aid
           if (parent instanceof SOAPEnvelope) {
  -            log.warn(JavaUtils.getMessage("bodyElementParent"));
  +            log.warn(Messages.getMessage("bodyElementParent"));
               parent = ((SOAPEnvelope)parent).getBody();
           }
           try {
  
  
  
  1.9       +3 -2      xml-axis/java/src/org/apache/axis/message/SOAPHeaderElement.java
  
  Index: SOAPHeaderElement.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/message/SOAPHeaderElement.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- SOAPHeaderElement.java	24 Jul 2002 12:25:36 -0000	1.8
  +++ SOAPHeaderElement.java	9 Sep 2002 17:03:20 -0000	1.9
  @@ -58,6 +58,7 @@
   import org.apache.axis.soap.SOAPConstants;
   import org.apache.axis.encoding.DeserializationContext;
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   import org.w3c.dom.Element;
   import org.xml.sax.Attributes;
   
  @@ -121,9 +122,9 @@
   
       public void setParentElement(SOAPElement parent) throws SOAPException {
           if(parent == null)
  -            throw new IllegalArgumentException(JavaUtils.getMessage("nullParent00")); 
  +            throw new IllegalArgumentException(Messages.getMessage("nullParent00")); 
           if(!(parent instanceof SOAPHeader))
  -            throw new IllegalArgumentException(JavaUtils.getMessage("illegalArgumentException00")); 
  +            throw new IllegalArgumentException(Messages.getMessage("illegalArgumentException00")); 
           try {
               super.setParentElement((SOAPHeader)parent);
           } catch (Throwable t) {
  
  
  
  1.71      +3 -2      xml-axis/java/src/org/apache/axis/message/RPCElement.java
  
  Index: RPCElement.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/message/RPCElement.java,v
  retrieving revision 1.70
  retrieving revision 1.71
  diff -u -r1.70 -r1.71
  --- RPCElement.java	24 Aug 2002 23:11:00 -0000	1.70
  +++ RPCElement.java	9 Sep 2002 17:03:20 -0000	1.71
  @@ -66,6 +66,7 @@
   import org.apache.axis.enum.Style;
   import org.apache.axis.handlers.soap.SOAPService;
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   import org.apache.axis.wsdl.toJava.Utils;
   import org.xml.sax.Attributes;
   import org.xml.sax.SAXException;
  @@ -106,7 +107,7 @@
                   if (serviceDesc == null) {
                       AxisFault.makeFault(
                               new ClassNotFoundException(
  -                                    JavaUtils.getMessage("noClassForService00",
  +                                    Messages.getMessage("noClassForService00",
                                                            lc)));
                   }
   
  @@ -225,7 +226,7 @@
                   throw savedException;
               } else {
                   throw new SAXException(
  -                    JavaUtils.getMessage("noSuchOperation", name));
  +                    Messages.getMessage("noSuchOperation", name));
               }
           }
   
  
  
  
  1.61      +5 -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.60
  retrieving revision 1.61
  diff -u -r1.60 -r1.61
  --- RPCHandler.java	27 Aug 2002 13:11:21 -0000	1.60
  +++ RPCHandler.java	9 Sep 2002 17:03:20 -0000	1.61
  @@ -69,6 +69,7 @@
   import org.apache.axis.encoding.MethodTarget;
   import org.apache.axis.encoding.DeserializerImpl;
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   
   import org.apache.axis.components.logger.LogFactory;
   import org.apache.commons.logging.Log;
  @@ -189,7 +190,7 @@
           }
   
           if (log.isDebugEnabled()) {
  -            log.debug(JavaUtils.getMessage("typeFromAttr00", "" + type));
  +            log.debug(Messages.getMessage("typeFromAttr00", "" + type));
           }
           
   
  @@ -261,7 +262,7 @@
             if (type != null) {
                 dser = context.getDeserializerForType(type);
                 if (dser == null) {
  -                  throw new SAXException(JavaUtils.getMessage(
  +                  throw new SAXException(Messages.getMessage(
                             "noDeser01", localName,"" + type));
                 }
                 if (paramDesc != null && paramDesc.getJavaType() != null) {
  @@ -277,7 +278,7 @@
             } else {
                 dser = new DeserializerImpl();
                 if (dser == null) {
  -                  throw new SAXException(JavaUtils.getMessage(
  +                  throw new SAXException(Messages.getMessage(
                             "noDeser01", localName,"" + type));
                 }
             }
  @@ -300,7 +301,7 @@
           throws SAXException
       {
           if (log.isDebugEnabled()) {
  -            log.debug(JavaUtils.getMessage("setProp00",
  +            log.debug(Messages.getMessage("setProp00",
                       "MessageContext", "RPCHandler.endElement()."));
           }
           context.getMessageContext().setProperty("RPC", rpcElem);
  
  
  
  1.78      +7 -6      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.77
  retrieving revision 1.78
  diff -u -r1.77 -r1.78
  --- SOAPEnvelope.java	12 Aug 2002 22:58:47 -0000	1.77
  +++ SOAPEnvelope.java	9 Sep 2002 17:03:20 -0000	1.78
  @@ -66,6 +66,7 @@
   import org.apache.axis.encoding.SerializationContext;
   import org.apache.axis.utils.JavaUtils;
   import org.apache.axis.utils.Mapping;
  +import org.apache.axis.utils.Messages;
   
   import org.apache.axis.components.logger.LogFactory;
   import org.apache.commons.logging.Log;
  @@ -230,7 +231,7 @@
               header.setParentElement(this);
           } catch (SOAPException ex) {
               // class cast should never fail when parent is a SOAPEnvelope
  -            log.fatal(JavaUtils.getMessage("exception00"), ex);
  +            log.fatal(Messages.getMessage("exception00"), ex);
           }
       }
   
  @@ -252,7 +253,7 @@
               body.setParentElement(this);
           } catch (SOAPException ex) {
               // class cast should never fail when parent is a SOAPEnvelope
  -            log.fatal(JavaUtils.getMessage("exception00"), ex);
  +            log.fatal(Messages.getMessage("exception00"), ex);
           }
       }
   
  @@ -267,7 +268,7 @@
       public void removeTrailer(MessageElement element)
       {
           if (log.isDebugEnabled())
  -            log.debug(JavaUtils.getMessage("removeTrailer00"));
  +            log.debug(Messages.getMessage("removeTrailer00"));
           trailers.removeElement(element);
           _isDirty = true;
       }
  @@ -283,7 +284,7 @@
       public void addTrailer(MessageElement element)
       {
           if (log.isDebugEnabled())
  -            log.debug(JavaUtils.getMessage("removeTrailer00"));
  +            log.debug(Messages.getMessage("removeTrailer00"));
           element.setEnvelope(this);
           trailers.addElement(element);
           _isDirty = true;
  @@ -425,7 +426,7 @@
               body = new SOAPBody(this, soapConstants);
               return body;
           } else {
  -            throw new SOAPException(JavaUtils.getMessage("bodyPresent"));
  +            throw new SOAPException(Messages.getMessage("bodyPresent"));
           }
       }
   
  @@ -434,7 +435,7 @@
               header = new SOAPHeader(this, soapConstants);
               return header;
           } else {
  -            throw new SOAPException(JavaUtils.getMessage("headerPresent"));
  +            throw new SOAPException(Messages.getMessage("headerPresent"));
           }
       }
   
  
  
  
  1.31      +8 -7      xml-axis/java/src/org/apache/axis/message/SOAPBody.java
  
  Index: SOAPBody.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/message/SOAPBody.java,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- SOAPBody.java	9 Sep 2002 13:07:15 -0000	1.30
  +++ SOAPBody.java	9 Sep 2002 17:03:20 -0000	1.31
  @@ -61,6 +61,7 @@
   import org.apache.axis.encoding.SerializationContext;
   import org.apache.axis.soap.SOAPConstants;
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   
   import org.apache.axis.components.logger.LogFactory;
   import org.apache.commons.logging.Log;
  @@ -94,7 +95,7 @@
               setParentElement(env);
           } catch (SOAPException ex) {
               // class cast should never fail when parent is a SOAPEnvelope
  -            log.fatal(JavaUtils.getMessage("exception00"), ex);
  +            log.fatal(Messages.getMessage("exception00"), ex);
           }
       }
   
  @@ -107,7 +108,7 @@
   
       public void setParentElement(SOAPElement parent) throws SOAPException {
           if(parent == null)
  -            throw new IllegalArgumentException(JavaUtils.getMessage("nullParent00")); 
  +            throw new IllegalArgumentException(Messages.getMessage("nullParent00")); 
           try {
               // cast to force exception if wrong type
               super.setParentElement((SOAPEnvelope)parent);
  @@ -167,19 +168,19 @@
       void addBodyElement(SOAPBodyElement element)
       {
           if (log.isDebugEnabled())
  -            log.debug(JavaUtils.getMessage("addBody00"));
  +            log.debug(Messages.getMessage("addBody00"));
           try {
               element.setParentElement(this);
           } catch (SOAPException ex) {
               // class cast should never fail when parent is a SOAPBody
  -            log.fatal(JavaUtils.getMessage("exception00"), ex);
  +            log.fatal(Messages.getMessage("exception00"), ex);
           }
       }
   
       void removeBodyElement(SOAPBodyElement element)
       {
           if (log.isDebugEnabled())
  -            log.debug(JavaUtils.getMessage("removeBody00"));
  +            log.debug(Messages.getMessage("removeBody00"));
           bodyElements.removeElement(element);
       }
   
  @@ -234,7 +235,7 @@
           try {
               return (javax.xml.soap.SOAPFault)getBodyByName(Constants.URI_SOAP11_ENV, Constants.ELEM_FAULT);
           } catch(AxisFault af){
  -            log.fatal(JavaUtils.getMessage("exception00"), af);
  +            log.fatal(Messages.getMessage("exception00"), af);
               return null;
           }
       }
  @@ -244,7 +245,7 @@
               if(getBodyByName(Constants.URI_SOAP11_ENV, Constants.ELEM_FAULT)!=null)
                   return true;
           } catch(AxisFault af){
  -            log.fatal(JavaUtils.getMessage("exception00"), af);
  +            log.fatal(Messages.getMessage("exception00"), af);
           }
           return false;
       }
  
  
  
  1.48      +2 -1      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.47
  retrieving revision 1.48
  diff -u -r1.47 -r1.48
  --- BodyBuilder.java	9 Sep 2002 13:07:15 -0000	1.47
  +++ BodyBuilder.java	9 Sep 2002 17:03:20 -0000	1.48
  @@ -63,6 +63,7 @@
   import org.apache.axis.Constants;
   import org.apache.axis.MessageContext;
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   import org.apache.axis.soap.SOAPConstants;
   import org.apache.axis.description.OperationDesc;
   import org.apache.axis.encoding.DeserializationContext;
  @@ -198,7 +199,7 @@
               if (style == Style.RPC &&
                       context.getMessageContext().getSOAPConstants() ==
                       SOAPConstants.SOAP12_CONSTANTS) {
  -                throw new SAXException(JavaUtils.getMessage("onlyOneBodyFor12"));
  +                throw new SAXException(Messages.getMessage("onlyOneBodyFor12"));
               }
               element = new SOAPBodyElement(namespace, localName, prefix,
                                         attributes, context);
  
  
  
  1.56      +7 -6      xml-axis/java/src/org/apache/axis/message/SOAPHeader.java
  
  Index: SOAPHeader.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/message/SOAPHeader.java,v
  retrieving revision 1.55
  retrieving revision 1.56
  diff -u -r1.55 -r1.56
  --- SOAPHeader.java	8 Sep 2002 01:56:36 -0000	1.55
  +++ SOAPHeader.java	9 Sep 2002 17:03:20 -0000	1.56
  @@ -61,6 +61,7 @@
   import org.apache.axis.encoding.DeserializationContext;
   import org.apache.axis.encoding.SerializationContext;
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   import org.apache.axis.handlers.soap.SOAPService;
   
   import org.apache.axis.components.logger.LogFactory;
  @@ -99,7 +100,7 @@
               setParentElement(env);
           } catch (SOAPException ex) {
               // class cast should never fail when parent is a SOAPEnvelope
  -            log.fatal(JavaUtils.getMessage("exception00"), ex);
  +            log.fatal(Messages.getMessage("exception00"), ex);
           }
       }
   
  @@ -112,7 +113,7 @@
   
       public void setParentElement(SOAPElement parent) throws SOAPException {
           if(parent == null)
  -            throw new IllegalArgumentException(JavaUtils.getMessage("nullParent00")); 
  +            throw new IllegalArgumentException(Messages.getMessage("nullParent00")); 
           try {
               // cast to force exception if wrong type
               super.setParentElement((SOAPEnvelope)parent);
  @@ -178,18 +179,18 @@
   
       void addHeader(SOAPHeaderElement header) {
           if (log.isDebugEnabled())
  -            log.debug(JavaUtils.getMessage("addHeader00"));
  +            log.debug(Messages.getMessage("addHeader00"));
           try {
               header.setParentElement(this);
           } catch (SOAPException ex) {
               // class cast should never fail when parent is a SOAPHeader
  -            log.fatal(JavaUtils.getMessage("exception00"), ex);
  +            log.fatal(Messages.getMessage("exception00"), ex);
           }
       }
   
       void removeHeader(SOAPHeaderElement header) {
           if (log.isDebugEnabled())
  -            log.debug(JavaUtils.getMessage("removeHeader00"));
  +            log.debug(Messages.getMessage("removeHeader00"));
           headers.removeElement(header);
       }
   
  @@ -304,7 +305,7 @@
   
           if (log.isDebugEnabled())
               log.debug(headers.size() + " "
  -                    + JavaUtils.getMessage("headers00"));
  +                    + Messages.getMessage("headers00"));
   
           if (!headers.isEmpty()) {
               // Output <SOAP-ENV:Header>
  
  
  
  1.41      +4 -3      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.40
  retrieving revision 1.41
  diff -u -r1.40 -r1.41
  --- DebugHandler.java	12 Aug 2002 22:58:46 -0000	1.40
  +++ DebugHandler.java	9 Sep 2002 17:03:20 -0000	1.41
  @@ -62,6 +62,7 @@
   import org.apache.axis.message.SOAPEnvelope;
   import org.apache.axis.message.SOAPHeaderElement;
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   
   import org.apache.axis.components.logger.LogFactory;
   import org.apache.commons.logging.Log;
  @@ -90,16 +91,16 @@
                   Integer i = ((Integer)header
                                .getValueAsType(Constants.XSD_INT));
                   if (i == null)
  -                    throw new AxisFault(JavaUtils.getMessage("cantConvert03"));
  +                    throw new AxisFault(Messages.getMessage("cantConvert03"));
   
                   int debugVal = i.intValue();
  -                log.debug(JavaUtils.getMessage("debugLevel00", "" + debugVal) );
  +                log.debug(Messages.getMessage("debugLevel00", "" + debugVal) );
                   //Debug.setDebugLevel(debugVal);
                   header.setProcessed(true);
               }
           }
           catch( Exception e ) {
  -            log.error( JavaUtils.getMessage("exception00"), e );
  +            log.error( Messages.getMessage("exception00"), e );
               throw AxisFault.makeFault(e);
           }
           log.debug("Exit: DebugHandler::invoke");
  
  
  
  1.34      +7 -6      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.33
  retrieving revision 1.34
  diff -u -r1.33 -r1.34
  --- LogHandler.java	12 Aug 2002 22:58:46 -0000	1.33
  +++ LogHandler.java	9 Sep 2002 17:03:20 -0000	1.34
  @@ -59,6 +59,7 @@
   import org.apache.axis.Message;
   import org.apache.axis.MessageContext;
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   
   import org.apache.axis.components.logger.LogFactory;
   import org.apache.commons.logging.Log;
  @@ -89,17 +90,17 @@
                   Message outMsg = msgContext.getResponseMessage();
   
                   pw.println( "=======================================================" );
  -                pw.println( "= " + JavaUtils.getMessage("elapsed00",
  +                pw.println( "= " + Messages.getMessage("elapsed00",
                          "" + (System.currentTimeMillis() - start)));
  -                pw.println( "= " + JavaUtils.getMessage("inMsg00",
  +                pw.println( "= " + Messages.getMessage("inMsg00",
                          (inMsg == null ? "null" : inMsg.getSOAPPartAsString())));
  -                pw.println( "= " + JavaUtils.getMessage("outMsg00",
  +                pw.println( "= " + Messages.getMessage("outMsg00",
                          (outMsg == null ? "null" : outMsg.getSOAPPartAsString())));
                   pw.println( "=======================================================" );
   
                   pw.close();
               } catch( Exception e ) {
  -                log.error( JavaUtils.getMessage("exception00"), e );
  +                log.error( Messages.getMessage("exception00"), e );
                   throw AxisFault.makeFault(e);
               }
           }
  @@ -112,11 +113,11 @@
               FileWriter  fw   = new FileWriter( "axis.log", true );
               PrintWriter pw   = new PrintWriter( fw );
               pw.println( "=====================" );
  -            pw.println( "= " + JavaUtils.getMessage("fault00") );
  +            pw.println( "= " + Messages.getMessage("fault00") );
               pw.println( "=====================" );
               pw.close();
           } catch( Exception e ) {
  -            log.error(JavaUtils.getMessage("exception00"), e );
  +            log.error(Messages.getMessage("exception00"), e );
           }
           log.debug("Exit: LogHandler::undo");
       }
  
  
  
  1.29      +4 -3      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.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- SimpleSessionHandler.java	11 Jul 2002 14:53:15 -0000	1.28
  +++ SimpleSessionHandler.java	9 Sep 2002 17:03:20 -0000	1.29
  @@ -64,6 +64,7 @@
   import org.apache.axis.message.SOAPHeaderElement;
   import org.apache.axis.session.SimpleSession;
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   import org.apache.axis.utils.SessionUtils;
   
   import org.apache.axis.components.logger.LogFactory;
  @@ -164,7 +165,7 @@
                   SimpleSession session = (SimpleSession) entry.getValue();
                   if ((curTime - session.getLastAccessTime()) >
                        (session.getTimeout() * 1000)) {
  -                    log.debug(JavaUtils.getMessage("timeout00",
  +                    log.debug(Messages.getMessage("timeout00",
                                                           key.toString()));
   
                       // Don't modify the hashtable while we're iterating.
  @@ -237,7 +238,7 @@
               // We have a session ID, so insert the header
               Message msg = context.getRequestMessage();
               if (msg == null)
  -                throw new AxisFault(JavaUtils.getMessage("noRequest00"));
  +                throw new AxisFault(Messages.getMessage("noRequest00"));
               
               SOAPEnvelope env = msg.getSOAPEnvelope();
               SOAPHeaderElement header = new SOAPHeaderElement(SESSION_NS,
  @@ -271,7 +272,7 @@
               // Request.  Set up the session if we find the header.
               Message msg = context.getRequestMessage();
               if (msg == null)
  -                throw new AxisFault(JavaUtils.getMessage("noRequest00"));
  +                throw new AxisFault(Messages.getMessage("noRequest00"));
               
               SOAPEnvelope env = msg.getSOAPEnvelope();
               SOAPHeaderElement header = env.getHeaderByName(SESSION_NS,
  
  
  
  1.37      +9 -8      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.36
  retrieving revision 1.37
  diff -u -r1.36 -r1.37
  --- SimpleAuthorizationHandler.java	12 Aug 2002 22:58:46 -0000	1.36
  +++ SimpleAuthorizationHandler.java	9 Sep 2002 17:03:20 -0000	1.37
  @@ -61,6 +61,7 @@
   import org.apache.axis.security.AuthenticatedUser;
   import org.apache.axis.security.SecurityProvider;
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   
   import org.apache.axis.components.logger.LogFactory;
   import org.apache.commons.logging.Log;
  @@ -100,13 +101,13 @@
   
           if (user == null)
               throw new AxisFault("Server.NoUser",
  -                    JavaUtils.getMessage("needUser00"), null, null);
  +                    Messages.getMessage("needUser00"), null, null);
   
           String userID = user.getName();
           Handler serviceHandler = msgContext.getService();
   
           if (serviceHandler == null)
  -            throw new AxisFault(JavaUtils.getMessage("needService00"));
  +            throw new AxisFault(Messages.getMessage("needService00"));
   
           String serviceName = serviceHandler.getName();
   
  @@ -114,16 +115,16 @@
           if (allowedRoles == null) {
               if (allowByDefault) {
                   if (log.isDebugEnabled()) {
  -                    log.debug(JavaUtils.getMessage( "noRoles00"));
  +                    log.debug(Messages.getMessage( "noRoles00"));
                   }
               }
               else {
                   if (log.isDebugEnabled()) {
  -                    log.debug(JavaUtils.getMessage( "noRoles01"));
  +                    log.debug(Messages.getMessage( "noRoles01"));
                   }
   
                   throw new AxisFault( "Server.Unauthorized",
  -                    JavaUtils.getMessage("notAuth00", userID, serviceName),
  +                    Messages.getMessage("notAuth00", userID, serviceName),
                       null, null );
               }
   
  @@ -135,7 +136,7 @@
   
           SecurityProvider provider = (SecurityProvider)msgContext.getProperty("securityProvider");
           if (provider == null)
  -            throw new AxisFault(JavaUtils.getMessage("noSecurity00"));
  +            throw new AxisFault(Messages.getMessage("noSecurity00"));
   
           StringTokenizer st = new StringTokenizer(allowedRoles, ",");
           while (st.hasMoreTokens()) {
  @@ -143,7 +144,7 @@
               if (provider.userMatches(user, thisRole)) {
   
                   if (log.isDebugEnabled()) {
  -                    log.debug(JavaUtils.getMessage("auth01", 
  +                    log.debug(Messages.getMessage("auth01", 
                           userID, serviceName));
                   }
   
  @@ -155,7 +156,7 @@
           }
   
           throw new AxisFault( "Server.Unauthorized",
  -            JavaUtils.getMessage("cantAuth02", userID, serviceName),
  +            Messages.getMessage("cantAuth02", userID, serviceName),
               null, null );
       }
   
  
  
  
  1.37      +2 -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.36
  retrieving revision 1.37
  diff -u -r1.36 -r1.37
  --- EchoHandler.java	12 Aug 2002 22:58:46 -0000	1.36
  +++ EchoHandler.java	9 Sep 2002 17:03:20 -0000	1.37
  @@ -60,6 +60,7 @@
   import org.apache.axis.MessageContext;
   import org.apache.axis.message.SOAPEnvelope;
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   import org.apache.axis.utils.XMLUtils;
   
   import org.apache.axis.components.logger.LogFactory;
  @@ -83,7 +84,7 @@
               msgContext.setResponseMessage( new Message( env ) );
           }
           catch( Exception e ) {
  -            log.error( JavaUtils.getMessage("exception00"), e );
  +            log.error( Messages.getMessage("exception00"), e );
               throw AxisFault.makeFault(e);
           }
           log.debug("Exit: EchoHandler::invoke");
  
  
  
  1.5       +3 -2      xml-axis/java/src/org/apache/axis/handlers/HandlerChainImpl.java
  
  Index: HandlerChainImpl.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/handlers/HandlerChainImpl.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- HandlerChainImpl.java	29 Aug 2002 21:02:39 -0000	1.4
  +++ HandlerChainImpl.java	9 Sep 2002 17:03:21 -0000	1.5
  @@ -57,6 +57,7 @@
   
   import org.apache.axis.utils.ClassUtils;
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   
   import javax.xml.rpc.JAXRPCException;
   import javax.xml.rpc.handler.Handler;
  @@ -104,7 +105,7 @@
               handlerInfos.add(handlerInfo);
               add(newHandler(handlerInfo));
           } catch (Exception ex) {
  -            String messageText = JavaUtils.getMessage("NoJAXRPCHandler00", className);
  +            String messageText = Messages.getMessage("NoJAXRPCHandler00", className);
               throw new JAXRPCException(messageText, ex);
           }
       }
  @@ -164,7 +165,7 @@
               handler.init(handlerInfo);
               return handler;
           } catch (Exception ex) {
  -            String messageText = JavaUtils.getMessage("NoJAXRPCHandler00", handlerInfo.getHandlerClass().toString());
  +            String messageText = Messages.getMessage("NoJAXRPCHandler00", handlerInfo.getHandlerClass().toString());
               throw new JAXRPCException(messageText, ex);
           }
       }
  
  
  
  1.34      +6 -5      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.33
  retrieving revision 1.34
  diff -u -r1.33 -r1.34
  --- SimpleAuthenticationHandler.java	12 Aug 2002 22:58:46 -0000	1.33
  +++ SimpleAuthenticationHandler.java	9 Sep 2002 17:03:21 -0000	1.34
  @@ -61,6 +61,7 @@
   import org.apache.axis.security.SecurityProvider;
   import org.apache.axis.security.simple.SimpleSecurityProvider;
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   
   import org.apache.axis.components.logger.LogFactory;
   import org.apache.commons.logging.Log;
  @@ -98,18 +99,18 @@
           if (provider != null) {
               String  userID = msgContext.getUsername();
               if (log.isDebugEnabled()) {
  -                log.debug( JavaUtils.getMessage("user00", userID) );
  +                log.debug( Messages.getMessage("user00", userID) );
               }
   
               // in order to authenticate, the user must exist
               if ( userID == null || userID.equals(""))
                   throw new AxisFault( "Server.Unauthenticated",
  -                    JavaUtils.getMessage("cantAuth00", userID),
  +                    Messages.getMessage("cantAuth00", userID),
                       null, null );
   
               String passwd = msgContext.getPassword();
               if (log.isDebugEnabled()) {
  -                log.debug( JavaUtils.getMessage("password00", passwd) );
  +                log.debug( Messages.getMessage("password00", passwd) );
               }
   
               AuthenticatedUser authUser = provider.authenticate(msgContext);
  @@ -117,11 +118,11 @@
               // if a password is defined, then it must match
               if ( authUser == null)
                   throw new AxisFault( "Server.Unauthenticated",
  -                    JavaUtils.getMessage("cantAuth01", userID),
  +                    Messages.getMessage("cantAuth01", userID),
                       null, null );
   
               if (log.isDebugEnabled()) {
  -                log.debug( JavaUtils.getMessage("auth00", userID) );
  +                log.debug( Messages.getMessage("auth00", userID) );
               }
   
               msgContext.setProperty(MessageContext.AUTHUSER, authUser);
  
  
  
  1.17      +2 -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.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- MD5AttachHandler.java	12 Aug 2002 22:58:46 -0000	1.16
  +++ MD5AttachHandler.java	9 Sep 2002 17:03:21 -0000	1.17
  @@ -61,6 +61,7 @@
   import org.apache.axis.MessageContext;
   import org.apache.axis.message.SOAPEnvelope;
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   
   import org.apache.axis.components.logger.LogFactory;
   import org.apache.commons.logging.Log;
  @@ -153,7 +154,7 @@
               msgContext.setResponseMessage( msg );
           }
           catch ( Exception e ) {
  -            log.error( JavaUtils.getMessage("exception00"), e );
  +            log.error( Messages.getMessage("exception00"), e );
               throw AxisFault.makeFault(e);
           }
           
  
  
  
  1.24      +6 -5      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.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- JWSHandler.java	23 Aug 2002 15:08:56 -0000	1.23
  +++ JWSHandler.java	9 Sep 2002 17:03:21 -0000	1.24
  @@ -63,6 +63,7 @@
   import org.apache.axis.description.ServiceDesc;
   import org.apache.axis.enum.Scope;
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   import org.apache.axis.utils.XMLUtils;
   import org.apache.axis.utils.ClassUtils;
   import org.apache.axis.utils.JWSClassLoader;
  @@ -122,7 +123,7 @@
           try {
               setupService(msgContext);
           } catch (Exception e) {
  -            log.error( JavaUtils.getMessage("exception00"), e );
  +            log.error( Messages.getMessage("exception00"), e );
               throw AxisFault.makeFault(e);
           }
       }
  @@ -218,8 +219,8 @@
                   /* java file then recompile the java file.                 */
                   /* Start by copying the *.jws file to *.java               */
                   /***********************************************************/
  -                log.debug(JavaUtils.getMessage("compiling00", jwsFile) );
  -                log.debug(JavaUtils.getMessage("copy00", jwsFile, jFile) );
  +                log.debug(Messages.getMessage("compiling00", jwsFile) );
  +                log.debug(Messages.getMessage("copy00", jwsFile, jFile) );
                   FileReader fr = new FileReader( jwsFile );
                   FileWriter fw = new FileWriter( jFile );
                   char[] buf = new char[4096];
  @@ -274,7 +275,7 @@
                       }
                       root.appendChild( doc.createTextNode( message.toString() ) );
                       throw new AxisFault( "Server.compileError",
  -                                         JavaUtils.getMessage("badCompile00", jFile),
  +                                         Messages.getMessage("badCompile00", jFile),
                                            null, new Element[] { root } );
                   }
                   ClassUtils.removeClassLoader( clsName );
  @@ -467,7 +468,7 @@
           try {
               setupService(msgContext);
           } catch (Exception e) {
  -            log.error( JavaUtils.getMessage("exception00"), e );
  +            log.error( Messages.getMessage("exception00"), e );
               throw AxisFault.makeFault(e);
           }
       }
  
  
  
  1.8       +7 -6      xml-axis/java/src/org/apache/axis/configuration/EngineConfigurationFactoryFinder.java
  
  Index: EngineConfigurationFactoryFinder.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/configuration/EngineConfigurationFactoryFinder.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- EngineConfigurationFactoryFinder.java	5 Sep 2002 17:31:03 -0000	1.7
  +++ EngineConfigurationFactoryFinder.java	9 Sep 2002 17:03:21 -0000	1.8
  @@ -60,6 +60,7 @@
   import org.apache.axis.EngineConfigurationFactory;
   import org.apache.axis.components.logger.LogFactory;
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   import org.apache.commons.discovery.ResourceClassIterator;
   import org.apache.commons.discovery.ResourceNameIterator;
   import org.apache.commons.discovery.resource.ClassLoaders;
  @@ -158,7 +159,7 @@
               try {
                   factory = EngineConfigurationFactoryServlet.newFactory(obj);
               } catch (Exception e) {
  -                log.warn(JavaUtils.getMessage("engineConfigInvokeNewFactory",
  +                log.warn(Messages.getMessage("engineConfigInvokeNewFactory",
                                                 EngineConfigurationFactoryServlet.class.getName(),
                                                 requiredMethod), e);
               }
  @@ -168,7 +169,7 @@
                       // should NEVER return null.
                       factory = EngineConfigurationFactoryDefault.newFactory(obj);
                   } catch (Exception e) {
  -                    log.warn(JavaUtils.getMessage("engineConfigInvokeNewFactory",
  +                    log.warn(Messages.getMessage("engineConfigInvokeNewFactory",
                                                     EngineConfigurationFactoryDefault.class.getName(),
                                                     requiredMethod), e);
                   }
  @@ -177,9 +178,9 @@
   
           if (factory != null) {
               if(log.isDebugEnabled())
  -                log.debug(JavaUtils.getMessage("engineFactory", factory.getClass().getName()));
  +                log.debug(Messages.getMessage("engineFactory", factory.getClass().getName()));
           } else {
  -            log.error(JavaUtils.getMessage("engineConfigFactoryMissing"));
  +            log.error(Messages.getMessage("engineConfigFactoryMissing"));
               // we should be throwing an exception here,
               //
               // but again, requires more refactoring than we want to swallow
  @@ -211,14 +212,14 @@
   
   
           if (method == null) {
  -            log.warn(JavaUtils.getMessage("engineConfigMissingNewFactory",
  +            log.warn(Messages.getMessage("engineConfigMissingNewFactory",
                                             service.getName(),
                                             requiredMethod));
           } else {
               try {
                   return (EngineConfigurationFactory)method.invoke(null, param);
               } catch (Exception e) {
  -                log.warn(JavaUtils.getMessage("engineConfigInvokeNewFactory",
  +                log.warn(Messages.getMessage("engineConfigInvokeNewFactory",
                                                 service.getName(),
                                                 requiredMethod), e);
               }
  
  
  
  1.37      +4 -3      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.36
  retrieving revision 1.37
  diff -u -r1.36 -r1.37
  --- FileProvider.java	12 Aug 2002 22:35:56 -0000	1.36
  +++ FileProvider.java	9 Sep 2002 17:03:21 -0000	1.37
  @@ -66,6 +66,7 @@
   import org.apache.axis.deployment.wsdd.WSDDService;
   import org.apache.axis.encoding.TypeMappingRegistry;
   import org.apache.axis.utils.Admin;
  +import org.apache.axis.utils.Messages;
   import org.apache.axis.utils.XMLUtils;
   import org.apache.axis.utils.JavaUtils;
   import org.apache.axis.utils.ClassUtils;
  @@ -138,7 +139,7 @@
            * exception to make it easier to debug setup problems.
            */
           if (!dir.isDirectory() || !dir.canRead()) {
  -            throw new ConfigurationException(JavaUtils.getMessage
  +            throw new ConfigurationException(Messages.getMessage
                                                ("invalidConfigFilePath",
                                                 basepath));
           }
  @@ -159,7 +160,7 @@
            * as configuration changes will not persist.
            */
           if (readOnly) {
  -            log.info(JavaUtils.getMessage("readOnlyConfigFile"));
  +            log.info(Messages.getMessage("readOnlyConfigFile"));
           }
       }
   
  @@ -203,7 +204,7 @@
   
               if (myInputStream == null) {
                   throw new ConfigurationException(
  -                        JavaUtils.getMessage("noConfigFile"));
  +                        Messages.getMessage("noConfigFile"));
               }
   
               WSDDDocument doc = new WSDDDocument(XMLUtils.
  
  
  
  1.8       +2 -1      xml-axis/java/src/org/apache/axis/configuration/EngineConfigurationFactoryServlet.java
  
  Index: EngineConfigurationFactoryServlet.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/configuration/EngineConfigurationFactoryServlet.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- EngineConfigurationFactoryServlet.java	30 Aug 2002 19:13:05 -0000	1.7
  +++ EngineConfigurationFactoryServlet.java	9 Sep 2002 17:03:21 -0000	1.8
  @@ -64,6 +64,7 @@
   import org.apache.axis.EngineConfigurationFactory;
   import org.apache.axis.components.logger.LogFactory;
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   import org.apache.commons.logging.Log;
   
   /**
  @@ -154,7 +155,7 @@
               if (rootPath != null) {
                   name = rootPath + name;
               }
  -            log.error(JavaUtils.getMessage("servletEngineWebInfError01",
  +            log.error(Messages.getMessage("servletEngineWebInfError01",
                                              name));
               config = null;
           } else {
  
  
  
  1.19      +7 -6      xml-axis/java/src/org/apache/axis/transport/http/AdminServlet.java
  
  Index: AdminServlet.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/transport/http/AdminServlet.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- AdminServlet.java	7 Sep 2002 00:06:29 -0000	1.18
  +++ AdminServlet.java	9 Sep 2002 17:03:21 -0000	1.19
  @@ -63,6 +63,7 @@
   
   import org.apache.axis.server.AxisServer;
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   
   import org.apache.axis.components.logger.LogFactory;
   import org.apache.commons.logging.Log;
  @@ -105,26 +106,26 @@
               if (isDevelopment()) {
                   //only in dev mode do these command work
                   if (cmd.equals("start")) {
  -                    log.info(JavaUtils.getMessage("adminServiceStart", callerIP));
  +                    log.info(Messages.getMessage("adminServiceStart", callerIP));
                       server.start();
                   }
                   else if (cmd.equals("stop")) {
  -                    log.info(JavaUtils.getMessage("adminServiceStop", callerIP));
  +                    log.info(Messages.getMessage("adminServiceStop", callerIP));
                       server.stop();
                   }
               } else {
                   //in production we log a hostile probe. Remember: logs can be
                   //used for DoS attacks themselves.
  -                log.info(JavaUtils.getMessage("adminServiceDeny", callerIP));
  +                log.info(Messages.getMessage("adminServiceDeny", callerIP));
               }
           }
   
           // display status
           if (server.isRunning()) {
  -            buffer.append(JavaUtils.getMessage("serverRun00"));
  +            buffer.append(Messages.getMessage("serverRun00"));
           }
           else {
  -            buffer.append(JavaUtils.getMessage("serverStop00"));
  +            buffer.append(Messages.getMessage("serverStop00"));
           }
           //add commands
           if(isDevelopment()) {
  @@ -133,7 +134,7 @@
           }
           //print load
           buffer.append("<p>");
  -        buffer.append(JavaUtils.getMessage("adminServiceLoad",
  +        buffer.append(Messages.getMessage("adminServiceLoad",
                   Integer.toString(getLoadCounter())));
           buffer.append("\n</body></html>\n");
           response.getWriter().print( new String(buffer) );
  
  
  
  1.83      +11 -10    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.82
  retrieving revision 1.83
  diff -u -r1.82 -r1.83
  --- HTTPSender.java	24 Aug 2002 23:20:50 -0000	1.82
  +++ HTTPSender.java	9 Sep 2002 17:03:21 -0000	1.83
  @@ -64,6 +64,7 @@
   import org.apache.axis.encoding.Base64;
   import org.apache.axis.handlers.BasicHandler;
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   import org.apache.commons.logging.Log;
   
   import javax.xml.soap.SOAPException;
  @@ -98,7 +99,7 @@
       public void invoke(MessageContext msgContext) throws AxisFault {
   
           if (log.isDebugEnabled()) {
  -            log.debug(JavaUtils.getMessage("enter00", "HTTPSender::invoke"));
  +            log.debug(Messages.getMessage("enter00", "HTTPSender::invoke"));
           }
           try {
               BooleanHolder useFullURL = new BooleanHolder(false);
  @@ -132,7 +133,7 @@
               throw AxisFault.makeFault(e);
           }
           if (log.isDebugEnabled()) {
  -            log.debug(JavaUtils.getMessage("exit00",
  +            log.debug(Messages.getMessage("exit00",
                       "HTTPDispatchHandler::invoke"));
           }
       }
  @@ -430,7 +431,7 @@
   
                       AxisFault fault = new AxisFault("HTTP", "(" + returnCode+ ")" + statusMessage, null, null);
   
  -                    fault.setFaultDetailString(JavaUtils.getMessage("return01",
  +                    fault.setFaultDetailString(Messages.getMessage("return01",
                               "" + returnCode, ""));
                       throw fault;
                  }
  @@ -442,7 +443,7 @@
               try {
                   reqMessage.writeTo(out);
               } catch (SOAPException e) {
  -                log.error(JavaUtils.getMessage("exception00"), e);
  +                log.error(Messages.getMessage("exception00"), e);
               }
               out.flush();
               chunkedOutputStream.eos();
  @@ -469,7 +470,7 @@
   
                       AxisFault fault = new AxisFault("HTTP", "(" + returnCode+ ")" + statusMessage, null, null);
   
  -                    fault.setFaultDetailString(JavaUtils.getMessage("return01",
  +                    fault.setFaultDetailString(Messages.getMessage("return01",
                               "" + returnCode, ""));
                       throw fault;
                  }
  @@ -482,13 +483,13 @@
                           .getBytes(HTTPConstants.HEADER_DEFAULT_CHAR_ENCODING));
                   reqMessage.writeTo(out);
               } catch (SOAPException e) {
  -                log.error(JavaUtils.getMessage("exception00"), e);
  +                log.error(Messages.getMessage("exception00"), e);
               }
               // Flush ONLY once.
               out.flush();
           }
           if (log.isDebugEnabled()) {
  -            log.debug(JavaUtils.getMessage("xmlSent00"));
  +            log.debug(Messages.getMessage("xmlSent00"));
               log.debug("---------------------------------------------------");
               log.debug(header + reqEnv);
           }
  @@ -627,7 +628,7 @@
               }
               AxisFault fault = new AxisFault("HTTP", "(" + returnCode + ")" + statusMessage, null, null);
   
  -            fault.setFaultDetailString(JavaUtils.getMessage("return01",
  +            fault.setFaultDetailString(Messages.getMessage("return01",
                       "" + returnCode, buf.toString()));
               throw fault;
           }
  @@ -665,9 +666,9 @@
               if (log.isDebugEnabled()) {
                   if (null == contentLength) {
                       log.debug("\n"
  -                            + JavaUtils.getMessage("no00", "Content-Length"));
  +                            + Messages.getMessage("no00", "Content-Length"));
                   }
  -                log.debug("\n" + JavaUtils.getMessage("xmlRecd00"));
  +                log.debug("\n" + Messages.getMessage("xmlRecd00"));
                   log.debug("-----------------------------------------------");
                   log.debug((String) outMsg.getSOAPPartAsString());
               }
  
  
  
  1.6       +7 -6      xml-axis/java/src/org/apache/axis/transport/http/CommonsHTTPSender.java
  
  Index: CommonsHTTPSender.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/transport/http/CommonsHTTPSender.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- CommonsHTTPSender.java	23 Aug 2002 19:07:19 -0000	1.5
  +++ CommonsHTTPSender.java	9 Sep 2002 17:03:21 -0000	1.6
  @@ -62,6 +62,7 @@
   import org.apache.axis.encoding.Base64;
   import org.apache.axis.handlers.BasicHandler;
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   import org.apache.axis.components.net.TransportClientProperties;
   import org.apache.axis.components.net.TransportClientPropertiesFactory;
   import org.apache.commons.httpclient.Credentials;
  @@ -99,7 +100,7 @@
       public void invoke(MessageContext msgContext) throws AxisFault {
   
           if (log.isDebugEnabled()) {
  -            log.debug(JavaUtils.getMessage("enter00",
  +            log.debug(Messages.getMessage("enter00",
                       "CommonsHTTPSender::invoke"));
           }
           try {
  @@ -164,7 +165,7 @@
                           + statusMessage, null,
                           null);
   
  -                fault.setFaultDetailString(JavaUtils.getMessage("return01",
  +                fault.setFaultDetailString(Messages.getMessage("return01",
                           "" + returnCode, method.getResponseBodyAsString()));
                   throw fault;
               }
  @@ -176,9 +177,9 @@
               if (log.isDebugEnabled()) {
                   if (null == contentLength) {
                       log.debug("\n"
  -                            + JavaUtils.getMessage("no00", "Content-Length"));
  +                            + Messages.getMessage("no00", "Content-Length"));
                   }
  -                log.debug("\n" + JavaUtils.getMessage("xmlRecd00"));
  +                log.debug("\n" + Messages.getMessage("xmlRecd00"));
                   log.debug("-----------------------------------------------");
                   log.debug((String) outMsg.getSOAPPartAsString());
               }
  @@ -199,7 +200,7 @@
               throw AxisFault.makeFault(e);
           }
           if (log.isDebugEnabled()) {
  -            log.debug(JavaUtils.getMessage("exit00",
  +            log.debug(Messages.getMessage("exit00",
                       "CommonsHTTPSender::invoke"));
           }
       }
  @@ -427,7 +428,7 @@
               String pattern = tokenizer.nextToken();
   
               if (log.isDebugEnabled()) {
  -                log.debug(JavaUtils.getMessage("match00",
  +                log.debug(Messages.getMessage("match00",
                           new String[]{"HTTPSender",
                                        host,
                                        pattern}));
  
  
  
  1.18      +16 -15    xml-axis/java/src/org/apache/axis/transport/http/SimpleAxisWorker.java
  
  Index: SimpleAxisWorker.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/transport/http/SimpleAxisWorker.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- SimpleAxisWorker.java	4 Sep 2002 19:19:22 -0000	1.17
  +++ SimpleAxisWorker.java	9 Sep 2002 17:03:21 -0000	1.18
  @@ -66,6 +66,7 @@
   import org.apache.axis.message.SOAPFault;
   import org.apache.axis.server.AxisServer;
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   import org.apache.axis.utils.XMLUtils;
   
   import org.apache.axis.components.logger.LogFactory;
  @@ -92,9 +93,9 @@
       private static String transportName = "SimpleHTTP";
   
       // HTTP status codes
  -    private static byte OK[] = ("200 " + JavaUtils.getMessage("ok00")).getBytes();
  -    private static byte UNAUTH[] = ("401 " + JavaUtils.getMessage("unauth00")).getBytes();
  -    private static byte ISE[] = ("500 " + JavaUtils.getMessage("internalError01")).getBytes();
  +    private static byte OK[] = ("200 " + Messages.getMessage("ok00")).getBytes();
  +    private static byte UNAUTH[] = ("401 " + Messages.getMessage("unauth00")).getBytes();
  +    private static byte ISE[] = ("500 " + Messages.getMessage("internalError01")).getBytes();
   
       // HTTP prefix
       private static byte HTTP[] = "HTTP/1.0 ".getBytes();
  @@ -116,7 +117,7 @@
       private static final String responseStr =
               "<html><head><title>SimpleAxisServer</title></head>" +
               "<body><h1>SimpleAxisServer</h1>" +
  -            JavaUtils.getMessage("reachedServer00") +
  +            Messages.getMessage("reachedServer00") +
               "</html>";
       private static byte cannedHTMLResponse[] = responseStr.getBytes();
   
  @@ -259,9 +260,9 @@
                       String params = fileName.substring(paramIdx + 1);
                       fileName.setLength(paramIdx);
   
  -                    log.debug(JavaUtils.getMessage("filename00",
  +                    log.debug(Messages.getMessage("filename00",
                               fileName.toString()));
  -                    log.debug(JavaUtils.getMessage("params00",
  +                    log.debug(Messages.getMessage("params00",
                               params));
   
                       if ("wsdl".equalsIgnoreCase(params))
  @@ -304,7 +305,7 @@
                       }
   
                       if (log.isDebugEnabled()) {
  -                        log.debug(JavaUtils.getMessage("user00",
  +                        log.debug(Messages.getMessage("user00",
                                   userBuf.toString()));
                       }
   
  @@ -409,14 +410,14 @@
                   // Retrieve the response from Axis
                   responseMsg = msgContext.getResponseMessage();
                   if (responseMsg == null) {
  -                    throw new AxisFault(JavaUtils.getMessage("nullResponse00"));
  +                    throw new AxisFault(Messages.getMessage("nullResponse00"));
                   }
   
               } catch (Exception e) {
                   AxisFault af;
                   if (e instanceof AxisFault) {
                       af = (AxisFault) e;
  -                    log.debug(JavaUtils.getMessage("serverFault00"), af);
  +                    log.debug(Messages.getMessage("serverFault00"), af);
   
                       if ("Server.Unauthorized".equals(af.getFaultCode())) {
                           status = UNAUTH; // SC_UNAUTHORIZED
  @@ -473,7 +474,7 @@
               // out.write(response);
               out.flush();
           } catch (Exception e) {
  -            log.debug(JavaUtils.getMessage("exception00"), e);
  +            log.debug(Messages.getMessage("exception00"), e);
           } finally {
               try {
                   if (socket != null) socket.close();
  @@ -520,7 +521,7 @@
           n = this.readLine(is, buf, 0, buf.length);
           if (n < 0) {
               // nothing!
  -            throw new java.io.IOException(JavaUtils.getMessage("unexpectedEOS00"));
  +            throw new java.io.IOException(Messages.getMessage("unexpectedEOS00"));
           }
   
           // which does it begin with?
  @@ -537,7 +538,7 @@
                       break;
                   fileName.append(c);
               }
  -            log.debug(JavaUtils.getMessage("filename01", "SimpleAxisServer", fileName.toString()));
  +            log.debug(Messages.getMessage("filename01", "SimpleAxisServer", fileName.toString()));
               return 0;
           } else if (buf[0] == postHeader[0]) {
               httpRequest.append("POST");
  @@ -547,9 +548,9 @@
                       break;
                   fileName.append(c);
               }
  -            log.debug(JavaUtils.getMessage("filename01", "SimpleAxisServer", fileName.toString()));
  +            log.debug(Messages.getMessage("filename01", "SimpleAxisServer", fileName.toString()));
           } else {
  -            throw new java.io.IOException(JavaUtils.getMessage("badRequest00"));
  +            throw new java.io.IOException(Messages.getMessage("badRequest00"));
           }
   
           while ((n = readLine(is, buf, 0, buf.length)) > 0) {
  @@ -616,7 +617,7 @@
                       }
                   } else {
                       throw new java.io.IOException(
  -                            JavaUtils.getMessage("badAuth00"));
  +                            Messages.getMessage("badAuth00"));
                   }
               } else if (endHeaderIndex == locationLen && matches(buf, locationHeader)) {
                   while (++i < n && (buf[i] != '\r') && (buf[i] != '\n')) {
  
  
  
  1.72      +10 -10    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.71
  retrieving revision 1.72
  diff -u -r1.71 -r1.72
  --- SimpleAxisServer.java	12 Aug 2002 22:53:09 -0000	1.71
  +++ SimpleAxisServer.java	9 Sep 2002 17:03:21 -0000	1.72
  @@ -59,6 +59,7 @@
   import org.apache.axis.session.Session;
   import org.apache.axis.session.SimpleSession;
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   import org.apache.axis.utils.Options;
   
   import org.apache.axis.components.logger.LogFactory;
  @@ -143,7 +144,7 @@
        * Axis engine for processing.
        */
       public void run() {
  -        log.info(JavaUtils.getMessage("start00", "SimpleAxisServer",
  +        log.info(Messages.getMessage("start00", "SimpleAxisServer",
                   new Integer(getServerSocket().getLocalPort()).toString()));
   
           // Accept and process requests from the socket
  @@ -153,7 +154,7 @@
                   socket = serverSocket.accept();
               } catch (java.io.InterruptedIOException iie) {
               } catch (Exception e) {
  -                log.debug(JavaUtils.getMessage("exception00"), e);
  +                log.debug(Messages.getMessage("exception00"), e);
                   break;
               }
               if (socket != null) {
  @@ -167,7 +168,7 @@
                   }
               }
           }
  -        log.info(JavaUtils.getMessage("quit00", "SimpleAxisServer"));
  +        log.info(Messages.getMessage("quit00", "SimpleAxisServer"));
       }
   
       // per thread socket information
  @@ -227,10 +228,10 @@
           try {
               serverSocket.close();
           } catch (Exception e) {
  -            log.info(JavaUtils.getMessage("exception00"), e);
  +            log.info(Messages.getMessage("exception00"), e);
           }
   
  -        log.info(JavaUtils.getMessage("quit00", "SimpleAxisServer"));
  +        log.info(Messages.getMessage("quit00", "SimpleAxisServer"));
   
           // Kill the JVM, which will interrupt pending accepts even on linux.
           System.exit(0);
  @@ -247,7 +248,7 @@
           try {
               opts = new Options(args);
           } catch (MalformedURLException e) {
  -            log.error(JavaUtils.getMessage("malformedURLException00"), e);
  +            log.error(Messages.getMessage("malformedURLException00"), e);
               return;
           }
   
  @@ -262,13 +263,12 @@
                       ss = new ServerSocket(port);
                       break;
                   } catch (java.net.BindException be){
  -                    log.debug(JavaUtils.getMessage("exception00"), be);
  +                    log.debug(Messages.getMessage("exception00"), be);
                       if (i < 4) {
                           // At 3 second intervals.
                           Thread.sleep(3000);
                       } else {
  -                        throw new Exception(JavaUtils.
  -                                getMessage("unableToStartServer00",
  +                        throw new Exception(Messages.getMessage("unableToStartServer00",
                                              Integer.toString(port)));
                       }
                   }
  @@ -276,7 +276,7 @@
               sas.setServerSocket(ss);
               sas.start();
           } catch (Exception e) {
  -            log.error(JavaUtils.getMessage("exception00"), e);
  +            log.error(Messages.getMessage("exception00"), e);
               return;
           }
   
  
  
  
  1.141     +31 -30    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.140
  retrieving revision 1.141
  diff -u -r1.140 -r1.141
  --- AxisServlet.java	7 Sep 2002 00:09:03 -0000	1.140
  +++ AxisServlet.java	9 Sep 2002 17:03:21 -0000	1.141
  @@ -85,6 +85,7 @@
   import org.apache.axis.soap.SOAPConstants;
   import org.apache.axis.utils.Admin;
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   import org.apache.axis.utils.XMLUtils;
   
   import org.apache.axis.components.logger.LogFactory;
  @@ -296,9 +297,9 @@
                               response.setStatus(java.net.HttpURLConnection.HTTP_NOT_FOUND);
                               response.setContentType("text/html");
                               writer.println("<h2>" +
  -                                           JavaUtils.getMessage("error00") + "</h2>");
  +                                           Messages.getMessage("error00") + "</h2>");
                               writer.println("<p>" +
  -                                           JavaUtils.getMessage("noService06") +
  +                                           Messages.getMessage("noService06") +
                                              "</p>");
                           } else {
                               //print a snippet of service info.
  @@ -306,25 +307,25 @@
                           }
                       }
                   } catch (AxisFault fault) {
  -                    log.error(JavaUtils.getMessage("exception00"), fault);
  +                    log.error(Messages.getMessage("exception00"), fault);
                       response.setContentType("text/html");
                       response.setStatus(500);
                       writer.println("<h2>" +
  -                                   JavaUtils.getMessage("error00") + "</h2>");
  +                                   Messages.getMessage("error00") + "</h2>");
                       writer.println("<p>" +
  -                                   JavaUtils.getMessage("somethingWrong00") +
  +                                   Messages.getMessage("somethingWrong00") +
                                      "</p>");
                       writer.println("<pre>Fault - " + fault.toString() + " </pre>");
                       writer.println("<pre>" + fault.dumpToString() + " </pre>");
                   } catch (Exception e) {
  -                    log.error(JavaUtils.getMessage("exception00"), e);
  +                    log.error(Messages.getMessage("exception00"), e);
                       response.setContentType("text/html");
                       response.setStatus(500);
                       writer.println("<h2>" +
  -                                   JavaUtils.getMessage("error00") +
  +                                   Messages.getMessage("error00") +
                                      "</h2>");
                       writer.println("<p>" +
  -                                   JavaUtils.getMessage("somethingWrong00") +
  +                                   Messages.getMessage("somethingWrong00") +
                                      "</p>");
                       writer.println("<pre>Exception - " + e + "<br>");
                       //dev systems only give fault dumps
  @@ -342,10 +343,10 @@
   
                   response.setContentType("text/html");
                   writer.println( "<html><h1>Axis HTTP Servlet</h1>" );
  -                writer.println( JavaUtils.getMessage("reachedServlet00"));
  +                writer.println( Messages.getMessage("reachedServlet00"));
   
                   writer.println("<p>" +
  -                               JavaUtils.getMessage("transportName00",
  +                               Messages.getMessage("transportName00",
                                            "<b>" + transportName + "</b>"));
                   writer.println("</html>");
               }
  @@ -388,12 +389,12 @@
               response.setContentType("text/html");
               //TODO: what error code should we send back for no method?
               writer.println("<h2>" +
  -                           JavaUtils.getMessage("error00") +
  +                           Messages.getMessage("error00") +
                              ":  " +
  -                           JavaUtils.getMessage("invokeGet00") +
  +                           Messages.getMessage("invokeGet00") +
                              "</h2>");
               writer.println("<p>" +
  -                           JavaUtils.getMessage("noMethod01") +
  +                           Messages.getMessage("noMethod01") +
                              "</p>");
           } else {
               invokeEndpointFromGet(msgContext, response, writer, method, args);
  @@ -470,7 +471,7 @@
           } else {
               //TODO: error code
               writer.println("<p>" +
  -                   JavaUtils.getMessage("noResponse01") +
  +                   Messages.getMessage("noResponse01") +
                              "</p>");
           }
       }
  @@ -490,11 +491,11 @@
                   +"</h1>");
           writer.println(
                   "<p>" +
  -                JavaUtils.getMessage("axisService00") +
  +                Messages.getMessage("axisService00") +
                   "</p>");
           writer.println(
                   "<i>" +
  -                JavaUtils.getMessage("perhaps00") +
  +                Messages.getMessage("perhaps00") +
                   "</i>");
       }
   
  @@ -518,10 +519,10 @@
                   response.setStatus(HttpURLConnection.HTTP_NOT_FOUND);
                   response.setContentType("text/html");
                   writer.println("<h2>" +
  -                               JavaUtils.getMessage("error00") +
  +                               Messages.getMessage("error00") +
                                  "</h2>");
                   writer.println("<p>" +
  -                               JavaUtils.getMessage("noDeploy00") +
  +                               Messages.getMessage("noDeploy00") +
                                  "</p>");
               }
           } else {
  @@ -530,10 +531,10 @@
               response.setStatus(HttpURLConnection.HTTP_FORBIDDEN);
               response.setContentType("text/html");
               writer.println("<h2>" +
  -                           JavaUtils.getMessage("error00") +
  +                           Messages.getMessage("error00") +
                              "</h2>");
               writer.println("<p><i>?list</i>" +
  -                           JavaUtils.getMessage("disabled00") +
  +                           Messages.getMessage("disabled00") +
                              "</p>");
           }
       }
  @@ -547,10 +548,10 @@
           res.setStatus(HttpURLConnection.HTTP_NOT_FOUND);
           res.setContentType("text/html");
           writer.println("<h2>" +
  -                       JavaUtils.getMessage("error00") +
  +                       Messages.getMessage("error00") +
                          "</h2>");
           writer.println("<p>" +
  -                       JavaUtils.getMessage("noWSDL00") +
  +                       Messages.getMessage("noWSDL00") +
                          "</p>");
       }
   
  @@ -625,7 +626,7 @@
               if (engine == null) {
                   // !!! should return a SOAP fault...
                   ServletException se =
  -                    new ServletException(JavaUtils.getMessage("noEngine00"));
  +                    new ServletException(Messages.getMessage("noEngine00"));
                   log.debug("No Engine!", se);
                   throw se;
               }
  @@ -694,7 +695,7 @@
   
                   responseMsg = msgContext.getResponseMessage();
               } catch (AxisFault e) {
  -                log.error(JavaUtils.getMessage("exception00"), e);
  +                log.error(Messages.getMessage("exception00"), e);
                   // It's been suggested that a lack of SOAPAction
                   // should produce some other error code (in the 400s)...
                   int status = getHttpServletResponseStatus(e);
  @@ -704,12 +705,12 @@
                   res.setStatus(status);
                   responseMsg = new Message(e);
               } catch (Exception e) {
  -                log.error(JavaUtils.getMessage("exception00"), e);
  +                log.error(Messages.getMessage("exception00"), e);
                   res.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
                   responseMsg = new Message(AxisFault.makeFault(e));
               }
           } catch (AxisFault fault) {
  -            log.error(JavaUtils.getMessage("axisFault00"), fault);
  +            log.error(Messages.getMessage("axisFault00"), fault);
               responseMsg = new Message(fault);
           }
           if( tlog.isDebugEnabled() ) {
  @@ -773,7 +774,7 @@
           if (responseMsg == null) {
               res.setStatus(HttpServletResponse.SC_NO_CONTENT);
               if(isDebug) log.debug("NO AXIS MESSAGE TO RETURN!");
  -            //String resp = JavaUtils.getMessage("noData00");
  +            //String resp = Messages.getMessage("noData00");
               //res.setContentLength((int) resp.getBytes().length);
               //res.getWriter().print(resp);
           } else {
  @@ -802,7 +803,7 @@
   
                   responseMsg.writeTo(res.getOutputStream());
               } catch (SOAPException e){
  -                log.error(JavaUtils.getMessage("exception00"), e);
  +                log.error(Messages.getMessage("exception00"), e);
               }
           }
   
  @@ -909,11 +910,11 @@
            */
           if (soapAction == null) {
               AxisFault af = new AxisFault("Client.NoSOAPAction",
  -                                         JavaUtils.getMessage("noHeader00",
  +                                         Messages.getMessage("noHeader00",
                                                                 "SOAPAction"),
                                            null, null);
   
  -            log.error(JavaUtils.getMessage("genFault00"), af);
  +            log.error(Messages.getMessage("genFault00"), af);
   
               throw af;
           }
  
  
  
  1.46      +10 -9     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.45
  retrieving revision 1.46
  diff -u -r1.45 -r1.46
  --- SOAPPart.java	29 Aug 2002 21:02:40 -0000	1.45
  +++ SOAPPart.java	9 Sep 2002 17:03:22 -0000	1.46
  @@ -62,6 +62,7 @@
   import org.apache.axis.message.InputStreamBody;
   import org.apache.axis.message.SOAPEnvelope;
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   import org.apache.axis.utils.SessionUtils;
   import org.apache.axis.transport.http.HTTPConstants;
   
  @@ -263,7 +264,7 @@
               try {
                   env.output(new SerializationContextImpl(writer, getMessage().getMessageContext()));
               } catch (Exception e) {
  -                log.error(JavaUtils.getMessage("exception00"), e);
  +                log.error(Messages.getMessage("exception00"), e);
                   throw env;
               }
               return;
  @@ -308,7 +309,7 @@
               } else {
                   msgStr = currMsg.getClass().getName();
               }
  -            log.debug(JavaUtils.getMessage("setMsgForm", formNames[form],
  +            log.debug(Messages.getMessage("setMsgForm", formNames[form],
                       "" + msgStr));
           }
           currentMessage = currMsg ;
  @@ -330,7 +331,7 @@
               try {
                   getAsSOAPEnvelope();
               } catch (Exception e) {
  -                log.fatal(JavaUtils.getMessage("makeEnvFail00"), e);
  +                log.fatal(Messages.getMessage("makeEnvFail00"), e);
                   log.debug("Exit: SOAPPart::getAsBytes");
                   return null;
               }
  @@ -359,7 +360,7 @@
                   return (byte[])currentMessage;
               }
               catch( Exception e ) {
  -                log.error(JavaUtils.getMessage("exception00"), e);
  +                log.error(Messages.getMessage("exception00"), e);
               }
               log.debug("Exit: SOAPPart::getAsBytes");
               return null;
  @@ -406,7 +407,7 @@
               return (byte[])currentMessage;
           }
   
  -        log.error(JavaUtils.getMessage("cantConvert00", ""+currentForm));
  +        log.error(Messages.getMessage("cantConvert00", ""+currentForm));
   
           log.debug("Exit: SOAPPart::getAsBytes");
           return null;
  @@ -464,7 +465,7 @@
               try {
                   this.writeTo(writer);
               } catch (Exception e) {
  -                log.error(JavaUtils.getMessage("exception00"), e);
  +                log.error(Messages.getMessage("exception00"), e);
                   return null;
               }
               setCurrentMessage(writer.getBuffer().toString(), FORM_STRING);
  @@ -489,7 +490,7 @@
               return (String)currentMessage;
           }
   
  -        log.error( JavaUtils.getMessage("cantConvert01", ""+currentForm));
  +        log.error( Messages.getMessage("cantConvert01", ""+currentForm));
   
           log.debug("Exit: SOAPPart::getAsString()");
           return null;
  @@ -505,7 +506,7 @@
       {
           if (log.isDebugEnabled()) {
               log.debug("Enter: SOAPPart::getAsSOAPEnvelope()");
  -            log.debug(JavaUtils.getMessage("currForm", formNames[currentForm]));
  +            log.debug(Messages.getMessage("currForm", formNames[currentForm]));
           }
           if ( currentForm == FORM_SOAPENVELOPE )
               return (SOAPEnvelope)currentMessage;
  @@ -636,7 +637,7 @@
        */
       public void setContent(Source source) throws SOAPException {
           if(source == null)
  -            throw new SOAPException(JavaUtils.getMessage("illegalArgumentException00"));
  +            throw new SOAPException(Messages.getMessage("illegalArgumentException00"));
   
           contentSource = source;
           InputSource in = org.apache.axis.utils.XMLUtils.sourceToInputSource(contentSource);
  
  
  
  1.14      +2 -1      xml-axis/java/src/org/apache/axis/AxisProperties.java
  
  Index: AxisProperties.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/AxisProperties.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- AxisProperties.java	23 Aug 2002 22:22:30 -0000	1.13
  +++ AxisProperties.java	9 Sep 2002 17:03:22 -0000	1.14
  @@ -62,6 +62,7 @@
   import java.util.Properties;
   
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   import org.apache.commons.discovery.tools.DefaultClassHolder;
   import org.apache.commons.discovery.tools.DiscoverClass;
   import org.apache.commons.discovery.tools.ManagedProperties;
  @@ -242,7 +243,7 @@
                                                            (PropertiesHolder)null,
                                                            defaultClass);
                       } catch (Exception e) {
  -                        log.error(JavaUtils.getMessage("exception00"), e);
  +                        log.error(Messages.getMessage("exception00"), e);
                       }
                       return null;
                   }
  
  
  
  1.51      +4 -4      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.50
  retrieving revision 1.51
  diff -u -r1.50 -r1.51
  --- SimpleChain.java	24 Aug 2002 23:27:30 -0000	1.50
  +++ SimpleChain.java	9 Sep 2002 17:03:22 -0000	1.51
  @@ -55,13 +55,13 @@
   
   package org.apache.axis ;
   
  -import org.apache.axis.Message;
   import org.apache.axis.message.SOAPEnvelope;
   import org.apache.axis.message.SOAPFault;
   import org.apache.axis.handlers.BasicHandler;
   import org.apache.axis.strategies.InvocationStrategy;
   import org.apache.axis.strategies.WSDLGenStrategy;
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   
   import org.apache.axis.components.logger.LogFactory;
   import org.apache.commons.logging.Log;
  @@ -197,12 +197,12 @@
       public void addHandler(Handler handler) {
           if (handler == null)
               throw new InternalException(
  -                JavaUtils.getMessage("nullHandler00",
  +                Messages.getMessage("nullHandler00",
                                        "SimpleChain::addHandler"));
   
           if (invoked)
               throw new InternalException(
  -              JavaUtils.getMessage("addAfterInvoke00",
  +              Messages.getMessage("addAfterInvoke00",
                                      "SimpleChain::addHandler"));
   
           handlers.add( handler );
  @@ -222,7 +222,7 @@
   
       public Element getDeploymentData(Document doc) {
           if (log.isDebugEnabled()) {
  -            log.debug( JavaUtils.getMessage("enter00",
  +            log.debug( Messages.getMessage("enter00",
                                               "SimpleChain::getDeploymentData") );
           }
   
  
  
  
  1.10      +2 -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.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- InternalException.java	3 Jul 2002 17:50:29 -0000	1.9
  +++ InternalException.java	9 Sep 2002 17:03:22 -0000	1.10
  @@ -56,6 +56,7 @@
   package org.apache.axis;
   
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   
   import org.apache.axis.components.logger.LogFactory;
   import org.apache.commons.logging.Log;
  @@ -120,7 +121,7 @@
               if (e instanceof InternalException) {
                   log.debug("InternalException: ", e);
               } else {
  -                log.fatal(JavaUtils.getMessage("exception00"), e);
  +                log.fatal(Messages.getMessage("exception00"), e);
               }
           }
       }
  
  
  
  1.6       +2 -1      xml-axis/java/src/org/apache/axis/NoEndPointException.java
  
  Index: NoEndPointException.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/NoEndPointException.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- NoEndPointException.java	15 Mar 2002 01:14:09 -0000	1.5
  +++ NoEndPointException.java	9 Sep 2002 17:03:22 -0000	1.6
  @@ -55,6 +55,7 @@
   package org.apache.axis;
   
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   
   /**
    * @author Russell Butek (butek@us.ibm.com)
  @@ -63,6 +64,6 @@
   {
       public NoEndPointException ()
       {
  -        super("Server.NoEndpoint", JavaUtils.getMessage("noEndpoint"), null, null);
  +        super("Server.NoEndpoint", Messages.getMessage("noEndpoint"), null, null);
       } // ctor
   } // class NoEndPointException
  
  
  
  1.120     +10 -9     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.119
  retrieving revision 1.120
  diff -u -r1.119 -r1.120
  --- MessageContext.java	28 Aug 2002 19:22:55 -0000	1.119
  +++ MessageContext.java	9 Sep 2002 17:03:22 -0000	1.120
  @@ -68,6 +68,7 @@
   import org.apache.axis.soap.SOAPConstants;
   import org.apache.axis.utils.JavaUtils;
   import org.apache.axis.utils.LockableHashtable;
  +import org.apache.axis.utils.Messages;
   import org.apache.axis.schema.SchemaVersion;
   
   import org.apache.axis.components.logger.LogFactory;
  @@ -219,7 +220,7 @@
           if (serviceHandler == null) {
               try {
                   if (log.isDebugEnabled()) {
  -                    log.debug(JavaUtils.getMessage("dispatching00",
  +                    log.debug(Messages.getMessage("dispatching00",
                                                      qname.getNamespaceURI()));
                   }
   
  @@ -635,7 +636,7 @@
                   List ops = sd.getOperations();
                   if (ops.size() != 1) {
                       throw new AxisFault(
  -                            JavaUtils.getMessage("onlyOneMessageOp",
  +                            Messages.getMessage("onlyOneMessageOp",
                                                    targetService,
                                                    ""+ops.size()));
                   }
  @@ -753,7 +754,7 @@
           else if (name.equals(Call.USERNAME_PROPERTY)) {
               if (!(value instanceof String)) {
                   throw new IllegalArgumentException(
  -                        JavaUtils.getMessage("badProp00", new String[] {
  +                        Messages.getMessage("badProp00", new String[] {
                           name, "java.lang.String", value.getClass().getName()}));
               }
               setUsername((String) value);
  @@ -761,7 +762,7 @@
           else if (name.equals(Call.PASSWORD_PROPERTY)) {
               if (!(value instanceof String)) {
                   throw new IllegalArgumentException(
  -                        JavaUtils.getMessage("badProp00", new String[] {
  +                        Messages.getMessage("badProp00", new String[] {
                           name, "java.lang.String", value.getClass().getName()}));
               }
               setPassword((String) value);
  @@ -769,7 +770,7 @@
           else if (name.equals(Call.SESSION_MAINTAIN_PROPERTY)) {
               if (!(value instanceof Boolean)) {
                   throw new IllegalArgumentException(
  -                        JavaUtils.getMessage("badProp00", new String[]
  +                        Messages.getMessage("badProp00", new String[]
                           {name,
                           "java.lang.Boolean",
                           value.getClass().getName()}));
  @@ -779,7 +780,7 @@
           else if (name.equals(Call.OPERATION_STYLE_PROPERTY)) {
               if (!(value instanceof String)) {
                   throw new IllegalArgumentException(
  -                        JavaUtils.getMessage("badProp00", new String[] {
  +                        Messages.getMessage("badProp00", new String[] {
                           name, "java.lang.String", value.getClass().getName()}));
               }
               setOperationStyle(Style.getStyle((String)value, Style.DEFAULT));
  @@ -787,7 +788,7 @@
           else if (name.equals(Call.SOAPACTION_USE_PROPERTY)) {
               if (!(value instanceof Boolean)) {
                   throw new IllegalArgumentException(
  -                        JavaUtils.getMessage("badProp00", new String[]
  +                        Messages.getMessage("badProp00", new String[]
                           {name,
                           "java.lang.Boolean",
                           value.getClass().getName()}));
  @@ -797,7 +798,7 @@
           else if (name.equals(Call.SOAPACTION_URI_PROPERTY)) {
               if (!(value instanceof String)) {
                   throw new IllegalArgumentException(
  -                        JavaUtils.getMessage("badProp00", new String[]
  +                        Messages.getMessage("badProp00", new String[]
                           {name,
                           "java.lang.String",
                           value.getClass().getName()}));
  @@ -807,7 +808,7 @@
           else if (name.equals(Call.ENCODINGSTYLE_URI_PROPERTY)) {
               if (!(value instanceof String)) {
                   throw new IllegalArgumentException(
  -                        JavaUtils.getMessage("badProp00", new String[]
  +                        Messages.getMessage("badProp00", new String[]
                           {name,
                           "java.lang.String",
                           value.getClass().getName()}));
  
  
  
  1.89      +10 -9     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.88
  retrieving revision 1.89
  diff -u -r1.88 -r1.89
  --- Message.java	6 Sep 2002 20:09:25 -0000	1.88
  +++ Message.java	9 Sep 2002 17:03:22 -0000	1.89
  @@ -61,6 +61,7 @@
   import org.apache.axis.transport.http.HTTPConstants;
   import org.apache.axis.utils.ClassUtils;
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   
   import org.apache.axis.components.logger.LogFactory;
   import org.apache.commons.logging.Log;
  @@ -282,7 +283,7 @@
               } catch (java.lang.NoClassDefFoundError ex) {
                   // no support for it, leave mAttachments null.
               }
  -            log.debug(JavaUtils.getMessage("attachEnabled") + "  " +
  +            log.debug(Messages.getMessage("attachEnabled") + "  " +
                       attachmentSupportEnabled);
           }
           return attachmentSupportEnabled;
  @@ -322,15 +323,15 @@
                   //If it can't support it, it wont have a root part.
                   mSOAPPart = (SOAPPart) mAttachments.getRootPart();
               } catch (InvocationTargetException ex) {
  -                log.fatal(JavaUtils.getMessage("invocationTargetException00"),
  +                log.fatal(Messages.getMessage("invocationTargetException00"),
                             ex);
                   throw new RuntimeException(ex.getMessage());
               } catch (InstantiationException ex) {
  -                log.fatal(JavaUtils.getMessage("instantiationException00"),
  +                log.fatal(Messages.getMessage("instantiationException00"),
                             ex);
                   throw new RuntimeException(ex.getMessage());
               } catch (IllegalAccessException ex) {
  -                log.fatal(JavaUtils.getMessage("illegalAccessException00"),
  +                log.fatal(Messages.getMessage("illegalAccessException00"),
                             ex);
                   throw new RuntimeException(ex.getMessage());
               }
  @@ -440,13 +441,13 @@
                   mSOAPPart.writeTo(writer);
                   writer.flush();
               } catch (java.io.IOException e) {
  -                log.error(JavaUtils.getMessage("javaIOException00"), e);
  +                log.error(Messages.getMessage("javaIOException00"), e);
               }
           } else {
               try {
                   mAttachments.writeContentToStream(os);
               } catch (java.lang.Exception e) {
  -                log.error(JavaUtils.getMessage("exception00"), e);
  +                log.error(Messages.getMessage("exception00"), e);
               }
           }
       }
  @@ -558,7 +559,7 @@
           try {
               return mAttachments.getAttachments().iterator();
           } catch (AxisFault af){
  -            log.error(JavaUtils.getMessage("exception00"), af);
  +            log.error(Messages.getMessage("exception00"), af);
           }
           return null;
       }
  @@ -592,7 +593,7 @@
           try {
               mAttachments.addAttachmentPart((org.apache.axis.Part)attachmentpart);
           } catch (AxisFault af){
  -            log.error(JavaUtils.getMessage("exception00"), af);
  +            log.error(Messages.getMessage("exception00"), af);
           }
       }
   
  @@ -610,7 +611,7 @@
           try {
               return (AttachmentPart) mAttachments.createAttachmentPart();
           } catch (AxisFault af){
  -            log.error(JavaUtils.getMessage("exception00"), af);
  +            log.error(Messages.getMessage("exception00"), af);
           }
           return null;
       }
  
  
  
  1.42      +2 -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.41
  retrieving revision 1.42
  diff -u -r1.41 -r1.42
  --- FaultableHandler.java	24 Jul 2002 18:01:04 -0000	1.41
  +++ FaultableHandler.java	9 Sep 2002 17:03:22 -0000	1.42
  @@ -57,6 +57,7 @@
   
   import org.apache.axis.handlers.BasicHandler;
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   
   import org.apache.axis.components.logger.LogFactory;
   import org.apache.commons.logging.Log;
  @@ -115,7 +116,7 @@
               workHandler.invoke( msgContext );
           }
           catch( Exception e ) {
  -            entLog.info(JavaUtils.getMessage("toAxisFault00"), e );
  +            entLog.info(Messages.getMessage("toAxisFault00"), e );
               AxisFault fault = AxisFault.makeFault(e);
   
   //            AxisEngine engine = msgContext.getAxisEngine();
  
  
  
  1.96      +3 -2      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.95
  retrieving revision 1.96
  diff -u -r1.95 -r1.96
  --- AxisEngine.java	28 Aug 2002 14:51:49 -0000	1.95
  +++ AxisEngine.java	9 Sep 2002 17:03:22 -0000	1.96
  @@ -62,6 +62,7 @@
   import org.apache.axis.session.Session;
   import org.apache.axis.session.SimpleSession;
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   import org.apache.axis.utils.cache.ClassCache;
   import org.apache.axis.client.Service;
   import org.apache.axis.client.Call;
  @@ -234,7 +235,7 @@
           try {
               config.writeEngineConfig(this);
           } catch (Exception e) {
  -            log.error(JavaUtils.getMessage("saveConfigFail00"), e);
  +            log.error(Messages.getMessage("saveConfigFail00"), e);
           }
       }
   
  @@ -292,7 +293,7 @@
           try {
               tmr = config.getTypeMappingRegistry();
           } catch (ConfigurationException e) {
  -            log.error(JavaUtils.getMessage("axisConfigurationException00"), e);
  +            log.error(Messages.getMessage("axisConfigurationException00"), e);
           }
   
           return tmr;
  
  
  
  1.5       +3 -2      xml-axis/java/src/org/apache/axis/Version.java
  
  Index: Version.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/Version.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Version.java	28 Mar 2002 15:14:04 -0000	1.4
  +++ Version.java	9 Sep 2002 17:03:22 -0000	1.5
  @@ -56,6 +56,7 @@
   package org.apache.axis;
   
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   import org.apache.axis.client.Call;
   
   /**
  @@ -69,8 +70,8 @@
   public class Version {
       public static String getVersion()
       {
  -        return JavaUtils.getMessage("axisVersion") + "\n" +
  -               JavaUtils.getMessage("builtOn");
  +        return Messages.getMessage("axisVersion") + "\n" +
  +               Messages.getMessage("builtOn");
       }
       
       /**
  
  
  
  1.78      +10 -9     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.77
  retrieving revision 1.78
  diff -u -r1.77 -r1.78
  --- JavaProvider.java	2 Sep 2002 18:20:05 -0000	1.77
  +++ JavaProvider.java	9 Sep 2002 17:03:22 -0000	1.78
  @@ -71,6 +71,7 @@
   import org.apache.axis.providers.BasicProvider;
   import org.apache.axis.utils.ClassUtils;
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   import org.apache.axis.utils.cache.ClassCache;
   import org.apache.axis.utils.cache.JavaClass;
   import org.apache.axis.wsdl.fromJava.Emitter;
  @@ -247,7 +248,7 @@
   
           if ((clsName == null) || clsName.equals("")) {
               throw new AxisFault("Server.NoClassForService",
  -                JavaUtils.getMessage("noOption00", getServiceClassNameOptionName(), serviceName),
  +                Messages.getMessage("noOption00", getServiceClassNameOptionName(), serviceName),
                   null, null);
           }
   
  @@ -287,7 +288,7 @@
               }
           }
           catch( Exception exp ) {
  -            entLog.debug( JavaUtils.getMessage("toAxisFault00"), exp);
  +            entLog.debug( Messages.getMessage("toAxisFault00"), exp);
               throw AxisFault.makeFault(exp);
           }
   
  @@ -416,10 +417,10 @@
   
               msgContext.setProperty("WSDL", doc);
           } catch (NoClassDefFoundError e) {
  -            entLog.info( JavaUtils.getMessage("toAxisFault00"), e );
  +            entLog.info( Messages.getMessage("toAxisFault00"), e );
               throw new AxisFault(e.toString(), e);
           } catch (Exception e) {
  -            entLog.info( JavaUtils.getMessage("toAxisFault00"), e );
  +            entLog.info( Messages.getMessage("toAxisFault00"), e );
               throw AxisFault.makeFault(e);
           }
   
  @@ -499,16 +500,16 @@
                   JavaClass jc = cache.lookup(clsName, cl);
                   serviceClass = jc.getJavaClass();
               } catch (ClassNotFoundException e) {
  -                log.error(JavaUtils.getMessage("exception00"), e);
  -                throw new AxisFault(JavaUtils.getMessage("noClassForService00", clsName), e);
  +                log.error(Messages.getMessage("exception00"), e);
  +                throw new AxisFault(Messages.getMessage("noClassForService00", clsName), e);
               }
           } else {
               // if no engine, we don't have a cache, use Class.forName instead.
               try {
                   serviceClass = ClassUtils.forName(clsName, true, cl);
               } catch (ClassNotFoundException e) {
  -                log.error(JavaUtils.getMessage("exception00"), e);
  -                throw new AxisFault(JavaUtils.getMessage("noClassForService00", clsName), e);
  +                log.error(Messages.getMessage("exception00"), e);
  +                throw new AxisFault(Messages.getMessage("noClassForService00", clsName), e);
               }
           }
           return serviceClass;
  @@ -527,7 +528,7 @@
   
           String clsName = getServiceClassName(service);
           if (clsName == null) {
  -            throw new AxisFault(JavaUtils.getMessage("noServiceClass"));
  +            throw new AxisFault(Messages.getMessage("noServiceClass"));
           }
           Class cls = getServiceClass(clsName, service, msgContext);
           ServiceDesc serviceDescription = service.getServiceDescription();
  
  
  
  1.29      +4 -3      xml-axis/java/src/org/apache/axis/providers/java/MsgProvider.java
  
  Index: MsgProvider.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/providers/java/MsgProvider.java,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- MsgProvider.java	15 Aug 2002 12:50:11 -0000	1.28
  +++ MsgProvider.java	9 Sep 2002 17:03:22 -0000	1.29
  @@ -59,6 +59,7 @@
   import org.apache.axis.MessageContext;
   import org.apache.axis.AxisFault;
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   import org.apache.axis.description.OperationDesc;
   import org.apache.axis.message.SOAPBodyElement;
   import org.apache.axis.message.SOAPEnvelope;
  @@ -133,7 +134,7 @@
           if (params.length != 1) {
               // Must have exactly one argument in all cases.
               throw new AxisFault(
  -                    JavaUtils.getMessage("msgMethodMustHaveOneParam",
  +                    Messages.getMessage("msgMethodMustHaveOneParam",
                                            method.getName(),
                                            ""+params.length));
   
  @@ -180,7 +181,7 @@
               } else {
                   // Neither - must be a bad method.
                   throw new AxisFault(
  -                        JavaUtils.getMessage("badMsgMethodParam",
  +                        Messages.getMessage("badMsgMethodParam",
                                                method.getName(),
                                                params[0].getName()));
               }
  @@ -188,7 +189,7 @@
               // pass *just* the MessageContext (maybe don't even parse!!!)
               if (params[0] != MessageContext.class) {
                   throw new AxisFault(
  -                        JavaUtils.getMessage("needMessageContextArg",
  +                        Messages.getMessage("needMessageContextArg",
                                                method.getName(),
                                                params[0].getName()));
               }
  
  
  
  1.31      +6 -5      xml-axis/java/src/org/apache/axis/providers/java/EJBProvider.java
  
  Index: EJBProvider.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/providers/java/EJBProvider.java,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- EJBProvider.java	6 Aug 2002 15:59:36 -0000	1.30
  +++ EJBProvider.java	9 Sep 2002 17:03:22 -0000	1.31
  @@ -64,6 +64,7 @@
   import org.apache.axis.handlers.soap.SOAPService;
   import org.apache.axis.utils.ClassUtils;
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   
   import org.apache.axis.components.logger.LogFactory;
   import org.apache.commons.logging.Log;
  @@ -133,7 +134,7 @@
                                                   msgContext.getService());
           if (homeName == null) 
               throw new AxisFault(
  -                    JavaUtils.getMessage("noOption00", 
  +                    Messages.getMessage("noOption00", 
                                            OPTION_HOMEINTERFACENAME, 
                                            msgContext.getTargetService()));
   
  @@ -218,7 +219,7 @@
                                                           service);
                   if (homeName == null)
                       throw new AxisFault(
  -                            JavaUtils.getMessage("noOption00",
  +                            Messages.getMessage("noOption00",
                                                    OPTION_HOMEINTERFACENAME,
                                                    service.getName()));
   
  @@ -314,16 +315,16 @@
   
               // if we didn't get a context, fail
               if (context == null)
  -                throw new AxisFault( JavaUtils.getMessage("cannotCreateInitialContext00"));
  +                throw new AxisFault( Messages.getMessage("cannotCreateInitialContext00"));
               
               ejbHome = getEJBHome(context, beanJndiName);
   
               if (ejbHome == null)
  -                throw new AxisFault( JavaUtils.getMessage("cannotFindJNDIHome00",beanJndiName));
  +                throw new AxisFault( Messages.getMessage("cannotFindJNDIHome00",beanJndiName));
           }
           // Should probably catch javax.naming.NameNotFoundException here 
           catch (Exception exception) {
  -            entLog.info(JavaUtils.getMessage("toAxisFault00"), exception);
  +            entLog.info(Messages.getMessage("toAxisFault00"), exception);
               throw AxisFault.makeFault(exception);
           }
   
  
  
  
  1.93      +10 -9     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.92
  retrieving revision 1.93
  diff -u -r1.92 -r1.93
  --- RPCProvider.java	26 Aug 2002 13:10:22 -0000	1.92
  +++ RPCProvider.java	9 Sep 2002 17:03:22 -0000	1.93
  @@ -70,6 +70,7 @@
   import org.apache.axis.soap.SOAPConstants;
   import org.apache.axis.utils.ClassUtils;
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   
   import org.apache.axis.components.logger.LogFactory;
   import org.apache.commons.logging.Log;
  @@ -123,8 +124,8 @@
   
           Vector          bodies = reqEnv.getBodyElements();
           if (log.isDebugEnabled()) {
  -            log.debug(JavaUtils.getMessage("bodyElems00", "" + bodies.size()));
  -            log.debug(JavaUtils.getMessage("bodyIs00", "" + bodies.get(0)));
  +            log.debug(Messages.getMessage("bodyElems00", "" + bodies.size()));
  +            log.debug(Messages.getMessage("bodyIs00", "" + bodies.get(0)));
           }
   
           RPCElement   body = null;
  @@ -161,7 +162,7 @@
           if (body == null) {
               // throw an error if this isn't a document style service
               if (!serviceDesc.getStyle().equals(Style.DOCUMENT)) {
  -                throw new Exception(JavaUtils.getMessage("noBody00"));
  +                throw new Exception(Messages.getMessage("noBody00"));
               }
   
               // look for a method in the service that has no arguments,
  @@ -181,7 +182,7 @@
   
               // If we still didn't find anything, report no body error.
               if (body == null) {
  -                throw new Exception(JavaUtils.getMessage("noBody00"));
  +                throw new Exception(Messages.getMessage("noBody00"));
               }
           }
   
  @@ -200,7 +201,7 @@
           }
   
           if (operation == null) {
  -            throw new AxisFault(JavaUtils.getMessage("noSuchOperation",
  +            throw new AxisFault(Messages.getMessage("noSuchOperation",
                                                        methodName));
           }
   
  @@ -250,7 +251,7 @@
               }
   
               if (log.isDebugEnabled()) {
  -                log.debug("  " + JavaUtils.getMessage("value00",
  +                log.debug("  " + Messages.getMessage("value00",
                                                         "" + argValues[i]) );
               }
           }
  @@ -276,7 +277,7 @@
                       outs.add(new RPCParam(param.getQName(),
                                             argValues[numArgs + i]));
                   } else {
  -                    throw new AxisFault(JavaUtils.getMessage("badOutParameter00",
  +                    throw new AxisFault(Messages.getMessage("badOutParameter00",
                                                                "" + param.getQName(),
                                                                operation.getName()));
                   }
  @@ -302,10 +303,10 @@
                       argClasses += ",";
                   }
               }
  -            log.info(JavaUtils.getMessage("dispatchIAE00",
  +            log.info(Messages.getMessage("dispatchIAE00",
                                             new String[] {methodSig, argClasses}),
                        e);
  -            throw new AxisFault(JavaUtils.getMessage("dispatchIAE00",
  +            throw new AxisFault(Messages.getMessage("dispatchIAE00",
                                             new String[] {methodSig, argClasses}),
                                   e);
           }
  
  
  
  1.51      +6 -5      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.50
  retrieving revision 1.51
  diff -u -r1.50 -r1.51
  --- BeanDeserializer.java	26 Aug 2002 23:44:33 -0000	1.50
  +++ BeanDeserializer.java	9 Sep 2002 17:03:23 -0000	1.51
  @@ -64,6 +64,7 @@
   import org.apache.axis.message.MessageElement;
   import org.apache.axis.utils.BeanPropertyDescriptor;
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   import org.apache.axis.wsdl.symbolTable.SchemaUtils;
   
   import org.apache.axis.components.logger.LogFactory;
  @@ -158,7 +159,7 @@
                   value=javaType.newInstance();
               } catch (Exception e) {
                   // Failed to create an object.
  -                throw new SAXException(JavaUtils.getMessage("cantCreateBean00", 
  +                throw new SAXException(Messages.getMessage("cantCreateBean00", 
                                                               javaType.getName(), 
                                                               e.toString()));
               }
  @@ -246,7 +247,7 @@
           if (propDesc == null) {
               // No such field
               throw new SAXException(
  -                    JavaUtils.getMessage("badElem00", javaType.getName(), 
  +                    Messages.getMessage("badElem00", javaType.getName(), 
                                            localName));
           }
   
  @@ -332,7 +333,7 @@
               try {
                   value=javaType.newInstance();
               } catch (Exception e) {
  -                throw new SAXException(JavaUtils.getMessage("cantCreateBean00", 
  +                throw new SAXException(Messages.getMessage("cantCreateBean00", 
                                                               javaType.getName(), 
                                                               e.toString()));
               }
  @@ -364,12 +365,12 @@
   
                   if (dSer == null)
                       throw new SAXException(
  -                            JavaUtils.getMessage("unregistered00",
  +                            Messages.getMessage("unregistered00",
                                                    bpd.getType().toString()));
                   
                   if (! (dSer instanceof SimpleDeserializer))
                       throw new SAXException(
  -                            JavaUtils.getMessage("AttrNotSimpleType00", 
  +                            Messages.getMessage("AttrNotSimpleType00", 
                                                    bpd.getName(), 
                                                    bpd.getType().toString()));
                   
  
  
  
  1.53      +4 -3      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.52
  retrieving revision 1.53
  diff -u -r1.52 -r1.53
  --- BeanSerializer.java	19 Aug 2002 18:51:27 -0000	1.52
  +++ BeanSerializer.java	9 Sep 2002 17:03:23 -0000	1.53
  @@ -65,6 +65,7 @@
   import org.apache.axis.utils.BeanPropertyDescriptor;
   import org.apache.axis.utils.BeanUtils;
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   import org.apache.axis.wsdl.fromJava.Types;
   
   import org.apache.axis.components.logger.LogFactory;
  @@ -250,10 +251,10 @@
               }
           } catch (InvocationTargetException ite) {
               Throwable target = ite.getTargetException();
  -            log.error(JavaUtils.getMessage("exception00"), target);
  +            log.error(Messages.getMessage("exception00"), target);
               throw new IOException(target.toString());
           } catch (Exception e) {
  -            log.error(JavaUtils.getMessage("exception00"), e);
  +            log.error(Messages.getMessage("exception00"), e);
               throw new IOException(e.toString());
           }
   
  @@ -437,7 +438,7 @@
   
           // Attribute must be a simple type.
           if (!types.isAcceptableAsAttribute(fieldType)) {
  -            throw new AxisFault(JavaUtils.getMessage("AttrNotSimpleType00",
  +            throw new AxisFault(Messages.getMessage("AttrNotSimpleType00",
                                                        fieldName,
                                                        fieldType.getName()));
           }
  
  
  
  1.12      +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.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- EnumSerializer.java	16 Aug 2002 11:07:09 -0000	1.11
  +++ EnumSerializer.java	9 Sep 2002 17:03:23 -0000	1.12
  @@ -72,6 +72,7 @@
   import org.apache.axis.encoding.Deserializer;
   import org.apache.axis.InternalException;
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   
   import org.apache.axis.components.logger.LogFactory;
   import org.apache.commons.logging.Log;
  @@ -119,7 +120,7 @@
               }
               return (String) toStringMethod.invoke(value, null);
           } catch (Exception e) {
  -            log.error(JavaUtils.getMessage("exception00"), e);
  +            log.error(Messages.getMessage("exception00"), e);
           }
           return null;
       }
  
  
  
  1.6       +3 -2      xml-axis/java/src/org/apache/axis/encoding/ser/DateDeserializer.java
  
  Index: DateDeserializer.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/encoding/ser/DateDeserializer.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- DateDeserializer.java	31 Jul 2002 20:47:02 -0000	1.5
  +++ DateDeserializer.java	9 Sep 2002 17:03:23 -0000	1.6
  @@ -56,6 +56,7 @@
   package org.apache.axis.encoding.ser;
   
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   
   import javax.xml.namespace.QName;
   
  @@ -107,11 +108,11 @@
               
               if (source.length() < 10) 
                   throw new NumberFormatException(
  -                           JavaUtils.getMessage("badDate00"));
  +                           Messages.getMessage("badDate00"));
       
               if (source.charAt(4) != '-' || source.charAt(7) != '-')
                   throw new NumberFormatException(
  -                                                JavaUtils.getMessage("badDate00"));
  +                                                Messages.getMessage("badDate00"));
               
           }
           
  
  
  
  1.14      +2 -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.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- ElementDeserializer.java	22 Jul 2002 06:23:01 -0000	1.13
  +++ ElementDeserializer.java	9 Sep 2002 17:03:23 -0000	1.14
  @@ -60,6 +60,7 @@
   import org.apache.axis.encoding.DeserializerImpl;
   import org.apache.axis.message.MessageElement;
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   
   import org.apache.axis.components.logger.LogFactory;
   import org.apache.commons.logging.Log;
  @@ -104,7 +105,7 @@
               }
           }
           catch( Exception exp ) {
  -            log.error(JavaUtils.getMessage("exception00"), exp);
  +            log.error(Messages.getMessage("exception00"), exp);
               throw new SAXException( exp );
           }
       }
  
  
  
  1.12      +2 -1      xml-axis/java/src/org/apache/axis/encoding/ser/VectorSerializer.java
  
  Index: VectorSerializer.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/encoding/ser/VectorSerializer.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- VectorSerializer.java	22 Jul 2002 20:10:04 -0000	1.11
  +++ VectorSerializer.java	9 Sep 2002 17:03:23 -0000	1.12
  @@ -66,6 +66,7 @@
   import org.apache.axis.encoding.Serializer;
   import org.apache.axis.encoding.SerializationContext;
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   
   import java.io.IOException;
   import java.util.Iterator;
  @@ -106,7 +107,7 @@
       {
           if (!(value instanceof Vector))
               throw new IOException(
  -                JavaUtils.getMessage("noVector00", "VectorSerializer", 
  +                Messages.getMessage("noVector00", "VectorSerializer", 
                                        value.getClass().getName()));
   
           Vector vector = (Vector)value;
  
  
  
  1.5       +6 -5      xml-axis/java/src/org/apache/axis/encoding/ser/CalendarDeserializer.java
  
  Index: CalendarDeserializer.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/encoding/ser/CalendarDeserializer.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- CalendarDeserializer.java	24 Jul 2002 17:13:21 -0000	1.4
  +++ CalendarDeserializer.java	9 Sep 2002 17:03:23 -0000	1.5
  @@ -56,6 +56,7 @@
   package org.apache.axis.encoding.ser;
   
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   
   import javax.xml.namespace.QName;
   
  @@ -110,16 +111,16 @@
   
               if (source.length() < 19)
                   throw new NumberFormatException(
  -                           JavaUtils.getMessage("badDateTime00"));
  +                           Messages.getMessage("badDateTime00"));
   
               if (source.charAt(4) != '-' || source.charAt(7) != '-' ||
                   source.charAt(10) != 'T')
                   throw new NumberFormatException(
  -                                                JavaUtils.getMessage("badDate00"));
  +                                                Messages.getMessage("badDate00"));
   
               if (source.charAt(13) != ':' || source.charAt(16) != ':')
                   throw new NumberFormatException(
  -                                                JavaUtils.getMessage("badTime00"));
  +                                                Messages.getMessage("badTime00"));
           }
   
           // convert what we have validated so far
  @@ -168,7 +169,7 @@
                           !Character.isDigit(source.charAt(pos+4)) ||
                           !Character.isDigit(source.charAt(pos+5)))
                           throw new NumberFormatException(
  -                                                        JavaUtils.getMessage("badTimezone00"));
  +                                                        Messages.getMessage("badTimezone00"));
   
                       int hours = (source.charAt(pos+1)-'0')*10
                           +source.charAt(pos+2)-'0';
  @@ -189,7 +190,7 @@
   
               if (pos < source.length())
                   throw new NumberFormatException(
  -                                                JavaUtils.getMessage("badChars00"));
  +                                                Messages.getMessage("badChars00"));
           }
   
           calendar.setTime(date);
  
  
  
  1.32      +4 -3      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.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- ArraySerializer.java	5 Sep 2002 01:08:38 -0000	1.31
  +++ ArraySerializer.java	9 Sep 2002 17:03:23 -0000	1.32
  @@ -59,6 +59,7 @@
   import org.apache.axis.encoding.SerializationContext;
   import org.apache.axis.encoding.Serializer;
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   import org.apache.axis.wsdl.fromJava.Types;
   
   import org.apache.axis.components.logger.LogFactory;
  @@ -105,7 +106,7 @@
           throws IOException
       {
           if (value == null)
  -            throw new IOException(JavaUtils.getMessage("cantDoNullArray00"));
  +            throw new IOException(Messages.getMessage("cantDoNullArray00"));
   
           MessageContext msgContext = context.getMessageContext();
           SchemaVersion schema = msgContext.getSchemaVersion();
  @@ -117,7 +118,7 @@
           if (!cls.isArray()) {
               if (!(value instanceof Collection)) {
                   throw new IOException(
  -                        JavaUtils.getMessage("cantSerialize00", cls.getName()));
  +                        Messages.getMessage("cantSerialize00", cls.getName()));
               }
               list = (Collection)value;
           }
  @@ -160,7 +161,7 @@
   
           if (componentQName == null) {
               throw new IOException(
  -                    JavaUtils.getMessage("noType00", componentType.getName()));
  +                    Messages.getMessage("noType00", componentType.getName()));
           }
   
           String prefix = context.getPrefixForURI(componentQName.getNamespaceURI());
  
  
  
  1.15      +2 -1      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.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- BeanPropertyTarget.java	15 Aug 2002 13:24:47 -0000	1.14
  +++ BeanPropertyTarget.java	9 Sep 2002 17:03:23 -0000	1.15
  @@ -58,6 +58,7 @@
   import org.apache.axis.encoding.Target;
   import org.apache.axis.utils.BeanPropertyDescriptor;
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   
   import org.apache.axis.components.logger.LogFactory;
   import org.apache.commons.logging.Log;
  @@ -122,7 +123,7 @@
                       String valueType = "null";
                       if (value != null)
                           valueType = value.getClass().getName();
  -                    log.error(JavaUtils.getMessage("cantConvert02",
  +                    log.error(Messages.getMessage("cantConvert02",
                                                      new String[] {
                                                          valueType,
                                                          field,
  
  
  
  1.7       +2 -1      xml-axis/java/src/org/apache/axis/encoding/ser/ElementSerializer.java
  
  Index: ElementSerializer.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/encoding/ser/ElementSerializer.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- ElementSerializer.java	16 Aug 2002 11:07:09 -0000	1.6
  +++ ElementSerializer.java	9 Sep 2002 17:03:23 -0000	1.7
  @@ -67,6 +67,7 @@
   import org.apache.axis.encoding.Serializer;
   import org.apache.axis.encoding.SerializationContext;
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   
   /**
    * Serializer for DOM elements
  @@ -84,7 +85,7 @@
           throws IOException
       {
           if (!(value instanceof Element))
  -            throw new IOException(JavaUtils.getMessage("cantSerialize01"));
  +            throw new IOException(Messages.getMessage("cantSerialize01"));
   
           // suppress xsd:any namespace="##any" elements
           boolean suppressElement = (!context.getMessageContext().isEncoded() && 
  
  
  
  1.15      +2 -1      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.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- MapSerializer.java	22 Jul 2002 20:10:04 -0000	1.14
  +++ MapSerializer.java	9 Sep 2002 17:03:23 -0000	1.15
  @@ -59,6 +59,7 @@
   import org.apache.axis.encoding.SerializationContext;
   import org.apache.axis.encoding.Serializer;
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   import org.apache.axis.wsdl.fromJava.Types;
   
   import org.apache.axis.components.logger.LogFactory;
  @@ -109,7 +110,7 @@
       {
           if (!(value instanceof Map))
               throw new IOException(
  -                JavaUtils.getMessage("noMap00", "MapSerializer", value.getClass().getName()));
  +                Messages.getMessage("noMap00", "MapSerializer", value.getClass().getName()));
   
           Map map = (Map)value;
   
  
  
  
  1.27      +11 -10    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.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- ArrayDeserializer.java	24 Aug 2002 01:25:19 -0000	1.26
  +++ ArrayDeserializer.java	9 Sep 2002 17:03:23 -0000	1.27
  @@ -63,6 +63,7 @@
   import org.apache.axis.message.SOAPHandler;
   import org.apache.axis.utils.ClassUtils;
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   import org.apache.axis.wsdl.symbolTable.SchemaUtils;
   import org.apache.axis.components.logger.LogFactory;
   import org.apache.commons.logging.Log;
  @@ -190,7 +191,7 @@
                   || rightBracketIndex < leftBracketIndex)
                   {
                       throw new IllegalArgumentException(
  -                      JavaUtils.getMessage("badArrayType00", 
  +                      Messages.getMessage("badArrayType00", 
                                              "" + arrayTypeValue));
                   }
               
  @@ -246,7 +247,7 @@
                           dims));
                   } catch (Exception e) {
                       throw new SAXException(
  -                       JavaUtils.getMessage("noComponent00",  
  +                       Messages.getMessage("noComponent00",  
                                               "" + defaultItemType));
                   }
               }
  @@ -254,7 +255,7 @@
   
           if (arrayClass == null) {
               throw new SAXException(
  -               JavaUtils.getMessage("noComponent00",  "" + defaultItemType));
  +               Messages.getMessage("noComponent00",  "" + defaultItemType));
           }
   
           if (dimString == null || dimString.length() == 0) {
  @@ -299,7 +300,7 @@
               catch (NumberFormatException e)
               {
                   throw new IllegalArgumentException(
  -                        JavaUtils.getMessage("badInteger00", dimString));
  +                        Messages.getMessage("badInteger00", dimString));
               }
           }
   
  @@ -316,7 +317,7 @@
                   || rightBracketIndex < leftBracketIndex)
               {
                   throw new SAXException(
  -                        JavaUtils.getMessage("badOffset00", offset));
  +                        Messages.getMessage("badOffset00", offset));
               }
   
               curIndex = 
  @@ -369,7 +370,7 @@
                       || rightBracketIndex < leftBracketIndex)
                   {
                       throw new SAXException(
  -                            JavaUtils.getMessage("badPosition00", pos));
  +                            Messages.getMessage("badPosition00", pos));
                   }
                   
                   curIndex = 
  @@ -563,7 +564,7 @@
                   index = Integer.parseInt(tokenizer.nextToken());
                   if (tokenizer.hasMoreTokens()) {
                       throw new SAXException(
  -                        JavaUtils.getMessage(exceptKey, text));
  +                        Messages.getMessage(exceptKey, text));
                   }
               }
               else {
  @@ -576,7 +577,7 @@
                       dim++;
                       if (dim >= mDimLength.size()) {
                           throw new SAXException(
  -                            JavaUtils.getMessage(exceptKey, text));
  +                            Messages.getMessage(exceptKey, text));
                       }
                       // Get the next token and convert to integer
                       int workIndex = Integer.parseInt(tokenizer.nextToken());
  @@ -586,7 +587,7 @@
                           workIndex >= 
                               ((Integer)mDimLength.get(dim)).intValue()) {
                           throw new SAXException(
  -                            JavaUtils.getMessage(exceptKey, text));
  +                            Messages.getMessage(exceptKey, text));
                       }
                       work.add(new Integer(workIndex));
                   }
  @@ -595,7 +596,7 @@
           } catch (SAXException e) {
               throw e;
           } catch (Exception e) {
  -            throw new SAXException(JavaUtils.getMessage(exceptKey, text));
  +            throw new SAXException(Messages.getMessage(exceptKey, text));
           }
           return index;
       } 
  
  
  
  1.2       +2 -1      xml-axis/java/src/org/apache/axis/encoding/ser/SourceDataHandlerSerializer.java
  
  Index: SourceDataHandlerSerializer.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/encoding/ser/SourceDataHandlerSerializer.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- SourceDataHandlerSerializer.java	26 Aug 2002 13:10:21 -0000	1.1
  +++ SourceDataHandlerSerializer.java	9 Sep 2002 17:03:23 -0000	1.2
  @@ -62,6 +62,7 @@
   import org.apache.axis.encoding.SerializationContext;
   
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   
   import org.apache.commons.logging.Log;
   
  @@ -95,7 +96,7 @@
       {
           if (value != null) {
               if (!(value instanceof StreamSource)) {
  -                throw new IOException(JavaUtils.getMessage("badSource",
  +                throw new IOException(Messages.getMessage("badSource",
                           value.getClass().getName()));
               }
               DataHandler dh = new DataHandler(new SourceDataSource("source",
  
  
  
  1.26      +4 -3      xml-axis/java/src/org/apache/axis/encoding/ser/SimpleSerializer.java
  
  Index: SimpleSerializer.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/encoding/ser/SimpleSerializer.java,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- SimpleSerializer.java	19 Aug 2002 18:51:27 -0000	1.25
  +++ SimpleSerializer.java	9 Sep 2002 17:03:23 -0000	1.26
  @@ -65,6 +65,7 @@
   import org.apache.axis.utils.BeanPropertyDescriptor;
   import org.apache.axis.utils.BeanUtils;
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   import org.apache.axis.utils.XMLUtils;
   import org.apache.axis.wsdl.fromJava.Types;
   import org.w3c.dom.Element;
  @@ -132,7 +133,7 @@
           throws IOException
       {
           if (value != null && value.getClass() == java.lang.Object.class) {
  -            throw new IOException(JavaUtils.getMessage("cantSerialize02"));
  +            throw new IOException(Messages.getMessage("cantSerialize02"));
           }
   
           // get any attributes
  @@ -285,7 +286,7 @@
   
                           // Attribute must be a simple type, enum or SimpleType
                           if (!types.isAcceptableAsAttribute(fieldType)) {
  -                            throw new AxisFault(JavaUtils.getMessage("AttrNotSimpleType00",
  +                            throw new AxisFault(Messages.getMessage("AttrNotSimpleType00",
                                       propName,
                                       fieldType.getName()));
                           }
  @@ -307,7 +308,7 @@
               Class type = bpd.getType();
               // Attribute must extend a simple type, enum or SimpleType
               if (!types.isAcceptableAsAttribute(type)) {
  -                throw new AxisFault(JavaUtils.getMessage("AttrNotSimpleType01",
  +                throw new AxisFault(Messages.getMessage("AttrNotSimpleType01",
                           type.getName()));
               }
               base = types.writeType(type);
  
  
  
  1.12      +2 -1      xml-axis/java/src/org/apache/axis/encoding/ser/BaseSerializerFactory.java
  
  Index: BaseSerializerFactory.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/encoding/ser/BaseSerializerFactory.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- BaseSerializerFactory.java	27 Jun 2002 17:22:32 -0000	1.11
  +++ BaseSerializerFactory.java	9 Sep 2002 17:03:23 -0000	1.12
  @@ -68,6 +68,7 @@
   import org.apache.axis.Constants;
   import org.apache.axis.utils.ClassUtils;
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   import org.apache.axis.encoding.Serializer;
   import org.apache.axis.encoding.SerializerFactory;
   import org.apache.axis.encoding.SerializationContext;
  @@ -143,7 +144,7 @@
               }
           } catch (Exception e) {
               throw new JAXRPCException(
  -                JavaUtils.getMessage("CantGetSerializer", 
  +                Messages.getMessage("CantGetSerializer", 
                                        serClass.getName()),
                   e);
           }
  
  
  
  1.19      +2 -1      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.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- JAFDataHandlerSerializer.java	30 Aug 2002 17:17:58 -0000	1.18
  +++ JAFDataHandlerSerializer.java	9 Sep 2002 17:03:23 -0000	1.19
  @@ -71,6 +71,7 @@
   import org.apache.axis.encoding.DeserializationContext;
   import org.apache.axis.encoding.Deserializer;
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   
   import javax.activation.DataHandler;
   import org.apache.axis.Part;
  @@ -116,7 +117,7 @@
               // Attachments apparently aren't supported.
               // Instead of throwing NullPointerException like
               // we used to do, throw something meaningful.
  -            throw new IOException(JavaUtils.getMessage("noAttachments"));
  +            throw new IOException(Messages.getMessage("noAttachments"));
           }
   
           Part attachmentPart= attachments.createAttachmentPart(dh);
  
  
  
  1.23      +6 -5      xml-axis/java/src/org/apache/axis/encoding/ser/SimpleDeserializer.java
  
  Index: SimpleDeserializer.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/encoding/ser/SimpleDeserializer.java,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- SimpleDeserializer.java	26 Aug 2002 23:44:33 -0000	1.22
  +++ SimpleDeserializer.java	9 Sep 2002 17:03:23 -0000	1.23
  @@ -65,6 +65,7 @@
   import org.apache.axis.utils.BeanPropertyDescriptor;
   import org.apache.axis.utils.BeanUtils;
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   import org.xml.sax.Attributes;
   import org.xml.sax.SAXException;
   
  @@ -185,7 +186,7 @@
           throws SAXException
       {
           throw new SAXException(
  -                JavaUtils.getMessage("cantHandle00", "SimpleDeser"));
  +                Messages.getMessage("cantHandle00", "SimpleDeser"));
       }
       
       /**
  @@ -247,7 +248,7 @@
   
                   default:
                      throw new NumberFormatException(
  -                           JavaUtils.getMessage("badBool00"));
  +                           Messages.getMessage("badBool00"));
               }
               
           }
  @@ -318,16 +319,16 @@
                   QName qn = tm.getTypeQName(type);
                   if (qn == null)
                       throw new SAXException(
  -                            JavaUtils.getMessage("unregistered00", type.toString()));
  +                            Messages.getMessage("unregistered00", type.toString()));
   
                   // get the deserializer
                   Deserializer dSer = context.getDeserializerForType(qn);
                   if (dSer == null)
                       throw new SAXException(
  -                            JavaUtils.getMessage("noDeser00", type.toString()));
  +                            Messages.getMessage("noDeser00", type.toString()));
                   if (! (dSer instanceof SimpleDeserializer))
                       throw new SAXException(
  -                            JavaUtils.getMessage("AttrNotSimpleType00",
  +                            Messages.getMessage("AttrNotSimpleType00",
                                                    bpd.getName(),
                                                    type.toString()));
   
  
  
  
  1.19      +2 -1      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.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- MapDeserializer.java	19 Aug 2002 12:12:08 -0000	1.18
  +++ MapDeserializer.java	9 Sep 2002 17:03:23 -0000	1.19
  @@ -62,6 +62,7 @@
   import org.apache.axis.encoding.DeserializerTarget;
   import org.apache.axis.message.SOAPHandler;
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   
   import org.apache.axis.components.logger.LogFactory;
   import org.apache.commons.logging.Log;
  @@ -165,7 +166,7 @@
       public void setValue(Object value, Object hint) throws SAXException
       {
           if (log.isDebugEnabled()) {
  -            log.debug(JavaUtils.getMessage("gotValue00", "MapDeserializer", "" + value));
  +            log.debug(Messages.getMessage("gotValue00", "MapDeserializer", "" + value));
           }
           ((Map)this.value).put(hint, value);
       }
  
  
  
  1.18      +3 -2      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.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- VectorDeserializer.java	19 Aug 2002 12:12:08 -0000	1.17
  +++ VectorDeserializer.java	9 Sep 2002 17:03:23 -0000	1.18
  @@ -62,6 +62,7 @@
   import org.apache.axis.encoding.DeserializerTarget;
   import org.apache.axis.message.SOAPHandler;
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   
   import org.apache.axis.components.logger.LogFactory;
   import org.apache.commons.logging.Log;
  @@ -140,7 +141,7 @@
           }
           
           if (attributes == null)
  -            throw new SAXException(JavaUtils.getMessage("noType01"));
  +            throw new SAXException(Messages.getMessage("noType01"));
   
           // If the xsi:nil attribute, set the value to null and return since
           // there is nothing to deserialize.
  @@ -183,7 +184,7 @@
       public void setValue(Object value, Object hint) throws SAXException
       {
           if (log.isDebugEnabled()) {
  -            log.debug(JavaUtils.getMessage("gotValue00", "VectorDeserializer", "" + value));
  +            log.debug(Messages.getMessage("gotValue00", "VectorDeserializer", "" + value));
           }
           int offset = ((Integer)hint).intValue();
           Vector v = (Vector)this.value;
  
  
  
  1.14      +3 -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.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- JAFDataHandlerDeserializer.java	3 Aug 2002 21:25:25 -0000	1.13
  +++ JAFDataHandlerDeserializer.java	9 Sep 2002 17:03:23 -0000	1.14
  @@ -60,6 +60,7 @@
   import org.apache.axis.encoding.DeserializerImpl;
   import org.apache.axis.message.SOAPHandler;
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   
   import org.apache.axis.components.logger.LogFactory;
   import org.apache.commons.logging.Log;
  @@ -95,7 +96,7 @@
                                                      localName,
                                                      attributes);
           if (log.isDebugEnabled()) {
  -            log.debug(JavaUtils.getMessage("gotType00", "Deser", "" + type));
  +            log.debug(Messages.getMessage("gotType00", "Deser", "" + type));
           }
           
           String href = attributes.getValue("href");
  @@ -120,7 +121,7 @@
                                       Attributes attributes,
                                       DeserializationContext context)
           throws SAXException {
  -        throw new SAXException(JavaUtils.getMessage(
  +        throw new SAXException(Messages.getMessage(
                   "noSubElements", namespace + ":" + localName));
       }
   }
  
  
  
  1.41      +2 -1      xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaTestCaseWriter.java
  
  Index: JavaTestCaseWriter.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaTestCaseWriter.java,v
  retrieving revision 1.40
  retrieving revision 1.41
  diff -u -r1.40 -r1.41
  --- JavaTestCaseWriter.java	22 Aug 2002 22:00:42 -0000	1.40
  +++ JavaTestCaseWriter.java	9 Sep 2002 17:03:24 -0000	1.41
  @@ -70,6 +70,7 @@
   import javax.xml.rpc.holders.BooleanHolder;
   
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   
   import org.apache.axis.wsdl.symbolTable.BindingEntry;
   import org.apache.axis.wsdl.symbolTable.Parameter;
  @@ -291,7 +292,7 @@
           pw.println("        }");
   
           pw.println("        assertTrue(\"" +
  -                JavaUtils.getMessage("null00", "binding") +
  +                Messages.getMessage("null00", "binding") +
                   "\", binding != null);");
           pw.println();
       } // writeBindingAssignment
  
  
  
  1.91      +8 -7      xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaStubWriter.java
  
  Index: JavaStubWriter.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaStubWriter.java,v
  retrieving revision 1.90
  retrieving revision 1.91
  diff -u -r1.90 -r1.91
  --- JavaStubWriter.java	6 Sep 2002 17:14:23 -0000	1.90
  +++ JavaStubWriter.java	9 Sep 2002 17:03:24 -0000	1.91
  @@ -55,6 +55,7 @@
   package org.apache.axis.wsdl.toJava;
   
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   import org.apache.axis.wsdl.symbolTable.BindingEntry;
   import org.apache.axis.wsdl.symbolTable.CollectionTE;
   import org.apache.axis.wsdl.symbolTable.Element;
  @@ -200,18 +201,18 @@
           pw.println("                    _call.setScopedProperty(key, super.cachedProperties.get(key));");
           pw.println("            }");
           if (types.size() > 0 || hasMIME) {
  -            pw.println("            // " + JavaUtils.getMessage("typeMap00"));
  -            pw.println("            // " + JavaUtils.getMessage("typeMap01"));
  -            pw.println("            // " + JavaUtils.getMessage("typeMap02"));
  -            pw.println("            // " + JavaUtils.getMessage("typeMap03"));
  -            pw.println("            // " + JavaUtils.getMessage("typeMap04"));
  +            pw.println("            // " + Messages.getMessage("typeMap00"));
  +            pw.println("            // " + Messages.getMessage("typeMap01"));
  +            pw.println("            // " + Messages.getMessage("typeMap02"));
  +            pw.println("            // " + Messages.getMessage("typeMap03"));
  +            pw.println("            // " + Messages.getMessage("typeMap04"));
               pw.println("            synchronized (this) {");
               pw.println("                if (firstCall()) {");
               
               // Hack alert - we need to establish the encoding style before we register type mappings due
               // to the fact that TypeMappings key off of encoding style
               pw.println("                    // "
  -                    + JavaUtils.getMessage("mustSetStyle"));
  +                    + Messages.getMessage("mustSetStyle"));
               if (bEntry.hasLiteral()) {
                   pw.println("                    _call.setEncodingStyle(null);");
               } else {
  @@ -235,7 +236,7 @@
           pw.println("        }");
           pw.println("        catch (Throwable t) {");
           pw.println("            throw new org.apache.axis.AxisFault(\""
  -                + JavaUtils.getMessage("badCall01") + "\", t);");
  +                + Messages.getMessage("badCall01") + "\", t);");
           pw.println("        }");
           pw.println("    }");
           pw.println();
  
  
  
  1.11      +4 -3      xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaServiceIfaceWriter.java
  
  Index: JavaServiceIfaceWriter.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaServiceIfaceWriter.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- JavaServiceIfaceWriter.java	15 Aug 2002 23:39:54 -0000	1.10
  +++ JavaServiceIfaceWriter.java	9 Sep 2002 17:03:24 -0000	1.11
  @@ -65,6 +65,7 @@
   import javax.wsdl.Service;
   
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   
   import org.apache.axis.wsdl.symbolTable.BindingEntry;
   import org.apache.axis.wsdl.symbolTable.PortTypeEntry;
  @@ -120,14 +121,14 @@
               Port p = (Port) portIterator.next();
               Binding binding = p.getBinding();
               if (binding == null) {
  -                throw new IOException(JavaUtils.getMessage("emitFailNoBinding01",
  +                throw new IOException(Messages.getMessage("emitFailNoBinding01",
                           new String[] {p.getName()}));
               }
               
               BindingEntry bEntry =
                       symbolTable.getBindingEntry(binding.getQName());
               if (bEntry == null) {
  -                throw new IOException(JavaUtils.getMessage(
  +                throw new IOException(Messages.getMessage(
                           "emitFailNoBindingEntry01",
                           new String[] {binding.getQName().toString()}));
               }
  @@ -135,7 +136,7 @@
               PortTypeEntry ptEntry = symbolTable.getPortTypeEntry(
                       binding.getPortType().getQName());
               if (ptEntry == null) {
  -                throw new IOException(JavaUtils.getMessage(
  +                throw new IOException(Messages.getMessage(
                           "emitFailNoPortType01",
                           new String[]
                           {binding.getPortType().getQName().toString()}));
  
  
  
  1.23      +19 -18    xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaServiceImplWriter.java
  
  Index: JavaServiceImplWriter.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaServiceImplWriter.java,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- JavaServiceImplWriter.java	27 Aug 2002 14:52:48 -0000	1.22
  +++ JavaServiceImplWriter.java	9 Sep 2002 17:03:24 -0000	1.23
  @@ -71,6 +71,7 @@
   import javax.wsdl.Service;
   
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   import org.apache.axis.utils.WSDLUtils;
   
   import org.apache.axis.wsdl.symbolTable.BindingEntry;
  @@ -135,21 +136,21 @@
               Port p = (Port) portIterator.next();
               Binding binding = p.getBinding();
               if (binding == null) {
  -                throw new IOException(JavaUtils.getMessage("emitFailNoBinding01",
  +                throw new IOException(Messages.getMessage("emitFailNoBinding01",
                           new String[] {p.getName()}));
               }
               
               BindingEntry bEntry =
                       symbolTable.getBindingEntry(binding.getQName());
               if (bEntry == null) {
  -                throw new IOException(JavaUtils.getMessage("emitFailNoBindingEntry01",
  +                throw new IOException(Messages.getMessage("emitFailNoBindingEntry01",
                           new String[] {binding.getQName().toString()}));
               }
   
               PortTypeEntry ptEntry = symbolTable.getPortTypeEntry(
                       binding.getPortType().getQName());
               if (ptEntry == null) {
  -                throw new IOException(JavaUtils.getMessage("emitFailNoPortType01",
  +                throw new IOException(Messages.getMessage("emitFailNoPortType01",
                           new String[] {binding.getPortType().getQName().toString()}));
               }
   
  @@ -188,14 +189,14 @@
               String address = WSDLUtils.getAddressFromPort(p);
               if (address == null) {
                   // now what?
  -                throw new IOException(JavaUtils.getMessage("emitFail02",
  +                throw new IOException(Messages.getMessage("emitFail02",
                           portName, className));
               }
               try {
                   new URL(address);
               }
               catch (MalformedURLException e) {
  -                throw new IOException(JavaUtils.getMessage("emitFail03",
  +                throw new IOException(Messages.getMessage("emitFail03",
                           new String[] {portName, className, address}));
               }
               writeAddressInfo(pw, portName, address, p);
  @@ -219,7 +220,7 @@
               String address, Port p) {
           // Write the private address field for this port
           pw.println();
  -        pw.println("    // " + JavaUtils.getMessage("getProxy00", portName));
  +        pw.println("    // " + Messages.getMessage("getProxy00", portName));
           writeComment(pw, p.getDocumentationElement());
           pw.println("    private final java.lang.String " + portName + "_address = \"" + address + "\";");
   
  @@ -238,7 +239,7 @@
       protected void writeWSDDServiceNameInfo(PrintWriter pw,
               String wsddServiceName, String portName) {
           // Write the private WSDD service name field
  -        pw.println("    // " + JavaUtils.getMessage("wsddServiceName00"));
  +        pw.println("    // " + Messages.getMessage("wsddServiceName00"));
           pw.println("    private java.lang.String " + wsddServiceName + " = \"" + portName + "\";");
           pw.println();
   
  @@ -265,7 +266,7 @@
           pw.println("        }");
           pw.println("        catch (java.net.MalformedURLException e) {");
           pw.println("            return null; // " +
  -                   JavaUtils.getMessage("unlikely00"));
  +                   Messages.getMessage("unlikely00"));
           pw.println("        }");
           pw.println("        return get" + portName + "(endpoint);");
           pw.println("    }");
  @@ -298,18 +299,18 @@
               boolean printGetPortNotice)
       {
           pw.println("    /**");
  -        pw.println("     * " + JavaUtils.getMessage("getPortDoc00"));
  -        pw.println("     * " + JavaUtils.getMessage("getPortDoc01"));
  -        pw.println("     * " + JavaUtils.getMessage("getPortDoc02"));
  +        pw.println("     * " + Messages.getMessage("getPortDoc00"));
  +        pw.println("     * " + Messages.getMessage("getPortDoc01"));
  +        pw.println("     * " + Messages.getMessage("getPortDoc02"));
           if (printGetPortNotice) {
  -            pw.println("     * " + JavaUtils.getMessage("getPortDoc03"));
  -            pw.println("     * " + JavaUtils.getMessage("getPortDoc04"));
  +            pw.println("     * " + Messages.getMessage("getPortDoc03"));
  +            pw.println("     * " + Messages.getMessage("getPortDoc04"));
           }
           pw.println("     */");
           pw.println("    public java.rmi.Remote getPort(Class serviceEndpointInterface) throws " + javax.xml.rpc.ServiceException.class.getName() + " {");
           if (getPortIfaces.size() == 0) {
               pw.println("        throw new " + javax.xml.rpc.ServiceException.class.getName() + "(\""
  -                    + JavaUtils.getMessage("noStub") + "  \" + (serviceEndpointInterface == null ? \"null\" : serviceEndpointInterface.getName()));");
  +                    + Messages.getMessage("noStub") + "  \" + (serviceEndpointInterface == null ? \"null\" : serviceEndpointInterface.getName()));");
           }
           else {
               pw.println("        try {");
  @@ -328,7 +329,7 @@
               pw.println("            throw new " + javax.xml.rpc.ServiceException.class.getName() + "(t);");
               pw.println("        }");
               pw.println("        throw new " + javax.xml.rpc.ServiceException.class.getName() + "(\""
  -                    + JavaUtils.getMessage("noStub") + "  \" + (serviceEndpointInterface == null ? \"null\" : serviceEndpointInterface.getName()));");
  +                    + Messages.getMessage("noStub") + "  \" + (serviceEndpointInterface == null ? \"null\" : serviceEndpointInterface.getName()));");
           }
           pw.println("    }");
           pw.println();
  @@ -340,9 +341,9 @@
        */
       protected void writeGetPortQNameClass(PrintWriter pw) {
           pw.println("    /**");
  -        pw.println("     * " + JavaUtils.getMessage("getPortDoc00"));
  -        pw.println("     * " + JavaUtils.getMessage("getPortDoc01"));
  -        pw.println("     * " + JavaUtils.getMessage("getPortDoc02"));
  +        pw.println("     * " + Messages.getMessage("getPortDoc00"));
  +        pw.println("     * " + Messages.getMessage("getPortDoc01"));
  +        pw.println("     * " + Messages.getMessage("getPortDoc02"));
           pw.println("     */");
           pw.println("    public java.rmi.Remote getPort(javax.xml.namespace.QName portName, Class serviceEndpointInterface) throws " + javax.xml.rpc.ServiceException.class.getName() + " {");
           pw.println("        java.rmi.Remote _stub = getPort(serviceEndpointInterface);");
  
  
  
  1.14      +2 -1      xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaEnumTypeWriter.java
  
  Index: JavaEnumTypeWriter.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaEnumTypeWriter.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- JavaEnumTypeWriter.java	15 Aug 2002 23:39:54 -0000	1.13
  +++ JavaEnumTypeWriter.java	9 Sep 2002 17:03:24 -0000	1.14
  @@ -60,6 +60,7 @@
   import java.util.Vector;
   
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   
   import org.apache.axis.wsdl.symbolTable.TypeEntry;
   
  @@ -159,7 +160,7 @@
           pw.println("");
   
           // A protected constructor is used to create the static enumeration values
  -        pw.println("    // " + JavaUtils.getMessage("ctor00"));
  +        pw.println("    // " + Messages.getMessage("ctor00"));
           pw.println("    protected " + javaName + "(" + baseType + " value) {");
           pw.println("        _value_ = value;");
           if (baseClass.equals("java.lang.String") || 
  
  
  
  1.46      +2 -1      xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaSkelWriter.java
  
  Index: JavaSkelWriter.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaSkelWriter.java,v
  retrieving revision 1.45
  retrieving revision 1.46
  diff -u -r1.45 -r1.46
  --- JavaSkelWriter.java	6 Sep 2002 17:14:23 -0000	1.45
  +++ JavaSkelWriter.java	9 Sep 2002 17:03:24 -0000	1.46
  @@ -80,6 +80,7 @@
   import org.apache.axis.wsdl.symbolTable.SymbolTable;
   
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   
   /**
   * This is Wsdl2java's skeleton writer.  It writes the <BindingName>Skeleton.java
  @@ -169,7 +170,7 @@
                               break;
                           default:
                               throw new IOException(
  -                                JavaUtils.getMessage("badParmMode00", 
  +                                Messages.getMessage("badParmMode00", 
                                           (new Byte(p.getMode())).toString()));
                       }
   
  
  
  
  1.15      +3 -2      xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaBindingWriter.java
  
  Index: JavaBindingWriter.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaBindingWriter.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- JavaBindingWriter.java	9 Aug 2002 19:33:09 -0000	1.14
  +++ JavaBindingWriter.java	9 Sep 2002 17:03:24 -0000	1.15
  @@ -59,6 +59,7 @@
   import javax.wsdl.Binding;
   
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   
   import org.apache.axis.wsdl.gen.Generator;
   
  @@ -183,7 +184,7 @@
                       if (Utils.fileExists(fileName,
                               binding.getQName().getNamespaceURI(),
                               emitter.getNamespaces())) {
  -                        System.out.println(JavaUtils.getMessage(
  +                        System.out.println(Messages.getMessage(
                                   "wontOverwrite", fileName));
                       }
                       else {
  @@ -193,7 +194,7 @@
                   }
                   catch (IOException ioe) {
                       System.err.println(
  -                            JavaUtils.getMessage("fileExistError00", fileName));
  +                            Messages.getMessage("fileExistError00", fileName));
                   }
               }
           }
  
  
  
  1.27      +3 -2      xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaBeanWriter.java
  
  Index: JavaBeanWriter.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaBeanWriter.java,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- JavaBeanWriter.java	30 Aug 2002 15:45:29 -0000	1.26
  +++ JavaBeanWriter.java	9 Sep 2002 17:03:24 -0000	1.27
  @@ -60,6 +60,7 @@
   import java.util.Vector;
   
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   
   import org.apache.axis.wsdl.symbolTable.ElementDecl;
   import org.apache.axis.wsdl.symbolTable.SchemaUtils;
  @@ -409,7 +410,7 @@
                   pw.println();
               }
   
  -            pw.println("    // " + JavaUtils.getMessage("needStringCtor"));
  +            pw.println("    // " + Messages.getMessage("needStringCtor"));
               pw.println("    public " + className + "(java.lang.String value) {");
               // Make sure we wrap base types with its Object type
               String wrapper = JavaUtils.getWrapper(simpleValueType);
  @@ -447,7 +448,7 @@
       protected void writeToStringMethod() {
           // If this is a simple type, emit a toString
           if (type.isSimpleType() && simpleValueType != null) {
  -            pw.println("    // " + JavaUtils.getMessage("needToString"));
  +            pw.println("    // " + Messages.getMessage("needToString"));
               String wrapper = JavaUtils.getWrapper(simpleValueType);
               pw.println("    public java.lang.String toString() {");
               if (wrapper != null) {
  
  
  
  1.4       +3 -2      xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaClassWriter.java
  
  Index: JavaClassWriter.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaClassWriter.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- JavaClassWriter.java	8 Aug 2002 15:17:11 -0000	1.3
  +++ JavaClassWriter.java	9 Sep 2002 17:03:24 -0000	1.4
  @@ -59,6 +59,7 @@
   import java.io.PrintWriter;
   
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   
   /**
   * Emitter knows about WSDL writers, one each for PortType, Binding, Service,
  @@ -209,8 +210,8 @@
           pw.println("/**");
           pw.println(" * " + localFile);
           pw.println(" *");
  -        pw.println(" * " + JavaUtils.getMessage("wsdlGenLine00"));
  -        pw.println(" * " + JavaUtils.getMessage("wsdlGenLine01"));
  +        pw.println(" * " + Messages.getMessage("wsdlGenLine00"));
  +        pw.println(" * " + Messages.getMessage("wsdlGenLine01"));
           pw.println(" */");
           pw.println();
       } // writeHeaderComments
  
  
  
  1.10      +9 -8      xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaUndeployWriter.java
  
  Index: JavaUndeployWriter.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaUndeployWriter.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- JavaUndeployWriter.java	8 Aug 2002 15:17:11 -0000	1.9
  +++ JavaUndeployWriter.java	9 Sep 2002 17:03:24 -0000	1.10
  @@ -67,6 +67,7 @@
   import org.apache.axis.deployment.wsdd.WSDDConstants;
   
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   
   import org.apache.axis.wsdl.symbolTable.SymbolTable;
   
  @@ -108,13 +109,13 @@
        * Replace the default file header with the deployment doc file header.
        */
       protected void writeFileHeader(PrintWriter pw) throws IOException {
  -        pw.println(JavaUtils.getMessage("deploy01"));
  -        pw.println(JavaUtils.getMessage("deploy02"));
  -        pw.println(JavaUtils.getMessage("deploy04"));
  -        pw.println(JavaUtils.getMessage("deploy05"));
  -        pw.println(JavaUtils.getMessage("deploy06"));
  -        pw.println(JavaUtils.getMessage("deploy08"));
  -        pw.println(JavaUtils.getMessage("deploy09"));
  +        pw.println(Messages.getMessage("deploy01"));
  +        pw.println(Messages.getMessage("deploy02"));
  +        pw.println(Messages.getMessage("deploy04"));
  +        pw.println(Messages.getMessage("deploy05"));
  +        pw.println(Messages.getMessage("deploy06"));
  +        pw.println(Messages.getMessage("deploy08"));
  +        pw.println(Messages.getMessage("deploy09"));
           pw.println();
           pw.println("<undeployment");
           pw.println("    xmlns=\"" + WSDDConstants.URI_WSDD +"\">");
  @@ -138,7 +139,7 @@
               Service myService = (Service) mapIterator.next();
   
               pw.println();
  -            pw.println("  <!-- " + JavaUtils.getMessage("wsdlService00",
  +            pw.println("  <!-- " + Messages.getMessage("wsdlService00",
                       myService.getQName().getLocalPart()) + " -->");
               pw.println();
   
  
  
  
  1.60      +9 -8      xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaDeployWriter.java
  
  Index: JavaDeployWriter.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaDeployWriter.java,v
  retrieving revision 1.59
  retrieving revision 1.60
  diff -u -r1.59 -r1.60
  --- JavaDeployWriter.java	26 Aug 2002 13:10:22 -0000	1.59
  +++ JavaDeployWriter.java	9 Sep 2002 17:03:24 -0000	1.60
  @@ -76,6 +76,7 @@
   import org.apache.axis.enum.Scope;
   
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   
   import org.apache.axis.wsdl.symbolTable.BindingEntry;
   import org.apache.axis.wsdl.symbolTable.Element;
  @@ -127,13 +128,13 @@
        * Replace the default file header with the deployment doc file header.
        */
       protected void writeFileHeader(PrintWriter pw) throws IOException {
  -        pw.println(JavaUtils.getMessage("deploy00"));
  -        pw.println(JavaUtils.getMessage("deploy02"));
  -        pw.println(JavaUtils.getMessage("deploy03"));
  -        pw.println(JavaUtils.getMessage("deploy05"));
  -        pw.println(JavaUtils.getMessage("deploy06"));
  -        pw.println(JavaUtils.getMessage("deploy07"));
  -        pw.println(JavaUtils.getMessage("deploy09"));
  +        pw.println(Messages.getMessage("deploy00"));
  +        pw.println(Messages.getMessage("deploy02"));
  +        pw.println(Messages.getMessage("deploy03"));
  +        pw.println(Messages.getMessage("deploy05"));
  +        pw.println(Messages.getMessage("deploy06"));
  +        pw.println(Messages.getMessage("deploy07"));
  +        pw.println(Messages.getMessage("deploy09"));
           pw.println();
           pw.println("<deployment");
           pw.println("    xmlns=\"" + WSDDConstants.URI_WSDD +"\"");
  @@ -160,7 +161,7 @@
               Service myService = (Service) mapIterator.next();
   
               pw.println();
  -            pw.println("  <!-- " + JavaUtils.getMessage(
  +            pw.println("  <!-- " + Messages.getMessage(
                       "wsdlService00", myService.getQName().getLocalPart())
                       + " -->");
               pw.println();
  
  
  
  1.20      +3 -2      xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaBeanHelperWriter.java
  
  Index: JavaBeanHelperWriter.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaBeanHelperWriter.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- JavaBeanHelperWriter.java	16 Aug 2002 11:07:10 -0000	1.19
  +++ JavaBeanHelperWriter.java	9 Sep 2002 17:03:24 -0000	1.20
  @@ -62,6 +62,7 @@
   import javax.xml.namespace.QName;
   
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   
   import org.apache.axis.wsdl.symbolTable.ElementDecl;
   import org.apache.axis.wsdl.symbolTable.TypeEntry;
  @@ -223,7 +224,7 @@
                   //}
               }
           }
  -        pw.println("    // " + JavaUtils.getMessage("typeMeta"));
  +        pw.println("    // " + Messages.getMessage("typeMeta"));
           pw.println("    private static org.apache.axis.description.TypeDesc typeDesc =");
           pw.println("        new org.apache.axis.description.TypeDesc(" +
                      Utils.getJavaLocalName(type.getName()) + ".class);");
  @@ -286,7 +287,7 @@
               pw.println();
   
               pw.println("    /**");
  -            pw.println("     * " + JavaUtils.getMessage("returnTypeMeta"));
  +            pw.println("     * " + Messages.getMessage("returnTypeMeta"));
               pw.println("     */");
               pw.println("    public static org.apache.axis.description.TypeDesc getTypeDesc() {");
               pw.println("        return typeDesc;");
  
  
  
  1.22      +6 -5      xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaGeneratorFactory.java
  
  Index: JavaGeneratorFactory.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaGeneratorFactory.java,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- JavaGeneratorFactory.java	29 Aug 2002 17:50:11 -0000	1.21
  +++ JavaGeneratorFactory.java	9 Sep 2002 17:03:24 -0000	1.22
  @@ -78,6 +78,7 @@
   import org.apache.axis.encoding.DefaultTypeMappingImpl;
   
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   
   import org.apache.axis.wsdl.gen.NoopGenerator;
   import org.apache.axis.wsdl.gen.Generator;
  @@ -304,7 +305,7 @@
                   }
                   catch (Throwable t) {
                       throw new IOException(
  -                        JavaUtils.getMessage("exception01", t.getMessage()));
  +                        Messages.getMessage("exception01", t.getMessage()));
                   }
                   gen.generate();
               }
  @@ -858,15 +859,15 @@
                           String name = operation.getName();
                           Parameters parameters = bEntry.getParameters(operation);
                           if (type == OperationType.SOLICIT_RESPONSE) {
  -                            parameters.signature = "    // " + JavaUtils.getMessage(
  +                            parameters.signature = "    // " + Messages.getMessage(
                                       "invalidSolResp00", name);
  -                            System.err.println(JavaUtils.getMessage(
  +                            System.err.println(Messages.getMessage(
                                       "invalidSolResp00", name));
                           }
                           else if (type == OperationType.NOTIFICATION) {
  -                            parameters.signature = "    // " + JavaUtils.getMessage(
  +                            parameters.signature = "    // " + Messages.getMessage(
                                       "invalidNotif00", name);
  -                            System.err.println(JavaUtils.getMessage(
  +                            System.err.println(Messages.getMessage(
                                       "invalidNotif00", name));
                           }
                           else { // ONE_WAY or REQUEST_RESPONSE
  
  
  
  1.18      +3 -2      xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaWriter.java
  
  Index: JavaWriter.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaWriter.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- JavaWriter.java	1 Jul 2002 16:09:38 -0000	1.17
  +++ JavaWriter.java	9 Sep 2002 17:03:24 -0000	1.18
  @@ -60,6 +60,7 @@
   import java.io.PrintWriter;
   
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   
   import org.apache.axis.wsdl.gen.Generator;
   
  @@ -136,7 +137,7 @@
       public void generate() throws IOException {
           String file = getFileName();
           if (isFileGenerated(file)) {
  -            throw new IOException(JavaUtils.getMessage("duplicateFile00", file));
  +            throw new IOException(Messages.getMessage("duplicateFile00", file));
           }
           registerFile(file);
           if (emitter.isVerbose()) {
  @@ -182,7 +183,7 @@
        * method if you want to provide more information.
        */
       protected String verboseMessage(String file) {
  -        return JavaUtils.getMessage("generating", file);
  +        return Messages.getMessage("generating", file);
       } // verboseMessage
   
       /**
  
  
  
  1.5       +2 -1      xml-axis/java/src/org/apache/axis/wsdl/symbolTable/TypeEntry.java
  
  Index: TypeEntry.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/symbolTable/TypeEntry.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- TypeEntry.java	15 Aug 2002 21:27:47 -0000	1.4
  +++ TypeEntry.java	9 Sep 2002 17:03:25 -0000	1.5
  @@ -60,6 +60,7 @@
   import javax.xml.namespace.QName;
   
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   
   import org.w3c.dom.Node;
   
  @@ -275,7 +276,7 @@
                   undefined = false;
                   isBaseType = false;
                   node = null;                   
  -                throw new IOException(JavaUtils.getMessage("undefinedloop00", getQName().toString()));
  +                throw new IOException(Messages.getMessage("undefinedloop00", getQName().toString()));
               }
           }
   
  
  
  
  1.33      +29 -28    xml-axis/java/src/org/apache/axis/wsdl/symbolTable/SymbolTable.java
  
  Index: SymbolTable.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/symbolTable/SymbolTable.java,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- SymbolTable.java	6 Sep 2002 15:18:43 -0000	1.32
  +++ SymbolTable.java	9 Sep 2002 17:03:25 -0000	1.33
  @@ -105,6 +105,7 @@
   import org.apache.axis.Constants;
   
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   import org.apache.axis.utils.XMLUtils;
   import org.apache.axis.utils.URLHashSet;
   
  @@ -316,7 +317,7 @@
        */
       public void dump(java.io.PrintStream out) {
           out.println();
  -        out.println(JavaUtils.getMessage("symbolTable00"));
  +        out.println(Messages.getMessage("symbolTable00"));
           out.println("-----------------------");
           Iterator it = symbolTable.values().iterator();
           while (it.hasNext()) {
  @@ -342,11 +343,11 @@
   
       public void populate(String uri, String username, String password) throws IOException, WSDLException {
           if (verbose)
  -            System.out.println(JavaUtils.getMessage("parsing00", uri));
  +            System.out.println(Messages.getMessage("parsing00", uri));
   
           Document doc = XMLUtils.newDocument(uri, username, password);
           if (doc == null) {
  -            throw new IOException(JavaUtils.getMessage("cantGetDoc00", uri));
  +            throw new IOException(Messages.getMessage("cantGetDoc00", uri));
           }
           this.wsdlURI = uri;
           try {
  @@ -399,12 +400,12 @@
                   if (binding.isUndefined()) {
                       if (filename == null) {
                           throw new IOException(
  -                            JavaUtils.getMessage("emitFailtUndefinedBinding01",
  +                            Messages.getMessage("emitFailtUndefinedBinding01",
                                       binding.getQName().getLocalPart()));
                       }
                       else {
                           throw new IOException(
  -                            JavaUtils.getMessage("emitFailtUndefinedBinding02",
  +                            Messages.getMessage("emitFailtUndefinedBinding02",
                                       binding.getQName().getLocalPart(), filename));
                       }
                   }
  @@ -417,12 +418,12 @@
                   if (portType.isUndefined()) {
                       if (filename == null) {
                           throw new IOException(
  -                            JavaUtils.getMessage("emitFailtUndefinedPort01",
  +                            Messages.getMessage("emitFailtUndefinedPort01",
                                       portType.getQName().getLocalPart()));
                       }
                       else {
                           throw new IOException(
  -                            JavaUtils.getMessage("emitFailtUndefinedPort02",
  +                            Messages.getMessage("emitFailtUndefinedPort02",
                                       portType.getQName().getLocalPart(), filename));
                       }
                   }
  @@ -439,7 +440,7 @@
                   Message message = (Message) i.next();
                   if (message.isUndefined()) {
                       throw new IOException(
  -                            JavaUtils.getMessage("emitFailtUndefinedMessage01",
  +                            Messages.getMessage("emitFailtUndefinedMessage01",
                                       message.getQName().getLocalPart()));
                   }
               }
  @@ -468,7 +469,7 @@
                       (qn.getLocalPart().equals("timeInstant") &&
                        qn.getNamespaceURI().equals(Constants.URI_2001_SCHEMA_XSD))) {
                           throw new IOException(
  -                                JavaUtils.getMessage("wrongNamespace00",
  +                                Messages.getMessage("wrongNamespace00",
                                                        qn.getLocalPart(),
                                                        qn.getNamespaceURI()));
                       } 
  @@ -477,18 +478,18 @@
                       // an unsupported message instead of undefined
                       if (SchemaUtils.isSimpleSchemaType(entry.getQName())) {
                           throw new IOException(
  -                                JavaUtils.getMessage("unsupportedSchemaType00",
  +                                Messages.getMessage("unsupportedSchemaType00",
                                                        qn.getLocalPart()));
                       }
                       
                       // last case, its some other undefined thing
                       throw new IOException(
  -                            JavaUtils.getMessage("undefined00",
  +                            Messages.getMessage("undefined00",
                                                    entry.getQName().toString()));
                   } // if undefined
                   else if (entry instanceof UndefinedElement) {
                       throw new IOException(
  -                            JavaUtils.getMessage("undefinedElem00",
  +                            Messages.getMessage("undefinedElem00",
                               entry.getQName().toString()));
                   }
               }
  @@ -703,7 +704,7 @@
                                       !refType.isSimpleType())) {
                               // Problem if not simple
                               throw new IOException(
  -                                                  JavaUtils.getMessage("AttrNotSimpleType01",
  +                                                  Messages.getMessage("AttrNotSimpleType01",
                                                                          refQName.toString()));
                           }
                       }
  @@ -776,7 +777,7 @@
                       if (name == null) {
                           name = "unknown";
                       }
  -                    throw new IOException(JavaUtils.getMessage("emptyref00", name));
  +                    throw new IOException(Messages.getMessage("emptyref00", name));
                   }
                   
                   // Now get the TypeEntry
  @@ -887,7 +888,7 @@
                   if (name == null) {
                       name = "unknown";
                   }
  -                throw new IOException(JavaUtils.getMessage("emptyref00", name));
  +                throw new IOException(Messages.getMessage("emptyref00", name));
               }
           
               // Get Type or Element depending on whether type attr was used.
  @@ -1026,7 +1027,7 @@
                   Map allInputs = inputMsg.getParts();
                   Collection orderedInputs = inputMsg.getOrderedParts(parameterOrder);
                   if (allInputs.size() != orderedInputs.size()) {
  -                    throw new IOException(JavaUtils.getMessage("emitFail00", operation.getName()));
  +                    throw new IOException(Messages.getMessage("emitFail00", operation.getName()));
                   }
               }
           }
  @@ -1080,7 +1081,7 @@
                       addOutParm(outputs, outdex, parameters, true);
                   }
                   else {
  -                    System.err.println(JavaUtils.getMessage("noPart00", name));
  +                    System.err.println(Messages.getMessage("noPart00", name));
                   }
               }
           }
  @@ -1168,7 +1169,7 @@
                   // part with the same name but different types.... guess
                   // it's not really an inout....
                   // 
  -                //throw new IOException(JavaUtils.getMessage("differentTypes00", 
  +                //throw new IOException(Messages.getMessage("differentTypes00", 
                   //     new String[] { p.getName(), 
                   //                    p.getType().getQName().toString(), 
                   //                   outParam.getType().getQName().toString()
  @@ -1286,7 +1287,7 @@
                   } else {
                       // no type or element
                       throw new IOException(
  -                            JavaUtils.getMessage("noTypeOrElement00", 
  +                            Messages.getMessage("noTypeOrElement00", 
                                                    new String[] {partName, 
                                                                  opName}));
                   }
  @@ -1313,7 +1314,7 @@
                   String bindingName =
                     bindingEntry == null ? "unknown" : bindingEntry.getBinding().getQName().toString();
                   throw new IOException(
  -                        JavaUtils.getMessage("literalTypePart00", 
  +                        Messages.getMessage("literalTypePart00", 
                                                new String[] {partName, 
                                                              opName,  
                                                              bindingName}));
  @@ -1340,7 +1341,7 @@
               // If we have nothing at this point, we're in trouble.
               if (node == null) {
                   throw new IOException(
  -                        JavaUtils.getMessage("badTypeNode", 
  +                        Messages.getMessage("badTypeNode", 
                                                new String[] {
                                                    partName, 
                                                    opName,  
  @@ -1501,7 +1502,7 @@
                               if (obj instanceof SOAPBody) {
                                   String use = ((SOAPBody) obj).getUse();
                                   if (use == null) {
  -                                    throw new IOException(JavaUtils.getMessage(
  +                                    throw new IOException(Messages.getMessage(
                                               "noUse", bindOp.getName()));
                                   }
                                   if (use.equalsIgnoreCase("literal")) {
  @@ -1528,7 +1529,7 @@
                               if (obj instanceof SOAPBody) {
                                   String use = ((SOAPBody) obj).getUse();
                                   if (use == null) {
  -                                    throw new IOException(JavaUtils.getMessage(
  +                                    throw new IOException(Messages.getMessage(
                                               "noUse", bindOp.getName()));
                                   }
                                   if (use.equalsIgnoreCase("literal")) {
  @@ -1563,7 +1564,7 @@
                           if (obj instanceof SOAPBody) {
                               String use = ((SOAPBody) obj).getUse();
                               if (use == null) {
  -                                throw new IOException(JavaUtils.getMessage(
  +                                throw new IOException(Messages.getMessage(
                                           "noUse", bindOp.getName()));
                               }
                               if (use.equalsIgnoreCase("literal")) {
  @@ -1613,7 +1614,7 @@
                   else if (obj instanceof SOAPBody) {
                       String use = ((SOAPBody) obj).getUse();
                       if (use == null) {
  -                        throw new IOException(JavaUtils.getMessage(
  +                        throw new IOException(Messages.getMessage(
                                   "noUse", bindOp.getName()));
                       }
                       if (use.equalsIgnoreCase("literal")) {
  @@ -1637,7 +1638,7 @@
               if (service.getQName() == null ||
                   service.getQName().getLocalPart() == null || 
                   service.getQName().getLocalPart().equals("")) {
  -                throw new IOException(JavaUtils.getMessage("BadServiceName00"));
  +                throw new IOException(Messages.getMessage("BadServiceName00"));
               }
               
               ServiceEntry sEntry = new ServiceEntry(service);
  @@ -1979,7 +1980,7 @@
                       // Problem if the undefined type was used in a 
                       // simple type context.
                       throw new IOException(
  -                                          JavaUtils.getMessage("AttrNotSimpleType01",
  +                                          Messages.getMessage("AttrNotSimpleType01",
                                                                  name.toString()));
   
                   }
  @@ -2043,7 +2044,7 @@
           }
           else {
               throw new IOException(
  -                    JavaUtils.getMessage("alreadyExists00", "" + name));
  +                    Messages.getMessage("alreadyExists00", "" + name));
           }
       } // symbolTablePut
   } // class SymbolTable
  
  
  
  1.52      +4 -3      xml-axis/java/src/org/apache/axis/encoding/DefaultTypeMappingImpl.java
  
  Index: DefaultTypeMappingImpl.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/encoding/DefaultTypeMappingImpl.java,v
  retrieving revision 1.51
  retrieving revision 1.52
  diff -u -r1.51 -r1.52
  --- DefaultTypeMappingImpl.java	4 Sep 2002 13:09:22 -0000	1.51
  +++ DefaultTypeMappingImpl.java	9 Sep 2002 17:03:25 -0000	1.52
  @@ -80,6 +80,7 @@
   import org.apache.axis.encoding.ser.VectorDeserializerFactory;
   import org.apache.axis.encoding.ser.VectorSerializerFactory;
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   
   import javax.xml.namespace.QName;
   import javax.xml.rpc.JAXRPCException;
  @@ -621,7 +622,7 @@
   
           // Don't allow anyone but init to modify us.
           if (doneInit) {
  -            throw new JAXRPCException(JavaUtils.getMessage("fixedTypeMapping"));
  +            throw new JAXRPCException(Messages.getMessage("fixedTypeMapping"));
           }
           else {
               super.register(javaType, xmlType, sf, dsf);
  @@ -629,11 +630,11 @@
       }
       public void removeSerializer(Class javaType, QName xmlType)
           throws JAXRPCException {
  -        throw new JAXRPCException(JavaUtils.getMessage("fixedTypeMapping"));
  +        throw new JAXRPCException(Messages.getMessage("fixedTypeMapping"));
       }
       public void removeDeserializer(Class javaType, QName xmlType)
           throws JAXRPCException {
  -        throw new JAXRPCException(JavaUtils.getMessage("fixedTypeMapping"));
  +        throw new JAXRPCException(Messages.getMessage("fixedTypeMapping"));
       }
       public void setSupportedEncodings(String[] namespaceURIs) {
       }
  
  
  
  1.28      +7 -6      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.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- DeserializerImpl.java	19 Aug 2002 12:12:08 -0000	1.27
  +++ DeserializerImpl.java	9 Sep 2002 17:03:25 -0000	1.28
  @@ -63,6 +63,7 @@
   import org.apache.axis.message.SOAPHandler;
   import org.apache.axis.Part;
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   
   import org.apache.axis.components.logger.LogFactory;
   import org.apache.commons.logging.Log;
  @@ -258,7 +259,7 @@
                       Target target = (Target)e.nextElement();
                       target.set(value);
                       if (log.isDebugEnabled()) {
  -                        log.debug(JavaUtils.getMessage("setValueInTarget00",
  +                        log.debug(Messages.getMessage("setValueInTarget00",
                                                               "" + value, "" + target));
                       }
                   }
  @@ -338,7 +339,7 @@
           if (id != null) {
               context.addObjectById(id, value);
               if (log.isDebugEnabled()) {
  -                log.debug(JavaUtils.getMessage("deserInitPutValueDebug00", "" + value, id));
  +                log.debug(Messages.getMessage("deserInitPutValueDebug00", "" + value, id));
               }
               context.registerFixup("#" + id, this);
           }
  @@ -349,7 +350,7 @@
   
               Object ref = context.getObjectByRef(href);            
               if (log.isDebugEnabled()) {
  -                log.debug(JavaUtils.getMessage(
  +                log.debug(Messages.getMessage(
                           "gotForID00",
                           new String[] {"" + ref, href, (ref == null ? "*null*" : ref.getClass().toString())}));
               }
  @@ -427,7 +428,7 @@
               }
               
               if (log.isDebugEnabled()) {
  -                log.debug(JavaUtils.getMessage("gotType00", "Deser", "" + type));
  +                log.debug(Messages.getMessage("gotType00", "Deser", "" + type));
               }
               
               // We know we're deserializing, but we don't have
  @@ -444,7 +445,7 @@
                                         attributes, context);
                   } else {
                       throw new SAXException(
  -                                           JavaUtils.getMessage("noDeser00", "" + type));
  +                                           Messages.getMessage("noDeser00", "" + type));
                   }
               }
           }
  @@ -507,7 +508,7 @@
           if (id != null) {
               context.addObjectById(id, value);
               if (log.isDebugEnabled()) {
  -                log.debug(JavaUtils.getMessage("deserPutValueDebug00", "" + value, id));
  +                log.debug(Messages.getMessage("deserPutValueDebug00", "" + value, id));
               }     
           }
       }
  
  
  
  1.6       +4 -3      xml-axis/java/src/org/apache/axis/encoding/TypeMappingDelegate.java
  
  Index: TypeMappingDelegate.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/encoding/TypeMappingDelegate.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- TypeMappingDelegate.java	19 Jun 2002 16:13:17 -0000	1.5
  +++ TypeMappingDelegate.java	9 Sep 2002 17:03:25 -0000	1.6
  @@ -57,6 +57,7 @@
   
   import org.apache.axis.Constants;
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   
   import javax.xml.namespace.QName;
   import javax.xml.rpc.JAXRPCException;
  @@ -103,7 +104,7 @@
           throws JAXRPCException {        
   
           throw new JAXRPCException(
  -                JavaUtils.getMessage("delegatedTypeMapping"));
  +                Messages.getMessage("delegatedTypeMapping"));
       }
       
       public javax.xml.rpc.encoding.SerializerFactory 
  @@ -141,13 +142,13 @@
       public void removeSerializer(Class javaType, QName xmlType)
           throws JAXRPCException {
           throw new JAXRPCException(
  -                JavaUtils.getMessage("delegatedTypeMapping"));
  +                Messages.getMessage("delegatedTypeMapping"));
       }
   
       public void removeDeserializer(Class javaType, QName xmlType)
           throws JAXRPCException {
           throw new JAXRPCException(
  -                JavaUtils.getMessage("delegatedTypeMapping"));
  +                Messages.getMessage("delegatedTypeMapping"));
       }
   
      public boolean isRegistered(Class javaType, QName xmlType) {
  
  
  
  1.10      +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.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- MethodTarget.java	12 Aug 2002 22:35:56 -0000	1.9
  +++ MethodTarget.java	9 Sep 2002 17:03:25 -0000	1.10
  @@ -61,6 +61,7 @@
   import java.lang.reflect.InvocationTargetException;
   
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   
   import org.apache.axis.components.logger.LogFactory;
   import org.apache.commons.logging.Log;
  @@ -108,15 +109,15 @@
           try {
               targetMethod.invoke(targetObject, new Object [] { value });
           } catch (IllegalAccessException accEx) {
  -            log.error(JavaUtils.getMessage("illegalAccessException00"),
  +            log.error(Messages.getMessage("illegalAccessException00"),
                         accEx);
               throw new SAXException(accEx);
           } catch (IllegalArgumentException argEx) {
  -            log.error(JavaUtils.getMessage("illegalArgumentException00"),
  +            log.error(Messages.getMessage("illegalArgumentException00"),
                         argEx);
               throw new SAXException(argEx);
           } catch (InvocationTargetException targetEx) {
  -            log.error(JavaUtils.getMessage("invocationTargetException00"),
  +            log.error(Messages.getMessage("invocationTargetException00"),
                         targetEx);
               throw new SAXException(targetEx);
           }
  
  
  
  1.65      +7 -6      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.64
  retrieving revision 1.65
  diff -u -r1.64 -r1.65
  --- SerializationContextImpl.java	5 Sep 2002 01:08:37 -0000	1.64
  +++ SerializationContextImpl.java	9 Sep 2002 17:03:25 -0000	1.65
  @@ -71,6 +71,7 @@
   import org.apache.axis.client.Call;
   import org.apache.axis.utils.JavaUtils;
   import org.apache.axis.utils.Mapping;
  +import org.apache.axis.utils.Messages;
   import org.apache.axis.utils.NSStack;
   import org.apache.axis.utils.XMLUtils;
   
  @@ -413,7 +414,7 @@
       public void registerPrefixForURI(String prefix, String uri)
       {
           if (log.isDebugEnabled()) {
  -            log.debug(JavaUtils.getMessage("register00", prefix, uri));
  +            log.debug(Messages.getMessage("register00", prefix, uri));
           }
   
           if ((uri != null) && (prefix != null)) {
  @@ -882,7 +883,7 @@
       {
           java.util.ArrayList vecQNames = null;
           if (log.isDebugEnabled()) {
  -            log.debug(JavaUtils.getMessage("startElem00",
  +            log.debug(Messages.getMessage("startElem00",
                       "[" + qName.getNamespaceURI() + "]:" + qName.getLocalPart()));
           }
   
  @@ -977,7 +978,7 @@
           String elementQName = (String)elementStack.pop();
   
           if (log.isDebugEnabled()) {
  -            log.debug(JavaUtils.getMessage("endElem00", "" + elementQName));
  +            log.debug(Messages.getMessage("endElem00", "" + elementQName));
           }
   
           nsStack.pop();
  @@ -1173,7 +1174,7 @@
   
               if (tm == null) {
                   throw new IOException(
  -                        JavaUtils.getMessage("noSerializer00",
  +                        Messages.getMessage("noSerializer00",
                                                value.getClass().getName(),
                                                "" + this));
               }
  @@ -1209,7 +1210,7 @@
                   return;
               }
   
  -            throw new IOException(JavaUtils.getMessage("noSerializer00",
  +            throw new IOException(Messages.getMessage("noSerializer00",
                       value.getClass().getName(), "" + tm));
           }
           // !!! Write out a generic null, or get type info from somewhere else?
  @@ -1288,7 +1289,7 @@
           Serializer ser = getSerializer(value.getClass(), xmlType);
           if (!(ser instanceof SimpleValueSerializer)) {
               throw new IOException(
  -                    JavaUtils.getMessage("needSimpleValueSer",
  +                    Messages.getMessage("needSimpleValueSer",
                                            ser.getClass().getName()));
           }
           SimpleValueSerializer simpleSer = (SimpleValueSerializer)ser;
  
  
  
  1.14      +5 -4      xml-axis/java/src/org/apache/axis/encoding/TypeMappingRegistryImpl.java
  
  Index: TypeMappingRegistryImpl.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/encoding/TypeMappingRegistryImpl.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- TypeMappingRegistryImpl.java	19 Jun 2002 16:13:17 -0000	1.13
  +++ TypeMappingRegistryImpl.java	9 Sep 2002 17:03:25 -0000	1.14
  @@ -58,6 +58,7 @@
   import org.apache.axis.Constants;
   import org.apache.axis.deployment.wsdd.WSDDConstants;
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   
   import javax.xml.namespace.QName;
   import javax.xml.rpc.JAXRPCException;
  @@ -250,11 +251,11 @@
           if (mapping == null || 
               !(mapping instanceof TypeMapping)) {
               throw new IllegalArgumentException(
  -                    JavaUtils.getMessage("badTypeMapping"));
  +                    Messages.getMessage("badTypeMapping"));
           } 
           if (namespaceURI == null) {
               throw new java.lang.IllegalArgumentException(
  -                    JavaUtils.getMessage("nullNamespaceURI"));
  +                    Messages.getMessage("nullNamespaceURI"));
           }
           // Get or create a TypeMappingDelegate and set it to 
           // delegate to the new mapping.
  @@ -282,7 +283,7 @@
           if (mapping == null || 
               !(mapping instanceof TypeMapping)) {
               throw new IllegalArgumentException(
  -                    JavaUtils.getMessage("badTypeMapping"));
  +                    Messages.getMessage("badTypeMapping"));
           }
   
           /* Don't allow this call after the delegate() method since
  @@ -291,7 +292,7 @@
            */
           if (defaultDelTM.getDelegate() instanceof TypeMappingDelegate) {
               throw new IllegalArgumentException(
  -                    JavaUtils.getMessage("defaultTypeMappingSet"));
  +                    Messages.getMessage("defaultTypeMappingSet"));
           }
   
           defaultDelTM.setDelegate((TypeMapping) mapping);
  
  
  
  1.58      +8 -7      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.57
  retrieving revision 1.58
  diff -u -r1.57 -r1.58
  --- DeserializationContextImpl.java	4 Sep 2002 21:48:15 -0000	1.57
  +++ DeserializationContextImpl.java	9 Sep 2002 17:03:25 -0000	1.58
  @@ -67,6 +67,7 @@
   import org.apache.axis.message.SAX2EventRecorder;
   import org.apache.axis.message.SOAPEnvelope;
   import org.apache.axis.message.SOAPHandler;
  +import org.apache.axis.utils.Messages;
   import org.apache.axis.utils.NSStack;
   import org.apache.axis.utils.JavaUtils;
   import org.apache.axis.utils.XMLUtils;
  @@ -418,13 +419,13 @@
               dserF = (DeserializerFactory) getTypeMapping().
                       getDeserializer(cls, xmlType);
           } catch (JAXRPCException e) {
  -            log.error(JavaUtils.getMessage("noFactory00", xmlType.toString()));
  +            log.error(Messages.getMessage("noFactory00", xmlType.toString()));
           }
           if (dserF != null) {
               try {
                   dser = (Deserializer) dserF.getDeserializerAs(Constants.AXIS_SAX);
               } catch (JAXRPCException e) {
  -                log.error(JavaUtils.getMessage("noDeser00", xmlType.toString()));
  +                log.error(Messages.getMessage("noDeser00", xmlType.toString()));
               }
           }
           return dser;
  @@ -665,7 +666,7 @@
                * occurs if the parent already has an explicit object value,
                * which should never occur during deserialization.
                */
  -            log.fatal(JavaUtils.getMessage("exception00"), e);
  +            log.fatal(Messages.getMessage("exception00"), e);
           }
           curElement = elem;
   
  @@ -680,7 +681,7 @@
       public void pushElementHandler(SOAPHandler handler)
       {
           if (log.isDebugEnabled()) {
  -            log.debug(JavaUtils.getMessage("pushHandler00", "" + handler));
  +            log.debug(Messages.getMessage("pushHandler00", "" + handler));
           }
   
           if (topHandler != null) pushedDownHandlers.add(topHandler);
  @@ -711,9 +712,9 @@
   
           if (log.isDebugEnabled()) {
               if (result == null) {
  -                log.debug(JavaUtils.getMessage("popHandler00", "(null)"));
  +                log.debug(Messages.getMessage("popHandler00", "(null)"));
               } else {
  -                log.debug(JavaUtils.getMessage("popHandler00", "" + result));
  +                log.debug(Messages.getMessage("popHandler00", "" + result));
               }
           }
   
  @@ -841,7 +842,7 @@
       public void processingInstruction(String p1, String p2) throws SAXException {
           // must throw an error since SOAP 1.1 doesn't allow
           // processing instructions anywhere in the message
  -        throw new SAXException(JavaUtils.getMessage("noInstructions00"));
  +        throw new SAXException(Messages.getMessage("noInstructions00"));
       }
   
       public void skippedEntity(String p1) throws SAXException {
  
  
  
  1.9       +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.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- FieldTarget.java	12 Aug 2002 22:35:56 -0000	1.8
  +++ FieldTarget.java	9 Sep 2002 17:03:25 -0000	1.9
  @@ -63,6 +63,7 @@
   import java.util.Vector;
   
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   
   import org.apache.axis.components.logger.LogFactory;
   import org.apache.commons.logging.Log;
  @@ -95,11 +96,11 @@
           try {
               targetField.set(targetObject, value);
           } catch (IllegalAccessException accEx) {
  -            log.error(JavaUtils.getMessage("illegalAccessException00"),
  +            log.error(Messages.getMessage("illegalAccessException00"),
                         accEx);
               throw new SAXException(accEx);
           } catch (IllegalArgumentException argEx) {
  -            log.error(JavaUtils.getMessage("illegalArgumentException00"),
  +            log.error(Messages.getMessage("illegalArgumentException00"),
                         argEx);
               throw new SAXException(argEx);
           }
  
  
  
  1.31      +6 -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.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- TypeMappingImpl.java	4 Sep 2002 14:14:28 -0000	1.30
  +++ TypeMappingImpl.java	9 Sep 2002 17:03:25 -0000	1.31
  @@ -60,6 +60,7 @@
   import org.apache.axis.encoding.ser.BeanDeserializerFactory;
   import org.apache.axis.utils.JavaUtils;
   import org.apache.axis.utils.ClassUtils;
  +import org.apache.axis.utils.Messages;
   
   import org.apache.axis.components.logger.LogFactory;
   import org.apache.commons.logging.Log;
  @@ -217,7 +218,7 @@
               // REMOVED_FOR_TCK
               // return false;
               throw new JAXRPCException(
  -                    JavaUtils.getMessage(javaType == null ?
  +                    Messages.getMessage(javaType == null ?
                                            "badJavaType" : "badXmlType"));
           }
           if (pair2SF.keySet().contains(new Pair(javaType, xmlType))) {
  @@ -248,14 +249,14 @@
           // Both javaType and xmlType must be specified.
           if (javaType == null || xmlType == null) {
               throw new JAXRPCException(
  -                    JavaUtils.getMessage(javaType == null ?
  +                    Messages.getMessage(javaType == null ?
                                            "badJavaType" : "badXmlType"));
           }
   
           // At least a serializer or deserializer factory must be specified.
           if (sf == null && dsf == null) {
               throw new JAXRPCException(
  -                    JavaUtils.getMessage(sf == null ?
  +                    Messages.getMessage(sf == null ?
                                            "badSerFac" : "badDeserFac"));
           }
   
  @@ -478,7 +479,7 @@
           throws JAXRPCException {
           if (javaType == null || xmlType == null) {
               throw new JAXRPCException(
  -                    JavaUtils.getMessage(javaType == null ?
  +                    Messages.getMessage(javaType == null ?
                                            "badJavaType" : "badXmlType"));
           }
   
  @@ -500,7 +501,7 @@
           throws JAXRPCException {
           if (javaType == null || xmlType == null) {
               throw new JAXRPCException(
  -                    JavaUtils.getMessage(javaType == null ?
  +                    Messages.getMessage(javaType == null ?
                                            "badJavaType" : "badXmlType"));
           }
           Pair pair = new Pair(javaType, xmlType);
  
  
  
  1.8       +2 -1      xml-axis/java/src/org/apache/axis/encoding/Base64.java
  
  Index: Base64.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/encoding/Base64.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- Base64.java	6 Nov 2001 21:52:28 -0000	1.7
  +++ Base64.java	9 Sep 2002 17:03:25 -0000	1.8
  @@ -59,6 +59,7 @@
   import java.io.Writer;
   
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   
   /**
    *
  @@ -105,7 +106,7 @@
               obuf[wp] = (byte)(b2 << 6 & 0xc0 | b3 & 0x3f);
               return 3;
           default:
  -            throw new RuntimeException(JavaUtils.getMessage("internalError00"));
  +            throw new RuntimeException(Messages.getMessage("internalError00"));
           }
       }
   
  
  
  
  1.12      +5 -3      xml-axis/java/src/org/apache/axis/attachments/MultiPartDimeInputStream.java
  
  Index: MultiPartDimeInputStream.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/attachments/MultiPartDimeInputStream.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- MultiPartDimeInputStream.java	29 Aug 2002 21:02:39 -0000	1.11
  +++ MultiPartDimeInputStream.java	9 Sep 2002 17:03:25 -0000	1.12
  @@ -62,6 +62,8 @@
   
   import org.apache.axis.Part;
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
  +
   import javax.mail.internet.MimeUtility;
   
   import org.apache.axis.components.logger.LogFactory;
  @@ -117,7 +119,7 @@
               if (null == ret) {
                   ret = readTillFound(id);
               }
  -            log.debug(JavaUtils.getMessage("return02",
  +            log.debug(Messages.getMessage("return02",
                       "getAttachmentByReference(\"" + id + "\"",
                       (ret == null ? "null" : ret.toString())));
           } catch (java.io.IOException e) {
  @@ -257,7 +259,7 @@
       public int read(byte[] b, int off, int len)
         throws java.io.IOException {
           if (closed) {
  -            throw new java.io.IOException(JavaUtils.getMessage(
  +            throw new java.io.IOException(Messages.getMessage(
                 "streamClosed"));
           }
           if (eos) {
  @@ -277,7 +279,7 @@
   
       public int read() throws java.io.IOException {
           if (closed) {
  -            throw new java.io.IOException(JavaUtils.getMessage(
  +            throw new java.io.IOException(Messages.getMessage(
               "streamClosed"));
           }
           if (eos) {
  
  
  
  1.34      +4 -3      xml-axis/java/src/org/apache/axis/attachments/AttachmentsImpl.java
  
  Index: AttachmentsImpl.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/attachments/AttachmentsImpl.java,v
  retrieving revision 1.33
  retrieving revision 1.34
  diff -u -r1.33 -r1.34
  --- AttachmentsImpl.java	4 Sep 2002 14:14:28 -0000	1.33
  +++ AttachmentsImpl.java	9 Sep 2002 17:03:25 -0000	1.34
  @@ -61,6 +61,7 @@
   import org.apache.axis.Part;
   import org.apache.axis.SOAPPart;
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   
   import org.apache.axis.components.logger.LogFactory;
   import org.apache.commons.logging.Log;
  @@ -282,7 +283,7 @@
   
           if (!(datahandler instanceof javax.activation.DataHandler)) {
               throw new org.apache.axis.AxisFault(
  -                    JavaUtils.getMessage(
  +                    Messages.getMessage(
                               "unsupportedAttach", datahandler.getClass().getName(),
                               javax.activation.DataHandler.class.getName()));
           }
  @@ -417,7 +418,7 @@
               multipart = null;
               dimemultipart = null;
           } catch (ClassCastException e) {
  -            throw new ClassCastException(JavaUtils.getMessage("onlySOAPParts"));
  +            throw new ClassCastException(Messages.getMessage("onlySOAPParts"));
           }
       }
   
  @@ -584,7 +585,7 @@
               attachments.clear();
               orderedAttachments.clear();
           } catch (AxisFault af){
  -            log.warn(JavaUtils.getMessage("exception00"));
  +            log.warn(Messages.getMessage("exception00"));
           }
       }
   
  
  
  
  1.11      +9 -8      xml-axis/java/src/org/apache/axis/attachments/DimeBodyPart.java
  
  Index: DimeBodyPart.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/attachments/DimeBodyPart.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- DimeBodyPart.java	29 Aug 2002 21:02:39 -0000	1.10
  +++ DimeBodyPart.java	9 Sep 2002 17:03:25 -0000	1.11
  @@ -67,6 +67,7 @@
   import javax.activation.DataSource;
   
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   
   import org.apache.axis.components.logger.LogFactory;
   import org.apache.commons.logging.Log;
  @@ -139,13 +140,13 @@
           this.dtnf = format; 
           this.type = type.getBytes();
           if (this.type.length > MAX_TYPE_LENGTH)
  -            throw new IllegalArgumentException(JavaUtils.getMessage 
  +            throw new IllegalArgumentException(Messages.getMessage 
                       ("attach.dimetypeexceedsmax",
                       "" + this.type.length, "" + MAX_TYPE_LENGTH));
           this.id = id.getBytes();
           if (this.id.length > MAX_ID_LENGTH)
               throw new IllegalArgumentException(
  -                    JavaUtils.getMessage("attach.dimelengthexceedsmax", "" + this.id.length,
  +                    Messages.getMessage("attach.dimelengthexceedsmax", "" + this.id.length,
                           "" + MAX_ID_LENGTH));
       }
   
  @@ -165,12 +166,12 @@
               type = "application/octet-stream";
           this.type = type.getBytes();
           if (this.type.length > MAX_TYPE_LENGTH)
  -            throw new IllegalArgumentException(JavaUtils.getMessage(
  +            throw new IllegalArgumentException(Messages.getMessage(
                           "attach.dimetypeexceedsmax", 
                           "" + this.type.length, "" + MAX_TYPE_LENGTH));
           this.id = id.getBytes(); 
           if (this.id.length > MAX_ID_LENGTH)
  -            throw new IllegalArgumentException(JavaUtils.getMessage(
  +            throw new IllegalArgumentException(Messages.getMessage(
               "attach.dimelengthexceedsmax", 
               "" + this.id.length, "" + MAX_ID_LENGTH));
       }
  @@ -251,9 +252,9 @@
       void write(java.io.OutputStream os, byte position, long maxchunk)
         throws java.io.IOException {
           if (maxchunk < 1) throw new IllegalArgumentException(
  -                    JavaUtils.getMessage("attach.dimeMaxChunkSize0", "" + maxchunk)); 
  +                    Messages.getMessage("attach.dimeMaxChunkSize0", "" + maxchunk)); 
           if (maxchunk > MAX_DWORD) throw new IllegalArgumentException(
  -                    JavaUtils.getMessage("attach.dimeMaxChunkSize1", "" + maxchunk)); 
  +                    Messages.getMessage("attach.dimeMaxChunkSize1", "" + maxchunk)); 
           if (data instanceof byte[]) send(os, position, (byte[]) data,
             maxchunk);
           if (data instanceof DataHandler) send(os, position,
  @@ -451,7 +452,7 @@
   
                   if (!df.exists()) {
                       throw new RuntimeException(
  -                            JavaUtils.getMessage("noFile", 
  +                            Messages.getMessage("noFile", 
                                   df.getAbsolutePath()));
                   }
                   dataSize = df.length();
  @@ -469,7 +470,7 @@
                   in.close();
               }
           } catch (Exception e) {
  -            log.error(JavaUtils.getMessage("exception00"), e);
  +            log.error(Messages.getMessage("exception00"), e);
           }
           return dataSize;
       }
  
  
  
  1.29      +10 -9     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.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- MultiPartRelatedInputStream.java	6 Sep 2002 20:09:25 -0000	1.28
  +++ MultiPartRelatedInputStream.java	9 Sep 2002 17:03:25 -0000	1.29
  @@ -57,6 +57,7 @@
   import org.apache.axis.Part;
   import org.apache.axis.transport.http.HTTPConstants;
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   
   import org.apache.axis.components.logger.LogFactory;
   import org.apache.commons.logging.Log;
  @@ -197,7 +198,7 @@
                                   boundaryMarker[(current + 1) & 0x1],
                                   boundaryMarker[0].length - 1, 1) < 1) {
                               throw new org.apache.axis.AxisFault(
  -                                    JavaUtils.getMessage(
  +                                    Messages.getMessage(
                                               "mimeErrorNoBoundary", new String(boundary)));
                           }
                       }
  @@ -217,7 +218,7 @@
                       found = java.util.Arrays.equals(boundaryBytes, readBytes);
                       if(!found && is.read(readBytes) < 1){
                           throw new org.apache.axis.AxisFault(
  -                                JavaUtils.getMessage(
  +                                Messages.getMessage(
                                           "mimeErrorNoBoundary", boundaryStr));
                       }
                   }
  @@ -357,7 +358,7 @@
   
               if (boundaryDelimitedStream == null) {
                   throw new org.apache.axis.AxisFault(
  -                        JavaUtils.getMessage("noRoot", rootPartContentId));
  +                        Messages.getMessage("noRoot", rootPartContentId));
               }
   
               soapStreamBDS = boundaryDelimitedStream;
  @@ -374,13 +375,13 @@
               // Read from the input stream all attachments prior to the root part.
           } catch (javax.mail.internet.ParseException e) {
               throw new org.apache.axis.AxisFault(
  -                    JavaUtils.getMessage("mimeErrorParsing", e.getMessage()));
  +                    Messages.getMessage("mimeErrorParsing", e.getMessage()));
           } catch (java.io.IOException e) {
               throw new org.apache.axis.AxisFault(
  -                    JavaUtils.getMessage("readError", e.getMessage()));
  +                    Messages.getMessage("readError", e.getMessage()));
           } catch (javax.mail.MessagingException e) {
               throw new org.apache.axis.AxisFault(
  -                    JavaUtils.getMessage("readError", e.getMessage()));
  +                    Messages.getMessage("readError", e.getMessage()));
           }
       }
   
  @@ -433,7 +434,7 @@
               ret = readTillFound(id);
           }
   
  -        log.debug(JavaUtils.getMessage("return02",
  +        log.debug(Messages.getMessage("return02",
                   "getAttachmentByReference(\"" + id
                   + "\"", ((ret == null)
                   ? "null"
  @@ -695,7 +696,7 @@
       public int read(byte[] b, int off, int len) throws java.io.IOException {
   
           if (closed) {
  -            throw new java.io.IOException(JavaUtils.getMessage("streamClosed"));
  +            throw new java.io.IOException(Messages.getMessage("streamClosed"));
           }
   
           if (eos) {
  @@ -734,7 +735,7 @@
       public int read() throws java.io.IOException {
   
           if (closed) {
  -            throw new java.io.IOException(JavaUtils.getMessage("streamClosed"));
  +            throw new java.io.IOException(Messages.getMessage("streamClosed"));
           }
   
           if (eos) {
  
  
  
  1.32      +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.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- MimeUtils.java	4 Sep 2002 14:14:28 -0000	1.31
  +++ MimeUtils.java	9 Sep 2002 17:03:25 -0000	1.32
  @@ -62,6 +62,7 @@
   import org.apache.axis.AxisProperties;
   import org.apache.axis.transport.http.HTTPConstants;
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   import org.apache.axis.utils.SessionUtils;
   
   import org.apache.axis.components.logger.LogFactory;
  @@ -144,7 +145,7 @@
                   java.io.File df = fdh.getFile();
   
                   if (!df.exists()) {
  -                    throw new RuntimeException(JavaUtils.getMessage("noFile",
  +                    throw new RuntimeException(Messages.getMessage("noFile",
                               df.getAbsolutePath()));
                   }
   
  @@ -171,7 +172,7 @@
                   }
               }
           } catch (Exception e) {
  -            log.error(JavaUtils.getMessage("exception00"), e);
  +            log.error(Messages.getMessage("exception00"), e);
           }
   
           return dataSize + headerLength;
  @@ -244,9 +245,9 @@
               message.saveChanges();
               message.writeTo(os, filter);
           } catch (javax.mail.MessagingException e) {
  -            log.error(JavaUtils.getMessage("javaxMailMessagingException00"), e);
  +            log.error(Messages.getMessage("javaxMailMessagingException00"), e);
           } catch (java.io.IOException e) {
  -            log.error(JavaUtils.getMessage("javaIOException00"), e);
  +            log.error(Messages.getMessage("javaIOException00"), e);
           }
       }
   
  @@ -346,7 +347,7 @@
                   multipart.addBodyPart(messageBodyPart);
               }
           } catch (javax.mail.MessagingException e) {
  -            log.error(JavaUtils.getMessage("javaxMailMessagingException00"), e);
  +            log.error(Messages.getMessage("javaxMailMessagingException00"), e);
           }
   
           return multipart;
  
  
  
  1.4       +2 -1      xml-axis/java/src/org/apache/axis/attachments/ImageDataSource.java
  
  Index: ImageDataSource.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/attachments/ImageDataSource.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ImageDataSource.java	26 Aug 2002 13:10:21 -0000	1.3
  +++ ImageDataSource.java	9 Sep 2002 17:03:25 -0000	1.4
  @@ -57,6 +57,7 @@
   import org.apache.axis.components.image.ImageIOFactory;
   import org.apache.axis.components.logger.LogFactory;
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   import org.apache.commons.logging.Log;
   
   import javax.activation.DataSource;
  @@ -93,7 +94,7 @@
               }
           }
           catch (Exception e) {
  -            log.error(JavaUtils.getMessage("exception00"), e);
  +            log.error(Messages.getMessage("exception00"), e);
           }
       } // ctor
   
  
  
  
  1.20      +10 -9     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.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- BoundaryDelimitedStream.java	29 Aug 2002 21:02:39 -0000	1.19
  +++ BoundaryDelimitedStream.java	9 Sep 2002 17:03:25 -0000	1.20
  @@ -55,6 +55,7 @@
   package org.apache.axis.attachments;
   
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   
   import org.apache.axis.components.logger.LogFactory;
   import org.apache.commons.logging.Log;
  @@ -122,7 +123,7 @@
        */
       protected static synchronized int newStreamNo() {
   
  -        log.debug(JavaUtils.getMessage("streamNo", "" + (streamCount + 1)));
  +        log.debug(Messages.getMessage("streamNo", "" + (streamCount + 1)));
   
           return ++streamCount;
       }
  @@ -289,7 +290,7 @@
               throws java.io.IOException {
   
           if (closed) {
  -            throw new java.io.IOException(JavaUtils.getMessage("streamClosed"));
  +            throw new java.io.IOException(Messages.getMessage("streamClosed"));
           }
   
           if (eos) {
  @@ -306,7 +307,7 @@
                   finalClose();
   
                   throw new java.io.IOException(
  -                        JavaUtils.getMessage("eosBeforeMarker"));
  +                        Messages.getMessage("eosBeforeMarker"));
               }
   
               readBufPos = 0;
  @@ -335,7 +336,7 @@
               if (readBufPos == boundaryPos) {
                   eos = true;                 // hit the boundary so it the end of the stream.
   
  -                log.debug(JavaUtils.getMessage("atEOS", "" + streamNo));
  +                log.debug(Messages.getMessage("atEOS", "" + streamNo));
               } else if (bwritten < len) {    // need to get more data.
                   byte[] dstbuf = readbuf;
   
  @@ -358,7 +359,7 @@
                       finalClose();
   
                       throw new java.io.IOException(
  -                            JavaUtils.getMessage("eosBeforeMarker"));
  +                            Messages.getMessage("eosBeforeMarker"));
                   }
   
                   readBufEnd = readcnt + movecnt;
  @@ -384,7 +385,7 @@
                   byte tb[] = new byte[bwritten];
   
                   System.arraycopy(b, off, tb, 0, bwritten);
  -                log.debug(JavaUtils.getMessage("readBStream",
  +                log.debug(Messages.getMessage("readBStream",
                           new String[]{"" + bwritten,
                                        "" + streamNo,
                                        new String(tb)}));
  @@ -439,7 +440,7 @@
               return;
           }
   
  -        log.debug(JavaUtils.getMessage("bStreamClosed", "" + streamNo));
  +        log.debug(Messages.getMessage("bStreamClosed", "" + streamNo));
   
           closed = true;    // mark it closed.
   
  @@ -474,7 +475,7 @@
        */
       public void reset() throws java.io.IOException {
           throw new java.io.IOException(
  -                JavaUtils.getMessage("attach.bounday.mns"));
  +                Messages.getMessage("attach.bounday.mns"));
       }
   
       /**
  @@ -595,7 +596,7 @@
                   sb.append("boundary.length=" + boundary.length);
                   sb.append("j=" + j);
                   sb.append("end=" + end);
  -                log.warn(JavaUtils.getMessage("exception01",sb.toString()));
  +                log.warn(Messages.getMessage("exception01",sb.toString()));
                   throw e;
               }
   
  
  
  
  1.4       +2 -1      xml-axis/java/src/org/apache/axis/attachments/DimeTypeNameFormat.java
  
  Index: DimeTypeNameFormat.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/attachments/DimeTypeNameFormat.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- DimeTypeNameFormat.java	29 Aug 2002 21:02:39 -0000	1.3
  +++ DimeTypeNameFormat.java	9 Sep 2002 17:03:25 -0000	1.4
  @@ -61,6 +61,7 @@
   
   
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   
   
   /**
  @@ -121,7 +122,7 @@
   
       public static DimeTypeNameFormat parseByte(byte x) {
           if (x < 0 || x > fromByte.length) {
  -            throw new IllegalArgumentException(JavaUtils.getMessage(
  +            throw new IllegalArgumentException(Messages.getMessage(
                           "attach.DimeStreamBadType", "" + x));
           }
           return fromByte[x];
  
  
  
  1.20      +25 -24    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.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- ManagedMemoryDataSource.java	12 Aug 2002 22:28:57 -0000	1.19
  +++ ManagedMemoryDataSource.java	9 Sep 2002 17:03:25 -0000	1.20
  @@ -57,6 +57,7 @@
   import org.apache.axis.InternalException;
   import org.apache.axis.MessageContext;
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   
   import org.apache.axis.components.logger.LogFactory;
   import org.apache.commons.logging.Log;
  @@ -158,7 +159,7 @@
   
           if (maxCached < MAX_MEMORY_DISK_CACHED) {
               throw new IllegalArgumentException(
  -                    JavaUtils.getMessage("badMaxCached", "" + maxCached));
  +                    Messages.getMessage("badMaxCached", "" + maxCached));
           }
   
           if (log.isDebugEnabled()) {
  @@ -294,7 +295,7 @@
               throws java.io.IOException {
   
           if (closed) {
  -            throw new java.io.IOException(JavaUtils.getMessage("streamClosed"));
  +            throw new java.io.IOException(Messages.getMessage("streamClosed"));
           }
   
           int writesz = length;
  @@ -408,7 +409,7 @@
   
           memorybuflist = null;
   
  -        log.debug(JavaUtils.getMessage("maxCached", "" + maxCached,
  +        log.debug(Messages.getMessage("maxCached", "" + maxCached,
                   "" + totalsz));
   
           if (ml != null) {
  @@ -427,7 +428,7 @@
                                       attdir));
   
                       log.debug(
  -                            JavaUtils.getMessage(
  +                            Messages.getMessage(
                                       "diskCache", diskCacheFile.getAbsolutePath()));
   
                       cachediskstream = new java.io.BufferedOutputStream(
  @@ -458,7 +459,7 @@
                       cachediskstream = null;
                       maxCached = java.lang.Integer.MAX_VALUE;
   
  -                    log.info(JavaUtils.getMessage("nodisk00"), se);
  +                    log.info(Messages.getMessage("nodisk00"), se);
                   }
               }
           }
  @@ -562,7 +563,7 @@
   
               if (deleted) {
                   throw new java.io.IOException(
  -                        JavaUtils.getMessage("resourceDeleted"));
  +                        Messages.getMessage("resourceDeleted"));
               }
   
               readers.put(this, null);
  @@ -579,12 +580,12 @@
   
               if (deleted) {
                   throw new java.io.IOException(
  -                        JavaUtils.getMessage("resourceDeleted"));
  +                        Messages.getMessage("resourceDeleted"));
               }
   
               if (readClosed) {
                   throw new java.io.IOException(
  -                        JavaUtils.getMessage("streamClosed"));
  +                        Messages.getMessage("streamClosed"));
               }
   
               int ret = totalsz - bread;
  @@ -655,7 +656,7 @@
                   is_log.debug("reset()");
               }
   
  -            throw new java.io.IOException(JavaUtils.getMessage("noResetMark"));
  +            throw new java.io.IOException(Messages.getMessage("noResetMark"));
           }
   
           /**
  @@ -676,12 +677,12 @@
   
               if (deleted) {
                   throw new java.io.IOException(
  -                        JavaUtils.getMessage("resourceDeleted"));
  +                        Messages.getMessage("resourceDeleted"));
               }
   
               if (readClosed) {
                   throw new java.io.IOException(
  -                        JavaUtils.getMessage("streamClosed"));
  +                        Messages.getMessage("streamClosed"));
               }
   
               if (skipped < 1) {
  @@ -754,31 +755,31 @@
   
               if (deleted) {
                   throw new java.io.IOException(
  -                        JavaUtils.getMessage("resourceDeleted"));
  +                        Messages.getMessage("resourceDeleted"));
               }
   
               if (readClosed) {
                   throw new java.io.IOException(
  -                        JavaUtils.getMessage("streamClosed"));
  +                        Messages.getMessage("streamClosed"));
               }
   
               if (b == null) {
  -                throw new InternalException(JavaUtils.getMessage("nullInput"));
  +                throw new InternalException(Messages.getMessage("nullInput"));
               }
   
               if (off < 0) {
                   throw new IndexOutOfBoundsException(
  -                        JavaUtils.getMessage("negOffset", "" + off));
  +                        Messages.getMessage("negOffset", "" + off));
               }
   
               if (len < 0) {
                   throw new IndexOutOfBoundsException(
  -                        JavaUtils.getMessage("length", "" + len));
  +                        Messages.getMessage("length", "" + len));
               }
   
               if (len + off > b.length) {
                   throw new IndexOutOfBoundsException(
  -                        JavaUtils.getMessage("writeBeyond"));
  +                        Messages.getMessage("writeBeyond"));
               }
   
               if (len == 0) {
  @@ -831,19 +832,19 @@
   
                   if ((bwritten == 0) && (null != diskCacheFile)) {
                       if (debugEnabled) {
  -                        is_log.debug(JavaUtils.getMessage("reading", "" + len));
  +                        is_log.debug(Messages.getMessage("reading", "" + len));
                       }
   
                       if (null == fin) {           // we are now reading from disk.
                           if (debugEnabled) {
                               is_log.debug(
  -                                    JavaUtils.getMessage(
  +                                    Messages.getMessage(
                                               "openBread",
                                               diskCacheFile.getCanonicalPath()));
                           }
   
                           if (debugEnabled) {
  -                            is_log.debug(JavaUtils.getMessage("openBread",
  +                            is_log.debug(Messages.getMessage("openBread",
                                       "" + bread));
                           }
   
  @@ -856,14 +857,14 @@
   
                       if (cachediskstream != null) {
                           if (debugEnabled) {
  -                            is_log.debug(JavaUtils.getMessage("flushing"));
  +                            is_log.debug(Messages.getMessage("flushing"));
                           }
   
                           cachediskstream.flush();
                       }
   
                       if (debugEnabled) {
  -                        is_log.debug(JavaUtils.getMessage("flushing"));
  +                        is_log.debug(Messages.getMessage("flushing"));
                           is_log.debug("len=" + len);
                           is_log.debug("off=" + off);
                           is_log.debug("b.length=" + b.length);
  @@ -879,7 +880,7 @@
   
               if (debugEnabled) {
                   is_log.debug(this.hashCode()
  -                        + JavaUtils.getMessage("read", "" + bwritten));
  +                        + Messages.getMessage("read", "" + bwritten));
               }
   
               return bwritten;
  @@ -954,7 +955,7 @@
               fo.close();
               is.close();
           } catch (java.lang.Exception e) {
  -            log.error(JavaUtils.getMessage("exception00"), e);
  +            log.error(Messages.getMessage("exception00"), e);
           }
       }
   }
  
  
  
  1.29      +12 -11    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.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- AttachmentPart.java	12 Aug 2002 22:28:57 -0000	1.28
  +++ AttachmentPart.java	9 Sep 2002 17:03:25 -0000	1.29
  @@ -57,6 +57,7 @@
   import org.apache.axis.Part;
   import org.apache.axis.transport.http.HTTPConstants;
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   import org.apache.axis.utils.SessionUtils;
   
   import org.apache.axis.components.logger.LogFactory;
  @@ -292,7 +293,7 @@
        */
       public DataHandler getDataHandler() throws SOAPException {
           if(datahandler == null) {
  -            throw new SOAPException(JavaUtils.getMessage("noContent"));
  +            throw new SOAPException(Messages.getMessage("noContent"));
           }
           return datahandler;
       }
  @@ -314,7 +315,7 @@
       public void setDataHandler(DataHandler datahandler) {
           if(datahandler == null)
               throw new java.lang.IllegalArgumentException(
  -                JavaUtils.getMessage("illegalArgumentException00"));
  +                Messages.getMessage("illegalArgumentException00"));
           this.datahandler = datahandler;
           setMimeHeader(HTTPConstants.HEADER_CONTENT_TYPE, datahandler.getContentType());
       }
  @@ -357,7 +358,7 @@
               return contentObject;
   
           if(datahandler == null) {
  -            throw new SOAPException(JavaUtils.getMessage("noContent"));
  +            throw new SOAPException(Messages.getMessage("noContent"));
           }
   
           javax.activation.DataSource ds = datahandler.getDataSource();
  @@ -373,7 +374,7 @@
   
                       return new String(bytes);
                   } catch (java.io.IOException io) {
  -                    log.error(JavaUtils.getMessage("javaIOException00"), io);
  +                    log.error(Messages.getMessage("javaIOException00"), io);
                   }
               }
           }
  @@ -409,9 +410,9 @@
                   contentObject = object;
                   return;
               } catch (java.io.IOException io) {
  -                log.error(JavaUtils.getMessage("javaIOException00"), io);
  +                log.error(Messages.getMessage("javaIOException00"), io);
                   throw new java.lang.IllegalArgumentException(
  -                        JavaUtils.getMessage("illegalArgumentException00"));
  +                        Messages.getMessage("illegalArgumentException00"));
               }
           } else if (object instanceof java.io.InputStream) {
                   try {
  @@ -420,13 +421,13 @@
                       contentObject = object;
                       return;
                   } catch (java.io.IOException io) {
  -                    log.error(JavaUtils.getMessage("javaIOException00"), io);
  +                    log.error(Messages.getMessage("javaIOException00"), io);
                       throw new java.lang.IllegalArgumentException(
  -                            JavaUtils.getMessage("illegalArgumentException00"));
  +                            Messages.getMessage("illegalArgumentException00"));
                   }
           } else {
               throw new java.lang.IllegalArgumentException(
  -                    JavaUtils.getMessage("illegalArgumentException00"));
  +                    Messages.getMessage("illegalArgumentException00"));
           }
       }
   
  @@ -456,8 +457,8 @@
           try {
               datahandler.writeTo(bout);
           } catch (java.io.IOException ex) {
  -            log.error(JavaUtils.getMessage("javaIOException00"), ex);
  -            throw new SOAPException(JavaUtils.getMessage("javaIOException01", ex.getMessage()), ex);
  +            log.error(Messages.getMessage("javaIOException00"), ex);
  +            throw new SOAPException(Messages.getMessage("javaIOException01", ex.getMessage()), ex);
           }
           byte bytes[] = bout.getBytes();
           if (bytes != null)
  
  
  
  1.7       +3 -2      xml-axis/java/src/org/apache/axis/attachments/AttachmentUtils.java
  
  Index: AttachmentUtils.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/attachments/AttachmentUtils.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- AttachmentUtils.java	24 Jun 2002 12:34:51 -0000	1.6
  +++ AttachmentUtils.java	9 Sep 2002 17:03:25 -0000	1.7
  @@ -57,6 +57,7 @@
   import org.apache.axis.AxisFault;
   import org.apache.axis.Part;
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   
   import javax.activation.DataHandler;
   
  @@ -85,12 +86,12 @@
               throws AxisFault {
   
           if (null == part) {
  -            throw new AxisFault(JavaUtils.getMessage("gotNullPart"));
  +            throw new AxisFault(Messages.getMessage("gotNullPart"));
           }
   
           if (!(part instanceof AttachmentPart)) {
               throw new AxisFault(
  -                    JavaUtils.getMessage(
  +                    Messages.getMessage(
                               "unsupportedAttach", part.getClass().getName(),
                               AttachmentPart.class.getName()));
           }
  
  
  
  1.10      +23 -22    xml-axis/java/src/org/apache/axis/attachments/DimeDelimitedInputStream.java
  
  Index: DimeDelimitedInputStream.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/attachments/DimeDelimitedInputStream.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- DimeDelimitedInputStream.java	29 Aug 2002 21:02:39 -0000	1.9
  +++ DimeDelimitedInputStream.java	9 Sep 2002 17:03:25 -0000	1.10
  @@ -59,6 +59,7 @@
   import java.io.IOException;
   
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   import org.apache.axis.AxisFault;
   
   import org.apache.axis.components.logger.LogFactory;
  @@ -121,7 +122,7 @@
       protected static int streamCount = 0; //number of streams produced.
   
       protected static synchronized int newStreamNo() {
  -        log.debug(JavaUtils.getMessage("streamNo", "" + (streamCount + 1)));
  +        log.debug(Messages.getMessage("streamNo", "" + (streamCount + 1)));
           return ++streamCount;
       }
         
  @@ -136,7 +137,7 @@
           if (null != streamInError) throw streamInError;
           if (theEnd) return null;
           if (bytesRead < recordLength || moreChunks) //Stream must be read in succession 
  -            throw new RuntimeException(JavaUtils.getMessage(
  +            throw new RuntimeException(Messages.getMessage(
                "attach.dimeReadFullyError")); 
           dataPadLength -= readPad(dataPadLength);
   
  @@ -161,7 +162,7 @@
           int read = readFromStream(trash, 0, size);
   
           if (size != read) {
  -            streamInError = new IOException(JavaUtils.getMessage(
  +            streamInError = new IOException(Messages.getMessage(
               "attach.dimeNotPaddedCorrectly")); 
               throw streamInError;
           }
  @@ -234,7 +235,7 @@
   
           if (closed) {
               dataPadLength -= readPad(dataPadLength);
  -            throw new IOException(JavaUtils.getMessage("streamClosed"));
  +            throw new IOException(Messages.getMessage("streamClosed"));
           }
           return _read(b, off, len);
       }
  @@ -242,16 +243,16 @@
       protected int _read(byte[] b, final int off, final int len)
           throws IOException {
           if (len < 0) throw new IllegalArgumentException
  -                (JavaUtils.getMessage("attach.readLengthError", 
  +                (Messages.getMessage("attach.readLengthError", 
                    "" + len)); 
   
           if (off < 0) throw new IllegalArgumentException
  -                (JavaUtils.getMessage("attach.readOffsetError", 
  +                (Messages.getMessage("attach.readOffsetError", 
                    "" + off)); 
           if (b == null) throw new IllegalArgumentException
  -                (JavaUtils.getMessage("attach.readArrayNullError")); 
  +                (Messages.getMessage("attach.readArrayNullError")); 
           if (b.length < off + len) throw new IllegalArgumentException
  -                (JavaUtils.getMessage("attach.readArraySizeError",
  +                (Messages.getMessage("attach.readArraySizeError",
                           "" + b.length, "" + len, "" + off)); 
   
           if (null != streamInError) throw streamInError; 
  @@ -303,18 +304,18 @@
   
           if (0 > bytes2read) {
               if (moreChunks) {
  -                streamInError = new IOException(JavaUtils.getMessage(
  +                streamInError = new IOException(Messages.getMessage(
                                   "attach.DimeStreamError0"));
                   throw streamInError;
               }  
               if (bytesRead < recordLength) {
  -                streamInError = new IOException(JavaUtils.getMessage
  +                streamInError = new IOException(Messages.getMessage
                               ("attach.DimeStreamError1", 
                                 "" + (recordLength - bytesRead)));
                   throw streamInError;
               }  
               if (!ME) {
  -                streamInError = new IOException(JavaUtils.getMessage(
  +                streamInError = new IOException(Messages.getMessage(
                                   "attach.DimeStreamError0"));
                   throw streamInError;
               }  
  @@ -347,14 +348,14 @@
           bytesRead = 0; //How many bytes of the record have been read.
           if (isChunk) { 
               if (!moreChunks) throw new RuntimeException(
  -                        JavaUtils.getMessage("attach.DimeStreamError2"));
  +                        Messages.getMessage("attach.DimeStreamError2"));
               dataPadLength -= readPad(dataPadLength); //Just incase it was left over.
           }
   
           byte[] header = new byte[12];
   
           if (header.length != readFromStream(header)) {
  -            streamInError = new IOException(JavaUtils.getMessage(
  +            streamInError = new IOException(Messages.getMessage(
                               "attach.DimeStreamError3",
                                 "" + header.length));
               throw streamInError;
  @@ -364,7 +365,7 @@
           byte version = (byte) ((header[0] >>> 3) & 0x1f);
   
           if (version > DimeMultiPart.CURRENT_VERSION) {
  -            streamInError = new IOException(JavaUtils.getMessage("attach.DimeStreamError4",
  +            streamInError = new IOException(Messages.getMessage("attach.DimeStreamError4",
                               "" + version,
                                "" + DimeMultiPart.CURRENT_VERSION));
               throw streamInError;
  @@ -403,7 +404,7 @@
               byte[] optBytes = new byte[optionsLength]; 
   
               if (optionsLength != readFromStream(optBytes)) {
  -                streamInError = new IOException(JavaUtils.getMessage(
  +                streamInError = new IOException(Messages.getMessage(
                                   "attach.DimeStreamError5",
                                    "" + optionsLength));
                   throw streamInError;
  @@ -414,7 +415,7 @@
   
               if (pad != readFromStream(header, 0, pad)) {
                   streamInError = new IOException(
  -                 JavaUtils.getMessage("attach.DimeStreamError7"));
  +                 Messages.getMessage("attach.DimeStreamError7"));
                   throw streamInError;
               }
           }
  @@ -425,7 +426,7 @@
   
               if (idLength != readFromStream(idBytes)) {
                   streamInError = new IOException(
  -                JavaUtils.getMessage("attach.DimeStreamError8"));
  +                Messages.getMessage("attach.DimeStreamError8"));
                   throw streamInError;
               } 
               if (idLength != 0 && !isChunk) {
  @@ -434,7 +435,7 @@
               int pad = DimeBodyPart.dimePadding(idLength); 
   
               if (pad != readFromStream(header, 0, pad)) {
  -                streamInError = new IOException(JavaUtils.getMessage(
  +                streamInError = new IOException(Messages.getMessage(
                   "attach.DimeStreamError9"));
                   throw streamInError;
               }
  @@ -445,7 +446,7 @@
               byte[] typeBytes = new byte[typeLength]; 
   
               if (typeLength != readFromStream(typeBytes)) {
  -                streamInError = new IOException(JavaUtils.getMessage(
  +                streamInError = new IOException(Messages.getMessage(
                   "attach.DimeStreamError10"));
                   throw streamInError;
               } 
  @@ -455,7 +456,7 @@
               int pad = DimeBodyPart.dimePadding(typeLength); 
   
               if (pad != readFromStream(header, 0, pad)) {
  -                streamInError = new IOException(JavaUtils.getMessage(
  +                streamInError = new IOException(Messages.getMessage(
                   "attach.DimeStreamError11"));
   
                   throw streamInError;
  @@ -503,7 +504,7 @@
           if (closed) return;
           closed = true; //mark it closed.
           }
  -        log.debug(JavaUtils.getMessage("bStreamClosed", "" + streamNo));
  +        log.debug(Messages.getMessage("bStreamClosed", "" + streamNo));
           if (bytesRead < recordLength || moreChunks) {
               //We need get this off the stream.
               //Easy way to flush through the stream;
  @@ -530,7 +531,7 @@
        * This is not supported.
        */
       public void reset() throws IOException {
  -        streamInError = new IOException(JavaUtils.getMessage(
  +        streamInError = new IOException(Messages.getMessage(
           "attach.bounday.mns"));
           throw streamInError;
       }
  
  
  
  1.26      +2 -1      xml-axis/java/src/org/apache/axis/deployment/wsdd/WSDDGlobalConfiguration.java
  
  Index: WSDDGlobalConfiguration.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/deployment/wsdd/WSDDGlobalConfiguration.java,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- WSDDGlobalConfiguration.java	12 Jul 2002 14:14:34 -0000	1.25
  +++ WSDDGlobalConfiguration.java	9 Sep 2002 17:03:26 -0000	1.26
  @@ -59,6 +59,7 @@
   import org.apache.axis.Handler;
   import org.apache.axis.encoding.SerializationContext;
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   import org.w3c.dom.Element;
   
   import javax.xml.namespace.QName;
  @@ -181,7 +182,7 @@
        */
       public void setType(String type) throws WSDDException
       {
  -        throw new WSDDException(JavaUtils.getMessage("noTypeOnGlobalConfig00"));
  +        throw new WSDDException(Messages.getMessage("noTypeOnGlobalConfig00"));
       }
   
       /**
  
  
  
  1.87      +2 -1      xml-axis/java/src/org/apache/axis/deployment/wsdd/WSDDService.java
  
  Index: WSDDService.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/deployment/wsdd/WSDDService.java,v
  retrieving revision 1.86
  retrieving revision 1.87
  diff -u -r1.86 -r1.87
  --- WSDDService.java	4 Sep 2002 13:25:03 -0000	1.86
  +++ WSDDService.java	9 Sep 2002 17:03:26 -0000	1.87
  @@ -76,6 +76,7 @@
   import org.apache.axis.handlers.soap.SOAPService;
   import org.apache.axis.providers.java.JavaProvider;
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   import org.apache.axis.utils.XMLUtils;
   import org.w3c.dom.Element;
   import org.xml.sax.helpers.AttributesImpl;
  @@ -397,7 +398,7 @@
               }
               if (providerHandler == null)
                   throw new WSDDException(
  -                          JavaUtils.getMessage("couldntConstructProvider00"));
  +                          Messages.getMessage("couldntConstructProvider00"));
           }
   
           Handler respHandler = null;
  
  
  
  1.15      +2 -1      xml-axis/java/src/org/apache/axis/deployment/wsdd/WSDDTargetedChain.java
  
  Index: WSDDTargetedChain.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/deployment/wsdd/WSDDTargetedChain.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- WSDDTargetedChain.java	12 Jul 2002 14:14:34 -0000	1.14
  +++ WSDDTargetedChain.java	9 Sep 2002 17:03:26 -0000	1.15
  @@ -60,6 +60,7 @@
   import org.apache.axis.encoding.SerializationContext;
   import org.apache.axis.utils.ClassUtils;
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   import org.apache.axis.utils.XMLUtils;
   import org.w3c.dom.Element;
   
  @@ -160,7 +161,7 @@
        */
       public void setType(String type) throws WSDDException
       {
  -        throw new WSDDException(JavaUtils.getMessage(
  +        throw new WSDDException(Messages.getMessage(
                   "noTypeSetting", getElementName().getLocalPart()));
       }
       
  
  
  
  1.21      +3 -2      xml-axis/java/src/org/apache/axis/deployment/wsdd/WSDDProvider.java
  
  Index: WSDDProvider.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/deployment/wsdd/WSDDProvider.java,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- WSDDProvider.java	26 Jun 2002 18:19:07 -0000	1.20
  +++ WSDDProvider.java	9 Sep 2002 17:03:26 -0000	1.21
  @@ -61,6 +61,7 @@
   import org.apache.axis.deployment.wsdd.providers.WSDDJavaMsgProvider;
   import org.apache.axis.deployment.wsdd.providers.WSDDJavaRPCProvider;
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   
   import javax.xml.namespace.QName;
   import java.util.Hashtable;
  @@ -133,11 +134,11 @@
           throws Exception
       {
           if (providerType == null)
  -            throw new WSDDException(JavaUtils.getMessage("nullProvider00"));
  +            throw new WSDDException(Messages.getMessage("nullProvider00"));
           
           WSDDProvider provider = (WSDDProvider)providers.get(providerType);
           if (provider == null) {
  -            throw new WSDDException(JavaUtils.getMessage("noMatchingProvider00",
  +            throw new WSDDException(Messages.getMessage("noMatchingProvider00",
                                       providerType.toString()));
           }
           
  
  
  
  1.29      +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.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- WSDDDocument.java	12 Aug 2002 22:35:56 -0000	1.28
  +++ WSDDDocument.java	9 Sep 2002 17:03:26 -0000	1.29
  @@ -58,6 +58,7 @@
   import org.apache.axis.encoding.SerializationContext;
   import org.apache.axis.encoding.SerializationContextImpl;
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   import org.apache.axis.utils.XMLUtils;
   
   import org.apache.axis.components.logger.LogFactory;
  @@ -139,7 +140,7 @@
           try {
               deployment.writeToContext(context);
           } catch (Exception e) {
  -            log.error(JavaUtils.getMessage("exception00"), e);
  +            log.error(Messages.getMessage("exception00"), e);
           }
           try {
               writer.close();
  
  
  
  1.16      +2 -1      xml-axis/java/src/org/apache/axis/deployment/wsdd/WSDDElement.java
  
  Index: WSDDElement.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/deployment/wsdd/WSDDElement.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- WSDDElement.java	29 Aug 2002 21:02:40 -0000	1.15
  +++ WSDDElement.java	9 Sep 2002 17:03:26 -0000	1.16
  @@ -56,6 +56,7 @@
   
   import org.apache.axis.encoding.SerializationContext;
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   import org.w3c.dom.Element;
   import org.w3c.dom.Node;
   import org.w3c.dom.NodeList;
  @@ -113,7 +114,7 @@
                   || (null == e.getLocalName())
                   ||!e.getNamespaceURI().equals(name.getNamespaceURI())
                   ||!e.getLocalName().equals(name.getLocalPart())) {
  -            throw new WSDDException(JavaUtils.getMessage("invalidWSDD00",
  +            throw new WSDDException(Messages.getMessage("invalidWSDD00",
                                       e.getLocalName(),
                                       name.getLocalPart()));
           }
  
  
  
  1.29      +2 -1      xml-axis/java/src/org/apache/axis/deployment/wsdd/WSDDChain.java
  
  Index: WSDDChain.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/deployment/wsdd/WSDDChain.java,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- WSDDChain.java	12 Jul 2002 12:44:22 -0000	1.28
  +++ WSDDChain.java	9 Sep 2002 17:03:26 -0000	1.29
  @@ -60,6 +60,7 @@
   import org.apache.axis.Handler;
   import org.apache.axis.encoding.SerializationContext;
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   import org.w3c.dom.Element;
   import org.xml.sax.helpers.AttributesImpl;
   
  @@ -116,7 +117,7 @@
           }
   
           if (handlers.isEmpty())
  -            throw new WSDDException(JavaUtils.getMessage("noHandlersInChain00", 
  +            throw new WSDDException(Messages.getMessage("noHandlersInChain00", 
                                       getElementName().getLocalPart(),
                                       (getQName()!=null)?getQName().toString():"null"));
       }
  
  
  
  1.9       +2 -1      xml-axis/java/src/org/apache/axis/deployment/wsdd/WSDDUndeployment.java
  
  Index: WSDDUndeployment.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/deployment/wsdd/WSDDUndeployment.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- WSDDUndeployment.java	26 Jun 2002 18:34:58 -0000	1.8
  +++ WSDDUndeployment.java	9 Sep 2002 17:03:26 -0000	1.9
  @@ -57,6 +57,7 @@
   import org.apache.axis.ConfigurationException;
   import org.apache.axis.encoding.SerializationContext;
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   import org.w3c.dom.Element;
   import org.xml.sax.helpers.AttributesImpl;
   
  @@ -118,7 +119,7 @@
       {
           String attr = el.getAttribute(ATTR_NAME);
           if (attr == null || "".equals(attr))
  -            throw new WSDDException(JavaUtils.getMessage("badNameAttr00"));
  +            throw new WSDDException(Messages.getMessage("badNameAttr00"));
           return new QName("", attr);
       }
   
  
  
  
  1.20      +2 -1      xml-axis/java/src/org/apache/axis/deployment/wsdd/WSDDHandler.java
  
  Index: WSDDHandler.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/deployment/wsdd/WSDDHandler.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- WSDDHandler.java	26 Jun 2002 18:19:07 -0000	1.19
  +++ WSDDHandler.java	9 Sep 2002 17:03:26 -0000	1.20
  @@ -56,6 +56,7 @@
   
   import org.apache.axis.encoding.SerializationContext;
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   import org.w3c.dom.Element;
   import org.xml.sax.helpers.AttributesImpl;
   
  @@ -86,7 +87,7 @@
       {
           super(e);
           if (type == null && (this.getClass() == WSDDHandler.class)) {
  -            throw new WSDDException(JavaUtils.getMessage("noTypeAttr00"));
  +            throw new WSDDException(Messages.getMessage("noTypeAttr00"));
           }
       }
   
  
  
  
  1.33      +3 -3      xml-axis/java/src/org/apache/axis/deployment/wsdd/WSDDTypeMapping.java
  
  Index: WSDDTypeMapping.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/deployment/wsdd/WSDDTypeMapping.java,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- WSDDTypeMapping.java	26 Jun 2002 18:19:07 -0000	1.32
  +++ WSDDTypeMapping.java	9 Sep 2002 17:03:26 -0000	1.33
  @@ -58,6 +58,7 @@
   import org.apache.axis.encoding.SerializationContext;
   import org.apache.axis.utils.ClassUtils;
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   import org.apache.axis.utils.XMLUtils;
   import org.w3c.dom.Attr;
   import org.w3c.dom.Element;
  @@ -209,8 +210,7 @@
       {
           if (typeQName != null) {
               if (!URI_WSDD_JAVA.equals(typeQName.getNamespaceURI())) {
  -                throw new ClassNotFoundException(JavaUtils.
  -                             getMessage("badTypeNamespace00",
  +                throw new ClassNotFoundException(Messages.getMessage("badTypeNamespace00",
                                           typeQName.getNamespaceURI(),
                                           URI_WSDD_JAVA));
               }
  @@ -221,7 +221,7 @@
               return ClassUtils.forName(loadName);
           }
           
  -        throw new ClassNotFoundException(JavaUtils.getMessage("noTypeQName00"));
  +        throw new ClassNotFoundException(Messages.getMessage("noTypeQName00"));
       }
   
       /**
  
  
  
  1.4       +3 -2      xml-axis/java/src/org/apache/axis/deployment/wsdd/WSDDJAXRPCHandlerInfo.java
  
  Index: WSDDJAXRPCHandlerInfo.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/deployment/wsdd/WSDDJAXRPCHandlerInfo.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- WSDDJAXRPCHandlerInfo.java	4 Sep 2002 13:25:03 -0000	1.3
  +++ WSDDJAXRPCHandlerInfo.java	9 Sep 2002 17:03:26 -0000	1.4
  @@ -56,6 +56,7 @@
   
   import org.apache.axis.encoding.SerializationContext;
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   import org.apache.axis.utils.XMLUtils;
   import org.w3c.dom.Element;
   import org.xml.sax.helpers.AttributesImpl;
  @@ -101,7 +102,7 @@
               _classname = classnameStr;
           }
           else 
  -            throw new WSDDException(JavaUtils.getMessage("noClassNameAttr00"));
  +            throw new WSDDException(Messages.getMessage("noClassNameAttr00"));
           
           Element[] elements = getChildElements(e, ELEM_WSDD_PARAM);
           if (elements.length != 0) {
  @@ -123,7 +124,7 @@
                   Element qElem = elements[i];
                   String headerStr = qElem.getAttribute(ATTR_QNAME);
                   if (headerStr == null ||  headerStr.equals("")) 
  -                    throw new WSDDException(JavaUtils.getMessage("noValidHeader"));     
  +                    throw new WSDDException(Messages.getMessage("noValidHeader"));     
   
                   QName headerQName = XMLUtils.getQNameFromString(headerStr, qElem);
                   if (headerQName != null) 
  
  
  
  1.81      +16 -15    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.80
  retrieving revision 1.81
  diff -u -r1.80 -r1.81
  --- AxisServer.java	7 Sep 2002 00:05:31 -0000	1.80
  +++ AxisServer.java	9 Sep 2002 17:03:27 -0000	1.81
  @@ -68,6 +68,7 @@
   import org.apache.axis.configuration.EngineConfigurationFactoryFinder;
   import org.apache.axis.utils.ClassUtils;
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   
   import org.apache.axis.components.logger.LogFactory;
   import org.apache.commons.logging.Log;
  @@ -99,7 +100,7 @@
                   } catch (Exception e) {
                       // If something goes wrong here, should we just fall
                       // through and use the default one?
  -                    log.error(JavaUtils.getMessage("exception00"), e);
  +                    log.error(Messages.getMessage("exception00"), e);
                   }
               }
               
  @@ -178,7 +179,7 @@
   
           if (!isRunning()) {
               throw new AxisFault("Server.disabled",
  -                                JavaUtils.getMessage("serverDisabled00"),
  +                                Messages.getMessage("serverDisabled00"),
                                   null, null);
           }
   
  @@ -197,7 +198,7 @@
                   if ( (h = getHandler(hName)) == null ) {
                       ClassLoader cl = msgContext.getClassLoader();
                       try {
  -                        log.debug( JavaUtils.getMessage("tryingLoad00", hName) );
  +                        log.debug( Messages.getMessage("tryingLoad00", hName) );
                           Class cls = ClassUtils.forName(hName, true, cl);
                           h = (Handler) cls.newInstance();
                       }
  @@ -212,7 +213,7 @@
                       h.invoke(msgContext);
                   else
                       throw new AxisFault( "Server.error",
  -                                         JavaUtils.getMessage("noHandler00", hName),
  +                                         Messages.getMessage("noHandler00", hName),
                                            null, null );
                   if( tlog.isDebugEnabled() ) {
                       t2=System.currentTimeMillis();
  @@ -238,7 +239,7 @@
   
                   // When do we call init/cleanup??
                   if (log.isDebugEnabled()) {
  -                    log.debug(JavaUtils.getMessage("defaultLogic00") );
  +                    log.debug(Messages.getMessage("defaultLogic00") );
                   }
   
                   /*  This is what the entirety of this logic might evolve to:
  @@ -248,7 +249,7 @@
                   if ((h = hr.find( hName )) != null ) {
                   h.invoke(msgContext);
                   } else {
  -                log.error(JavaUtils.getMessage("noTransport02", hName));
  +                log.error(Messages.getMessage("noTransport02", hName));
                   }
                   } else {
                   // No transport set, so use the default (probably just
  @@ -264,7 +265,7 @@
                   SimpleTargetedChain transportChain = null;
   
                   if (log.isDebugEnabled())
  -                    log.debug(JavaUtils.getMessage("transport01", "AxisServer.invoke", hName));
  +                    log.debug(Messages.getMessage("transport01", "AxisServer.invoke", hName));
   
                   if( tlog.isDebugEnabled() ) {
                       t1=System.currentTimeMillis();
  @@ -304,7 +305,7 @@
                       h = msgContext.getService();
                       if (h == null)
                           throw new AxisFault("Server.NoService",
  -                                            JavaUtils.getMessage("noService05",
  +                                            Messages.getMessage("noService05",
                                                                    "" + msgContext.getTargetService()),
                                               null, null );
                   }
  @@ -371,7 +372,7 @@
   
           if (!isRunning()) {
               throw new AxisFault("Server.disabled",
  -                                JavaUtils.getMessage("serverDisabled00"),
  +                                Messages.getMessage("serverDisabled00"),
                                   null, null);
           }
   
  @@ -390,14 +391,14 @@
                   if ( (h = getHandler(hName)) == null ) {
                       ClassLoader cl = msgContext.getClassLoader();
                       try {
  -                        log.debug( JavaUtils.getMessage("tryingLoad00", hName) );
  +                        log.debug( Messages.getMessage("tryingLoad00", hName) );
                           Class cls = ClassUtils.forName(hName, true, cl);
                           h = (Handler) cls.newInstance();
                       }
                       catch( Exception e ) {
                           throw new AxisFault(
                                   "Server.error",
  -                                JavaUtils.getMessage("noHandler00", hName),
  +                                Messages.getMessage("noHandler00", hName),
                                   null, null );
                       }
                   }
  @@ -419,7 +420,7 @@
                   /**************************************************************/
   
                   // When do we call init/cleanup??
  -                log.debug( JavaUtils.getMessage("defaultLogic00") );
  +                log.debug( Messages.getMessage("defaultLogic00") );
   
                   /*  This is what the entirety of this logic might evolve to:
   
  @@ -428,7 +429,7 @@
                   if ((h = hr.find( hName )) != null ) {
                   h.generateWSDL(msgContext);
                   } else {
  -                log.error(JavaUtils.getMessage("noTransport02", hName));
  +                log.error(Messages.getMessage("noTransport02", hName));
                   }
                   } else {
                   // No transport set, so use the default (probably just
  @@ -444,7 +445,7 @@
                   SimpleTargetedChain transportChain = null;
   
                   if (log.isDebugEnabled())
  -                    log.debug(JavaUtils.getMessage("transport01",
  +                    log.debug(Messages.getMessage("transport01",
                                                      "AxisServer.generateWSDL",
                                                      hName));
                   if ( hName != null && (h = getTransport( hName )) != null ) {
  @@ -481,7 +482,7 @@
                       }
                       if (h == null)
                           throw new AxisFault(Constants.QNAME_NO_SERVICE_FAULT_CODE,
  -                                            JavaUtils.getMessage("noService05",
  +                                            Messages.getMessage("noService05",
                                                                    "" + msgContext.getTargetService()),
                                               null, null );
                   }
  
  
  
  1.17      +6 -5      xml-axis/java/src/org/apache/axis/server/DefaultAxisServerFactory.java
  
  Index: DefaultAxisServerFactory.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/server/DefaultAxisServerFactory.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- DefaultAxisServerFactory.java	29 Aug 2002 21:02:39 -0000	1.16
  +++ DefaultAxisServerFactory.java	9 Sep 2002 17:03:27 -0000	1.17
  @@ -61,6 +61,7 @@
   import org.apache.axis.EngineConfiguration;
   import org.apache.axis.utils.ClassUtils;
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   
   import org.apache.axis.components.logger.LogFactory;
   import org.apache.commons.logging.Log;
  @@ -169,7 +170,7 @@
               try {
                   config = (EngineConfiguration)environment.get(EngineConfiguration.PROPERTY_NAME);
               } catch (ClassCastException e) {
  -                log.warn(JavaUtils.getMessage("engineConfigWrongClass00"), e);
  +                log.warn(Messages.getMessage("engineConfigWrongClass00"), e);
                   // Fall through
               }
           }
  @@ -186,16 +187,16 @@
                       Class cls = ClassUtils.forName(configClass);
                       config = (EngineConfiguration)cls.newInstance();
                   } catch (ClassNotFoundException e) {
  -                    log.warn(JavaUtils.getMessage("engineConfigNoClass00", configClass), e);
  +                    log.warn(Messages.getMessage("engineConfigNoClass00", configClass), e);
                       // Fall through
                   } catch (InstantiationException e) {
  -                    log.warn(JavaUtils.getMessage("engineConfigNoInstance00", configClass), e);
  +                    log.warn(Messages.getMessage("engineConfigNoInstance00", configClass), e);
                       // Fall through
                   } catch (IllegalAccessException e) {
  -                    log.warn(JavaUtils.getMessage("engineConfigIllegalAccess00", configClass), e);
  +                    log.warn(Messages.getMessage("engineConfigIllegalAccess00", configClass), e);
                       // Fall through
                   } catch (ClassCastException e) {
  -                    log.warn(JavaUtils.getMessage("engineConfigWrongClass01", configClass), e);
  +                    log.warn(Messages.getMessage("engineConfigWrongClass01", configClass), e);
                       // Fall through
                   }
               }
  
  
  
  1.7       +3 -2      xml-axis/java/src/org/apache/axis/server/JNDIAxisServerFactory.java
  
  Index: JNDIAxisServerFactory.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/server/JNDIAxisServerFactory.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- JNDIAxisServerFactory.java	9 May 2002 18:36:34 -0000	1.6
  +++ JNDIAxisServerFactory.java	9 Sep 2002 17:03:27 -0000	1.7
  @@ -59,6 +59,7 @@
   import org.apache.axis.AxisEngine;
   import org.apache.axis.AxisFault;
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   
   import javax.naming.InitialContext;
   import javax.naming.NamingException;
  @@ -102,7 +103,7 @@
           try {
               context = new InitialContext();
           } catch (NamingException e) {
  -            log.warn(JavaUtils.getMessage("jndiNotFound00"), e);
  +            log.warn(Messages.getMessage("jndiNotFound00"), e);
           }
           
           ServletContext servletContext = null;
  @@ -110,7 +111,7 @@
               servletContext =
                   (ServletContext)environment.get(AxisEngine.ENV_SERVLET_CONTEXT);
           } catch (ClassCastException e) {
  -            log.warn(JavaUtils.getMessage("servletContextWrongClass00"), e);
  +            log.warn(Messages.getMessage("servletContextWrongClass00"), e);
               // Fall through
           }
   
  
  
  
  1.2       +2 -1      xml-axis/java/src/org/apache/axis/components/image/JDK13IO.java
  
  Index: JDK13IO.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/components/image/JDK13IO.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- JDK13IO.java	26 Aug 2002 19:20:16 -0000	1.1
  +++ JDK13IO.java	9 Sep 2002 17:03:27 -0000	1.2
  @@ -56,6 +56,7 @@
   package org.apache.axis.components.image;
   
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   
   import java.awt.Component;
   import java.awt.Graphics;
  @@ -108,7 +109,7 @@
               j.encode(rendImage);
           }
           else {
  -            throw new IOException(JavaUtils.getMessage("jpegOnly", mimeType));
  +            throw new IOException(Messages.getMessage("jpegOnly", mimeType));
           }
       } // saveImage
   
  
  
  
  1.80      +4 -3      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.79
  retrieving revision 1.80
  diff -u -r1.79 -r1.80
  --- SOAPService.java	2 Sep 2002 00:13:21 -0000	1.79
  +++ SOAPService.java	9 Sep 2002 17:03:27 -0000	1.80
  @@ -74,6 +74,7 @@
   import org.apache.axis.providers.BasicProvider;
   import org.apache.axis.utils.JavaUtils;
   import org.apache.axis.utils.LockableHashtable;
  +import org.apache.axis.utils.Messages;
   import org.apache.axis.utils.XMLUtils;
   import org.apache.commons.logging.Log;
   import org.w3c.dom.Document;
  @@ -168,7 +169,7 @@
           public void invoke(MessageContext msgContext) throws AxisFault {
               // Do SOAP semantics here
               if (this.log.isDebugEnabled()) {
  -                this.log.debug( JavaUtils.getMessage("semanticCheck00"));
  +                this.log.debug( Messages.getMessage("semanticCheck00"));
               }
   
               ArrayList acts = getActors();
  @@ -219,7 +220,7 @@
                   }
   
                   throw new AxisFault(Constants.FAULT_MUSTUNDERSTAND,
  -                                    JavaUtils.getMessage("noUnderstand00"),
  +                                    Messages.getMessage("noUnderstand00"),
                                       null, null);
               }
           }
  @@ -386,7 +387,7 @@
       public void enableTransport(String transportName)
       {
           if (log.isDebugEnabled()) {
  -            log.debug(JavaUtils.getMessage(
  +            log.debug(Messages.getMessage(
                   "enableTransport00", "" + this, transportName));
           }
   
  
  
  
  1.4       +2 -1      xml-axis/java/src/org/apache/axis/types/UnsignedLong.java
  
  Index: UnsignedLong.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/types/UnsignedLong.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- UnsignedLong.java	13 Aug 2002 06:03:27 -0000	1.3
  +++ UnsignedLong.java	9 Sep 2002 17:03:27 -0000	1.4
  @@ -57,6 +57,7 @@
   import java.util.ArrayList;
   
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   
   /**
    * Custom class for supporting primitive XSD data type UnsignedLong
  @@ -92,7 +93,7 @@
        */
       public void setValue(double lValue) throws Exception {
           if (isValid(lValue) == false)
  -            throw new Exception(JavaUtils.getMessage("badUnsignedLong00") +
  +            throw new Exception(Messages.getMessage("badUnsignedLong00") +
                       String.valueOf(lValue) + "]");
           this.lValue = new Double(lValue);
       }
  
  
  
  1.2       +5 -4      xml-axis/java/src/org/apache/axis/types/Time.java
  
  Index: Time.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/types/Time.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Time.java	7 Aug 2002 21:02:09 -0000	1.1
  +++ Time.java	9 Sep 2002 17:03:27 -0000	1.2
  @@ -55,6 +55,7 @@
   package org.apache.axis.types;
   
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   
   import java.util.Date;
   import java.util.TimeZone;
  @@ -118,10 +119,10 @@
           if ( source != null ) {
               if (source.charAt(2) != ':' || source.charAt(5) != ':')
                   throw new NumberFormatException(
  -                        JavaUtils.getMessage("badTime00"));
  +                        Messages.getMessage("badTime00"));
               if (source.length() < 8) {
                   throw new NumberFormatException(
  -                        JavaUtils.getMessage("badTime00"));
  +                        Messages.getMessage("badTime00"));
               }
           }
   
  @@ -170,7 +171,7 @@
                           !Character.isDigit(source.charAt(pos+4)) ||
                           !Character.isDigit(source.charAt(pos+5)))
                           throw new NumberFormatException(
  -                                JavaUtils.getMessage("badTimezone00"));
  +                                Messages.getMessage("badTimezone00"));
   
                       int hours = (source.charAt(pos+1)-'0')*10
                           +source.charAt(pos+2)-'0';
  @@ -191,7 +192,7 @@
   
               if (pos < source.length())
                   throw new NumberFormatException(
  -                        JavaUtils.getMessage("badChars00"));
  +                        Messages.getMessage("badChars00"));
           }
   
           calendar.setTime(date);
  
  
  
  1.3       +2 -2      xml-axis/java/src/org/apache/axis/types/UnsignedByte.java
  
  Index: UnsignedByte.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/types/UnsignedByte.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- UnsignedByte.java	13 Aug 2002 06:03:27 -0000	1.2
  +++ UnsignedByte.java	9 Sep 2002 17:03:27 -0000	1.3
  @@ -54,9 +54,9 @@
    */
   package org.apache.axis.types;
   
  -import java.lang.Number;
   
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   
   /**
    * Custom class for supporting primitive XSD data type UnsignedByte
  @@ -91,7 +91,7 @@
        */
       public void setValue(long sValue) throws Exception {
           if (isValid(sValue) == false)
  -            throw new Exception(JavaUtils.getMessage("badUnsignedByte00") +
  +            throw new Exception(Messages.getMessage("badUnsignedByte00") +
                       String.valueOf(sValue) + "]");
           lValue = new Long(sValue);
       }
  
  
  
  1.2       +5 -4      xml-axis/java/src/org/apache/axis/types/Year.java
  
  Index: Year.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/types/Year.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Year.java	9 Aug 2002 15:18:29 -0000	1.1
  +++ Year.java	9 Sep 2002 17:03:27 -0000	1.2
  @@ -55,6 +55,7 @@
   package org.apache.axis.types;
   
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   
   import java.text.SimpleDateFormat;
   import java.text.Format;
  @@ -98,7 +99,7 @@
           }
           if (source.length() < (4 + negative)) {
               throw new NumberFormatException(
  -                    JavaUtils.getMessage("badYear00"));
  +                    Messages.getMessage("badYear00"));
           }
           
           // calculate how many more than 4 digits (if any) in the year
  @@ -119,7 +120,7 @@
           // validate year, more than 4 digits are allowed!
           if (year == 0) {
               throw new NumberFormatException(
  -                    JavaUtils.getMessage("badYear00"));
  +                    Messages.getMessage("badYear00"));
           }
           
           this.year = year;
  @@ -141,11 +142,11 @@
                           !Character.isDigit(timezone.charAt(4)) ||
                           !Character.isDigit(timezone.charAt(5)))
                           throw new NumberFormatException(
  -                                JavaUtils.getMessage("badTimezone00"));
  +                                Messages.getMessage("badTimezone00"));
   
               } else if (!timezone.equals("Z")) {
                   throw new NumberFormatException(
  -                        JavaUtils.getMessage("badTimezone00"));
  +                        Messages.getMessage("badTimezone00"));
               }
               // if we got this far, its good
               this.timezone = timezone;
  
  
  
  1.3       +2 -1      xml-axis/java/src/org/apache/axis/types/UnsignedShort.java
  
  Index: UnsignedShort.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/types/UnsignedShort.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- UnsignedShort.java	13 Aug 2002 06:03:27 -0000	1.2
  +++ UnsignedShort.java	9 Sep 2002 17:03:27 -0000	1.3
  @@ -57,6 +57,7 @@
   import java.util.ArrayList;
   
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   
   /**
    * Custom class for supporting primitive XSD data type UnsignedShort
  @@ -90,7 +91,7 @@
        */
       public void setValue(long sValue) throws Exception {
           if (isValid(sValue) == false)
  -            throw new Exception(JavaUtils.getMessage("badUnsignedShort00") +
  +            throw new Exception(Messages.getMessage("badUnsignedShort00") +
                       String.valueOf(sValue) + "]");
           lValue = new Long(sValue);
       }
  
  
  
  1.2       +2 -1      xml-axis/java/src/org/apache/axis/types/Token.java
  
  Index: Token.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/types/Token.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Token.java	7 Aug 2002 21:02:09 -0000	1.1
  +++ Token.java	9 Sep 2002 17:03:27 -0000	1.2
  @@ -57,6 +57,7 @@
   import java.util.ArrayList;
   
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   
   /**
    * Custom class for supporting primitive XSD data type Token.
  @@ -82,7 +83,7 @@
           }
           catch (Exception e) {
               // recast normalizedString exception as token exception
  -            throw new Exception(JavaUtils.getMessage("badToken00") + "data=[" +
  +            throw new Exception(Messages.getMessage("badToken00") + "data=[" +
                       stValue + "]");
           }
       }
  
  
  
  1.2       +6 -5      xml-axis/java/src/org/apache/axis/types/Day.java
  
  Index: Day.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/types/Day.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Day.java	9 Aug 2002 15:18:29 -0000	1.1
  +++ Day.java	9 Sep 2002 17:03:27 -0000	1.2
  @@ -55,6 +55,7 @@
   package org.apache.axis.types;
   
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   
   import java.text.SimpleDateFormat;
   import java.text.Format;
  @@ -93,14 +94,14 @@
       public Day(String source) throws NumberFormatException {
           if (source.length() < 5) {
               throw new NumberFormatException(
  -                    JavaUtils.getMessage("badDay00"));
  +                    Messages.getMessage("badDay00"));
           }
           
           if (source.charAt(0) != '-' ||
               source.charAt(1) != '-' ||
               source.charAt(2) != '-' ) {
               throw new NumberFormatException(
  -                    JavaUtils.getMessage("badDay00"));
  +                    Messages.getMessage("badDay00"));
           }
           
           setValue(Integer.parseInt(source.substring(3,5)),
  @@ -118,7 +119,7 @@
           // validate day
           if (day < 1 || day > 31) {
               throw new NumberFormatException(
  -                    JavaUtils.getMessage("badDay00"));
  +                    Messages.getMessage("badDay00"));
           }
           this.day = day;
       }
  @@ -139,11 +140,11 @@
                           !Character.isDigit(timezone.charAt(4)) ||
                           !Character.isDigit(timezone.charAt(5)))
                           throw new NumberFormatException(
  -                                JavaUtils.getMessage("badTimezone00"));
  +                                Messages.getMessage("badTimezone00"));
   
               } else if (!timezone.equals("Z")) {
                   throw new NumberFormatException(
  -                        JavaUtils.getMessage("badTimezone00"));
  +                        Messages.getMessage("badTimezone00"));
               }
               // if we got this far, its good
               this.timezone = timezone;
  
  
  
  1.2       +8 -7      xml-axis/java/src/org/apache/axis/types/MonthDay.java
  
  Index: MonthDay.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/types/MonthDay.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- MonthDay.java	9 Aug 2002 15:18:29 -0000	1.1
  +++ MonthDay.java	9 Sep 2002 17:03:27 -0000	1.2
  @@ -55,6 +55,7 @@
   package org.apache.axis.types;
   
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   
   import java.text.SimpleDateFormat;
   import java.text.Format;
  @@ -94,14 +95,14 @@
       public MonthDay(String source) throws NumberFormatException {
           if (source.length() < 6) {
               throw new NumberFormatException(
  -                    JavaUtils.getMessage("badMonthDay00"));
  +                    Messages.getMessage("badMonthDay00"));
           }
           
           if (source.charAt(0) != '-' ||
               source.charAt(1) != '-' ||
               source.charAt(4) != '-' ) {
               throw new NumberFormatException(
  -                    JavaUtils.getMessage("badMonthDay00"));
  +                    Messages.getMessage("badMonthDay00"));
           }
           
           setValue(Integer.parseInt(source.substring(2,4)),
  @@ -117,7 +118,7 @@
           // validate month
           if (month < 1 || month > 12) {
               throw new NumberFormatException(
  -                    JavaUtils.getMessage("badMonthDay00"));
  +                    Messages.getMessage("badMonthDay00"));
           }
           this.month = month;
       }
  @@ -134,14 +135,14 @@
           // validate day
           if (day < 1 || day > 31) {
               throw new NumberFormatException(
  -                    JavaUtils.getMessage("badMonthDay00"));
  +                    Messages.getMessage("badMonthDay00"));
           }
           // 30 days has September... All the rest have 31 (except Feb!)
           // NOTE: if month isn't set, we don't validate day.
           if ((month == 2 && day > 29) ||
              ((month == 9 || month == 4 || month == 6 || month == 11) && day > 30)) {
               throw new NumberFormatException(
  -                    JavaUtils.getMessage("badMonthDay00"));
  +                    Messages.getMessage("badMonthDay00"));
           }
           this.day = day;
       }
  @@ -162,11 +163,11 @@
                           !Character.isDigit(timezone.charAt(4)) ||
                           !Character.isDigit(timezone.charAt(5)))
                           throw new NumberFormatException(
  -                                JavaUtils.getMessage("badTimezone00"));
  +                                Messages.getMessage("badTimezone00"));
   
               } else if (!timezone.equals("Z")) {
                   throw new NumberFormatException(
  -                        JavaUtils.getMessage("badTimezone00"));
  +                        Messages.getMessage("badTimezone00"));
               }
               // if we got this far, its good
               this.timezone = timezone;
  
  
  
  1.2       +7 -6      xml-axis/java/src/org/apache/axis/types/YearMonth.java
  
  Index: YearMonth.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/types/YearMonth.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- YearMonth.java	9 Aug 2002 15:18:29 -0000	1.1
  +++ YearMonth.java	9 Sep 2002 17:03:27 -0000	1.2
  @@ -55,6 +55,7 @@
   package org.apache.axis.types;
   
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   
   import java.text.SimpleDateFormat;
   import java.text.Format;
  @@ -99,14 +100,14 @@
           }
           if (source.length() < (7 + negative)) {
               throw new NumberFormatException(
  -                    JavaUtils.getMessage("badYearMonth00"));
  +                    Messages.getMessage("badYearMonth00"));
           }
           
           // look for first '-'
           int pos = source.substring(negative).indexOf('-');
           if (pos < 0) {
               throw new NumberFormatException(
  -                    JavaUtils.getMessage("badYearMonth00"));
  +                    Messages.getMessage("badYearMonth00"));
           }
           if (negative > 0) pos++;    //adjust index for orginal string
           
  @@ -123,7 +124,7 @@
           // validate year, more than 4 digits are allowed!
           if (year == 0) {
               throw new NumberFormatException(
  -                    JavaUtils.getMessage("badYearMonth00"));
  +                    Messages.getMessage("badYearMonth00"));
           }
           
           this.year = year;
  @@ -137,7 +138,7 @@
           // validate month
           if (month < 1 || month > 12) {
               throw new NumberFormatException(
  -                    JavaUtils.getMessage("badYearMonth00"));
  +                    Messages.getMessage("badYearMonth00"));
           }
           this.month = month;
       }
  @@ -158,11 +159,11 @@
                           !Character.isDigit(timezone.charAt(4)) ||
                           !Character.isDigit(timezone.charAt(5)))
                           throw new NumberFormatException(
  -                                JavaUtils.getMessage("badTimezone00"));
  +                                Messages.getMessage("badTimezone00"));
   
               } else if (!timezone.equals("Z")) {
                   throw new NumberFormatException(
  -                        JavaUtils.getMessage("badTimezone00"));
  +                        Messages.getMessage("badTimezone00"));
               }
               // if we got this far, its good
               this.timezone = timezone;
  
  
  
  1.2       +2 -1      xml-axis/java/src/org/apache/axis/types/Duration.java
  
  Index: Duration.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/types/Duration.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Duration.java	16 Aug 2002 20:07:55 -0000	1.1
  +++ Duration.java	9 Sep 2002 17:03:27 -0000	1.2
  @@ -56,6 +56,7 @@
   package org.apache.axis.types;
   
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   
   
   /**
  @@ -110,7 +111,7 @@
   
           if (duration.indexOf("P") == -1)
               throw new IllegalArgumentException(
  -                    JavaUtils.getMessage("badDuration"));
  +                    Messages.getMessage("badDuration"));
   
           if (duration.startsWith("-")) {
               isNegative = true;
  
  
  
  1.2       +3 -2      xml-axis/java/src/org/apache/axis/types/HexBinary.java
  
  Index: HexBinary.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/types/HexBinary.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- HexBinary.java	7 Aug 2002 21:02:09 -0000	1.1
  +++ HexBinary.java	9 Sep 2002 17:03:27 -0000	1.2
  @@ -57,6 +57,7 @@
   import java.io.ByteArrayOutputStream;
   
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   
   /**
    * Custom class for supporting primitive XSD data type hexBinary.
  @@ -99,9 +100,9 @@
       }
   
       public static final String ERROR_ODD_NUMBER_OF_DIGITS =
  -            JavaUtils.getMessage("oddDigits00");
  +            Messages.getMessage("oddDigits00");
       public static final String ERROR_BAD_CHARACTER_IN_HEX_STRING =
  -            JavaUtils.getMessage("badChars01");
  +            Messages.getMessage("badChars01");
   
       // Code from Ajp11, from Apache's JServ
   
  
  
  
  1.3       +2 -2      xml-axis/java/src/org/apache/axis/types/NCName.java
  
  Index: NCName.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/types/NCName.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- NCName.java	15 Aug 2002 04:51:51 -0000	1.2
  +++ NCName.java	9 Sep 2002 17:03:27 -0000	1.3
  @@ -54,9 +54,9 @@
    */
   package org.apache.axis.types;
   
  -import java.lang.Character;
   
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   import org.apache.axis.utils.XMLChar;
   
   /**
  @@ -84,7 +84,7 @@
           }
           catch (Exception e) {
               // recast normalizedString exception as token exception
  -            throw new Exception(JavaUtils.getMessage("badNCNameType00") + "data=[" +
  +            throw new Exception(Messages.getMessage("badNCNameType00") + "data=[" +
                       stValue + "]");
           }
       }
  
  
  
  1.2       +6 -5      xml-axis/java/src/org/apache/axis/types/Month.java
  
  Index: Month.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/types/Month.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Month.java	9 Aug 2002 15:18:29 -0000	1.1
  +++ Month.java	9 Sep 2002 17:03:27 -0000	1.2
  @@ -55,6 +55,7 @@
   package org.apache.axis.types;
   
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   
   import java.text.SimpleDateFormat;
   import java.text.Format;
  @@ -93,7 +94,7 @@
       public Month(String source) throws NumberFormatException {
           if (source.length() < (6)) {
               throw new NumberFormatException(
  -                    JavaUtils.getMessage("badMonth00"));
  +                    Messages.getMessage("badMonth00"));
           }
           
           if (source.charAt(0) != '-' ||
  @@ -101,7 +102,7 @@
               source.charAt(4) != '-' ||
               source.charAt(5) != '-' ) {
               throw new NumberFormatException(
  -                    JavaUtils.getMessage("badMonth00"));
  +                    Messages.getMessage("badMonth00"));
           }
           
           setValue(Integer.parseInt(source.substring(2,4)),
  @@ -116,7 +117,7 @@
           // validate month
           if (month < 1 || month > 12) {
               throw new NumberFormatException(
  -                    JavaUtils.getMessage("badMonth00"));
  +                    Messages.getMessage("badMonth00"));
           }
           this.month = month;
       }
  @@ -137,11 +138,11 @@
                           !Character.isDigit(timezone.charAt(4)) ||
                           !Character.isDigit(timezone.charAt(5)))
                           throw new NumberFormatException(
  -                                JavaUtils.getMessage("badTimezone00"));
  +                                Messages.getMessage("badTimezone00"));
   
               } else if (!timezone.equals("Z")) {
                   throw new NumberFormatException(
  -                        JavaUtils.getMessage("badTimezone00"));
  +                        Messages.getMessage("badTimezone00"));
               }
               // if we got this far, its good
               this.timezone = timezone;
  
  
  
  1.4       +2 -3      xml-axis/java/src/org/apache/axis/types/UnsignedInt.java
  
  Index: UnsignedInt.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/types/UnsignedInt.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- UnsignedInt.java	13 Aug 2002 06:03:27 -0000	1.3
  +++ UnsignedInt.java	9 Sep 2002 17:03:27 -0000	1.4
  @@ -54,11 +54,10 @@
    */
   package org.apache.axis.types;
   
  -import java.lang.Comparable;
  -import java.lang.Number;
   
   
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   
   /**
    * Custom class for supporting primitive XSD data type UnsignedInt
  @@ -94,7 +93,7 @@
        */
       public void setValue(long iValue) throws Exception {
         if (isValid(iValue) == false)
  -            throw new Exception(JavaUtils.getMessage("badUnsignedInt00") +
  +            throw new Exception(Messages.getMessage("badUnsignedInt00") +
                       String.valueOf(iValue) + "]");
         lValue = new Long(iValue);
       }
  
  
  
  1.2       +2 -1      xml-axis/java/src/org/apache/axis/types/NormalizedString.java
  
  Index: NormalizedString.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/types/NormalizedString.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- NormalizedString.java	7 Aug 2002 21:02:09 -0000	1.1
  +++ NormalizedString.java	9 Sep 2002 17:03:27 -0000	1.2
  @@ -55,6 +55,7 @@
   package org.apache.axis.types;
   
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   
   /**
    * Custom class for supporting XSD data type NormalizedString.
  @@ -89,7 +90,7 @@
        */
       public void setValue(String stValue) throws Exception {
           if (isValid(stValue) == false)
  -            throw new Exception(JavaUtils.getMessage("badNormalizedString00") +
  +            throw new Exception(Messages.getMessage("badNormalizedString00") +
                       " data=[" + stValue + "]");
           m_value = stValue;
       }
  
  
  
  1.3       +2 -2      xml-axis/java/src/org/apache/axis/types/Name.java
  
  Index: Name.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/types/Name.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Name.java	15 Aug 2002 04:51:51 -0000	1.2
  +++ Name.java	9 Sep 2002 17:03:27 -0000	1.3
  @@ -54,9 +54,9 @@
    */
   package org.apache.axis.types;
   
  -import java.lang.Character;
   
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   import org.apache.axis.utils.XMLChar;
   
   /**
  @@ -84,7 +84,7 @@
           }
           catch (Exception e) {
               // recast normalizedString exception as token exception
  -            throw new Exception(JavaUtils.getMessage("badNameType00") + "data=[" +
  +            throw new Exception(Messages.getMessage("badNameType00") + "data=[" +
                       stValue + "]");
           }
       }
  
  
  
  1.3       +2 -1      xml-axis/java/src/org/apache/axis/types/NonNegativeInteger.java
  
  Index: NonNegativeInteger.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/types/NonNegativeInteger.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- NonNegativeInteger.java	4 Sep 2002 14:42:01 -0000	1.2
  +++ NonNegativeInteger.java	9 Sep 2002 17:03:27 -0000	1.3
  @@ -59,6 +59,7 @@
   import java.util.Random;
   
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   
   /**
    * Custom class for supporting primitive XSD data type nonNegativeInteger
  @@ -105,7 +106,7 @@
       private void checkValidity() {
           if (compareTo(zero) < 0) {
               throw new NumberFormatException(
  -                    JavaUtils.getMessage("badNonNegInt00")
  +                    Messages.getMessage("badNonNegInt00")
                       + ":  " + this);
           }
       } // checkValidity
  
  
  
  1.3       +2 -1      xml-axis/java/src/org/apache/axis/types/NMToken.java
  
  Index: NMToken.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/types/NMToken.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- NMToken.java	15 Aug 2002 04:51:51 -0000	1.2
  +++ NMToken.java	9 Sep 2002 17:03:27 -0000	1.3
  @@ -57,6 +57,7 @@
   import java.util.ArrayList;
   
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   import org.apache.axis.utils.XMLChar;
   
   /**
  @@ -86,7 +87,7 @@
           }
           catch (Exception e) {
               // recast normalizedString exception as token exception
  -            throw new Exception(JavaUtils.getMessage("badNmtoken00") + "data=[" +
  +            throw new Exception(Messages.getMessage("badNmtoken00") + "data=[" +
                       stValue + "]");
           }
       }
  
  
  
  1.24      +35 -34    xml-axis/java/src/org/apache/axis/wsdl/Java2WSDL.java
  
  Index: Java2WSDL.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/Java2WSDL.java,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- Java2WSDL.java	3 Sep 2002 20:36:45 -0000	1.23
  +++ Java2WSDL.java	9 Sep 2002 17:03:28 -0000	1.24
  @@ -59,6 +59,7 @@
   import org.apache.axis.utils.CLOptionDescriptor;
   import org.apache.axis.utils.CLUtil;
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   
   import org.apache.axis.wsdl.fromJava.Emitter;
   
  @@ -113,91 +114,91 @@
           new CLOptionDescriptor("help",
                   CLOptionDescriptor.ARGUMENT_DISALLOWED,
                   HELP_OPT,
  -                JavaUtils.getMessage("j2wopthelp00")),
  +                Messages.getMessage("j2wopthelp00")),
           new CLOptionDescriptor("input",
                   CLOptionDescriptor.ARGUMENT_REQUIRED,
                   INPUT_OPT,
  -                JavaUtils.getMessage("j2woptinput00")),
  +                Messages.getMessage("j2woptinput00")),
           new CLOptionDescriptor("output",
                   CLOptionDescriptor.ARGUMENT_REQUIRED,
                   OUTPUT_OPT,
  -                JavaUtils.getMessage("j2woptoutput00")),
  +                Messages.getMessage("j2woptoutput00")),
           new CLOptionDescriptor("location",
                   CLOptionDescriptor.ARGUMENT_REQUIRED,
                   LOCATION_OPT,
  -                JavaUtils.getMessage("j2woptlocation00")),
  +                Messages.getMessage("j2woptlocation00")),
           new CLOptionDescriptor("portTypeName",
                   CLOptionDescriptor.ARGUMENT_REQUIRED,
                   PORTTYPE_NAME_OPT,
  -                JavaUtils.getMessage("j2woptportTypeName00")),
  +                Messages.getMessage("j2woptportTypeName00")),
           new CLOptionDescriptor("bindingName",
                   CLOptionDescriptor.ARGUMENT_REQUIRED,
                   BINDING_NAME_OPT,
  -                JavaUtils.getMessage("j2woptbindingName00")),
  +                Messages.getMessage("j2woptbindingName00")),
           new CLOptionDescriptor("serviceElementName",
                   CLOptionDescriptor.ARGUMENT_REQUIRED,
                   SERVICE_ELEMENT_NAME_OPT,
  -                JavaUtils.getMessage("j2woptserviceElementName00")),
  +                Messages.getMessage("j2woptserviceElementName00")),
           new CLOptionDescriptor("servicePortName",
                   CLOptionDescriptor.ARGUMENT_REQUIRED,
                   SERVICE_PORT_NAME_OPT,
  -                JavaUtils.getMessage("j2woptservicePortName00")),
  +                Messages.getMessage("j2woptservicePortName00")),
           new CLOptionDescriptor("namespace",
                   CLOptionDescriptor.ARGUMENT_REQUIRED,
                   NAMESPACE_OPT,
  -                JavaUtils.getMessage("j2woptnamespace00")),
  +                Messages.getMessage("j2woptnamespace00")),
           new CLOptionDescriptor("PkgtoNS",
                   CLOptionDescriptor.DUPLICATES_ALLOWED + CLOptionDescriptor.ARGUMENTS_REQUIRED_2,
                   PACKAGE_OPT,
  -                JavaUtils.getMessage("j2woptPkgtoNS00")),
  +                Messages.getMessage("j2woptPkgtoNS00")),
           new CLOptionDescriptor("methods",
                   CLOptionDescriptor.DUPLICATES_ALLOWED + CLOptionDescriptor.ARGUMENT_REQUIRED,
                   METHODS_ALLOWED_OPT,
  -                JavaUtils.getMessage("j2woptmethods00")),
  +                Messages.getMessage("j2woptmethods00")),
           new CLOptionDescriptor("all",
                   CLOptionDescriptor.ARGUMENT_DISALLOWED,
                   INHERITED_CLASS_OPT,
  -                JavaUtils.getMessage("j2woptall00")),
  +                Messages.getMessage("j2woptall00")),
           new CLOptionDescriptor("outputWsdlMode",
                   CLOptionDescriptor.ARGUMENT_REQUIRED,
                   OUTPUT_WSDL_MODE_OPT,
  -                JavaUtils.getMessage("j2woptoutputWsdlMode00")),
  +                Messages.getMessage("j2woptoutputWsdlMode00")),
           new CLOptionDescriptor("locationImport",
                   CLOptionDescriptor.ARGUMENT_REQUIRED,
                   LOCATION_IMPORT_OPT,
  -                JavaUtils.getMessage("j2woptlocationImport00")),
  +                Messages.getMessage("j2woptlocationImport00")),
           new CLOptionDescriptor("namespaceImpl",
                   CLOptionDescriptor.ARGUMENT_REQUIRED,
                   NAMESPACE_IMPL_OPT,
  -                JavaUtils.getMessage("j2woptnamespaceImpl00")),
  +                Messages.getMessage("j2woptnamespaceImpl00")),
           new CLOptionDescriptor("outputImpl",
                   CLOptionDescriptor.ARGUMENT_REQUIRED,
                   OUTPUT_IMPL_OPT,
  -                JavaUtils.getMessage("j2woptoutputImpl00")),
  +                Messages.getMessage("j2woptoutputImpl00")),
           new CLOptionDescriptor("implClass",
                   CLOptionDescriptor.ARGUMENT_REQUIRED,
                   IMPL_CLASS_OPT,
  -                JavaUtils.getMessage("j2woptimplClass00")),
  +                Messages.getMessage("j2woptimplClass00")),
           new CLOptionDescriptor("exclude",
                   CLOptionDescriptor.DUPLICATES_ALLOWED + CLOptionDescriptor.ARGUMENT_REQUIRED,
                   METHODS_NOTALLOWED_OPT,
  -                 JavaUtils.getMessage("j2woptexclude00")),
  +                 Messages.getMessage("j2woptexclude00")),
           new CLOptionDescriptor("stopClasses",
                   CLOptionDescriptor.DUPLICATES_ALLOWED + CLOptionDescriptor.ARGUMENT_REQUIRED,
                   STOP_CLASSES_OPT,
  -                JavaUtils.getMessage("j2woptstopClass00")),
  +                Messages.getMessage("j2woptstopClass00")),
           new CLOptionDescriptor("typeMappingVersion",
                   CLOptionDescriptor.ARGUMENT_REQUIRED,
                   TYPEMAPPING_OPT,
  -                JavaUtils.getMessage("j2wopttypeMapping00")),
  +                Messages.getMessage("j2wopttypeMapping00")),
           new CLOptionDescriptor("soapAction",
                   CLOptionDescriptor.ARGUMENT_REQUIRED,
                   SOAPACTION_OPT,
  -                JavaUtils.getMessage("j2woptsoapAction00")),
  +                Messages.getMessage("j2woptsoapAction00")),
           new CLOptionDescriptor("style",
                   CLOptionDescriptor.ARGUMENT_REQUIRED,
                   STYLE_OPT,
  -                JavaUtils.getMessage("j2woptStyle00"))
  +                Messages.getMessage("j2woptStyle00"))
           
       };
   
  @@ -250,7 +251,7 @@
           switch (option.getId()) {
           case CLOption.TEXT_ARGUMENT:
               if (className != null) {
  -                System.out.println(JavaUtils.getMessage("j2wDuplicateClass00", 
  +                System.out.println(Messages.getMessage("j2wDuplicateClass00", 
                                                           className, 
                                                           option.getArgument()));
                   printUsage();
  @@ -284,7 +285,7 @@
                   mode = Emitter.MODE_IMPLEMENTATION;
               else {
                   mode = Emitter.MODE_ALL; 
  -                System.err.println(JavaUtils.getMessage("j2wmodeerror", modeArg));
  +                System.err.println(Messages.getMessage("j2wmodeerror", modeArg));
               }
               break;
               
  @@ -356,7 +357,7 @@
                   emitter.setDefaultTypeMapping(
                                                 DefaultSOAP12TypeMappingImpl.create());
               } else {
  -                System.out.println(JavaUtils.getMessage("j2wBadTypeMapping00"));
  +                System.out.println(Messages.getMessage("j2wBadTypeMapping00"));
               }
               break;
               
  @@ -369,7 +370,7 @@
               } else if (value.equalsIgnoreCase("NONE")) {
                   emitter.setSoapAction("NONE");
               } else {
  -                System.out.println(JavaUtils.getMessage("j2wBadSoapAction00"));
  +                System.out.println(Messages.getMessage("j2wBadSoapAction00"));
               }
               break;
   
  @@ -380,7 +381,7 @@
                   } else if (value.equalsIgnoreCase("RPC")) {
                       emitter.setMode(Emitter.MODE_RPC);
                   } else {
  -                    System.out.println(JavaUtils.getMessage("j2woptBadStyle00"));
  +                    System.out.println(Messages.getMessage("j2woptBadStyle00"));
                   }
               break;
   
  @@ -398,13 +399,13 @@
       protected void validateOptions() {
           // Can't proceed without a class name
           if ((className == null)) {
  -            System.out.println(JavaUtils.getMessage("j2wMissingClass00"));
  +            System.out.println(Messages.getMessage("j2wMissingClass00"));
               printUsage();
           }
           
           if (!locationSet && (mode == Emitter.MODE_ALL ||
                                mode == Emitter.MODE_IMPLEMENTATION)) {
  -            System.out.println(JavaUtils.getMessage("j2wMissingLocation00"));
  +            System.out.println(Messages.getMessage("j2wMissingLocation00"));
               printUsage();
           }
           
  @@ -426,7 +427,7 @@
           // Print parser errors, if any
           if (null != argsParser.getErrorString()) {
               System.err.println(
  -                    JavaUtils.getMessage("j2werror00", argsParser.getErrorString()));
  +                    Messages.getMessage("j2werror00", argsParser.getErrorString()));
               printUsage();
           }
   
  @@ -475,12 +476,12 @@
           String lSep = System.getProperty("line.separator");
           StringBuffer msg = new StringBuffer();
           msg.append("Java2WSDL " 
  -                   + JavaUtils.getMessage("j2wemitter00")).append(lSep);
  -        msg.append(JavaUtils.getMessage("j2wusage00", 
  +                   + Messages.getMessage("j2wemitter00")).append(lSep);
  +        msg.append(Messages.getMessage("j2wusage00", 
                      "java " + Java2WSDL.class.getName() + " [options] class-of-portType")).append(lSep);
  -        msg.append(JavaUtils.getMessage("j2woptions00")).append(lSep);
  +        msg.append(Messages.getMessage("j2woptions00")).append(lSep);
           msg.append(CLUtil.describeOptions(options).toString());
  -        msg.append(JavaUtils.getMessage("j2wdetails00")).append(lSep);
  +        msg.append(Messages.getMessage("j2wdetails00")).append(lSep);
           System.out.println(msg.toString());
           System.exit(0);
       }
  
  
  
  1.37      +19 -18    xml-axis/java/src/org/apache/axis/wsdl/WSDL2Java.java
  
  Index: WSDL2Java.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/WSDL2Java.java,v
  retrieving revision 1.36
  retrieving revision 1.37
  diff -u -r1.36 -r1.37
  --- WSDL2Java.java	11 Jun 2002 13:26:16 -0000	1.36
  +++ WSDL2Java.java	9 Sep 2002 17:03:28 -0000	1.37
  @@ -59,6 +59,7 @@
   import org.apache.axis.utils.CLOptionDescriptor;
   import org.apache.axis.utils.CLUtil;
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   
   import org.apache.axis.enum.Scope;
   
  @@ -106,59 +107,59 @@
           new CLOptionDescriptor("server-side",
                   CLOptionDescriptor.ARGUMENT_DISALLOWED,
                   SERVER_OPT,
  -                JavaUtils.getMessage("optionSkel00")),
  +                Messages.getMessage("optionSkel00")),
           new CLOptionDescriptor("skeletonDeploy",
                   CLOptionDescriptor.ARGUMENT_REQUIRED,
                   SKELETON_DEPLOY_OPT,
  -                JavaUtils.getMessage("optionSkeletonDeploy00")),
  +                Messages.getMessage("optionSkeletonDeploy00")),
           new CLOptionDescriptor("NStoPkg",
                   CLOptionDescriptor.DUPLICATES_ALLOWED + CLOptionDescriptor.ARGUMENTS_REQUIRED_2,
                   NAMESPACE_OPT,
  -                JavaUtils.getMessage("optionNStoPkg00")),
  +                Messages.getMessage("optionNStoPkg00")),
           new CLOptionDescriptor("fileNStoPkg",
                   CLOptionDescriptor.ARGUMENT_REQUIRED,
                   NAMESPACE_FILE_OPT,
  -                JavaUtils.getMessage("optionFileNStoPkg00")),
  +                Messages.getMessage("optionFileNStoPkg00")),
           new CLOptionDescriptor("package",
                   CLOptionDescriptor.ARGUMENT_REQUIRED,
                   PACKAGE_OPT,
  -                JavaUtils.getMessage("optionPackage00")),
  +                Messages.getMessage("optionPackage00")),
           new CLOptionDescriptor("output",
                   CLOptionDescriptor.ARGUMENT_REQUIRED,
                   OUTPUT_OPT,
  -                JavaUtils.getMessage("optionOutput00")),
  +                Messages.getMessage("optionOutput00")),
           new CLOptionDescriptor("deployScope",
                   CLOptionDescriptor.ARGUMENT_REQUIRED,
                   SCOPE_OPT,
  -                JavaUtils.getMessage("optionScope00")),
  +                Messages.getMessage("optionScope00")),
           new CLOptionDescriptor("testCase",
                   CLOptionDescriptor.ARGUMENT_DISALLOWED,
                   TEST_OPT,
  -                JavaUtils.getMessage("optionTest00")),
  +                Messages.getMessage("optionTest00")),
           new CLOptionDescriptor("all",
                   CLOptionDescriptor.ARGUMENT_DISALLOWED,
                   ALL_OPT,
  -                JavaUtils.getMessage("optionAll00")),
  +                Messages.getMessage("optionAll00")),
           new CLOptionDescriptor("typeMappingVersion",
                   CLOptionDescriptor.ARGUMENT_REQUIRED,
                   TYPEMAPPING_OPT,
  -                JavaUtils.getMessage("optionTypeMapping00")),
  +                Messages.getMessage("optionTypeMapping00")),
           new CLOptionDescriptor("factory",
                   CLOptionDescriptor.ARGUMENT_REQUIRED,
                   FACTORY_CLASS_OPT,
  -                JavaUtils.getMessage("optionFactory00")),
  +                Messages.getMessage("optionFactory00")),
           new CLOptionDescriptor("helperGen",
                   CLOptionDescriptor.ARGUMENT_DISALLOWED,
                   HELPER_CLASS_OPT,
  -                JavaUtils.getMessage("optionHelper00")),
  +                Messages.getMessage("optionHelper00")),
           new CLOptionDescriptor("user",
                   CLOptionDescriptor.ARGUMENT_REQUIRED,
                   USERNAME_OPT,
  -                JavaUtils.getMessage("optionUsername")),
  +                Messages.getMessage("optionUsername")),
           new CLOptionDescriptor("password",
                   CLOptionDescriptor.ARGUMENT_REQUIRED,
                   PASSWORD_OPT,
  -                JavaUtils.getMessage("optionPassword"))
  +                Messages.getMessage("optionPassword"))
       };
   
       /**
  @@ -230,7 +231,7 @@
                       emitter.setScope(scope);
                   } else {
                       System.err.println(
  -                            JavaUtils.getMessage("badScope00", arg));
  +                            Messages.getMessage("badScope00", arg));
                   }
   
                   break;
  @@ -250,7 +251,7 @@
                   } else if (tmValue.equals("1.2")) {
                       emitter.setTypeMappingVersion("1.2");
                   } else {
  -                    System.out.println(JavaUtils.getMessage("badTypeMappingOption00"));
  +                    System.out.println(Messages.getMessage("badTypeMappingOption00"));
                   }
                   break;
   
  @@ -277,11 +278,11 @@
   
           // validate argument combinations
           if (emitter.isSkeletonWanted() && !emitter.isServerSide()) {
  -            System.out.println(JavaUtils.getMessage("badSkeleton00"));
  +            System.out.println(Messages.getMessage("badSkeleton00"));
               printUsage();
           }
           if (!emitter.getNamespaceMap().isEmpty() && bPackageOpt) {
  -            System.out.println(JavaUtils.getMessage("badpackage00"));
  +            System.out.println(Messages.getMessage("badpackage00"));
               printUsage();
           }
       } // validateOptions
  
  
  
  1.11      +2 -2      xml-axis/java/samples/echo/echoHeaderStructHandler.java
  
  Index: echoHeaderStructHandler.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/samples/echo/echoHeaderStructHandler.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- echoHeaderStructHandler.java	3 Jul 2002 18:47:08 -0000	1.10
  +++ echoHeaderStructHandler.java	9 Sep 2002 17:03:28 -0000	1.11
  @@ -62,7 +62,7 @@
   import org.apache.axis.MessageContext;
   import org.apache.axis.message.SOAPEnvelope;
   import org.apache.axis.message.SOAPHeaderElement;
  -import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   
   import org.apache.axis.components.logger.LogFactory;
   import org.apache.commons.logging.Log;
  @@ -115,7 +115,7 @@
               // Request. look for the header
               Message msg = context.getRequestMessage();
               if (msg == null)
  -                throw new AxisFault(JavaUtils.getMessage("noRequest00"));
  +                throw new AxisFault(Messages.getMessage("noRequest00"));
               
               SOAPEnvelope env = msg.getSOAPEnvelope();
               SOAPHeaderElement header = env.getHeaderByName(HEADER_NS,
  
  
  
  1.10      +2 -2      xml-axis/java/samples/echo/echoHeaderStringHandler.java
  
  Index: echoHeaderStringHandler.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/samples/echo/echoHeaderStringHandler.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- echoHeaderStringHandler.java	3 Jul 2002 18:47:08 -0000	1.9
  +++ echoHeaderStringHandler.java	9 Sep 2002 17:03:28 -0000	1.10
  @@ -62,7 +62,7 @@
   import org.apache.axis.MessageContext;
   import org.apache.axis.message.SOAPEnvelope;
   import org.apache.axis.message.SOAPHeaderElement;
  -import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   
   import org.apache.axis.components.logger.LogFactory;
   import org.apache.commons.logging.Log;
  @@ -110,7 +110,7 @@
               // Request. look for the header
               Message msg = context.getRequestMessage();
               if (msg == null)
  -                throw new AxisFault(JavaUtils.getMessage("noRequest00"));
  +                throw new AxisFault(Messages.getMessage("noRequest00"));
               
               SOAPEnvelope env = msg.getSOAPEnvelope();
               SOAPHeaderElement header = env.getHeaderByName(HEADER_NS,
  
  
  
  1.14      +4 -3      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.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- ServletSecurityProvider.java	12 Aug 2002 22:59:09 -0000	1.13
  +++ ServletSecurityProvider.java	9 Sep 2002 17:03:28 -0000	1.14
  @@ -60,6 +60,7 @@
   import org.apache.axis.security.SecurityProvider;
   import org.apache.axis.transport.http.HTTPConstants;
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   
   import org.apache.axis.components.logger.LogFactory;
   import org.apache.commons.logging.Log;
  @@ -99,15 +100,15 @@
           if (req == null)
               return null;
   
  -        log.debug(JavaUtils.getMessage("got00", "HttpServletRequest"));
  +        log.debug(Messages.getMessage("got00", "HttpServletRequest"));
   
           Principal principal = req.getUserPrincipal();
           if (principal == null) {
  -            log.debug(JavaUtils.getMessage("noPrincipal00"));
  +            log.debug(Messages.getMessage("noPrincipal00"));
               return null;
           }
   
  -        log.debug(JavaUtils.getMessage("gotPrincipal00",  principal.getName()));
  +        log.debug(Messages.getMessage("gotPrincipal00",  principal.getName()));
   
           return new ServletAuthenticatedUser(req);
       }
  
  
  
  1.7       +3 -2      xml-axis/java/src/org/apache/axis/soap/SOAPConnectionImpl.java
  
  Index: SOAPConnectionImpl.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/soap/SOAPConnectionImpl.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- SOAPConnectionImpl.java	24 Jul 2002 16:59:51 -0000	1.6
  +++ SOAPConnectionImpl.java	9 Sep 2002 17:03:28 -0000	1.7
  @@ -60,6 +60,7 @@
   
   import org.apache.axis.client.Call;
   import org.apache.axis.message.SOAPEnvelope;
  +import org.apache.axis.utils.Messages;
   
   /**
    * SOAP Connection implementation
  @@ -84,7 +85,7 @@
       public SOAPMessage call(SOAPMessage request, Object endpoint)
           throws SOAPException {
           if(closed){
  -            throw new SOAPException(org.apache.axis.utils.JavaUtils.getMessage("connectionClosed00"));
  +            throw new SOAPException(Messages.getMessage("connectionClosed00"));
           }
           try {
               Call call = new Call(endpoint.toString());
  @@ -107,7 +108,7 @@
        */
       public void close() throws SOAPException {
           if(closed){
  -            throw new SOAPException(org.apache.axis.utils.JavaUtils.getMessage("connectionClosed00"));
  +            throw new SOAPException(Messages.getMessage("connectionClosed00"));
           }
           closed = true;
       }
  
  
  
  1.3       +1 -1      xml-axis/java/src/org/apache/axis/utils/SessionUtils.java
  
  Index: SessionUtils.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/utils/SessionUtils.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- SessionUtils.java	23 Aug 2002 01:33:53 -0000	1.2
  +++ SessionUtils.java	9 Sep 2002 17:03:28 -0000	1.3
  @@ -213,7 +213,7 @@
               try {
                   thisHost = java.net.InetAddress.getLocalHost().getHostName();
               } catch (java.net.UnknownHostException e) {
  -                log.error(JavaUtils.getMessage("javaNetUnknownHostException00"),
  +                log.error(Messages.getMessage("javaNetUnknownHostException00"),
                           e);
                   thisHost = "localhost";
               }
  
  
  
  1.121     +12 -12    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.120
  retrieving revision 1.121
  diff -u -r1.120 -r1.121
  --- Admin.java	12 Aug 2002 22:52:13 -0000	1.120
  +++ Admin.java	9 Sep 2002 17:03:28 -0000	1.121
  @@ -125,12 +125,12 @@
               engine.setAdminPassword(newPassword);
               doc = XMLUtils.newDocument();
               doc.appendChild( root = doc.createElementNS("", "Admin" ) );
  -            root.appendChild( doc.createTextNode( JavaUtils.getMessage("done00") ) );
  +            root.appendChild( doc.createTextNode( Messages.getMessage("done00") ) );
               return doc;
           }
   
           if (action.equals("quit")) {
  -            log.error(JavaUtils.getMessage("quitRequest00"));
  +            log.error(Messages.getMessage("quitRequest00"));
               if (msgContext != null) {
                   // put a flag into message context so listener will exit after
                   // sending response
  @@ -138,7 +138,7 @@
               }
               doc = XMLUtils.newDocument();
               doc.appendChild( root = doc.createElementNS("", "Admin" ) );
  -            root.appendChild( doc.createTextNode( JavaUtils.getMessage("quit00", "") ) );
  +            root.appendChild( doc.createTextNode( Messages.getMessage("quit00", "") ) );
               return doc;
           }
   
  @@ -164,7 +164,7 @@
           
           doc = XMLUtils.newDocument();
           doc.appendChild( root = doc.createElementNS("", "Admin" ) );
  -        root.appendChild( doc.createTextNode( JavaUtils.getMessage("done00") ) );
  +        root.appendChild( doc.createTextNode( Messages.getMessage("done00") ) );
           
           return doc;
       }
  @@ -209,11 +209,11 @@
                       
                       if (!myAddr.equals(remoteAddr))
                           throw new AxisFault("Server.Unauthorized",
  -                           JavaUtils.getMessage("noAdminAccess00"),
  +                           Messages.getMessage("noAdminAccess00"),
                              null, null);
                   } catch (UnknownHostException e) {
                       throw new AxisFault("Server.UnknownHost",
  -                        JavaUtils.getMessage("unknownHost00"),
  +                        Messages.getMessage("unknownHost00"),
                           null, null);
                   }
               }
  @@ -254,7 +254,7 @@
               // If the engine config isn't a FileProvider, or we have no
               // engine config for some odd reason, we'll end up here.
   
  -            throw new AxisFault(JavaUtils.getMessage("noEngineWSDD"));
  +            throw new AxisFault(Messages.getMessage("noEngineWSDD"));
           }
   
           try {
  @@ -270,9 +270,9 @@
   
           if ( args.length < 2 || !(args[0].equals("client") ||
                                     args[0].equals("server")) ) {
  -            log.error( JavaUtils.getMessage("usage00", "Admin client|server <xml-file>") );
  +            log.error( Messages.getMessage("usage00", "Admin client|server <xml-file>") );
   
  -            log.error( JavaUtils.getMessage("where00", "<xml-file>") );
  +            log.error( Messages.getMessage("where00", "<xml-file>") );
               log.error( "<deploy>" );
               /*
               log.error( "  <transport name=a request=\"a,b,c\" sender=\"s\"");
  @@ -295,7 +295,7 @@
               // throw an Exception which will go uncaught!  this way, a test
               // suite can invoke main() and detect the exception
               throw new IllegalArgumentException(
  -                    JavaUtils.getMessage("usage00", 
  +                    Messages.getMessage("usage00", 
                                            "Admin client|server <xml-file>"));
               // System.exit( 1 );
           }
  @@ -314,14 +314,14 @@
           try {
               for ( i = 1 ; i < args.length ; i++ ) {
                   if (log.isDebugEnabled())
  -                    log.debug( JavaUtils.getMessage("process00", args[i]) );
  +                    log.debug( Messages.getMessage("process00", args[i]) );
   
                   Document doc = XMLUtils.newDocument( new FileInputStream( args[i] ) );
                   admin.process(msgContext, doc.getDocumentElement());
               }
           }
           catch( Exception e ) {
  -            log.error( JavaUtils.getMessage("errorProcess00", args[i]), e );
  +            log.error( Messages.getMessage("errorProcess00", args[i]), e );
               //System.exit( 1 );
               throw e;
           }
  
  
  
  1.31      +2 -2      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.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- NSStack.java	4 Sep 2002 21:48:16 -0000	1.30
  +++ NSStack.java	9 Sep 2002 17:03:28 -0000	1.31
  @@ -122,7 +122,7 @@
   
           if (top == 0) {
               if (log.isTraceEnabled())
  -                log.trace("NSPop (" + JavaUtils.getMessage("empty00") + ")");
  +                log.trace("NSPop (" + Messages.getMessage("empty00") + ")");
   
               return;
           }
  @@ -282,7 +282,7 @@
               Mapping map = stack[cursor];
   
               if (map == null) {
  -                log.trace(dumpPrefix + JavaUtils.getMessage("stackFrame00"));
  +                log.trace(dumpPrefix + Messages.getMessage("stackFrame00"));
               } else {
                   log.trace(dumpPrefix + map.getNamespaceURI() + " -> " + map.getPrefix());
               }
  
  
  
  1.13      +1 -1      xml-axis/java/src/org/apache/axis/utils/BeanUtils.java
  
  Index: BeanUtils.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/utils/BeanUtils.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- BeanUtils.java	16 Aug 2002 11:07:10 -0000	1.12
  +++ BeanUtils.java	9 Sep 2002 17:03:28 -0000	1.13
  @@ -271,7 +271,7 @@
                   myPd[i] = (BeanPropertyDescriptor) pd.get(i);
               }
           } catch (Exception e) {
  -            log.error(JavaUtils.getMessage("badPropertyDesc00",
  +            log.error(Messages.getMessage("badPropertyDesc00",
                                              cls.getName()), e);
               throw new InternalException(e);
           }
  
  
  
  1.2       +1 -1      xml-axis/java/src/org/apache/axis/utils/FieldPropertyDescriptor.java
  
  Index: FieldPropertyDescriptor.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/utils/FieldPropertyDescriptor.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- FieldPropertyDescriptor.java	30 Jul 2002 06:16:04 -0000	1.1
  +++ FieldPropertyDescriptor.java	9 Sep 2002 17:03:28 -0000	1.2
  @@ -83,7 +83,7 @@
            }
            if (_field == null || _name == null) {
                throw new IllegalArgumentException(
  -                     JavaUtils.getMessage(_field == null ?
  +                     Messages.getMessage(_field == null ?
                                             "badField00" : "badProp03"));
            }
        }
  
  
  
  1.32      +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.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- Options.java	12 Aug 2002 22:52:14 -0000	1.31
  +++ Options.java	9 Sep 2002 17:03:28 -0000	1.32
  @@ -103,7 +103,7 @@
           try {
               getURL();
           } catch( MalformedURLException e ) {
  -            log.error( JavaUtils.getMessage("cantDoURL00") );
  +            log.error( Messages.getMessage("cantDoURL00") );
               throw e ;
           }
           getUser();
  @@ -304,7 +304,7 @@
               if ( port != null && !port.equals("-1")) tmp += ":" + port ;
               if ( servlet != null ) tmp += servlet ;
           } else tmp = url.toString();
  -        log.debug( JavaUtils.getMessage("return02", "getURL", tmp) );
  +        log.debug( Messages.getMessage("return02", "getURL", tmp) );
           return( tmp );
       }
       
  
  
  
  1.12      +2 -2      xml-axis/java/src/org/apache/axis/utils/BeanPropertyDescriptor.java
  
  Index: BeanPropertyDescriptor.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/utils/BeanPropertyDescriptor.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- BeanPropertyDescriptor.java	30 Jul 2002 06:16:04 -0000	1.11
  +++ BeanPropertyDescriptor.java	9 Sep 2002 17:03:29 -0000	1.12
  @@ -143,7 +143,7 @@
           if (myPD.getReadMethod() != null) {
               return myPD.getReadMethod().invoke(obj, noArgs);
           }
  -        throw new IllegalAccessException(JavaUtils.getMessage("badGetter00"));
  +        throw new IllegalAccessException(Messages.getMessage("badGetter00"));
       }
       /**
        * Set the property value
  @@ -155,7 +155,7 @@
           if (myPD.getWriteMethod() != null) {
               myPD.getWriteMethod().invoke(obj, new Object[] {newValue});
           } else {
  -            throw new IllegalAccessException(JavaUtils.getMessage("badSetter00"));
  +            throw new IllegalAccessException(Messages.getMessage("badSetter00"));
           }
       }    
       /** 
  
  
  
  1.78      +7 -130    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.77
  retrieving revision 1.78
  diff -u -r1.77 -r1.78
  --- JavaUtils.java	9 Sep 2002 14:18:23 -0000	1.77
  +++ JavaUtils.java	9 Sep 2002 17:03:29 -0000	1.78
  @@ -222,7 +222,7 @@
           if (log.isDebugEnabled()) {
               String clsName = "null";
               if (arg != null) clsName = arg.getClass().getName();
  -            log.debug( getMessage("convert00", clsName, destClass.getName()));
  +            log.debug( Messages.getMessage("convert00", clsName, destClass.getName()));
           }
   
           // See if a previously converted value is stored in the argument.
  @@ -286,7 +286,7 @@
                                   return getImageFromStream(is);
                               }
                               else {
  -                                log.info(JavaUtils.getMessage("needImageIO"));
  +                                log.info(Messages.getMessage("needImageIO"));
                                   return arg;
                               }
                           }
  @@ -792,129 +792,6 @@
       } // isPunctuation
   
   
  -    /********************************************************************/
  -    /*********************** i18n Message Support ***********************/
  -     
  -    // Message resource bundle.
  -    private static Vector bundleNames = null;        // String
  -    private static Vector messageBundles = null;     // ResourceBundle
  -    
  -
  -    /**
  -     * Get the resource bundle that contains all
  -     * of the AXIS translatable messages.
  -     * 
  -     * This is currently ONLY used by TestMessages... which verifies
  -     * axisNLS.properties.  So, it will return the first in the message
  -     * list (axisNLS.properties)... name changed to reflect.
  -     */
  -    public static ResourceBundle getFirstMessageResourceBundle() {
  -        if (messageBundles == null) {
  -            initializeMessageBundles();
  -        }
  -        return (ResourceBundle)messageBundles.get(0);
  -    } // getMessageResourceBundle
  -
  -    /**
  -     * Get the message with the given key.
  -     * There are no arguments for this message.
  -     */
  -    public static String getMessage(String key)
  -            throws MissingResourceException {
  -        if (messageBundles == null) {
  -            initializeMessageBundles();
  -        }
  -        
  -        String msg = null;
  -        for (int i = 0; msg == null  &&  i < messageBundles.size(); i++) {
  -            msg = ((ResourceBundle)messageBundles.get(i)).getString(key);
  -        }
  -        return msg;
  -    } // getMessage
  -
  -    /**
  -     * Get the message with the given key.  If an argument is specified
  -     * in the message (in the format of "{0}") then fill in that argument
  -     * with the value of var.
  -     */
  -    public static String getMessage(String key, String var)
  -            throws MissingResourceException {
  -        String[] args = {var};
  -        return MessageFormat.format(getMessage(key), args);
  -    } // getMessage
  -
  -    /**
  -     * Get the message with the given key.  If arguments are specified
  -     * in the message (in the format of "{0} {1}") then fill them in
  -     * with the values of var1 and var2, respectively.
  -     */
  -    public static String getMessage(String key, String var1, String var2)
  -            throws MissingResourceException {
  -        String[] args = {var1, var2};
  -        return MessageFormat.format(getMessage(key), args);
  -    } // getMessage
  -
  -    /**
  -     * Get the message with the given key.  If arguments are specified
  -     * in the message (in the format of "{0} {1}") then fill them in
  -     * with the values of var1 and var2, respectively.
  -     */
  -    public static String getMessage(String key, String var1, String var2, String var3)
  -            throws MissingResourceException {
  -        return MessageFormat.format(getMessage(key), new String[]{var1, var2, var3});
  -    } // getMessage
  -
  -    /**
  -     * Get the message with the given key.  Replace each "{X}" in the
  -     * message with vars[X].  If there are more vars than {X}'s, then
  -     * the extra vars are ignored.  If there are more {X}'s than vars,
  -     * then a java.text.ParseException (subclass of RuntimeException)
  -     * is thrown.
  -     */
  -    public static String getMessage(String key, String[] vars)
  -            throws MissingResourceException {
  -        return MessageFormat.format(getMessage(key), vars);
  -    } // getMessage
  -
  -    /**
  -     * Add a ResourceBundle to list.
  -     * ResourceBundle is not opened until needed.
  -     */    
  -    public static void addMessages(String resourceBundleName) {
  -        if (bundleNames == null) {
  -            initializeBundleNames();
  -        }
  -        bundleNames.add(resourceBundleName);
  -        if (messageBundles != null) {
  -            messageBundles.add(ResourceBundle.getBundle(resourceBundleName));
  -        }
  -    }
  -    
  -    /**
  -     * Load the resource bundle messages from the properties file.
  -     * This is ONLY done when it is needed.  If no messages are
  -     * printed (for example, only Wsdl2java is being run in non-
  -     * verbose mode) then there is no need to read the properties file.
  -     */
  -    private static void initializeMessageBundles() {
  -        if (bundleNames == null) {
  -            initializeBundleNames();
  -        }
  -        messageBundles = new Vector();
  -        for (int i = 0; i < bundleNames.size(); i++) {
  -            messageBundles.add(ResourceBundle.getBundle((String)bundleNames.get(i)));
  -        }
  -    } // initializeMessageBundles
  -    
  -    private static void initializeBundleNames() {
  -        bundleNames = new Vector();
  -        bundleNames.add("org.apache.axis.utils.axisNLS");
  -    }
  -
  -    /********************* END i18n Message Support *********************/
  -    /********************************************************************/
  -
  -
       /**
        * replace:
        * Like String.replace except that the old new items are strings.
  @@ -992,13 +869,13 @@
        */
       public static Object getHolderValue(Object holder) throws HolderException {
           if (!(holder instanceof javax.xml.rpc.holders.Holder)) {
  -            throw new HolderException(getMessage("badHolder00"));
  +            throw new HolderException(Messages.getMessage("badHolder00"));
           }
           try {
               Field valueField = holder.getClass().getField("value");
               return valueField.get(holder);
           } catch (Exception e) {
  -          throw new HolderException(getMessage("exception01", e.getMessage()));
  +          throw new HolderException(Messages.getMessage("exception01", e.getMessage()));
           }
       }
   
  @@ -1009,7 +886,7 @@
        */
       public static void setHolderValue(Object holder, Object value) throws HolderException {
           if (!(holder instanceof javax.xml.rpc.holders.Holder)) {
  -            throw new HolderException(getMessage("badHolder00"));
  +            throw new HolderException(Messages.getMessage("badHolder00"));
           }
           try {
               Field valueField = holder.getClass().getField("value");
  @@ -1022,7 +899,7 @@
                   valueField.set(holder, value);
               }
           } catch (Exception e) {
  -          throw new HolderException(getMessage("exception01", e.getMessage()));
  +          throw new HolderException(Messages.getMessage("exception01", e.getMessage()));
           }
       }
       public static class HolderException extends Exception
  @@ -1240,7 +1117,7 @@
                   attachmentSupportEnabled = true;
               } catch (Throwable t) {
               }
  -            log.debug(JavaUtils.getMessage("attachEnabled") + "  " +
  +            log.debug(Messages.getMessage("attachEnabled") + "  " +
                       attachmentSupportEnabled);
           }
   
  
  
  
  1.68      +7 -7      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.67
  retrieving revision 1.68
  diff -u -r1.67 -r1.68
  --- XMLUtils.java	4 Sep 2002 20:15:10 -0000	1.67
  +++ XMLUtils.java	9 Sep 2002 17:03:29 -0000	1.68
  @@ -205,7 +205,7 @@
                                          factoryClassName);
                   }
               } catch (Exception e) {
  -                log.error(JavaUtils.getMessage("exception00"), e);
  +                log.error(Messages.getMessage("exception00"), e);
                   saxFactory = null;
               }
          } else {
  @@ -225,7 +225,7 @@
               dbf.setNamespaceAware(true);
           }
           catch( Exception e ) {
  -            log.error(JavaUtils.getMessage("exception00"), e );
  +            log.error(Messages.getMessage("exception00"), e );
               dbf = null;
           }
           return( dbf );
  @@ -249,10 +249,10 @@
                               false);
               return parser;
           } catch (ParserConfigurationException e) {
  -            log.error(JavaUtils.getMessage("parserConfigurationException00"), e);
  +            log.error(Messages.getMessage("parserConfigurationException00"), e);
               return null;
           } catch (SAXException se) {
  -            log.error(JavaUtils.getMessage("SAXException00"), se);
  +            log.error(Messages.getMessage("SAXException00"), se);
               return null;
           }
       }
  @@ -304,7 +304,7 @@
               return( db.parse( inp ) );
           }
           catch( Exception e ) {
  -            log.error(JavaUtils.getMessage("exception00"), e);
  +            log.error(Messages.getMessage("exception00"), e);
           }
           return( null );
       }
  @@ -335,7 +335,7 @@
               }
               return doc;
           } catch (Exception e) {
  -            log.error(JavaUtils.getMessage("exception00"), e);
  +            log.error(Messages.getMessage("exception00"), e);
           }
           return null;
       }
  @@ -543,7 +543,7 @@
   
           public void warning(SAXParseException spe) throws SAXException {
               if (log.isDebugEnabled())
  -                log.debug( JavaUtils.getMessage("warning00", getParseExceptionInfo(spe)));
  +                log.debug( Messages.getMessage("warning00", getParseExceptionInfo(spe)));
           }
           
           public void error(SAXParseException spe) throws SAXException {
  
  
  
  1.1                  xml-axis/java/src/org/apache/axis/utils/Messages.java
  
  Index: Messages.java
  ===================================================================
  /*
   * The Apache Software License, Version 1.1
   *
   *
   * Copyright (c) 2001 The Apache Software Foundation.  All rights
   * reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, are permitted provided that the following conditions
   * are met:
   *
   * 1. Redistributions of source code must retain the above copyright
   *    notice, this list of conditions and the following disclaimer.
   *
   * 2. Redistributions in binary form must reproduce the above copyright
   *    notice, this list of conditions and the following disclaimer in
   *    the documentation and/or other materials provided with the
   *    distribution.
   *
   * 3. The end-user documentation included with the redistribution,
   *    if any, must include the following acknowledgment:
   *       "This product includes software developed by the
   *        Apache Software Foundation (http://www.apache.org/)."
   *    Alternately, this acknowledgment may appear in the software itself,
   *    if and wherever such third-party acknowledgments normally appear.
   *
   * 4. The names "Axis" and "Apache Software Foundation" must
   *    not be used to endorse or promote products derived from this
   *    software without prior written permission. For written
   *    permission, please contact apache@apache.org.
   *
   * 5. Products derived from this software may not be called "Apache",
   *    nor may "Apache" appear in their name, without prior written
   *    permission of the Apache Software Foundation.
   *
   * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
   * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
   * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
   * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
   * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
   * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
   * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
   * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
   * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
   * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
   * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
   * SUCH DAMAGE.
   * ====================================================================
   *
   * This software consists of voluntary contributions made by many
   * individuals on behalf of the Apache Software Foundation.  For more
   * information on the Apache Software Foundation, please see
   * <http://www.apache.org/>.
   */
  
  package org.apache.axis.utils;
  
  import java.awt.Image;
  import java.beans.Introspector;
  import java.io.IOException;
  import java.io.InputStream;
  import java.io.StringReader;
  import java.lang.reflect.Array;
  import java.lang.reflect.Field;
  import java.text.Collator;
  import java.text.MessageFormat;
  import java.util.ArrayList;
  import java.util.Arrays;
  import java.util.Calendar;
  import java.util.Collection;
  import java.util.Date;
  import java.util.HashMap;
  import java.util.HashSet;
  import java.util.Hashtable;
  import java.util.Iterator;
  import java.util.List;
  import java.util.Locale;
  import java.util.MissingResourceException;
  import java.util.ResourceBundle;
  import java.util.Set;
  import java.util.Vector;
  
  import javax.activation.DataHandler;
  import javax.xml.soap.SOAPException;
  import javax.xml.transform.Source;
  import javax.xml.transform.stream.StreamSource;
  
  import org.apache.axis.attachments.AttachmentPart;
  import org.apache.axis.components.image.ImageIO;
  import org.apache.axis.components.image.ImageIOFactory;
  import org.apache.axis.components.logger.LogFactory;
  import org.apache.axis.types.HexBinary;
  import org.apache.commons.logging.Log;
  
  
  /**
   * Class to facilitate i18n (NLS) message translation for
   * axis components.
   *
   * @author Richard A. Sitze
   * @author Glen Daniels (gdaniels@macromedia.com)
   */
  public class Messages {
      // Message resource bundle.
      private static Vector bundleNames = null;        // String
      private static Vector messageBundles = null;     // ResourceBundle
  
      
      /**
       * Get the resource bundle that contains all
       * of the AXIS translatable messages.
       * 
       * This is currently ONLY used by TestMessages... which verifies
       * axisNLS.properties.  So, it will return the first in the message
       * list (axisNLS.properties)... name changed to reflect.
       */
      public static ResourceBundle getFirstMessageResourceBundle() {
          if (messageBundles == null) {
              initializeMessageBundles();
          }
          return (ResourceBundle)messageBundles.get(0);
      } // getMessageResourceBundle
  
  
  
      /**
       * Get the message with the given key.
       * There are no arguments for this message.
       */
      public static String getMessage(String key)
              throws MissingResourceException {
          if (messageBundles == null) {
              initializeMessageBundles();
          }
          
          String msg = null;
          for (int i = 0; msg == null  &&  i < messageBundles.size(); i++) {
              msg = ((ResourceBundle)messageBundles.get(i)).getString(key);
          }
          return msg;
      } // getMessage
  
  
  
      /**
       * Get the message with the given key.  If an argument is specified
       * in the message (in the format of "{0}") then fill in that argument
       * with the value of var.
       */
      public static String getMessage(String key, String var)
              throws MissingResourceException {
          String[] args = {var};
          return MessageFormat.format(getMessage(key), args);
      } // getMessage
  
  
  
      /**
       * Get the message with the given key.  If arguments are specified
       * in the message (in the format of "{0} {1}") then fill them in
       * with the values of var1 and var2, respectively.
       */
      public static String getMessage(String key, String var1, String var2)
              throws MissingResourceException {
          String[] args = {var1, var2};
          return MessageFormat.format(getMessage(key), args);
      } // getMessage
  
  
  
      /**
       * Get the message with the given key.  If arguments are specified
       * in the message (in the format of "{0} {1}") then fill them in
       * with the values of var1 and var2, respectively.
       */
      public static String getMessage(String key, String var1, String var2, String var3)
              throws MissingResourceException {
          return MessageFormat.format(getMessage(key), new String[]{var1, var2, var3});
      } // getMessage
  
  
  
      /**
       * Get the message with the given key.  Replace each "{X}" in the
       * message with vars[X].  If there are more vars than {X}'s, then
       * the extra vars are ignored.  If there are more {X}'s than vars,
       * then a java.text.ParseException (subclass of RuntimeException)
       * is thrown.
       */
      public static String getMessage(String key, String[] vars)
              throws MissingResourceException {
          return MessageFormat.format(getMessage(key), vars);
      } // getMessage
  
  
  
      /**
       * Add a ResourceBundle to list.
       * ResourceBundle is not opened until needed.
       */    
      public static void addMessages(String resourceBundleName) {
          if (bundleNames == null) {
              initializeBundleNames();
          }
          bundleNames.add(resourceBundleName);
          if (messageBundles != null) {
              messageBundles.add(ResourceBundle.getBundle(resourceBundleName));
          }
      }
  
  
      /**
       * Load the resource bundle messages from the properties file.
       * This is ONLY done when it is needed.  If no messages are
       * printed (for example, only Wsdl2java is being run in non-
       * verbose mode) then there is no need to read the properties file.
       */
      private static void initializeMessageBundles() {
          if (bundleNames == null) {
              initializeBundleNames();
          }
          messageBundles = new Vector();
          for (int i = 0; i < bundleNames.size(); i++) {
              messageBundles.add(ResourceBundle.getBundle((String)bundleNames.get(i)));
          }
      } // initializeMessageBundles
      
      private static void initializeBundleNames() {
          bundleNames = new Vector();
          bundleNames.add("org.apache.axis.utils.axisNLS");
      }
  }
  
  
  
  1.4       +12 -11    xml-axis/java/src/org/apache/axis/components/compiler/Javac.java
  
  Index: Javac.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/components/compiler/Javac.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Javac.java	29 Aug 2002 21:02:39 -0000	1.3
  +++ Javac.java	9 Sep 2002 17:03:29 -0000	1.4
  @@ -57,6 +57,7 @@
   
   import org.apache.axis.utils.ClassUtils;
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   
   import org.apache.axis.components.logger.LogFactory;
   import org.apache.commons.logging.Log;
  @@ -101,16 +102,16 @@
               ClassUtils.forName(MODERN_CLASS, true, cl);
               modern = true;
           } catch (ClassNotFoundException e) {
  -            log.debug(JavaUtils.getMessage("noModernCompiler"));
  +            log.debug(Messages.getMessage("noModernCompiler"));
               try {
                   ClassUtils.forName(CLASSIC_CLASS, true, cl);
                   modern = false;
               } catch (Exception ex) {
  -                log.error(JavaUtils.getMessage("noCompiler00"), ex);
  -                throw new RuntimeException(JavaUtils.getMessage("noCompiler00"));
  +                log.error(Messages.getMessage("noCompiler00"), ex);
  +                throw new RuntimeException(Messages.getMessage("noCompiler00"));
               }
           }
  -        log.debug(JavaUtils.getMessage("compilerClass",
  +        log.debug(Messages.getMessage("compilerClass",
                   (modern ? MODERN_CLASS : CLASSIC_CLASS)));
       }
   
  @@ -139,8 +140,8 @@
                                           new Object[] {toStringArray(fillArguments(new ArrayList()))});
               result = ok.booleanValue();
           } catch (Exception cnfe){
  -            log.error(JavaUtils.getMessage("noCompiler00"), cnfe);
  -            throw new RuntimeException(JavaUtils.getMessage("noCompiler00"));
  +            log.error(Messages.getMessage("noCompiler00"), cnfe);
  +            throw new RuntimeException(Messages.getMessage("noCompiler00"));
           }
   
           this.errors = new ByteArrayInputStream(err.toByteArray());
  @@ -221,9 +222,9 @@
               if (endcolumn == -1) endcolumn = context.length();
               return new CompilerError(file, false, line, startcolumn, line, endcolumn, message);
           } catch(NoSuchElementException nse) {
  -            return new CompilerError(JavaUtils.getMessage("noMoreTokens", error));
  +            return new CompilerError(Messages.getMessage("noMoreTokens", error));
           } catch(Exception nse) {
  -            return new CompilerError(JavaUtils.getMessage("cantParse", error));
  +            return new CompilerError(Messages.getMessage("cantParse", error));
           }
       }
   
  @@ -292,14 +293,14 @@
               return new CompilerError(srcDir + File.separator + file, true,
                       line, startcolumn, line, endcolumn, message);
           } catch(NoSuchElementException nse) {
  -            return new CompilerError(JavaUtils.getMessage("noMoreTokens",
  +            return new CompilerError(Messages.getMessage("noMoreTokens",
                       error));
           } catch(Exception nse) {
  -            return new CompilerError(JavaUtils.getMessage("cantParse", error));
  +            return new CompilerError(Messages.getMessage("cantParse", error));
           }
       }
   
       public String toString() {
  -        return JavaUtils.getMessage("sunJavac");
  +        return Messages.getMessage("sunJavac");
       }
   }
  
  
  
  1.3       +4 -3      xml-axis/java/src/org/apache/axis/components/compiler/Jikes.java
  
  Index: Jikes.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/components/compiler/Jikes.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Jikes.java	12 Aug 2002 22:30:52 -0000	1.2
  +++ Jikes.java	9 Sep 2002 17:03:29 -0000	1.3
  @@ -56,6 +56,7 @@
   package org.apache.axis.components.compiler;
   
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   
   import org.apache.axis.components.logger.LogFactory;
   import org.apache.commons.logging.Log;
  @@ -275,9 +276,9 @@
               endcolumn = Integer.parseInt(tokens.nextToken());
           } catch (Exception e) {
               // FIXME: VG: This is not needed anymore?
  -            message.append(JavaUtils.getMessage("compilerFail00"));
  +            message.append(Messages.getMessage("compilerFail00"));
               type="error";
  -            log.error(JavaUtils.getMessage("compilerFail00"), e);
  +            log.error(Messages.getMessage("compilerFail00"), e);
           }
   
           if ("".equals(message)) {
  @@ -292,6 +293,6 @@
       }
   
       public String toString() {
  -        return JavaUtils.getMessage("ibmJikes");
  +        return Messages.getMessage("ibmJikes");
       }
   }
  
  
  
  1.5       +2 -1      xml-axis/java/src/org/apache/axis/components/compiler/CompilerFactory.java
  
  Index: CompilerFactory.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/components/compiler/CompilerFactory.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- CompilerFactory.java	23 Aug 2002 22:22:30 -0000	1.4
  +++ CompilerFactory.java	9 Sep 2002 17:03:29 -0000	1.5
  @@ -58,6 +58,7 @@
   import org.apache.axis.AxisProperties;
   import org.apache.axis.utils.ClassUtils;
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   
   import org.apache.commons.discovery.tools.SPInterface;
   
  @@ -83,7 +84,7 @@
                            Javac.class);
           
           if (compiler == null) {
  -            log.debug(JavaUtils.getMessage("defaultCompiler"));
  +            log.debug(Messages.getMessage("defaultCompiler"));
               compiler = new Javac();
           }
   
  
  
  
  1.21      +6 -5      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.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- SimpleSecurityProvider.java	12 Aug 2002 22:59:10 -0000	1.20
  +++ SimpleSecurityProvider.java	9 Sep 2002 17:03:29 -0000	1.21
  @@ -60,6 +60,7 @@
   import org.apache.axis.security.AuthenticatedUser;
   import org.apache.axis.security.SecurityProvider;
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   
   import org.apache.axis.components.logger.LogFactory;
   import org.apache.commons.logging.Log;
  @@ -113,7 +114,7 @@
                           String passwd = (st.hasMoreTokens()) ? st.nextToken() : "";
   
                           if (log.isDebugEnabled()) {
  -                            log.debug( JavaUtils.getMessage("fromFile00", 
  +                            log.debug( Messages.getMessage("fromFile00", 
                                   userID, passwd) );
                           }
   
  @@ -124,7 +125,7 @@
                   lnr.close();
   
               } catch( Exception e ) {
  -                log.error( JavaUtils.getMessage("exception00"), e );
  +                log.error( Messages.getMessage("exception00"), e );
                   return;
               }
           }
  @@ -148,7 +149,7 @@
   
           if (users != null) {
               if (log.isDebugEnabled()) {
  -                log.debug( JavaUtils.getMessage("user00", username) );
  +                log.debug( Messages.getMessage("user00", username) );
               }
   
               // in order to authenticate, the user must exist
  @@ -160,7 +161,7 @@
               String valid = (String) users.get(username);
   
               if (log.isDebugEnabled()) {
  -                log.debug( JavaUtils.getMessage("password00", password) );
  +                log.debug( Messages.getMessage("password00", password) );
               }
   
               // if a password is defined, then it must match
  @@ -168,7 +169,7 @@
                   return null;
   
               if (log.isDebugEnabled()) {
  -                log.debug( JavaUtils.getMessage("auth00", username) );
  +                log.debug( Messages.getMessage("auth00", username) );
               }
   
               return new SimpleAuthenticatedUser(username);
  
  
  
  1.68      +15 -14    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.67
  retrieving revision 1.68
  diff -u -r1.67 -r1.68
  --- AdminClient.java	12 Aug 2002 22:30:52 -0000	1.67
  +++ AdminClient.java	9 Sep 2002 17:03:29 -0000	1.68
  @@ -59,6 +59,7 @@
   import org.apache.axis.EngineConfiguration;
   import org.apache.axis.message.SOAPBodyElement;
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   import org.apache.axis.utils.Options;
   import org.apache.axis.deployment.wsdd.WSDDConstants;
   
  @@ -123,7 +124,7 @@
               }
               call = (Call) service.createCall();
           } catch (ServiceException e) {
  -            log.fatal(JavaUtils.getMessage("couldntCall00"), e);
  +            log.fatal(Messages.getMessage("couldntCall00"), e);
               call = null;
           }
       }
  @@ -142,7 +143,7 @@
       }
   
       public String list() throws Exception { 
  -        log.debug( JavaUtils.getMessage("doList00") );
  +        log.debug( Messages.getMessage("doList00") );
           String               str   = "<m:list xmlns:m=\"" + WSDDConstants.URI_WSDD + "\"/>" ;
           ByteArrayInputStream input = new ByteArrayInputStream(str.getBytes());
           return process(input);
  @@ -156,14 +157,14 @@
       protected static final String ROOT_UNDEPLOY= WSDDConstants.QNAME_UNDEPLOY.getLocalPart(); 
   
       public String quit() throws Exception { 
  -        log.debug(JavaUtils.getMessage("doQuit00"));
  +        log.debug(Messages.getMessage("doQuit00"));
           String               str   = "<m:quit xmlns:m=\"" + WSDDConstants.URI_WSDD + "\"/>";
           ByteArrayInputStream input = new ByteArrayInputStream(str.getBytes());
           return process(input);
       }
   
       public String undeployHandler(String handlerName) throws Exception { 
  -        log.debug(JavaUtils.getMessage("doQuit00"));
  +        log.debug(Messages.getMessage("doQuit00"));
           String               str   = "<m:"+ROOT_UNDEPLOY +" xmlns:m=\"" + WSDDConstants.URI_WSDD + "\">" +
                                        "<handler name=\"" + handlerName + "\"/>"+
                                        "</m:"+ROOT_UNDEPLOY +">" ;
  @@ -172,7 +173,7 @@
       }
   
       public String undeployService(String serviceName) throws Exception { 
  -        log.debug(JavaUtils.getMessage("doQuit00"));
  +        log.debug(Messages.getMessage("doQuit00"));
           String               str   = "<m:"+ROOT_UNDEPLOY +" xmlns:m=\"" + WSDDConstants.URI_WSDD + "\">" +
                                        "<service name=\"" + serviceName + "\"/>"+
                                        "</m:"+ROOT_UNDEPLOY +">" ;
  @@ -225,7 +226,7 @@
           args = opts.getRemainingArgs();
   
           if ( args == null ) {
  -            log.info(JavaUtils.getMessage("usage00","AdminClient xml-files | list"));
  +            log.info(Messages.getMessage("usage00","AdminClient xml-files | list"));
               return null;
           }
   
  @@ -237,9 +238,9 @@
               else if (args[i].equals("quit")) 
                 sb.append( quit(opts) );
               else if (args[i].equals("passwd")) {
  -                log.info(JavaUtils.getMessage("changePwd00"));
  +                log.info(Messages.getMessage("changePwd00"));
                   if (args[i + 1] == null) {
  -                    log.error(JavaUtils.getMessage("needPwd00"));
  +                    log.error(Messages.getMessage("needPwd00"));
                       return null;
                   }
                   String str = "<m:passwd xmlns:m=\"http://xml.apache.org/axis/wsdd/\">";
  @@ -251,7 +252,7 @@
               }
               else {
                   if(args[i].indexOf(java.io.File.pathSeparatorChar)==-1){
  -                    log.info( JavaUtils.getMessage("processFile00", args[i]) );
  +                    log.info( Messages.getMessage("processFile00", args[i]) );
                       sb.append( process(opts, args[i] ) );
                   } else {
                       java.util.StringTokenizer tokenizer = null ;
  @@ -259,7 +260,7 @@
                                                    java.io.File.pathSeparator);
                       while(tokenizer.hasMoreTokens()) {
                           String file = tokenizer.nextToken();
  -                        log.info( JavaUtils.getMessage("processFile00", file) );
  +                        log.info( Messages.getMessage("processFile00", file) );
                           sb.append( process(opts, file) );
                           if(tokenizer.hasMoreTokens())
                               sb.append("\n");
  @@ -273,7 +274,7 @@
   
       public void processOpts(Options opts) throws Exception {
           if (call == null) 
  -            throw new Exception(JavaUtils.getMessage("nullCall00"));
  +            throw new Exception(Messages.getMessage("nullCall00"));
   
           call.setTargetEndpointAddress( new URL(opts.getURL()) );
           call.setUsername( opts.getUser() );
  @@ -306,7 +307,7 @@
   
       public String process(Options opts, InputStream input)  throws Exception {
           if (call == null) 
  -            throw new Exception(JavaUtils.getMessage("nullCall00"));
  +            throw new Exception(Messages.getMessage("nullCall00"));
   
           if ( opts != null ) processOpts( opts );
           
  @@ -320,7 +321,7 @@
           input.close();
   
           if (result == null || result.isEmpty()) 
  -            throw new AxisFault(JavaUtils.getMessage("nullResponse00"));
  +            throw new AxisFault(Messages.getMessage("nullResponse00"));
   
           SOAPBodyElement body = (SOAPBodyElement) result.elementAt(0);
           return body.toString();
  @@ -343,7 +344,7 @@
               else
                   System.exit(1);
           } catch (Exception e) {
  -            log.error(JavaUtils.getMessage("exception00"), e);
  +            log.error(Messages.getMessage("exception00"), e);
               System.exit(1);
           }
       }
  
  
  
  1.74      +14 -13    xml-axis/java/src/org/apache/axis/client/Service.java
  
  Index: Service.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/client/Service.java,v
  retrieving revision 1.73
  retrieving revision 1.74
  diff -u -r1.73 -r1.74
  --- Service.java	29 Aug 2002 21:02:40 -0000	1.73
  +++ Service.java	9 Sep 2002 17:03:29 -0000	1.74
  @@ -61,6 +61,7 @@
   import org.apache.axis.configuration.EngineConfigurationFactoryFinder;
   import org.apache.axis.utils.ClassUtils;
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   import org.apache.axis.utils.WSDLUtils;
   import org.apache.axis.utils.XMLUtils;
   import org.w3c.dom.Document;
  @@ -267,7 +268,7 @@
           }
           catch( Exception exp ) {
               throw new ServiceException(
  -                    JavaUtils.getMessage("wsdlError00", "" + "", "\n" + exp) );
  +                    Messages.getMessage("wsdlError00", "" + "", "\n" + exp) );
           }
       }
   
  @@ -279,11 +280,11 @@
               this.wsdlService    = def.getService( serviceName );
               if ( this.wsdlService == null )
                   throw new ServiceException(
  -                        JavaUtils.getMessage("noService00", "" + serviceName));
  +                        Messages.getMessage("noService00", "" + serviceName));
           }
           catch( Exception exp ) {
               throw new ServiceException(
  -                    JavaUtils.getMessage("wsdlError00", "" + "", "\n" + exp) );
  +                    Messages.getMessage("wsdlError00", "" + "", "\n" + exp) );
           }
       }
   
  @@ -301,11 +302,11 @@
                              throws ServiceException {
   
           if (wsdlService == null)
  -            throw new ServiceException(JavaUtils.getMessage("wsdlMissing00"));
  +            throw new ServiceException(Messages.getMessage("wsdlMissing00"));
   
           Port port = wsdlService.getPort( portName.getLocalPart() );
           if ( port == null )
  -            throw new ServiceException( JavaUtils.getMessage("noPort00", "" + portName) );
  +            throw new ServiceException( Messages.getMessage("noPort00", "" + portName) );
   
           // First, try to find a generated stub.  If that
           // returns null, then find a dynamic stub.
  @@ -360,7 +361,7 @@
        */
       public Remote getPort(Class proxyInterface) throws ServiceException {
           if (wsdlService == null)
  -            throw new ServiceException(JavaUtils.getMessage("wsdlMissing00"));
  +            throw new ServiceException(Messages.getMessage("wsdlMissing00"));
   
           return getPort(null, null, proxyInterface);
       }
  @@ -386,12 +387,12 @@
       private Remote getPort(String endpoint, QName portName,
               Class proxyInterface) throws ServiceException {
           if (!proxyInterface.isInterface()) {
  -            throw new ServiceException(JavaUtils.getMessage("mustBeIface00"));
  +            throw new ServiceException(Messages.getMessage("mustBeIface00"));
           }
   
           if (!(Remote.class.isAssignableFrom(proxyInterface))) {
               throw new ServiceException(
  -                            JavaUtils.getMessage("mustExtendRemote00"));
  +                            Messages.getMessage("mustExtendRemote00"));
           }
   
           try {
  @@ -435,12 +436,12 @@
   
           Port port = wsdlService.getPort( portName.getLocalPart() );
           if ( port == null )
  -            throw new ServiceException( JavaUtils.getMessage("noPort00", "" + portName) );
  +            throw new ServiceException( Messages.getMessage("noPort00", "" + portName) );
   
           Binding   binding  = port.getBinding();
           PortType  portType = binding.getPortType();
           if ( portType == null )
  -            throw new ServiceException( JavaUtils.getMessage("noPortType00", "" + portName) );
  +            throw new ServiceException( Messages.getMessage("noPortType00", "" + portName) );
   
           // Get the URL
           ////////////////////////////////////////////////////////////////////
  @@ -455,7 +456,7 @@
                   }
                   catch(Exception exp) {
                       throw new ServiceException(
  -                            JavaUtils.getMessage("cantSetURI00", "" + exp) );
  +                            Messages.getMessage("cantSetURI00", "" + exp) );
                   }
               }
           }
  @@ -532,10 +533,10 @@
        */
       public javax.xml.rpc.Call[] getCalls(QName portName) throws ServiceException {
           if (portName == null)
  -            throw new ServiceException(JavaUtils.getMessage("badPort00"));
  +            throw new ServiceException(Messages.getMessage("badPort00"));
   
           if (wsdlService == null) 
  -            throw new ServiceException(JavaUtils.getMessage("wsdlMissing00"));
  +            throw new ServiceException(Messages.getMessage("wsdlMissing00"));
   
           javax.xml.rpc.Call[] array = new javax.xml.rpc.Call[]{createCall(portName)};
           return array;
  
  
  
  1.174     +56 -55    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.173
  retrieving revision 1.174
  diff -u -r1.173 -r1.174
  --- Call.java	28 Aug 2002 19:22:56 -0000	1.173
  +++ Call.java	9 Sep 2002 17:03:29 -0000	1.174
  @@ -84,6 +84,7 @@
   import org.apache.axis.message.SOAPHeaderElement;
   import org.apache.axis.transport.http.HTTPTransport;
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   
   import org.apache.axis.components.logger.LogFactory;
   import org.apache.commons.logging.Log;
  @@ -291,13 +292,13 @@
       public void setProperty(String name, Object value) {
           if (name == null || value == null) {
               throw new JAXRPCException(
  -                    JavaUtils.getMessage(name == null ?
  +                    Messages.getMessage(name == null ?
                                            "badProp03" : "badProp04"));
           }
           else if (name.equals(USERNAME_PROPERTY)) {
               if (!(value instanceof String)) {
                   throw new JAXRPCException(
  -                        JavaUtils.getMessage("badProp00", new String[] {
  +                        Messages.getMessage("badProp00", new String[] {
                           name, "java.lang.String", value.getClass().getName()}));
               }
               setUsername((String) value);
  @@ -305,7 +306,7 @@
           else if (name.equals(PASSWORD_PROPERTY)) {
               if (!(value instanceof String)) {
                   throw new JAXRPCException(
  -                        JavaUtils.getMessage("badProp00", new String[] {
  +                        Messages.getMessage("badProp00", new String[] {
                           name, "java.lang.String", value.getClass().getName()}));
               }
               setPassword((String) value);
  @@ -313,7 +314,7 @@
           else if (name.equals(SESSION_MAINTAIN_PROPERTY)) {
               if (!(value instanceof Boolean)) {
                   throw new JAXRPCException(
  -                        JavaUtils.getMessage("badProp00", new String[]
  +                        Messages.getMessage("badProp00", new String[]
                           {name,
                           "java.lang.Boolean",
                           value.getClass().getName()}));
  @@ -323,7 +324,7 @@
           else if (name.equals(OPERATION_STYLE_PROPERTY)) {
               if (!(value instanceof String)) {
                   throw new JAXRPCException(
  -                        JavaUtils.getMessage("badProp00", new String[] {
  +                        Messages.getMessage("badProp00", new String[] {
                           name, "java.lang.String", value.getClass().getName()}));
               }
               setOperationStyle((String) value);
  @@ -331,7 +332,7 @@
           else if (name.equals(SOAPACTION_USE_PROPERTY)) {
               if (!(value instanceof Boolean)) {
                   throw new JAXRPCException(
  -                        JavaUtils.getMessage("badProp00", new String[]
  +                        Messages.getMessage("badProp00", new String[]
                           {name,
                           "java.lang.Boolean",
                           value.getClass().getName()}));
  @@ -341,7 +342,7 @@
           else if (name.equals(SOAPACTION_URI_PROPERTY)) {
               if (!(value instanceof String)) {
                   throw new JAXRPCException(
  -                        JavaUtils.getMessage("badProp00", new String[]
  +                        Messages.getMessage("badProp00", new String[]
                           {name,
                           "java.lang.String",
                           value.getClass().getName()}));
  @@ -351,7 +352,7 @@
           else if (name.equals(ENCODINGSTYLE_URI_PROPERTY)) {
               if (!(value instanceof String)) {
                   throw new JAXRPCException(
  -                        JavaUtils.getMessage("badProp00", new String[]
  +                        Messages.getMessage("badProp00", new String[]
                           {name,
                           "java.lang.String",
                           value.getClass().getName()}));
  @@ -361,7 +362,7 @@
           else if (name.equals(Stub.ENDPOINT_ADDRESS_PROPERTY)) {
               if (!(value instanceof String)) {
                   throw new JAXRPCException(
  -                        JavaUtils.getMessage("badProp00", new String[]
  +                        Messages.getMessage("badProp00", new String[]
                           {name,
                           "java.lang.String",
                           value.getClass().getName()}));
  @@ -371,7 +372,7 @@
           else if ( name.equals(TRANSPORT_NAME) ) {
               if (!(value instanceof String)) {
                   throw new JAXRPCException(
  -                        JavaUtils.getMessage("badProp00", new String[] {
  +                        Messages.getMessage("badProp00", new String[] {
                           name, "java.lang.String", value.getClass().getName()}));
               }
               transportName = (String) value ;
  @@ -381,19 +382,19 @@
           else if ( name.equals(ATTACHMENT_ENCAPSULATION_FORMAT) ) {
               if (!(value instanceof String)) {
                   throw new JAXRPCException(
  -                        JavaUtils.getMessage("badProp00", new String[] {
  +                        Messages.getMessage("badProp00", new String[] {
                           name, "java.lang.String", value.getClass().getName()}));
               }
               if(!value.equals(ATTACHMENT_ENCAPSULATION_FORMAT_MIME ) && 
                  !value.equals(ATTACHMENT_ENCAPSULATION_FORMAT_DIME ))
                   throw new JAXRPCException(
  -                        JavaUtils.getMessage("badattachmenttypeerr", new String[] {
  +                        Messages.getMessage("badattachmenttypeerr", new String[] {
                           (String) value, ATTACHMENT_ENCAPSULATION_FORMAT_MIME + " "
                           +ATTACHMENT_ENCAPSULATION_FORMAT_DIME  }));
           }
           else if (name.startsWith("java.") || name.startsWith("javax.")) {
               throw new JAXRPCException(
  -                    JavaUtils.getMessage("badProp05", name));
  +                    Messages.getMessage("badProp05", name));
           }
           callProperties.put(name, value);
       } // setProperty
  @@ -407,8 +408,8 @@
       public Object getProperty(String name) {
           if (name == null || !isPropertySupported(name)) {
               throw new JAXRPCException(name == null ?
  -                  JavaUtils.getMessage("badProp03") :
  -                  JavaUtils.getMessage("badProp05", name));
  +                  Messages.getMessage("badProp03") :
  +                  Messages.getMessage("badProp05", name));
           }
           return callProperties.get(name);
       } // getProperty
  @@ -421,8 +422,8 @@
        public void removeProperty(String name) {
            if (name == null || !isPropertySupported(name)) {
               throw new JAXRPCException(name == null ?
  -                  JavaUtils.getMessage("badProp03") :
  -                  JavaUtils.getMessage("badProp05", name));
  +                  Messages.getMessage("badProp03") :
  +                  Messages.getMessage("badProp05", name));
            }
            callProperties.remove(name);
        } // removeProperty
  @@ -430,7 +431,7 @@
       public void setScopedProperty(String name, Object value) {
           if (name == null || value == null) {
               throw new JAXRPCException(
  -                    JavaUtils.getMessage(name == null ?
  +                    Messages.getMessage(name == null ?
                                            "badProp03" : "badProp04"));
           }
           scopedProperties.put(name, value);
  @@ -531,7 +532,7 @@
           this.operationStyle = Style.getStyle(operationStyle, Style.DEFAULT);
   
   /*  Not being used for now... --GD
  -        throw new IllegalArgumentException(JavaUtils.getMessage(
  +        throw new IllegalArgumentException(Messages.getMessage(
                   "badProp01",
                   new String[] {OPERATION_STYLE_PROPERTY,
                                 "\"rpc\", \"document\"", operationStyle}));
  @@ -659,7 +660,7 @@
                   transport = getTransportForProtocol(protocol);
                   if (transport == null)
                       throw new AxisFault("Call.setTargetEndpointAddress",
  -                                 JavaUtils.getMessage("noTransport01",
  +                                 Messages.getMessage("noTransport01",
                                    protocol), null, null);
                   transport.setUrl(address.toString());
                   setTransport(transport);
  @@ -667,7 +668,7 @@
               }
           }
           catch( Exception exp ) {
  -            log.error(JavaUtils.getMessage("exception00"), exp);
  +            log.error(Messages.getMessage("exception00"), exp);
               // do what?
               // throw new AxisFault("Call.setTargetEndpointAddress",
               //"Malformed URL Exception: " + e.getMessage(), null, null);
  @@ -772,7 +773,7 @@
           parmAndRetReq = true;
           //}
           //else {
  -        //throw new JAXRPCException(JavaUtils.getMessage("noParmAndRetReq"));
  +        //throw new JAXRPCException(Messages.getMessage("noParmAndRetReq"));
           //}
       }
   
  @@ -862,7 +863,7 @@
           parmAndRetReq = true;
           //}
           //else {
  -        //throw new JAXRPCException(JavaUtils.getMessage("noParmAndRetReq"));
  +        //throw new JAXRPCException(Messages.getMessage("noParmAndRetReq"));
           //}
       }
   
  @@ -925,7 +926,7 @@
           parmAndRetReq = true;
           //}
           //else {
  -        //throw new JAXRPCException(JavaUtils.getMessage("noParmAndRetReq"));
  +        //throw new JAXRPCException(Messages.getMessage("noParmAndRetReq"));
           //}
       }
   
  @@ -959,7 +960,7 @@
   
       public void setOperation(QName portName, String opName) {
           if ( service == null )
  -            throw new JAXRPCException( JavaUtils.getMessage("noService04") );
  +            throw new JAXRPCException( Messages.getMessage("noService04") );
   
           // Make sure we're making a fresh start.
           this.setPortName( portName );
  @@ -976,16 +977,16 @@
   
           Port port = wsdlService.getPort( portName.getLocalPart() );
           if ( port == null )
  -            throw new JAXRPCException( JavaUtils.getMessage("noPort00", "" + portName) );
  +            throw new JAXRPCException( Messages.getMessage("noPort00", "" + portName) );
   
           Binding   binding  = port.getBinding();
           PortType  portType = binding.getPortType();
           if ( portType == null )
  -            throw new JAXRPCException( JavaUtils.getMessage("noPortType00", "" + portName) );
  +            throw new JAXRPCException( Messages.getMessage("noPortType00", "" + portName) );
   
           List operations = portType.getOperations();
           if ( operations == null )
  -            throw new JAXRPCException( JavaUtils.getMessage("noOperation01", opName) );
  +            throw new JAXRPCException( Messages.getMessage("noOperation01", opName) );
   
           Operation op = null ;
           for ( int i = 0 ; i < operations.size() ; i++, op=null ) {
  @@ -993,7 +994,7 @@
               if ( opName.equals( op.getName() ) ) break ;
           }
           if ( op == null )
  -            throw new JAXRPCException( JavaUtils.getMessage("noOperation01", opName) );
  +            throw new JAXRPCException( Messages.getMessage("noOperation01", opName) );
   
           // Get the URL
           ////////////////////////////////////////////////////////////////////
  @@ -1008,7 +1009,7 @@
                   }
                   catch(Exception exp) {
                       throw new JAXRPCException(
  -                            JavaUtils.getMessage("cantSetURI00", "" + exp) );
  +                            Messages.getMessage("cantSetURI00", "" + exp) );
                   }
               }
           }
  @@ -1018,7 +1019,7 @@
           BindingOperation bop = binding.getBindingOperation(opName,
                                                              null, null);
           if ( bop == null )
  -            throw new JAXRPCException( JavaUtils.getMessage("noOperation02",
  +            throw new JAXRPCException( Messages.getMessage("noOperation02",
                                                               opName ));
           list = bop.getExtensibilityElements();
           for ( int i = 0 ; list != null && i < list.size() ; i++ ) {
  @@ -1098,7 +1099,7 @@
                         type = new QName("java","org.w3c.dom.Element");
                       else
                         throw new JAXRPCException(
  -                                  JavaUtils.getMessage("typeNotSet00", name) );
  +                                  Messages.getMessage("typeNotSet00", name) );
                   }
   
                   QName qname = new QName(type.getNamespaceURI(),
  @@ -1134,7 +1135,7 @@
                         type = new QName("java","org.w3c.dom.Element");
                       else
                         throw new JAXRPCException(
  -                            JavaUtils.getMessage("typeNotSet00", "<return>") );
  +                            Messages.getMessage("typeNotSet00", "<return>") );
                   }
                   QName qname = new QName(type.getNamespaceURI(),
                           type.getLocalPart());
  @@ -1289,7 +1290,7 @@
               msg = msgContext.getResponseMessage();
               if (msg == null) {
                 if (FAULT_ON_NO_RESPONSE) {
  -                throw new AxisFault(JavaUtils.getMessage("nullResponse00"));
  +                throw new AxisFault(Messages.getMessage("nullResponse00"));
                 } else {
                   return null;
                 }
  @@ -1301,7 +1302,7 @@
   
   
           if ( operationName == null )
  -            throw new AxisFault( JavaUtils.getMessage("noOperation00") );
  +            throw new AxisFault( Messages.getMessage("noOperation00") );
           try {
               Object res=this.invoke(operationName.getNamespaceURI(),
                       operationName.getLocalPart(), params);
  @@ -1316,8 +1317,8 @@
           }
           catch( Exception exp ) {
               //if ( exp instanceof AxisFault ) throw (AxisFault) exp ;
  -            entLog.info(JavaUtils.getMessage("toAxisFault00"), exp);
  -            throw new AxisFault( JavaUtils.getMessage("errorInvoking00", "\n" + exp) );
  +            entLog.info(Messages.getMessage("toAxisFault00"), exp);
  +            throw new AxisFault( Messages.getMessage("errorInvoking00", "\n" + exp) );
           }
       }
   
  @@ -1365,7 +1366,7 @@
               msg = msgContext.getResponseMessage();
               if (msg == null) {
                 if (this.FAULT_ON_NO_RESPONSE) {
  -                throw new AxisFault(JavaUtils.getMessage("nullResponse00"));
  +                throw new AxisFault(Messages.getMessage("nullResponse00"));
                 } else {
                   return null;
                 }
  @@ -1375,8 +1376,8 @@
           catch( Exception exp ) {
               if ( exp instanceof AxisFault ) throw (AxisFault) exp ;
   
  -            entLog.info(JavaUtils.getMessage("toAxisFault00"), exp);
  -            throw new AxisFault( JavaUtils.getMessage("errorInvoking00", "\n" + exp) );
  +            entLog.info(Messages.getMessage("toAxisFault00"), exp);
  +            throw new AxisFault( Messages.getMessage("errorInvoking00", "\n" + exp) );
           }
       }
   
  @@ -1490,7 +1491,7 @@
   
           if ( params == null || numParams != params.length )
               throw new JAXRPCException(
  -                    JavaUtils.getMessage("parmMismatch00",
  +                    Messages.getMessage("parmMismatch00",
                       "" + params.length, "" + numParams) );
   
           log.debug( "getParamList number of params: " + params.length);
  @@ -1537,7 +1538,7 @@
       public void setTransport(Transport trans) {
           transport = trans;
           if (log.isDebugEnabled())
  -            log.debug(JavaUtils.getMessage("transport00", "" + transport));
  +            log.debug(Messages.getMessage("transport00", "" + transport));
       }
   
       /** Get the Transport registered for the given protocol.
  @@ -1594,12 +1595,12 @@
               org.apache.axis.attachments.Attachments attachments= msg.getAttachmentsImpl();
               if(null == attachments) {
                 throw new RuntimeException(
  -                      JavaUtils.getMessage("noAttachments"));
  +                      Messages.getMessage("noAttachments"));
               }
   
               attachments.setAttachmentParts(attachmentParts);
               }catch(org.apache.axis.AxisFault ex){
  -              log.info(JavaUtils.getMessage("axisFault00"), ex);
  +              log.info(Messages.getMessage("axisFault00"), ex);
                 throw  new RuntimeException(ex.getMessage());
               }
           }
  @@ -1760,7 +1761,7 @@
            */
           if (returnType != null && args != null && args.length != 0
                   && operation == null) {
  -            throw new AxisFault(JavaUtils.getMessage("mustSpecifyParms"));
  +            throw new AxisFault(Messages.getMessage("mustSpecifyParms"));
           }
   
           RPCElement  body = new RPCElement(namespace, method, getParamList(args));
  @@ -1815,8 +1816,8 @@
           if (!invokeOneWay && operation.getNumParams() > 0 && returnType == null) {
               // TCK:
               // Issue an error if the return type was not set, but continue processing.
  -            //throw new AxisFault(JavaUtils.getMessage("mustSpecifyReturnType"));
  -            log.error(JavaUtils.getMessage("mustSpecifyReturnType"));
  +            //throw new AxisFault(Messages.getMessage("mustSpecifyReturnType"));
  +            log.error(Messages.getMessage("mustSpecifyReturnType"));
           }
   
           SOAPEnvelope         reqEnv = new SOAPEnvelope(msgContext.getSOAPConstants());
  @@ -1841,7 +1842,7 @@
   
               invoke();
           } catch (Exception e) {
  -            entLog.info(JavaUtils.getMessage("toAxisFault00"), e);
  +            entLog.info(Messages.getMessage("toAxisFault00"), e);
               throw AxisFault.makeFault(e);
           }
   
  @@ -1849,7 +1850,7 @@
   
           if (resMsg == null) {
             if (FAULT_ON_NO_RESPONSE) {
  -            throw new AxisFault(JavaUtils.getMessage("nullResponse00"));
  +            throw new AxisFault(Messages.getMessage("nullResponse00"));
             } else {
               return null;
             }
  @@ -1861,7 +1862,7 @@
               try {
                   resArgs = ((RPCElement) bodyEl).getParams();
               } catch (Exception e) {
  -                log.error(JavaUtils.getMessage("exception00"), e);
  +                log.error(Messages.getMessage("exception00"), e);
                   throw AxisFault.makeFault(e);
               }
   
  @@ -2028,7 +2029,7 @@
                   //if ( body.getPrefix() == null )       body.setPrefix( "m" );
                   if ( body.getNamespaceURI() == null ) {
                       throw new AxisFault("Call.invoke",
  -                                        JavaUtils.getMessage("cantInvoke00", body.getName()),
  +                                        Messages.getMessage("cantInvoke00", body.getName()),
                                           null, null);
                   } else {
                       msgContext.setTargetService(body.getNamespaceURI());
  @@ -2043,7 +2044,7 @@
               }
           }
           if (log.isDebugEnabled()) {
  -            log.debug(JavaUtils.getMessage("targetService",
  +            log.debug(Messages.getMessage("targetService",
                       msgContext.getTargetService()));
           }
   
  @@ -2063,7 +2064,7 @@
                   reqEnv.output(ctx);
                   writer.close();
               } catch (Exception e) {
  -                log.debug(JavaUtils.getMessage("exceptionPrinting"), e);
  +                log.debug(Messages.getMessage("exceptionPrinting"), e);
               } finally {
                   log.debug(writer.getBuffer().toString());
               }
  @@ -2090,7 +2091,7 @@
   
           if (resMsg == null) {
             if (this.FAULT_ON_NO_RESPONSE) {
  -            throw new AxisFault(JavaUtils.getMessage("nullResponse00"));
  +            throw new AxisFault(Messages.getMessage("nullResponse00"));
             } else {
               return;
             }
  @@ -2114,7 +2115,7 @@
                   try {
                       service.getEngine().invoke( msgContext );
                   } catch (AxisFault af){
  -                    log.debug(JavaUtils.getMessage("exceptionPrinting"), af);
  +                    log.debug(Messages.getMessage("exceptionPrinting"), af);
                   }
               }
           };
  
  
  
  1.16      +8 -7      xml-axis/java/src/org/apache/axis/client/Stub.java
  
  Index: Stub.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/client/Stub.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- Stub.java	19 Aug 2002 15:35:21 -0000	1.15
  +++ Stub.java	9 Sep 2002 17:03:30 -0000	1.16
  @@ -69,6 +69,7 @@
   import org.apache.axis.AxisFault;
   
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   
   /**
   * This class is the base for all generated stubs.
  @@ -125,13 +126,13 @@
       public void _setProperty(String name, Object value) {
           if (name == null || value == null) {
               throw new JAXRPCException(
  -                    JavaUtils.getMessage(name == null ?
  +                    Messages.getMessage(name == null ?
                                            "badProp03" : "badProp04"));
           }
           else if (name.equals(Call.USERNAME_PROPERTY)) {
               if (!(value instanceof String)) {
                   throw new JAXRPCException(
  -                        JavaUtils.getMessage("badProp00", new String[] {
  +                        Messages.getMessage("badProp00", new String[] {
                           name, "java.lang.String", value.getClass().getName()}));
               }
               cachedUsername = (String) value;
  @@ -139,7 +140,7 @@
           else if (name.equals(Call.PASSWORD_PROPERTY)) {
               if (!(value instanceof String)) {
                   throw new JAXRPCException(
  -                        JavaUtils.getMessage("badProp00", new String[] {
  +                        Messages.getMessage("badProp00", new String[] {
                           name, "java.lang.String", value.getClass().getName()}));
               }
               cachedPassword = (String) value;
  @@ -147,7 +148,7 @@
           else if (name.equals(Stub.ENDPOINT_ADDRESS_PROPERTY)) {
               if (!(value instanceof String)) {
                   throw new JAXRPCException(
  -                        JavaUtils.getMessage("badProp00", new String[] {
  +                        Messages.getMessage("badProp00", new String[] {
                           name, "java.lang.String", value.getClass().getName()}));
               }
               try {
  @@ -160,7 +161,7 @@
           else if (name.equals(Call.SESSION_MAINTAIN_PROPERTY)) {
               if (!(value instanceof Boolean)) {
                   throw new JAXRPCException(
  -                        JavaUtils.getMessage("badProp00", new String[]
  +                        Messages.getMessage("badProp00", new String[]
                           {name,
                           "java.lang.Boolean",
                           value.getClass().getName()}));
  @@ -170,7 +171,7 @@
           }
           else if (name.startsWith("java.") || name.startsWith("javax.")) {
               throw new JAXRPCException(
  -                    JavaUtils.getMessage("badProp05", name));
  +                    Messages.getMessage("badProp05", name));
           }
           else {
               cachedProperties.put(name, value);
  @@ -200,7 +201,7 @@
               }
               else if (name.startsWith("java.") || name.startsWith("javax.")) {
                   throw new JAXRPCException(
  -                        JavaUtils.getMessage("badProp05", name));
  +                        Messages.getMessage("badProp05", name));
               }
               else {
                   return cachedProperties.get(name);
  
  
  
  1.56      +4 -3      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.55
  retrieving revision 1.56
  diff -u -r1.55 -r1.56
  --- AxisClient.java	4 Sep 2002 13:25:02 -0000	1.55
  +++ AxisClient.java	9 Sep 2002 17:03:30 -0000	1.56
  @@ -63,6 +63,7 @@
   import org.apache.axis.configuration.EngineConfigurationFactoryFinder;
   import org.apache.axis.handlers.soap.SOAPService;
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   
   import org.apache.axis.components.logger.LogFactory;
   import org.apache.commons.logging.Log;
  @@ -130,7 +131,7 @@
                       h.invoke(msgContext);
                   else
                       throw new AxisFault( "Client.error",
  -                                        JavaUtils.getMessage("noHandler00", hName),
  +                                        Messages.getMessage("noHandler00", hName),
                                           null, null );
               }
               else {
  @@ -182,7 +183,7 @@
                   }
                   else {
                       throw new AxisFault(
  -                        JavaUtils.getMessage("noTransport00", hName));
  +                        Messages.getMessage("noTransport00", hName));
                   }
   
                   /* Process the JAXRPC Handlers */
  @@ -207,7 +208,7 @@
   
           } catch ( Exception e ) {
               // Should we even bother catching it ?
  -            log.debug(JavaUtils.getMessage("exception00"), e);
  +            log.debug(Messages.getMessage("exception00"), e);
               throw AxisFault.makeFault(e);
   
           } finally {
  
  
  
  1.11      +4 -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.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- TestSrcContent.java	25 Jul 2002 17:09:58 -0000	1.10
  +++ TestSrcContent.java	9 Sep 2002 17:03:30 -0000	1.11
  @@ -21,7 +21,7 @@
   import org.apache.oro.text.regex.Perl5Compiler;
   import org.apache.oro.text.regex.MalformedPatternException;
   
  -import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   
   /**
    * This TestCase verifies that content of the source files adheres
  @@ -35,9 +35,9 @@
    *   in wsdl to/from java tooling.
    *
    * - Verify that log.info(), log.warn(), log.error(), and log.fatal()
  - *   use JavaUtils.getMessage() (i18n).
  + *   use Messages.getMessage() (i18n).
    *
  - * - Verify that exceptions are created with JavaUtils.getMessage() (i18n).
  + * - Verify that exceptions are created with Messages.getMessage() (i18n).
    *
    * To add new patterns, search for and append to the
    * private attribute 'avoidPatterns'.
  @@ -190,7 +190,7 @@
                                          + "[^\\\\/]+\\.java",
                                          "log\\.(info|warn|error|fatal)"
                                          + "[ \\t]*\\("
  -                                       + "(?![ \\t]*JavaUtils\\.getMessage)",
  +                                       + "(?![ \\t]*Messages\\.getMessage)",
                                          false),
   
               // Verify that exceptions are built with messages.
  
  
  
  1.10      +27 -27    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.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- TestMessages.java	28 Aug 2002 19:45:09 -0000	1.9
  +++ TestMessages.java	9 Sep 2002 17:03:30 -0000	1.10
  @@ -14,12 +14,12 @@
   import junit.framework.TestCase;
   import junit.framework.TestSuite;
   
  -import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   
   /**
    * This TestCase verifies:
    *   - the contents of axisNLS.properties for well-formedness, and
  - *   - tests calls to JavaUtils.getMessage.
  + *   - tests calls to Messages.getMessage.
    */
   public class TestMessages extends TestCase {
       public TestMessages(String name) {
  @@ -37,14 +37,14 @@
           String arg0 = "arg0";
           String arg1 = "arg1";
           String[] args = {arg0, arg1, "arg2"};
  -        Enumeration keys = JavaUtils.getFirstMessageResourceBundle().getKeys();
  +        Enumeration keys = Messages.getFirstMessageResourceBundle().getKeys();
           while (keys.hasMoreElements()) {
               String key = (String) keys.nextElement();
               try {
  -                String message = JavaUtils.getMessage(key);
  -                message = JavaUtils.getMessage(key, arg0);
  -                message = JavaUtils.getMessage(key, arg0, arg1);
  -                message = JavaUtils.getMessage(key, args);
  +                String message = Messages.getMessage(key);
  +                message = Messages.getMessage(key, arg0);
  +                message = Messages.getMessage(key, arg0, arg1);
  +                message = Messages.getMessage(key, args);
               }
               catch (IllegalArgumentException iae) {
                   throw new AssertionFailedError("Test failure on key = " + key + ":  " + iae.getMessage());
  @@ -57,44 +57,44 @@
        */
       public void testTestMessages() {
           try {
  -            String message = JavaUtils.getMessage("test00");
  +            String message = Messages.getMessage("test00");
               String expected = "...";
               assertTrue("expected (" + expected + ") got (" + message + ")", expected.equals(message));
  -            message = JavaUtils.getMessage("test00", new String[0]);
  +            message = Messages.getMessage("test00", new String[0]);
               assertTrue("expected (" + expected + ") got (" + message + ")", expected.equals(message));
  -            message = JavaUtils.getMessage("test00", new String[] {"one", "two"});
  +            message = Messages.getMessage("test00", new String[] {"one", "two"});
               assertTrue("expected (" + expected + ") got (" + message + ")", expected.equals(message));
  -            message = JavaUtils.getMessage("test01");
  +            message = Messages.getMessage("test01");
               expected = ".{0}.";
               assertTrue("expected (" + expected + ") got (" + message + ")", expected.equals(message));
  -            message = JavaUtils.getMessage("test01", "one");
  +            message = Messages.getMessage("test01", "one");
               expected = ".one.";
               assertTrue("expected (" + expected + ") got (" + message + ")", expected.equals(message));
  -            message = JavaUtils.getMessage("test01", new String[0]);
  +            message = Messages.getMessage("test01", new String[0]);
               expected = ".{0}.";
               assertTrue("expected (" + expected + ") got (" + message + ")", expected.equals(message));
  -            message = JavaUtils.getMessage("test01", new String[] {"one"});
  +            message = Messages.getMessage("test01", new String[] {"one"});
               expected = ".one.";
               assertTrue("expected (" + expected + ") got (" + message + ")", expected.equals(message));
  -            message = JavaUtils.getMessage("test01", new String[] {"one", "two"});
  +            message = Messages.getMessage("test01", new String[] {"one", "two"});
               expected = ".one.";
               assertTrue("expected (" + expected + ") got (" + message + ")", expected.equals(message));
  -            message = JavaUtils.getMessage("test02");
  +            message = Messages.getMessage("test02");
               expected = "{0}, {1}.";
               assertTrue("expected (" + expected + ") got (" + message + ")", expected.equals(message));
  -            message = JavaUtils.getMessage("test02", new String[0]);
  +            message = Messages.getMessage("test02", new String[0]);
               expected = "{0}, {1}.";
               assertTrue("expected (" + expected + ") got (" + message + ")", expected.equals(message));
  -            message = JavaUtils.getMessage("test02", new String[] {"one"});
  +            message = Messages.getMessage("test02", new String[] {"one"});
               expected = "one, {1}.";
               assertTrue("expected (" + expected + ") got (" + message + ")", expected.equals(message));
  -            message = JavaUtils.getMessage("test02", new String[] {"one", "two"});
  +            message = Messages.getMessage("test02", new String[] {"one", "two"});
               expected = "one, two.";
               assertTrue("expected (" + expected + ") got (" + message + ")", expected.equals(message));
  -            message = JavaUtils.getMessage("test03", new String[] {"one", "two", "three"});
  +            message = Messages.getMessage("test03", new String[] {"one", "two", "three"});
               expected = ".three, one, two.";
               assertTrue("expected (" + expected + ") got (" + message + ")", expected.equals(message));
  -            message = JavaUtils.getMessage("test04", new String[] {"one", "two", "three", "four", "five", "six"});
  +            message = Messages.getMessage("test04", new String[] {"one", "two", "three", "four", "five", "six"});
               expected = ".one two three ... four three five six.";
               assertTrue("expected (" + expected + ") got (" + message + ")", expected.equals(message));
           }
  @@ -110,7 +110,7 @@
   
       /**
        * If this test is run from xml-axis/java, then walk through the source tree looking for all
  -     * calls to JavaUtils.getMessage.  For each of these calls:
  +     * calls to Messages.getMessage.  For each of these calls:
        * 1.  Make sure the message key exists in axisNLS.properties
        * 2.  Make sure the actual number of parameters (in axisNLS.properties) matches the
        *     excpected number of parameters (in the source code).
  @@ -145,7 +145,7 @@
       } // walkTree
   
       /**
  -     * Check all calls to JavaUtils.getMessages:
  +     * Check all calls to Messages.getMessages:
        * 1.  Make sure the message key exists in axisNLS.properties
        * 2.  Make sure the actual number of parameters (in axisNLS.properties) matches the
        *     excpected number of parameters (in the source code).
  @@ -156,10 +156,10 @@
               byte[] bytes = new byte[fis.available()];
               fis.read(bytes);
               String string = new String(bytes);
  -            int index = string.indexOf("JavaUtils.getMessage(");
  +            int index = string.indexOf("Messages.getMessage(");
               while (index >= 0) {
   
  -                // Bump the string past the "JavaUtils.getMessage(" string
  +                // Bump the string past the "Messages.getMessage(" string
                   string = string.substring(index + 21);
   
                   // Get the arguments for the getMessage call
  @@ -174,7 +174,7 @@
                       // Get the raw message
                       String value = null;
                       try {
  -                        value = JavaUtils.getMessage(key);
  +                        value = Messages.getMessage(key);
                       }
                       catch (Throwable t) {
                           errors = errors + "File:  " + file.getPath() + " " + t.getMessage() + LS;
  @@ -190,7 +190,7 @@
                           errors = errors + "File:  " + file.getPath() + " " + key + " has " + realParms + " parameters, " + expectedParms + " expected." + LS;
                       }
                   }
  -                index = string.indexOf("JavaUtils.getMessage(");
  +                index = string.indexOf("Messages.getMessage(");
               }
           }
           catch (Throwable t) {
  
  
  
  1.2       +7 -6      xml-axis/java/src/org/apache/axis/components/net/FakeTrustSocketFactory.java
  
  Index: FakeTrustSocketFactory.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/components/net/FakeTrustSocketFactory.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- FakeTrustSocketFactory.java	9 Jul 2002 12:54:53 -0000	1.1
  +++ FakeTrustSocketFactory.java	9 Sep 2002 17:03:30 -0000	1.2
  @@ -59,6 +59,7 @@
   import com.sun.net.ssl.X509TrustManager;
   import org.apache.axis.components.logger.LogFactory;
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   import org.apache.commons.logging.Log;
   
   import java.util.Hashtable;
  @@ -97,12 +98,12 @@
                       new TrustManager[]{new FakeX509TrustManager()},
                       new java.security.SecureRandom());
               if (log.isDebugEnabled()) {
  -                log.debug(JavaUtils.getMessage("ftsf00"));
  +                log.debug(Messages.getMessage("ftsf00"));
               }
               return sc;
           } catch (Exception exc) {
  -            log.error(JavaUtils.getMessage("ftsf01"), exc);
  -            throw new Exception(JavaUtils.getMessage("ftsf02"));
  +            log.error(Messages.getMessage("ftsf01"), exc);
  +            throw new Exception(Messages.getMessage("ftsf02"));
           }
       }
   
  @@ -126,7 +127,7 @@
                   .X509Certificate[] chain) {
   
               if (log.isDebugEnabled()) {
  -                log.debug(JavaUtils.getMessage("ftsf03"));
  +                log.debug(Messages.getMessage("ftsf03"));
               }
               return true;
           }
  @@ -142,7 +143,7 @@
                   .X509Certificate[] chain) {
   
               if (log.isDebugEnabled()) {
  -                log.debug(JavaUtils.getMessage("ftsf04"));
  +                log.debug(Messages.getMessage("ftsf04"));
               }
               return true;
           }
  @@ -155,7 +156,7 @@
           public java.security.cert.X509Certificate[] getAcceptedIssuers() {
   
               if (log.isDebugEnabled()) {
  -                log.debug(JavaUtils.getMessage("ftsf05"));
  +                log.debug(Messages.getMessage("ftsf05"));
               }
               return null;
           }
  
  
  
  1.4       +4 -3      xml-axis/java/src/org/apache/axis/components/net/DefaultSocketFactory.java
  
  Index: DefaultSocketFactory.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/components/net/DefaultSocketFactory.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- DefaultSocketFactory.java	16 Aug 2002 22:51:21 -0000	1.3
  +++ DefaultSocketFactory.java	9 Sep 2002 17:03:30 -0000	1.4
  @@ -59,6 +59,7 @@
   import org.apache.axis.encoding.Base64;
   import org.apache.axis.transport.http.HTTPConstants;
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   import org.apache.commons.logging.Log;
   
   import java.net.Socket;
  @@ -129,13 +130,13 @@
           {
               sock = new Socket(host, port);
               if (log.isDebugEnabled()) {
  -                log.debug(JavaUtils.getMessage("createdHTTP00"));
  +                log.debug(Messages.getMessage("createdHTTP00"));
               }
           } else {
               sock = new Socket(tcp.getProxyHost(),
                                 new Integer(tcp.getProxyPort()).intValue());
               if (log.isDebugEnabled()) {
  -                log.debug(JavaUtils.getMessage("createdHTTP01", tcp.getProxyHost(),
  +                log.debug(Messages.getMessage("createdHTTP01", tcp.getProxyHost(),
                             tcp.getProxyPort()));
               }
               useFullURL.value = true;
  @@ -167,7 +168,7 @@
               String pattern = tokenizer.nextToken();
   
               if (log.isDebugEnabled()) {
  -                log.debug(JavaUtils.getMessage("match00",
  +                log.debug(Messages.getMessage("match00",
                           new String[]{"HTTPSender",
                                        host,
                                        pattern}));
  
  
  
  1.4       +5 -4      xml-axis/java/src/org/apache/axis/components/net/JSSESocketFactory.java
  
  Index: JSSESocketFactory.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/components/net/JSSESocketFactory.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- JSSESocketFactory.java	16 Aug 2002 22:51:21 -0000	1.3
  +++ JSSESocketFactory.java	9 Sep 2002 17:03:30 -0000	1.4
  @@ -57,6 +57,7 @@
   import com.sun.net.ssl.SSLContext;
   import org.apache.axis.AxisProperties;
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   import org.apache.axis.utils.XMLUtils;
   
   import javax.net.ssl.SSLSocket;
  @@ -196,7 +197,7 @@
               InputStream tunnelInputStream = tunnel.getInputStream();
   
               if (log.isDebugEnabled()) {
  -                log.debug(JavaUtils.getMessage("isNull00", "tunnelInputStream",
  +                log.debug(Messages.getMessage("isNull00", "tunnelInputStream",
                           "" + (tunnelInputStream
                           == null)));
               }
  @@ -225,7 +226,7 @@
               }
               if (!replyStr.startsWith("HTTP/1.0 200")
                       && !replyStr.startsWith("HTTP/1.1 200")) {
  -                throw new IOException(JavaUtils.getMessage("cantTunnel00",
  +                throw new IOException(Messages.getMessage("cantTunnel00",
                           new String[]{
                               tcp.getProxyHost(),
                               "" + tunnelPort,
  @@ -235,14 +236,14 @@
               // End of condensed reflective tunnel handshake method
               sslSocket = sslFactory.createSocket(tunnel, host, port, true);
               if (log.isDebugEnabled()) {
  -                log.debug(JavaUtils.getMessage("setupTunnel00",
  +                log.debug(Messages.getMessage("setupTunnel00",
                             tcp.getProxyHost(),
                           "" + tunnelPort));
               }
           }
           ((SSLSocket) sslSocket).startHandshake();
           if (log.isDebugEnabled()) {
  -            log.debug(JavaUtils.getMessage("createdSSL00"));
  +            log.debug(Messages.getMessage("createdSSL00"));
           }
           return sslSocket;
       }
  
  
  
  1.55      +7 -6      xml-axis/java/src/org/apache/axis/wsdl/fromJava/Types.java
  
  Index: Types.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/fromJava/Types.java,v
  retrieving revision 1.54
  retrieving revision 1.55
  diff -u -r1.54 -r1.55
  --- Types.java	9 Aug 2002 13:56:24 -0000	1.54
  +++ Types.java	9 Sep 2002 17:03:31 -0000	1.55
  @@ -64,6 +64,7 @@
   import org.apache.axis.encoding.TypeMapping;
   import org.apache.axis.encoding.ser.BeanSerializerFactory;
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   import org.apache.axis.utils.XMLUtils;
   import org.apache.axis.wsdl.symbolTable.BaseTypeMapping;
   import org.apache.axis.wsdl.symbolTable.SymbolTable;
  @@ -529,7 +530,7 @@
           // if we can't get a serializer, that is bad.
           if (ser == null) {
               throw new AxisFault(
  -                    JavaUtils.getMessage("NoSerializer00", type.getName()));
  +                    Messages.getMessage("NoSerializer00", type.getName()));
           }
   
           // Write the namespace
  @@ -586,7 +587,7 @@
                       ser.writeSchema(this);
                   }
               } catch (Exception e) {
  -                throw new AxisFault(JavaUtils.getMessage("writeSchemaProblem00", type.getName()), e);
  +                throw new AxisFault(Messages.getMessage("writeSchemaProblem00", type.getName()), e);
               }
           }
           return prefixedName;
  @@ -952,7 +953,7 @@
               javaType.isPrimitive()) {
               if (issueErrors && 
                   !beanCompatErrs.contains(javaType)) {
  -                log.error(JavaUtils.getMessage("beanCompatType00",
  +                log.error(Messages.getMessage("beanCompatType00",
                                                  javaType.getName()));
                   beanCompatErrs.add(javaType);
               }
  @@ -965,7 +966,7 @@
               javaType.getName().startsWith("javax.")) {
               if (issueErrors && 
                   !beanCompatErrs.contains(javaType)) {
  -                log.error(JavaUtils.getMessage("beanCompatPkg00",
  +                log.error(Messages.getMessage("beanCompatPkg00",
                                                  javaType.getName()));
                   beanCompatErrs.add(javaType);
               }
  @@ -985,7 +986,7 @@
               } catch (java.lang.NoSuchMethodException e) {
                   if (issueErrors && 
                       !beanCompatErrs.contains(javaType)) {
  -                    log.error(JavaUtils.getMessage("beanCompatConstructor00",
  +                    log.error(Messages.getMessage("beanCompatConstructor00",
                                                      javaType.getName()));
                       beanCompatErrs.add(javaType);
                   }
  @@ -1008,7 +1009,7 @@
   
                   if (issueErrors && 
                       !beanCompatErrs.contains(javaType)) {
  -                    log.error(JavaUtils.getMessage("beanCompatExtends00",
  +                    log.error(Messages.getMessage("beanCompatExtends00",
                                                      javaType.getName(),
                                                      superClass.getName(),
                                                       javaType.getName()));
  
  
  
  1.3       +3 -2      xml-axis/java/src/org/apache/axis/utils/bytecode/ClassReader.java
  
  Index: ClassReader.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/utils/bytecode/ClassReader.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ClassReader.java	29 Aug 2002 21:02:39 -0000	1.2
  +++ ClassReader.java	9 Sep 2002 17:03:31 -0000	1.3
  @@ -56,6 +56,7 @@
   package org.apache.axis.utils.bytecode;
   
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   
   import java.io.ByteArrayInputStream;
   import java.io.ByteArrayOutputStream;
  @@ -222,7 +223,7 @@
           while (n > 0) {
               int c = (int) skip(n);
               if (c <= 0)
  -                throw new EOFException(JavaUtils.getMessage("unexpectedEOF00"));
  +                throw new EOFException(Messages.getMessage("unexpectedEOF00"));
               n -= c;
           }
       }
  @@ -386,7 +387,7 @@
                   default:
                       // corrupt class file
                       throw new IllegalStateException(
  -                            JavaUtils.getMessage("unexpectedBytes00"));
  +                            Messages.getMessage("unexpectedBytes00"));
               }
           }
       }
  
  
  
  1.2       +2 -1      xml-axis/java/src/org/apache/axis/utils/bytecode/ParamNameExtractor.java
  
  Index: ParamNameExtractor.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/utils/bytecode/ParamNameExtractor.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ParamNameExtractor.java	19 Aug 2002 17:12:09 -0000	1.1
  +++ ParamNameExtractor.java	9 Sep 2002 17:03:31 -0000	1.2
  @@ -56,6 +56,7 @@
   
   import org.apache.axis.components.logger.LogFactory;
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   import org.apache.commons.logging.Log;
   
   import java.io.IOException;
  @@ -106,7 +107,7 @@
                   paramCache.put(c, pr);
               } catch (IOException e) {
                   // log it and leave
  -                log.info(JavaUtils.getMessage("error00") + ":" + e);
  +                log.info(Messages.getMessage("error00") + ":" + e);
                   return null;
               }
           }
  
  
  
  1.2       +2 -1      xml-axis/java/src/org/apache/axis/utils/bytecode/ParamReader.java
  
  Index: ParamReader.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/utils/bytecode/ParamReader.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ParamReader.java	19 Aug 2002 17:12:09 -0000	1.1
  +++ ParamReader.java	9 Sep 2002 17:03:31 -0000	1.2
  @@ -55,6 +55,7 @@
   package org.apache.axis.utils.bytecode;
   
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   
   import java.io.IOException;
   import java.lang.reflect.Method;
  @@ -103,7 +104,7 @@
           // check the magic number
           if (readInt() != 0xCAFEBABE) {
               // not a class file!
  -            throw new IOException(JavaUtils.getMessage("badClassFile00"));
  +            throw new IOException(Messages.getMessage("badClassFile00"));
           }
   
           readShort(); // minor version
  
  
  
  1.7       +2 -1      xml-axis/java/src/org/apache/axis/wsdl/gen/Parser.java
  
  Index: Parser.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/gen/Parser.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- Parser.java	22 Jul 2002 06:23:01 -0000	1.6
  +++ Parser.java	9 Sep 2002 17:03:31 -0000	1.7
  @@ -64,6 +64,7 @@
   import javax.wsdl.WSDLException;
   
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   
   import org.apache.axis.wsdl.symbolTable.BindingEntry;
   import org.apache.axis.wsdl.symbolTable.PortTypeEntry;
  @@ -224,7 +225,7 @@
   
           if (wsdlThread.isAlive()) {
               wsdlThread.interrupt();
  -            throw new IOException(JavaUtils.getMessage("timedOut"));
  +            throw new IOException(Messages.getMessage("timedOut"));
           }
   
           if (runnable.getFailure() != null) {
  
  
  
  1.11      +12 -11    xml-axis/java/src/org/apache/axis/wsdl/gen/WSDL2.java
  
  Index: WSDL2.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/gen/WSDL2.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- WSDL2.java	8 Aug 2002 15:17:10 -0000	1.10
  +++ WSDL2.java	9 Sep 2002 17:03:31 -0000	1.11
  @@ -60,6 +60,7 @@
   import org.apache.axis.utils.CLUtil;
   import org.apache.axis.utils.DefaultAuthenticator;
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   
   import java.net.Authenticator;
   import java.net.MalformedURLException;
  @@ -79,27 +80,27 @@
           new CLOptionDescriptor("help",
                   CLOptionDescriptor.ARGUMENT_DISALLOWED,
                   HELP_OPT,
  -                JavaUtils.getMessage("optionHelp00")),
  +                Messages.getMessage("optionHelp00")),
           new CLOptionDescriptor("verbose",
                   CLOptionDescriptor.ARGUMENT_DISALLOWED,
                   VERBOSE_OPT,
  -                JavaUtils.getMessage("optionVerbose00")),
  +                Messages.getMessage("optionVerbose00")),
           new CLOptionDescriptor("noImports",
                   CLOptionDescriptor.ARGUMENT_DISALLOWED,
                   NOIMPORTS_OPT,
  -                JavaUtils.getMessage("optionImport00")),
  +                Messages.getMessage("optionImport00")),
           new CLOptionDescriptor("timeout",
                   CLOptionDescriptor.ARGUMENT_REQUIRED,
                   NETWORK_TIMEOUT_OPT,
  -                JavaUtils.getMessage("optionTimeout00")),
  +                Messages.getMessage("optionTimeout00")),
           new CLOptionDescriptor("Debug",
                   CLOptionDescriptor.ARGUMENT_DISALLOWED,
                   DEBUG_OPT,
  -                JavaUtils.getMessage("optionDebug00")),
  +                Messages.getMessage("optionDebug00")),
           new CLOptionDescriptor("noWrapped",
                    CLOptionDescriptor.ARGUMENT_DISALLOWED,
                    NOWRAP_OPT,
  -                 JavaUtils.getMessage("optionNoWrap00"))
  +                 Messages.getMessage("optionNoWrap00"))
       };
   
       protected String wsdlURI = null;
  @@ -152,7 +153,7 @@
           switch (option.getId()) {
               case CLOption.TEXT_ARGUMENT:
                   if (wsdlURI != null) {
  -                    System.out.println(JavaUtils.getMessage("w2jDuplicateWSDLURI00", 
  +                    System.out.println(Messages.getMessage("w2jDuplicateWSDLURI00", 
                                                               wsdlURI, 
                                                               option.getArgument()));
                       printUsage();
  @@ -198,7 +199,7 @@
        **/
       protected void validateOptions() {
           if (wsdlURI == null) {
  -            System.out.println(JavaUtils.getMessage("w2jMissingWSDLURI00"));
  +            System.out.println(Messages.getMessage("w2jMissingWSDLURI00"));
               printUsage();
           }
   
  @@ -241,10 +242,10 @@
           String lSep = System.getProperty("line.separator");
           StringBuffer msg = new StringBuffer();
           msg.append(
  -                JavaUtils.getMessage("usage00",
  +                Messages.getMessage("usage00",
                   "java " + getClass().getName() + " [options] WSDL-URI"))
                   .append(lSep);
  -        msg.append(JavaUtils.getMessage("options00")).append(lSep);
  +        msg.append(Messages.getMessage("options00")).append(lSep);
           msg.append(CLUtil.describeOptions(options).toString());
           System.out.println(msg.toString());
           System.exit(1);
  @@ -262,7 +263,7 @@
           // Print parser errors, if any
           if (null != argsParser.getErrorString()) {
               System.err.println(
  -                    JavaUtils.getMessage("error01", argsParser.getErrorString()));
  +                    Messages.getMessage("error01", argsParser.getErrorString()));
               printUsage();
           }
   
  
  
  
  1.53      +3 -2      xml-axis/java/src/org/apache/axis/description/ServiceDesc.java
  
  Index: ServiceDesc.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/description/ServiceDesc.java,v
  retrieving revision 1.52
  retrieving revision 1.53
  diff -u -r1.52 -r1.53
  --- ServiceDesc.java	9 Sep 2002 14:50:36 -0000	1.52
  +++ ServiceDesc.java	9 Sep 2002 17:03:32 -0000	1.53
  @@ -63,6 +63,7 @@
   import org.apache.axis.encoding.TypeMappingRegistryImpl;
   import org.apache.axis.enum.Style;
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   import org.apache.axis.utils.bytecode.ParamNameExtractor;
   import org.apache.axis.wsdl.Skeleton;
   import org.apache.commons.logging.Log;
  @@ -241,7 +242,7 @@
       public void setImplClass(Class implClass) {
           if (this.implClass != null)
               throw new IllegalArgumentException(
  -                    JavaUtils.getMessage("implAlreadySet"));
  +                    Messages.getMessage("implAlreadySet"));
   
           this.implClass = implClass;
           if (Skeleton.class.isAssignableFrom(implClass)) {
  @@ -654,7 +655,7 @@
           // Exception if sync fails to find method for operation
           if (oper.getMethod() == null) {
               InternalException ie =
  -                new InternalException(JavaUtils.getMessage("serviceDescOperSync00",
  +                new InternalException(Messages.getMessage("serviceDescOperSync00",
                                                              oper.getName(),
                                                              implClass.getName()));
               throw ie;
  
  
  
  1.19      +3 -2      xml-axis/java/src/org/apache/axis/description/ParameterDesc.java
  
  Index: ParameterDesc.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/description/ParameterDesc.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- ParameterDesc.java	9 Aug 2002 13:56:24 -0000	1.18
  +++ ParameterDesc.java	9 Sep 2002 17:03:32 -0000	1.19
  @@ -57,6 +57,7 @@
   import javax.xml.namespace.QName;
   
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   
   import org.apache.axis.wsdl.symbolTable.TypeEntry;
   
  @@ -171,7 +172,7 @@
           }
           
           throw new IllegalArgumentException(
  -                JavaUtils.getMessage("badParameterMode", Byte.toString(mode)));
  +                Messages.getMessage("badParameterMode", Byte.toString(mode)));
       }
   
       public QName getQName() {
  @@ -224,7 +225,7 @@
                   mode != IN && !isReturn &&
                   !javax.xml.rpc.holders.Holder.class.isAssignableFrom(javaType)) {
                   throw new IllegalArgumentException(
  -                     JavaUtils.getMessage("setJavaTypeErr00", 
  +                     Messages.getMessage("setJavaTypeErr00", 
                                             javaType.getName(),
                                             getModeAsString(mode)));
               }             
  
  
  
  1.21      +2 -1      xml-axis/java/src/org/apache/axis/description/TypeDesc.java
  
  Index: TypeDesc.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/description/TypeDesc.java,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- TypeDesc.java	21 Aug 2002 18:48:43 -0000	1.20
  +++ TypeDesc.java	9 Sep 2002 17:03:32 -0000	1.21
  @@ -59,6 +59,7 @@
   import org.apache.axis.utils.JavaUtils;
   import org.apache.axis.utils.BeanUtils;
   import org.apache.axis.utils.BeanPropertyDescriptor;
  +import org.apache.axis.utils.Messages;
   
   import org.apache.axis.components.logger.LogFactory;
   import org.apache.commons.logging.Log;
  @@ -207,7 +208,7 @@
       {
           if (field == null) {
               throw new IllegalArgumentException(
  -                    JavaUtils.getMessage("nullFieldDesc"));
  +                    Messages.getMessage("nullFieldDesc"));
           }
           
           int numFields = 0;
  
  
  
  1.12      +3 -2      xml-axis/java/samples/security/SignedSOAPEnvelope.java
  
  Index: SignedSOAPEnvelope.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/samples/security/SignedSOAPEnvelope.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- SignedSOAPEnvelope.java	31 May 2002 19:08:05 -0000	1.11
  +++ SignedSOAPEnvelope.java	9 Sep 2002 17:03:32 -0000	1.12
  @@ -65,7 +65,7 @@
   import org.apache.axis.encoding.SerializationContextImpl;
   import org.apache.axis.message.SOAPEnvelope;
   import org.apache.axis.message.SOAPHeaderElement;
  -import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   import org.apache.axis.utils.Mapping;
   import org.apache.axis.utils.XMLUtils;
   import org.apache.xml.security.c14n.Canonicalizer;
  @@ -82,6 +82,7 @@
   import java.security.PrivateKey;
   import java.security.cert.X509Certificate;
   
  +
   public class SignedSOAPEnvelope extends SOAPEnvelope {
       static String SOAPSECNS = "http://schemas.xmlsoap.org/soap/security/2000-12";
       static String SOAPSECprefix = "SOAP-SEC";
  @@ -179,7 +180,7 @@
           Document doc = XMLUtils.newDocument(new InputSource(reader));
           if (doc == null)
               throw new Exception(
  -                    JavaUtils.getMessage("noDoc00", writer.getBuffer().toString()));
  +                    Messages.getMessage("noDoc00", writer.getBuffer().toString()));
           return doc;
       }
   }
  
  
  
  1.13      +2 -2      xml-axis/java/samples/security/LogHandler.java
  
  Index: LogHandler.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/samples/security/LogHandler.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- LogHandler.java	3 Jul 2002 18:47:09 -0000	1.12
  +++ LogHandler.java	9 Sep 2002 17:03:32 -0000	1.13
  @@ -60,7 +60,7 @@
   import org.apache.axis.Message;
   import org.apache.axis.MessageContext;
   import org.apache.axis.handlers.BasicHandler;
  -import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   
   import org.apache.axis.components.logger.LogFactory;
   import org.apache.commons.logging.Log;
  @@ -132,7 +132,7 @@
               FileWriter fw = new FileWriter(filename, true);
               PrintWriter pw = new PrintWriter(fw);
               pw.println("=====================");
  -            pw.println("= " + JavaUtils.getMessage("fault00"));
  +            pw.println("= " + Messages.getMessage("fault00"));
               pw.println("=====================");
               pw.close();
           } catch (Exception e) {
  
  
  
  1.8       +3 -4      xml-axis/java/src/org/apache/axis/deployment/wsdd/providers/WSDDHandlerProvider.java
  
  Index: WSDDHandlerProvider.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/deployment/wsdd/providers/WSDDHandlerProvider.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- WSDDHandlerProvider.java	26 Jun 2002 18:34:58 -0000	1.7
  +++ WSDDHandlerProvider.java	9 Sep 2002 17:03:32 -0000	1.8
  @@ -61,6 +61,7 @@
   import org.apache.axis.deployment.wsdd.WSDDService;
   import org.apache.axis.utils.ClassUtils;
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   
   /**
    * This is a simple provider for using Handler-based services which don't
  @@ -77,15 +78,13 @@
       {
           String providerClass = service.getParameter("handlerClass");
           if (providerClass == null) {
  -            throw new ConfigurationException(JavaUtils.
  -                                            getMessage("noHandlerClass00"));
  +            throw new ConfigurationException(Messages.getMessage("noHandlerClass00"));
           }
           
           Class _class = ClassUtils.forName(providerClass);
           
           if (!(Handler.class.isAssignableFrom(_class))) {
  -            throw new ConfigurationException(JavaUtils.
  -                                            getMessage("badHandlerClass00",
  +            throw new ConfigurationException(Messages.getMessage("badHandlerClass00",
                                                          _class.getName()));
           }
   
  
  
  
  1.9       +2 -1      xml-axis/java/src/org/apache/axis/enum/Enum.java
  
  Index: Enum.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/enum/Enum.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- Enum.java	29 Aug 2002 21:02:39 -0000	1.8
  +++ Enum.java	9 Sep 2002 17:03:32 -0000	1.9
  @@ -59,6 +59,7 @@
   import java.util.Hashtable;
   
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   
   import org.apache.axis.components.logger.LogFactory;
   import org.apache.commons.logging.Log;
  @@ -184,7 +185,7 @@
               Enum e = getEnum(enumName, null);
               
               if (e == null) {
  -                log.error(JavaUtils.getMessage("badEnum02", name, enumName));
  +                log.error(Messages.getMessage("badEnum02", name, enumName));
               }
       
               return e;
  
  
  
  1.24      +2 -1      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.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- HTTPActionHandler.java	12 Aug 2002 22:58:47 -0000	1.23
  +++ HTTPActionHandler.java	9 Sep 2002 17:03:32 -0000	1.24
  @@ -58,6 +58,7 @@
   import org.apache.axis.MessageContext;
   import org.apache.axis.handlers.BasicHandler;
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   
   import org.apache.axis.components.logger.LogFactory;
   import org.apache.commons.logging.Log;
  @@ -95,7 +96,7 @@
               */
               if (action == null) {
                   throw new AxisFault( "Server.NoHTTPSOAPAction",
  -                    JavaUtils.getMessage("noSOAPAction00"),
  +                    Messages.getMessage("noSOAPAction00"),
                       null, null );
               }
               
  
  
  
  1.20      +3 -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.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- HTTPAuthHandler.java	12 Aug 2002 22:58:47 -0000	1.19
  +++ HTTPAuthHandler.java	9 Sep 2002 17:03:32 -0000	1.20
  @@ -60,6 +60,7 @@
   import org.apache.axis.handlers.BasicHandler;
   import org.apache.axis.transport.http.HTTPConstants;
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   
   import org.apache.axis.components.logger.LogFactory;
   import org.apache.commons.logging.Log;
  @@ -93,13 +94,13 @@
               if ( i == -1 ) user = tmp ;
               else           user = tmp.substring( 0, i);
               msgContext.setUsername( user );
  -            log.debug( JavaUtils.getMessage("httpUser00", user) );
  +            log.debug( Messages.getMessage("httpUser00", user) );
               if ( i != -1 )  {
                   String pwd = tmp.substring(i+1);
                   if ( pwd != null && pwd.equals("") ) pwd = null ;
                   if ( pwd != null ) {
                       msgContext.setPassword( pwd );
  -                    log.debug( JavaUtils.getMessage("httpPassword00", pwd) );
  +                    log.debug( Messages.getMessage("httpPassword00", pwd) );
                   }
               }
           }
  
  
  
  1.39      +3 -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.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- LocalSender.java	12 Aug 2002 22:53:09 -0000	1.38
  +++ LocalSender.java	9 Sep 2002 17:03:33 -0000	1.39
  @@ -64,6 +64,7 @@
   import org.apache.axis.message.SOAPFault;
   import org.apache.axis.server.AxisServer;
   import org.apache.axis.utils.JavaUtils;
  +import org.apache.axis.utils.Messages;
   
   import org.apache.axis.components.logger.LogFactory;
   import org.apache.commons.logging.Log;
  @@ -97,7 +98,7 @@
               (AxisServer)clientContext.getProperty(LocalTransport.LOCAL_SERVER);
   
           if (log.isDebugEnabled()) {
  -            log.debug(JavaUtils.getMessage("usingServer00", 
  +            log.debug(Messages.getMessage("usingServer00", 
                   "LocalSender", "" + targetServer));
           }
   
  @@ -116,7 +117,7 @@
           String msgStr = clientContext.getRequestMessage().getSOAPPartAsString();
   
           if (log.isDebugEnabled()) {
  -            log.debug(JavaUtils.getMessage("sendingXML00", "LocalSender"));
  +            log.debug(Messages.getMessage("sendingXML00", "LocalSender"));
               log.debug(msgStr);
           }
   
  
  
  
  1.12      +158 -160  xml-axis/java/lib/commons-discovery.jar
  
  	<<Binary file>>
  
  

Mime
View raw message