geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r527416 - in /geronimo/server/trunk/modules/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment: EjbDeploymentBuilder.java SecurityBuilder.java
Date Wed, 11 Apr 2007 08:41:04 GMT
Author: djencks
Date: Wed Apr 11 01:41:03 2007
New Revision: 527416

URL: http://svn.apache.org/viewvc?view=rev&rev=527416
Log:
Fix compilation problem with recent openejb change in rev 527392, no apparent jira

Modified:
    geronimo/server/trunk/modules/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbDeploymentBuilder.java
    geronimo/server/trunk/modules/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/SecurityBuilder.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=527416&r1=527415&r2=527416
==============================================================================
--- 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
Wed Apr 11 01:41:03 2007
@@ -18,6 +18,7 @@
 package org.apache.geronimo.openejb.deployment;
 
 import java.security.Permissions;
+import java.security.PermissionCollection;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -182,7 +183,7 @@
             RemoteBean remoteBean = (RemoteBean) enterpriseBean;
 
             SecurityBuilder securityBuilder = new SecurityBuilder();
-            Permissions permissions = new Permissions();
+            PermissionCollection permissions = new Permissions();
 
             SecurityConfiguration securityConfiguration = (SecurityConfiguration) earContext.getSecurityConfiguration();
             if (securityConfiguration != null) {
@@ -211,24 +212,28 @@
                         EjbInterface.SERVICE_ENDPOINT.getJaccInterfaceName(),
                         remoteBean.getLocalHome(),
                         ejbModule.getClassLoader());
-                if (remoteBean.getBusinessRemote() != null) {
-                    securityBuilder.addToPermissions(permissions,
+                if (remoteBean.getBusinessRemote() != null && !remoteBean.getBusinessRemote().isEmpty())
{
+                    for (String businessRemote: remoteBean.getBusinessRemote()) {
+                        securityBuilder.addToPermissions(permissions,
                             remoteBean.getEjbName(),
                             EjbInterface.REMOTE.getJaccInterfaceName(),
-                            remoteBean.getBusinessRemote(),
+                            businessRemote,
                             ejbModule.getClassLoader());
+                    }
                     securityBuilder.addToPermissions(componentPermissions.getUncheckedPermissions(),
                             remoteBean.getEjbName(),
                             EjbInterface.HOME.getJaccInterfaceName(),
                             DeploymentInfo.BusinessRemoteHome.class.getName(),
                             ejbModule.getClassLoader());
                 }
-                if (remoteBean.getBusinessLocal() != null) {
-                    securityBuilder.addToPermissions(permissions,
+                if (remoteBean.getBusinessLocal() != null && !remoteBean.getBusinessLocal().isEmpty())
{
+                    for (String businessLocal: remoteBean.getBusinessLocal()) {
+                        securityBuilder.addToPermissions(permissions,
                             remoteBean.getEjbName(),
                             EjbInterface.LOCAL.getJaccInterfaceName(),
-                            remoteBean.getBusinessLocal(),
+                            businessLocal,
                             ejbModule.getClassLoader());
+                    }
                     securityBuilder.addToPermissions(componentPermissions.getUncheckedPermissions(),
                             remoteBean.getEjbName(),
                             EjbInterface.LOCAL_HOME.getJaccInterfaceName(),

Modified: geronimo/server/trunk/modules/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/SecurityBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/SecurityBuilder.java?view=diff&rev=527416&r1=527415&r2=527416
==============================================================================
--- geronimo/server/trunk/modules/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/SecurityBuilder.java
(original)
+++ geronimo/server/trunk/modules/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/SecurityBuilder.java
Wed Apr 11 01:41:03 2007
@@ -53,7 +53,7 @@
      * @throws DeploymentException if any constraints are violated
      */
     public void addComponentPermissions(String defaultRole,
-            Permissions notAssigned,
+            PermissionCollection notAssigned,
             AssemblyDescriptor assemblyDescriptor,
             String ejbName,
             List<SecurityRoleRef> securityRoleRefs,



Mime
View raw message