[jboss-cvs] JBossAS SVN: r61915 - in trunk/ejb3: src/resources/test/tck5sec/META-INF and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Mar 30 17:03:57 EDT 2007
Author: bdecoste
Date: 2007-03-30 17:03:57 -0400 (Fri, 30 Mar 2007)
New Revision: 61915
Added:
trunk/ejb3/src/resources/test/tck5sec/META-INF/application.xml
trunk/ejb3/src/resources/test/tck5sec/META-INF/jboss-app.xml
Modified:
trunk/ejb3/build-test.xml
trunk/ejb3/src/resources/test/tck5sec/META-INF/jboss.xml
trunk/ejb3/src/test/org/jboss/ejb3/test/tck5sec/StatefulBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/tck5sec/StatefulTestBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/tck5sec/unit/Tck5SecTestCase.java
Log:
test for run-as-principal
Modified: trunk/ejb3/build-test.xml
===================================================================
--- trunk/ejb3/build-test.xml 2007-03-30 20:55:27 UTC (rev 61914)
+++ trunk/ejb3/build-test.xml 2007-03-30 21:03:57 UTC (rev 61915)
@@ -2652,11 +2652,20 @@
<include name="org/jboss/ejb3/test/tck5sec/*.class"/>
</fileset>
<fileset dir="${resources}/test/tck5sec">
- <include name="META-INF/*.xml"/>
+ <include name="META-INF/jboss.xml"/>
<include name="users.properties"/>
<include name="roles.properties"/>
</fileset>
</jar>
+
+ <ear appxml="${resources}/test/tck5sec/META-INF/application.xml" earfile="${build.lib}/tck5sec-test.ear">
+ <!--metainf dir="${build.resources}/test/tck5sec/META-INF">
+ <include name="jboss-app.xml"/>
+ </metainf-->
+ <fileset dir="${build.lib}">
+ <include name="tck5sec-test.jar"/>
+ </fileset>
+ </ear>
</target>
<target name="security"
Added: trunk/ejb3/src/resources/test/tck5sec/META-INF/application.xml
===================================================================
--- trunk/ejb3/src/resources/test/tck5sec/META-INF/application.xml (rev 0)
+++ trunk/ejb3/src/resources/test/tck5sec/META-INF/application.xml 2007-03-30 21:03:57 UTC (rev 61915)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE application PUBLIC
+ "-//Sun Microsystems, Inc.//DTD J2EE Application 1.3//EN"
+ "http://java.sun.com/dtd/application_1_3.dtd">
+
+<application>
+ <display-name>EJB3 tck5sec test</display-name>
+
+ <module>
+ <ejb>tck5sec-test.jar</ejb>
+ </module>
+</application>
Added: trunk/ejb3/src/resources/test/tck5sec/META-INF/jboss-app.xml
===================================================================
--- trunk/ejb3/src/resources/test/tck5sec/META-INF/jboss-app.xml (rev 0)
+++ trunk/ejb3/src/resources/test/tck5sec/META-INF/jboss-app.xml 2007-03-30 21:03:57 UTC (rev 61915)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jboss-app PUBLIC "-//JBoss//DTD Java EE Application 5.0///EN" "http://www.jboss.org/j2ee/dtd/jboss-app_5_0.dtd">
+
+<jboss-app>
+ <security-domain>java:/jaas/cts</security-domain>
+ <security-role>
+ <role-name>Administrator</role-name>
+ <principal-name>j2ee</principal-name>
+ </security-role>
+ <security-role>
+ <role-name>Manager</role-name>
+ <principal-name>javajoe</principal-name>
+ </security-role>
+ <security-role>
+ <role-name>Employee</role-name>
+ <principal-name>javajoe</principal-name>
+ <principal-name>j2ee</principal-name>
+ </security-role>
+</jboss-app>
Modified: trunk/ejb3/src/resources/test/tck5sec/META-INF/jboss.xml
===================================================================
--- trunk/ejb3/src/resources/test/tck5sec/META-INF/jboss.xml 2007-03-30 20:55:27 UTC (rev 61914)
+++ trunk/ejb3/src/resources/test/tck5sec/META-INF/jboss.xml 2007-03-30 21:03:57 UTC (rev 61915)
@@ -5,6 +5,7 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://www.jboss.org/j2ee/schema/jboss_5_0.xsd"
version="3.0">
+ <security-domain>java:/jaas/cts</security-domain>
<enterprise-beans>
<session>
<ejb-name>StatefulTestBean</ejb-name>
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/tck5sec/StatefulBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/tck5sec/StatefulBean.java 2007-03-30 20:55:27 UTC (rev 61914)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/tck5sec/StatefulBean.java 2007-03-30 21:03:57 UTC (rev 61915)
@@ -38,7 +38,6 @@
*/
@Stateful
@Remote(StatefulSession.class)
- at SecurityDomain("other")
public class StatefulBean implements StatefulSession
{
private static final Logger log = Logger.getLogger(StatefulBean.class);
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/tck5sec/StatefulTestBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/tck5sec/StatefulTestBean.java 2007-03-30 20:55:27 UTC (rev 61914)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/tck5sec/StatefulTestBean.java 2007-03-30 21:03:57 UTC (rev 61915)
@@ -39,7 +39,6 @@
*/
@Stateful
@Remote(StatefulSessionTest.class)
- at SecurityDomain("other")
@RunAs("Manager")
//@org.jboss.annotation.security.RunAsPrincipal("javajoe")
public class StatefulTestBean implements StatefulSessionTest
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/tck5sec/unit/Tck5SecTestCase.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/tck5sec/unit/Tck5SecTestCase.java 2007-03-30 20:55:27 UTC (rev 61914)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/tck5sec/unit/Tck5SecTestCase.java 2007-03-30 21:03:57 UTC (rev 61915)
@@ -63,19 +63,19 @@
lc.login();
InitialContext jndiContext = new InitialContext();
- StatefulSessionTest sfsb = (StatefulSessionTest)jndiContext.lookup("StatefulTestBean/remote");
+ StatefulSessionTest sfsb = (StatefulSessionTest)jndiContext.lookup("tck5sec-test/StatefulTestBean/remote");
boolean success = sfsb.EjbOverloadedSecRoleRefs("Employee", "Administrator");
assertTrue(success);
}
- public void test3() throws Exception
+ public void atest3() throws Exception
{
AppCallbackHandler handler = new AppCallbackHandler("j2ee", "j2ee".toCharArray());
LoginContext lc = new LoginContext("spec-test", handler);
lc.login();
InitialContext jndiContext = new InitialContext();
- StatefulSessionTest sfsb = (StatefulSessionTest)jndiContext.lookup("StatefulTestBean/remote");
+ StatefulSessionTest sfsb = (StatefulSessionTest)jndiContext.lookup("tck5sec-test/StatefulTestBean/remote");
boolean success = sfsb.EjbSecRoleRef("Employee");
assertTrue(success);
}
@@ -83,7 +83,7 @@
public static Test suite() throws Exception
{
Configuration.setConfiguration(new XMLLoginConfigImpl());
- return getDeploySetup(Tck5SecTestCase.class, "tck5sec-test.jar");
+ return getDeploySetup(Tck5SecTestCase.class, "tck5sec-test.ear");
}
More information about the jboss-cvs-commits
mailing list