[jboss-cvs] JBossAS SVN: r91626 - in projects/metadata/web/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 Jul 23 19:29:55 EDT 2009
Author: remy.maucherat at jboss.com
Date: 2009-07-23 19:29:55 -0400 (Thu, 23 Jul 2009)
New Revision: 91626
Added:
projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/jboss/JBoss60WebMetaData.java
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/WebResourceCollectionMetaData.java
Log:
- Add two missing elements.
Added: projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/jboss/JBoss60WebMetaData.java
===================================================================
--- projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/jboss/JBoss60WebMetaData.java (rev 0)
+++ projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/jboss/JBoss60WebMetaData.java 2009-07-23 23:29:55 UTC (rev 91626)
@@ -0,0 +1,49 @@
+/*
+ * 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.jboss;
+
+import javax.xml.bind.annotation.XmlNs;
+import javax.xml.bind.annotation.XmlNsForm;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+import org.jboss.metadata.javaee.spec.JavaEEMetaDataConstants;
+import org.jboss.xb.annotations.JBossXmlSchema;
+
+/**
+ * @author Scott.Stark at jboss.org
+ * @version $Revision: 84989 $
+ */
+ at XmlRootElement(name="jboss-web", namespace=JavaEEMetaDataConstants.JBOSS_NS)
+ at JBossXmlSchema(
+ xmlns={@XmlNs(namespaceURI = JavaEEMetaDataConstants.JAVAEE_NS, prefix = "jee")},
+ ignoreUnresolvedFieldOrClass=false,
+ namespace=JavaEEMetaDataConstants.JBOSS_NS,
+ elementFormDefault=XmlNsForm.QUALIFIED)
+ at XmlType(name="jboss-webType", namespace=JavaEEMetaDataConstants.JBOSS_NS, propOrder={"classLoading", "securityDomain",
+ "jaccAllStoreRole", "contextRoot",
+ "virtualHosts", "useSessionCookies", "replicationConfig", "environmentRefsGroup", "securityRoles", "messageDestinations",
+ "webserviceDescriptions", "depends", "servlets", "maxActiveSessions", "passivationConfig"})
+public class JBoss60WebMetaData extends JBossWebMetaData
+{
+ private static final long serialVersionUID = 1;
+}
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-23 21:55:58 UTC (rev 91625)
+++ projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/ServletMetaData.java 2009-07-23 23:29:55 UTC (rev 91626)
@@ -39,7 +39,7 @@
* @version $Revision: 84989 $
*/
@XmlType(name="servletType", propOrder={"descriptionGroup", "servletName", "servletClass", "jspFile", "initParam", "loadOnStartup",
- "runAs", "securityRoleRefs"})
+ "runAs", "securityRoleRefs", "asyncSupported", "enabled"})
public class ServletMetaData extends NamedMetaDataWithDescriptionGroup
implements MergeableMetaData<ServletMetaData>
{
@@ -47,6 +47,7 @@
private static final int loadOnStartupDefault = -1;
private static final boolean asyncSupportedDefault = false;
+ private static final boolean enabledDefault = true;
private String servletClass;
private String jspFile;
@@ -57,6 +58,7 @@
/** The security role ref */
private SecurityRoleRefsMetaData securityRoleRefs;
private boolean asyncSupported = asyncSupportedDefault;
+ private boolean enabled = enabledDefault;
public String getServletName()
{
@@ -125,6 +127,14 @@
{
this.asyncSupported = asyncSupported;
}
+ public boolean isEnabled()
+ {
+ return enabled;
+ }
+ public void setEnabled(boolean enabled)
+ {
+ this.enabled = enabled;
+ }
public ServletMetaData merge(ServletMetaData original)
{
@@ -163,6 +173,10 @@
setAsyncSupported(override.asyncSupported);
else if(original != null && original.asyncSupported != asyncSupportedDefault)
setAsyncSupported(original.asyncSupported);
+ if(override != null && override.enabled != enabledDefault)
+ setEnabled(override.enabled);
+ else if(original != null && original.enabled != enabledDefault)
+ setEnabled(original.enabled);
}
public String toString()
Modified: projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/WebResourceCollectionMetaData.java
===================================================================
--- projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/WebResourceCollectionMetaData.java 2009-07-23 21:55:58 UTC (rev 91625)
+++ projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/WebResourceCollectionMetaData.java 2009-07-23 23:29:55 UTC (rev 91626)
@@ -38,7 +38,8 @@
* @author Scott.Stark at jboss.org
* @version $Revision: 84989 $
*/
- at XmlType(name="web-resource-collectionType", propOrder={"webResourceName", "descriptions", "urlPatterns", "httpMethods"})
+ at XmlType(name="web-resource-collectionType", propOrder={"webResourceName", "descriptions", "urlPatterns",
+ "httpMethods", "httpMethodOmissions"})
public class WebResourceCollectionMetaData extends NamedMetaDataWithDescriptions
{
private static final long serialVersionUID = 1;
@@ -64,6 +65,7 @@
private List<String> urlPatterns = new ArrayList<String>();
private List<String> httpMethods = new ArrayList<String>();
+ private List<String> httpMethodOmissions = new ArrayList<String>();
/**
* Get http methods in ALL_HTTP_METHODS not in the argument httpMethods.
@@ -112,4 +114,14 @@
{
this.httpMethods = httpMethods;
}
+
+ public List<String> getHttpMethodOmissions()
+ {
+ return httpMethodOmissions;
+ }
+ @XmlElement(name="http-method-omission")
+ public void setHttpMethodOmissions(List<String> httpMethodOmissions)
+ {
+ this.httpMethodOmissions = httpMethodOmissions;
+ }
}
More information about the jboss-cvs-commits
mailing list