Attachment #125938 for bug #264389

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

Lines 10-23 Link Here

(-)src/org/eclipse/equinox/p2/tests/updatesite/SiteXMLActionTest.java (-3 / +26 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.equinox.p2.tests.updatesite;	11	package org.eclipse.equinox.p2.tests.updatesite;
12		12
		13	import java.io.File;
13	import java.net.URI;	14	import java.net.URI;
14	import java.util.Collection;	15	import java.util.Collection;
15	import java.util.Iterator;	16	import java.util.Iterator;
		17	import org.eclipse.core.runtime.NullProgressMonitor;
		18	import org.eclipse.core.runtime.URIUtil;
16	import org.eclipse.equinox.internal.p2.updatesite.SiteXMLAction;	19	import org.eclipse.equinox.internal.p2.updatesite.SiteXMLAction;
17	import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepository;	20	import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepository;
18	import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;	21	import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;
		22	import org.eclipse.equinox.internal.provisional.p2.metadata.query.IUPropertyQuery;
		23	import org.eclipse.equinox.internal.provisional.p2.query.Collector;
		24	import org.eclipse.equinox.internal.provisional.p2.query.Query;
19	import org.eclipse.equinox.internal.provisional.spi.p2.metadata.repository.RepositoryReference;	25	import org.eclipse.equinox.internal.provisional.spi.p2.metadata.repository.RepositoryReference;
20	import org.eclipse.equinox.p2.publisher.*;	26	import org.eclipse.equinox.p2.publisher.*;
		27	import org.eclipse.equinox.p2.publisher.eclipse.FeaturesAction;
21	import org.eclipse.equinox.p2.tests.*;	28	import org.eclipse.equinox.p2.tests.*;
22		29
23	/**	30	/**
Lines 25-41 Link Here
25	*/	32	*/
26	public class SiteXMLActionTest extends AbstractProvisioningTest {	33	public class SiteXMLActionTest extends AbstractProvisioningTest {
27	private TestMetadataRepository metadataRepository;	34	private TestMetadataRepository metadataRepository;
		35	private IPublisherResult actionResult;
		36	private URI siteLocation;
28		37
29	@Override	38	@Override
30	protected void setUp() throws Exception {	39	protected void setUp() throws Exception {
31	super.setUp();	40	super.setUp();
32	IPublisherResult result = new PublisherResult();	41	actionResult = new PublisherResult();
33	PublisherInfo info = new PublisherInfo();	42	PublisherInfo info = new PublisherInfo();
34	metadataRepository = new TestMetadataRepository(new IInstallableUnit[0]);	43	metadataRepository = new TestMetadataRepository(new IInstallableUnit[0]);
35	info.setMetadataRepository(metadataRepository);	44	info.setMetadataRepository(metadataRepository);
36	URI siteLocation = TestData.getFile("updatesite", "SiteXMLActionTest/site.xml").toURI();	45	siteLocation = TestData.getFile("updatesite", "SiteXMLActionTest/site.xml").toURI();
		46	FeaturesAction featuresAction = new FeaturesAction(new File[] {TestData.getFile("updateSite", "SiteXMLActionTest")});
		47	featuresAction.perform(info, actionResult, new NullProgressMonitor());
		48
37	SiteXMLAction action = new SiteXMLAction(siteLocation);	49	SiteXMLAction action = new SiteXMLAction(siteLocation);
38	action.perform(info, result, getMonitor());	50	action.perform(info, actionResult, getMonitor());
		51	}
		52
		53	public void testQualifier() {
		54	Query categoryQuery = new IUPropertyQuery(IInstallableUnit.PROP_TYPE_CATEGORY, Boolean.toString(true));
		55	Collector results = actionResult.query(categoryQuery, new Collector(), new NullProgressMonitor());
		56	Iterator iter = results.iterator();
		57	while (iter.hasNext()) {
		58	IInstallableUnit unit = (IInstallableUnit) iter.next();
		59	assertTrue("1.0", unit.getId().startsWith(URIUtil.toUnencodedString(siteLocation)));
		60	assertEquals("2.0", "Test Category Label", unit.getProperty(IInstallableUnit.PROP_NAME));
		61	}
39	}	62	}
40		63
41	/**	64	/**

Lines 39-44 Link Here

(-)src/org/eclipse/equinox/internal/p2/updatesite/SiteXMLAction.java (-3 / +24 lines)
39	private SiteCategory defaultCategory;	39	private SiteCategory defaultCategory;
40	private HashSet defaultCategorySet;	40	private HashSet defaultCategorySet;
41	private URI location;	41	private URI location;
		42	private String categoryQualifier = null;
42		43
43	public SiteXMLAction(URI location) {	44	public SiteXMLAction(URI location) {
44	this.location = location;	45	this.location = location;
Lines 48-53 Link Here
48	this.updateSite = updateSite;	49	this.updateSite = updateSite;
49	}	50	}
50		51
		52	/**
		53	* Sets the qualifier that will be prepended to the front of category names
		54	*/
		55	public void setCategoryQualifier(String categoryQualifier) {
		56	this.categoryQualifier = categoryQualifier;
		57	}
		58
51	private void initialize() {	59	private void initialize() {
52	if (defaultCategory != null)	60	if (defaultCategory != null)
53	return;	61	return;
Lines 236-242 Link Here
236	protected void generateCategoryIUs(Map categoriesToFeatures, IPublisherResult result) {	244	protected void generateCategoryIUs(Map categoriesToFeatures, IPublisherResult result) {
237	for (Iterator it = categoriesToFeatures.keySet().iterator(); it.hasNext();) {	245	for (Iterator it = categoriesToFeatures.keySet().iterator(); it.hasNext();) {
238	SiteCategory category = (SiteCategory) it.next();	246	SiteCategory category = (SiteCategory) it.next();
239	result.addIU(createCategoryIU(category, (Set) categoriesToFeatures.get(category), null), IPublisherResult.NON_ROOT);	247	String qualifier = createQualifier();
		248	result.addIU(createCategoryIU(category, (Set) categoriesToFeatures.get(category), null, qualifier), IPublisherResult.NON_ROOT);
240	}	249	}
241	}	250	}
242		251
Lines 247-256 Link Here
247	* @param parentCategory The parent category, or <code>null</code>	256	* @param parentCategory The parent category, or <code>null</code>
248	* @return an IU representing the category	257	* @return an IU representing the category
249	*/	258	*/
250	public static IInstallableUnit createCategoryIU(SiteCategory category, Set featureIUs, IInstallableUnit parentCategory) {	259	public static IInstallableUnit createCategoryIU(SiteCategory category, Set featureIUs, IInstallableUnit parentCategory, String categoryQualifier) {
251	InstallableUnitDescription cat = new MetadataFactory.InstallableUnitDescription();	260	InstallableUnitDescription cat = new MetadataFactory.InstallableUnitDescription();
252	cat.setSingleton(true);	261	cat.setSingleton(true);
253	String categoryId = category.getName();	262	String categoryId = categoryQualifier + category.getName();
254	cat.setId(categoryId);	263	cat.setId(categoryId);
255	cat.setVersion(Version.emptyVersion);	264	cat.setVersion(Version.emptyVersion);
256	cat.setProperty(IInstallableUnit.PROP_NAME, category.getLabel());	265	cat.setProperty(IInstallableUnit.PROP_NAME, category.getLabel());
Lines 293-296 Link Here
293	return MetadataFactory.createInstallableUnit(cat);	302	return MetadataFactory.createInstallableUnit(cat);
294	}	303	}
295		304
		305	/**
		306	* Creates a qualifier that can be prepended to a category to the category is unique
		307	* between multiple repositories
		308	*/
		309	private String createQualifier() {
		310	if (categoryQualifier != null)
		311	return categoryQualifier;
		312	if (updateSite != null)
		313	return URIUtil.toUnencodedString(updateSite.getLocation()) + "."; //$NON-NLS-1$
		314	return ""; //$NON-NLS-1$
		315	}
		316
296	}	317	}




 ******************************************************************************/
package org.eclipse.equinox.internal.p2.updatesite;

import java.net.URI;
import java.net.URISyntaxException;
import java.util.ArrayList;
import org.eclipse.core.runtime.*;
import org.eclipse.equinox.p2.publisher.*;

		this.updateSite = updateSite;
	}

	public RemoteUpdateSiteAction(String source) {
		this.source = source;
	}

	public IStatus perform(IPublisherInfo info, IPublisherResult results, IProgressMonitor monitor) {
		IPublisherAction[] actions = createActions();
		MultiStatus finalStatus = new MultiStatus(this.getClass().getName(), 0, NLS.bind(Messages.Error_Generation, source != null ? source : (updateSite != null ? updateSite.getLocation().toString() : "Unknown")), null); //$NON-NLS-1$

	}

	private IPublisherAction createSiteXMLAction() {
		return new SiteXMLAction(updateSite);
			return new SiteXMLAction(updateSite);
		if (source != null) {
			try {
				return new SiteXMLAction(new URI(source + "/site.xml")); //$NON-NLS-1$
			} catch (URISyntaxException e) {
				// never happens
				return null;
			}
		}
		return null;
	}
}

Return to bug 264389