Changeset 30932 in vbox

Timestamp:

Jul 20, 2010 4:09:24 PM (15 years ago)

Author:

vboxsync

Message:

Java bridge: uniform bridge is functional

Location:

trunk/src/VBox/Main

Files:

• glue/tests/Makefile.kmk (modified) (2 diffs)
• glue/tests/TestVBox.java (modified) (2 diffs)
• webservice/Makefile.kmk (modified) (1 diff)

trunk/src/VBox/Main/glue/tests/Makefile.kmk

@@ -38 +38 @@
 endif
 
-VBOX_JAR_WS=$(VBOX_SDK)bindings/webservice/java/jax-ws/vboxjws.jar
+VBOX_JAR_WS=$(VBOX_SDK)/bindings/webservice/java/jax-ws/vboxjws.jar
 
 JAVA_ARGS += -Dvbox.home=$(VBOX_BIN)
@@ -52 +52 @@
 testws:
         javac -cp $(VBOX_JAR_WS) TestVBox.java
-        java $(JAVA_ARGS) -cp $(VBOX_JAR_WS) TestVBox -w -url http://localhost:18083
+        java $(JAVA_ARGS) -cp $(VBOX_JAR_WS)$(SEP)$(CLASSPATH) TestVBox -w -url http://localhost:18083

trunk/src/VBox/Main/glue/tests/TestVBox.java

@@ -130 +130 @@
             } catch (Exception e) {
                 e.printStackTrace();
+                System.out.println("Cannot connect, start webserver first!");                
             }
         }
@@ -136 +137 @@
         {
             IVirtualBox vbox = mgr.getVBox();
-            System.out.println("VirtualBox version: " + vbox.getVersion() + "\n");
-            testEnumeration(mgr, vbox);
-            testStart(mgr, vbox);
-            testEvents(mgr, vbox.getEventSource(), false);
+            if (vbox != null)
+            {
+                System.out.println("VirtualBox version: " + vbox.getVersion() + "\n");
+                testEnumeration(mgr, vbox);
+                testStart(mgr, vbox);
+                testEvents(mgr, vbox.getEventSource(), false);
 
-            System.out.println("done, press Enter...");
-            int ch = System.in.read();
+                System.out.println("done, press Enter...");
+                int ch = System.in.read();
+            }
         }
         catch (Throwable e)

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

@@ -300 +300 @@
 VBOX_JAXLIB_DIR    := $(PATH_ROOT)/src/VBox/Main/webservice/jaxlibs
 
-VBoxJWs-inst-jar_INST = $(INST_SDK)bindings/webservice/java/jax-ws/vboxjws.jar
+VBoxJWs-inst-jar_INST = $(INST_SDK)bindings/webservice/java/jax-ws
 VBoxJWs-inst-jar_SOURCES = \
         $(VBOX_JWS_JAR)