[jboss-cvs] JBossAS SVN: r61331 - in branches/Branch_4_2/ejb3/src: test/org/jboss/ejb3/test/securitydomain and 1 other directories.

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

Author: bdecoste
Date: 2007-03-14 16:13:45 -0400 (Wed, 14 Mar 2007)
New Revision: 61331

Added:
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/securitydomain/AugmentSecurityDomainTestBean.java
Modified:
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/Ejb3DescriptorHandler.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/securitydomain/unit/SecurityDomainTestCase.java
Log:
[JBCTS-555] additional tests for <security-domain>

Modified: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/Ejb3DescriptorHandler.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/Ejb3DescriptorHandler.java	2007-03-14 19:13:43 UTC (rev 61330)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/Ejb3DescriptorHandler.java	2007-03-14 20:13:45 UTC (rev 61331)
@@ -1805,8 +1805,6 @@
    {
       log.debug("adding class annotation " + annotationClass.getName() + " to "
             + ejbClass.getName() + " " + annotation);
-      log.debug("adding class annotation " + annotationClass.getName() + " to "
-            + ejbClass.getName() + " " + annotation);
       container.getAnnotations()
             .addClassAnnotation(annotationClass, annotation);
    }

Added: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/securitydomain/AugmentSecurityDomainTestBean.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/securitydomain/AugmentSecurityDomainTestBean.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/securitydomain/AugmentSecurityDomainTestBean.java	2007-03-14 20:13:45 UTC (rev 61331)
@@ -0,0 +1,43 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.securitydomain;
+
+import javax.ejb.Stateless;
+import javax.ejb.Remote;
+
+import org.jboss.logging.Logger;
+
+/**
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+ at Stateless
+ at Remote(SecurityDomainTest.class)
+public class AugmentSecurityDomainTestBean
+   implements SecurityDomainTest
+{
+   private static final Logger log = Logger.getLogger(AugmentSecurityDomainTestBean.class);
+    
+   public void testAccess()
+   {
+     
+   }
+}

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/securitydomain/unit/SecurityDomainTestCase.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/securitydomain/unit/SecurityDomainTestCase.java	2007-03-14 19:13:43 UTC (rev 61330)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/securitydomain/unit/SecurityDomainTestCase.java	2007-03-14 20:13:45 UTC (rev 61331)
@@ -53,10 +53,23 @@
       {
       }
       
+      SecurityDomainTest augment = (SecurityDomainTest)getInitialContext().lookup("AugmentSecurityDomainTestBean/remote");
+      assertNotNull(augment);
+      
+      try
+      {
+         augment.testAccess();
+         fail();
+      }
+      catch (Exception e)
+      {
+      }
+      
       SecurityAssociation.setPrincipal(new SimplePrincipal("somebody"));
       SecurityAssociation.setCredential("password".toCharArray());
       
       test.testAccess();
+      augment.testAccess();
    }