[jboss-cvs] JBossAS SVN: r57316 - trunk/system/src/resources/tests/bootstrap/defaulthotdeploy

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

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

Modified:
   trunk/system/src/resources/tests/bootstrap/defaulthotdeploy/deployer-beans.xml
Log:
Merge the bootstrap tests and update them for the vfs and deployer changes

Modified: trunk/system/src/resources/tests/bootstrap/defaulthotdeploy/deployer-beans.xml
===================================================================
--- trunk/system/src/resources/tests/bootstrap/defaulthotdeploy/deployer-beans.xml	2006-10-01 02:45:12 UTC (rev 57315)
+++ trunk/system/src/resources/tests/bootstrap/defaulthotdeploy/deployer-beans.xml	2006-10-01 02:45:32 UTC (rev 57316)
@@ -17,29 +17,53 @@
    </bean>
 
    <!-- The MainDeployer -->
-   <bean name="MainDeployer" class="org.jboss.deployers.plugins.MainDeployerImpl">
-      <property name="VFSFactory"><inject bean="VFSFactory"/></property>
+   <bean name="MainDeployer" class="org.jboss.deployers.plugins.deployment.MainDeployerImpl">
+      <property name="structureDeployers">
+         <list>
+            <!-- JAR Structure -->
+            <bean name="JARStructure" class="org.jboss.deployers.plugins.structure.vfs.jar.JARStructure">
+               <property name="candidateStructureVisitorFactory">
+                  <!-- Any file that is not an ordinary directory is a candidate -->
+                  <bean name="JARStructureCandidates" class="org.jboss.deployers.plugins.structure.vfs.jar.JARCandidateStructureVisitorFactory">
+                     <!-- A filter to exclude some obvious non-subdeployments -->
+                     <property name="filter">
+                        <bean name="JARFilter" class="org.jboss.virtual.plugins.vfs.helpers.SuffixesExcludeFilter">
+                           <constructor><parameter>
+                              <list elementClass="java.lang.String">
+                                 <!-- Exclude class files as subdeployments -->
+                                 <value>.class</value>
+                              </list>
+                           </parameter></constructor>
+                        </bean>
+                     </property>
+                  </bean>
+               </property>
+            </bean>
+            <!-- File Structure -->
+            <bean name="FileStructure" class="org.jboss.deployers.plugins.structure.vfs.file.FileStructure"/>
+         </list>
+      </property>
+      <property name="deployers">
+         <list>
+            <!-- POJO Deployment -->
+            <bean name="BeanDeployer" class="org.jboss.deployers.plugins.deployers.kernel.BeanDeployer"/>
+            <bean name="KernelDeploymentDeployer" class="org.jboss.deployers.plugins.deployers.kernel.KernelDeploymentDeployer"/>
+            <bean name="BeanMetaDataDeployer" class="org.jboss.deployers.plugins.deployers.kernel.BeanMetaDataDeployer">
+               <constructor><parameter><inject bean="jboss.kernel:service=Kernel"/></parameter></constructor>
+            </bean>
+         </list>
+      </property>
    </bean>
-   <bean name="VFSFactory" class="org.jboss.vfs.file.DefaultVFSFactory">
-   </bean>
-
-   <!-- Deployers. Declaration order defines the deployer chain order
-   -->
-   <bean name="ClassLoadingDeployer" class="org.jboss.deployers.plugins.classloading.ClassLoadingDeployer">
-      <property name="mainDeployer"><inject bean="MainDeployer"/></property>
-   </bean>
-   <bean name="BeanDeployer" class="org.jboss.deployers.plugins.bean.BeanDeployer">
-      <property name="mainDeployer"><inject bean="MainDeployer"/></property>
-   </bean>
-
-   <!-- Hot deployment service that directly uses the MainDeployer -->
-   <bean name="VFSDeploymentScanner" class="org.jboss.deployers.plugins.scanner.VFSDeploymentScannerImpl">
-      <property name="mainDeployer"><inject bean="MainDeployer"/></property>
-      <property name="VFSFactory"><inject bean="MainDeployer" property="VFSFactory" /></property>
+   
+   <!-- Scan for deployments -->
+   <bean name="VFSDeploymentScanner" class="org.jboss.system.server.profileservice.VFSDeploymentScannerImpl">
+      <property name="profileService"><inject bean="ProfileService"/></property>
       <property name="URIList">
-         <list elementClass="java.net.URI"><value>${jbosstest.deploy.dir}/../resources/deploy/</value></list>
+         <list elementClass="java.net.URI">
+            <!-- Standard hot deployment directory -->
+            <value>${jbosstest.deploy.dir}/deploy/</value>
+         </list>
       </property>
-      <property name="scanPeriod"><value>5000</value></property>
    </bean>
-	
+ 
 </deployment>