[jboss-cvs] JBossAS SVN: r96243 - projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec.

[jboss-cvs-commits at lists.jboss.org]

Author: remy.maucherat at jboss.com
Date: 2009-11-10 22:34:04 -0500 (Tue, 10 Nov 2009)
New Revision: 96243

Modified:
   projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/FilterMappingMetaData.java
   projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/ServletMappingMetaData.java
Log:
- Hack to add support for the <url-pattern>""</url-pattern> special element without using a custom object
  (which would be harder than a String to work with).

Modified: projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/FilterMappingMetaData.java
===================================================================
--- projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/FilterMappingMetaData.java	2009-11-11 00:36:35 UTC (rev 96242)
+++ projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/FilterMappingMetaData.java	2009-11-11 03:34:04 UTC (rev 96243)
@@ -67,6 +67,15 @@
    }
    public List<String> getUrlPatterns()
    {
+      // Resolve special "" mapping as the empty String
+      if (urlPatterns != null)
+         for (int i = 0; i < urlPatterns.size(); i++)
+         {
+            if ("\"\"".equals(urlPatterns.get(i)))
+            {
+               urlPatterns.set(i, "");
+            }
+         }
       return urlPatterns;
    }
    @XmlElement(name="url-pattern")
@@ -74,6 +83,7 @@
    {
       this.urlPatterns = urlPatterns;
    }
+
    public List<DispatcherType> getDispatchers()
    {
       return dispatchers;

Modified: projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/ServletMappingMetaData.java
===================================================================
--- projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/ServletMappingMetaData.java	2009-11-11 00:36:35 UTC (rev 96242)
+++ projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/ServletMappingMetaData.java	2009-11-11 03:34:04 UTC (rev 96243)
@@ -55,6 +55,15 @@
 
    public List<String> getUrlPatterns()
    {
+      // Resolve special "" mapping as the empty String
+      if (urlPatterns != null)
+         for (int i = 0; i < urlPatterns.size(); i++)
+         {
+            if ("\"\"".equals(urlPatterns.get(i)))
+            {
+               urlPatterns.set(i, "");
+            }
+         }
       return urlPatterns;
    }
    @XmlElement(name="url-pattern")