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/toJava JavaBindingWriter.java JavaGeneratorFactory.java JavaImplWriter.java JavaInterfaceWriter.java JavaServiceIfaceWriter.java JavaServiceImplWriter.java JavaSkelWriter.java JavaStubWriter.java JavaTestCaseWriter.java
Date Thu, 16 May 2002 19:34:18 GMT
butek       02/05/16 12:34:18

  Modified:    java/src/org/apache/axis/wsdl/toJava JavaBindingWriter.java
                        JavaGeneratorFactory.java JavaImplWriter.java
                        JavaInterfaceWriter.java
                        JavaServiceIfaceWriter.java
                        JavaServiceImplWriter.java JavaSkelWriter.java
                        JavaStubWriter.java JavaTestCaseWriter.java
  Log:
  Changed all references from SEI to INTERFACE.  We decide SEI is too
  cryptic.  (It stands for Service Endpoint Interface.)
  
  Revision  Changes    Path
  1.8       +6 -5      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.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- JavaBindingWriter.java	14 May 2002 18:59:24 -0000	1.7
  +++ JavaBindingWriter.java	16 May 2002 19:34:17 -0000	1.8
  @@ -79,11 +79,12 @@
       Generator implWriter = null;
       Generator interfaceWriter = null;
   
  -    // This is the dynamic var key for the SEI name.  This name
  -    // could either be derived from the portType or the binding.
  -    // The generatorPass fills this dynamic var in and it is
  -    // used in the writers that need the SEI name.
  -    public static String SEI_NAME = "SEI name";
  +    // This is the dynamic var key for the SEI (Service Endpoint
  +    // Interface) name.  This name could either be derived from
  +    // the portType or the binding.  The generatorPass fills
  +    // this dynamic var in and it is used in the writers that
  +    // need this SEI name.
  +    public static String INTERFACE_NAME = "interface name";
   
       /**
        * Constructor.
  
  
  
  1.5       +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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- JavaGeneratorFactory.java	14 May 2002 23:46:34 -0000	1.4
  +++ JavaGeneratorFactory.java	16 May 2002 19:34:17 -0000	1.5
  @@ -177,7 +177,7 @@
           javifyNames(symbolTable);
           setFaultContext(symbolTable);
           resolveNameClashes(symbolTable);
  -        determineSEINames(symbolTable);
  +        determineInterfaceNames(symbolTable);
           if (emitter.isAllWanted()) {
               setAllReferencesToTrue();
           }
  @@ -531,14 +531,15 @@
           }
       }
   
  -    protected void determineSEINames(SymbolTable symbolTable) {
  +    protected void determineInterfaceNames(SymbolTable symbolTable) {
           Iterator it = symbolTable.getHashMap().values().iterator();
           while (it.hasNext()) {
               Vector v = (Vector) it.next();
               for (int i = 0; i < v.size(); ++i) {
                   SymTabEntry entry = (SymTabEntry) v.elementAt(i);
                   if (entry instanceof BindingEntry) {
  -                    // The SEI name is normally the portType name.
  +                    // The SEI (Service Endpoint Interface) name
  +                    // is normally the portType name.
                       // But the binding info MIGHT force the SEI
                       // name to be the binding name.
                       BindingEntry bEntry = (BindingEntry) entry;
  @@ -550,11 +551,11 @@
                           PortTypeEntry ptEntry = symbolTable.getPortTypeEntry(
                                   bEntry.getBinding().getPortType().getQName());
                           seiName = ptEntry.getName();
  -                    }                    bEntry.setDynamicVar(JavaBindingWriter.SEI_NAME,
seiName);
  +                    }                    bEntry.setDynamicVar(JavaBindingWriter.INTERFACE_NAME,
seiName);
                   }
               }
           }
  -    } // determineSEINames
  +    } // determineInterfaceNames
   
       /**
        * Messages, PortTypes, Bindings, and Services can share the same name.  If they do
in this
  
  
  
  1.20      +1 -1      xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaImplWriter.java
  
  Index: JavaImplWriter.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaImplWriter.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- JavaImplWriter.java	16 May 2002 18:50:09 -0000	1.19
  +++ JavaImplWriter.java	16 May 2002 19:34:17 -0000	1.20
  @@ -159,7 +159,7 @@
        * @return " implements <classes>"
        */
       protected String getImplementsText() {
  -        String portTypeName = (String) bEntry.getDynamicVar(JavaBindingWriter.SEI_NAME);
  +        String portTypeName = (String) bEntry.getDynamicVar(JavaBindingWriter.INTERFACE_NAME);
           String implementsText = " implements " + portTypeName;
           return implementsText;
       }
  
  
  
  1.9       +1 -1      xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaInterfaceWriter.java
  
  Index: JavaInterfaceWriter.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaInterfaceWriter.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- JavaInterfaceWriter.java	14 May 2002 18:59:24 -0000	1.8
  +++ JavaInterfaceWriter.java	16 May 2002 19:34:17 -0000	1.9
  @@ -91,7 +91,7 @@
           this.bEntry = bEntry;
   
           super.className = Utils.getJavaLocalName(
  -                (String) bEntry.getDynamicVar(JavaBindingWriter.SEI_NAME));
  +                (String) bEntry.getDynamicVar(JavaBindingWriter.INTERFACE_NAME));
           super.fileName = className + ".java";
       } // ctor
   
  
  
  
  1.5       +1 -1      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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- JavaServiceIfaceWriter.java	14 May 2002 18:59:24 -0000	1.4
  +++ JavaServiceIfaceWriter.java	16 May 2002 19:34:17 -0000	1.5
  @@ -140,7 +140,7 @@
   
               // If there is not literal use, the interface name is the portType name.
               // Otherwise it is the binding name.
  -            String bindingType = (String) bEntry.getDynamicVar(JavaBindingWriter.SEI_NAME);
  +            String bindingType = (String) bEntry.getDynamicVar(JavaBindingWriter.INTERFACE_NAME);
   
               // Write out the get<PortName> methods
               pw.println("    public String get" + portName + "Address();");
  
  
  
  1.12      +1 -1      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.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- JavaServiceImplWriter.java	14 May 2002 18:59:24 -0000	1.11
  +++ JavaServiceImplWriter.java	16 May 2002 19:34:17 -0000	1.12
  @@ -155,7 +155,7 @@
               String portName = Utils.xmlNameToJavaClass(p.getName());
               String stubClass = bEntry.getName() + "Stub";
   
  -            String bindingType = (String) bEntry.getDynamicVar(JavaBindingWriter.SEI_NAME);
  +            String bindingType = (String) bEntry.getDynamicVar(JavaBindingWriter.INTERFACE_NAME);
   
               // getPort(Class) must return a stub for an interface.  Collect all
               // the port interfaces so the getPort(Class) method can be constructed.
  
  
  
  1.25      +1 -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.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- JavaSkelWriter.java	14 May 2002 18:59:24 -0000	1.24
  +++ JavaSkelWriter.java	16 May 2002 19:34:17 -0000	1.25
  @@ -111,7 +111,7 @@
           PortTypeEntry ptEntry =
                   symbolTable.getPortTypeEntry(portType.getQName());
   
  -        String portTypeName = (String) bEntry.getDynamicVar(JavaBindingWriter.SEI_NAME);
  +        String portTypeName = (String) bEntry.getDynamicVar(JavaBindingWriter.INTERFACE_NAME);
           boolean isRPC = true;
           if (bEntry.getBindingStyle() == BindingEntry.STYLE_DOCUMENT) {
               isRPC = false;
  
  
  
  1.59      +1 -1      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.58
  retrieving revision 1.59
  diff -u -r1.58 -r1.59
  --- JavaStubWriter.java	14 May 2002 18:59:24 -0000	1.58
  +++ JavaStubWriter.java	16 May 2002 19:34:17 -0000	1.59
  @@ -124,7 +124,7 @@
                   symbolTable.getPortTypeEntry(portType.getQName());
   
           String portTypeName = 
  -                (String) bEntry.getDynamicVar(JavaBindingWriter.SEI_NAME);
  +                (String) bEntry.getDynamicVar(JavaBindingWriter.INTERFACE_NAME);
           boolean isRPC = true;
           if (bEntry.getBindingStyle() == BindingEntry.STYLE_DOCUMENT) {
               isRPC = false;
  
  
  
  1.26      +1 -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.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- JavaTestCaseWriter.java	14 May 2002 18:59:24 -0000	1.25
  +++ JavaTestCaseWriter.java	16 May 2002 19:34:17 -0000	1.26
  @@ -179,7 +179,7 @@
               String testMethodName = "test" + counter++ + portName + javaOpName;
               pw.println("    public void " + testMethodName + "() {");
   
  -            String bindingType = (String) bEntry.getDynamicVar(JavaBindingWriter.SEI_NAME);
  +            String bindingType = (String) bEntry.getDynamicVar(JavaBindingWriter.INTERFACE_NAME);
               writeBindingAssignment(bindingType, portName);
   
               pw.println("        try {");
  
  
  

Mime
View raw message