[jboss-cvs] JBossAS SVN: r85854 - in projects/jboss-osgi/trunk/build/distribution: src/main/etc/jboss501/server and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sun Mar 15 09:38:20 EDT 2009
Author: thomas.diesler at jboss.com
Date: 2009-03-15 09:38:19 -0400 (Sun, 15 Mar 2009)
New Revision: 85854
Added:
projects/jboss-osgi/trunk/build/distribution/src/main/etc/jboss501/server/deploy/
Removed:
projects/jboss-osgi/trunk/build/distribution/src/main/etc/jboss501/server/conf/bootstrap/
Modified:
projects/jboss-osgi/trunk/build/distribution/scripts/antrun-runtime.xml
projects/jboss-osgi/trunk/build/distribution/src/main/etc/jboss501/server/conf/bootstrap.xml
projects/jboss-osgi/trunk/build/distribution/src/main/etc/jboss501/server/conf/jboss-service.xml
Log:
Build minimal runtime based on default that actually works.
Modified: projects/jboss-osgi/trunk/build/distribution/scripts/antrun-runtime.xml
===================================================================
--- projects/jboss-osgi/trunk/build/distribution/scripts/antrun-runtime.xml 2009-03-15 12:37:04 UTC (rev 85853)
+++ projects/jboss-osgi/trunk/build/distribution/scripts/antrun-runtime.xml 2009-03-15 13:38:19 UTC (rev 85854)
@@ -16,27 +16,14 @@
<!-- Setup -->
<!-- ================================================================== -->
<property name="output.dir" value="${basedir}/target" />
- <property name="source.dir" value="${basedir}/src/main/etc/jboss501" />
- <property name="source.server.conf" value="${source.dir}/server/conf" />
+ <property name="jboss.overwrite.dir" value="${basedir}/src/main/etc/jboss501" />
<property name="jboss.source.dir" value="${jboss501.home}" />
- <property name="jboss.source.bin" value="${jboss.source.dir}/bin" />
- <property name="jboss.source.lib" value="${jboss.source.dir}/lib" />
- <property name="jboss.source.common.lib" value="${jboss.source.dir}/common/lib" />
- <property name="jboss.source.server" value="${jboss.source.dir}/server/default" />
- <property name="jboss.source.server.conf" value="${jboss.source.server}/conf" />
- <property name="jboss.source.server.deploy" value="${jboss.source.server}/deploy" />
- <property name="jboss.source.server.deployers" value="${jboss.source.server}/deployers" />
+ <property name="jboss.source.server.dir" value="${jboss.source.dir}/server/default" />
- <property name="jboss.runtime.version" value="jboss-osgi-runtime-${project.version}" />
- <property name="jboss.target.dir" value="${output.dir}/${jboss.runtime.version}" />
- <property name="jboss.target.bin" value="${jboss.target.dir}/bin" />
- <property name="jboss.target.lib" value="${jboss.target.dir}/lib" />
- <property name="jboss.target.common.lib" value="${jboss.target.dir}/common/lib" />
- <property name="jboss.target.server" value="${jboss.target.dir}/server/default" />
- <property name="jboss.target.server.conf" value="${jboss.target.server}/conf" />
- <property name="jboss.target.server.deploy" value="${jboss.target.server}/deploy" />
- <property name="jboss.target.server.deployers" value="${jboss.target.server}/deployers" />
+ <property name="jboss.target.name" value="jboss-osgi-runtime-${project.version}" />
+ <property name="jboss.target.dir" value="${output.dir}/${jboss.target.name}" />
+ <property name="jboss.target.server.dir" value="${jboss.target.dir}/server/default" />
<!-- ================================================================== -->
<!-- Initialization -->
@@ -54,105 +41,161 @@
<echo message="JBoss Target: ${jboss.target.dir}"/>
<echo/>
- <mkdir dir="${jboss.target.bin}"/>
- <mkdir dir="${jboss.target.lib}"/>
- <mkdir dir="${jboss.target.common.lib}"/>
- <mkdir dir="${jboss.target.server}"/>
- <mkdir dir="${jboss.target.server.deploy}"/>
+ <mkdir dir="${jboss.target.server.dir}/lib"/>
<!-- BIN -->
- <copy todir="${jboss.target.bin}">
- <fileset dir="${jboss.source.bin}">
- <include name="run.*"/>
+ <copy todir="${jboss.target.dir}">
+ <fileset dir="${jboss.source.dir}">
+ <include name="bin/run.*"/>
</fileset>
</copy>
<chmod perm="+x">
- <fileset dir="${jboss.target.bin}">
+ <fileset dir="${jboss.target.dir}/bin">
<include name="*.sh"/>
</fileset>
</chmod>
<!-- COMMON/LIB -->
- <copy todir="${jboss.target.common.lib}">
- <fileset dir="${jboss.source.common.lib}">
- <include name="jboss.jar"/>
+ <copy todir="${jboss.target.dir}">
+ <fileset dir="${jboss.source.dir}">
+ <include name="common/lib/commons-logging.jar"/>
+ <include name="common/lib/jboss-bindingservice.jar"/>
+ <include name="common/lib/jboss-integration.jar"/>
+ <include name="common/lib/jboss-javaee.jar"/>
+ <include name="common/lib/jboss-jsr88.jar"/>
+ <include name="common/lib/jboss-metadata.jar"/>
+ <include name="common/lib/jboss-remoting.jar"/>
+ <include name="common/lib/jboss-security-spi.jar"/>
+ <include name="common/lib/jboss-serialization.jar"/>
+ <include name="common/lib/jbossjta-integration.jar"/>
+ <include name="common/lib/jbossjta.jar"/>
+ <include name="common/lib/jbosssx.jar"/>
+ <include name="common/lib/jbossts-common.jar"/>
+ <include name="common/lib/jboss.jar"/>
+ <include name="common/lib/jmx-adaptor-plugin.jar"/>
+ <include name="common/lib/jnpserver.jar"/>
+ <include name="common/lib/log4j.jar"/>
</fileset>
</copy>
<!-- LIB -->
- <copy todir="${jboss.target.lib}">
- <fileset dir="${jboss.source.lib}">
-
- <include name="endorsed/activation.jar"/>
- <include name="endorsed/jaxb-api.jar"/>
- <include name="endorsed/resolver.jar"/>
- <include name="endorsed/serializer.jar"/>
- <include name="endorsed/stax-api.jar"/>
- <include name="endorsed/xalan.jar"/>
- <include name="endorsed/xercesImpl.jar"/>
-
- <include name="concurrent.jar"/>
- <include name="dom4j.jar"/>
- <include name="jaxb-impl.jar"/>
- <include name="jboss-bootstrap.jar"/>
- <include name="jboss-classloader.jar"/>
- <include name="jboss-classloading*.jar"/>
- <include name="jboss-common-core.jar"/>
- <include name="jboss-dependency.jar"/>
- <include name="jboss-deployers*.jar"/>
- <include name="jboss-j2se.jar"/>
- <include name="jboss-jmx.jar"/>
- <include name="jboss-kernel.jar"/>
- <include name="jboss-logging*.jar"/>
- <include name="jboss-managed.jar"/>
- <include name="jboss-mbeans.jar"/>
- <include name="jboss-metatype.jar"/>
- <include name="jboss-mdr.jar"/>
- <include name="jboss-profileservice-spi.jar"/>
- <include name="jboss-reflect.jar"/>
- <include name="jboss-system.jar"/>
- <include name="jboss-system-jmx.jar"/>
- <include name="jboss-vfs.jar"/>
- <include name="jboss-xml-binding.jar"/>
- <include name="log4j-boot.jar"/>
- <include name="wstx.jar"/>
+ <copy todir="${jboss.target.dir}">
+ <fileset dir="${jboss.source.dir}">
+ <include name="lib/endorsed/activation.jar"/>
+ <include name="lib/endorsed/jaxb-api.jar"/>
+ <include name="lib/endorsed/resolver.jar"/>
+ <include name="lib/endorsed/serializer.jar"/>
+ <include name="lib/endorsed/stax-api.jar"/>
+ <include name="lib/endorsed/xalan.jar"/>
+ <include name="lib/endorsed/xercesImpl.jar"/>
+ <include name="lib/concurrent.jar"/>
+ <include name="lib/dom4j.jar"/>
+ <include name="lib/javassist.jar"/>
+ <include name="lib/jaxb-impl.jar"/>
+ <include name="lib/jboss-aop-asintegration-core.jar"/>
+ <include name="lib/jboss-aop-asintegration-jmx.jar"/>
+ <include name="lib/jboss-aop-asintegration-mc.jar"/>
+ <include name="lib/jboss-aop-jboss5.jar"/>
+ <include name="lib/jboss-aop-mc-int.jar"/>
+ <include name="lib/jboss-aop.jar"/>
+ <include name="lib/jboss-bootstrap.jar"/>
+ <include name="lib/jboss-classloader.jar"/>
+ <include name="lib/jboss-classloading-spi.jar"/>
+ <include name="lib/jboss-classloading-vfs.jar"/>
+ <include name="lib/jboss-classloading.jar"/>
+ <include name="lib/jboss-common-core.jar"/>
+ <include name="lib/jboss-dependency.jar"/>
+ <include name="lib/jboss-deployers-client-spi.jar"/>
+ <include name="lib/jboss-deployers-client.jar"/>
+ <include name="lib/jboss-deployers-core-spi.jar"/>
+ <include name="lib/jboss-deployers-core.jar"/>
+ <include name="lib/jboss-deployers-impl.jar"/>
+ <include name="lib/jboss-deployers-spi.jar"/>
+ <include name="lib/jboss-deployers-structure-spi.jar"/>
+ <include name="lib/jboss-deployers-vfs-spi.jar"/>
+ <include name="lib/jboss-deployers-vfs.jar"/>
+ <include name="lib/jboss-j2se.jar"/>
+ <include name="lib/jboss-jmx.jar"/>
+ <include name="lib/jboss-kernel.jar"/>
+ <include name="lib/jboss-logging-jdk.jar"/>
+ <include name="lib/jboss-logging-log4j.jar"/>
+ <include name="lib/jboss-logging-spi.jar"/>
+ <include name="lib/jboss-managed.jar"/>
+ <include name="lib/jboss-mbeans.jar"/>
+ <include name="lib/jboss-mdr.jar"/>
+ <include name="lib/jboss-metatype.jar"/>
+ <include name="lib/jboss-profileservice-spi.jar"/>
+ <include name="lib/jboss-reflect.jar"/>
+ <include name="lib/jboss-system-jmx.jar"/>
+ <include name="lib/jboss-system.jar"/>
+ <include name="lib/jboss-vfs.jar"/>
+ <include name="lib/jboss-xml-binding.jar"/>
+ <include name="lib/log4j-boot.jar"/>
+ <include name="lib/trove.jar"/>
+ <include name="lib/wstx.jar"/>
</fileset>
</copy>
-
- <!-- SERVER/CONF -->
- <copy todir="${jboss.target.server.conf}">
- <fileset dir="${source.server.conf}">
- <include name="bootstrap.xml"/>
- <include name="jboss-log4j.xml"/>
- <include name="jboss-service.xml"/>
- <include name="bootstrap/deployers.xml"/>
- <include name="bootstrap/jmx.xml"/>
+
+ <!-- CONF -->
+ <copy todir="${jboss.target.server.dir}">
+ <fileset dir="${jboss.source.server.dir}">
+ <include name="conf/bootstrap/aop.xml"/>
+ <include name="conf/bootstrap/bindings.xml"/>
+ <include name="conf/bootstrap/classloader.xml"/>
+ <include name="conf/bootstrap/deployers.xml"/>
+ <include name="conf/bootstrap/jmx.xml"/>
+ <include name="conf/bootstrap/profile.xml"/>
+ <include name="conf/bootstrap/vfs.xml"/>
+ <include name="conf/xmdesc/ClientUserTransaction-xmbean.xml"/>
+ <include name="conf/xmdesc/Log4jService-xmbean.xml"/>
+ <include name="conf/xmdesc/NamingBean-xmbean.xml"/>
+ <include name="conf/xmdesc/NamingService-xmbean.xml"/>
+ <include name="conf/xmdesc/org.jboss.deployment.JARDeployer-xmbean.xml"/>
+ <include name="conf/xmdesc/org.jboss.deployment.MainDeployer-xmbean.xml"/>
+ <include name="conf/java.policy"/>
+ <include name="conf/jbossjta-properties.xml"/>
+ <include name="conf/jndi.properties"/>
</fileset>
- <fileset dir="${jboss.source.server.conf}">
- <include name="bootstrap/vfs.xml"/>
- <include name="bootstrap/classloader.xml"/>
- <include name="bootstrap/profile.xml"/>
+ <fileset dir="${jboss.overwrite.dir}/server">
+ <include name="conf/bootstrap.xml"/>
+ <include name="conf/jboss-log4j.xml"/>
+ <include name="conf/jboss-service.xml"/>
</fileset>
</copy>
-
- <!-- SERVER/DEPLOYERS
- <copy todir="${jboss.target.server.deployers}">
- <fileset dir="${jboss.source.server.deployers}">
- <include name="osgi.deployer/**"/>
+
+ <!-- DEPLOY -->
+ <copy todir="${jboss.target.server.dir}">
+ <fileset dir="${jboss.source.server.dir}">
+ <include name="deploy/jmx-remoting.sar/META-INF/jboss-service.xml"/>
+ <include name="deploy/jmx-remoting.sar/jbossas-jmx-remoting.jar"/>
+ <include name="deploy/hdscanner-jboss-beans.xml"/>
+ <include name="deploy/jmx-invoker-service.xml"/>
+ <include name="deploy/legacy-invokers-service.xml"/>
+ <include name="deploy/remoting-jboss-beans.xml"/>
+ <include name="deploy/transaction-jboss-beans.xml"/>
+ <include name="deploy/transaction-service.xml"/>
+ <include name="deploy/vfs-jboss-beans.xml"/>
</fileset>
</copy>
+
+ <!-- DEPLOYERS
+ <copy todir="${jboss.target.server.dir}">
+ <fileset dir="${jboss.source.server.dir}">
+ </fileset>
+ </copy>
-->
-
- <!-- SERVER/DEPLOY
- <copy todir="${jboss.target.server.deploy}">
- <fileset dir="${jboss.source.server.deploy}">
- <include name="osgi/**"/>
+
+ <!-- OSGi
+ <copy todir="${jboss.target.server.dir}">
+ <fileset dir="${jboss.source.server.dir}">
+ <include name="deploy/osgi/**"/>
+ <include name="deployers/osgi.deployer/**"/>
</fileset>
</copy>
-->
<!-- ZIP the Runtime distribution -->
- <zip destfile="${jboss.target.dir}.zip" basedir="${output.dir}" includes="${jboss.runtime.version}/**"/>
+ <zip destfile="${jboss.target.dir}.zip" basedir="${output.dir}" includes="${jboss.target.name}/**"/>
</target>
Modified: projects/jboss-osgi/trunk/build/distribution/src/main/etc/jboss501/server/conf/bootstrap.xml
===================================================================
--- projects/jboss-osgi/trunk/build/distribution/src/main/etc/jboss501/server/conf/bootstrap.xml 2009-03-15 12:37:04 UTC (rev 85853)
+++ projects/jboss-osgi/trunk/build/distribution/src/main/etc/jboss501/server/conf/bootstrap.xml 2009-03-15 13:38:19 UTC (rev 85854)
@@ -7,8 +7,10 @@
<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/jmx.xml</url>
+ <url>bootstrap/bindings.xml</url>
<url>bootstrap/profile.xml</url>
</bootstrap>
Modified: projects/jboss-osgi/trunk/build/distribution/src/main/etc/jboss501/server/conf/jboss-service.xml
===================================================================
--- projects/jboss-osgi/trunk/build/distribution/src/main/etc/jboss501/server/conf/jboss-service.xml 2009-03-15 12:37:04 UTC (rev 85853)
+++ projects/jboss-osgi/trunk/build/distribution/src/main/etc/jboss501/server/conf/jboss-service.xml 2009-03-15 13:38:19 UTC (rev 85854)
@@ -3,25 +3,67 @@
<!-- $Id$ -->
<!-- ===================================================================== -->
-<!-- A minimal JBoss Server Configuration -->
+<!-- JBoss Server Configuration -->
<!-- ===================================================================== -->
<server>
- <!-- Load all jars from the JBOSS_DIST/server/<config>/lib directory. This
- can be restricted to specific jars by specifying them in the archives
- attribute.
- -->
+ <!-- Load all jars from the JBOSS_HOME/server/<config>/lib directory and
+ the shared JBOSS_HOME/common/lib directory. This can be restricted to
+ specific jars by specifying them in the archives attribute.
+ -->
<classpath codebase="${jboss.server.lib.url}" archives="*"/>
<classpath codebase="${jboss.common.lib.url}" archives="*"/>
<!-- ==================================================================== -->
+ <!-- Main Deployer -->
+ <!-- ==================================================================== -->
+ <mbean code="org.jboss.deployment.MainDeployer"
+ name="jboss.system:service=MainDeployer">
+ <!-- This is used to delegate the deployment handling -->
+ <attribute name="KernelMainDeployer"><inject bean="MainDeployer" /></attribute>
+ <!-- This is used to validate incomplete deployments -->
+ <attribute name="Controller"><inject bean="jboss.kernel:service=Kernel" property="controller"/></attribute>
+ </mbean>
+
+ <!-- A Thread pool service -->
+ <mbean code="org.jboss.util.threadpool.BasicThreadPool"
+ name="jboss.system:service=ThreadPool">
+ <attribute name="Name">JBoss System Threads</attribute>
+ <attribute name="ThreadGroupName">System Threads</attribute>
+ <!-- How long a thread will live without any tasks in MS -->
+ <attribute name="KeepAliveTime">60000</attribute>
+ <!-- The max number of threads in the pool -->
+ <attribute name="MaximumPoolSize">10</attribute>
+ <!-- The max number of tasks before the queue is full -->
+ <attribute name="MaximumQueueSize">1000</attribute>
+ <!-- The behavior of the pool when a task is added and the queue is full.
+ abort - a RuntimeException is thrown
+ run - the calling thread executes the task
+ wait - the calling thread blocks until the queue has room
+ discard - the task is silently discarded without being run
+ discardOldest - check to see if a task is about to complete and enque
+ the new task if possible, else run the task in the calling thread
+ -->
+ <attribute name="BlockingMode">run</attribute>
+ </mbean>
+
+ <!-- ==================================================================== -->
<!-- Log4j Initialization -->
<!-- ==================================================================== -->
+
<mbean code="org.jboss.logging.Log4jService"
name="jboss.system:type=Log4jService,service=Logging"
xmbean-dd="resource:xmdesc/Log4jService-xmbean.xml">
- <attribute name="ConfigurationURL">resource:jboss-log4j.xml</attribute>
+ <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
+ appender level. See bug#696819.
+ -->
+ <attribute name="Log4jQuietMode">true</attribute>
+ <!-- How frequently in seconds the ConfigurationURL is checked for changes -->
+ <attribute name="RefreshPeriod">60</attribute>
+
<!-- The value to assign to system property jboss.server.log.threshold
if it is not already set. This system property in turn controls
the logging threshold for the server.log file.
@@ -30,4 +72,70 @@
<attribute name="DefaultJBossServerLogThreshold">DEBUG</attribute>
</mbean>
-</server>
+
+ <!-- ==================================================================== -->
+ <!-- JBoss RMI Classloader - only install when available -->
+ <!-- ==================================================================== -->
+ <mbean code="org.jboss.util.property.jmx.SystemPropertyClassValue"
+ name="jboss.rmi:type=RMIClassLoader">
+ <attribute name="Property">java.rmi.server.RMIClassLoaderSpi</attribute>
+ <attribute name="ClassName">org.jboss.system.JBossRMIClassLoader</attribute>
+ </mbean>
+
+ <!-- ==================================================================== -->
+ <!-- JNDI -->
+ <!-- ==================================================================== -->
+
+ <!-- A simple mbean wrapper around the jndi Naming object. This
+ only handles an in memory instance. The NamingService uses this
+ as the JNDI store and exposes it remotely.
+ -->
+ <mbean code="org.jnp.server.NamingBeanImpl"
+ name="jboss:service=NamingBeanImpl"
+ xmbean-dd="resource:xmdesc/NamingBean-xmbean.xml">
+ </mbean>
+
+ <mbean code="org.jboss.naming.NamingService"
+ name="jboss:service=Naming"
+ xmbean-dd="resource:xmdesc/NamingService-xmbean.xml">
+ <!-- The call by value mode. true if all lookups are unmarshalled using
+ the caller's TCL, false if in VM lookups return the value by reference.
+ -->
+ <attribute name="CallByValue">false</attribute>
+
+ <!-- The listening port for the bootstrap JNP service. Set this to -1
+ to run the NamingService without the JNP invoker listening port.
+ -->
+ <attribute name="Port">
+ <value-factory bean="ServiceBindingManager" method="getIntBinding">
+ <parameter>jboss:service=Naming</parameter>
+ <parameter>Port</parameter>
+ </value-factory>
+ </attribute>
+
+ <!-- The bootstrap JNP server bind address. This also sets the default
+ RMI service bind address. Empty == all addresses
+ -->
+ <attribute name="BindAddress">${jboss.bind.address}</attribute>
+ <!-- The port of the RMI naming service, 0 == anonymous -->
+ <attribute name="RmiPort">
+ <value-factory bean="ServiceBindingManager" method="getIntBinding">
+ <parameter>jboss:service=Naming</parameter>
+ <parameter>RmiPort</parameter>
+ </value-factory>
+ </attribute>
+ <!-- The RMI service bind address. Empty == all addresses
+ -->
+ <attribute name="RmiBindAddress">${jboss.bind.address}</attribute>
+ <!-- The thread pool service used to control the bootstrap lookups -->
+ <depends optional-attribute-name="LookupPool"
+ proxy-type="attribute">jboss.system:service=ThreadPool</depends>
+ <!-- An example of using the unifed invoker as the transport.
+ <depends optional-attribute-name="InvokerProxyFactory"
+ proxy-type="attribute">jboss:service=proxyFactory,type=unified,target=Naming</depends>
+ -->
+ <depends optional-attribute-name="Naming"
+ proxy-type="attribute">jboss:service=NamingBeanImpl</depends>
+ </mbean>
+
+</server>
\ No newline at end of file
More information about the jboss-cvs-commits
mailing list