Fix some niggles with icons in web.xml processing. Nothing that will cause a problem...

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

diff --git a/java/org/apache/catalina/deploy/ContextService.java b/java/org/apache/catalina/deploy/ContextService.java
index b0849fc..e73a2c6 100644 (file)
--- a/java/org/apache/catalina/deploy/ContextService.java
+++ b/java/org/apache/catalina/deploy/ContextService.java
@@ -51,16 +51,29 @@ public class ContextService extends ResourceBase implements Serializable {
     }
 
     /**
-     * An icon for this WebService.
+     * A large icon for this WebService.
      */
-    private String icon = null;
+    private String largeIcon = null;
 
-    public String getIcon() {
-        return (this.icon);
+    public String getLargeIcon() {
+        return (this.largeIcon);
     }
 
-    public void setIcon(String icon) {
-        this.icon = icon;
+    public void setLargeIcon(String largeIcon) {
+        this.largeIcon = largeIcon;
+    }
+
+    /**
+     * A small icon for this WebService.
+     */
+    private String smallIcon = null;
+
+    public String getSmallIcon() {
+        return (this.smallIcon);
+    }
+
+    public void setSmallIcon(String smallIcon) {
+        this.smallIcon = smallIcon;
     }
 
     /**
@@ -200,9 +213,13 @@ public class ContextService extends ResourceBase implements Serializable {
             sb.append(", displayname=");
             sb.append(displayname);
         }
-        if (icon != null) {
-            sb.append(", icon=");
-            sb.append(icon);
+        if (largeIcon != null) {
+            sb.append(", largeIcon=");
+            sb.append(largeIcon);
+        }
+        if (smallIcon != null) {
+            sb.append(", smallIcon=");
+            sb.append(smallIcon);
         }
         if (wsdlfile != null) {
             sb.append(", wsdl-file=");

diff --git a/java/org/apache/catalina/startup/WebRuleSet.java b/java/org/apache/catalina/startup/WebRuleSet.java
index b4b9457..541a2df 100644 (file)
--- a/java/org/apache/catalina/startup/WebRuleSet.java
+++ b/java/org/apache/catalina/startup/WebRuleSet.java
@@ -167,9 +167,9 @@ public class WebRuleSet extends RuleSetBase {
                                "setFilterClass", 0);
         digester.addCallMethod(prefix + "web-app/filter/filter-name",
                                "setFilterName", 0);
-        digester.addCallMethod(prefix + "web-app/filter/large-icon",
+        digester.addCallMethod(prefix + "web-app/filter/icon/large-icon",
                                "setLargeIcon", 0);
-        digester.addCallMethod(prefix + "web-app/filter/small-icon",
+        digester.addCallMethod(prefix + "web-app/filter/icon/small-icon",
                                "setSmallIcon", 0);
         
         //spec right now only has an annotation, not XML but we will add it
@@ -471,8 +471,10 @@ public class WebRuleSet extends RuleSetBase {
                                "setDescription", 0);
         digester.addCallMethod(prefix + "web-app/service-ref/display-name",
                                "setDisplayname", 0);
-        digester.addCallMethod(prefix + "web-app/service-ref/icon",
-                               "setIcon", 0);
+        digester.addCallMethod(prefix + "web-app/service-ref/icon/large-icon",
+                               "setLargeIcon", 0);
+        digester.addCallMethod(prefix + "web-app/service-ref/icon/small-icon",
+                               "setSmallIcon", 0);
         digester.addCallMethod(prefix + "web-app/service-ref/service-ref-name",
                                "setName", 0);
         digester.addCallMethod(prefix + "web-app/service-ref/service-interface",