New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
JBIDE-14548 fix IAE while installing plugins via project examples requirements #122
Merged
+154
−113
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
68 changes: 68 additions & 0 deletions
68
...oject.examples/src/org/jboss/tools/project/examples/internal/discovery/DiscoveryUtil.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,68 @@ | ||
| /************************************************************************************* | ||
| * Copyright (c) 2008-2013 Red Hat, Inc. 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: | ||
| * JBoss by Red Hat - Initial implementation. | ||
| ************************************************************************************/ | ||
| package org.jboss.tools.project.examples.internal.discovery; | ||
|
|
||
| import java.util.Dictionary; | ||
| import java.util.Hashtable; | ||
|
|
||
| import org.eclipse.mylyn.internal.discovery.core.model.ConnectorDiscovery; | ||
| import org.jboss.tools.project.examples.ProjectExamplesActivator; | ||
| import org.jboss.tools.project.examples.internal.discovery.ChainedDiscoveryStrategy.DiscoveryConnectorCollector; | ||
|
|
||
| /** | ||
| * Discovery utility class. | ||
| * | ||
| * @author Fred Bricon | ||
| * | ||
| */ | ||
| public class DiscoveryUtil { | ||
|
|
||
| private DiscoveryUtil() { | ||
| } | ||
|
|
||
| /** | ||
| * Creates a new {@link ConnectorDiscovery} which looks for remote discovery sites first and falls back on locally defined connectors. | ||
| */ | ||
| public static ConnectorDiscovery createConnectorDiscovery() { | ||
| String directoryUrl = ProjectExamplesActivator.getDefault().getConfigurator().getJBossDiscoveryDirectory(); | ||
| return createConnectorDiscovery(directoryUrl); | ||
| } | ||
|
|
||
| /** | ||
| * Creates a new {@link ConnectorDiscovery} which looks for a remote discovery site first and falls back on locally defined connectors. | ||
| */ | ||
| public static ConnectorDiscovery createConnectorDiscovery(String directoryUrl) { | ||
| ConnectorDiscovery connectorDiscovery = new ConnectorDiscovery(); | ||
| ChainedDiscoveryStrategy chainedDiscoveryStrategy = new ChainedDiscoveryStrategy(new DiscoveryConnectorCollector()); | ||
|
|
||
| // look for remote descriptor first | ||
| if (directoryUrl != null) { | ||
| ExpressionBasedRemoteBundleDiscoveryStrategy remoteDiscoveryStrategy = new ExpressionBasedRemoteBundleDiscoveryStrategy(); | ||
| remoteDiscoveryStrategy.setDirectoryUrl(directoryUrl); | ||
| chainedDiscoveryStrategy.addStrategy(remoteDiscoveryStrategy); | ||
| } | ||
|
|
||
| // look for descriptors from installed bundles | ||
| chainedDiscoveryStrategy.addStrategy(new ExpressionBasedBundleDiscoveryStrategy()); | ||
|
|
||
| connectorDiscovery.getDiscoveryStrategies().add(chainedDiscoveryStrategy); | ||
| connectorDiscovery.setVerifyUpdateSiteAvailability(true); | ||
| connectorDiscovery.setEnvironment(getEnvironment()); | ||
| return connectorDiscovery; | ||
| } | ||
|
|
||
| private static Dictionary<Object, Object> getEnvironment() { | ||
| Dictionary<Object, Object> environment = new Hashtable<Object, Object>( | ||
| System.getProperties()); | ||
| return environment; | ||
| } | ||
|
|
||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
removed now