You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by di...@apache.org on 2004/10/29 14:30:49 UTC

cvs commit: ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws Generator.java SourceWriter.java WebServiceGeneratorImpl.java Genarator.java

dicka       2004/10/29 05:30:49

  Modified:    c/src/wsdl/org/apache/axis/wsdl/wsdl2ws SourceWriter.java
                        WebServiceGeneratorImpl.java
  Added:       c/src/wsdl/org/apache/axis/wsdl/wsdl2ws Generator.java
  Removed:     c/src/wsdl/org/apache/axis/wsdl/wsdl2ws Genarator.java
  Log:
  Correct spelling of Generator in WSDL2Ws tool
  
  Submitted by: Adrian Dick
  
  Revision  Changes    Path
  1.3       +1 -1      ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/SourceWriter.java
  
  Index: SourceWriter.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/SourceWriter.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- SourceWriter.java	9 Apr 2004 08:49:31 -0000	1.2
  +++ SourceWriter.java	29 Oct 2004 12:30:49 -0000	1.3
  @@ -17,7 +17,7 @@
   
   package org.apache.axis.wsdl.wsdl2ws;
   /**
  - * Write a source to genarated. This instances decides how the Genarator will behave . 
  + * Write a source to genarated. This instances decides how the Generator will behave . 
    * @author Srinath Perera (hemapani@opensource.lk)
    * @author Dimuthu Leelarathne (muthulee@opensource.lk)
    */
  
  
  
  1.2       +60 -60    ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/WebServiceGeneratorImpl.java
  
  Index: WebServiceGeneratorImpl.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/WebServiceGeneratorImpl.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- WebServiceGeneratorImpl.java	25 Oct 2004 15:27:49 -0000	1.1
  +++ WebServiceGeneratorImpl.java	29 Oct 2004 12:30:49 -0000	1.2
  @@ -41,12 +41,12 @@
   
           if (WrapperConstants.LANGUAGE_JAVA.equalsIgnoreCase(language))
           {
  -            (new Genarator(WrapperConstants.GENERATOR_WRAPPER_JAVA, wscontext))
  -                .genarate();
  -            (new Genarator(WrapperConstants.GENERATOR_SERVICE_JAVA, wscontext))
  -                .genarate();
  -            (new Genarator(WrapperConstants.GENERATOR_PARAM_JAVA, wscontext))
  -                .genarate();
  +            (new Generator(WrapperConstants.GENERATOR_WRAPPER_JAVA, wscontext))
  +                .generate();
  +            (new Generator(WrapperConstants.GENERATOR_SERVICE_JAVA, wscontext))
  +                .generate();
  +            (new Generator(WrapperConstants.GENERATOR_PARAM_JAVA, wscontext))
  +                .generate();
           }
           else
           {
  @@ -57,64 +57,64 @@
                       .SERVER
                       .equals(wscontext.getWrapInfo().getTargetEngine()))
                   {
  -                    (new Genarator(WrapperConstants.GENERATOR_WRAPPER_CPP,
  +                    (new Generator(WrapperConstants.GENERATOR_WRAPPER_CPP,
                           wscontext))
  -                        .genarate();
  -                    (new Genarator(WrapperConstants.GENERATOR_WRAPPER_HPP,
  +                        .generate();
  +                    (new Generator(WrapperConstants.GENERATOR_WRAPPER_HPP,
                           wscontext))
  -                        .genarate();
  -                    (new Genarator(WrapperConstants.GENERATOR_SERVICE_CPP,
  +                        .generate();
  +                    (new Generator(WrapperConstants.GENERATOR_SERVICE_CPP,
                           wscontext))
  -                        .genarate();
  -                    (new Genarator(WrapperConstants.GENERATOR_SERVICE_HPP,
  +                        .generate();
  +                    (new Generator(WrapperConstants.GENERATOR_SERVICE_HPP,
                           wscontext))
  -                        .genarate();
  -                    (new Genarator(WrapperConstants.GENERATOR_PARAM_CPP_ALL,
  +                        .generate();
  +                    (new Generator(WrapperConstants.GENERATOR_PARAM_CPP_ALL,
                           wscontext))
  -                        .genarate();
  -                    (new Genarator(WrapperConstants.GENERATOR_CLASSLOADER_CPP,
  +                        .generate();
  +                    (new Generator(WrapperConstants.GENERATOR_CLASSLOADER_CPP,
                           wscontext))
  -                        .genarate();
  -                    (new Genarator(WrapperConstants.GENERATOR_DEPLOYMENT,
  +                        .generate();
  +                    (new Generator(WrapperConstants.GENERATOR_DEPLOYMENT,
                           wscontext))
  -                        .genarate();
  -                    (new Genarator(WrapperConstants.GENERATOR_SERVER_EXCEPTION,
  +                        .generate();
  +                    (new Generator(WrapperConstants.GENERATOR_SERVER_EXCEPTION,
                           wscontext))
  -                        .genarate();
  -                    (new Genarator(WrapperConstants.GENERATOR_UNDEPLOYMENT,
  +                        .generate();
  +                    (new Generator(WrapperConstants.GENERATOR_UNDEPLOYMENT,
                           wscontext))
  -                        .genarate();
  +                        .generate();
                       /*
                        * Ensure the BuildScript generator is called last.
                        * If called earlier not all files will be added
                        * to the build script (Ex: to Makefile.am).
                        */
  -                    (new Genarator(WrapperConstants.GENERATOR_BUILDSCRIPT,
  +                    (new Generator(WrapperConstants.GENERATOR_BUILDSCRIPT,
                           wscontext))
  -                        .genarate();
  +                        .generate();
                   }
                   else
                   {
  -                    (new Genarator(WrapperConstants.GENERATOR_CLIENT_STUB_CPP,
  +                    (new Generator(WrapperConstants.GENERATOR_CLIENT_STUB_CPP,
                           wscontext))
  -                        .genarate();
  -                    (new Genarator(WrapperConstants.GENERATOR_CLIENT_STUB_HPP,
  +                        .generate();
  +                    (new Generator(WrapperConstants.GENERATOR_CLIENT_STUB_HPP,
                           wscontext))
  -                        .genarate();
  -                    (new Genarator(WrapperConstants.GENERATOR_CLIENT_EXCEPTION,
  +                        .generate();
  +                    (new Generator(WrapperConstants.GENERATOR_CLIENT_EXCEPTION,
                           wscontext))
  -                        .genarate();
  -                    (new Genarator(WrapperConstants.GENERATOR_PARAM_CPP_ALL,
  +                        .generate();
  +                    (new Generator(WrapperConstants.GENERATOR_PARAM_CPP_ALL,
                           wscontext))
  -                        .genarate();
  +                        .generate();
                       /*
                        * Ensure the BuildScript generator is called last.
                        * If called earlier not all files will be added
                        * to the build script (Ex: to Makefile.am).
                        */
  -                    (new Genarator(WrapperConstants.GENERATOR_BUILDSCRIPT,
  +                    (new Generator(WrapperConstants.GENERATOR_BUILDSCRIPT,
                           wscontext))
  -                        .genarate();
  +                        .generate();
                   }
               }
               else
  @@ -126,55 +126,55 @@
                           .SERVER
                           .equals(wscontext.getWrapInfo().getTargetEngine()))
                       {
  -                        (new Genarator(WrapperConstants.GENERATOR_WRAPPER_C,
  +                        (new Generator(WrapperConstants.GENERATOR_WRAPPER_C,
                               wscontext))
  -                            .genarate();
  -                        (new Genarator(WrapperConstants.GENERATOR_WRAPPER_H,
  +                            .generate();
  +                        (new Generator(WrapperConstants.GENERATOR_WRAPPER_H,
                               wscontext))
  -                            .genarate();
  -                        (new Genarator(WrapperConstants.GENERATOR_SERVICE_C,
  +                            .generate();
  +                        (new Generator(WrapperConstants.GENERATOR_SERVICE_C,
                               wscontext))
  -                            .genarate();
  -                        (new Genarator(WrapperConstants.GENERATOR_PARAM_C_ALL,
  +                            .generate();
  +                        (new Generator(WrapperConstants.GENERATOR_PARAM_C_ALL,
                               wscontext))
  -                            .genarate();
  -                        (new Genarator(WrapperConstants.GENERATOR_CLASSLOADER_C,
  +                            .generate();
  +                        (new Generator(WrapperConstants.GENERATOR_CLASSLOADER_C,
                               wscontext))
  -                            .genarate();
  -                        (new Genarator(WrapperConstants.GENERATOR_DEPLOYMENT,
  +                            .generate();
  +                        (new Generator(WrapperConstants.GENERATOR_DEPLOYMENT,
                               wscontext))
  -                            .genarate();
  -                        (new Genarator(WrapperConstants.GENERATOR_UNDEPLOYMENT,
  +                            .generate();
  +                        (new Generator(WrapperConstants.GENERATOR_UNDEPLOYMENT,
                               wscontext))
  -                            .genarate();
  +                            .generate();
                           /*
                            * Ensure the BuildScript generator is called last.
                            * If called earlier not all files will be added
                            * to the build script (Ex: to Makefile.am).
                            */
  -                        (new Genarator(WrapperConstants.GENERATOR_BUILDSCRIPT,
  +                        (new Generator(WrapperConstants.GENERATOR_BUILDSCRIPT,
                               wscontext))
  -                            .genarate();
  +                            .generate();
                       }
                       else
                       {
  -                        (new Genarator(WrapperConstants.GENERATOR_CLIENT_STUB_C,
  +                        (new Generator(WrapperConstants.GENERATOR_CLIENT_STUB_C,
                               wscontext))
  -                            .genarate();
  -                        (new Genarator(WrapperConstants.GENERATOR_CLIENT_STUB_H,
  +                            .generate();
  +                        (new Generator(WrapperConstants.GENERATOR_CLIENT_STUB_H,
                               wscontext))
  -                            .genarate();
  -                        (new Genarator(WrapperConstants.GENERATOR_PARAM_C_ALL,
  +                            .generate();
  +                        (new Generator(WrapperConstants.GENERATOR_PARAM_C_ALL,
                               wscontext))
  -                            .genarate();
  +                            .generate();
                           /*
                            * Ensure the BuildScript generator is called last.
                            * If called earlier not all files will be added
                            * to the build script (Ex: to Makefile.am).
                            */
  -                        (new Genarator(WrapperConstants.GENERATOR_BUILDSCRIPT,
  +                        (new Generator(WrapperConstants.GENERATOR_BUILDSCRIPT,
                               wscontext))
  -                            .genarate();
  +                            .generate();
                       }
                   }
                   else
  
  
  
  1.1                  ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/Generator.java
  
  Index: Generator.java
  ===================================================================
  /*
   *   Copyright 2003-2004 The Apache Software Foundation.
   *
   *   Licensed under the Apache License, Version 2.0 (the "License");
   *   you may not use this file except in compliance with the License.
   *   You may obtain a copy of the License at
   *
   *       http://www.apache.org/licenses/LICENSE-2.0
   *
   *   Unless required by applicable law or agreed to in writing, software
   *   distributed under the License is distributed on an "AS IS" BASIS,
   *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   *   See the License for the specific language governing permissions and
   *   limitations under the License.
   */
  
  package org.apache.axis.wsdl.wsdl2ws;
  
  import org.apache.axis.wsdl.wsdl2ws.info.WebServiceContext;
  
  /**
   * This is the basic Generator, the actual way the generator act depend on the 
   * source writer object inside the Generator 
   * @author Srinath Perera (hemapani@opensource.lk)
   * @author Dimuthu Leelarathne (muthulee@opensource.lk)
   */
  public class Generator
  {
      private SourceWriter sourceWriter;
  
      public Generator(int genaratorType, WebServiceContext wscontext)
          throws WrapperFault
      {
          this.sourceWriter =
              SourceWriterFactory.createSourceWriter(genaratorType, wscontext);
      }
  
      public void generate() throws WrapperFault
      {
          if (this.sourceWriter == null)
          {
              throw new WrapperFault("Can't find Matching Generator");
          }
          this.sourceWriter.writeSource();
      }
  }