Bug 223945 [sec] Should AuthorizationEngine/AuthorizationManager be internal.provisional ?
diff --git a/bundles/org.eclipse.equinox.security.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.security.ui/META-INF/MANIFEST.MF
index e2af7a1..2e7eb02 100644
--- a/bundles/org.eclipse.equinox.security.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.security.ui/META-INF/MANIFEST.MF
@@ -11,6 +11,7 @@
org.eclipse.core.runtime,
org.eclipse.core.runtime.jobs,
org.eclipse.jface.action,
+ org.eclipse.osgi.internal.provisional.service.security;version="[1.0.0,2.0.0)",
org.eclipse.osgi.internal.service.security,
org.eclipse.osgi.service.resolver;version="1.2.0",
org.eclipse.osgi.service.security;version="1.0.0",
@@ -21,12 +22,12 @@
org.eclipse.equinox.preferences;bundle-version="[3.2.200,4.0.0)",
org.eclipse.ui;bundle-version="[3.4.0,4.0.0)"
Bundle-Activator: org.eclipse.equinox.internal.security.ui.Activator
-Export-Package: org.eclipse.equinox.internal.security.ui;x-internal:=true,
+Export-Package: org.eclipse.equinox.internal.provisional.security.ui.actions;version="1.0.0";x-internal:=true,
+ org.eclipse.equinox.internal.provisional.security.ui.services;version="1.0.0";x-internal:=true,
+ org.eclipse.equinox.internal.security.ui;x-internal:=true,
org.eclipse.equinox.internal.security.ui.nls;x-internal:=true,
org.eclipse.equinox.internal.security.ui.preferences;x-internal:=true,
org.eclipse.equinox.internal.security.ui.storage;x-internal:=true,
- org.eclipse.equinox.internal.security.ui.wizard;x-internal:=true,
- org.eclipse.equinox.security.ui.actions;version="1.0.0",
- org.eclipse.equinox.security.ui.services;version="1.0.0"
+ org.eclipse.equinox.internal.security.ui.wizard;x-internal:=true
Bundle-RequiredExecutionEnvironment: J2SE-1.4
Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/security/ui/actions/SecurityContributionItemFactory.java b/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/provisional/security/ui/actions/SecurityContributionItemFactory.java
similarity index 96%
rename from bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/security/ui/actions/SecurityContributionItemFactory.java
rename to bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/provisional/security/ui/actions/SecurityContributionItemFactory.java
index 63bfe37..232597e 100644
--- a/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/security/ui/actions/SecurityContributionItemFactory.java
+++ b/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/provisional/security/ui/actions/SecurityContributionItemFactory.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.security.ui.actions;
+package org.eclipse.equinox.internal.provisional.security.ui.actions;
import org.eclipse.equinox.internal.security.ui.SecurityStatusControl;
import org.eclipse.jface.action.IContributionItem;
diff --git a/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/security/ui/actions/package.html b/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/provisional/security/ui/actions/package.html
similarity index 100%
rename from bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/security/ui/actions/package.html
rename to bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/provisional/security/ui/actions/package.html
diff --git a/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/security/ui/services/AuthorizationManager.java b/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/provisional/security/ui/services/AuthorizationManager.java
similarity index 96%
rename from bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/security/ui/services/AuthorizationManager.java
rename to bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/provisional/security/ui/services/AuthorizationManager.java
index 656bc50..ae187b0 100644
--- a/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/security/ui/services/AuthorizationManager.java
+++ b/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/provisional/security/ui/services/AuthorizationManager.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.security.ui.services;
+package org.eclipse.equinox.internal.provisional.security.ui.services;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.ui.IWorkbenchWindow;
diff --git a/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/security/ui/services/package.html b/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/provisional/security/ui/services/package.html
similarity index 100%
rename from bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/security/ui/services/package.html
rename to bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/provisional/security/ui/services/package.html
diff --git a/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/Activator.java b/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/Activator.java
index 5faca2d..3416c35 100644
--- a/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/Activator.java
+++ b/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/Activator.java
@@ -15,10 +15,10 @@
import java.util.Hashtable;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
-import org.eclipse.equinox.security.ui.services.AuthorizationManager;
+import org.eclipse.equinox.internal.provisional.security.ui.services.AuthorizationManager;
import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.osgi.internal.provisional.service.security.AuthorizationEngine;
import org.eclipse.osgi.service.resolver.PlatformAdmin;
-import org.eclipse.osgi.service.security.AuthorizationEngine;
import org.eclipse.osgi.service.security.TrustEngine;
import org.eclipse.osgi.util.NLS;
import org.eclipse.ui.plugin.AbstractUIPlugin;
diff --git a/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/DefaultAuthorizationManager.java b/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/DefaultAuthorizationManager.java
index b2a257c..1f38f00 100644
--- a/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/DefaultAuthorizationManager.java
+++ b/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/DefaultAuthorizationManager.java
@@ -12,8 +12,8 @@
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
-import org.eclipse.equinox.security.ui.services.AuthorizationManager;
-import org.eclipse.osgi.service.security.AuthorizationStatus;
+import org.eclipse.equinox.internal.provisional.security.ui.services.AuthorizationManager;
+import org.eclipse.osgi.internal.provisional.service.security.AuthorizationStatus;
import org.eclipse.ui.IWorkbenchWindow;
// 1. if there are disabled bundles, and if so, which ones, why, and whether they are fatal or warn
diff --git a/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/SecurityStatusControl.java b/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/SecurityStatusControl.java
index 41510fc..0596ad6 100644
--- a/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/SecurityStatusControl.java
+++ b/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/SecurityStatusControl.java
@@ -12,7 +12,7 @@
import org.eclipse.core.runtime.*;
import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.equinox.security.ui.services.AuthorizationManager;
+import org.eclipse.equinox.internal.provisional.security.ui.services.AuthorizationManager;
import org.eclipse.jface.action.ControlContribution;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.swt.SWT;
diff --git a/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/preferences/PolicyPage.java b/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/preferences/PolicyPage.java
index ab54331..215ac76 100644
--- a/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/preferences/PolicyPage.java
+++ b/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/preferences/PolicyPage.java
@@ -13,8 +13,8 @@
import org.eclipse.equinox.internal.security.ui.Activator;
import org.eclipse.equinox.internal.security.ui.SecurityUIMsg;
import org.eclipse.jface.preference.PreferencePage;
+import org.eclipse.osgi.internal.provisional.service.security.AuthorizationEngine;
import org.eclipse.osgi.internal.service.security.DefaultAuthorizationEngine;
-import org.eclipse.osgi.service.security.AuthorizationEngine;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.events.SelectionListener;