maguro 2004/11/18 22:58:59
Modified: modules/openejb-builder/src/java/org/openejb/deployment
CMPEntityBuilder.java ContainerSecurityBuilder.java
EntityBuilder.java MdbBuilder.java
OpenEJBModuleBuilder.java SessionBuilder.java
Log:
Intermediate checkin for http://nagoya.apache.org/jira/browse/GERONIMO-454.
Auto mapping now properly occurs at deploy time.
Revision Changes Path
1.7 +1 -2
openejb/modules/openejb-builder/src/java/org/openejb/deployment/CMPEntityBuilder.java
Index: CMPEntityBuilder.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/java/org/openejb/deployment/CMPEntityBuilder.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- CMPEntityBuilder.java 12 Nov 2004 21:29:21 -0000 1.6
+++ CMPEntityBuilder.java 19 Nov 2004 03:58:59 -0000 1.7
@@ -558,8 +558,7 @@
((EjbJarType) ejbModule.getSpecDD()).getAssemblyDescriptor(),
getString(entityBean.getEjbName()),
entityBean.getSecurityIdentity(),
- entityBean.getSecurityRoleRefArray(),
- getModuleBuilder().getSecurityService());
+ entityBean.getSecurityRoleRefArray());
processEnvironmentRefs(builder, earContext, ejbModule, entityBean,
openejbEntityBean, null, cl);
1.5 +3 -18
openejb/modules/openejb-builder/src/java/org/openejb/deployment/ContainerSecurityBuilder.java
Index: ContainerSecurityBuilder.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/java/org/openejb/deployment/ContainerSecurityBuilder.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ContainerSecurityBuilder.java 15 Nov 2004 06:17:53 -0000 1.4
+++ ContainerSecurityBuilder.java 19 Nov 2004 03:58:59 -0000 1.5
@@ -63,7 +63,6 @@
import org.apache.geronimo.common.GeronimoSecurityException;
import org.apache.geronimo.security.PrimaryRealmPrincipal;
import org.apache.geronimo.security.RealmPrincipal;
-import org.apache.geronimo.security.SecurityService;
import org.apache.geronimo.security.deploy.DefaultPrincipal;
import org.apache.geronimo.security.deploy.Principal;
import org.apache.geronimo.security.deploy.Realm;
@@ -116,8 +115,7 @@
AssemblyDescriptorType
assemblyDescriptor,
String EJBName,
SecurityIdentityType
securityIdentity,
- SecurityRoleRefType[]
roleReferences,
- SecurityService
securityService)
+ SecurityRoleRefType[]
roleReferences)
throws DeploymentException {
if (security == null) return;
@@ -227,7 +225,7 @@
/**
* Set the security interceptor's run-as subject, if one has been
defined.
*/
- addRoleMappings(securityConfiguration, builder, security,
securityIdentity, securityService);
+ addRoleMappings(securityConfiguration, builder, security,
securityIdentity);
/**
* EJB v2.1 section 21.3.2
@@ -322,20 +320,7 @@
protected void addRoleMappings(SecurityConfiguration
securityConfiguration,
SecureBuilder builder,
Security security,
- SecurityIdentityType securityIdentity,
- SecurityService securityService)
- throws DeploymentException {
-
-
- security.autoGenerate(securityService);
- addExplicitMappings(securityConfiguration, builder, security,
securityIdentity);
-
- }
-
- protected void addExplicitMappings(SecurityConfiguration
securityConfiguration,
- SecureBuilder builder,
- Security security,
- SecurityIdentityType securityIdentity)
+ SecurityIdentityType securityIdentity)
throws DeploymentException {
boolean needsRunAs = (securityIdentity != null &&
securityIdentity.getRunAs() != null);
1.5 +1 -2
openejb/modules/openejb-builder/src/java/org/openejb/deployment/EntityBuilder.java
Index: EntityBuilder.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/java/org/openejb/deployment/EntityBuilder.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- EntityBuilder.java 12 Nov 2004 21:29:21 -0000 1.4
+++ EntityBuilder.java 19 Nov 2004 03:58:59 -0000 1.5
@@ -134,8 +134,7 @@
((EjbJarType) ejbModule.getSpecDD()).getAssemblyDescriptor(),
entityBean.getEjbName().getStringValue(),
entityBean.getSecurityIdentity(),
- entityBean.getSecurityRoleRefArray(),
- getModuleBuilder().getSecurityService());
+ entityBean.getSecurityRoleRefArray());
processEnvironmentRefs(builder, earContext, ejbModule, entityBean,
openejbEntityBean, null, cl);
1.5 +1 -2
openejb/modules/openejb-builder/src/java/org/openejb/deployment/MdbBuilder.java
Index: MdbBuilder.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/java/org/openejb/deployment/MdbBuilder.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- MdbBuilder.java 16 Nov 2004 23:07:27 -0000 1.4
+++ MdbBuilder.java 19 Nov 2004 03:58:59 -0000 1.5
@@ -177,8 +177,7 @@
((EjbJarType) ejbModule.getSpecDD()).getAssemblyDescriptor(),
messageDrivenBean.getEjbName().getStringValue(),
messageDrivenBean.getSecurityIdentity(),
- null,
- getModuleBuilder().getSecurityService());
+ null);
UserTransactionImpl userTransaction;
//TODO this is probably wrong???
1.9 +5 -5
openejb/modules/openejb-builder/src/java/org/openejb/deployment/OpenEJBModuleBuilder.java
Index: OpenEJBModuleBuilder.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/java/org/openejb/deployment/OpenEJBModuleBuilder.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- OpenEJBModuleBuilder.java 15 Nov 2004 23:04:40 -0000 1.8
+++ OpenEJBModuleBuilder.java 19 Nov 2004 03:58:59 -0000 1.9
@@ -137,10 +137,6 @@
this.mdbBuilder = new MdbBuilder(this);
}
- public SecurityService getSecurityService() {
- return securityService;
- }
-
public ContainerSecurityBuilder getSecurityBuilder() {
return containerSecurityBuilder;
}
@@ -437,7 +433,11 @@
transactionPolicyHelper = new TransactionPolicyHelper();
}
+ /**
+ * Build the security configuration. Attempt to auto generate role
mappings.
+ */
Security security =
SecurityBuilder.buildSecurityConfig(openejbEjbJar.getSecurity(),
collectRoleNames(ejbJar));
+ if (security != null) security.autoGenerate(securityService);
EnterpriseBeansType enterpriseBeans = ejbJar.getEnterpriseBeans();
1.5 +1 -2
openejb/modules/openejb-builder/src/java/org/openejb/deployment/SessionBuilder.java
Index: SessionBuilder.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/java/org/openejb/deployment/SessionBuilder.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SessionBuilder.java 12 Nov 2004 21:29:21 -0000 1.4
+++ SessionBuilder.java 19 Nov 2004 03:58:59 -0000 1.5
@@ -126,8 +126,7 @@
((EjbJarType) ejbModule.getSpecDD()).getAssemblyDescriptor(),
sessionBean.getEjbName().getStringValue(),
sessionBean.getSecurityIdentity(),
- sessionBean.getSecurityRoleRefArray(),
- getModuleBuilder().getSecurityService());
+ sessionBean.getSecurityRoleRefArray());
UserTransactionImpl userTransaction;
if
("Bean".equals(sessionBean.getTransactionType().getStringValue())) {
