[jboss-cvs] JBossAS SVN: r108929 - branches/JBPAPP_5_1/testsuite.

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

Author: pskopek at redhat.com
Date: 2010-10-27 06:40:19 -0400 (Wed, 27 Oct 2010)
New Revision: 108929

Modified:
   branches/JBPAPP_5_1/testsuite/build.xml
Log:
cc: CXF testsuite integrated to CC tests

Modified: branches/JBPAPP_5_1/testsuite/build.xml
===================================================================
--- branches/JBPAPP_5_1/testsuite/build.xml	2010-10-27 08:04:27 UTC (rev 108928)
+++ branches/JBPAPP_5_1/testsuite/build.xml	2010-10-27 10:40:19 UTC (rev 108929)
@@ -1867,14 +1867,29 @@
             <include name="localhost.*"/>
          </patternset>
       </create-config>
+
+      <!-- create cc-cxf as copy of cc -->
+      <create-config baseconf="cc" newconf="cc-cxf">
+         <patternset>
+            <include name="conf/**" />
+            <include name="deployers/**" />
+            <include name="deploy/**" />
+            <include name="deploy-hasingleton/**" />
+            <include name="farm/**" />
+            <include name="lib/**" />
+            <include name="cc.*"/>
+            <include name="ssl.*"/>
+            <include name="localhost.*"/>
+         </patternset>
+      </create-config>
       
       <!-- prepare run.conf for audit testing -->
       <echo file="${jboss.dist}/server/cc-audit/run.conf">
       JAVA_OPTS="-Xms1024m -Xmx1024m -XX:MaxPermSize=256m -Dorg.jboss.resolver.warning=true -Dsun.rmi.dgc.client.gcInterval=3600000 -Dsun.rmi.dgc.server.gcInterval=3600000 -Dsun.lang.ClassLoader.allowArraySyntax=true -Djboss.home.dir=${jboss.dist} -Djboss.server.home.dir=${jboss.dist}${/}server${/}cc-audit -Djava.security.manager -Djava.security.policy==${jboss.dist}${/}server${/}cc-audit/cc.policy -Dcc.jdbc.driver=${cc.jdbc.driver}"/></echo>
 
       <!-- prepare run.conf for later CXF testing -->
-      <echo file="${build.resources}/cc/run.conf">
-      JAVA_OPTS="-Xms1024m -Xmx1024m -XX:MaxPermSize=512m -Dorg.jboss.resolver.warning=true -Dsun.rmi.dgc.client.gcInterval=3600000 -Dsun.rmi.dgc.server.gcInterval=3600000 -Dsun.lang.ClassLoader.allowArraySyntax=true -Djboss.home.dir=${jboss.dist} -Djboss.server.home.dir=${jboss.dist}${/}server${/}cc-audit -Djava.security.manager -Djava.security.policy==${jboss.dist}${/}server${/}cc/cc.policy -Dcc.jdbc.driver=${cc.jdbc.driver}"</echo>
+      <echo file="${jboss.dist}/server/cc-cxf/run.conf">
+      JAVA_OPTS="-Xms1024m -Xmx1024m -XX:MaxPermSize=512m -Dorg.jboss.resolver.warning=true -Dsun.rmi.dgc.client.gcInterval=3600000 -Dsun.rmi.dgc.server.gcInterval=3600000 -Dsun.lang.ClassLoader.allowArraySyntax=true -Djboss.home.dir=${jboss.dist} -Djboss.server.home.dir=${jboss.dist}${/}server${/}cc-cxf -Djava.security.manager -Djava.security.policy==${jboss.dist}${/}server${/}cc-cxf/cc.policy -Dcc.jdbc.driver=${cc.jdbc.driver}"</echo>
 
    </target>
 
@@ -2032,9 +2047,10 @@
      
       <antcall target="tests-cc-audit"/>
       
+      <!-- Because CXF tests could be run later, we have to split and call those targets in separate ant run at the end. 
       <antcall target="calculate-md5"/>
       <antcall target="tests-report"/>
-
+      -->
    </target>
 
   <target name="cc-tests-secured" description="Tests run against secured configuration">
@@ -2092,8 +2108,6 @@
         </batchtest>
      </junit>
 
-     <!-- antcall target="cc-tests-ws"/ -->
-     
      <echo>Waiting for server to shutdown...</echo>
      <server:stop name="cc-secured"/>
 
@@ -2134,7 +2148,7 @@
    
    
    
-   <target name="cc-tests-ws" description="WS tests for CC">
+   <target name="cc-tests-ws" description="WS tests for CC" unless="cc.run.cxf.tests">
 
       <!-- WS tests have their own Security Manager, so we have to use new instance of JUNIT -->
       <junit dir="${module.output}"