[jboss-cvs] JBossAS SVN: r60783 - branches/Branch_4_2/testsuite.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Feb 21 17:19:32 EST 2007
Author: anil.saldhana at jboss.com
Date: 2007-02-21 17:19:32 -0500 (Wed, 21 Feb 2007)
New Revision: 60783
Modified:
branches/Branch_4_2/testsuite/build.xml
Log:
pull the jacc tests into a separate xml
Modified: branches/Branch_4_2/testsuite/build.xml
===================================================================
--- branches/Branch_4_2/testsuite/build.xml 2007-02-21 22:18:36 UTC (rev 60782)
+++ branches/Branch_4_2/testsuite/build.xml 2007-02-21 22:19:32 UTC (rev 60783)
@@ -21,6 +21,9 @@
<!-- Targets for integration tests -->
<import file="build-integration.xml"/>
+ <!-- Tests requiring separate server configurations -->
+ <import file="imports/config/configs.xml"/>
+
<!-- ======================================================== -->
<!-- Initialization -->
<!-- ======================================================== -->
@@ -566,26 +569,7 @@
<patternset id="securitymgr.excludes">
<exclude name="**/test/securitymgr/test/*"/>
</patternset>
- <!-- A patternset that requires jboss to run with a JACC security manager -->
- <patternset id="jacc.includes">
- <include name="org/jboss/test/jacc/test/*TestCase.class"/>
- <include name="org/jboss/test/web/test/UserInRoleUnitTestCase.class"/>
- <include name="org/jboss/test/cmp2/audit/test/*TestCase.class"/>
- <include name="org/jboss/test/cmp2/commerce/*TestCase.class"/>
- <include name="org/jboss/test/cmp2/cmrstress/*TestCase.class"/>
- <include name="org/jboss/test/cmp2/cmrtransaction/test/*TestCase.class"/>
- <include name="org/jboss/test/cmp2/perf/test/*TestCase.class"/>
- <include name="org/jboss/test/cmp2/relationship/*TestCase.class"/>
- <include name="org/jboss/test/cmp2/simple/SimpleUnitTestCase.class"/>
- <include name="org/jboss/test/webservice/jbws309/*TestCase.class"/>
- <exclude name="org/jboss/test/jacc/test/external/*TestCase.class"/>
- </patternset>
- <patternset id="jacc.excludes">
- <exclude name="**/test/jacc/test/*"/>
- </patternset>
- <patternset id="jacc.external.includes">
- <include name="org/jboss/test/jacc/test/external/*TestCase.class"/>
- </patternset>
+
<patternset id="custom-secmgr.includes">
<include name="**/test/**/CustomSecurityManagerTestCase.class"/>
</patternset>
@@ -1607,191 +1591,8 @@
<echo>Waiting for server to shutdown...</echo>
<server:stop name="securitymgr"/>
- </target>
+ </target>
- <!-- Tests of the JACC security implementation -->
- <target name="tests-jacc-security" description="Tests run against a jboss server with JACC configured">
- <!-- Create the ssl enabled tomcat config -->
- <create-config baseconf="default" newconf="jacc">
- <patternset>
- <include name="conf/**"/>
- <include name="deploy/hsqldb-ds.xml"/>
- <include name="deploy/jboss-web.deployer/**"/>
- <include name="deploy/jbossws.sar/**"/>
- <include name="deploy/client-deployer-service.xml"/>
- <include name="deploy/ear-deployer.xml"/>
- <include name="deploy/ejb-deployer.xml"/>
- <include name="deploy/jmx-invoker-service.xml"/>
- <include name="deploy/jmx-console.war/**"/>
- <include name="deploy/jbossjca-service.xml"/>
- <include name="deploy/jboss-local-jdbc.rar"/>
- <include name="deploy/mail-service.xml"/>
- <include name="deploy/jms/**"/>
- <include name="deploy/jboss-aop.deployer/**"/>
- <include name="deploy/jboss-aop-jdk50.deployer/**"/>
- <include name="deploy/jboss-bean.deployer/**"/>
- <include name="deploy/ejb3-interceptors-aop.xml"/>
- <include name="deploy/ejb3.deployer/**"/>
- <include name="lib/**"/>
- </patternset>
- </create-config>
- <server:start name="jacc"/>
-
- <mkdir dir="${build.reports}"/>
- <mkdir dir="${build.testlog}"/>
-
- <property name="jbosstest.secure" value="true"/>
- <property name="jboss.security.jacc" value="true"/>
- <property name="java.security.auth.login.config" value="${build.resources}/security/auth.conf"/>
- <propertyset id="jacc-tests-props">
- <propertyref prefix="java.security.auth"/>
- <propertyref prefix="jboss.security"/>
- </propertyset>
- <run-junit junit.patternset="jacc.includes" junit.configuration="JACC" junit.syspropertyset="jacc-tests-props"/>
-
- <server:stop name="jacc"/>
- </target>
-
- <target name="tests-jacc-securitymgr" description="Tests run against a jboss server with JACC configured + security manager">
- <!-- Create the security manager enabled jacc -->
- <create-config baseconf="default" newconf="jacc-securitymgr" newconf-src="jacc">
- <patternset>
- <include name="conf/**"/>
- <include name="deploy/hsqldb-ds.xml"/>
- <include name="deploy/jboss-web.deployer/**"/>
- <include name="deploy/jbossws.sar/**"/>
- <include name="deploy/client-deployer-service.xml"/>
- <include name="deploy/ear-deployer.xml"/>
- <include name="deploy/ejb-deployer.xml"/>
- <include name="deploy/jmx-invoker-service.xml"/>
- <include name="deploy/jmx-console.war/**"/>
- <include name="deploy/jbossjca-service.xml"/>
- <include name="deploy/jboss-local-jdbc.rar"/>
- <include name="deploy/mail-service.xml"/>
- <include name="deploy/jms/**"/>
- <include name="lib/**"/>
- <include name="deploy/jboss-aop.deployer/**"/>
- <include name="deploy/jboss-aop-jdk50.deployer/**"/>
- <include name="deploy/jboss-bean.deployer/**"/>
- <include name="deploy/ejb3-interceptors-aop.xml"/>
- <include name="deploy/ejb3.deployer/**"/>
- </patternset>
- </create-config>
- <!-- -->
- <unzip dest="${jboss.dist}/server/jacc-securitymgr/deploy/jboss-web.deployer">
- <fileset dir="${jboss.dist}/server/jacc-securitymgr/deploy/jboss-web.deployer">
- <patternset>
- <exclude name="META-INF/*"/>
- </patternset>
- <include name="jasper-jdt.jar"/>
- </fileset>
- </unzip>
- <server:start name="jacc-securitymgr"/>
-
- <mkdir dir="${build.reports}"/>
- <mkdir dir="${build.testlog}"/>
- <waitfor maxwait="60" maxwaitunit="second" checkevery="5" checkeveryunit="second" timeoutproperty="startup.timeout">
- <http url="http://${node0}:8080/"/>
- </waitfor>
- <fail message="Timeout waiting for server to start" if="startup.timeout"/>
- <property name="jbosstest.secure" value="true"/>
- <property name="jboss.security.jacc" value="true"/>
- <property name="java.security.auth.login.config" value="${build.resources}/security/auth.conf"/>
- <propertyset id="jacc-tests-props">
- <propertyref prefix="java.security.auth"/>
- </propertyset>
-
- <propertyset id="jacc-tests-props">
- <propertyref prefix="java.security.auth"/>
- <propertyref prefix="jboss.security"/>
- </propertyset>
-
- <run-junit junit.patternset="jacc.includes" junit.configuration="JACC+SecurityMgr" junit.syspropertyset="jacc-tests-props"/>
-
- <stop-jboss/>
- <wait-on-shutdown conf="jacc-securitymgr"/>
- </target>
-
- <target name="tests-jacc-security-external"
- description="Tests run against a jboss server with JACC configured with an
- external policy provider">
- <create-config baseconf="default" newconf="jacc-security-external" newconf-src="jacc">
- <patternset>
- <include name="conf/**"/>
- <include name="deploy/hsqldb-ds.xml"/>
- <include name="deploy/jboss-web.deployer/**"/>
- <include name="deploy/jbossws.sar/**"/>
- <include name="deploy/jbossws.sar/**"/>
- <include name="deploy/client-deployer-service.xml"/>
- <include name="deploy/ear-deployer.xml"/>
- <include name="deploy/ejb-deployer.xml"/>
- <include name="deploy/jmx-invoker-service.xml"/>
- <include name="deploy/jmx-console.war/**"/>
- <include name="deploy/jbossjca-service.xml"/>
- <include name="deploy/jboss-local-jdbc.rar"/>
- <include name="deploy/mail-service.xml"/>
- <include name="deploy/jms/**"/>
- <include name="lib/**"/>
- <include name="deploy/jboss-aop.deployer/**"/>
- <include name="deploy/jboss-aop-jdk50.deployer/**"/>
- <include name="deploy/ejb3-interceptors-aop.xml"/>
- <include name="deploy/ejb3.deployer/**"/>
- </patternset>
- </create-config>
- <!-- -->
- <unzip dest="${jboss.dist}/server/jacc-security-external/deploy/jboss-web.deployer">
- <fileset dir="${jboss.dist}/server/jacc-security-external/deploy/jboss-web.deployer">
- <patternset>
- <exclude name="META-INF/*"/>
- </patternset>
- <include name="jasper-compiler.jar"/>
- <include name="jasper-compiler-jdt.jar"/>
- </fileset>
- </unzip>
- <!-- Copy the jacc securityconstraint provider jar -->
- <copy todir="${jboss.dist}/server/jacc-security-external/lib" file="${build.lib}/jacc-securityconstraint.jar"/>
- <!-- Append extra attributes to the JACCAuthorizationRealm -->
- <replace file="${jboss.dist}/server/jacc-security-external/deploy/jboss-web.deployer/server.xml">
- <replacetoken><![CDATA[className="org.jboss.web.tomcat.security.JaccAuthorizationRealm"]]>
- </replacetoken>
- <replacevalue>
- <![CDATA[className="org.jboss.web.tomcat.security.JaccAuthorizationRealm" unprotectedResourceDelegation="true" securityConstraintProviderClass="org.jboss.test.security.test.CustomSecurityConstraintProvider" ]]>
- </replacevalue>
- </replace>
- <!-- Replace the policy provider with the test provider -->
- <replace file="${jboss.dist}/server/jacc-security-external/deploy/jacc-service.xml">
- <replacetoken><![CDATA[org.jboss.security.jacc.DelegatingPolicy]]>
- </replacetoken>
- <replacevalue><![CDATA[org.jboss.test.jacc.test.external.TestExternalPolicyProvider]]>
- </replacevalue>
- </replace>
-
- <server:start name="jacc-security-external"/>
-
- <mkdir dir="${build.reports}"/>
- <mkdir dir="${build.testlog}"/>
- <waitfor maxwait="60" maxwaitunit="second" checkevery="5" checkeveryunit="second" timeoutproperty="startup.timeout">
- <http url="http://${node0}:8080/"/>
- </waitfor>
- <fail message="Timeout waiting for server to start" if="startup.timeout"/>
- <property name="jbosstest.secure" value="true"/>
- <property name="jboss.security.jacc" value="true"/>
- <property name="java.security.auth.login.config" value="${build.resources}/security/auth.conf"/>
- <propertyset id="jacc-tests-props">
- <propertyref prefix="java.security.auth"/>
- </propertyset>
-
- <propertyset id="jacc-tests-props">
- <propertyref prefix="java.security.auth"/>
- <propertyref prefix="jboss.security"/>
- </propertyset>
-
- <run-junit junit.patternset="jacc.external.includes" junit.configuration="jacc-security-external" junit.syspropertyset="jacc-tests-props"/>
-
- <stop-jboss/>
- <wait-on-shutdown conf="jacc-security-external"/>
- </target>
-
<!-- Tests of the custom security manager plugin -->
<target name="tests-custom-securitymgr" description="Tests run against a jboss server with custom security manager configured">
<!-- Create the ssl enabled tomcat config -->
More information about the jboss-cvs-commits
mailing list