diff options
Diffstat (limited to 'bundles/org.eclipse.equinox.frameworkadmin')
16 files changed, 24 insertions, 157 deletions
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.frameworkadmin/test/org/eclipse/incubator/configurator/util/UtilsTest.java b/bundles/org.eclipse.equinox.frameworkadmin/test/org/eclipse/incubator/configurator/util/UtilsTest.java deleted file mode 100644 index b50ca0b2a..000000000 --- a/bundles/org.eclipse.equinox.frameworkadmin/test/org/eclipse/incubator/configurator/util/UtilsTest.java +++ /dev/null @@ -1,132 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2005, 2007 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -///** -// * -// */ -//package org.eclipse.incubator.configurator.util; -// -//import java.net.MalformedURLException; -//import java.net.URL; -// -//import junit.framework.*; -// -//import org.eclipse.equinox.internal.frameworkadmin.utils.*; -// -///** -// * @author iyamasak -// * -// */ -//public class UtilsTest extends TestCase { -// -// /** -// * @param name -// */ -// public UtilsTest(String name) { -// super(name); -// } -// -// /* (non-Javadoc) -// * @see junit.framework.TestCase#setUp() -// */ -// protected void setUp() throws Exception { -// super.setUp(); -// } -// -// /* (non-Javadoc) -// * @see junit.framework.TestCase#tearDown() -// */ -// protected void tearDown() throws Exception { -// super.tearDown(); -// } -// -// // /** -// // * Test method for {@link org.eclipse.configMan.internal.util.Utils#getUrl(java.lang.String, java.lang.String, java.lang.String)}. -// // */ -// // public void testGetUrl() { -// // fail("Not yet implemented"); -// // } -// -// /** -// * Test method for {@link Utils#getRelativePath(java.net.URL, java.net.URL)}. -// */ -// public void testGetRelativePath() { -// //URL target; -// //URL from; -// try { -// URL target = new URL("http", "www.ntt.co.jp", "dir1/dir2/target.html"); -// URL from = new URL("http", "www.ntt.co.jp", "dir1/dir3/dir4/from.html"); -// String expected = "../../../dir2/target.html"; -// String ret = Utils.getRelativePath(target, from); -// assertEquals(expected, ret); -// -// expected = "../../dir3/dir4/from.html"; -// ret = Utils.getRelativePath(from, target); -// assertEquals(expected, ret); -// -// try { -// target = new URL("http", "www.ntt.co.jp", "dir1/dir2/target.html"); -// from = new URL("http", "www.ibm.com", "dir1/dir3/dir4/from.html"); -// ret = Utils.getRelativePath(target, from); -// fail("IllegalArgumentException must be thrown"); -// } catch (IllegalArgumentException e) { -// -// } -// try { -// target = new URL("file", null, "dir2/target.html"); -// from = new URL("http", "www.ntt.co.jp", "dir1/dir3/dir4/from.html"); -// ret = Utils.getRelativePath(target, from); -// fail("IllegalArgumentException must be thrown"); -// } catch (IllegalArgumentException e) { -// -// } -// } catch (MalformedURLException e) { -// e.printStackTrace(); -// -// } -// -// } -// -// /** -// * Test method for {@link Utils#replaceAll(java.lang.String, java.lang.String, java.lang.String)}. -// */ -// public void testReplaceAll() { -// String st = "tere/eerere//ty/d"; -// String expected = "tere\\eerere\\\\ty\\d"; -// String oldSt = "/"; -// String newSt = "\\"; -// String ret = Utils.replaceAll(st, oldSt, newSt); -// assertEquals(expected, ret); -// } -// -// /** -// * Test method for {@link Utils#getTokens(java.lang.String, java.lang.String)}. -// */ -// public void testGetTokens() { -// String st = "/AAAA/BB//CC/D/"; -// String[] expected = {"AAAA", "BB", "CC", "D"}; -// String delim = "/"; -// String[] ret = Utils.getTokens(st, delim); -// assertEquals("lengths must equal.", ret.length, expected.length); -// for (int i = 0; i < ret.length; i++) -// assertEquals("each elements must equal.", expected[i], ret[i]); -// } -// -// /** -// * Test method for {@link Utils#removeLastCh(String target, char ch)}. -// */ -// public void testRemoveLastCh() { -// String target = "ddddaaaaaaaa"; -// String expected = "dddd"; -// char ch = 'a'; -// String ret = Utils.removeLastCh(target, ch); -// assertEquals(expected, ret); -// } -//} |