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 sc...@apache.org on 2002/01/14 16:24:03 UTC

cvs commit: xml-axis/java/src/org/apache/axis/wsdl Java2WSDL.java

scheu       02/01/14 07:24:03

  Modified:    java/src/org/apache/axis/utils resources.properties
               java/src/org/apache/axis/wsdl Java2WSDL.java
  Log:
  Java2WSDL -l option is now required if service element is generated...per axis-dev notes
  
  Revision  Changes    Path
  1.40      +1 -0      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.39
  retrieving revision 1.40
  diff -u -r1.39 -r1.40
  --- resources.properties	12 Jan 2002 16:44:13 -0000	1.39
  +++ resources.properties	14 Jan 2002 15:24:03 -0000	1.40
  @@ -613,3 +613,4 @@
   j2wmodeerror=Error Unrecognized Mode: {0} Use All, Interface or Implementation. Continuing with All. 
   
   optionSkeletonDeploy00=(true or false) Indicate whether to deploy skeleton or implementation class.
  +j2wMissingLocation00=The -l <location> option must be specified if the full wsdl or the implementation wsdl is requested.
  
  
  
  1.6       +8 -0      xml-axis/java/src/org/apache/axis/wsdl/Java2WSDL.java
  
  Index: Java2WSDL.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/Java2WSDL.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- Java2WSDL.java	3 Jan 2002 20:33:43 -0000	1.5
  +++ Java2WSDL.java	14 Jan 2002 15:24:03 -0000	1.6
  @@ -170,6 +170,7 @@
           String wsdlImplFilename = null;
           HashMap namespaceMap = new HashMap();
           int mode = Emitter.MODE_ALL;
  +        boolean locationSet = false;
   
           // Parse the arguments
           CLArgsParser parser = new CLArgsParser(args, options);
  @@ -263,6 +264,7 @@
   
                       case LOCATION_OPT:
                           emitter.setLocationUrl(option.getArgument());
  +                        locationSet = true;
                           break;
   
                       case LOCATION_IMPORT_OPT:
  @@ -273,6 +275,12 @@
   
               // Can't proceed without a class name
               if ((className == null)) {
  +                printUsage();
  +            }
  +
  +            if (!locationSet && (mode == Emitter.MODE_ALL ||
  +                                 mode == Emitter.MODE_IMPLEMENTATION)) {
  +                System.out.println(JavaUtils.getMessage("j2wMissingLocation00"));
                   printUsage();
               }