axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hawk...@apache.org
Subject svn commit: r332111 - /webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/WSDL2Ws.java
Date Wed, 09 Nov 2005 19:23:50 GMT
Author: hawkeye
Date: Wed Nov  9 11:23:47 2005
New Revision: 332111

URL: http://svn.apache.org/viewcvs?rev=332111&view=rev
Log:
Removed make files from wsdl2ws options

Modified:
    webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/WSDL2Ws.java

Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/WSDL2Ws.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/WSDL2Ws.java?rev=332111&r1=332110&r2=332111&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/WSDL2Ws.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/WSDL2Ws.java Wed Nov  9
11:23:47 2005
@@ -71,11 +71,13 @@
  * 
  * @author hemapani@opensource.lk
  * @author Samisa Abeysinghe (sabeysinghe@virtusa.com)
+ * @author hawkeye (hawkinsj@uk.ibm.com)
  */
 public class WSDL2Ws
 {
     public static boolean verbose = false;
-    public static String makeSystem = null;
+    // we don't write out the make files anymore - 9th Nov 2005
+//    public static String makeSystem = null;
 
     private String language;
     private boolean wsdlWrappingStyle;
@@ -85,7 +87,6 @@
 
     private String serviceStyle = null;
 
-    //private boolean verbose = true;
     private String targetEndpointURI = null;
     private String transportURI = null;
     private String targetNameSpaceOfWSDL = null;
@@ -1126,7 +1127,7 @@
                             TypeEntry referencedType =defType.getRefType(); 
                             if(referencedType!=null && referencedType.getQName().getLocalPart().startsWith(">"))
                             {
-                                if(CopyOfWSDL2Ws.verbose)
+                                if(WSDL2Ws.verbose)
                                 {
                                     System.out.println( "got to expose "+defType.getQName().getLocalPart());
                                 }
@@ -1154,8 +1155,8 @@
                 + "-l<c++|c>              target language (c++|c) - default is c++\n"
                 + "-s<server|client>      target side (server|client) - default is
server\n"
 //                + "-w<wrapped|nonwrapped> wrapping style of the WSDL (wrapped|nonwrapped)
- default is wrapped - nonwrapped is currently not implemented\n"
-                + "-verbose, -v           be verbose\n"
-                + "-m<none|gnu>           generate make files (none|gnu) - default
is none\n");
+                + "-verbose, -v           be verbose\n");
+//                + "-m<none|gnu>           generate make files (none|gnu) - default
is none\n");
 
     }
     /**
@@ -1167,11 +1168,11 @@
      * ======= === ======
      * -o target output folder
      * -l target language(c|c++) default is c++
-     * -help (later ???? not emplemented)
+     * -help (later ???? not implemented)
      * -h print usage()
      * -s (client|server|both)  
-     * -w wrapping style of the WSDL (wrapped|nonwrapped) - default is wrapped - nonwrapped
is currently not implemented so removed option for -wnonwrapped
-     * -m create GNU make files
+     * ****** removed *******-w wrapping style of the WSDL (wrapped|nonwrapped) - default
is wrapped - nonwrapped is currently not implemented so removed option for -wnonwrapped
+     * ****** removed *******-m create GNU make files - this was failing and not supported
so removed.
      * 
      * Note:  PP - pull parser
      * @param args
@@ -1198,14 +1199,8 @@
                 return;
             }
             
-            // ensure that only wrapped style is used. 
-            if(data.isSet("w") && ! "wrapped".equalsIgnoreCase(data.getOptionBykey("w")))
-            {
-                usage();
-                return;
-            }
 
-            WSDL2Ws.makeSystem = data.getOptionBykey("m");
+            // WSDL2Ws.makeSystem = data.getOptionBykey("m");
             try
             {
 
@@ -1257,24 +1252,24 @@
                     return false;
                 }
             }
-            
-            //wrapped
-            String wrapped=data.getOptionBykey("w");
-            if(wrapped!=null)
+
+            // ensure that only wrapped style is used. 
+            if(data.isSet("w") && !"wrapped".equalsIgnoreCase(data.getOptionBykey("w")))
             {
-                if(!wrapped.equals("wrapped") && !wrapped.equals("nonwrapped"))
-                {
-                    return false;
-                }
+                usage();
+                return false;
             }
+            
             // make file generation
             String makeFiles = data.getOptionBykey("m");
             if(makeFiles!=null)
             {
-                if(!makeFiles.equals("none") && !makeFiles.equals("gnu"))
-                {
-                    return false;
-                }
+                // hawkeye - makefiles are not supported as of Nov 2005.
+                return false;
+//                if(!makeFiles.equals("none") && !makeFiles.equals("gnu"))
+//                {
+//                    return false;
+//                }
             }
             
         }



Mime
View raw message