axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bu...@apache.org
Subject cvs commit: xml-axis/java/src/org/apache/axis/wsdl Emitter.java JavaBindingWriter.java JavaComplexTypeWriter.java JavaDeployWriter.java JavaEnumTypeWriter.java JavaFaultWriter.java JavaHolderWriter.java JavaImplWriter.java JavaInterfaceWriter.java JavaServiceImplWriter.java JavaServiceInterfaceWriter.java JavaSkelWriter.java JavaStubWriter.java JavaTestCaseWriter.java JavaUndeployWriter.java JavaWriter.java Wsdl2java.java
Date Fri, 09 Nov 2001 15:02:18 GMT
butek       01/11/09 07:02:18

  Modified:    java/src/org/apache/axis/utils resources.properties
               java/src/org/apache/axis/wsdl Emitter.java
                        JavaBindingWriter.java JavaComplexTypeWriter.java
                        JavaDeployWriter.java JavaEnumTypeWriter.java
                        JavaFaultWriter.java JavaHolderWriter.java
                        JavaImplWriter.java JavaInterfaceWriter.java
                        JavaServiceImplWriter.java
                        JavaServiceInterfaceWriter.java JavaSkelWriter.java
                        JavaStubWriter.java JavaTestCaseWriter.java
                        JavaUndeployWriter.java JavaWriter.java
                        Wsdl2java.java
  Log:
  Internationalized org.apache.axis.wsdl package.
  
  Revision  Changes    Path
  1.10      +89 -9     xml-axis/java/src/org/apache/axis/utils/resources.properties
  
  Index: resources.properties
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/utils/resources.properties,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- resources.properties	2001/11/09 00:02:56	1.9
  +++ resources.properties	2001/11/09 15:02:17	1.10
  @@ -4,7 +4,6 @@
   # 3.  If a single quote character is to appear in the resulting message, it must appear
in this file as two consecutive single quote characters.
   # 4.  Lines beginning with "#" (like this one) are comment lines and may contain translation
instructions.  They need not be translated unless your translated file, rather than this file,
will serve as a base for other translators.
   
  -act00=Act as a...
   addBody00=Adding body element to message...
   addHeader00=Adding header to message...
   addTrailer00=Adding trailer to message...
  @@ -28,6 +27,10 @@
   badDateTime00=Invalid date/time
   badElem00=Invalid element in {0} - {1}
   badInteger00=Explicit array length is not a valid integer ''{0}''.
  +
  +# NOTE:  in badMsgCtx00, do not translate "--messageContext", "--skeleton"
  +badMsgCtx00=Error: --messageContext switch only valid with --skeleton
  +
   badNamespace00=Bad envelope namespace:  {0}
   badOffset00=Malformed offset attribute ''{0}''.
   badPosition00=Malformed position attribute ''{0}''.
  @@ -39,6 +42,7 @@
   # NOTE:  in badRootElem00, do not translate "clientdeploy", "deploy", "undeploy", "list",
"passwd", "quit"
   badRootElem00=Root element must be ''clientdeploy'', ''deploy'', ''undeploy'', ''list'',
''passwd'', or ''quit''
   
  +badScope00=Unrecognized scope:  {0}.  Ignoring it.
   badTag00=Bad envelope tag:  {0}
   badTime00=Invalid time
   badTimezone00=Invalid timezone
  @@ -80,6 +84,7 @@
   cantTunnel00=Unable to tunnel through {0}:{1}.  Proxy returns "{2}"
   changePwd00=Changing admin password
   compiling00=Compiling:  {0}
  +ctor00=Constructor
   convert00=Trying to convert {0} to {1}
   copy00=copy {0} {1}
   couldntCall00=Could not get a call
  @@ -111,6 +116,18 @@
   done00=Done processing
   doQuit00=Doing a quit
   elapsed00=Elapsed:  {0} milliseconds
  +
  +# NOTE:  in emitFail00, do not translate "parameterOrder"
  +emitFail00=Emitter failure.  All input parts must be listed in the parameterOrder attribute
of {0}
  +
  +# NOTE:  in emitFail01, do not translate "portType", "binding"
  +emitFail01=Emitter failure.  Cannot find portType operation parameters for binding {0}
  +
  +# NOTE:  in emitFail02 and emitFail03, do not translate "port", "service"
  +emitFail02=Emitter failure.  Cannot find endpoint address in port {0} in service {1}
  +emitFail03=Emitter failure.  Invalid endpoint address in port {0} in service {1}:  {2}
  +
  +emitter00=emitter
   empty00=empty
   
   # NOTE:  in enableTransport00, do not translate "SOAPService"
  @@ -126,15 +143,39 @@
   #NOTE:  in error00, do not translate "AXIS"
   error00=AXIS error
   
  +error01=Error:  {0}
   errorInvoking00=Error invoking operation:  {0}
   errorProcess00=Error processing ''{0}''
   exit00=Exit:  {0}
   exit01=Exit:  {0} no-argument constructor
   exit02=Exit:  {0} - {1} is null
   fault00=Fault occurred
  +fileExistError00=Error determining if {0} already exists.  Will not generate this file.
   filename00=File name is:  {0}
   filename01={0}:  request file name = ''{1}''
   fromFile00=From file:  ''{0}'':''{1}''
  +from00=From {0}
  +genDeploy00=Generating deployment document
  +genDeployFail00=Failed to write deployment document
  +genFault00=Generating fault class
  +genHolder00=Generating type implementation holder
  +
  +# NOTE:  in genIFace00, do not translate "portType"
  +genIface00=Generating portType interface
  +genIface01=Generating server-side portType interface
  +
  +genImpl00=Generating server-side implementation template
  +
  +# NOTE:  in genService00, do not translate "service"
  +genService00=Generating service class
  +
  +genSkel00=Generating server-side skeleton
  +genStub00=Generating client-side stub
  +genTest00=Generating service test case
  +genType00=Generating type implementation
  +genUndeploy00=Generating undeployment document
  +genUndeployFail00=Failed to write undeployment document
  +getProxy00=Use to get a proxy class for {0}
   got00=Got {0}
   gotForID00=Got {0} for ID {1} (class = {2})
   gotPrincipal00=Got principal:  {0}
  @@ -142,7 +183,6 @@
   gotType00={0} got type {1}
   gotValue00={0} got value {1}
   headers00=headers
  -hostname00=Target Hostname
   
   # NOTE:  in httpPassword00, do not translate HTTP
   httpPassword00=HTTP password:  {0}
  @@ -165,8 +205,6 @@
   # NOTE:  in itemInMap00, do not translate "''item''" and "Map"
   itemInMap00=Only ''item'' elements are allowed in a Map!
   
  -listener00=Listener
  -listenPort00=Listen port #
   lookup00=Looking up method {0} in class {1}
   makeEnvFail00=Could not make envelope
   match00={0} match:  host:  {1}, pattern:  {2}
  @@ -180,9 +218,6 @@
   # NOTE:  in newElem00, do not translate "MessageElement"
   newElem00=New MessageElement ({0}) named {1}
   
  -# NOTE:  in newTcpmon00, do not translate "TCP/IP"
  -newTcpmon00=Create a new TCP/IP Monitor... 
  -
   no00=no {0}
   noAdminAccess00=Remote administrator access is not allowed!
   noArrayArray00=Arrays of arrays are not supported ''{0}''.
  @@ -253,6 +288,7 @@
   # NOTE:  in noParent00, do not translate "SOAPTypeMappingRegistry"
   noParent00=no SOAPTypeMappingRegistry parent
   
  +noPart00={0} not found as an input part OR an output part!
   noPivot00=No pivot handler ''{0}'' found!
   
   # NOTE:  in noPort00, do not translate "port"
  @@ -310,6 +346,8 @@
   # NOTE:  in noWSDL00, do not translate "WSDL"
   noWSDL00=Could not generate WSDL!
   
  +null00={0} is null
  +
   # NOTE:  in nullCall00, do not translate "AdminClient" or "''call''"
   nullCall00=AdminClient did not initialize correctly: ''call'' is null!
   
  @@ -329,18 +367,44 @@
   # NOTE:  in the only1Header00, do not translate "Header"
   only1Header00=Only one Header element allowed!
   
  +optionHelp00=print this message and exit
  +
  +# NOTE:  in optionImport00, do not translate "WSDL"
  +optionImport00=only generate code for the immediate WSDL document
  +
  +# NOTE:  in optionMsgCtx00, do not translate "MessageContext"
  +optionMsgCtx00=emit a MessageContext parameter to skeleton methods
  +
  +# NOTE:  in optionNStoPkg00, do not translate "namespace", "package"
  +optionNStoPkg00=mapping of namespace to package
  +
  +optionOutput00=output directory for emitted files
  +options00=Options:
  +
  +# NOTE:  in optionScope00, do not translate "Application", "Request", "Session"
  +optionScope00=add scope to deploy.xml: "Application", "Request", "Session"
  +
  +optionSkel00=emit skeleton class for web service
  +
  +# NOTE:  in optionTest00, do not translate "junit"
  +optionTest00=emit junit testcase class for web service
  +
  +optionVerbose00=print informational messages
   outMsg00=Out message:  {0}
   params00=Parameters are:  {0}
   parent00=parent
   parmMismatch00=Number of parameters passed in ({0}) doesn''t match the number of IN/INOUT
parameters ({1}) from the addParameter() calls
  +
  +# NOTE:  in parsing00, do not translate "XML"
  +parsing00=Parsing XML file:  {0}
  +
  +parseError00=Error in parsing:  {0}
   password00=Password:  {0}
   perhaps00=Perhaps there will be a form for invoking the service here...
   popHandler00=Popping handler {0}
  -port00=Target Port #
   problemDeploying00=Problem deploying!
   process00=Processing ''{0}''
   processFile00=Processing file {0}
  -proxy00=Proxy
   pushHandler00=Pushing handler {0}
   quit00={0} quitting.
   quitRequest00=Administration service requested to quit, quitting.
  @@ -412,6 +476,8 @@
   # NOTE:  in typeNotSet00, do not translate "Part"
   typeNotSet00=Type attribute on Part ''{0}'' is not set
   
  +types00=Types:
  +
   # NOTE:  in typeSetNotAllowed00, do not translate "Type"
   typeSetNotAllowed00={0} disallows setting of Type
   unauth00=Unauthorized
  @@ -422,6 +488,10 @@
   unknownHost00=Unknown host - could not verify admininistrator access
   unknownType00=Unknown type:  {0}
   unknownType01=Unknown type to {0}
  +
  +# NOTE: in unlikely00, do not translate "URL", "Wsdl2java"
  +unlikely00=unlikely as URL was validated in Wsdl2java
  +
   unregistered00=Unregistered type:  {0}
   usage00=Usage:  {0}
   user00=User:  {0}
  @@ -432,7 +502,17 @@
   # NOTE:  in withParent00, do not translate "SOAPTypeMappingRegistry"
   withParent00=SOAPTypeMappingRegistry with parent
   wsdlError00=Error processing WSDL document: {0} {1}
  +
  +# NOTE:  in wsdlGenLine00, do not translate "WSDL"
  +wsdlGenLine00=This file was auto-generated from WSDL
  +
  +# NOTE:  in wsdlGenLine01, do not translate "Apache Axis Wsdl2java"
  +wsdlGenLine01=by the Apache Axis Wsdl2java emitter.
  +
   wsdlMissing00=Missing WSDL document
  +
  +# NOTE:  in wsdlService00, do not translate "WSDL service"
  +wsdlService00=Services from {0} WSDL service
   
   # NOTE:  in xml entries, do not translate "XML"
   xmlRecd00=XML received:
  
  
  
  1.97      +9 -6      xml-axis/java/src/org/apache/axis/wsdl/Emitter.java
  
  Index: Emitter.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/Emitter.java,v
  retrieving revision 1.96
  retrieving revision 1.97
  diff -u -r1.96 -r1.97
  --- Emitter.java	2001/11/02 16:11:08	1.96
  +++ Emitter.java	2001/11/09 15:02:17	1.97
  @@ -56,6 +56,7 @@
   
   import com.ibm.wsdl.xml.WSDLReader;
   
  +import org.apache.axis.utils.JavaUtils;
   import org.apache.axis.utils.XMLUtils;
   
   import org.w3c.dom.Document;
  @@ -148,14 +149,15 @@
        */
       public void emit(String uri) throws IOException {
           if (bVerbose)
  -            System.out.println("Parsing XML File: " + uri);
  +            System.out.println(JavaUtils.getMessage("parsing00", uri));
   
           try {
               emit(XMLUtils.newDocument(uri));
           }
           catch (Throwable t) {
               t.printStackTrace();
  -            System.out.println("Error in parsing: " + t.getMessage());
  +            System.out.println(
  +                    JavaUtils.getMessage("parseError00", t.getMessage()));
           }
       } // emit
   
  @@ -182,7 +184,8 @@
           }
           catch (Throwable t) {
               t.printStackTrace();
  -            System.out.println("Error in parsing: " + t.getMessage());
  +            System.out.println(
  +                    JavaUtils.getMessage("parseError00", t.getMessage()));
           }
       } // emit
   
  @@ -194,7 +197,7 @@
           if (doc != null) {
               emitFactory.buildTypes(doc);
               if (bVerbose) {
  -                System.out.println("Types:");
  +                System.out.println(JavaUtils.getMessage("types00"));
                   emitFactory.dump();
               }
               // Output Java classes for types
  @@ -510,7 +513,7 @@
                   Map allInputs = inputMsg.getParts();
                   Collection orderedInputs = inputMsg.getOrderedParts(parameterOrder);
                   if (allInputs.size() != orderedInputs.size()) {
  -                    throw new IOException("Emitter failure.  All input parts must be listed
in the parameterOrder attribute of " + operation.getName());
  +                    throw new IOException(JavaUtils.getMessage("emitFail00"));
                   }
               }
           }
  @@ -551,7 +554,7 @@
                       addOutParm(outputs, outdex, parameters, true);
                   }
                   else {
  -                    System.err.println("!!! " + name + " not found as an input OR an output
part!");
  +                    System.err.println(JavaUtils.getMessage("noPart00", name));
                   }
               }
           }
  
  
  
  1.4       +4 -1      xml-axis/java/src/org/apache/axis/wsdl/JavaBindingWriter.java
  
  Index: JavaBindingWriter.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/JavaBindingWriter.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- JavaBindingWriter.java	2001/10/31 21:46:07	1.3
  +++ JavaBindingWriter.java	2001/11/09 15:02:17	1.4
  @@ -61,6 +61,8 @@
   import javax.wsdl.Binding;
   import javax.wsdl.QName;
   
  +import org.apache.axis.utils.JavaUtils;
  +
   /**
   * This is Wsdl2java's Binding Writer.  It writes the following files, as appropriate:
   * <bindingName>Stub.java, <bindingName>Skeleton.java, <bindingName>Impl.java.
  @@ -90,7 +92,8 @@
                   }
               }
               catch (IOException ioe) {
  -                System.err.println("Error determining if " + fileName + " already exists.
 Will not generate this file.");
  +                System.err.println(
  +                        JavaUtils.getMessage("fileExistError00", fileName));
               }
           }
       } // ctor
  
  
  
  1.2       +4 -1      xml-axis/java/src/org/apache/axis/wsdl/JavaComplexTypeWriter.java
  
  Index: JavaComplexTypeWriter.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/JavaComplexTypeWriter.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- JavaComplexTypeWriter.java	2001/10/31 15:18:22	1.1
  +++ JavaComplexTypeWriter.java	2001/11/09 15:02:17	1.2
  @@ -60,6 +60,8 @@
   
   import javax.wsdl.QName;
   
  +import org.apache.axis.utils.JavaUtils;
  +
   import org.w3c.dom.Node;
   
   /**
  @@ -75,7 +77,8 @@
       protected JavaComplexTypeWriter(
               Emitter emitter,
               Type type, Vector elements) {
  -        super(emitter, type.getQName(), "", "java", "Generating type implementation:  ");
  +        super(emitter, type.getQName(), "", "java",
  +                JavaUtils.getMessage("genType00"));
           this.type = type;
           this.elements = elements;
       } // ctor
  
  
  
  1.2       +7 -3      xml-axis/java/src/org/apache/axis/wsdl/JavaDeployWriter.java
  
  Index: JavaDeployWriter.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/JavaDeployWriter.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- JavaDeployWriter.java	2001/10/31 17:28:55	1.1
  +++ JavaDeployWriter.java	2001/11/09 15:02:17	1.2
  @@ -67,6 +67,8 @@
   import javax.wsdl.QName;
   import javax.wsdl.Service;
   
  +import org.apache.axis.utils.JavaUtils;
  +
   /**
   * This is Wsdl2java's deploy Writer.  It writes the deploy.java file.
   */
  @@ -81,7 +83,7 @@
                   new QName(definition.getTargetNamespace(), "deploy"),
                   "",
                   "xml",
  -                "Generating deployment document:  ");
  +                JavaUtils.getMessage("genDeploy00"));
           this.definition = definition;
       } // ctor
   
  @@ -103,7 +105,7 @@
               pw.close();
           }
           catch (IOException e) {
  -            System.err.println("Failed to write deployment documents");
  +            System.err.println(JavaUtils.getMessage("genDeployFail00"));
               e.printStackTrace();
           }
       } // writeFileBody
  @@ -118,7 +120,9 @@
               Service myService = (Service) mapIterator.next();
   
               pw.println();
  -            pw.println("   <!-- Services from " + myService.getQName().getLocalPart()
+ " WSDL service -->");
  +            pw.println("   <!-- " + JavaUtils.getMessage(
  +                    "wsdlService00", myService.getQName().getLocalPart())
  +                    + " -->");
               pw.println();
   
               for (Iterator portIterator = myService.getPorts().values().iterator(); portIterator.hasNext();)
{
  
  
  
  1.3       +5 -2      xml-axis/java/src/org/apache/axis/wsdl/JavaEnumTypeWriter.java
  
  Index: JavaEnumTypeWriter.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/JavaEnumTypeWriter.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- JavaEnumTypeWriter.java	2001/11/01 16:50:47	1.2
  +++ JavaEnumTypeWriter.java	2001/11/09 15:02:17	1.3
  @@ -58,6 +58,8 @@
   
   import java.util.Vector;
   
  +import org.apache.axis.utils.JavaUtils;
  +
   import org.w3c.dom.Node;
   
   /**
  @@ -73,7 +75,8 @@
       protected JavaEnumTypeWriter(
               Emitter emitter,
               Type type, Vector elements) {
  -        super(emitter, type.getQName(), "", "java", "Generating type implementation:  ");
  +        super(emitter, type.getQName(), "", "java",
  +                JavaUtils.getMessage("genType00"));
           this.type = type;
           this.elements = elements;
       } // ctor
  @@ -108,7 +111,7 @@
           pw.println("");
   
           // A protected constructor is used to create the static enumeration values
  -        pw.println("    // Constructor");
  +        pw.println("    // " + JavaUtils.getMessage("ctor00"));
           pw.println("    protected " + javaName + "(" + baseType + " value) {");
           pw.println("        _value_ = value;");
           pw.println("        _table_.put(_value_,this);");
  
  
  
  1.2       +3 -1      xml-axis/java/src/org/apache/axis/wsdl/JavaFaultWriter.java
  
  Index: JavaFaultWriter.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/JavaFaultWriter.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- JavaFaultWriter.java	2001/10/31 21:46:07	1.1
  +++ JavaFaultWriter.java	2001/11/09 15:02:17	1.2
  @@ -61,6 +61,8 @@
   import javax.wsdl.Fault;
   import javax.wsdl.QName;
   
  +import org.apache.axis.utils.JavaUtils;
  +
   /**
   * This is Wsdl2java's Fault Writer.  It writes the <faultName>.java file.
   * NOTE:  this must be rewritten.  It doesn't follow JAX-RPC.
  @@ -72,7 +74,7 @@
        * Constructor.
        */
       protected JavaFaultWriter(Emitter emitter, QName qname, Fault fault) {
  -        super(emitter, qname, "", "java", "Generating Fault class:  ");
  +        super(emitter, qname, "", "java", JavaUtils.getMessage("genFault00"));
           this.fault = fault;
       } // ctor
   
  
  
  
  1.2       +5 -2      xml-axis/java/src/org/apache/axis/wsdl/JavaHolderWriter.java
  
  Index: JavaHolderWriter.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/JavaHolderWriter.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- JavaHolderWriter.java	2001/10/31 15:18:22	1.1
  +++ JavaHolderWriter.java	2001/11/09 15:02:17	1.2
  @@ -56,6 +56,8 @@
   
   import java.io.IOException;
   
  +import org.apache.axis.utils.JavaUtils;
  +
   /**
   * This is Wsdl2java's Holder Writer.  It writes the <typeName>Holder.java file.
   */
  @@ -66,7 +68,8 @@
        * Constructor.
        */
       protected JavaHolderWriter(Emitter emitter, Type type) {
  -        super(emitter, type.getQName(), "Holder", "java", "Generating type implementation
holder:  ");
  +        super(emitter, type.getQName(), "Holder", "java",
  +                JavaUtils.getMessage("genHolder00"));
           this.type = type;
       } // ctor
   
  @@ -85,7 +88,7 @@
           pw.println("        this._value = value;");
           pw.println("    }");
           pw.println();
  -        pw.println("    // ??? what else?");
  +        pw.println("    // ?++?");
           pw.println("}");
           pw.close();
       } // writeOperation
  
  
  
  1.3       +6 -2      xml-axis/java/src/org/apache/axis/wsdl/JavaImplWriter.java
  
  Index: JavaImplWriter.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/JavaImplWriter.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- JavaImplWriter.java	2001/11/02 16:11:08	1.2
  +++ JavaImplWriter.java	2001/11/09 15:02:17	1.3
  @@ -74,6 +74,8 @@
   import javax.wsdl.PortType;
   import javax.wsdl.QName;
   
  +import org.apache.axis.utils.JavaUtils;
  +
   import org.w3c.dom.Node;
   
   import com.ibm.wsdl.extensions.soap.SOAPBody;
  @@ -94,7 +96,8 @@
               Emitter emitter,
               Binding binding,
               HashMap operationParameters) {
  -        super(emitter, binding.getQName(), "Impl", "java", "Generating server-side implementation
template:  ");
  +        super(emitter, binding.getQName(), "Impl", "java",
  +                JavaUtils.getMessage("genImpl00"));
           this.binding = binding;
           this.operationParameters = operationParameters;
       } // ctor
  @@ -104,7 +107,8 @@
        */
       protected void writeFileBody() throws IOException {
           if (operationParameters == null)
  -            throw new IOException("Emitter failure.  Can't find portType operation parameters
for binding " + qname);
  +            throw new IOException(
  +                    JavaUtils.getMessage("emitFail01", "" + qname));
   
           PortType portType = binding.getPortType();
           String portTypeName = emitter.emitFactory.getJavaName(portType.getQName());
  
  
  
  1.3       +4 -1      xml-axis/java/src/org/apache/axis/wsdl/JavaInterfaceWriter.java
  
  Index: JavaInterfaceWriter.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/JavaInterfaceWriter.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- JavaInterfaceWriter.java	2001/11/02 16:11:08	1.2
  +++ JavaInterfaceWriter.java	2001/11/09 15:02:17	1.3
  @@ -63,6 +63,8 @@
   import javax.wsdl.Operation;
   import javax.wsdl.PortType;
   
  +import org.apache.axis.utils.JavaUtils;
  +
   /**
   * This is Wsdl2java's PortType Writer.  It writes the <portTypeName>.java file
   * which contains the <portTypeName> interface.
  @@ -77,7 +79,8 @@
       protected JavaInterfaceWriter(
               Emitter emitter,
               PortType portType, HashMap operationParameters) {
  -        super(emitter, portType.getQName(), "", "java", "Generating portType interface:
 ");
  +        super(emitter, portType.getQName(), "", "java",
  +                JavaUtils.getMessage("genIface00"));
           this.portType = portType;
           this.operationParameters = operationParameters;
       } // ctor
  
  
  
  1.2       +11 -5     xml-axis/java/src/org/apache/axis/wsdl/JavaServiceImplWriter.java
  
  Index: JavaServiceImplWriter.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/JavaServiceImplWriter.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- JavaServiceImplWriter.java	2001/10/30 22:24:56	1.1
  +++ JavaServiceImplWriter.java	2001/11/09 15:02:17	1.2
  @@ -70,6 +70,8 @@
   
   import com.ibm.wsdl.extensions.soap.SOAPAddress;
   
  +import org.apache.axis.utils.JavaUtils;
  +
   /**
   * This is Wsdl2java's service writer.  It writes the <serviceName>.java file.
   */
  @@ -82,7 +84,8 @@
       protected JavaServiceImplWriter(
               Emitter emitter,
               Service service) {
  -        super(emitter, service.getQName(), "", "java", "Generating service class:  ");
  +        super(emitter, service.getQName(), "", "java",
  +                JavaUtils.getMessage("genService00"));
           this.service = service;
       } // ctor
   
  @@ -118,18 +121,20 @@
               String address = getAddressFromPort(p);
               if (address == null) {
                   // now what?
  -                throw new IOException("Emitter failure.  Can't find endpoint address in
port " + portName + " in service " + className);
  +                throw new IOException(JavaUtils.getMessage("emitFail02",
  +                        portName, className));
               }
               try {
                   URL ep = new URL(address);
               }
               catch (MalformedURLException e) {
  -                throw new IOException("Emitter failure.  Invalid endpoint address in port
" + portName + " in service " + className + ": " + address);
  +                throw new IOException(JavaUtils.getMessage("emitFail03",
  +                        new String[] {portName, className, address}));
               }
   
               // Write out the get<PortName> methods
               pw.println();
  -            pw.println("    // Use to get a proxy class for " + portName);
  +            pw.println("    // " + JavaUtils.getMessage("getProxy00", portName));
               writeComment(pw, p.getDocumentationElement());
               pw.println("    private final java.lang.String " + portName + "_address = \""
+ address + "\";");
   
  @@ -146,7 +151,8 @@
               pw.println("            endpoint = new java.net.URL(" + portName + "_address);");
               pw.println("        }");
               pw.println("        catch (java.net.MalformedURLException e) {");
  -            pw.println("            return null; // unlikely as URL was validated in wsdl2java");
  +            pw.println("            return null; // " +
  +                    JavaUtils.getMessage("unlikely00"));
               pw.println("        }");
               pw.println("        return get" + portName + "(endpoint);");
               pw.println("    }");
  
  
  
  1.3       +4 -1      xml-axis/java/src/org/apache/axis/wsdl/JavaServiceInterfaceWriter.java
  
  Index: JavaServiceInterfaceWriter.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/JavaServiceInterfaceWriter.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- JavaServiceInterfaceWriter.java	2001/11/02 16:11:08	1.2
  +++ JavaServiceInterfaceWriter.java	2001/11/09 15:02:17	1.3
  @@ -62,6 +62,8 @@
   import javax.wsdl.Operation;
   import javax.wsdl.PortType;
   
  +import org.apache.axis.utils.JavaUtils;
  +
   /**
   * This is Wsdl2java's service writer.  It writes the <serviceName>.java file.
   */
  @@ -76,7 +78,8 @@
               Emitter emitter,
               PortType portType,
               HashMap operationParameters) {
  -        super(emitter, portType.getQName(), "AXIS", "java", "Generating server-side PortType
interface:  ");
  +        super(emitter, portType.getQName(), "AXIS", "java",
  +                JavaUtils.getMessage("genIface01"));
           this.portType = portType;
           this.operationParameters = operationParameters;
       } // ctor
  
  
  
  1.3       +6 -2      xml-axis/java/src/org/apache/axis/wsdl/JavaSkelWriter.java
  
  Index: JavaSkelWriter.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/JavaSkelWriter.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- JavaSkelWriter.java	2001/11/02 16:11:08	1.2
  +++ JavaSkelWriter.java	2001/11/09 15:02:17	1.3
  @@ -68,6 +68,8 @@
   import com.ibm.wsdl.extensions.soap.SOAPBody;
   import com.ibm.wsdl.extensions.soap.SOAPOperation;
   
  +import org.apache.axis.utils.JavaUtils;
  +
   /**
   * This is Wsdl2java's skeleton writer.  It writes the <BindingName>Skeleton.java
   * file which contains the <bindingName>Skeleton class.
  @@ -83,7 +85,8 @@
               Emitter emitter,
               Binding binding,
               HashMap operationParameters) {
  -        super(emitter, binding.getQName(), "Skeleton", "java", "Generating server-side
skeleton:  ");
  +        super(emitter, binding.getQName(), "Skeleton", "java",
  +                JavaUtils.getMessage("genSkel00"));
           this.binding = binding;
           this.operationParameters = operationParameters;
       } // ctor
  @@ -93,7 +96,8 @@
        */
       protected void writeFileBody() throws IOException {
           if (operationParameters == null)
  -            throw new IOException("Emitter failure.  Can't find portType operation parameters
for binding " + qname);
  +            throw new IOException(
  +                    JavaUtils.getMessage("emitFail01", "" + qname));
   
           PortType portType = binding.getPortType();
           String portTypeName = emitter.emitFactory.getJavaName(portType.getQName());
  
  
  
  1.4       +14 -6     xml-axis/java/src/org/apache/axis/wsdl/JavaStubWriter.java
  
  Index: JavaStubWriter.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/JavaStubWriter.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- JavaStubWriter.java	2001/11/02 16:11:08	1.3
  +++ JavaStubWriter.java	2001/11/09 15:02:17	1.4
  @@ -79,6 +79,8 @@
   import com.ibm.wsdl.extensions.soap.SOAPBody;
   import com.ibm.wsdl.extensions.soap.SOAPOperation;
   
  +import org.apache.axis.utils.JavaUtils;
  +
   /**
   * This is Wsdl2java's stub writer.  It writes the <BindingName>Stub.java
   * file which contains the <bindingName>Stub class.
  @@ -94,7 +96,8 @@
               Emitter emitter,
               Binding binding,
               HashMap operationParameters) {
  -        super(emitter, binding.getQName(), "Stub", "java", "Generating client-side stub:
 ");
  +        super(emitter, binding.getQName(), "Stub", "java",
  +                JavaUtils.getMessage("genStub00"));
           this.binding = binding;
           this.operationParameters = operationParameters;
       } // ctor
  @@ -104,7 +107,8 @@
        */
       protected void writeFileBody() throws IOException {
           if (operationParameters == null)
  -            throw new IOException("Emitter failure.  Can't find portType operation parameters
for binding " + qname);
  +            throw new IOException(
  +                    JavaUtils.getMessage("emitFail01", "" + qname));
   
           PortType portType = binding.getPortType();
           String name = Utils.xmlNameToJava(qname.getLocalPart());
  @@ -149,17 +153,20 @@
           pw.println("        properties.put(name, value);");
           pw.println("    }");
           pw.println();
  -        pw.println("    // From javax.xml.rpc.Stub");
  +        pw.println("    // " +
  +                JavaUtils.getMessage("from00", "javax.xml.rpc.Stub"));
           pw.println("    public Object _getProperty(String name) {");
           pw.println("        return properties.get(name);");
           pw.println("    }");
           pw.println();
  -        pw.println("    // From javax.xml.rpc.Stub");
  +        pw.println("    // " +
  +                JavaUtils.getMessage("from00", "javax.xml.rpc.Stub"));
           pw.println("    public void _setTargetEndpoint(java.net.URL address) {");
           pw.println("        call.setProperty(org.apache.axis.transport.http.HTTPTransport.URL,
address.toString());");
           pw.println("    }");
           pw.println();
  -        pw.println("    // From javax.xml.rpc.Stub");
  +        pw.println("    // " +
  +                JavaUtils.getMessage("from00", "javax.xml.rpc.Stub"));
           pw.println("    public java.net.URL _getTargetEndpoint() {");
           pw.println("        try {");
           pw.println("            return new java.net.URL((String) call.getProperty(org.apache.axis.transport.http.HTTPTransport.URL));");
  @@ -169,7 +176,8 @@
           pw.println("        }");
           pw.println("    }");
           pw.println();
  -        pw.println("    // From javax.xml.rpc.Stub");
  +        pw.println("    // " +
  +                JavaUtils.getMessage("from00", "javax.xml.rpc.Stub"));
           pw.println("    public synchronized void setMaintainSession(boolean session) {");
           pw.println("        call.setMaintainSession(session);");
           pw.println("    }");
  
  
  
  1.3       +7 -2      xml-axis/java/src/org/apache/axis/wsdl/JavaTestCaseWriter.java
  
  Index: JavaTestCaseWriter.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/JavaTestCaseWriter.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- JavaTestCaseWriter.java	2001/11/02 16:11:08	1.2
  +++ JavaTestCaseWriter.java	2001/11/09 15:02:17	1.3
  @@ -67,6 +67,8 @@
   import javax.wsdl.PortType;
   import javax.wsdl.Service;
   
  +import org.apache.axis.utils.JavaUtils;
  +
   /**
   * This is Wsdl2java's TestCase writer.  It writes the <serviceName>TestCase.java
file.
   */
  @@ -81,7 +83,8 @@
               Emitter emitter,
               Service service,
               HashMap portTypeOperationParameters) {
  -        super(emitter, service.getQName(), "TestCase", "java", "Generating service test
case:  ");
  +        super(emitter, service.getQName(), "TestCase", "java",
  +                JavaUtils.getMessage("genTest00"));
           this.service = service;
           this.portTypeOperationParameters = portTypeOperationParameters;
       } // ctor
  @@ -149,7 +152,9 @@
           pw.print(portName);
           pw.println("();");
   
  -        pw.println("        assertTrue(\"Binding is null\", binding != null);");
  +        pw.println("        assertTrue(\"" +
  +                JavaUtils.getMessage("null00", "binding") +
  +                "\", binding != null);");
   
           this.writePortTestCode(portType);
   
  
  
  
  1.2       +6 -3      xml-axis/java/src/org/apache/axis/wsdl/JavaUndeployWriter.java
  
  Index: JavaUndeployWriter.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/JavaUndeployWriter.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- JavaUndeployWriter.java	2001/10/31 17:28:55	1.1
  +++ JavaUndeployWriter.java	2001/11/09 15:02:17	1.2
  @@ -65,6 +65,8 @@
   import javax.wsdl.QName;
   import javax.wsdl.Service;
   
  +import org.apache.axis.utils.JavaUtils;
  +
   /**
   * This is Wsdl2java's deploy Writer.  It writes the deploy.java file.
   */
  @@ -79,7 +81,7 @@
                   new QName(definition.getTargetNamespace(), "undeploy"),
                   "",
                   "xml",
  -                "Generating deployment document:  ");
  +                JavaUtils.getMessage("genUndeploy00"));
           this.definition = definition;
       } // ctor
   
  @@ -100,7 +102,7 @@
               pw.close();
           }
           catch (IOException e) {
  -            System.err.println("Failed to write deployment documents");
  +            System.err.println(JavaUtils.getMessage("genUndeployFail00"));
               e.printStackTrace();
           }
       } // writeFileBody
  @@ -115,7 +117,8 @@
               Service myService = (Service) mapIterator.next();
   
               pw.println();
  -            pw.println("   <!-- Services from " + myService.getQName().getLocalPart()
+ " WSDL service -->");
  +            pw.println("   <!-- " + JavaUtils.getMessage("wsdlService00",
  +                    myService.getQName().getLocalPart()) + " -->");
               pw.println();
   
               for (Iterator portIterator = myService.getPorts().values().iterator(); portIterator.hasNext();)
{
  
  
  
  1.5       +5 -3      xml-axis/java/src/org/apache/axis/wsdl/JavaWriter.java
  
  Index: JavaWriter.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/JavaWriter.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- JavaWriter.java	2001/10/31 21:46:07	1.4
  +++ JavaWriter.java	2001/11/09 15:02:17	1.5
  @@ -63,6 +63,8 @@
   
   import javax.wsdl.QName;
   
  +import org.apache.axis.utils.JavaUtils;
  +
   import org.w3c.dom.Element;
   
   /**
  @@ -124,7 +126,7 @@
           emitter.classList.add(packageName + "." + className);
           File file = new File(packageDirName, fileName);
           if (emitter.bVerbose) {
  -            System.out.println(message + file.getPath());
  +            System.out.println(message + ":  " + file.getPath());
           }
           pw = new PrintWriter(new FileWriter(file));
           writeFileHeader();
  @@ -138,8 +140,8 @@
           pw.println("/**");
           pw.println(" * " + fileName);
           pw.println(" *");
  -        pw.println(" * This file was auto-generated from WSDL");
  -        pw.println(" * by the Apache Axis Wsdl2java emitter.");
  +        pw.println(" * " + JavaUtils.getMessage("wsdlGenLine00"));
  +        pw.println(" * " + JavaUtils.getMessage("wsdlGenLine01"));
           pw.println(" */");
           pw.println();
   
  
  
  
  1.20      +23 -15    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.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- Wsdl2java.java	2001/10/30 13:20:14	1.19
  +++ Wsdl2java.java	2001/11/09 15:02:17	1.20
  @@ -59,6 +59,8 @@
   import org.apache.avalon.excalibur.cli.CLOptionDescriptor;
   import org.apache.avalon.excalibur.cli.CLUtil;
   
  +import org.apache.axis.utils.JavaUtils;
  +
   import java.util.HashMap;
   import java.util.List;
   
  @@ -92,39 +94,39 @@
           new CLOptionDescriptor("help",
                   CLOptionDescriptor.ARGUMENT_DISALLOWED,
                   HELP_OPT,
  -                "print this message and exit"),
  +                JavaUtils.getMessage("optionHelp00")),
           new CLOptionDescriptor("verbose",
                   CLOptionDescriptor.ARGUMENT_DISALLOWED,
                   VERBOSE_OPT,
  -                "print informational messages"),
  +                JavaUtils.getMessage("optionVerbose00")),
           new CLOptionDescriptor("skeleton",
                   CLOptionDescriptor.ARGUMENT_DISALLOWED,
                   SKELETON_OPT,
  -                "emit skeleton class for web service"),
  +                JavaUtils.getMessage("optionSkel00")),
           new CLOptionDescriptor("messageContext",
                   CLOptionDescriptor.ARGUMENT_DISALLOWED,
                   MESSAGECONTEXT_OPT,
  -                "emit a MessageContext parameter to skeleton methods"),
  +                JavaUtils.getMessage("optionMsgCtx00")),
           new CLOptionDescriptor("NStoPkg",
                   CLOptionDescriptor.DUPLICATES_ALLOWED + CLOptionDescriptor.ARGUMENTS_REQUIRED_2,
                   NAMESPACE_OPT,
  -                "mapping of namespace to package"),
  +                JavaUtils.getMessage("optionNStoPkg00")),
           new CLOptionDescriptor("output",
                   CLOptionDescriptor.ARGUMENT_REQUIRED,
                   OUTPUT_OPT,
  -                "output dir for emitted files"),
  +                JavaUtils.getMessage("optionOutput00")),
           new CLOptionDescriptor("deployScope",
                   CLOptionDescriptor.ARGUMENT_REQUIRED,
                   SCOPE_OPT,
  -                "add scope to deploy.xml: \"Application\", \"Request\", \"Session\""),
  +                JavaUtils.getMessage("optionScope00")),
           new CLOptionDescriptor("testCase",
                   CLOptionDescriptor.ARGUMENT_DISALLOWED,
                   TEST_OPT,
  -                "emit junit testcase class for web service"),
  +                JavaUtils.getMessage("optionTest00")),
           new CLOptionDescriptor("noImports",
                   CLOptionDescriptor.ARGUMENT_DISALLOWED,
                   NOIMPORTS_OPT,
  -                "only generate code for the immediate WSDL document")
  +                JavaUtils.getMessage("optionImport00"))
       };
   
       /**
  @@ -142,7 +144,8 @@
   
           // Print parser errors, if any
           if (null != parser.getErrorString()) {
  -            System.err.println("Error: " + parser.getErrorString());
  +            System.err.println(
  +                    JavaUtils.getMessage("error01", parser.getErrorString()));
               printUsage();
           }
   
  @@ -209,7 +212,8 @@
                               emitter.setScope(Emitter.SESSION_SCOPE);
                           }
                           else {
  -                            System.err.println("Unrecognized scope:  " + scope + ".  Ignoring
it.");
  +                            System.err.println(
  +                                    JavaUtils.getMessage("badScope00", scope));
                           }
                           break;
   
  @@ -227,7 +231,7 @@
               // validate argument combinations
               //
               if (bMessageContext && !bSkeleton) {
  -                System.out.println("Error: --messageContext switch only valid with --skeleton");
  +                System.out.println(JavaUtils.getMessage("badMsgCtx00"));
                   printUsage();
               }
               if (wsdlURI == null) {
  @@ -256,9 +260,13 @@
       private static void printUsage() {
           String lSep = System.getProperty("line.separator");
           StringBuffer msg = new StringBuffer();
  -        msg.append("Wsdl2java stub generator").append(lSep);
  -        msg.append("Usage: java " + Wsdl2java.class.getName() + " [options] WSDL-URI").append(lSep);
  -        msg.append("Options: ").append(lSep);
  +        msg.append("Wsdl2java " +
  +                JavaUtils.getMessage("emitter00")).append(lSep);
  +        msg.append(
  +                JavaUtils.getMessage("usage00",
  +                "java " + Wsdl2java.class.getName() + " [options] WSDL-URI"))
  +                .append(lSep);
  +        msg.append(JavaUtils.getMessage("options00")).append(lSep);
           msg.append(CLUtil.describeOptions(Wsdl2java.options).toString());
           System.out.println(msg.toString());
           System.exit(1);
  
  
  

Mime
View raw message