[jboss-svn-commits] JBL Code SVN: r23472 - in labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/tests/src/org/jboss: soa/esb/listeners/message and 1 other directory.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Oct 16 06:09:31 EDT 2008
Author: kevin.conner at jboss.com
Date: 2008-10-16 06:09:30 -0400 (Thu, 16 Oct 2008)
New Revision: 23472
Added:
labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/tests/src/org/jboss/internal/soa/esb/services/security/test_jaas.config
labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/tests/src/org/jboss/soa/esb/listeners/message/test_jaas.config
Removed:
labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/tests/src/org/jboss/internal/soa/esb/services/security/login-config.xml
labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/tests/src/org/jboss/soa/esb/listeners/message/login-config.xml
Modified:
labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/tests/src/org/jboss/internal/soa/esb/services/security/JaasSecurityServiceUnitTest.java
labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/tests/src/org/jboss/soa/esb/listeners/message/ActionProcessingPipelineUnitTest.java
Log:
Fix unit tests: JBESB-2120
Modified: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/tests/src/org/jboss/internal/soa/esb/services/security/JaasSecurityServiceUnitTest.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/tests/src/org/jboss/internal/soa/esb/services/security/JaasSecurityServiceUnitTest.java 2008-10-16 07:28:17 UTC (rev 23471)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/tests/src/org/jboss/internal/soa/esb/services/security/JaasSecurityServiceUnitTest.java 2008-10-16 10:09:30 UTC (rev 23472)
@@ -22,7 +22,6 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
import java.net.URL;
import java.security.Principal;
@@ -30,11 +29,9 @@
import java.util.Set;
import javax.security.auth.Subject;
-import javax.security.auth.login.Configuration;
import junit.framework.JUnit4TestAdapter;
-import org.jboss.security.auth.login.XMLLoginConfigImpl;
import org.jboss.soa.esb.ConfigurationException;
import org.jboss.soa.esb.common.Environment;
import org.jboss.soa.esb.services.security.SecurityConfig;
@@ -151,40 +148,6 @@
assertTrue(checkRolesAllowed);
}
- @Test
- public void refresh() throws SecurityServiceException
- {
- Runnable runnable = new Runnable()
- {
- public void run()
- {
- threadLogin();
- }
- };
- for (int i = 0; i < 1000; i++)
- {
- Thread t1 = new Thread(runnable);
- Thread t2 = new Thread(runnable);
- t1.start();
- t2.start();
- }
- }
-
- private void threadLogin()
- {
- Builder builder = new SecurityConfig.Builder("SuccessfulLogin");
- SecurityConfig configInfo = builder.build();
- SecurityContext context = new SecurityContext(new Subject());
- try
- {
- service.authenticate( configInfo, context, null );
- }
- catch (SecurityServiceException e)
- {
- fail(e.getMessage());
- }
- }
-
@Before
public void setup() throws ConfigurationException
{
@@ -192,17 +155,8 @@
URL resource = ClassUtil.getResource("security-properties.xml", getClass());
System.setProperty(Environment.PROPERTIES_FILE, "abs://" + resource.getFile());
- // set up login-config.xml
- XMLLoginConfigImpl loginConfigImpl = new XMLLoginConfigImpl();
- loginConfigImpl.setValidateDTD(true);
-
- // our login-config.xml (in the same directory as this class
- URL loginConfig = ClassUtil.getResource("login-config.xml", getClass());
+ URL loginConfig = ClassUtil.getResource("test_jaas.config", getClass());
System.setProperty("java.security.auth.login.config", loginConfig.getFile());
- loginConfigImpl.loadConfig();
-
- Configuration.setConfiguration(loginConfigImpl);
-
}
@After
Deleted: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/tests/src/org/jboss/internal/soa/esb/services/security/login-config.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/tests/src/org/jboss/internal/soa/esb/services/security/login-config.xml 2008-10-16 07:28:17 UTC (rev 23471)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/tests/src/org/jboss/internal/soa/esb/services/security/login-config.xml 2008-10-16 10:09:30 UTC (rev 23472)
@@ -1,29 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE policy PUBLIC "-//JBoss//DTD JBOSS Security Config 3.0//EN" "http://www.jboss.org/j2ee/dtd/security_config.dtd">
-
-<policy>
-
- <application-policy name = "SuccessfulLogin">
- <authentication>
- <login-module code = "org.jboss.soa.esb.services.security.TestLoginModule" flag = "required" >
- <module-option name = "forceLogin">true</module-option>
- </login-module>
- </authentication>
- </application-policy>
-
- <application-policy name = "FailureLogin">
- <authentication>
- <login-module code = "org.jboss.soa.esb.services.security.TestLoginModule" flag = "required" >
- <module-option name = "forceLogin">false</module-option>
- </login-module>
- </authentication>
- </application-policy>
-
- <application-policy name = "UserPassLogin">
- <authentication>
- <login-module code = "org.jboss.soa.esb.services.security.UserPassLoginModule" flag = "required"/>
- </authentication>
- </application-policy>
-
-</policy>
-
Added: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/tests/src/org/jboss/internal/soa/esb/services/security/test_jaas.config
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/tests/src/org/jboss/internal/soa/esb/services/security/test_jaas.config (rev 0)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/tests/src/org/jboss/internal/soa/esb/services/security/test_jaas.config 2008-10-16 10:09:30 UTC (rev 23472)
@@ -0,0 +1,11 @@
+SuccessfulLogin {
+ org.jboss.soa.esb.services.security.TestLoginModule required forceLogin=true;
+};
+
+FailureLogin {
+ org.jboss.soa.esb.services.security.TestLoginModule required forceLogin=false;
+};
+
+UserPassLogin {
+ org.jboss.soa.esb.services.security.UserPassLoginModule required;
+};
Modified: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/tests/src/org/jboss/soa/esb/listeners/message/ActionProcessingPipelineUnitTest.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/tests/src/org/jboss/soa/esb/listeners/message/ActionProcessingPipelineUnitTest.java 2008-10-16 07:28:17 UTC (rev 23471)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/tests/src/org/jboss/soa/esb/listeners/message/ActionProcessingPipelineUnitTest.java 2008-10-16 10:09:30 UTC (rev 23472)
@@ -26,11 +26,10 @@
import java.net.URL;
import javax.security.auth.Subject;
-import javax.security.auth.login.Configuration;
import junit.framework.TestCase;
-import org.jboss.security.auth.login.XMLLoginConfigImpl;
+import org.jboss.internal.soa.esb.services.registry.MockRegistry;
import org.jboss.soa.esb.ConfigurationException;
import org.jboss.soa.esb.common.Environment;
import org.jboss.soa.esb.common.ModulePropertyManager;
@@ -64,24 +63,15 @@
MockActionInfo.reset();
System.setProperty("javax.xml.registry.ConnectionFactoryClass","org.apache.ws.scout.registry.ConnectionFactoryImpl");
- com.arjuna.common.util.propertyservice.PropertyManager pm = ModulePropertyManager.getPropertyManager(ModulePropertyManager.DBSTORE_MODULE);
- pm.setProperty("javax.xml.registry.ConnectionFactoryClass", "org.apache.ws.scout.registry.ConnectionFactoryImpl");
+ MockRegistry.install();
LifecycleResourceManager.getSingleton().associateDeployment(getClass().getCanonicalName()) ;
jbossEsbProperties = System.getProperty(Environment.PROPERTIES_FILE);
URL resource = ClassUtil.getResource("security-properties.xml", getClass());
System.setProperty(Environment.PROPERTIES_FILE, "abs://" + resource.getFile());
-
- // set up login-config.xml
- XMLLoginConfigImpl loginConfigImpl = new XMLLoginConfigImpl();
- loginConfigImpl.setValidateDTD(true);
-
- // our login-config.xml (in the same directory as this class
- URL loginConfig = ClassUtil.getResource("login-config.xml", getClass());
+
+ URL loginConfig = ClassUtil.getResource("test_jaas.config", getClass());
System.setProperty("java.security.auth.login.config", loginConfig.getFile());
- loginConfigImpl.loadConfig();
-
- Configuration.setConfiguration(loginConfigImpl);
}
@Override
Deleted: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/tests/src/org/jboss/soa/esb/listeners/message/login-config.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/tests/src/org/jboss/soa/esb/listeners/message/login-config.xml 2008-10-16 07:28:17 UTC (rev 23471)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/tests/src/org/jboss/soa/esb/listeners/message/login-config.xml 2008-10-16 10:09:30 UTC (rev 23472)
@@ -1,29 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE policy PUBLIC "-//JBoss//DTD JBOSS Security Config 3.0//EN" "http://www.jboss.org/j2ee/dtd/security_config.dtd">
-
-<policy>
-
- <application-policy name = "SuccessfulLogin">
- <authentication>
- <login-module code = "org.jboss.soa.esb.services.security.TestLoginModule" flag = "required" >
- <module-option name = "forceLogin">true</module-option>
- </login-module>
- </authentication>
- </application-policy>
-
- <application-policy name = "FailureLogin">
- <authentication>
- <login-module code = "org.jboss.soa.esb.services.security.TestLoginModule" flag = "required" >
- <module-option name = "forceLogin">false</module-option>
- </login-module>
- </authentication>
- </application-policy>
-
- <application-policy name = "UserPassLogin">
- <authentication>
- <login-module code = "org.jboss.soa.esb.services.security.UserPassLoginModule" flag = "required"/>
- </authentication>
- </application-policy>
-
-</policy>
-
Added: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/tests/src/org/jboss/soa/esb/listeners/message/test_jaas.config
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/tests/src/org/jboss/soa/esb/listeners/message/test_jaas.config (rev 0)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/tests/src/org/jboss/soa/esb/listeners/message/test_jaas.config 2008-10-16 10:09:30 UTC (rev 23472)
@@ -0,0 +1,11 @@
+SuccessfulLogin {
+ org.jboss.soa.esb.services.security.TestLoginModule required forceLogin=true;
+};
+
+FailureLogin {
+ org.jboss.soa.esb.services.security.TestLoginModule required forceLogin=false;
+};
+
+UserPassLogin {
+ org.jboss.soa.esb.services.security.UserPassLoginModule required;
+};
More information about the jboss-svn-commits
mailing list