[jboss-cvs] JBossAS SVN: r86467 - in projects/ejb3/trunk/testsuite: src/test/java/org/jboss/ejb3/test/changexml and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Mar 30 06:15:07 EDT 2009
Author: jaikiran
Date: 2009-03-30 06:15:07 -0400 (Mon, 30 Mar 2009)
New Revision: 86467
Added:
projects/ejb3/trunk/testsuite/src/test/resources/test/changexml/META-INF/changexml-jaas-config.xml
projects/ejb3/trunk/testsuite/src/test/resources/test/changexml/changexml-roles.properties
projects/ejb3/trunk/testsuite/src/test/resources/test/changexml/changexml-users.properties
projects/ejb3/trunk/testsuite/src/test/resources/test/changexml/jboss-service.xml
Modified:
projects/ejb3/trunk/testsuite/build-test.xml
projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/changexml/TesterBean.java
Log:
EJBTHREE-1795 Updated the ChangeXMLUnitTestCase to be more robust by relying on its own unique security domain configuration
Modified: projects/ejb3/trunk/testsuite/build-test.xml
===================================================================
--- projects/ejb3/trunk/testsuite/build-test.xml 2009-03-30 10:09:15 UTC (rev 86466)
+++ projects/ejb3/trunk/testsuite/build-test.xml 2009-03-30 10:15:07 UTC (rev 86467)
@@ -3728,6 +3728,9 @@
</fileset>
<fileset dir="${resources}/test/changexml">
<include name="META-INF/*.xml"/>
+ <include name="changexml-users.properties"/>
+ <include name="changexml-roles.properties"/>
+ <include name="*.xml"/>
</fileset>
</jar>
</target>
Modified: projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/changexml/TesterBean.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/changexml/TesterBean.java 2009-03-30 10:09:15 UTC (rev 86466)
+++ projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/changexml/TesterBean.java 2009-03-30 10:15:07 UTC (rev 86467)
@@ -45,12 +45,12 @@
{
if (local == null)
throw new RuntimeException("local not injected");
-
+
// No security domain should work
if ("Ok".equals(local.doSomething("Ok")) == false)
throw new RuntimeException("doSomething didn't work");
-
- // Add a security domain
+
+ // Add a security domain
MBeanServer server = MBeanServerLocator.locateJBoss();
DeploymentUnit unit = (DeploymentUnit) server.invoke(MainDeployerMBean.OBJECT_NAME, "getDeploymentUnit", new Object[] { url }, new String[] { URL.class.getName() });
if (unit == null)
@@ -61,8 +61,8 @@
JBossEnterpriseBeanMetaData bean = jbossMetaData.getEnterpriseBean(SessionBean.class.getSimpleName());
if (bean == null)
throw new RuntimeException("No bean");
- bean.setSecurityDomain("other");
-
+ bean.setSecurityDomain("changexml-security-domain");
+
// Now this shouldn't work
try
{
@@ -72,6 +72,6 @@
{
return;
}
- throw new RuntimeException("Should not be here!");
+ throw new RuntimeException("Should not be here!");
}
}
Added: projects/ejb3/trunk/testsuite/src/test/resources/test/changexml/META-INF/changexml-jaas-config.xml
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/resources/test/changexml/META-INF/changexml-jaas-config.xml (rev 0)
+++ projects/ejb3/trunk/testsuite/src/test/resources/test/changexml/META-INF/changexml-jaas-config.xml 2009-03-30 10:15:07 UTC (rev 86467)
@@ -0,0 +1,17 @@
+<?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="changexml-security-domain">
+ <authentication>
+ <login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule"
+ flag="required">
+ <module-option name="usersProperties">changexml-users.properties</module-option>
+ <module-option name="rolesProperties">changexml-roles.properties</module-option>
+ </login-module>
+ </authentication>
+ </application-policy>
+</policy>
+
Property changes on: projects/ejb3/trunk/testsuite/src/test/resources/test/changexml/META-INF/changexml-jaas-config.xml
___________________________________________________________________
Name: svn:executable
+ *
Added: projects/ejb3/trunk/testsuite/src/test/resources/test/changexml/changexml-roles.properties
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/resources/test/changexml/changexml-roles.properties (rev 0)
+++ projects/ejb3/trunk/testsuite/src/test/resources/test/changexml/changexml-roles.properties 2009-03-30 10:15:07 UTC (rev 86467)
@@ -0,0 +1,4 @@
+# Intentionally maintained as empty because in the
+# org.jboss.ejb3.test.changexml.unit.ChangeXMLUnitTestCase,
+# we expect the bean access to fail, when under the "other"
+# security domain
\ No newline at end of file
Property changes on: projects/ejb3/trunk/testsuite/src/test/resources/test/changexml/changexml-roles.properties
___________________________________________________________________
Name: svn:executable
+ *
Added: projects/ejb3/trunk/testsuite/src/test/resources/test/changexml/changexml-users.properties
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/resources/test/changexml/changexml-users.properties (rev 0)
+++ projects/ejb3/trunk/testsuite/src/test/resources/test/changexml/changexml-users.properties 2009-03-30 10:15:07 UTC (rev 86467)
@@ -0,0 +1,4 @@
+# Intentionally maintained as empty because in the
+# org.jboss.ejb3.test.changexml.unit.ChangeXMLUnitTestCase,
+# we expect the bean access to fail, when under the "other"
+# security domain
\ No newline at end of file
Property changes on: projects/ejb3/trunk/testsuite/src/test/resources/test/changexml/changexml-users.properties
___________________________________________________________________
Name: svn:executable
+ *
Added: projects/ejb3/trunk/testsuite/src/test/resources/test/changexml/jboss-service.xml
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/resources/test/changexml/jboss-service.xml (rev 0)
+++ projects/ejb3/trunk/testsuite/src/test/resources/test/changexml/jboss-service.xml 2009-03-30 10:15:07 UTC (rev 86467)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<server>
+ <!-- The custom JAAS login configuration service that installs
+ a Configuration capable of dynamically updating the
+ config settings
+ -->
+ <mbean code="org.jboss.security.auth.login.DynamicLoginConfig"
+ name="jboss.security.tests:service=DynamicLoginConfig">
+ <attribute name="AuthConfig">META-INF/changexml-jaas-config.xml</attribute>
+ <depends optional-attribute-name="LoginConfigService">
+ jboss.security:service=XMLLoginConfig
+ </depends>
+ <depends optional-attribute-name="SecurityManagerService">
+ jboss.security:service=JaasSecurityManager
+ </depends>
+ </mbean>
+
+</server>
Property changes on: projects/ejb3/trunk/testsuite/src/test/resources/test/changexml/jboss-service.xml
___________________________________________________________________
Name: svn:executable
+ *
More information about the jboss-cvs-commits
mailing list