Index: /trunk/src/VBox/Main/glue/tests/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Main/glue/tests/Makefile.kmk	(revision 31231)
+++ /trunk/src/VBox/Main/glue/tests/Makefile.kmk	(revision 31232)
@@ -13,4 +13,5 @@
  VBOX_BIN=/Applications/VirtualBox.app/Contents/MacOS
  VBOX_SDK=$(VBOX_BIN)/sdk
+ JAVA15=/System/Library/Frameworks/JavaVM.framework/Versions/1.5/Commands/java
 # JAVA_ARGS += -d32
 endif
@@ -49,4 +50,10 @@
 	java $(JAVA_ARGS) -cp $(CLASSPATH)  TestVBox
 
+JAXLIBS=../../webservice/jaxlibs/
+# -noverify could be needed due http://bugs.sun.com/bugdatabase/view_bug.do;jsessionid=eb3fcd8f72ab4713f96e378a7575?bug_id=6614974
+testws15:
+	javac -target 1.5 -source 1.5 -cp $(VBOX_JAR) TestVBox.java
+	$(JAVA15) $(JAVA_ARGS) -cp $(VBOX_JAR_WS)$(SEP)$(CLASSPATH)$(SEP)$(JAXLIBS)/jaxws-api.jar$(SEP)$(JAXLIBS)/jaxws-rt.jar \
+            TestVBox -w -url http://localhost:18083
 
 testws:
Index: /trunk/src/VBox/Main/glue/tests/TestVBox.java
===================================================================
--- /trunk/src/VBox/Main/glue/tests/TestVBox.java	(revision 31231)
+++ /trunk/src/VBox/Main/glue/tests/TestVBox.java	(revision 31232)
@@ -21,11 +21,10 @@
     {
         System.out.println("got event: " + ev);
-
         VBoxEventType type = ev.getType();
         System.out.println("type = "+type);
-
         switch (type)
         {
             case OnMachineStateChanged:
+            {
                 IMachineStateChangedEvent mcse = IMachineStateChangedEvent.queryInterface(ev);
                 if (mcse == null)
@@ -34,4 +33,5 @@
                     System.out.println("mid="+mcse.getMachineId());
                 break;
+            }
         }
     }
Index: /trunk/src/VBox/Main/webservice/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Main/webservice/Makefile.kmk	(revision 31231)
+++ /trunk/src/VBox/Main/webservice/Makefile.kmk	(revision 31232)
@@ -458,7 +458,11 @@
 	$(VBOXWEB_PYTHONWSSAMPLE)\
 	$(VBOXWEB_JAXWSSAMPLE) \
-	$(VBOXWEB_METRICSAMPLE) \
+	$(VBOXWEB_METRICSAMPLE)
+
+ifdef VBOX_WITH_OLD_JWS
+  VBOXWEB_OTHERS               += \
         $(VBOXWEB_JAVA15_JAR) \
 	$(VBOXWEB_JAVA16_JAR)
+endif
 
  #