[jboss-cvs] JBossAS SVN: r104942 - in projects/metadata/trunk/src/main: resources/schema and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue May 18 14:26:08 EDT 2010
Author: mmoyses
Date: 2010-05-18 14:26:07 -0400 (Tue, 18 May 2010)
New Revision: 104942
Added:
projects/metadata/trunk/src/main/java/org/jboss/metadata/web/jboss/SecurityDomainWebMetaData.java
Modified:
projects/metadata/trunk/src/main/java/org/jboss/metadata/web/jboss/JBoss4xDTDWebMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/web/jboss/JBoss50DTDWebMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/web/jboss/JBoss50WebMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/web/jboss/JBossWebMetaData.java
projects/metadata/trunk/src/main/resources/schema/jboss-web_5_1.xsd
Log:
JBMETA-269: fixing flushOnSessionInvalidation parsing
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/web/jboss/JBoss4xDTDWebMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/web/jboss/JBoss4xDTDWebMetaData.java 2010-05-18 16:52:41 UTC (rev 104941)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/web/jboss/JBoss4xDTDWebMetaData.java 2010-05-18 18:26:07 UTC (rev 104942)
@@ -43,7 +43,7 @@
namespace="",
elementFormDefault=XmlNsForm.UNSET,
normalizeSpace=true)
- at XmlType(name="jboss-webType", namespace="", propOrder={"classLoading", "securityDomain", "jaccAllStoreRole", "contextRoot",
+ at XmlType(name="jboss-webType", namespace="", propOrder={"classLoading", "securityDomainWeb", "jaccAllStoreRole", "contextRoot",
"virtualHosts", "useSessionCookies", "replicationConfig", "environmentRefsGroup4x", "securityRoles", "messageDestinations",
"webserviceDescriptions", "depends", "servlets"})
@JBossXmlType(modelGroup=JBossXmlConstants.MODEL_GROUP_UNORDERED_SEQUENCE)
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/web/jboss/JBoss50DTDWebMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/web/jboss/JBoss50DTDWebMetaData.java 2010-05-18 16:52:41 UTC (rev 104941)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/web/jboss/JBoss50DTDWebMetaData.java 2010-05-18 18:26:07 UTC (rev 104942)
@@ -40,7 +40,7 @@
namespace="",
elementFormDefault=XmlNsForm.UNSET,
normalizeSpace=true)
- at XmlType(name="jboss-webType", namespace="", propOrder={"classLoading", "securityDomain", "jaccAllStoreRole", "contextRoot",
+ at XmlType(name="jboss-webType", namespace="", propOrder={"classLoading", "securityDomainWeb", "jaccAllStoreRole", "contextRoot",
"virtualHosts", "useSessionCookies", "replicationConfig", "environmentRefsGroup", "securityRoles", "messageDestinations",
"webserviceDescriptions", "depends", "servlets", "maxActiveSessions", "passivationConfig"})
public class JBoss50DTDWebMetaData extends JBossWebMetaData
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/web/jboss/JBoss50WebMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/web/jboss/JBoss50WebMetaData.java 2010-05-18 16:52:41 UTC (rev 104941)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/web/jboss/JBoss50WebMetaData.java 2010-05-18 18:26:07 UTC (rev 104942)
@@ -39,7 +39,7 @@
ignoreUnresolvedFieldOrClass=false,
namespace=JavaEEMetaDataConstants.JBOSS_NS,
elementFormDefault=XmlNsForm.QUALIFIED)
- at XmlType(name="jboss-webType", namespace=JavaEEMetaDataConstants.JBOSS_NS, propOrder={"classLoading", "securityDomain",
+ at XmlType(name="jboss-webType", namespace=JavaEEMetaDataConstants.JBOSS_NS, propOrder={"classLoading", "securityDomainWeb",
"jaccAllStoreRole", "contextRoot",
"virtualHosts", "useSessionCookies", "replicationConfig", "environmentRefsGroup", "securityRoles", "messageDestinations",
"webserviceDescriptions", "depends", "servlets", "maxActiveSessions", "passivationConfig"})
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 2010-05-18 16:52:41 UTC (rev 104941)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/web/jboss/JBossWebMetaData.java 2010-05-18 18:26:07 UTC (rev 104942)
@@ -137,6 +137,7 @@
private PassivationConfig passivationConfig;
private WebserviceDescriptionsMetaData webserviceDescriptions = new WebserviceDescriptionsMetaData();
private Boolean jaccAllStoreRole;
+ private SecurityDomainWebMetaData securityDomainWeb;
/** The web context class loader used to create the java:comp context */
@Deprecated
@@ -623,16 +624,29 @@
{
return this.getDtdPublicId();
}
+ @XmlTransient
public String getSecurityDomain()
{
return securityDomain;
}
+ @XmlTransient
public void setSecurityDomain(String securityDomain)
{
if(securityDomain == null)
throw new IllegalArgumentException("securityDomain is null");
this.securityDomain = securityDomain.trim();
}
+ @XmlElement(name="security-domain")
+ public SecurityDomainWebMetaData getSecurityDomainWeb()
+ {
+ return securityDomainWeb;
+ }
+ public void setSecurityDomainWeb(SecurityDomainWebMetaData securityDomainWeb)
+ {
+ this.securityDomainWeb = securityDomainWeb;
+ this.securityDomain = securityDomainWeb.getDomain();
+ this.flushOnSessionInvalidation = securityDomainWeb.isFlushOnSessionInvalidation();
+ }
public HashMap getArbitraryMetadata()
{
@@ -642,10 +656,12 @@
{
this.arbitraryMetadata = arbitraryMetadata;
}
+ @XmlTransient
public boolean isFlushOnSessionInvalidation()
{
return flushOnSessionInvalidation;
}
+ @XmlTransient
public void setFlushOnSessionInvalidation(boolean flushOnSessionInvalidation)
{
this.flushOnSessionInvalidation = flushOnSessionInvalidation;
Added: projects/metadata/trunk/src/main/java/org/jboss/metadata/web/jboss/SecurityDomainWebMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/web/jboss/SecurityDomainWebMetaData.java (rev 0)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/web/jboss/SecurityDomainWebMetaData.java 2010-05-18 18:26:07 UTC (rev 104942)
@@ -0,0 +1,67 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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 java.io.Serializable;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlType;
+
+import org.jboss.metadata.rar.jboss.mcf.SecurityDomainMetaData;
+
+/**
+ * A SecurityDomainWebMetaData.
+ *
+ * @author <a href="mmoyses at redhat.com">Marcus Moyses</a>
+ * @version $Revision: 1.1 $
+ */
+ at XmlAccessorType(XmlAccessType.NONE)
+ at XmlType(name="security-domainWebType")
+public class SecurityDomainWebMetaData extends SecurityDomainMetaData
+{
+ private static final long serialVersionUID = 1L;
+
+ private boolean flushOnSessionInvalidation;
+
+ @XmlAttribute(name="flushOnSessionInvalidation")
+ public boolean isFlushOnSessionInvalidation()
+ {
+ return flushOnSessionInvalidation;
+ }
+
+ public void setFlushOnSessionInvalidation(boolean value)
+ {
+ this.flushOnSessionInvalidation = value;
+ }
+
+ @XmlAttribute(name="id")
+ public String getId()
+ {
+ return null;
+ }
+
+ public void setId(String id)
+ {
+ }
+}
Modified: projects/metadata/trunk/src/main/resources/schema/jboss-web_5_1.xsd
===================================================================
--- projects/metadata/trunk/src/main/resources/schema/jboss-web_5_1.xsd 2010-05-18 16:52:41 UTC (rev 104941)
+++ projects/metadata/trunk/src/main/resources/schema/jboss-web_5_1.xsd 2010-05-18 18:26:07 UTC (rev 104942)
@@ -83,7 +83,7 @@
<xsd:sequence>
<xsd:element name="class-loading" type="jboss:class-loadingType" minOccurs="0"/>
- <xsd:element name="security-domain" type="jboss:security-domainType" minOccurs="0"/>
+ <xsd:element name="security-domain" type="jboss:security-domainWebType" minOccurs="0"/>
<xsd:element name="jacc-star-role-allow" type="jboss:jacc-star-role-allowType" minOccurs="0"/>
<xsd:element name="context-root" type="jboss:context-rootType" minOccurs="0"/>
<xsd:element name="virtual-host" type="jboss:virtual-hostType" minOccurs="0" maxOccurs="unbounded"/>
@@ -136,6 +136,32 @@
</xsd:attribute>
</xsd:complexType>
+ <xsd:complexType name="security-domainWebType">
+ <xsd:annotation>
+ <xsd:documentation>
+ The security-domain element allows one to specify a module wide
+ security manager domain. It specifies the JNDI name of the security
+ manager that implements the org.jboss.security.AuthenticationManager and
+ org.jboss.security.RealmMapping interfaces for the domain.
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:complexContent>
+ <xsd:extension base="jboss:security-domainType">
+ <xsd:attribute name="flushOnSessionInvalidation" type="xsd:boolean" use="optional">
+ <xsd:annotation>
+ <xsd:documentation>
+ The flushOnSessionInvalidation attribute is a boolean indicating whether
+ the associated security domain cache should be flushed when the web session is
+ invalidated. If true, the security manager service
+ flushAuthenticationCache(String, java.security.Principal) is called when the
+ session is seen to be invalid due to expiration or explicit invalidation.
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:attribute>
+ </xsd:extension>
+ </xsd:complexContent>
+ </xsd:complexType>
+
<xsd:complexType name="jacc-star-role-allowType">
<xsd:annotation>
<xsd:documentation>
@@ -646,4 +672,4 @@
<xsd:restriction base="xsd:integer"/>
</xsd:simpleType>
-</xsd:schema>
\ No newline at end of file
+</xsd:schema>
More information about the jboss-cvs-commits
mailing list