[jboss-cvs] JBossAS SVN: r71444 - in projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test: container/unit and 14 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sun Mar 30 01:14:02 EDT 2008
Author: ALRubinger
Date: 2008-03-30 01:14:01 -0400 (Sun, 30 Mar 2008)
New Revision: 71444
Modified:
projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/asynchronous/unit/AsynchronousTestCase.java
projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/container/unit/ContainerTestCase.java
projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/dd/web/servlets/EJBOnStartupServlet.java
projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/dd/web/servlets/EJBServlet.java
projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/dd/web/servlets/SecureServlet.java
projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/dd/web/servlets/SpeedServlet.java
projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/dd/web/servlets/StatefulSessionServlet.java
projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/ejbthree973/unit/AnonymousCallerPrincipalTestCase.java
projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/iiop/unit/IiopRemoteUnitTestCase.java
projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/initial/SecurityTester.java
projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/initial/unit/RemoteUnitTestCase.java
projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/jacc/unit/JaccTestCase.java
projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/mdb/unit/MDBUnitEmbeddedTest.java
projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/mdb/unit/MDBUnitTestCase.java
projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/naming/unit/ENCUnitTestCase.java
projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/security/unit/TimerRunAsTestCase.java
projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/securitydomain/unit/SecurityDomainTestCase.java
projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/service/unit/ServiceUnitTestCase.java
projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/servlet/servlets/EJBServlet.java
projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/stateful/unit/MetricsUnitTestCase.java
projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/stateful/unit/RemoteUnitTestCase.java
projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/stateless/unit/StatelessTestCase.java
Log:
[EJBTHREE-1242] Switch over deprecated SecurityAssociation to SecurityClient in tests
Modified: projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/asynchronous/unit/AsynchronousTestCase.java
===================================================================
--- projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/asynchronous/unit/AsynchronousTestCase.java 2008-03-30 02:43:26 UTC (rev 71443)
+++ projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/asynchronous/unit/AsynchronousTestCase.java 2008-03-30 05:14:01 UTC (rev 71444)
@@ -23,14 +23,17 @@
import java.lang.reflect.InvocationTargetException;
import java.util.Collection;
+
import javax.ejb.EJBAccessException;
import javax.management.MBeanServerConnection;
import javax.management.ObjectName;
import javax.transaction.RollbackException;
import javax.transaction.UserTransaction;
+
+import junit.framework.Test;
+
import org.jboss.aspects.asynch.AsynchProvider;
import org.jboss.aspects.asynch.Future;
-import org.jboss.ejb3.Ejb3Registry;
import org.jboss.ejb3.JBossProxy;
import org.jboss.ejb3.asynchronous.Asynch;
import org.jboss.ejb3.test.asynchronous.SecuredStatelessRemote;
@@ -43,8 +46,10 @@
import org.jboss.logging.Logger;
import org.jboss.security.SecurityAssociation;
import org.jboss.security.SimplePrincipal;
+import org.jboss.security.client.JBossSecurityClient;
+import org.jboss.security.client.SecurityClient;
+import org.jboss.security.client.SecurityClientFactory;
import org.jboss.test.JBossTestCase;
-import junit.framework.Test;
/**
* @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
@@ -165,10 +170,11 @@
(SecuredStatelessRemote) getInitialContext().lookup("SecuredStatelessBean/remote");
SecuredStatelessRemote asynchTester = (SecuredStatelessRemote)((JBossProxy)tester).getAsynchronousProxy();
AsynchProvider ap = (AsynchProvider)asynchTester;
+
+ SecurityClient client = SecurityClientFactory.getSecurityClient();
+ client.setSimple("rolefail","password");
+ client.login();
- SecurityAssociation.setPrincipal(new SimplePrincipal("rolefail"));
- SecurityAssociation.setCredential("password".toCharArray());
-
asynchTester.method(61);
Object ret = getReturnOrException(ap);
assertTrue("SecurityException not thrown: " + ret, ret instanceof EJBAccessException);
@@ -181,16 +187,14 @@
ret = getReturnOrException(ap);
assertTrue("SecurityException not thrown: " + ret, ret instanceof EJBAccessException);
- SecurityAssociation.setPrincipal(new SimplePrincipal("somebody"));
- SecurityAssociation.setCredential("password".toCharArray());
+ client.setSimple("somebody","password");
asynchTester.method(64);
ret = getReturnOrException(ap);
- assertEquals("Wrong return for authorised method", 64, ret);
+ assertEquals("Wrong return for authorized method", 64, ret);
+
+ client.setSimple("nosuchuser","password");
- SecurityAssociation.setPrincipal(new SimplePrincipal("nosuchuser"));
- SecurityAssociation.setCredential("password".toCharArray());
-
asynchTester.method(65);
ret = getReturnOrException(ap);
assertTrue("SecurityException not thrown: " + ret, ret instanceof EJBAccessException);
Modified: projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/container/unit/ContainerTestCase.java
===================================================================
--- projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/container/unit/ContainerTestCase.java 2008-03-30 02:43:26 UTC (rev 71443)
+++ projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/container/unit/ContainerTestCase.java 2008-03-30 05:14:01 UTC (rev 71444)
@@ -25,18 +25,20 @@
import javax.management.ObjectName;
import javax.naming.InitialContext;
+import junit.framework.Test;
+
+import org.jboss.ejb3.statistics.InvocationStatistics;
import org.jboss.ejb3.test.reference21_30.Test2;
import org.jboss.ejb3.test.reference21_30.Test2Home;
import org.jboss.ejb3.test.reference21_30.Test3;
import org.jboss.ejb3.test.service.ServiceSixRemote;
-import org.jboss.ejb3.test.stateful.ProxyFactoryInterface;
import org.jboss.ejb3.test.stateful.Stateful;
-import org.jboss.ejb3.statistics.InvocationStatistics;
import org.jboss.logging.Logger;
import org.jboss.security.SecurityAssociation;
import org.jboss.security.SimplePrincipal;
+import org.jboss.security.client.SecurityClient;
+import org.jboss.security.client.SecurityClientFactory;
import org.jboss.test.JBossTestCase;
-import junit.framework.Test;
/**
* @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
@@ -83,8 +85,9 @@
System.out.println("Stats \n" + stats);
assertTrue(stats.toString().contains("setCalled"));
- SecurityAssociation.setPrincipal(new SimplePrincipal("somebody"));
- SecurityAssociation.setCredential("password".toCharArray());
+ SecurityClient client = SecurityClientFactory.getSecurityClient();
+ client.setSimple("somebody", "password");
+ client.login();
Stateful stateful = (Stateful)getInitialContext().lookup("Stateful");
assertNotNull(stateful);
Modified: projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/dd/web/servlets/EJBOnStartupServlet.java
===================================================================
--- projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/dd/web/servlets/EJBOnStartupServlet.java 2008-03-30 02:43:26 UTC (rev 71443)
+++ projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/dd/web/servlets/EJBOnStartupServlet.java 2008-03-30 05:14:01 UTC (rev 71444)
@@ -24,7 +24,7 @@
import java.io.IOException;
import java.io.PrintWriter;
import java.net.URL;
-import javax.naming.Context;
+
import javax.naming.InitialContext;
import javax.naming.NamingException;
import javax.servlet.ServletConfig;
@@ -32,14 +32,14 @@
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import javax.sql.DataSource;
import org.jboss.ejb3.test.dd.web.interfaces.ReferenceTest;
import org.jboss.ejb3.test.dd.web.interfaces.StatelessSession;
-import org.jboss.ejb3.test.dd.web.interfaces.StatelessSessionLocal;
import org.jboss.ejb3.test.dd.web.util.Util;
import org.jboss.security.SecurityAssociation;
import org.jboss.security.SimplePrincipal;
+import org.jboss.security.client.SecurityClient;
+import org.jboss.security.client.SecurityClientFactory;
/** A servlet that accesses an EJB inside its init and destroy methods
to test web component startup ordering with respect to ebj components.
@@ -90,8 +90,9 @@
{
try
{
- SecurityAssociation.setPrincipal(new SimplePrincipal("jduke"));
- SecurityAssociation.setCredential("theduke".toCharArray());
+ SecurityClient client = SecurityClientFactory.getSecurityClient();
+ client.setSimple("jduke", "theduke");
+ client.login();
InitialContext ctx = new InitialContext();
StatelessSession bean = (StatelessSession)ctx.lookup("java:comp/env/ejb/OptimizedEJB");
Modified: projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/dd/web/servlets/EJBServlet.java
===================================================================
--- projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/dd/web/servlets/EJBServlet.java 2008-03-30 02:43:26 UTC (rev 71443)
+++ projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/dd/web/servlets/EJBServlet.java 2008-03-30 05:14:01 UTC (rev 71444)
@@ -48,6 +48,8 @@
import org.jboss.logging.Logger;
import org.jboss.security.SecurityAssociation;
import org.jboss.security.SimplePrincipal;
+import org.jboss.security.client.SecurityClient;
+import org.jboss.security.client.SecurityClientFactory;
/**
*
@@ -101,8 +103,9 @@
{
try
{
- SecurityAssociation.setPrincipal(new SimplePrincipal("jduke"));
- SecurityAssociation.setCredential("theduke".toCharArray());
+ SecurityClient client = SecurityClientFactory.getSecurityClient();
+ client.setSimple("jduke", "theduke");
+ client.login();
InitialContext ctx = new InitialContext();
Modified: projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/dd/web/servlets/SecureServlet.java
===================================================================
--- projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/dd/web/servlets/SecureServlet.java 2008-03-30 02:43:26 UTC (rev 71443)
+++ projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/dd/web/servlets/SecureServlet.java 2008-03-30 05:14:01 UTC (rev 71444)
@@ -24,12 +24,13 @@
import java.io.IOException;
import java.io.PrintWriter;
import java.security.Principal;
+
+import javax.security.auth.Subject;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
-import javax.security.auth.Subject;
import org.jboss.security.SecurityAssociation;
Modified: projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/dd/web/servlets/SpeedServlet.java
===================================================================
--- projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/dd/web/servlets/SpeedServlet.java 2008-03-30 02:43:26 UTC (rev 71443)
+++ projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/dd/web/servlets/SpeedServlet.java 2008-03-30 05:14:01 UTC (rev 71444)
@@ -23,24 +23,18 @@
import java.io.IOException;
import java.io.PrintWriter;
-import javax.naming.Context;
+
import javax.naming.InitialContext;
-import javax.naming.NamingException;
-import javax.rmi.PortableRemoteObject;
-import javax.servlet.ServletConfig;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import javax.sql.DataSource;
import org.jboss.ejb3.test.dd.web.interfaces.ReferenceTest;
import org.jboss.ejb3.test.dd.web.interfaces.StatelessSession;
-import org.jboss.ejb3.test.dd.web.interfaces.StatelessSessionLocal;
-import org.jboss.ejb3.test.dd.web.util.Util;
import org.jboss.logging.Logger;
-import org.jboss.security.SecurityAssociation;
-import org.jboss.security.SimplePrincipal;
+import org.jboss.security.client.SecurityClient;
+import org.jboss.security.client.SecurityClientFactory;
/**
* A servlet that accesses an EJB and tests the speed of optimized versus
@@ -127,8 +121,18 @@
{
testNaming();
- SecurityAssociation.setPrincipal(new SimplePrincipal("jduke"));
- SecurityAssociation.setCredential("theduke".toCharArray());
+ SecurityClient client = null;
+
+ try
+ {
+ client = SecurityClientFactory.getSecurityClient();
+ client.setSimple("jduke", "theduke");
+ client.login();
+ }
+ catch (Exception e)
+ {
+ throw new ServletException(e);
+ }
long[] optimized = null;
long[] notOptimized = null;
Modified: projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/dd/web/servlets/StatefulSessionServlet.java
===================================================================
--- projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/dd/web/servlets/StatefulSessionServlet.java 2008-03-30 02:43:26 UTC (rev 71443)
+++ projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/dd/web/servlets/StatefulSessionServlet.java 2008-03-30 05:14:01 UTC (rev 71444)
@@ -38,6 +38,8 @@
import org.jboss.ejb3.test.dd.web.interfaces.StatelessSession;
import org.jboss.security.SecurityAssociation;
import org.jboss.security.SimplePrincipal;
+import org.jboss.security.client.SecurityClient;
+import org.jboss.security.client.SecurityClientFactory;
/** A servlet that accesses a stateful session EJB and stores a handle in the session context
* to test retrieval of the session from the handle.
@@ -70,8 +72,17 @@
protected void processRequest(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException
{
- SecurityAssociation.setPrincipal(new SimplePrincipal("jduke"));
- SecurityAssociation.setCredential("theduke".toCharArray());
+ SecurityClient client = null;
+ try
+ {
+ client = SecurityClientFactory.getSecurityClient();
+ client.setSimple("jduke", "theduke");
+ client.login();
+ }
+ catch (Exception e)
+ {
+ throw new ServletException(e);
+ }
HttpSession session = request.getSession();
try
Modified: projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/ejbthree973/unit/AnonymousCallerPrincipalTestCase.java
===================================================================
--- projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/ejbthree973/unit/AnonymousCallerPrincipalTestCase.java 2008-03-30 02:43:26 UTC (rev 71443)
+++ projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/ejbthree973/unit/AnonymousCallerPrincipalTestCase.java 2008-03-30 05:14:01 UTC (rev 71444)
@@ -37,6 +37,8 @@
import org.jboss.ejb3.test.ejbthree973.WhoAmI;
import org.jboss.security.SecurityAssociation;
import org.jboss.security.SimplePrincipal;
+import org.jboss.security.client.SecurityClient;
+import org.jboss.security.client.SecurityClientFactory;
import org.jboss.test.JBossTestCase;
/**
@@ -69,7 +71,9 @@
public void testAnybody() throws Exception
{
- SecurityAssociation.setPrincipal(new SimplePrincipal("anybody"));
+ SecurityClient client = SecurityClientFactory.getSecurityClient();
+ client.setSimple("anybody", null);
+ client.login();
try
{
WhoAmI bean = lookupBean();
@@ -82,7 +86,7 @@
}
finally
{
- SecurityAssociation.setPrincipal(null);
+ client.setSimple(null, null);
}
}
Modified: projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/iiop/unit/IiopRemoteUnitTestCase.java
===================================================================
--- projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/iiop/unit/IiopRemoteUnitTestCase.java 2008-03-30 02:43:26 UTC (rev 71443)
+++ projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/iiop/unit/IiopRemoteUnitTestCase.java 2008-03-30 05:14:01 UTC (rev 71444)
@@ -44,6 +44,8 @@
import org.jboss.ejb3.test.iiop.TxTester;
import org.jboss.security.SecurityAssociation;
import org.jboss.security.SimplePrincipal;
+import org.jboss.security.client.SecurityClient;
+import org.jboss.security.client.SecurityClientFactory;
/**
* TODO: use JBossIIOPTestCase
@@ -53,6 +55,8 @@
*/
public class IiopRemoteUnitTestCase extends CustomJNDIJBossTestCase
{
+
+ private SecurityClient client;
public IiopRemoteUnitTestCase(String name)
{
@@ -86,7 +90,7 @@
{
super.tearDown();
- SecurityAssociation.clear();
+ this.client.logout();
}
public void test0() throws Exception
@@ -96,9 +100,10 @@
public void test1() throws Exception
{
- SimplePrincipal principal = new SimplePrincipal("somebody");
- SecurityAssociation.setPrincipal(principal);
- SecurityAssociation.setCredential("password".toCharArray());
+
+ this.client = SecurityClientFactory.getSecurityClient();
+ this.client.setSimple("somebody", "password");
+ this.client.login();
InitialContext ctx = getInitialContext();
Object obj = ctx.lookup("MySessionBean/remote");
@@ -230,9 +235,8 @@
public void testSecurity() throws Exception
{
- SimplePrincipal principal = new SimplePrincipal("somebody");
- SecurityAssociation.setPrincipal(principal);
- SecurityAssociation.setCredential("password".toCharArray());
+ this.client.setSimple("somebody", "password");
+ this.client.login();
InitialContext ctx = getInitialContext();
Object obj = ctx.lookup("MySessionBean/remote");
Modified: projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/initial/SecurityTester.java
===================================================================
--- projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/initial/SecurityTester.java 2008-03-30 02:43:26 UTC (rev 71443)
+++ projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/initial/SecurityTester.java 2008-03-30 05:14:01 UTC (rev 71444)
@@ -23,11 +23,10 @@
import javax.ejb.EJBAccessException;
import javax.naming.InitialContext;
+
import org.jboss.logging.Logger;
-import org.jboss.security.auth.callback.AppCallbackHandler;
import org.jboss.security.SecurityAssociation;
import org.jboss.security.SimplePrincipal;
-import org.jboss.security.client.JBossSecurityClient;
import org.jboss.security.client.SecurityClient;
import org.jboss.security.client.SecurityClientFactory;
@@ -47,14 +46,15 @@
InitialContext ctx = new InitialContext();
SecuredTest test = (SecuredTest) ctx.lookup("SecuredTestBean/local");
- SecurityAssociation.setPrincipal(new SimplePrincipal("somebody"));
- SecurityAssociation.setCredential("password".toCharArray());
+ SecurityClient client = SecurityClientFactory.getSecurityClient();
+ client.setSimple("somebody", "password");
+ client.login();
test.unchecked();
test.testDefault();
test.secured();
- SecurityAssociation.setPrincipal(new SimplePrincipal("authfail"));
+ client.setSimple("authfail", "password");
boolean securityFailure = true;
try
@@ -70,8 +70,7 @@
if (securityFailure) throw new RuntimeException("auth failure was not caught for method");
securityFailure = true;
- SecurityAssociation.clear();
- SecurityAssociation.setPrincipal(new SimplePrincipal("rolefail"));
+ client.setSimple("rolefail", null);
try
{
test.secured();
@@ -83,7 +82,7 @@
}
if (securityFailure) throw new RuntimeException("role failure was not caught for method");
- SecurityAssociation.setPrincipal(new SimplePrincipal("somebody"));
+ client.setSimple("somebody", null);
log.info("test exclusion");
securityFailure = true;
try
@@ -101,14 +100,13 @@
public void testSecurityClient() throws Exception
{
- SecurityAssociation.clear();
InitialContext ctx = new InitialContext();
SecuredTest test = (SecuredTest) ctx.lookup("SecuredTestBean/local");
SecurityClient sc = SecurityClientFactory.getSecurityClient();
-// SecurityClient sc = SecurityClientFactory.getSecurityClient(JBossSecurityClient.class);
- sc.setSimple(new SimplePrincipal("somebody"),"password".toCharArray());
+ sc.setSimple("somebody","password");
+ sc.login();
// AppCallbackHandler acbh = new AppCallbackHandler("somebody","password".toCharArray());
// sc.setJAAS("other", acbh);
@@ -120,7 +118,7 @@
sc.logout();
- sc.setSimple(new SimplePrincipal("authfail"), "password".toCharArray());
+ sc.setSimple("authfail", "password");
sc.login();
boolean securityFailure = true;
try
@@ -137,7 +135,7 @@
sc.logout();
securityFailure = true;
- sc.setSimple(new SimplePrincipal("rolefail"), "password".toCharArray());
+ sc.setSimple("rolefail", "password");
sc.login();
try
{
@@ -152,7 +150,7 @@
sc.logout();
- sc.setSimple(new SimplePrincipal("somebody"), "password".toCharArray());
+ sc.setSimple("somebody", "password");
sc.login();
log.info("test exclusion");
Modified: projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/initial/unit/RemoteUnitTestCase.java
===================================================================
--- projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/initial/unit/RemoteUnitTestCase.java 2008-03-30 02:43:26 UTC (rev 71443)
+++ projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/initial/unit/RemoteUnitTestCase.java 2008-03-30 05:14:01 UTC (rev 71444)
@@ -32,6 +32,8 @@
import org.jboss.logging.Logger;
import org.jboss.security.SecurityAssociation;
import org.jboss.security.SimplePrincipal;
+import org.jboss.security.client.SecurityClient;
+import org.jboss.security.client.SecurityClientFactory;
import org.jboss.test.JBossTestCase;
import junit.framework.Test;
@@ -91,10 +93,11 @@
// Test basic security propagation
InitialContext ctx = getInitialContext();
SecuredTest test = (SecuredTest) ctx.lookup("SecuredTestBean/remote");
+
+ SecurityClient client = SecurityClientFactory.getSecurityClient();
+ client.setSimple("somebody", "password");
+ client.login();
- SecurityAssociation.setPrincipal(new SimplePrincipal("somebody"));
- SecurityAssociation.setCredential("password".toCharArray());
-
System.out.println("Calling initial security tests....");
test.unchecked();
System.out.println("Calling testDefault()....");
@@ -103,7 +106,7 @@
test.secured();
System.out.println("Calling security fine grain tests....");
- SecurityAssociation.setPrincipal(new SimplePrincipal("authfail"));
+ client.setSimple("authfail", "password");
boolean securityFailure = true;
try
@@ -120,7 +123,7 @@
if (securityFailure) throw new RuntimeException("auth failure was not caught for method");
securityFailure = true;
- SecurityAssociation.setPrincipal(new SimplePrincipal("rolefail"));
+ client.setSimple("rolefail", "password");
try
{
test.secured();
@@ -132,7 +135,7 @@
}
if (securityFailure) throw new RuntimeException("role failure was not caught for method");
- SecurityAssociation.setPrincipal(new SimplePrincipal("somebody"));
+ client.setSimple("somebody","password");
log.info("test exclusion");
securityFailure = true;
try
Modified: projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/jacc/unit/JaccTestCase.java
===================================================================
--- projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/jacc/unit/JaccTestCase.java 2008-03-30 02:43:26 UTC (rev 71443)
+++ projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/jacc/unit/JaccTestCase.java 2008-03-30 05:14:01 UTC (rev 71444)
@@ -31,6 +31,8 @@
import org.jboss.ejb3.test.jacc.Stateless;
import org.jboss.security.SecurityAssociation;
import org.jboss.security.SimplePrincipal;
+import org.jboss.security.client.SecurityClient;
+import org.jboss.security.client.SecurityClientFactory;
import org.jboss.test.JBossTestCase;
import junit.framework.Test;
@@ -45,6 +47,10 @@
static boolean deployed = false;
static int test = 0;
+
+ private static final String PRINCIPAL_SOMEBODY = "somebody";
+ private static final String PRINCIPAL_ROLEFAIL = "rolefail";
+ private static final String PASSWORD_PASSWORD = "password";
public JaccTestCase(String name)
{
@@ -55,18 +61,18 @@
{
Stateful stateful = (Stateful)getInitialContext().lookup("StatefulBean/remote");
Stateless stateless = (Stateless)getInitialContext().lookup("StatelessBean/remote");
+
+ SecurityClient client = SecurityClientFactory.getSecurityClient();
+ client.setSimple(JaccTestCase.PRINCIPAL_SOMEBODY, JaccTestCase.PASSWORD_PASSWORD);
+ client.login();
- SecurityAssociation.setPrincipal(new SimplePrincipal("somebody"));
- SecurityAssociation.setCredential("password".toCharArray());
-
int result = stateful.unchecked(1);
assertEquals(1,result);
result = stateless.unchecked(10);
assertEquals(10,result);
- SecurityAssociation.setPrincipal(new SimplePrincipal("rolefail"));
- SecurityAssociation.setCredential("password".toCharArray());
+ client.setSimple(JaccTestCase.PRINCIPAL_ROLEFAIL, JaccTestCase.PASSWORD_PASSWORD);
result = stateful.unchecked(100);
assertEquals(100,result);
@@ -81,18 +87,18 @@
{
Stateful stateful = (Stateful)getInitialContext().lookup("StatefulBean/remote");
Stateless stateless = (Stateless)getInitialContext().lookup("StatelessBean/remote");
+
+ SecurityClient client = SecurityClientFactory.getSecurityClient();
+ client.setSimple(JaccTestCase.PRINCIPAL_SOMEBODY, JaccTestCase.PASSWORD_PASSWORD);
+ client.login();
- SecurityAssociation.setPrincipal(new SimplePrincipal("somebody"));
- SecurityAssociation.setCredential("password".toCharArray());
-
int result = stateful.checked(5);
assertEquals(5,result);
result = stateless.checked(50);
assertEquals(50,result);
- SecurityAssociation.setPrincipal(new SimplePrincipal("rolefail"));
- SecurityAssociation.setCredential("password".toCharArray());
+ client.setSimple(JaccTestCase.PRINCIPAL_ROLEFAIL, JaccTestCase.PASSWORD_PASSWORD);
boolean securityException = false;
try
@@ -119,8 +125,10 @@
public void testAllEntity()throws Exception
{
Stateless stateless = (Stateless)getInitialContext().lookup("StatelessBean/remote");
- SecurityAssociation.setPrincipal(new SimplePrincipal("somebody"));
- SecurityAssociation.setCredential("password".toCharArray());
+
+ SecurityClient client = SecurityClientFactory.getSecurityClient();
+ client.setSimple(JaccTestCase.PRINCIPAL_SOMEBODY, JaccTestCase.PASSWORD_PASSWORD);
+ client.login();
System.out.println("Good role");
System.out.println("Inserting...");
@@ -136,8 +144,7 @@
e = stateless.insertAllEntity();
System.out.println("Bad role");
- SecurityAssociation.setPrincipal(new SimplePrincipal("rolefail"));
- SecurityAssociation.setCredential("password".toCharArray());
+ client.setSimple(JaccTestCase.PRINCIPAL_ROLEFAIL, JaccTestCase.PASSWORD_PASSWORD);
AllEntity ae2 = null;
try
@@ -218,8 +225,10 @@
public void testStarEntity()throws Exception
{
Stateless stateless = (Stateless)getInitialContext().lookup("StatelessBean/remote");
- SecurityAssociation.setPrincipal(new SimplePrincipal("somebody"));
- SecurityAssociation.setCredential("password".toCharArray());
+
+ SecurityClient client = SecurityClientFactory.getSecurityClient();
+ client.setSimple(JaccTestCase.PRINCIPAL_SOMEBODY, JaccTestCase.PASSWORD_PASSWORD);
+ client.login();
System.out.println("Good role");
System.out.println("Inserting...");
@@ -235,8 +244,7 @@
e = stateless.insertStarEntity();
System.out.println("Bad role");
- SecurityAssociation.setPrincipal(new SimplePrincipal("rolefail"));
- SecurityAssociation.setCredential("password".toCharArray());
+ client.setSimple(JaccTestCase.PRINCIPAL_ROLEFAIL, JaccTestCase.PASSWORD_PASSWORD);
StarEntity ae2 = null;
try
@@ -316,8 +324,10 @@
public void testSomeEntity()throws Exception
{
Stateless stateless = (Stateless)getInitialContext().lookup("StatelessBean/remote");
- SecurityAssociation.setPrincipal(new SimplePrincipal("somebody"));
- SecurityAssociation.setCredential("password".toCharArray());
+
+ SecurityClient client = SecurityClientFactory.getSecurityClient();
+ client.setSimple(JaccTestCase.PRINCIPAL_SOMEBODY, JaccTestCase.PASSWORD_PASSWORD);
+ client.login();
System.out.println("Good role");
System.out.println("Inserting...");
@@ -361,8 +371,7 @@
e = stateless.insertSomeEntity();
System.out.println("Bad role");
- SecurityAssociation.setPrincipal(new SimplePrincipal("rolefail"));
- SecurityAssociation.setCredential("password".toCharArray());
+ client.setSimple(JaccTestCase.PRINCIPAL_ROLEFAIL, JaccTestCase.PASSWORD_PASSWORD);
SomeEntity ae2 = null;
try
Modified: projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/mdb/unit/MDBUnitEmbeddedTest.java
===================================================================
--- projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/mdb/unit/MDBUnitEmbeddedTest.java 2008-03-30 02:43:26 UTC (rev 71443)
+++ projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/mdb/unit/MDBUnitEmbeddedTest.java 2008-03-30 05:14:01 UTC (rev 71444)
@@ -21,41 +21,26 @@
*/
package org.jboss.ejb3.test.mdb.unit;
-import org.jboss.test.JBossTestCase;
-import org.jboss.logging.Logger;
-import org.jboss.ejb3.ClientKernelAbstraction;
-import org.jboss.ejb3.KernelAbstractionFactory;
-import org.jboss.ejb3.InitialContextFactory;
-import org.jboss.ejb3.test.mdb.TestStatus;
-import org.jboss.ejb3.test.mdb.Stateless;
-import org.jboss.security.SecurityAssociation;
-import org.jboss.security.SimplePrincipal;
-import org.jboss.util.collection.CollectionsUtil;
-import org.jboss.embedded.junit.EmbeddedTestCase;
-import org.jboss.embedded.Bootstrap;
-
-import javax.management.ObjectName;
+import javax.jms.Queue;
import javax.jms.QueueConnection;
+import javax.jms.QueueConnectionFactory;
import javax.jms.QueueSender;
import javax.jms.QueueSession;
-import javax.jms.Queue;
-import javax.jms.QueueConnectionFactory;
import javax.jms.TextMessage;
-import javax.jms.DeliveryMode;
-import javax.jms.TopicConnection;
-import javax.jms.MessageProducer;
-import javax.jms.TopicSession;
-import javax.jms.Topic;
import javax.jms.TopicConnectionFactory;
-import javax.jms.QueueReceiver;
-import javax.jms.QueueBrowser;
import javax.naming.NamingException;
-import javax.naming.InitialContext;
-import java.util.List;
-import java.util.Enumeration;
import junit.framework.Test;
+import org.jboss.ejb3.InitialContextFactory;
+import org.jboss.ejb3.test.mdb.Stateless;
+import org.jboss.ejb3.test.mdb.TestStatus;
+import org.jboss.embedded.Bootstrap;
+import org.jboss.embedded.junit.EmbeddedTestCase;
+import org.jboss.security.client.SecurityClient;
+import org.jboss.security.client.SecurityClientFactory;
+import org.jboss.test.JBossTestCase;
+
/**
* Sample client for the jboss container.
*
@@ -71,10 +56,11 @@
}
- protected void setSecurity(String user, String password)
+ protected void setSecurity(String user, String password) throws Exception
{
- SecurityAssociation.setPrincipal(new SimplePrincipal(user));
- SecurityAssociation.setCredential(password.toCharArray());
+ SecurityClient client = SecurityClientFactory.getSecurityClient();
+ client.setSimple(user, password);
+ client.login();
InitialContextFactory.setSecurity(user, password);
}
Modified: projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/mdb/unit/MDBUnitTestCase.java
===================================================================
--- projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/mdb/unit/MDBUnitTestCase.java 2008-03-30 02:43:26 UTC (rev 71443)
+++ projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/mdb/unit/MDBUnitTestCase.java 2008-03-30 05:14:01 UTC (rev 71444)
@@ -25,13 +25,12 @@
import java.util.List;
import javax.jms.DeliveryMode;
+import javax.jms.MessageConsumer;
import javax.jms.MessageProducer;
-import javax.jms.MessageConsumer;
import javax.jms.Queue;
import javax.jms.QueueBrowser;
import javax.jms.QueueConnection;
import javax.jms.QueueConnectionFactory;
-import javax.jms.QueueReceiver;
import javax.jms.QueueSender;
import javax.jms.QueueSession;
import javax.jms.TextMessage;
@@ -53,6 +52,8 @@
import org.jboss.logging.Logger;
import org.jboss.security.SecurityAssociation;
import org.jboss.security.SimplePrincipal;
+import org.jboss.security.client.SecurityClient;
+import org.jboss.security.client.SecurityClientFactory;
import org.jboss.test.JBossTestCase;
import org.jboss.util.collection.CollectionsUtil;
@@ -77,6 +78,9 @@
super(name);
}
+
+ private static final String PRINCIPAL_ANYONE = "anyone";
+ private static final String PASSWORD_PASSWORD = "password";
private static void removeAllMessagesFromDLQ() throws Exception
{
@@ -87,8 +91,9 @@
public void testOverrideQueue() throws Exception
{
- SecurityAssociation.setPrincipal(new SimplePrincipal("anyone"));
- SecurityAssociation.setCredential("password".toCharArray());
+ SecurityClient client = SecurityClientFactory.getSecurityClient();
+ client.setSimple(MDBUnitTestCase.PRINCIPAL_ANYONE, MDBUnitTestCase.PASSWORD_PASSWORD);
+ client.login();
TestStatus status = (TestStatus) getInitialContext().lookup(
"TestStatusBean/remote");
@@ -116,8 +121,9 @@
public void testNondurableQueue() throws Exception
{
- SecurityAssociation.setPrincipal(new SimplePrincipal("anyone"));
- SecurityAssociation.setCredential("password".toCharArray());
+ SecurityClient client = SecurityClientFactory.getSecurityClient();
+ client.setSimple(MDBUnitTestCase.PRINCIPAL_ANYONE, MDBUnitTestCase.PASSWORD_PASSWORD);
+ client.login();
TestStatus status = (TestStatus) getInitialContext().lookup(
"TestStatusBean/remote");
@@ -147,8 +153,9 @@
public void testDefaultedQueue() throws Exception
{
- SecurityAssociation.setPrincipal(new SimplePrincipal("anyone"));
- SecurityAssociation.setCredential("password".toCharArray());
+ SecurityClient client = SecurityClientFactory.getSecurityClient();
+ client.setSimple(MDBUnitTestCase.PRINCIPAL_ANYONE, MDBUnitTestCase.PASSWORD_PASSWORD);
+ client.login();
TestStatus status = (TestStatus) getInitialContext().lookup(
"TestStatusBean/remote");
@@ -176,8 +183,9 @@
public void testOverrideDefaultedQueue() throws Exception
{
- SecurityAssociation.setPrincipal(new SimplePrincipal("anyone"));
- SecurityAssociation.setCredential("password".toCharArray());
+ SecurityClient client = SecurityClientFactory.getSecurityClient();
+ client.setSimple(MDBUnitTestCase.PRINCIPAL_ANYONE, MDBUnitTestCase.PASSWORD_PASSWORD);
+ client.login();
TestStatus status = (TestStatus) getInitialContext().lookup(
"TestStatusBean/remote");
@@ -697,12 +705,11 @@
assertFalse(status.preDestroy());
}
- protected void setSecurity(String user, String password)
+ protected void setSecurity(String user, String password) throws Exception
{
- SecurityAssociation.setPrincipal(new SimplePrincipal(user));
- SecurityAssociation.setCredential(password.toCharArray());
-
- InitialContextFactory.setSecurity(user, password);
+ SecurityClient client = SecurityClientFactory.getSecurityClient();
+ client.setSimple(user, password);
+ client.login();
}
protected InitialContext getInitialContext() throws Exception
Modified: projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/naming/unit/ENCUnitTestCase.java
===================================================================
--- projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/naming/unit/ENCUnitTestCase.java 2008-03-30 02:43:26 UTC (rev 71443)
+++ projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/naming/unit/ENCUnitTestCase.java 2008-03-30 05:14:01 UTC (rev 71444)
@@ -21,9 +21,12 @@
*/
package org.jboss.ejb3.test.naming.unit;
+import org.jboss.ejb3.test.mdb.unit.MDBUnitTestCase;
import org.jboss.ejb3.test.naming.TestENC;
import org.jboss.security.SecurityAssociation;
import org.jboss.security.SimplePrincipal;
+import org.jboss.security.client.SecurityClient;
+import org.jboss.security.client.SecurityClientFactory;
import org.jboss.test.JBossTestCase;
import junit.framework.Test;
@@ -35,7 +38,7 @@
* @version $Revision$
*/
public class ENCUnitTestCase extends JBossTestCase
-{
+{
/**
* Constructor for the ENCUnitTestCase object
*
@@ -52,8 +55,9 @@
*/
public void testENC() throws Exception
{
- SecurityAssociation.setPrincipal(new SimplePrincipal("jduke"));
- SecurityAssociation.setCredential("theduke".toCharArray());
+ SecurityClient client = SecurityClientFactory.getSecurityClient();
+ client.setSimple("jduke", "theduke");
+ client.login();
TestENC bean = (TestENC)getInitialContext().lookup("ENCBean");
getLog().debug("Created ENCBean");
@@ -68,8 +72,9 @@
*/
public void testENC2() throws Exception
{
- SecurityAssociation.setPrincipal(new SimplePrincipal("jduke"));
- SecurityAssociation.setCredential("theduke".toCharArray());
+ SecurityClient client = SecurityClientFactory.getSecurityClient();
+ client.setSimple("jduke", "theduke");
+ client.login();
TestENC bean = (TestENC)getInitialContext().lookup("ENCBean0");
getLog().debug("Created ENCBean0");
Modified: projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/security/unit/TimerRunAsTestCase.java
===================================================================
--- projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/security/unit/TimerRunAsTestCase.java 2008-03-30 02:43:26 UTC (rev 71443)
+++ projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/security/unit/TimerRunAsTestCase.java 2008-03-30 05:14:01 UTC (rev 71444)
@@ -51,6 +51,8 @@
super(name);
}
+ //TODO SecurityAssociation is Deprecated, this should be replaced with equivalent
+ // testing for SecurityClient
public void testSecurityAssociation()
{
SecurityAssociation.clear();
Modified: projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/securitydomain/unit/SecurityDomainTestCase.java
===================================================================
--- projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/securitydomain/unit/SecurityDomainTestCase.java 2008-03-30 02:43:26 UTC (rev 71443)
+++ projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/securitydomain/unit/SecurityDomainTestCase.java 2008-03-30 05:14:01 UTC (rev 71444)
@@ -24,6 +24,8 @@
import org.jboss.ejb3.test.securitydomain.SecurityDomainTest;
import org.jboss.security.SecurityAssociation;
import org.jboss.security.SimplePrincipal;
+import org.jboss.security.client.SecurityClient;
+import org.jboss.security.client.SecurityClientFactory;
import org.jboss.test.JBossTestCase;
import junit.framework.Test;
@@ -65,8 +67,9 @@
{
}
- SecurityAssociation.setPrincipal(new SimplePrincipal("somebody"));
- SecurityAssociation.setCredential("password".toCharArray());
+ SecurityClient client = SecurityClientFactory.getSecurityClient();
+ client.setSimple("somebody", "password");
+ client.login();
test.testAccess();
augment.testAccess();
Modified: projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/service/unit/ServiceUnitTestCase.java
===================================================================
--- projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/service/unit/ServiceUnitTestCase.java 2008-03-30 02:43:26 UTC (rev 71443)
+++ projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/service/unit/ServiceUnitTestCase.java 2008-03-30 05:14:01 UTC (rev 71444)
@@ -40,6 +40,8 @@
import org.jboss.logging.Logger;
import org.jboss.security.SecurityAssociation;
import org.jboss.security.SimplePrincipal;
+import org.jboss.security.client.SecurityClient;
+import org.jboss.security.client.SecurityClientFactory;
import org.jboss.test.JBossTestCase;
/**
@@ -72,8 +74,9 @@
public void testEjbInjection() throws Exception
{
- SecurityAssociation.setPrincipal(new SimplePrincipal("somebody"));
- SecurityAssociation.setCredential("password".toCharArray());
+ SecurityClient client = SecurityClientFactory.getSecurityClient();
+ client.setSimple("somebody", "password");
+ client.login();
ServiceOneRemote test = (ServiceOneRemote) getInitialContext().lookup("ServiceOne/remote");
test.testEjbInjection();
@@ -83,7 +86,8 @@
{
try
{
- SecurityAssociation.clear();
+ SecurityClient client = SecurityClientFactory.getSecurityClient();
+ client.logout();
ServiceOneRemote test = (ServiceOneRemote) getInitialContext().lookup("ServiceOne/remote");
test.testEjbInjection();
@@ -97,8 +101,9 @@
public void testServiceWithDefaultRemoteJNDIName() throws Exception
{
- SecurityAssociation.setPrincipal(new SimplePrincipal("somebody"));
- SecurityAssociation.setCredential("password".toCharArray());
+ SecurityClient client = SecurityClientFactory.getSecurityClient();
+ client.setSimple("somebody", "password");
+ client.login();
ServiceOneRemote test = (ServiceOneRemote) getInitialContext().lookup("ServiceOne/remote");
test.setRemoteMethodCalls(0);
@@ -114,8 +119,9 @@
{
try
{
- SecurityAssociation.setPrincipal(new SimplePrincipal("somebody"));
- SecurityAssociation.setCredential("password".toCharArray());
+ SecurityClient client = SecurityClientFactory.getSecurityClient();
+ client.setSimple("somebody", "password");
+ client.login();
ServiceOneRemote test = (ServiceOneRemote) getInitialContext().lookup("ServiceOne/remote");
for (int j = 0 ; j < count ; j++)
{
@@ -336,8 +342,9 @@
public void testManagementServiceWithDefaultName() throws Exception
{
- SecurityAssociation.setPrincipal(new SimplePrincipal("somebody"));
- SecurityAssociation.setCredential("password".toCharArray());
+ SecurityClient client = SecurityClientFactory.getSecurityClient();
+ client.setSimple("somebody", "password");
+ client.login();
MBeanServerConnection server = getServer();
ObjectName testerName = new ObjectName("jboss.j2ee:service=EJB3,jar=service-test.jar,name=ServiceOne,type=ManagementInterface");
Modified: projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/servlet/servlets/EJBServlet.java
===================================================================
--- projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/servlet/servlets/EJBServlet.java 2008-03-30 02:43:26 UTC (rev 71443)
+++ projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/servlet/servlets/EJBServlet.java 2008-03-30 05:14:01 UTC (rev 71444)
@@ -41,6 +41,8 @@
import org.jboss.logging.Logger;
import org.jboss.security.SecurityAssociation;
import org.jboss.security.SimplePrincipal;
+import org.jboss.security.client.SecurityClient;
+import org.jboss.security.client.SecurityClientFactory;
/** A servlet that accesses an EJB and tests whether the call argument
is serialized.
@@ -63,8 +65,9 @@
{
try
{
- SecurityAssociation.setPrincipal(new SimplePrincipal("somebody"));
- SecurityAssociation.setCredential("password".toCharArray());
+ SecurityClient client = SecurityClientFactory.getSecurityClient();
+ client.setSimple("somebody", "password");
+ client.login();
injectedSession.hello();
injectedSession.goodbye();
Modified: projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/stateful/unit/MetricsUnitTestCase.java
===================================================================
--- projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/stateful/unit/MetricsUnitTestCase.java 2008-03-30 02:43:26 UTC (rev 71443)
+++ projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/stateful/unit/MetricsUnitTestCase.java 2008-03-30 05:14:01 UTC (rev 71444)
@@ -32,6 +32,8 @@
import org.jboss.security.SimplePrincipal;
import org.jboss.security.SecurityAssociation;
+import org.jboss.security.client.SecurityClient;
+import org.jboss.security.client.SecurityClientFactory;
/**
* @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
@@ -50,8 +52,9 @@
public void testJmxMetrics() throws Exception
{
- SecurityAssociation.setPrincipal(new SimplePrincipal("somebody"));
- SecurityAssociation.setCredential("password".toCharArray());
+ SecurityClient client = SecurityClientFactory.getSecurityClient();
+ client.setSimple("somebody", "password");
+ client.login();
MBeanServerConnection server = getServer();
Modified: projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/stateful/unit/RemoteUnitTestCase.java
===================================================================
--- projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/stateful/unit/RemoteUnitTestCase.java 2008-03-30 02:43:26 UTC (rev 71443)
+++ projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/stateful/unit/RemoteUnitTestCase.java 2008-03-30 05:14:01 UTC (rev 71444)
@@ -56,6 +56,8 @@
import org.jboss.logging.Logger;
import org.jboss.security.SecurityAssociation;
import org.jboss.security.SimplePrincipal;
+import org.jboss.security.client.SecurityClient;
+import org.jboss.security.client.SecurityClientFactory;
import org.jboss.test.JBossTestCase;
/**
@@ -177,8 +179,9 @@
// Keep this test first so we test everything after a deployment restart
public void testJmxName() throws Exception
{
- SecurityAssociation.setPrincipal(new SimplePrincipal("somebody"));
- SecurityAssociation.setCredential("password".toCharArray());
+ SecurityClient client = SecurityClientFactory.getSecurityClient();
+ client.setSimple("somebody", "password");
+ client.login();
Stateful stateful = (Stateful)getInitialContext().lookup("Stateful");
assertNotNull(stateful);
@@ -216,8 +219,9 @@
public void testStatefulSynchronization() throws Exception
{
- SecurityAssociation.setPrincipal(new SimplePrincipal("somebody"));
- SecurityAssociation.setCredential("password".toCharArray());
+ SecurityClient client = SecurityClientFactory.getSecurityClient();
+ client.setSimple("somebody", "password");
+ client.login();
Tester test = (Tester) getInitialContext().lookup("TesterBean/remote");
test.testSessionSynchronization();
@@ -226,8 +230,9 @@
public void testEJBObject() throws Exception
{
- SecurityAssociation.setPrincipal(new SimplePrincipal("somebody"));
- SecurityAssociation.setCredential("password".toCharArray());
+ SecurityClient client = SecurityClientFactory.getSecurityClient();
+ client.setSimple("somebody", "password");
+ client.login();
StatefulHome home = (StatefulHome)getInitialContext().lookup("StatefulBean/home");
assertNotNull(home);
@@ -237,8 +242,9 @@
public void testStatefulTx() throws Exception
{
- SecurityAssociation.setPrincipal(new SimplePrincipal("somebody"));
- SecurityAssociation.setCredential("password".toCharArray());
+ SecurityClient client = SecurityClientFactory.getSecurityClient();
+ client.setSimple("somebody", "password");
+ client.login();
StatefulTx stateful = (StatefulTx)getInitialContext().lookup("StatefulTx");
assertNotNull(stateful);
@@ -262,8 +268,9 @@
public void testTemplateInterfaceTx() throws Exception
{
- SecurityAssociation.setPrincipal(new SimplePrincipal("somebody"));
- SecurityAssociation.setCredential("password".toCharArray());
+ SecurityClient client = SecurityClientFactory.getSecurityClient();
+ client.setSimple("somebody", "password");
+ client.login();
StatefulTx stateful = (StatefulTx)getInitialContext().lookup("StatefulTx");
assertNotNull(stateful);
@@ -280,8 +287,9 @@
public void testLocalSFSB() throws Exception
{
- SecurityAssociation.setPrincipal(new SimplePrincipal("somebody"));
- SecurityAssociation.setCredential("password".toCharArray());
+ SecurityClient client = SecurityClientFactory.getSecurityClient();
+ client.setSimple("somebody", "password");
+ client.login();
try
{
@@ -300,8 +308,9 @@
public void testNotSerialableSFSB() throws Exception
{
- SecurityAssociation.setPrincipal(new SimplePrincipal("somebody"));
- SecurityAssociation.setCredential("password".toCharArray());
+ SecurityClient client = SecurityClientFactory.getSecurityClient();
+ client.setSimple("somebody", "password");
+ client.login();
Stateful stateful = (Stateful)getInitialContext().lookup("Stateful");
assertNotNull(stateful);
@@ -312,8 +321,9 @@
public void testSFSBInit() throws Exception
{
- SecurityAssociation.setPrincipal(new SimplePrincipal("somebody"));
- SecurityAssociation.setCredential("password".toCharArray());
+ SecurityClient client = SecurityClientFactory.getSecurityClient();
+ client.setSimple("somebody", "password");
+ client.login();
StatefulHome home = (StatefulHome)getInitialContext().lookup("StatefulBean/home");
assertNotNull(home);
@@ -326,8 +336,9 @@
public void testStackTrace() throws Exception
{
- SecurityAssociation.setPrincipal(new SimplePrincipal("somebody"));
- SecurityAssociation.setCredential("password".toCharArray());
+ SecurityClient client = SecurityClientFactory.getSecurityClient();
+ client.setSimple("somebody", "password");
+ client.login();
Stateful stateful = (Stateful)getInitialContext().lookup("Stateful");
assertNotNull(stateful);
@@ -346,8 +357,9 @@
public void testExceptionCase() throws Exception
{
- SecurityAssociation.setPrincipal(new SimplePrincipal("somebody"));
- SecurityAssociation.setCredential("password".toCharArray());
+ SecurityClient client = SecurityClientFactory.getSecurityClient();
+ client.setSimple("somebody", "password");
+ client.login();
Stateful stateful = (Stateful)getInitialContext().lookup("Stateful");
assertNotNull(stateful);
@@ -367,8 +379,9 @@
public void testRemoteBindingInterceptorStack() throws Exception
{
- SecurityAssociation.setPrincipal(new SimplePrincipal("somebody"));
- SecurityAssociation.setCredential("password".toCharArray());
+ SecurityClient client = SecurityClientFactory.getSecurityClient();
+ client.setSimple("somebody", "password");
+ client.login();
Stateful stateful = (Stateful)getInitialContext().lookup("Stateful");
assertNotNull(stateful);
@@ -378,8 +391,9 @@
public void testUninstantiatedPassivation() throws Exception
{
- SecurityAssociation.setPrincipal(new SimplePrincipal("somebody"));
- SecurityAssociation.setCredential("password".toCharArray());
+ SecurityClient client = SecurityClientFactory.getSecurityClient();
+ client.setSimple("somebody", "password");
+ client.login();
Stateful stateful = (Stateful)getInitialContext().lookup("Stateful");
assertNotNull(stateful);
@@ -541,8 +555,9 @@
public void testPassivation() throws Exception
{
- SecurityAssociation.setPrincipal(new SimplePrincipal("somebody"));
- SecurityAssociation.setCredential("password".toCharArray());
+ SecurityClient client = SecurityClientFactory.getSecurityClient();
+ client.setSimple("somebody", "password");
+ client.login();
System.out.println("testPassivation");
Stateless stateless = (Stateless)getInitialContext().lookup("Stateless");
@@ -582,8 +597,9 @@
public void testClusteredPassivation() throws Exception
{
- SecurityAssociation.setPrincipal(new SimplePrincipal("somebody"));
- SecurityAssociation.setCredential("password".toCharArray());
+ SecurityClient client = SecurityClientFactory.getSecurityClient();
+ client.setSimple("somebody", "password");
+ client.login();
System.out.println("testPassivation");
Stateless stateless = (Stateless)getInitialContext().lookup("Stateless");
@@ -624,8 +640,9 @@
public void testRemove() throws Exception
{
- SecurityAssociation.setPrincipal(new SimplePrincipal("somebody"));
- SecurityAssociation.setCredential("password".toCharArray());
+ SecurityClient client = SecurityClientFactory.getSecurityClient();
+ client.setSimple("somebody", "password");
+ client.login();
System.out.println("testPassivation");
Stateful stateful = (Stateful)getInitialContext().lookup("Stateful");
Modified: projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/stateless/unit/StatelessTestCase.java
===================================================================
--- projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/stateless/unit/StatelessTestCase.java 2008-03-30 02:43:26 UTC (rev 71443)
+++ projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/stateless/unit/StatelessTestCase.java 2008-03-30 05:14:01 UTC (rev 71444)
@@ -31,6 +31,8 @@
import org.jboss.logging.Logger;
import org.jboss.security.SecurityAssociation;
import org.jboss.security.SimplePrincipal;
+import org.jboss.security.client.SecurityClient;
+import org.jboss.security.client.SecurityClientFactory;
import org.jboss.test.JBossTestCase;
import junit.framework.Test;
@@ -52,8 +54,9 @@
public void testCallerPrincipal() throws Exception
{
- SecurityAssociation.setPrincipal(new SimplePrincipal("somebody"));
- SecurityAssociation.setCredential("password".toCharArray());
+ SecurityClient client = SecurityClientFactory.getSecurityClient();
+ client.setSimple("somebody", "password");
+ client.login();
RunAsStateless runAs = (RunAsStateless) getInitialContext().lookup("RunAsStatelessEjbName/remote");
assertNotNull(runAs);
@@ -72,8 +75,9 @@
public void testStatelessLocal() throws Exception
{
- SecurityAssociation.setPrincipal(new SimplePrincipal("somebody"));
- SecurityAssociation.setCredential("password".toCharArray());
+ SecurityClient client = SecurityClientFactory.getSecurityClient();
+ client.setSimple("somebody", "password");
+ client.login();
try
{
@@ -92,14 +96,14 @@
{
CheckedStateless checked = (CheckedStateless)getInitialContext().lookup("CheckedStatelessBean/remote");
- SecurityAssociation.setPrincipal(new SimplePrincipal("somebody"));
- SecurityAssociation.setCredential("password".toCharArray());
+ SecurityClient client = SecurityClientFactory.getSecurityClient();
+ client.setSimple("somebody", "password");
+ client.login();
int result = checked.method(1);
assertEquals(1,result);
- SecurityAssociation.setPrincipal(new SimplePrincipal("rolefail"));
- SecurityAssociation.setCredential("password".toCharArray());
+ client.setSimple("rolefail", "password");
try {
checked.method(2);
@@ -119,7 +123,8 @@
{
AnonymousStateless anonymous = (AnonymousStateless)getInitialContext().lookup("AnonymousStatelessBean/remote");
- SecurityAssociation.clear();
+ SecurityClient client = SecurityClientFactory.getSecurityClient();
+ client.logout();
try
{
@@ -142,8 +147,9 @@
{
UnsecuredStateless stateless = (UnsecuredStateless)getInitialContext().lookup("UnsecuredStatelessBean/remote");
- SecurityAssociation.setPrincipal(new SimplePrincipal("somebody"));
- SecurityAssociation.setCredential("password".toCharArray());
+ SecurityClient client = SecurityClientFactory.getSecurityClient();
+ client.setSimple("somebody", "password");
+ client.login();
try
{
@@ -159,7 +165,8 @@
{
UnsecuredStateless stateless = (UnsecuredStateless)getInitialContext().lookup("UnsecuredStatelessBean/remote");
- SecurityAssociation.clear();
+ SecurityClient client = SecurityClientFactory.getSecurityClient();
+ client.logout();
try
{
More information about the jboss-cvs-commits
mailing list