[jboss-cvs] JBossAS SVN: r81277 - in trunk: server/src/etc/conf/default and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Nov 19 04:54:10 EST 2008
Author: dimitris at jboss.org
Date: 2008-11-19 04:54:09 -0500 (Wed, 19 Nov 2008)
New Revision: 81277
Added:
trunk/server/src/etc/conf/default/bootstrap/
trunk/server/src/etc/conf/default/bootstrap/aop.xml
trunk/server/src/etc/conf/default/bootstrap/bindings.xml
trunk/server/src/etc/conf/default/bootstrap/classloader.xml
trunk/server/src/etc/conf/default/bootstrap/deployers.xml
trunk/server/src/etc/conf/default/bootstrap/jmx.xml
trunk/server/src/etc/conf/default/bootstrap/profile-repository.xml
trunk/server/src/etc/conf/default/bootstrap/profile.xml
trunk/server/src/etc/conf/default/bootstrap/security.xml
trunk/server/src/etc/conf/default/bootstrap/vfs.xml
Removed:
trunk/server/src/etc/conf/default/aop.xml
trunk/server/src/etc/conf/default/bindings.xml
trunk/server/src/etc/conf/default/classloader.xml
trunk/server/src/etc/conf/default/deployers.xml
trunk/server/src/etc/conf/default/jmx.xml
trunk/server/src/etc/conf/default/profile-repository.xml
trunk/server/src/etc/conf/default/profile.xml
trunk/server/src/etc/conf/default/security.xml
trunk/server/src/etc/conf/default/vfs.xml
Modified:
trunk/build/build.xml
trunk/server/src/etc/conf/default/bootstrap-minimal.xml
trunk/server/src/etc/conf/default/bootstrap-norepo.xml
trunk/server/src/etc/conf/default/bootstrap.xml
trunk/server/src/etc/conf/default/jboss-minimal.xml
trunk/server/src/etc/conf/default/jboss-service.xml
Log:
tidy up all the bootstrap beans in their own conf/bootstrap directory and reference them from there.
Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml 2008-11-19 09:19:41 UTC (rev 81276)
+++ trunk/build/build.xml 2008-11-19 09:54:09 UTC (rev 81277)
@@ -760,16 +760,16 @@
<mkdir dir="${install.minimal.deployers}"/>
<copy todir="${install.minimal.conf}">
<fileset dir="${install.default.conf}">
- <include name="jndi.properties" />
- <include name="jboss-log4j.xml" />
- <include name="aop.xml" />
- <include name="classloader.xml" />
- <include name="deployers.xml" />
- <include name="jmx.xml" />
- <include name="profile.xml" />
- <include name="Log4jService-xmbean.xml" />
- <include name="xmdesc/NamingBean-xmbean.xml" />
- <include name="xmdesc/NamingService-xmbean.xml" />
+ <include name="jndi.properties"/>
+ <include name="jboss-log4j.xml"/>
+ <include name="bootstrap/classloader.xml"/>
+ <include name="bootstrap/aop.xml"/>
+ <include name="bootstrap/jmx.xml"/>
+ <include name="bootstrap/deployers.xml"/>
+ <include name="bootstrap/profile.xml"/>
+ <include name="xmdesc/NamingBean-xmbean.xml"/>
+ <include name="xmdesc/NamingService-xmbean.xml"/>
+ <include name="xmdesc/Log4jService-xmbean.xml"/>
</fileset>
</copy>
<copy file="${install.default.conf}/bootstrap-minimal.xml"
Deleted: trunk/server/src/etc/conf/default/aop.xml
===================================================================
--- trunk/server/src/etc/conf/default/aop.xml 2008-11-19 09:19:41 UTC (rev 81276)
+++ trunk/server/src/etc/conf/default/aop.xml 2008-11-19 09:54:09 UTC (rev 81277)
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- AOP configuration
--->
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <classloader><inject bean="aop-classloader:0.0.0"/></classloader>
-
- <classloader name="aop-classloader" xmlns="urn:jboss:classloader:1.0" export-all="NON_EMPTY" import-all="true">
- <root>${jboss.lib.url}jboss-aop-asintegration-core.jar</root>
- <root>${jboss.lib.url}jboss-aop-asintegration-jmx.jar</root>
- <root>${jboss.lib.url}jboss-aop-asintegration-mc.jar</root>
- <root>${jboss.lib.url}jboss-aop-jboss5.jar</root>
- </classloader>
-
- <!-- Integration -->
- <bean name="AOPJBossIntegration" class="org.jboss.aop.asintegration.jboss5.JBoss5Integration"/>
-
- <bean name="DefaultAspectManager" class="org.jboss.aop.microcontainer.beans.metadata.DefaultAspectManager">
- <property name="managerBean">AspectManager</property>
- <property name="managerProperty">aspectManager</property>
- </bean>
-
-
- <!--
- Valid values for the AspectManager bean for use with enableTransformer=true are:
- * org.jboss.aop.deployers.AspectManagerJDK5 - works with the -javaagent:pluggable-instrumentor.jar switch
- * org.jboss.aop.deployers.AspectManagerJRockit - works with JRockit and the -Xmanagement:class=org.jboss.aop.hook.JRockitPluggableClassPreProcessor switch
- -->
- <bean name="AspectManager" class="org.jboss.aop.deployers.AspectManagerJDK5">
- <constructor>
- <parameter><![CDATA[
- <aop>
- <aspect name="mainDeployer" class="org.jboss.profileservice.aop.MainDeployerAspect"/>
- <bind pointcut="execution(* $instanceof{org.jboss.deployers.spi.deployment.MainDeployer}->process(..))">
- <advice name="process" aspect="mainDeployer"/>
- </bind>
- <aspect name="persist" class="org.jboss.profileservice.aop.PersistAspect"/>
- <bind pointcut="execution(* $instanceof{org.jboss.managed.api.ManagedProperty}->setValue(..))">
- <advice name="setValue" aspect="persist"/>
- </bind>
- </aop>]]>
- </parameter>
- </constructor>
-
- <property name="jbossIntegration"><inject bean="AOPJBossIntegration"/></property>
-
- <property name="enableLoadtimeWeaving">false</property>
- <!-- only relevant when EnableLoadtimeWeaving is true.
- When transformer is on, every loaded class gets
- transformed. If AOP can't find the class, then it
- throws an exception. Sometimes, classes may not have
- all the classes they reference. So, the Suppressing
- is needed. (i.e. Jboss cache in the default configuration -->
- <property name="suppressTransformationErrors">true</property>
- <property name="prune">true</property>
- <property name="include">org.jboss.test., org.jboss.injbossaop.</property>
- <property name="exclude">org.jboss.</property>
- <!-- This avoids instrumentation of hibernate cglib enhanced proxies
- <property name="ignore">*$$EnhancerByCGLIB$$*</property> -->
- <property name="optimized">true</property>
- <property name="verbose">false</property>
- <!--
- Available choices for this attribute are:
- org.jboss.aop.instrument.ClassicInstrumentor (default)
- org.jboss.aop.instrument.GeneratedAdvisorInstrumentor
- <property name="instrumentor">org.jboss.aop.instrument.ClassicInstrumentor</property>
- -->
- <!--
- By default the deployment of the aspects contained in
- ../deployers/jboss-aop-jboss5.deployer/base-aspects.xml
- are not deployed. To turn on deployment uncomment this property
- <property name="useBaseXml">true</property>
- -->
- </bean>
-
- <!-- Support for @JMX -->
- <lifecycle-configure xmlns="urn:jboss:aop-beans:1.0"
- name="JMXRegistrationAdvice"
- class="org.jboss.system.microcontainer.jmx.ServiceControllerRegistrationLifecycleCallback"
- classes="@org.jboss.aop.microcontainer.aspects.jmx.JMX"
- manager-bean="AspectManager"
- manager-property="aspectManager">
- <property name="serviceController"><inject bean="JMXKernel" property="serviceController"/></property>
- </lifecycle-configure>
- <lifecycle-create xmlns="urn:jboss:aop-beans:1.0"
- name="JMXCreateDestroyAdvice"
- class="org.jboss.system.microcontainer.jmx.ServiceControllerCreateDestroyLifecycleCallback"
- classes="@org.jboss.aop.microcontainer.aspects.jmx.JMX"
- manager-bean="AspectManager"
- manager-property="aspectManager">
- <property name="serviceController"><inject bean="JMXKernel" property="serviceController"/></property>
- </lifecycle-create>
- <lifecycle-install xmlns="urn:jboss:aop-beans:1.0"
- name="JMXStartStopAdvice"
- class="org.jboss.system.microcontainer.jmx.ServiceControllerStartStopLifecycleCallback"
- classes="@org.jboss.aop.microcontainer.aspects.jmx.JMX"
- manager-bean="AspectManager"
- manager-property="aspectManager">
- <property name="serviceController"><inject bean="JMXKernel" property="serviceController"/></property>
- </lifecycle-install>
-
- <!-- MBean for making sure that the underlying AspectManagerService gets registered in JMX -->
- <bean name="AspectManagerJMXRegistrar" class="org.jboss.aop.deployers.AspectManagerJMXRegistrar">
- <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property>
- <property name="aspectManager"><inject bean="AspectManager" property="delegate"/></property>
- </bean>
-
-</deployment>
Deleted: trunk/server/src/etc/conf/default/bindings.xml
===================================================================
--- trunk/server/src/etc/conf/default/bindings.xml 2008-11-19 09:19:41 UTC (rev 81276)
+++ trunk/server/src/etc/conf/default/bindings.xml 2008-11-19 09:54:09 UTC (rev 81277)
@@ -1,453 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <classloader><inject bean="bindings-classloader:0.0.0"/></classloader>
-
- <classloader name="bindings-classloader" xmlns="urn:jboss:classloader:1.0" export-all="NON_EMPTY" import-all="true">
- <root>${jboss.common.lib.url}jboss-bindingservice.jar</root>
- </classloader>
-
- <bean name="ServiceBindingManager" class="org.jboss.services.binding.ServiceBindingManager">
-
- <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.system:service=ServiceBindingManager", exposedInterface=org.jboss.services.binding.ServiceBindingManagerMBean.class, registerDirectly=true)</annotation>
-
- <constructor>
- <!-- The set of bindings to use for this server -->
- <parameter>${jboss.service.binding.set:ports-default}</parameter>
-
- <!-- The named sets of bindings -->
- <parameter>
- <bean name="ServiceBindingStore" class="org.jboss.services.binding.impl.PojoServiceBindingStore">
-
- <constructor>
- <parameter>
- <map keyClass="java.lang.String" valueClass="java.util.Set">
- <entry>
- <key>ports-default</key>
- <value><inject bean="PortsDefaultBindings"/></value>
- </entry>
- <entry>
- <key>ports-01</key>
- <value><inject bean="Ports01Bindings"/></value>
- </entry>
- <entry>
- <key>ports-02</key>
- <value><inject bean="Ports02Bindings"/></value>
- </entry>
- </map>
- </parameter>
- </constructor>
- </bean>
- </parameter>
- </constructor>
-
- </bean>
-
- <!-- The default bindings -->
- <bean name="PortsDefaultBindings" class="org.jboss.services.binding.impl.ServiceBindingSet">
-
- <constructor>
- <parameter>
- <set>
- <!-- ********************* conf/jboss-service.xml ****************** -->
-
- <!-- Naming Service -->
- <bean class="org.jboss.services.binding.ServiceBinding">
- <constructor>
- <parameter>jboss:service=Naming</parameter>
- <parameter>Port</parameter>
- <parameter>${jboss.bind.address}</parameter>
- <parameter>1099</parameter>
- </constructor>
- </bean>
-
- <bean class="org.jboss.services.binding.ServiceBinding">
- <constructor>
- <parameter>jboss:service=Naming</parameter>
- <parameter>RmiPort</parameter>
- <parameter>${jboss.bind.address}</parameter>
- <parameter>1098</parameter>
- </constructor>
- </bean>
-
- <!-- Remote classloading service -->
- <bean class="org.jboss.services.binding.ServiceBinding">
- <constructor>
- <parameter>jboss:service=WebService</parameter>
- <parameter>${jboss.bind.address}</parameter>
- <parameter>8083</parameter>
- </constructor>
- </bean>
-
- <!-- Remoting Connector -->
- <bean class="org.jboss.services.binding.ServiceBinding">
- <constructor>
- <parameter>UnifiedInvokerConnector</parameter>
- <parameter>${jboss.bind.address}</parameter>
- <parameter>4446</parameter>
- </constructor>
- </bean>
-
- <!-- Used to create a multihome Remoting server. See -->
- <!-- deploy/remoting-jboss-beans.xml for more details. -->
- <!--bean class="org.jboss.services.binding.ServiceBinding">
- <constructor>
- <parameter>UnifiedInvokerConnector:bindingHome1</parameter>
- <parameter>192.168.2.2</parameter>
- <parameter>7777</parameter>
- </constructor>
- </bean-->
-
- <!-- Used to create a multihome Remoting server. See -->
- <!-- deploy/remoting-jboss-beans.xml for more details. -->
- <!--bean class="org.jboss.services.binding.ServiceBinding">
- <constructor>
- <parameter>UnifiedInvokerConnector:bindingHome2</parameter>
- <parameter>10.11.12.238</parameter>
- <parameter>8888</parameter>
- </constructor>
- </bean-->
-
- <!-- ********************* deploy/remoting-service.xml ****************** -->
-
- <!-- RMI/JRMP invoker -->
- <bean class="org.jboss.services.binding.ServiceBinding">
- <constructor>
- <parameter>jboss:service=invoker,type=jrmp</parameter>
- <parameter>${jboss.bind.address}</parameter>
- <parameter>4444</parameter>
- </constructor>
- </bean>
-
- <!-- Pooled invoker -->
- <bean class="org.jboss.services.binding.ServiceBinding">
- <constructor>
- <parameter>jboss:service=invoker,type=pooled</parameter>
- <parameter>${jboss.bind.address}</parameter>
- <parameter>4445</parameter>
- </constructor>
- </bean>
-
- <!-- ********************* deploy/cluster/hajndi-service.xml ****************** -->
-
- <bean class="org.jboss.services.binding.ServiceBinding">
- <constructor>
- <parameter>jboss:service=HAJNDI</parameter>
- <parameter>Port</parameter>
- <parameter>${jboss.bind.address}</parameter>
- <parameter>1100</parameter>
- </constructor>
- </bean>
-
- <bean class="org.jboss.services.binding.ServiceBinding">
- <constructor>
- <parameter>jboss:service=HAJNDI</parameter>
- <parameter>RmiPort</parameter>
- <parameter>${jboss.bind.address}</parameter>
- <parameter>1101</parameter>
- </constructor>
- </bean>
-
- <!-- ********************* deploy/cluster/ha-legacy-service.xml ****************** -->
-
- <!-- HA RMI/JRMP invoker -->
- <bean class="org.jboss.services.binding.ServiceBinding">
- <constructor>
- <parameter>jboss:service=invoker,type=jrmpha</parameter>
- <parameter>${jboss.bind.address}</parameter>
- <parameter>4447</parameter>
- </constructor>
- </bean>
-
- <!-- HA Pooled invoker -->
- <bean class="org.jboss.services.binding.ServiceBinding">
- <constructor>
- <parameter>jboss:service=invoker,type=pooledha</parameter>
- <parameter>${jboss.bind.address}</parameter>
- <parameter>4448</parameter>
- </constructor>
- </bean>
-
- <!-- ********************* deploy/iiop-service.xml ****************** -->
-
- <bean class="org.jboss.services.binding.ServiceBinding">
- <constructor>
- <parameter>jboss:service=CorbaORB</parameter>
- <parameter>${jboss.bind.address}</parameter>
- <parameter>3528</parameter>
- </constructor>
- </bean>
-
- <!-- ********************* deploy/snmp-adaptor.sar **************** -->
-
- <!-- Trap receiver that acts as an SNMP Manager -->
- <bean class="org.jboss.services.binding.ServiceBinding">
- <constructor>
- <parameter>jboss.jmx:name=SnmpAgent,service=trapd,type=logger</parameter>
- <parameter>${jboss.bind.address}</parameter>
- <parameter>1162</parameter>
- </constructor>
- </bean>
-
- <!-- The SNMP adaptor MBean -->
- <bean class="org.jboss.services.binding.ServiceBinding">
- <constructor>
- <parameter>jboss.jmx:name=SnmpAgent,service=snmp,type=adaptor</parameter>
- <parameter>${jboss.bind.address}</parameter>
- <parameter>1161</parameter>
- </constructor>
- </bean>
-
- <!-- ********************* deploy/jmx-remoting.sar **************** -->
-
- <bean class="org.jboss.services.binding.ServiceBinding">
- <constructor>
- <parameter>jboss.remoting:service=JMXConnectorServer,protocol=rmi</parameter>
- <parameter>${jboss.bind.address}</parameter>
- <parameter>1090</parameter>
- </constructor>
- </bean>
-
- <!-- ********************* deploy/ejb3-connectors-service.xml **************** -->
-
- <!-- EJB3 wants to have the service create its own ServiceBinding object
- dynamically. See the value-factory usage in deploy/ejb3-connectors-service.xml -->
-
-
- <!-- ********************* deploy/jbossweb.sar **************** -->
- <!-- ********************* deploy/httpha-invoker.sar **************** -->
-
- <!--
- JBoss Web server.xml configuration.
-
- Same binding config can be used by the following services, or really
- anything else that needs to point to the JBoss Web HTTP connector
- but doesn't need an XSL Transform
-
- jboss:service=invoker,type=http
- jboss:service=invoker,type=http,target=Naming
- jboss:service=invoker,type=http,target=Naming,readonly=true
- jboss:service=invoker,type=httpHA
- jboss:service=invoker,type=http,target=HAJNDI
- jboss.ws:service=ServiceEndpointManager
- -->
- <bean class="org.jboss.services.binding.ServiceBinding">
- <constructor>
- <parameter>jboss.web:service=WebServer</parameter>
- <parameter>${jboss.bind.address}</parameter>
- <parameter>8080</parameter>
- </constructor>
-
- <!--
- Inject a XSLT transform configuration (see below) that describes
- how to transform server.xml
- If the binding value request doesn't require an XSL Transform, this config
- will be ignored.
- -->
- <property name="serviceBindingValueSourceConfig"><inject bean="JBossWebConnectorXSLTConfig"/></property>
- </bean>
-
- <!-- For services like those listed above that need to know the
- port of the HTTPS connector -->
- <bean class="org.jboss.services.binding.ServiceBinding">
- <constructor>
- <parameter>jboss.web:service=WebServer</parameter>
- <parameter>HttpsConnector</parameter>
- <!-- The address/port of the JBoss Web HTTPS Connector below -->
- <parameter>${jboss.bind.address}</parameter>
- <parameter>8443</parameter>
- </constructor>
- </bean>
-
- <!-- ********************* deploy/messaging/remoting-bisocket-service.xml ********************** -->
-
- <!-- Standard JBM bisocket connector -->
- <bean class="org.jboss.services.binding.ServiceBinding">
- <constructor>
- <parameter>jboss.messaging:service=Connector,transport=bisocket</parameter>
- <parameter>${jboss.bind.address}</parameter>
- <parameter>4457</parameter>
- </constructor>
- </bean>
-
- <!-- ********************* deploy/transaction-jboss-beans.xml ********************** -->
-
- <!-- JBossTS Recovery Manager -->
- <bean class="org.jboss.services.binding.ServiceBinding">
- <constructor>
- <parameter>TransactionManager</parameter>
- <parameter>recoveryManager</parameter>
- <parameter>${jboss.bind.address}</parameter>
- <parameter>4712</parameter>
- </constructor>
- </bean>
-
- <!-- JBossTS Transaction Status Manager -->
- <bean class="org.jboss.services.binding.ServiceBinding">
- <constructor>
- <parameter>TransactionManager</parameter>
- <parameter>transactionStatusManager</parameter>
- <parameter>${jboss.bind.address}</parameter>
- <parameter>4713</parameter>
- </constructor>
- </bean>
-
- <!-- JBossTS SocketProcessId. The address part is ignored,
- it will always use null/localhost/127.0.0.1. -->
- <bean class="org.jboss.services.binding.ServiceBinding">
- <constructor>
- <parameter>TransactionManager</parameter>
- <parameter>socketProcessId</parameter>
- <parameter><null/></parameter>
- <parameter>4714</parameter>
- </constructor>
- </bean>
-
-
- <!-- ********************* deploy/hsqldb-ds.xml **************** -->
-
- <!-- Commented out as tcp/ip access to Hypersonic is not enabled by default -->
- <!--
- <bean class="org.jboss.services.binding.ServiceBinding">
- <constructor>
- <parameter>jboss:service=Hypersonic</parameter>
- <parameter>${jboss.bind.address}</parameter>
- <parameter>1701</parameter>
- </constructor>
- </bean>
- -->
-
- <!-- ********************* JBoss MQ **************** -->
-
- <!-- Commented out as JBoss MQ is not installed by default
- If you uncomment this and also use jboss.mq:service=InvocationLayer,type=HTTP,
- configure the http invocation layer using the jboss.web:service=WebServer binding above
- -->
- <!--
- <bean class="org.jboss.services.binding.ServiceBinding">
- <constructor>
- <parameter>jboss.mq:service=InvocationLayer,type=UIL2</parameter>
- <parameter>${jboss.bind.address}</parameter>
- <parameter>8093</parameter>
- </constructor>
- </bean>
- -->
- </set>
- </parameter>
-
- <!-- The port offset -->
- <parameter>0</parameter>
- <!-- Default host name -->
- <parameter>${jboss.bind.address}</parameter>
- </constructor>
-
- </bean>
-
- <!-- The ports-01 bindings are obtained by taking ports-default and adding 100 to each port value -->
- <bean name="Ports01Bindings" class="org.jboss.services.binding.impl.ServiceBindingSet">
-
- <constructor>
- <parameter><inject bean="PortsDefaultBindings"/></parameter>
- <!-- The port offset -->
- <parameter>100</parameter>
- <!-- Set of bindings to which the "offset by 100" approach can't be applied -->
- <parameter><null/></parameter>
- <!-- Default host name -->
- <parameter>${jboss.bind.address}</parameter>
- </constructor>
- </bean>
-
- <!-- The ports-02 bindings are obtained by taking ports-default and adding 200 to each port value -->
- <bean name="Ports02Bindings" class="org.jboss.services.binding.impl.ServiceBindingSet">
-
- <constructor>
- <parameter><inject bean="PortsDefaultBindings"/></parameter>
- <!-- The port offset -->
- <parameter>200</parameter>
- <!-- Set of bindings to which the "offset by 200" approach can't be applied -->
- <parameter><null/></parameter>
- <!-- Default host name -->
- <parameter>${jboss.bind.address}</parameter>
- </constructor>
- </bean>
-
-
- <!-- Conversion of selected bindings into system properties -->
- <bean name="SystemPropertyBinder" class="org.jboss.services.binding.SystemPropertyBinder">
-
- <constructor>
- <parameter>
- <set>
- <!-- JBM's remoting connector -->
- <bean class="org.jboss.services.binding.SystemPropertyBinding">
- <constructor>
- <parameter>jboss.messaging.connector.bisocket.port</parameter>
- <parameter class="int">
- <value-factory bean="ServiceBindingManager" method="getIntBinding"
- parameter="jboss.messaging:service=Connector,transport=bisocket"/>
- </parameter>
- </constructor>
- </bean>
- </set>
- </parameter>
- </constructor>
-
- </bean>
-
- <!-- XSL Transform to apply to server.xml -->
- <bean name="JBossWebConnectorXSLTConfig"
- class="org.jboss.services.binding.impl.XSLTServiceBindingValueSourceConfig">
-
- <constructor>
- <parameter><![CDATA[
- <xsl:stylesheet
- xmlns:xsl='http://www.w3.org/1999/XSL/Transform' version='1.0'>
-
- <xsl:output method="xml" />
- <xsl:param name="port"/>
-
- <xsl:variable name="portAJP" select="$port - 71"/>
- <xsl:variable name="portHttps" select="$port + 363"/>
-
- <xsl:template match="/">
- <xsl:apply-templates/>
- </xsl:template>
-
- <xsl:template match = "Connector">
- <Connector>
- <xsl:for-each select="@*">
- <xsl:choose>
- <xsl:when test="(name() = 'port' and . = '8080')">
- <xsl:attribute name="port"><xsl:value-of select="$port" /></xsl:attribute>
- </xsl:when>
- <xsl:when test="(name() = 'port' and . = '8009')">
- <xsl:attribute name="port"><xsl:value-of select="$portAJP" /></xsl:attribute>
- </xsl:when>
- <xsl:when test="(name() = 'redirectPort')">
- <xsl:attribute name="redirectPort"><xsl:value-of select="$portHttps" /></xsl:attribute>
- </xsl:when>
- <xsl:when test="(name() = 'port' and . = '8443')">
- <xsl:attribute name="port"><xsl:value-of select="$portHttps" /></xsl:attribute>
- </xsl:when>
- <xsl:otherwise>
- <xsl:attribute name="{name()}"><xsl:value-of select="." /></xsl:attribute>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:for-each>
- <xsl:apply-templates/>
- </Connector>
- </xsl:template>
-
- <xsl:template match="*|@*">
- <xsl:copy>
- <xsl:apply-templates select="@*|node()"/>
- </xsl:copy>
- </xsl:template>
- </xsl:stylesheet>
- ]]>
- </parameter>
- </constructor>
- </bean>
-
-</deployment>
Copied: trunk/server/src/etc/conf/default/bootstrap/aop.xml (from rev 81273, trunk/server/src/etc/conf/default/aop.xml)
===================================================================
--- trunk/server/src/etc/conf/default/bootstrap/aop.xml (rev 0)
+++ trunk/server/src/etc/conf/default/bootstrap/aop.xml 2008-11-19 09:54:09 UTC (rev 81277)
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ AOP configuration
+-->
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <classloader><inject bean="aop-classloader:0.0.0"/></classloader>
+
+ <classloader name="aop-classloader" xmlns="urn:jboss:classloader:1.0" export-all="NON_EMPTY" import-all="true">
+ <root>${jboss.lib.url}jboss-aop-asintegration-core.jar</root>
+ <root>${jboss.lib.url}jboss-aop-asintegration-jmx.jar</root>
+ <root>${jboss.lib.url}jboss-aop-asintegration-mc.jar</root>
+ <root>${jboss.lib.url}jboss-aop-jboss5.jar</root>
+ </classloader>
+
+ <!-- Integration -->
+ <bean name="AOPJBossIntegration" class="org.jboss.aop.asintegration.jboss5.JBoss5Integration"/>
+
+ <bean name="DefaultAspectManager" class="org.jboss.aop.microcontainer.beans.metadata.DefaultAspectManager">
+ <property name="managerBean">AspectManager</property>
+ <property name="managerProperty">aspectManager</property>
+ </bean>
+
+
+ <!--
+ Valid values for the AspectManager bean for use with enableTransformer=true are:
+ * org.jboss.aop.deployers.AspectManagerJDK5 - works with the -javaagent:pluggable-instrumentor.jar switch
+ * org.jboss.aop.deployers.AspectManagerJRockit - works with JRockit and the -Xmanagement:class=org.jboss.aop.hook.JRockitPluggableClassPreProcessor switch
+ -->
+ <bean name="AspectManager" class="org.jboss.aop.deployers.AspectManagerJDK5">
+ <constructor>
+ <parameter><![CDATA[
+ <aop>
+ <aspect name="mainDeployer" class="org.jboss.profileservice.aop.MainDeployerAspect"/>
+ <bind pointcut="execution(* $instanceof{org.jboss.deployers.spi.deployment.MainDeployer}->process(..))">
+ <advice name="process" aspect="mainDeployer"/>
+ </bind>
+ <aspect name="persist" class="org.jboss.profileservice.aop.PersistAspect"/>
+ <bind pointcut="execution(* $instanceof{org.jboss.managed.api.ManagedProperty}->setValue(..))">
+ <advice name="setValue" aspect="persist"/>
+ </bind>
+ </aop>]]>
+ </parameter>
+ </constructor>
+
+ <property name="jbossIntegration"><inject bean="AOPJBossIntegration"/></property>
+
+ <property name="enableLoadtimeWeaving">false</property>
+ <!-- only relevant when EnableLoadtimeWeaving is true.
+ When transformer is on, every loaded class gets
+ transformed. If AOP can't find the class, then it
+ throws an exception. Sometimes, classes may not have
+ all the classes they reference. So, the Suppressing
+ is needed. (i.e. Jboss cache in the default configuration -->
+ <property name="suppressTransformationErrors">true</property>
+ <property name="prune">true</property>
+ <property name="include">org.jboss.test., org.jboss.injbossaop.</property>
+ <property name="exclude">org.jboss.</property>
+ <!-- This avoids instrumentation of hibernate cglib enhanced proxies
+ <property name="ignore">*$$EnhancerByCGLIB$$*</property> -->
+ <property name="optimized">true</property>
+ <property name="verbose">false</property>
+ <!--
+ Available choices for this attribute are:
+ org.jboss.aop.instrument.ClassicInstrumentor (default)
+ org.jboss.aop.instrument.GeneratedAdvisorInstrumentor
+ <property name="instrumentor">org.jboss.aop.instrument.ClassicInstrumentor</property>
+ -->
+ <!--
+ By default the deployment of the aspects contained in
+ ../deployers/jboss-aop-jboss5.deployer/base-aspects.xml
+ are not deployed. To turn on deployment uncomment this property
+ <property name="useBaseXml">true</property>
+ -->
+ </bean>
+
+ <!-- Support for @JMX -->
+ <lifecycle-configure xmlns="urn:jboss:aop-beans:1.0"
+ name="JMXRegistrationAdvice"
+ class="org.jboss.system.microcontainer.jmx.ServiceControllerRegistrationLifecycleCallback"
+ classes="@org.jboss.aop.microcontainer.aspects.jmx.JMX"
+ manager-bean="AspectManager"
+ manager-property="aspectManager">
+ <property name="serviceController"><inject bean="JMXKernel" property="serviceController"/></property>
+ </lifecycle-configure>
+ <lifecycle-create xmlns="urn:jboss:aop-beans:1.0"
+ name="JMXCreateDestroyAdvice"
+ class="org.jboss.system.microcontainer.jmx.ServiceControllerCreateDestroyLifecycleCallback"
+ classes="@org.jboss.aop.microcontainer.aspects.jmx.JMX"
+ manager-bean="AspectManager"
+ manager-property="aspectManager">
+ <property name="serviceController"><inject bean="JMXKernel" property="serviceController"/></property>
+ </lifecycle-create>
+ <lifecycle-install xmlns="urn:jboss:aop-beans:1.0"
+ name="JMXStartStopAdvice"
+ class="org.jboss.system.microcontainer.jmx.ServiceControllerStartStopLifecycleCallback"
+ classes="@org.jboss.aop.microcontainer.aspects.jmx.JMX"
+ manager-bean="AspectManager"
+ manager-property="aspectManager">
+ <property name="serviceController"><inject bean="JMXKernel" property="serviceController"/></property>
+ </lifecycle-install>
+
+ <!-- MBean for making sure that the underlying AspectManagerService gets registered in JMX -->
+ <bean name="AspectManagerJMXRegistrar" class="org.jboss.aop.deployers.AspectManagerJMXRegistrar">
+ <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property>
+ <property name="aspectManager"><inject bean="AspectManager" property="delegate"/></property>
+ </bean>
+
+</deployment>
Copied: trunk/server/src/etc/conf/default/bootstrap/bindings.xml (from rev 81273, trunk/server/src/etc/conf/default/bindings.xml)
===================================================================
--- trunk/server/src/etc/conf/default/bootstrap/bindings.xml (rev 0)
+++ trunk/server/src/etc/conf/default/bootstrap/bindings.xml 2008-11-19 09:54:09 UTC (rev 81277)
@@ -0,0 +1,453 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <classloader><inject bean="bindings-classloader:0.0.0"/></classloader>
+
+ <classloader name="bindings-classloader" xmlns="urn:jboss:classloader:1.0" export-all="NON_EMPTY" import-all="true">
+ <root>${jboss.common.lib.url}jboss-bindingservice.jar</root>
+ </classloader>
+
+ <bean name="ServiceBindingManager" class="org.jboss.services.binding.ServiceBindingManager">
+
+ <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.system:service=ServiceBindingManager", exposedInterface=org.jboss.services.binding.ServiceBindingManagerMBean.class, registerDirectly=true)</annotation>
+
+ <constructor>
+ <!-- The set of bindings to use for this server -->
+ <parameter>${jboss.service.binding.set:ports-default}</parameter>
+
+ <!-- The named sets of bindings -->
+ <parameter>
+ <bean name="ServiceBindingStore" class="org.jboss.services.binding.impl.PojoServiceBindingStore">
+
+ <constructor>
+ <parameter>
+ <map keyClass="java.lang.String" valueClass="java.util.Set">
+ <entry>
+ <key>ports-default</key>
+ <value><inject bean="PortsDefaultBindings"/></value>
+ </entry>
+ <entry>
+ <key>ports-01</key>
+ <value><inject bean="Ports01Bindings"/></value>
+ </entry>
+ <entry>
+ <key>ports-02</key>
+ <value><inject bean="Ports02Bindings"/></value>
+ </entry>
+ </map>
+ </parameter>
+ </constructor>
+ </bean>
+ </parameter>
+ </constructor>
+
+ </bean>
+
+ <!-- The default bindings -->
+ <bean name="PortsDefaultBindings" class="org.jboss.services.binding.impl.ServiceBindingSet">
+
+ <constructor>
+ <parameter>
+ <set>
+ <!-- ********************* conf/jboss-service.xml ****************** -->
+
+ <!-- Naming Service -->
+ <bean class="org.jboss.services.binding.ServiceBinding">
+ <constructor>
+ <parameter>jboss:service=Naming</parameter>
+ <parameter>Port</parameter>
+ <parameter>${jboss.bind.address}</parameter>
+ <parameter>1099</parameter>
+ </constructor>
+ </bean>
+
+ <bean class="org.jboss.services.binding.ServiceBinding">
+ <constructor>
+ <parameter>jboss:service=Naming</parameter>
+ <parameter>RmiPort</parameter>
+ <parameter>${jboss.bind.address}</parameter>
+ <parameter>1098</parameter>
+ </constructor>
+ </bean>
+
+ <!-- Remote classloading service -->
+ <bean class="org.jboss.services.binding.ServiceBinding">
+ <constructor>
+ <parameter>jboss:service=WebService</parameter>
+ <parameter>${jboss.bind.address}</parameter>
+ <parameter>8083</parameter>
+ </constructor>
+ </bean>
+
+ <!-- Remoting Connector -->
+ <bean class="org.jboss.services.binding.ServiceBinding">
+ <constructor>
+ <parameter>UnifiedInvokerConnector</parameter>
+ <parameter>${jboss.bind.address}</parameter>
+ <parameter>4446</parameter>
+ </constructor>
+ </bean>
+
+ <!-- Used to create a multihome Remoting server. See -->
+ <!-- deploy/remoting-jboss-beans.xml for more details. -->
+ <!--bean class="org.jboss.services.binding.ServiceBinding">
+ <constructor>
+ <parameter>UnifiedInvokerConnector:bindingHome1</parameter>
+ <parameter>192.168.2.2</parameter>
+ <parameter>7777</parameter>
+ </constructor>
+ </bean-->
+
+ <!-- Used to create a multihome Remoting server. See -->
+ <!-- deploy/remoting-jboss-beans.xml for more details. -->
+ <!--bean class="org.jboss.services.binding.ServiceBinding">
+ <constructor>
+ <parameter>UnifiedInvokerConnector:bindingHome2</parameter>
+ <parameter>10.11.12.238</parameter>
+ <parameter>8888</parameter>
+ </constructor>
+ </bean-->
+
+ <!-- ********************* deploy/remoting-service.xml ****************** -->
+
+ <!-- RMI/JRMP invoker -->
+ <bean class="org.jboss.services.binding.ServiceBinding">
+ <constructor>
+ <parameter>jboss:service=invoker,type=jrmp</parameter>
+ <parameter>${jboss.bind.address}</parameter>
+ <parameter>4444</parameter>
+ </constructor>
+ </bean>
+
+ <!-- Pooled invoker -->
+ <bean class="org.jboss.services.binding.ServiceBinding">
+ <constructor>
+ <parameter>jboss:service=invoker,type=pooled</parameter>
+ <parameter>${jboss.bind.address}</parameter>
+ <parameter>4445</parameter>
+ </constructor>
+ </bean>
+
+ <!-- ********************* deploy/cluster/hajndi-service.xml ****************** -->
+
+ <bean class="org.jboss.services.binding.ServiceBinding">
+ <constructor>
+ <parameter>jboss:service=HAJNDI</parameter>
+ <parameter>Port</parameter>
+ <parameter>${jboss.bind.address}</parameter>
+ <parameter>1100</parameter>
+ </constructor>
+ </bean>
+
+ <bean class="org.jboss.services.binding.ServiceBinding">
+ <constructor>
+ <parameter>jboss:service=HAJNDI</parameter>
+ <parameter>RmiPort</parameter>
+ <parameter>${jboss.bind.address}</parameter>
+ <parameter>1101</parameter>
+ </constructor>
+ </bean>
+
+ <!-- ********************* deploy/cluster/ha-legacy-service.xml ****************** -->
+
+ <!-- HA RMI/JRMP invoker -->
+ <bean class="org.jboss.services.binding.ServiceBinding">
+ <constructor>
+ <parameter>jboss:service=invoker,type=jrmpha</parameter>
+ <parameter>${jboss.bind.address}</parameter>
+ <parameter>4447</parameter>
+ </constructor>
+ </bean>
+
+ <!-- HA Pooled invoker -->
+ <bean class="org.jboss.services.binding.ServiceBinding">
+ <constructor>
+ <parameter>jboss:service=invoker,type=pooledha</parameter>
+ <parameter>${jboss.bind.address}</parameter>
+ <parameter>4448</parameter>
+ </constructor>
+ </bean>
+
+ <!-- ********************* deploy/iiop-service.xml ****************** -->
+
+ <bean class="org.jboss.services.binding.ServiceBinding">
+ <constructor>
+ <parameter>jboss:service=CorbaORB</parameter>
+ <parameter>${jboss.bind.address}</parameter>
+ <parameter>3528</parameter>
+ </constructor>
+ </bean>
+
+ <!-- ********************* deploy/snmp-adaptor.sar **************** -->
+
+ <!-- Trap receiver that acts as an SNMP Manager -->
+ <bean class="org.jboss.services.binding.ServiceBinding">
+ <constructor>
+ <parameter>jboss.jmx:name=SnmpAgent,service=trapd,type=logger</parameter>
+ <parameter>${jboss.bind.address}</parameter>
+ <parameter>1162</parameter>
+ </constructor>
+ </bean>
+
+ <!-- The SNMP adaptor MBean -->
+ <bean class="org.jboss.services.binding.ServiceBinding">
+ <constructor>
+ <parameter>jboss.jmx:name=SnmpAgent,service=snmp,type=adaptor</parameter>
+ <parameter>${jboss.bind.address}</parameter>
+ <parameter>1161</parameter>
+ </constructor>
+ </bean>
+
+ <!-- ********************* deploy/jmx-remoting.sar **************** -->
+
+ <bean class="org.jboss.services.binding.ServiceBinding">
+ <constructor>
+ <parameter>jboss.remoting:service=JMXConnectorServer,protocol=rmi</parameter>
+ <parameter>${jboss.bind.address}</parameter>
+ <parameter>1090</parameter>
+ </constructor>
+ </bean>
+
+ <!-- ********************* deploy/ejb3-connectors-service.xml **************** -->
+
+ <!-- EJB3 wants to have the service create its own ServiceBinding object
+ dynamically. See the value-factory usage in deploy/ejb3-connectors-service.xml -->
+
+
+ <!-- ********************* deploy/jbossweb.sar **************** -->
+ <!-- ********************* deploy/httpha-invoker.sar **************** -->
+
+ <!--
+ JBoss Web server.xml configuration.
+
+ Same binding config can be used by the following services, or really
+ anything else that needs to point to the JBoss Web HTTP connector
+ but doesn't need an XSL Transform
+
+ jboss:service=invoker,type=http
+ jboss:service=invoker,type=http,target=Naming
+ jboss:service=invoker,type=http,target=Naming,readonly=true
+ jboss:service=invoker,type=httpHA
+ jboss:service=invoker,type=http,target=HAJNDI
+ jboss.ws:service=ServiceEndpointManager
+ -->
+ <bean class="org.jboss.services.binding.ServiceBinding">
+ <constructor>
+ <parameter>jboss.web:service=WebServer</parameter>
+ <parameter>${jboss.bind.address}</parameter>
+ <parameter>8080</parameter>
+ </constructor>
+
+ <!--
+ Inject a XSLT transform configuration (see below) that describes
+ how to transform server.xml
+ If the binding value request doesn't require an XSL Transform, this config
+ will be ignored.
+ -->
+ <property name="serviceBindingValueSourceConfig"><inject bean="JBossWebConnectorXSLTConfig"/></property>
+ </bean>
+
+ <!-- For services like those listed above that need to know the
+ port of the HTTPS connector -->
+ <bean class="org.jboss.services.binding.ServiceBinding">
+ <constructor>
+ <parameter>jboss.web:service=WebServer</parameter>
+ <parameter>HttpsConnector</parameter>
+ <!-- The address/port of the JBoss Web HTTPS Connector below -->
+ <parameter>${jboss.bind.address}</parameter>
+ <parameter>8443</parameter>
+ </constructor>
+ </bean>
+
+ <!-- ********************* deploy/messaging/remoting-bisocket-service.xml ********************** -->
+
+ <!-- Standard JBM bisocket connector -->
+ <bean class="org.jboss.services.binding.ServiceBinding">
+ <constructor>
+ <parameter>jboss.messaging:service=Connector,transport=bisocket</parameter>
+ <parameter>${jboss.bind.address}</parameter>
+ <parameter>4457</parameter>
+ </constructor>
+ </bean>
+
+ <!-- ********************* deploy/transaction-jboss-beans.xml ********************** -->
+
+ <!-- JBossTS Recovery Manager -->
+ <bean class="org.jboss.services.binding.ServiceBinding">
+ <constructor>
+ <parameter>TransactionManager</parameter>
+ <parameter>recoveryManager</parameter>
+ <parameter>${jboss.bind.address}</parameter>
+ <parameter>4712</parameter>
+ </constructor>
+ </bean>
+
+ <!-- JBossTS Transaction Status Manager -->
+ <bean class="org.jboss.services.binding.ServiceBinding">
+ <constructor>
+ <parameter>TransactionManager</parameter>
+ <parameter>transactionStatusManager</parameter>
+ <parameter>${jboss.bind.address}</parameter>
+ <parameter>4713</parameter>
+ </constructor>
+ </bean>
+
+ <!-- JBossTS SocketProcessId. The address part is ignored,
+ it will always use null/localhost/127.0.0.1. -->
+ <bean class="org.jboss.services.binding.ServiceBinding">
+ <constructor>
+ <parameter>TransactionManager</parameter>
+ <parameter>socketProcessId</parameter>
+ <parameter><null/></parameter>
+ <parameter>4714</parameter>
+ </constructor>
+ </bean>
+
+
+ <!-- ********************* deploy/hsqldb-ds.xml **************** -->
+
+ <!-- Commented out as tcp/ip access to Hypersonic is not enabled by default -->
+ <!--
+ <bean class="org.jboss.services.binding.ServiceBinding">
+ <constructor>
+ <parameter>jboss:service=Hypersonic</parameter>
+ <parameter>${jboss.bind.address}</parameter>
+ <parameter>1701</parameter>
+ </constructor>
+ </bean>
+ -->
+
+ <!-- ********************* JBoss MQ **************** -->
+
+ <!-- Commented out as JBoss MQ is not installed by default
+ If you uncomment this and also use jboss.mq:service=InvocationLayer,type=HTTP,
+ configure the http invocation layer using the jboss.web:service=WebServer binding above
+ -->
+ <!--
+ <bean class="org.jboss.services.binding.ServiceBinding">
+ <constructor>
+ <parameter>jboss.mq:service=InvocationLayer,type=UIL2</parameter>
+ <parameter>${jboss.bind.address}</parameter>
+ <parameter>8093</parameter>
+ </constructor>
+ </bean>
+ -->
+ </set>
+ </parameter>
+
+ <!-- The port offset -->
+ <parameter>0</parameter>
+ <!-- Default host name -->
+ <parameter>${jboss.bind.address}</parameter>
+ </constructor>
+
+ </bean>
+
+ <!-- The ports-01 bindings are obtained by taking ports-default and adding 100 to each port value -->
+ <bean name="Ports01Bindings" class="org.jboss.services.binding.impl.ServiceBindingSet">
+
+ <constructor>
+ <parameter><inject bean="PortsDefaultBindings"/></parameter>
+ <!-- The port offset -->
+ <parameter>100</parameter>
+ <!-- Set of bindings to which the "offset by 100" approach can't be applied -->
+ <parameter><null/></parameter>
+ <!-- Default host name -->
+ <parameter>${jboss.bind.address}</parameter>
+ </constructor>
+ </bean>
+
+ <!-- The ports-02 bindings are obtained by taking ports-default and adding 200 to each port value -->
+ <bean name="Ports02Bindings" class="org.jboss.services.binding.impl.ServiceBindingSet">
+
+ <constructor>
+ <parameter><inject bean="PortsDefaultBindings"/></parameter>
+ <!-- The port offset -->
+ <parameter>200</parameter>
+ <!-- Set of bindings to which the "offset by 200" approach can't be applied -->
+ <parameter><null/></parameter>
+ <!-- Default host name -->
+ <parameter>${jboss.bind.address}</parameter>
+ </constructor>
+ </bean>
+
+
+ <!-- Conversion of selected bindings into system properties -->
+ <bean name="SystemPropertyBinder" class="org.jboss.services.binding.SystemPropertyBinder">
+
+ <constructor>
+ <parameter>
+ <set>
+ <!-- JBM's remoting connector -->
+ <bean class="org.jboss.services.binding.SystemPropertyBinding">
+ <constructor>
+ <parameter>jboss.messaging.connector.bisocket.port</parameter>
+ <parameter class="int">
+ <value-factory bean="ServiceBindingManager" method="getIntBinding"
+ parameter="jboss.messaging:service=Connector,transport=bisocket"/>
+ </parameter>
+ </constructor>
+ </bean>
+ </set>
+ </parameter>
+ </constructor>
+
+ </bean>
+
+ <!-- XSL Transform to apply to server.xml -->
+ <bean name="JBossWebConnectorXSLTConfig"
+ class="org.jboss.services.binding.impl.XSLTServiceBindingValueSourceConfig">
+
+ <constructor>
+ <parameter><![CDATA[
+ <xsl:stylesheet
+ xmlns:xsl='http://www.w3.org/1999/XSL/Transform' version='1.0'>
+
+ <xsl:output method="xml" />
+ <xsl:param name="port"/>
+
+ <xsl:variable name="portAJP" select="$port - 71"/>
+ <xsl:variable name="portHttps" select="$port + 363"/>
+
+ <xsl:template match="/">
+ <xsl:apply-templates/>
+ </xsl:template>
+
+ <xsl:template match = "Connector">
+ <Connector>
+ <xsl:for-each select="@*">
+ <xsl:choose>
+ <xsl:when test="(name() = 'port' and . = '8080')">
+ <xsl:attribute name="port"><xsl:value-of select="$port" /></xsl:attribute>
+ </xsl:when>
+ <xsl:when test="(name() = 'port' and . = '8009')">
+ <xsl:attribute name="port"><xsl:value-of select="$portAJP" /></xsl:attribute>
+ </xsl:when>
+ <xsl:when test="(name() = 'redirectPort')">
+ <xsl:attribute name="redirectPort"><xsl:value-of select="$portHttps" /></xsl:attribute>
+ </xsl:when>
+ <xsl:when test="(name() = 'port' and . = '8443')">
+ <xsl:attribute name="port"><xsl:value-of select="$portHttps" /></xsl:attribute>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:attribute name="{name()}"><xsl:value-of select="." /></xsl:attribute>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:for-each>
+ <xsl:apply-templates/>
+ </Connector>
+ </xsl:template>
+
+ <xsl:template match="*|@*">
+ <xsl:copy>
+ <xsl:apply-templates select="@*|node()"/>
+ </xsl:copy>
+ </xsl:template>
+ </xsl:stylesheet>
+ ]]>
+ </parameter>
+ </constructor>
+ </bean>
+
+</deployment>
Copied: trunk/server/src/etc/conf/default/bootstrap/classloader.xml (from rev 81273, trunk/server/src/etc/conf/default/classloader.xml)
===================================================================
--- trunk/server/src/etc/conf/default/bootstrap/classloader.xml (rev 0)
+++ trunk/server/src/etc/conf/default/bootstrap/classloader.xml 2008-11-19 09:54:09 UTC (rev 81277)
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ The core classloading system
+-->
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <classloader><inject bean="bootstrap-classloader:0.0.0"/></classloader>
+
+ <!--
+ The classloader implementation
+ -->
+ <bean name="ClassLoaderSystem" class="org.jboss.classloader.spi.ClassLoaderSystem">
+ <classloader><null/></classloader>
+ <constructor factoryClass="org.jboss.classloader.spi.ClassLoaderSystem" factoryMethod="getInstance"/>
+ </bean>
+
+ <!--
+ ClassLoader management and resolution
+ -->
+ <bean name="ClassLoading" class="org.jboss.classloading.spi.dependency.ClassLoading">
+ <classloader><null/></classloader>
+ <incallback method="addModule" state="Configured"/>
+ <uncallback method="removeModule" state="Configured"/>
+ </bean>
+
+ <classloader name="bootstrap-classloader" xmlns="urn:jboss:classloader:1.0" export-all="NON_EMPTY" import-all="true">
+ <!-- FIXME Move to Deployers -->
+ <root>${jboss.lib.url}jboss-deployers-core-spi.jar</root>
+ <root>${jboss.lib.url}jboss-deployers-core.jar</root>
+ <root>${jboss.lib.url}jboss-deployers-client-spi.jar</root>
+ <root>${jboss.lib.url}jboss-deployers-client.jar</root>
+ <root>${jboss.lib.url}jboss-deployers-structure-spi.jar</root>
+ <root>${jboss.lib.url}jboss-deployers-spi.jar</root>
+ <root>${jboss.lib.url}jboss-deployers-impl.jar</root>
+ <root>${jboss.lib.url}jboss-deployers-vfs-spi.jar</root>
+ <root>${jboss.lib.url}jboss-deployers-vfs.jar</root>
+ <!-- System -->
+ <root>${jboss.lib.url}jboss-system.jar</root>
+ <root>${jboss.lib.url}jboss-profileservice-spi.jar</root>
+ <!-- FIXME Move to JMX -->
+ <root>${jboss.lib.url}jboss-j2se.jar</root>
+ <root>${jboss.lib.url}jboss-mbeans.jar</root>
+ <root>${jboss.lib.url}jboss-jmx.jar</root>
+ <root>${jboss.lib.url}jboss-system-jmx.jar</root>
+ <root>${jboss.lib.url}dom4j.jar</root>
+ <!-- JAXB impl here, api is in endorsed -->
+ <root>${jboss.lib.url}jaxb-impl.jar</root>
+ <!-- STAX2 impl here, api is in endorsed -->
+ <root>${jboss.lib.url}wstx.jar</root>
+ </classloader>
+
+</deployment>
Copied: trunk/server/src/etc/conf/default/bootstrap/deployers.xml (from rev 81273, trunk/server/src/etc/conf/default/deployers.xml)
===================================================================
--- trunk/server/src/etc/conf/default/bootstrap/deployers.xml (rev 0)
+++ trunk/server/src/etc/conf/default/bootstrap/deployers.xml 2008-11-19 09:54:09 UTC (rev 81277)
@@ -0,0 +1,225 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ The base deployers
+-->
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <classloader><inject bean="deployers-classloader:0.0.0"/></classloader>
+
+ <classloader name="deployers-classloader" xmlns="urn:jboss:classloader:1.0" export-all="NON_EMPTY" import-all="true">
+ <!-- FIXME
+ <root>${jboss.lib.url}jboss-deployers-core-spi.jar</root>
+ <root>${jboss.lib.url}jboss-deployers-core.jar</root>
+ <root>${jboss.lib.url}jboss-deployers-client-spi.jar</root>
+ <root>${jboss.lib.url}jboss-deployers-client.jar</root>
+ <root>${jboss.lib.url}jboss-deployers-structure-spi.jar</root>
+ <root>${jboss.lib.url}jboss-deployers-spi.jar</root>
+ <root>${jboss.lib.url}jboss-deployers-impl.jar</root>
+ <root>${jboss.lib.url}jboss-deployers-vfs-spi.jar</root>
+ <root>${jboss.lib.url}jboss-deployers-vfs.jar</root>
+ -->
+ </classloader>
+
+ <!-- use legacy ordering -->
+ <bean name="topContextComparator">
+ <constructor factoryClass="org.jboss.system.deployers.LegacyDeploymentContextComparator" factoryMethod="getInstance"/>
+ </bean>
+
+ <!-- The ManagedObjectFactory -->
+ <bean name="ManagedObjectFactory">
+ <constructor factoryClass="org.jboss.managed.api.factory.ManagedObjectFactory" factoryMethod="getInstance"/>
+ <!-- Accept any implementor of InstanceClassFactory -->
+ <incallback method="addInstanceClassFactory"/>
+ <uncallback method="removeInstanceClassFactory"/>
+ </bean>
+ <!-- The ManagedObjectCreator implementation -->
+ <bean name="ManagedObjectCreator" class="org.jboss.deployers.spi.deployer.helpers.DefaultManagedObjectCreator">
+ <property name="mof"><inject bean="ManagedObjectFactory"/></property>
+ </bean>
+
+ <!-- The MainDeployer -->
+ <bean name="MainDeployer" class="org.jboss.deployers.plugins.main.MainDeployerImpl">
+ <property name="structuralDeployers"><inject bean="StructuralDeployers"/></property>
+ <property name="deployers"><inject bean="Deployers"/></property>
+ <property name="mgtDeploymentCreator"><inject bean="ManagedDeploymentCreator"/></property>
+ <property name="comparator"><inject bean="topContextComparator"/></property>
+ </bean>
+
+ <!-- The ManagedDeploymentCreator implementation that supports mapping
+ attachment types to ManagedDeployment#getTypes
+ -->
+ <bean name="ManagedDeploymentCreator" class="org.jboss.deployers.plugins.managed.TypedManagedDeploymentCreator" />
+
+ <!-- The holder for deployers that determine structure -->
+ <bean name="StructuralDeployers" class="org.jboss.deployers.vfs.plugins.structure.VFSStructuralDeployersImpl">
+ <property name="structureBuilder">
+ <!-- The consolidator of the structure information -->
+ <bean name="StructureBuilder" class="org.jboss.deployers.vfs.plugins.structure.VFSStructureBuilder"/>
+ </property>
+ <!-- Accept any implementor of structure deployer -->
+ <incallback method="addDeployer"/>
+ <uncallback method="removeDeployer"/>
+ </bean>
+
+ <!-- The holder for deployers that do real deployment -->
+ <bean name="Deployers" class="org.jboss.deployers.plugins.deployers.DeployersImpl">
+ <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.deployment:service=DeployersImpl", exposedInterface=org.jboss.deployers.plugins.deployers.DeployersImplMBean.class, registerDirectly=true)</annotation>
+ <constructor><parameter><inject bean="jboss.kernel:service=KernelController"/></parameter></constructor>
+ <!-- Accept any implementor of deployer -->
+ <incallback method="addDeployer"/>
+ <uncallback method="removeDeployer"/>
+ <property name="mgtObjectCreator"><inject bean="ManagedObjectCreator"/></property>
+ </bean>
+
+ <!-- A declared structure descriptor deployer -->
+ <bean name="DeclaredStructure" class="org.jboss.deployers.vfs.plugins.structure.explicit.DeclaredStructure"/>
+
+ <!-- JAR Structure -->
+ <bean name="JARStructure" class="org.jboss.deployers.vfs.plugins.structure.jar.JARStructure">
+ <!-- Unless specified the default list of suffixes is .zip, .ear, .jar, ,.rar, .war, .sar, .har, .aop -->
+ <constructor>
+ <parameter>
+ <set elementClass="java.lang.String">
+ <value>.zip</value>
+ <value>.ear</value>
+ <value>.jar</value>
+ <value>.rar</value>
+ <value>.war</value>
+ <value>.sar</value>
+ <value>.har</value>
+ <value>.aop</value>
+ <value>.deployer</value>
+ <value>.beans</value>
+ </set>
+ </parameter>
+ </constructor>
+ <property name="candidateStructureVisitorFactory">
+ <!-- Any file that is not an ordinary directory is a candidate -->
+ <bean name="JARStructureCandidates" class="org.jboss.deployers.vfs.spi.structure.helpers.DefaultCandidateStructureVisitorFactory">
+ <!-- A filter to exclude some obvious non-subdeployments -->
+ <property name="filter">
+ <bean name="JARFilter" class="org.jboss.virtual.plugins.vfs.helpers.SuffixesExcludeFilter">
+ <constructor><parameter>
+ <list elementClass="java.lang.String">
+ <!-- Exclude class files as subdeployments -->
+ <value>.class</value>
+ </list>
+ </parameter></constructor>
+ </bean>
+ </property>
+ </bean>
+ </property>
+ </bean>
+
+ <!-- File Structure -->
+ <bean name="FileStructure" class="org.jboss.deployers.vfs.plugins.structure.file.FileStructure">
+ <!-- Unless specified the default list of suffixes is -service.xml, -beans.xml, -ds.xml, -aop.xml -->
+ <constructor>
+ <parameter>
+ <set elementClass="java.lang.String">
+ <value>-service.xml</value>
+ <value>-beans.xml</value>
+ <value>-ds.xml</value>
+ <value>-aop.xml</value>
+ </set>
+ </parameter>
+ </constructor>
+ </bean>
+
+ <!-- Old AOP deployment
+ <bean name="AspectAppParsingDeployer" class="org.jboss.aop.asintegration.jboss5.AspectAppParsingDeployer"/>
+ <bean name="AspectDeployer" class="org.jboss.aop.asintegration.jboss5.AspectDeployer">
+ <property name="aspectManager"><inject bean="AspectManager" property="aspectManager"/></property>
+ </bean>
+ -->
+
+ <bean name="AOPXMLMetaDataParserDeployer" class="org.jboss.deployers.vfs.spi.deployer.SchemaResolverDeployer">
+ <constructor>
+ <parameter>org.jboss.aop.microcontainer.beans.metadata.AOPDeployment</parameter>
+ </constructor>
+ <property name="suffix">-aop.xml</property>
+ </bean>
+ <bean name="AOPAnnotationMetaDataParserDeployer" class="org.jboss.aop.asintegration.jboss5.AOPAnnotationMetaDataParserDeployer">
+ <constructor>
+ <parameter><inject bean="AOPXMLMetaDataParserDeployer" property="relativeOrder"/></parameter>
+ </constructor>
+ </bean>
+ <bean name="AOPClassLoaderDeployer" class="org.jboss.aop.asintegration.jboss5.AOPClassLoaderDeployer">
+ <property name="aspectManager"><inject bean="AspectManager" property="aspectManager"/></property>
+ </bean>
+ <bean name="AOPDeploymentAopMetaDataDeployer" class="org.jboss.aop.asintegration.jboss5.AOPDeploymentAopMetaDataDeployer">
+ <property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property>
+ <property name="aspectManager"><inject bean="AspectManager" property="aspectManager"/></property>
+ </bean>
+ <bean name="BeansDeploymentAopMetaDataDeployer" class="org.jboss.aop.asintegration.jboss5.BeansDeploymentAopMetaDataDeployer">
+ <property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property>
+ <property name="aspectManager"><inject bean="AspectManager" property="aspectManager"/></property>
+ </bean>
+
+ <!-- POJO Deployment -->
+ <bean name="BeanMetaDataICF" class="org.jboss.deployers.plugins.managed.BeanMetaDataICF">
+ <property name="controller"><inject bean="jboss.kernel:service=KernelController"/></property>
+ </bean>
+ <bean name="KernelDeploymentManagedObjectCreator" class="org.jboss.deployers.plugins.managed.KernelDeploymentManagedObjectCreator">
+ <constructor><parameter><inject bean="ManagedObjectFactory"/></parameter></constructor>
+ </bean>
+ <bean name="BeanDeployer" class="org.jboss.deployers.vfs.deployer.kernel.BeanDeployer">
+ <property name="suffix">jboss-beans.xml</property>
+ </bean>
+ <bean name="KernelDeploymentDeployer" class="org.jboss.deployers.vfs.deployer.kernel.KernelDeploymentDeployer">
+ <install bean="ManagedDeploymentCreator" method="addAttachmentType">
+ <parameter>
+ <value>org.jboss.kernel.spi.deployment.KernelDeployment</value>
+ </parameter>
+ <parameter>
+ <value>beans</value>
+ </parameter>
+ </install>
+ <uninstall bean="ManagedDeploymentCreator" method="removeAttachmentType">
+ <parameter>
+ <value>org.jboss.kernel.spi.deployment.KernelDeployment</value>
+ </parameter>
+ </uninstall>
+ <property name="mgtObjectCreator"><inject bean="KernelDeploymentManagedObjectCreator"/></property>
+ </bean>
+ <bean name="BeanMetaDataDeployer" class="org.jboss.deployers.vfs.deployer.kernel.BeanMetaDataDeployer">
+ <constructor><parameter class="org.jboss.kernel.Kernel"><inject bean="jboss.kernel:service=Kernel"/></parameter></constructor>
+ </bean>
+
+ <!-- JMX Deployment -->
+ <bean name="ServiceMetaDataICF" class="org.jboss.system.deployers.managed.ServiceMetaDataICF">
+ <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property>
+ </bean>
+ <bean name="SARDeployer" class="org.jboss.system.deployers.SARDeployer">
+ </bean>
+ <bean name="ServiceClassLoaderDeployer" class="org.jboss.system.deployers.ServiceClassLoaderDeployer"/>
+ <bean name="ServiceDeploymentDeployer" class="org.jboss.system.deployers.ServiceDeploymentDeployer">
+ </bean>
+ <bean name="ServiceDeployer" class="org.jboss.system.deployers.ServiceDeployer">
+ <constructor><parameter><inject bean="JMXKernel" property="serviceController"/></parameter></constructor>
+ </bean>
+
+ <bean name="ClassLoadingMetaDataParser" class="org.jboss.deployers.vfs.spi.deployer.SchemaResolverDeployer">
+ <constructor>
+ <parameter>org.jboss.classloading.spi.metadata.ClassLoadingMetaData</parameter>
+ </constructor>
+ <property name="name">jboss-classloading.xml</property>
+ <property name="buildManagedObject">true</property>
+ </bean>
+ <bean name="ClassLoadingDefaultDeployer" class="org.jboss.deployers.plugins.classloading.ClassLoadingDefaultDeployer">
+ <property name="defaultMetaData">
+ <classloading xmlns="urn:jboss:classloading:1.0" export-all="NON_EMPTY" import-all="true"/>
+ </property>
+ </bean>
+ <bean name="InMemoryClassesDeployer" class="org.jboss.deployers.vfs.plugins.classloader.InMemoryClassesDeployer"/>
+ <bean name="ClassLoaderClassPathDeployer" class="org.jboss.deployers.vfs.plugins.classloader.VFSClassLoaderClassPathDeployer"/>
+ <bean name="ClassLoaderDescribeDeployer" class="org.jboss.deployers.vfs.plugins.classloader.VFSClassLoaderDescribeDeployer">
+ <property name="classLoading"><inject bean="ClassLoading"/></property>
+ </bean>
+ <bean name="ClassLoaderDeployer" class="org.jboss.deployers.plugins.classloading.AbstractLevelClassLoaderSystemDeployer">
+ <property name="classLoading"><inject bean="ClassLoading"/></property>
+ <property name="system"><inject bean="ClassLoaderSystem"/></property>
+ </bean>
+
+</deployment>
Copied: trunk/server/src/etc/conf/default/bootstrap/jmx.xml (from rev 81273, trunk/server/src/etc/conf/default/jmx.xml)
===================================================================
--- trunk/server/src/etc/conf/default/bootstrap/jmx.xml (rev 0)
+++ trunk/server/src/etc/conf/default/bootstrap/jmx.xml 2008-11-19 09:54:09 UTC (rev 81277)
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ The JMX Subsystem
+-->
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <classloader><inject bean="jmx-classloader:0.0.0"/></classloader>
+
+ <classloader name="jmx-classloader" xmlns="urn:jboss:classloader:1.0" export-all="NON_EMPTY" import-all="true">
+ <!-- FIXME
+ <root>${jboss.lib.url}jboss-j2se.jar</root>
+ <root>${jboss.lib.url}jboss-mbeans.jar</root>
+ <root>${jboss.lib.url}jboss-jmx.jar</root>
+ <root>${jboss.lib.url}jboss-system-jmx.jar</root>
+ <root>${jboss.lib.url}dom4j.jar</root>
+ -->
+ </classloader>
+
+ <bean name="ServerInfo" class="org.jboss.system.server.ServerInfo">
+ <alias>jboss.system:type=ServerInfo</alias>
+ </bean>
+
+ <!-- The legacy JMX kernel -->
+ <bean name="JMXKernel" class="org.jboss.system.server.jmx.JMXKernel">
+ <property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property>
+ <property name="serverImpl"><inject bean="JBossServer"/></property>
+ <property name="serverInfo"><inject bean="ServerInfo"/></property>
+ </bean>
+
+</deployment>
Copied: trunk/server/src/etc/conf/default/bootstrap/profile-repository.xml (from rev 81273, trunk/server/src/etc/conf/default/profile-repository.xml)
===================================================================
--- trunk/server/src/etc/conf/default/bootstrap/profile-repository.xml (rev 0)
+++ trunk/server/src/etc/conf/default/bootstrap/profile-repository.xml 2008-11-19 09:54:09 UTC (rev 81277)
@@ -0,0 +1,59 @@
+<?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="AttachmentsSerializer"/></property>
+ <property name="mainDeployer"><inject bean="MainDeployer"/></property>
+ </bean>
+ <bean name="AttachmentsSerializer" class="org.jboss.system.server.profileservice.repository.JAXBAttachmentSerializer">
+ <!-- TODO This is getting set in the DeploymentRepository.load, to make sure that we use the same directory.
+ <property name="attachmentsStoreDir">${jboss.server.home.dir}attachments</property>
+ -->
+ </bean>
+
+ <!-- The Bootstrap implementation that loads the Profile from the ProfileService -->
+ <bean name="ProfileServiceBootstrap" class="org.jboss.system.server.profileservice.ProfileServiceBootstrap">
+ <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>
+ </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>
Copied: trunk/server/src/etc/conf/default/bootstrap/profile.xml (from rev 81273, trunk/server/src/etc/conf/default/profile.xml)
===================================================================
--- trunk/server/src/etc/conf/default/bootstrap/profile.xml (rev 0)
+++ trunk/server/src/etc/conf/default/bootstrap/profile.xml 2008-11-19 09:54:09 UTC (rev 81277)
@@ -0,0 +1,80 @@
+<?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>
+ <property name="filter">
+ <bean class="org.jboss.system.server.profile.basic.XmlIncludeVirtualFileFilter"/>
+ </property>
+ </bean>
+
+ <bean name="ProfileServiceBootstrap" class="org.jboss.system.server.profileservice.ProfileServiceBootstrap">
+ <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>
+ </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>
+
+</deployment>
Copied: trunk/server/src/etc/conf/default/bootstrap/security.xml (from rev 81273, trunk/server/src/etc/conf/default/security.xml)
===================================================================
--- trunk/server/src/etc/conf/default/bootstrap/security.xml (rev 0)
+++ trunk/server/src/etc/conf/default/bootstrap/security.xml 2008-11-19 09:54:09 UTC (rev 81277)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ The Security Policy Subsystem
+-->
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <classloader><inject bean="security-classloader:0.0.0"/></classloader>
+
+ <classloader name="security-classloader" xmlns="urn:jboss:classloader:1.0" export-all="NON_EMPTY" import-all="true"/>
+
+ <!-- Installation of a security manager -->
+ <bean name="SecurityPolicy" class="org.jboss.system.server.security.SecurityPolicy">
+ <property name="securityManager"><javabean xmlns="urn:jboss:javabean:2.0" class="java.lang.SecurityManager"/></property>
+ <property name="policyURL">${jboss.server.config.url}/java.policy</property>
+ </bean>
+
+</deployment>
Copied: trunk/server/src/etc/conf/default/bootstrap/vfs.xml (from rev 81274, trunk/server/src/etc/conf/default/vfs.xml)
===================================================================
--- trunk/server/src/etc/conf/default/bootstrap/vfs.xml (rev 0)
+++ trunk/server/src/etc/conf/default/bootstrap/vfs.xml 2008-11-19 09:54:09 UTC (rev 81277)
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ The JBossAS initializer configuration.
+-->
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="VFSCache">
+ <constructor factoryClass="org.jboss.virtual.spi.cache.VFSCacheFactory" factoryMethod="getInstance">
+ <!-- Use the TimedVFSCache implementation -->
+ <parameter>org.jboss.virtual.plugins.cache.TimedVFSCache</parameter>
+ </constructor>
+ <start ignored="true"/>
+ </bean>
+
+ <bean name="JBossVFSInitializer" class="org.jboss.virtual.plugins.cache.PreInitializeVFSContexts">
+ <property name="initializedVFSContexts">
+ <list elementClass="java.net.URL">
+ <value>${jboss.lib.url}</value>
+ <value>${jboss.common.lib.url}</value>
+ <value>${jboss.server.lib.url}</value>
+ </list>
+ </property>
+ <property name="holdReference">true</property>
+ </bean>
+
+</deployment>
Modified: trunk/server/src/etc/conf/default/bootstrap-minimal.xml
===================================================================
--- trunk/server/src/etc/conf/default/bootstrap-minimal.xml 2008-11-19 09:19:41 UTC (rev 81276)
+++ trunk/server/src/etc/conf/default/bootstrap-minimal.xml 2008-11-19 09:54:09 UTC (rev 81277)
@@ -1,15 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
- The list of configurations used to bootstrap the server
- using hot deployment for the profile service
+ The list of URLs for mc beans to load during bootstrap.
+ $Id:$
-->
<bootstrap xmlns="urn:jboss:bootstrap:1.0">
- <url>classloader.xml</url>
- <url>aop.xml</url>
- <url>jmx.xml</url>
- <url>deployers.xml</url>
- <url>profile.xml</url>
+ <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/default/bootstrap-minimal.xml
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: trunk/server/src/etc/conf/default/bootstrap-norepo.xml
===================================================================
--- trunk/server/src/etc/conf/default/bootstrap-norepo.xml 2008-11-19 09:19:41 UTC (rev 81276)
+++ trunk/server/src/etc/conf/default/bootstrap-norepo.xml 2008-11-19 09:54:09 UTC (rev 81277)
@@ -1,17 +1,16 @@
<?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>vfs.xml</url>
- <url>classloader.xml</url>
- <url>aop.xml</url>
- <url>jmx.xml</url>
- <url>deployers.xml</url>
- <url>bindings.xml</url>
- <url>profile.xml</url>
+ <url>bootstrap/vfs.xml</url>
+ <url>bootstrap/classloader.xml</url>
+ <url>bootstrap/aop.xml</url>
+ <url>bootstrap/jmx.xml</url>
+ <url>bootstrap/deployers.xml</url>
+ <url>bootstrap/bindings.xml</url>
+ <url>bootstrap/profile.xml</url>
</bootstrap>
Modified: trunk/server/src/etc/conf/default/bootstrap.xml
===================================================================
--- trunk/server/src/etc/conf/default/bootstrap.xml 2008-11-19 09:19:41 UTC (rev 81276)
+++ trunk/server/src/etc/conf/default/bootstrap.xml 2008-11-19 09:54:09 UTC (rev 81277)
@@ -5,12 +5,12 @@
-->
<bootstrap xmlns="urn:jboss:bootstrap:1.0">
- <url>vfs.xml</url>
- <url>classloader.xml</url>
- <url>aop.xml</url>
- <url>jmx.xml</url>
- <url>deployers.xml</url>
- <url>bindings.xml</url>
- <url>profile-repository.xml</url>
+ <url>bootstrap/vfs.xml</url>
+ <url>bootstrap/classloader.xml</url>
+ <url>bootstrap/aop.xml</url>
+ <url>bootstrap/jmx.xml</url>
+ <url>bootstrap/deployers.xml</url>
+ <url>bootstrap/bindings.xml</url>
+ <url>bootstrap/profile-repository.xml</url>
</bootstrap>
Deleted: trunk/server/src/etc/conf/default/classloader.xml
===================================================================
--- trunk/server/src/etc/conf/default/classloader.xml 2008-11-19 09:19:41 UTC (rev 81276)
+++ trunk/server/src/etc/conf/default/classloader.xml 2008-11-19 09:54:09 UTC (rev 81277)
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- The core classloading system
--->
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <classloader><inject bean="bootstrap-classloader:0.0.0"/></classloader>
-
- <!--
- The classloader implementation
- -->
- <bean name="ClassLoaderSystem" class="org.jboss.classloader.spi.ClassLoaderSystem">
- <classloader><null/></classloader>
- <constructor factoryClass="org.jboss.classloader.spi.ClassLoaderSystem" factoryMethod="getInstance"/>
- </bean>
-
- <!--
- ClassLoader management and resolution
- -->
- <bean name="ClassLoading" class="org.jboss.classloading.spi.dependency.ClassLoading">
- <classloader><null/></classloader>
- <incallback method="addModule" state="Configured"/>
- <uncallback method="removeModule" state="Configured"/>
- </bean>
-
- <classloader name="bootstrap-classloader" xmlns="urn:jboss:classloader:1.0" export-all="NON_EMPTY" import-all="true">
- <!-- FIXME Move to Deployers -->
- <root>${jboss.lib.url}jboss-deployers-core-spi.jar</root>
- <root>${jboss.lib.url}jboss-deployers-core.jar</root>
- <root>${jboss.lib.url}jboss-deployers-client-spi.jar</root>
- <root>${jboss.lib.url}jboss-deployers-client.jar</root>
- <root>${jboss.lib.url}jboss-deployers-structure-spi.jar</root>
- <root>${jboss.lib.url}jboss-deployers-spi.jar</root>
- <root>${jboss.lib.url}jboss-deployers-impl.jar</root>
- <root>${jboss.lib.url}jboss-deployers-vfs-spi.jar</root>
- <root>${jboss.lib.url}jboss-deployers-vfs.jar</root>
- <!-- System -->
- <root>${jboss.lib.url}jboss-system.jar</root>
- <root>${jboss.lib.url}jboss-profileservice-spi.jar</root>
- <!-- FIXME Move to JMX -->
- <root>${jboss.lib.url}jboss-j2se.jar</root>
- <root>${jboss.lib.url}jboss-mbeans.jar</root>
- <root>${jboss.lib.url}jboss-jmx.jar</root>
- <root>${jboss.lib.url}jboss-system-jmx.jar</root>
- <root>${jboss.lib.url}dom4j.jar</root>
- <!-- JAXB impl here, api is in endorsed -->
- <root>${jboss.lib.url}jaxb-impl.jar</root>
- <!-- STAX2 impl here, api is in endorsed -->
- <root>${jboss.lib.url}wstx.jar</root>
- </classloader>
-
-</deployment>
Deleted: trunk/server/src/etc/conf/default/deployers.xml
===================================================================
--- trunk/server/src/etc/conf/default/deployers.xml 2008-11-19 09:19:41 UTC (rev 81276)
+++ trunk/server/src/etc/conf/default/deployers.xml 2008-11-19 09:54:09 UTC (rev 81277)
@@ -1,225 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- The base deployers
--->
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <classloader><inject bean="deployers-classloader:0.0.0"/></classloader>
-
- <classloader name="deployers-classloader" xmlns="urn:jboss:classloader:1.0" export-all="NON_EMPTY" import-all="true">
- <!-- FIXME
- <root>${jboss.lib.url}jboss-deployers-core-spi.jar</root>
- <root>${jboss.lib.url}jboss-deployers-core.jar</root>
- <root>${jboss.lib.url}jboss-deployers-client-spi.jar</root>
- <root>${jboss.lib.url}jboss-deployers-client.jar</root>
- <root>${jboss.lib.url}jboss-deployers-structure-spi.jar</root>
- <root>${jboss.lib.url}jboss-deployers-spi.jar</root>
- <root>${jboss.lib.url}jboss-deployers-impl.jar</root>
- <root>${jboss.lib.url}jboss-deployers-vfs-spi.jar</root>
- <root>${jboss.lib.url}jboss-deployers-vfs.jar</root>
- -->
- </classloader>
-
- <!-- use legacy ordering -->
- <bean name="topContextComparator">
- <constructor factoryClass="org.jboss.system.deployers.LegacyDeploymentContextComparator" factoryMethod="getInstance"/>
- </bean>
-
- <!-- The ManagedObjectFactory -->
- <bean name="ManagedObjectFactory">
- <constructor factoryClass="org.jboss.managed.api.factory.ManagedObjectFactory" factoryMethod="getInstance"/>
- <!-- Accept any implementor of InstanceClassFactory -->
- <incallback method="addInstanceClassFactory"/>
- <uncallback method="removeInstanceClassFactory"/>
- </bean>
- <!-- The ManagedObjectCreator implementation -->
- <bean name="ManagedObjectCreator" class="org.jboss.deployers.spi.deployer.helpers.DefaultManagedObjectCreator">
- <property name="mof"><inject bean="ManagedObjectFactory"/></property>
- </bean>
-
- <!-- The MainDeployer -->
- <bean name="MainDeployer" class="org.jboss.deployers.plugins.main.MainDeployerImpl">
- <property name="structuralDeployers"><inject bean="StructuralDeployers"/></property>
- <property name="deployers"><inject bean="Deployers"/></property>
- <property name="mgtDeploymentCreator"><inject bean="ManagedDeploymentCreator"/></property>
- <property name="comparator"><inject bean="topContextComparator"/></property>
- </bean>
-
- <!-- The ManagedDeploymentCreator implementation that supports mapping
- attachment types to ManagedDeployment#getTypes
- -->
- <bean name="ManagedDeploymentCreator" class="org.jboss.deployers.plugins.managed.TypedManagedDeploymentCreator" />
-
- <!-- The holder for deployers that determine structure -->
- <bean name="StructuralDeployers" class="org.jboss.deployers.vfs.plugins.structure.VFSStructuralDeployersImpl">
- <property name="structureBuilder">
- <!-- The consolidator of the structure information -->
- <bean name="StructureBuilder" class="org.jboss.deployers.vfs.plugins.structure.VFSStructureBuilder"/>
- </property>
- <!-- Accept any implementor of structure deployer -->
- <incallback method="addDeployer"/>
- <uncallback method="removeDeployer"/>
- </bean>
-
- <!-- The holder for deployers that do real deployment -->
- <bean name="Deployers" class="org.jboss.deployers.plugins.deployers.DeployersImpl">
- <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.deployment:service=DeployersImpl", exposedInterface=org.jboss.deployers.plugins.deployers.DeployersImplMBean.class, registerDirectly=true)</annotation>
- <constructor><parameter><inject bean="jboss.kernel:service=KernelController"/></parameter></constructor>
- <!-- Accept any implementor of deployer -->
- <incallback method="addDeployer"/>
- <uncallback method="removeDeployer"/>
- <property name="mgtObjectCreator"><inject bean="ManagedObjectCreator"/></property>
- </bean>
-
- <!-- A declared structure descriptor deployer -->
- <bean name="DeclaredStructure" class="org.jboss.deployers.vfs.plugins.structure.explicit.DeclaredStructure"/>
-
- <!-- JAR Structure -->
- <bean name="JARStructure" class="org.jboss.deployers.vfs.plugins.structure.jar.JARStructure">
- <!-- Unless specified the default list of suffixes is .zip, .ear, .jar, ,.rar, .war, .sar, .har, .aop -->
- <constructor>
- <parameter>
- <set elementClass="java.lang.String">
- <value>.zip</value>
- <value>.ear</value>
- <value>.jar</value>
- <value>.rar</value>
- <value>.war</value>
- <value>.sar</value>
- <value>.har</value>
- <value>.aop</value>
- <value>.deployer</value>
- <value>.beans</value>
- </set>
- </parameter>
- </constructor>
- <property name="candidateStructureVisitorFactory">
- <!-- Any file that is not an ordinary directory is a candidate -->
- <bean name="JARStructureCandidates" class="org.jboss.deployers.vfs.spi.structure.helpers.DefaultCandidateStructureVisitorFactory">
- <!-- A filter to exclude some obvious non-subdeployments -->
- <property name="filter">
- <bean name="JARFilter" class="org.jboss.virtual.plugins.vfs.helpers.SuffixesExcludeFilter">
- <constructor><parameter>
- <list elementClass="java.lang.String">
- <!-- Exclude class files as subdeployments -->
- <value>.class</value>
- </list>
- </parameter></constructor>
- </bean>
- </property>
- </bean>
- </property>
- </bean>
-
- <!-- File Structure -->
- <bean name="FileStructure" class="org.jboss.deployers.vfs.plugins.structure.file.FileStructure">
- <!-- Unless specified the default list of suffixes is -service.xml, -beans.xml, -ds.xml, -aop.xml -->
- <constructor>
- <parameter>
- <set elementClass="java.lang.String">
- <value>-service.xml</value>
- <value>-beans.xml</value>
- <value>-ds.xml</value>
- <value>-aop.xml</value>
- </set>
- </parameter>
- </constructor>
- </bean>
-
- <!-- Old AOP deployment
- <bean name="AspectAppParsingDeployer" class="org.jboss.aop.asintegration.jboss5.AspectAppParsingDeployer"/>
- <bean name="AspectDeployer" class="org.jboss.aop.asintegration.jboss5.AspectDeployer">
- <property name="aspectManager"><inject bean="AspectManager" property="aspectManager"/></property>
- </bean>
- -->
-
- <bean name="AOPXMLMetaDataParserDeployer" class="org.jboss.deployers.vfs.spi.deployer.SchemaResolverDeployer">
- <constructor>
- <parameter>org.jboss.aop.microcontainer.beans.metadata.AOPDeployment</parameter>
- </constructor>
- <property name="suffix">-aop.xml</property>
- </bean>
- <bean name="AOPAnnotationMetaDataParserDeployer" class="org.jboss.aop.asintegration.jboss5.AOPAnnotationMetaDataParserDeployer">
- <constructor>
- <parameter><inject bean="AOPXMLMetaDataParserDeployer" property="relativeOrder"/></parameter>
- </constructor>
- </bean>
- <bean name="AOPClassLoaderDeployer" class="org.jboss.aop.asintegration.jboss5.AOPClassLoaderDeployer">
- <property name="aspectManager"><inject bean="AspectManager" property="aspectManager"/></property>
- </bean>
- <bean name="AOPDeploymentAopMetaDataDeployer" class="org.jboss.aop.asintegration.jboss5.AOPDeploymentAopMetaDataDeployer">
- <property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property>
- <property name="aspectManager"><inject bean="AspectManager" property="aspectManager"/></property>
- </bean>
- <bean name="BeansDeploymentAopMetaDataDeployer" class="org.jboss.aop.asintegration.jboss5.BeansDeploymentAopMetaDataDeployer">
- <property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property>
- <property name="aspectManager"><inject bean="AspectManager" property="aspectManager"/></property>
- </bean>
-
- <!-- POJO Deployment -->
- <bean name="BeanMetaDataICF" class="org.jboss.deployers.plugins.managed.BeanMetaDataICF">
- <property name="controller"><inject bean="jboss.kernel:service=KernelController"/></property>
- </bean>
- <bean name="KernelDeploymentManagedObjectCreator" class="org.jboss.deployers.plugins.managed.KernelDeploymentManagedObjectCreator">
- <constructor><parameter><inject bean="ManagedObjectFactory"/></parameter></constructor>
- </bean>
- <bean name="BeanDeployer" class="org.jboss.deployers.vfs.deployer.kernel.BeanDeployer">
- <property name="suffix">jboss-beans.xml</property>
- </bean>
- <bean name="KernelDeploymentDeployer" class="org.jboss.deployers.vfs.deployer.kernel.KernelDeploymentDeployer">
- <install bean="ManagedDeploymentCreator" method="addAttachmentType">
- <parameter>
- <value>org.jboss.kernel.spi.deployment.KernelDeployment</value>
- </parameter>
- <parameter>
- <value>beans</value>
- </parameter>
- </install>
- <uninstall bean="ManagedDeploymentCreator" method="removeAttachmentType">
- <parameter>
- <value>org.jboss.kernel.spi.deployment.KernelDeployment</value>
- </parameter>
- </uninstall>
- <property name="mgtObjectCreator"><inject bean="KernelDeploymentManagedObjectCreator"/></property>
- </bean>
- <bean name="BeanMetaDataDeployer" class="org.jboss.deployers.vfs.deployer.kernel.BeanMetaDataDeployer">
- <constructor><parameter class="org.jboss.kernel.Kernel"><inject bean="jboss.kernel:service=Kernel"/></parameter></constructor>
- </bean>
-
- <!-- JMX Deployment -->
- <bean name="ServiceMetaDataICF" class="org.jboss.system.deployers.managed.ServiceMetaDataICF">
- <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property>
- </bean>
- <bean name="SARDeployer" class="org.jboss.system.deployers.SARDeployer">
- </bean>
- <bean name="ServiceClassLoaderDeployer" class="org.jboss.system.deployers.ServiceClassLoaderDeployer"/>
- <bean name="ServiceDeploymentDeployer" class="org.jboss.system.deployers.ServiceDeploymentDeployer">
- </bean>
- <bean name="ServiceDeployer" class="org.jboss.system.deployers.ServiceDeployer">
- <constructor><parameter><inject bean="JMXKernel" property="serviceController"/></parameter></constructor>
- </bean>
-
- <bean name="ClassLoadingMetaDataParser" class="org.jboss.deployers.vfs.spi.deployer.SchemaResolverDeployer">
- <constructor>
- <parameter>org.jboss.classloading.spi.metadata.ClassLoadingMetaData</parameter>
- </constructor>
- <property name="name">jboss-classloading.xml</property>
- <property name="buildManagedObject">true</property>
- </bean>
- <bean name="ClassLoadingDefaultDeployer" class="org.jboss.deployers.plugins.classloading.ClassLoadingDefaultDeployer">
- <property name="defaultMetaData">
- <classloading xmlns="urn:jboss:classloading:1.0" export-all="NON_EMPTY" import-all="true"/>
- </property>
- </bean>
- <bean name="InMemoryClassesDeployer" class="org.jboss.deployers.vfs.plugins.classloader.InMemoryClassesDeployer"/>
- <bean name="ClassLoaderClassPathDeployer" class="org.jboss.deployers.vfs.plugins.classloader.VFSClassLoaderClassPathDeployer"/>
- <bean name="ClassLoaderDescribeDeployer" class="org.jboss.deployers.vfs.plugins.classloader.VFSClassLoaderDescribeDeployer">
- <property name="classLoading"><inject bean="ClassLoading"/></property>
- </bean>
- <bean name="ClassLoaderDeployer" class="org.jboss.deployers.plugins.classloading.AbstractLevelClassLoaderSystemDeployer">
- <property name="classLoading"><inject bean="ClassLoading"/></property>
- <property name="system"><inject bean="ClassLoaderSystem"/></property>
- </bean>
-
-</deployment>
Modified: trunk/server/src/etc/conf/default/jboss-minimal.xml
===================================================================
--- trunk/server/src/etc/conf/default/jboss-minimal.xml 2008-11-19 09:19:41 UTC (rev 81276)
+++ trunk/server/src/etc/conf/default/jboss-minimal.xml 2008-11-19 09:54:09 UTC (rev 81277)
@@ -18,7 +18,8 @@
<!-- Log4j Initialization -->
<!-- ==================================================================== -->
<mbean code="org.jboss.logging.Log4jService"
- name="jboss.system:type=Log4jService,service=Logging">
+ 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
Modified: trunk/server/src/etc/conf/default/jboss-service.xml
===================================================================
--- trunk/server/src/etc/conf/default/jboss-service.xml 2008-11-19 09:19:41 UTC (rev 81276)
+++ trunk/server/src/etc/conf/default/jboss-service.xml 2008-11-19 09:54:09 UTC (rev 81277)
@@ -72,7 +72,7 @@
<mbean code="org.jboss.logging.Log4jService"
name="jboss.system:type=Log4jService,service=Logging"
- xmbean-dd="resource:xmdesc/Log4jService-xmbean.xml">
+ xmbean-dd="resource:xmdesc/Log4jService-xmbean.xml">
<attribute name="ConfigurationURL">resource:jboss-log4j.xml</attribute>
<!-- Set the org.apache.log4j.helpers.LogLog.setQuiteMode. As of log4j1.2.8
this needs to be set to avoid a possible deadlock on exception at the
Deleted: trunk/server/src/etc/conf/default/jmx.xml
===================================================================
--- trunk/server/src/etc/conf/default/jmx.xml 2008-11-19 09:19:41 UTC (rev 81276)
+++ trunk/server/src/etc/conf/default/jmx.xml 2008-11-19 09:54:09 UTC (rev 81277)
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- The JMX Subsystem
--->
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <classloader><inject bean="jmx-classloader:0.0.0"/></classloader>
-
- <classloader name="jmx-classloader" xmlns="urn:jboss:classloader:1.0" export-all="NON_EMPTY" import-all="true">
- <!-- FIXME
- <root>${jboss.lib.url}jboss-j2se.jar</root>
- <root>${jboss.lib.url}jboss-mbeans.jar</root>
- <root>${jboss.lib.url}jboss-jmx.jar</root>
- <root>${jboss.lib.url}jboss-system-jmx.jar</root>
- <root>${jboss.lib.url}dom4j.jar</root>
- -->
- </classloader>
-
- <bean name="ServerInfo" class="org.jboss.system.server.ServerInfo">
- <alias>jboss.system:type=ServerInfo</alias>
- </bean>
-
- <!-- The legacy JMX kernel -->
- <bean name="JMXKernel" class="org.jboss.system.server.jmx.JMXKernel">
- <property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property>
- <property name="serverImpl"><inject bean="JBossServer"/></property>
- <property name="serverInfo"><inject bean="ServerInfo"/></property>
- </bean>
-
-</deployment>
Deleted: trunk/server/src/etc/conf/default/profile-repository.xml
===================================================================
--- trunk/server/src/etc/conf/default/profile-repository.xml 2008-11-19 09:19:41 UTC (rev 81276)
+++ trunk/server/src/etc/conf/default/profile-repository.xml 2008-11-19 09:54:09 UTC (rev 81277)
@@ -1,59 +0,0 @@
-<?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="AttachmentsSerializer"/></property>
- <property name="mainDeployer"><inject bean="MainDeployer"/></property>
- </bean>
- <bean name="AttachmentsSerializer" class="org.jboss.system.server.profileservice.repository.JAXBAttachmentSerializer">
- <!-- TODO This is getting set in the DeploymentRepository.load, to make sure that we use the same directory.
- <property name="attachmentsStoreDir">${jboss.server.home.dir}attachments</property>
- -->
- </bean>
-
- <!-- The Bootstrap implementation that loads the Profile from the ProfileService -->
- <bean name="ProfileServiceBootstrap" class="org.jboss.system.server.profileservice.ProfileServiceBootstrap">
- <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>
- </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.xml
===================================================================
--- trunk/server/src/etc/conf/default/profile.xml 2008-11-19 09:19:41 UTC (rev 81276)
+++ trunk/server/src/etc/conf/default/profile.xml 2008-11-19 09:54:09 UTC (rev 81277)
@@ -1,80 +0,0 @@
-<?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>
- <property name="filter">
- <bean class="org.jboss.system.server.profile.basic.XmlIncludeVirtualFileFilter"/>
- </property>
- </bean>
-
- <bean name="ProfileServiceBootstrap" class="org.jboss.system.server.profileservice.ProfileServiceBootstrap">
- <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>
- </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>
-
-</deployment>
Deleted: trunk/server/src/etc/conf/default/security.xml
===================================================================
--- trunk/server/src/etc/conf/default/security.xml 2008-11-19 09:19:41 UTC (rev 81276)
+++ trunk/server/src/etc/conf/default/security.xml 2008-11-19 09:54:09 UTC (rev 81277)
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- The Security Policy Subsystem
--->
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <classloader><inject bean="security-classloader:0.0.0"/></classloader>
-
- <classloader name="security-classloader" xmlns="urn:jboss:classloader:1.0" export-all="NON_EMPTY" import-all="true"/>
-
- <!-- Installation of a security manager -->
- <bean name="SecurityPolicy" class="org.jboss.system.server.security.SecurityPolicy">
- <property name="securityManager"><javabean xmlns="urn:jboss:javabean:2.0" class="java.lang.SecurityManager"/></property>
- <property name="policyURL">${jboss.server.config.url}/java.policy</property>
- </bean>
-
-</deployment>
Deleted: trunk/server/src/etc/conf/default/vfs.xml
===================================================================
--- trunk/server/src/etc/conf/default/vfs.xml 2008-11-19 09:19:41 UTC (rev 81276)
+++ trunk/server/src/etc/conf/default/vfs.xml 2008-11-19 09:54:09 UTC (rev 81277)
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- The JBossAS initializer configuration.
--->
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <bean name="VFSCache">
- <constructor factoryClass="org.jboss.virtual.spi.cache.VFSCacheFactory" factoryMethod="getInstance">
- <!-- Use the TimedVFSCache implementation -->
- <parameter>org.jboss.virtual.plugins.cache.TimedVFSCache</parameter>
- </constructor>
- <start ignored="true"/>
- </bean>
-
- <bean name="JBossVFSInitializer" class="org.jboss.virtual.plugins.cache.PreInitializeVFSContexts">
- <property name="initializedVFSContexts">
- <list elementClass="java.net.URL">
- <value>${jboss.lib.url}</value>
- <value>${jboss.common.lib.url}</value>
- <value>${jboss.server.lib.url}</value>
- </list>
- </property>
- <property name="holdReference">true</property>
- </bean>
-
-</deployment>
More information about the jboss-cvs-commits
mailing list