[jboss-cvs] JBossAS SVN: r76639 - in trunk: build and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Aug 5 04:54:59 EDT 2008
Author: alesj
Date: 2008-08-05 04:54:59 -0400 (Tue, 05 Aug 2008)
New Revision: 76639
Added:
trunk/server/src/etc/conf/default/profile-repository.xml
trunk/server/src/etc/conf/default/profile.xml
Removed:
trunk/server/src/etc/conf/default/profile-service-repository.xml
trunk/server/src/etc/conf/default/profile-service.xml
Modified:
trunk/bootstrap/src/resources/schema/jboss-bootstrap_1_0.xsd
trunk/build/build.xml
trunk/build/docs/readme.html
trunk/server/src/etc/conf/default/bootstrap-repo.xml
trunk/server/src/etc/conf/default/bootstrap.xml
Log:
[JBAS-5761]; renaming profile-service.xml to just profile.xml.
Since none of the other bootstrap files uses -beans.xml, I think this one shouldn't as well.
Modified: trunk/bootstrap/src/resources/schema/jboss-bootstrap_1_0.xsd
===================================================================
--- trunk/bootstrap/src/resources/schema/jboss-bootstrap_1_0.xsd 2008-08-05 08:51:02 UTC (rev 76638)
+++ trunk/bootstrap/src/resources/schema/jboss-bootstrap_1_0.xsd 2008-08-05 08:54:59 UTC (rev 76639)
@@ -44,7 +44,7 @@
<url>aop.xml</url>
<url>jmx.xml</url>
<url>deployers.xml</url>
- <url>profile-service.xml</url>
+ <url>profile.xml</url>
</bootstrap>
The files referenced must be microcontainer deployments.
Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml 2008-08-05 08:51:02 UTC (rev 76638)
+++ trunk/build/build.xml 2008-08-05 08:54:59 UTC (rev 76639)
@@ -746,7 +746,7 @@
<include name="classloader.xml" />
<include name="deployers.xml" />
<include name="jmx.xml" />
- <include name="profile-service.xml" />
+ <include name="profile.xml" />
<include name="xmdesc/NamingBean-xmbean.xml" />
<include name="xmdesc/NamingService-xmbean.xml" />
</fileset>
Modified: trunk/build/docs/readme.html
===================================================================
--- trunk/build/docs/readme.html 2008-08-05 08:51:02 UTC (rev 76638)
+++ trunk/build/docs/readme.html 2008-08-05 08:54:59 UTC (rev 76639)
@@ -1,4 +1,4 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html><head><!-- $Id: readme.html,v 1.1.2.36 2006/05/13 15:42:36 dimitris Exp $ -->
<meta content="text/html" http-equiv="content-type"><meta content="JBoss Inc." name="author"><title>JBoss
5.0.0.CR1 Readme</title></head>
@@ -169,7 +169,7 @@
<li>server - the same server configuration dirs.<ul> <li>default
configuration<ul> <li>conf</li> <ul> <li><b>bootstrap-beans.xml
</b>- new mc kernel bootstrap configuration referencing other<br>configuration
-files that contain the beans that setup each individual subsystem.</li><ul><li>classloader.xml</li><li>aop.xml</li><li>jmx.xml</li><li>deployers.xml</li><li>profile-service.xml</li></ul>
+files that contain the beans that setup each individual subsystem.</li><ul><li>classloader.xml</li><li>aop.xml</li><li>jmx.xml</li><li>deployers.xml</li><li>profile.xml</li></ul>
<li><b>jax-ws-catalog.xml
</b>- oasis catalog driven schema/dtd namespace configuration</li>
<li><b>jbossjta-properties.xml </b>- new JBossTS
Modified: trunk/server/src/etc/conf/default/bootstrap-repo.xml
===================================================================
--- trunk/server/src/etc/conf/default/bootstrap-repo.xml 2008-08-05 08:51:02 UTC (rev 76638)
+++ trunk/server/src/etc/conf/default/bootstrap-repo.xml 2008-08-05 08:54:59 UTC (rev 76639)
@@ -10,6 +10,6 @@
<url>aop.xml</url>
<url>jmx.xml</url>
<url>deployers.xml</url>
- <url>profile-service-repository.xml</url>
+ <url>profile-repository.xml</url>
</bootstrap>
Modified: trunk/server/src/etc/conf/default/bootstrap.xml
===================================================================
--- trunk/server/src/etc/conf/default/bootstrap.xml 2008-08-05 08:51:02 UTC (rev 76638)
+++ trunk/server/src/etc/conf/default/bootstrap.xml 2008-08-05 08:54:59 UTC (rev 76639)
@@ -10,6 +10,6 @@
<url>aop.xml</url>
<url>jmx.xml</url>
<url>deployers.xml</url>
- <url>profile-service.xml</url>
+ <url>profile.xml</url>
</bootstrap>
Copied: trunk/server/src/etc/conf/default/profile-repository.xml (from rev 76584, trunk/server/src/etc/conf/default/profile-service-repository.xml)
===================================================================
--- trunk/server/src/etc/conf/default/profile-repository.xml (rev 0)
+++ trunk/server/src/etc/conf/default/profile-repository.xml 2008-08-05 08:54:59 UTC (rev 76639)
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ The profile service
+-->
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <classloader><inject bean="profile-classloader:0.0.0"/></classloader>
+
+ <classloader name="profile-classloader" xmlns="urn:jboss:classloader:1.0" export-all="NON_EMPTY" import-all="true"/>
+
+ <!-- The file repository profile service which provides full
+ support ProfileService spi.
+ -->
+ <bean name="ProfileService" class="org.jboss.system.server.profileservice.repository.ProfileServiceImpl">
+ <constructor>
+ <parameter>${jboss.server.name}</parameter>
+ </constructor>
+ <property name="profileRepository"><inject bean="FileProfileRepository"/></property>
+ </bean>
+ <bean name="FileProfileRepository" class="org.jboss.system.server.profileservice.repository.FileProfileRepository">
+ <property name="storeRoot">${jboss.server.base.dir}</property>
+ <property name="repositoryFactory"><inject bean="SerializableDeploymentRepositoryFactory"/></property>
+ </bean>
+ <bean name="SerializableDeploymentRepositoryFactory" class="org.jboss.system.server.profileservice.repository.SerializableDeploymentRepositoryFactory">
+ <property name="storeRoot">${jboss.server.base.dir}</property>
+ <property name="applicationURIs">
+ <array elementClass="java.net.URI">
+ <value>${jboss.server.home.url}/deploy</value>
+ </array>
+ </property>
+ <property name="serializer"><inject bean="JavaSerializationAttachmentsSerializer"/></property>
+ </bean>
+ <bean name="JavaSerializationAttachmentsSerializer" class="org.jboss.system.server.profileservice.repository.JavaSerializationAttachmentsSerializer">
+ <property name="attachmentsStoreDir">${jboss.server.home.dir}/attachments</property>
+ </bean>
+
+ <bean name="ProfileServiceBootstrap" class="org.jboss.system.server.profileservice.ProfileServiceBootstrap">
+ <property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property>
+ </bean>
+
+ <!-- A filter for excluding files from the scanner -->
+ <bean name="DeploymentFilter" class="org.jboss.virtual.plugins.vfs.helpers.ExtensibleFilter">
+ <!-- Files starting with theses strings are ignored -->
+ <property name="prefixes">#,%,\,,.,_$</property>
+ <!-- Files ending with theses strings are ignored -->
+ <property name="suffixes">#,$,%,~,\,v,.BAK,.bak,.old,.orig,.tmp,.rej,.sh</property>
+ <!-- Files matching with theses strings are ignored -->
+ <property name="matches">.make.state,.nse_depinfo,CVS,CVS.admin,RCS,RCSLOG,SCCS,TAGS,core,tags</property>
+ </bean>
+
+</deployment>
Deleted: trunk/server/src/etc/conf/default/profile-service-repository.xml
===================================================================
--- trunk/server/src/etc/conf/default/profile-service-repository.xml 2008-08-05 08:51:02 UTC (rev 76638)
+++ trunk/server/src/etc/conf/default/profile-service-repository.xml 2008-08-05 08:54:59 UTC (rev 76639)
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- The profile service
--->
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <classloader><inject bean="profile-service-classloader:0.0.0"/></classloader>
-
- <classloader name="profile-service-classloader" xmlns="urn:jboss:classloader:1.0" export-all="NON_EMPTY" import-all="true"/>
-
- <!-- The file repository profile service which provides full
- support ProfileService spi.
- -->
- <bean name="ProfileService" class="org.jboss.system.server.profileservice.repository.ProfileServiceImpl">
- <constructor>
- <parameter>${jboss.server.name}</parameter>
- </constructor>
- <property name="profileRepository"><inject bean="FileProfileRepository"/></property>
- </bean>
- <bean name="FileProfileRepository" class="org.jboss.system.server.profileservice.repository.FileProfileRepository">
- <property name="storeRoot">${jboss.server.base.dir}</property>
- <property name="repositoryFactory"><inject bean="SerializableDeploymentRepositoryFactory"/></property>
- </bean>
- <bean name="SerializableDeploymentRepositoryFactory" class="org.jboss.system.server.profileservice.repository.SerializableDeploymentRepositoryFactory">
- <property name="storeRoot">${jboss.server.base.dir}</property>
- <property name="applicationURIs">
- <array elementClass="java.net.URI">
- <value>${jboss.server.home.url}/deploy</value>
- </array>
- </property>
- <property name="serializer"><inject bean="JavaSerializationAttachmentsSerializer"/></property>
- </bean>
- <bean name="JavaSerializationAttachmentsSerializer" class="org.jboss.system.server.profileservice.repository.JavaSerializationAttachmentsSerializer">
- <property name="attachmentsStoreDir">${jboss.server.home.dir}/attachments</property>
- </bean>
-
- <bean name="ProfileServiceBootstrap" class="org.jboss.system.server.profileservice.ProfileServiceBootstrap">
- <property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property>
- </bean>
-
- <!-- A filter for excluding files from the scanner -->
- <bean name="DeploymentFilter" class="org.jboss.virtual.plugins.vfs.helpers.ExtensibleFilter">
- <!-- Files starting with theses strings are ignored -->
- <property name="prefixes">#,%,\,,.,_$</property>
- <!-- Files ending with theses strings are ignored -->
- <property name="suffixes">#,$,%,~,\,v,.BAK,.bak,.old,.orig,.tmp,.rej,.sh</property>
- <!-- Files matching with theses strings are ignored -->
- <property name="matches">.make.state,.nse_depinfo,CVS,CVS.admin,RCS,RCSLOG,SCCS,TAGS,core,tags</property>
- </bean>
-
-</deployment>
Deleted: trunk/server/src/etc/conf/default/profile-service.xml
===================================================================
--- trunk/server/src/etc/conf/default/profile-service.xml 2008-08-05 08:51:02 UTC (rev 76638)
+++ trunk/server/src/etc/conf/default/profile-service.xml 2008-08-05 08:54:59 UTC (rev 76639)
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- The profile service
--->
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <classloader><inject bean="profile-service-classloader:0.0.0"/></classloader>
-
- <classloader name="profile-service-classloader" xmlns="urn:jboss:classloader:1.0" export-all="NON_EMPTY" import-all="true"/>
-
- <!-- The basic profile service which relies on vfs scanners
- to determine the profile deployments. This version does not
- support the full ProfileService spi.
- -->
- <bean name="ProfileService" class="org.jboss.system.server.profileservice.basic.MetaDataAwareProfileService">
- <constructor>
- <parameter>${jboss.server.name}</parameter>
- </constructor>
- <property name="profileRoot">${jboss.server.home.dir}</property>
- <property name="mainDeployer"><inject bean="MainDeployer"/></property>
- </bean>
-
- <bean name="ProfileServiceBootstrap" class="org.jboss.system.server.profileservice.ProfileServiceBootstrap">
- <property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property>
- </bean>
-
- <!-- A filter for excluding files from the scanner -->
- <bean name="DeploymentFilter" class="org.jboss.virtual.plugins.vfs.helpers.ExtensibleFilter">
- <!-- Files starting with theses strings are ignored -->
- <property name="prefixes">#,%,\,,.,_$</property>
- <!-- Files ending with theses strings are ignored -->
- <property name="suffixes">#,$,%,~,\,v,.BAK,.bak,.old,.orig,.tmp,.rej,.sh</property>
- <!-- Files matching with theses strings are ignored -->
- <property name="matches">.make.state,.nse_depinfo,CVS,CVS.admin,RCS,RCSLOG,SCCS,TAGS,core,tags</property>
- </bean>
-
- <!-- Scan for bootstraps -->
- <bean name="VFSBootstrapScanner" class="org.jboss.system.server.profileservice.VFSBootstrapScannerImpl">
- <property name="profileService"><inject bean="ProfileService"/></property>
- <property name="filterInstance"><inject bean="DeploymentFilter"/></property>
- <property name="URIList">
- <list elementClass="java.net.URI">
- <!-- Legacy static conf/jboss-service.xml -->
- <value>${jboss.server.home.url}conf/jboss-service.xml</value>
- </list>
- </property>
- </bean>
-
- <!-- Scan for deployers -->
- <bean name="VFSDeployerScanner" class="org.jboss.system.server.profileservice.VFSDeployerScannerImpl">
- <property name="profileService"><inject bean="ProfileService"/></property>
- <property name="filterInstance"><inject bean="DeploymentFilter"/></property>
- <property name="URIList">
- <list elementClass="java.net.URI">
- <!-- Directory for deployers -->
- <value>${jboss.server.home.url}deployers/</value>
- </list>
- </property>
- </bean>
-
- <!-- Scan for applications -->
- <bean name="VFSDeploymentScanner" class="org.jboss.system.server.profileservice.VFSDeploymentScannerImpl">
- <property name="profileService"><inject bean="ProfileService"/></property>
- <property name="filterInstance"><inject bean="DeploymentFilter"/></property>
- <property name="URIList">
- <list elementClass="java.net.URI">
- <!-- Standard hot deployment directory -->
- <value>${jboss.server.home.url}deploy/</value>
- </list>
- </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>
Copied: trunk/server/src/etc/conf/default/profile.xml (from rev 76584, trunk/server/src/etc/conf/default/profile-service.xml)
===================================================================
--- trunk/server/src/etc/conf/default/profile.xml (rev 0)
+++ trunk/server/src/etc/conf/default/profile.xml 2008-08-05 08:54:59 UTC (rev 76639)
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ The profile service
+-->
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <classloader><inject bean="profile-classloader:0.0.0"/></classloader>
+
+ <classloader name="profile-classloader" xmlns="urn:jboss:classloader:1.0" export-all="NON_EMPTY" import-all="true"/>
+
+ <!-- The basic profile service which relies on vfs scanners
+ to determine the profile deployments. This version does not
+ support the full ProfileService spi.
+ -->
+ <bean name="ProfileService" class="org.jboss.system.server.profileservice.basic.MetaDataAwareProfileService">
+ <constructor>
+ <parameter>${jboss.server.name}</parameter>
+ </constructor>
+ <property name="profileRoot">${jboss.server.home.dir}</property>
+ <property name="mainDeployer"><inject bean="MainDeployer"/></property>
+ </bean>
+
+ <bean name="ProfileServiceBootstrap" class="org.jboss.system.server.profileservice.ProfileServiceBootstrap">
+ <property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property>
+ </bean>
+
+ <!-- A filter for excluding files from the scanner -->
+ <bean name="DeploymentFilter" class="org.jboss.virtual.plugins.vfs.helpers.ExtensibleFilter">
+ <!-- Files starting with theses strings are ignored -->
+ <property name="prefixes">#,%,\,,.,_$</property>
+ <!-- Files ending with theses strings are ignored -->
+ <property name="suffixes">#,$,%,~,\,v,.BAK,.bak,.old,.orig,.tmp,.rej,.sh</property>
+ <!-- Files matching with theses strings are ignored -->
+ <property name="matches">.make.state,.nse_depinfo,CVS,CVS.admin,RCS,RCSLOG,SCCS,TAGS,core,tags</property>
+ </bean>
+
+ <!-- Scan for bootstraps -->
+ <bean name="VFSBootstrapScanner" class="org.jboss.system.server.profileservice.VFSBootstrapScannerImpl">
+ <property name="profileService"><inject bean="ProfileService"/></property>
+ <property name="filterInstance"><inject bean="DeploymentFilter"/></property>
+ <property name="URIList">
+ <list elementClass="java.net.URI">
+ <!-- Legacy static conf/jboss-service.xml -->
+ <value>${jboss.server.home.url}conf/jboss-service.xml</value>
+ </list>
+ </property>
+ </bean>
+
+ <!-- Scan for deployers -->
+ <bean name="VFSDeployerScanner" class="org.jboss.system.server.profileservice.VFSDeployerScannerImpl">
+ <property name="profileService"><inject bean="ProfileService"/></property>
+ <property name="filterInstance"><inject bean="DeploymentFilter"/></property>
+ <property name="URIList">
+ <list elementClass="java.net.URI">
+ <!-- Directory for deployers -->
+ <value>${jboss.server.home.url}deployers/</value>
+ </list>
+ </property>
+ </bean>
+
+ <!-- Scan for applications -->
+ <bean name="VFSDeploymentScanner" class="org.jboss.system.server.profileservice.VFSDeploymentScannerImpl">
+ <property name="profileService"><inject bean="ProfileService"/></property>
+ <property name="filterInstance"><inject bean="DeploymentFilter"/></property>
+ <property name="URIList">
+ <list elementClass="java.net.URI">
+ <!-- Standard hot deployment directory -->
+ <value>${jboss.server.home.url}deploy/</value>
+ </list>
+ </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>
More information about the jboss-cvs-commits
mailing list