diff options
| author | spingel | 2010-05-19 19:57:04 +0000 |
|---|---|---|
| committer | spingel | 2010-05-19 19:57:04 +0000 |
| commit | 09f76b4e627e6d09af1373c21cf26f9d3b2ce209 (patch) | |
| tree | 3721384e463fd05a8a67043dfb75d58c98ce926a | |
| parent | 45c9a5d82bdda730d5e4243ae30278cb379caa84 (diff) | |
| download | org.eclipse.mylyn.commons-e_3_6_m_3_3_x.tar.gz org.eclipse.mylyn.commons-e_3_6_m_3_3_x.tar.xz org.eclipse.mylyn.commons-e_3_6_m_3_3_x.zip | |
NEW - bug 313257: [discovery] connector discovery does not support composite repositoriese_3_6_m_3_3_x
https://bugs.eclipse.org/bugs/show_bug.cgi?id=313257
| -rw-r--r-- | org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/model/ConnectorDiscovery.java | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/model/ConnectorDiscovery.java b/org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/model/ConnectorDiscovery.java index a381f8de..1d660b14 100644 --- a/org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/model/ConnectorDiscovery.java +++ b/org.eclipse.mylyn.discovery.core/src/org/eclipse/mylyn/internal/discovery/core/model/ConnectorDiscovery.java @@ -258,8 +258,8 @@ public class ConnectorDiscovery { connector.setCategory(category); } else { StatusHandler.log(new Status(IStatus.ERROR, DiscoveryCore.ID_PLUGIN, NLS.bind( - Messages.ConnectorDiscovery_bundle_references_unknown_category, new Object[] { - connector.getCategoryId(), connector.getId(), connector.getSource().getId() }))); + Messages.ConnectorDiscovery_bundle_references_unknown_category, + new Object[] { connector.getCategoryId(), connector.getId(), connector.getSource().getId() }))); } } } @@ -276,8 +276,9 @@ public class ConnectorDiscovery { match = filter.match(environment); } catch (InvalidSyntaxException e) { StatusHandler.log(new Status(IStatus.ERROR, DiscoveryCore.ID_PLUGIN, NLS.bind( - Messages.ConnectorDiscovery_illegal_filter_syntax, new Object[] { - connector.getPlatformFilter(), connector.getId(), connector.getSource().getId() }))); + Messages.ConnectorDiscovery_illegal_filter_syntax, + new Object[] { connector.getPlatformFilter(), connector.getId(), + connector.getSource().getId() }))); } if (!match) { connectors.remove(connector); @@ -407,7 +408,8 @@ public class ConnectorDiscovery { public VerifyUpdateSiteJob call() throws Exception { URL baseUrl = new URL(url); List<URI> locations = new ArrayList<URI>(); - for (String location : new String[] { "content.jar", "content.xml", "site.xml" }) { //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$ + for (String location : new String[] { + "content.jar", "content.xml", "compositeContent.jar", "compositeContent.xml", "site.xml" }) { //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ locations.add(new URL(baseUrl, location).toURI()); } ok = WebUtil.verifyAvailability(locations, true, new NullProgressMonitor()); |