[jboss-cvs] JBossAS SVN: r95028 - projects/metadata/web/trunk/src/main/java/org/jboss/metadata/annotation/creator/web.

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

Author: remy.maucherat at jboss.com
Date: 2009-10-16 08:01:51 -0400 (Fri, 16 Oct 2009)
New Revision: 95028

Modified:
   projects/metadata/web/trunk/src/main/java/org/jboss/metadata/annotation/creator/web/WebFilterProcessor.java
   projects/metadata/web/trunk/src/main/java/org/jboss/metadata/annotation/creator/web/WebServletProcessor.java
Log:
- Fix class names and missing value handling.

Modified: projects/metadata/web/trunk/src/main/java/org/jboss/metadata/annotation/creator/web/WebFilterProcessor.java
===================================================================
--- projects/metadata/web/trunk/src/main/java/org/jboss/metadata/annotation/creator/web/WebFilterProcessor.java	2009-10-16 11:03:04 UTC (rev 95027)
+++ projects/metadata/web/trunk/src/main/java/org/jboss/metadata/annotation/creator/web/WebFilterProcessor.java	2009-10-16 12:01:51 UTC (rev 95028)
@@ -67,6 +67,7 @@
       WebMetaData metaData = new WebMetaData();
       FiltersMetaData filters = new FiltersMetaData();
       FilterMetaData filter = new FilterMetaData();
+      filter.setFilterClass(element.getName());
       if (webFilter.filterName().length() == 0)
          filter.setName(element.getName());
       else
@@ -87,17 +88,27 @@
       // TODO: description group ?
       filters.add(filter);
       metaData.setFilters(filters);
-      if (webFilter.urlPatterns() != null || webFilter.servletNames() != null)
+      if (webFilter.urlPatterns() != null || webFilter.value() != null || webFilter.servletNames() != null)
       {
          List<FilterMappingMetaData> filterMappings = new ArrayList<FilterMappingMetaData>();
          FilterMappingMetaData filterMapping = new FilterMappingMetaData();
-         if (webFilter.urlPatterns() != null)
+         if (webFilter.urlPatterns() != null || webFilter.value() != null)
          {
             List<String> urlPatterns = new ArrayList<String>();
-            for (String urlPattern : webFilter.urlPatterns())
+            if (webFilter.urlPatterns() != null)
             {
-               urlPatterns.add(urlPattern);
+               for (String urlPattern : webFilter.urlPatterns())
+               {
+                  urlPatterns.add(urlPattern);
+               }
             }
+            if (webFilter.value() != null)
+            {
+               for (String urlPattern : webFilter.value())
+               {
+                  urlPatterns.add(urlPattern);
+               }
+            }
             filterMapping.setUrlPatterns(urlPatterns);
          }
          if (webFilter.servletNames() != null)

Modified: projects/metadata/web/trunk/src/main/java/org/jboss/metadata/annotation/creator/web/WebServletProcessor.java
===================================================================
--- projects/metadata/web/trunk/src/main/java/org/jboss/metadata/annotation/creator/web/WebServletProcessor.java	2009-10-16 11:03:04 UTC (rev 95027)
+++ projects/metadata/web/trunk/src/main/java/org/jboss/metadata/annotation/creator/web/WebServletProcessor.java	2009-10-16 12:01:51 UTC (rev 95028)
@@ -66,6 +66,7 @@
       WebMetaData metaData = new WebMetaData();
       ServletsMetaData servlets = new ServletsMetaData();
       ServletMetaData servlet = new ServletMetaData();
+      servlet.setServletClass(element.getName());
       if (webServlet.name().length() == 0)
          servlet.setName(element.getName());
       else
@@ -88,16 +89,26 @@
       // TODO: description group ?
       servlets.add(servlet);
       metaData.setServlets(servlets);
-      if (webServlet.urlPatterns() != null)
+      if (webServlet.urlPatterns() != null || webServlet.value() != null)
       {
          List<ServletMappingMetaData> servletMappings = new ArrayList<ServletMappingMetaData>();
          ServletMappingMetaData servletMapping = new ServletMappingMetaData();
          servletMapping.setServletName(webServlet.name());
          List<String> urlPatterns = new ArrayList<String>();
-         for (String urlPattern : webServlet.urlPatterns())
+         if (webServlet.urlPatterns() != null)
          {
-            urlPatterns.add(urlPattern);
+            for (String urlPattern : webServlet.urlPatterns())
+            {
+               urlPatterns.add(urlPattern);
+            }
          }
+         if (webServlet.value() != null)
+         {
+            for (String urlPattern : webServlet.value())
+            {
+               urlPatterns.add(urlPattern);
+            }
+         }
          servletMapping.setUrlPatterns(urlPatterns);
          servletMappings.add(servletMapping);
          metaData.setServletMappings(servletMappings);