Attachment 126197 Details for Bug 264389 – Updated patch

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

[patch] Updated patch

clipboard.txt (text/plain), 22.93 KB, created by Ian Bull

on 2009-02-19 13:55:44 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Ian Bull

Created: 2009-02-19 13:55:44 EST

Size: 22.93 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.pde.build
>Index: src_ant/org/eclipse/pde/internal/build/publisher/FeaturesAndBundlesTask.java
>===================================================================
>RCS file: /cvsroot/eclipse/pde/build/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/publisher/FeaturesAndBundlesTask.java,v
>retrieving revision 1.1
>diff -u -r1.1 FeaturesAndBundlesTask.java
>--- src_ant/org/eclipse/pde/internal/build/publisher/FeaturesAndBundlesTask.java	14 Jan 2009 21:15:40 -0000	1.1
>+++ src_ant/org/eclipse/pde/internal/build/publisher/FeaturesAndBundlesTask.java	19 Feb 2009 18:52:30 -0000
>@@ -35,7 +35,7 @@
> 		if (b.length > 0)
> 			application.addAction(new BundlesAction(b));
> 		if (siteXML != null)
>-			application.addAction(new SiteXMLAction(siteXML));
>+			application.addAction(new SiteXMLAction(siteXML, null));
> 
> 		try {
> 			application.run(getPublisherInfo());
>#P org.eclipse.equinox.p2.updatesite
>Index: src/org/eclipse/equinox/internal/p2/updatesite/SiteXMLAction.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.updatesite/src/org/eclipse/equinox/internal/p2/updatesite/SiteXMLAction.java,v
>retrieving revision 1.16
>diff -u -r1.16 SiteXMLAction.java
>--- src/org/eclipse/equinox/internal/p2/updatesite/SiteXMLAction.java	12 Feb 2009 22:22:40 -0000	1.16
>+++ src/org/eclipse/equinox/internal/p2/updatesite/SiteXMLAction.java	19 Feb 2009 18:52:32 -0000
>@@ -39,13 +39,30 @@
> 	private SiteCategory defaultCategory;
> 	private HashSet defaultCategorySet;
> 	private URI location;
>+	private String categoryQualifier = null;
> 
>-	public SiteXMLAction(URI location) {
>+	/**
>+	 * Creates a SiteXMLAction from a Location (URI) with an optional qualifier to use for category names
>+	 * @param location The location of the update site
>+	 * @param categoryQualifier The qualifier to prepend to categories. This qualifier is used
>+	 * to ensure that the category IDs are unique between update sites. If null a default
>+	 * qualifier will be generated
>+	 */
>+	public SiteXMLAction(URI location, String categoryQualifier) {
> 		this.location = location;
>+		this.categoryQualifier = categoryQualifier;
> 	}
> 
>-	public SiteXMLAction(UpdateSite updateSite) {
>+	/**
>+	 * Creates a SiteXMLAction from an Update site with an optional qualifier to use for category names
>+	 * @param updateSite The update site 
>+	 * @param categoryQualifier The qualifier to prepend to categories. This qualifier is used
>+	 * to ensure that the category IDs are unique between update sites. If null a default
>+	 * qualifier will be generated
>+	 */
>+	public SiteXMLAction(UpdateSite updateSite, String categoryQualifier) {
> 		this.updateSite = updateSite;
>+		this.categoryQualifier = categoryQualifier;
> 	}
> 
> 	private void initialize() {
>@@ -236,7 +253,7 @@
> 	protected void generateCategoryIUs(Map categoriesToFeatures, IPublisherResult result) {
> 		for (Iterator it = categoriesToFeatures.keySet().iterator(); it.hasNext();) {
> 			SiteCategory category = (SiteCategory) it.next();
>-			result.addIU(createCategoryIU(category, (Set) categoriesToFeatures.get(category), null), IPublisherResult.NON_ROOT);
>+			result.addIU(createCategoryIU(category, (Set) categoriesToFeatures.get(category), null, createQualifier()), IPublisherResult.NON_ROOT);
> 		}
> 	}
> 
>@@ -247,10 +264,10 @@
> 	 * @param parentCategory The parent category, or <code>null</code>
> 	 * @return an IU representing the category
> 	 */
>-	public static IInstallableUnit createCategoryIU(SiteCategory category, Set featureIUs, IInstallableUnit parentCategory) {
>+	public static IInstallableUnit createCategoryIU(SiteCategory category, Set featureIUs, IInstallableUnit parentCategory, String categoryQualifier) {
> 		InstallableUnitDescription cat = new MetadataFactory.InstallableUnitDescription();
> 		cat.setSingleton(true);
>-		String categoryId = category.getName();
>+		String categoryId = categoryQualifier + category.getName();
> 		cat.setId(categoryId);
> 		cat.setVersion(Version.emptyVersion);
> 		cat.setProperty(IInstallableUnit.PROP_NAME, category.getLabel());
>@@ -293,4 +310,16 @@
> 		return MetadataFactory.createInstallableUnit(cat);
> 	}
> 
>+	/**
>+	 * Creates a qualifier that can be prepended to a category to the category is unique
>+	 * between multiple repositories
>+	 */
>+	private String createQualifier() {
>+		if (categoryQualifier != null)
>+			return categoryQualifier + "."; //$NON-NLS-1$
>+		if (updateSite != null)
>+			return URIUtil.toUnencodedString(updateSite.getLocation()) + "."; //$NON-NLS-1$
>+		return ""; //$NON-NLS-1$
>+	}
>+
> }
>Index: src/org/eclipse/equinox/internal/p2/updatesite/RemoteUpdateSiteAction.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.updatesite/src/org/eclipse/equinox/internal/p2/updatesite/RemoteUpdateSiteAction.java,v
>retrieving revision 1.4
>diff -u -r1.4 RemoteUpdateSiteAction.java
>--- src/org/eclipse/equinox/internal/p2/updatesite/RemoteUpdateSiteAction.java	9 Oct 2008 03:21:48 -0000	1.4
>+++ src/org/eclipse/equinox/internal/p2/updatesite/RemoteUpdateSiteAction.java	19 Feb 2009 18:52:31 -0000
>@@ -10,8 +10,6 @@
> ******************************************************************************/
> 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.*;
>@@ -23,20 +21,15 @@
> * IUs generated for the bundles are "partial" as the bundles themselves are not downloaded.
> */
> public class RemoteUpdateSiteAction implements IPublisherAction {
>-	protected String source;
> 	private UpdateSite updateSite;
> 
> 	public RemoteUpdateSiteAction(UpdateSite updateSite) {
> 		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$
>+		MultiStatus finalStatus = new MultiStatus(this.getClass().getName(), 0, NLS.bind(Messages.Error_Generation, updateSite != null ? updateSite.getLocation().toString() : "Unknown"), null); //$NON-NLS-1$
> 		for (int i = 0; i < actions.length; i++) {
> 			if (monitor.isCanceled())
> 				return Status.CANCEL_STATUS;
>@@ -55,16 +48,6 @@
> 	}
> 
> 	private IPublisherAction createSiteXMLAction() {
>-		if (updateSite != null)
>-			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 new SiteXMLAction(updateSite, null);
> 	}
> }
>Index: src/org/eclipse/equinox/internal/p2/updatesite/LocalUpdateSiteAction.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.updatesite/src/org/eclipse/equinox/internal/p2/updatesite/LocalUpdateSiteAction.java,v
>retrieving revision 1.4
>diff -u -r1.4 LocalUpdateSiteAction.java
>--- src/org/eclipse/equinox/internal/p2/updatesite/LocalUpdateSiteAction.java	9 Oct 2008 03:21:48 -0000	1.4
>+++ src/org/eclipse/equinox/internal/p2/updatesite/LocalUpdateSiteAction.java	19 Feb 2009 18:52:31 -0000
>@@ -26,16 +26,34 @@
> public class LocalUpdateSiteAction implements IPublisherAction {
> 	protected String source;
> 	private UpdateSite updateSite;
>+	private String categoryQualifier;
> 
> 	protected LocalUpdateSiteAction() {
>+		// empty
> 	}
> 
>-	public LocalUpdateSiteAction(String source) {
>+	/**
>+	 * Creates a local updatesite publisher action from a source location
>+	 * @param source The location of the directory that contains the site.xml file
>+	 * @param categoryQualifier The qualifier to prepend to categories. This qualifier is used
>+	 * to ensure that the category IDs are unique between update sites. If null a default
>+	 * qualifier will be generated
>+	 */
>+	public LocalUpdateSiteAction(String source, String categoryQualifier) {
> 		this.source = source;
>+		this.categoryQualifier = categoryQualifier;
> 	}
> 
>-	public LocalUpdateSiteAction(UpdateSite updateSite) {
>+	/**
>+	 * Creates a local updatesite publisher action from an UpdateSite
>+	 * @param updateSite The updatesite to use
>+	 * @param categoryQualifier The qualifier to prepend to categories. This qualifier is used
>+	 * to ensure that the category IDs are unique between update sites. If null a default
>+	 * qualifier will be generated
>+	 */
>+	public LocalUpdateSiteAction(UpdateSite updateSite, String categoryQualifier) {
> 		this.updateSite = updateSite;
>+		this.categoryQualifier = categoryQualifier;
> 	}
> 
> 	public IStatus perform(IPublisherInfo info, IPublisherResult results, IProgressMonitor monitor) {
>@@ -63,13 +81,16 @@
> 
> 	private IPublisherAction createSiteXMLAction() {
> 		if (updateSite != null)
>-			return new SiteXMLAction(updateSite);
>-		if (source != null)
>-			return new SiteXMLAction(new File(source, "site.xml").toURI()); //$NON-NLS-1$
>+			return new SiteXMLAction(updateSite, categoryQualifier);
>+		if (source != null) {
>+			SiteXMLAction siteXmlAction = new SiteXMLAction(new File(source, "site.xml").toURI(), categoryQualifier); //$NON-NLS-1$
>+			return siteXmlAction;
>+		}
> 		return null;
> 	}
> 
> 	private void createAdvice() {
>+		// empty
> 	}
> 
> 	protected IPublisherAction createFeaturesAction() {
>Index: src/org/eclipse/equinox/internal/p2/updatesite/UpdatesitePublisherApplication.java
>===================================================================
>RCS file: src/org/eclipse/equinox/internal/p2/updatesite/UpdatesitePublisherApplication.java
>diff -N src/org/eclipse/equinox/internal/p2/updatesite/UpdatesitePublisherApplication.java
>--- src/org/eclipse/equinox/internal/p2/updatesite/UpdatesitePublisherApplication.java	11 Sep 2008 02:14:52 -0000	1.1
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,30 +0,0 @@
>-/*******************************************************************************
>- * Copyright (c) 2008 Code 9 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: 
>- * Code 9 - initial API and implementation
>- ******************************************************************************/
>-package org.eclipse.equinox.internal.p2.updatesite;
>-
>-import org.eclipse.equinox.p2.publisher.AbstractPublisherApplication;
>-import org.eclipse.equinox.p2.publisher.IPublisherAction;
>-
>-/**
>- * 
>- * This application generates meta-data/artifact repositories from a local update site.
>- * The -source <localdir> parameter must specify the top-level directory containing the update site.
>- * 
>- */
>-public class UpdatesitePublisherApplication extends AbstractPublisherApplication {
>-
>-	public UpdatesitePublisherApplication() {
>-		// nothing todo
>-	}
>-
>-	protected IPublisherAction[] createActions() {
>-		return new IPublisherAction[] {new LocalUpdateSiteAction(source)};
>-	}
>-}
>Index: plugin.xml
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.updatesite/plugin.xml,v
>retrieving revision 1.3
>diff -u -r1.3 plugin.xml
>--- plugin.xml	11 Sep 2008 02:14:52 -0000	1.3
>+++ plugin.xml	19 Feb 2009 18:52:31 -0000
>@@ -27,7 +27,7 @@
> thread="any"
> visible="true">
> <run
>- class="org.eclipse.equinox.internal.p2.updatesite.UpdatesitePublisherApplication">
>+ class="org.eclipse.equinox.internal.p2.updatesite.UpdateSitePublisherApplication">
> </run>
> </application>
> </extension>
>Index: src/org/eclipse/equinox/internal/p2/updatesite/UpdateSitePublisherApplication.java
>===================================================================
>RCS file: src/org/eclipse/equinox/internal/p2/updatesite/UpdateSitePublisherApplication.java
>diff -N src/org/eclipse/equinox/internal/p2/updatesite/UpdateSitePublisherApplication.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/equinox/internal/p2/updatesite/UpdateSitePublisherApplication.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,40 @@
>+/*******************************************************************************
>+ * Copyright (c) 2008 Code 9 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: 
>+ * Code 9 - initial API and implementation
>+ ******************************************************************************/
>+package org.eclipse.equinox.internal.p2.updatesite;
>+
>+import java.net.URISyntaxException;
>+import org.eclipse.equinox.p2.publisher.*;
>+
>+/**
>+ * 
>+ * This application generates meta-data/artifact repositories from a local update site.
>+ * The -source <localdir> parameter must specify the top-level directory containing the update site.
>+ * 
>+ */
>+public class UpdateSitePublisherApplication extends AbstractPublisherApplication {
>+
>+	private String categoryQualifier = null;
>+
>+	public UpdateSitePublisherApplication() {
>+		// nothing todo
>+	}
>+
>+	protected void processParameter(String arg, String parameter, PublisherInfo pinfo) throws URISyntaxException {
>+		super.processParameter(arg, parameter, pinfo);
>+
>+		if (arg.equalsIgnoreCase("-categoryQualifier")) //$NON-NLS-1$
>+			categoryQualifier = parameter;
>+
>+	}
>+
>+	protected IPublisherAction[] createActions() {
>+		return new IPublisherAction[] {new LocalUpdateSiteAction(source, categoryQualifier)};
>+	}
>+}
>#P org.eclipse.equinox.p2.publisher
>Index: src/org/eclipse/equinox/p2/publisher/AbstractPublisherApplication.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/AbstractPublisherApplication.java,v
>retrieving revision 1.6
>diff -u -r1.6 AbstractPublisherApplication.java
>--- src/org/eclipse/equinox/p2/publisher/AbstractPublisherApplication.java	13 Feb 2009 16:18:18 -0000	1.6
>+++ src/org/eclipse/equinox/p2/publisher/AbstractPublisherApplication.java	19 Feb 2009 18:52:35 -0000
>@@ -79,7 +79,8 @@
> 	}
> 
> 	protected void initializeRepositories(PublisherInfo info) throws ProvisionException {
>-		info.setArtifactRepository(Publisher.createArtifactRepository(artifactLocation, artifactRepoName, append, compress, reusePackedFiles));
>+		if (artifactLocation != null)
>+			info.setArtifactRepository(Publisher.createArtifactRepository(artifactLocation, artifactRepoName, append, compress, reusePackedFiles));
> 		info.setMetadataRepository(Publisher.createMetadataRepository(metadataLocation, metadataRepoName, append, compress));
> 	}
> 
>#P org.eclipse.equinox.p2.tests
>Index: src/org/eclipse/equinox/p2/tests/updatesite/AllTests.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/updatesite/AllTests.java,v
>retrieving revision 1.2
>diff -u -r1.2 AllTests.java
>--- src/org/eclipse/equinox/p2/tests/updatesite/AllTests.java	12 Dec 2008 21:11:39 -0000	1.2
>+++ src/org/eclipse/equinox/p2/tests/updatesite/AllTests.java	19 Feb 2009 18:52:36 -0000
>@@ -21,6 +21,7 @@
> 		TestSuite suite = new TestSuite(AllTests.class.getName());
> 		suite.addTestSuite(SiteXMLActionTest.class);
> 		suite.addTestSuite(UpdateSiteTest.class);
>+		suite.addTestSuite(LocalUpdatesiteTest.class);
> 		return suite;
> 	}
> 
>Index: src/org/eclipse/equinox/p2/tests/updatesite/SiteXMLActionTest.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/updatesite/SiteXMLActionTest.java,v
>retrieving revision 1.2
>diff -u -r1.2 SiteXMLActionTest.java
>--- src/org/eclipse/equinox/p2/tests/updatesite/SiteXMLActionTest.java	12 Feb 2009 22:22:39 -0000	1.2
>+++ src/org/eclipse/equinox/p2/tests/updatesite/SiteXMLActionTest.java	19 Feb 2009 18:52:36 -0000
>@@ -10,14 +10,21 @@
> *******************************************************************************/
> package org.eclipse.equinox.p2.tests.updatesite;
> 
>+import java.io.File;
> import java.net.URI;
> import java.util.Collection;
> import java.util.Iterator;
>+import org.eclipse.core.runtime.NullProgressMonitor;
>+import org.eclipse.core.runtime.URIUtil;
> import org.eclipse.equinox.internal.p2.updatesite.SiteXMLAction;
> import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepository;
> import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;
>+import org.eclipse.equinox.internal.provisional.p2.metadata.query.IUPropertyQuery;
>+import org.eclipse.equinox.internal.provisional.p2.query.Collector;
>+import org.eclipse.equinox.internal.provisional.p2.query.Query;
> import org.eclipse.equinox.internal.provisional.spi.p2.metadata.repository.RepositoryReference;
> import org.eclipse.equinox.p2.publisher.*;
>+import org.eclipse.equinox.p2.publisher.eclipse.FeaturesAction;
> import org.eclipse.equinox.p2.tests.*;
> 
> /**
>@@ -25,17 +32,33 @@
> */
> public class SiteXMLActionTest extends AbstractProvisioningTest {
> 	private TestMetadataRepository metadataRepository;
>+	private IPublisherResult actionResult;
>+	private URI siteLocation;
> 
> 	@Override
> 	protected void setUp() throws Exception {
> 		super.setUp();
>-		IPublisherResult result = new PublisherResult();
>+		actionResult = new PublisherResult();
> 		PublisherInfo info = new PublisherInfo();
> 		metadataRepository = new TestMetadataRepository(new IInstallableUnit[0]);
> 		info.setMetadataRepository(metadataRepository);
>-		URI siteLocation = TestData.getFile("updatesite", "SiteXMLActionTest/site.xml").toURI();
>-		SiteXMLAction action = new SiteXMLAction(siteLocation);
>-		action.perform(info, result, getMonitor());
>+		siteLocation = TestData.getFile("updatesite", "SiteXMLActionTest/site.xml").toURI();
>+		FeaturesAction featuresAction = new FeaturesAction(new File[] {TestData.getFile("updateSite", "SiteXMLActionTest")});
>+		featuresAction.perform(info, actionResult, new NullProgressMonitor());
>+
>+		SiteXMLAction action = new SiteXMLAction(siteLocation, null);
>+		action.perform(info, actionResult, getMonitor());
>+	}
>+
>+	public void testQualifier() {
>+		Query categoryQuery = new IUPropertyQuery(IInstallableUnit.PROP_TYPE_CATEGORY, Boolean.toString(true));
>+		Collector results = actionResult.query(categoryQuery, new Collector(), new NullProgressMonitor());
>+		Iterator iter = results.iterator();
>+		while (iter.hasNext()) {
>+			IInstallableUnit unit = (IInstallableUnit) iter.next();
>+			assertTrue("1.0", unit.getId().startsWith(URIUtil.toUnencodedString(siteLocation)));
>+			assertEquals("2.0", "Test Category Label", unit.getProperty(IInstallableUnit.PROP_NAME));
>+		}
> 	}
> 
> 	/**
>Index: src/org/eclipse/equinox/p2/tests/updatesite/LocalUpdatesiteTest.java
>===================================================================
>RCS file: src/org/eclipse/equinox/p2/tests/updatesite/LocalUpdatesiteTest.java
>diff -N src/org/eclipse/equinox/p2/tests/updatesite/LocalUpdatesiteTest.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/equinox/p2/tests/updatesite/LocalUpdatesiteTest.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,62 @@
>+/******************************************************************************* 
>+* Copyright (c) 2009 EclipseSource 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:
>+* EclipseSource - initial API and implementation
>+******************************************************************************/
>+package org.eclipse.equinox.p2.tests.updatesite;
>+
>+import java.io.File;
>+import java.io.IOException;
>+import java.util.Iterator;
>+import org.eclipse.core.runtime.NullProgressMonitor;
>+import org.eclipse.equinox.internal.p2.updatesite.UpdateSitePublisherApplication;
>+import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;
>+import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;
>+import org.eclipse.equinox.internal.provisional.p2.metadata.query.IUPropertyQuery;
>+import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepository;
>+import org.eclipse.equinox.internal.provisional.p2.query.Collector;
>+import org.eclipse.equinox.internal.provisional.p2.query.Query;
>+import org.eclipse.equinox.p2.tests.AbstractProvisioningTest;
>+import org.eclipse.equinox.p2.tests.TestData;
>+
>+public class LocalUpdatesiteTest extends AbstractProvisioningTest {
>+	protected File repoLocation;
>+
>+	protected void setUp() throws Exception {
>+		super.setUp();
>+		String tempDir = System.getProperty("java.io.tmpdir");
>+		repoLocation = new File(tempDir, "LocalMetadataRepositoryTest");
>+		AbstractProvisioningTest.delete(repoLocation);
>+		repoLocation.mkdir();
>+	}
>+
>+	protected void tearDown() throws Exception {
>+		getMetadataRepositoryManager().removeRepository(repoLocation.toURI());
>+		delete(repoLocation);
>+		super.tearDown();
>+	}
>+
>+	public void testCategoryQualifier() throws IOException, ProvisionException {
>+		Query categoryQuery = new IUPropertyQuery(IInstallableUnit.PROP_TYPE_CATEGORY, Boolean.toString(true));
>+		File siteSource = TestData.getFile("updatesite", "SiteXMLActionTest");
>+		UpdateSitePublisherApplication application = new UpdateSitePublisherApplication();
>+		try {
>+			application.run(new String[] {"-metadataRepository", repoLocation.toURI().toString(), "-source", siteSource.toString(), "-categoryQualifier", "fooQualifier"});
>+		} catch (Exception e) {
>+			fail("0.99");
>+		}
>+		IMetadataRepository repository = getMetadataRepositoryManager().loadRepository(repoLocation.toURI(), new NullProgressMonitor());
>+		Collector results = repository.query(categoryQuery, new Collector(), new NullProgressMonitor());
>+		assertEquals("1.0", 1, results.size());
>+		Iterator iter = results.iterator();
>+		while (iter.hasNext()) {
>+			IInstallableUnit unit = (IInstallableUnit) iter.next();
>+			assertTrue("2.0", unit.getId().startsWith("fooQualifier"));
>+			assertEquals("3.0", "Test Category Label", unit.getProperty(IInstallableUnit.PROP_NAME));
>+		}
>+	}
>+}

Actions: View | Diff

Attachments on bug 264389: 125938 | 125939 | 126082 | 126083 | 126197 | 126200 | 126667 | 126670 | 126671