[jboss-cvs] JBossAS SVN: r58790 - in trunk/server/src/main/org/jboss/metadata: . web
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Nov 30 19:42:23 EST 2006
Author: remy.maucherat at jboss.com
Date: 2006-11-30 19:42:19 -0500 (Thu, 30 Nov 2006)
New Revision: 58790
Modified:
trunk/server/src/main/org/jboss/metadata/WebMetaData.java
trunk/server/src/main/org/jboss/metadata/web/ErrorPage.java
trunk/server/src/main/org/jboss/metadata/web/FilterMapping.java
trunk/server/src/main/org/jboss/metadata/web/ServletMapping.java
trunk/server/src/main/org/jboss/metadata/web/WebMetaDataObjectFactory.java
Log:
- Add some of the missing fields.
- Modify certain structures because Servlet 2.5 allows multiple elements for mappings.
Modified: trunk/server/src/main/org/jboss/metadata/WebMetaData.java
===================================================================
--- trunk/server/src/main/org/jboss/metadata/WebMetaData.java 2006-12-01 00:20:53 UTC (rev 58789)
+++ trunk/server/src/main/org/jboss/metadata/WebMetaData.java 2006-12-01 00:42:19 UTC (rev 58790)
@@ -154,6 +154,8 @@
private ClassLoader cxtLoader;
/** ArrayList<ObjectName> of the web app dependencies */
private ArrayList depends = new ArrayList();
+ /** Flag to check for metadata in webapps **/
+ private boolean metadataComplete = false;
/**
* this is really a hack for new injection code so that we can reparse web.xml/jbossweb.xml for JavaEE 5 injections
@@ -1123,6 +1125,16 @@
this.maxActiveSessions = maxActive;
}
+ public boolean isMetadataComplete()
+ {
+ return metadataComplete;
+ }
+
+ public void setMetadataComplete(boolean metadataComplete)
+ {
+ this.metadataComplete = metadataComplete;
+ }
+
/** Parse the elements of the jboss-web element used by the integration layer.
*/
protected void importJBossWebXml(Element jbossWeb) throws DeploymentException
Modified: trunk/server/src/main/org/jboss/metadata/web/ErrorPage.java
===================================================================
--- trunk/server/src/main/org/jboss/metadata/web/ErrorPage.java 2006-12-01 00:20:53 UTC (rev 58789)
+++ trunk/server/src/main/org/jboss/metadata/web/ErrorPage.java 2006-12-01 00:42:19 UTC (rev 58790)
@@ -36,6 +36,7 @@
protected String errorCode;
protected String location;
+ protected String exceptionType;
public String getErrorCode()
{
@@ -57,6 +58,16 @@
this.location = location;
}
+ public String getExceptionType()
+ {
+ return exceptionType;
+ }
+
+ public void setExceptionType(String exceptionType)
+ {
+ this.exceptionType = exceptionType;
+ }
+
public String toString()
{
StringBuffer sb = new StringBuffer(100);
Modified: trunk/server/src/main/org/jboss/metadata/web/FilterMapping.java
===================================================================
--- trunk/server/src/main/org/jboss/metadata/web/FilterMapping.java 2006-12-01 00:20:53 UTC (rev 58789)
+++ trunk/server/src/main/org/jboss/metadata/web/FilterMapping.java 2006-12-01 00:42:19 UTC (rev 58790)
@@ -21,6 +21,8 @@
*/
package org.jboss.metadata.web;
+import java.util.ArrayList;
+
import org.jboss.logging.Logger;
/**
@@ -35,8 +37,9 @@
private static final Logger log = Logger.getLogger(FilterMapping.class);
protected String filterName;
- protected String urlPattern;
- protected String servletName;
+ protected ArrayList<String> urlPatterns = new ArrayList<String>();
+ protected ArrayList<String> servletNames = new ArrayList<String>();
+ protected ArrayList<String> dispatchers = new ArrayList<String>();
public String getFilterName()
{
@@ -48,29 +51,40 @@
this.filterName = filterName;
}
- public String getUrlPattern()
+ public ArrayList<String> getUrlPatterns()
{
- return urlPattern;
+ return urlPatterns;
}
- public void setUrlPattern(String urlPattern)
+ public void addUrlPattern(String urlPattern)
{
- this.urlPattern = urlPattern;
+ urlPatterns.add(urlPattern);
}
- public String getServletName()
+ public ArrayList<String> getServletNames()
{
- return servletName;
+ return servletNames;
}
- public void setServletName(String servletName)
+ public void addServletName(String servletName)
{
- this.servletName = servletName;
+ servletNames.add(servletName);
}
+ public ArrayList<String> getDispatchers()
+ {
+ return dispatchers;
+ }
+
+ public void addDispatcher(String dispatcher)
+ {
+ dispatchers.add(dispatcher);
+ }
+
public String toString()
{
StringBuffer sb = new StringBuffer(100);
return sb.toString();
}
+
}
Modified: trunk/server/src/main/org/jboss/metadata/web/ServletMapping.java
===================================================================
--- trunk/server/src/main/org/jboss/metadata/web/ServletMapping.java 2006-12-01 00:20:53 UTC (rev 58789)
+++ trunk/server/src/main/org/jboss/metadata/web/ServletMapping.java 2006-12-01 00:42:19 UTC (rev 58790)
@@ -21,6 +21,8 @@
*/
package org.jboss.metadata.web;
+import java.util.ArrayList;
+
import org.jboss.logging.Logger;
/**
@@ -35,7 +37,7 @@
private static final Logger log = Logger.getLogger(ServletMapping.class);
protected String name;
- protected String urlPattern;
+ protected ArrayList<String> urlPatterns = new ArrayList<String>();
public String getName()
{
@@ -47,14 +49,14 @@
this.name = name;
}
- public String getUrlPattern()
+ public ArrayList<String> getUrlPatterns()
{
- return urlPattern;
+ return urlPatterns;
}
- public void setUrlPattern(String urlPattern)
+ public void addUrlPattern(String urlPattern)
{
- this.urlPattern = urlPattern;
+ urlPatterns.add(urlPattern);
}
public String toString()
Modified: trunk/server/src/main/org/jboss/metadata/web/WebMetaDataObjectFactory.java
===================================================================
--- trunk/server/src/main/org/jboss/metadata/web/WebMetaDataObjectFactory.java 2006-12-01 00:20:53 UTC (rev 58789)
+++ trunk/server/src/main/org/jboss/metadata/web/WebMetaDataObjectFactory.java 2006-12-01 00:42:19 UTC (rev 58790)
@@ -396,8 +396,15 @@
}
else if(localName.equals("display-name"))
{
- wmd.setDisplayName(value);
+ wmd.setDisplayName(value);
}
+ else if(localName.equals("metadata-complete"))
+ {
+ if ("true".equals(value))
+ {
+ wmd.setMetadataComplete(true);
+ }
+ }
}
public void setValue(ParamValue pv, UnmarshallingContext navigator,
@@ -439,12 +446,16 @@
}
else if (localName.equals("url-pattern"))
{
- mapping.setUrlPattern(value);
+ mapping.addUrlPattern(value);
}
else if (localName.equals("servlet-name"))
{
- mapping.setServletName(value);
+ mapping.addServletName(value);
}
+ else if (localName.equals("dispatcher"))
+ {
+ mapping.addDispatcher(value);
+ }
}
public void setValue(ServletMapping mapping, UnmarshallingContext navigator,
@@ -456,7 +467,7 @@
}
else if (localName.equals("url-pattern"))
{
- mapping.setUrlPattern(value);
+ mapping.addUrlPattern(value);
}
}
@@ -471,6 +482,10 @@
{
page.setLocation(value);
}
+ else if (localName.equals("exception-type"))
+ {
+ page.setExceptionType(value);
+ }
}
public void setValue(SessionConfig config, UnmarshallingContext navigator,
More information about the jboss-cvs-commits
mailing list