[jboss-cvs] JBossAS SVN: r57315 - in trunk/system/src/resources/deploy/beans: . unpacked.beans/META-INF

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

Author: scott.stark at jboss.org
Date: 2006-09-30 22:45:12 -0400 (Sat, 30 Sep 2006)
New Revision: 57315

Modified:
   trunk/system/src/resources/deploy/beans/test-beans.xml
   trunk/system/src/resources/deploy/beans/unpacked.beans/META-INF/jboss-beans.xml
Log:
Merge the bootstrap tests and update them for the vfs and deployer changes

Modified: trunk/system/src/resources/deploy/beans/test-beans.xml
===================================================================
--- trunk/system/src/resources/deploy/beans/test-beans.xml	2006-10-01 02:44:33 UTC (rev 57314)
+++ trunk/system/src/resources/deploy/beans/test-beans.xml	2006-10-01 02:45:12 UTC (rev 57315)
@@ -4,16 +4,15 @@
 <deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:bean-deployer:2.0 bean-deployer_2_0.xsd"
             xmlns="urn:jboss:bean-deployer:2.0">
-   <bean name="VFSClassLoader" class="org.jboss.vfs.classloading.VFSClassLoader">
-      <constructor factoryClass="org.jboss.vfs.classloading.VFSClassLoaderFactory"
+   <bean name="VFSClassLoader" class="org.jboss.virtual.classloading.VFSClassLoader">
+      <constructor factoryClass="org.jboss.virtual.classloading.VFSClassLoaderFactory"
                    factoryMethod="newClassLoader">
-         <parameter>${jbosstest.support.dir}</parameter>
+         <parameter class="java.net.URI">${jbosstest.support.dir}</parameter>
          <parameter>
          	<array class="[Ljava.lang.String;" elementClass="java.lang.String">
 	         	<value>org.jboss.server.support.jar</value>
          	</array>
          	</parameter>
-         <parameter><inject bean="MainDeployer" property="VFSFactory"/></parameter>
       </constructor>
    </bean>
    <bean name="TestBean" class="org.jboss.test.server.support.TestBeanImpl">

Modified: trunk/system/src/resources/deploy/beans/unpacked.beans/META-INF/jboss-beans.xml
===================================================================
--- trunk/system/src/resources/deploy/beans/unpacked.beans/META-INF/jboss-beans.xml	2006-10-01 02:44:33 UTC (rev 57314)
+++ trunk/system/src/resources/deploy/beans/unpacked.beans/META-INF/jboss-beans.xml	2006-10-01 02:45:12 UTC (rev 57315)
@@ -4,16 +4,15 @@
 <deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:bean-deployer:2.0 bean-deployer_2_0.xsd"
             xmlns="urn:jboss:bean-deployer:2.0">
-   <bean name="VFSClassLoader-unpacked" class="org.jboss.vfs.classloading.VFSClassLoader">
-      <constructor factoryClass="org.jboss.vfs.classloading.VFSClassLoaderFactory"
+   <bean name="VFSClassLoader-unpacked" class="org.jboss.virtual.classloading.VFSClassLoader">
+      <constructor factoryClass="org.jboss.virtual.classloading.VFSClassLoaderFactory"
                    factoryMethod="newClassLoader">
-         <parameter>${jbosstest.support.dir}</parameter>
+         <parameter class="java.net.URI">${jbosstest.support.dir}</parameter>
          <parameter>
          	<array class="[Ljava.lang.String;" elementClass="java.lang.String">
 	         	<value>org.jboss.server.support.jar</value>
          	</array>
          	</parameter>
-         <parameter><inject bean="MainDeployer" property="VFSFactory"/></parameter>
       </constructor>
    </bean>
    <bean name="TestBean-unpacked" class="org.jboss.test.server.support.TestBeanImpl">