From 038aad1a8076cd1193881c5d43809d099eda121c Mon Sep 17 00:00:00 2001 From: scottslewis Date: Fri, 21 Apr 2023 18:43:41 -0700 Subject: [PATCH] Fixes for 3.14.38 build --- .../org.eclipse.ecf.ssl/META-INF/MANIFEST.MF | 4 +- .../bundles/org.eclipse.ecf.ui/.classpath | 2 +- .../org.eclipse.ecf.ui/.settings/.api_filters | 14 ++++ .../org.eclipse.ecf.ui/META-INF/MANIFEST.MF | 8 +-- framework/bundles/org.eclipse.ecf.ui/pom.xml | 2 +- .../ecf/ui/util/PasswordCacheHelper.java | 44 +++--------- pom.xml | 2 +- .../META-INF/MANIFEST.MF | 1 - .../ecf-2022-12.target | 72 +++++++++++++++++++ releng/org.eclipse.ecf.releng.target/pom.xml | 4 +- 10 files changed, 107 insertions(+), 46 deletions(-) create mode 100644 releng/org.eclipse.ecf.releng.target/ecf-2022-12.target diff --git a/framework/bundles/org.eclipse.ecf.ssl/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf.ssl/META-INF/MANIFEST.MF index b569f3a85c..6a78c4755f 100644 --- a/framework/bundles/org.eclipse.ecf.ssl/META-INF/MANIFEST.MF +++ b/framework/bundles/org.eclipse.ecf.ssl/META-INF/MANIFEST.MF @@ -6,9 +6,7 @@ Automatic-Module-Name: org.eclipse.ecf.ssl Bundle-Version: 1.3.0.qualifier Fragment-Host: org.eclipse.ecf Bundle-RequiredExecutionEnvironment: JavaSE-17 -Import-Package: javax.net, - javax.net.ssl, - org.eclipse.osgi.service.security +Import-Package: org.eclipse.osgi.service.security Bundle-Localization: plugin Export-Package: org.eclipse.ecf.internal.ssl;x-internal:=true Bundle-Vendor: %plugin.provider diff --git a/framework/bundles/org.eclipse.ecf.ui/.classpath b/framework/bundles/org.eclipse.ecf.ui/.classpath index 6f3b481acd..e801ebfb46 100644 --- a/framework/bundles/org.eclipse.ecf.ui/.classpath +++ b/framework/bundles/org.eclipse.ecf.ui/.classpath @@ -1,6 +1,6 @@ - + diff --git a/framework/bundles/org.eclipse.ecf.ui/.settings/.api_filters b/framework/bundles/org.eclipse.ecf.ui/.settings/.api_filters index 682bdf2242..0ad5e09ab9 100644 --- a/framework/bundles/org.eclipse.ecf.ui/.settings/.api_filters +++ b/framework/bundles/org.eclipse.ecf.ui/.settings/.api_filters @@ -22,6 +22,20 @@ + + + + + + + + + + + + + + diff --git a/framework/bundles/org.eclipse.ecf.ui/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf.ui/META-INF/MANIFEST.MF index 61b3bfd322..398d2cf4f7 100644 --- a/framework/bundles/org.eclipse.ecf.ui/META-INF/MANIFEST.MF +++ b/framework/bundles/org.eclipse.ecf.ui/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-Name: %plugin.name Bundle-SymbolicName: org.eclipse.ecf.ui;singleton:=true Automatic-Module-Name: org.eclipse.ecf.ui -Bundle-Version: 2.2.201.qualifier +Bundle-Version: 2.3.0.qualifier Bundle-Activator: org.eclipse.ecf.internal.ui.Activator Bundle-Vendor: %plugin.provider Bundle-Localization: plugin @@ -21,8 +21,7 @@ Export-Package: org.eclipse.ecf.internal.ui;version="2.1.0";x-internal:=true, org.eclipse.ecf.ui.wizards;version="2.1.0" Eclipse-RegisterBuddy: org.eclipse.ecf Eclipse-BuddyPolicy: dependent -Bundle-RequiredExecutionEnvironment: CDC-1.1/Foundation-1.1, - J2SE-1.4 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: org.eclipse.ecf, org.eclipse.ecf.presence, org.eclipse.jface.text, @@ -31,5 +30,6 @@ Require-Bundle: org.eclipse.ecf, org.eclipse.ecf.filetransfer, org.eclipse.ecf.sharedobject Bundle-ActivationPolicy: lazy -Import-Package: org.eclipse.ui.editors.text;resolution:=optional +Import-Package: org.eclipse.equinox.security.storage;version="1.0.0", + org.eclipse.ui.editors.text;resolution:=optional diff --git a/framework/bundles/org.eclipse.ecf.ui/pom.xml b/framework/bundles/org.eclipse.ecf.ui/pom.xml index dc427580e7..0eff547d72 100644 --- a/framework/bundles/org.eclipse.ecf.ui/pom.xml +++ b/framework/bundles/org.eclipse.ecf.ui/pom.xml @@ -10,6 +10,6 @@ org.eclipse.ecf org.eclipse.ecf.ui - 2.2.201-SNAPSHOT + 2.3.0-SNAPSHOT eclipse-plugin diff --git a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/util/PasswordCacheHelper.java b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/util/PasswordCacheHelper.java index 25bbb80be2..072318e09c 100644 --- a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/util/PasswordCacheHelper.java +++ b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/util/PasswordCacheHelper.java @@ -13,12 +13,8 @@ package org.eclipse.ecf.ui.util; -import java.net.MalformedURLException; -import java.net.URL; -import java.util.HashMap; -import java.util.Map; -import org.eclipse.core.runtime.*; import org.eclipse.ecf.internal.ui.Activator; +import org.eclipse.equinox.security.storage.*; /** * Helper for caching password via @@ -26,37 +22,18 @@ */ public class PasswordCacheHelper { - public static final URL FAKE_URL; - public static final String AUTH_SCHEME = ""; //$NON-NLS-1$ + private static final String TOP_NODE = "org.eclipse.ecf.ui"; //$NON-NLS-1$ public static final String INFO_PASSWORD = "org.eclipse.ecf.ui.password"; //$NON-NLS-1$ - private String targetAuthority; - - static { - URL temp = null; - try { - temp = new URL("http://org.eclipse.ecf.ui"); //$NON-NLS-1$ - } catch (MalformedURLException e) { - // Never happens - } - FAKE_URL = temp; - } + private ISecurePreferences securePrefs; public PasswordCacheHelper(String targetID) { - this.targetAuthority = targetID; - Assert.isNotNull(this.targetAuthority); + this.securePrefs = SecurePreferencesFactory.getDefault().node(TOP_NODE).node(targetID); } public boolean savePassword(String password) { - Map map = Platform.getAuthorizationInfo(FAKE_URL, targetAuthority, AUTH_SCHEME); - if (map == null) { - map = new HashMap(10); - } - if (password != null) - map.put(INFO_PASSWORD, password); - try { - Platform.addAuthorizationInfo(FAKE_URL, targetAuthority, AUTH_SCHEME, map); - } catch (CoreException e) { + this.securePrefs.put(INFO_PASSWORD, password, true); + } catch (StorageException e) { Activator.log("savePassword", e); //$NON-NLS-1$ return false; } @@ -64,10 +41,11 @@ public boolean savePassword(String password) { } public String retrievePassword() { - Map map = Platform.getAuthorizationInfo(FAKE_URL, targetAuthority, AUTH_SCHEME); - if (map != null) { - return (String) map.get(INFO_PASSWORD); + try { + return this.securePrefs.get(INFO_PASSWORD, null); + } catch (StorageException e) { + Activator.log("savePassword", e); //$NON-NLS-1$ + return null; } - return null; } } diff --git a/pom.xml b/pom.xml index d41f3cc47f..0649a5a251 100644 --- a/pom.xml +++ b/pom.xml @@ -74,7 +74,7 @@ 2.7.5 1.3.2 - 2022-03 + 2022-12 https://download.eclipse.org/eclipse/updates/latest/ ISO-8859-1 ISO-8859-1 diff --git a/providers/bundles/org.eclipse.ecf.provider.filetransfer.ssl/META-INF/MANIFEST.MF b/providers/bundles/org.eclipse.ecf.provider.filetransfer.ssl/META-INF/MANIFEST.MF index 923ed82c4c..f41007e091 100644 --- a/providers/bundles/org.eclipse.ecf.provider.filetransfer.ssl/META-INF/MANIFEST.MF +++ b/providers/bundles/org.eclipse.ecf.provider.filetransfer.ssl/META-INF/MANIFEST.MF @@ -8,4 +8,3 @@ Bundle-Vendor: %plugin.provider Fragment-Host: org.eclipse.ecf.provider.filetransfer;bundle-version="2.0.0" Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-Localization: plugin -Import-Package: javax.net.ssl diff --git a/releng/org.eclipse.ecf.releng.target/ecf-2022-12.target b/releng/org.eclipse.ecf.releng.target/ecf-2022-12.target new file mode 100644 index 0000000000..b295093100 --- /dev/null +++ b/releng/org.eclipse.ecf.releng.target/ecf-2022-12.target @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/releng/org.eclipse.ecf.releng.target/pom.xml b/releng/org.eclipse.ecf.releng.target/pom.xml index bb64a15409..20e5e7aeb7 100644 --- a/releng/org.eclipse.ecf.releng.target/pom.xml +++ b/releng/org.eclipse.ecf.releng.target/pom.xml @@ -31,9 +31,9 @@ - ecf-2021-09.target + ecf-2022-12.target target - ecf-2021-09 + ecf-2022-12