From fa560a97d75c85cfcbbeae84a4277de493945d21 Mon Sep 17 00:00:00 2001
From: Javier Montalvo Orus <javier.montalvoorus@gmail.com>
Date: Fri, 8 Sep 2006 14:27:50 +0000
Subject: [PATCH] Updated RSE plugin references
---
discovery/org.eclipse.rse.discovery/.cvsignore | 1 +
discovery/org.eclipse.rse.discovery/plugin.xml | 4 +---
.../src/org/eclipse/rse/discovery/ServiceDiscoveryWizard.java | 4 ++--
.../eclipse/rse/discovery/ServiceDiscoveryWizardDelegate.java | 2 +-
discovery/org.eclipse.tm.discovery.wizard/.cvsignore | 1 +
.../discovery/wizard/ServiceDiscoveryWizardDisplayPage.java | 2 +-
6 files changed, 7 insertions(+), 7 deletions(-)
create mode 100644 discovery/org.eclipse.rse.discovery/.cvsignore
create mode 100644 discovery/org.eclipse.tm.discovery.wizard/.cvsignore
diff --git a/discovery/org.eclipse.rse.discovery/.cvsignore b/discovery/org.eclipse.rse.discovery/.cvsignore
new file mode 100644
index 00000000000..ba077a4031a
--- /dev/null
+++ b/discovery/org.eclipse.rse.discovery/.cvsignore
@@ -0,0 +1 @@
+bin
diff --git a/discovery/org.eclipse.rse.discovery/plugin.xml b/discovery/org.eclipse.rse.discovery/plugin.xml
index 4eaffc35a4e..c49abbc48c5 100644
--- a/discovery/org.eclipse.rse.discovery/plugin.xml
+++ b/discovery/org.eclipse.rse.discovery/plugin.xml
@@ -14,9 +14,7 @@ Contributors:
<plugin>
<extension
- id="a"
- name="as"
- point="org.eclipse.rse.ui.newConnectionWizardDelegate">
+ point="org.eclipse.rse.ui.newConnectionWizardDelegates">
<newConnectionWizardDelegate
class="org.eclipse.rse.discovery.ServiceDiscoveryWizardDelegate"
systemType="org.eclipse.rse.systemtype.discovery"/>
diff --git a/discovery/org.eclipse.rse.discovery/src/org/eclipse/rse/discovery/ServiceDiscoveryWizard.java b/discovery/org.eclipse.rse.discovery/src/org/eclipse/rse/discovery/ServiceDiscoveryWizard.java
index 78a20cb0879..f238aedccf7 100644
--- a/discovery/org.eclipse.rse.discovery/src/org/eclipse/rse/discovery/ServiceDiscoveryWizard.java
+++ b/discovery/org.eclipse.rse.discovery/src/org/eclipse/rse/discovery/ServiceDiscoveryWizard.java
@@ -20,8 +20,8 @@ import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.jface.wizard.IWizardPage;
import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.rse.model.IHost;
-import org.eclipse.rse.model.IPropertySet;
+import org.eclipse.rse.core.model.IHost;
+import org.eclipse.rse.core.model.IPropertySet;
import org.eclipse.rse.ui.RSEUIPlugin;
import org.eclipse.tm.discovery.model.Pair;
import org.eclipse.tm.discovery.model.Service;
diff --git a/discovery/org.eclipse.rse.discovery/src/org/eclipse/rse/discovery/ServiceDiscoveryWizardDelegate.java b/discovery/org.eclipse.rse.discovery/src/org/eclipse/rse/discovery/ServiceDiscoveryWizardDelegate.java
index 516d66ff52c..59502c1e112 100644
--- a/discovery/org.eclipse.rse.discovery/src/org/eclipse/rse/discovery/ServiceDiscoveryWizardDelegate.java
+++ b/discovery/org.eclipse.rse.discovery/src/org/eclipse/rse/discovery/ServiceDiscoveryWizardDelegate.java
@@ -12,7 +12,7 @@ package org.eclipse.rse.discovery;
import org.eclipse.jface.wizard.IWizardPage;
import org.eclipse.rse.core.IRSESystemType;
-import org.eclipse.rse.model.IHost;
+import org.eclipse.rse.core.model.IHost;
import org.eclipse.rse.ui.wizards.RSENewConnectionWizard;
import org.eclipse.rse.ui.wizards.RSENewConnectionWizardDelegate;
diff --git a/discovery/org.eclipse.tm.discovery.wizard/.cvsignore b/discovery/org.eclipse.tm.discovery.wizard/.cvsignore
new file mode 100644
index 00000000000..ba077a4031a
--- /dev/null
+++ b/discovery/org.eclipse.tm.discovery.wizard/.cvsignore
@@ -0,0 +1 @@
+bin
diff --git a/discovery/org.eclipse.tm.discovery.wizard/src/org/eclipse/tm/discovery/wizard/ServiceDiscoveryWizardDisplayPage.java b/discovery/org.eclipse.tm.discovery.wizard/src/org/eclipse/tm/discovery/wizard/ServiceDiscoveryWizardDisplayPage.java
index 64db196d371..51048789e6a 100644
--- a/discovery/org.eclipse.tm.discovery.wizard/src/org/eclipse/tm/discovery/wizard/ServiceDiscoveryWizardDisplayPage.java
+++ b/discovery/org.eclipse.tm.discovery.wizard/src/org/eclipse/tm/discovery/wizard/ServiceDiscoveryWizardDisplayPage.java
@@ -135,7 +135,7 @@ public class ServiceDiscoveryWizardDisplayPage extends WizardPage {
//load all service id's from the extension point registry
//this id will be used to filter the supported services in the view
- IExtensionPoint ep = Platform.getExtensionRegistry().getExtensionPoint("org.eclipse.rse.ui","subsystemConfiguration"); //$NON-NLS-1$ //$NON-NLS-2$
+ IExtensionPoint ep = Platform.getExtensionRegistry().getExtensionPoint("org.eclipse.rse.ui","subsystemConfigurations"); //$NON-NLS-1$ //$NON-NLS-2$
IConfigurationElement[] ce = ep.getConfigurationElements();
for (int i = 0; i < ce.length; i++) {
String id = ce[i].getAttribute("id"); //$NON-NLS-1$