[jboss-cvs] JBossAS SVN: r76409 - in trunk/testsuite/imports: sections and 1 other directory.

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

Author: adrian at jboss.org
Date: 2008-07-29 08:34:33 -0400 (Tue, 29 Jul 2008)
New Revision: 76409

Modified:
   trunk/testsuite/imports/sections/web.xml
   trunk/testsuite/imports/server-config.xml
Log:
[JBAS-5803] beans.xml -> jboss-beans.xml

Modified: trunk/testsuite/imports/sections/web.xml
===================================================================
--- trunk/testsuite/imports/sections/web.xml	2008-07-29 12:32:58 UTC (rev 76408)
+++ trunk/testsuite/imports/sections/web.xml	2008-07-29 12:34:33 UTC (rev 76409)
@@ -680,7 +680,7 @@
       <jar destfile="${build.lib}/simple-mock.beans">
          <zipfileset dir="${build.resources}/web/simple-xmlonly"
             fullpath="META-INF/jboss-beans.xml">
-            <include name="encbinding-beans.xml"/>            
+            <include name="encbinding-jboss-beans.xml"/>            
          </zipfileset>
          <fileset dir="${build.classes}">
             <include name="org/jboss/test/web/mock/**"/>

Modified: trunk/testsuite/imports/server-config.xml
===================================================================
--- trunk/testsuite/imports/server-config.xml	2008-07-29 12:32:58 UTC (rev 76408)
+++ trunk/testsuite/imports/server-config.xml	2008-07-29 12:34:33 UTC (rev 76409)
@@ -968,8 +968,8 @@
            token="jvmRoute=&quot;@{conf}&quot;" value=""/>
           <replace file="${jboss.dist}/server/@{conf}/deploy/jbossweb.sar/server.xml"
             token="defaultHost" value="jvmRoute=&quot;@{conf}&quot; defaultHost"/>
-          <!-- Turn on UseJK in war-deployers-beans.xml -->
-          <replace file="${jboss.dist}/server/@{conf}/deployers/jbossweb.deployer/META-INF/war-deployers-beans.xml"
+          <!-- Turn on UseJK in war-deployers-jboss-beans.xml -->
+          <replace file="${jboss.dist}/server/@{conf}/deployers/jbossweb.deployer/META-INF/war-deployers-jboss-beans.xml"
             token="&quot;useJK&quot;&gt;false&lt;" value="&quot;useJK&quot;&gt;true&lt;"/>
       </sequential>
    </macrodef>