User: user57
Date: 02/02/25 18:19:02
Modified: jboss build.xml
Log:
o build file clean up
Revision Changes Path
1.93 +70 -98 build/jboss/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/build/jboss/build.xml,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- build.xml 25 Feb 2002 01:23:23 -0000 1.92
+++ build.xml 26 Feb 2002 02:19:01 -0000 1.93
@@ -12,7 +12,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.92 2002/02/25 01:23:23 user57 Exp $ -->
+<!-- $Id: build.xml,v 1.93 2002/02/26 02:19:01 user57 Exp $ -->
<project default="main" name="JBoss/Build">
@@ -196,9 +196,11 @@
<!-- Module groups -->
<group name="core">
+ <include modules="common, system"/>
+ </group>
+
+ <group name="basic">
<include modules="j2ee,
- common,
- system,
naming,
server"/>
</group>
@@ -227,15 +229,15 @@
<!-- Module group sets -->
<group name="default">
- <include groups="core, standard"/>
+ <include groups="core, basic, standard"/>
</group>
<group name="most">
- <include groups="core, standard, optional"/>
+ <include groups="core, basic, standard, optional"/>
</group>
<group name="all">
- <include groups="core, standard, optional, optional-requires-config"/>
+ <include groups="core, basic, standard, optional,
optional-requires-config"/>
</group>
</moduleconfig>
@@ -282,10 +284,6 @@
<property name="install.db" value="${install.root}/db"/>
<property name="install.deploy" value="${install.root}/deploy"/>
<property name="install.lib" value="${install.root}/lib"/>
-
- <!-- FIXME: remove the usage of this bad boy -->
- <property name="install.lib.ext" value="${install.lib}"/>
-
<property name="install.log" value="${install.root}/log"/>
<property name="install.tmp" value="${install.root}/tmp"/>
@@ -354,15 +352,15 @@
<property name="_module.output" override="true"
value="${project.root}/${_module.name}/output"/>
- <!-- Copy the generated libraries (lib/ext) -->
- <mkdir dir="${install.lib.ext}"/>
- <copy todir="${install.lib.ext}" filtering="no">
+ <!-- Copy the generated libraries -->
+ <mkdir dir="${install.lib}"/>
+ <copy todir="${install.lib}" filtering="no">
<fileset dir="${_module.output}/lib">
<include name="jboss-j2ee.jar"/>
</fileset>
</copy>
- <!-- Copy the generated libraries (client) -->
+ <!-- Copy the generated client libraries -->
<mkdir dir="${install.client}"/>
<copy todir="${install.client}" filtering="no">
<fileset dir="${_module.output}/lib">
@@ -390,15 +388,15 @@
<property name="_module.output" override="true"
value="${project.root}/${_module.name}/output"/>
- <!-- Copy the generated libraries (lib/ext) -->
- <mkdir dir="${install.lib.ext}"/>
- <copy todir="${install.lib.ext}" filtering="no">
+ <!-- Copy the generated libraries -->
+ <mkdir dir="${install.lib}"/>
+ <copy todir="${install.lib}" filtering="no">
<fileset dir="${_module.output}/lib">
<include name="jboss-common.jar"/>
</fileset>
</copy>
- <!-- Copy the generated libraries (client) -->
+ <!-- Copy the generated client libraries -->
<mkdir dir="${install.client}"/>
<copy todir="${install.client}" filtering="no">
<fileset dir="${_module.output}/lib">
@@ -426,7 +424,7 @@
<property name="_module.output" override="true"
value="${project.root}/${_module.name}/output"/>
- <!-- Copy the generated libraries (lib) -->
+ <!-- Copy the generated libraries -->
<mkdir dir="${install.lib}"/>
<copy todir="${install.lib}" filtering="no">
<fileset dir="${_module.output}/lib">
@@ -435,7 +433,7 @@
</fileset>
</copy>
- <!-- Copy the generated libraries (client) -->
+ <!-- Copy the generated client -->
<mkdir dir="${install.client}"/>
<copy todir="${install.client}" filtering="no">
<fileset dir="${_module.output}/lib">
@@ -443,7 +441,7 @@
</fileset>
</copy>
- <!-- Copy the generated scripts & runnable jars (bin) -->
+ <!-- Copy the generated scripts & runnable jars -->
<mkdir dir="${install.bin}"/>
<copy todir="${install.bin}" filtering="no">
<fileset dir="${_module.output}/bin">
@@ -480,15 +478,15 @@
<property name="_module.output" override="true"
value="${project.root}/${_module.name}/output"/>
- <!-- Copy the generated libraries (lib/ext) -->
- <mkdir dir="${install.lib.ext}"/>
- <copy todir="${install.lib.ext}" filtering="no">
+ <!-- Copy the generated libraries -->
+ <mkdir dir="${install.lib}"/>
+ <copy todir="${install.lib}" filtering="no">
<fileset dir="${_module.output}/lib">
<include name="jnpserver.jar"/>
</fileset>
</copy>
- <!-- Copy the generated libraries (client) -->
+ <!-- Copy the generated client libraries -->
<mkdir dir="${install.client}"/>
<copy todir="${install.client}" filtering="no">
<fileset dir="${_module.output}/lib">
@@ -516,7 +514,7 @@
<property name="_module.output" override="true"
value="${project.root}/${_module.name}/output"/>
- <!-- Copy the generated libraries (lib) -->
+ <!-- Copy the generated libraries -->
<mkdir dir="${install.lib}"/>
<copy todir="${install.lib}" filtering="no">
<fileset dir="${_module.output}/lib">
@@ -524,7 +522,7 @@
</fileset>
</copy>
- <!-- Copy the generated libraries (client) -->
+ <!-- Copy the generated client libraries -->
<mkdir dir="${install.client}"/>
<copy todir="${install.client}" filtering="no">
<fileset dir="${_module.output}/lib">
@@ -535,10 +533,8 @@
</fileset>
</copy>
- <!-- Setup the deployment directory (deploy) -->
- <mkdir dir="${install.deploy}"/>
-
<!-- Copy deployable files -->
+ <mkdir dir="${install.deploy}"/>
<copy todir="${install.deploy}" filtering="no">
<!-- Deployable xml snipets -->
<fileset dir="${_module.output}/etc/deploy">
@@ -555,7 +551,7 @@
</fileset>
</copy>
- <!-- Copy the generated scripts & runnable jars (bin) -->
+ <!-- Copy the generated scripts & runnable jars -->
<mkdir dir="${install.bin}"/>
<copy todir="${install.bin}" filtering="no">
<fileset dir="${_module.output}/bin">
@@ -571,7 +567,7 @@
</fileset>
</chmod>
- <!-- Copy the default configuration files (conf) -->
+ <!-- Copy the default configuration files -->
<mkdir dir="${install.conf}"/>
<copy todir="${install.conf}" filtering="no">
<fileset dir="${_module.output}/etc/conf">
@@ -579,15 +575,15 @@
</fileset>
</copy>
- <!-- Setup the database directory (db) -->
+ <!-- Setup the database directory -->
<mkdir dir="${install.db}"/>
- <!-- Setup the log file directory (log) -->
+ <!-- Setup the log file directory -->
<mkdir dir="${install.log}"/>
<!-- Create an emtpy log/server.log -->
<touch file="${install.log}/server.log"/>
- <!-- Setup the temporary file directory (tmp) -->
+ <!-- Setup the temporary file directory -->
<mkdir dir="${install.tmp}"/>
</target>
@@ -618,15 +614,15 @@
<property name="_module.output" override="true"
value="${project.root}/${_module.name}/output"/>
- <!-- Copy the generated libraries (lib/ext) -->
- <mkdir dir="${install.lib.ext}"/>
- <copy todir="${install.lib.ext}" filtering="no">
+ <!-- Copy the generated libraries -->
+ <mkdir dir="${install.lib}"/>
+ <copy todir="${install.lib}" filtering="no">
<fileset dir="${_module.output}/lib">
<include name="jboss-ejb.jar"/>
</fileset>
</copy>
- <!-- Copy the generated libraries (client) -->
+ <!-- Copy the generated client libraries -->
<mkdir dir="${install.client}"/>
<copy todir="${install.client}" filtering="no">
<fileset dir="${_module.output}/lib">
@@ -654,7 +650,7 @@
<property name="_module.output" override="true"
value="${project.root}/${_module.name}/output"/>
- <!-- Copy the generated scripts & runnable jars (bin) -->
+ <!-- Copy the generated scripts & runnable jars -->
<mkdir dir="${install.bin}"/>
<copy todir="${install.bin}" filtering="no">
<fileset dir="${_module.output}/bin">
@@ -662,7 +658,7 @@
</fileset>
</copy>
- <!-- Copy admin files (admin) -->
+ <!-- Copy admin files -->
<mkdir dir="${install.admin}"/>
<copy todir="${install.admin}" filtering="no">
<fileset dir="${_module.output}/lib">
@@ -670,7 +666,7 @@
</fileset>
</copy>
- <!-- Copy admin files (admin/client) -->
+ <!-- Copy admin files -->
<mkdir dir="${install.admin.client}"/>
<copy todir="${install.admin.client}" filtering="no">
<fileset dir="${_module.output}/lib">
@@ -681,7 +677,7 @@
</fileset>
</copy>
- <!-- Copy admin files (admin/client/lib) -->
+ <!-- Copy admin files -->
<mkdir dir="${install.admin.client.lib}"/>
<copy todir="${install.admin.client.lib}" filtering="no">
<fileset dir="${_module.output}/lib">
@@ -689,7 +685,7 @@
</fileset>
</copy>
- <!-- Copy admin files (admin/components) -->
+ <!-- Copy admin files -->
<mkdir dir="${install.admin.components}"/>
<copy todir="${install.admin.components}" filtering="no">
<fileset dir="${_module.output}/lib">
@@ -718,15 +714,7 @@
<property name="_module.output" override="true"
value="${project.root}/${_module.name}/output"/>
- <!-- Copy the generated libraries (lib/ext) -->
- <mkdir dir="${install.lib.ext}"/>
- <copy todir="${install.lib.ext}" filtering="no">
- <fileset dir="${_module.output}/lib">
- <include name="RARDeployer.jar"/>
- </fileset>
- </copy>
-
- <!-- Copy the generated deployment libraries (deploy) -->
+ <!-- Copy the generated deployment libraries -->
<copy todir="${install.deploy}" filtering="no">
<fileset dir="${_module.output}/lib">
<include name="jbosscx.sar"/>
@@ -754,7 +742,7 @@
<property name="_module.output" override="true"
value="${project.root}/${_module.name}/output"/>
- <!-- Copy the jbossmq service xml snippet (deploy) -->
+ <!-- Copy the jbossmq service xml snippet -->
<mkdir dir="${install.deploy}"/>
<copy todir="${install.deploy}" filtering="no">
<fileset dir="${_module.output}/etc/conf/default">
@@ -766,15 +754,15 @@
</fileset>
</copy>
- <!-- Copy the generated libraries (lib/ext) -->
- <mkdir dir="${install.lib.ext}"/>
- <copy todir="${install.lib.ext}" filtering="no">
+ <!-- Copy the generated libraries -->
+ <mkdir dir="${install.lib}"/>
+ <copy todir="${install.lib}" filtering="no">
<fileset dir="${_module.output}/lib">
<include name="jbossmq.jar"/>
</fileset>
</copy>
- <!-- Copy the generated libraries (client) -->
+ <!-- Copy the generated client libraries -->
<mkdir dir="${install.client}"/>
<copy todir="${install.client}" filtering="no">
<fileset dir="${_module.output}/lib">
@@ -782,7 +770,7 @@
</fileset>
</copy>
- <!-- Copy the default configuration files (conf) -->
+ <!-- Copy the default configuration files -->
<mkdir dir="${install.conf}"/>
<copy todir="${install.conf}" filtering="no">
<fileset dir="${_module.output}/etc/conf">
@@ -819,9 +807,9 @@
<property name="_module.output" override="true"
value="${project.root}/${_module.name}/output"/>
- <!-- Copy the generated libraries (lib/ext) -->
- <!--mkdir dir="${install.lib.ext}"/>
- <copy todir="${install.lib.ext}" filtering="no">
+ <!-- Copy the generated libraries -->
+ <!--mkdir dir="${install.lib}"/>
+ <copy todir="${install.lib}" filtering="no">
<fileset dir="${_module.output}/lib">
<include name="jbosspool.jar"/>
</fileset>
@@ -870,16 +858,16 @@
<property name="_module.output" override="true"
value="${project.root}/${_module.name}/output"/>
- <!-- Copy the generated libraries (lib/ext) -->
- <mkdir dir="${install.lib.ext}"/>
- <copy todir="${install.lib.ext}" filtering="no">
+ <!-- Copy the generated libraries -->
+ <mkdir dir="${install.lib}"/>
+ <copy todir="${install.lib}" filtering="no">
<fileset dir="${_module.output}/lib">
<include name="jbosssx.jar"/>
<include name="jaas.jar"/>
</fileset>
</copy>
- <!-- Copy the generated libraries (client) -->
+ <!-- Copy the generated client libraries -->
<mkdir dir="${install.client}"/>
<copy todir="${install.client}" filtering="no">
<fileset dir="${_module.output}/lib">
@@ -911,9 +899,9 @@
<property name="_module.output" override="true"
value="${project.root}/${_module.name}/output"/>
- <!-- Copy the generated libraries (lib/ext) -->
- <mkdir dir="${install.lib.ext}"/>
- <copy todir="${install.lib.ext}" filtering="no">
+ <!-- Copy the generated libraries -->
+ <mkdir dir="${install.lib}"/>
+ <copy todir="${install.lib}" filtering="no">
<fileset dir="${_module.output}/lib">
<include name="jbossmx.jar"/>
<include name="jbossha.jar"/>
@@ -921,7 +909,7 @@
</fileset>
</copy>
- <!-- Copy the generated libraries (client) -->
+ <!-- Copy the generated client libraries -->
<mkdir dir="${install.client}"/>
<copy todir="${install.client}" filtering="no">
<fileset dir="${_module.output}/lib">
@@ -966,9 +954,9 @@
<property name="_module.output" override="true"
value="${project.root}/${_module.name}/output"/>
- <!-- Copy the generated libraries (lib/ext) -->
- <mkdir dir="${install.lib.ext}"/>
- <copy todir="${install.lib.ext}" filtering="no">
+ <!-- Copy the generated libraries -->
+ <mkdir dir="${install.lib}"/>
+ <copy todir="${install.lib}" filtering="no">
<fileset dir="${_module.output}/lib">
<include name="mail-plugin.jar"/>
<include name="counter-plugin.jar"/>
@@ -1011,30 +999,18 @@
<property name="_module.output" override="true"
value="${project.root}/${_module.name}/output"/>
- <!-- Copy the jetty-plugin.sar (deploy) -->
+ <!-- Copy the jetty-plugin.sar -->
<copy todir="${install.deploy}" filtering="no">
<fileset dir="${_module.output}/lib">
<include name="jetty-plugin.sar"/>
</fileset>
</copy>
- <copy todir="${install.lib.ext}" filtering="no">
+ <copy todir="${install.lib}" filtering="no">
<fileset dir="${_module.output}/lib">
<include name="javax.servlet.jar"/>
<include name="org.apache.jasper.jar"/>
</fileset>
</copy>
-
-
- <!-- Copy the default configuration files (conf/default) -->
- <!-- These could perhaps be repackaged into jetty-plugin.sar
- using the local directory feature -->
- <mkdir dir="${install.conf.default}"/>
- <copy todir="${install.conf.default}" filtering="no">
- <fileset dir="${_module.output}/etc">
- <include name="jetty.xml"/>
- <include name="jetty.properties"/>
- </fileset>
- </copy>
</target>
<target name="_module-jetty-all" depends="_module-jetty-most">
@@ -1056,14 +1032,14 @@
<property name="_module.output" override="true"
value="${project.root}/${_module.name}/output"/>
- <!-- Copy the jboss-net.sar (deploy) -->
+ <!-- Copy the jboss-net.sar -->
<copy todir="${install.deploy}" filtering="no">
<fileset dir="${_module.output}/lib">
<include name="jboss-net.sar"/>
</fileset>
</copy>
- <!-- Copy the jboss-net-client.jar (deploy) -->
+ <!-- Copy the jboss-net-client.jar -->
<copy todir="${install.deploy}/client" filtering="no">
<fileset dir="${_module.output}/lib">
<include name="jboss-net-client.sar"/>
@@ -1071,13 +1047,13 @@
</copy>
<!-- Copy relevant axis code -->
- <copy todir="${install.lib.ext}" filtering="no">
+ <copy todir="${install.lib}" filtering="no">
<fileset dir="${apache.axis.lib}">
<include name="axis.jar"/>
</fileset>
</copy>
- <!-- Copy the default configuration files (conf/default) -->
+ <!-- Copy the default configuration files -->
<mkdir dir="${install.conf.default}"/>
<copy todir="${install.conf.default}" filtering="no">
<fileset dir="${_module.output}/etc">
@@ -1085,7 +1061,7 @@
</fileset>
</copy>
- <!-- Copy the client configuration files (client) -->
+ <!-- Copy the client configuration files -->
<mkdir dir="${install.client}"/>
<copy todir="${install.client}" filtering="no">
<fileset dir="${_module.output}/etc">
@@ -1123,7 +1099,7 @@
value="${project.root}/${_module.name}/output"/>
<!-- Copy the jboss-iiop.jar -->
- <copy todir="${install.lib.ext}" filtering="no">
+ <copy todir="${install.lib}" filtering="no">
<fileset dir="${_module.output}/lib">
<include name="jboss-iiop.jar"/>
</fileset>
@@ -1137,7 +1113,7 @@
</copy>
<!-- Copy relevant jacorb code -->
- <copy todir="${install.lib.ext}" filtering="no">
+ <copy todir="${install.lib}" filtering="no">
<fileset dir="${jacorb.jacorb.lib}">
<include name="jacorb.jar"/>
</fileset>
@@ -1181,10 +1157,6 @@
<fileset dir="${gnu.getopt.lib}">
<include name="getopt.jar"/>
</fileset>
- </copy>
-
- <mkdir dir="${install.lib.ext}"/>
- <copy todir="${install.lib.ext}" filtering="no">
<fileset dir="${sun.jndi.lib}">
<include name="jndi.jar"/>
</fileset>
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
