[jboss-cvs] JBossAS SVN: r65769 - in trunk: server/src/etc/deploy and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Oct 2 15:17:34 EDT 2007
Author: anil.saldhana at jboss.com
Date: 2007-10-02 15:17:34 -0400 (Tue, 02 Oct 2007)
New Revision: 65769
Modified:
trunk/build/build-thirdparty.xml
trunk/server/src/etc/deploy/security-policies-service.xml
trunk/server/src/main/org/jboss/ejb/deployers/EjbDeployer.java
trunk/server/src/resources/schema/security-config_5_0.xsd
trunk/tomcat/src/resources/war-deployers-all-beans.xml
trunk/tomcat/src/resources/war-deployers-beans.xml
Log:
JBossSx 2.0.1-BETA2
Modified: trunk/build/build-thirdparty.xml
===================================================================
--- trunk/build/build-thirdparty.xml 2007-10-02 19:04:57 UTC (rev 65768)
+++ trunk/build/build-thirdparty.xml 2007-10-02 19:17:34 UTC (rev 65769)
@@ -95,8 +95,8 @@
<componentref name="jboss/jboss-jaspi-api" version="1.0-BETA1"/>
<componentref name="jboss/jboss-javaee" version="5.0.0.Beta3"/>
<componentref name="jboss/jboss-security-spi" version="2.0.1-BETA1"/>
- <componentref name="jboss/jbosssx" version="2.0.1-BETA1"/>
- <componentref name="jboss/jbosssx-client" version="2.0.1-BETA1"/>
+ <componentref name="jboss/jbosssx" version="2.0.1-BETA2"/>
+ <componentref name="jboss/jbosssx-client" version="2.0.1-BETA2"/>
<componentref name="jboss/jbossts" version="4.3.0.BETA1"/>
<componentref name="jboss/jboss-vfs" version="2.0.0.Beta4"/>
<componentref name="jboss/jbossws-native50" version="2.0.1.SP1"/>
Modified: trunk/server/src/etc/deploy/security-policies-service.xml
===================================================================
--- trunk/server/src/etc/deploy/security-policies-service.xml 2007-10-02 19:04:57 UTC (rev 65768)
+++ trunk/server/src/etc/deploy/security-policies-service.xml 2007-10-02 19:17:34 UTC (rev 65769)
@@ -13,17 +13,15 @@
xmlns:jbsx="urn:jboss:security-config:5.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
>
- <jbsx:application-policy name="jboss-web-policy">
+ <jbsx:application-policy name="jboss-web-policy" extends="other">
<jbsx:authentication>
- <jbsx:login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule" flag="required"/>
</jbsx:authentication>
<jbsx:authorization>
<jbsx:policy-module code="org.jboss.security.authorization.modules.DelegatingAuthorizationModule" flag="required"/>
</jbsx:authorization>
</jbsx:application-policy>
- <jbsx:application-policy name="jboss-ejb-policy">
+ <jbsx:application-policy name="jboss-ejb-policy" extends="other">
<jbsx:authentication>
- <jbsx:login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule" flag="required"/>
</jbsx:authentication>
<jbsx:authorization>
<jbsx:policy-module code="org.jboss.security.authorization.modules.DelegatingAuthorizationModule" flag="required"/>
Modified: trunk/server/src/main/org/jboss/ejb/deployers/EjbDeployer.java
===================================================================
--- trunk/server/src/main/org/jboss/ejb/deployers/EjbDeployer.java 2007-10-02 19:04:57 UTC (rev 65768)
+++ trunk/server/src/main/org/jboss/ejb/deployers/EjbDeployer.java 2007-10-02 19:17:34 UTC (rev 65769)
@@ -173,12 +173,8 @@
throws DeploymentException
{
// TODO: use BeanVerifier to validate the metadata in the DDs
- if (deployment.getEjbVersion() > 2) return; // let EJB3 deployer handle this
+ if (deployment.getEjbVersion() > 2) return; // let EJB3 deployer handle this
- // TODO What is this hack?
- // if(unit.getName().startsWith("jboss:") && unit.getName().contains("id="))
- // return;
-
ServiceMetaData ejbModule = new ServiceMetaData();
ejbModule.setCode(EjbModule.class.getName());
Modified: trunk/server/src/resources/schema/security-config_5_0.xsd
===================================================================
--- trunk/server/src/resources/schema/security-config_5_0.xsd 2007-10-02 19:04:57 UTC (rev 65768)
+++ trunk/server/src/resources/schema/security-config_5_0.xsd 2007-10-02 19:17:34 UTC (rev 65769)
@@ -45,6 +45,7 @@
<xsd:element ref="jbsx:identity-trust" minOccurs="0"/>
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required"/>
+ <xsd:attribute name="extends" type="xsd:string"/>
</xsd:complexType>
</xsd:element>
<xsd:element name="authentication" type="jbsx:authenticationInfo"/>
@@ -81,7 +82,7 @@
</xsd:appinfo>
</xsd:annotation>
<xsd:sequence>
- <xsd:element ref="jbsx:policy-module"/>
+ <xsd:element ref="jbsx:policy-module" maxOccurs="unbounded"/>
</xsd:sequence>
</xsd:complexType>
<xsd:complexType name="roleMappingInfo">
@@ -92,7 +93,7 @@
</xsd:appinfo>
</xsd:annotation>
<xsd:sequence>
- <xsd:element ref="jbsx:mapping-module"/>
+ <xsd:element ref="jbsx:mapping-module" maxOccurs="unbounded"/>
</xsd:sequence>
</xsd:complexType>
<xsd:complexType name="auditInfo">
@@ -102,7 +103,7 @@
</xsd:appinfo>
</xsd:annotation>
<xsd:sequence>
- <xsd:element ref="jbsx:provider-module"/>
+ <xsd:element ref="jbsx:provider-module" maxOccurs="unbounded"/>
</xsd:sequence>
</xsd:complexType>
<xsd:complexType name="identityTrustInfo">
@@ -112,7 +113,7 @@
</xsd:appinfo>
</xsd:annotation>
<xsd:sequence>
- <xsd:element ref="jbsx:trust-module"/>
+ <xsd:element ref="jbsx:trust-module" maxOccurs="unbounded"/>
</xsd:sequence>
</xsd:complexType>
Modified: trunk/tomcat/src/resources/war-deployers-all-beans.xml
===================================================================
--- trunk/tomcat/src/resources/war-deployers-all-beans.xml 2007-10-02 19:04:57 UTC (rev 65768)
+++ trunk/tomcat/src/resources/war-deployers-all-beans.xml 2007-10-02 19:17:34 UTC (rev 65769)
@@ -69,7 +69,7 @@
<!-- The JAAS security domain to use in the absense of an explicit
security-domain specification in the war WEB-INF/jboss-web.xml
-->
- <property name="defaultSecurityDomain">java:/jaas/other</property>
+ <property name="defaultSecurityDomain">java:/jaas/jboss-web-policy</property>
<!-- Get the flag indicating if the normal Java2 parent first class
loading model should be used over the servlet 2.3 web container first
Modified: trunk/tomcat/src/resources/war-deployers-beans.xml
===================================================================
--- trunk/tomcat/src/resources/war-deployers-beans.xml 2007-10-02 19:04:57 UTC (rev 65768)
+++ trunk/tomcat/src/resources/war-deployers-beans.xml 2007-10-02 19:17:34 UTC (rev 65769)
@@ -93,7 +93,7 @@
<!-- The JAAS security domain to use in the absense of an explicit
security-domain specification in the war WEB-INF/jboss-web.xml
-->
- <property name="defaultSecurityDomain">java:/jaas/other</property>
+ <property name="defaultSecurityDomain">java:/jaas/jboss-web-policy</property>
<!-- Get the flag indicating if the normal Java2 parent first class
loading model should be used over the servlet 2.3 web container first
More information about the jboss-cvs-commits
mailing list