[jboss-cvs] JBossAS SVN: r79713 - in trunk/testsuite: src/resources/test-configs/web-profile and 1 other directory.

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

Author: dimitris at jboss.org
Date: 2008-10-19 14:17:32 -0400 (Sun, 19 Oct 2008)
New Revision: 79713

Removed:
   trunk/testsuite/src/resources/test-configs/web-profile/conf/
Modified:
   trunk/testsuite/imports/server-config.xml
Log:
make the web-profile tests boot so the testsuite completes, although the tests themselves fail.

Modified: trunk/testsuite/imports/server-config.xml
===================================================================
--- trunk/testsuite/imports/server-config.xml	2008-10-19 14:18:23 UTC (rev 79712)
+++ trunk/testsuite/imports/server-config.xml	2008-10-19 18:17:32 UTC (rev 79713)
@@ -956,35 +956,36 @@
    </macrodef>
 	
    <!-- A macro for creating the web profile -->
-   <macrodef name="create-web-profile-config"
-	      description="Create the web configuration">
-	   <attribute name="conf"/>
-   	<sequential>
-	    <create-config baseconf="default" newconf="@{conf}"
-	      newconf-src="web-profile">
-	      <patternset>
-            <include name="conf/**"/>
-            <include name="deploy/hsqldb-ds.xml"/>
-            <include name="deploy/jbossjca-service.xml"/>
-            <include name="deploy/jboss-local-jdbc.rar"/>
-            <include name="deploy/jbossweb.sar/**"/>
-            <include name="deploy/jboss-xa-jdbc.rar"/>
-            <include name="deploy/jmx-console.war/**"/>
-            <include name="deploy/http-invoker.sar/**"/>
-            <include name="deploy/ROOT.war/**"/>
-            <include name="deploy/security/**"/>
-            <include name="deploy/transaction-jboss-beans.xml"/>
-            <include name="deployers/alias-deployers-jboss-beans.xml"/>            
-            <include name="deployers/ejb3.deployer/**"/>            
-            <include name="deployers/jboss-jca.deployer/**"/>            
-            <include name="deployers/jboss-aop-jboss5.deployer/**"/>            
-            <include name="deployers/jbossweb.deployer/**"/>            
-            <include name="deployers/metadata-deployer-jboss-beans.xml"/>            
-            <include name="deployers/security-deployer-jboss-beans.xml"/>            
-            <include name="lib/**"/>
-	      </patternset>
-	    </create-config>
-    </sequential>
+   <macrodef name="create-web-profile-config" description="Create the web configuration">
+      <attribute name="conf"/>
+      <sequential>
+         <create-config baseconf="default" newconf="@{conf}" newconf-src="web-profile">
+            <patternset>
+               <include name="conf/**"/>
+               <include name="deploy/hsqldb-ds.xml"/>
+               <include name="deploy/jbossjca-service.xml"/>
+               <include name="deploy/jboss-local-jdbc.rar"/>
+               <include name="deploy/jbossweb.sar/**"/>
+               <include name="deploy/jboss-xa-jdbc.rar"/>
+               <include name="deploy/jmx-console.war/**"/>
+               <include name="deploy/ROOT.war/**"/>
+               <include name="deploy/security/**"/>
+               <include name="deploy/legacy-conf-service.xml"/>
+               <include name="deploy/naming-jboss-beans.xml"/>
+               <include name="deploy/transaction-jboss-beans.xml"/>
+               <include name="deployers/alias-deployers-jboss-beans.xml"/>            
+               <include name="deployers/ejb3.deployer/**"/>            
+               <include name="deployers/jboss-jca.deployer/**"/>            
+               <include name="deployers/jboss-aop-jboss5.deployer/**"/>            
+               <include name="deployers/jbossweb.deployer/**"/>            
+               <include name="deployers/metadata-deployer-jboss-beans.xml"/>            
+               <include name="deployers/security-deployer-jboss-beans.xml"/>            
+               <include name="lib/**"/>
+	    </patternset>
+         </create-config>
+     	 <copy file="${project.root}/varia/output/lib/http-invoker.sar" 
+               tofile="${jboss.dist}/server/@{conf}/deploy/http-invoker.sar"/>
+      </sequential>
    </macrodef>
 
    <!-- This macro makes a new config whose name is given by the newconf