User: chirino
Date: 01/09/12 19:39:50
Modified: jbossmq build.xml
Log:
Adjusted build and changed where the examples are placed in the final
distribution. The jboss-mq module should now build again and produce
the standalone jbossmq binary.
Revision Changes Path
1.9 +59 -7 build/jbossmq/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/build/jbossmq/build.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- build.xml 2001/09/12 00:10:19 1.8
+++ build.xml 2001/09/13 02:39:49 1.9
@@ -10,7 +10,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.8 2001/09/12 00:10:19 user57 Exp $ -->
+<!-- $Id: build.xml,v 1.9 2001/09/13 02:39:49 chirino Exp $ -->
<project default="main" name="JBossMQ/Build">
@@ -31,7 +31,7 @@
<path id="project.root"><pathelement location=".."/></path>
<property name="project.root" refid="project.root"/>
<property name="project.build" value="${project.root}/build"/>
-
+
<!-- Include user and project property overrides. -->
<property file="${user.home}/.buildmagic.properties"/>
<property file="${user.home}/.ant.properties"/>
@@ -584,40 +584,54 @@
<!-- Shouldn't these go into bin ? -->
<include name="stop.jar"/>
+<!--
<include name="deploy.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"/>
</fileset>
</copy>
+ -->
<!-- Copy the generated deployment libraries (deploy/lib) -->
<mkdir dir="${install.deploy.lib}"/>
+ <!--
<copy todir="${install.deploy.lib}" filtering="no">
<fileset dir="${_module.output}/lib">
<include name="jms-ra.rar"/>
</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"/>
</fileset>
</copy>
+ -->
<!-- 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"/>
</fileset>
+-->
+ <fileset dir="${project.build}/etc/conf/default">
+ <include name="core-service.xml"/>
+ </fileset>
</copy>
+
<!-- Copy the jbossmq service xml snippet (deploy/lib) -->
<copy todir="${install.deploy.lib}" filtering="no">
<fileset dir="${_module.output}/etc/conf/default">
@@ -626,25 +640,31 @@
</copy>
<!-- 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"/>
</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"/>
</fileset>
</copy>
+ -->
<!-- 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"/>
</fileset>
</copy>
+ -->
<!-- Copy the jmx-connector.jsr (deploy/lib) -->
<copy todir="${install.deploy.lib}" filtering="no">
@@ -657,7 +677,9 @@
<mkdir dir="${install.bin}"/>
<copy todir="${install.bin}" filtering="no">
<fileset dir="${_module.output}/bin">
- <include name="**/*"/>
+ <include name="**/run.sh"/>
+ <include name="**/run.bat"/>
+ <include name="**/privatekeys"/>
</fileset>
<fileset dir="${_module.output}/lib">
<include name="run.jar"/>
@@ -673,7 +695,14 @@
<mkdir dir="${install.conf}"/>
<copy todir="${install.conf}" filtering="no">
<fileset dir="${_module.output}/etc/conf">
- <include name="**/*"/>
+<!--
+ <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"/>-->
@@ -682,6 +711,10 @@
<exclude name="default/jbossmq-service.xml"/>
<exclude name="default/hsql-default-service.xml"/>
</fileset>
+
+ <fileset dir="${project.build}/etc/conf">
+ <include name="**/default/jboss-service.xml"/>
+ </fileset>
</copy>
<!-- Setup the database directory (db) -->
@@ -767,7 +800,13 @@
</copy>
<!-- Setup the database directory (db) -->
- <mkdir dir="${install.db}/jbossmq"/>
+ <mkdir dir="${install.db}/jbossmq"/>
+ <copy todir="${install.db}/jbossmq" filtering="no">
+ <fileset dir="${_module.output}/etc">
+ <include name="db-readme.txt"/>
+ </fileset>
+ </copy>
+
</target>
<target name="_module-messaging-all" depends="_module-messaging-most">
@@ -789,8 +828,10 @@
</target>
<!-- Security -->
-
<target name="_module-security-most">
+ </target>
+
+ <target name="OLD_module-security-most">
<property name="_module.name" value="security" override="true"/>
<property name="_module.output" override="true"
value="${project.root}/${_module.name}/output"/>
@@ -851,12 +892,15 @@
<fileset dir="${sun.jndi.lib}">
<include name="jndi.jar"/>
</fileset>
+<!--
<fileset dir="${sun.jaxp.lib}">
<include name="xalan.jar"/>
</fileset>
+-->
<fileset dir="${sun.jmx.lib}">
<include name="jmxtools.jar"/>
</fileset>
+<!--
<fileset dir="${sun.jaf.lib}">
<include name="activation.jar"/>
</fileset>
@@ -866,24 +910,30 @@
<fileset dir="${sun.jts.lib}">
<include name="jts.jar"/>
</fileset>
+-->
<fileset dir="${oswego.concurrent.lib}">
<include name="concurrent.jar"/>
</fileset>
+<!--
<fileset dir="${gjt.jpl-util.lib}">
<include name="*.jar"/>
</fileset>
+-->
<fileset dir="${javagroups.javagroups.lib}">
<include name="JavaGroups.jar"/>
</fileset>
<fileset dir="${apache.log4j.lib}">
<include name="log4j.jar"/>
</fileset>
+<!--
<fileset dir="${sun.jsr77.lib}">
<include name="jsr77.jar"/>
</fileset>
+-->
<fileset dir="${gnu.regexp.lib}">
<include name="*.jar"/>
</fileset>
+<!--
<fileset dir="${sun.jsse.lib}">
<include name="*.jar"/>
</fileset>
@@ -905,6 +955,7 @@
<fileset dir="${mortbay.jetty3extra.jmx.lib}">
<include name="**/*.jar"/>
</fileset>
+-->
</copy>
<mkdir dir="${install.client}"/>
@@ -921,9 +972,11 @@
<fileset dir="${gnu.regexp.lib}">
<include name="*.jar"/>
</fileset>
+<!--
<fileset dir="${sun.jsse.lib}">
<include name="*.jar"/>
</fileset>
+-->
</copy>
</target>
@@ -931,7 +984,6 @@
<!-- ================================================================== -->
<!-- Release -->
<!-- ================================================================== -->
-
<target name="release" depends="install, modules-all"/>
<target name="release-zip" depends="release"
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development