[jboss-cvs] JBossAS SVN: r80843 - in trunk: profileservice/src/resources and 2 other directories.

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

Author: scott.stark at jboss.org
Date: 2008-11-12 02:34:57 -0500 (Wed, 12 Nov 2008)
New Revision: 80843

Added:
   trunk/profileservice/src/resources/profileservice-hdscanner-jboss-beans.xml
Modified:
   trunk/build/build-distr.xml
   trunk/build/build.xml
   trunk/profileservice/src/resources/profileservice-jboss-beans.xml
   trunk/server/src/etc/conf/default/profile.xml
   trunk/system/src/main/org/jboss/system/server/profileservice/hotdeploy/HDScanner.java
Log:
JBAS-6190, deploy the HDScanner bean in deploy/profileservice-hdscanner-jboss-beans.xml regardless of the profile service implementation

Modified: trunk/build/build-distr.xml
===================================================================
--- trunk/build/build-distr.xml	2008-11-12 06:13:58 UTC (rev 80842)
+++ trunk/build/build-distr.xml	2008-11-12 07:34:57 UTC (rev 80843)
@@ -1735,6 +1735,9 @@
     <copy todir="${install.all.lib}" filtering="no">
       <fileset dir="${_module.output}/lib" includes="*.jar"/>
     </copy>
+    <!-- Copy the profileservice hdscanner bean to deploy -->
+    <copy todir="${install.server}/all/deploy/"
+      file="${_module.output}/resources/profileservice-hdscanner-jboss-beans.xml" />
     <!-- Copy the profileservice beans to an optional file -->
     <copy tofile="${install.server}/all/deploy/profileservice-jboss-beans.xml.bak"
       file="${_module.output}/resources/profileservice-jboss-beans.xml" />

Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml	2008-11-12 06:13:58 UTC (rev 80842)
+++ trunk/build/build.xml	2008-11-12 07:34:57 UTC (rev 80843)
@@ -773,6 +773,9 @@
           tofile="${install.minimal.conf}/bootstrap.xml"/>
     <copy file="${install.default.conf}/jboss-minimal.xml"
           tofile="${install.minimal.conf}/jboss-service.xml"/>
+    <copy file="${project.root}/profileservice/output/resources/profileservice-hdscanner-jboss-beans.xml" 
+          todir="${install.minimal.deploy}"
+overwrite="true"/>
     <copy todir="${install.minimal.lib}">
       <fileset dir="${install.shared.lib}">
         <include name="jnpserver.jar" />

Added: trunk/profileservice/src/resources/profileservice-hdscanner-jboss-beans.xml
===================================================================
--- trunk/profileservice/src/resources/profileservice-hdscanner-jboss-beans.xml	                        (rev 0)
+++ trunk/profileservice/src/resources/profileservice-hdscanner-jboss-beans.xml	2008-11-12 07:34:57 UTC (rev 80843)
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+    ProfileService beans that extend the bootstrap configuration. This
+    includes:
+    Hot deployment scanning
+    ...
+    $Id: profileservice-jboss-beans.xml 79345 2008-10-10 13:46:55Z emuckenhuber $
+-->
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+    <!-- Hotdeployment of applications -->
+    <bean name="HDScanner"
+        class="org.jboss.system.server.profileservice.hotdeploy.HDScanner">
+        <property name="mainDeployer"><inject bean="MainDeployer"/></property>
+        <!-- Workaround for JBMICROCONT-176
+        -->
+        <property name="controller"><inject bean="jboss.kernel:service=KernelController"/></property>
+        <!-- Broken due to JBMICROCONT-176
+            <property name="controller"><inject bean="jboss.kernel:service=Kernel" property="controller"/></property>
+        -->
+        
+        <property name="profileService"><inject bean="ProfileService"/></property>
+        <property name="scanPeriod">5000</property>
+        <property name="scanThreadName">HDScanner</property>
+    </bean>
+</deployment>

Modified: trunk/profileservice/src/resources/profileservice-jboss-beans.xml
===================================================================
--- trunk/profileservice/src/resources/profileservice-jboss-beans.xml	2008-11-12 06:13:58 UTC (rev 80842)
+++ trunk/profileservice/src/resources/profileservice-jboss-beans.xml	2008-11-12 07:34:57 UTC (rev 80843)
@@ -5,6 +5,7 @@
     includes:
     Remote access to ProfileService interfaces
     ManagementView plugin + DeploymentTemplates
+    Hot deployment scanning
     ...
     $Id$
 -->

Modified: trunk/server/src/etc/conf/default/profile.xml
===================================================================
--- trunk/server/src/etc/conf/default/profile.xml	2008-11-12 06:13:58 UTC (rev 80842)
+++ trunk/server/src/etc/conf/default/profile.xml	2008-11-12 07:34:57 UTC (rev 80843)
@@ -76,19 +76,4 @@
       </property>
    </bean>
 
-   <!-- Hotdeployment of applications -->
-   <bean name="HDScanner"
-      class="org.jboss.system.server.profileservice.hotdeploy.HDScanner">
-      <property name="mainDeployer"><inject bean="MainDeployer"/></property>
-      <!-- Workaround for JBMICROCONT-176
-      -->
-      <property name="controller"><inject bean="jboss.kernel:service=KernelController"/></property>
-      <!-- Broken due to JBMICROCONT-176
-         <property name="controller"><inject bean="jboss.kernel:service=Kernel" property="controller"/></property>
-      -->
-      <property name="profileService"><inject bean="ProfileService"/></property>
-      <property name="scanPeriod">5000</property>
-      <property name="scanThreadName">HDScanner</property>
-   </bean>
-   
 </deployment>

Modified: trunk/system/src/main/org/jboss/system/server/profileservice/hotdeploy/HDScanner.java
===================================================================
--- trunk/system/src/main/org/jboss/system/server/profileservice/hotdeploy/HDScanner.java	2008-11-12 06:13:58 UTC (rev 80842)
+++ trunk/system/src/main/org/jboss/system/server/profileservice/hotdeploy/HDScanner.java	2008-11-12 07:34:57 UTC (rev 80843)
@@ -288,7 +288,9 @@
                if (tcl != null)
                   Thread.currentThread().setContextClassLoader(tcl);
                mainDeployer.process();
-               mainDeployer.checkComplete();
+               // Can be nulled by a shutdown
+               if(mainDeployer != null)
+                  mainDeployer.checkComplete();
             }
             finally
             {