[jboss-cvs] JBossAS SVN: r90443 - in branches/JBPAPP_5_0: testsuite and 1 other directory.

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

Author: smarlow at redhat.com
Date: 2009-06-18 14:11:22 -0400 (Thu, 18 Jun 2009)
New Revision: 90443

Modified:
   branches/JBPAPP_5_0/build/build.xml
   branches/JBPAPP_5_0/testsuite/build.xml
Log:
bring web profile back

Modified: branches/JBPAPP_5_0/build/build.xml
===================================================================
--- branches/JBPAPP_5_0/build/build.xml	2009-06-18 17:46:26 UTC (rev 90442)
+++ branches/JBPAPP_5_0/build/build.xml	2009-06-18 18:11:22 UTC (rev 90443)
@@ -1168,6 +1168,52 @@
     <copy todir="${install.minimal.lib}"
       file="${project.root}/server/output/lib/jboss-minimal.jar" />
 
+    <!-- Build server/web manually -->
+    <mkdir dir="${install.web}"/>
+    <mkdir dir="${install.web.lib}"/> <!-- empty -->
+    <copy todir="${install.web.conf}">
+      <fileset dir="${install.default.conf}">
+        <include name="**"/>
+        <exclude name="jboss-service.xml"/>
+      </fileset>
+      <fileset dir="${project.root}/server/output/etc/conf/web">
+        <include name="jboss-service.xml"/>
+      </fileset>
+    </copy>
+    <copy todir="${install.web.deployers}">
+      <fileset dir="${install.default.deployers}">
+         <include name="alias-deployers-jboss-beans.xml"/>            
+         <include name="ejb3.deployer/**"/>            
+         <include name="jboss-jca.deployer/**"/>            
+         <include name="jboss-aop-jboss5.deployer/**"/>            
+         <include name="jbossweb.deployer/**"/>            
+         <include name="metadata-deployer-jboss-beans.xml"/>            
+         <include name="security-deployer-jboss-beans.xml"/>            
+      </fileset>
+    </copy>
+    <copy todir="${install.web.deploy}">
+      <fileset dir="${install.default.deploy}">
+         <include name="hsqldb-ds.xml"/>
+         <include name="jca-jboss-beans.xml"/>
+         <include name="jboss-local-jdbc.rar"/>
+         <include name="jbossweb.sar/**"/>
+         <include name="jboss-xa-jdbc.rar"/>
+         <include name="jmx-console.war/**"/>
+         <include name="http-invoker.sar/**"/>
+         <include name="ROOT.war/**"/>
+         <include name="security/**"/>
+         <include name="transaction-jboss-beans.xml"/>
+         <!-- FIXME serlvets shouldn't be using the ejb3 user transaction -->
+         <include name="ejb3-container-jboss-beans.xml"/>
+      </fileset>
+      <fileset dir="${project.root}/server/output/etc/conf/web">
+        <include name="jmx-invoker-service.xml"/>
+      </fileset>
+      <fileset dir="${project.root}/profileservice/output/resources/">
+        <include name="hdscanner-jboss-beans.xml"/>
+      </fileset>
+    </copy>
+
     <!-- Build standard config manually -->
     <copy todir="${install.standard}">
       <fileset dir="${install.default}">

Modified: branches/JBPAPP_5_0/testsuite/build.xml
===================================================================
--- branches/JBPAPP_5_0/testsuite/build.xml	2009-06-18 17:46:26 UTC (rev 90442)
+++ branches/JBPAPP_5_0/testsuite/build.xml	2009-06-18 18:11:22 UTC (rev 90443)
@@ -1007,8 +1007,7 @@
       <antcall target="jrmp-invoker-tests"/>
       <antcall target="pooled-invoker-tests"/>
       <antcall target="tests-clustered-profileservice"/>
-<!--  web server config removed for EAP 5 - commenting out test target
-      <antcall target="tests-web-profile"/> -->
+      <antcall target="tests-web-profile"/> 
       <antcall target="tests-jts" />
    	
       <!-- NOTE: Run the classloader leak tests last as they can be