[85724] many objectclass errors in WS due to renames
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/plugin.properties b/bundles/org.eclipse.jst.ws.consumption.ui/plugin.properties
index 4e11141..066d4ec 100644
--- a/bundles/org.eclipse.jst.ws.consumption.ui/plugin.properties
+++ b/bundles/org.eclipse.jst.ws.consumption.ui/plugin.properties
@@ -15,6 +15,14 @@
PLUGIN_NAME=Web Services Consumption Graphical User Interface
PLUGIN_PROVIDER=Eclipse.org
+XP_PUBLIC_UDDI_REGISTRY_TYPES=Public UDDI Registry Types
+XP_PRIVATE_UDDI_REGISTRY_TYPES=Private UDDI Registry Types
+XP_WEB_SERVICE_CLIENT_TYPES=Web Service Client Types
+XP_WEB_SERVICE_TEST=Web Service Test
+XP_WEB_SERVICE_SERVER_RUNTIME_TYPES=Web Service Server Runtime Types
+XP_WEB_SERVICE_CLIENT_PROJECT_TYPE=clientProjectType
+XP_OBJECT_SELECTION_WIDGET=objectSelectionWidget
+
#
# Wizards.
#
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/plugin.xml b/bundles/org.eclipse.jst.ws.consumption.ui/plugin.xml
index e4eed9b..afb7f9f 100644
--- a/bundles/org.eclipse.jst.ws.consumption.ui/plugin.xml
+++ b/bundles/org.eclipse.jst.ws.consumption.ui/plugin.xml
@@ -63,35 +63,35 @@
<extension-point
id="publicUDDIRegistryType"
- name="Public UDDI Registry Types"/>
+ name="%XP_PUBLIC_UDDI_REGISTRY_TYPES"/>
<extension-point
id="privateUDDIRegistryType"
- name="Private UDDI Registry Types"/>
+ name="%XP_PRIVATE_UDDI_REGISTRY_TYPES"/>
<extension-point
id="webServiceClientType"
- name="Web Service Client Types"
+ name="%XP_WEB_SERVICE_CLIENT_TYPES"
schema="schema/webServiceClientType.exsd"/>
<extension-point
id="webServiceTest"
- name="Web Service Test"
+ name="%XP_WEB_SERVICE_TEST"
schema="schema/webServiceTest.exsd"/>
<extension-point
id="webServiceServerRuntimeType"
- name="Web Service Server Runtime Types"
+ name="%XP_WEB_SERVICE_SERVER_RUNTIME_TYPES"
schema="schema/webServiceServerRuntimeType.exsd"/>
<extension-point
id="clientProjectType"
- name="clientProjectType"
+ name="%XP_WEB_SERVICE_CLIENT_PROJECT_TYPE"
schema="schema/clientProjectType.exsd"/>
<extension-point
id="objectSelectionWidget"
- name="objectSelectionWidget"
+ name="%XP_OBJECT_SELECTION_WIDGET"
schema="schema/objectSelectionWidget.exsd"/>
@@ -550,7 +550,7 @@
</objectContribution>
<objectContribution
- objectClass="org.eclipse.jst.internal.webservice.WebServiceNavigatorGroupType"
+ objectClass="org.eclipse.jst.j2ee.internal.webservice.WebServiceNavigatorGroupType"
id="org.eclipse.jst.ws.internal.consumption.ui.wizard.handlers.editor">
<action
label="%POPUP_ADD_HANDLERS"
diff --git a/bundles/org.eclipse.jst.ws.consumption/plugin.properties b/bundles/org.eclipse.jst.ws.consumption/plugin.properties
index 603482d..f484e26 100644
--- a/bundles/org.eclipse.jst.ws.consumption/plugin.properties
+++ b/bundles/org.eclipse.jst.ws.consumption/plugin.properties
@@ -14,3 +14,6 @@
#
PLUGIN_NAME=Web Services Consumption
PLUGIN_PROVIDER=Eclipse.org
+XP_WSFINDER=org.eclipse.jst.ws.internal.consumption.wsfinder
+XP_WEB_SERVICE_START_SERVER_TYPE=WebServiceStartServerType
+XP_SERVER_DEFAULTER=Server Defaulter
diff --git a/bundles/org.eclipse.jst.ws.consumption/plugin.xml b/bundles/org.eclipse.jst.ws.consumption/plugin.xml
index 487fd8c..96acff3 100644
--- a/bundles/org.eclipse.jst.ws.consumption/plugin.xml
+++ b/bundles/org.eclipse.jst.ws.consumption/plugin.xml
@@ -52,16 +52,16 @@
<extension-point
id="wsfinder"
- name="org.eclipse.jst.ws.internal.consumption.wsfinder"/>
+ name="%XP_WSFINDER"/>
<!-- The following extension point will be removed. -->
<extension-point
id="webServiceStartServerType"
- name="WebServiceStartServerType"/>
+ name="%XP_WEB_SERVICE_START_SERVER_TYPE"/>
<extension-point
id="serverDefaulter"
- name="Server Defaulter"/>
+ name="%XP_SERVER_DEFAULTER"/>
<extension
point="org.eclipse.jst.ws.consumption.webServiceStartServerType">
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/plugin.xml b/bundles/org.eclipse.jst.ws.creation.ui/plugin.xml
index 62ddc4b..c433168 100644
--- a/bundles/org.eclipse.jst.ws.creation.ui/plugin.xml
+++ b/bundles/org.eclipse.jst.ws.creation.ui/plugin.xml
@@ -34,6 +34,7 @@
<import plugin="org.eclipse.jst.j2ee"/>
<import plugin="org.eclipse.jst.j2ee.core"/>
<import plugin="org.eclipse.jst.j2ee.ejb"/>
+ <import plugin="org.eclipse.wst.wsdl"/>
</requires>
<!-- Wizards -->
@@ -196,7 +197,7 @@
</objectContribution>
<objectContribution
- objectClass="org.eclipse.jst.ws.wsclient.ServiceRef"
+ objectClass="org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef"
nameFilter="*"
id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard.skeleton">
<action
@@ -208,7 +209,7 @@
</objectContribution>
<objectContribution
- objectClass="org.eclipse.jst.ws.wsdd.ServiceImplBean"
+ objectClass="org.eclipse.jst.j2ee.webservice.wsdd.ServiceImplBean"
nameFilter="*"
id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard.java">
<action
@@ -220,7 +221,7 @@
</objectContribution>
<objectContribution
- objectClass="org.eclipse.jst.ws.wsdd.BeanLink"
+ objectClass="org.eclipse.jst.j2ee.webservice.wsdd.BeanLink"
nameFilter="*"
id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard.java">
<action
diff --git a/bundles/org.eclipse.jst.ws.uddiregistry/plugin.properties b/bundles/org.eclipse.jst.ws.uddiregistry/plugin.properties
index 644bff8..d8cfbff 100644
--- a/bundles/org.eclipse.jst.ws.uddiregistry/plugin.properties
+++ b/bundles/org.eclipse.jst.ws.uddiregistry/plugin.properties
@@ -16,3 +16,5 @@
PLUGIN_PROVIDER=Eclipse.org
PLUGIN_NEW_WIZARD_NAME_WS_UNIT_TEST_UDDI=Unit Test UDDI
+
+XP_PRIVATE_UDDI_REGISTRY_TYPES=Private UDDI Registry Types
diff --git a/bundles/org.eclipse.jst.ws.uddiregistry/plugin.xml b/bundles/org.eclipse.jst.ws.uddiregistry/plugin.xml
index fb3b51b..814e50b 100644
--- a/bundles/org.eclipse.jst.ws.uddiregistry/plugin.xml
+++ b/bundles/org.eclipse.jst.ws.uddiregistry/plugin.xml
@@ -35,7 +35,7 @@
</requires>
- <extension-point id="privateUDDIRegistryType" name="Private UDDI Registry Types"/>
+ <extension-point id="privateUDDIRegistryType" name="%XP_PRIVATE_UDDI_REGISTRY_TYPES"/>
<extension
point="org.eclipse.jst.ws.consumption.ui.privateUDDIRegistryType">
diff --git a/bundles/org.eclipse.jst.ws.ui/plugin.xml b/bundles/org.eclipse.jst.ws.ui/plugin.xml
index a6203d2..7a49a36 100644
--- a/bundles/org.eclipse.jst.ws.ui/plugin.xml
+++ b/bundles/org.eclipse.jst.ws.ui/plugin.xml
@@ -82,7 +82,7 @@
</page>
<page
- objectClass="org.eclipse.core.resources.IJavaProject"
+ objectClass="org.eclipse.jdt.core.IJavaProject"
adaptable="true"
name="%PREFERENCE_CATEGORY_WSI"
class="org.eclipse.jst.ws.internal.ui.wsi.properties.WSICompliancePropertyPage"
@@ -112,6 +112,7 @@
</menu>
</objectContribution>
+<!--
<objectContribution
objectClass="org.eclipse.jst.j2ee.ejb.EnterpriseBean"
adaptable="true"
@@ -125,6 +126,7 @@
</separator>
</menu>
</objectContribution>
+-->
</extension>
