axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chinth...@apache.org
Subject svn commit: r412708 - in /webservices/axis2/trunk/java/modules: codegen/src/org/apache/axis2/wsdl/codegen/CodeGenerationEngine.java core/src/org/apache/axis2/description/WSDL20ToAxisServiceBuilder.java
Date Thu, 08 Jun 2006 09:13:19 GMT
Author: chinthaka
Date: Thu Jun  8 02:13:18 2006
New Revision: 412708

URL: http://svn.apache.org/viewvc?rev=412708&view=rev
Log:
minor improvements to the code.

Modified:
    webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/CodeGenerationEngine.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/WSDL20ToAxisServiceBuilder.java

Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/CodeGenerationEngine.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/CodeGenerationEngine.java?rev=412708&r1=412707&r2=412708&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/CodeGenerationEngine.java
(original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/CodeGenerationEngine.java
Thu Jun  8 02:13:18 2006
@@ -16,20 +16,6 @@
 
 package org.apache.axis2.wsdl.codegen;
 
-import java.io.File;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import javax.wsdl.Definition;
-import javax.wsdl.WSDLException;
-import javax.wsdl.factory.WSDLFactory;
-import javax.wsdl.xml.WSDLReader;
-import javax.xml.namespace.QName;
-import javax.xml.parsers.ParserConfigurationException;
-
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.description.WSDL11ToAxisServiceBuilder;
 import org.apache.axis2.description.WSDL20ToAxisServiceBuilder;
@@ -48,6 +34,19 @@
 import org.w3c.dom.Document;
 import org.xml.sax.SAXException;
 
+import javax.wsdl.Definition;
+import javax.wsdl.WSDLException;
+import javax.wsdl.factory.WSDLFactory;
+import javax.wsdl.xml.WSDLReader;
+import javax.xml.namespace.QName;
+import javax.xml.parsers.ParserConfigurationException;
+import java.io.File;
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
 public class CodeGenerationEngine {
     private static final Log log = LogFactory.getLog(CodeGenerationEngine.class);
 
@@ -98,7 +97,7 @@
                 }
                 configuration.setAxisService(new WSDL20ToAxisServiceBuilder(description,
serviceQname, configuration.getPortName()).populateService());
             }else{
-                //It ll be WSDL 1.1
+                //It'll be WSDL 1.1
                 Definition wsdl4jDef = readInTheWSDLFile(wsdlUri);
                 QName serviceQname = null;
                 if (configuration.getServiceName()!=null){

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/WSDL20ToAxisServiceBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/WSDL20ToAxisServiceBuilder.java?rev=412708&r1=412707&r2=412708&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/WSDL20ToAxisServiceBuilder.java
(original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/WSDL20ToAxisServiceBuilder.java
Thu Jun  8 02:13:18 2006
@@ -1,15 +1,5 @@
 package org.apache.axis2.description;
 
-import java.io.InputStream;
-import java.net.URI;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.namespace.QName;
-
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.wsdl.WSDLConstants;
 import org.apache.woden.WSDLException;
@@ -17,7 +7,6 @@
 import org.apache.woden.WSDLReader;
 import org.apache.woden.schema.Schema;
 import org.apache.woden.wsdl20.Binding;
-import org.apache.woden.wsdl20.BindingOperation;
 import org.apache.woden.wsdl20.Description;
 import org.apache.woden.wsdl20.Endpoint;
 import org.apache.woden.wsdl20.Interface;
@@ -41,6 +30,15 @@
 import org.apache.ws.policy.util.PolicyFactory;
 import org.w3c.dom.Element;
 
+import javax.xml.namespace.QName;
+import java.io.InputStream;
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
 /*
  * Copyright 2004,2005 The Apache Software Foundation.
  *
@@ -99,12 +97,6 @@
         this.wsdlURI = wsdlUri;
     }
 
-    // public WSDL20ToAxisServiceBuilder(DescriptionElement descriptionElement,
-    // QName serviceName) {
-    // super(null, serviceName);
-    // this.descriptionElement = descriptionElement;
-    // }
-
     public WSDL20ToAxisServiceBuilder(String wsdlUri, AxisService service) {
         super(null, service);
         this.wsdlURI = wsdlUri;
@@ -136,10 +128,10 @@
             axisService.setTargetNamespace(savedTargetNamespace);
 
             // adding ns in the original WSDL
-            // processPoliciesInDefintion(wsdl4jDefinition); TODO : Differing
+            // processPoliciesInDefintion(wsdl4jDefinition); TODO : Defering policy handling
for now - Chinthaka
             // policy support
 
-            // scheam generation
+            // schema generation
 
             // Create the namespacemap
 
@@ -147,7 +139,7 @@
             Iterator iterator = namespacemap.keySet().iterator();
             while (iterator.hasNext()) {
                 String key = (String) iterator.next();
-                stringBasedNamespaceMap.put(key, ((URI) namespacemap.get(key))
+                stringBasedNamespaceMap.put(key, (namespacemap.get(key))
                         .toString());
             }
             axisService.setNameSpacesMap(stringBasedNamespaceMap);
@@ -281,7 +273,6 @@
 
         InterfaceOperation[] interfaceOperations = serviceInterface
                 .getInterfaceOperations();
-        InterfaceOperation operation;
         for (int i = 0; i < interfaceOperations.length; i++) {
             axisService.addOperation(populateOperations(interfaceOperations[i],
                     description));



---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org


Mime
View raw message