djencks 2004/11/10 02:23:24
Modified: modules/openejb-builder/src/java/org/openejb/deployment
CMPEntityBuilder.java OpenEJBModuleBuilder.java
SecurityBuilder.java
Log:
2nd try on separate security and openejb builders
Revision Changes Path
1.3 +11 -11
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CMPEntityBuilder.java 10 Nov 2004 04:38:31 -0000 1.2
+++ CMPEntityBuilder.java 10 Nov 2004 07:23:24 -0000 1.3
@@ -86,7 +86,7 @@
import org.openejb.xbeans.ejbjar.OpenejbEntityBeanType.CmpFieldMapping;
import org.openejb.xbeans.ejbjar.OpenejbOpenejbJarType;
import org.openejb.xbeans.ejbjar.OpenejbQueryType;
-//import org.openejb.entity.cmp.PrimaryKeyGeneratorWrapper;
+import org.openejb.entity.cmp.PrimaryKeyGeneratorWrapper;
import org.tranql.cache.GlobalSchema;
import org.tranql.cache.GlobalSchemaLoader;
import org.tranql.ejb.CMPField;
@@ -219,16 +219,16 @@
if ( null == keyGeneratorDelegate ) {
keyGeneratorDelegate = new PrimaryKeyGeneratorDelegate();
ObjectName wrapperGeneratorObjectName;
-// GBeanMBean keyGenerator = new
GBeanMBean(PrimaryKeyGeneratorWrapper.GBEAN_INFO, cl);
-// try {
-// ObjectName generatorObjectName = new
ObjectName(generatorName);
-// wrapperGeneratorObjectName = new
ObjectName(generatorName + ",isWrapper=true");
-//
keyGenerator.setReferencePatterns("PrimaryKeyGenerator",
Collections.singleton(generatorObjectName));
-//
keyGenerator.setAttribute("primaryKeyGeneratorDelegate", keyGeneratorDelegate);
-// } catch (Exception e) {
-// throw new DeploymentException("Unable to
initialize PrimaryKeyGeneratorWrapper GBean", e);
-// }
-// earContext.addGBean(wrapperGeneratorObjectName,
keyGenerator);
+ GBeanMBean keyGenerator = new
GBeanMBean(PrimaryKeyGeneratorWrapper.GBEAN_INFO, cl);
+ try {
+ ObjectName generatorObjectName = new
ObjectName(generatorName);
+ wrapperGeneratorObjectName = new
ObjectName(generatorName + ",isWrapper=true");
+
keyGenerator.setReferencePatterns("PrimaryKeyGenerator",
Collections.singleton(generatorObjectName));
+
keyGenerator.setAttribute("primaryKeyGeneratorDelegate", keyGeneratorDelegate);
+ } catch (Exception e) {
+ throw new DeploymentException("Unable to initialize
PrimaryKeyGeneratorWrapper GBean", e);
+ }
+ earContext.addGBean(wrapperGeneratorObjectName,
keyGenerator);
keyGenerators.put(generatorName, keyGeneratorDelegate);
}
1.3 +2 -2
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- OpenEJBModuleBuilder.java 10 Nov 2004 04:38:31 -0000 1.2
+++ OpenEJBModuleBuilder.java 10 Nov 2004 07:23:24 -0000 1.3
@@ -425,7 +425,7 @@
transactionPolicyHelper = new TransactionPolicyHelper();
}
- Security security =
securityBuilder.buildSecurityConfig(openejbEjbJar);
+ Security security =
org.apache.geronimo.security.deployment.SecurityBuilder.buildSecurityConfig(openejbEjbJar.getSecurity());
EnterpriseBeansType enterpriseBeans = ejbJar.getEnterpriseBeans();
1.3 +0 -66
openejb/modules/openejb-builder/src/java/org/openejb/deployment/SecurityBuilder.java
Index: SecurityBuilder.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/java/org/openejb/deployment/SecurityBuilder.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SecurityBuilder.java 10 Nov 2004 03:15:39 -0000 1.2
+++ SecurityBuilder.java 10 Nov 2004 07:23:24 -0000 1.3
@@ -76,15 +76,7 @@
import org.apache.geronimo.xbeans.j2ee.RoleNameType;
import org.apache.geronimo.xbeans.j2ee.SecurityIdentityType;
import org.apache.geronimo.xbeans.j2ee.SecurityRoleRefType;
-import org.apache.geronimo.xbeans.geronimo.security.GerSecurityType;
-import org.apache.geronimo.xbeans.geronimo.security.GerDefaultPrincipalType;
-import org.apache.geronimo.xbeans.geronimo.security.GerRoleMappingsType;
-import org.apache.geronimo.xbeans.geronimo.security.GerRoleType;
-import org.apache.geronimo.xbeans.geronimo.security.GerRealmType;
-import org.apache.geronimo.xbeans.geronimo.security.GerPrincipalType;
-
import org.openejb.security.SecurityConfiguration;
-import org.openejb.xbeans.ejbjar.OpenejbOpenejbJarType;
class SecurityBuilder {
@@ -96,64 +88,6 @@
this.moduleBuilder = moduleBuilder;
}
-
- public Security buildSecurityConfig(OpenejbOpenejbJarType openejbEjbJar)
{
- Security security = null;
-
- GerSecurityType securityType = openejbEjbJar.getSecurity();
- if (securityType != null) {
- security = new Security();
-
-
security.setDoAsCurrentCaller(securityType.getDoasCurrentCaller());
-
security.setUseContextHandler(securityType.getUseContextHandler());
- security.setDefaultRole(securityType.getDefaultRole());
-
- GerDefaultPrincipalType defaultPrincipalType =
securityType.getDefaultPrincipal();
- DefaultPrincipal defaultPrincipal = new DefaultPrincipal();
-
-
defaultPrincipal.setRealmName(defaultPrincipalType.getRealmName());
-
defaultPrincipal.setPrincipal(buildPrincipal(defaultPrincipalType.getPrincipal()));
-
- security.setDefaultPrincipal(defaultPrincipal);
-
- GerRoleMappingsType roleMappingsType =
securityType.getRoleMappings();
- if (roleMappingsType != null) {
- for (int i = 0; i < roleMappingsType.sizeOfRoleArray(); i++)
{
- GerRoleType roleType = roleMappingsType.getRoleArray(i);
- Role role = new Role();
-
- role.setRoleName(roleType.getRoleName());
-
- for (int j = 0; j < roleType.sizeOfRealmArray(); j++) {
- GerRealmType 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 Principal buildPrincipal(GerPrincipalType principalType) {
- Principal principal = new Principal();
-
- principal.setClassName(principalType.getClass1());
- principal.setPrincipalName(principalType.getName());
- principal.setDesignatedRunAs(principalType.isSetDesignatedRunAs());
-
- return principal;
- }
/**
* Fill the container moduleBuilder with the security information that
it needs
