[jboss-cvs] JBossAS SVN: r102250 - in projects/metadata/branches/1.0.1.SP1_JBMETA-269/src/main: resources/schema and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: mmoyses
Date: 2010-03-10 18:10:45 -0500 (Wed, 10 Mar 2010)
New Revision: 102250

Modified:
   projects/metadata/branches/1.0.1.SP1_JBMETA-269/src/main/java/org/jboss/metadata/web/jboss/JBossWebMetaData.java
   projects/metadata/branches/1.0.1.SP1_JBMETA-269/src/main/java/org/jboss/metadata/web/jboss/SecurityDomainWebMetaData.java
   projects/metadata/branches/1.0.1.SP1_JBMETA-269/src/main/resources/schema/jboss-web_5_1.xsd
Log:
JBPAPP-3870: fixing parsing of flushOnSessionInvalidation attribute

Modified: projects/metadata/branches/1.0.1.SP1_JBMETA-269/src/main/java/org/jboss/metadata/web/jboss/JBossWebMetaData.java
===================================================================
--- projects/metadata/branches/1.0.1.SP1_JBMETA-269/src/main/java/org/jboss/metadata/web/jboss/JBossWebMetaData.java	2010-03-10 23:05:39 UTC (rev 102249)
+++ projects/metadata/branches/1.0.1.SP1_JBMETA-269/src/main/java/org/jboss/metadata/web/jboss/JBossWebMetaData.java	2010-03-10 23:10:45 UTC (rev 102250)
@@ -27,7 +27,6 @@
 import java.util.Map;
 import java.util.Set;
 
-import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlTransient;
 

Modified: projects/metadata/branches/1.0.1.SP1_JBMETA-269/src/main/java/org/jboss/metadata/web/jboss/SecurityDomainWebMetaData.java
===================================================================
--- projects/metadata/branches/1.0.1.SP1_JBMETA-269/src/main/java/org/jboss/metadata/web/jboss/SecurityDomainWebMetaData.java	2010-03-10 23:05:39 UTC (rev 102249)
+++ projects/metadata/branches/1.0.1.SP1_JBMETA-269/src/main/java/org/jboss/metadata/web/jboss/SecurityDomainWebMetaData.java	2010-03-10 23:10:45 UTC (rev 102250)
@@ -43,7 +43,6 @@
    private static final long serialVersionUID = 1L;
 
    private boolean flushOnSessionInvalidation;
-   private String securityDomain;
 
    @XmlAttribute(name="flushOnSessionInvalidation")
    public boolean isFlushOnSessionInvalidation()

Modified: projects/metadata/branches/1.0.1.SP1_JBMETA-269/src/main/resources/schema/jboss-web_5_1.xsd
===================================================================
--- projects/metadata/branches/1.0.1.SP1_JBMETA-269/src/main/resources/schema/jboss-web_5_1.xsd	2010-03-10 23:05:39 UTC (rev 102249)
+++ projects/metadata/branches/1.0.1.SP1_JBMETA-269/src/main/resources/schema/jboss-web_5_1.xsd	2010-03-10 23:10:45 UTC (rev 102250)
@@ -147,17 +147,17 @@
       </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: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>