[jboss-cvs] JBossAS SVN: r80160 - in projects/metadata/trunk/src: test/java/org/jboss/test/metadata/web and 1 other directories.

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

Author: emuckenhuber
Date: 2008-10-28 13:31:06 -0400 (Tue, 28 Oct 2008)
New Revision: 80160

Modified:
   projects/metadata/trunk/src/main/resources/dtd/jboss-web_4_2.dtd
   projects/metadata/trunk/src/main/resources/dtd/jboss-web_5_0.dtd
   projects/metadata/trunk/src/test/java/org/jboss/test/metadata/web/JBossWeb50UnitTestCase.java
   projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/web/JBossWeb50_testIsJaacAllStoreRole.xml
Log:
[JBMETA-134] missing jacc-star-role-allowed

Modified: projects/metadata/trunk/src/main/resources/dtd/jboss-web_4_2.dtd
===================================================================
--- projects/metadata/trunk/src/main/resources/dtd/jboss-web_4_2.dtd	2008-10-28 17:29:57 UTC (rev 80159)
+++ projects/metadata/trunk/src/main/resources/dtd/jboss-web_4_2.dtd	2008-10-28 17:31:06 UTC (rev 80160)
@@ -19,7 +19,7 @@
 
 <!-- The jboss-web element is the root element.
 -->
-<!ELEMENT jboss-web (class-loading?, security-domain?, context-root?,
+<!ELEMENT jboss-web (class-loading?, security-domain?, jacc-star-role-allow?, context-root?,
    virtual-host*, use-session-cookies?, replication-config?, resource-env-ref*,
    resource-ref*, security-role*, ejb-ref*, ejb-local-ref*, 
    message-destination-ref*, message-destination*, 

Modified: projects/metadata/trunk/src/main/resources/dtd/jboss-web_5_0.dtd
===================================================================
--- projects/metadata/trunk/src/main/resources/dtd/jboss-web_5_0.dtd	2008-10-28 17:29:57 UTC (rev 80159)
+++ projects/metadata/trunk/src/main/resources/dtd/jboss-web_5_0.dtd	2008-10-28 17:31:06 UTC (rev 80160)
@@ -20,7 +20,7 @@
 
 <!-- The jboss-web element is the root element.
 -->
-<!ELEMENT jboss-web (class-loading?, security-domain?, context-root?,
+<!ELEMENT jboss-web (class-loading?, security-domain?, jacc-star-role-allow?, context-root?,
    virtual-host*, use-session-cookies?, replication-config?, resource-env-ref*,
    resource-ref*, security-role*, ejb-ref*, ejb-local-ref*, 
    message-destination-ref*, message-destination*, 

Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/web/JBossWeb50UnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/web/JBossWeb50UnitTestCase.java	2008-10-28 17:29:57 UTC (rev 80159)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/web/JBossWeb50UnitTestCase.java	2008-10-28 17:31:06 UTC (rev 80160)
@@ -121,14 +121,9 @@
    
    public void testIsJaacAllStoreRole() throws Exception
    {
-      Unmarshaller unmarshaller = UnmarshallerFactory.newInstance().newUnmarshaller();
-      unmarshaller.setSchemaValidation(false);
-      unmarshaller.setValidation(false);
       
-      JBossWebMetaData jbossWeb = (JBossWebMetaData) unmarshaller.unmarshal(getResource("JBossWeb50_testIsJaacAllStoreRole.xml").getPath(), initResolver());
+      JBossWebMetaData jbossWeb = unmarshal();
       
-//      JBossWebMetaData jbossWeb = unmarshal();
-      
       assertNotNull(jbossWeb);
       assertTrue(jbossWeb.isJaccAllStoreRole());
       

Modified: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/web/JBossWeb50_testIsJaacAllStoreRole.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/web/JBossWeb50_testIsJaacAllStoreRole.xml	2008-10-28 17:29:57 UTC (rev 80159)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/web/JBossWeb50_testIsJaacAllStoreRole.xml	2008-10-28 17:31:06 UTC (rev 80160)
@@ -3,6 +3,6 @@
     "http://www.jboss.org/j2ee/dtd/jboss-web_4_2.dtd">
 
 <jboss-web>
+	<jacc-star-role-allow>true</jacc-star-role-allow>
 	<context-root>root</context-root>
-	<jacc-star-role-allow>true</jacc-star-role-allow>
 </jboss-web>