User: user57
Date: 02/02/27 01:24:24
Modified: jboss build.xml
Log:
o Release structure and server config changes
Revision Changes Path
1.95 +125 -121 build/jboss/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/build/jboss/build.xml,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- build.xml 26 Feb 2002 07:24:52 -0000 1.94
+++ build.xml 27 Feb 2002 09:24:24 -0000 1.95
@@ -12,7 +12,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.94 2002/02/26 07:24:52 user57 Exp $ -->
+<!-- $Id: build.xml,v 1.95 2002/02/27 09:24:24 user57 Exp $ -->
<project default="main" name="JBoss/Build">
@@ -274,18 +274,17 @@
<property name="release.id" value="${install.id}"/>
<property name="install.root" value="${module.output}/${install.id}"/>
+
<property name="install.docs" value="${install.root}/docs"/>
<property name="install.api" value="${install.docs}/api"/>
<property name="install.examples" value="${install.docs}/examples"/>
+
<property name="install.bin" value="${install.root}/bin"/>
+ <property name="install.etc" value="${install.root}/etc"/>
<property name="install.client" value="${install.root}/client"/>
- <property name="install.conf" value="${install.root}/conf"/>
- <property name="install.conf.default" value="${install.conf}/default"/>
- <property name="install.db" value="${install.root}/db"/>
- <property name="install.deploy" value="${install.root}/deploy"/>
<property name="install.lib" value="${install.root}/lib"/>
- <property name="install.log" value="${install.root}/log"/>
- <property name="install.tmp" value="${install.root}/tmp"/>
+
+ <property name="install.server" value="${install.root}/server"/>
<!-- Not really sure why these are here -->
<property name="install.admin" value="${install.root}/admin"/>
@@ -577,24 +576,6 @@
</fileset>
</copy>
- <!-- Copy deployable files -->
- <mkdir dir="${install.deploy}"/>
- <copy todir="${install.deploy}" filtering="no">
- <!-- Deployable xml snipets -->
- <fileset dir="${_module.output}/etc/deploy">
- <include name="**"/>
- </fileset>
-
- <!-- Deployable archives -->
- <fileset dir="${_module.output}/lib">
- <include name="ejb-management.jar"/>
- <include name="jmx-ejb-connector-server.sar"/>
- <include name="jmx-ejb-adaptor.jar"/>
- <include name="jmx-html-adaptor.sar"/>
- <include name="jmx-rmi-adaptor.sar"/>
- </fileset>
- </copy>
-
<!-- Copy the generated scripts & runnable jars -->
<mkdir dir="${install.bin}"/>
<copy todir="${install.bin}" filtering="no">
@@ -611,14 +592,6 @@
</fileset>
</chmod>
- <!-- Copy the default configuration files -->
- <mkdir dir="${install.conf}"/>
- <copy todir="${install.conf}" filtering="no">
- <fileset dir="${_module.output}/etc/conf">
- <include name="default/*"/>
- </fileset>
- </copy>
-
<!-- Copy thirdparty code -->
<copy todir="${install.lib}" filtering="no">
<fileset dir="${sun.jts.lib}">
@@ -648,16 +621,44 @@
</fileset>
</copy>
+ <!-- Default server config -->
+
+ <mkdir dir="${install.server}/default/deploy"/>
+ <copy todir="${install.server}/default/deploy" filtering="no">
+ <!-- Deployable xml snipets -->
+ <fileset dir="${_module.output}/etc/deploy">
+ <include name="**"/>
+ </fileset>
+
+ <!-- Deployable archives -->
+ <fileset dir="${_module.output}/lib">
+ <include name="ejb-management.jar"/>
+ <include name="jmx-ejb-connector-server.sar"/>
+ <include name="jmx-ejb-adaptor.jar"/>
+ <include name="jmx-html-adaptor.sar"/>
+ <include name="jmx-rmi-adaptor.sar"/>
+ </fileset>
+ </copy>
+
+ <!-- Copy the default configuration files -->
+ <mkdir dir="${install.server}/default/conf"/>
+ <copy todir="${install.server}/default/conf" filtering="no">
+ <fileset dir="${_module.output}/etc/conf/default">
+ <include name="*"/>
+ </fileset>
+ </copy>
+
<!-- Setup the database directory -->
- <mkdir dir="${install.db}"/>
+ <mkdir dir="${install.server}/default/db"/>
<!-- Setup the log file directory -->
- <mkdir dir="${install.log}"/>
- <!-- Create an emtpy log/server.log -->
- <touch file="${install.log}/server.log"/>
+ <mkdir dir="${install.server}/default/log"/>
+ <!-- Create an emtpy log/server.log (log4j won't make this dir) -->
+ <touch file="${install.server}/default/log/server.log"/>
<!-- Setup the temporary file directory -->
- <mkdir dir="${install.tmp}"/>
+ <mkdir dir="${install.server}/default/tmp"/>
+
</target>
<target name="_module-server-all" depends="_module-server-most">
@@ -788,7 +789,8 @@
value="${project.root}/${_module.name}/output"/>
<!-- Copy the generated deployment libraries -->
- <copy todir="${install.deploy}" filtering="no">
+ <mkdir dir="${install.server}/default/deploy"/>
+ <copy todir="${install.server}/default/deploy" filtering="no">
<fileset dir="${_module.output}/lib">
<include name="jbosscx.sar"/>
<include name="*.rar"/>
@@ -815,18 +817,6 @@
<property name="_module.output" override="true"
value="${project.root}/${_module.name}/output"/>
- <!-- Copy the jbossmq service xml snippet -->
- <mkdir dir="${install.deploy}"/>
- <copy todir="${install.deploy}" filtering="no">
- <fileset dir="${_module.output}/etc/conf/default">
- <include name="jbossmq-service.xml"/>
- <include name="jbossmq-state.xml"/>
-
- <!-- only needed to urun the testsuite -->
- <include name="jbossmq-testsuite-service.xml"/>
- </fileset>
- </copy>
-
<!-- Copy the generated libraries -->
<mkdir dir="${install.lib}"/>
<copy todir="${install.lib}" filtering="no">
@@ -843,12 +833,26 @@
</fileset>
</copy>
+ <!-- Default server config -->
+
+ <!-- Copy the jbossmq service xml snippet -->
+ <mkdir dir="${install.server}/default/deploy"/>
+ <copy todir="${install.server}/default/deploy" filtering="no">
+ <fileset dir="${_module.output}/etc/conf/default">
+ <include name="jbossmq-service.xml"/>
+ <include name="jbossmq-state.xml"/>
+
+ <!-- only needed to urun the testsuite -->
+ <include name="jbossmq-testsuite-service.xml"/>
+ </fileset>
+ </copy>
+
<!-- Copy the default configuration files -->
- <mkdir dir="${install.conf}"/>
- <copy todir="${install.conf}" filtering="no">
- <fileset dir="${_module.output}/etc/conf">
- <include name="**/*"/>
- <exclude name="**/jbossmq-service.xml"/>
+ <mkdir dir="${install.server}/default/conf"/>
+ <copy todir="${install.server}/default/conf" filtering="no">
+ <fileset dir="${_module.output}/etc/conf/default">
+ <include name="*"/>
+ <exclude name="jbossmq-service.xml"/>
</fileset>
</copy>
</target>
@@ -880,13 +884,7 @@
<property name="_module.output" override="true"
value="${project.root}/${_module.name}/output"/>
- <!-- Copy the generated libraries -->
- <!--mkdir dir="${install.lib}"/>
- <copy todir="${install.lib}" filtering="no">
- <fileset dir="${_module.output}/lib">
- <include name="jbosspool.jar"/>
- </fileset>
- </copy-->
+ <!-- Pool will be going away soon -->
</target>
@@ -910,6 +908,7 @@
value="${project.root}/${_module.name}/output"/>
<!-- TODO Install -->
+
</target>
<target name="_module-jmx-all" depends="_module-jmx-most">
@@ -1005,20 +1004,22 @@
</fileset>
</copy>
- <!-- Copy the deployables -->
- <mkdir dir="${install.deploy}"/>
- <copy todir="${install.deploy}" filtering="no">
- <fileset dir="${_module.output}/etc">
- <include name="cluster-service.xml"/>
- </fileset>
- </copy>
-
<!-- Copy thirdparty code -->
<copy todir="${install.lib}" filtering="no">
<fileset dir="${javagroups.javagroups.lib}">
<include name="javagroups-2.0.jar"/>
</fileset>
</copy>
+
+ <!-- Default server config -->
+
+ <!-- Copy the deployables -->
+ <mkdir dir="${install.server}/default/deploy"/>
+ <copy todir="${install.server}/default/deploy" filtering="no">
+ <fileset dir="${_module.output}/etc">
+ <include name="cluster-service.xml"/>
+ </fileset>
+ </copy>
</target>
<target name="_module-cluster-all" depends="_module-cluster-most">
@@ -1060,19 +1061,6 @@
</fileset>
</copy>
- <!-- Copy deployables -->
- <mkdir dir="${install.deploy}"/>
- <copy todir="${install.deploy}" filtering="no">
- <!-- Deployable configuration -->
- <fileset dir="${_module.output}/etc">
- <include name="mail-service.xml"/>
-
- <!-- These should move to example/deploy -->
- <include name="scheduler-service.xml"/>
- <include name="counter-service.xml"/>
- </fileset>
- </copy>
-
<!-- Copy thirdparty code -->
<copy todir="${install.lib}" filtering="no">
<fileset dir="${sun.jaf.lib}">
@@ -1094,6 +1082,21 @@
<include name="tyrex.jar"/>
</fileset>
</copy>
+
+ <!-- Default server config -->
+
+ <!-- Copy the deployables -->
+ <mkdir dir="${install.server}/default/deploy"/>
+ <copy todir="${install.server}/default/deploy" filtering="no">
+ <!-- Deployable configuration -->
+ <fileset dir="${_module.output}/etc">
+ <include name="mail-service.xml"/>
+
+ <!-- These should move to example/deploy -->
+ <include name="scheduler-service.xml"/>
+ <include name="counter-service.xml"/>
+ </fileset>
+ </copy>
</target>
<target name="_module-varia-all" depends="_module-varia-most">
@@ -1115,18 +1118,24 @@
<property name="_module.output" override="true"
value="${project.root}/${_module.name}/output"/>
- <!-- Copy the jetty-plugin.sar -->
- <copy todir="${install.deploy}" filtering="no">
- <fileset dir="${_module.output}/lib">
- <include name="jetty-plugin.sar"/>
- </fileset>
- </copy>
+ <!-- Copy the generated libraries -->
+ <mkdir dir="${install.lib}"/>
<copy todir="${install.lib}" filtering="no">
<fileset dir="${_module.output}/lib">
<include name="javax.servlet.jar"/>
<include name="org.apache.jasper.jar"/>
</fileset>
</copy>
+
+ <!-- Default server config -->
+
+ <!-- Copy the deployables -->
+ <mkdir dir="${install.server}/default/deploy"/>
+ <copy todir="${install.server}/default/deploy" filtering="no">
+ <fileset dir="${_module.output}/lib">
+ <include name="jetty-plugin.sar"/>
+ </fileset>
+ </copy>
</target>
<target name="_module-jetty-all" depends="_module-jetty-most">
@@ -1148,35 +1157,14 @@
<property name="_module.output" override="true"
value="${project.root}/${_module.name}/output"/>
- <!-- 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 -->
- <copy todir="${install.deploy}/client" filtering="no">
- <fileset dir="${_module.output}/lib">
- <include name="jboss-net-client.sar"/>
- </fileset>
- </copy>
-
- <!-- Copy relevant axis code -->
+ <!-- Copy the generated libraries -->
+ <mkdir dir="${install.lib}"/>
<copy todir="${install.lib}" filtering="no">
<fileset dir="${apache.axis.lib}">
<include name="axis.jar"/>
</fileset>
</copy>
- <!-- Copy the default configuration files -->
- <mkdir dir="${install.conf.default}"/>
- <copy todir="${install.conf.default}" filtering="no">
- <fileset dir="${_module.output}/etc">
- <include name="axis-config.xml"/>
- </fileset>
- </copy>
-
<!-- Copy the client configuration files -->
<mkdir dir="${install.client}"/>
<copy todir="${install.client}" filtering="no">
@@ -1185,14 +1173,27 @@
</fileset>
</copy>
- <!-- Copy the test wsr -->
- <mkdir dir="${install.deploy}"/>
- <copy todir="${install.deploy}" filtering="no">
+
+ <!-- Default server config -->
+
+ <!-- Deployables -->
+ <mkdir dir="${install.server}/default/deploy"/>
+ <copy todir="${install.server}/default/deploy" filtering="no">
<fileset dir="${_module.output}/lib">
+ <include name="jboss-net.sar"/>
+ <include name="jboss-net-client.sar"/>
<include name="addr.wsr"/>
</fileset>
</copy>
+ <!-- Copy the default configuration files -->
+ <mkdir dir="${install.server}/default/conf"/>
+ <copy todir="${install.server}/default/conf" filtering="no">
+ <fileset dir="${_module.output}/etc">
+ <include name="axis-config.xml"/>
+ </fileset>
+ </copy>
+
</target>
<target name="_module-jboss.net-all" depends="_module-jboss.net-most">
@@ -1228,12 +1229,14 @@
</fileset>
</copy>
- <!-- Copy relevant jacorb code -->
+ <!-- Copy thirdparty code -->
<copy todir="${install.lib}" filtering="no">
<fileset dir="${jacorb.jacorb.lib}">
<include name="jacorb.jar"/>
</fileset>
</copy>
+
+ <!-- Copy thirdparty client code -->
<copy todir="${install.client}" filtering="no">
<fileset dir="${jacorb.jacorb.lib}">
<include name="jacorb.jar"/>
@@ -1404,10 +1407,11 @@
<target name="testsuite" depends="run-testsuite"/>
- <!-- Invoke the 'tests-unit' on the 'testsuite' module. This must
- be run prior to commiting any changes to ensure that your changes
- don't cause grief to other developers.
- -->
+ <!--
+ | Invoke the 'tests-unit' on the 'testsuite' module. This must
+ | be run prior to commiting any changes to ensure that your changes
+ | don't cause grief to other developers.
+ -->
<target name="run-basic-testsuite" depends="init"
description="Execute the testsuite.">
<execmodules target="tests-unit" modules="testsuite"
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
