[Jboss-cvs] JBossAS SVN: r56983 - in branches/MC_VDF_WORK/system/src: resources/tests/bootstrap/default tests/org/jboss/test/server/profileservice

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

Author: scott.stark at jboss.org
Date: 2006-09-19 19:51:21 -0400 (Tue, 19 Sep 2006)
New Revision: 56983

Modified:
   branches/MC_VDF_WORK/system/src/resources/tests/bootstrap/default/deployer-beans.xml
   branches/MC_VDF_WORK/system/src/tests/org/jboss/test/server/profileservice/MainTestCase.java
Log:
Update for the deployer changes

Modified: branches/MC_VDF_WORK/system/src/resources/tests/bootstrap/default/deployer-beans.xml
===================================================================
--- branches/MC_VDF_WORK/system/src/resources/tests/bootstrap/default/deployer-beans.xml	2006-09-19 23:50:39 UTC (rev 56982)
+++ branches/MC_VDF_WORK/system/src/resources/tests/bootstrap/default/deployer-beans.xml	2006-09-19 23:51:21 UTC (rev 56983)
@@ -5,39 +5,47 @@
 during the load of the org.jboss.system.server.profileservice.ServerImpl
 entry point.
 -->
-<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xsi:schemaLocation="urn:jboss:bean-deployer:2.0 ../../../../../kernel/src/resources/schema/bean-deployer_2_0.xsd"
-   xmlns="urn:jboss:bean-deployer:2.0">
-   <!-- -->
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+   
+   <!-- The profile service -->
    <bean name="ProfileService" class="org.jboss.system.server.profileservice.ProfileServiceImpl">
       <constructor>
          <parameter>${jboss.server.name}</parameter>
       </constructor>
-      <property name="profileRoot">${jbosstest.deploy.dir}</property>
+      <property name="profileRoot">${jboss.server.home.url}/profile</property>
    </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"/>
+            <!-- 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>
+   <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}/${jboss.server.name}</value></list>
-      	</property>
+         <list elementClass="java.net.URI">
+            <!-- Standard hot deployment directory -->
+            <value>${jboss.server.home.url}deploy/</value>
+         </list>
+      </property>
    </bean>
-	
+   
 </deployment>

Modified: branches/MC_VDF_WORK/system/src/tests/org/jboss/test/server/profileservice/MainTestCase.java
===================================================================
--- branches/MC_VDF_WORK/system/src/tests/org/jboss/test/server/profileservice/MainTestCase.java	2006-09-19 23:50:39 UTC (rev 56982)
+++ branches/MC_VDF_WORK/system/src/tests/org/jboss/test/server/profileservice/MainTestCase.java	2006-09-19 23:51:21 UTC (rev 56983)
@@ -54,7 +54,16 @@
     */
    public void testCreateDefaultProfile() throws Throwable
    {
+      // Set the jboss.server.home.url property to the system/src/resources dir
+      URL bootstrapDir = super.getResource("/bootstrap");
+      log.info("bootstrapDir: "+bootstrapDir);
+      URL resourcesDir = new URL(bootstrapDir, "..");
+      log.info("resourcesDir: "+resourcesDir);
+      System.setProperty("jboss.server.home.url", resourcesDir.toString());
+
+      // 
       ProfileServiceBootstrap psb = new ProfileServiceBootstrap();
+      psb.setDeployerBeansPrefix("bootstrap/default/");
       psb.bootstrap();
       ProfileService ps = psb.getProfileService();
       ProfileKey defaultKey = new ProfileKey("default");