[jboss-cvs] JBossAS SVN: r87009 - in trunk: server/src/etc/conf and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Apr 8 18:01:27 EDT 2009
Author: bstansberry at jboss.com
Date: 2009-04-08 18:01:27 -0400 (Wed, 08 Apr 2009)
New Revision: 87009
Added:
trunk/server/src/etc/conf/all/
trunk/server/src/etc/conf/minimal/
trunk/server/src/etc/conf/minimal/bootstrap.xml
trunk/server/src/etc/conf/minimal/jboss-service.xml
Removed:
trunk/server/src/etc/conf/all/bootstrap-minimal.xml
trunk/server/src/etc/conf/all/jboss-minimal.xml
trunk/server/src/etc/conf/default/
Modified:
trunk/build/build-distr.xml
trunk/build/build.xml
Log:
[JBAS-6757] Reorganize source that populates the server/xxx/conf dir
Modified: trunk/build/build-distr.xml
===================================================================
--- trunk/build/build-distr.xml 2009-04-08 21:57:53 UTC (rev 87008)
+++ trunk/build/build-distr.xml 2009-04-08 22:01:27 UTC (rev 87009)
@@ -518,13 +518,10 @@
<copy file="${_module.output}/resources/jmx-invoker-adaptor/META-INF/jboss-service.xml" tofile="${install.all.deploy}/jmx-invoker-service.xml"/>
- <!-- Copy the default configuration files -->
+ <!-- Copy the "all" configuration files -->
<mkdir dir="${install.server}/all/conf"/>
<copy todir="${install.server}/all/conf" filtering="no">
- <fileset dir="${_module.output}/etc/conf/default">
- <exclude name="bootstrap-minimal.xml"/>
- <exclude name="jboss-minimal.xml"/>
- </fileset>
+ <fileset dir="${_module.output}/etc/conf/all"/>
</copy>
</target>
Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml 2009-04-08 21:57:53 UTC (rev 87008)
+++ trunk/build/build.xml 2009-04-08 22:01:27 UTC (rev 87009)
@@ -705,9 +705,13 @@
</copy>
<!-- 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/default/jndi.properties" overwrite="true"/>
-
+ file="${project.root}/server/output/etc/conf/all/jndi.properties" overwrite="true"/>
+
+
<copy tofile="${install.default}/deployers/clustering-deployer-jboss-beans.xml"
file="${project.root}/cluster/output/etc/clustering-deployer-jboss-beans-non-clustered.xml"/>
@@ -731,10 +735,9 @@
<include name="xmdesc/Log4jService-xmbean.xml"/>
</fileset>
</copy>
- <copy file="${project.root}/server/output/etc/conf/default/bootstrap-minimal.xml"
- tofile="${install.minimal.conf}/bootstrap.xml"/>
- <copy file="${project.root}/server/output/etc/conf/default/jboss-minimal.xml"
- tofile="${install.minimal.conf}/jboss-service.xml"/>
+ <copy todir="${install.minimal.conf}">
+ <fileset dir="${project.root}/server/output/etc/conf/minimal" />
+ </copy>
<copy file="${project.root}/profileservice/output/resources/hdscanner-jboss-beans.xml"
todir="${install.minimal.deploy}" overwrite="true"/>
<copy todir="${install.minimal.lib}">
Copied: trunk/server/src/etc/conf/all (from rev 86994, trunk/server/src/etc/conf/default)
Property changes on: trunk/server/src/etc/conf/all
___________________________________________________________________
Name: svn:mergeinfo
+
Deleted: trunk/server/src/etc/conf/all/bootstrap-minimal.xml
===================================================================
--- trunk/server/src/etc/conf/default/bootstrap-minimal.xml 2009-04-08 20:42:32 UTC (rev 86994)
+++ trunk/server/src/etc/conf/all/bootstrap-minimal.xml 2009-04-08 22:01:27 UTC (rev 87009)
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- The list of URLs for mc beans to load during bootstrap.
- $Id$
--->
-<bootstrap xmlns="urn:jboss:bootstrap:1.0">
-
- <url>bootstrap/classloader.xml</url>
- <url>bootstrap/aop.xml</url>
- <url>bootstrap/jmx.xml</url>
- <url>bootstrap/deployers.xml</url>
- <url>bootstrap/profile.xml</url>
-
-</bootstrap>
Deleted: trunk/server/src/etc/conf/all/jboss-minimal.xml
===================================================================
--- trunk/server/src/etc/conf/default/jboss-minimal.xml 2009-04-08 20:42:32 UTC (rev 86994)
+++ trunk/server/src/etc/conf/all/jboss-minimal.xml 2009-04-08 22:01:27 UTC (rev 87009)
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- $Id$ -->
-
-<!-- ===================================================================== -->
-<!-- A minimal JBoss Server Configuration -->
-<!-- ===================================================================== -->
-
-<server>
-
- <!-- Load all jars from the JBOSS_DIST/server/<config>/lib directory. This
- can be restricted to specific jars by specifying them in the archives
- attribute.
- -->
- <classpath codebase="${jboss.server.lib.url}" archives="*"/>
-
- <!-- ==================================================================== -->
- <!-- Log4j Initialization -->
- <!-- ==================================================================== -->
- <mbean code="org.jboss.logging.Log4jService"
- name="jboss.system:type=Log4jService,service=Logging"
- xmbean-dd="resource:xmdesc/Log4jService-xmbean.xml">
- <attribute name="ConfigurationURL">resource:jboss-log4j.xml</attribute>
- <!-- The value to assign to system property jboss.server.log.threshold
- if it is not already set. This system property in turn controls
- the logging threshold for the server.log file.
- If the system property is already set when this service is created,
- this value is ignored. -->
- <attribute name="DefaultJBossServerLogThreshold">INFO</attribute>
- </mbean>
-
- <!-- A Thread pool service -->
- <mbean code="org.jboss.util.threadpool.BasicThreadPool"
- name="jboss.system:service=ThreadPool">
- <attribute name="Name">JBoss System Threads</attribute>
- <attribute name="ThreadGroupName">System Threads</attribute>
- <!-- How long a thread will live without any tasks in MS -->
- <attribute name="KeepAliveTime">60000</attribute>
- <!-- The max number of threads in the pool -->
- <attribute name="MaximumPoolSize">10</attribute>
- <!-- The max number of tasks before the queue is full -->
- <attribute name="MaximumQueueSize">1000</attribute>
- <!-- The behavior of the pool when a task is added and the queue is full.
- abort - a RuntimeException is thrown
- run - the calling thread executes the task
- wait - the calling thread blocks until the queue has room
- discard - the task is silently discarded without being run
- discardOldest - check to see if a task is about to complete and enque
- the new task if possible, else run the task in the calling thread
- -->
- <attribute name="BlockingMode">run</attribute>
- </mbean>
-
- <!-- ==================================================================== -->
- <!-- JNDI -->
- <!-- ==================================================================== -->
-
- <!-- A simple mbean wrapper around the jndi Naming object. This
- only handles an in memory instance. The NamingService uses this
- as the JNDI store and exposes it remotely.
- -->
- <mbean code="org.jnp.server.NamingBeanImpl"
- name="jboss:service=NamingBeanImpl"
- xmbean-dd="resource:xmdesc/NamingBean-xmbean.xml">
- </mbean>
-
- <mbean code="org.jboss.naming.NamingService"
- name="jboss:service=Naming"
- xmbean-dd="resource:xmdesc/NamingService-xmbean.xml">
- <!-- The call by value mode. true if all lookups are unmarshalled using
- the caller's TCL, false if in VM lookups return the value by reference.
- -->
- <attribute name="CallByValue">false</attribute>
- <!-- The listening port for the bootstrap JNP service. Set this to -1
- to run the NamingService without the JNP invoker listening port.
- -->
- <attribute name="Port">1099</attribute>
- <!-- The bootstrap JNP server bind address. This also sets the default
- RMI service bind address. Empty == all addresses
- -->
- <attribute name="BindAddress">${jboss.bind.address}</attribute>
- <!-- The port of the RMI naming service, 0 == anonymous -->
- <attribute name="RmiPort">1098</attribute>
- <!-- The RMI service bind address. Empty == all addresses
- -->
- <attribute name="RmiBindAddress">${jboss.bind.address}</attribute>
- <!-- The thread pool service used to control the bootstrap lookups -->
- <depends optional-attribute-name="LookupPool"
- proxy-type="attribute">jboss.system:service=ThreadPool</depends>
- <!-- An example of using the unifed invoker as the transport.
- <depends optional-attribute-name="InvokerProxyFactory"
- proxy-type="attribute">jboss:service=proxyFactory,type=unified,target=Naming</depends>
- -->
- <depends optional-attribute-name="Naming"
- proxy-type="attribute">jboss:service=NamingBeanImpl</depends>
- </mbean>
-
-</server>
Copied: trunk/server/src/etc/conf/minimal/bootstrap.xml (from rev 86994, trunk/server/src/etc/conf/default/bootstrap-minimal.xml)
===================================================================
--- trunk/server/src/etc/conf/minimal/bootstrap.xml (rev 0)
+++ trunk/server/src/etc/conf/minimal/bootstrap.xml 2009-04-08 22:01:27 UTC (rev 87009)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ The list of URLs for mc beans to load during bootstrap.
+ $Id$
+-->
+<bootstrap xmlns="urn:jboss:bootstrap:1.0">
+
+ <url>bootstrap/classloader.xml</url>
+ <url>bootstrap/aop.xml</url>
+ <url>bootstrap/jmx.xml</url>
+ <url>bootstrap/deployers.xml</url>
+ <url>bootstrap/profile.xml</url>
+
+</bootstrap>
Property changes on: trunk/server/src/etc/conf/minimal/bootstrap.xml
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:mergeinfo
+
Name: svn:eol-style
+ native
Copied: trunk/server/src/etc/conf/minimal/jboss-service.xml (from rev 86994, trunk/server/src/etc/conf/default/jboss-minimal.xml)
===================================================================
--- trunk/server/src/etc/conf/minimal/jboss-service.xml (rev 0)
+++ trunk/server/src/etc/conf/minimal/jboss-service.xml 2009-04-08 22:01:27 UTC (rev 87009)
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- $Id$ -->
+
+<!-- ===================================================================== -->
+<!-- A minimal JBoss Server Configuration -->
+<!-- ===================================================================== -->
+
+<server>
+
+ <!-- Load all jars from the JBOSS_DIST/server/<config>/lib directory. This
+ can be restricted to specific jars by specifying them in the archives
+ attribute.
+ -->
+ <classpath codebase="${jboss.server.lib.url}" archives="*"/>
+
+ <!-- ==================================================================== -->
+ <!-- Log4j Initialization -->
+ <!-- ==================================================================== -->
+ <mbean code="org.jboss.logging.Log4jService"
+ name="jboss.system:type=Log4jService,service=Logging"
+ xmbean-dd="resource:xmdesc/Log4jService-xmbean.xml">
+ <attribute name="ConfigurationURL">resource:jboss-log4j.xml</attribute>
+ <!-- The value to assign to system property jboss.server.log.threshold
+ if it is not already set. This system property in turn controls
+ the logging threshold for the server.log file.
+ If the system property is already set when this service is created,
+ this value is ignored. -->
+ <attribute name="DefaultJBossServerLogThreshold">INFO</attribute>
+ </mbean>
+
+ <!-- A Thread pool service -->
+ <mbean code="org.jboss.util.threadpool.BasicThreadPool"
+ name="jboss.system:service=ThreadPool">
+ <attribute name="Name">JBoss System Threads</attribute>
+ <attribute name="ThreadGroupName">System Threads</attribute>
+ <!-- How long a thread will live without any tasks in MS -->
+ <attribute name="KeepAliveTime">60000</attribute>
+ <!-- The max number of threads in the pool -->
+ <attribute name="MaximumPoolSize">10</attribute>
+ <!-- The max number of tasks before the queue is full -->
+ <attribute name="MaximumQueueSize">1000</attribute>
+ <!-- The behavior of the pool when a task is added and the queue is full.
+ abort - a RuntimeException is thrown
+ run - the calling thread executes the task
+ wait - the calling thread blocks until the queue has room
+ discard - the task is silently discarded without being run
+ discardOldest - check to see if a task is about to complete and enque
+ the new task if possible, else run the task in the calling thread
+ -->
+ <attribute name="BlockingMode">run</attribute>
+ </mbean>
+
+ <!-- ==================================================================== -->
+ <!-- JNDI -->
+ <!-- ==================================================================== -->
+
+ <!-- A simple mbean wrapper around the jndi Naming object. This
+ only handles an in memory instance. The NamingService uses this
+ as the JNDI store and exposes it remotely.
+ -->
+ <mbean code="org.jnp.server.NamingBeanImpl"
+ name="jboss:service=NamingBeanImpl"
+ xmbean-dd="resource:xmdesc/NamingBean-xmbean.xml">
+ </mbean>
+
+ <mbean code="org.jboss.naming.NamingService"
+ name="jboss:service=Naming"
+ xmbean-dd="resource:xmdesc/NamingService-xmbean.xml">
+ <!-- The call by value mode. true if all lookups are unmarshalled using
+ the caller's TCL, false if in VM lookups return the value by reference.
+ -->
+ <attribute name="CallByValue">false</attribute>
+ <!-- The listening port for the bootstrap JNP service. Set this to -1
+ to run the NamingService without the JNP invoker listening port.
+ -->
+ <attribute name="Port">1099</attribute>
+ <!-- The bootstrap JNP server bind address. This also sets the default
+ RMI service bind address. Empty == all addresses
+ -->
+ <attribute name="BindAddress">${jboss.bind.address}</attribute>
+ <!-- The port of the RMI naming service, 0 == anonymous -->
+ <attribute name="RmiPort">1098</attribute>
+ <!-- The RMI service bind address. Empty == all addresses
+ -->
+ <attribute name="RmiBindAddress">${jboss.bind.address}</attribute>
+ <!-- The thread pool service used to control the bootstrap lookups -->
+ <depends optional-attribute-name="LookupPool"
+ proxy-type="attribute">jboss.system:service=ThreadPool</depends>
+ <!-- An example of using the unifed invoker as the transport.
+ <depends optional-attribute-name="InvokerProxyFactory"
+ proxy-type="attribute">jboss:service=proxyFactory,type=unified,target=Naming</depends>
+ -->
+ <depends optional-attribute-name="Naming"
+ proxy-type="attribute">jboss:service=NamingBeanImpl</depends>
+ </mbean>
+
+</server>
Property changes on: trunk/server/src/etc/conf/minimal/jboss-service.xml
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:mergeinfo
+
Name: svn:eol-style
+ native
More information about the jboss-cvs-commits
mailing list