diff --git a/plugins/org.jkiss.dbeaver.core/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.core/META-INF/MANIFEST.MF index 5075c20d7400a6e15e649bf3ffbc9d11955ce500..f2ed098b9786cf360b978a0f8f6ba0798af882d1 100644 --- a/plugins/org.jkiss.dbeaver.core/META-INF/MANIFEST.MF +++ b/plugins/org.jkiss.dbeaver.core/META-INF/MANIFEST.MF @@ -103,6 +103,7 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.core.filesystem, org.eclipse.core.resources, org.eclipse.core.expressions, + org.eclipse.core.net, org.eclipse.equinox.security, org.eclipse.ui, org.eclipse.ui.editors, diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/DBeaverCore.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/DBeaverCore.java index 3f076041f75dbb3d52726a65d47dc74c796c2d1f..c2c0286707d713b47b9f603c0ee0d4d56a9017db 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/DBeaverCore.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/DBeaverCore.java @@ -17,6 +17,7 @@ package org.jkiss.dbeaver.core; +import org.eclipse.core.net.proxy.IProxyService; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.IProgressMonitor; @@ -24,6 +25,7 @@ import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Platform; import org.eclipse.ui.IWorkbench; import org.eclipse.ui.PlatformUI; +import org.eclipse.ui.internal.ide.IDEWorkbenchPlugin; import org.jkiss.code.NotNull; import org.jkiss.dbeaver.DBException; import org.jkiss.dbeaver.DBeaverPreferences; @@ -61,6 +63,7 @@ import org.jkiss.dbeaver.utils.RuntimeUtils; import org.jkiss.utils.CommonUtils; import org.jkiss.utils.StandardConstants; import org.osgi.framework.Bundle; +import org.osgi.framework.ServiceReference; import java.io.*; import java.net.Authenticator; @@ -231,6 +234,9 @@ public class DBeaverCore implements DBPPlatform { this.navigatorModel = new DBNModel(this); this.navigatorModel.initialize(); + // Activate proxy service + activateProxyService(); + // Activate plugin services for (IPluginService pluginService : PluginServiceRegistry.getInstance().getServices()) { try { @@ -247,6 +253,14 @@ public class DBeaverCore implements DBPPlatform { log.debug("Core initialized (" + (System.currentTimeMillis() - startTime) + "ms)"); } + private void activateProxyService() { + try { + log.debug("Proxy service '" + IProxyService.class.getName() + "' loaded"); + } catch (Throwable e) { + log.debug("Proxy service not found"); + } + } + private void initializeProjects() { final IProgressMonitor monitor = new NullProgressMonitor(); try {