[jboss-cvs] JBossAS SVN: r66059 - in projects/metadata/trunk/src/main/java/org/jboss/metadata/web: spec and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Oct 11 20:10:38 EDT 2007
Author: scott.stark at jboss.org
Date: 2007-10-11 20:10:37 -0400 (Thu, 11 Oct 2007)
New Revision: 66059
Removed:
projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/ServletMappingsMetaData.java
Modified:
projects/metadata/trunk/src/main/java/org/jboss/metadata/web/jboss/JBossWebMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/FilterMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/ListenerMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/MimeMappingMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/ServletMappingMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/ServletMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/TaglibMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/WebMetaData.java
Log:
Change the servlet-mapping from a map to a list
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/web/jboss/JBossWebMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/web/jboss/JBossWebMetaData.java 2007-10-12 00:09:56 UTC (rev 66058)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/web/jboss/JBossWebMetaData.java 2007-10-12 00:10:37 UTC (rev 66059)
@@ -21,6 +21,7 @@
*/
package org.jboss.metadata.web.jboss;
+import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
@@ -60,7 +61,7 @@
import org.jboss.metadata.javaee.support.AbstractMappedMetaData;
import org.jboss.metadata.javaee.support.IdMetaDataImplWithOverride;
import org.jboss.metadata.web.spec.SecurityConstraintMetaData;
-import org.jboss.metadata.web.spec.ServletMappingsMetaData;
+import org.jboss.metadata.web.spec.ServletMappingMetaData;
import org.jboss.metadata.web.spec.ServletMetaData;
import org.jboss.metadata.web.spec.ServletsMetaData;
import org.jboss.metadata.web.spec.WebMetaData;
@@ -80,14 +81,14 @@
private boolean java2ClassLoadingCompliance;
/** The loader repository */
private LoaderRepositoryMetaData loaderRepository;
- private ServletsMetaData servlets;
+ private ServletsMetaData servlets = new ServletsMetaData();
/** A list of extra dependencies to wait on */
private List<String> depends;
/** */
private Map<String, SecurityRoleMetaData> runAsIdentity = new HashMap<String, SecurityRoleMetaData>();
- private SecurityRolesMetaData securityRoles;
+ private SecurityRolesMetaData securityRoles = new SecurityRolesMetaData();
/** The message destinations */
- private MessageDestinationsMetaData messageDestinations;
+ private MessageDestinationsMetaData messageDestinations = new MessageDestinationsMetaData();
/** The environment */
private JBossEnvironmentRefsGroupMetaData jndiEnvironmentRefsGroup;
/** The merged environment */
@@ -97,7 +98,7 @@
private boolean useSessionCookies;
private ReplicationConfig replicationConfig;
private PassivationConfig passivationConfig;
- private WebserviceDescriptionsMetaData webserviceDescriptions;
+ private WebserviceDescriptionsMetaData webserviceDescriptions = new WebserviceDescriptionsMetaData();
/** The optional JBossWS config-name */
private String configName;
/** The optional JBossWS config-file */
@@ -505,13 +506,21 @@
@XmlTransient
public ServletsMetaData getMergedServlets()
{
- return this.getOverridenMetaData().getServlets();
+ WebMetaData wmd = getOverridenMetaData();
+ ServletsMetaData smd = wmd.getServlets();
+ if(smd == null)
+ smd = new ServletsMetaData();
+ return smd;
}
-
+
@XmlTransient
- public ServletMappingsMetaData getServletMappings()
+ public List<ServletMappingMetaData> getServletMappings()
{
- return this.getOverridenMetaData().getServletMappings();
+ WebMetaData wmd = getOverridenMetaData();
+ List<ServletMappingMetaData> smd = wmd.getServletMappings();
+ if(smd == null)
+ smd = Collections.emptyList();
+ return smd;
}
@XmlTransient
@@ -681,19 +690,23 @@
SecurityRoleMetaData srmd = runAsIdentity.get(servletName);
if (srmd == null)
{
- ServletMetaData servlet = getOverridenMetaData().getServlets().get(servletName);
- if (servlet == null)
+ ServletsMetaData servlets = getMergedServlets();
+ if(servlets != null)
{
- // Check for a web.xml run-as only specification
- synchronized (runAsIdentity)
+ ServletMetaData servlet = servlets.get(servletName);
+ if (servlet != null)
{
- RunAsMetaData runAs = servlet.getRunAs();
- if (runAs != null)
+ // Check for a web.xml run-as only specification
+ synchronized (runAsIdentity)
{
- String roleName = runAs.getRoleName();
- srmd = new SecurityRoleMetaData();
- srmd.setName(roleName);
- runAsIdentity.put(servletName, srmd);
+ RunAsMetaData runAs = servlet.getRunAs();
+ if (runAs != null)
+ {
+ String roleName = runAs.getRoleName();
+ srmd = new SecurityRoleMetaData();
+ srmd.setName(roleName);
+ runAsIdentity.put(servletName, srmd);
+ }
}
}
}
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/FilterMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/FilterMetaData.java 2007-10-12 00:09:56 UTC (rev 66058)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/FilterMetaData.java 2007-10-12 00:10:37 UTC (rev 66059)
@@ -23,7 +23,9 @@
import java.util.List;
-import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.jboss.metadata.javaee.spec.ParamValueMetaData;
import org.jboss.metadata.javaee.support.NamedMetaDataWithDescriptionGroup;
@@ -54,7 +56,7 @@
{
return filterClass;
}
-
+ @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
public void setFilterClass(String filterClass)
{
this.filterClass = filterClass;
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/ListenerMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/ListenerMetaData.java 2007-10-12 00:09:56 UTC (rev 66058)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/ListenerMetaData.java 2007-10-12 00:10:37 UTC (rev 66059)
@@ -42,4 +42,14 @@
{
this.listenerClass = listenerClass;
}
+
+ public String toString()
+ {
+ StringBuilder tmp = new StringBuilder("ListenerMetaData(id=");
+ tmp.append(getId());
+ tmp.append(",listenerClass=");
+ tmp.append(listenerClass);
+ tmp.append(')');
+ return tmp.toString();
+ }
}
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/MimeMappingMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/MimeMappingMetaData.java 2007-10-12 00:09:56 UTC (rev 66058)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/MimeMappingMetaData.java 2007-10-12 00:10:37 UTC (rev 66059)
@@ -53,4 +53,16 @@
{
this.mimeType = mimeType;
}
+
+ public String toString()
+ {
+ StringBuilder tmp = new StringBuilder("MimeMappingMetaData(id=");
+ tmp.append(getId());
+ tmp.append(",extension=");
+ tmp.append(extension);
+ tmp.append(",mimeType=");
+ tmp.append(mimeType);
+ tmp.append(')');
+ return tmp.toString();
+ }
}
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/ServletMappingMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/ServletMappingMetaData.java 2007-10-12 00:09:56 UTC (rev 66058)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/ServletMappingMetaData.java 2007-10-12 00:10:37 UTC (rev 66059)
@@ -25,13 +25,15 @@
import javax.xml.bind.annotation.XmlElement;
-import org.jboss.metadata.javaee.support.NamedMetaData;
+import org.jboss.metadata.javaee.support.IdMetaDataImpl;
/**
+ * web-app/servlet-mapping metadata
+ *
* @author Scott.Stark at jboss.org
* @version $Revision$
*/
-public class ServletMappingMetaData extends NamedMetaData
+public class ServletMappingMetaData extends IdMetaDataImpl
{
private static final long serialVersionUID = 1;
protected String servletName;
@@ -39,11 +41,11 @@
public String getServletName()
{
- return getName();
+ return servletName;
}
public void setServletName(String servletName)
{
- super.setName(servletName);
+ this.servletName = servletName;
}
public List<String> getUrlPatterns()
@@ -56,5 +58,16 @@
this.urlPatterns = urlPatterns;
}
-
+ public String toString()
+ {
+ StringBuilder tmp = new StringBuilder("ServletMappingMetaData(id=");
+ tmp.append(getId());
+ tmp.append(",servletName=");
+ tmp.append(servletName);
+ tmp.append(",urlPatterns=");
+ tmp.append(urlPatterns);
+ tmp.append(')');
+ return tmp.toString();
+ }
+
}
Deleted: projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/ServletMappingsMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/ServletMappingsMetaData.java 2007-10-12 00:09:56 UTC (rev 66058)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/ServletMappingsMetaData.java 2007-10-12 00:10:37 UTC (rev 66059)
@@ -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 ServletMappingsMetaData extends AbstractMappedMetaData<ServletMappingMetaData>
-{
- private static final long serialVersionUID = 1;
- public ServletMappingsMetaData()
- {
- super("web app serlvet mappings");
- }
-}
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/ServletMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/ServletMetaData.java 2007-10-12 00:09:56 UTC (rev 66058)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/ServletMetaData.java 2007-10-12 00:10:37 UTC (rev 66059)
@@ -31,6 +31,8 @@
import org.jboss.metadata.javaee.support.NamedMetaDataWithDescriptionGroup;
/**
+ * web-app/servlet metadata
+ *
* @author Scott.Stark at jboss.org
* @version $Revision$
*/
@@ -106,4 +108,20 @@
{
this.securityRoleRefs = securityRoleRefs;
}
+
+ public String toString()
+ {
+ StringBuilder tmp = new StringBuilder("ServletMetaData(id=");
+ tmp.append(getId());
+ tmp.append(",servletClass=");
+ tmp.append(servletClass);
+ tmp.append(",jspFile=");
+ tmp.append(jspFile);
+ tmp.append(",loadOnStartup=");
+ tmp.append(loadOnStartup);
+ tmp.append(",runAs=");
+ tmp.append(runAs);
+ tmp.append(')');
+ return tmp.toString();
+ }
}
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/TaglibMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/TaglibMetaData.java 2007-10-12 00:09:56 UTC (rev 66058)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/TaglibMetaData.java 2007-10-12 00:10:37 UTC (rev 66059)
@@ -29,6 +29,8 @@
*/
public class TaglibMetaData extends IdMetaDataImpl
{
+ private static final long serialVersionUID = 1;
+
private String taglibUri;
private String taglibLocation;
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:09:56 UTC (rev 66058)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/WebMetaData.java 2007-10-12 00:10:37 UTC (rev 66059)
@@ -80,7 +80,7 @@
private List<LoginConfigMetaData> loginConfig;
private List<MimeMappingMetaData> mimeMappings;
private ServletsMetaData servlets;
- private ServletMappingsMetaData servletMappings;
+ private List<ServletMappingMetaData> servletMappings;
private List<SecurityConstraintMetaData> securityContraints;
private SecurityRolesMetaData securityRoles;
private WelcomeFileListMetaData welcomeFileList;
@@ -267,12 +267,12 @@
this.servlets = servlets;
}
- public ServletMappingsMetaData getServletMappings()
+ public List<ServletMappingMetaData> getServletMappings()
{
return servletMappings;
}
@XmlElement(name="servlet-mapping")
- public void setServletMappings(ServletMappingsMetaData servletMappings)
+ public void setServletMappings(List<ServletMappingMetaData> servletMappings)
{
this.servletMappings = servletMappings;
}
More information about the jboss-cvs-commits
mailing list