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

Timestamp:

Apr 29, 2011 9:46:16 AM (14 years ago)

Author:

vboxsync

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

71462

Message:

webservices: removed obsolete code

Location:

trunk/src/VBox/Main/webservice

Files:

• Makefile.kmk (modified) (4 diffs)
• glue-jaxws.xsl (deleted)

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

@@ -436 +436 @@
  endef
 
- ifdef VBOX_WITH_OLD_JWS
- VBOX_JAXWS_LIBDIR             = $(VBOX_PATH_WEBSERVICE)/jaxlibs
- # well, not really good
- VBOX_JAVA15                   = $(firstword $(wildcard \
-        /usr/lib/jvm/java-1.5.0-sun/bin/java \
-        /usr/jdk/jdk1.5*/bin/java  \
-        /opt/sun-jdk-1.5*/bin/java \
-        /System/Library/Frameworks/JavaVM.framework/Versions/1.5.0/Commands/java))
-  ifeq ($(strip $(VBOX_JAVA15)),)
-   $(error Failed to autodetect VBOX_JAVA15, please set it manually)
-  endif
- VBOX_JAVA16                   = java
- VBOX_JAVAC15                  = javac -target 1.5
- VBOX_JAVAC16                  = javac -target 1.6
- VBOX_WSIMPORT15               = $(VBOX_JAVA15) -jar $(VBOX_JAXWS_LIBDIR)/jaxws-tools.jar
- VBOX_WSIMPORT16               =  $(firstword $(wildcard \
-        /usr/jdk/jdk1.6*/bin/wsimport \
-        /usr/bin/wsimport \
-        /opt/sun-jdk-1.6*/bin/wsimport))
-  ifeq ($(strip $(VBOX_WSIMPORT16)),)
-   $(error Failed to autodetect VBOX_WSIMPORT16, please set it manually)
-  endif
- endif # VBOX_WITH_OLD_JWS
-
  VBOXWEB_OTHERS               +=  \
         $(VBOXWEB_GLUE_PYTHON)    \
@@ -468 +444 @@
         $(PATH_ROOT)
 
- ifdef VBOX_WITH_OLD_JWS
-  VBOXWEB_OTHERS               += \
-        $(VBOXWEB_GLUE_JAVA_TMP)  \
-        $(VBOXWEB_JAXWSSAMPLE)    \
-        $(VBOXWEB_METRICSAMPLE)   \
-        $(VBOXWEB_JAVA15_JAR)     \
-        $(VBOXWEB_JAVA16_JAR)
- endif
 
  #
@@ -494 +462 @@
         samples/python/Makefile.glue=>python/lib/Makefile \
         $(PATH_ROOT)/COPYING.LIB=>java/jax-ws/COPYING.LIB
-
- ifdef VBOX_WITH_OLD_JWS
-  vboxwebinst_nox_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
- endif
 
 endif # VBOX_ONLY_SDK
@@ -685 +646 @@
         $(QUIET)$(SED) -e 's/{VBOX_API_SUFFIX}/$(VBOX_API_SUFFIX)/' <  $< >  $@
 
-# generate jax-ws wrapper for java client code
-$(VBOXWEB_GLUE_JAVA_TMP): \
-                $(VBOXWEB_IDL_SRC) \
-                $(VBOX_PATH_WEBSERVICE)/glue-jaxws.xsl \
-                $(VBOX_PATH_WEBSERVICE)/websrv-shared.inc.xsl \
-                $(RECOMPILE_ON_MAKEFILE_CURRENT) \
-                | $$(dir $$@) \
-                $(VBOX_FILESPLIT)
-        $(QUIET)$(MKDIR) -p $(@D)
-        $(call MSG_GENERATE,,$@,$(VBOXWEB_IDL_SRC) using glue-jaxws.xsl)
-        $(QUIET)$(VBOX_XSLTPROC) $(VBOXWEB_XSLTPROC_VERBOSE) \
-              --stringparam G_vboxApiSuffix $(VBOX_API_SUFFIX) \
-              -o $@ $(VBOX_PATH_WEBSERVICE)/glue-jaxws.xsl $<
-        $(call MSG_GENERATE,,java client glue files in $(VBOXWEB_PATH_SDK_GLUE_JAVA))
-        $(RM) -R -f $(VBOXWEB_PATH_SDK_GLUE_JAVA)
-        $(QUIET)$(MKDIR) -p $(VBOXWEB_PATH_SDK_GLUE_JAVA)
-        $(QUIET)$(VBOX_FILESPLIT) $@ $(VBOXWEB_PATH_SDK_GLUE_JAVA)
-        $(QUIET)$(CP) -f $(VBOX_PATH_WEBSERVICE)/../../../../COPYING.LIB $(VBOXWEB_PATH_SDK_GLUE_JAVA)
-
-$(VBOXWEB_GLUE_JAVA_TMP).done: $(VBOXWEB_GLUE_JAVA_TMP)
-        $(QUIET)$(APPEND) $@ ''
-
-$(VBOXWEB_JAVA15_JAR): $(VBOXWEB_GLUE_JAVA_TMP).done $(VBOXWEB_WSDL) $(VBOXWEBSERVICE_WSDL)
-        $(QUIET)$(RM) -Rf $(VBOXWEB_JAVALIB)/gen15
-        $(QUIET)$(MKDIR) -p $(VBOXWEB_JAVALIB)/gen15
-        $(call MSG_GENERATE,,$@,JAX-WS for Java 1.5 bindings using $(VBOXWEBSERVICE_WSDL))
-        $(QUIET)$(VBOX_WSIMPORT15) -p $(VBOX_JAVA_PACKAGE) -d $(VBOXWEB_JAVALIB)/gen15 $(VBOXWEBSERVICE_WSDL)
-        $(call MSG_L1,Compiling bridge code)
-        $(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 \
-                $(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  $(call find_java_files,$(VBOXWEB_JAVALIB))
-        $(QUIET)$(VBOX_JAR) cf $@ -C $(VBOXWEB_JAVALIB)/gen15 .
-
-$(VBOXWEB_JAVA16_JAR): $(VBOXWEB_GLUE_JAVA_TMP).done $(VBOXWEB_WSDL) $(VBOXWEBSERVICE_WSDL)
-        $(QUIET)$(RM) -Rf $(VBOXWEB_JAVALIB)/gen16
-        $(MKDIR) -p $(VBOXWEB_JAVALIB)/gen16
-        $(call MSG_GENERATE,,$@,JAX-WS for Java 1.6 bindings using $(VBOXWEBSERVICE_WSDL))
-        $(QUIET)$(VBOX_WSIMPORT16) -p $(VBOX_JAVA_PACKAGE)  -d $(VBOXWEB_JAVALIB)/gen16 $(VBOXWEBSERVICE_WSDL)
-        $(call MSG_L1,Compiling bridge code)
-        $(QUIET)$(VBOX_JAVAC16) -cp $(VBOXWEB_JAVALIB)/gen16 \
-                $(VBOXWEB_PATH_SDK_GLUE_JAVA)/*.java  -d  $(VBOXWEB_JAVALIB)/gen16
-        $(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  $(call find_java_files,$(VBOXWEB_JAVALIB)/gen16)
-        $(QUIET)$(VBOX_JAR) cf $@ -C $(VBOXWEB_JAVALIB)/gen16 .
-
 endif # VBOX_ONLY_SDK