Got rid of another log line

diff --git a/wsdl/gw2wsdl.py b/wsdl/gw2wsdl.py
index 0b5c478..cf3fc68 100755 (executable)
--- a/wsdl/gw2wsdl.py
+++ b/wsdl/gw2wsdl.py
@@ -13,13 +13,14 @@ import xml.dom.ext
 import apistub
 import inspect
 
-import globals
-
 from types import *
+from optparse import OptionParser
 
 from sfa.trust.auth import Auth
 from sfa.util.parameter import Parameter,Mixed
 
+import globals
+
 complex_types = {}
 services = {}
 
@@ -137,7 +138,6 @@ def param_type(arg):
 
 def add_wsdl_ports_and_bindings (wsdl):
     for method in apistub.methods:
-        print "Processing method %s"%method
 
         # Skip system. methods
         if "system." in method:

diff --git a/wsdl/sfa.wsdl b/wsdl/sfa.wsdl
index 2f83df2..8a8fc9f 100644 (file)
--- a/wsdl/sfa.wsdl
+++ b/wsdl/sfa.wsdl
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<wsdl:definitions xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:tns='http://www.planet-lab.org/geniwrapper.wsdl' xmlns:soapenc='http://schemas.xmlsoap.org/wsdl/soap/encoding' xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsdl='http://http://www.planet-lab.org/geniwrapper/2009/06/schema' xmlns:wsdl='http://schemas.xmlsoap.org/wsdl/' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' name='geniwrapper_autogenerated' targetNamespace='http://www.planet-lab.org/geniwrapper/2009/06/sfa.wsdl'>
+<wsdl:definitions xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:tns='http://www.planet-lab.org/geniwrapper/2009/07/sfa.wsdl' xmlns:soapenc='http://schemas.xmlsoap.org/wsdl/soap/encoding' xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsdl='http://www.planet-lab.org/geniwrapper/2009/07/schema' xmlns:wsdl='http://schemas.xmlsoap.org/wsdl/' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' name='geniwrapper_autogenerated' targetNamespace='http://www.planet-lab.org/geniwrapper/2009/07/sfa.wsdl'>
   <message name='create_gid_in'>
     <part type='xsd:string' name='cred'/>
     <part type='xsd:string' name='hrn'/>
@@ -33,7 +33,7 @@
     <part type='xsd:string' name='rspec'/>
   </message>
   <message name='create_slice_out'>
-    <part type='xsdl:Type2' name='returnvalue'/>
+    <part type='xsd:int' name='returnvalue'/>
   </message>
   <portType name='create_slice_port'>
     <operation name='create_slice'>
@@ -58,7 +58,7 @@
     <part type='xsd:string' name='hrn'/>
   </message>
   <message name='delete_slice_out'>
-    <part type='xsdl:Type3' name='returnvalue'/>
+    <part type='xsd:int' name='returnvalue'/>
   </message>
   <portType name='delete_slice_port'>
     <operation name='delete_slice'>
@@ -79,7 +79,7 @@
     </operation>
   </binding>
   <message name='get_credential_in'>
-    <part type='xsdl:Type4' name='cred'/>
+    <part type='xsdl:Type2' name='cred'/>
     <part type='xsd:string' name='type'/>
   </message>
   <message name='get_credential_out'>
@@ -105,7 +105,7 @@
   </binding>
   <message name='get_resources_in'>
     <part type='xsd:string' name='cred'/>
-    <part type='xsdl:Type5' name='hrn'/>
+    <part type='xsdl:Type3' name='hrn'/>
   </message>
   <message name='get_resources_out'>
     <part type='xsd:string' name='returnvalue'/>
@@ -132,7 +132,7 @@
     <part type='xsd:string' name='cred'/>
   </message>
   <message name='get_slices_out'>
-    <part type='xsdl:Type6' name='returnvalue'/>
+    <part type='xsdl:Type4' name='returnvalue'/>
   </message>
   <portType name='get_slices_port'>
     <operation name='get_slices'>
@@ -183,7 +183,7 @@
     <part type='xsd:string' name='hrn'/>
   </message>
   <message name='list_out'>
-    <part type='xsdl:Type8' name='returnvalue'/>
+    <part type='xsdl:Type6' name='returnvalue'/>
   </message>
   <portType name='list_port'>
     <operation name='list'>
@@ -259,7 +259,7 @@
     <part type='xsd:string' name='hrn'/>
   </message>
   <message name='reset_slices_out'>
-    <part type='xsdl:Type9' name='returnvalue'/>
+    <part type='xsd:int' name='returnvalue'/>
   </message>
   <portType name='reset_slices_port'>
     <operation name='reset_slices'>
@@ -284,7 +284,7 @@
     <part type='xsd:string' name='hrn'/>
   </message>
   <message name='resolve_out'>
-    <part type='xsdl:Type11' name='returnvalue'/>
+    <part type='xsdl:Type8' name='returnvalue'/>
   </message>
   <portType name='resolve_port'>
     <operation name='resolve'>
@@ -309,7 +309,7 @@
     <part type='xsd:string' name='hrn'/>
   </message>
   <message name='start_slice_out'>
-    <part type='xsdl:Type12' name='returnvalue'/>
+    <part type='xsdl:Type9' name='returnvalue'/>
   </message>
   <portType name='start_slice_port'>
     <operation name='start_slice'>
@@ -334,7 +334,7 @@
     <part type='xsd:string' name='hrn'/>
   </message>
   <message name='stop_slice_out'>
-    <part type='xsdl:Type13' name='returnvalue'/>
+    <part type='xsd:int' name='returnvalue'/>
   </message>
   <portType name='stop_slice_port'>
     <operation name='stop_slice'>
@@ -380,92 +380,48 @@
     </operation>
   </binding>
   <types>
-    <xsd:schema xmlns='http://www.w3.org/2001/XMLSchema' targetNamespace='http://www.planet-lab.org/geniwrapper/2009/06/schema'>
+    <xsd:schema xmlns='http://www.w3.org/2001/XMLSchema' targetNamespace='http://www.planet-lab.org/geniwrapper/2009/07/schema'>
       <xsd:complexType name='Type1'>
         <xsd:choice>
           <element type='xsd:string' name='uuid' minOccurs='0'/>
         </xsd:choice>
       </xsd:complexType>
       <xsd:complexType name='Type2'>
-        <xsd:complexContent>
-          <restriction base='soapenc:Array'>
-            <attribute wsdl:arrayType='xsd:int[]' ref='soapenc:arrayType'/>
-          </restriction>
-        </xsd:complexContent>
-      </xsd:complexType>
-      <xsd:complexType name='Type3'>
-        <xsd:complexContent>
-          <restriction base='soapenc:Array'>
-            <attribute wsdl:arrayType='xsd:int[]' ref='soapenc:arrayType'/>
-          </restriction>
-        </xsd:complexContent>
-      </xsd:complexType>
-      <xsd:complexType name='Type4'>
         <xsd:choice>
           <element type='xsd:string' name='credential' minOccurs='0'/>
         </xsd:choice>
       </xsd:complexType>
-      <xsd:complexType name='Type5'>
+      <xsd:complexType name='Type3'>
         <xsd:choice>
           <element type='xsd:string' name='hrn' minOccurs='0'/>
         </xsd:choice>
       </xsd:complexType>
-      <xsd:complexType name='Type6'>
-        <xsd:complexContent>
-          <restriction base='soapenc:Array'>
-            <attribute wsdl:arrayType='xsd:string[]' ref='soapenc:arrayType'/>
-          </restriction>
-        </xsd:complexContent>
-      </xsd:complexType>
-      <xsd:complexType name='Type7'>
+      <xsd:simpleType name='Type4'>
+        <xsd:list itemType='xsd:string'/>
+      </xsd:simpleType>
+      <xsd:complexType name='Type5'>
         <xsd:sequence>
           <xsd:element type='xsd:string' name='gid'/>
           <xsd:element type='xsd:string' name='hrn'/>
           <xsd:element type='xsd:string' name='type'/>
         </xsd:sequence>
       </xsd:complexType>
-      <xsd:complexType name='Type8'>
-        <xsd:complexContent>
-          <restriction base='soapenc:Array'>
-            <attribute wsdl:arrayType='xsdl:Type7[]' ref='soapenc:arrayType'/>
-          </restriction>
-        </xsd:complexContent>
-      </xsd:complexType>
-      <xsd:complexType name='Type9'>
-        <xsd:complexContent>
-          <restriction base='soapenc:Array'>
-            <attribute wsdl:arrayType='xsd:int[]' ref='soapenc:arrayType'/>
-          </restriction>
-        </xsd:complexContent>
-      </xsd:complexType>
-      <xsd:complexType name='Type10'>
+      <xsd:simpleType name='Type6'>
+        <xsd:list itemType='xsdl:Type5'/>
+      </xsd:simpleType>
+      <xsd:complexType name='Type7'>
         <xsd:sequence>
           <xsd:element type='xsd:string' name='gid'/>
           <xsd:element type='xsd:string' name='hrn'/>
           <xsd:element type='xsd:string' name='type'/>
         </xsd:sequence>
       </xsd:complexType>
-      <xsd:complexType name='Type11'>
-        <xsd:complexContent>
-          <restriction base='soapenc:Array'>
-            <attribute wsdl:arrayType='xsdl:Type10[]' ref='soapenc:arrayType'/>
-          </restriction>
-        </xsd:complexContent>
-      </xsd:complexType>
-      <xsd:complexType name='Type12'>
-        <xsd:complexContent>
-          <restriction base='soapenc:Array'>
-            <attribute wsdl:arrayType='xsd:int[]' ref='soapenc:arrayType'/>
-          </restriction>
-        </xsd:complexContent>
-      </xsd:complexType>
-      <xsd:complexType name='Type13'>
-        <xsd:complexContent>
-          <restriction base='soapenc:Array'>
-            <attribute wsdl:arrayType='xsd:int[]' ref='soapenc:arrayType'/>
-          </restriction>
-        </xsd:complexContent>
-      </xsd:complexType>
+      <xsd:simpleType name='Type8'>
+        <xsd:list itemType='xsdl:Type7'/>
+      </xsd:simpleType>
+      <xsd:simpleType name='Type9'>
+        <xsd:list itemType='xsd:int'/>
+      </xsd:simpleType>
     </xsd:schema>
   </types>
   <service name='aggregate'>