[jboss-cvs] JBossAS SVN: r87023 - in trunk: server/src/etc/conf/all/bootstrap and 4 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Apr 8 21:48:12 EDT 2009
Author: bstansberry at jboss.com
Date: 2009-04-08 21:48:12 -0400 (Wed, 08 Apr 2009)
New Revision: 87023
Removed:
trunk/testsuite/src/resources/test-configs/cluster-profilesvc-0/conf/
trunk/testsuite/src/resources/test-configs/cluster-profilesvc-0/deploy/cluster/farm-deployment-jboss-beans.xml
trunk/testsuite/src/resources/test-configs/cluster-profilesvc-1/conf/
trunk/testsuite/src/resources/test-configs/cluster-profilesvc-1/deploy/cluster/farm-deployment-jboss-beans.xml
Modified:
trunk/build/build-distr.xml
trunk/build/build.xml
trunk/server/src/etc/conf/all/bootstrap/profile.xml
Log:
[JBAS-6757] Further reorganize source that populates the server/xxx/conf dir
[JBAS-5552] Use clustered repo in "all" config
Modified: trunk/build/build-distr.xml
===================================================================
--- trunk/build/build-distr.xml 2009-04-09 01:46:26 UTC (rev 87022)
+++ trunk/build/build-distr.xml 2009-04-09 01:48:12 UTC (rev 87023)
@@ -855,6 +855,7 @@
<include name="hajndi-jboss-beans.xml"/>
<include name="ha-legacy-jboss-beans.xml"/>
<include name="timestamps-jboss-beans.xml"/>
+ <include name="farm-deployment-jboss-beans.xml"/>
</fileset>
</copy>
<mkdir dir="${install.server}/all/deploy/cluster/jgroups-channelfactory.sar"/>
@@ -871,22 +872,16 @@
</copy>
<mkdir dir="${install.server}/all/deploy-hasingleton"/>
<mkdir dir="${install.server}/all/deploy/deploy.last"/>
- <!--
- <copy todir="${install.server}/all/deploy/deploy.last" filtering="no">
- <fileset dir="${_module.output}/etc">
- <include name="farm-jboss-beans.xml"/>
- </fileset>
- </copy>
- <!- - Copy the farmed deployables - ->
+ <!-- Copy the farmed deployables -->
<mkdir dir="${install.server}/all/farm"/>
<copy todir="${install.server}/all/farm" filtering="no">
- <fileset dir="${_module.output}/etc">
- <include name="cluster-examples-service.xml"/>
- </fileset>
+ <fileset dir="${_module.output}/etc">
+ <include name="cluster-examples-service.xml"/>
+ </fileset>
</copy>
- -->
+
</target>
<target name="_module-cluster-all" depends="_module-cluster-most">
Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml 2009-04-09 01:46:26 UTC (rev 87022)
+++ trunk/build/build.xml 2009-04-09 01:48:12 UTC (rev 87023)
@@ -706,8 +706,8 @@
<!-- leave the empty default/lib directory there -->
<mkdir dir="${install.default.lib}"/>
- <copy todir="${install.minimal.conf}">
- <fileset dir="${project.root}/server/output/etc/conf/default" />
+ <copy todir="${install.default.conf}" overwrite="true">
+ <fileset dir="${project.root}/server/output/etc/conf/default"/>
</copy>
<copy tofile="${install.default}/deployers/clustering-deployer-jboss-beans.xml"
Modified: trunk/server/src/etc/conf/all/bootstrap/profile.xml
===================================================================
--- trunk/server/src/etc/conf/all/bootstrap/profile.xml 2009-04-09 01:46:26 UTC (rev 87022)
+++ trunk/server/src/etc/conf/all/bootstrap/profile.xml 2009-04-09 01:48:12 UTC (rev 87023)
@@ -12,23 +12,32 @@
<root>${jboss.lib.url}jboss-profileservice-spi.jar</root>
</classloader>
- <!--
- The profile configuration
- This contains required properties:
- The uri to jboss-service.xml.
- The uri to the deployers folder.
- A list of uris to deploy folders. -->
- <bean name="BootstrapProfileFactory" class="org.jboss.system.server.profileservice.repository.StaticProfileFactory">
- <property name="bootstrapURI">${jboss.server.home.url}conf/jboss-service.xml</property>
- <property name="deployersURI">${jboss.server.home.url}deployers</property>
- <property name="applicationURIs">
- <list elementClass="java.net.URI">
- <value>${jboss.server.home.url}deploy</value>
- </list>
- </property>
- <property name="attachmentStoreRoot">${jboss.server.data.dir}/attachments</property>
- <property name="profileFactory"><inject bean="ProfileFactory" /></property>
- </bean>
+ <!--
+ The profile configuration
+ This contains required properties:
+ The uri to jboss-service.xml.
+ The uri to the deployers folder.
+ A list of uris to deploy folders. -->
+ <bean name="BootstrapProfileFactory" class="org.jboss.system.server.profileservice.StaticClusteredProfileFactory">
+ <property name="bootstrapURI">${jboss.server.home.url}conf/jboss-service.xml</property>
+ <property name="deployersURI">${jboss.server.home.url}deployers</property>
+ <property name="applicationURIs">
+ <list elementClass="java.net.URI">
+ <value>${jboss.server.home.url}deploy</value>
+ </list>
+ </property>
+ <!-- Optional list of URIs that will be kept in sync across the cluster.
+ Requires deploy/cluster/farm-deployment-jboss-beans.xml to be
+ deployed as well.
+ -->
+ <property name="farmURIs">
+ <list elementClass="java.net.URI">
+ <value>${jboss.server.home.url}farm</value>
+ </list>
+ </property>
+ <property name="attachmentStoreRoot">${jboss.server.data.dir}/attachments</property>
+ <property name="profileFactory"><inject bean="ProfileFactory" /></property>
+ </bean>
<!-- The default profile key -->
<bean name="DefaultProfileKey" class="org.jboss.profileservice.spi.ProfileKey">
@@ -91,6 +100,36 @@
<property name="checker"><inject bean="StructureModificationChecker" /></property>
</bean>
+ <!-- The clustered deployment repository factory -->
+ <bean name="ClusteredDeploymentRepositoryFactory" class="org.jboss.system.server.profileservice.repository.clustered.ClusteredDeploymentRepositoryFactory">
+ <property name="deploymentFilter"><inject bean="DeploymentFilter" /></property>
+ <property name="checker"><inject bean="StructureModificationChecker" /></property>
+ <!-- Accept any RepositoryClusteringHandler -->
+ <incallback method="addRepositoryClusteringHandler" />
+ <uncallback method="removeRepositoryClusteringHandler" />
+ <!-- Accept any LocalContentManagerFactory -->
+ <incallback method="addLocalContentManagerFactory" />
+ <uncallback method="removeLocalContentManagerFactory" />
+ </bean>
+
+ <!-- Handles persistence of metadata about clustered DeploymentRepository content -->
+ <bean name="ClusteredDeploymentRepositoryMetadataPersister"
+ class="org.jboss.system.server.profileservice.repository.clustered.local.JAXBRepositoryContentMetadataPersister">
+ <constructor>
+ <!-- Here we use the constructor version that takes the Server impl and
+ uses it to find the data dir. You could alternatively use a version
+ that takes a URI or a File. -->
+ <parameter><inject bean="JBossServer"/></parameter>
+ </constructor>
+ </bean>
+
+ <!-- Factory for manager of local persistence of clustered DeploymentRepository content -->
+ <bean name="FilesystemLocalContentManagerFactory"
+ class="org.jboss.system.server.profileservice.repository.clustered.local.file.FilesystemLocalContentManagerFactory">
+ <property name="metadataPersister"><inject bean="ClusteredDeploymentRepositoryMetadataPersister"/></property>
+ <property name="tempDirURI">${jboss.server.home.url}temp${/}cluster-repo</property>
+ </bean>
+
<!-- The attachment store -->
<bean name="AttachmentStore" class="org.jboss.system.server.profileservice.repository.AbstractAttachmentStore">
<constructor><parameter><inject bean="BootstrapProfileFactory" property="attachmentStoreRoot" /></parameter></constructor>
Deleted: trunk/testsuite/src/resources/test-configs/cluster-profilesvc-0/deploy/cluster/farm-deployment-jboss-beans.xml
===================================================================
--- trunk/testsuite/src/resources/test-configs/cluster-profilesvc-0/deploy/cluster/farm-deployment-jboss-beans.xml 2009-04-09 01:46:26 UTC (rev 87022)
+++ trunk/testsuite/src/resources/test-configs/cluster-profilesvc-0/deploy/cluster/farm-deployment-jboss-beans.xml 2009-04-09 01:48:12 UTC (rev 87023)
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <bean name="FarmProfileRepositoryClusteringHandler"
- class="org.jboss.profileservice.cluster.repository.DefaultRepositoryClusteringHandler">
-
- <property name="partition"><inject bean="HAPartition"/></property>
- <property name="profileName">farm</property>
- <property name="synchronizationPolicy"><inject bean="FarmProfileSynchronizationPolicy"/></property>
- </bean>
-
- <bean name="FarmProfileSynchronizationPolicy"
- class="org.jboss.profileservice.cluster.repository.DefaultSynchronizationPolicy">
- <property name="timestampService"><inject bean="TimestampDiscrepancyService"/></property>
- </bean>
-
-</deployment>
Deleted: trunk/testsuite/src/resources/test-configs/cluster-profilesvc-1/deploy/cluster/farm-deployment-jboss-beans.xml
===================================================================
--- trunk/testsuite/src/resources/test-configs/cluster-profilesvc-1/deploy/cluster/farm-deployment-jboss-beans.xml 2009-04-09 01:46:26 UTC (rev 87022)
+++ trunk/testsuite/src/resources/test-configs/cluster-profilesvc-1/deploy/cluster/farm-deployment-jboss-beans.xml 2009-04-09 01:48:12 UTC (rev 87023)
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <bean name="FarmProfileRepositoryClusteringHandler"
- class="org.jboss.profileservice.cluster.repository.DefaultRepositoryClusteringHandler">
-
- <property name="partition"><inject bean="HAPartition"/></property>
- <property name="profileName">farm</property>
- <property name="synchronizationPolicy"><inject bean="FarmProfileSynchronizationPolicy"/></property>
- </bean>
-
- <bean name="FarmProfileSynchronizationPolicy"
- class="org.jboss.profileservice.cluster.repository.DefaultSynchronizationPolicy">
- <property name="timestampService"><inject bean="TimestampDiscrepancyService"/></property>
- </bean>
-
-</deployment>
More information about the jboss-cvs-commits
mailing list