[jboss-cvs] JBossAS SVN: r96766 - trunk/build.

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

Author: remy.maucherat at jboss.com
Date: 2009-11-23 18:20:13 -0500 (Mon, 23 Nov 2009)
New Revision: 96766

Modified:
   trunk/build/build.xml
Log:
- Testsuite needs the invoker ...
- ... And migrate more of the default config for now. Feel free to to refix it.

Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml	2009-11-23 22:44:34 UTC (rev 96765)
+++ trunk/build/build.xml	2009-11-23 23:20:13 UTC (rev 96766)
@@ -301,15 +301,18 @@
     <copy todir="${install.web.conf}">
       <fileset dir="${install.default.conf}">
         <include name="**"/>
+    	<!-- Use default config instead
         <exclude name="jboss-service.xml"/>
       </fileset>
       <fileset dir="${project.root}/server/target/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="core-naming-jboss-beans.xml"/>
         <include name="ejb3.deployer/**"/>
         <include name="jboss-jca.deployer/**"/>
         <include name="jboss-aop-jboss5.deployer/**"/>
@@ -328,22 +331,19 @@
         <include name="jbossweb.sar/**"/>
         <include name="jboss-xa-jdbc.rar"/>
         <include name="jmx-console.war/**"/>
-    	<!-- broken right now
         <include name="http-invoker.sar/**"/>
-        -->
         <include name="ROOT.war/**"/>
         <include name="security/**"/>
         <include name="transaction-jboss-beans.xml"/>
         <include name="thread-pool-jboss-beans.xml"/>
         <include name="legacy-conf-service.xml"/>
-        <!-- FIXME serlvets shouldn't be using the ejb3 user transaction -->
+        <include name="naming-jboss-beans.xml"/>
+      	<!-- FIXME serlvets shouldn't be using the ejb3 user transaction -->
         <include name="ejb3-container-jboss-beans.xml"/>
       </fileset>
-      <!-- broken right now
       <fileset dir="${project.root}/server/target/etc/conf/web">
         <include name="jmx-invoker-service.xml"/>
       </fileset>
-      -->
       <fileset dir="${project.root}/profileservice/target/resources/">
         <include name="hdscanner-jboss-beans.xml"/>
       </fileset>