You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2004/11/10 02:34:39 UTC
svn commit: rev 57116 - in geronimo/trunk/modules: assembly assembly/src/plan axis j2ee-schema/src/java/org/apache/geronimo/schema jetty-builder jetty-builder/src/java/org/apache/geronimo/jetty/deployment jetty-builder/src/schema security security-builder security-builder/src security-builder/src/java security-builder/src/java/org security-builder/src/java/org/apache security-builder/src/java/org/apache/geronimo security-builder/src/java/org/apache/geronimo/security security-builder/src/java/org/apache/geronimo/security/deployment security-builder/src/schema security/src/java/org/apache/geronimo/security/jacc security/src/schema
Author: djencks
Date: Tue Nov 9 17:34:38 2004
New Revision: 57116
Added:
geronimo/trunk/modules/security-builder/
geronimo/trunk/modules/security-builder/locator.ent
- copied unchanged from rev 56984, geronimo/trunk/modules/security/locator.ent
geronimo/trunk/modules/security-builder/maven.xml
- copied unchanged from rev 56984, geronimo/trunk/modules/security/maven.xml
geronimo/trunk/modules/security-builder/project.properties
- copied unchanged from rev 56984, geronimo/trunk/modules/security/project.properties
geronimo/trunk/modules/security-builder/project.xml
- copied, changed from rev 56984, geronimo/trunk/modules/security/project.xml
geronimo/trunk/modules/security-builder/src/
geronimo/trunk/modules/security-builder/src/java/
geronimo/trunk/modules/security-builder/src/java/org/
geronimo/trunk/modules/security-builder/src/java/org/apache/
geronimo/trunk/modules/security-builder/src/java/org/apache/geronimo/
geronimo/trunk/modules/security-builder/src/java/org/apache/geronimo/security/
geronimo/trunk/modules/security-builder/src/java/org/apache/geronimo/security/deployment/
geronimo/trunk/modules/security-builder/src/schema/
- copied from rev 56984, geronimo/trunk/modules/security/src/schema/
geronimo/trunk/modules/security-builder/src/schema/geronimo-security.xsd
- copied, changed from rev 57115, geronimo/trunk/modules/security/src/schema/geronimo-security.xsd
geronimo/trunk/modules/security-builder/src/schema/xmlconfig.xml
- copied unchanged from rev 57115, geronimo/trunk/modules/security/src/schema/xmlconfig.xml
Removed:
geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jacc/EJBModuleConfiguration.java
geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jacc/WebModuleConfiguration.java
geronimo/trunk/modules/security/src/schema/
Modified:
geronimo/trunk/modules/assembly/project.xml
geronimo/trunk/modules/assembly/src/plan/j2ee-deployer-plan.xml
geronimo/trunk/modules/assembly/src/plan/j2ee-server-plan.xml
geronimo/trunk/modules/axis/project.xml
geronimo/trunk/modules/j2ee-schema/src/java/org/apache/geronimo/schema/SchemaConversionUtils.java
geronimo/trunk/modules/jetty-builder/project.xml
geronimo/trunk/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java
geronimo/trunk/modules/jetty-builder/src/schema/geronimo-jetty.xsd
geronimo/trunk/modules/jetty-builder/src/schema/xmlconfig.xml
geronimo/trunk/modules/security/maven.xml
Log:
GERONIMO 464 and 402. Split security and openejb deployment code into separate modules
Modified: geronimo/trunk/modules/assembly/project.xml
==============================================================================
--- geronimo/trunk/modules/assembly/project.xml (original)
+++ geronimo/trunk/modules/assembly/project.xml Tue Nov 9 17:34:38 2004
@@ -240,6 +240,15 @@
<dependency>
<groupId>geronimo</groupId>
+ <artifactId>geronimo-security-builder</artifactId>
+ <version>${pom.currentVersion}</version>
+ <properties>
+ <repository>true</repository>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <groupId>geronimo</groupId>
<artifactId>geronimo-derby</artifactId>
<version>${pom.currentVersion}</version>
<properties>
@@ -578,6 +587,15 @@
<dependency>
<groupId>openejb</groupId>
<artifactId>openejb-core</artifactId>
+ <version>&openejb-version;</version>
+ <properties>
+ <repository>true</repository>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <groupId>openejb</groupId>
+ <artifactId>openejb-builder</artifactId>
<version>&openejb-version;</version>
<properties>
<repository>true</repository>
Modified: geronimo/trunk/modules/assembly/src/plan/j2ee-deployer-plan.xml
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/j2ee-deployer-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/j2ee-deployer-plan.xml Tue Nov 9 17:34:38 2004
@@ -49,6 +49,12 @@
<uri>geronimo/jars/geronimo-client-builder-${geronimo_version}.jar</uri>
</dependency>
<dependency>
+ <uri>geronimo/jars/geronimo-security-builder-${geronimo_version}.jar</uri>
+ </dependency>
+ <dependency>
+ <uri>openejb/jars/openejb-builder-${openejb_version}.jar</uri>
+ </dependency>
+ <dependency>
<uri>xmlbeans/jars/xbean-apache-${xmlbeans_version}.jar</uri>
</dependency>
@@ -102,9 +108,6 @@
</dependency>
<dependency>
<uri>geronimo/jars/geronimo-client-${geronimo_version}.jar</uri>
- </dependency>
- <dependency>
- <uri>geronimo/jars/geronimo-client-builder-${geronimo_version}.jar</uri>
</dependency>
<gbean name="geronimo.deployment:role=Deployer,config=org/apache/geronimo/J2EEDeployer" class="org.apache.geronimo.deployment.Deployer">
Modified: geronimo/trunk/modules/assembly/src/plan/j2ee-server-plan.xml
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/j2ee-server-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/j2ee-server-plan.xml Tue Nov 9 17:34:38 2004
@@ -54,6 +54,12 @@
<uri>geronimo/jars/geronimo-client-builder-${geronimo_version}.jar</uri>
</dependency>
<dependency>
+ <uri>geronimo/jars/geronimo-security-builder-${geronimo_version}.jar</uri>
+ </dependency>
+ <dependency>
+ <uri>openejb/jars/openejb-builder-${openejb_version}.jar</uri>
+ </dependency>
+ <dependency>
<uri>xmlbeans/jars/xbean-apache-${xmlbeans_version}.jar</uri>
</dependency>
Modified: geronimo/trunk/modules/axis/project.xml
==============================================================================
--- geronimo/trunk/modules/axis/project.xml (original)
+++ geronimo/trunk/modules/axis/project.xml Tue Nov 9 17:34:38 2004
@@ -331,7 +331,15 @@
<module>true</module>
</properties>
</dependency>
- </dependencies>
+ <dependency>
+ <groupId>openejb</groupId>
+ <artifactId>openejb-builder</artifactId>
+ <version>&openejb-version;</version>
+ <properties>
+ <module>true</module>
+ </properties>
+ </dependency>
+ </dependencies>
<!-- =================== -->
Modified: geronimo/trunk/modules/j2ee-schema/src/java/org/apache/geronimo/schema/SchemaConversionUtils.java
==============================================================================
--- geronimo/trunk/modules/j2ee-schema/src/java/org/apache/geronimo/schema/SchemaConversionUtils.java (original)
+++ geronimo/trunk/modules/j2ee-schema/src/java/org/apache/geronimo/schema/SchemaConversionUtils.java Tue Nov 9 17:34:38 2004
@@ -41,8 +41,9 @@
static final String J2EE_NAMESPACE = "http://java.sun.com/xml/ns/j2ee";
static final String GERONIMO_NAMING_NAMESPACE = "http://geronimo.apache.org/xml/ns/naming";
- static final String GERONIMO_NAMING_NAMESPACE_L0CATION = "http://geronimo.apache.org/xml/ns/naming_1_4.xsd";
+// static final String GERONIMO_NAMING_NAMESPACE_L0CATION = "http://geronimo.apache.org/xml/ns/naming_1_4.xsd";
private static final QName TAGLIB = new QName(J2EE_NAMESPACE, "taglib");
+ private static final String GERONIMO_SECURITY_NAMESPACE = "http://geronimo.apache.org/xml/ns/security";
private SchemaConversionUtils() {
}
@@ -227,32 +228,53 @@
}
public static XmlObject convertToGeronimoNamingSchema(XmlObject xmlObject) {
- XmlCursor cursor = xmlObject.newCursor();
- XmlCursor end = xmlObject.newCursor();
- String version = "1.0";
- try {
- while (cursor.hasNextToken()) {
- if (cursor.isStart()) {
- String localName = cursor.getName().getLocalPart();
- if (localName.equals("ejb-ref")
- || localName.equals("ejb-local-ref")
- || localName.equals("resource-ref")
- || localName.equals("resource-env-ref")
- || localName.equals("cmp-connection-factory")
- || localName.equals("resource-adapter")) {
- convertElementToSchema(cursor, end, GERONIMO_NAMING_NAMESPACE);
- }
- }
- cursor.toNextToken();
- }
- } finally {
- cursor.dispose();
- end.dispose();
- }
- return xmlObject;
- }
+ XmlCursor cursor = xmlObject.newCursor();
+ XmlCursor end = xmlObject.newCursor();
+ String version = "1.0";
+ try {
+ while (cursor.hasNextToken()) {
+ if (cursor.isStart()) {
+ String localName = cursor.getName().getLocalPart();
+ if (localName.equals("ejb-ref")
+ || localName.equals("ejb-local-ref")
+ || localName.equals("resource-ref")
+ || localName.equals("resource-env-ref")
+ || localName.equals("cmp-connection-factory")
+ || localName.equals("resource-adapter")) {
+ convertElementToSchema(cursor, end, GERONIMO_NAMING_NAMESPACE);
+ }
+ }
+ cursor.toNextToken();
+ }
+ } finally {
+ cursor.dispose();
+ end.dispose();
+ }
+ return xmlObject;
+ }
+
+ public static XmlObject convertToGeronimoSecuritySchema(XmlObject xmlObject) {
+ XmlCursor cursor = xmlObject.newCursor();
+ XmlCursor end = xmlObject.newCursor();
+ String version = "1.0";
+ try {
+ while (cursor.hasNextToken()) {
+ if (cursor.isStart()) {
+ String localName = cursor.getName().getLocalPart();
+ if (localName.equals("security")) {
+ convertElementToSchema(cursor, end, GERONIMO_SECURITY_NAMESPACE);
+ }
+ }
+ cursor.toNextToken();
+ }
+ } finally {
+ cursor.dispose();
+ end.dispose();
+ }
+ return xmlObject;
+ }
- public static XmlObject getNestedObjectAsType(XmlObject xmlObject, String desiredElement, SchemaType type) {
+ public static XmlObject getNestedObjectAsType(XmlObject xmlObject, String desiredElement, SchemaType type) {
XmlCursor cursor = xmlObject.newCursor();
try {
while (cursor.hasNextToken()) {
Modified: geronimo/trunk/modules/jetty-builder/project.xml
==============================================================================
--- geronimo/trunk/modules/jetty-builder/project.xml (original)
+++ geronimo/trunk/modules/jetty-builder/project.xml Tue Nov 9 17:34:38 2004
@@ -110,6 +110,12 @@
<groupId>geronimo</groupId>
<artifactId>geronimo-security</artifactId>
<version>${pom.currentVersion}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-security-builder</artifactId>
+ <version>${pom.currentVersion}</version>
<properties>
<xmlbeans>true</xmlbeans>
</properties>
Modified: geronimo/trunk/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java
==============================================================================
--- geronimo/trunk/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java (original)
+++ geronimo/trunk/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java Tue Nov 9 17:34:38 2004
@@ -52,20 +52,11 @@
import org.apache.geronimo.naming.deployment.GBeanResourceEnvironmentBuilder;
import org.apache.geronimo.naming.java.ReadOnlyContext;
import org.apache.geronimo.schema.SchemaConversionUtils;
-import org.apache.geronimo.security.deploy.DefaultPrincipal;
-import org.apache.geronimo.security.deploy.Principal;
-import org.apache.geronimo.security.deploy.Realm;
-import org.apache.geronimo.security.deploy.Role;
import org.apache.geronimo.security.deploy.Security;
+import org.apache.geronimo.security.deployment.SecurityBuilder;
import org.apache.geronimo.transaction.OnlineUserTransaction;
-import org.apache.geronimo.xbeans.geronimo.jetty.JettyDefaultPrincipalType;
import org.apache.geronimo.xbeans.geronimo.jetty.JettyDependencyType;
import org.apache.geronimo.xbeans.geronimo.jetty.JettyGbeanType;
-import org.apache.geronimo.xbeans.geronimo.jetty.JettyPrincipalType;
-import org.apache.geronimo.xbeans.geronimo.jetty.JettyRealmType;
-import org.apache.geronimo.xbeans.geronimo.jetty.JettyRoleMappingsType;
-import org.apache.geronimo.xbeans.geronimo.jetty.JettyRoleType;
-import org.apache.geronimo.xbeans.geronimo.jetty.JettySecurityType;
import org.apache.geronimo.xbeans.geronimo.jetty.JettyWebAppDocument;
import org.apache.geronimo.xbeans.geronimo.jetty.JettyWebAppType;
import org.apache.geronimo.xbeans.j2ee.FilterMappingType;
@@ -180,6 +171,7 @@
// if we got one extract and validate it otherwise create a default one
if (jettyWebApp != null) {
jettyWebApp = (JettyWebAppType) SchemaConversionUtils.convertToGeronimoNamingSchema(jettyWebApp);
+ jettyWebApp = (JettyWebAppType) SchemaConversionUtils.convertToGeronimoSecuritySchema(jettyWebApp);
SchemaConversionUtils.validateDD(jettyWebApp);
} else {
String path;
@@ -304,7 +296,7 @@
UserTransaction userTransaction = new OnlineUserTransaction();
ReadOnlyContext compContext = buildComponentContext(earContext, webModule, webApp, jettyWebApp, userTransaction, webClassLoader);
- Security security = buildSecurityConfig(jettyWebApp);
+ Security security = SecurityBuilder.buildSecurityConfig(jettyWebApp.getSecurity());
GBeanMBean gbean;
try {
@@ -386,63 +378,6 @@
webApp.getResourceEnvRefArray(), jettyWebApp.getResourceEnvRefArray(),
webApp.getMessageDestinationRefArray(),
cl);
- }
-
-
- private static Security buildSecurityConfig(JettyWebAppType jettyWebApp) {
- Security security = null;
-
- JettySecurityType securityType = jettyWebApp.getSecurity();
- if (securityType != null) {
- security = new Security();
-
- security.setUseContextHandler(securityType.getUseContextHandler());
-
- JettyDefaultPrincipalType defaultPrincipalType = securityType.getDefaultPrincipal();
- DefaultPrincipal defaultPrincipal = new DefaultPrincipal();
-
- defaultPrincipal.setRealmName(defaultPrincipalType.getRealmName());
- defaultPrincipal.setPrincipal(buildPrincipal(defaultPrincipalType.getPrincipal()));
-
- security.setDefaultPrincipal(defaultPrincipal);
-
- JettyRoleMappingsType roleMappingsType = securityType.getRoleMappings();
- if (roleMappingsType != null) {
- for (int i = 0; i < roleMappingsType.sizeOfRoleArray(); i++) {
- JettyRoleType roleType = roleMappingsType.getRoleArray(i);
- Role role = new Role();
-
- role.setRoleName(roleType.getRoleName());
-
- for (int j = 0; j < roleType.sizeOfRealmArray(); j++) {
- JettyRealmType realmType = roleType.getRealmArray(j);
- Realm realm = new Realm();
-
- realm.setRealmName(realmType.getRealmName());
-
- for (int k = 0; k < realmType.sizeOfPrincipalArray(); k++) {
- realm.getPrincipals().add(buildPrincipal(realmType.getPrincipalArray(k)));
- }
-
- role.getRealms().add(realm);
- }
-
- security.getRoleMappings().add(role);
- }
- }
- }
-
- return security;
- }
-
- private static Principal buildPrincipal(JettyPrincipalType principalType) {
- Principal principal = new Principal();
-
- principal.setClassName(principalType.getClass1());
- principal.setPrincipalName(principalType.getName());
- principal.setDesignatedRunAs(principalType.isSetDesignatedRunAs());
-
- return principal;
}
Modified: geronimo/trunk/modules/jetty-builder/src/schema/geronimo-jetty.xsd
==============================================================================
--- geronimo/trunk/modules/jetty-builder/src/schema/geronimo-jetty.xsd (original)
+++ geronimo/trunk/modules/jetty-builder/src/schema/geronimo-jetty.xsd Tue Nov 9 17:34:38 2004
@@ -20,16 +20,17 @@
xmlns:jetty="http://geronimo.apache.org/xml/ns/web/jetty"
targetNamespace="http://geronimo.apache.org/xml/ns/web/jetty"
xmlns:naming="http://geronimo.apache.org/xml/ns/naming"
- xmlns:sec="http://geronimo.apache.org/xml/ns/security"
+ xmlns:security="http://geronimo.apache.org/xml/ns/security"
xmlns:xs="http://www.w3.org/2001/XMLSchema"
elementFormDefault="qualified"
attributeFormDefault="unqualified"
version="1.0">
<xs:import namespace="http://geronimo.apache.org/xml/ns/naming" schemaLocation="../../../naming/src/schema/geronimo-naming.xsd"/>
+ <xs:import namespace="http://geronimo.apache.org/xml/ns/security" schemaLocation="../../../naming/src/schema/geronimo-security.xsd"/>
<xs:include schemaLocation="../../../deployment/src/schema/geronimo-common.xsd"/>
- <xs:include schemaLocation="../../../security/src/schema/geronimo-security.xsd"/>
+<!-- <xs:include schemaLocation="../../../security/src/schema/geronimo-security.xsd"/>-->
<xs:element name="web-app" type="jetty:web-appType"/>
@@ -41,7 +42,7 @@
<xs:element name="context-priority-classloader" type="xs:boolean"/>
- <xs:element name="security" type="jetty:securityType" minOccurs="0"/>
+ <xs:element ref="security:security" minOccurs="0"/>
<xs:element name="gbean" type="jetty:gbeanType" minOccurs="0" maxOccurs="unbounded"/>
Modified: geronimo/trunk/modules/jetty-builder/src/schema/xmlconfig.xml
==============================================================================
--- geronimo/trunk/modules/jetty-builder/src/schema/xmlconfig.xml (original)
+++ geronimo/trunk/modules/jetty-builder/src/schema/xmlconfig.xml Tue Nov 9 17:34:38 2004
@@ -24,9 +24,9 @@
</xb:namespace>
<!--this should be unnecessary. Probably needs xmlbeans plugin to reuse the naming classes rather than generating duplicates-->
- <xb:namespace uri="http://geronimo.apache.org/xml/ns/naming">
- <xb:package>org.apache.geronimo.xbeans.geronimo.naming</xb:package>
- <xb:prefix>Ger</xb:prefix>
- </xb:namespace>
+<!-- <xb:namespace uri="http://geronimo.apache.org/xml/ns/naming">-->
+<!-- <xb:package>org.apache.geronimo.xbeans.geronimo.naming</xb:package>-->
+<!-- <xb:prefix>Ger</xb:prefix>-->
+<!-- </xb:namespace>-->
</xb:config>
Copied: geronimo/trunk/modules/security-builder/project.xml (from rev 56984, geronimo/trunk/modules/security/project.xml)
==============================================================================
--- geronimo/trunk/modules/security/project.xml (original)
+++ geronimo/trunk/modules/security-builder/project.xml Tue Nov 9 17:34:38 2004
@@ -32,9 +32,9 @@
<!-- Module Identification -->
<!-- ===================== -->
- <name>Geronimo :: Security</name>
- <id>geronimo-security</id>
- <shortDescription>Geronimo Security</shortDescription>
+ <name>Geronimo :: Security :: Builder</name>
+ <id>geronimo-security-builder</id>
+ <shortDescription>Geronimo Security Builder</shortDescription>
<description>Geronimo Security</description>
<url>http://incubator.apache.org/projects/geronimo/security/</url>
<siteDirectory>/www/incubator.apache.org/projects/geronimo/security</siteDirectory>
@@ -62,12 +62,18 @@
</dependency>
<dependency>
- <groupId>geronimo</groupId>
- <artifactId>geronimo-core</artifactId>
- <version>${pom.currentVersion}</version>
- </dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-security</artifactId>
+ <version>${pom.currentVersion}</version>
+ </dependency>
<dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-core</artifactId>
+ <version>${pom.currentVersion}</version>
+ </dependency>
+
+ <dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-common</artifactId>
<version>${pom.currentVersion}</version>
Copied: geronimo/trunk/modules/security-builder/src/schema/geronimo-security.xsd (from rev 57115, geronimo/trunk/modules/security/src/schema/geronimo-security.xsd)
==============================================================================
--- geronimo/trunk/modules/security/src/schema/geronimo-security.xsd (original)
+++ geronimo/trunk/modules/security-builder/src/schema/geronimo-security.xsd Tue Nov 9 17:34:38 2004
@@ -19,13 +19,15 @@
<xsd:schema
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:j2ee="http://java.sun.com/xml/ns/j2ee"
+ xmlns:geronimo="http://geronimo.apache.org/xml/ns/security"
+ targetNamespace="http://geronimo.apache.org/xml/ns/security"
elementFormDefault="qualified"
attributeFormDefault="unqualified"
version="1.0">
<xsd:import namespace="http://java.sun.com/xml/ns/j2ee" schemaLocation="j2ee_1_4.xsd"/>
- <xsd:element name="security" type="securityType"/>
+ <xsd:element name="security" type="geronimo:securityType"/>
<xsd:complexType name="securityType">
<xsd:annotation>
@@ -38,8 +40,8 @@
</xsd:annotation>
<xsd:sequence>
<xsd:element name="description" type="j2ee:descriptionType" minOccurs="0" maxOccurs="unbounded"/>
- <xsd:element name="default-principal" type="default-principalType"/>
- <xsd:element name="role-mappings" type="role-mappingsType" minOccurs="0"/>
+ <xsd:element name="default-principal" type="geronimo:default-principalType"/>
+ <xsd:element name="role-mappings" type="geronimo:role-mappingsType" minOccurs="0"/>
</xsd:sequence>
<xsd:attribute name="doas-current-caller" type="xsd:boolean" default="false">
<xsd:annotation>
@@ -57,30 +59,41 @@
</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
+ <xsd:attribute name="default-role" type="xsd:string">
+ <xsd:annotation>
+ <xsd:documentation>
+ Used by the the Deployer to assign method permissions for
+ all of the unspecified methods, either by assigning them
+ to security roles, or by marking them as unchecked. If
+ the value of default-role is empty, then the unspecified
+ methods are marked unchec
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:attribute>
</xsd:complexType>
<xsd:complexType name="default-principalType">
<xsd:sequence>
<xsd:element name="description" type="j2ee:descriptionType" minOccurs="0" maxOccurs="unbounded"/>
- <xsd:element name="principal" type="principalType"/>
+ <xsd:element name="principal" type="geronimo:principalType"/>
</xsd:sequence>
<xsd:attribute name="realm-name" type="xsd:string" use="required"/>
</xsd:complexType>
<xsd:complexType name="role-mappingsType">
<xsd:sequence>
- <xsd:element name="role" type="roleType" minOccurs="1" maxOccurs="unbounded"/>
+ <xsd:element name="role" type="geronimo:roleType" minOccurs="1" maxOccurs="unbounded"/>
</xsd:sequence>
</xsd:complexType>
<xsd:complexType name="roleType">
<xsd:sequence>
<xsd:element name="description" type="j2ee:descriptionType" minOccurs="0" maxOccurs="unbounded"/>
- <xsd:element name="realm" type="realmType" minOccurs="1" maxOccurs="unbounded"/>
+ <xsd:element name="realm" type="geronimo:realmType" minOccurs="1" maxOccurs="unbounded"/>
</xsd:sequence>
<xsd:attribute name="role-name" type="xsd:string" use="required"/>
</xsd:complexType>
<xsd:complexType name="realmType">
<xsd:sequence>
<xsd:element name="description" type="j2ee:descriptionType" minOccurs="0" maxOccurs="unbounded"/>
- <xsd:element name="principal" type="principalType" minOccurs="1" maxOccurs="unbounded"/>
+ <xsd:element name="principal" type="geronimo:principalType" minOccurs="1" maxOccurs="unbounded"/>
</xsd:sequence>
<xsd:attribute name="realm-name" type="xsd:string" use="required"/>
</xsd:complexType>
Modified: geronimo/trunk/modules/security/maven.xml
==============================================================================
--- geronimo/trunk/modules/security/maven.xml (original)
+++ geronimo/trunk/modules/security/maven.xml Tue Nov 9 17:34:38 2004
@@ -22,21 +22,12 @@
<project default="default"
xmlns:j="jelly:core"
xmlns:ant="jelly:ant"
- xmlns:maven="jelly:maven"
- xmlns:xmlbeans="geronimo:xmlbeans">
+ xmlns:maven="jelly:maven">
<preGoal name="xdoc:jelly-transform">
<attainGoal name="html2xdoc"/>
</preGoal>
- <preGoal name="java:compile">
- <xmlbeans:schema2java
- sourcedir="${basedir}/src"
- sourceschema="schema/geronimo-security.xsd"
- xmlconfigs="${basedir}/src/schema/xmlconfig.xml"
- targetdir="${basedir}/target/xmlbeans"
- cataloglocation="${basedir}/../j2ee-schema/src/catalog/resolver-catalog.xml"/>
- </preGoal>
<!-- Set up the test files -->
<postGoal name="test:test-resources">