Changeset 18609 in vbox

Timestamp:

Apr 1, 2009 5:14:10 PM (16 years ago)

Author:

vboxsync

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

45515

Message:

SDK: versioning in samples, cleanup

Location:

trunk/src/VBox/Main/webservice

Files:

• Makefile.kmk (modified) (2 diffs)
• samples/java/jax-ws/clienttest.java (modified) (1 diff)
• samples/java/jax-ws/metrictest.java (modified) (1 diff)

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

@@ -454 +454 @@
         $(QUIET)$(REDIRECT) -C $(@D) -- $(VBOX_STUBMAKER) file://$(VBOXWEBSERVICE_WSDL)
 # Ugly, ugly, ugly, make me right once
-        $(QUIET)perl -ne "s#http://www.virtualbox.org/Service#http://www.virtualbox.org/#; print" < $(VBOXWEB_WS_PERL) > $(VBOXWEB_WS_PERL).tmp
-        $(QUIET)mv $(VBOXWEB_WS_PERL).tmp $(VBOXWEB_WS_PERL)
+        $(QUIET)$(SED) -e "s+http://www.virtualbox.org/Service+http://www.virtualbox.org/+" < $(VBOXWEB_WS_PERL) > $(VBOXWEB_WS_PERL).tmp
+        $(QUIET)$(MV) $(VBOXWEB_WS_PERL).tmp $(VBOXWEB_WS_PERL)
         $(QUIET)$(APPEND) $@ ''
 
@@ -580 +580 @@
 $(VBOXWEB_JAXWSSAMPLE): $(VBOX_PATH_WEBSERVICE)/samples/java/jax-ws/clienttest.java
         $(QUIET)$(MKDIR) -p $(VBOXWEB_SAMPLES_JAXWS_DIR)
-        $(QUIET)$(CP) -f $< $@
+        $(QUIET)$(SED) -e 's/{VBOX_API_SUFFIX}/$(VBOX_API_SUFFIX)/' <  $< >  $@
 
 $(VBOXWEB_METRICSAMPLE): $(VBOX_PATH_WEBSERVICE)/samples/java/jax-ws/metrictest.java
         $(QUIET)$(MKDIR) -p $(VBOXWEB_SAMPLES_JAXWS_DIR)
-        $(QUIET)$(CP) -f $< $@
+        $(QUIET)$(SED) -e 's/{VBOX_API_SUFFIX}/$(VBOX_API_SUFFIX)/' <  $< >  $@
 
 $(VBOXWEB_PERLSAMPLE): $(VBOX_PATH_WEBSERVICE)/samples/perl/clienttest.pl

trunk/src/VBox/Main/webservice/samples/java/jax-ws/clienttest.java

@@ -19 +19 @@
  * additional information or have any questions.
  */
-import com.sun.xml.ws.commons.virtualbox_2_1.*;
+/* Somewhat ugly way to support versioning */
+import com.sun.xml.ws.commons.virtualbox{VBOX_API_SUFFIX}.*;
+import org.virtualbox{VBOX_API_SUFFIX}.*;
+
 import java.util.*;
 import javax.xml.ws.Holder;
-import org.virtualbox_2_1.*;
 
 public class clienttest

trunk/src/VBox/Main/webservice/samples/java/jax-ws/metrictest.java

@@ -19 +19 @@
  * additional information or have any questions.
  */
-import com.sun.xml.ws.commons.virtualbox.*;
+import com.sun.xml.ws.commons.virtualbox{VBOX_API_SUFFIX}.*;
+import org.virtualbox{VBOX_API_SUFFIX}.*;
+
 import java.util.*;
 import javax.xml.ws.Holder;
-import org.virtualbox.*;
 
 class PerformanceData