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/test/wsdl Wsdl2javaAntTask.java Wsdl2javaTestSuite.xml
Date Thu, 06 Dec 2001 13:11:53 GMT
butek       01/12/06 05:11:53

  Modified:    java/src/org/apache/axis/wsdl Emitter.java
                        JavaImplWriter.java JavaPortTypeWriter.java
                        JavaSkelWriter.java JavaWriterFactory.java
                        Parameters.java Wsdl2java.java
               java/test/wsdl Wsdl2javaAntTask.java Wsdl2javaTestSuite.xml
  Removed:     java/src/org/apache/axis/wsdl
                        JavaServiceInterfaceWriter.java
  Log:
  Removed Wsdl2java --messageContext option and all the code associated with it.
  
  Revision  Changes    Path
  1.111     +0 -33     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.110
  retrieving revision 1.111
  diff -u -r1.110 -r1.111
  --- Emitter.java	2001/12/04 19:43:29	1.110
  +++ Emitter.java	2001/12/06 13:11:53	1.111
  @@ -94,7 +94,6 @@
       protected Document doc = null;
       protected Definition def = null;
       protected boolean bEmitSkeleton = false;
  -    protected boolean bMessageContext = false;
       protected boolean bEmitTestCase = false;
       protected boolean bVerbose = false;
       protected boolean bGenerateImports = true;
  @@ -116,22 +115,6 @@
       } // ctor
   
       /**
  -     * Construct an Emitter that initially looks like the given Emitter.
  -     */
  -    public Emitter(Emitter that) {
  -        this.bEmitSkeleton    = that.bEmitSkeleton;
  -        this.bMessageContext  = that.bMessageContext;
  -        this.bEmitTestCase    = that.bEmitTestCase;
  -        this.bVerbose         = that.bVerbose;
  -        this.bGenerateImports = that.bGenerateImports;
  -        this.outputDir        = that.outputDir;
  -        this.scope            = that.scope;
  -        this.namespaces       = that.namespaces;
  -        this.writerFactory    = that.writerFactory;
  -        this.symbolTable      = that.symbolTable;
  -    } // ctor
  -
  -    /**
        * Call this method if you have a uri for the WSDL document
        */
       public void emit(String uri) throws IOException, WSDLException {
  @@ -288,22 +271,6 @@
        */
       public void generateTestCase(boolean value) {
           this.bEmitTestCase = value;
  -    }
  -
  -    /**
  -     * Turn on/off server Message Context parameter in skeleton
  -     * @param boolean value
  -     */
  -    public void generateMessageContext(boolean value) {
  -        this.bMessageContext = value;
  -    }
  -
  -    /**
  -     * Is Message Context parm creation flag set
  -     * @return boolean value
  -     */
  -    public boolean getMessageContext() {
  -        return this.bMessageContext;
       }
   
       /**
  
  
  
  1.9       +1 -9      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.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- JavaImplWriter.java	2001/11/30 13:51:31	1.8
  +++ JavaImplWriter.java	2001/12/06 13:11:53	1.9
  @@ -112,9 +112,6 @@
           PortTypeEntry ptEntry = symbolTable.getPortTypeEntry(portType.getQName());
           String portTypeName = ptEntry.getName();
           pw.print("public class " + className + " implements " + portTypeName);
  -        if (emitter.bMessageContext) {
  -            pw.print("Axis");
  -        }
           pw.println(" {");
   
           List operations = binding.getBindingOperations();
  @@ -129,12 +126,7 @@
       } // writeFileBody
   
       private void writeOperation(Parameters parms) throws IOException {
  -        if (emitter.bMessageContext) {
  -            pw.println(parms.axisSignature + " {");
  -        }
  -        else {
  -            pw.println(parms.signature + " {");
  -        }
  +        pw.println(parms.signature + " {");
           if (parms.returnType != null) {
               pw.print("        return ");
   
  
  
  
  1.7       +0 -7      xml-axis/java/src/org/apache/axis/wsdl/JavaPortTypeWriter.java
  
  Index: JavaPortTypeWriter.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/JavaPortTypeWriter.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- JavaPortTypeWriter.java	2001/12/04 19:34:56	1.6
  +++ JavaPortTypeWriter.java	2001/12/06 13:11:53	1.7
  @@ -68,7 +68,6 @@
   */
   public class JavaPortTypeWriter implements Writer {
       private Writer interfaceWriter = null;
  -    private Writer serviceInterfaceWriter = null;
   
       /**
        * Constructor.
  @@ -82,9 +81,6 @@
           if (ptEntry.isReferenced()) {
               interfaceWriter =
                 new JavaInterfaceWriter(emitter, ptEntry, symbolTable);
  -            if (emitter.bEmitSkeleton && emitter.bMessageContext) {
  -                serviceInterfaceWriter = new JavaServiceInterfaceWriter(emitter, ptEntry,
symbolTable);
  -            }
           }
       } // ctor
   
  @@ -94,9 +90,6 @@
       public void write() throws IOException {
           if (interfaceWriter != null) {
               interfaceWriter.write();
  -        }
  -        if (serviceInterfaceWriter != null) {
  -            serviceInterfaceWriter.write();
           }
       } // write
   } // class JavaPortTypeWriter
  
  
  
  1.12      +0 -9      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.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- JavaSkelWriter.java	2001/12/05 21:45:09	1.11
  +++ JavaSkelWriter.java	2001/12/06 13:11:53	1.12
  @@ -107,9 +107,6 @@
           }
   
           String implType = portTypeName + " impl";
  -        if (emitter.bMessageContext) {
  -            implType = portTypeName + "Axis impl";
  -        }
           pw.println("public class " + className + " {");
           pw.println("    private " + implType + ";");
           pw.println();
  @@ -191,12 +188,6 @@
           else
               pw.print("        Object ret = ");
           String call = "impl." + Utils.xmlNameToJava(operation.getName()) + "(";
  -        if (emitter.bMessageContext) {
  -            call = call + "ctx";
  -            if (parms.list.size() > 0)
  -                call = call + ", ";
  -        }
  -
           boolean needComma = false;
           for (int i = 0; i < parms.list.size(); ++i) {
               if (needComma)
  
  
  
  1.14      +0 -18     xml-axis/java/src/org/apache/axis/wsdl/JavaWriterFactory.java
  
  Index: JavaWriterFactory.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/JavaWriterFactory.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- JavaWriterFactory.java	2001/12/05 21:45:09	1.13
  +++ JavaWriterFactory.java	2001/12/06 13:11:53	1.14
  @@ -286,7 +286,6 @@
           int allOuts = parms.outputs + parms.inouts;
           String ret = parms.returnType == null ? "void" : parms.returnType.getName();
           String signature = "    public " + ret + " " + name + "(";
  -        String axisSig = "    public " + ret + " " + name + "(";
           String skelSig = null;
   
           if (allOuts == 0)
  @@ -294,16 +293,6 @@
           else
               skelSig = "    public Object " + name + "(";
   
  -        if (emitter.bMessageContext) {
  -            skelSig = skelSig + "org.apache.axis.MessageContext ctx";
  -            axisSig = axisSig + "org.apache.axis.MessageContext ctx";
  -            if ((parms.inputs + parms.inouts) > 0) {
  -                skelSig = skelSig + ", ";
  -            }
  -            if (parms.list.size() > 0) {
  -                axisSig = axisSig + ", ";
  -            }
  -        }
           boolean needComma = false;
   
           for (int i = 0; i < parms.list.size(); ++i) {
  @@ -311,7 +300,6 @@
   
               if (needComma) {
                   signature = signature + ", ";
  -                axisSig = axisSig + ", ";
                   if (p.mode != Parameter.OUT)
                       skelSig = skelSig + ", ";
               }
  @@ -319,30 +307,24 @@
                   needComma = true;
               if (p.mode == Parameter.IN) {
                   signature = signature + p.type.getName() + " " + p.name;
  -                axisSig = axisSig + p.type.getName() + " " + p.name;
                   skelSig = skelSig + p.type.getName() + " " + p.name;
               }
               else if (p.mode == Parameter.INOUT) {
                   signature = signature + Utils.holder(p.type) + " " + p.name;
  -                axisSig = axisSig + Utils.holder(p.type) + " " + p.name;
                   skelSig = skelSig + p.type.getName() + " " + p.name;
               }
               else// (p.mode == Parameter.OUT)
               {
                   signature = signature + Utils.holder(p.type) + " " + p.name;
  -                axisSig = axisSig + Utils.holder(p.type) + " " + p.name;
               }
           }
           signature = signature + ") throws java.rmi.RemoteException";
  -        axisSig = axisSig + ") throws java.rmi.RemoteException";
           skelSig = skelSig + ") throws java.rmi.RemoteException";
           if (parms.faultString != null) {
               signature = signature + ", " + parms.faultString;
  -            axisSig = axisSig + ", " + parms.faultString;
               skelSig = skelSig + ", " + parms.faultString;
           }
           parms.signature = signature;
  -        parms.axisSignature = axisSig;
           parms.skelSignature = skelSig;
       } // constructSignatures
   
  
  
  
  1.5       +0 -4      xml-axis/java/src/org/apache/axis/wsdl/Parameters.java
  
  Index: Parameters.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/Parameters.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Parameters.java	2001/12/04 19:34:56	1.4
  +++ Parameters.java	2001/12/06 13:11:53	1.5
  @@ -80,9 +80,6 @@
       // The signature that the skeleton will use
       public String skelSignature = null;
   
  -    // The signature that the skeleton impl
  -    public String axisSignature = null;
  -
       // The numbers of the respective parameters
       public int inputs = 0;
       public int inouts = 0;
  @@ -94,7 +91,6 @@
                   + "\nfaultString = " + faultString
                   + "\nsignature = " + signature
                   + "\nskelSignature = " + skelSignature
  -                + "\naxisSignature = " + axisSignature
                   + "\n(inputs, inouts, outputs) = (" + inputs + ", " + inouts + ", " + outputs
+ ")"
                   + "\nlist = " + list;
       } // toString
  
  
  
  1.22      +0 -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.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- Wsdl2java.java	2001/12/04 19:43:29	1.21
  +++ Wsdl2java.java	2001/12/06 13:11:53	1.22
  @@ -73,7 +73,6 @@
       // Define our short one-letter option identifiers.
       protected static final int HELP_OPT = 'h';
       protected static final int VERBOSE_OPT = 'v';
  -    protected static final int MESSAGECONTEXT_OPT = 'm';
       protected static final int SKELETON_OPT = 's';
       protected static final int NAMESPACE_OPT = 'N';
       protected static final int OUTPUT_OPT = 'o';
  @@ -104,10 +103,6 @@
                   CLOptionDescriptor.ARGUMENT_DISALLOWED,
                   SKELETON_OPT,
                   JavaUtils.getMessage("optionSkel00")),
  -        new CLOptionDescriptor("messageContext",
  -                CLOptionDescriptor.ARGUMENT_DISALLOWED,
  -                MESSAGECONTEXT_OPT,
  -                JavaUtils.getMessage("optionMsgCtx00")),
           new CLOptionDescriptor("NStoPkg",
                   CLOptionDescriptor.DUPLICATES_ALLOWED + CLOptionDescriptor.ARGUMENTS_REQUIRED_2,
                   NAMESPACE_OPT,
  @@ -139,7 +134,6 @@
        */
       public static void main(String args[]) {
           boolean bSkeleton = false;
  -        boolean bMessageContext = false;
           boolean bTestClass = false;
           String wsdlURI = null;
           HashMap namespaceMap = new HashMap();
  @@ -191,11 +185,6 @@
                           emitter.generateSkeleton(true);
                           break;
   
  -                    case MESSAGECONTEXT_OPT:
  -                        bMessageContext = true;
  -                        emitter.generateMessageContext(true);
  -                        break;
  -
                       case NAMESPACE_OPT:
                           String namespace = option.getArgument(0);
                           String packageName = option.getArgument(1);
  @@ -241,10 +230,6 @@
   
               // validate argument combinations
               //
  -            if (bMessageContext && !bSkeleton) {
  -                System.out.println(JavaUtils.getMessage("badMsgCtx00"));
  -                printUsage();
  -            }
               if (wsdlURI == null) {
                   printUsage();
               }
  
  
  
  1.8       +0 -8      xml-axis/java/test/wsdl/Wsdl2javaAntTask.java
  
  Index: Wsdl2javaAntTask.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/test/wsdl/Wsdl2javaAntTask.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- Wsdl2javaAntTask.java	2001/10/30 14:43:19	1.7
  +++ Wsdl2javaAntTask.java	2001/12/06 13:11:53	1.8
  @@ -71,7 +71,6 @@
   {
       private boolean verbose = false;
       private boolean skeleton = true ;
  -    private boolean messageContext = false;
       private boolean testCase = false;
       private boolean noImports = false;
       private HashMap namespaceMap = new HashMap();
  @@ -85,7 +84,6 @@
               log("Running Wsdl2javaAntTask with parameters:", Project.MSG_VERBOSE);
               log("\tverbose:" + verbose, Project.MSG_VERBOSE);
               log("\tskeleton:" + skeleton, Project.MSG_VERBOSE);
  -            log("\tmessageContext:" + messageContext, Project.MSG_VERBOSE);
               log("\ttestCase:" + testCase, Project.MSG_VERBOSE);
               log("\tnoImports:" + noImports, Project.MSG_VERBOSE);
               log("\tNStoPkg:" + namespaceMap, Project.MSG_VERBOSE);
  @@ -119,7 +117,6 @@
               emitter.generateTestCase(testCase);
               emitter.generateImports(!noImports);
               emitter.setOutputDir(output);
  -            emitter.generateMessageContext(messageContext);
               emitter.generateSkeleton(skeleton);
               emitter.verbose(verbose);
               emitter.emit(url);
  @@ -136,11 +133,6 @@
       // The setter for the "skeleton" attribute
       public void setSkeleton(String parameter) {
           this.skeleton = Project.toBoolean(parameter);
  -    }
  -
  -    // The setter for the "messagecontext" attribute
  -    public void setMessageContext(String parameter) {
  -        this.messageContext = Project.toBoolean(parameter);
       }
   
       // The setter for the "testcase" attribute
  
  
  
  1.33      +0 -27     xml-axis/java/test/wsdl/Wsdl2javaTestSuite.xml
  
  Index: Wsdl2javaTestSuite.xml
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/test/wsdl/Wsdl2javaTestSuite.xml,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- Wsdl2javaTestSuite.xml	2001/12/05 23:46:34	1.32
  +++ Wsdl2javaTestSuite.xml	2001/12/06 13:11:53	1.33
  @@ -33,7 +33,6 @@
                  output="build/work"
                  deployscope="session"
                  skeleton="yes"
  -               messagecontext="no"
                  noimports="no"
                  verbose="no"
                  testcase="no">
  @@ -45,7 +44,6 @@
                  output="build/work"
                  deployscope="session"
                  skeleton="yes"
  -               messagecontext="no"
                  noimports="no"
                  verbose="no"
                  testcase="no">
  @@ -58,7 +56,6 @@
                  output="build/work"
                  deployscope="session"
                  skeleton="yes"
  -               messagecontext="no"
                  noimports="no"
                  verbose="no"
                  testcase="no">
  @@ -91,7 +88,6 @@
                  output="build/work"
                  deployscope="session"
                  skeleton="yes"
  -               messagecontext="no"
                  noimports="no"
                  verbose="no"
                  testcase="no">
  @@ -103,7 +99,6 @@
                  output="build/work"
                  deployscope="session"
                  skeleton="yes"
  -               messagecontext="no"
                  noimports="no"
                  verbose="no"
                  testcase="no">
  @@ -117,7 +112,6 @@
                  output="build/work"
                  deployscope="none"
                  skeleton="yes"
  -               messagecontext="no"
                  noimports="no"
                  verbose="no"
                  testcase="yes">
  @@ -131,7 +125,6 @@
                  output="build/work"
                  deployscope="none"
                  skeleton="yes"
  -               messagecontext="no"
                  noimports="no"
                  verbose="no"
                  testcase="yes">
  @@ -148,7 +141,6 @@
                  output="build/work"
                  deployscope="none"
                  skeleton="yes"
  -               messagecontext="no"
                  noimports="no"
                  verbose="no"
                  testcase="no">
  @@ -161,7 +153,6 @@
                  output="build/work"
                  deployscope="none"
                  skeleton="yes"
  -               messagecontext="no"
                  noimports="no"
                  verbose="no"
                  testcase="no">
  @@ -175,7 +166,6 @@
                  output="build/work"
                  deployscope="none"
                  skeleton="yes"
  -               messagecontext="no"
                  noimports="no"
                  verbose="no"
                  testcase="no">
  @@ -186,7 +176,6 @@
                  output="build/work"
                  deployscope="none"
                  skeleton="yes"
  -               messagecontext="no"
                  noimports="no"
                  verbose="no"
                  testcase="no">
  @@ -201,7 +190,6 @@
                  testcase="no"
                  deployscope="none"
                  skeleton="yes"
  -               messagecontext="no"
                  verbose="yes"
                  noimports="no">
           <mapping namespace="http://soapinterop.org/" package="interop.echoheader"/>
  @@ -215,7 +203,6 @@
                  testcase="no"
                  deployscope="none"
                  skeleton="yes"
  -               messagecontext="no"
                  verbose="no"
                  noimports="no">
           <mapping namespace="http://soapinterop.org/" package="interop.echoheadersvc"/>
  @@ -228,7 +215,6 @@
                  testcase="no"
                  deployscope="none"
                  skeleton="yes"
  -               messagecontext="no"
                  verbose="no"
                  noimports="no">
           <mapping namespace="http://soapinterop.org/" package="mssoapinterop.interopb"/>
  @@ -240,7 +226,6 @@
                  testcase="no"
                  deployscope="none"
                  skeleton="yes"
  -               messagecontext="no"
                  verbose="yes"
                  noimports="no">
           <mapping namespace="http://soapinterop.org/" package="mssoapinterop.interopbtyped"/>
  @@ -252,7 +237,6 @@
                  testcase="no"
                  deployscope="none"
                  skeleton="yes"
  -               messagecontext="no"
                  verbose="no"
                  noimports="no">
           <mapping namespace="http://soapinterop.org" package="mssoapinterop.interopc"/>
  @@ -266,7 +250,6 @@
                  testcase="yes"
                  deployscope="none"
                  skeleton="yes"
  -               messagecontext="no"
                  verbose="no"
                  noimports="no">
           <mapping namespace="http://www.capeclear.com/AirportWeather.wsdl" package="test.clash"/>
  @@ -279,7 +262,6 @@
                  testcase="yes"
                  deployscope="none"
                  skeleton="yes"
  -               messagecontext="no"
                  verbose="no"
                  noimports="no">
           <mapping namespace="http://test.com/wsdl/faults" package="test.faults.wsdl"/>
  @@ -291,7 +273,6 @@
                  testcase="no"
                  deployscope="none"
                  skeleton="yes"
  -               messagecontext="no"
                  verbose="no"
                  noimports="no">
           <mapping namespace="urn:uddi-org:api" package="org.uddi.api"/>
  @@ -302,7 +283,6 @@
                  testcase="no"
                  deployscope="none"
                  skeleton="yes"
  -               messagecontext="no"
                  verbose="no"
                  noimports="no">
           <mapping namespace="urn:uddi-org:api" package="org.uddi.api"/>
  @@ -316,7 +296,6 @@
                  testcase="no"
                  deployscope="none"
                  skeleton="yes"
  -               messagecontext="no"
                  verbose="no"
                  noimports="no">
           <mapping namespace="urn:vgx-realtime" package="com.velocigen.thor"/>
  @@ -329,7 +308,6 @@
                  testcase="no"
                  deployscope="none"
                  skeleton="yes"
  -               messagecontext="no"
                  verbose="no"
                  noimports="no">
       </wsdl2java>
  @@ -342,7 +320,6 @@
                  testcase="no"
                  deployscope="none"
                  skeleton="yes"
  -               messagecontext="no"
                  verbose="yes"
                  noimports="no">
       </wsdl2java>
  @@ -353,7 +330,6 @@
                  output="build/work"
                  deployscope="none"
                  skeleton="no"
  -               messagecontext="no"
                  noimports="no"
                  verbose="no"
                  testcase="no">
  @@ -366,7 +342,6 @@
                  output="build/work"
                  deployscope="none"
                  skeleton="yes"
  -               messagecontext="no"
                  noimports="no"
                  verbose="yes"
                  testcase="yes">
  @@ -380,7 +355,6 @@
                  testcase="no"
                  deployscope="none"
                  skeleton="yes"
  -               messagecontext="no"
                  verbose="yes"
                  noimports="no">
       </wsdl2java>
  @@ -390,7 +364,6 @@
                  testcase="no"
                  deployscope="none"
                  skeleton="yes"
  -               messagecontext="no"
                  verbose="yes"
                  noimports="no">
       </wsdl2java>
  
  
  

Mime
View raw message