User: user57
Date: 02/01/02 20:00:56
Modified: . build.xml
Log:
o migrated all components to a new JMX domain name model. jboss.system
is now where to core/spine components live. moved all components that
were in JBOSS-SYSTEM that did not move into a jboss.* domain into
jboss (where the server is now registered). The point was to limit the
members of jboss.system to core bits only.
o Created org.jboss.system.Server, which does the work of initialization
that org.jboss.Main used to do. Main now only parses the command line,
sets up basic legecy properties and creates a Server instance.
o Moved functionality of Shutdown (component not cl tool) into Server (
which is bound as jboss.system:service=Server)
o Moved more Runtime access from Info into Server. Exposed memory info
as attributes.
o Logging a WARN everywhere that uses System.getProperty("jboss.system.home")
as that should go away soon/eventually.
o Initialized the invokerMap in the harmi impl to avoid NPE
o Made getopt.jar a member of the lib/* dir instead of adding it to the
run.jar and shutdown.jars each time.
o Minor cosmetic changes along the way.
Revision Changes Path
1.49 +33 -33 jboss/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jboss/build.xml,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- build.xml 2001/12/18 21:40:21 1.48
+++ build.xml 2002/01/03 04:00:56 1.49
@@ -12,7 +12,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.48 2001/12/18 21:40:21 mnf999 Exp $ -->
+<!-- $Id: build.xml,v 1.49 2002/01/03 04:00:56 user57 Exp $ -->
<project default="main" name="JBoss/Server">
@@ -315,7 +315,12 @@
| documentation compiles.
-->
<target name="compile"
- depends="compile-bean-sources, compile-classes, compile-rmi, compile-etc,
compile-resources, compile-bin"
+ depends="compile-bean-sources,
+ compile-classes,
+ compile-rmi,
+ compile-etc,
+ compile-resources,
+ compile-bin"
description="Compile all source files."/>
<!-- Compile EJB beans with XDoclet -->
@@ -467,17 +472,18 @@
<mkdir dir="${build.lib}"/>
<!-- Build jboss.jar -->
- <jar jarfile="${build.lib}/jboss.jar"
- manifest="${build.etc}/jboss.mf">
+ <jar jarfile="${build.lib}/jboss.jar" manifest="${build.etc}/jboss.mf">
<fileset dir="${build.classes}">
<include name="org/jboss/**"/>
- <!-- Exclude Main, it will go into run.jar -->
- <exclude name="org/jboss/Main*"/>
- <!-- Exclude JMX Connector stuff we will use the connector JSR for that -->
+
+ <!-- Exclude command line utilities -->
+ <exclude name="org/jboss/*"/>
+
+ <!-- Exclude JMX Connector stuff we will use the connector SAR for that -->
<exclude name="org/jboss/jmx/**"/>
- <!-- But include this interface because the Farm needs it -->
- <include name="org/jboss/jmx/connector/RemoteMBeanServer.class"/>
</fileset>
+
+ <!-- HACK -->
<fileset dir="${build.classes}">
<!-- But include this interface because the Farm needs it -->
<include name="org/jboss/jmx/connector/RemoteMBeanServer.class"/>
@@ -493,18 +499,24 @@
</fileset>
</jar>
- <!-- Build jboss-boot.jar -->
+ <!--
+ | Build jboss-boot.jar
+ |
+ | This file is always local and contains the basic classed required
+ | to start the server and setup network service loading.
+ -->
<jar jarfile="${build.lib}/jboss-boot.jar">
<fileset dir="${build.classes}">
- <include name="org/jboss/system/BootstrapLogger.class"/>
- <include name="org/jboss/system/URLClassLoader.class"/>
- <include name="org/jboss/system/URLClassLoaderMBean.class"/>
- <include name="org/jboss/system/MBeanClassLoader.class"/>
- <include name="org/jboss/system/MBeanClassLoaderMBean.class"/>
- <include name="org/jboss/system/ServiceLibraries.class"/>
- <include name="org/jboss/system/ServiceLibrariesMBean.class"/>
- <include name="org/jboss/deployment/DeploymentException.class"/>
+ <include name="org/jboss/system/BootstrapLogger*"/>
+ <include name="org/jboss/system/URLClassLoader*"/>
+ <include name="org/jboss/system/MBeanClassLoader*"/>
+ <include name="org/jboss/system/ServiceLibraries*"/>
+ <include name="org/jboss/system/Server*"/>
+ <include name="org/jboss/Version*"/>
</fileset>
+ <fileset dir="${build.resources}">
+ <include name="org/jboss/version.properties"/>
+ </fileset>
</jar>
<!-- Build jboss-spine.jar -->
@@ -519,9 +531,7 @@
<include name="org/jboss/system/ServiceConfigurator.class"/>
<include name="org/jboss/system/ServiceControllerMBean.class"/>
<include name="org/jboss/system/ConfigurationException.class"/>
- <include name="org/jboss/system/Info.class"/>
- <include name="org/jboss/system/InfoMBean.class"/>
- <include name="org/jboss/system/Shutdown*.class"/>
+ <include name="org/jboss/system/Info*"/>
<include name="org/jboss/system/ServiceContext.class"/>
<include name="org/jboss/deployment/ServiceDeployer.class"/>
<include name="org/jboss/deployment/ServiceDeployerMBean.class"/>
@@ -561,26 +571,16 @@
</jar>
<!-- Build run.jar -->
- <!-- should use jlink for this, but jlink sucks -->
- <unjar src="${gnu.getopt.lib}/getopt.jar" dest="${build.classes}"/>
- <jar jarfile="${build.lib}/run.jar"
- manifest="${build.etc}/run.mf">
+ <jar jarfile="${build.lib}/run.jar" manifest="${build.etc}/run.mf">
<fileset dir="${build.classes}">
<include name="org/jboss/Main*"/>
- <include name="org/jboss/Version*"/>
- <include name="gnu/getopt/**"/>
- </fileset>
- <fileset dir="${build.resources}">
- <include name="org/jboss/version.properties"/>
</fileset>
</jar>
<!-- Build shutdown.jar -->
- <unjar src="${gnu.getopt.lib}/getopt.jar" dest="${build.classes}"/>
- <jar jarfile="${build.lib}/shutdown.jar">
+ <jar jarfile="${build.lib}/shutdown.jar" manifest="${build.etc}/shutdown.mf">
<fileset dir="${build.classes}">
<include name="org/jboss/Shutdown*"/>
- <include name="gnu/getopt/**"/>
</fileset>
</jar>
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
