User: stark
Date: 01/03/05 02:13:54
Modified: src/build build.xml run_tests.xml
Log:
Updated security tests
Revision Changes Path
1.19 +29 -5 jbosstest/src/build/build.xml
Index: build.xml
===================================================================
RCS file: /products/cvs/ejboss/jbosstest/src/build/build.xml,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- build.xml 2001/03/01 13:23:18 1.18
+++ build.xml 2001/03/05 10:13:54 1.19
@@ -29,7 +29,7 @@
<property name="build.javadocs.dir" value="${build.dir}/docs/api"/>
<property name="dist.dir" value="dist"/>
- <property name="classpath"
value="${src.lib.dir}/jaas.jar;${src.lib.dir}/jmxri.jar;${build.classes.dir};${src.lib.dir}/ejb.jar;${src.lib.dir}/jndi.jar;${src.lib.dir}/jta-spec1_0_1.jar;${src.lib.dir}/jnp.jar;${src.lib.dir}/junit.jar;${src.lib.dir}/deploy.jar;${src.lib.dir}/jdbc2_0-stdext.jar;${src.lib.dir}/servlet.jar;${src.lib.dir}/jms.jar;${src.lib.dir}/ejb2.0.jar;${src.lib.dir}/jbossmq-client.jar"/>
+ <property name="classpath"
value="${src.lib.dir}/jaas.jar;${src.lib.dir}/jmxri.jar;${build.classes.dir};${src.lib.dir}/ejb.jar;${src.lib.dir}/jndi.jar;${src.lib.dir}/jta-spec1_0_1.jar;${src.lib.dir}/jnp.jar;${src.lib.dir}/junit.jar;${src.lib.dir}/deploy.jar;${src.lib.dir}/jdbc2_0-stdext.jar;${src.lib.dir}/servlet.jar;${src.lib.dir}/jms.jar;${src.lib.dir}/ejb2.0.jar;${src.lib.dir}/jbossmq-client.jar;${src.lib.dir}/log4j.jar;${src.lib.dir}/jbosssx-client.jar"/>
<property name="packages"
value="org.jboss.test,org.jboss.test.bank,org.jboss.test.bank.client,org.jboss.test.bank.beans,org.jboss.test.bank.interfaces"/>
<property name="build.compiler" value="classic"/>
@@ -284,7 +284,7 @@
includes="org/jboss/test/spydermq/**,*.*"
/>
- <!-- JBossSX/Security tests
+ <!-- JBossSX/Security tests -->
<delete dir="${build.classes.dir}/META-INF"/>
<copy todir="${build.classes.dir}">
<fileset dir="${src.resources}/security" />
@@ -298,14 +298,38 @@
basedir="${build.classes.dir}" >
<include name="org/jboss/test/security/ejb/**" />
<include name="org/jboss/test/security/interfaces/**" />
- <include name="**/*.xml" />
+ <include name="org/jboss/test/security/proxy/*" />
+ <include name="org/jboss/test/security/test/Namespace*" />
+ <include name="org/jboss/test/security/test/PermissionName*.class" />
+ <include name="**/ejb-jar.xml" />
+ <include name="**/jboss.xml" />
<include name="users.properties" />
<include name="roles.properties" />
</jar>
--->
+ <move file="${build.classes.dir}/META-INF/jboss-spec.xml"
tofile="${build.classes.dir}/META-INF/jboss.xml" overwrite="true" />
+ <jar jarfile="${build.deploy.dir}/security-spec.jar"
+ basedir="${build.classes.dir}" >
+ <include name="org/jboss/test/security/ejb/**" />
+ <include name="org/jboss/test/security/interfaces/**" />
+ <include name="org/jboss/test/security/proxy/*" />
+ <include name="org/jboss/test/security/test/Namespace*" />
+ <include name="org/jboss/test/security/test/PermissionName*.class" />
+ <include name="**/ejb-jar.xml" />
+ <include name="**/jboss.xml" />
+ <include name="users.properties" />
+ <include name="roles.properties" />
+ </jar>
+ <!-- Create a separate jar that contains the security proxy classes.
+ These need to be segregated so that they can be assigned a minimal
+ Java2 permission set.
+ <jar jarfile="${build.lib.dir}/security-proxy.jar"
+ basedir="${build.classes.dir}"
+ includes="org/jboss/test/security/proxy/*"
+ />
+ -->
</target>
-
+
<!-- =================================================================== -->
<!-- Creates the binary structure -->
<!-- =================================================================== -->
1.2 +88 -5 jbosstest/src/build/run_tests.xml
Index: run_tests.xml
===================================================================
RCS file: /products/cvs/ejboss/jbosstest/src/build/run_tests.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- run_tests.xml 2001/02/27 06:40:04 1.1
+++ run_tests.xml 2001/03/05 10:13:54 1.2
@@ -51,6 +51,7 @@
<pathelement path="${lib.dir}/optional.jar" />
<pathelement path="${src.lib.dir}/deploy.jar" />
<pathelement path="${src.lib.dir}/junit.jar" />
+ <pathelement path="${src.lib.dir}/log4j.jar" />
<pathelement path="${jboss.client}/jnp-client.jar" />
<pathelement path="${jboss.client}/jboss-client.jar" />
<pathelement path="${jboss.client}/jbossmq-client.jar" />
@@ -61,7 +62,6 @@
<pathelement path="${jboss.lib}/jmxri.jar" />
<pathelement path="${jboss.lib.ext}/ejb.jar" />
<pathelement path="${jboss.lib.ext}/ejb2.0.jar" />
- <pathelement path="${jboss.lib.ext}/jbosssx.jar" />
<pathelement path="${jboss.lib.ext}/jms.jar" />
</path>
@@ -77,7 +77,7 @@
<!-- Look for test/Main.java or test/Test*.java junit tests -->
<target name="standard-tests">
<junit printsummary="yes" haltonfailure="no" fork="true"
- timeout="120000"
+ dir="${build.classes.dir}" timeout="120000"
>
<jvmarg value="-Djbosstest.deploy.dir=${build.deploy.dir}" />
<classpath>
@@ -101,16 +101,19 @@
<!-- We need to jar this test up so that the Main2.SecurityDelegate
class is in a speparate jar so that it has a codesource distinct from
the rest of the code. This allows us to remove all the Java2
- permissions assigned to .
+ permissions assigned to the startup class.
-->
<jar jarfile="${build.classes.dir}/SecurityDelegate.jar"
basedir="${build.classes.dir}">
<include
name="org/jboss/test/security/test/Test*SecurityDelegate.class" />
</jar>
- <junit printsummary="no" haltonfailure="yes" fork="true">
+ <junit printsummary="no" haltonfailure="yes" fork="true"
+ dir="${build.classes.dir}" timeout="120000"
+ >
<jvmarg value="-Djava.security.manager" />
<jvmarg
value="-Djava.security.policy=${src.resources}/security/tst.policy" />
- <jvmarg
value="-Djava.security.auth.login.config=${jboss.home}/client/auth.conf" />
+ <jvmarg
value="-Djava.security.auth.login.config=${src.resources}/security/auth.conf" />
+ <jvmarg value="-Djbosstest.deploy.dir=${build.deploy.dir}" />
<classpath>
<pathelement path="${build.classes.dir}/SecurityDelegate.jar" />
<path refid="test.classpath" />
@@ -122,8 +125,88 @@
<batchtest>
<fileset dir="${src.dir}">
<include name="**/test/security/test/Test*.java" />
+ <exclude name="**/test/security/test/TestEJBAccess.java" />
+ <exclude name="**/test/security/test/TestLoginContext.java" />
</fileset>
</batchtest>
+
+ </junit>
+
+ <!-- Run with a global security domain -->
+ <junit printsummary="no" haltonfailure="yes" fork="true"
+ dir="${build.classes.dir}" timeout="120000"
+ >
+ <jvmarg value="-Djava.security.manager" />
+ <jvmarg
value="-Djava.security.policy=${src.resources}/security/tst.policy" />
+ <jvmarg
value="-Djava.security.auth.login.config=${src.resources}/security/auth.conf" />
+ <jvmarg value="-Djbosstest.deploy.dir=${build.deploy.dir}" />
+ <jvmarg value="-Dsecurity.domain=test-domain" />
+ <jvmarg value="-Dconf.name=simple" />
+ <classpath>
+ <pathelement path="${build.classes.dir}/SecurityDelegate.jar" />
+ <path refid="test.classpath" />
+ <pathelement path="${src.resources}/security" />
+ </classpath>
+ <formatter type="plain" usefile="false" />
+ <test name="org.jboss.test.security.test.TestEJBAccess" />
+ </junit>
+ </target>
+
+ <target name="test1">
+ <junit printsummary="yes" haltonfailure="no" fork="true"
+ dir="${build.classes.dir}" timeout="1200000"
+ >
+ <jvmarg value="-Djbosstest.deploy.dir=${build.deploy.dir}" />
+ <jvmarg value="-Djava.security.manager" />
+ <jvmarg
value="-Djava.security.policy=${src.resources}/security/tst.policy" />
+ <jvmarg
value="-Djava.security.auth.login.config=${src.resources}/security/auth.conf" />
+
+ <classpath>
+ <path refid="test.classpath" />
+ <pathelement path="${jboss.lib}/jboss-jaas.jar" />
+ </classpath>
+ <formatter type="plain" usefile="false" />
+
+ <test name="org.jboss.test.security.test.TestProjRepository" />
+<!--
+ <test name="org.jboss.test.security.test.TestNamespacePermissions" />
+-->
+ </junit>
+ </target>
+
+ <!-- Try to get something working with the j2ee-ri for compatability
+ testing. Currently this is not working as the security info is
+ not propagated correctly.
+ -->
+ <target name="test1-ri">
+<property name="j2ee.home" value="/usr/local/Java/j2sdkee1.2.1" />
+
+ <junit printsummary="yes" haltonfailure="no" fork="true"
+ dir="${build.classes.dir}" timeout="120000"
+ >
+ <jvmarg value="-Djbosstest.deploy.dir=${build.deploy.dir}" />
+ <jvmarg value="-Djava.security.manager" />
+ <jvmarg
value="-Djava.security.policy=${src.resources}/security/tst.policy" />
+ <jvmarg
value="-Djava.security.auth.login.config=${src.resources}/security/auth.conf" />
+ <jvmarg value="-Dcom.sun.enterprise.home=${j2ee.home}" />
+ <jvmarg value="-Dno-deploy=true" />
+ <jvmarg value="-Dconf.name=j2eeri" />
+
+ <classpath>
+ <pathelement path="${j2ee.home}/lib/j2ee.jar" />
+ <pathelement path="${build.deploy.dir}/j2eeriClient.jar" />
+ <pathelement path="${build.classes.dir}" />
+ <pathelement path="${lib.dir}/ant.jar" />
+ <pathelement path="${lib.dir}/optional.jar" />
+ <pathelement path="${src.lib.dir}/junit.jar" />
+ <pathelement path="${jboss.lib}/jaxp.jar" />
+ <pathelement path="${jboss.lib}/parser.jar" />
+ <pathelement path="${jboss.lib}/jaas.jar" />
+ <pathelement path="${jboss.lib.ext}/jbosssx.jar" />
+ <pathelement path="${jboss.home}/client/jbosssx-client.jar" />
+ </classpath>
+ <formatter type="plain" usefile="false" />
+ <test name="org.jboss.test.security.test.TestEJBAccess" />
</junit>
</target>
