diff options
9 files changed, 26 insertions, 19 deletions
diff --git a/bundles/org.eclipse.core.net/META-INF/MANIFEST.MF b/bundles/org.eclipse.core.net/META-INF/MANIFEST.MF index ba0702628..1374462ac 100644 --- a/bundles/org.eclipse.core.net/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.core.net/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Activator: org.eclipse.core.internal.net.Activator Bundle-Vendor: %PLUGIN_PROVIDER Bundle-Localization: plugin Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.3.0,4.0.0)" -Eclipse-LazyStart: true +Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.core.internal.net;x-internal:=true, org.eclipse.core.net.proxy Bundle-RequiredExecutionEnvironment: J2SE-1.4, diff --git a/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 0a8003f15..000000000 --- a/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,12 +0,0 @@ -#Wed Mar 05 14:12:30 CET 2008 -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.4 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning -org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning -org.eclipse.jdt.core.compiler.source=1.3 diff --git a/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86/BUILD_INFO.txt b/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86/BUILD_INFO.txt new file mode 100644 index 000000000..b9285106d --- /dev/null +++ b/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86/BUILD_INFO.txt @@ -0,0 +1,10 @@ +Native Build Info: +------------------ + +platform: win32.x86 +built by: Stefan.Liebig@compeople.de +build date: 01-Apr-2008 +OS Name: Microsoft Windows XP Professional SP 2 +OS Version: 5.1.2600 Service Pack 2 Build 2600 +Compiler version: Microsoft Visual Studio 2008 VC Express Version 9.0.21022.8 RTM +Java version: Standard Edition (build 1.4.2-b28) diff --git a/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86/META-INF/MANIFEST.MF b/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86/META-INF/MANIFEST.MF index eb3166b41..99320457a 100644 --- a/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %fragmentName Bundle-SymbolicName: org.eclipse.core.net.win32.x86;singleton:=true Bundle-Version: 1.0.0 -Fragment-Host: org.eclipse.core.net;bundle-version="1.0.100" +Fragment-Host: org.eclipse.core.net;bundle-version="1.1.0" Eclipse-PlatformFilter: (& (osgi.os=win32) (osgi.arch=x86)) Bundle-Vendor: %providerName Bundle-RequiredExecutionEnvironment: J2SE-1.4 diff --git a/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86/build.properties b/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86/build.properties index 62826ea68..dc4a04e06 100644 --- a/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86/build.properties +++ b/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86/build.properties @@ -11,8 +11,9 @@ bin.includes = fragment.properties,\ .,\ about.html,\ - fragment.xml,\ - META-INF/ + META-INF/,\ + bin/,\ + jWinHttp.dll generateSourceBundle=false src.includes = about.html source.. = src/ diff --git a/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86/fragment.properties b/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86/fragment.properties index 8c3ef9927..fc06d275e 100644 --- a/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86/fragment.properties +++ b/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86/fragment.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2005 IBM Corporation and others. +# Copyright (c) 2008 IBM Corporation and others. # All rights reserved. This program and the accompanying materials # are made available under the terms of the Eclipse Public License v1.0 # which accompanies this distribution, and is available at diff --git a/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86/os/win32/jWinHttp.dll b/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86/jWinHttp.dll Binary files differindex 3ea408e63..3ea408e63 100644 --- a/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86/os/win32/jWinHttp.dll +++ b/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86/jWinHttp.dll diff --git a/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86/src/org/eclipse/core/net/ProxyProvider.java b/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86/src/org/eclipse/core/net/ProxyProvider.java index 34bfd0429..6740e32ba 100644 --- a/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86/src/org/eclipse/core/net/ProxyProvider.java +++ b/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86/src/org/eclipse/core/net/ProxyProvider.java @@ -1,7 +1,16 @@ +/******************************************************************************* + * Copyright (c) 2008 compeople AG and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * compeople AG (Stefan Liebig) - initial API and implementation + *******************************************************************************/ package org.eclipse.core.net; import org.eclipse.core.internal.net.WindowsProxyProvider; public class ProxyProvider extends WindowsProxyProvider { - } diff --git a/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/ProxyManager.java b/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/ProxyManager.java index 939d5b6ea..068ff6de2 100644 --- a/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/ProxyManager.java +++ b/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/ProxyManager.java @@ -288,7 +288,6 @@ public class ProxyManager implements IProxyService, IPreferenceChangeListener { checkMigrated(); if (hasSystemProxies() && isSystemProxiesEnabled()) try { - System.out.println(new URI(host)); return nativeProxyProvider.select(new URI(host)); } catch (URISyntaxException e) { return new IProxyData[0]; |