Changeset 23552 in vbox for trunk/src/VBox

Timestamp:

Oct 5, 2009 11:29:58 AM (16 years ago)

Author:

vboxsync

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

53196

Message:

Python WS: docs update, minor build changes

Location:

trunk/src/VBox/Main

Files:

• glue/vboxapi.py (modified) (1 diff)
• webservice/Makefile.kmk (modified) (3 diffs)
• webservice/samples/python/Makefile (modified) (1 diff)
• webservice/websrv-python.xsl (modified) (1 diff)

trunk/src/VBox/Main/glue/vboxapi.py

@@ -355 +355 @@
         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)

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

@@ -342 +342 @@
  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 +614 @@
         $(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 +630 @@
         $(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 .
 

trunk/src/VBox/Main/webservice/samples/python/Makefile

@@ -18 +18 @@
 
 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 &

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

@@ -43 +43 @@
   <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>