Author: ron.sigal(a)jboss.com Date: 2010-07-03 15:23:03 -0400 (Sat, 03 Jul 2010) New Revision: 5902 Modified: remoting2/branches/2.x/build.xml Log: JBREM-1231: Changes to run InvokerRegistrySecurityTestCase. Modified: remoting2/branches/2.x/build.xml =================================================================== --- remoting2/branches/2.x/build.xml 2010-07-03 19:18:14 UTC (rev 5901) +++ remoting2/branches/2.x/build.xml 2010-07-03 19:23:03 UTC (rev 5902) @@ -306,6 +306,15 @@ <pathelement path="${jdbc-driver-jar}"/> </path> + <path id="tests.classpath.invokerregistrysecurity"> + <pathelement path="${ant.library.dir}/ant.jar"/> + <pathelement path="${ant.library.dir}/ant-junit.jar"/> + <pathelement path="${output.lib.dir}/jboss-remoting-tests.jar"/> + <pathelement path="${output.lib.dir}/jboss-remoting-invokerregistry-test.jar"/> + <path refid="library.classpath"/> + <pathelement path="${jdbc-driver-jar}"/> + </path> + <path id="third_party.classpath.tomcat"> <fileset dir="${lib.dir}"> <include name="**/*.jar"/> @@ -373,6 +382,7 @@ <property name="java.security.policy" value="${output.tests}/remoting.security.policy"/> <property name="java.security.policy.marshal" value="${output.tests}/remoting.security.policy.marshal"/> <property name="java.security.policy.strict" value="${output.tests}/remoting.security.policy.strict"/> + <property name="java.security.policy.invokerregistry" value="${output.tests}/remoting.security.policy.invokerregistry"/> <!--<property name="java.security.manager" value="org.jboss.test.security.LoggingSecurityManager"/>--> <!--property name="java.security.debug" value="access,failure"/--> <property name="java.security.debug" value=""/> @@ -397,6 +407,13 @@ files="remoting.security.policy.core, remoting.security.policy.tests.marshal"/> </concat> + + <!-- Create security policy file for tests.functional.invokerregistry.security --> + <concat destfile="${output.tests}/remoting.security.policy.invokerregistry"> + <filelist dir="${etc.dir}" + files="remoting.security.policy.core, + remoting.security.policy.tests.invokerregistry"/> + </concat> </target> <!-- ================================================================== --> @@ -600,6 +617,7 @@ <exclude name="org/jboss/test/remoting/marshall/dynamic/remote/**/TestWrapper*"/> <exclude name="org/jboss/test/remoting/marshall/dynamic/remote/**/TestObject*"/> <exclude name="org/jboss/test/remoting/marshall/dynamic/remote/**/ResponseImpl*"/> + <exclude name="org/jboss/test/remoting/security/InvokerRegistryCaller*"/> </fileset> </jar> <jar jarfile="${output.lib.dir}/jboss-remoting-loading-tests.jar" @@ -611,7 +629,11 @@ <include name="org/jboss/test/remoting/marshall/dynamic/remote/classloaders/ResponseImpl.class"/> </fileset> </jar> - + <jar jarfile="${output.lib.dir}/jboss-remoting-invokerregistry-test.jar" manifest="${manifest.file}"> + <fileset dir="${tests.compile.dir}"> + <include name="org/jboss/test/remoting/security/InvokerRegistryCaller*"/> + </fileset> + </jar> </target> <target name="manifest" depends="configure"> @@ -824,6 +846,9 @@ </target> <target name="one-test" depends="tests.jars"> + <echo>Running ${test}TestCase</echo> + <mkdir dir="${output.tests.results}"/> + <mkdir dir="${output.tests.tmp}"/> <junit printsummary="true" fork="yes" includeantruntime="true" tempdir="${output.tests.tmp}" maxmemory="1024m"> @@ -1175,6 +1200,7 @@ <exclude name="**/remoting/transport/multiplex/**/**Performance*TestCase.class"/> <exclude name="**/remoting/versioning/**/*TestCase.class"/> <!-- <exclude name="**/remoting/transport/multiplex/**/MultiplexMultiThreadedPerformanceTestCase.class"/> --> + <exclude name="**/remoting/**/InvokerRegistrySecurityTestCase.class"/> </fileset> </batchtest> </junit> @@ -1241,6 +1267,7 @@ <exclude name="**/remoting/classloader/InvokerTestCase.class" if="isJDK4"/> <exclude name="**/remoting/oneway/OnewayThreadPoolTestCase.class" if="isJDK4"/> <exclude name="**/remoting/security/ServerSocketFactoryProxyTestCase.class" if="isJDK4"/> + <exclude name="**/remoting/**/InvokerRegistrySecurityTestCase.class"/> </fileset> </batchtest> </junit> @@ -1288,8 +1315,48 @@ </fileset> </batchtest> </junit> + <antcall target="tests.functional.invokerregistry.security" inheritrefs="true"/> </target> + <target name="tests.functional.invokerregistry.security" depends="tests.jars"> + <mkdir dir="${output.tests.results}"/> + <mkdir dir="${output.tests.tmp}"/> + <junit + printsummary="true" fork="yes" includeantruntime="true" + tempdir="${output.tests.tmp}" maxmemory="1024m"> + <jvmarg value="-Dloader.path=${output.lib.dir}/jboss-remoting-loading-tests.jar"/> + <jvmarg value="-D${remoting.metadata.key}=${metadata}"/> + <classpath> + <path refid="tests.classpath.invokerregistrysecurity"/> + </classpath> + <sysproperty key="java.security.manager" value=""/> + <sysproperty key="java.security.policy" value="${java.security.policy.invokerregistry}"/> + <sysproperty key="java.security.debug" value="${java.security.debug}"/> + <sysproperty key="build.home" value="${basedir}"/> + <sysproperty key="remoting.jar.dir" value="${basedir}/output/lib"/> + <sysproperty key="log4j.jar.dir" value="${basedir}/lib/apache-log4j/lib"/> + <sysproperty key="log4j.config.dir" value="${basedir}/src/etc"/> + <sysproperty key="ant.library.dir" value="${ant.library.dir}"/> + <sysproperty key="jboss-junit-configuration" value="${jboss-junit-configuration}"/> + <sysproperty key="jrunit.bind_addr" value="${bind.address}"/> + <sysproperty key="jrunit.mcast_addr" value="${multicast.address}"/> + <sysproperty key="jrunit.mcast_port" value="${multicast.port}"/> + <sysproperty key="jrunit.receive_on_all_interfaces" value="${receiveOnAllInterfaces}"/> + <sysproperty key="jrunit.send_on_all_interfaces" value="${sendOnAllInterfaces}"/> + <sysproperty key="jrunit.send_interfaces" value="${sendInterfaces}"/> + <sysproperty key="jrunit.logdir" value="${output.tests}"/> + <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter" + extension="-${jboss-junit-configuration}.xml"/> + <batchtest fork="yes" todir="${output.tests.results}" + haltonfailure="no"> + <fileset dir="${tests.compile.dir}"> + <include name="**/remoting/**/InvokerRegistrySecurityTestCase.class"/> + </fileset> + </batchtest> + </junit> + </target> + + <target name="tests.functional.main.isJDK5" depends="tests.jars" unless="isJDK4"> <mkdir dir="${output.tests.results}"/> <mkdir dir="${output.tests.tmp}"/> @@ -4699,7 +4766,7 @@ <findbugs home="${findbugs.home}" output="html" outputFile="${output.dir}/findbugs.html" > <class location="${output.lib.dir}/jboss-remoting.jar" /> <sourcePath path="${src.dir}" /> - <auxClasspath refid="third_party.classpath"/> + <auxClasspath refid="third_party.classpath"/> </findbugs> </target>