You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by na...@apache.org on 2008/08/11 19:43:57 UTC

svn commit: r684836 - in /webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws: ./ c/ cpp/ info/

Author: nadiramra
Date: Mon Aug 11 10:43:50 2008
New Revision: 684836

URL: http://svn.apache.org/viewvc?rev=684836&view=rev
Log:
Simplify code, remove unneeded logic.

Modified:
    webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/WSDL2Ws.java
    webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/WrapperUtils.java
    webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ClientStubHeaderWriter.java
    webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ClientStubWriter.java
    webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ClassLoader.java
    webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ClientStubHeaderWriter.java
    webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ClientStubWriter.java
    webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ExceptionWriter.java
    webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ServiceHeaderWriter.java
    webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ServiceWriter.java
    webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/WrapHeaderWriter.java
    webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/WrapWriter.java
    webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/info/ServiceInfo.java
    webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/info/WrapperInfo.java

Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/WSDL2Ws.java
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/WSDL2Ws.java?rev=684836&r1=684835&r2=684836&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 Mon Aug 11 10:43:50 2008
@@ -52,7 +52,6 @@
 import org.apache.axis.wsdl.symbolTable.DefinedType;
 import org.apache.axis.wsdl.symbolTable.Element;
 import org.apache.axis.wsdl.symbolTable.Parameters;
-import org.apache.axis.wsdl.symbolTable.PortTypeEntry;
 import org.apache.axis.wsdl.symbolTable.ServiceEntry;
 import org.apache.axis.wsdl.symbolTable.SymTabEntry;
 import org.apache.axis.wsdl.symbolTable.SymbolTable;
@@ -92,12 +91,12 @@
     private String c_targetEndpointURI = null;
     private String c_transportURI = null;
 
-    private String c_qualifiedServiceName;
+    private String c_serviceName;
     private String c_serviceStyle = null;
     
     private ServiceEntry c_serviceEntry;
     private BindingEntry c_bindingEntry;
-    private PortTypeEntry c_portTypeEntry;
+    private PortType     c_portType;
     
     // Array of MethodInfo objects representing service operations.
     private ArrayList c_methods;
@@ -224,24 +223,15 @@
             c_transportURI = SymbolTableParsingUtils.getTransportType(c_bindingEntry.getBinding());    
             
             // ==================================================
-            // Get port type entry information 
+            // Get port type information associated with binding 
             // ==================================================
             
-            c_portTypeEntry = c_symbolTable.getPortTypeEntry(binding.getPortType().getQName());
-            if (c_portTypeEntry == null)
+            c_portType = binding.getPortType();
+            if (c_portType == null)
                 throw new WrapperFault("Port type entry not found");
             
-            c_qualifiedServiceName = c_portTypeEntry.getName();
-            if (c_qualifiedServiceName == null)
-            {
-                // TODO - not sure if stuff below is applicable?
-                c_qualifiedServiceName = c_portTypeEntry.getQName().getNamespaceURI();
-                c_qualifiedServiceName =
-                    WrapperUtils.firstCharacterToLowercase(
-                        WrapperUtils.nsURI2packageName(c_qualifiedServiceName))
-                        + "."
-                        + c_portTypeEntry.getQName().getLocalPart();
-            }
+            // Service name will be the portType name.
+            c_serviceName = WrapperUtils.getClassNameFromFullyQualifiedName(c_portType.getQName().getLocalPart());
 
             // ==================================================
             // Get target end point 
@@ -725,7 +715,7 @@
         // Process information about service operations
         // ==================================================            
         
-        processServiceMethods(c_portTypeEntry.getPortType());
+        processServiceMethods(c_portType);
 
         // ==================================================
         // Generate the artifacts
@@ -737,8 +727,7 @@
                                                   c_transportURI, c_targetEndpointURI, targetNameSpaceOfWSDL);
         
         // Service info
-        String servicename = c_serviceEntry.getService().getQName().getLocalPart();
-        ServiceInfo serviceInfo = new ServiceInfo(servicename, c_qualifiedServiceName, c_methods);
+        ServiceInfo serviceInfo = new ServiceInfo(c_serviceName, c_methods);
         
         // Context
         WebServiceContext wsContext = new WebServiceContext(wrapperInfo, serviceInfo, c_typeMap); 

Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/WrapperUtils.java
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/WrapperUtils.java?rev=684836&r1=684835&r2=684836&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/WrapperUtils.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/WrapperUtils.java Mon Aug 11 10:43:50 2008
@@ -22,8 +22,6 @@
 package org.apache.axis.wsdl.wsdl2ws;
 
 import java.util.Iterator;
-import java.util.Stack;
-import java.util.StringTokenizer;
 
 import javax.xml.namespace.QName;
 
@@ -54,6 +52,7 @@
 
         return fullyQualifiedName.substring(lastIndex + 1);
     }
+
     /**
      *  get classpart of the class and if name happen to be a Simple type return 
      *  the Wrapper Class name(service.0 wrapper class name)
@@ -91,49 +90,6 @@
         return new String(chars);
     }
     
-    public static String nsURI2packageName(String nsuri)
-    {
-
-        //gard agien if nsuri is urn | http and nothing return        
-        if (("urn".equals(nsuri) || "http".equals(nsuri)))
-            return nsuri;
-
-        StringTokenizer tokenizer = new StringTokenizer(nsuri, ":/.", false);
-        String token;
-        Stack stack = new Stack();
-
-        //first ine may be urn: or http: remove it
-        if (tokenizer.hasMoreTokens())
-        {
-            token = tokenizer.nextToken();
-            if (!("urn".equals(token) || "http".equals(token)))
-                stack.push(token);
-        }
-
-        while (tokenizer.hasMoreTokens())
-        {
-            token = tokenizer.nextToken();
-            if (!(token == null || "".equals(token)))
-                stack.push(token);
-        }
-
-        // create the String from the stack
-        StringBuffer buff = new StringBuffer(150);
-        if (!stack.isEmpty())
-            buff.append((String) stack.pop());
-
-        while (!stack.isEmpty())
-        {
-            buff.append('.');
-            buff.append((String) stack.pop());
-        }
-
-        String changednsuri = buff.toString();
-        //remove any unexpected charactors        
-        changednsuri = changednsuri.replaceAll("[^(a-zA-z0-9|.|_)]", "_");
-        return changednsuri;
-    }
-
     public static String getClassNameFromParamInfoConsideringArrays(
         ParameterInfo param,
         WebServiceContext wscontext)

Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ClientStubHeaderWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ClientStubHeaderWriter.java?rev=684836&r1=684835&r2=684836&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ClientStubHeaderWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ClientStubHeaderWriter.java Mon Aug 11 10:43:50 2008
@@ -46,7 +46,7 @@
     public ClientStubHeaderWriter(WebServiceContext wscontext)
         throws WrapperFault
     {
-        super(WrapperUtils.getClassNameFromFullyQualifiedName(wscontext.getSerInfo().getQualifiedServiceName()));
+        super(wscontext.getSerInfo().getServicename());
         this.wscontext = wscontext;
         this.methods = wscontext.getSerInfo().getMethods();
     }

Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ClientStubWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ClientStubWriter.java?rev=684836&r1=684835&r2=684836&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ClientStubWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ClientStubWriter.java Mon Aug 11 10:43:50 2008
@@ -48,7 +48,7 @@
      */
     public ClientStubWriter(WebServiceContext wscontext) throws WrapperFault
     {
-        super(WrapperUtils.getClassNameFromFullyQualifiedName(wscontext.getSerInfo().getQualifiedServiceName()));
+        super(wscontext.getSerInfo().getServicename());
         this.wscontext = wscontext;
         this.methods = wscontext.getSerInfo().getMethods();
     }

Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ClassLoader.java
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ClassLoader.java?rev=684836&r1=684835&r2=684836&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ClassLoader.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ClassLoader.java Mon Aug 11 10:43:50 2008
@@ -33,7 +33,6 @@
 import org.apache.axis.wsdl.wsdl2ws.SourceWriter;
 import org.apache.axis.wsdl.wsdl2ws.WSDL2Ws;
 import org.apache.axis.wsdl.wsdl2ws.WrapperFault;
-import org.apache.axis.wsdl.wsdl2ws.WrapperUtils;
 import org.apache.axis.wsdl.wsdl2ws.info.WebServiceContext;
 
 public class ClassLoader implements SourceWriter
@@ -44,9 +43,7 @@
     public ClassLoader(WebServiceContext wscontext) throws WrapperFault
     {
         this.wscontext = wscontext;
-        this.classname =
-            WrapperUtils.getClassNameFromFullyQualifiedName(
-                wscontext.getSerInfo().getQualifiedServiceName());
+        this.classname = wscontext.getSerInfo().getServicename();
     }
 
     public void writeSource() throws WrapperFault

Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ClientStubHeaderWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ClientStubHeaderWriter.java?rev=684836&r1=684835&r2=684836&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ClientStubHeaderWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ClientStubHeaderWriter.java Mon Aug 11 10:43:50 2008
@@ -41,9 +41,7 @@
     protected ArrayList methods;
     public ClientStubHeaderWriter(WebServiceContext wscontext) throws WrapperFault
     {
-        super(
-            WrapperUtils.getClassNameFromFullyQualifiedName(
-                wscontext.getSerInfo().getQualifiedServiceName()));
+        super(wscontext.getSerInfo().getServicename());
         this.wscontext = wscontext;
         this.methods = wscontext.getSerInfo().getMethods();
     }

Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ClientStubWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ClientStubWriter.java?rev=684836&r1=684835&r2=684836&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ClientStubWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ClientStubWriter.java Mon Aug 11 10:43:50 2008
@@ -54,8 +54,7 @@
 
     public ClientStubWriter(WebServiceContext wscontext) throws WrapperFault
     {
-        super(WrapperUtils.getClassNameFromFullyQualifiedName(wscontext
-                .getSerInfo().getQualifiedServiceName()));
+        super(wscontext.getSerInfo().getServicename());
         this.wscontext = wscontext;
         this.methods = wscontext.getSerInfo().getMethods();
     }

Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ExceptionWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ExceptionWriter.java?rev=684836&r1=684835&r2=684836&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ExceptionWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ExceptionWriter.java Mon Aug 11 10:43:50 2008
@@ -28,7 +28,6 @@
 import org.apache.axis.wsdl.wsdl2ws.CUtils;
 import org.apache.axis.wsdl.wsdl2ws.WSDL2Ws;
 import org.apache.axis.wsdl.wsdl2ws.WrapperFault;
-import org.apache.axis.wsdl.wsdl2ws.WrapperUtils;
 import org.apache.axis.wsdl.wsdl2ws.info.WebServiceContext;
 
 /**
@@ -45,9 +44,7 @@
     public ExceptionWriter(WebServiceContext wscontext, String faultInfoName)
         throws WrapperFault
     {
-        super(
-            WrapperUtils.getClassNameFromFullyQualifiedName(
-                wscontext.getSerInfo().getQualifiedServiceName()));
+        super(wscontext.getSerInfo().getServicename());
         this.wscontext = wscontext;
         this.faultInfoName = "Axis" + faultInfoName + "Exception";
     }

Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ServiceHeaderWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ServiceHeaderWriter.java?rev=684836&r1=684835&r2=684836&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ServiceHeaderWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ServiceHeaderWriter.java Mon Aug 11 10:43:50 2008
@@ -41,9 +41,7 @@
     protected ArrayList methods;
     public ServiceHeaderWriter(WebServiceContext wscontext) throws WrapperFault
     {
-        super(
-            WrapperUtils.getClassNameFromFullyQualifiedName(
-                wscontext.getSerInfo().getQualifiedServiceName()));
+        super(wscontext.getSerInfo().getServicename());
         this.wscontext = wscontext;
         this.methods = wscontext.getSerInfo().getMethods();
     }

Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ServiceWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ServiceWriter.java?rev=684836&r1=684835&r2=684836&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ServiceWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ServiceWriter.java Mon Aug 11 10:43:50 2008
@@ -38,9 +38,7 @@
     private ArrayList methods;
     public ServiceWriter(WebServiceContext wscontext) throws WrapperFault
     {
-        super(
-            WrapperUtils.getClassNameFromFullyQualifiedName(
-                wscontext.getSerInfo().getQualifiedServiceName()));
+        super(wscontext.getSerInfo().getServicename());
         this.wscontext = wscontext;
         this.methods = wscontext.getSerInfo().getMethods();
     }

Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/WrapHeaderWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/WrapHeaderWriter.java?rev=684836&r1=684835&r2=684836&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/WrapHeaderWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/WrapHeaderWriter.java Mon Aug 11 10:43:50 2008
@@ -28,7 +28,6 @@
 
 import org.apache.axis.wsdl.wsdl2ws.CUtils;
 import org.apache.axis.wsdl.wsdl2ws.WrapperFault;
-import org.apache.axis.wsdl.wsdl2ws.WrapperUtils;
 import org.apache.axis.wsdl.wsdl2ws.info.FaultInfo;
 import org.apache.axis.wsdl.wsdl2ws.info.MethodInfo;
 import org.apache.axis.wsdl.wsdl2ws.info.WebServiceContext;
@@ -39,10 +38,7 @@
     protected ArrayList methods;
     public WrapHeaderWriter(WebServiceContext wscontext) throws WrapperFault
     {
-        super(
-            WrapperUtils.getClassNameFromFullyQualifiedName(
-                wscontext.getSerInfo().getQualifiedServiceName()
-                    + CUtils.WRAPPER_NAME_APPENDER));
+        super(wscontext.getSerInfo().getServicename() + CUtils.WRAPPER_NAME_APPENDER);
         this.wscontext = wscontext;
         this.methods = wscontext.getSerInfo().getMethods();
         this.bindingStyle = "RPC_ENCODED";

Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/WrapWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/WrapWriter.java?rev=684836&r1=684835&r2=684836&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/WrapWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/WrapWriter.java Mon Aug 11 10:43:50 2008
@@ -43,10 +43,7 @@
     private ArrayList methods;
     public WrapWriter(WebServiceContext wscontext) throws WrapperFault
     {
-        super(
-            WrapperUtils.getClassNameFromFullyQualifiedName(
-                wscontext.getSerInfo().getQualifiedServiceName()
-                    + CUtils.WRAPPER_NAME_APPENDER));
+        super(wscontext.getSerInfo().getServicename() + CUtils.WRAPPER_NAME_APPENDER);
         this.wscontext = wscontext;
         this.methods = wscontext.getSerInfo().getMethods();
     }

Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/info/ServiceInfo.java
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/info/ServiceInfo.java?rev=684836&r1=684835&r2=684836&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/info/ServiceInfo.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/info/ServiceInfo.java Mon Aug 11 10:43:50 2008
@@ -25,45 +25,26 @@
 import java.util.ArrayList;
 
 import org.apache.axis.wsdl.wsdl2ws.WrapperFault;
-import org.apache.axis.wsdl.wsdl2ws.WrapperUtils;
 
 public class ServiceInfo
 {
     private String servicename;
-    private String qualifiedServiceName;
     private ArrayList methods;
-    private String[][] parameters;
 
     public ServiceInfo(
         String servicename,
-        String qualifiedServiceName,
         ArrayList methods)
         throws WrapperFault
     {
         this.methods = methods;
-        this.qualifiedServiceName = qualifiedServiceName;
         this.servicename = servicename;
 
-        //validate the infomormation
-        if (this.qualifiedServiceName == null)
-        {
-            throw new WrapperFault("The fully qualified parameter name can't be null");
-        }
+        //validate the information
         if (servicename == null)
-        {
-            servicename =
-                WrapperUtils.getClassNameFromFullyQualifiedName(
-                    qualifiedServiceName);
-        }
-        if (this.methods == null || this.methods.size() == 0)
-        {
-            throw new WrapperFault("service with no methods no point writing a wrapper");
-        }
-        if (this.parameters == null)
-        {
-            this.parameters = new String[0][0];
-        }
+            throw new WrapperFault("Service name can't be null.");
 
+        if (this.methods == null || this.methods.size() == 0)
+            throw new WrapperFault("Service with no methods.");
     }
 
     /**
@@ -74,11 +55,6 @@
         return methods;
     }
 
-    public String getQualifiedServiceName()
-    {
-        return qualifiedServiceName;
-    }
-
     /**
      * @return String
      */
@@ -86,4 +62,4 @@
     {
         return servicename;
     }
-}
+}
\ No newline at end of file

Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/info/WrapperInfo.java
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/info/WrapperInfo.java?rev=684836&r1=684835&r2=684836&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/info/WrapperInfo.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/info/WrapperInfo.java Mon Aug 11 10:43:50 2008
@@ -29,27 +29,32 @@
 {
     //service style
     private String wrapperStyle;
+    
     // programming language
     private String wrapperLanguage;
-    // use getvalue or get TAG or SIMPlE
-//    private String implStyle;
-    //serverside or client side
+
+    //server side or client side
     private String targetEngine;
+    
     //output location
     private String targetOutputLocation;
+    
     //transport method specified in the binding
     private String transportUri;
+    
     //target endpoint (the URI the service is deployed in)
     private String targetEndpointURI;
+    
     //private target name space of the wsdl file 
     private String targetNameSpaceOfWSDL;
 
-    public WrapperInfo(String wrapperStyle, String wrapperLanguage,
-    String targetOutputLocation,
-        String targetEngine,
-        String transportUri,
-        String targetEndpointURI,
-        String targetNameSpaceOfWSDL)
+    public WrapperInfo(String wrapperStyle, 
+                       String wrapperLanguage,
+                       String targetOutputLocation,
+                       String targetEngine,
+                       String transportUri,
+                       String targetEndpointURI,
+                       String targetNameSpaceOfWSDL)
     {
         this.wrapperStyle = wrapperStyle;
         this.wrapperLanguage = wrapperLanguage;
@@ -67,12 +72,9 @@
         else
             this.wrapperStyle = this.wrapperStyle.toLowerCase();
 
-        //        if (encodingStyle == null || encodingStyle.equals(WrapperConstants.ENCODING_STYLE_SOAP))
-        //            encodingStyle = WrapperConstants.ENCODING_STYLE_SOAP;
         if (targetOutputLocation == null)
             targetOutputLocation = ".";
 
-
         if (targetEngine == null
                 || !WrapperConstants.CLIENT.equalsIgnoreCase(targetEngine))
             this.targetEngine = WrapperConstants.SERVER;