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/src/org/apache/axis/wsdl/toJava JavaTestCaseWriter.java JavaServiceIfaceWriter.java JavaServiceImplWriter.java
Date Fri, 02 Aug 2002 22:12:48 GMT
rsitze      2002/08/02 15:12:48

  Modified:    java/src/org/apache/axis/wsdl/toJava JavaTestCaseWriter.java
                        JavaServiceIfaceWriter.java
                        JavaServiceImplWriter.java
  Log:
  Replace DiscoveryException in generated code with (original) ServiceException.
  
  Revision  Changes    Path
  1.36      +2 -2      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.35
  retrieving revision 1.36
  diff -u -r1.35 -r1.36
  --- JavaTestCaseWriter.java	2 Aug 2002 17:27:41 -0000	1.35
  +++ JavaTestCaseWriter.java	2 Aug 2002 22:12:48 -0000	1.36
  @@ -341,8 +341,8 @@
           pw.print("            binding = new " + sEntry.getName());
           pw.println("Locator" + "().get" + portName + "();");
           pw.println("        }");
  -        pw.println("        catch (javax.xml.rpc.DiscoveryException jre) {");
  -        pw.println("            throw new junit.framework.AssertionFailedError(\"JAX-RPCDiscoveryExceptionn
caught: \" + jre);");
  +        pw.println("        catch (" + javax.xml.rpc.ServiceException.class.getName() +
" jre) {");
  +        pw.println("            throw new junit.framework.AssertionFailedError(\"JAX-RPC
ServiceException caught: \" + jre);");
           pw.println("        }");
   
           pw.println("        assertTrue(\"" +
  
  
  
  1.9       +2 -2      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.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- JavaServiceIfaceWriter.java	2 Aug 2002 17:27:41 -0000	1.8
  +++ JavaServiceIfaceWriter.java	2 Aug 2002 22:12:48 -0000	1.9
  @@ -166,10 +166,10 @@
               pw.println("    public String get" + portName + "Address();");
               pw.println();
               pw.println("    public " + bindingType + " get" + portName
  -                    + "() throws javax.xml.rpc.DiscoveryException;");
  +                    + "() throws " + javax.xml.rpc.ServiceException.class.getName() + ";");
               pw.println();
               pw.println("    public " + bindingType + " get" + portName
  -                    + "(java.net.URL portAddress) throws javax.xml.rpc.DiscoveryException;");
  +                    + "(java.net.URL portAddress) throws " + javax.xml.rpc.ServiceException.class.getName()
+ ";");
           }
       } // writeFileBody
   
  
  
  
  1.18      +6 -6      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.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- JavaServiceImplWriter.java	2 Aug 2002 17:27:41 -0000	1.17
  +++ JavaServiceImplWriter.java	2 Aug 2002 22:12:48 -0000	1.18
  @@ -211,7 +211,7 @@
               pw.println("    }" );
               pw.println("" );
   
  -            pw.println("    public " + bindingType + " get" + portName + "() throws javax.xml.rpc.DiscoveryException
{");
  +            pw.println("    public " + bindingType + " get" + portName + "() throws " +
javax.xml.rpc.ServiceException.class.getName() + " {");
               pw.println("       java.net.URL endpoint;");
               pw.println("        try {");
               pw.println("            endpoint = new java.net.URL(" + portName + "_address);");
  @@ -223,7 +223,7 @@
               pw.println("        return get" + portName + "(endpoint);");
               pw.println("    }");
               pw.println();
  -            pw.println("    public " + bindingType + " get" + portName + "(java.net.URL
portAddress) throws javax.xml.rpc.DiscoveryException {");
  +            pw.println("    public " + bindingType + " get" + portName + "(java.net.URL
portAddress) throws " + javax.xml.rpc.ServiceException.class.getName() + " {");
               pw.println("        try {");
               pw.println("            return new " + stubClass + "(portAddress, this);");
               pw.println("        }");
  @@ -244,9 +244,9 @@
               pw.println("     * " + JavaUtils.getMessage("getPortDoc04"));
           }
           pw.println("     */");
  -        pw.println("    public java.rmi.Remote getPort(Class serviceEndpointInterface)
throws javax.xml.rpc.DiscoveryException {");
  +        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.DiscoveryException(\""
  +            pw.println("        throw new " + javax.xml.rpc.ServiceException.class.getName()
+ "(\""
                       + JavaUtils.getMessage("noStub") + "  \" + (serviceEndpointInterface
== null ? \"null\" : serviceEndpointInterface.getName()));");
           }
           else {
  @@ -261,9 +261,9 @@
               }
               pw.println("        }");
               pw.println("        catch (Throwable t) {");
  -            pw.println("            throw new javax.xml.rpc.DiscoveryException(t);");
  +            pw.println("            throw new " + javax.xml.rpc.ServiceException.class.getName()
+ "(t);");
               pw.println("        }");
  -            pw.println("        throw new javax.xml.rpc.DiscoveryException(\""
  +            pw.println("        throw new " + javax.xml.rpc.ServiceException.class.getName()
+ "(\""
                       + JavaUtils.getMessage("noStub") + "  \" + (serviceEndpointInterface
== null ? \"null\" : serviceEndpointInterface.getName()));");
           }
           pw.println("    }");
  
  
  

Mime
View raw message