[jboss-cvs] JBossAS SVN: r76703 - in branches/JBPAPP_4_3_0_GA_CC/testsuite: imports and 1 other directories.

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

Author: pskopek at redhat.com
Date: 2008-08-06 05:09:14 -0400 (Wed, 06 Aug 2008)
New Revision: 76703

Modified:
   branches/JBPAPP_4_3_0_GA_CC/testsuite/build.xml
   branches/JBPAPP_4_3_0_GA_CC/testsuite/imports/cc.xml
   branches/JBPAPP_4_3_0_GA_CC/testsuite/src/resources/cc/cc-test-patterns.xsl
Log:
Fixes regarding XSLT processor differences for patterns generator.

Modified: branches/JBPAPP_4_3_0_GA_CC/testsuite/build.xml
===================================================================
--- branches/JBPAPP_4_3_0_GA_CC/testsuite/build.xml	2008-08-06 08:37:30 UTC (rev 76702)
+++ branches/JBPAPP_4_3_0_GA_CC/testsuite/build.xml	2008-08-06 09:09:14 UTC (rev 76703)
@@ -850,6 +850,7 @@
     <record name="${basedir}/build.log" action="stop"/>
   </target>
 
+  <import file="imports/cc.xml"/>
 	
   <!-- Common Criteria Evaluation Tests running with Java Security Manager turned on. 
   -->	
@@ -872,13 +873,11 @@
     <record name="${basedir}/build.log" action="stop"/>
   	
   </target>
-  	
-  <import file="imports/cc.xml"/>
-  
+  	  
   <!-- 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." 
-  	depends="maybejars">
+  	depends="generate-cc-patternsets,maybejars">
 
   	<record name="${basedir}/build.log" append="no" action="start" loglevel="${buildlog.level}"/>
     <property name="nojars" value="true"/>

Modified: branches/JBPAPP_4_3_0_GA_CC/testsuite/imports/cc.xml
===================================================================
--- branches/JBPAPP_4_3_0_GA_CC/testsuite/imports/cc.xml	2008-08-06 08:37:30 UTC (rev 76702)
+++ branches/JBPAPP_4_3_0_GA_CC/testsuite/imports/cc.xml	2008-08-06 09:09:14 UTC (rev 76703)
@@ -10,7 +10,8 @@
     <xslt 
       in="src/resources/cc/testCaseMapping_1.0.xml" 
       out="output/cc-results.xml"
-      style="src/resources/cc/cc-results.xsl">  
+      style="src/resources/cc/cc-results.xsl"  
+      force="true">
       
       <outputproperty name="method" value="xml"/>
       <outputproperty name="standalone" value="yes"/>
@@ -29,7 +30,8 @@
     <xslt 
       in="src/resources/cc/testCaseMapping_1.0.xml" 
       out="output/eap-cc-test-patterns.txt"
-      style="src/resources/cc/cc-test-patterns.xsl">  
+      style="src/resources/cc/cc-test-patterns.xsl"
+      force="true">
       
       <param name="testSuite" expression="EAP"/>
     
@@ -38,7 +40,8 @@
     <xslt 
       in="src/resources/cc/testCaseMapping_1.0.xml" 
       out="output/ejb3-cc-test-patterns.txt"
-      style="src/resources/cc/cc-test-patterns.xsl">  
+      style="src/resources/cc/cc-test-patterns.xsl"  
+      force="true">
       
       <param name="testSuite" expression="EJB3"/>
     
@@ -47,7 +50,8 @@
     <xslt 
       in="src/resources/cc/testCaseMapping_1.0.xml" 
       out="output/jbm-cc-test-patterns.txt"
-      style="src/resources/cc/cc-test-patterns.xsl">  
+      style="src/resources/cc/cc-test-patterns.xsl"  
+      force="true">
       
       <param name="testSuite" expression="JBM"/>
     
@@ -56,7 +60,8 @@
     <xslt 
       in="src/resources/cc/testCaseMapping_1.0.xml" 
       out="output/cts-cc-test-patterns.txt"
-      style="src/resources/cc/cc-test-patterns.xsl">  
+      style="src/resources/cc/cc-test-patterns.xsl"  
+      force="true">
       
       <param name="testSuite" expression="CTS"/>
     

Modified: branches/JBPAPP_4_3_0_GA_CC/testsuite/src/resources/cc/cc-test-patterns.xsl
===================================================================
--- branches/JBPAPP_4_3_0_GA_CC/testsuite/src/resources/cc/cc-test-patterns.xsl	2008-08-06 08:37:30 UTC (rev 76702)
+++ branches/JBPAPP_4_3_0_GA_CC/testsuite/src/resources/cc/cc-test-patterns.xsl	2008-08-06 09:09:14 UTC (rev 76703)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet version="2.0"
+<xsl:stylesheet version="1.0"
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
   xmlns:cc="http://www.redhat.com/CcTsfiMap"
   exclude-result-prefixes="cc">
@@ -21,8 +21,9 @@
               <xsl:with-param name="to" select="''" />
             </xsl:call-template>
           </xsl:variable>
-          <xsl:text><xsl:value-of select="concat('**',translate($pattern,'.','/'),'.class')"/>
-</xsl:text>
+            <xsl:value-of select="concat('**',translate($pattern,'.','/'),'.class')"/>
+            <xsl:text>
+</xsl:text>              
           </xsl:if>
         </xsl:for-each>
       </xsl:if>