User: ejort
Date: 02/03/24 09:38:31
Modified: jbossmq build.xml
Log:
Integrate JBossMX into JBossMQ standalone, bring the build up-to-date
Revision Changes Path
1.14 +382 -158 build/jbossmq/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/build/jbossmq/build.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- build.xml 28 Feb 2002 04:39:24 -0000 1.13
+++ build.xml 24 Mar 2002 17:38:30 -0000 1.14
@@ -12,7 +12,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.13 2002/02/28 04:39:24 user57 Exp $ -->
+<!-- $Id: build.xml,v 1.14 2002/03/24 17:38:30 ejort Exp $ -->
<project default="main" name="JBossMQ/Build">
@@ -108,6 +108,10 @@
<property name="apache.log4j.root" value="${project.thirdparty}/apache/log4j"/>
<property name="apache.log4j.lib" value="${apache.log4j.root}/lib"/>
+ <!-- BCEL -->
+ <property name="apache.bcel.root" value="${project.thirdparty}/apache/bcel"/>
+ <property name="apache.bcel.lib" value="${apache.bcel.root}/lib"/>
+
<!-- EDU.oswego.cs.dl.util.concurrent -->
<property name="oswego.concurrent.root"
value="${project.thirdparty}/oswego/concurrent"/>
<property name="oswego.concurrent.lib" value="${oswego.concurrent.root}/lib"/>
@@ -128,6 +132,10 @@
<property name="gnu.regexp.root" value="${project.thirdparty}/gnu/regexp"/>
<property name="gnu.regexp.lib" value="${gnu.regexp.root}/lib"/>
+ <!-- GNU Getopt -->
+ <property name="gnu.getopt.root" value="${project.thirdparty}/gnu/getopt"/>
+ <property name="gnu.getopt.lib" value="${gnu.getopt.root}/lib"/>
+
<!-- Java Secure Socket Extension (JSSE) -->
<property name="sun.jsse.root" value="${project.thirdparty}/sun/jsse"/>
<property name="sun.jsse.lib" value="${sun.jsse.root}/lib"/>
@@ -172,15 +180,31 @@
<moduleconfig property="modules" selected="${groups}">
<!-- Standard modules -->
+ <module name="jmx"/>
+ <module name="common"/>
+ <module name="system"/>
<module name="j2ee"/>
<module name="naming"/>
+ <module name="management"/>
<module name="server"/>
<module name="security"/>
+ <module name="connector"/>
+ <module name="pool"/>
<module name="messaging"/>
<!-- Module groups -->
<group name="standard">
- <include modules="j2ee, naming, server, security, messaging"/>
+ <include modules="jmx,
+ common,
+ system,
+ j2ee,
+ naming,
+ management,
+ server,
+ security,
+ pool,
+ connector,
+ messaging"/>
</group>
<!-- Module group sets -->
@@ -222,21 +246,16 @@
<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.manual" value="${install.docs}/manual"/>
<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.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.deploy.lib" value="${install.deploy}/lib"/>
<property name="install.lib" value="${install.root}/lib"/>
- <property name="install.lib.ext" value="${install.lib}/ext"/>
- <property name="install.log" value="${install.root}/log"/>
- <property name="install.tmp" value="${install.root}/tmp"/>
+ <property name="install.server" value="${install.root}/server"/>
</target>
@@ -262,6 +281,36 @@
<!-- Module Pass-through Hooks -->
<!-- ================================================================== -->
+ <!-- === -->
+ <!-- JMX -->
+ <!-- === -->
+
+ <target name="_module-jmx-most">
+ <property name="_module.name" value="jmx" override="true"/>
+ <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="jboss-jmx-core.jar"/>
+ <include name="jboss-jmx-services.jar"/>
+ </fileset>
+ </copy>
+
+ </target>
+
+ <target name="_module-jmx-all" depends="_module-jmx-most">
+ <!-- Copy the generated javadocs -->
+ <mkdir dir="${install.api}/${_module.name}"/>
+ <copy todir="${install.api}/${_module.name}" filtering="no">
+ <fileset dir="${_module.output}/api">
+ <include name="**/*"/>
+ </fileset>
+ </copy>
+ </target>
+
<!-- ==== -->
<!-- J2EE -->
<!-- ==== -->
@@ -272,8 +321,8 @@
value="${project.root}/${_module.name}/output"/>
<!-- Copy the generated libraries (lib/ext) -->
- <mkdir dir="${install.lib.ext}"/>
- <copy todir="${install.lib.ext}" filtering="no">
+ <mkdir dir="${install.lib}"/>
+ <copy todir="${install.lib}" filtering="no">
<fileset dir="${_module.output}/lib">
<include name="jboss-j2ee.jar"/>
</fileset>
@@ -299,32 +348,47 @@
</target>
<!-- ====== -->
- <!-- Naming -->
+ <!-- Common -->
<!-- ====== -->
- <target name="_module-naming-most">
- <property name="_module.name" value="naming" override="true"/>
+ <target name="_module-common-most">
+ <property name="_module.name" value="common" override="true"/>
<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"/>
+ <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">
- <include name="jnp-client.jar"/>
+ <include name="jboss-common-client.jar"/>
+ </fileset>
+ </copy>
+
+ <!-- Copy thirdparty code -->
+ <copy todir="${install.lib}" filtering="no">
+ <fileset dir="${sun.jaxp.lib}">
+ <include name="jaxp.jar"/>
+ <include name="crimson.jar"/>
+ <include name="xalan.jar"/>
+ </fileset>
+
+ <!-- FIXME This should go away when we have our own html adaptor -->
+ <fileset dir="${sun.jmx.lib}">
+ <include name="jmxri.jar"/>
+ <include name="jmxtools.jar"/>
</fileset>
</copy>
</target>
- <target name="_module-naming-all" depends="_module-naming-most">
+ <target name="_module-common-all" depends="_module-common-most">
<!-- Copy the generated javadocs -->
<mkdir dir="${install.api}/${_module.name}"/>
<copy todir="${install.api}/${_module.name}" filtering="no">
@@ -332,142 +396,212 @@
<include name="**/*"/>
</fileset>
</copy>
+
+ <!-- Copy the generated todo docs -->
+ <mkdir dir="${install.todo}/${_module.name}"/>
+ <copy todir="${install.todo}/${_module.name}" filtering="no">
+ <fileset dir="${_module.output}/todo">
+ <include name="**/*"/>
+ </fileset>
+ </copy>
</target>
<!-- ====== -->
- <!-- Server -->
+ <!-- System -->
<!-- ====== -->
- <target name="_module-server-most">
- <property name="_module.name" value="server" override="true"/>
+ <target name="_module-system-most">
+ <property name="_module.name" value="system" override="true"/>
<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">
<include name="jboss-boot.jar"/>
+ <include name="jboss-system.jar"/>
</fileset>
</copy>
- <!-- Copy the generated libraries (lib/ext) -->
- <mkdir dir="${install.lib.ext}"/>
- <copy todir="${install.lib.ext}" filtering="no">
+ <!-- Copy the generated client -->
+ <mkdir dir="${install.client}"/>
+ <copy todir="${install.client}" filtering="no">
<fileset dir="${_module.output}/lib">
- <include name="jboss.jar"/>
- <include name="jboss-spine.jar"/>
+ <include name="*-client.jar"/>
</fileset>
</copy>
- <!-- Copy the generated libraries (client) -->
- <mkdir dir="${install.client}"/>
- <copy todir="${install.client}" filtering="no">
+ <!-- Copy the generated scripts & runnable jars -->
+ <mkdir dir="${install.bin}"/>
+ <copy todir="${install.bin}" filtering="no">
+ <fileset dir="${_module.output}/bin">
+ <include name="**/*"/>
+ </fileset>
<fileset dir="${_module.output}/lib">
- <include name="*-client.jar"/>
- <include name="connector.jar"/>
+ <include name="run.jar"/>
+ <include name="shutdown.jar"/>
+ </fileset>
+ </copy>
+ <chmod perm="+x">
+ <fileset dir="${install.bin}">
+ <include name="**/*.sh"/>
+ </fileset>
+ </chmod>
- <!-- Shouldn't these go into bin ? -->
- <include name="stop.jar"/>
-<!--
- <include name="deploy.jar"/>
--->
+ <!-- Copy thirdparty code -->
+ <copy todir="${install.lib}" filtering="no">
+ <fileset dir="${apache.log4j.lib}">
+ <include name="log4j.jar"/>
+ </fileset>
+ <fileset dir="${gnu.getopt.lib}">
+ <include name="getopt.jar"/>
</fileset>
</copy>
- <!-- Setup the deployment directory (deploy) -->
- <!--
- <mkdir dir="${install.deploy}"/>
- <copy todir="${install.deploy}" filtering="no">
- <fileset dir="${_module.output}/etc">
- <include name="deploy.txt"/>
+ <!-- Copy thirdparty client code -->
+ <copy todir="${install.client}" filtering="no">
+ <fileset dir="${apache.log4j.lib}">
+ <include name="log4j.jar"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <target name="_module-system-all" depends="_module-system-most">
+ <!-- Copy the generated javadocs -->
+ <mkdir dir="${install.api}/${_module.name}"/>
+ <copy todir="${install.api}/${_module.name}" filtering="no">
+ <fileset dir="${_module.output}/api">
+ <include name="**/*"/>
</fileset>
</copy>
- -->
+ </target>
+
+ <!-- ====== -->
+ <!-- Naming -->
+ <!-- ====== -->
- <!-- Copy the generated deployment libraries (deploy/lib) -->
- <mkdir dir="${install.deploy.lib}"/>
- <!--
- <copy todir="${install.deploy.lib}" filtering="no">
+ <target name="_module-naming-most">
+ <property name="_module.name" value="naming" override="true"/>
+ <property name="_module.output" override="true"
+ value="${project.root}/${_module.name}/output"/>
+
+ <!-- Copy the generated libraries (lib/ext) -->
+ <mkdir dir="${install.lib}"/>
+ <copy todir="${install.lib}" filtering="no">
<fileset dir="${_module.output}/lib">
- <include name="jms-ra.rar"/>
+ <include name="jnpserver.jar"/>
</fileset>
</copy>
- -->
-
- <!-- Copy the mail service xml snippet (deploy/lib) -->
- <!--
- <copy todir="${install.deploy.lib}" filtering="no">
- <fileset dir="${_module.output}/etc/conf/default">
- <include name="mail-service.xml"/>
+
+ <!-- Copy the generated libraries (client) -->
+ <mkdir dir="${install.client}"/>
+ <copy todir="${install.client}" filtering="no">
+ <fileset dir="${_module.output}/lib">
+ <include name="jnp-client.jar"/>
</fileset>
</copy>
- -->
+ </target>
- <!-- Copy the core service xml snippet (deploy/lib) -->
- <copy todir="${install.deploy.lib}" filtering="no">
-<!--
- <fileset dir="${_module.output}/etc/conf/default">
- <include name="core-service.xml"/>
+ <target name="_module-naming-all" depends="_module-naming-most">
+ <!-- Copy the generated javadocs -->
+ <mkdir dir="${install.api}/${_module.name}"/>
+ <copy todir="${install.api}/${_module.name}" filtering="no">
+ <fileset dir="${_module.output}/api">
+ <include name="**/*"/>
</fileset>
--->
- <fileset dir="${project.build}/etc/conf/default">
- <include name="core-service.xml"/>
+ </copy>
+ </target>
+
+ <!-- ========== -->
+ <!-- Management -->
+ <!-- ========== -->
+
+ <target name="_module-management-most">
+ <property name="_module.name" value="management" override="true"/>
+ <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="jboss-jsr77.jar"/>
+ <include name="jboss-management.jar"/>
</fileset>
</copy>
+ <mkdir dir="${install.server}/default/deploy"/>
+ <copy todir="${install.server}/default/deploy" filtering="no">
+ <!-- Deployable archives -->
+ <fileset dir="${_module.output}/lib">
+ <include name="ejb-management.jar"/>
+ </fileset>
+ </copy>
- <!-- Copy the jbossmq service xml snippet (deploy/lib) -->
- <copy todir="${install.deploy.lib}" filtering="no">
- <fileset dir="${_module.output}/etc/conf/default">
- <include name="jbossmq-service.xml"/>
+ <!-- Copy the generated client libraries -->
+ <mkdir dir="${install.client}"/>
+ <copy todir="${install.client}" filtering="no">
+ <fileset dir="${_module.output}/lib">
+ <include name="jboss-jsr77.jar"/>
</fileset>
</copy>
+ </target>
- <!-- Copy the jms service xml snippet (deploy/lib) -->
- <!--
- <copy todir="${install.deploy.lib}" filtering="no">
- <fileset dir="${_module.output}/etc/conf/default">
- <include name="jms-service.xml"/>
+ <target name="_module-management-all" depends="_module-management-most">
+ <!-- Copy the generated javadocs -->
+ <mkdir dir="${install.api}/${_module.name}"/>
+ <copy todir="${install.api}/${_module.name}" filtering="no">
+ <fileset dir="${_module.output}/api">
+ <include name="**/*"/>
</fileset>
</copy>
- -->
- <!-- Copy the j2eedeployment service xml snippet (deploy/lib) -->
- <!--
- <copy todir="${install.deploy.lib}" filtering="no">
- <fileset dir="${_module.output}/etc/conf/default">
- <include name="j2eedeployment-service.xml"/>
+ <!-- Copy the generated todo docs -->
+ <mkdir dir="${install.todo}/${_module.name}"/>
+ <copy todir="${install.todo}/${_module.name}" filtering="no">
+ <fileset dir="${_module.output}/todo">
+ <include name="**/*"/>
</fileset>
</copy>
- -->
+ </target>
- <!-- Copy the hsql defaultds service xml snippet (deploy/lib) -->
- <!--
- <copy todir="${install.deploy.lib}" filtering="no">
- <fileset dir="${_module.output}/etc/conf/default">
- <include name="hsql-default-service.xml"/>
+ <!-- ====== -->
+ <!-- Server -->
+ <!-- ====== -->
+
+ <target name="_module-server-most">
+ <property name="_module.name" value="server" override="true"/>
+ <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="jboss.jar"/>
</fileset>
</copy>
- -->
- <!-- Copy the jmx-connector.jsr (deploy/lib) -->
- <copy todir="${install.deploy.lib}" filtering="no">
+ <!-- Copy the generated client libraries -->
+ <mkdir dir="${install.client}"/>
+ <copy todir="${install.client}" filtering="no">
<fileset dir="${_module.output}/lib">
- <include name="jmx-connector.jsr"/>
+ <include name="*-client.jar"/>
+ <include name="jmx-ejb-connector-client.jar"/>
+ <include name="jmx-rmi-connector-client.jar"/>
+ <include name="jmx-connector-client-factory.jar"/>
</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">
- <include name="**/run.sh"/>
- <include name="**/run.bat"/>
- <include name="**/privatekeys"/>
+ <include name="**/*"/>
</fileset>
<fileset dir="${_module.output}/lib">
- <include name="run.jar"/>
+ <include name="boot.jar"/>
</fileset>
</copy>
<chmod perm="+x">
@@ -476,53 +610,59 @@
</fileset>
</chmod>
- <!-- Copy the default configuration files (conf) -->
- <mkdir dir="${install.conf}"/>
- <copy todir="${install.conf}" filtering="no">
- <fileset dir="${_module.output}/etc/conf">
-<!--
- <include name="**/default/jboss.properties"/>
--->
- <include name="**/default/jbossmq-state.xml"/>
- <include name="**/default/jndi.properties"/>
- <include name="**/default/log4j.properties"/>
- <include name="**/default/server.policy"/>
-
- <exclude name="default/mail-service.xml"/>
- <exclude name="default/core-service.xml"/>
- <!--<exclude name="default/jetty-service.xml"/>-->
- <exclude name="default/jms-service.xml"/>
- <exclude name="default/j2eedeployment-service.xml"/>
- <exclude name="default/jbossmq-service.xml"/>
- <exclude name="default/hsql-default-service.xml"/>
+ <!-- Copy thirdparty code -->
+ <copy todir="${install.lib}" filtering="no">
+ <fileset dir="${sun.jts.lib}">
+ <include name="jts.jar"/>
</fileset>
-
- <fileset dir="${project.build}/etc/conf">
- <include name="**/default/jboss-service.xml"/>
+ <fileset dir="${oswego.concurrent.lib}">
+ <include name="concurrent.jar"/>
+ </fileset>
+ <fileset dir="${gjt.jpl-util.lib}">
+ <include name="*.jar"/>
+ </fileset>
+ <fileset dir="${gnu.regexp.lib}">
+ <include name="*.jar"/>
+ </fileset>
+ <fileset dir="${apache.bcel.lib}">
+ <include name="bcel.jar"/>
</fileset>
</copy>
- <!-- Setup the database directory (db) -->
- <mkdir dir="${install.db}"/>
- <copy todir="${install.db}" filtering="no">
- <fileset dir="${_module.output}/etc">
- <include name="db.properties"/>
+ <!-- Copy thirdparty client code -->
+ <copy todir="${install.client}" filtering="no">
+ <fileset dir="${oswego.concurrent.lib}">
+ <include name="concurrent.jar"/>
+ </fileset>
+ <fileset dir="${gnu.regexp.lib}">
+ <include name="*.jar"/>
</fileset>
</copy>
- <!-- Setup the log file directory (log) -->
- <mkdir dir="${install.log}"/>
- <copy todir="${install.log}" filtering="no">
- <fileset dir="${_module.output}/etc">
- <include name="log.properties"/>
+ <!-- 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="**"/>
+ <exclude name="hsqldb-default-service.xml"/>
+ </fileset>
+
+ <!-- Deployable archives -->
+ <fileset dir="${_module.output}/lib">
+ <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>
- <!-- Setup the temporary file directory (tmp) -->
- <mkdir dir="${install.tmp}"/>
- <copy todir="${install.tmp}" filtering="no">
- <fileset dir="${_module.output}/etc">
- <include name="tmp.properties"/>
+ <!-- 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>
</target>
@@ -545,6 +685,77 @@
</copy>
</target>
+ <!-- ==== -->
+ <!-- Pool -->
+ <!-- ==== -->
+
+ <target name="_module-pool-most">
+ <property name="_module.name" value="pool" override="true"/>
+ <property name="_module.output" override="true"
+ value="${project.root}/${_module.name}/output"/>
+
+ <!-- Pool will be going away soon -->
+
+ <!-- Copy the generated libraries -->
+ <mkdir dir="${install.lib}"/>
+ <copy todir="${install.lib}" filtering="no">
+ <fileset dir="${_module.output}/lib">
+ <include name="jboss-pool.jar"/>
+ </fileset>
+ </copy>
+
+ </target>
+
+ <target name="_module-pool-all" depends="_module-pool-most">
+ <!-- Copy the generated javadocs -->
+ <mkdir dir="${install.api}/${_module.name}"/>
+ <copy todir="${install.api}/${_module.name}" filtering="no">
+ <fileset dir="${_module.output}/api">
+ <include name="**/*"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <!-- ========= -->
+ <!-- Connector -->
+ <!-- ========= -->
+
+ <target name="_module-connector-most">
+ <property name="_module.name" value="connector" override="true"/>
+ <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="jboss-jca.jar"/>
+ </fileset>
+ </copy>
+
+ <!-- Copy the generated deployment libraries -->
+ <mkdir dir="${install.server}/default/deploy"/>
+ <copy todir="${install.server}/default/deploy" filtering="no">
+ <fileset dir="${_module.output}/lib">
+ <include name="*.rar"/>
+ </fileset>
+ </copy>
+
+ <!-- HACK, HACK, HACK -->
+ <copy file="${_module.output}/resources/jca-sar/META-INF/jboss-service.xml"
+ tofile="${install.server}/default/deploy/jca-service.xml" filtering="no"/>
+ </target>
+
+ <target name="_module-connector-all" depends="_module-connector-most">
+ <!-- Copy the generated javadocs -->
+ <mkdir dir="${install.api}/${_module.name}"/>
+ <copy todir="${install.api}/${_module.name}" filtering="no">
+ <fileset dir="${_module.output}/api">
+ <include name="**/*"/>
+ </fileset>
+ </copy>
+ </target>
+
<!-- ========= -->
<!-- Messaging -->
<!-- ========= -->
@@ -555,15 +766,15 @@
value="${project.root}/${_module.name}/output"/>
<!-- Copy the jbossmq service xml snippet (deploy/lib) -->
- <copy todir="${install.deploy.lib}" filtering="no">
+ <copy todir="${install.server}/default/deploy" filtering="no">
<fileset dir="${_module.output}/etc/conf/default">
<include name="jbossmq-service.xml"/>
</fileset>
</copy>
<!-- Copy the generated libraries (lib/ext) -->
- <mkdir dir="${install.lib.ext}"/>
- <copy todir="${install.lib.ext}" filtering="no">
+ <mkdir dir="${install.lib}"/>
+ <copy todir="${install.lib}" filtering="no">
<fileset dir="${_module.output}/lib">
<include name="jbossmq.jar"/>
</fileset>
@@ -578,17 +789,17 @@
</copy>
<!-- Copy the default configuration files (conf) -->
- <mkdir dir="${install.conf}"/>
- <copy todir="${install.conf}" filtering="no">
- <fileset dir="${_module.output}/etc/conf">
+ <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"/>
+ <exclude name="jbossmq-service.xml"/>
</fileset>
</copy>
<!-- Setup the database directory (db) -->
- <mkdir dir="${install.db}/jbossmq"/>
- <copy todir="${install.db}/jbossmq" filtering="no">
+ <mkdir dir="${install.server}/default/db/jbossmq"/>
+ <copy todir="${install.server}/default/db/jbossmq" filtering="no">
<fileset dir="${_module.output}/etc">
<include name="db-readme.txt"/>
</fileset>
@@ -614,25 +825,25 @@
</copy>
</target>
+ <!-- ======== -->
<!-- Security -->
- <target name="_module-security-most">
- </target>
+ <!-- ======== -->
- <target name="OLD_module-security-most">
+ <target name="_module-security-most">
<property name="_module.name" value="security" override="true"/>
<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">
@@ -643,6 +854,20 @@
<include name="*"/>
</fileset>
</copy>
+
+ <!-- Copy thirdparty code -->
+ <copy todir="${install.lib}" filtering="no">
+ <fileset dir="${sun.jsse.lib}">
+ <include name="*.jar"/>
+ </fileset>
+ </copy>
+
+ <!-- Copy thirdparty client code -->
+ <copy todir="${install.client}" filtering="no">
+ <fileset dir="${sun.jsse.lib}">
+ <include name="*.jar"/>
+ </fileset>
+ </copy>
</target>
<target name="_module-security-all" depends="_module-security-most">
@@ -655,7 +880,6 @@
</copy>
</target>
-
<!-- ================================================================== -->
<!-- Install & Release -->
<!-- ================================================================== -->
@@ -667,17 +891,14 @@
<target name="install-dependencies" depends="init">
<mkdir dir="${install.lib}"/>
<copy todir="${install.lib}" filtering="no">
- <fileset dir="${sun.jmx.lib}">
- <include name="jmxri.jar"/>
- </fileset>
<fileset dir="${sun.jaxp.lib}">
<include name="*.jar"/>
<exclude name="xalan.jar"/>
</fileset>
</copy>
- <mkdir dir="${install.lib.ext}"/>
- <copy todir="${install.lib.ext}" filtering="no">
+ <mkdir dir="${install.lib}"/>
+ <copy todir="${install.lib}" filtering="no">
<fileset dir="${sun.jndi.lib}">
<include name="jndi.jar"/>
</fileset>
@@ -686,6 +907,9 @@
<include name="xalan.jar"/>
</fileset>
-->
+ <fileset dir="${sun.jmx.lib}">
+ <include name="jmxri.jar"/>
+ </fileset>
<fileset dir="${sun.jmx.lib}">
<include name="jmxtools.jar"/>
</fileset>
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
