[jboss-cvs] JBossAS SVN: r91293 - projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Jul 15 09:38:06 EDT 2009
Author: remy.maucherat at jboss.com
Date: 2009-07-15 09:38:06 -0400 (Wed, 15 Jul 2009)
New Revision: 91293
Added:
projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/JspPropertyGroupMetaData.java
projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/RelativeOrderingMetaData.java
Removed:
projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/JspPropertyGroup.java
Modified:
projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/AbsoluteOrderingMetaData.java
projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/DispatcherType.java
projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/FilterMetaData.java
projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/JspConfigMetaData.java
projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/ServletMetaData.java
projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/WebFragmentMetaData.java
Log:
- Add the relative ordering elements.
Modified: projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/AbsoluteOrderingMetaData.java
===================================================================
--- projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/AbsoluteOrderingMetaData.java 2009-07-15 13:01:57 UTC (rev 91292)
+++ projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/AbsoluteOrderingMetaData.java 2009-07-15 13:38:06 UTC (rev 91293)
@@ -33,7 +33,7 @@
* @author Scott.Stark at jboss.org
* @version $Revision: 83549 $
*/
- at XmlType(name="absolute-orderingType")
+ at XmlType(name="absoluteOrderingType")
public class AbsoluteOrderingMetaData extends IdMetaDataImpl
{
private static final long serialVersionUID = 1;
Modified: projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/DispatcherType.java
===================================================================
--- projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/DispatcherType.java 2009-07-15 13:01:57 UTC (rev 91292)
+++ projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/DispatcherType.java 2009-07-15 13:38:06 UTC (rev 91293)
@@ -33,5 +33,9 @@
@XmlEnum(String.class)
public enum DispatcherType
{
- FORWARD, REQUEST, INCLUDE, ERROR
+ FORWARD,
+ INCLUDE,
+ REQUEST,
+ ASYNC,
+ ERROR
}
Modified: projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/FilterMetaData.java
===================================================================
--- projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/FilterMetaData.java 2009-07-15 13:01:57 UTC (rev 91292)
+++ projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/FilterMetaData.java 2009-07-15 13:38:06 UTC (rev 91293)
@@ -43,6 +43,7 @@
private String filterClass;
/** The filter init-params */
private List<ParamValueMetaData> initParam;
+ private boolean asyncSupported = false;
public String getFilterName()
{
@@ -72,5 +73,14 @@
{
this.initParam = initParam;
}
+
+ public boolean isAsyncSupported()
+ {
+ return asyncSupported;
+ }
+ public void setAsyncSupported(boolean asyncSupported)
+ {
+ this.asyncSupported = asyncSupported;
+ }
}
Modified: projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/JspConfigMetaData.java
===================================================================
--- projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/JspConfigMetaData.java 2009-07-15 13:01:57 UTC (rev 91292)
+++ projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/JspConfigMetaData.java 2009-07-15 13:38:06 UTC (rev 91293)
@@ -38,7 +38,7 @@
{
private static final long serialVersionUID = 1;
private List<TaglibMetaData> taglib;
- private List<JspPropertyGroup> propertyGroups;
+ private List<JspPropertyGroupMetaData> propertyGroups;
public List<TaglibMetaData> getTaglibs()
{
@@ -50,12 +50,12 @@
this.taglib = taglib;
}
- public List<JspPropertyGroup> getPropertyGroups()
+ public List<JspPropertyGroupMetaData> getPropertyGroups()
{
return propertyGroups;
}
@XmlElement(name="jsp-property-group")
- public void setPropertyGroups(List<JspPropertyGroup> propertyGroups)
+ public void setPropertyGroups(List<JspPropertyGroupMetaData> propertyGroups)
{
this.propertyGroups = propertyGroups;
}
Deleted: projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/JspPropertyGroup.java
===================================================================
--- projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/JspPropertyGroup.java 2009-07-15 13:01:57 UTC (rev 91292)
+++ projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/JspPropertyGroup.java 2009-07-15 13:38:06 UTC (rev 91293)
@@ -1,126 +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 java.util.List;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-import org.jboss.metadata.javaee.support.IdMetaDataImplWithDescriptionGroup;
-
-/**
- * @author Scott.Stark at jboss.org
- * @version $Revision: 83549 $
- */
- at XmlType(name="jsp-property-groupType", propOrder={"descriptionGroup", "urlPatterns", "elIgnored", "pageEncoding",
- "scriptingInvalid", "xml", "includePrelude", "includeCoda", "deferredSyntaxAllowedAsLiteral", "trimDirectiveWhitespaces"})
-public class JspPropertyGroup extends IdMetaDataImplWithDescriptionGroup
-{
- private static final long serialVersionUID = 1;
-
- private List<String> urlPatterns;
- private String scriptingInvalid;
- private String elIgnored;
- private String isXml;
- private String deferredSyntaxAllowedAsLiteral;
- private String trimDirectiveWhitespaces;
- private String pageEncoding;
- private List<String> includePrelude;
- private List<String> includeCoda;
-
- public String getDeferredSyntaxAllowedAsLiteral()
- {
- return deferredSyntaxAllowedAsLiteral;
- }
- public void setDeferredSyntaxAllowedAsLiteral(
- String deferredSyntaxAllowedAsLiteral)
- {
- this.deferredSyntaxAllowedAsLiteral = deferredSyntaxAllowedAsLiteral;
- }
- public String getElIgnored()
- {
- return elIgnored;
- }
- public void setElIgnored(String elIgnored)
- {
- this.elIgnored = elIgnored;
- }
- public List<String> getIncludeCoda()
- {
- return includeCoda;
- }
- public void setIncludeCoda(List<String> includeCoda)
- {
- this.includeCoda = includeCoda;
- }
- public List<String> getIncludePrelude()
- {
- return includePrelude;
- }
- public void setIncludePrelude(List<String> includePrelude)
- {
- this.includePrelude = includePrelude;
- }
- public String getXml()
- {
- return isXml;
- }
- @XmlElement(name="is-xml")
- public void setXml(String isXml)
- {
- this.isXml = isXml;
- }
- public String getPageEncoding()
- {
- return pageEncoding;
- }
- public void setPageEncoding(String pageEncoding)
- {
- this.pageEncoding = pageEncoding;
- }
- public String isScriptingInvalid()
- {
- return scriptingInvalid;
- }
- public void setScriptingInvalid(String scriptingInvalid)
- {
- this.scriptingInvalid = scriptingInvalid;
- }
- public String getTrimDirectiveWhitespaces()
- {
- return trimDirectiveWhitespaces;
- }
- public void setTrimDirectiveWhitespaces(String trimDirectiveWhitespaces)
- {
- this.trimDirectiveWhitespaces = trimDirectiveWhitespaces;
- }
- public List<String> getUrlPatterns()
- {
- return urlPatterns;
- }
- @XmlElement(name="url-pattern")
- public void setUrlPatterns(List<String> urlPatterns)
- {
- this.urlPatterns = urlPatterns;
- }
-}
Copied: projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/JspPropertyGroupMetaData.java (from rev 91109, projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/JspPropertyGroup.java)
===================================================================
--- projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/JspPropertyGroupMetaData.java (rev 0)
+++ projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/JspPropertyGroupMetaData.java 2009-07-15 13:38:06 UTC (rev 91293)
@@ -0,0 +1,155 @@
+/*
+ * 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 java.util.List;
+
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+
+import org.jboss.metadata.javaee.support.IdMetaDataImplWithDescriptionGroup;
+
+/**
+ * @author Scott.Stark at jboss.org
+ * @version $Revision: 83549 $
+ */
+ at XmlType(name="jsp-property-groupType", propOrder={"descriptionGroup", "urlPatterns", "elIgnored", "pageEncoding",
+ "scriptingInvalid", "xml", "includePrelude", "includeCoda", "deferredSyntaxAllowedAsLiteral", "trimDirectiveWhitespaces",
+ "defaultContentType", "buffer", "errorOnUndeclaredNamespace"})
+public class JspPropertyGroupMetaData extends IdMetaDataImplWithDescriptionGroup
+{
+ private static final long serialVersionUID = 1;
+
+ private List<String> urlPatterns;
+ private String scriptingInvalid;
+ private String elIgnored;
+ private String isXml;
+ private String deferredSyntaxAllowedAsLiteral;
+ private String trimDirectiveWhitespaces;
+ private String pageEncoding;
+ private List<String> includePrelude;
+ private List<String> includeCoda;
+ private String defaultContentType;
+ private String buffer;
+ private String errorOnUndeclaredNamespace;
+
+ public String getDeferredSyntaxAllowedAsLiteral()
+ {
+ return deferredSyntaxAllowedAsLiteral;
+ }
+ public void setDeferredSyntaxAllowedAsLiteral(
+ String deferredSyntaxAllowedAsLiteral)
+ {
+ this.deferredSyntaxAllowedAsLiteral = deferredSyntaxAllowedAsLiteral;
+ }
+ public String getElIgnored()
+ {
+ return elIgnored;
+ }
+ public void setElIgnored(String elIgnored)
+ {
+ this.elIgnored = elIgnored;
+ }
+ public List<String> getIncludeCoda()
+ {
+ return includeCoda;
+ }
+ public void setIncludeCoda(List<String> includeCoda)
+ {
+ this.includeCoda = includeCoda;
+ }
+ public List<String> getIncludePrelude()
+ {
+ return includePrelude;
+ }
+ public void setIncludePrelude(List<String> includePrelude)
+ {
+ this.includePrelude = includePrelude;
+ }
+ public String getXml()
+ {
+ return isXml;
+ }
+ @XmlElement(name="is-xml")
+ public void setXml(String isXml)
+ {
+ this.isXml = isXml;
+ }
+ public String getPageEncoding()
+ {
+ return pageEncoding;
+ }
+ public void setPageEncoding(String pageEncoding)
+ {
+ this.pageEncoding = pageEncoding;
+ }
+ public String isScriptingInvalid()
+ {
+ return scriptingInvalid;
+ }
+ public void setScriptingInvalid(String scriptingInvalid)
+ {
+ this.scriptingInvalid = scriptingInvalid;
+ }
+ public String getTrimDirectiveWhitespaces()
+ {
+ return trimDirectiveWhitespaces;
+ }
+ public void setTrimDirectiveWhitespaces(String trimDirectiveWhitespaces)
+ {
+ this.trimDirectiveWhitespaces = trimDirectiveWhitespaces;
+ }
+ public List<String> getUrlPatterns()
+ {
+ return urlPatterns;
+ }
+ @XmlElement(name="url-pattern")
+ public void setUrlPatterns(List<String> urlPatterns)
+ {
+ this.urlPatterns = urlPatterns;
+ }
+ public String getDefaultContentType()
+ {
+ return defaultContentType;
+ }
+ public void setDefaultContentType(String defaultContentType)
+ {
+ this.defaultContentType = defaultContentType;
+ }
+ public String getBuffer()
+ {
+ return buffer;
+ }
+ public void setBuffer(String buffer)
+ {
+ this.buffer = buffer;
+ }
+ public String getErrorOnUndeclaredNamespace()
+ {
+ return errorOnUndeclaredNamespace;
+ }
+ public void setErrorOnUndeclaredNamespace(String errorOnUndeclaredNamespace)
+ {
+ this.errorOnUndeclaredNamespace = errorOnUndeclaredNamespace;
+ }
+
+}
Added: projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/RelativeOrderingMetaData.java
===================================================================
--- projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/RelativeOrderingMetaData.java (rev 0)
+++ projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/RelativeOrderingMetaData.java 2009-07-15 13:38:06 UTC (rev 91293)
@@ -0,0 +1,58 @@
+/*
+ * 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 java.util.ArrayList;
+import java.util.List;
+
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+
+import org.jboss.metadata.javaee.support.IdMetaDataImpl;
+
+/**
+ * @author Scott.Stark at jboss.org
+ * @version $Revision: 83549 $
+ */
+ at XmlType(name="ordering-orderingType")
+public class RelativeOrderingMetaData extends IdMetaDataImpl
+{
+ private static final long serialVersionUID = 1;
+
+ protected List<String> ordering = new ArrayList<String>();
+
+ public List<String> getOrdering() {
+ return ordering;
+ }
+
+ @XmlElement(name="name")
+ public void addName(String name)
+ {
+ ordering.add(name);
+ }
+ @XmlElement(name="others")
+ public void addOthers()
+ {
+ ordering.add("*");
+ }
+
+}
Modified: projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/ServletMetaData.java
===================================================================
--- projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/ServletMetaData.java 2009-07-15 13:01:57 UTC (rev 91292)
+++ projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/ServletMetaData.java 2009-07-15 13:38:06 UTC (rev 91293)
@@ -46,6 +46,7 @@
private static final long serialVersionUID = 1;
private static final int loadOnStartupDefault = -1;
+ private static final boolean asyncSupportedDefault = false;
private String servletClass;
private String jspFile;
@@ -55,6 +56,7 @@
private RunAsMetaData runAs;
/** The security role ref */
private SecurityRoleRefsMetaData securityRoleRefs;
+ private boolean asyncSupported = asyncSupportedDefault;
public String getServletName()
{
@@ -115,6 +117,14 @@
{
this.securityRoleRefs = securityRoleRefs;
}
+ public boolean isAsyncSupported()
+ {
+ return asyncSupported;
+ }
+ public void setAsyncSupported(boolean asyncSupported)
+ {
+ this.asyncSupported = asyncSupported;
+ }
public ServletMetaData merge(ServletMetaData original)
{
@@ -149,6 +159,10 @@
setSecurityRoleRefs(override.securityRoleRefs);
else if(original != null && original.securityRoleRefs != null)
setSecurityRoleRefs(original.securityRoleRefs);
+ if(override != null && override.asyncSupported != asyncSupportedDefault)
+ setAsyncSupported(override.asyncSupported);
+ else if(original != null && original.asyncSupported != asyncSupportedDefault)
+ setAsyncSupported(original.asyncSupported);
}
public String toString()
Modified: projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/WebFragmentMetaData.java
===================================================================
--- projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/WebFragmentMetaData.java 2009-07-15 13:01:57 UTC (rev 91292)
+++ projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/WebFragmentMetaData.java 2009-07-15 13:38:06 UTC (rev 91293)
@@ -21,7 +21,9 @@
*/
package org.jboss.metadata.web.spec;
+import javax.xml.bind.annotation.XmlElement;
+
/**
* The web-app spec metadata
* @author Scott.Stark at jboss.org
@@ -29,4 +31,28 @@
*/
public class WebFragmentMetaData extends WebCommonMetaData
{
+ private static final long serialVersionUID = 1;
+ private RelativeOrderingMetaData afterOrdering;
+ private RelativeOrderingMetaData beforeOrdering;
+
+ public RelativeOrderingMetaData getAfterOrdering()
+ {
+ return afterOrdering;
+ }
+ @XmlElement(name="after")
+ public void setAfterOrdering(RelativeOrderingMetaData afterOrdering)
+ {
+ this.afterOrdering = afterOrdering;
+ }
+ public RelativeOrderingMetaData getBeforeOrdering()
+ {
+ return beforeOrdering;
+ }
+ @XmlElement(name="before")
+ public void setBeforeOrdering(RelativeOrderingMetaData beforeOrdering)
+ {
+ this.beforeOrdering = beforeOrdering;
+ }
+
+
}
More information about the jboss-cvs-commits
mailing list