[jboss-cvs] JBossAS SVN: r64548 - branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/security.

[jboss-cvs-commits at lists.jboss.org]

Author: bdecoste
Date: 2007-08-10 14:51:58 -0400 (Fri, 10 Aug 2007)
New Revision: 64548

Modified:
   branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/security/CallerBean.java
   branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/security/CallerBean2.java
   branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/security/FacadeTargetBean.java
   branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/security/Level1CallerBean.java
Log:
[JBPAPP-259] merge of [EJBTHREE-997]

Modified: branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/security/CallerBean.java
===================================================================
--- branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/security/CallerBean.java	2007-08-10 18:51:20 UTC (rev 64547)
+++ branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/security/CallerBean.java	2007-08-10 18:51:58 UTC (rev 64548)
@@ -63,8 +63,8 @@
       log.info("echo, arg=" + arg);
       Principal p = sessionContext.getCallerPrincipal();
       log.info("echo, callerPrincipal=" + p);
-      boolean isEchoCaller = sessionContext.isCallerInRole("Echo");
-      log.info("echo, isCallerInRole('Echo')=" + isEchoCaller);
+      boolean isEchoCaller = sessionContext.isCallerInRole("EchoCaller");
+      log.info("echo, isCallerInRole('EchoCaller')=" + isEchoCaller);
       boolean isInternalRole = sessionContext.isCallerInRole("InternalRole");
       log.info("echo, isCallerInRole('InternalRole')=" + isInternalRole);
       
@@ -89,8 +89,8 @@
          throw new EJBException("Failed to invoke Callee.echo", e);
       }
 
-      isEchoCaller = sessionContext.isCallerInRole("Echo");
-      log.info("echo, isCallerInRole#2('Echo')=" + isEchoCaller);
+      isEchoCaller = sessionContext.isCallerInRole("EchoCaller");
+      log.info("echo, isCallerInRole#2('EchoCaller')=" + isEchoCaller);
       isInternalRole = sessionContext.isCallerInRole("InternalRole");
       log.info("echo, isCallerInRole#2('InternalRole')=" + isInternalRole);
 

Modified: branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/security/CallerBean2.java
===================================================================
--- branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/security/CallerBean2.java	2007-08-10 18:51:20 UTC (rev 64547)
+++ branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/security/CallerBean2.java	2007-08-10 18:51:58 UTC (rev 64548)
@@ -64,8 +64,8 @@
       log.info("echo, arg=" + arg);
       Principal p = sessionContext.getCallerPrincipal();
       log.info("echo, callerPrincipal=" + p);
-      boolean isEchoCaller = sessionContext.isCallerInRole("Echo");
-      log.info("echo, isCallerInRole('Echo')=" + isEchoCaller);
+      boolean isEchoCaller = sessionContext.isCallerInRole("EchoCaller");
+      log.info("echo, isCallerInRole('EchoCaller')=" + isEchoCaller);
       boolean isInternalRole = sessionContext.isCallerInRole("InternalRole");
       log.info("echo, isCallerInRole('InternalRole')=" + isInternalRole);
 
@@ -86,8 +86,8 @@
          throw new EJBException("Failed to invoke Callee.echo", e);
       }
 
-      isEchoCaller = sessionContext.isCallerInRole("Echo");
-      log.info("echo, isCallerInRole#2('Echo')=" + isEchoCaller);
+      isEchoCaller = sessionContext.isCallerInRole("EchoCaller");
+      log.info("echo, isCallerInRole#2('EchoCaller')=" + isEchoCaller);
       isInternalRole = sessionContext.isCallerInRole("InternalRole");
       log.info("echo, isCallerInRole#2('InternalRole')=" + isInternalRole);
 

Modified: branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/security/FacadeTargetBean.java
===================================================================
--- branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/security/FacadeTargetBean.java	2007-08-10 18:51:20 UTC (rev 64547)
+++ branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/security/FacadeTargetBean.java	2007-08-10 18:51:58 UTC (rev 64548)
@@ -61,8 +61,8 @@
       log.debug("echo, arg=" + arg);
       Principal p = sessionContext.getCallerPrincipal();
       log.debug("echo, callerPrincipal=" + p);
-      boolean isEchoCaller = sessionContext.isCallerInRole("Echo");
-      log.debug("echo, isCallerInRole('Echo')=" + isEchoCaller);
+      boolean isEchoCaller = sessionContext.isCallerInRole("EchoCaller");
+      log.debug("echo, isCallerInRole('EchoCaller')=" + isEchoCaller);
 
       if (isEchoCaller == false)
          throw new SecurityException("isEchoCaller == false");
@@ -81,8 +81,8 @@
          throw new EJBException("Failed to invoke Callee.echo", e);
       }
 
-      isEchoCaller = sessionContext.isCallerInRole("Echo");
-      log.debug("echo, post calls isCallerInRole('Echo')=" + isEchoCaller);
+      isEchoCaller = sessionContext.isCallerInRole("EchoCaller");
+      log.debug("echo, post calls isCallerInRole('EchoCaller')=" + isEchoCaller);
       if (isEchoCaller == false)
          throw new SecurityException("isEchoCaller == false post calls");
 

Modified: branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/security/Level1CallerBean.java
===================================================================
--- branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/security/Level1CallerBean.java	2007-08-10 18:51:20 UTC (rev 64547)
+++ branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/security/Level1CallerBean.java	2007-08-10 18:51:58 UTC (rev 64548)
@@ -65,8 +65,8 @@
       log.info("echo, arg=" + arg);
       Principal p = sessionContext.getCallerPrincipal();
       log.info("echo, callerPrincipal=" + p);
-      boolean isEchoCaller = sessionContext.isCallerInRole("Echo");
-      log.info("echo, isCallerInRole('Echo')=" + isEchoCaller);
+      boolean isEchoCaller = sessionContext.isCallerInRole("EchoCaller");
+      log.info("echo, isCallerInRole('EchoCaller')=" + isEchoCaller);
       boolean isInternalRole = sessionContext.isCallerInRole("InternalRole");
       log.info("echo, isCallerInRole('InternalRole')=" + isInternalRole);
       
@@ -88,8 +88,8 @@
          throw new EJBException("Failed to invoke Callee.echo", e);
       }
 
-      isEchoCaller = sessionContext.isCallerInRole("Echo");
-      log.info("echo, isCallerInRole#2('Echo')=" + isEchoCaller);
+      isEchoCaller = sessionContext.isCallerInRole("EchoCaller");
+      log.info("echo, isCallerInRole#2('EchoCaller')=" + isEchoCaller);
       isInternalRole = sessionContext.isCallerInRole("InternalRole");
       log.info("echo, isCallerInRole#2('InternalRole')=" + isInternalRole);