Attachment #122799 for bug #258820

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

Lines 138-145 Link Here

(-)src/java/org/eclipse/buckminster/core/cspec/AbstractResolutionBuilder.java (-2 / +8 lines)
138	return new ResolvedNode(reader.getNodeQuery(), createResolution(reader, cspecBuilder, opmlBuilder));	138	return new ResolvedNode(reader.getNodeQuery(), createResolution(reader, cspecBuilder, opmlBuilder));
139	}	139	}
140		140
141	protected Resolution createResolution(IComponentReader reader, CSpecBuilder cspecBuilder, OPMLBuilder opmlBuilder)	141	protected Resolution createResolution(IComponentReader reader, CSpecBuilder cspecBuilder, OPMLBuilder opmlBuilder) throws CoreException
142	throws CoreException	142	{
		143	return createResolution(reader, cspecBuilder, opmlBuilder, false);
		144	}
		145
		146	protected Resolution createResolution(IComponentReader reader, CSpecBuilder cspecBuilder, OPMLBuilder opmlBuilder,
		147	boolean unpack) throws CoreException
143	{	148	{
144	ResolutionBuilder resBld = new ResolutionBuilder(cspecBuilder, opmlBuilder);	149	ResolutionBuilder resBld = new ResolutionBuilder(cspecBuilder, opmlBuilder);
145		150
Lines 153-158 Link Here
153	resBld.setVersionMatch(providerMatch.getVersionMatch());	158	resBld.setVersionMatch(providerMatch.getVersionMatch());
154	resBld.setMaterializable(reader.canMaterialize());	159	resBld.setMaterializable(reader.canMaterialize());
155	resBld.setRepository(providerMatch.getRepositoryURI());	160	resBld.setRepository(providerMatch.getRepositoryURI());
		161	resBld.setUnpack(unpack);
156	if(reader instanceof IFileReader)	162	if(reader instanceof IFileReader)
157	resBld.setFileInfo(((IFileReader)reader).getFileInfo());	163	resBld.setFileInfo(((IFileReader)reader).getFileInfo());
158	return new Resolution(resBld);	164	return new Resolution(resBld);

Lines 292-298 Link Here

(-)src/java/org/eclipse/buckminster/pde/internal/EclipsePlatformReaderType.java (-1 / +1 lines)
292	plugin.setModel(generatedFeatureModel);	292	plugin.setModel(generatedFeatureModel);
293	plugin.setId(id);	293	plugin.setId(id);
294	plugin.setVersion(vStr);	294	plugin.setVersion(vStr);
295	plugin.setUnpack(false);	295	plugin.setUnpack(res.isUnpack());
296	generatedFeature.addPlugins(new IFeaturePlugin[] { plugin });	296	generatedFeature.addPlugins(new IFeaturePlugin[] { plugin });
297	}	297	}
298		298

Lines 18-30 Link Here

(-)src/java/org/eclipse/buckminster/pde/cspecgen/bundle/BundleBuilder.java (+23 lines)
18	import org.eclipse.buckminster.core.ctype.IComponentType;	18	import org.eclipse.buckminster.core.ctype.IComponentType;
19	import org.eclipse.buckminster.core.ctype.MissingCSpecSourceException;	19	import org.eclipse.buckminster.core.ctype.MissingCSpecSourceException;
20	import org.eclipse.buckminster.core.helpers.AccessibleByteArrayOutputStream;	20	import org.eclipse.buckminster.core.helpers.AccessibleByteArrayOutputStream;
		21	import org.eclipse.buckminster.core.metadata.builder.ResolutionBuilder;
		22	import org.eclipse.buckminster.core.metadata.model.Resolution;
21	import org.eclipse.buckminster.core.reader.ICatalogReader;	23	import org.eclipse.buckminster.core.reader.ICatalogReader;
22	import org.eclipse.buckminster.core.reader.IComponentReader;	24	import org.eclipse.buckminster.core.reader.IComponentReader;
		25	import org.eclipse.buckminster.core.reader.IFileReader;
23	import org.eclipse.buckminster.core.reader.IStreamConsumer;	26	import org.eclipse.buckminster.core.reader.IStreamConsumer;
		27	import org.eclipse.buckminster.core.resolver.NodeQuery;
		28	import org.eclipse.buckminster.core.rmap.model.Provider;
24	import org.eclipse.buckminster.core.version.IVersionType;	29	import org.eclipse.buckminster.core.version.IVersionType;
		30	import org.eclipse.buckminster.core.version.ProviderMatch;
		31	import org.eclipse.buckminster.opml.builder.OPMLBuilder;
25	import org.eclipse.buckminster.pde.Messages;	32	import org.eclipse.buckminster.pde.Messages;
26	import org.eclipse.buckminster.pde.cspecgen.CSpecGenerator;	33	import org.eclipse.buckminster.pde.cspecgen.CSpecGenerator;
27	import org.eclipse.buckminster.pde.cspecgen.PDEBuilder;	34	import org.eclipse.buckminster.pde.cspecgen.PDEBuilder;
		35	import org.eclipse.buckminster.pde.internal.EclipseImportReader;
28	import org.eclipse.buckminster.pde.internal.EclipsePlatformReader;	36	import org.eclipse.buckminster.pde.internal.EclipsePlatformReader;
29	import org.eclipse.buckminster.pde.internal.model.ExternalBuildModel;	37	import org.eclipse.buckminster.pde.internal.model.ExternalBuildModel;
30	import org.eclipse.buckminster.pde.internal.model.ExternalBundleModel;	38	import org.eclipse.buckminster.pde.internal.model.ExternalBundleModel;
Lines 237-240 Link Here
237	monitor.done();	245	monitor.done();
238	}	246	}
239	}	247	}
		248
		249	/* (non-Javadoc)
		250	* @see org.eclipse.buckminster.core.cspec.AbstractResolutionBuilder#createResolution(org.eclipse.buckminster.core.reader.IComponentReader, org.eclipse.buckminster.core.cspec.builder.CSpecBuilder, org.eclipse.buckminster.opml.builder.OPMLBuilder)
		251	*/
		252	@Override
		253	protected Resolution createResolution(IComponentReader reader, CSpecBuilder cspecBuilder, OPMLBuilder opmlBuilder)
		254	throws CoreException
		255	{
		256	if(reader instanceof EclipseImportReader)
		257	{
		258	EclipseImportReader eclipseImportReader = (EclipseImportReader)reader;
		259	return super.createResolution(reader, cspecBuilder, opmlBuilder, eclipseImportReader.isUnpack());
		260	}
		261	return super.createResolution(reader, cspecBuilder, opmlBuilder);
		262	}
240	}	263	}

Lines 767-772 Link Here

(-)src/java/org/eclipse/buckminster/pde/internal/EclipseImportReaderType.java (+1 lines)
767	}	767	}
768	jarFile.delete();	768	jarFile.delete();
769	}	769	}
		770	base.setUnpack(unpack);
770		771
771	// Cache this using the remote key also so that the next time someone asks for it, the local	772	// Cache this using the remote key also so that the next time someone asks for it, the local
772	// version is returned	773	// version is returned

Lines 101-106 Link Here

(-)src/java/org/eclipse/buckminster/pde/internal/EclipseImportBase.java (+22 lines)
101		101
102	private final URL m_remoteLocation;	102	private final URL m_remoteLocation;
103		103
		104	private boolean m_unpack = false;
		105
104	private static final UUID CACHE_IMPORT_BASE_CACHE = UUID.randomUUID();	106	private static final UUID CACHE_IMPORT_BASE_CACHE = UUID.randomUUID();
105		107
106	public static EclipseImportBase obtain(NodeQuery query, String repositoryURI) throws CoreException	108	public static EclipseImportBase obtain(NodeQuery query, String repositoryURI) throws CoreException
Lines 285-288 Link Here
285	{	287	{
286	return m_remoteLocation == null;	288	return m_remoteLocation == null;
287	}	289	}
		290
		291	/**
		292	* Should this bundle be unpacked (set in the enclosing feature.xml)
		293	*
		294	* @return true if supposed to be unpacked
		295	*/
		296	boolean isUnpack()
		297	{
		298	return m_unpack;
		299	}
		300
		301	/**
		302	* Should this bundle be unpacked (set in the enclosing feature.xml)
		303	*
		304	* @param unpack
		305	*/
		306	void setUnpack(boolean unpack)
		307	{
		308	m_unpack = unpack;
		309	}
288	}	310	}

Lines 243-246 Link Here

(-)src/java/org/eclipse/buckminster/pde/internal/EclipseImportReader.java (+5 lines)
243	.getComponentName()));	243	.getComponentName()));
244	monitor.done();	244	monitor.done();
245	}	245	}
		246
		247	public boolean isUnpack()
		248	{
		249	return m_base.isUnpack();
		250	}
246	}	251	}

Return to bug 258820