RMI server refactoring

Former-commit-id: 77aa5e6b

plugins/org.jkiss.dbeaver.core.application/src/org/jkiss/dbeaver/core/application/DBeaverApplication.java

@@ -32,9 +32,7 @@ import org.eclipse.ui.PlatformUI;
 import org.jkiss.code.Nullable;
 import org.jkiss.dbeaver.Log;
 import org.jkiss.dbeaver.core.DBeaverCore;
-import org.jkiss.dbeaver.runtime.rmi.IInstanceController;
-import org.jkiss.dbeaver.runtime.rmi.InstanceClient;
-import org.jkiss.dbeaver.runtime.rmi.InstanceServer;
+import org.jkiss.dbeaver.IInstanceController;
 import org.jkiss.utils.ArrayUtils;
 
 import java.io.File;
@@ -195,9 +193,6 @@ public class DBeaverApplication implements IApplication
             DBEAVER_DEFAULT_DIR);
     }
 
-    /* (non-Javadoc)
-      * @see org.eclipse.equinox.app.IApplication#stop()
-      */
     @Override
     public void stop()
     {

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/rmi/InstanceClient.java → plugins/org.jkiss.dbeaver.core.application/src/org/jkiss/dbeaver/core/application/InstanceClient.java

@@ -16,12 +16,12 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-package org.jkiss.dbeaver.runtime.rmi;
+package org.jkiss.dbeaver.core.application;
 
 import org.jkiss.dbeaver.Log;
+import org.jkiss.dbeaver.IInstanceController;
 
 import java.io.*;
-import java.net.URL;
 import java.rmi.registry.LocateRegistry;
 import java.util.Properties;
 

plugins/org.jkiss.dbeaver.core/META-INF/MANIFEST.MF

@@ -23,7 +23,6 @@ Export-Package: org.jkiss.dbeaver,
  org.jkiss.dbeaver.runtime.net,
  org.jkiss.dbeaver.runtime.properties,
  org.jkiss.dbeaver.runtime.qm,
- org.jkiss.dbeaver.runtime.rmi,
  org.jkiss.dbeaver.runtime.sql,
  org.jkiss.dbeaver.runtime.ui,
  org.jkiss.dbeaver.tools,

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/DBeaverCore.java

@@ -49,7 +49,6 @@ import org.jkiss.dbeaver.runtime.net.GlobalProxyAuthenticator;
 import org.jkiss.dbeaver.runtime.net.GlobalProxySelector;
 import org.jkiss.dbeaver.runtime.qm.QMControllerImpl;
 import org.jkiss.dbeaver.runtime.qm.QMLogFileWriter;
-import org.jkiss.dbeaver.runtime.rmi.InstanceServer;
 import org.jkiss.utils.CommonUtils;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.Version;
@@ -186,7 +185,7 @@ public class DBeaverCore implements DBPApplication {
 
         if (standalone) {
             // Start instance server
-            InstanceServer.startInstanceServer();
+            DBeaverInstanceServer.startInstanceServer();
         }
 
         QMUtils.initApplication(this);
@@ -288,7 +287,7 @@ public class DBeaverCore implements DBPApplication {
                 log.error("Can't save workspace", ex); //$NON-NLS-1$
             }
 
-            InstanceServer.stopInstanceServer();
+            DBeaverInstanceServer.stopInstanceServer();
         }
 
         // Remove temp folder

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/rmi/InstanceServer.java → plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/DBeaverInstanceServer.java

@@ -16,10 +16,10 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-package org.jkiss.dbeaver.runtime.rmi;
+package org.jkiss.dbeaver.core;
 
 import org.jkiss.dbeaver.Log;
-import org.jkiss.dbeaver.core.DBeaverCore;
+import org.jkiss.dbeaver.IInstanceController;
 import org.jkiss.dbeaver.utils.GeneralUtils;
 import org.jkiss.utils.IOUtils;
 
@@ -34,9 +34,9 @@ import java.util.Properties;
 /**
  * DBeaver instance controller.
  */
-public class InstanceServer implements IInstanceController {
+public class DBeaverInstanceServer implements IInstanceController {
 
-    private static final Log log = Log.getLog(InstanceServer.class);
+    private static final Log log = Log.getLog(DBeaverInstanceServer.class);
 
     private static int portNumber;
     private static Registry registry;
@@ -63,7 +63,7 @@ public class InstanceServer implements IInstanceController {
     }
 
     public static void startInstanceServer() {
-        InstanceServer server = new InstanceServer();
+        DBeaverInstanceServer server = new DBeaverInstanceServer();
 
         try {
             portNumber = IOUtils.findFreePort(20000, 65000);

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/rmi/IInstanceController.java → plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/IInstanceController.java

@@ -16,7 +16,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-package org.jkiss.dbeaver.runtime.rmi;
+package org.jkiss.dbeaver;
 
 import java.rmi.Remote;
 import java.rmi.RemoteException;