Index: /trunk/src/VBox/Main/glue/vboxapi.py
===================================================================
--- /trunk/src/VBox/Main/glue/vboxapi.py	(revision 23551)
+++ /trunk/src/VBox/Main/glue/vboxapi.py	(revision 23552)
@@ -355,5 +355,4 @@
         str += "   def __init__(self): BaseClass.__init__(self, arg)\n"
         str += "result = xpcom.components.classes['@virtualbox.org/CallbackWrapper;1'].createInstance()\n"
-        # This wrapping is not entirely correct - we shall create a local object
         str += "result.setLocalObject("+iface+"Impl())\n"
         exec (str,d,d)
Index: /trunk/src/VBox/Main/webservice/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Main/webservice/Makefile.kmk	(revision 23551)
+++ /trunk/src/VBox/Main/webservice/Makefile.kmk	(revision 23552)
@@ -342,4 +342,8 @@
  VBOXWEB_JAVA15_JAR            = $(VBOXWEB_JAVALIB)/vboxws_java15.jar
  VBOXWEB_JAVA16_JAR            = $(VBOXWEB_JAVALIB)/vboxws_java16.jar
+
+define find_java_files
+ $(shell find $(1) -name \*.java)
+endef # def_vbox_disas_binary
 
 
@@ -610,8 +614,8 @@
 	$(QUIET)$(VBOX_JAVAC15) -cp \
 		$(VBOXWEB_JAVALIB)/gen15:$(VBOX_JAXWS_LIBDIR)/jaxws-api.jar:$(VBOX_JAXWS_LIBDIR)/lib/jaxb-api.jar:$(VBOX_JAXWS_LIBDIR)/jsr181-api.jar \
-		$(VBOXWEB_PATH_SDK_GLUE_JAVA)/*.java  -d  $(VBOXWEB_JAVALIB)/gen15
+		$(call find_java_files,$(VBOXWEB_PATH_SDK_GLUE_JAVA))  -d  $(VBOXWEB_JAVALIB)/gen15
 	$(QUIET)$(SED) -e "s/vboxweb.wsdl/vboxweb$(VBOX_API_SUFFIX).wsdl/" <  $(VBOXWEBSERVICE_WSDL) > $(VBOXWEB_JAVALIB)/gen15/vboxwebService$(VBOX_API_SUFFIX).wsdl
 	$(QUIET)$(CP) -f $(VBOXWEB_WSDL) $(VBOXWEB_JAVALIB)/gen15/vboxweb$(VBOX_API_SUFFIX).wsdl
-	$(QUIET)$(RM) -f  $(VBOXWEB_JAVALIB)/gen15/*.java
+	$(QUIET)$(RM) -f  $(call find_java_files,$(VBOXWEB_JAVALIB))
 	$(QUIET)$(VBOX_JAR) cf $@ -C $(VBOXWEB_JAVALIB)/gen15 .
 
@@ -626,5 +630,5 @@
 	$(QUIET)$(SED) -e "s/vboxweb.wsdl/vboxweb$(VBOX_API_SUFFIX).wsdl/" <  $(VBOXWEBSERVICE_WSDL) > $(VBOXWEB_JAVALIB)/gen16/vboxwebService$(VBOX_API_SUFFIX).wsdl
 	$(QUIET)$(CP) -f $(VBOXWEB_WSDL) $(VBOXWEB_JAVALIB)/gen16/vboxweb$(VBOX_API_SUFFIX).wsdl
-	$(QUIET)$(RM) -f  $(VBOXWEB_JAVALIB)/gen16/*.java
+	$(QUIET)$(RM) -f  $(call find_java_files,$(VBOXWEB_JAVALIB)/gen16)
 	$(QUIET)$(VBOX_JAR) cf $@ -C $(VBOXWEB_JAVALIB)/gen16 .
 
Index: /trunk/src/VBox/Main/webservice/samples/python/Makefile
===================================================================
--- /trunk/src/VBox/Main/webservice/samples/python/Makefile	(revision 23551)
+++ /trunk/src/VBox/Main/webservice/samples/python/Makefile	(revision 23552)
@@ -18,3 +18,7 @@
 
 run: 
-	PYTHONPATH=../lib python ./clienttest.py
+	@echo !!!! Don\'t forget to start webserver with \"vboxwebsrv -t 10000\" !!!
+	PYTHONPATH=../lib python ../../../glue/python/sample/vboxshell.py -w 
+
+server:
+	nohup vboxwebsrv -t 10000 &
Index: /trunk/src/VBox/Main/webservice/websrv-python.xsl
===================================================================
--- /trunk/src/VBox/Main/webservice/websrv-python.xsl	(revision 23551)
+++ /trunk/src/VBox/Main/webservice/websrv-python.xsl	(revision 23552)
@@ -43,4 +43,5 @@
   <xsl:choose>
     <xsl:when test="$type='wstring'">String</xsl:when>
+    <xsl:when test="$type='uuid'">String</xsl:when>
     <xsl:when test="$type='boolean'">Boolean</xsl:when>
     <xsl:when test="$type='unsigned long'">UnsignedInt</xsl:when>