Author: alessio.soldano(a)jboss.com Date: 2011-06-07 07:14:43 -0400 (Tue, 07 Jun 2011) New Revision: 14479 Modified: shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestSetup.java Log: [JBWS-3257] Adding option for deploying the jbossws default test security domain Modified: shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestSetup.java =================================================================== --- shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestSetup.java 2011-06-06 16:25:26 UTC (rev 14478) +++ shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestSetup.java 2011-06-07 11:14:43 UTC (rev 14479) @@ -50,22 +50,37 @@ { // provide logging private static Logger log = Logger.getLogger(JBossWSTestSetup.class); + + private static final String JBOSSWS_SEC_DOMAIN = "JBossWS"; private String[] archives = new String[0]; private ClassLoader originalClassLoader; private Map<String, Map<String, String>> securityDomains = new HashMap<String, Map<String,String>>(); + private boolean defaultSecurityDomainRequirement = false; public JBossWSTestSetup(Class<?> testClass, String archiveList) { super(new TestSuite(testClass)); getArchiveArray(archiveList); } + + public JBossWSTestSetup(Class<?> testClass, String archiveList, boolean requiresDefaultSecurityDomain) + { + this(testClass, archiveList); + setDefaultSecurityDomainRequirement(requiresDefaultSecurityDomain); + } public JBossWSTestSetup(Test test, String archiveList) { super(test); getArchiveArray(archiveList); } + + public JBossWSTestSetup(Test test, String archiveList, boolean requiresDefaultSecurityDomain) + { + this(test, archiveList); + setDefaultSecurityDomainRequirement(requiresDefaultSecurityDomain); + } public JBossWSTestSetup(Test test) { @@ -117,6 +132,20 @@ JBossWSTestHelper.addSecurityDomain(key, securityDomains.get(key)); } } + if (defaultSecurityDomainRequirement) + { + String usersPropFile = System.getProperty("org.jboss.ws.testsuite.securityDomain.users.propfile"); + String rolesPropFile = System.getProperty("org.jboss.ws.testsuite.securityDomain.roles.propfile"); + Map<String, String> authenticationOptions = new HashMap<String, String>(); + if (usersPropFile != null) { + authenticationOptions.put("usersProperties", usersPropFile); + } + if (rolesPropFile != null) { + authenticationOptions.put("rolesProperties", rolesPropFile); + } + authenticationOptions.put("unauthenticatedIdentity", "anonymous"); + JBossWSTestHelper.addSecurityDomain(JBOSSWS_SEC_DOMAIN, authenticationOptions); + } List<URL> clientJars = new ArrayList<URL>(); for (int i = 0; i < archives.length; i++) @@ -175,6 +204,10 @@ JBossWSTestHelper.removeSecurityDomain(key); } } + if (defaultSecurityDomainRequirement) + { + JBossWSTestHelper.removeSecurityDomain(JBOSSWS_SEC_DOMAIN); + } } } @@ -192,4 +225,9 @@ { securityDomains.put(securityDomainName, authenticationOptions); } + + public void setDefaultSecurityDomainRequirement(boolean defaultSecurityDomainRequirement) + { + this.defaultSecurityDomainRequirement = defaultSecurityDomainRequirement; + } }