Changeset 31117 in vbox for trunk/src/VBox/Main/webservice

Timestamp:

Jul 26, 2010 2:49:24 PM (15 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

64079

Message:

Python WS: generate code compatible with newer ZSI

Location:

trunk/src/VBox/Main/webservice

Files:

• Makefile.kmk (modified) (2 diffs)
• websrv-python.xsl (modified) (2 diffs)

trunk/src/VBox/Main/webservice/Makefile.kmk

@@ -156 +156 @@
 VBOXWEB_IDL_SRC_ORIG          := $(VBOX_XIDL_FILE)
 VBOXWEB_IDL_SRC               := $(VBOXWEB_OUT_DIR)/VirtualBox.xidl
+VBOXWEB_WSDL                   = $(VBOX_PATH_SDK)/bindings/webservice/vboxweb.wsdl
+VBOXWEBSERVICE_WSDL            = $(VBOX_PATH_SDK)/bindings/webservice/vboxwebService.wsdl
 
 VBOXWEB_TYPEMAP               := $(VBOXWEB_OUT_DIR)/typemap.dat
@@ -286 +288 @@
  vboxwebsrv_ORDERDEPS = $(VBOXWEB_OUT_DIR)/gsoap_copy_all_ts
  endif # !VBOX_ONLY_SDK
-
-VBOXWEB_WSDL                   = $(VBOX_PATH_SDK)/bindings/webservice/vboxweb.wsdl
-VBOXWEBSERVICE_WSDL            = $(VBOX_PATH_SDK)/bindings/webservice/vboxwebService.wsdl
 
 ifdef VBOX_WITH_JWS

trunk/src/VBox/Main/webservice/websrv-python.xsl

@@ -465 +465 @@
 from VirtualBox_services import *
 
+try:
+  from VirtualBox_client import *
+except:
+  pass
+
 class ManagedManager:
   def __init__(self):
@@ -855 +860 @@
   def getPort(self):
       if self.port is None:
-          self.port = vboxServiceLocator().getvboxPortType(self.url)
+          try:
+             self.port = vboxServiceLocator().getvboxPortType(self.url)
+          except:
+             self.port = vboxServiceLocator().getvboxServicePort(self.url)
       return self.port