Download
Getting Started
Members
Projects
Community
Marketplace
Events
Planet Eclipse
Newsletter
Videos
Participate
Report a Bug
Forums
Mailing Lists
Wiki
IRC
How to Contribute
Working Groups
Automotive
Internet of Things
LocationTech
Long-Term Support
PolarSys
Science
OpenMDM
More
Community
Marketplace
Events
Planet Eclipse
Newsletter
Videos
Participate
Report a Bug
Forums
Mailing Lists
Wiki
IRC
How to Contribute
Working Groups
Automotive
Internet of Things
LocationTech
Long-Term Support
PolarSys
Science
OpenMDM
Toggle navigation
Bugzilla – Attachment 122794 Details for
Bug 258820
Bundle remains packed with upack=true set in feature.xml
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
Log In
[x]
|
Terms of Use
|
Copyright Agent
Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read
this important communication.
[patch]
patch p2
clipboard.txt (text/plain), 5.78 KB, created by
Markus Kuppe
on 2009-01-16 07:19:56 EST
(
hide
)
Description:
patch p2
Filename:
MIME Type:
Creator:
Markus Kuppe
Created:
2009-01-16 07:19:56 EST
Size:
5.78 KB
patch
obsolete
>### Eclipse Workspace Patch 1.0 >#P org.eclipse.buckminster.pde >Index: src/java/org/eclipse/buckminster/pde/internal/EclipsePlatformReaderType.java >=================================================================== >--- src/java/org/eclipse/buckminster/pde/internal/EclipsePlatformReaderType.java (revision 9863) >+++ src/java/org/eclipse/buckminster/pde/internal/EclipsePlatformReaderType.java (working copy) >@@ -292,7 +292,7 @@ > plugin.setModel(generatedFeatureModel); > plugin.setId(id); > plugin.setVersion(vStr); >- plugin.setUnpack(false); >+ plugin.setUnpack(res.isUnpack()); > generatedFeature.addPlugins(new IFeaturePlugin[] { plugin }); > } > >Index: src/java/org/eclipse/buckminster/pde/cspecgen/bundle/BundleBuilder.java >=================================================================== >--- src/java/org/eclipse/buckminster/pde/cspecgen/bundle/BundleBuilder.java (revision 9865) >+++ src/java/org/eclipse/buckminster/pde/cspecgen/bundle/BundleBuilder.java (working copy) >@@ -18,13 +18,21 @@ > import org.eclipse.buckminster.core.ctype.IComponentType; > import org.eclipse.buckminster.core.ctype.MissingCSpecSourceException; > import org.eclipse.buckminster.core.helpers.AccessibleByteArrayOutputStream; >+import org.eclipse.buckminster.core.metadata.builder.ResolutionBuilder; >+import org.eclipse.buckminster.core.metadata.model.Resolution; > import org.eclipse.buckminster.core.reader.ICatalogReader; > import org.eclipse.buckminster.core.reader.IComponentReader; >+import org.eclipse.buckminster.core.reader.IFileReader; > import org.eclipse.buckminster.core.reader.IStreamConsumer; >+import org.eclipse.buckminster.core.resolver.NodeQuery; >+import org.eclipse.buckminster.core.rmap.model.Provider; > import org.eclipse.buckminster.core.version.IVersionType; >+import org.eclipse.buckminster.core.version.ProviderMatch; >+import org.eclipse.buckminster.opml.builder.OPMLBuilder; > import org.eclipse.buckminster.pde.Messages; > import org.eclipse.buckminster.pde.cspecgen.CSpecGenerator; > import org.eclipse.buckminster.pde.cspecgen.PDEBuilder; >+import org.eclipse.buckminster.pde.internal.EclipseImportReader; > import org.eclipse.buckminster.pde.internal.EclipsePlatformReader; > import org.eclipse.buckminster.pde.internal.model.ExternalBuildModel; > import org.eclipse.buckminster.pde.internal.model.ExternalBundleModel; >@@ -237,4 +245,37 @@ > monitor.done(); > } > } >+ >+ /* (non-Javadoc) >+ * @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) >+ */ >+ @Override >+ protected Resolution createResolution(IComponentReader reader, CSpecBuilder cspecBuilder, OPMLBuilder opmlBuilder) >+ throws CoreException >+ { >+ ResolutionBuilder resBld = new ResolutionBuilder(cspecBuilder, opmlBuilder); >+ >+ ProviderMatch providerMatch = reader.getProviderMatch(); >+ Provider provider = providerMatch.getProvider(); >+ NodeQuery nq = providerMatch.getNodeQuery(); >+ resBld.setComponentTypeId(providerMatch.getComponentType().getId()); >+ resBld.getRequest().initFrom(nq.getComponentRequest()); >+ resBld.setAttributes(nq.getRequiredAttributes()); >+ resBld.setProvider(provider); >+ resBld.setVersionMatch(providerMatch.getVersionMatch()); >+ resBld.setMaterializable(reader.canMaterialize()); >+ resBld.setRepository(providerMatch.getRepositoryURI()); >+ if(reader instanceof EclipseImportReader) >+ { >+ EclipseImportReader eclipseImportReader = (EclipseImportReader)reader; >+ resBld.setUnpack(eclipseImportReader.isUnpack()); >+ } >+ else >+ { >+ resBld.setUnpack(false); >+ } >+ if(reader instanceof IFileReader) >+ resBld.setFileInfo(((IFileReader)reader).getFileInfo()); >+ return new Resolution(resBld); >+ } > } >Index: src/java/org/eclipse/buckminster/pde/internal/EclipseImportReaderType.java >=================================================================== >--- src/java/org/eclipse/buckminster/pde/internal/EclipseImportReaderType.java (revision 9863) >+++ src/java/org/eclipse/buckminster/pde/internal/EclipseImportReaderType.java (working copy) >@@ -767,6 +767,7 @@ > } > jarFile.delete(); > } >+ base.setUnpack(unpack); > > // Cache this using the remote key also so that the next time someone asks for it, the local > // version is returned >Index: src/java/org/eclipse/buckminster/pde/internal/EclipseImportBase.java >=================================================================== >--- src/java/org/eclipse/buckminster/pde/internal/EclipseImportBase.java (revision 9863) >+++ src/java/org/eclipse/buckminster/pde/internal/EclipseImportBase.java (working copy) >@@ -101,6 +101,8 @@ > > private final URL m_remoteLocation; > >+ private boolean m_unpack = false; >+ > private static final UUID CACHE_IMPORT_BASE_CACHE = UUID.randomUUID(); > > public static EclipseImportBase obtain(NodeQuery query, String repositoryURI) throws CoreException >@@ -285,4 +287,24 @@ > { > return m_remoteLocation == null; > } >+ >+ /** >+ * Should this bundle be unpacked (set in the enclosing feature.xml) >+ * >+ * @return true if supposed to be unpacked >+ */ >+ boolean isUnpack() >+ { >+ return m_unpack; >+ } >+ >+ /** >+ * Should this bundle be unpacked (set in the enclosing feature.xml) >+ * >+ * @param unpack >+ */ >+ void setUnpack(boolean unpack) >+ { >+ m_unpack = unpack; >+ } > } >Index: src/java/org/eclipse/buckminster/pde/internal/EclipseImportReader.java >=================================================================== >--- src/java/org/eclipse/buckminster/pde/internal/EclipseImportReader.java (revision 9865) >+++ src/java/org/eclipse/buckminster/pde/internal/EclipseImportReader.java (working copy) >@@ -243,4 +243,9 @@ > .getComponentName())); > monitor.done(); > } >+ >+ public boolean isUnpack() >+ { >+ return m_base.isUnpack(); >+ } > }
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 258820
:
120471
|
122791
|
122792
|
122794
|
122795
|
122799
|
122800