[92138] Hook up sample JSP gen to Web service test extension.

4 files changed, 7 insertions, 12 deletions

diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/WebServiceExtension.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/WebServiceExtension.java
index 6bbc47674..4332d0a74 100644
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/WebServiceExtension.java
+++ b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/WebServiceExtension.java
@@ -28,7 +28,7 @@ public interface WebServiceExtension
   * @return WebServiceExecutable this interface holds executable code and a 
   * fragment
   */
-  public WebServiceExecutable getWebServiceExecutableExtension();
+  public Object getWebServiceExecutableExtension();
 
   /**
   * This is the config element that holds the extension info
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/WebServiceExtensionImpl.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/WebServiceExtensionImpl.java
index d9c4bbb46..1c16bb483 100644
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/WebServiceExtensionImpl.java
+++ b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/WebServiceExtensionImpl.java
@@ -54,17 +54,12 @@ public class WebServiceExtensionImpl implements WebServiceExtension
   * @return WebServiceExecutable this interface holds executable code and a 
   * fragment
   */
-  public WebServiceExecutable getWebServiceExecutableExtension()
+  public Object getWebServiceExecutableExtension()
   {
     if(webServiceExecutable_ != null) return webServiceExecutable_;
 
     try{
-      Object webServiceExecutable = configElement_.createExecutableExtension("class");
-      
-      if( webServiceExecutable instanceof WebServiceExecutable)
-        return (WebServiceExecutable)webServiceExecutable; 
-      else
-      	log_.log(Log.ERROR, 5028, this, "getWebServiceExecutableExtension", "Incorrect WebServiceTest:" + webServiceExecutable.getClass().getName());      
+      return configElement_.createExecutableExtension("class");
     }catch (CoreException e){
       log_.log(Log.ERROR, 5029, this, "getWebServiceExecutableExtension",e);
     }
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/WebServiceExtensionRegistryImpl.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/WebServiceExtensionRegistryImpl.java
index 7f5cefb64..2f53fd28b 100644
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/WebServiceExtensionRegistryImpl.java
+++ b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/WebServiceExtensionRegistryImpl.java
@@ -66,11 +66,11 @@ public abstract class WebServiceExtensionRegistryImpl implements WebServiceExten
     for(int idx=0; idx<config.length; idx++) 
     {
       IConfigurationElement elem = config[idx];
-      String name = elem.getAttribute( "name" );
+      String label = elem.getAttribute( "label" );
       String id =   elem.getAttribute( "id" );      
       WebServiceExtension webServiceExtension = createWebServiceExtension(elem);	
-      nameExtensionTable_.put(name,webServiceExtension);
-      label_.add(name);
+      nameExtensionTable_.put(label,webServiceExtension);
+      label_.add(label);
       id_.add(id);
     }
   }
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/test/WebServiceTestRegistry.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/test/WebServiceTestRegistry.java
index 2d06466c9..310e3d55c 100644
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/test/WebServiceTestRegistry.java
+++ b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/test/WebServiceTestRegistry.java
@@ -61,7 +61,7 @@ public class WebServiceTestRegistry extends WebServiceExtensionRegistryImpl
     IExtensionRegistry reg = Platform.getExtensionRegistry();
     IConfigurationElement[] config = reg.getConfigurationElementsFor(
                                      "org.eclipse.jst.ws.consumption.ui",
-                                     "webServiceTest");
+                                     "tester");
     return config;    
   }