Index: /trunk/src/VBox/Main/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Main/Makefile.kmk	(revision 31134)
+++ /trunk/src/VBox/Main/Makefile.kmk	(revision 31135)
@@ -896,4 +896,14 @@
 endif # VBOX_WITH_JMSCOM
 
+#
+# Install Java glue sample code.
+#
+INSTALLS += javagluesample
+javagluesample_INST = $(INST_SDK)bindings/glue/java
+javagluesample_MODE = a+rx,u+w
+javagluesample_SOURCES = \
+	$(VBOX_PATH_MAIN_SRC)/glue/tests/TestVBox.java=>TestVBox.java \
+	$(VBOX_PATH_MAIN_SRC)/glue/tests/Makefile.kmk=>Makefile.kmk
+
 updatenls::
 	$(VBOX_LUPDATE) $(VBoxSVC_SOURCES) $(VBoxSVC_VBOX_HEADERS) -ts $(VBoxSVC_VBOX_TRANSLATIONS)
Index: /trunk/src/VBox/Main/glue/tests/TestVBox.java
===================================================================
--- /trunk/src/VBox/Main/glue/tests/TestVBox.java	(revision 31134)
+++ /trunk/src/VBox/Main/glue/tests/TestVBox.java	(revision 31135)
@@ -50,10 +50,10 @@
     }
 
-    static void testEvents(VirtualBoxManager mgr, IEventSource es, boolean active)
+    static void testEvents(VirtualBoxManager mgr, IEventSource es)
     {
         // active mode for Java doesn't fully work yet, and using passive
         // is more portable (the only mode for MSCOM and WS) and thus generally
         // recommended
-        IEventListener listener = active ? mgr.createListener(new EventHandler()) : es.createListener();
+        IEventListener listener = es.createListener();
 
         es.registerListener(listener, Arrays.asList(VBoxEventType.Any), false);
@@ -63,16 +63,9 @@
             {
                 System.out.print(".");
-                if (active)
+                IEvent ev = es.getEvent(listener, 1000);
+                if (ev != null)
                 {
-                    mgr.waitForEvents(500);
-                }
-                else
-                {
-                    IEvent ev = es.getEvent(listener, 1000);
-                    if (ev != null)
-                    {
-                        processEvent(ev);
-                        es.eventProcessed(listener, ev);
-                    }
+                    processEvent(ev);
+                    es.eventProcessed(listener, ev);
                 }
             }
@@ -142,5 +135,5 @@
                 testEnumeration(mgr, vbox);
                 testStart(mgr, vbox);
-                testEvents(mgr, vbox.getEventSource(), false);
+                testEvents(mgr, vbox.getEventSource());
 
                 System.out.println("done, press Enter...");