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

Timestamp:

Apr 14, 2009 12:13:37 PM (16 years ago)

Author:

vboxsync

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

45923

Message:

SDK, Knut compatibility: cleanup of SDK generation

Location:

trunk/src/VBox/Main/webservice

Files:

• Makefile.kmk (modified) (9 diffs)
• glue-jaxws.xsl (modified) (1 diff)

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

@@ -329 +329 @@
  VBOXWEB_WS_PERL               = $(VBOX_PATH_SDK)/bindings/webservice/perl/lib/vboxService.pm
  VBOXWEB_SAMPLES_AXIS_DIR      = $(VBOX_PATH_SDK)/bindings/webservice/java/axis/samples
- VBOXWEB_AXISSAMPLE            = $(VBOXWEB_SAMPLES_AXIS_DIR)/clienttest.java
  VBOXWEB_SAMPLES_JAXWS_DIR     = $(VBOX_PATH_SDK)/bindings/webservice/java/jax-ws/samples
  VBOXWEB_JAXWSSAMPLE           = $(VBOXWEB_SAMPLES_JAXWS_DIR)/clienttest.java
  VBOXWEB_METRICSAMPLE          = $(VBOXWEB_SAMPLES_JAXWS_DIR)/metrictest.java
- VBOXWEB_SAMPLES_PERL_DIR      = $(VBOX_PATH_SDK)/bindings/webservice/perl/samples
- VBOXWEB_PERLSAMPLE            = $(VBOXWEB_SAMPLES_PERL_DIR)/clienttest.pl
- VBOXWEB_SAMPLES_PYTHONWS_DIR  = $(VBOX_PATH_SDK)/bindings/webservice/python/samples
- VBOXWEB_PYTHONWSSAMPLE        = $(VBOXWEB_SAMPLES_PYTHONWS_DIR)/vboxshell.py
- VBOXWEB_SHELLCOMMON           = $(VBOXWEB_SAMPLES_PYTHONWS_DIR)/shellcommon.py
 
  VBOXWEB_GLUE_JAVA_TMP         = $(VBOXWEB_OUT_DIR)/glue-jaxws.java.tmp
@@ -373 +367 @@
 
  VBOXWEB_OTHERS               += \
-        $(VBOXWEB_GLUE_JAVA_TMP) \
-        $(VBOXWEB_GLUE_PYTHON)\
-        $(VBOXWEB_WS_PYTHON) \
-        $(VBOXWEB_WS_PERL)   \
-        $(VBOXWEB_PYTHONWSSAMPLE)\
-        $(VBOXWEB_SHELLCOMMON)\
-        $(VBOXWEB_AXISSAMPLE) \
-        $(VBOXWEB_JAXWSSAMPLE)\
-        $(VBOXWEB_METRICSAMPLE)\
-        $(VBOXWEB_PERLSAMPLE) \
-        $(VBOXWEB_PATH_SDK_GLUE_JAVA)/Makefile \
-        $(VBOXWEB_SAMPLES_PYTHONWS_DIR)/Makefile\
-        $(VBOXWEB_SAMPLES_JAXWS_DIR)/Makefile \
-        $(VBOXWEB_JAVA15_JAR) \
-        $(VBOXWEB_JAVA16_JAR)
-
- #
+        $(VBOXWEB_GLUE_JAVA_TMP) \
+        $(VBOXWEB_GLUE_PYTHON)   \
+        $(VBOXWEB_WS_PYTHON)     \
+        $(VBOXWEB_WS_PERL)       \
+        $(VBOXWEB_PYTHONWSSAMPLE)\
+        $(VBOXWEB_SHELLCOMMON)   \
+        $(VBOXWEB_JAXWSSAMPLE)   \
+        $(VBOXWEB_METRICSAMPLE)  \
+        $(VBOXWEB_JAVA15_JAR)    \
+        $(VBOXWEB_JAVA16_JAR)
+
+VBOXWEB_INSTALLS = vboxwebinst
+
+vboxwebinst_INST = bin/sdk/bindings/webservice/
+vboxwebinst_MODE = a+rx,u+w
+vboxwebinst_SOURCES =                                                               \
+     samples/java/axis/clienttest.java=>java/axis/samples/clienttest.java           \
+     samples/java/jax-ws/Makefile.glue=>java/jax-ws/src/Makefile                    \
+     samples/java/jax-ws/Makefile=>java/jax-ws/samples/Makefile                     \
+     samples/perl/clienttest.pl=>perl/samples/clienttest.pl                         \
+     samples/python/Makefile=>python/samples/Makefile                               \
+     samples/python/Makefile.glue=>python/lib/Makefile                              \
+     $(PATH_ROOT)/src/VBox/Frontends/VBoxShell/ws/vboxshell.py=>python/samples/vboxshell.py  \
+     $(PATH_ROOT)/src/VBox/Frontends/VBoxShell/shellcommon.py=>python/samples/shellcommon.py
+
  # filesplitter - build helper, splits up the java classes.
  #
@@ -414 +416 @@
 OTHERS += $(VBOXWEB_OTHERS)
 OTHER_CLEAN += \
-        $(VBOXWEB_OTHERS) \
+        $(VBOXWEB_OTHERS)  \
         $(VBOXWEB_TYPEMAP) \
         $(VBOXWEB_IDL_SRC)
-
+INSTALLS += $(VBOXWEB_INSTALLS)
 
 
@@ -442 +444 @@
         $(QUIET)$(MKDIR) -p $(@D)
         $(QUIET)$(VBOX_XSLTPROC) $(VBOXWEB_XSLTPROC_VERBOSE) -o $@ $(VBOX_PATH_WEBSERVICE)/websrv-python.xsl $<
-        $(QUIET)$(CP) -f  $(VBOX_PATH_WEBSERVICE)/samples/python/Makefile.glue $(@D)/Makefile
 
 $(VBOXWEB_WS_PYTHON): $(VBOXWEB_WSDL) $(VBOXWEBSERVICE_WSDL)
@@ -574 +575 @@
 ifdef VBOX_ONLY_SDK
 
-## @todo Use an install target for these simple copy operations?
-$(VBOXWEB_AXISSAMPLE): $(VBOX_PATH_WEBSERVICE)/samples/java/axis/clienttest.java
-        $(QUIET)$(MKDIR) -p $(VBOXWEB_SAMPLES_AXIS_DIR)
-        $(QUIET)$(CP) -f $< $@
-
 $(VBOXWEB_JAXWSSAMPLE): $(VBOX_PATH_WEBSERVICE)/samples/java/jax-ws/clienttest.java
         $(QUIET)$(MKDIR) -p $(VBOXWEB_SAMPLES_JAXWS_DIR)
@@ -586 +582 @@
         $(QUIET)$(MKDIR) -p $(VBOXWEB_SAMPLES_JAXWS_DIR)
         $(QUIET)$(SED) -e 's/{VBOX_API_SUFFIX}/$(VBOX_API_SUFFIX)/' <  $< >  $@
-
-$(VBOXWEB_PERLSAMPLE): $(VBOX_PATH_WEBSERVICE)/samples/perl/clienttest.pl
-        $(QUIET)$(MKDIR) -p $(VBOXWEB_SAMPLES_PERL_DIR)
-        $(QUIET)$(CP) -f $< $@
-
-$(VBOXWEB_PYTHONWSSAMPLE): $(PATH_ROOT)/src/VBox/Frontends/VBoxShell/ws/vboxshell.py
-        $(QUIET)$(MKDIR) -p $(VBOXWEB_SAMPLES_PYTHONWS_DIR)
-        $(QUIET)$(CP) -f $< $@
-
-$(VBOXWEB_SHELLCOMMON): $(PATH_ROOT)/src/VBox/Frontends/VBoxShell/shellcommon.py $(VBOXWEB_PYTHONWSSAMPLE)
-        $(QUIET)$(CP) -f $< $@
 
 # generate jax-ws wrapper for java client code
@@ -611 +596 @@
         $(QUIET)$(CP) -f $(VBOX_PATH_WEBSERVICE)/../../../../COPYING.LIB $(VBOXWEB_PATH_SDK_GLUE_JAVA)
 
-# likely those 4 rules can be changed to INSTALLS
-$(VBOXWEB_PATH_SDK_GLUE_JAVA)/Makefile: $(VBOX_PATH_WEBSERVICE)/samples/java/jax-ws/Makefile.glue  $(VBOXWEB_GLUE_JAVA_TMP)
-        $(QUIET)$(CP) $< $@
-
-$(VBOXWEB_SAMPLES_PYTHONWS_DIR)/Makefile: $(VBOX_PATH_WEBSERVICE)/samples/python/Makefile $(VBOXWEB_PERLSAMPLE)
-        $(QUIET)$(CP) $< $@
-
-$(VBOXWEB_SAMPLES_JAXWS_DIR)/Makefile: $(VBOX_PATH_WEBSERVICE)/samples/java/jax-ws/Makefile  $(VBOXWEB_JAXWSSAMPLE)
-        $(QUIET)$(CP) $< $@
-
-## @todo r=bird: What is this for? It's not referenced by anyone.
-$(VBOXWEB_JAVALIB)/Makefile: $(VBOX_PATH_WEBSERVICE)/samples/java/jax-ws/Makefile.glue $(VBOXWEB_JAVA16_JAR)
-        $(QUIET)$(CP) $< $@
-
 $(VBOXWEB_JAVA15_JAR): $(VBOXWEB_GLUE_JAVA_TMP) $(VBOXWEB_WSDL) $(VBOXWEBSERVICE_WSDL)
         $(QUIET)$(RM) -Rf $(VBOXWEB_JAVALIB)/gen15
@@ -634 +605 @@
                 $(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
-        $(SED) -e "s/vboxweb.wsdl/vboxweb$(VBOX_API_SUFFIX).wsdl/" <  $(VBOXWEBSERVICE_WSDL) > $(VBOXWEB_JAVALIB)/gen15/vboxwebService$(VBOX_API_SUFFIX).wsdl
+        $(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
@@ -647 +618 @@
         $(QUIET)$(VBOX_JAVAC16) -cp $(VBOXWEB_JAVALIB)/gen16 \
                 $(VBOXWEB_PATH_SDK_GLUE_JAVA)/*.java  -d  $(VBOXWEB_JAVALIB)/gen16
-        $(SED) -e "s/vboxweb.wsdl/vboxweb$(VBOX_API_SUFFIX).wsdl/" <  $(VBOXWEBSERVICE_WSDL) > $(VBOXWEB_JAVALIB)/gen16/vboxwebService$(VBOX_API_SUFFIX).wsdl
+        $(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

trunk/src/VBox/Main/webservice/glue-jaxws.xsl

@@ -505 +505 @@
     private Map<VboxPortType, Integer> known;
     private boolean initStarted;
-    private VboxService svc;    
+    private VboxService svc;
 
     PortPool(boolean usePreinit)