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 98967 Details for
Bug 221727
Improvements for metadata generated when adding directories and zips
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]
Improved fix for update sites
patch.txt (text/plain), 3.67 KB, created by
John Arthorne
on 2008-05-06 17:40:32 EDT
(
hide
)
Description:
Improved fix for update sites
Filename:
MIME Type:
Creator:
John Arthorne
Created:
2008-05-06 17:40:32 EDT
Size:
3.67 KB
patch
obsolete
>### Eclipse Workspace Patch 1.0 >#P org.eclipse.equinox.p2.updatesite >Index: src/org/eclipse/equinox/internal/p2/updatesite/Activator.java >=================================================================== >RCS file: /cvsroot/eclipse/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.updatesite/src/org/eclipse/equinox/internal/p2/updatesite/Activator.java,v >retrieving revision 1.3 >diff -u -r1.3 Activator.java >--- src/org/eclipse/equinox/internal/p2/updatesite/Activator.java 2 Apr 2008 23:25:38 -0000 1.3 >+++ src/org/eclipse/equinox/internal/p2/updatesite/Activator.java 6 May 2008 21:39:57 -0000 >@@ -10,6 +10,9 @@ > *******************************************************************************/ > package org.eclipse.equinox.internal.p2.updatesite; > >+import java.io.File; >+import java.net.URL; >+import org.eclipse.equinox.internal.p2.core.helpers.URLUtil; > import org.osgi.framework.BundleActivator; > import org.osgi.framework.BundleContext; > >@@ -40,4 +43,12 @@ > return bundleContext; > } > >+ /** >+ * Returns a reasonable human-readable repository name for the given location. >+ */ >+ public static String getRepositoryName(URL location) { >+ File file = URLUtil.toFile(location); >+ return file == null ? location.toExternalForm() : file.getAbsolutePath(); >+ } >+ > } >Index: src/org/eclipse/equinox/internal/p2/updatesite/metadata/UpdateSiteMetadataRepository.java >=================================================================== >RCS file: /cvsroot/eclipse/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.updatesite/src/org/eclipse/equinox/internal/p2/updatesite/metadata/UpdateSiteMetadataRepository.java,v >retrieving revision 1.32 >diff -u -r1.32 UpdateSiteMetadataRepository.java >--- src/org/eclipse/equinox/internal/p2/updatesite/metadata/UpdateSiteMetadataRepository.java 6 May 2008 20:05:35 -0000 1.32 >+++ src/org/eclipse/equinox/internal/p2/updatesite/metadata/UpdateSiteMetadataRepository.java 6 May 2008 21:39:57 -0000 >@@ -45,7 +45,7 @@ > private static final String PROP_SITE_CHECKSUM = "site.checksum"; //$NON-NLS-1$ > > public UpdateSiteMetadataRepository(URL location, IProgressMonitor monitor) throws ProvisionException { >- super("update site: " + location.toExternalForm(), TYPE, VERSION.toString(), location, null, null, null); //$NON-NLS-1$ >+ super(Activator.getRepositoryName(location), TYPE, VERSION.toString(), location, null, null, null); > // todo progress monitoring > // loading validates before we create repositories > UpdateSite updateSite = UpdateSite.load(location, null); >Index: src/org/eclipse/equinox/internal/p2/updatesite/artifact/UpdateSiteArtifactRepository.java >=================================================================== >RCS file: /cvsroot/eclipse/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.updatesite/src/org/eclipse/equinox/internal/p2/updatesite/artifact/UpdateSiteArtifactRepository.java,v >retrieving revision 1.30 >diff -u -r1.30 UpdateSiteArtifactRepository.java >--- src/org/eclipse/equinox/internal/p2/updatesite/artifact/UpdateSiteArtifactRepository.java 6 May 2008 20:05:35 -0000 1.30 >+++ src/org/eclipse/equinox/internal/p2/updatesite/artifact/UpdateSiteArtifactRepository.java 6 May 2008 21:39:57 -0000 >@@ -37,7 +37,7 @@ > private final IArtifactRepository artifactRepository; > > public UpdateSiteArtifactRepository(URL location, IProgressMonitor monitor) throws ProvisionException { >- super("update site: " + location.toExternalForm(), TYPE, VERSION.toString(), location, null, null, null); //$NON-NLS-1$ >+ super(Activator.getRepositoryName(location), TYPE, VERSION.toString(), location, null, null, null); > > // todo progress monitoring > // loading validates before we create repositories
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 221727
:
98959
|
98965
| 98967