Author: markt
Date: Fri Sep 11 10:47:11 2009
New Revision: 813771
URL: http://svn.apache.org/viewvc?rev=813771&view=rev
Log:
Fix some niggles with icons in web.xml processing. Nothing that will cause a
problem, just errors spotted whilst preparing for Servlet 3.0 fragment
proceessing
Modified:
tomcat/trunk/java/org/apache/catalina/deploy/ContextService.java
tomcat/trunk/java/org/apache/catalina/startup/WebRuleSet.java
Modified: tomcat/trunk/java/org/apache/catalina/deploy/ContextService.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/deploy/ContextService.java?rev=813771&r1=813770&r2=813771&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/deploy/ContextService.java (original)
+++ tomcat/trunk/java/org/apache/catalina/deploy/ContextService.java Fri Sep 11
10:47:11 2009
@@ -51,16 +51,29 @@
}
/**
- * 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 @@
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=");
Modified: tomcat/trunk/java/org/apache/catalina/startup/WebRuleSet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/WebRuleSet.java?rev=813771&r1=813770&r2=813771&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/WebRuleSet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/WebRuleSet.java Fri Sep 11
10:47:11 2009
@@ -167,9 +167,9 @@
"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 @@
"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",
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
