[jboss-cvs] JBossAS SVN: r81477 - in projects/ejb3/trunk: testsuite/src/test/java/org/jboss/ejb3/test/security/unit and 1 other directories.

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

Author: wolfc
Date: 2008-11-24 05:22:03 -0500 (Mon, 24 Nov 2008)
New Revision: 81477

Modified:
   projects/ejb3/trunk/core/pom.xml
   projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/security/unit/EJBSpecUnitTestCase.java
   projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/security/unit/TimerRunAsTestCase.java
   projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/tck5sec/unit/Tck5SecTestCase.java
Log:
EJBTHREE-1241: Upgrade to jbosssx 2.0.2.SP2

Modified: projects/ejb3/trunk/core/pom.xml
===================================================================
--- projects/ejb3/trunk/core/pom.xml	2008-11-24 09:56:07 UTC (rev 81476)
+++ projects/ejb3/trunk/core/pom.xml	2008-11-24 10:22:03 UTC (rev 81477)
@@ -275,6 +275,13 @@
     <dependency>
       <groupId>org.jboss.aspects</groupId>
       <artifactId>jboss-remoting-aspects</artifactId>
+      <exclusions>
+        <!-- Conflicts with org.jboss.security:jbosssx -->
+        <exclusion>
+          <groupId>org.jboss.security</groupId>
+          <artifactId>jbosssx-client</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     
     <dependency>
@@ -542,7 +549,12 @@
           <groupId>org.jboss.jbossas</groupId>
           <artifactId>jboss-as-security</artifactId>
         </exclusion>        
+        <!-- Conflicts with org.jboss.security:jbosssx -->
         <exclusion>
+          <groupId>org.jboss.security</groupId>
+          <artifactId>jbosssx-client</artifactId>
+        </exclusion>
+        <exclusion>
           <groupId>org.jboss.ws.native</groupId>
           <artifactId>jbossws-native-jaxws</artifactId>
         </exclusion>
@@ -575,7 +587,7 @@
     <dependency>
       <groupId>org.jboss.security</groupId>
       <artifactId>jbosssx</artifactId>
-      <version>2.0.2.CR5</version>
+      <version>2.0.2.SP2</version>
     </dependency>
     
      <dependency>

Modified: projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/security/unit/EJBSpecUnitTestCase.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/security/unit/EJBSpecUnitTestCase.java	2008-11-24 09:56:07 UTC (rev 81476)
+++ projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/security/unit/EJBSpecUnitTestCase.java	2008-11-24 10:22:03 UTC (rev 81477)
@@ -31,9 +31,6 @@
 import javax.jms.QueueSender;
 import javax.jms.QueueSession;
 import javax.jms.Session;
-import javax.management.MBeanServerConnection;
-import javax.management.MBeanServerInvocationHandler;
-import javax.management.ObjectName;
 import javax.naming.InitialContext;
 import javax.security.auth.login.Configuration;
 import javax.security.auth.login.LoginContext;
@@ -47,8 +44,7 @@
 import org.jboss.ejb3.test.security.StatefulSession;
 import org.jboss.ejb3.test.security.StatelessSession;
 import org.jboss.logging.Logger;
-import org.jboss.security.SimplePrincipal;
-import org.jboss.security.auth.login.XMLLoginConfigImpl; 
+import org.jboss.security.auth.login.XMLLoginConfigImpl;
 import org.jboss.test.JBossTestCase;
 
 
@@ -613,7 +609,7 @@
 public static Test suite() throws Exception
 {
    try {
-      Configuration.setConfiguration(new XMLLoginConfigImpl());
+      Configuration.setConfiguration(XMLLoginConfigImpl.getInstance());
       return getDeploySetup(EJBSpecUnitTestCase.class, "security-spec.sar,security.jar");
    }
    catch (Exception e)

Modified: projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/security/unit/TimerRunAsTestCase.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/security/unit/TimerRunAsTestCase.java	2008-11-24 09:56:07 UTC (rev 81476)
+++ projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/security/unit/TimerRunAsTestCase.java	2008-11-24 10:22:03 UTC (rev 81477)
@@ -25,6 +25,8 @@
 import javax.security.auth.login.Configuration;
 import javax.security.auth.login.LoginContext;
 
+import junit.framework.Test;
+
 import org.jboss.ejb3.test.security.TimerTester;
 import org.jboss.logging.Logger;
 import org.jboss.security.SecurityAssociation;
@@ -32,7 +34,6 @@
 import org.jboss.security.auth.callback.UsernamePasswordHandler;
 import org.jboss.security.auth.login.XMLLoginConfigImpl;
 import org.jboss.test.JBossTestCase;
-import junit.framework.Test;
 
 /**
  * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
@@ -67,7 +68,7 @@
       SecurityAssociation.clear();
       
       AppConfigurationEntry[] entries;
-      XMLLoginConfigImpl config = new XMLLoginConfigImpl();
+      XMLLoginConfigImpl config = XMLLoginConfigImpl.getInstance();
       config.setConfigResource("jaas-test-config.xml");
       config.loadConfig();
       Configuration.setConfiguration(config);

Modified: projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/tck5sec/unit/Tck5SecTestCase.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/tck5sec/unit/Tck5SecTestCase.java	2008-11-24 09:56:07 UTC (rev 81476)
+++ projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/tck5sec/unit/Tck5SecTestCase.java	2008-11-24 10:22:03 UTC (rev 81477)
@@ -80,7 +80,7 @@
 
    public static Test suite() throws Exception
    {
-      Configuration.setConfiguration(new XMLLoginConfigImpl());
+      Configuration.setConfiguration(XMLLoginConfigImpl.getInstance());
       return getDeploySetup(Tck5SecTestCase.class, "tck5sec-test.ear");
 
    }