[jboss-cvs] JBossAS SVN: r81253 - in trunk: profileservice/src/resources and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Nov 18 15:57:25 EST 2008
Author: dimitris at jboss.org
Date: 2008-11-18 15:57:25 -0500 (Tue, 18 Nov 2008)
New Revision: 81253
Added:
trunk/profileservice/src/resources/hdscanner-jboss-beans.xml
Removed:
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
Log:
rename profileservice-hdscanner-jboss-beans.xml to hdscanner-jboss-beans.xml
Modified: trunk/build/build-distr.xml
===================================================================
--- trunk/build/build-distr.xml 2008-11-18 20:35:05 UTC (rev 81252)
+++ trunk/build/build-distr.xml 2008-11-18 20:57:25 UTC (rev 81253)
@@ -1737,7 +1737,7 @@
</copy>
<!-- Copy the profileservice hdscanner bean to deploy -->
<copy todir="${install.server}/all/deploy/"
- file="${_module.output}/resources/profileservice-hdscanner-jboss-beans.xml" />
+ file="${_module.output}/resources/hdscanner-jboss-beans.xml" />
<!-- Copy the profileservice beans to an optional file -->
<copy todir="${install.server}/all/deploy/"
file="${_module.output}/resources/profileservice-jboss-beans.xml" />
Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml 2008-11-18 20:35:05 UTC (rev 81252)
+++ trunk/build/build.xml 2008-11-18 20:57:25 UTC (rev 81253)
@@ -776,7 +776,7 @@
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"
+ <copy file="${project.root}/profileservice/output/resources/hdscanner-jboss-beans.xml"
todir="${install.minimal.deploy}"
overwrite="true"/>
<copy todir="${install.minimal.lib}">
@@ -828,7 +828,7 @@
<include name="jmx-invoker-service.xml"/>
</fileset>
<fileset dir="${project.root}/profileservice/output/resources/">
- <include name="profileservice-hdscanner-jboss-beans.xml"/>
+ <include name="hdscanner-jboss-beans.xml"/>
</fileset>
</copy>
Copied: trunk/profileservice/src/resources/hdscanner-jboss-beans.xml (from rev 81228, trunk/profileservice/src/resources/profileservice-hdscanner-jboss-beans.xml)
===================================================================
--- trunk/profileservice/src/resources/hdscanner-jboss-beans.xml (rev 0)
+++ trunk/profileservice/src/resources/hdscanner-jboss-beans.xml 2008-11-18 20:57:25 UTC (rev 81253)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ 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>
+ <property name="controller"><inject bean="jboss.kernel:service=KernelController"/></property>
+ <property name="profileService"><inject bean="ProfileService"/></property>
+ <property name="scanPeriod">5000</property>
+ <property name="scanThreadName">HDScanner</property>
+ </bean>
+</deployment>
Deleted: trunk/profileservice/src/resources/profileservice-hdscanner-jboss-beans.xml
===================================================================
--- trunk/profileservice/src/resources/profileservice-hdscanner-jboss-beans.xml 2008-11-18 20:35:05 UTC (rev 81252)
+++ trunk/profileservice/src/resources/profileservice-hdscanner-jboss-beans.xml 2008-11-18 20:57:25 UTC (rev 81253)
@@ -1,27 +0,0 @@
-<?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-18 20:35:05 UTC (rev 81252)
+++ trunk/profileservice/src/resources/profileservice-jboss-beans.xml 2008-11-18 20:57:25 UTC (rev 81253)
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ProfileService beans that extend the bootstrap configuration. This
- includes:
+ ProfileService beans that extend the bootstrap configuration.
+ This includes:
Remote access to ProfileService interfaces
ManagementView plugin + DeploymentTemplates
- Hot deployment scanning
...
$Id$
-->
<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
<bean name="ConnectorMBean">
<constructor factoryClass="org.jboss.mx.util.MBeanTyper" factoryMethod="typeMBean">
<parameter><inject bean="JMXKernel" property="mbeanServer"/></parameter>
@@ -18,6 +18,7 @@
</constructor>
<depends>jboss.remoting:service=Connector,transport=socket</depends>
</bean>
+
<!--
Add a ProfileService handler to the remoting socket connector
-->
@@ -33,6 +34,7 @@
<property name="managementViewProxy"><inject bean="ProfileServiceProxyFactory" property="managementViewProxy"/></property>
<property name="deployMgrProxy"><inject bean="ProfileServiceProxyFactory" property="deployMgrProxy"/></property>
</bean>
+
<!--
Add a DeploymentManger handler to the remoting socket connector
-->
@@ -55,7 +57,9 @@
<property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property>
</bean>
- <!-- The ManagementView plugin -->
+ <!--
+ The ManagementView plugin
+ -->
<bean name="ManagementView" class="org.jboss.profileservice.management.ManagementViewImpl">
<install bean="ProfileService" method="setViewManager">
<parameter>
@@ -77,7 +81,9 @@
<uncallback method="removeTemplate"/>
</bean>
- <!-- The DeploymentManager plugin -->
+ <!--
+ The DeploymentManager plugin
+ -->
<bean name="DeploymentManager"
class="org.jboss.profileservice.management.upload.DeploymentManagerImpl">
<install bean="ProfileService" method="setDeploymentManager">
More information about the jboss-cvs-commits
mailing list