From 1021f389e7546d30778e6de7eb3707d6598bfe6e Mon Sep 17 00:00:00 2001 From: Denis Golovin Date: Tue, 18 Jun 2013 18:39:47 -0700 Subject: [PATCH] JBIDE-14548 fix IAE while installing plugins via project examples requirements - Moved mylyn discovery from central to project-examples - refactored 3 ConnectorDiscovery creation points into one DiscoveryUtil method Author: Denis Golovin CoAuthor: Fred Bricon --- .../META-INF/MANIFEST.MF | 3 - .../central/editors/GettingStartedPage.java | 15 +--- .../central/editors/xpl/DiscoveryViewer.java | 53 ++------------- .../CachedProxyWizardDiscoveryStrategy.java | 2 +- ...InstalledProxyWizardDiscoveryStrategy.java | 2 +- .../wizards/ProxyWizardDataCollector.java | 2 +- .../discovery/wizards/ProxyWizardManager.java | 2 +- .../RemoteProxyWizardDiscoveryStrategy.java | 2 +- .../wizards/ChainedDiscoveryStrategyTest.java | 2 +- .../tools/central/test/DiscoveryTest.java | 7 +- .../test/xpl/ExpressionResolverTest.java | 4 +- .../META-INF/MANIFEST.MF | 3 + .../examples/ProjectExamplesActivator.java | 15 ---- .../discovery/ChainedDiscoveryStrategy.java | 44 +++++++++++- .../internal/discovery/DiscoveryUtil.java | 68 +++++++++++++++++++ ...xpressionBasedBundleDiscoveryStrategy.java | 2 +- .../ExpressionBasedDiscoveryConnector.java | 6 +- ...ssionBasedDiscoveryExtensionProcessor.java | 2 +- ...ionBasedRemoteBundleDiscoveryStrategy.java | 2 +- .../xpl/BundleDiscoveryStrategy.java | 2 +- .../xpl/DiscoveryRegistryStrategy.java | 2 +- .../xpl/ExternalBundleDiscoveryStrategy.java | 2 +- ...RemoteExternalBundleDiscoveryStrategy.java | 2 +- .../xpl/ExpressionResolutionException.java | 2 +- .../internal/xpl/ExpressionResolver.java | 2 +- .../NewProjectExamplesRequirementsPage.java | 19 +++--- 26 files changed, 154 insertions(+), 113 deletions(-) rename {central/plugins/org.jboss.tools.central/src/org/jboss/tools/central => examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples}/internal/discovery/ChainedDiscoveryStrategy.java (70%) create mode 100644 examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/internal/discovery/DiscoveryUtil.java rename {central/plugins/org.jboss.tools.central/src/org/jboss/tools/central => examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples}/internal/discovery/ExpressionBasedBundleDiscoveryStrategy.java (96%) rename {central/plugins/org.jboss.tools.central/src/org/jboss/tools/central => examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples}/internal/discovery/ExpressionBasedDiscoveryConnector.java (87%) rename {central/plugins/org.jboss.tools.central/src/org/jboss/tools/central => examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples}/internal/discovery/ExpressionBasedDiscoveryExtensionProcessor.java (98%) rename {central/plugins/org.jboss.tools.central/src/org/jboss/tools/central => examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples}/internal/discovery/ExpressionBasedRemoteBundleDiscoveryStrategy.java (96%) rename {central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/internal/discovery/wizards => examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/internal/discovery}/xpl/BundleDiscoveryStrategy.java (98%) rename {central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/internal/discovery/wizards => examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/internal/discovery}/xpl/DiscoveryRegistryStrategy.java (99%) rename {central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/internal/discovery/wizards => examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/internal/discovery}/xpl/ExternalBundleDiscoveryStrategy.java (99%) rename {central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/internal/discovery/wizards => examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/internal/discovery}/xpl/RemoteExternalBundleDiscoveryStrategy.java (99%) rename {central/plugins/org.jboss.tools.central/src/org/jboss/tools/central => examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples}/internal/xpl/ExpressionResolutionException.java (94%) rename {central/plugins/org.jboss.tools.central/src/org/jboss/tools/central => examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples}/internal/xpl/ExpressionResolver.java (99%) diff --git a/central/plugins/org.jboss.tools.central/META-INF/MANIFEST.MF b/central/plugins/org.jboss.tools.central/META-INF/MANIFEST.MF index 9eb48a722..9f74dbad2 100644 --- a/central/plugins/org.jboss.tools.central/META-INF/MANIFEST.MF +++ b/central/plugins/org.jboss.tools.central/META-INF/MANIFEST.MF @@ -38,10 +38,7 @@ Export-Package: org.jboss.tools.central, org.jboss.tools.central.editors, org.jboss.tools.central.editors.xpl, org.jboss.tools.central.internal;x-friends:="org.jboss.tools.central.test", - org.jboss.tools.central.internal.discovery;x-friends:="org.jboss.tools.central.test", org.jboss.tools.central.internal.discovery.wizards;x-friends:="org.jboss.tools.central.test", - org.jboss.tools.central.internal.discovery.wizards.xpl;x-friends:="org.jboss.tools.central.test", - org.jboss.tools.central.internal.xpl, org.jboss.tools.central.jobs, org.jboss.tools.central.model, org.jboss.tools.central.preferences diff --git a/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/GettingStartedPage.java b/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/GettingStartedPage.java index 28d69316f..0903e8371 100644 --- a/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/GettingStartedPage.java +++ b/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/GettingStartedPage.java @@ -100,8 +100,6 @@ import org.eclipse.ui.part.PageBook; import org.jboss.tools.central.JBossCentralActivator; import org.jboss.tools.central.internal.ImageUtil; -import org.jboss.tools.central.internal.discovery.ExpressionBasedBundleDiscoveryStrategy; -import org.jboss.tools.central.internal.discovery.ExpressionBasedRemoteBundleDiscoveryStrategy; import org.jboss.tools.central.internal.discovery.wizards.ProxyWizard; import org.jboss.tools.central.internal.discovery.wizards.ProxyWizardManager; import org.jboss.tools.central.internal.discovery.wizards.ProxyWizardManager.ProxyWizardManagerListener; @@ -110,6 +108,7 @@ import org.jboss.tools.central.jobs.RefreshTutorialsJob; import org.jboss.tools.central.model.FeedsEntry; import org.jboss.tools.project.examples.ProjectExamplesActivator; +import org.jboss.tools.project.examples.internal.discovery.DiscoveryUtil; import org.jboss.tools.project.examples.model.ProjectExample; import org.jboss.tools.project.examples.model.ProjectExampleCategory; import org.jboss.tools.project.examples.wizard.NewProjectExamplesWizard2; @@ -629,18 +628,10 @@ protected void installMissingWizard(final Collection connectorIds) throw final IStatus[] results = new IStatus[1]; final ConnectorDiscovery[] connectorDiscoveries = new ConnectorDiscovery[1]; - //TODO Refactor the connector installation b/w the software page & project examples IRunnableWithProgress runnable = new IRunnableWithProgress() { public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { - connectorDiscoveries[0] = new ConnectorDiscovery(); - // look for descriptors from installed bundles - connectorDiscoveries[0].getDiscoveryStrategies().add(new ExpressionBasedBundleDiscoveryStrategy()); - ExpressionBasedRemoteBundleDiscoveryStrategy remoteDiscoveryStrategy = new ExpressionBasedRemoteBundleDiscoveryStrategy(); - remoteDiscoveryStrategy.setDirectoryUrl(ProjectExamplesActivator.getDefault().getConfigurator().getJBossDiscoveryDirectory()); - connectorDiscoveries[0].getDiscoveryStrategies().add(remoteDiscoveryStrategy); - - connectorDiscoveries[0].setEnvironment(ProjectExamplesActivator.getEnvironment()); - connectorDiscoveries[0].setVerifyUpdateSiteAvailability(true); + connectorDiscoveries[0] = DiscoveryUtil.createConnectorDiscovery(); + connectorDiscoveries[0].setEnvironment(JBossCentralActivator.getEnvironment()); results[0] = connectorDiscoveries[0].performDiscovery(monitor); if (monitor.isCanceled()) { results[0] = Status.CANCEL_STATUS; diff --git a/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/xpl/DiscoveryViewer.java b/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/xpl/DiscoveryViewer.java index e8cfd315c..86324949e 100644 --- a/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/xpl/DiscoveryViewer.java +++ b/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/xpl/DiscoveryViewer.java @@ -122,10 +122,12 @@ import org.eclipse.ui.progress.WorkbenchJob; import org.eclipse.ui.statushandlers.StatusManager; import org.eclipse.ui.themes.IThemeManager; -import org.jboss.tools.central.internal.discovery.ChainedDiscoveryStrategy; -import org.jboss.tools.central.internal.discovery.ChainedDiscoveryStrategy.DataCollector; -import org.jboss.tools.central.internal.discovery.ExpressionBasedBundleDiscoveryStrategy; -import org.jboss.tools.central.internal.discovery.ExpressionBasedRemoteBundleDiscoveryStrategy; +import org.jboss.tools.project.examples.internal.discovery.ChainedDiscoveryStrategy; +import org.jboss.tools.project.examples.internal.discovery.ChainedDiscoveryStrategy.DataCollector; +import org.jboss.tools.project.examples.internal.discovery.ChainedDiscoveryStrategy.DiscoveryConnectorCollector; +import org.jboss.tools.project.examples.internal.discovery.DiscoveryUtil; +import org.jboss.tools.project.examples.internal.discovery.ExpressionBasedBundleDiscoveryStrategy; +import org.jboss.tools.project.examples.internal.discovery.ExpressionBasedRemoteBundleDiscoveryStrategy; import org.osgi.framework.Bundle; import org.osgi.framework.Version; @@ -137,8 +139,6 @@ */ public class DiscoveryViewer { - private static boolean ALLOW_DUPLICATE_DISCOVERY_CONNECTORS = Boolean.getBoolean("org.jboss.tools.central.allow.duplicate.connectors"); - public class ConnectorBorderPaintListener implements PaintListener { public void paintControl(PaintEvent e) { Composite composite = (Composite) e.widget; @@ -1493,24 +1493,7 @@ public void run(IProgressMonitor monitor) throws InvocationTargetException, Inte if (DiscoveryViewer.this.installedFeatures == null) { DiscoveryViewer.this.installedFeatures = getInstalledFeatures(monitor); } - - ConnectorDiscovery connectorDiscovery = new ConnectorDiscovery(); - ChainedDiscoveryStrategy chainedDiscoveryStrategy = new ChainedDiscoveryStrategy(new DiscoveryConnectorCollector(ALLOW_DUPLICATE_DISCOVERY_CONNECTORS)); - - // look for remote descriptor first - if (directoryUrl != null) { - ExpressionBasedRemoteBundleDiscoveryStrategy remoteDiscoveryStrategy = new ExpressionBasedRemoteBundleDiscoveryStrategy(); - remoteDiscoveryStrategy.setDirectoryUrl(directoryUrl); - chainedDiscoveryStrategy.addStrategy(remoteDiscoveryStrategy); - } - - //Fall back on bundle discovery strategy - chainedDiscoveryStrategy.addStrategy(new ExpressionBasedBundleDiscoveryStrategy()); - - // look for descriptors from installed bundles - connectorDiscovery.getDiscoveryStrategies().add(chainedDiscoveryStrategy); - - + ConnectorDiscovery connectorDiscovery = DiscoveryUtil.createConnectorDiscovery(directoryUrl); connectorDiscovery.setEnvironment(environment); connectorDiscovery.setVerifyUpdateSiteAvailability(false); try { @@ -1602,26 +1585,4 @@ protected Set getInstalledFeatures(IProgressMonitor monitor) throws Inte return DiscoveryUi.createInstallJob().getInstalledFeatures(monitor); } - private final class DiscoveryConnectorCollector implements DataCollector { - - private boolean isComplete; - - private boolean allowDuplicates; - - public DiscoveryConnectorCollector(boolean allowDuplicates) { - this.allowDuplicates = allowDuplicates; - } - - @Override - public boolean isComplete() { - return isComplete && !allowDuplicates; - } - - @Override - public void collectData(AbstractDiscoveryStrategy ds) { - List collected = ds.getConnectors(); - isComplete = (collected != null && !collected.isEmpty()); - } - } - } diff --git a/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/internal/discovery/wizards/CachedProxyWizardDiscoveryStrategy.java b/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/internal/discovery/wizards/CachedProxyWizardDiscoveryStrategy.java index 355e7865c..8b2cfa393 100644 --- a/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/internal/discovery/wizards/CachedProxyWizardDiscoveryStrategy.java +++ b/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/internal/discovery/wizards/CachedProxyWizardDiscoveryStrategy.java @@ -20,7 +20,7 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.mylyn.internal.discovery.core.model.AbstractDiscoverySource; import org.jboss.tools.central.JBossCentralActivator; -import org.jboss.tools.central.internal.discovery.wizards.xpl.ExternalBundleDiscoveryStrategy; +import org.jboss.tools.project.examples.internal.discovery.xpl.ExternalBundleDiscoveryStrategy; /** * @author Fred Bricon diff --git a/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/internal/discovery/wizards/InstalledProxyWizardDiscoveryStrategy.java b/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/internal/discovery/wizards/InstalledProxyWizardDiscoveryStrategy.java index 06da3ddb4..34643fbfb 100644 --- a/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/internal/discovery/wizards/InstalledProxyWizardDiscoveryStrategy.java +++ b/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/internal/discovery/wizards/InstalledProxyWizardDiscoveryStrategy.java @@ -19,7 +19,7 @@ import org.eclipse.core.runtime.IExtension; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.mylyn.internal.discovery.core.model.AbstractDiscoverySource; -import org.jboss.tools.central.internal.discovery.wizards.xpl.BundleDiscoveryStrategy; +import org.jboss.tools.project.examples.internal.discovery.xpl.BundleDiscoveryStrategy; /** * @author Fred Bricon diff --git a/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/internal/discovery/wizards/ProxyWizardDataCollector.java b/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/internal/discovery/wizards/ProxyWizardDataCollector.java index 6bfa3bc10..18d6c3aad 100644 --- a/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/internal/discovery/wizards/ProxyWizardDataCollector.java +++ b/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/internal/discovery/wizards/ProxyWizardDataCollector.java @@ -14,7 +14,7 @@ import java.util.List; import org.eclipse.mylyn.internal.discovery.core.model.AbstractDiscoveryStrategy; -import org.jboss.tools.central.internal.discovery.ChainedDiscoveryStrategy.DataCollector; +import org.jboss.tools.project.examples.internal.discovery.ChainedDiscoveryStrategy.DataCollector; /** * Collects {@link ProxyWizard}s discovered by {@link ProxyWizardDiscoveryStrategy}s diff --git a/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/internal/discovery/wizards/ProxyWizardManager.java b/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/internal/discovery/wizards/ProxyWizardManager.java index fc7e1d225..dbf3ffdb5 100644 --- a/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/internal/discovery/wizards/ProxyWizardManager.java +++ b/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/internal/discovery/wizards/ProxyWizardManager.java @@ -25,8 +25,8 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.mylyn.internal.discovery.core.model.ConnectorDiscovery; import org.jboss.tools.central.JBossCentralActivator; -import org.jboss.tools.central.internal.discovery.ChainedDiscoveryStrategy; import org.jboss.tools.project.examples.ProjectExamplesActivator; +import org.jboss.tools.project.examples.internal.discovery.ChainedDiscoveryStrategy; /** diff --git a/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/internal/discovery/wizards/RemoteProxyWizardDiscoveryStrategy.java b/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/internal/discovery/wizards/RemoteProxyWizardDiscoveryStrategy.java index c7e03bd5f..9e2e81af7 100644 --- a/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/internal/discovery/wizards/RemoteProxyWizardDiscoveryStrategy.java +++ b/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/internal/discovery/wizards/RemoteProxyWizardDiscoveryStrategy.java @@ -20,7 +20,7 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.mylyn.internal.discovery.core.model.AbstractDiscoverySource; import org.jboss.tools.central.JBossCentralActivator; -import org.jboss.tools.central.internal.discovery.wizards.xpl.RemoteExternalBundleDiscoveryStrategy; +import org.jboss.tools.project.examples.internal.discovery.xpl.RemoteExternalBundleDiscoveryStrategy; /** * diff --git a/central/tests/org.jboss.tools.central.test/src/org/jboss/tools/central/internal/discovery/wizards/ChainedDiscoveryStrategyTest.java b/central/tests/org.jboss.tools.central.test/src/org/jboss/tools/central/internal/discovery/wizards/ChainedDiscoveryStrategyTest.java index 52cf2662a..cae0e8c51 100644 --- a/central/tests/org.jboss.tools.central.test/src/org/jboss/tools/central/internal/discovery/wizards/ChainedDiscoveryStrategyTest.java +++ b/central/tests/org.jboss.tools.central.test/src/org/jboss/tools/central/internal/discovery/wizards/ChainedDiscoveryStrategyTest.java @@ -25,7 +25,7 @@ import org.eclipse.core.runtime.MultiStatus; import org.eclipse.core.runtime.Status; import org.eclipse.mylyn.internal.discovery.core.model.AbstractDiscoveryStrategy; -import org.jboss.tools.central.internal.discovery.ChainedDiscoveryStrategy; +import org.jboss.tools.project.examples.internal.discovery.ChainedDiscoveryStrategy; import org.junit.Test; public class ChainedDiscoveryStrategyTest { diff --git a/central/tests/org.jboss.tools.central.test/src/org/jboss/tools/central/test/DiscoveryTest.java b/central/tests/org.jboss.tools.central.test/src/org/jboss/tools/central/test/DiscoveryTest.java index a40dbfd9f..7d32d834e 100644 --- a/central/tests/org.jboss.tools.central.test/src/org/jboss/tools/central/test/DiscoveryTest.java +++ b/central/tests/org.jboss.tools.central.test/src/org/jboss/tools/central/test/DiscoveryTest.java @@ -26,7 +26,8 @@ import org.jboss.tools.central.editors.JBossCentralEditor; import org.jboss.tools.central.editors.SoftwarePage; import org.jboss.tools.central.editors.xpl.DiscoveryViewer; -import org.jboss.tools.central.internal.discovery.ExpressionBasedDiscoveryConnector; +import org.jboss.tools.project.examples.internal.discovery.ChainedDiscoveryStrategy.DiscoveryConnectorCollector; +import org.jboss.tools.project.examples.internal.discovery.ExpressionBasedDiscoveryConnector; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; @@ -46,7 +47,7 @@ public class DiscoveryTest { public static void init() throws Exception { System.setProperty("central.URL", TEST_URL); //Need to allow bundle discovery AND remote discovery hence : - System.setProperty("org.jboss.tools.central.allow.duplicate.connectors", Boolean.TRUE.toString()); + System.setProperty(DiscoveryConnectorCollector.ALLOW_DUPLICATE_DISCOVERY_CONNECTORS_KEY, Boolean.TRUE.toString()); final WorkbenchWindow window = (WorkbenchWindow) PlatformUI .getWorkbench().getActiveWorkbenchWindow(); final IWorkbenchPage page = window.getActivePage(); @@ -64,7 +65,7 @@ public static void init() throws Exception { @AfterClass public static void shutDown() { - System.clearProperty("org.jboss.tools.central.allow.duplicate.connectors"); + System.clearProperty(DiscoveryConnectorCollector.ALLOW_DUPLICATE_DISCOVERY_CONNECTORS_KEY); System.clearProperty("central.URL"); } diff --git a/central/tests/org.jboss.tools.central.test/src/org/jboss/tools/central/test/xpl/ExpressionResolverTest.java b/central/tests/org.jboss.tools.central.test/src/org/jboss/tools/central/test/xpl/ExpressionResolverTest.java index f16b2f7a5..e1059233d 100644 --- a/central/tests/org.jboss.tools.central.test/src/org/jboss/tools/central/test/xpl/ExpressionResolverTest.java +++ b/central/tests/org.jboss.tools.central.test/src/org/jboss/tools/central/test/xpl/ExpressionResolverTest.java @@ -8,8 +8,8 @@ import junit.framework.Assert; -import org.jboss.tools.central.internal.xpl.ExpressionResolutionException; -import org.jboss.tools.central.internal.xpl.ExpressionResolver; +import org.jboss.tools.project.examples.internal.xpl.ExpressionResolutionException; +import org.jboss.tools.project.examples.internal.xpl.ExpressionResolver; import org.junit.Test; public class ExpressionResolverTest { diff --git a/examples/plugins/org.jboss.tools.project.examples/META-INF/MANIFEST.MF b/examples/plugins/org.jboss.tools.project.examples/META-INF/MANIFEST.MF index 109e5458c..43b8c6c50 100644 --- a/examples/plugins/org.jboss.tools.project.examples/META-INF/MANIFEST.MF +++ b/examples/plugins/org.jboss.tools.project.examples/META-INF/MANIFEST.MF @@ -51,6 +51,9 @@ Export-Package: org.jboss.tools.project.examples, org.jboss.tools.project.examples.dialog, org.jboss.tools.project.examples.dialog.xpl, org.jboss.tools.project.examples.fixes, + org.jboss.tools.project.examples.internal.discovery;x-friends:="org.jboss.tools.central", + org.jboss.tools.project.examples.internal.discovery.xpl;x-internal:=true, + org.jboss.tools.project.examples.internal.xpl;x-internal:=true, org.jboss.tools.project.examples.model, org.jboss.tools.project.examples.preferences, org.jboss.tools.project.examples.runtimes, diff --git a/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/ProjectExamplesActivator.java b/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/ProjectExamplesActivator.java index 718086e29..b9f79b15b 100644 --- a/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/ProjectExamplesActivator.java +++ b/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/ProjectExamplesActivator.java @@ -1230,21 +1230,6 @@ private void logIgnoredExtensionPoint(IExtension extension) { log(builder.toString()); } - public static Dictionary getEnvironment() { - Dictionary environment = new Hashtable( - System.getProperties()); - Bundle bundle = Platform.getBundle("org.jboss.tools.central"); //$NON-NLS-1$ - Version version = bundle.getVersion(); - environment.put("org.jboss.tools.central.version", version.toString()); //$NON-NLS-1$ - environment.put( - "org.jboss.tools.central.version.major", version.getMajor()); //$NON-NLS-1$ - environment.put( - "org.jboss.tools.central.version.minor", version.getMinor()); //$NON-NLS-1$ - environment.put( - "org.jboss.tools.central.version.micro", version.getMicro()); //$NON-NLS-1$ - return environment; - } - public static String getShortDescription(String description) { if (description.length() <= DESCRIPTION_LENGTH) { return description; diff --git a/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/internal/discovery/ChainedDiscoveryStrategy.java b/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/internal/discovery/ChainedDiscoveryStrategy.java similarity index 70% rename from central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/internal/discovery/ChainedDiscoveryStrategy.java rename to examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/internal/discovery/ChainedDiscoveryStrategy.java index 443e37ff3..39f780232 100644 --- a/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/internal/discovery/ChainedDiscoveryStrategy.java +++ b/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/internal/discovery/ChainedDiscoveryStrategy.java @@ -8,7 +8,7 @@ * Contributors: * JBoss by Red Hat - Initial implementation. ************************************************************************************/ -package org.jboss.tools.central.internal.discovery; +package org.jboss.tools.project.examples.internal.discovery; import java.util.ArrayList; import java.util.List; @@ -25,7 +25,8 @@ import org.eclipse.mylyn.internal.discovery.core.model.DiscoveryCertification; import org.eclipse.mylyn.internal.discovery.core.model.DiscoveryConnector; import org.eclipse.osgi.util.NLS; -import org.jboss.tools.central.JBossCentralActivator; +import org.jboss.tools.project.examples.ProjectExamplesActivator; + /** * @@ -53,7 +54,7 @@ public void performDiscovery(IProgressMonitor monitor) throws CoreException { throw new IllegalStateException("At least one AbstractDiscoveryStrategy must be added"); } - MultiStatus status = new MultiStatus(JBossCentralActivator.PLUGIN_ID, 0, + MultiStatus status = new MultiStatus(ProjectExamplesActivator.PLUGIN_ID, 0, "All attempts to discover connectors have failed", null); for (AbstractDiscoveryStrategy ds : strategies) { @@ -115,4 +116,41 @@ public interface DataCollector { } + public final static class DiscoveryConnectorCollector implements DataCollector { + + /** + * Use for testing purposes only + */ + public static String ALLOW_DUPLICATE_DISCOVERY_CONNECTORS_KEY = "org.jboss.tools.discovery.allow.duplicate.connectors";//$NON-NLS-1$ + + private boolean isComplete; + + private boolean allowDuplicates; + + /** + * Creates a new DiscoveryConnectorCollector instance which allows duplicate connectors if the org.jboss.tools.discovery.allow.duplicate.connectors system property exists and is set to true + */ + public DiscoveryConnectorCollector() { + this(Boolean.getBoolean(ALLOW_DUPLICATE_DISCOVERY_CONNECTORS_KEY)); + } + + /** + * Creates a new DiscoveryConnectorCollector instance. If allowDuplicates is true, duplicate connectors can be collected. + */ + public DiscoveryConnectorCollector(boolean allowDuplicates) { + this.allowDuplicates = allowDuplicates; + } + + @Override + public boolean isComplete() { + return isComplete && !allowDuplicates; + } + + @Override + public void collectData(AbstractDiscoveryStrategy ds) { + List collected = ds.getConnectors(); + isComplete = (collected != null && !collected.isEmpty()); + } + } + } diff --git a/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/internal/discovery/DiscoveryUtil.java b/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/internal/discovery/DiscoveryUtil.java new file mode 100644 index 000000000..9e33e9ac6 --- /dev/null +++ b/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/internal/discovery/DiscoveryUtil.java @@ -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 getEnvironment() { + Dictionary environment = new Hashtable( + System.getProperties()); + return environment; + } + +} diff --git a/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/internal/discovery/ExpressionBasedBundleDiscoveryStrategy.java b/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/internal/discovery/ExpressionBasedBundleDiscoveryStrategy.java similarity index 96% rename from central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/internal/discovery/ExpressionBasedBundleDiscoveryStrategy.java rename to examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/internal/discovery/ExpressionBasedBundleDiscoveryStrategy.java index 664982c2b..1595a49e0 100644 --- a/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/internal/discovery/ExpressionBasedBundleDiscoveryStrategy.java +++ b/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/internal/discovery/ExpressionBasedBundleDiscoveryStrategy.java @@ -8,7 +8,7 @@ * Contributors: * JBoss by Red Hat - Initial implementation. ************************************************************************************/ -package org.jboss.tools.central.internal.discovery; +package org.jboss.tools.project.examples.internal.discovery; import org.eclipse.core.runtime.IContributor; import org.eclipse.core.runtime.IExtension; diff --git a/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/internal/discovery/ExpressionBasedDiscoveryConnector.java b/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/internal/discovery/ExpressionBasedDiscoveryConnector.java similarity index 87% rename from central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/internal/discovery/ExpressionBasedDiscoveryConnector.java rename to examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/internal/discovery/ExpressionBasedDiscoveryConnector.java index e2a5ce146..d179726ab 100644 --- a/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/internal/discovery/ExpressionBasedDiscoveryConnector.java +++ b/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/internal/discovery/ExpressionBasedDiscoveryConnector.java @@ -8,13 +8,13 @@ * Contributors: * JBoss by Red Hat - Initial implementation. ************************************************************************************/ -package org.jboss.tools.central.internal.discovery; +package org.jboss.tools.project.examples.internal.discovery; import org.eclipse.mylyn.internal.discovery.core.model.DiscoveryConnector; import org.eclipse.mylyn.internal.discovery.core.model.ValidationException; import org.eclipse.osgi.util.NLS; -import org.jboss.tools.central.internal.xpl.ExpressionResolutionException; -import org.jboss.tools.central.internal.xpl.ExpressionResolver; +import org.jboss.tools.project.examples.internal.xpl.ExpressionResolutionException; +import org.jboss.tools.project.examples.internal.xpl.ExpressionResolver; /** * A subclass of a connector that resolves ${sysPropertyName:defaultValue} diff --git a/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/internal/discovery/ExpressionBasedDiscoveryExtensionProcessor.java b/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/internal/discovery/ExpressionBasedDiscoveryExtensionProcessor.java similarity index 98% rename from central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/internal/discovery/ExpressionBasedDiscoveryExtensionProcessor.java rename to examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/internal/discovery/ExpressionBasedDiscoveryExtensionProcessor.java index dac9e8437..329560e17 100644 --- a/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/internal/discovery/ExpressionBasedDiscoveryExtensionProcessor.java +++ b/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/internal/discovery/ExpressionBasedDiscoveryExtensionProcessor.java @@ -9,7 +9,7 @@ * Tasktop Technologies - initial API and implementation * JBoss by Red Hat - resolution for EL ${sysPropName:defaultValue} added ******************************************************************************/ -package org.jboss.tools.central.internal.discovery; +package org.jboss.tools.project.examples.internal.discovery; import java.util.List; diff --git a/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/internal/discovery/ExpressionBasedRemoteBundleDiscoveryStrategy.java b/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/internal/discovery/ExpressionBasedRemoteBundleDiscoveryStrategy.java similarity index 96% rename from central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/internal/discovery/ExpressionBasedRemoteBundleDiscoveryStrategy.java rename to examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/internal/discovery/ExpressionBasedRemoteBundleDiscoveryStrategy.java index 4da3906c8..a83626e9f 100644 --- a/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/internal/discovery/ExpressionBasedRemoteBundleDiscoveryStrategy.java +++ b/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/internal/discovery/ExpressionBasedRemoteBundleDiscoveryStrategy.java @@ -8,7 +8,7 @@ * Contributors: * JBoss by Red Hat - Initial implementation. ************************************************************************************/ -package org.jboss.tools.central.internal.discovery; +package org.jboss.tools.project.examples.internal.discovery; import org.eclipse.core.runtime.IContributor; import org.eclipse.core.runtime.IExtension; diff --git a/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/internal/discovery/wizards/xpl/BundleDiscoveryStrategy.java b/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/internal/discovery/xpl/BundleDiscoveryStrategy.java similarity index 98% rename from central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/internal/discovery/wizards/xpl/BundleDiscoveryStrategy.java rename to examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/internal/discovery/xpl/BundleDiscoveryStrategy.java index 0c54b6804..3e49025b2 100644 --- a/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/internal/discovery/wizards/xpl/BundleDiscoveryStrategy.java +++ b/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/internal/discovery/xpl/BundleDiscoveryStrategy.java @@ -9,7 +9,7 @@ * Tasktop Technologies - initial API and implementation * Red Hat, Inc. - load other extension points *******************************************************************************/ -package org.jboss.tools.central.internal.discovery.wizards.xpl; +package org.jboss.tools.project.examples.internal.discovery.xpl; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IConfigurationElement; diff --git a/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/internal/discovery/wizards/xpl/DiscoveryRegistryStrategy.java b/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/internal/discovery/xpl/DiscoveryRegistryStrategy.java similarity index 99% rename from central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/internal/discovery/wizards/xpl/DiscoveryRegistryStrategy.java rename to examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/internal/discovery/xpl/DiscoveryRegistryStrategy.java index 50db2a254..b579ee998 100644 --- a/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/internal/discovery/wizards/xpl/DiscoveryRegistryStrategy.java +++ b/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/internal/discovery/xpl/DiscoveryRegistryStrategy.java @@ -8,7 +8,7 @@ * Contributors: * Tasktop Technologies - initial API and implementation *******************************************************************************/ -package org.jboss.tools.central.internal.discovery.wizards.xpl; +package org.jboss.tools.project.examples.internal.discovery.xpl; import java.io.File; import java.io.IOException; diff --git a/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/internal/discovery/wizards/xpl/ExternalBundleDiscoveryStrategy.java b/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/internal/discovery/xpl/ExternalBundleDiscoveryStrategy.java similarity index 99% rename from central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/internal/discovery/wizards/xpl/ExternalBundleDiscoveryStrategy.java rename to examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/internal/discovery/xpl/ExternalBundleDiscoveryStrategy.java index 5406fd8f3..c89765d44 100644 --- a/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/internal/discovery/wizards/xpl/ExternalBundleDiscoveryStrategy.java +++ b/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/internal/discovery/xpl/ExternalBundleDiscoveryStrategy.java @@ -9,7 +9,7 @@ * Tasktop Technologies - initial API and implementation * Red Hat, Inc. - file based remote connectors, non default connector discovery *******************************************************************************/ -package org.jboss.tools.central.internal.discovery.wizards.xpl; +package org.jboss.tools.project.examples.internal.discovery.xpl; import java.io.File; import java.io.FilenameFilter; diff --git a/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/internal/discovery/wizards/xpl/RemoteExternalBundleDiscoveryStrategy.java b/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/internal/discovery/xpl/RemoteExternalBundleDiscoveryStrategy.java similarity index 99% rename from central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/internal/discovery/wizards/xpl/RemoteExternalBundleDiscoveryStrategy.java rename to examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/internal/discovery/xpl/RemoteExternalBundleDiscoveryStrategy.java index 2a29d39dd..53e42638a 100644 --- a/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/internal/discovery/wizards/xpl/RemoteExternalBundleDiscoveryStrategy.java +++ b/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/internal/discovery/xpl/RemoteExternalBundleDiscoveryStrategy.java @@ -9,7 +9,7 @@ * Tasktop Technologies - initial API and implementation * Red Hat - file based remote connectors *******************************************************************************/ -package org.jboss.tools.central.internal.discovery.wizards.xpl; +package org.jboss.tools.project.examples.internal.discovery.xpl; import java.io.File; import java.io.IOException; diff --git a/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/internal/xpl/ExpressionResolutionException.java b/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/internal/xpl/ExpressionResolutionException.java similarity index 94% rename from central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/internal/xpl/ExpressionResolutionException.java rename to examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/internal/xpl/ExpressionResolutionException.java index ec62da415..46c4c79fb 100644 --- a/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/internal/xpl/ExpressionResolutionException.java +++ b/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/internal/xpl/ExpressionResolutionException.java @@ -8,7 +8,7 @@ * Contributors: * JBoss by Red Hat - Initial implementation. ************************************************************************************/ -package org.jboss.tools.central.internal.xpl; +package org.jboss.tools.project.examples.internal.xpl; /** * Thrown to indicate that an attempt has been made to resolve diff --git a/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/internal/xpl/ExpressionResolver.java b/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/internal/xpl/ExpressionResolver.java similarity index 99% rename from central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/internal/xpl/ExpressionResolver.java rename to examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/internal/xpl/ExpressionResolver.java index 05af43a6b..37e9894b7 100644 --- a/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/internal/xpl/ExpressionResolver.java +++ b/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/internal/xpl/ExpressionResolver.java @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.tools.central.internal.xpl; +package org.jboss.tools.project.examples.internal.xpl; import java.io.File; import java.util.Properties; diff --git a/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesRequirementsPage.java b/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesRequirementsPage.java index 5be05a193..37ff966a0 100644 --- a/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesRequirementsPage.java +++ b/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesRequirementsPage.java @@ -67,6 +67,11 @@ import org.eclipse.ui.dialogs.PreferencesUtil; import org.jboss.tools.project.examples.Messages; import org.jboss.tools.project.examples.ProjectExamplesActivator; +import org.jboss.tools.project.examples.internal.discovery.ChainedDiscoveryStrategy; +import org.jboss.tools.project.examples.internal.discovery.DiscoveryUtil; +import org.jboss.tools.project.examples.internal.discovery.ExpressionBasedBundleDiscoveryStrategy; +import org.jboss.tools.project.examples.internal.discovery.ExpressionBasedRemoteBundleDiscoveryStrategy; +import org.jboss.tools.project.examples.internal.discovery.ChainedDiscoveryStrategy.DiscoveryConnectorCollector; import org.jboss.tools.project.examples.model.ProjectExample; import org.jboss.tools.project.examples.model.ProjectFix; import org.jboss.tools.runtime.core.RuntimeCoreActivator; @@ -488,17 +493,8 @@ protected void install(final Set connectorIds) throws InvocationTargetEx final ConnectorDiscovery[] connectorDiscoveries = new ConnectorDiscovery[1]; IRunnableWithProgress runnable = new IRunnableWithProgress() { public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { - connectorDiscoveries[0] = new ConnectorDiscovery(); - - // look for descriptors from installed bundles - connectorDiscoveries[0].getDiscoveryStrategies().add(new BundleDiscoveryStrategy()); - - RemoteBundleDiscoveryStrategy remoteDiscoveryStrategy = new RemoteBundleDiscoveryStrategy(); - remoteDiscoveryStrategy.setDirectoryUrl(ProjectExamplesActivator.getDefault().getConfigurator().getJBossDiscoveryDirectory()); - connectorDiscoveries[0].getDiscoveryStrategies().add(remoteDiscoveryStrategy); - - connectorDiscoveries[0].setEnvironment(ProjectExamplesActivator.getEnvironment()); - connectorDiscoveries[0].setVerifyUpdateSiteAvailability(true); + ConnectorDiscovery connectorDiscovery = DiscoveryUtil.createConnectorDiscovery(); + connectorDiscoveries[0] = connectorDiscovery; results[0] = connectorDiscoveries[0].performDiscovery(monitor); if (monitor.isCanceled()) { results[0] = Status.CANCEL_STATUS; @@ -666,4 +662,5 @@ public void setWizardContext(WizardContext context) { public String getPageType() { return "requirement"; } + }