diff options
69 files changed, 145 insertions, 145 deletions
diff --git a/bundles/org.eclipse.equinox.frameworkadmin.equinox/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.frameworkadmin.equinox/META-INF/MANIFEST.MF index ffadb2da2..39927645b 100644 --- a/bundles/org.eclipse.equinox.frameworkadmin.equinox/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.frameworkadmin.equinox/META-INF/MANIFEST.MF @@ -3,14 +3,14 @@ Bundle-ManifestVersion: 2 Bundle-Name: FrameworkAdmin Service for Equinox (Incubation) Bundle-SymbolicName: org.eclipse.equinox.frameworkadmin.equinox;singleton:=true Bundle-Version: 0.1.0.qualifier -Bundle-Activator: org.eclipse.equinox.frameworkadmin.equinox.internal.Activator +Bundle-Activator: org.eclipse.equinox.internal.frameworkadmin.equinox.Activator Bundle-Vendor: Eclipse.org Bundle-Localization: plugin Import-Package: org.eclipse.core.runtime.adaptor, org.eclipse.core.runtime.internal.adaptor, - org.eclipse.equinox.configuratormanipulator, - org.eclipse.equinox.frameworkadmin, org.eclipse.equinox.internal.frameworkadmin.utils, + org.eclipse.equinox.internal.provisional.configuratormanipulator, + org.eclipse.equinox.internal.provisional.frameworkadmin, org.eclipse.osgi.framework.adaptor;resolution:=optional, org.eclipse.osgi.framework.debug;resolution:=optional, org.eclipse.osgi.framework.internal.core, @@ -23,8 +23,8 @@ Import-Package: org.eclipse.core.runtime.adaptor, org.osgi.service.log;version="1.3.0", org.osgi.service.startlevel;version="1.0.0", org.osgi.util.tracker;version="1.3.2" -Export-Package: org.eclipse.equinox.frameworkadmin.equinox.internal;x-internal:=true, - org.eclipse.equinox.frameworkadmin.equinox.internal.utils;x-internal:=true +Export-Package: org.eclipse.equinox.internal.frameworkadmin.equinox;x-internal:=true, + org.eclipse.equinox.internal.frameworkadmin.equinox.utils;x-internal:=true Require-Bundle: org.eclipse.equinox.common Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0, J2SE-1.4 diff --git a/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/frameworkadmin/equinox/internal/Activator.java b/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/Activator.java index 3c6e16534..10b7c7910 100644 --- a/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/frameworkadmin/equinox/internal/Activator.java +++ b/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/Activator.java @@ -6,12 +6,12 @@ * * Contributors: IBM Corporation - initial API and implementation ******************************************************************************/ -package org.eclipse.equinox.frameworkadmin.equinox.internal; +package org.eclipse.equinox.internal.frameworkadmin.equinox; import java.util.Dictionary; import java.util.Hashtable; -import org.eclipse.equinox.frameworkadmin.FrameworkAdmin; -import org.eclipse.equinox.frameworkadmin.Manipulator; +import org.eclipse.equinox.internal.provisional.frameworkadmin.FrameworkAdmin; +import org.eclipse.equinox.internal.provisional.frameworkadmin.Manipulator; import org.osgi.framework.*; /** diff --git a/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/frameworkadmin/equinox/internal/EclipseLauncherImpl.java b/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/EclipseLauncherImpl.java index 6f9324603..d62ac6632 100644 --- a/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/frameworkadmin/equinox/internal/EclipseLauncherImpl.java +++ b/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/EclipseLauncherImpl.java @@ -6,15 +6,15 @@ * * Contributors: IBM Corporation - initial API and implementation ******************************************************************************/ -package org.eclipse.equinox.frameworkadmin.equinox.internal; +package org.eclipse.equinox.internal.frameworkadmin.equinox; import java.io.File; import java.io.IOException; import java.util.LinkedList; import java.util.List; -import org.eclipse.equinox.frameworkadmin.*; import org.eclipse.equinox.internal.frameworkadmin.utils.SimpleBundlesState; import org.eclipse.equinox.internal.frameworkadmin.utils.Utils; +import org.eclipse.equinox.internal.provisional.frameworkadmin.*; import org.osgi.service.log.LogService; public class EclipseLauncherImpl { diff --git a/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/frameworkadmin/equinox/internal/EclipseLauncherParser.java b/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/EclipseLauncherParser.java index e59f26360..3b5c7e92c 100644 --- a/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/frameworkadmin/equinox/internal/EclipseLauncherParser.java +++ b/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/EclipseLauncherParser.java @@ -6,7 +6,7 @@ * * Contributors: IBM Corporation - initial API and implementation ******************************************************************************/ -package org.eclipse.equinox.frameworkadmin.equinox.internal; +package org.eclipse.equinox.internal.frameworkadmin.equinox; import java.io.*; import java.net.MalformedURLException; @@ -14,9 +14,9 @@ import java.net.URL; import java.util.*; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Path; -import org.eclipse.equinox.frameworkadmin.LauncherData; -import org.eclipse.equinox.frameworkadmin.equinox.internal.utils.FileUtils; +import org.eclipse.equinox.internal.frameworkadmin.equinox.utils.FileUtils; import org.eclipse.equinox.internal.frameworkadmin.utils.Utils; +import org.eclipse.equinox.internal.provisional.frameworkadmin.LauncherData; import org.osgi.service.log.LogService; public class EclipseLauncherParser { diff --git a/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/frameworkadmin/equinox/internal/EquinoxBundlesState.java b/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/EquinoxBundlesState.java index 15dfcd9fb..6a43fb59f 100644 --- a/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/frameworkadmin/equinox/internal/EquinoxBundlesState.java +++ b/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/EquinoxBundlesState.java @@ -6,16 +6,16 @@ * * Contributors: IBM Corporation - initial API and implementation ******************************************************************************/ -package org.eclipse.equinox.frameworkadmin.equinox.internal; +package org.eclipse.equinox.internal.frameworkadmin.equinox; import java.io.File; import java.net.MalformedURLException; import java.util.*; import org.eclipse.core.runtime.internal.adaptor.EclipseEnvironmentInfo; -import org.eclipse.equinox.frameworkadmin.*; -import org.eclipse.equinox.frameworkadmin.equinox.internal.utils.FileUtils; +import org.eclipse.equinox.internal.frameworkadmin.equinox.utils.FileUtils; import org.eclipse.equinox.internal.frameworkadmin.utils.SimpleBundlesState; import org.eclipse.equinox.internal.frameworkadmin.utils.Utils; +import org.eclipse.equinox.internal.provisional.frameworkadmin.*; import org.eclipse.osgi.framework.internal.core.FrameworkProperties; import org.eclipse.osgi.service.resolver.*; import org.osgi.framework.*; diff --git a/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/frameworkadmin/equinox/internal/EquinoxConstants.java b/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/EquinoxConstants.java index 882d5fad4..f9de5dbe1 100644 --- a/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/frameworkadmin/equinox/internal/EquinoxConstants.java +++ b/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/EquinoxConstants.java @@ -6,7 +6,7 @@ * * Contributors: IBM Corporation - initial API and implementation ******************************************************************************/ -package org.eclipse.equinox.frameworkadmin.equinox.internal; +package org.eclipse.equinox.internal.frameworkadmin.equinox; public class EquinoxConstants { diff --git a/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/frameworkadmin/equinox/internal/EquinoxFrameworkAdminFactoryImpl.java b/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/EquinoxFrameworkAdminFactoryImpl.java index 95d688e44..82a230664 100644 --- a/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/frameworkadmin/equinox/internal/EquinoxFrameworkAdminFactoryImpl.java +++ b/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/EquinoxFrameworkAdminFactoryImpl.java @@ -6,11 +6,11 @@ * * Contributors: IBM Corporation - initial API and implementation ******************************************************************************/ -package org.eclipse.equinox.frameworkadmin.equinox.internal; +package org.eclipse.equinox.internal.frameworkadmin.equinox; -import org.eclipse.equinox.configuratormanipulator.ConfiguratorManipulatorFactory; -import org.eclipse.equinox.frameworkadmin.FrameworkAdmin; -import org.eclipse.equinox.frameworkadmin.FrameworkAdminFactory; +import org.eclipse.equinox.internal.provisional.configuratormanipulator.ConfiguratorManipulatorFactory; +import org.eclipse.equinox.internal.provisional.frameworkadmin.FrameworkAdmin; +import org.eclipse.equinox.internal.provisional.frameworkadmin.FrameworkAdminFactory; public class EquinoxFrameworkAdminFactoryImpl extends FrameworkAdminFactory { public FrameworkAdmin createFrameworkAdmin() throws InstantiationException, IllegalAccessException, ClassNotFoundException { diff --git a/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/frameworkadmin/equinox/internal/EquinoxFwAdminImpl.java b/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/EquinoxFwAdminImpl.java index 2a4c63064..18a741e71 100644 --- a/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/frameworkadmin/equinox/internal/EquinoxFwAdminImpl.java +++ b/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/EquinoxFwAdminImpl.java @@ -6,15 +6,15 @@ * * Contributors: IBM Corporation - initial API and implementation ******************************************************************************/ -package org.eclipse.equinox.frameworkadmin.equinox.internal; +package org.eclipse.equinox.internal.frameworkadmin.equinox; import java.io.File; import java.io.IOException; import java.util.Dictionary; -import org.eclipse.equinox.configuratormanipulator.ConfiguratorManipulator; -import org.eclipse.equinox.configuratormanipulator.ConfiguratorManipulatorFactory; -import org.eclipse.equinox.frameworkadmin.*; -import org.eclipse.equinox.frameworkadmin.equinox.internal.utils.EclipseVersion; +import org.eclipse.equinox.internal.frameworkadmin.equinox.utils.EclipseVersion; +import org.eclipse.equinox.internal.provisional.configuratormanipulator.ConfiguratorManipulator; +import org.eclipse.equinox.internal.provisional.configuratormanipulator.ConfiguratorManipulatorFactory; +import org.eclipse.equinox.internal.provisional.frameworkadmin.*; import org.osgi.framework.BundleContext; import org.osgi.framework.Constants; diff --git a/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/frameworkadmin/equinox/internal/EquinoxFwConfigFileParser.java b/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/EquinoxFwConfigFileParser.java index 295009fb0..70695adcf 100644 --- a/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/frameworkadmin/equinox/internal/EquinoxFwConfigFileParser.java +++ b/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/EquinoxFwConfigFileParser.java @@ -6,7 +6,7 @@ * * Contributors: IBM Corporation - initial API and implementation ******************************************************************************/ -package org.eclipse.equinox.frameworkadmin.equinox.internal; +package org.eclipse.equinox.internal.frameworkadmin.equinox; import java.io.*; import java.net.MalformedURLException; @@ -15,9 +15,9 @@ import java.util.Enumeration; import java.util.Properties; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Path; -import org.eclipse.equinox.frameworkadmin.*; -import org.eclipse.equinox.frameworkadmin.equinox.internal.utils.FileUtils; +import org.eclipse.equinox.internal.frameworkadmin.equinox.utils.FileUtils; import org.eclipse.equinox.internal.frameworkadmin.utils.Utils; +import org.eclipse.equinox.internal.provisional.frameworkadmin.*; import org.osgi.framework.BundleContext; import org.osgi.service.log.LogService; diff --git a/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/frameworkadmin/equinox/internal/EquinoxManipulatorImpl.java b/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/EquinoxManipulatorImpl.java index 0c50c5ee9..22852d0bc 100644 --- a/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/frameworkadmin/equinox/internal/EquinoxManipulatorImpl.java +++ b/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/EquinoxManipulatorImpl.java @@ -6,18 +6,18 @@ * * Contributors: IBM Corporation - initial API and implementation ******************************************************************************/ -package org.eclipse.equinox.frameworkadmin.equinox.internal; +package org.eclipse.equinox.internal.frameworkadmin.equinox; import java.io.File; import java.io.IOException; import java.net.URL; import java.util.*; import org.eclipse.core.runtime.*; -import org.eclipse.equinox.configuratormanipulator.ConfiguratorManipulator; -import org.eclipse.equinox.frameworkadmin.*; -import org.eclipse.equinox.frameworkadmin.equinox.internal.utils.FileUtils; +import org.eclipse.equinox.internal.frameworkadmin.equinox.utils.FileUtils; import org.eclipse.equinox.internal.frameworkadmin.utils.SimpleBundlesState; import org.eclipse.equinox.internal.frameworkadmin.utils.Utils; +import org.eclipse.equinox.internal.provisional.configuratormanipulator.ConfiguratorManipulator; +import org.eclipse.equinox.internal.provisional.frameworkadmin.*; import org.eclipse.osgi.service.datalocation.Location; import org.osgi.framework.*; import org.osgi.service.log.LogService; @@ -323,7 +323,7 @@ public class EquinoxManipulatorImpl implements Manipulator { } /* (non-Javadoc) - * @see org.eclipse.equinox.frameworkadmin.Manipulator#load() + * @see org.eclipse.equinox.internal.provisional.frameworkadmin.Manipulator#load() */ public void load() throws IllegalStateException, IOException, FrameworkAdminRuntimeException { Log.log(LogService.LOG_DEBUG, this, "load()", "BEGIN"); diff --git a/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/frameworkadmin/equinox/internal/Log.java b/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/Log.java index 548c02dca..6809674fa 100644 --- a/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/frameworkadmin/equinox/internal/Log.java +++ b/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/Log.java @@ -7,7 +7,7 @@ * Contributors: IBM Corporation - initial API and implementation ******************************************************************************/ -package org.eclipse.equinox.frameworkadmin.equinox.internal; +package org.eclipse.equinox.internal.frameworkadmin.equinox; import org.osgi.framework.BundleContext; import org.osgi.service.log.LogService; diff --git a/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/frameworkadmin/equinox/internal/utils/EclipseVersion.java b/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/utils/EclipseVersion.java index 7c0a4c5ec..2b517545c 100644 --- a/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/frameworkadmin/equinox/internal/utils/EclipseVersion.java +++ b/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/utils/EclipseVersion.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.frameworkadmin.equinox.internal.utils; +package org.eclipse.equinox.internal.frameworkadmin.equinox.utils; import java.util.StringTokenizer; diff --git a/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/frameworkadmin/equinox/internal/utils/FileUtils.java b/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/utils/FileUtils.java index 7b2f91497..d438bf1de 100644 --- a/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/frameworkadmin/equinox/internal/utils/FileUtils.java +++ b/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/utils/FileUtils.java @@ -6,14 +6,14 @@ * * Contributors: IBM Corporation - initial API and implementation ******************************************************************************/ -package org.eclipse.equinox.frameworkadmin.equinox.internal.utils; +package org.eclipse.equinox.internal.frameworkadmin.equinox.utils; import java.io.File; import java.net.MalformedURLException; import java.net.URL; -import org.eclipse.equinox.frameworkadmin.LauncherData; -import org.eclipse.equinox.frameworkadmin.Manipulator; -import org.eclipse.equinox.frameworkadmin.equinox.internal.EquinoxConstants; +import org.eclipse.equinox.internal.frameworkadmin.equinox.EquinoxConstants; +import org.eclipse.equinox.internal.provisional.frameworkadmin.LauncherData; +import org.eclipse.equinox.internal.provisional.frameworkadmin.Manipulator; public class FileUtils { diff --git a/bundles/org.eclipse.equinox.frameworkadmin.test/src/org/eclipse/equinox/frameworkadmin/internal/test/AbstractFwkAdminTest.java b/bundles/org.eclipse.equinox.frameworkadmin.test/src/org/eclipse/equinox/frameworkadmin/internal/test/AbstractFwkAdminTest.java index 18c0a96b8..2f26c74a1 100644 --- a/bundles/org.eclipse.equinox.frameworkadmin.test/src/org/eclipse/equinox/frameworkadmin/internal/test/AbstractFwkAdminTest.java +++ b/bundles/org.eclipse.equinox.frameworkadmin.test/src/org/eclipse/equinox/frameworkadmin/internal/test/AbstractFwkAdminTest.java @@ -11,7 +11,7 @@ package org.eclipse.equinox.frameworkadmin.internal.test; import java.io.*; import junit.framework.TestCase; import org.eclipse.core.runtime.Platform; -import org.eclipse.equinox.frameworkadmin.FrameworkAdmin; +import org.eclipse.equinox.internal.provisional.frameworkadmin.FrameworkAdmin; import org.osgi.framework.*; import org.osgi.util.tracker.ServiceTracker; diff --git a/bundles/org.eclipse.equinox.frameworkadmin.test/src/org/eclipse/equinox/frameworkadmin/internal/test/Bug196525.java b/bundles/org.eclipse.equinox.frameworkadmin.test/src/org/eclipse/equinox/frameworkadmin/internal/test/Bug196525.java index d8ce7951d..095819fcc 100644 --- a/bundles/org.eclipse.equinox.frameworkadmin.test/src/org/eclipse/equinox/frameworkadmin/internal/test/Bug196525.java +++ b/bundles/org.eclipse.equinox.frameworkadmin.test/src/org/eclipse/equinox/frameworkadmin/internal/test/Bug196525.java @@ -11,7 +11,7 @@ package org.eclipse.equinox.frameworkadmin.internal.test; import java.io.File; import java.io.IOException; import org.eclipse.core.runtime.FileLocator; -import org.eclipse.equinox.frameworkadmin.*; +import org.eclipse.equinox.internal.provisional.frameworkadmin.*; import org.osgi.framework.BundleException; public class Bug196525 extends AbstractFwkAdminTest { diff --git a/bundles/org.eclipse.equinox.frameworkadmin.test/src/org/eclipse/equinox/frameworkadmin/internal/test/CleanupTest.java b/bundles/org.eclipse.equinox.frameworkadmin.test/src/org/eclipse/equinox/frameworkadmin/internal/test/CleanupTest.java index c93290907..2b4d4abee 100644 --- a/bundles/org.eclipse.equinox.frameworkadmin.test/src/org/eclipse/equinox/frameworkadmin/internal/test/CleanupTest.java +++ b/bundles/org.eclipse.equinox.frameworkadmin.test/src/org/eclipse/equinox/frameworkadmin/internal/test/CleanupTest.java @@ -11,8 +11,8 @@ package org.eclipse.equinox.frameworkadmin.internal.test; import java.io.File; import java.io.IOException; import org.eclipse.core.runtime.FileLocator; -import org.eclipse.equinox.frameworkadmin.BundleInfo; -import org.eclipse.equinox.frameworkadmin.Manipulator; +import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo; +import org.eclipse.equinox.internal.provisional.frameworkadmin.Manipulator; public class CleanupTest extends FwkAdminAndSimpleConfiguratorTest { diff --git a/bundles/org.eclipse.equinox.frameworkadmin.test/src/org/eclipse/equinox/frameworkadmin/internal/test/FwkAdminAndSimpleConfiguratorTest.java b/bundles/org.eclipse.equinox.frameworkadmin.test/src/org/eclipse/equinox/frameworkadmin/internal/test/FwkAdminAndSimpleConfiguratorTest.java index 4ffa08c8e..617952b2d 100644 --- a/bundles/org.eclipse.equinox.frameworkadmin.test/src/org/eclipse/equinox/frameworkadmin/internal/test/FwkAdminAndSimpleConfiguratorTest.java +++ b/bundles/org.eclipse.equinox.frameworkadmin.test/src/org/eclipse/equinox/frameworkadmin/internal/test/FwkAdminAndSimpleConfiguratorTest.java @@ -11,7 +11,7 @@ package org.eclipse.equinox.frameworkadmin.internal.test; import java.io.File; import java.io.IOException; import org.eclipse.core.runtime.FileLocator; -import org.eclipse.equinox.frameworkadmin.*; +import org.eclipse.equinox.internal.provisional.frameworkadmin.*; import org.osgi.framework.BundleException; public abstract class FwkAdminAndSimpleConfiguratorTest extends AbstractFwkAdminTest { diff --git a/bundles/org.eclipse.equinox.frameworkadmin.test/src/org/eclipse/equinox/frameworkadmin/internal/test/OSGiVersionChange.java b/bundles/org.eclipse.equinox.frameworkadmin.test/src/org/eclipse/equinox/frameworkadmin/internal/test/OSGiVersionChange.java index 99850ea89..fe40bb7f4 100644 --- a/bundles/org.eclipse.equinox.frameworkadmin.test/src/org/eclipse/equinox/frameworkadmin/internal/test/OSGiVersionChange.java +++ b/bundles/org.eclipse.equinox.frameworkadmin.test/src/org/eclipse/equinox/frameworkadmin/internal/test/OSGiVersionChange.java @@ -10,7 +10,7 @@ package org.eclipse.equinox.frameworkadmin.internal.test; import java.io.IOException; import org.eclipse.core.runtime.FileLocator; -import org.eclipse.equinox.frameworkadmin.*; +import org.eclipse.equinox.internal.provisional.frameworkadmin.*; import org.osgi.framework.BundleException; public class OSGiVersionChange extends FwkAdminAndSimpleConfiguratorTest { diff --git a/bundles/org.eclipse.equinox.frameworkadmin.test/src/org/eclipse/equinox/frameworkadmin/internal/test/RelativePathTest.java b/bundles/org.eclipse.equinox.frameworkadmin.test/src/org/eclipse/equinox/frameworkadmin/internal/test/RelativePathTest.java index 0ca9ae0d5..fe869441e 100644 --- a/bundles/org.eclipse.equinox.frameworkadmin.test/src/org/eclipse/equinox/frameworkadmin/internal/test/RelativePathTest.java +++ b/bundles/org.eclipse.equinox.frameworkadmin.test/src/org/eclipse/equinox/frameworkadmin/internal/test/RelativePathTest.java @@ -10,7 +10,7 @@ package org.eclipse.equinox.frameworkadmin.internal.test; import java.io.*; import org.eclipse.core.runtime.FileLocator; -import org.eclipse.equinox.frameworkadmin.*; +import org.eclipse.equinox.internal.provisional.frameworkadmin.*; public class RelativePathTest extends FwkAdminAndSimpleConfiguratorTest { public RelativePathTest(String name) throws Exception { diff --git a/bundles/org.eclipse.equinox.frameworkadmin.test/src/org/eclipse/equinox/frameworkadmin/internal/test/SimpleConfiguratorComingAndGoing.java b/bundles/org.eclipse.equinox.frameworkadmin.test/src/org/eclipse/equinox/frameworkadmin/internal/test/SimpleConfiguratorComingAndGoing.java index 3c0aa7b4d..285a2078d 100644 --- a/bundles/org.eclipse.equinox.frameworkadmin.test/src/org/eclipse/equinox/frameworkadmin/internal/test/SimpleConfiguratorComingAndGoing.java +++ b/bundles/org.eclipse.equinox.frameworkadmin.test/src/org/eclipse/equinox/frameworkadmin/internal/test/SimpleConfiguratorComingAndGoing.java @@ -11,7 +11,7 @@ package org.eclipse.equinox.frameworkadmin.internal.test; import java.io.File; import java.io.IOException; import org.eclipse.core.runtime.FileLocator; -import org.eclipse.equinox.frameworkadmin.*; +import org.eclipse.equinox.internal.provisional.frameworkadmin.*; import org.osgi.framework.BundleException; public class SimpleConfiguratorComingAndGoing extends FwkAdminAndSimpleConfiguratorTest { diff --git a/bundles/org.eclipse.equinox.frameworkadmin.test/src/org/eclipse/equinox/frameworkadmin/internal/test/SimpleConfiguratorTest.java b/bundles/org.eclipse.equinox.frameworkadmin.test/src/org/eclipse/equinox/frameworkadmin/internal/test/SimpleConfiguratorTest.java index ecaecb19d..bcbad9a84 100644 --- a/bundles/org.eclipse.equinox.frameworkadmin.test/src/org/eclipse/equinox/frameworkadmin/internal/test/SimpleConfiguratorTest.java +++ b/bundles/org.eclipse.equinox.frameworkadmin.test/src/org/eclipse/equinox/frameworkadmin/internal/test/SimpleConfiguratorTest.java @@ -11,7 +11,7 @@ package org.eclipse.equinox.frameworkadmin.internal.test; import java.io.File; import java.io.IOException; import org.eclipse.core.runtime.FileLocator; -import org.eclipse.equinox.frameworkadmin.*; +import org.eclipse.equinox.internal.provisional.frameworkadmin.*; import org.osgi.framework.BundleException; public class SimpleConfiguratorTest extends AbstractFwkAdminTest { diff --git a/bundles/org.eclipse.equinox.frameworkadmin/test/org/eclipse/incubator/configurator/util/UtilsTest.java b/bundles/org.eclipse.equinox.frameworkadmin.test/src/org/eclipse/equinox/frameworkadmin/internal/test/UtilsTest.java index b50ca0b2a..7c77189c2 100644 --- a/bundles/org.eclipse.equinox.frameworkadmin/test/org/eclipse/incubator/configurator/util/UtilsTest.java +++ b/bundles/org.eclipse.equinox.frameworkadmin.test/src/org/eclipse/equinox/frameworkadmin/internal/test/UtilsTest.java @@ -1,3 +1,4 @@ +package org.eclipse.equinox.frameworkadmin.internal.test; /******************************************************************************* * Copyright (c) 2005, 2007 IBM Corporation and others. * All rights reserved. This program and the accompanying materials diff --git a/bundles/org.eclipse.equinox.frameworkadmin/.classpath b/bundles/org.eclipse.equinox.frameworkadmin/.classpath index 6bd36e3bb..7cdeb7319 100644 --- a/bundles/org.eclipse.equinox.frameworkadmin/.classpath +++ b/bundles/org.eclipse.equinox.frameworkadmin/.classpath @@ -1,7 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" path="src"/> - <classpathentry kind="src" path="test"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/CDC-1.1%Foundation-1.1"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="output" path="bin"/> diff --git a/bundles/org.eclipse.equinox.frameworkadmin/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.frameworkadmin/META-INF/MANIFEST.MF index 9858ca323..8a4e66091 100644 --- a/bundles/org.eclipse.equinox.frameworkadmin/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.frameworkadmin/META-INF/MANIFEST.MF @@ -6,9 +6,9 @@ Bundle-Version: 0.1.0.qualifier Bundle-Vendor: Eclipse.org Import-Package: org.osgi.framework;version="1.3.0", org.osgi.service.startlevel;version="1.0.0" -Export-Package: org.eclipse.equinox.configuratormanipulator, - org.eclipse.equinox.frameworkadmin, - org.eclipse.equinox.internal.frameworkadmin.utils;x-friends:="org.eclipse.equinox.frameworkadmin.equinox" +Export-Package: org.eclipse.equinox.internal.frameworkadmin.utils;x-friends:="org.eclipse.equinox.frameworkadmin.equinox", + org.eclipse.equinox.internal.provisional.configuratormanipulator, + org.eclipse.equinox.internal.provisional.frameworkadmin Bundle-RequiredExecutionEnvironment: J2SE-1.4, CDC-1.1/Foundation-1.1 Require-Bundle: org.eclipse.equinox.common;bundle-version="3.4.0" diff --git a/bundles/org.eclipse.equinox.frameworkadmin/src/org/eclipse/equinox/internal/frameworkadmin/utils/SimpleBundlesState.java b/bundles/org.eclipse.equinox.frameworkadmin/src/org/eclipse/equinox/internal/frameworkadmin/utils/SimpleBundlesState.java index d177ab40d..c22b7d64e 100644 --- a/bundles/org.eclipse.equinox.frameworkadmin/src/org/eclipse/equinox/internal/frameworkadmin/utils/SimpleBundlesState.java +++ b/bundles/org.eclipse.equinox.frameworkadmin/src/org/eclipse/equinox/internal/frameworkadmin/utils/SimpleBundlesState.java @@ -15,7 +15,7 @@ import java.io.IOException; import java.net.MalformedURLException; import java.util.*; -import org.eclipse.equinox.frameworkadmin.*; +import org.eclipse.equinox.internal.provisional.frameworkadmin.*; import org.osgi.framework.Constants; /** @@ -117,7 +117,7 @@ public class SimpleBundlesState implements BundlesState { /* * Just return required bundles. * - * @see org.eclipse.equinox.frameworkadmin.BundlesState#getPrerequisteBundles(org.eclipse.equinox.frameworkadmin.BundleInfo) + * @see org.eclipse.equinox.internal.provisional.frameworkadmin.BundlesState#getPrerequisteBundles(org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo) */ public BundleInfo[] getPrerequisteBundles(BundleInfo bInfo) { String location = bInfo.getLocation(); diff --git a/bundles/org.eclipse.equinox.frameworkadmin/src/org/eclipse/equinox/internal/frameworkadmin/utils/Utils.java b/bundles/org.eclipse.equinox.frameworkadmin/src/org/eclipse/equinox/internal/frameworkadmin/utils/Utils.java index 89edbfb05..c06b0e791 100644 --- a/bundles/org.eclipse.equinox.frameworkadmin/src/org/eclipse/equinox/internal/frameworkadmin/utils/Utils.java +++ b/bundles/org.eclipse.equinox.frameworkadmin/src/org/eclipse/equinox/internal/frameworkadmin/utils/Utils.java @@ -15,7 +15,7 @@ import java.util.*; import java.util.jar.*; import java.util.zip.ZipEntry; import java.util.zip.ZipFile; -import org.eclipse.equinox.frameworkadmin.BundleInfo; +import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo; public class Utils { private final static String PATH_SEP = "/"; diff --git a/bundles/org.eclipse.equinox.frameworkadmin/src/org/eclipse/equinox/configuratormanipulator/ConfiguratorManipulator.java b/bundles/org.eclipse.equinox.frameworkadmin/src/org/eclipse/equinox/internal/provisional/configuratormanipulator/ConfiguratorManipulator.java index c386d0403..f070a3a62 100644 --- a/bundles/org.eclipse.equinox.frameworkadmin/src/org/eclipse/equinox/configuratormanipulator/ConfiguratorManipulator.java +++ b/bundles/org.eclipse.equinox.frameworkadmin/src/org/eclipse/equinox/internal/provisional/configuratormanipulator/ConfiguratorManipulator.java @@ -8,12 +8,12 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.configuratormanipulator; +package org.eclipse.equinox.internal.provisional.configuratormanipulator; import java.io.File; import java.io.IOException; -import org.eclipse.equinox.frameworkadmin.*; +import org.eclipse.equinox.internal.provisional.frameworkadmin.*; /** * diff --git a/bundles/org.eclipse.equinox.frameworkadmin/src/org/eclipse/equinox/configuratormanipulator/ConfiguratorManipulatorFactory.java b/bundles/org.eclipse.equinox.frameworkadmin/src/org/eclipse/equinox/internal/provisional/configuratormanipulator/ConfiguratorManipulatorFactory.java index a630a7ab9..c81410500 100644 --- a/bundles/org.eclipse.equinox.frameworkadmin/src/org/eclipse/equinox/configuratormanipulator/ConfiguratorManipulatorFactory.java +++ b/bundles/org.eclipse.equinox.frameworkadmin/src/org/eclipse/equinox/internal/provisional/configuratormanipulator/ConfiguratorManipulatorFactory.java @@ -8,9 +8,9 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.configuratormanipulator; +package org.eclipse.equinox.internal.provisional.configuratormanipulator; -import org.eclipse.equinox.frameworkadmin.FrameworkAdmin; +import org.eclipse.equinox.internal.provisional.frameworkadmin.FrameworkAdmin; /** * Factory class for creating ConfiguratorManipulator object from Java programs. diff --git a/bundles/org.eclipse.equinox.frameworkadmin/src/org/eclipse/equinox/configuratormanipulator/ExtendedFrameworkAdminFactory.java b/bundles/org.eclipse.equinox.frameworkadmin/src/org/eclipse/equinox/internal/provisional/configuratormanipulator/ExtendedFrameworkAdminFactory.java index fa8c1268b..c6d882b4b 100644 --- a/bundles/org.eclipse.equinox.frameworkadmin/src/org/eclipse/equinox/configuratormanipulator/ExtendedFrameworkAdminFactory.java +++ b/bundles/org.eclipse.equinox.frameworkadmin/src/org/eclipse/equinox/internal/provisional/configuratormanipulator/ExtendedFrameworkAdminFactory.java @@ -1,4 +1,4 @@ -package org.eclipse.equinox.configuratormanipulator; +package org.eclipse.equinox.internal.provisional.configuratormanipulator; ///******************************************************************************* // * Copyright (c) 2007 IBM Corporation and others. // * All rights reserved. This program and the accompanying materials @@ -11,8 +11,8 @@ package org.eclipse.equinox.configuratormanipulator; // *******************************************************************************/ //package org.eclipse.equinox.configurator; // -//import org.eclipse.equinox.frameworkadmin.FrameworkAdmin; -//import org.eclipse.equinox.frameworkadmin.FrameworkAdminFactory; +//import org.eclipse.equinox.internal.provisional.frameworkadmin.FrameworkAdmin; +//import org.eclipse.equinox.internal.provisional.frameworkadmin.FrameworkAdminFactory; // //// This class is used for only method 1 to support ConfiguratorManipulator from a Java program // diff --git a/bundles/org.eclipse.equinox.frameworkadmin/src/org/eclipse/equinox/frameworkadmin/BundleInfo.java b/bundles/org.eclipse.equinox.frameworkadmin/src/org/eclipse/equinox/internal/provisional/frameworkadmin/BundleInfo.java index 24dbbea2a..44b8079d3 100644 --- a/bundles/org.eclipse.equinox.frameworkadmin/src/org/eclipse/equinox/frameworkadmin/BundleInfo.java +++ b/bundles/org.eclipse.equinox.frameworkadmin/src/org/eclipse/equinox/internal/provisional/frameworkadmin/BundleInfo.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.frameworkadmin; +package org.eclipse.equinox.internal.provisional.frameworkadmin; import org.eclipse.core.runtime.Path; diff --git a/bundles/org.eclipse.equinox.frameworkadmin/src/org/eclipse/equinox/frameworkadmin/BundlesState.java b/bundles/org.eclipse.equinox.frameworkadmin/src/org/eclipse/equinox/internal/provisional/frameworkadmin/BundlesState.java index c72c116d0..89a2e2787 100644 --- a/bundles/org.eclipse.equinox.frameworkadmin/src/org/eclipse/equinox/frameworkadmin/BundlesState.java +++ b/bundles/org.eclipse.equinox.frameworkadmin/src/org/eclipse/equinox/internal/provisional/frameworkadmin/BundlesState.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.frameworkadmin; +package org.eclipse.equinox.internal.provisional.frameworkadmin; /** * This API is used for expecting bundles state virtually. diff --git a/bundles/org.eclipse.equinox.frameworkadmin/src/org/eclipse/equinox/frameworkadmin/ConfigData.java b/bundles/org.eclipse.equinox.frameworkadmin/src/org/eclipse/equinox/internal/provisional/frameworkadmin/ConfigData.java index 92a7096db..ae0e5af94 100644 --- a/bundles/org.eclipse.equinox.frameworkadmin/src/org/eclipse/equinox/frameworkadmin/ConfigData.java +++ b/bundles/org.eclipse.equinox.frameworkadmin/src/org/eclipse/equinox/internal/provisional/frameworkadmin/ConfigData.java @@ -9,7 +9,7 @@ * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.frameworkadmin; +package org.eclipse.equinox.internal.provisional.frameworkadmin; import java.util.*; diff --git a/bundles/org.eclipse.equinox.frameworkadmin/src/org/eclipse/equinox/frameworkadmin/FrameworkAdmin.java b/bundles/org.eclipse.equinox.frameworkadmin/src/org/eclipse/equinox/internal/provisional/frameworkadmin/FrameworkAdmin.java index b50c71d3b..79eeae017 100644 --- a/bundles/org.eclipse.equinox.frameworkadmin/src/org/eclipse/equinox/frameworkadmin/FrameworkAdmin.java +++ b/bundles/org.eclipse.equinox.frameworkadmin/src/org/eclipse/equinox/internal/provisional/frameworkadmin/FrameworkAdmin.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.frameworkadmin; +package org.eclipse.equinox.internal.provisional.frameworkadmin; import java.io.File; import java.io.IOException; diff --git a/bundles/org.eclipse.equinox.frameworkadmin/src/org/eclipse/equinox/frameworkadmin/FrameworkAdminFactory.java b/bundles/org.eclipse.equinox.frameworkadmin/src/org/eclipse/equinox/internal/provisional/frameworkadmin/FrameworkAdminFactory.java index 6a114f042..df994af38 100644 --- a/bundles/org.eclipse.equinox.frameworkadmin/src/org/eclipse/equinox/frameworkadmin/FrameworkAdminFactory.java +++ b/bundles/org.eclipse.equinox.frameworkadmin/src/org/eclipse/equinox/internal/provisional/frameworkadmin/FrameworkAdminFactory.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.frameworkadmin; +package org.eclipse.equinox.internal.provisional.frameworkadmin; /** * Factory class for creating FrameworkAdmin object from Java programs. @@ -26,9 +26,9 @@ public abstract class FrameworkAdminFactory { // // method 3: two magic system properties are used. // public static FrameworkAdmin getInstance() throws InstantiationException, IllegalAccessException, ClassNotFoundException { - // String className = System.getProperty("org.eclipse.equinox.frameworkadmin.frameworkAdminFactory"); + // String className = System.getProperty("org.eclipse.equinox.internal.provisional.frameworkadmin.frameworkAdminFactory"); // if (className == null) - // throw new ClassNotFoundException("System property keyed by \"org.eclipse.equinox.frameworkadmin.frameworkAdminFactory\" is not set."); + // throw new ClassNotFoundException("System property keyed by \"org.eclipse.equinox.internal.provisional.frameworkadmin.frameworkAdminFactory\" is not set."); // FrameworkAdminFactory factory = (FrameworkAdminFactory) Class.forName(className).newInstance(); // return (FrameworkAdmin) factory.createFrameworkAdmin(); // } diff --git a/bundles/org.eclipse.equinox.frameworkadmin/src/org/eclipse/equinox/frameworkadmin/FrameworkAdminRuntimeException.java b/bundles/org.eclipse.equinox.frameworkadmin/src/org/eclipse/equinox/internal/provisional/frameworkadmin/FrameworkAdminRuntimeException.java index 2ceaddf7b..9bad8872d 100644 --- a/bundles/org.eclipse.equinox.frameworkadmin/src/org/eclipse/equinox/frameworkadmin/FrameworkAdminRuntimeException.java +++ b/bundles/org.eclipse.equinox.frameworkadmin/src/org/eclipse/equinox/internal/provisional/frameworkadmin/FrameworkAdminRuntimeException.java @@ -9,7 +9,7 @@ * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.frameworkadmin; +package org.eclipse.equinox.internal.provisional.frameworkadmin; public class FrameworkAdminRuntimeException extends RuntimeException { diff --git a/bundles/org.eclipse.equinox.frameworkadmin/src/org/eclipse/equinox/frameworkadmin/LauncherData.java b/bundles/org.eclipse.equinox.frameworkadmin/src/org/eclipse/equinox/internal/provisional/frameworkadmin/LauncherData.java index c92c4b152..cbfdeda96 100644 --- a/bundles/org.eclipse.equinox.frameworkadmin/src/org/eclipse/equinox/frameworkadmin/LauncherData.java +++ b/bundles/org.eclipse.equinox.frameworkadmin/src/org/eclipse/equinox/internal/provisional/frameworkadmin/LauncherData.java @@ -6,7 +6,7 @@ * * Contributors: IBM Corporation - initial API and implementation ******************************************************************************/ -package org.eclipse.equinox.frameworkadmin; +package org.eclipse.equinox.internal.provisional.frameworkadmin; import java.io.File; import java.util.*; diff --git a/bundles/org.eclipse.equinox.frameworkadmin/src/org/eclipse/equinox/frameworkadmin/Manipulator.java b/bundles/org.eclipse.equinox.frameworkadmin/src/org/eclipse/equinox/internal/provisional/frameworkadmin/Manipulator.java index 27c4473bb..d16749083 100644 --- a/bundles/org.eclipse.equinox.frameworkadmin/src/org/eclipse/equinox/frameworkadmin/Manipulator.java +++ b/bundles/org.eclipse.equinox.frameworkadmin/src/org/eclipse/equinox/internal/provisional/frameworkadmin/Manipulator.java @@ -8,12 +8,12 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.frameworkadmin; +package org.eclipse.equinox.internal.provisional.frameworkadmin; import java.io.File; import java.io.IOException; -import org.eclipse.equinox.configuratormanipulator.ConfiguratorManipulator; +import org.eclipse.equinox.internal.provisional.configuratormanipulator.ConfiguratorManipulator; /** * A manipulator is used to query and modify the state of a framework instance. diff --git a/bundles/org.eclipse.equinox.p2.console/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.console/META-INF/MANIFEST.MF index 74873e871..9203457ac 100644 --- a/bundles/org.eclipse.equinox.p2.console/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.p2.console/META-INF/MANIFEST.MF @@ -9,8 +9,8 @@ Bundle-Activator: org.eclipse.equinox.internal.p2.console.Activator Eclipse-LazyStart: true Export-Package: org.eclipse.equinox.internal.p2.console;x-friends:="org.eclipse.equinox.p2.director.app,org.eclipse.equinox.p2.tools" Import-Package: org.eclipse.core.runtime;common=split, - org.eclipse.equinox.configurator, org.eclipse.equinox.internal.p2.core.helpers, + org.eclipse.equinox.internal.provisional.configurator, org.eclipse.equinox.internal.provisional.p2.artifact.repository, org.eclipse.equinox.internal.provisional.p2.core, org.eclipse.equinox.internal.provisional.p2.core.repository, diff --git a/bundles/org.eclipse.equinox.p2.console/src/org/eclipse/equinox/internal/p2/console/ProvisioningHelper.java b/bundles/org.eclipse.equinox.p2.console/src/org/eclipse/equinox/internal/p2/console/ProvisioningHelper.java index 16fa7e123..212efc46f 100644 --- a/bundles/org.eclipse.equinox.p2.console/src/org/eclipse/equinox/internal/p2/console/ProvisioningHelper.java +++ b/bundles/org.eclipse.equinox.p2.console/src/org/eclipse/equinox/internal/p2/console/ProvisioningHelper.java @@ -15,8 +15,8 @@ import java.net.URL; import java.util.*; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; -import org.eclipse.equinox.configurator.Configurator; import org.eclipse.equinox.internal.p2.core.helpers.ServiceHelper; +import org.eclipse.equinox.internal.provisional.configurator.Configurator; import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepository; import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepositoryManager; import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; diff --git a/bundles/org.eclipse.equinox.p2.metadata.generator/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.metadata.generator/META-INF/MANIFEST.MF index f55bacddf..2793b7a99 100644 --- a/bundles/org.eclipse.equinox.p2.metadata.generator/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.p2.metadata.generator/META-INF/MANIFEST.MF @@ -11,10 +11,10 @@ Require-Bundle: org.eclipse.equinox.p2.core, org.eclipse.equinox.p2.metadata Import-Package: javax.xml.parsers, org.eclipse.equinox.app;version="1.0.0", - org.eclipse.equinox.frameworkadmin, org.eclipse.equinox.internal.p2.artifact.repository, org.eclipse.equinox.internal.p2.metadata, org.eclipse.equinox.internal.p2.metadata.repository, + org.eclipse.equinox.internal.provisional.frameworkadmin, org.eclipse.equinox.internal.provisional.p2.artifact.repository, org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing, org.eclipse.equinox.internal.provisional.p2.metadata, diff --git a/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/provisional/p2/metadata/generator/EclipseInstallGeneratorInfoProvider.java b/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/provisional/p2/metadata/generator/EclipseInstallGeneratorInfoProvider.java index 261da02eb..e4ce8fb74 100644 --- a/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/provisional/p2/metadata/generator/EclipseInstallGeneratorInfoProvider.java +++ b/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/provisional/p2/metadata/generator/EclipseInstallGeneratorInfoProvider.java @@ -14,10 +14,10 @@ import java.io.File; import java.io.IOException; import java.net.URL; import java.util.*; -import org.eclipse.equinox.frameworkadmin.*; import org.eclipse.equinox.internal.p2.core.helpers.ServiceHelper; import org.eclipse.equinox.internal.p2.metadata.generator.Activator; import org.eclipse.equinox.internal.p2.metadata.generator.Messages; +import org.eclipse.equinox.internal.provisional.frameworkadmin.*; import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepository; import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepository; diff --git a/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/provisional/p2/metadata/generator/Generator.java b/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/provisional/p2/metadata/generator/Generator.java index cc93b267e..fb461cda3 100644 --- a/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/provisional/p2/metadata/generator/Generator.java +++ b/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/provisional/p2/metadata/generator/Generator.java @@ -13,11 +13,11 @@ import java.net.URL; import java.util.*; import java.util.Map.Entry; import org.eclipse.core.runtime.*; -import org.eclipse.equinox.frameworkadmin.*; import org.eclipse.equinox.internal.p2.core.helpers.*; import org.eclipse.equinox.internal.p2.metadata.generator.Activator; import org.eclipse.equinox.internal.p2.metadata.generator.Messages; import org.eclipse.equinox.internal.p2.metadata.generator.features.*; +import org.eclipse.equinox.internal.provisional.frameworkadmin.*; import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactDescriptor; import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepository; import org.eclipse.equinox.internal.provisional.p2.metadata.*; diff --git a/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/provisional/p2/metadata/generator/GeneratorBundleInfo.java b/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/provisional/p2/metadata/generator/GeneratorBundleInfo.java index 662a349e2..62f15f120 100644 --- a/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/provisional/p2/metadata/generator/GeneratorBundleInfo.java +++ b/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/provisional/p2/metadata/generator/GeneratorBundleInfo.java @@ -11,8 +11,8 @@ package org.eclipse.equinox.internal.provisional.p2.metadata.generator; import java.io.ByteArrayInputStream; -import org.eclipse.equinox.frameworkadmin.BundleInfo; import org.eclipse.equinox.internal.p2.core.helpers.Headers; +import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo; import org.eclipse.osgi.util.ManifestElement; import org.osgi.framework.BundleException; import org.osgi.framework.Constants; diff --git a/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/provisional/p2/metadata/generator/IGeneratorInfo.java b/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/provisional/p2/metadata/generator/IGeneratorInfo.java index 43fedb028..c574bb496 100644 --- a/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/provisional/p2/metadata/generator/IGeneratorInfo.java +++ b/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/provisional/p2/metadata/generator/IGeneratorInfo.java @@ -14,8 +14,8 @@ import java.io.File; import java.net.URL; import java.util.ArrayList; import java.util.Set; -import org.eclipse.equinox.frameworkadmin.ConfigData; -import org.eclipse.equinox.frameworkadmin.LauncherData; +import org.eclipse.equinox.internal.provisional.frameworkadmin.ConfigData; +import org.eclipse.equinox.internal.provisional.frameworkadmin.LauncherData; import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepository; import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepository; diff --git a/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/provisional/p2/metadata/generator/MetadataGeneratorHelper.java b/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/provisional/p2/metadata/generator/MetadataGeneratorHelper.java index 1d6e1fb38..2fae915e0 100644 --- a/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/provisional/p2/metadata/generator/MetadataGeneratorHelper.java +++ b/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/provisional/p2/metadata/generator/MetadataGeneratorHelper.java @@ -12,12 +12,12 @@ package org.eclipse.equinox.internal.provisional.p2.metadata.generator; import java.io.*; import java.util.*; -import org.eclipse.equinox.frameworkadmin.BundleInfo; import org.eclipse.equinox.internal.p2.core.helpers.ServiceHelper; import org.eclipse.equinox.internal.p2.metadata.ArtifactKey; import org.eclipse.equinox.internal.p2.metadata.InstallableUnit; import org.eclipse.equinox.internal.p2.metadata.generator.Activator; import org.eclipse.equinox.internal.p2.metadata.generator.features.SiteCategory; +import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo; import org.eclipse.equinox.internal.provisional.p2.artifact.repository.ArtifactDescriptor; import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactDescriptor; import org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing.ProcessingStepDescriptor; diff --git a/bundles/org.eclipse.equinox.p2.reconciler.dropins/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.reconciler.dropins/META-INF/MANIFEST.MF index 2112bf7f7..15e196585 100644 --- a/bundles/org.eclipse.equinox.p2.reconciler.dropins/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.p2.reconciler.dropins/META-INF/MANIFEST.MF @@ -9,8 +9,8 @@ Bundle-Activator: org.eclipse.equinox.internal.p2.reconciler.dropins.Activator Eclipse-LazyStart: true Bundle-RequiredExecutionEnvironment: J2SE-1.4, CDC-1.1/Foundation-1.1 -Import-Package: org.eclipse.equinox.configurator, - org.eclipse.equinox.internal.p2.update, +Import-Package: org.eclipse.equinox.internal.p2.update, + org.eclipse.equinox.internal.provisional.configurator, org.eclipse.equinox.internal.provisional.p2.artifact.repository, org.eclipse.equinox.internal.provisional.p2.core, org.eclipse.equinox.internal.provisional.p2.core.repository, diff --git a/bundles/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/internal/p2/reconciler/dropins/ProfileSynchronizer.java b/bundles/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/internal/p2/reconciler/dropins/ProfileSynchronizer.java index b752f4c9e..3f8e08fcc 100644 --- a/bundles/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/internal/p2/reconciler/dropins/ProfileSynchronizer.java +++ b/bundles/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/internal/p2/reconciler/dropins/ProfileSynchronizer.java @@ -13,7 +13,7 @@ import java.io.IOException; import java.net.URL; import java.util.*; import org.eclipse.core.runtime.*; -import org.eclipse.equinox.configurator.Configurator; +import org.eclipse.equinox.internal.provisional.configurator.Configurator; import org.eclipse.equinox.internal.provisional.p2.director.*; import org.eclipse.equinox.internal.provisional.p2.engine.IProfile; import org.eclipse.equinox.internal.provisional.p2.engine.ProvisioningContext; diff --git a/bundles/org.eclipse.equinox.p2.reconciler/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.reconciler/META-INF/MANIFEST.MF index 2112bf7f7..15e196585 100644 --- a/bundles/org.eclipse.equinox.p2.reconciler/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.p2.reconciler/META-INF/MANIFEST.MF @@ -9,8 +9,8 @@ Bundle-Activator: org.eclipse.equinox.internal.p2.reconciler.dropins.Activator Eclipse-LazyStart: true Bundle-RequiredExecutionEnvironment: J2SE-1.4, CDC-1.1/Foundation-1.1 -Import-Package: org.eclipse.equinox.configurator, - org.eclipse.equinox.internal.p2.update, +Import-Package: org.eclipse.equinox.internal.p2.update, + org.eclipse.equinox.internal.provisional.configurator, org.eclipse.equinox.internal.provisional.p2.artifact.repository, org.eclipse.equinox.internal.provisional.p2.core, org.eclipse.equinox.internal.provisional.p2.core.repository, diff --git a/bundles/org.eclipse.equinox.p2.reconciler/src/org/eclipse/equinox/internal/p2/reconciler/dropins/ProfileSynchronizer.java b/bundles/org.eclipse.equinox.p2.reconciler/src/org/eclipse/equinox/internal/p2/reconciler/dropins/ProfileSynchronizer.java index b752f4c9e..3f8e08fcc 100644 --- a/bundles/org.eclipse.equinox.p2.reconciler/src/org/eclipse/equinox/internal/p2/reconciler/dropins/ProfileSynchronizer.java +++ b/bundles/org.eclipse.equinox.p2.reconciler/src/org/eclipse/equinox/internal/p2/reconciler/dropins/ProfileSynchronizer.java @@ -13,7 +13,7 @@ import java.io.IOException; import java.net.URL; import java.util.*; import org.eclipse.core.runtime.*; -import org.eclipse.equinox.configurator.Configurator; +import org.eclipse.equinox.internal.provisional.configurator.Configurator; import org.eclipse.equinox.internal.provisional.p2.director.*; import org.eclipse.equinox.internal.provisional.p2.engine.IProfile; import org.eclipse.equinox.internal.provisional.p2.engine.ProvisioningContext; diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/generator/TestGeneratorInfo.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/generator/TestGeneratorInfo.java index a0c5f7248..50a1d30b3 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/generator/TestGeneratorInfo.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/generator/TestGeneratorInfo.java @@ -14,8 +14,8 @@ import java.io.File; import java.net.URL; import java.util.ArrayList; import java.util.Set; -import org.eclipse.equinox.frameworkadmin.ConfigData; -import org.eclipse.equinox.frameworkadmin.LauncherData; +import org.eclipse.equinox.internal.provisional.frameworkadmin.ConfigData; +import org.eclipse.equinox.internal.provisional.frameworkadmin.LauncherData; import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepository; import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; import org.eclipse.equinox.internal.provisional.p2.metadata.generator.IGeneratorInfo; diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/META-INF/MANIFEST.MF index 7b7780d11..6b653af03 100644 --- a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/META-INF/MANIFEST.MF @@ -6,9 +6,9 @@ Bundle-Vendor: %providerName Bundle-Localization: plugin Bundle-Version: 0.1.0.qualifier Import-Package: org.eclipse.core.runtime;common=split, - org.eclipse.equinox.frameworkadmin, org.eclipse.equinox.internal.p2.core.helpers, org.eclipse.equinox.internal.p2.garbagecollector, + org.eclipse.equinox.internal.provisional.frameworkadmin, org.eclipse.equinox.internal.provisional.p2.artifact.repository, org.eclipse.equinox.internal.provisional.p2.core, org.eclipse.equinox.internal.provisional.p2.core.location, @@ -19,7 +19,7 @@ Import-Package: org.eclipse.core.runtime;common=split, org.eclipse.equinox.internal.provisional.p2.metadata.query, org.eclipse.equinox.internal.provisional.p2.query, org.eclipse.equinox.internal.provisional.spi.p2.artifact.repository, - org.eclipse.equinox.simpleconfigurator.manipulator.internal, + org.eclipse.equinox.internal.simpleconfigurator.manipulator, org.eclipse.osgi.service.datalocation;version="1.0.0", org.eclipse.osgi.service.environment;version="1.0.0", org.eclipse.osgi.service.resolver;version="1.2.0";resolution:=optional, diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/EclipseTouchpoint.java b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/EclipseTouchpoint.java index 316f07d32..a3b1a7120 100644 --- a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/EclipseTouchpoint.java +++ b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/EclipseTouchpoint.java @@ -14,8 +14,8 @@ import java.net.MalformedURLException; import java.net.URL; import java.util.*; import org.eclipse.core.runtime.*; -import org.eclipse.equinox.frameworkadmin.BundleInfo; -import org.eclipse.equinox.frameworkadmin.Manipulator; +import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo; +import org.eclipse.equinox.internal.provisional.frameworkadmin.Manipulator; import org.eclipse.equinox.internal.provisional.p2.artifact.repository.*; import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; import org.eclipse.equinox.internal.provisional.p2.engine.*; diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/LazyManipulator.java b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/LazyManipulator.java index b41fb85e7..6617f7306 100644 --- a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/LazyManipulator.java +++ b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/LazyManipulator.java @@ -12,7 +12,7 @@ package org.eclipse.equinox.internal.p2.touchpoint.eclipse; import java.io.File; import java.io.IOException; -import org.eclipse.equinox.frameworkadmin.*; +import org.eclipse.equinox.internal.provisional.frameworkadmin.*; import org.eclipse.equinox.internal.provisional.p2.engine.IProfile; import org.osgi.framework.*; import org.osgi.util.tracker.ServiceTracker; diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/SourceManipulator.java b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/SourceManipulator.java index 12428979e..ec0a093b7 100644 --- a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/SourceManipulator.java +++ b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/SourceManipulator.java @@ -13,9 +13,9 @@ import java.io.IOException; import java.net.MalformedURLException; import java.util.ArrayList; import java.util.List; -import org.eclipse.equinox.frameworkadmin.BundleInfo; +import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo; import org.eclipse.equinox.internal.provisional.p2.engine.IProfile; -import org.eclipse.equinox.simpleconfigurator.manipulator.internal.SimpleConfiguratorManipulatorImpl; +import org.eclipse.equinox.internal.simpleconfigurator.manipulator.SimpleConfiguratorManipulatorImpl; import org.osgi.framework.Version; //This class deals with source bundles and how their addition to the source.bundles.txt diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/Util.java b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/Util.java index 0373a32e4..3a55893a0 100644 --- a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/Util.java +++ b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/Util.java @@ -19,9 +19,9 @@ import java.util.zip.ZipEntry; import java.util.zip.ZipFile; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Path; -import org.eclipse.equinox.frameworkadmin.BundleInfo; -import org.eclipse.equinox.frameworkadmin.FrameworkAdmin; import org.eclipse.equinox.internal.p2.core.helpers.*; +import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo; +import org.eclipse.equinox.internal.provisional.frameworkadmin.FrameworkAdmin; import org.eclipse.equinox.internal.provisional.p2.artifact.repository.*; import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; import org.eclipse.equinox.internal.provisional.p2.core.location.AgentLocation; diff --git a/bundles/org.eclipse.equinox.p2.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.ui/META-INF/MANIFEST.MF index d568c3fa1..386307095 100644 --- a/bundles/org.eclipse.equinox.p2.ui/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.p2.ui/META-INF/MANIFEST.MF @@ -6,8 +6,8 @@ Bundle-Localization: plugin Bundle-SymbolicName: org.eclipse.equinox.p2.ui;singleton:=true Bundle-Version: 0.1.0.qualifier Bundle-Activator: org.eclipse.equinox.internal.p2.ui.ProvUIActivator -Import-Package: org.eclipse.equinox.configurator, - org.eclipse.equinox.internal.p2.core.helpers, +Import-Package: org.eclipse.equinox.internal.p2.core.helpers, + org.eclipse.equinox.internal.provisional.configurator, org.eclipse.equinox.internal.provisional.p2.artifact.repository, org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing, org.eclipse.equinox.internal.provisional.p2.core, diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/ProvUI.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/ProvUI.java index 4627c57e4..fa55cf022 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/ProvUI.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/ProvUI.java @@ -16,11 +16,11 @@ import java.lang.reflect.InvocationTargetException; import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.commands.operations.*; import org.eclipse.core.runtime.*; -import org.eclipse.equinox.configurator.Configurator; import org.eclipse.equinox.internal.p2.core.helpers.ServiceHelper; import org.eclipse.equinox.internal.p2.ui.ProvUIActivator; import org.eclipse.equinox.internal.p2.ui.ProvUIMessages; import org.eclipse.equinox.internal.p2.ui.dialogs.ApplyProfileChangesDialog; +import org.eclipse.equinox.internal.provisional.configurator.Configurator; import org.eclipse.equinox.internal.provisional.p2.ui.viewers.IUColumnConfig; import org.eclipse.equinox.internal.provisional.p2.ui.viewers.StructuredViewerProvisioningListener; import org.eclipse.jface.dialogs.MessageDialog; diff --git a/bundles/org.eclipse.equinox.simpleconfigurator.manipulator/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.simpleconfigurator.manipulator/META-INF/MANIFEST.MF index 6e8f6b5b0..7b80fb6bc 100644 --- a/bundles/org.eclipse.equinox.simpleconfigurator.manipulator/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.simpleconfigurator.manipulator/META-INF/MANIFEST.MF @@ -4,18 +4,18 @@ Bundle-Name: %bundleName Bundle-SymbolicName: org.eclipse.equinox.simpleconfigurator.manipulator;singleton:=true Bundle-Version: 0.1.0.qualifier Bundle-Localization: plugin -Bundle-Activator: org.eclipse.equinox.simpleconfigurator.manipulator.internal.Activator +Bundle-Activator: org.eclipse.equinox.internal.simpleconfigurator.manipulator.Activator Eclipse-LazyStart: true -Import-Package: org.eclipse.equinox.configuratormanipulator, - org.eclipse.equinox.frameworkadmin, - org.eclipse.equinox.internal.frameworkadmin.utils, +Import-Package: org.eclipse.equinox.internal.frameworkadmin.utils, + org.eclipse.equinox.internal.provisional.configuratormanipulator, + org.eclipse.equinox.internal.provisional.frameworkadmin, org.osgi.framework;version="1.3.0", org.osgi.service.packageadmin;version="1.2.0", org.osgi.service.startlevel;version="1.0.0", org.osgi.util.tracker Bundle-Vendor: %providerName -Export-Package: org.eclipse.equinox.internal.simpleconfigurator.utils;x-internal:=true, - org.eclipse.equinox.simpleconfigurator.manipulator.internal;x-friends:="org.eclipse.equinox.p2.touchpoint.eclipse" +Export-Package: org.eclipse.equinox.internal.simpleconfigurator.manipulator;x-friends:="org.eclipse.equinox.p2.touchpoint.eclipse", + org.eclipse.equinox.internal.simpleconfigurator.utils;x-internal:=true Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0, J2SE-1.4 Require-Bundle: org.eclipse.equinox.common;bundle-version="3.4.0" diff --git a/bundles/org.eclipse.equinox.simpleconfigurator.manipulator/src/org/eclipse/equinox/simpleconfigurator/manipulator/internal/Activator.java b/bundles/org.eclipse.equinox.simpleconfigurator.manipulator/src/org/eclipse/equinox/internal/simpleconfigurator/manipulator/Activator.java index 1759e9806..da43a8b22 100644 --- a/bundles/org.eclipse.equinox.simpleconfigurator.manipulator/src/org/eclipse/equinox/simpleconfigurator/manipulator/internal/Activator.java +++ b/bundles/org.eclipse.equinox.simpleconfigurator.manipulator/src/org/eclipse/equinox/internal/simpleconfigurator/manipulator/Activator.java @@ -8,11 +8,11 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.simpleconfigurator.manipulator.internal; +package org.eclipse.equinox.internal.simpleconfigurator.manipulator; import java.util.Dictionary; import java.util.Hashtable; -import org.eclipse.equinox.configuratormanipulator.ConfiguratorManipulator; +import org.eclipse.equinox.internal.provisional.configuratormanipulator.ConfiguratorManipulator; import org.eclipse.equinox.internal.simpleconfigurator.utils.SimpleConfiguratorConstants; import org.osgi.framework.*; import org.osgi.util.tracker.ServiceTracker; diff --git a/bundles/org.eclipse.equinox.simpleconfigurator.manipulator/src/org/eclipse/equinox/simpleconfigurator/manipulator/internal/SimpleConfiguratorManipulatorFactoryImpl.java b/bundles/org.eclipse.equinox.simpleconfigurator.manipulator/src/org/eclipse/equinox/internal/simpleconfigurator/manipulator/SimpleConfiguratorManipulatorFactoryImpl.java index 70b07f050..71ab7b307 100644 --- a/bundles/org.eclipse.equinox.simpleconfigurator.manipulator/src/org/eclipse/equinox/simpleconfigurator/manipulator/internal/SimpleConfiguratorManipulatorFactoryImpl.java +++ b/bundles/org.eclipse.equinox.simpleconfigurator.manipulator/src/org/eclipse/equinox/internal/simpleconfigurator/manipulator/SimpleConfiguratorManipulatorFactoryImpl.java @@ -8,10 +8,10 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.simpleconfigurator.manipulator.internal; +package org.eclipse.equinox.internal.simpleconfigurator.manipulator; -import org.eclipse.equinox.configuratormanipulator.ConfiguratorManipulator; -import org.eclipse.equinox.configuratormanipulator.ConfiguratorManipulatorFactory; +import org.eclipse.equinox.internal.provisional.configuratormanipulator.ConfiguratorManipulator; +import org.eclipse.equinox.internal.provisional.configuratormanipulator.ConfiguratorManipulatorFactory; public class SimpleConfiguratorManipulatorFactoryImpl extends ConfiguratorManipulatorFactory { diff --git a/bundles/org.eclipse.equinox.simpleconfigurator.manipulator/src/org/eclipse/equinox/simpleconfigurator/manipulator/internal/SimpleConfiguratorManipulatorImpl.java b/bundles/org.eclipse.equinox.simpleconfigurator.manipulator/src/org/eclipse/equinox/internal/simpleconfigurator/manipulator/SimpleConfiguratorManipulatorImpl.java index 427f4891d..fb6eb9068 100644 --- a/bundles/org.eclipse.equinox.simpleconfigurator.manipulator/src/org/eclipse/equinox/simpleconfigurator/manipulator/internal/SimpleConfiguratorManipulatorImpl.java +++ b/bundles/org.eclipse.equinox.simpleconfigurator.manipulator/src/org/eclipse/equinox/internal/simpleconfigurator/manipulator/SimpleConfiguratorManipulatorImpl.java @@ -6,7 +6,7 @@ * * Contributors: IBM Corporation - initial API and implementation ******************************************************************************/ -package org.eclipse.equinox.simpleconfigurator.manipulator.internal; +package org.eclipse.equinox.internal.simpleconfigurator.manipulator; import java.io.*; import java.net.MalformedURLException; @@ -14,9 +14,9 @@ import java.net.URL; import java.util.*; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Path; -import org.eclipse.equinox.configuratormanipulator.ConfiguratorManipulator; -import org.eclipse.equinox.frameworkadmin.*; import org.eclipse.equinox.internal.frameworkadmin.utils.Utils; +import org.eclipse.equinox.internal.provisional.configuratormanipulator.ConfiguratorManipulator; +import org.eclipse.equinox.internal.provisional.frameworkadmin.*; import org.eclipse.equinox.internal.simpleconfigurator.utils.SimpleConfiguratorConstants; import org.osgi.framework.Constants; diff --git a/bundles/org.eclipse.equinox.simpleconfigurator/.externalToolBuilders/Copy built version of simple configurator into metadata generator.launch b/bundles/org.eclipse.equinox.simpleconfigurator/.externalToolBuilders/Copy built version of simple configurator into metadata generator.launch index 62088ffa1..b68ad487d 100644 --- a/bundles/org.eclipse.equinox.simpleconfigurator/.externalToolBuilders/Copy built version of simple configurator into metadata generator.launch +++ b/bundles/org.eclipse.equinox.simpleconfigurator/.externalToolBuilders/Copy built version of simple configurator into metadata generator.launch @@ -1,30 +1,30 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<?xml version="1.0" encoding="UTF-8"?> <launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType"> +<booleanAttribute key="org.eclipse.ant.ui.ATTR_TARGETS_UPDATED" value="true"/> +<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/> <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"> -<listEntry value="/org.eclipse.equinox.simpleconfigurator/localbuild.xml"/> +<listEntry value="/org.eclipse.equinox.simpleconfigurator"/> </listAttribute> -<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,"/> +<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES"> +<listEntry value="4"/> +</listAttribute> +<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/> <booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/> +<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/> +<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/> <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.equinox.simpleconfigurator"/> <mapAttribute key="org.eclipse.ui.externaltools.ATTR_ANT_PROPERTIES"> -<mapEntry key="eclipse.home" value="D:\eclipse"/> -<mapEntry key="eclipse.pdebuild.templates" value="/D:/eclipse/plugins/org.eclipse.pde.build_3.3.0.v20070312/templates/"/> <mapEntry key="buildDirectory" value="${build_project}/trash"/> -<mapEntry key="eclipse.pdebuild.scripts" value="/D:/eclipse/plugins/org.eclipse.pde.build_3.3.0.v20070312/scripts/"/> -<mapEntry key="thisPlugin" value="${resource_loc:/org.eclipse.equinox.simpleconfigurator}"/> <mapEntry key="targetFolder" value="${resource_loc:/org.eclipse.equinox.p2.metadata.generator}"/> +<mapEntry key="eclipse.pdebuild.scripts" value="/D:/eclipse/plugins/org.eclipse.pde.build_3.3.0.v20070312/scripts/"/> <mapEntry key="eclipse.running" value="true"/> +<mapEntry key="thisPlugin" value="${resource_loc:/org.eclipse.equinox.simpleconfigurator}"/> +<mapEntry key="eclipse.pdebuild.templates" value="/D:/eclipse/plugins/org.eclipse.pde.build_3.3.0.v20070312/templates/"/> <mapEntry key="eclipse.pdebuild.home" value="/D:/eclipse/plugins/org.eclipse.pde.build_3.3.0.v20070312/./"/> +<mapEntry key="eclipse.home" value="D:\eclipse"/> <mapEntry key="baseLocation" value="${target_home}"/> </mapAttribute> -<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/> -<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/> -<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/> -<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/> -<booleanAttribute key="org.eclipse.ant.ui.ATTR_TARGETS_UPDATED" value="true"/> -<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/> <stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/org.eclipse.equinox.simpleconfigurator/localbuild.xml}"/> -<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES"> -<listEntry value="1"/> -</listAttribute> +<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,"/> +<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/> </launchConfiguration> diff --git a/bundles/org.eclipse.equinox.simpleconfigurator/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.simpleconfigurator/META-INF/MANIFEST.MF index 304b1fe61..b758dcae3 100644 --- a/bundles/org.eclipse.equinox.simpleconfigurator/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.simpleconfigurator/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-Version: 0.1.0.qualifier Bundle-Name: %bundleName Bundle-Vendor: %providerName Bundle-Localization: plugin -Bundle-Activator: org.eclipse.equinox.simpleconfigurator.internal.Activator +Bundle-Activator: org.eclipse.equinox.internal.simpleconfigurator.Activator Eclipse-LazyStart: true Import-Package: org.eclipse.osgi.framework.console;version="1.0.0";resolution:=optional, org.eclipse.osgi.service.datalocation;version="1.0.0";resolution:=optional, @@ -13,6 +13,6 @@ Import-Package: org.eclipse.osgi.framework.console;version="1.0.0";resolution:=o org.osgi.service.packageadmin;version="1.2.0", org.osgi.service.startlevel;version="1.0.0", org.osgi.util.tracker;version="1.3.0" -Export-Package: org.eclipse.equinox.configurator +Export-Package: org.eclipse.equinox.internal.provisional.configurator Bundle-RequiredExecutionEnvironment: CDC-1.1/Foundation-1.1, J2SE-1.4 diff --git a/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/configurator/Configurator.java b/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/provisional/configurator/Configurator.java index 798c23942..1a695c2d6 100644 --- a/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/configurator/Configurator.java +++ b/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/provisional/configurator/Configurator.java @@ -6,7 +6,7 @@ * * Contributors: IBM Corporation - initial API and implementation ******************************************************************************/ -package org.eclipse.equinox.configurator; +package org.eclipse.equinox.internal.provisional.configurator; import java.io.IOException; import java.net.URL; @@ -15,7 +15,7 @@ import java.net.URL; * The implementation of this interface will be registered into a service registry * by a Configurator Bundle. * - * The client bundle can apply configuration which can be interpreted by refering + * The client bundle can apply configuration which can be interpreted by referring * the specified location to the current running OSGi environment. In addition, * the client can expect bundle state in advance . * @@ -29,7 +29,7 @@ import java.net.URL; * * 1. Create a Configurator object. * 2. Register it as a service to the service registry. - * 3. Get where to read for knowing what kinds of bundles in its implementation dependend way. + * 3. Get where to read for knowing what kinds of bundles in its implementation dependent way. * 4. Call {@link Configurator#applyConfiguration(URL)} with the URL. * * At its stopping, the service registered will be unregistered. diff --git a/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/simpleconfigurator/internal/Activator.java b/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/Activator.java index c3af12081..0174265fe 100644 --- a/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/simpleconfigurator/internal/Activator.java +++ b/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/Activator.java @@ -6,11 +6,11 @@ * * Contributors: IBM Corporation - initial API and implementation ******************************************************************************/ -package org.eclipse.equinox.simpleconfigurator.internal; +package org.eclipse.equinox.internal.simpleconfigurator; import java.util.Dictionary; import java.util.Hashtable; -import org.eclipse.equinox.configurator.Configurator; +import org.eclipse.equinox.internal.provisional.configurator.Configurator; import org.eclipse.equinox.internal.simpleconfigurator.utils.EquinoxUtils; import org.eclipse.equinox.internal.simpleconfigurator.utils.SimpleConfiguratorConstants; import org.osgi.framework.*; diff --git a/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/simpleconfigurator/internal/ConfigApplier.java b/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/ConfigApplier.java index bff463fb7..1ad344dba 100644 --- a/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/simpleconfigurator/internal/ConfigApplier.java +++ b/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/ConfigApplier.java @@ -6,7 +6,7 @@ * * Contributors: IBM Corporation - initial API and implementation ******************************************************************************/ -package org.eclipse.equinox.simpleconfigurator.internal; +package org.eclipse.equinox.internal.simpleconfigurator; import java.io.*; import java.net.URL; diff --git a/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/simpleconfigurator/internal/SimpleConfiguratorImpl.java b/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/SimpleConfiguratorImpl.java index 34794b1ca..b0d53ee4e 100644 --- a/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/simpleconfigurator/internal/SimpleConfiguratorImpl.java +++ b/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/SimpleConfiguratorImpl.java @@ -6,14 +6,14 @@ * * Contributors: IBM Corporation - initial API and implementation ******************************************************************************/ -package org.eclipse.equinox.simpleconfigurator.internal; +package org.eclipse.equinox.internal.simpleconfigurator; import java.io.File; import java.io.IOException; import java.net.MalformedURLException; import java.net.URL; import java.util.List; -import org.eclipse.equinox.configurator.Configurator; +import org.eclipse.equinox.internal.provisional.configurator.Configurator; import org.eclipse.equinox.internal.simpleconfigurator.utils.*; import org.osgi.framework.BundleContext; diff --git a/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/console/ApplyCommand.java b/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/console/ApplyCommand.java index f57d0797c..cf678d384 100644 --- a/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/console/ApplyCommand.java +++ b/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/console/ApplyCommand.java @@ -11,7 +11,7 @@ package org.eclipse.equinox.internal.simpleconfigurator.console; import java.io.IOException; import java.net.URL; -import org.eclipse.equinox.configurator.Configurator; +import org.eclipse.equinox.internal.provisional.configurator.Configurator; import org.eclipse.osgi.framework.console.CommandInterpreter; import org.osgi.framework.BundleContext; import org.osgi.util.tracker.ServiceTracker; diff --git a/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/Utils.java b/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/Utils.java index ec2337fd8..b56b87811 100644 --- a/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/Utils.java +++ b/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/Utils.java @@ -14,7 +14,7 @@ import java.util.*; import java.util.jar.*; import java.util.zip.ZipEntry; import java.util.zip.ZipFile; -import org.eclipse.equinox.simpleconfigurator.internal.Activator; +import org.eclipse.equinox.internal.simpleconfigurator.Activator; /** * This class was copied from |