User: user57
Date: 02/02/24 02:24:33
Modified: . build.xml
Log:
o moved core system from server to system (includes
all of org.jboss.system, some of org.jboss.deployment +
Main, Shutdown & Version)
o finished the integration of ServerLoader, Server and
ServerConfig are now interfaces so had to update refering
classes to use ServerConfigImplMBean
o ServerLoader changes effectivly remove the need for lib/ + lib/ext
seperation, updated build to use lib for lib/ext and updated
config files
Revision Changes Path
1.3 +173 -9 jboss-system/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jboss-system/build.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build.xml 22 Feb 2002 08:00:39 -0000 1.2
+++ build.xml 24 Feb 2002 10:24:32 -0000 1.3
@@ -12,7 +12,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.2 2002/02/22 08:00:39 user57 Exp $ -->
+<!-- $Id: build.xml,v 1.3 2002/02/24 10:24:32 user57 Exp $ -->
<project default="main" name="JBoss/System">
@@ -76,6 +76,15 @@
<pathelement path="${sun.jmx.lib}/jmxri.jar"/>
</path>
+ <!-- Java API for XML Processing (JAXP) -->
+ <property name="sun.jaxp.root" value="${project.thirdparty}/sun/jaxp"/>
+ <property name="sun.jaxp.lib" value="${sun.jaxp.root}/lib"/>
+ <path id="sun.jaxp.classpath">
+ <fileset dir="${sun.jaxp.lib}">
+ <include name="*.jar"/>
+ </fileset>
+ </path>
+
<!-- JUnit -->
<property name="junit.junit.root" value="${project.thirdparty}/junit/junit"/>
<property name="junit.junit.lib" value="${junit.junit.root}/lib"/>
@@ -83,17 +92,44 @@
<pathelement path="${junit.junit.lib}/junit.jar"/>
</path>
+ <!-- Log4j -->
+ <property name="apache.log4j.root" value="${project.thirdparty}/apache/log4j"/>
+ <property name="apache.log4j.lib" value="${apache.log4j.root}/lib"/>
+ <path id="apache.log4j.classpath">
+ <pathelement path="${apache.log4j.lib}/log4j.jar"/>
+ </path>
+
+ <!-- GNU Getopt -->
+ <property name="gnu.getopt.root" value="${project.thirdparty}/gnu/getopt"/>
+ <property name="gnu.getopt.lib" value="${gnu.getopt.root}/lib"/>
+ <path id="gnu.getopt.classpath">
+ <fileset dir="${gnu.getopt.lib}">
+ <include name="*.jar"/>
+ </fileset>
+ </path>
+
<!-- The combined library classpath -->
<path id="library.classpath">
<path refid="sun.jmx.classpath"/>
+ <path refid="sun.jaxp.classpath"/>
+ <path refid="gnu.getopt.classpath"/>
+ <path refid="apache.log4j.classpath"/>
</path>
<!-- ======= -->
<!-- Modules -->
<!-- ======= -->
- <!-- The combined dependent module classpath -->
+ <!-- Common -->
+ <property name="jboss.common.root" value="${project.root}/common/output"/>
+ <property name="jboss.common.lib" value="${jboss.common.root}/lib"/>
+ <path id="jboss.common.classpath">
+ <pathelement path="${jboss.common.lib}/jboss-common.jar"/>
+ </path>
+
+ <!-- The combined dependant module classpath -->
<path id="dependentmodule.classpath">
+ <path refid="jboss.common.classpath"/>
</path>
<!-- ===== -->
@@ -102,6 +138,9 @@
<!-- Where source files live -->
<property name="source.java" value="${module.source}/main"/>
+ <property name="source.etc" value="${module.source}/etc"/>
+ <property name="source.bin" value="${module.source}/bin"/>
+ <property name="source.resources" value="${module.source}/resources"/>
<!-- Where build generated files will go -->
<property name="build.reports" value="${module.output}/reports"/>
@@ -109,6 +148,9 @@
<property name="build.lib" value="${module.output}/lib"/>
<property name="build.api" value="${module.output}/api"/>
<property name="build.etc" value="${module.output}/etc"/>
+ <property name="build.bin" value="${module.output}/bin"/>
+ <property name="build.gen" value="${module.output}/gen"/>
+ <property name="build.resources" value="${module.output}/resources"/>
<!-- Install/Release structure -->
<property name="install.id" value="${module.name}-${module.version}"/>
@@ -164,7 +206,10 @@
<target name="compile"
description="Compile all source files."
- depends="compile-classes"/>
+ depends="compile-classes,
+ compile-resources,
+ compile-etc,
+ compile-bin"/>
<!-- Compile all class files -->
<target name="compile-classes" depends="init">
@@ -186,6 +231,50 @@
</javac>
</target>
+ <!-- Compile resource files -->
+ <target name="compile-resources" depends="init">
+ <mkdir dir="${build.resources}"/>
+ <copy todir="${build.resources}" filtering="yes">
+ <fileset dir="${source.resources}">
+ <include name="**/*"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <!-- Compile etc files (manifests and such) -->
+ <target name="compile-etc" depends="init">
+ <mkdir dir="${build.etc}"/>
+ <copy todir="${build.etc}" filtering="yes">
+ <fileset dir="${source.etc}">
+ <include name="**/*"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <!-- Compile bin scripts -->
+ <target name="compile-bin" depends="init">
+ <mkdir dir="${build.bin}"/>
+ <copy todir="${build.bin}" filtering="yes">
+ <fileset dir="${source.bin}">
+ <include name="**/*"/>
+ </fileset>
+ </copy>
+
+ <fixcrlf srcdir="${build.bin}"
+ eol="lf" eof="remove"
+ includes="**/*.sh"/>
+
+ <fixcrlf srcdir="${build.bin}"
+ eol="crlf" eof="remove"
+ includes="**/*.bat, **/*.cmd"/>
+
+ <chmod perm="+x">
+ <fileset dir="${build.bin}">
+ <include name="**/*.sh"/>
+ </fileset>
+ </chmod>
+ </target>
+
<!-- ================================================================== -->
<!-- Archives -->
@@ -200,21 +289,93 @@
<mkdir dir="${build.lib}"/>
- <!-- Build the jboss-boot.jar -->
- <jar jarfile="${build.lib}/jboss-boot.jar">
+ <!-- Build jboss-boot.jar -->
+ <jar jarfile="${build.lib}/jboss-boot.jar" manifest="${build.etc}/default.mf">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/system/server/ServerLoader*.class"/>
+ <include name="org/jboss/system/server/Server.class"/>
+ <include name="org/jboss/system/server/ServerConfig.class"/>
+ </fileset>
+ </jar>
+
+ <!-- Build jboss-system.jar -->
+ <jar jarfile="${build.lib}/jboss-system.jar" manifest="${build.etc}/default.mf">
+ <fileset dir="${build.classes}">
+ <!-- Forget about these CLI classes -->
+ <exclude name="org/jboss/Main*.class"/>
+ <exclude name="org/jboss/system/server/Shutdown*"/>
+
+ <!-- Include everything else -->
+ <include name="org/jboss/**"/>
+ </fileset>
+ <fileset dir="${build.resources}">
+ <include name="org/jboss/version.properties"/>
+ </fileset>
+ </jar>
+
+ <!-- Build jboss-system-client.jar -->
+ <jar jarfile="${build.lib}/jboss-system-client.jar"
manifest="${build.etc}/default.mf">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/deployment/DeploymentException*"/>
+ </fileset>
+ </jar>
+
+ <!-- Unjar getopt better packaging (but slower builds) -->
+ <mkdir dir="${build.gen}/getopt"/>
+ <unjar src="${gnu.getopt.lib}/getopt.jar" dest="${build.gen}/getopt"/>
+
+ <!-- Build run.jar -->
+ <jar jarfile="${build.lib}/run.jar" manifest="${build.etc}/run.mf">
<fileset dir="${build.classes}">
+ <include name="org/jboss/Version*.class"/>
+ <include name="org/jboss/Main*.class"/>
<include name="org/jboss/system/server/ServerLoader*.class"/>
<include name="org/jboss/system/server/Server.class"/>
<include name="org/jboss/system/server/ServerConfig.class"/>
</fileset>
+ <fileset dir="${build.resources}">
+ <include name="log4j.properties"/>
+ <include name="org/jboss/version.properties"/>
+ </fileset>
+
+ <!-- Include getopt -->
+ <fileset dir="${build.gen}/getopt">
+ <include name="**"/>
+ </fileset>
</jar>
-
- <!-- Build the jboss-system.jar -->
- <jar jarfile="${build.lib}/jboss-system.jar">
+
+ <!-- Build shutdown.jar -->
+ <jar jarfile="${build.lib}/shutdown.jar" manifest="${build.etc}/shutdown.mf">
<fileset dir="${build.classes}">
- <include name="org/jboss/system/**"/>
+ <include name="org/jboss/Shutdown*"/>
+ </fileset>
+ <fileset dir="${build.resources}">
+ <include name="log4j.properties"/>
+ </fileset>
+
+ <!-- Include getopt -->
+ <fileset dir="${build.gen}/getopt">
+ <include name="**"/>
</fileset>
</jar>
+
+ <!--
+ | JBoss/Testsuite Support
+ -->
+
+ <!-- testsuite-support.jar -->
+ <jar jarfile="${build.lib}/testsuite-support.jar"
manifest="${build.etc}/default.mf">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/logging/**"/>
+ <include name="org/jboss/deployment/**"/>
+ <include name="org/jboss/system/Service.class"/>
+ <include name="org/jboss/system/ServiceMBean*.class"/>
+ <include name="org/jboss/system/MBeanClassLoader*.class"/>
+ <include name="org/jboss/system/UnifiedClassLoader*.class"/>
+ <include name="org/jboss/system/ServiceLibraries*.class"/>
+ </fileset>
+ </jar>
+
</target>
@@ -273,6 +434,9 @@
private="${javadoc.private}"
use="${javadoc.use}"
verbose="${javadoc.verbose}">
+ <!--
+ <link href="http://java.sun.com/j2se/1.3/docs/api/"/>
+ -->
</javadoc>
</target>
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
