You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by dj...@apache.org on 2010/07/20 08:55:45 UTC
svn commit: r965735 - in /openejb/branches/openejb-3.1.x: container/openejb-core/src/main/java/org/apache/openejb/core/mdb/ itests/openejb-itests-client/src/main/java/org/apache/openejb/test/mdb/

Author: djencks
Date: Tue Jul 20 06:55:45 2010
New Revision: 965735

URL: http://svn.apache.org/viewvc?rev=965735&view=rev
Log:
OPENEJB-1253 Make 3.1 branch javaee 5 compatible by not allowing isCallerInfRole in mdbs

Modified:
    openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbContext.java
    openejb/branches/openejb-3.1.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/mdb/BmtMdbAllowedOperationsTests.java
    openejb/branches/openejb-3.1.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/mdb/MdbAllowedOperationsTests.java

Modified: openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbContext.java
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbContext.java?rev=965735&r1=965734&r2=965735&view=diff
==============================================================================
--- openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbContext.java (original)
+++ openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbContext.java Tue Jul 20 06:55:45 2010
@@ -184,7 +184,7 @@ public class MdbContext extends BaseCont
 
     /**
      * Message listener method, business method interceptor method
-     * and timeout callback method
+     * and imeout callback method
      */
     protected static class BusinessTimeoutMdbState extends State {
         @Override
@@ -197,6 +197,11 @@ public class MdbContext extends BaseCont
             throw new IllegalStateException();
         }
 
+        @Override
+        public boolean isCallerInRole(SecurityService securityService, String roleName) {
+            throw new IllegalStateException();
+        }
+
     }
 
     static {

Modified: openejb/branches/openejb-3.1.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/mdb/BmtMdbAllowedOperationsTests.java
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/mdb/BmtMdbAllowedOperationsTests.java?rev=965735&r1=965734&r2=965735&view=diff
==============================================================================
--- openejb/branches/openejb-3.1.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/mdb/BmtMdbAllowedOperationsTests.java (original)
+++ openejb/branches/openejb-3.1.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/mdb/BmtMdbAllowedOperationsTests.java Tue Jul 20 06:55:45 2010
@@ -197,7 +197,6 @@ public class BmtMdbAllowedOperationsTest
             OperationsPolicy policy = new OperationsPolicy();
             policy.allow( OperationsPolicy.Context_getUserTransaction );
             policy.allow( OperationsPolicy.Context_getCallerPrincipal );
-            policy.allow( OperationsPolicy.Context_isCallerInRole );
             policy.allow( OperationsPolicy.Context_lookup );
             policy.allow( OperationsPolicy.JNDI_access_to_java_comp_env );
 

Modified: openejb/branches/openejb-3.1.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/mdb/MdbAllowedOperationsTests.java
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/mdb/MdbAllowedOperationsTests.java?rev=965735&r1=965734&r2=965735&view=diff
==============================================================================
--- openejb/branches/openejb-3.1.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/mdb/MdbAllowedOperationsTests.java (original)
+++ openejb/branches/openejb-3.1.x/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/mdb/MdbAllowedOperationsTests.java Tue Jul 20 06:55:45 2010
@@ -193,7 +193,6 @@ public class MdbAllowedOperationsTests e
             policy.allow( OperationsPolicy.Context_getRollbackOnly );
             // policy.allow( OperationsPolicy.Context_setRollbackOnly );
             policy.allow( OperationsPolicy.Context_getCallerPrincipal );
-            policy.allow( OperationsPolicy.Context_isCallerInRole );
             policy.allow( OperationsPolicy.Context_lookup );
             policy.allow( OperationsPolicy.JNDI_access_to_java_comp_env );