You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by db...@apache.org on 2007/03/23 11:23:20 UTC

svn commit: r521656 - /geronimo/server/trunk/modules/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbDeploymentBuilder.java

Author: dblevins
Date: Fri Mar 23 03:23:17 2007
New Revision: 521656

URL: http://svn.apache.org/viewvc?view=rev&rev=521656
Log:
Updated for change in openejb jaxb api

Modified:
    geronimo/server/trunk/modules/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbDeploymentBuilder.java

Modified: geronimo/server/trunk/modules/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbDeploymentBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbDeploymentBuilder.java?view=diff&rev=521656&r1=521655&r2=521656
==============================================================================
--- geronimo/server/trunk/modules/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbDeploymentBuilder.java (original)
+++ geronimo/server/trunk/modules/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbDeploymentBuilder.java Fri Mar 23 03:23:17 2007
@@ -179,14 +179,14 @@
         if (enterpriseBean instanceof RemoteBean) {
             RemoteBean remoteBean = (RemoteBean) enterpriseBean;
 
-            SecurityBuilder xmlBeansSecurityBuilder = new SecurityBuilder();
+            SecurityBuilder securityBuilder = new SecurityBuilder();
             Permissions permissions = new Permissions();
 
             SecurityConfiguration securityConfiguration = (SecurityConfiguration) earContext.getSecurityConfiguration();
             if (securityConfiguration != null) {
                 for (EjbInterface ejbInterface : EjbInterface.values()) {
                     String interfaceName = (String) gbean.getAttribute(ejbInterface.getAttributeName());
-                    xmlBeansSecurityBuilder.addToPermissions(permissions,
+                    securityBuilder.addToPermissions(permissions,
                             enterpriseBean.getEjbName(),
                             ejbInterface.getJaccInterfaceName(),
                             interfaceName,
@@ -194,7 +194,7 @@
                 }
 
                 String defaultRole = securityConfiguration.getDefaultRole();
-                xmlBeansSecurityBuilder.addComponentPermissions(defaultRole,
+                securityBuilder.addComponentPermissions(defaultRole,
                         permissions,
                         ejbModule.getEjbJar().getAssemblyDescriptor(),
                         enterpriseBean.getEjbName(),
@@ -204,7 +204,7 @@
                 // RunAs subject
                 SecurityIdentity securityIdentity = remoteBean.getSecurityIdentity();
                 if (securityIdentity != null && securityIdentity.getRunAs() != null) {
-                    String runAsName = securityIdentity.getRunAs().getRoleName();
+                    String runAsName = securityIdentity.getRunAs();
                     if (runAsName != null) {
                         Subject runAsSubject = (Subject) securityConfiguration.getRoleDesignates().get(runAsName);
                         if (runAsSubject == null) {