[jboss-cvs] JBossAS SVN: r78550 - branches/JBPAPP_4_3_0_GA_CC/testsuite.

[jboss-cvs-commits at lists.jboss.org]

Author: pskopek at redhat.com
Date: 2008-09-15 16:14:09 -0400 (Mon, 15 Sep 2008)
New Revision: 78550

Modified:
   branches/JBPAPP_4_3_0_GA_CC/testsuite/build.xml
Log:
DB login module configuration.

Modified: branches/JBPAPP_4_3_0_GA_CC/testsuite/build.xml
===================================================================
--- branches/JBPAPP_4_3_0_GA_CC/testsuite/build.xml	2008-09-15 18:46:07 UTC (rev 78549)
+++ branches/JBPAPP_4_3_0_GA_CC/testsuite/build.xml	2008-09-15 20:14:09 UTC (rev 78550)
@@ -851,18 +851,45 @@
   </target>
 
   <import file="imports/cc.xml"/>
-	
+
+  <!-- This target creates CC configuration -->
+  <target name="create-cc-config" description="Creates CC configuration">
+    <!-- Create the CC config starting with the pruduction config -->
+    <create-config baseconf="production" newconf="cc" newconf-src="cc">
+      <patternset>
+        <include name="conf/**"/>
+        <include name="deploy/**"/>
+      </patternset>
+    </create-config>
+    
+    <!-- delete SNMP adapter, because it is not allowed in CC config --> 
+    <delete dir="${jboss.dist}/server/cc/deploy/snmp-adaptor.sar"/>
+    
+    <!-- DB config patch -->    
+    <copy todir="${jboss.dist}/server/cc" overwrite="true">
+      <fileset dir="${build.resources}/test-configs/${alternate-config}">
+        <include name="**/*"/>
+      </fileset>
+    </copy>
+    
+  </target>
+  
   <!-- Common Criteria Evaluation Tests running with Java Security Manager turned on. 
   -->	
   <target name="tests-cc-sm" description="Execute all Common Criteria Evaluation tests with Java Security Manager turned on." 
   	depends="generate-cc-patternsets,maybejars">
 
   	<record name="${basedir}/build.log" append="no" action="start" loglevel="${buildlog.level}"/>
+    
+    <antcall target="create-cc-config">
+      <param name="alternate-config" value="cc-db"/>
+    </antcall>  
+
     <property name="nojars" value="true"/>
 
     <server:start name="cc-sm"/>
     
-    <antcall target="run-cc-tests-sm"/>
+    <antcall target="run-cc-tests-sm"/> 
   	<antcall target="run-cc-tests"/>
 
   	<antcall target="tests-report"/>
@@ -873,23 +900,46 @@
     <record name="${basedir}/build.log" action="stop"/>
   	
   </target>
-  	  
+
+  
+  <!-- Common Criteria Evaluation Tests running with Java Security Manager turned off.
+       Using UsersRolesLoginModule login module.
+  --> 
+  <target name="tests-cc" description="Execute all Common Criteria Evaluation tests with Java Security Manager turned off. Using UsersRolesLoginModule login module.">
+    <antcall target="tests-cc-generic">
+      <param name="alternate-config" value="cc-none"/>
+    </antcall>  
+  </target>  
+  
+  <!-- Common Criteria Evaluation Tests running with Java Security Manager turned off.
+       Using DatabaseServerLoginModule login module.
+  --> 
+  <target name="tests-cc-db" description="Execute all Common Criteria Evaluation tests with Java Security Manager turned off. Using DatabaseServerLoginModule login module.">
+    <antcall target="tests-cc-generic">
+      <param name="alternate-config" value="cc-db"/>
+    </antcall>  
+  </target>  
+
+  <!-- Common Criteria Evaluation Tests running with Java Security Manager turned off.
+       Using LdapLoginModule login module.
+  --> 
+  <target name="tests-cc-ldap" description="Execute all Common Criteria Evaluation tests with Java Security Manager turned off. Using LdapLoginModule login module.">
+    <antcall target="tests-cc-generic">
+      <param name="alternate-config" value="cc-ldap"/>
+    </antcall>  
+  </target>  
+
   <!-- Common Criteria Evaluation Tests running with Java Security Manager turned off. 
   -->	
-  <target name="tests-cc" description="Execute all Common Criteria Evaluation tests with Java Security Manager turned off." 
+  <target name="tests-cc-generic" description="Execute all Common Criteria Evaluation tests with Java Security Manager turned off." 
   	depends="generate-cc-patternsets,maybejars">
 
   	<record name="${basedir}/build.log" append="no" action="start" loglevel="${buildlog.level}"/>
     
-    <!-- Create the sso enabled tomcat config starting with the default config -->
-    <create-config baseconf="all" newconf="cc" newconf-src="cc">
-      <patternset>
-        <include name="conf/**"/>
-        <include name="deploy/**"/>
-      </patternset>
-    </create-config>
+    <antcall target="create-cc-config">
+      <param name="alternate-config" value="${alternate-config}"/>
+    </antcall>  
     
-    
     <property name="nojars" value="true"/>
   	<server:start name="cc"/>