[jboss-cvs] JBossAS SVN: r109117 - in branches/JBPAPP_5_1/testsuite: src/resources/jbossts/scripts and 1 other directory.

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

Author: pskopek at redhat.com
Date: 2010-11-04 05:27:57 -0400 (Thu, 04 Nov 2010)
New Revision: 109117

Modified:
   branches/JBPAPP_5_1/testsuite/imports/config/tests-crash-recovery.xml
   branches/JBPAPP_5_1/testsuite/src/resources/jbossts/scripts/as-tests.xml
Log:
cc: DB2 fixes for CC crashrecovery test

Modified: branches/JBPAPP_5_1/testsuite/imports/config/tests-crash-recovery.xml
===================================================================
--- branches/JBPAPP_5_1/testsuite/imports/config/tests-crash-recovery.xml	2010-11-04 09:20:47 UTC (rev 109116)
+++ branches/JBPAPP_5_1/testsuite/imports/config/tests-crash-recovery.xml	2010-11-04 09:27:57 UTC (rev 109117)
@@ -163,8 +163,10 @@
             <sysproperty key="jbossts.hornetq" value="${jbossts.hornetq}" />
             <sysproperty key="jbossts.hornetq.netty" value="${jbossts.hornetq.netty}" />
             <sysproperty key="testTime" value="${jbossts.max.time}" />
+            <sysproperty key="jboss.test.sign.keystore" value="${basedir}/src/resources/test-configs/cc/cc.keystore" />
             <syspropertyset>
                <propertyref prefix="jboss.test.deploy.dir"/>
+               <propertyref prefix="jboss.test.sign.jars"/>
                <propertyref prefix="cc."/>
             </syspropertyset>
             

Modified: branches/JBPAPP_5_1/testsuite/src/resources/jbossts/scripts/as-tests.xml
===================================================================
--- branches/JBPAPP_5_1/testsuite/src/resources/jbossts/scripts/as-tests.xml	2010-11-04 09:20:47 UTC (rev 109116)
+++ branches/JBPAPP_5_1/testsuite/src/resources/jbossts/scripts/as-tests.xml	2010-11-04 09:27:57 UTC (rev 109117)
@@ -626,10 +626,22 @@
     <available file="${astest.jar.dir}/${astest.alternative.jar.name}_content/META-INF/persistence.xml" 
   	    property="have.persistence.xml" />
     <antcall target="change-hbm2ddl-update-to-none" />
+    <!-- delete possible jar signature -->
+    <delete>
+	  <fileset dir="${astest.jar.dir}/${astest.alternative.jar.name}_content/META-INF">
+	    <include name="*.DSA"/>
+        <include name="*.RSA"/>
+        <include name="*.SF"/>
+	  </fileset>
+    </delete>
     <jar destfile="${astest.jar.dir}/${astest.alternative.jar.name}">
       <fileset dir="${astest.jar.dir}/${astest.alternative.jar.name}_content"/>
     </jar>
     <delete dir="${astest.jar.dir}/${astest.alternative.jar.name}_content" />
+    <!-- If necessary sign new file -->
+    <antcall target="sign-file">
+       <param name="file" value="${astest.jar.dir}/${astest.alternative.jar.name}"/>
+    </antcall>
   </target>
   
   <target name="change-hbm2ddl-update-to-none" if="have.persistence.xml">
@@ -810,5 +822,21 @@
         <get src="${driver.url}/sybase15/jdbc4/jconn4-26502.jar"
              dest="${driver.home}/${driver.name.sybase_15}"/>
     </target>
+   
+   <!--
+     | Sign test jar, ear, whatever if jboss.test.sign.jars is set to true.
+     | This is need in case we are running tests using Common Criteria policy (using Java Security Manager).
+     | We are not able to set proper permissions to vfsmemory:// deployed files.  
+   -->
+   <target name="sign-file" if="jboss.test.sign.jars">
+      <echo>signing ${file}</echo>
+   	  <signjar 
+         	keystore="${jboss.test.sign.keystore}"
+         	storetype="jks"
+         	alias="testsuite"
+         	storepass="jbosseap">
+   	    <fileset file="${file}" />
+   	  </signjar>
+   </target>
 
 </project>