geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From genspr...@apache.org
Subject svn commit: r1137511 - in /geronimo/server/trunk/plugins/openejb: geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/ geronimo-openejb-clustering-wadi/src/test/java/org/apache/geronimo/openejb/cluster/stateful/container/
Date Mon, 20 Jun 2011 06:10:22 GMT
Author: genspring
Date: Mon Jun 20 06:10:22 2011
New Revision: 1137511

URL: http://svn.apache.org/viewvc?rev=1137511&view=rev
Log:
GERONIMO-6015 JACC PolicyContextID conflicts,

use moduleURI as policyID because openejb side is using moduleURI too with changes in OPENEJB-1442.

Modified:
    geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java
    geronimo/server/trunk/plugins/openejb/geronimo-openejb-clustering-wadi/src/test/java/org/apache/geronimo/openejb/cluster/stateful/container/ClusteredStatefulContainerTest.java
    geronimo/server/trunk/plugins/openejb/geronimo-openejb-clustering-wadi/src/test/java/org/apache/geronimo/openejb/cluster/stateful/container/WadiCacheTest.java

Modified: geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java?rev=1137511&r1=1137510&r2=1137511&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java
(original)
+++ geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java
Mon Jun 20 06:10:22 2011
@@ -1205,7 +1205,7 @@ public class EjbModuleBuilder implements
         ejbDeploymentBuilder.addEjbModuleDependency(ejbModuleGBeanData);
 
         // add the Jacc permissions to the ear
-        String policyContextId = ejbModule.getEjbInfo().getEjbJarInfo().moduleId;
+        String policyContextId = ejbModule.getEjbInfo().getEjbJarInfo().moduleUri.toString();
         ComponentPermissions componentPermissions = (ComponentPermissions) earContext.getContextIDToPermissionsMap().get(policyContextId);
         if (componentPermissions == null) {
             componentPermissions = new ComponentPermissions(new Permissions(), new Permissions(),
new HashMap<String, PermissionCollection>());

Modified: geronimo/server/trunk/plugins/openejb/geronimo-openejb-clustering-wadi/src/test/java/org/apache/geronimo/openejb/cluster/stateful/container/ClusteredStatefulContainerTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb-clustering-wadi/src/test/java/org/apache/geronimo/openejb/cluster/stateful/container/ClusteredStatefulContainerTest.java?rev=1137511&r1=1137510&r2=1137511&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/geronimo-openejb-clustering-wadi/src/test/java/org/apache/geronimo/openejb/cluster/stateful/container/ClusteredStatefulContainerTest.java
(original)
+++ geronimo/server/trunk/plugins/openejb/geronimo-openejb-clustering-wadi/src/test/java/org/apache/geronimo/openejb/cluster/stateful/container/ClusteredStatefulContainerTest.java
Mon Jun 20 06:10:22 2011
@@ -65,7 +65,7 @@ public class ClusteredStatefulContainerT
         container = (ClusteredStatefulContainer) intercept(ClusteredStatefulContainer.class,
new Object[] {"id",
                 securityService});
         deploymentId = "deploymentId";
-        deploymentInfo = new BeanContext(deploymentId, null, new ModuleContext(deploymentId,
null, new AppContext(deploymentId, SystemInstance.get(), getClass().getClassLoader(), null,
null, false), null),
+        deploymentInfo = new BeanContext(deploymentId, null, new ModuleContext(deploymentId,
null, null, new AppContext(deploymentId, SystemInstance.get(), getClass().getClassLoader(),
null, null, false), null),
             SFSB.class,
             null,
             null,

Modified: geronimo/server/trunk/plugins/openejb/geronimo-openejb-clustering-wadi/src/test/java/org/apache/geronimo/openejb/cluster/stateful/container/WadiCacheTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb-clustering-wadi/src/test/java/org/apache/geronimo/openejb/cluster/stateful/container/WadiCacheTest.java?rev=1137511&r1=1137510&r2=1137511&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/geronimo-openejb-clustering-wadi/src/test/java/org/apache/geronimo/openejb/cluster/stateful/container/WadiCacheTest.java
(original)
+++ geronimo/server/trunk/plugins/openejb/geronimo-openejb-clustering-wadi/src/test/java/org/apache/geronimo/openejb/cluster/stateful/container/WadiCacheTest.java
Mon Jun 20 06:10:22 2011
@@ -70,7 +70,7 @@ public class WadiCacheTest extends RMock
         });
 
         deploymentId = "deploymentId";
-        deploymentInfo = new BeanContext(deploymentId, null, new ModuleContext(deploymentId,
null, new AppContext(deploymentId, SystemInstance.get(), getClass().getClassLoader(), null,
null, false), null),
+        deploymentInfo = new BeanContext(deploymentId, null, new ModuleContext(deploymentId,
null, null, new AppContext(deploymentId, SystemInstance.get(), getClass().getClassLoader(),
null, null, false), null),
             SFSB.class,
             null,
             null,



Mime
View raw message