Attachment #160710 for bug #269496




 org.eclipse.core.variables;bundle-version="[3.1.0,4.0.0)",
 org.eclipse.pde.build;bundle-version="[3.2.0,4.1.0)",
 org.eclipse.ant.core;bundle-version="[3.1.0,4.0.0)",
 org.eclipse.equinox.simpleconfigurator.manipulator;bundle-version="[2.0.0,3.0.0)",
 org.eclipse.equinox.frameworkadmin;bundle-version="[2.0.0,3.0.0)",
 org.eclipse.debug.core;bundle-version="[3.5.0,4.0.0)",
 org.eclipse.equinox.p2.engine;bundle-version="[2.0.0,3.0.0)",
 org.eclipse.equinox.p2.core;bundle-version="[2.0.0,3.0.0)",
 org.eclipse.equinox.p2.metadata;bundle-version="[2.0.0,3.0.0)",
 org.eclipse.equinox.p2.director;bundle-version="[2.0.0,3.0.0)",
 org.eclipse.equinox.p2.artifact.repository;bundle-version="[1.0.100,2.0.0)",
 org.eclipse.equinox.p2.repository;bundle-version="[2.0.0,3.0.0]",
 org.eclipse.equinox.p2.metadata.repository;bundle-version="[1.0.100,2.0.0)",




import java.net.URL;
import java.util.*;
import org.eclipse.core.runtime.*;
import org.eclipse.equinox.frameworkadmin.BundleInfo;
import org.eclipse.equinox.internal.provisional.simpleconfigurator.manipulator.SimpleConfiguratorManipulator;
import org.eclipse.equinox.p2.core.IProvisioningAgent;
import org.eclipse.equinox.p2.core.IProvisioningAgentProvider;
import org.eclipse.equinox.p2.engine.*;

import org.eclipse.equinox.p2.metadata.MetadataFactory.InstallableUnitDescription;
import org.eclipse.equinox.p2.metadata.VersionRange;
import org.eclipse.equinox.p2.planner.ProfileInclusionRules;
import org.eclipse.equinox.simpleconfigurator.manipulator.SimpleConfiguratorManipulator;
import org.eclipse.osgi.service.resolver.*;
import org.eclipse.pde.core.plugin.IPluginBase;
import org.eclipse.pde.core.plugin.IPluginModelBase;

		if (manipulator == null) {
			return null;
		}
		// the input stream will be buffered and closed for us
		return manipulator.loadConfiguration(fileURL.openStream(), home.toURI());
	}

	/**

Lines 19-24 Link Here

(-)src/org/eclipse/pde/internal/core/target/AbstractBundleContainer.java (+1 lines)
19	import org.eclipse.core.runtime.spi.RegistryContributor;	19	import org.eclipse.core.runtime.spi.RegistryContributor;
20	import org.eclipse.core.variables.IStringVariableManager;	20	import org.eclipse.core.variables.IStringVariableManager;
21	import org.eclipse.core.variables.VariablesPlugin;	21	import org.eclipse.core.variables.VariablesPlugin;
		22	import org.eclipse.equinox.frameworkadmin.BundleInfo;
22	import org.eclipse.equinox.internal.provisional.frameworkadmin.*;	23	import org.eclipse.equinox.internal.provisional.frameworkadmin.*;
23	import org.eclipse.osgi.service.pluginconversion.PluginConversionException;	24	import org.eclipse.osgi.service.pluginconversion.PluginConversionException;
24	import org.eclipse.osgi.service.pluginconversion.PluginConverter;	25	import org.eclipse.osgi.service.pluginconversion.PluginConverter;

Lines 16-22 Link Here

(-)src/org/eclipse/pde/internal/core/target/ProfileBundleContainer.java (-1 / +1 lines)
16	import java.util.ArrayList;	16	import java.util.ArrayList;
17	import java.util.List;	17	import java.util.List;
18	import org.eclipse.core.runtime.*;	18	import org.eclipse.core.runtime.*;
19	import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo;	19	import org.eclipse.equinox.frameworkadmin.BundleInfo;
20	import org.eclipse.osgi.util.NLS;	20	import org.eclipse.osgi.util.NLS;
21	import org.eclipse.pde.internal.build.site.PluginPathFinder;	21	import org.eclipse.pde.internal.build.site.PluginPathFinder;
22	import org.eclipse.pde.internal.core.P2Utils;	22	import org.eclipse.pde.internal.core.P2Utils;

Lines 12-18 Link Here

(-)src/org/eclipse/pde/internal/core/target/ResolvedBundle.java (-1 / +1 lines)
12		12
13	import org.eclipse.core.runtime.IStatus;	13	import org.eclipse.core.runtime.IStatus;
14	import org.eclipse.core.runtime.Status;	14	import org.eclipse.core.runtime.Status;
15	import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo;	15	import org.eclipse.equinox.frameworkadmin.BundleInfo;
16	import org.eclipse.pde.internal.core.target.provisional.IBundleContainer;	16	import org.eclipse.pde.internal.core.target.provisional.IBundleContainer;
17	import org.eclipse.pde.internal.core.target.provisional.IResolvedBundle;	17	import org.eclipse.pde.internal.core.target.provisional.IResolvedBundle;
18		18

Lines 18-24 Link Here

(-)src/org/eclipse/pde/internal/core/target/TargetDefinition.java (-1 / +1 lines)
18	import org.eclipse.core.variables.IStringVariableManager;	18	import org.eclipse.core.variables.IStringVariableManager;
19	import org.eclipse.core.variables.VariablesPlugin;	19	import org.eclipse.core.variables.VariablesPlugin;
20	import org.eclipse.debug.core.DebugPlugin;	20	import org.eclipse.debug.core.DebugPlugin;
21	import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo;	21	import org.eclipse.equinox.frameworkadmin.BundleInfo;
22	import org.eclipse.equinox.p2.engine.IProfile;	22	import org.eclipse.equinox.p2.engine.IProfile;
23	import org.eclipse.equinox.p2.engine.IProfileRegistry;	23	import org.eclipse.equinox.p2.engine.IProfileRegistry;
24	import org.eclipse.equinox.p2.engine.query.IUProfilePropertyQuery;	24	import org.eclipse.equinox.p2.engine.query.IUProfilePropertyQuery;

Lines 15-22 Link Here

(-)src/org/eclipse/pde/internal/core/target/TargetPlatformService.java (-1 / +1 lines)
15	import java.util.*;	15	import java.util.*;
16	import org.eclipse.core.resources.*;	16	import org.eclipse.core.resources.*;
17	import org.eclipse.core.runtime.*;	17	import org.eclipse.core.runtime.*;
		18	import org.eclipse.equinox.frameworkadmin.BundleInfo;
18	import org.eclipse.equinox.internal.p2.garbagecollector.GarbageCollector;	19	import org.eclipse.equinox.internal.p2.garbagecollector.GarbageCollector;
19	import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo;
20	import org.eclipse.equinox.p2.core.IProvisioningAgent;	20	import org.eclipse.equinox.p2.core.IProvisioningAgent;
21	import org.eclipse.equinox.p2.engine.IProfile;	21	import org.eclipse.equinox.p2.engine.IProfile;
22	import org.eclipse.equinox.p2.engine.IProfileRegistry;	22	import org.eclipse.equinox.p2.engine.IProfileRegistry;

Lines 11-17 Link Here

(-)src/org/eclipse/pde/internal/core/target/provisional/IResolvedBundle.java (-1 / +1 lines)
11	package org.eclipse.pde.internal.core.target.provisional;	11	package org.eclipse.pde.internal.core.target.provisional;
12		12
13	import org.eclipse.core.runtime.IStatus;	13	import org.eclipse.core.runtime.IStatus;
14	import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo;	14	import org.eclipse.equinox.frameworkadmin.BundleInfo;
15		15
16	/**	16	/**
17	* A resolved bundle contained in a bundle container of a target definition.	17	* A resolved bundle contained in a bundle container of a target definition.

Lines 20-26 Link Here

(-)src/org/eclipse/pde/internal/core/target/provisional/LoadTargetDefinitionJob.java (-1 / +1 lines)
20	import org.eclipse.core.runtime.jobs.Job;	20	import org.eclipse.core.runtime.jobs.Job;
21	import org.eclipse.core.variables.IStringVariableManager;	21	import org.eclipse.core.variables.IStringVariableManager;
22	import org.eclipse.core.variables.VariablesPlugin;	22	import org.eclipse.core.variables.VariablesPlugin;
23	import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo;	23	import org.eclipse.equinox.frameworkadmin.BundleInfo;
24	import org.eclipse.jdt.launching.IVMInstall;	24	import org.eclipse.jdt.launching.IVMInstall;
25	import org.eclipse.jdt.launching.JavaRuntime;	25	import org.eclipse.jdt.launching.JavaRuntime;
26	import org.eclipse.pde.core.plugin.IPluginModelBase;	26	import org.eclipse.pde.core.plugin.IPluginModelBase;

Lines 104-110 Link Here

(-)META-INF/MANIFEST.MF (-1 / +1 lines)
104	org.eclipse.equinox.p2.metadata.repository;bundle-version="[1.0.100,2.0.0)",	104	org.eclipse.equinox.p2.metadata.repository;bundle-version="[1.0.100,2.0.0)",
105	org.eclipse.equinox.p2.operations;bundle-version="[2.0.0,3.0.0)",	105	org.eclipse.equinox.p2.operations;bundle-version="[2.0.0,3.0.0)",
106	org.eclipse.equinox.p2.repository;bundle-version="[2.0.0,3.0.0)",	106	org.eclipse.equinox.p2.repository;bundle-version="[2.0.0,3.0.0)",
107	org.eclipse.equinox.frameworkadmin;bundle-version="[1.0.100,2.0.0)",	107	org.eclipse.equinox.frameworkadmin;bundle-version="[2.0.0,3.0.0)",
108	org.eclipse.equinox.frameworkadmin.equinox;bundle-version="[1.0.100,2.0.0)",	108	org.eclipse.equinox.frameworkadmin.equinox;bundle-version="[1.0.100,2.0.0)",
109	org.eclipse.pde.launching;bundle-version="[3.6.0,4.0.0)";visibility:=reexport	109	org.eclipse.pde.launching;bundle-version="[3.6.0,4.0.0)";visibility:=reexport
110	Eclipse-LazyStart: true	110	Eclipse-LazyStart: true

Lines 13-19 Link Here

(-)src/org/eclipse/pde/internal/ui/editor/targetdefinition/ImplicitDependenciesSection.java (-1 / +1 lines)
13	import java.util.*;	13	import java.util.*;
14	import java.util.List;	14	import java.util.List;
15	import org.eclipse.core.runtime.*;	15	import org.eclipse.core.runtime.*;
16	import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo;	16	import org.eclipse.equinox.frameworkadmin.BundleInfo;
17	import org.eclipse.jface.viewers.*;	17	import org.eclipse.jface.viewers.*;
18	import org.eclipse.jface.window.Window;	18	import org.eclipse.jface.window.Window;
19	import org.eclipse.osgi.util.NLS;	19	import org.eclipse.osgi.util.NLS;

Lines 17-23 Link Here

(-)src/org/eclipse/pde/internal/ui/preferences/TargetPlatformPreferencePage.java (-1 / +1 lines)
17	import org.eclipse.core.resources.IFile;	17	import org.eclipse.core.resources.IFile;
18	import org.eclipse.core.runtime.*;	18	import org.eclipse.core.runtime.*;
19	import org.eclipse.core.runtime.jobs.*;	19	import org.eclipse.core.runtime.jobs.*;
20	import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo;	20	import org.eclipse.equinox.frameworkadmin.BundleInfo;
21	import org.eclipse.jface.dialogs.*;	21	import org.eclipse.jface.dialogs.*;
22	import org.eclipse.jface.dialogs.Dialog;	22	import org.eclipse.jface.dialogs.Dialog;
23	import org.eclipse.jface.operation.IRunnableWithProgress;	23	import org.eclipse.jface.operation.IRunnableWithProgress;

Lines 13-20 Link Here

(-)src/org/eclipse/pde/internal/ui/shared/target/StyledBundleLabelProvider.java (-1 / +1 lines)
13	import com.ibm.icu.text.MessageFormat;	13	import com.ibm.icu.text.MessageFormat;
14	import java.net.URI;	14	import java.net.URI;
15	import org.eclipse.core.runtime.*;	15	import org.eclipse.core.runtime.*;
		16	import org.eclipse.equinox.frameworkadmin.BundleInfo;
16	import org.eclipse.equinox.internal.p2.metadata.TranslationSupport;	17	import org.eclipse.equinox.internal.p2.metadata.TranslationSupport;
17	import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo;
18	import org.eclipse.equinox.p2.metadata.IInstallableUnit;	18	import org.eclipse.equinox.p2.metadata.IInstallableUnit;
19	import org.eclipse.jface.resource.ImageDescriptor;	19	import org.eclipse.jface.resource.ImageDescriptor;
20	import org.eclipse.jface.viewers.*;	20	import org.eclipse.jface.viewers.*;

Lines 20-26 Link Here

(-)src/org/eclipse/pde/internal/ui/shared/target/TargetContentsGroup.java (-1 / +1 lines)
20	import java.util.zip.ZipEntry;	20	import java.util.zip.ZipEntry;
21	import java.util.zip.ZipFile;	21	import java.util.zip.ZipFile;
22	import org.eclipse.core.runtime.*;	22	import org.eclipse.core.runtime.*;
23	import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo;	23	import org.eclipse.equinox.frameworkadmin.BundleInfo;
24	import org.eclipse.jface.action.Action;	24	import org.eclipse.jface.action.Action;
25	import org.eclipse.jface.action.MenuManager;	25	import org.eclipse.jface.action.MenuManager;
26	import org.eclipse.jface.dialogs.ProgressMonitorDialog;	26	import org.eclipse.jface.dialogs.ProgressMonitorDialog;

Lines 17-23 Link Here

(-)src/org/eclipse/pde/internal/ui/wizards/target/TargetDefinitionContentPage.java (-1 / +1 lines)
17	import org.eclipse.core.runtime.preferences.IEclipsePreferences;	17	import org.eclipse.core.runtime.preferences.IEclipsePreferences;
18	import org.eclipse.core.runtime.preferences.InstanceScope;	18	import org.eclipse.core.runtime.preferences.InstanceScope;
19	import org.eclipse.debug.ui.StringVariableSelectionDialog;	19	import org.eclipse.debug.ui.StringVariableSelectionDialog;
20	import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo;	20	import org.eclipse.equinox.frameworkadmin.BundleInfo;
21	import org.eclipse.jdt.launching.JavaRuntime;	21	import org.eclipse.jdt.launching.JavaRuntime;
22	import org.eclipse.jdt.launching.environments.IExecutionEnvironment;	22	import org.eclipse.jdt.launching.environments.IExecutionEnvironment;
23	import org.eclipse.jdt.launching.environments.IExecutionEnvironmentsManager;	23	import org.eclipse.jdt.launching.environments.IExecutionEnvironmentsManager;

Lines 10-17 Link Here

(-)src/org/eclipse/pde/ui/tests/target/AbstractTargetTest.java (-3 / +1 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.pde.ui.tests.target;	11	package org.eclipse.pde.ui.tests.target;
12		12
13	import org.eclipse.core.runtime.Platform;
14
15	import java.io.*;	13	import java.io.*;
16	import java.net.URL;	14	import java.net.URL;
17	import java.util.*;	15	import java.util.*;
Lines 19-25 Link Here
19	import java.util.zip.ZipFile;	17	import java.util.zip.ZipFile;
20	import junit.framework.TestCase;	18	import junit.framework.TestCase;
21	import org.eclipse.core.runtime.*;	19	import org.eclipse.core.runtime.*;
22	import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo;	20	import org.eclipse.equinox.frameworkadmin.BundleInfo;
23	import org.eclipse.pde.core.plugin.TargetPlatform;	21	import org.eclipse.pde.core.plugin.TargetPlatform;
24	import org.eclipse.pde.internal.core.target.provisional.*;	22	import org.eclipse.pde.internal.core.target.provisional.*;
25	import org.eclipse.pde.internal.ui.tests.macro.MacroPlugin;	23	import org.eclipse.pde.internal.ui.tests.macro.MacroPlugin;




 *******************************************************************************/
package org.eclipse.pde.ui.tests.target;

import org.eclipse.pde.internal.core.target.provisional.NameVersionDescriptor;

import java.io.*;
import java.net.URL;
import java.util.*;
import junit.framework.Test;
import junit.framework.TestSuite;
import org.eclipse.core.runtime.*;
import org.eclipse.equinox.frameworkadmin.BundleInfo;
import org.eclipse.pde.core.plugin.*;
import org.eclipse.pde.internal.core.*;
import org.eclipse.pde.internal.core.target.TargetDefinition;
import org.eclipse.pde.internal.core.target.TargetDefinitionPersistenceHelper;
import org.eclipse.pde.internal.core.target.provisional.*;
import org.eclipse.pde.internal.launching.launcher.LaunchArgumentsHelper;
import org.eclipse.pde.internal.ui.tests.macro.MacroPlugin;




 *******************************************************************************/
package org.eclipse.pde.ui.tests.target;

import org.eclipse.pde.internal.core.target.provisional.NameVersionDescriptor;

import org.eclipse.equinox.p2.metadata.IInstallableUnit;



import org.eclipse.pde.internal.core.target.IUBundleContainer;

import org.eclipse.pde.internal.core.target.TargetPlatformService;

import java.io.File;
import junit.framework.Test;
import junit.framework.TestSuite;
import org.eclipse.core.runtime.*;
import org.eclipse.equinox.frameworkadmin.BundleInfo;
import org.eclipse.equinox.p2.metadata.IInstallableUnit;
import org.eclipse.jdt.launching.JavaRuntime;
import org.eclipse.pde.core.plugin.TargetPlatform;
import org.eclipse.pde.internal.core.*;
import org.eclipse.pde.internal.core.target.IUBundleContainer;
import org.eclipse.pde.internal.core.target.TargetPlatformService;
import org.eclipse.pde.internal.core.target.provisional.*;

public class TargetDefinitionResolutionTests extends AbstractTargetTest {

Return to bug 269496

Lines 58-70 Link Here

(-)META-INF/MANIFEST.MF (-3 / +3 lines)
58	org.eclipse.core.variables;bundle-version="[3.1.0,4.0.0)",	58	org.eclipse.core.variables;bundle-version="[3.1.0,4.0.0)",
59	org.eclipse.pde.build;bundle-version="[3.2.0,4.1.0)",	59	org.eclipse.pde.build;bundle-version="[3.2.0,4.1.0)",
60	org.eclipse.ant.core;bundle-version="[3.1.0,4.0.0)",	60	org.eclipse.ant.core;bundle-version="[3.1.0,4.0.0)",
61	org.eclipse.equinox.simpleconfigurator.manipulator;bundle-version="[1.0.100,2.0.0)",	61	org.eclipse.equinox.simpleconfigurator.manipulator;bundle-version="[2.0.0,3.0.0)",
62	org.eclipse.equinox.frameworkadmin;bundle-version="[1.0.100,2.0.0)",	62	org.eclipse.equinox.frameworkadmin;bundle-version="[2.0.0,3.0.0)",
63	org.eclipse.debug.core;bundle-version="[3.5.0,4.0.0)",	63	org.eclipse.debug.core;bundle-version="[3.5.0,4.0.0)",
64	org.eclipse.equinox.p2.engine;bundle-version="[2.0.0,3.0.0)",	64	org.eclipse.equinox.p2.engine;bundle-version="[2.0.0,3.0.0)",
65	org.eclipse.equinox.p2.core;bundle-version="[2.0.0,3.0.0)",	65	org.eclipse.equinox.p2.core;bundle-version="[2.0.0,3.0.0)",
66	org.eclipse.equinox.p2.metadata;bundle-version="[2.0.0,3.0.0)",	66	org.eclipse.equinox.p2.metadata;bundle-version="[2.0.0,3.0.0)",
67	org.eclipse.equinox.p2.director;bundle-version="[2.0.0, 3.0.0)",	67	org.eclipse.equinox.p2.director;bundle-version="[2.0.0,3.0.0)",
68	org.eclipse.equinox.p2.artifact.repository;bundle-version="[1.0.100,2.0.0)",	68	org.eclipse.equinox.p2.artifact.repository;bundle-version="[1.0.100,2.0.0)",
69	org.eclipse.equinox.p2.repository;bundle-version="[2.0.0,3.0.0]",	69	org.eclipse.equinox.p2.repository;bundle-version="[2.0.0,3.0.0]",
70	org.eclipse.equinox.p2.metadata.repository;bundle-version="[1.0.100,2.0.0)",	70	org.eclipse.equinox.p2.metadata.repository;bundle-version="[1.0.100,2.0.0)",

Lines 17-24 Link Here

(-)src/org/eclipse/pde/internal/core/P2Utils.java (-3 / +4 lines)
17	import java.net.URL;	17	import java.net.URL;
18	import java.util.*;	18	import java.util.*;
19	import org.eclipse.core.runtime.*;	19	import org.eclipse.core.runtime.*;
20	import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo;	20	import org.eclipse.equinox.frameworkadmin.BundleInfo;
21	import org.eclipse.equinox.internal.provisional.simpleconfigurator.manipulator.SimpleConfiguratorManipulator;
22	import org.eclipse.equinox.p2.core.IProvisioningAgent;	21	import org.eclipse.equinox.p2.core.IProvisioningAgent;
23	import org.eclipse.equinox.p2.core.IProvisioningAgentProvider;	22	import org.eclipse.equinox.p2.core.IProvisioningAgentProvider;
24	import org.eclipse.equinox.p2.engine.*;	23	import org.eclipse.equinox.p2.engine.*;
Lines 26-31 Link Here
26	import org.eclipse.equinox.p2.metadata.MetadataFactory.InstallableUnitDescription;	25	import org.eclipse.equinox.p2.metadata.MetadataFactory.InstallableUnitDescription;
27	import org.eclipse.equinox.p2.metadata.VersionRange;	26	import org.eclipse.equinox.p2.metadata.VersionRange;
28	import org.eclipse.equinox.p2.planner.ProfileInclusionRules;	27	import org.eclipse.equinox.p2.planner.ProfileInclusionRules;
		28	import org.eclipse.equinox.simpleconfigurator.manipulator.SimpleConfiguratorManipulator;
29	import org.eclipse.osgi.service.resolver.*;	29	import org.eclipse.osgi.service.resolver.*;
30	import org.eclipse.pde.core.plugin.IPluginBase;	30	import org.eclipse.pde.core.plugin.IPluginBase;
31	import org.eclipse.pde.core.plugin.IPluginModelBase;	31	import org.eclipse.pde.core.plugin.IPluginModelBase;
Lines 190-196 Link Here
190	if (manipulator == null) {	190	if (manipulator == null) {
191	return null;	191	return null;
192	}	192	}
193	return manipulator.loadConfiguration(fileURL, home);	193	// the input stream will be buffered and closed for us
		194	return manipulator.loadConfiguration(fileURL.openStream(), home.toURI());
194	}	195	}
195		196
196	/**	197	/**

Lines 10-27 Link Here

(-)src/org/eclipse/pde/ui/tests/target/LocalTargetDefinitionTests.java (-4 / +3 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.pde.ui.tests.target;	11	package org.eclipse.pde.ui.tests.target;
12		12
13	import org.eclipse.pde.internal.core.target.provisional.NameVersionDescriptor;
14
15	import java.io.*;	13	import java.io.*;
16	import java.net.URL;	14	import java.net.URL;
17	import java.util.*;	15	import java.util.*;
18	import junit.framework.Test;	16	import junit.framework.Test;
19	import junit.framework.TestSuite;	17	import junit.framework.TestSuite;
20	import org.eclipse.core.runtime.*;	18	import org.eclipse.core.runtime.*;
21	import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo;	19	import org.eclipse.equinox.frameworkadmin.BundleInfo;
22	import org.eclipse.pde.core.plugin.*;	20	import org.eclipse.pde.core.plugin.*;
23	import org.eclipse.pde.internal.core.*;	21	import org.eclipse.pde.internal.core.*;
24	import org.eclipse.pde.internal.core.target.*;	22	import org.eclipse.pde.internal.core.target.TargetDefinition;
		23	import org.eclipse.pde.internal.core.target.TargetDefinitionPersistenceHelper;
25	import org.eclipse.pde.internal.core.target.provisional.*;	24	import org.eclipse.pde.internal.core.target.provisional.*;
26	import org.eclipse.pde.internal.launching.launcher.LaunchArgumentsHelper;	25	import org.eclipse.pde.internal.launching.launcher.LaunchArgumentsHelper;
27	import org.eclipse.pde.internal.ui.tests.macro.MacroPlugin;	26	import org.eclipse.pde.internal.ui.tests.macro.MacroPlugin;

Lines 10-33 Link Here

(-)src/org/eclipse/pde/ui/tests/target/TargetDefinitionResolutionTests.java (-11 / +4 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.pde.ui.tests.target;	11	package org.eclipse.pde.ui.tests.target;
12		12
13	import org.eclipse.pde.internal.core.target.provisional.NameVersionDescriptor;
14
15	import org.eclipse.equinox.p2.metadata.IInstallableUnit;
16
17
18
19	import org.eclipse.pde.internal.core.target.IUBundleContainer;
20
21	import org.eclipse.pde.internal.core.target.TargetPlatformService;
22
23	import java.io.File;	13	import java.io.File;
24	import junit.framework.Test;	14	import junit.framework.Test;
25	import junit.framework.TestSuite;	15	import junit.framework.TestSuite;
26	import org.eclipse.core.runtime.*;	16	import org.eclipse.core.runtime.*;
27	import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo;	17	import org.eclipse.equinox.frameworkadmin.BundleInfo;
		18	import org.eclipse.equinox.p2.metadata.IInstallableUnit;
28	import org.eclipse.jdt.launching.JavaRuntime;	19	import org.eclipse.jdt.launching.JavaRuntime;
29	import org.eclipse.pde.core.plugin.TargetPlatform;	20	import org.eclipse.pde.core.plugin.TargetPlatform;
30	import org.eclipse.pde.internal.core.*;	21	import org.eclipse.pde.internal.core.*;
		22	import org.eclipse.pde.internal.core.target.IUBundleContainer;
		23	import org.eclipse.pde.internal.core.target.TargetPlatformService;
31	import org.eclipse.pde.internal.core.target.provisional.*;	24	import org.eclipse.pde.internal.core.target.provisional.*;
32		25
33	public class TargetDefinitionResolutionTests extends AbstractTargetTest {	26	public class TargetDefinitionResolutionTests extends AbstractTargetTest {