[jboss-cvs] JBossAS SVN: r87014 - in trunk: server/src/etc/conf and 3 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Wed Apr 8 18:18:24 EDT 2009 

Author: bstansberry at jboss.com
Date: 2009-04-08 18:18:24 -0400 (Wed, 08 Apr 2009)
New Revision: 87014

Added:
   trunk/server/src/etc/conf/default/
   trunk/server/src/etc/conf/default/bootstrap/
   trunk/server/src/etc/conf/default/bootstrap/profile.xml
   trunk/server/src/etc/conf/default/jndi.properties
Removed:
   trunk/server/src/etc/conf/all/jndi.properties
Modified:
   trunk/build/build.xml
Log:
[JBAS-6757] Further reorganize source that populates the server/xxx/conf dir

Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml	2009-04-08 22:06:46 UTC (rev 87013)
+++ trunk/build/build.xml	2009-04-08 22:18:24 UTC (rev 87014)
@@ -706,11 +706,9 @@
     <!-- leave the empty default/lib directory there --> 
     <mkdir dir="${install.default.lib}"/>
   	
-  	 <!-- BES 2009/04/08 this looks like cruft as this file should already
-  	      be there -->
-    <copy todir="${install.default.conf}"
-          file="${project.root}/server/output/etc/conf/all/jndi.properties" overwrite="true"/>
-    
+    <copy todir="${install.minimal.conf}">
+      <fileset dir="${project.root}/server/output/etc/conf/default" /> 
+    </copy>
   	
     <copy tofile="${install.default}/deployers/clustering-deployer-jboss-beans.xml"
           file="${project.root}/cluster/output/etc/clustering-deployer-jboss-beans-non-clustered.xml"/>

Deleted: trunk/server/src/etc/conf/all/jndi.properties
===================================================================
--- trunk/server/src/etc/conf/all/jndi.properties	2009-04-08 22:06:46 UTC (rev 87013)
+++ trunk/server/src/etc/conf/all/jndi.properties	2009-04-08 22:18:24 UTC (rev 87014)
@@ -1,4 +0,0 @@
-# DO NOT EDIT THIS FILE UNLESS YOU KNOW WHAT YOU ARE DOING
-#
-java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
-java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces

Added: trunk/server/src/etc/conf/default/bootstrap/profile.xml
===================================================================
--- trunk/server/src/etc/conf/default/bootstrap/profile.xml	                        (rev 0)
+++ trunk/server/src/etc/conf/default/bootstrap/profile.xml	2009-04-08 22:18:24 UTC (rev 87014)
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+   The profile service
+   $Id: profile.xml 86739 2009-04-03 12:05:06Z emuckenhuber $
+-->
+<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">
+		<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 default profile key -->
+	<bean name="DefaultProfileKey" class="org.jboss.profileservice.spi.ProfileKey">
+		<constructor><parameter>${jboss.server.name}</parameter></constructor>
+	</bean>
+
+	<!-- The ProfileService -->
+	<bean name="ProfileService" class="org.jboss.system.server.profileservice.repository.AbstractProfileService">
+		<constructor><parameter><inject bean="jboss.kernel:service=KernelController" /></parameter></constructor>
+		<property name="deployer"><inject bean="ProfileServiceDeployer" /></property>
+		<property name="defaultProfile"><inject bean="DefaultProfileKey" /></property>
+	</bean>
+
+	<!-- The Bootstrap implementation that loads the Profile from the ProfileService -->
+	<bean name="ProfileServiceBootstrap" class="org.jboss.system.server.profileservice.ProfileServiceBootstrap">
+		<property name="profileKey"><inject bean="DefaultProfileKey" /></property>
+		<property name="mainDeployer"><inject bean="MainDeployer" /></property>
+		<property name="profileService"><inject bean="ProfileService" /></property>
+		<property name="mof"><inject bean="ManagedObjectFactory" /></property>
+		<property name="mgtDeploymentCreator"><inject bean="ManagedDeploymentCreator" /></property>
+		<property name="bootstrapProfileFactory"><inject bean="BootstrapProfileFactory" /></property>
+		<property name="configurator"><inject bean="jboss.kernel:service=Kernel" property="configurator"/></property>
+	</bean>
+
+	<!-- The profile factory -->
+	<bean name="ProfileFactory" class="org.jboss.system.server.profileservice.repository.TypedProfileFactory">
+		<!-- Accept any AbstractprofileFactory -->
+		<incallback method="addProfileFactory" />
+		<uncallback method="removeProfileFactory" />
+	</bean>
+
+	<!-- The profile repository factory -->
+	<bean name="ProfileRepositoryFactory" class="org.jboss.system.server.profileservice.repository.TypedProfileRepository">
+		<!-- Accept any DeploymentRepositoryFactory -->
+		<incallback method="addRepositoryFactory" />
+		<uncallback method="removeRepositoryFactory" />
+	</bean>
+
+  <!-- The structure modification cache and checker -->
+  <bean name="StructureModCache" class="org.jboss.deployers.vfs.spi.structure.modified.DefaultStructureCache">
+    <destroy method="flush"/>
+  </bean>
+
+  <bean name="StructureModificationChecker" class="org.jboss.deployers.vfs.spi.structure.modified.MetaDataStructureModificationChecker">
+    <constructor>
+      <parameter><inject bean="MainDeployer" /></parameter>
+    </constructor>
+    <property name="cache"><inject bean="StructureModCache" /></property>
+    <property name="filter"><bean class="org.jboss.system.server.profile.basic.XmlIncludeVirtualFileFilter" /></property>
+  </bean>
+
+	<bean name="BasicProfileFactory" class="org.jboss.system.server.profileservice.repository.BasicProfileFactory">
+		<property name="profileRepository"><inject bean="ProfileRepositoryFactory" /></property>
+	</bean>
+	<bean name="FilteredProfileFactory" class="org.jboss.system.server.profileservice.repository.FilteredProfileFactory"/>
+
+	<!-- The default deployment repository factory -->
+	<bean name="DefaultDeploymentRepositoryFactory" class="org.jboss.system.server.profileservice.repository.DefaultDeploymentRepositoryFactory">
+		<property name="deploymentFilter"><inject bean="DeploymentFilter" /></property>
+		<property name="checker"><inject bean="StructureModificationChecker" /></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>
+		<property name="mainDeployer"><inject bean="MainDeployer" /></property>
+		<property name="serializer"><inject bean="AttachmentsSerializer" /></property>
+		<property name="metaDataFilter"><bean class="org.jboss.system.server.profile.basic.XmlIncludeVirtualFileFilter" /></property>
+	</bean>
+
+	<bean name="AttachmentsSerializer" class="org.jboss.system.server.profileservice.repository.JAXBAttachmentSerializer">
+		<constructor><parameter><inject bean="BootstrapProfileFactory" property="attachmentStoreRoot" /></parameter></constructor>
+	</bean>
+
+	<bean name="ProfileServiceDeployer" class="org.jboss.system.server.profileservice.repository.MainDeployerAdapter">
+		<property name="mainDeployer"><inject bean="MainDeployer" /></property>
+		<property name="attachmentStore"><inject bean="AttachmentStore" /></property>
+	</bean>
+
+   <bean name="ProfileServicePersistenceDeployer" class="org.jboss.system.server.profileservice.persistence.deployer.ProfileServicePersistenceDeployer" />
+
+	<!-- 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>
\ No newline at end of file


Property changes on: trunk/server/src/etc/conf/default/bootstrap/profile.xml
___________________________________________________________________
Name: svn:keywords
   + 

Copied: trunk/server/src/etc/conf/default/jndi.properties (from rev 87009, trunk/server/src/etc/conf/all/jndi.properties)
===================================================================
--- trunk/server/src/etc/conf/default/jndi.properties	                        (rev 0)
+++ trunk/server/src/etc/conf/default/jndi.properties	2009-04-08 22:18:24 UTC (rev 87014)
@@ -0,0 +1,4 @@
+# DO NOT EDIT THIS FILE UNLESS YOU KNOW WHAT YOU ARE DOING
+#
+java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
+java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces


Property changes on: trunk/server/src/etc/conf/default/jndi.properties
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:mergeinfo
   + 
Name: svn:eol-style
   + native

More information about the jboss-cvs-commits mailing list