[jboss-cvs] JBossAS SVN: r80128 - in projects/metadata/trunk/src: main/resources/dtd and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Oct 27 20:31:11 EDT 2008
Author: emuckenhuber
Date: 2008-10-27 20:31:11 -0400 (Mon, 27 Oct 2008)
New Revision: 80128
Added:
projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/web/JBMETA134.xml
Modified:
projects/metadata/trunk/src/main/java/org/jboss/metadata/web/jboss/JBossWebMetaData.java
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
Log:
[JBMETA-134] add missing jacc-star-role-allow element
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 2008-10-28 00:23:17 UTC (rev 80127)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/web/jboss/JBossWebMetaData.java 2008-10-28 00:31:11 UTC (rev 80128)
@@ -136,6 +136,7 @@
private ReplicationConfig replicationConfig;
private PassivationConfig passivationConfig;
private WebserviceDescriptionsMetaData webserviceDescriptions = new WebserviceDescriptionsMetaData();
+ private Boolean jaccAllStoreRole;
/** The web context class loader used to create the java:comp context */
@Deprecated
@@ -792,7 +793,19 @@
else
jndiEnvironmentRefsGroup = jenv;
}
+
+ public boolean isJaccAllStoreRole()
+ {
+ if(jaccAllStoreRole == null) return Boolean.FALSE;
+ return jaccAllStoreRole;
+ }
+ @XmlElement(name = "jacc-star-role-allow")
+ public void setJaccAllStoreRole(boolean isJaccAllStoreRole)
+ {
+ this.jaccAllStoreRole = Boolean.valueOf(isJaccAllStoreRole);
+ }
+
@XmlTransient
public MessageDestinationMetaData getMessageDestination(String name)
{
@@ -950,6 +963,9 @@
else if(original != null && original.getLocalEncodings() != null)
setLocalEncodings(original.getLocalEncodings());
+ if(override != null && override.jaccAllStoreRole != null)
+ this.jaccAllStoreRole = override.jaccAllStoreRole;
+
if(override != null && override.dtdPublicId != null)
this.dtdPublicId = override.dtdPublicId;
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 00:23:17 UTC (rev 80127)
+++ projects/metadata/trunk/src/main/resources/dtd/jboss-web_4_2.dtd 2008-10-28 00:31:11 UTC (rev 80128)
@@ -86,6 +86,13 @@
This should not override the application.xml level specification.
-->
<!ELEMENT context-root (#PCDATA)>
+
+<!-- (JBAS-1824) The jacc-star-role-allow element specifies whether the
+jacc permission generating agent in the web layer needs to generate a
+WebResourcePermission(url,null) permission such that the jacc provider can
+make a decision as to bypass authorization or not.
+-->
+<!ELEMENT jacc-star-role-allow (#PCDATA)>
<!-- The security-domain element allows one to specify a module wide
security manager domain. It specifies the JNDI name of the security
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 00:23:17 UTC (rev 80127)
+++ projects/metadata/trunk/src/main/resources/dtd/jboss-web_5_0.dtd 2008-10-28 00:31:11 UTC (rev 80128)
@@ -88,6 +88,13 @@
-->
<!ELEMENT context-root (#PCDATA)>
+<!-- (JBAS-1824) The jacc-star-role-allow element specifies whether the
+jacc permission generating agent in the web layer needs to generate a
+WebResourcePermission(url,null) permission such that the jacc provider can
+make a decision as to bypass authorization or not.
+-->
+<!ELEMENT jacc-star-role-allow (#PCDATA)>
+
<!-- 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
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 00:23:17 UTC (rev 80127)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/web/JBossWeb50UnitTestCase.java 2008-10-28 00:31:11 UTC (rev 80128)
@@ -32,6 +32,8 @@
import org.jboss.metadata.web.jboss.SnapshotMode;
import org.jboss.metadata.web.spec.Web24MetaData;
import org.jboss.test.metadata.javaee.AbstractJavaEEEverythingTest;
+import org.jboss.xb.binding.Unmarshaller;
+import org.jboss.xb.binding.UnmarshallerFactory;
import org.jboss.xb.binding.sunday.unmarshalling.DefaultSchemaResolver;
import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
@@ -116,7 +118,20 @@
LoaderRepositoryMetaData lrmd = classLoading.getLoaderRepository();
assertNull(lrmd.getName());
}
-
+
+ public void testIsJaacAllStoreRole() throws Exception
+ {
+ Unmarshaller unmarshaller = UnmarshallerFactory.newInstance().newUnmarshaller();
+ unmarshaller.setSchemaValidation(false);
+ unmarshaller.setValidation(false);
+
+ JBossWebMetaData jbossWeb = (JBossWebMetaData) unmarshaller.unmarshal(getResource("JBMETA134.xml").getPath(), initResolver());
+
+ assertNotNull(jbossWeb);
+ assertTrue(jbossWeb.isJaccAllStoreRole());
+
+ }
+
protected JBossWebMetaData unmarshal() throws Exception
{
return unmarshal(JBossWebMetaData.class);
Added: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/web/JBMETA134.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/web/JBMETA134.xml (rev 0)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/web/JBMETA134.xml 2008-10-28 00:31:11 UTC (rev 80128)
@@ -0,0 +1,8 @@
+<!DOCTYPE jboss-web
+ PUBLIC "-//JBoss//DTD Web Application 4.2//EN"
+ "http://www.jboss.org/j2ee/dtd/jboss-web_4_2.dtd">
+
+<jboss-web>
+ <context-root>root</context-root>
+ <jacc-star-role-allow>true</jacc-star-role-allow>
+</jboss-web>
More information about the jboss-cvs-commits
mailing list