DIRSTUDIO-1272: Remove Network Connections preferences page (socks proxy settings)

3 files changed, 5 insertions, 25 deletions

diff --git a/plugins/rcp/plugin.xml b/plugins/rcp/plugin.xml
index ee4e53dbf..5f14094aa 100644
--- a/plugins/rcp/plugin.xml
+++ b/plugins/rcp/plugin.xml
@@ -149,6 +149,11 @@
     <activityPatternBinding
         activityId="%RCP_Hide_id"
         isEqualityPattern="false"
+        pattern="org.eclipse.ui.net.*"/>
+
+    <activityPatternBinding
+        activityId="%RCP_Hide_id"
+        isEqualityPattern="false"
         pattern="org.eclipse.ui.ide.application.*"/>
 
     <activityPatternBinding
diff --git a/plugins/rcp/pom-first.xml b/plugins/rcp/pom-first.xml
index fe60e17e5..8c2ad2bb6 100644
--- a/plugins/rcp/pom-first.xml
+++ b/plugins/rcp/pom-first.xml
@@ -51,7 +51,6 @@
             
             <Require-Bundle>
  org.eclipse.core.filesystem,
- org.eclipse.core.net,
  org.eclipse.core.resources,
  org.eclipse.core.runtime,
  org.eclipse.e4.ui.css.swt.theme,
diff --git a/plugins/rcp/src/main/java/org/apache/directory/studio/ApplicationWorkbenchAdvisor.java b/plugins/rcp/src/main/java/org/apache/directory/studio/ApplicationWorkbenchAdvisor.java
index 05e0b5256..8e408055d 100644
--- a/plugins/rcp/src/main/java/org/apache/directory/studio/ApplicationWorkbenchAdvisor.java
+++ b/plugins/rcp/src/main/java/org/apache/directory/studio/ApplicationWorkbenchAdvisor.java
@@ -22,8 +22,6 @@ package org.apache.directory.studio;
 
 
 import org.apache.directory.studio.preferences.ShutdownPreferencesPage;
-import org.eclipse.core.net.proxy.IProxyService;
-import org.eclipse.core.runtime.Platform;
 import org.eclipse.core.runtime.preferences.IEclipsePreferences;
 import org.eclipse.core.runtime.preferences.InstanceScope;
 import org.eclipse.jface.dialogs.Dialog;
@@ -37,8 +35,6 @@ import org.eclipse.ui.application.IWorkbenchConfigurer;
 import org.eclipse.ui.application.IWorkbenchWindowConfigurer;
 import org.eclipse.ui.application.WorkbenchAdvisor;
 import org.eclipse.ui.application.WorkbenchWindowAdvisor;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.ServiceReference;
 
 
 /**
@@ -131,31 +127,11 @@ public class ApplicationWorkbenchAdvisor extends WorkbenchAdvisor
     public void postStartup()
     {
         super.postStartup();
-        activateProxyService();
         removeDefaultJvmSetting();
     }
 
 
     /**
-     * Activate the proxy service, this sets the relevant system properties.
-     */
-    private void activateProxyService()
-    {
-        Bundle bundle = Platform.getBundle( "org.eclipse.ui.ide" ); //$NON-NLS-1$
-        
-        if ( bundle != null )
-        {
-            ServiceReference<?> ref = bundle.getBundleContext().getServiceReference( IProxyService.class.getName() );
-        
-            if ( ref != null )
-            {
-                bundle.getBundleContext().getService( ref );
-            }
-        }
-    }
-
-
-    /**
      * DIRSTUDIO-1188: When launching ApacheDS the first time the same Studio JVM is used and stored in the preferences
      * (~/.ApacheDirectoryStudio/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.launching.prefs).
      * Afterwards that JVM is always used when starting ApacheDS, even if the Studio JVM changes. As there is no