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

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

Author: scott.stark at jboss.org
Date: 2007-10-11 20:56:27 -0400 (Thu, 11 Oct 2007)
New Revision: 66064

Removed:
   projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/FilterMappingsMetaData.java
Modified:
   projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/FilterMappingMetaData.java
   projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/WebMetaData.java
Log:
Change the filter-mapping from a map to a list

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/FilterMappingMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/FilterMappingMetaData.java	2007-10-12 00:53:28 UTC (rev 66063)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/FilterMappingMetaData.java	2007-10-12 00:56:27 UTC (rev 66064)
@@ -26,26 +26,29 @@
 
 import javax.xml.bind.annotation.XmlElement;
 
-import org.jboss.metadata.javaee.support.NamedMetaData;
+import org.jboss.metadata.javaee.support.IdMetaDataImpl;
 
 /**
+ * web-app/filter-mapping metadata
+ * 
  * @author Scott.Stark at jboss.org
  * @version $Revision$
  */
-public class FilterMappingMetaData extends NamedMetaData
+public class FilterMappingMetaData extends IdMetaDataImpl
 {
    private static final long serialVersionUID = 1;
-   protected List<String> urlPatterns;
-   protected List<String> servletNames;
-   protected List<DispatcherType> dispatchers;
+   private String filterName;
+   private List<String> urlPatterns;
+   private List<String> servletNames;
+   private List<DispatcherType> dispatchers;
 
    public String getFilterName()
    {
-      return getName();
+      return filterName;
    }
-   public void setFilterName(String name)
+   public void setFilterName(String filterName)
    {
-      super.setName(name);
+      this.filterName = filterName;
    }
 
    public List<String> getServletNames()

Deleted: projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/FilterMappingsMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/FilterMappingsMetaData.java	2007-10-12 00:53:28 UTC (rev 66063)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/FilterMappingsMetaData.java	2007-10-12 00:56:27 UTC (rev 66064)
@@ -1,37 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2007, Red Hat Middleware LLC, and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.metadata.web.spec;
-
-import org.jboss.metadata.javaee.support.AbstractMappedMetaData;
-
-/**
- * @author Scott.Stark at jboss.org
- * @version $Revision$
- */
-public class FilterMappingsMetaData extends AbstractMappedMetaData<FilterMappingMetaData>
-{
-   private static final long serialVersionUID = 1;
-   public FilterMappingsMetaData()
-   {
-      super("web app filter mappings");
-   }
-}

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/WebMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/WebMetaData.java	2007-10-12 00:53:28 UTC (rev 66063)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/WebMetaData.java	2007-10-12 00:56:27 UTC (rev 66064)
@@ -73,7 +73,7 @@
    private List<ParamValueMetaData> contextParams;
    private SessionConfigMetaData sessionConfig;
    private FiltersMetaData filters;
-   private FilterMappingsMetaData filterMappings;
+   private List<FilterMappingMetaData> filterMappings;
    private List<ErrorPageMetaData> errorPages;
    private List<JspConfigMetaData> jspConfig;
    private List<ListenerMetaData> listeners;
@@ -189,12 +189,12 @@
       this.filters = filters;
    }
 
-   public FilterMappingsMetaData getFilterMappings()
+   public List<FilterMappingMetaData> getFilterMappings()
    {
       return filterMappings;
    }
    @XmlElement(name="filter-mapping")
-   public void setFilterMappings(FilterMappingsMetaData filterMappings)
+   public void setFilterMappings(List<FilterMappingMetaData> filterMappings)
    {
       this.filterMappings = filterMappings;
    }