Interface and type are separate

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@894366 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/catalina/deploy/ContextService.java b/java/org/apache/catalina/deploy/ContextService.java
index 90c5efe..d451a70 100644 (file)
--- a/java/org/apache/catalina/deploy/ContextService.java
+++ b/java/org/apache/catalina/deploy/ContextService.java
@@ -77,6 +77,20 @@ public class ContextService extends ResourceBase {
     }
 
     /**
+     * The fully qualified class name of the JAX-WS Service interface that the
+     * client depends on.
+     */
+    private String serviceInterface = null;
+    
+    public String getInterface() {
+        return serviceInterface;
+    }
+    
+    public void setInterface(String serviceInterface) {
+        this.serviceInterface = serviceInterface;
+    }
+
+    /**
      * Contains the location (relative to the root of
      * the module) of the web service WSDL description.
      */

diff --git a/java/org/apache/catalina/startup/WebRuleSet.java b/java/org/apache/catalina/startup/WebRuleSet.java
index 07a3b6e..ae44c48 100644 (file)
--- a/java/org/apache/catalina/startup/WebRuleSet.java
+++ b/java/org/apache/catalina/startup/WebRuleSet.java
@@ -568,6 +568,8 @@ public class WebRuleSet extends RuleSetBase {
         digester.addCallMethod(fullPrefix + "/service-ref/service-ref-name",
                                "setName", 0);
         digester.addCallMethod(fullPrefix + "/service-ref/service-interface",
+                               "setInterface", 0);
+        digester.addCallMethod(fullPrefix + "/service-ref/service-ref-type",
                                "setType", 0);
         digester.addCallMethod(fullPrefix + "/service-ref/wsdl-file",
                                "setWsdlfile", 0);