Index: /trunk/src/libs/xpcom18a4/java/Makefile.kmk
===================================================================
--- /trunk/src/libs/xpcom18a4/java/Makefile.kmk	(revision 29756)
+++ /trunk/src/libs/xpcom18a4/java/Makefile.kmk	(revision 29757)
@@ -270,7 +270,4 @@
 	$(VBOX_JXPCOM_JSRC)/internal/XPCOMJavaProxyBase.java \
 	$(VBOX_JXPCOM_JSRC)/internal/XPCOMJavaProxy.java
-VBOX_JXPCOM_MGR = \
-     $(VBOX_JXPCOM_SRC)/src/org/virtualbox/VirtualBoxManager.java \
-     $(VBOX_JXPCOM_SRC)/src/org/virtualbox/VBoxObjectBase.java
 
 $$(VBOX_JXPCOM_JAR): $(VBOX_JXPCOM_JAR_SRC) $(VBOX_JXPCOM_GEN)/jxpcomgen.list $(VBOX_JXPCOM_GEN)/jxpcomglue.list $(VBOX_JXPCOM_NSERROR) $(VBOX_JXPCOM_MGR) | $$(dir $$@)
@@ -284,5 +281,4 @@
 		$(VBOX_JXPCOM_JAR_SRC) \
 		$(VBOX_JXPCOM_NSERROR) \
-		$(VBOX_JXPCOM_MGR) \
                 @$(VBOX_JXPCOM_GEN)/jxpcomglue.list \
 		-d $(VBOX_JXPCOM_JDEST) -classpath $(VBOX_JXPCOM_JDEST)
Index: /trunk/src/libs/xpcom18a4/java/tests/TestVBox.java
===================================================================
--- /trunk/src/libs/xpcom18a4/java/tests/TestVBox.java	(revision 29756)
+++ /trunk/src/libs/xpcom18a4/java/tests/TestVBox.java	(revision 29757)
@@ -11,7 +11,6 @@
  * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
  */
-
-import org.mozilla.interfaces.*;
-import org.virtualbox.*;
+import org.virtualbox_3_2.*;
+import java.util.List;
 
 class VBoxCallbacks extends VBoxObjectBase implements IVirtualBoxCallback
@@ -28,18 +27,18 @@
     }
     public void onSnapshotTaken(String machineId, String snapshotId) {}
-    public void onSessionStateChange(String machineId, long state)
+    public void onSessionStateChange(String machineId, SessionState state)
     {
         System.out.println("onSessionStateChange -- VM: " + machineId + ", state: " + state);
     }
-    public void onMachineRegistered(String machineId, boolean registered) {}
-    public void onMediumRegistered(String mediumId, long mediumType, boolean registered) {}
+    public void onMachineRegistered(String machineId, Boolean registered) {}
+    public void onMediumRegistered(String mediumId, DeviceType mediumType, Boolean registered) {}
     public void onExtraDataChange(String machineId, String key, String value)
     {
         System.out.println("onExtraDataChange -- VM: " + machineId + ": " + key+"->"+value);
     }
-    public boolean onExtraDataCanChange(String machineId, String key, String value, String[] error) { return true; }
+    public Boolean onExtraDataCanChange(String machineId, String key, String value, Holder<String> error) { return true; }
     public void onMachineDataChange(String machineId)
     {}
-    public void onMachineStateChange(String machineId, long state)
+    public void onMachineStateChange(String machineId, MachineState state)
     {
         System.out.println("onMachineStateChange -- VM: " + machineId + ", state: " + state);
@@ -51,5 +50,5 @@
     static void testCallbacks(VirtualBoxManager mgr, IVirtualBox vbox)
     {
-        IVirtualBoxCallback cbs = new VBoxCallbacks();
+        IVirtualBoxCallback cbs = mgr.createIVirtualBoxCallback(new VBoxCallbacks());
         vbox.registerCallback(cbs);
         for (int i=0; i<100; i++)
@@ -62,5 +61,5 @@
     static void testEnumeration(VirtualBoxManager mgr, IVirtualBox vbox)
     {
-        IMachine[] machs = vbox.getMachines(null);
+        List<IMachine> machs = vbox.getMachines();
         for (IMachine m : machs)
         {
@@ -74,5 +73,5 @@
     static void testStart(VirtualBoxManager mgr, IVirtualBox vbox)
     {
-        String m =  vbox.getMachines(null)[0].getName();
+        String m =  vbox.getMachines().get(0).getName();
         System.out.println("\nAttempting to start VM '" + m + "'");
         mgr.startVm(m, null, 7000);
@@ -90,4 +89,5 @@
             System.out.println("VirtualBox version: " + vbox.getVersion() + "\n");
             testEnumeration(mgr, vbox);
+            //testStart(mgr, vbox);
             testCallbacks(mgr, vbox);