[jboss-cvs] JBossAS SVN: r95029 - 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:14:47 -0400 (Fri, 16 Oct 2009)
New Revision: 95029

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:
- Actually test the changes ...

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 12:01:51 UTC (rev 95028)
+++ projects/metadata/web/trunk/src/main/java/org/jboss/metadata/annotation/creator/web/WebFilterProcessor.java	2009-10-16 12:14:47 UTC (rev 95029)
@@ -68,10 +68,12 @@
       FiltersMetaData filters = new FiltersMetaData();
       FilterMetaData filter = new FilterMetaData();
       filter.setFilterClass(element.getName());
+      String filterName = null;
       if (webFilter.filterName().length() == 0)
-         filter.setName(element.getName());
+         filterName = element.getName();
       else
-         filter.setName(webFilter.filterName());
+         filterName = webFilter.filterName();
+      filter.setFilterName(filterName);
       filter.setAsyncSupported(webFilter.asyncSupported());
       if (webFilter.initParams() != null)
       {
@@ -92,6 +94,7 @@
       {
          List<FilterMappingMetaData> filterMappings = new ArrayList<FilterMappingMetaData>();
          FilterMappingMetaData filterMapping = new FilterMappingMetaData();
+         filterMapping.setFilterName(filterName);
          if (webFilter.urlPatterns() != null || webFilter.value() != null)
          {
             List<String> urlPatterns = new ArrayList<String>();

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 12:01:51 UTC (rev 95028)
+++ projects/metadata/web/trunk/src/main/java/org/jboss/metadata/annotation/creator/web/WebServletProcessor.java	2009-10-16 12:14:47 UTC (rev 95029)
@@ -67,10 +67,12 @@
       ServletsMetaData servlets = new ServletsMetaData();
       ServletMetaData servlet = new ServletMetaData();
       servlet.setServletClass(element.getName());
+      String servletName = null;
       if (webServlet.name().length() == 0)
-         servlet.setName(element.getName());
+         servletName = element.getName();
       else
-         servlet.setName(webServlet.name());
+         servletName = webServlet.name();
+      servlet.setServletName(servletName);
       if (webServlet.loadOnStartup() > 0)
          servlet.setLoadOnStartup(webServlet.loadOnStartup());
       servlet.setAsyncSupported(webServlet.asyncSupported());
@@ -93,7 +95,7 @@
       {
          List<ServletMappingMetaData> servletMappings = new ArrayList<ServletMappingMetaData>();
          ServletMappingMetaData servletMapping = new ServletMappingMetaData();
-         servletMapping.setServletName(webServlet.name());
+         servletMapping.setServletName(servletName);
          List<String> urlPatterns = new ArrayList<String>();
          if (webServlet.urlPatterns() != null)
          {