User: chirino 
  Date: 01/08/28 21:35:32

  Modified:    jbossmq  build.bat build.sh build.xml
  Log:
  Adjusting the JBossMQ standalone build
  
  Revision  Changes    Path
  1.2       +81 -40    build/jbossmq/build.bat
  
  Index: build.bat
  ===================================================================
  RCS file: /cvsroot/jboss/build/jbossmq/build.bat,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- build.bat 2001/08/12 00:34:52     1.1
  +++ build.bat 2001/08/29 04:35:32     1.2
  @@ -1,40 +1,81 @@
  -@echo off
  -@if not "%ECHO%" == ""  echo %ECHO%
  -@if "%OS%" == "Windows_NT"  setlocal
  -
  -REM convenience bat file to build with
  -
  -
  -REM get the pwd
  -
  -@echo off
  -dir | find "Directory" > }1{.bat
  -set quote="
  -echo if %%3!==! set quote=> directory.bat
  -rem echo set PWD=%%quote%%%%2 %%3 %%4 %%5 %%6 %%7 %%8 %%9 %%quote%%>>directory.bat
  -echo set PWD=%%quote%%>>directory.bat
  -echo if not %%2!==! set PWD=%%PWD%%%%2>>directory.bat
  -echo if not %%3!==! set PWD=%%PWD%%%%3>>directory.bat
  -echo if not %%4!==! set PWD=%%PWD%%%%4>>directory.bat
  -echo if not %%5!==! set PWD=%%PWD%%%%5>>directory.bat
  -echo if not %%6!==! set PWD=%%PWD%%%%6>>directory.bat
  -echo if not %%7!==! set PWD=%%PWD%%%%7>>directory.bat
  -echo if not %%8!==! set PWD=%%PWD%%%%8>>directory.bat
  -echo if not %%9!==! set PWD=%%PWD%%%%9>>directory.bat
  -echo set PWD=%%PWD%%%%quote%%>>directory.bat
  -call }1{
  -
  -rem tidy up and remove temp scripts and unset environment var
  -for %%a in (}1{ directory) do del %%a.bat
  -set quote=
  -
  -for %%i in (..\tools\apache\ant\lib\*.jar) do call lcp.bat %%i
  -for %%i in (..\tools\sun\javac\lib\*.jar) do call lcp.bat %%i
  -for %%i in (..\tools\dreambean\ejbdoclet\lib\*.jar) do call lcp.bat %%i
  -for %%i in (..\tools\planet57\buildmagic\lib\*.jar) do call lcp.bat %%i
  -
  -set CP=%CP%;%PWD%\..\..\build\classes
  -
  -echo CLASSPATH= %CP%
  -
  -java %ANT_OPTS% -classpath "%CP%" org.apache.tools.ant.Main %1 %2 %3 %4 %5
  +@echo off
  +REM  ======================================================================
  +REM
  +REM  This is the main entry point for the build system.
  +REM
  +REM  Users should be sure to execute this file rather than 'ant' to ensure
  +REM  the correct version is being used with the correct configuration.
  +REM
  +REM  ======================================================================
  +REM
  +REM $Id: build.bat,v 1.2 2001/08/29 04:35:32 chirino Exp $
  +REM
  +REM Authors:
  +REM     Jason Dillon <[EMAIL PROTECTED]>
  +REM     Sacha Labourey  <[EMAIL PROTECTED]>
  +REM
  +
  +REM ******************************************************
  +REM Ignore the users classpath, cause it might mess
  +REM things up
  +REM ******************************************************
  +
  +set CLASSPATH=
  +
  +
  +REM ******************************************************
  +REM - "for" loops have been unrolled for compatibility
  +REM   with some WIN32 systems.
  +REM ******************************************************
  +
  +set NAMES=tools;tools\ant;tools\apache\ant
  +set SUBFOLDERS=..;..\..;..\..\..;..\..\..\..
  +
  +REM ******************************************************
  +REM ******************************************************
  +
  +SET EXECUTED=FALSE
  +for %%i in (%NAMES%) do call :subLoop %%i %1 %2 %3 %4 %5 %6
  +
  +goto :EOF
  +
  +
  +REM ******************************************************
  +REM ********* Search for names in the subfolders *********
  +REM ******************************************************
  +
  +:subLoop
  +for %%j in (%SUBFOLDERS%) do call :testIfExists %%j\%1\bin\ant.bat %2 %3 %4 %5 %6 %7
  +
  +goto :EOF
  +
  +
  +REM ******************************************************
  +REM ************ Test if ANT Batch file exists ***********
  +REM ******************************************************
  +
  +:testIfExists
  +if exist %1 call :BatchFound %1 %2 %3 %4 %5 %6 %7 %8
  +
  +goto :EOF
  +
  +
  +REM ******************************************************
  +REM ************** Batch file has been found *************
  +REM ******************************************************
  +
  +:BatchFound
  +if (%EXECUTED%)==(FALSE) call :ExecuteBatch %1 %2 %3 %4 %5 %6 %7 %8
  +set EXECUTED=TRUE
  +
  +goto :EOF
  +
  +REM ******************************************************
  +REM ************* Execute Batch file only once ***********
  +REM ******************************************************
  +
  +:ExecuteBatch
  +echo Calling %1 %2 %3 %4 %5 %6 %7 %8
  +call %1 %2 %3 %4 %5 %6 %7 %8
  +
  +:end
  \ No newline at end of file
  
  
  
  1.2       +22 -22    build/jbossmq/build.sh
  
  Index: build.sh
  ===================================================================
  RCS file: /cvsroot/jboss/build/jbossmq/build.sh,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- build.sh  2001/08/12 00:34:52     1.1
  +++ build.sh  2001/08/29 04:35:32     1.2
  @@ -1,39 +1,25 @@
   #!/bin/sh
   ### ====================================================================== ###
   ##                                                                          ##
  -##  Copyright (c) 1998-2000 by Jason Dillon <[EMAIL PROTECTED]>            ##
  -##                                                                          ##
  -##  This file is part of Buildmagic.                                        ##
  -##                                                                          ##
  -##  This library is free software; you can redistribute it and/or modify    ##
  -##  it under the terms of the GNU Lesser General Public License as          ##
  -##  published by the Free Software Foundation; either version 2 of the      ##
  -##  License, or (at your option) any later version.                         ##
  -##                                                                          ##
  -##  This library is distributed in the hope that it will be useful, but     ##
  -##  WITHOUT ANY WARRANTY; without even the implied warranty of              ##
  -##  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU       ##
  -##  Lesser General Public License for more details.                         ##
  -##                                                                          ##
  -### ====================================================================== ###
  -##                                                                          ##
   ##  This is the main entry point for the build system.                      ##
  +##                                                                          ##
   ##  Users should be sure to execute this file rather than 'ant' to ensure   ##
   ##  the correct version is being used with the correct configuration.       ##
   ##                                                                          ##
   ### ====================================================================== ###
   
  -# $Id: build.sh,v 1.1 2001/08/12 00:34:52 chirino Exp $
  +# $Id: build.sh,v 1.2 2001/08/29 04:35:32 chirino Exp $
   
   PROGNAME=`basename $0`
   DIRNAME=`dirname $0`
   GREP="grep"
   ROOT="/"
   
  -# the default search path for buildmagic/ant
  +# the default search path for ant
   ANT_SEARCH_PATH="\
  -    tools/apache/ant \
  +    tools
       tools/ant \
  +    tools/apache/ant \
       ant"
   
   # the default build file name
  @@ -42,9 +28,13 @@
   # the default arguments
   ANT_OPTIONS="-find $ANT_BUILD_FILE"
   
  -# the required version of Ant
  -ANT_VERSION="1.3"
  +# don't check versions (too slow)
  +ANT_VERSION=""
   
  +# specify the jaxp parsers to use
  +JAXP_DOM_FACTORY="org.apache.crimson.jaxp.DocumentBuilderFactoryImpl"
  +JAXP_SAX_FACTORY="org.apache.crimson.jaxp.SAXParserFactoryImpl"
  +
   #
   # Helper to complain.
   #
  @@ -113,12 +103,22 @@
       fi
   
       # perhaps check the version
  -    if [ "x$ANT_VERSION_CHECK" != "x" ]; then
  +    if [ "x$ANT_VERSION" != "x" ] && [ "x$ANT_VERSION_CHECK" != "x" ]; then
        result="`$ANT -version 2>&1 | $GREP $ANT_VERSION`x"
        if [ "$result" = "x" ]; then
            die "Ant version $ANT_VERSION is required to build."
        fi
       fi
  +
  +    # Specify the JAXP parser impls to use
  +    ANT_OPTS="$ANT_OPTS 
-Djavax.xml.parsers.DocumentBuilderFactory=$JAXP_DOM_FACTORY"
  +    ANT_OPTS="$ANT_OPTS -Djavax.xml.parsers.SAXParserFactory=$JAXP_SAX_FACTORY"
  +    export ANT_OPTS
  +
  +    # change to the directory where the script lives so folks do not have
  +    # to be in the same dir to run the build without specifying the build
  +    # file. 
  +    cd $DIRNAME
   
       export ANT ANT_HOME
       exec $ANT $ANT_OPTIONS "$@"
  
  
  
  1.7       +338 -274  build/jbossmq/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /cvsroot/jboss/build/jbossmq/build.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- build.xml 2001/08/22 15:15:47     1.6
  +++ build.xml 2001/08/29 04:35:32     1.7
  @@ -1,203 +1,209 @@
   <?xml version="1.0" encoding="UTF-8"?>
  -<!DOCTYPE project [ <!ENTITY config SYSTEM "file:./config.xml"> ]>
  +<!DOCTYPE project>
   
   <!-- ====================================================================== -->
   <!--                                                                        -->
  -<!--  JBoss, the OpenSource EJB server                                      -->
  +<!--  JBoss, the OpenSource J2EE webOS                                      -->
   <!--                                                                        -->
   <!--  Distributable under LGPL license.                                     -->
   <!--  See terms of license at http://www.gnu.org.                           -->
   <!--                                                                        -->
   <!-- ====================================================================== -->
   
  -<!-- $Id: build.xml,v 1.6 2001/08/22 15:15:47 chirino Exp $ -->
  +<!-- $Id: build.xml,v 1.7 2001/08/29 04:35:32 chirino Exp $ -->
   
  -<project default="main" basedir="..">
  +<project default="main">
   
     <!-- ================================================================== -->
  -  <!-- Basic project configuration                                        -->
  +  <!-- Initialization                                                     -->
     <!-- ================================================================== -->
   
  -  <!--
  -     |  Give users a chance to use a different Buildmagic.
  -    -->
  -  <property file="${user.home}/.buildmagic.properties"/>
  +  <!-- Load Buildmagic extention tasks. -->
  +  <taskdef name="taskdef" classname="planet57.tools.buildmagic.task.Taskdef"/>
  +  <taskdef resource="planet57/tools/buildmagic/task/autoload.properties"/>
   
  -  <!-- 
  -     |  Load Buildmagic Ant extentions. 
  -    -->
  -  <property name="planet57.buildmagic.root" 
value="${basedir}/tools/planet57/buildmagic"/>
  -  <property name="planet57.buildmagic.lib" value="${planet57.buildmagic.root}/lib"/>
  -  <path id="planet57.buildmagic.classpath">
  -    <fileset dir="${planet57.buildmagic.lib}">
  -      <include name="**/*.jar"/>
  -    </fileset>
  -  </path>
  -  <taskdef name="taskdef" classname="planet57.tools.buildmagic.task.Taskdef"
  -        classpathref="planet57.buildmagic.classpath"/>
  -  <taskdef classpathref="planet57.buildmagic.classpath"
  -        resource="planet57/tools/buildmagic/task/autoload.properties"/>
  +  <!-- Setup the basic project roots. -->
  +  <path id="project.root"><pathelement location=".."/></path>
  +  <property name="project.root" refid="project.root"/>
  +  <path id="control.root"><pathelement location="."/></path>
  +  <property name="control.root" refid="control.root"/>
   
  -  <!--
  -     |  Setup the basic project roots.
  -     |
  -     |  project.root    - Should be the parent directory from this file
  -     |  project.config  - Should be the directory this file is in
  -   -->
  -  <property name="project.root">
  -    <findroot basedir="." suffix="build/build.xml"/>
  -  </property>
  -  <property name="project.config" value="${basedir}/build"/>
  -
  -  
  -  <!-- 
  -     |  Include user and project property overrides.
  -     |
  -     |  override.properties     - Used rarely (ignore)
  -     |  .buildmagic.properties  - Provide Buildmagic specific properties
  -     |  .ant.properties         - Ant properties
  -     |  local.properties        - User local module properties
  -     |  config.properties       - Used rarely (ignore)
  -    -->
  -  <property file="${project.config}/override.properties"/>
  +  <!-- Include user and project property overrides. -->
     <property file="${user.home}/.buildmagic.properties"/>
     <property file="${user.home}/.ant.properties"/>
  -  <property file="${project.config}/local.properties"/>
  -  <property file="${project.config}/config.properties"/>
  +  <property file="${control.root}/local.properties"/>
   
  -  <!-- 
  -     |  Setup the basic environment for a project build module.
  -     |
  -     |  project.output   - The root where build output will be placed
  -     |  project.release  - Where released files will be placed
  -     |  tools.root       - Where to build support tools live
  -     |  thirdparty.root  - Where to thirdparty libraries live
  -    -->
  -  <property name="project.output" value="${project.config}/output"/>
  -  <property name="project.release" value="${project.config}/build"/>
  +  <!-- Setup the basic environment for a project build module. -->
  +  <property name="project.output" value="${control.root}/output"/>
  +  <property name="project.release" value="${project.output}"/>
     <property name="tools.root" value="${project.root}/tools"/>
     <property name="thirdparty.root" value="${project.root}/thirdparty"/>
  -
  -  <!-- 
  -     |  Load project configuration.
  -     |
  -     |  config.xml  - Define most configuration elements here (required).
  -    -->
  -  &config;
  -
  -
  -  <!-- ================================================================== -->
  -  <!-- Initialize, Configure and Bootstrap the build system               -->
  -  <!-- ================================================================== -->
  -
  -  <!-- 
  -     |  Bootstrap all required extensions.
  -     |
  -     |  Build local Ant extensions here if they are required.
  -     |
  -     |  This target will not run once the bootstraped-already is set.
  -    -->
  -  <target name="bootstrap" 
  -       depends="bootstrap-init" 
  -       unless="project-bootstraped-already">
  -    <property name="project-bootstraped-already" value="true"/>
  -  </target>
  -
  -  <!-- Fail if the required dependencies are missing -->
  -  <target name="bootstrap-init" 
  -       depends="bootstrap-check" 
  -       unless="project-have-bootstrap-dependencies-already">
  -    <echo>Missing some or all of the required dependencies.</echo>
  -    <fail message="Can not continue."/>
  -  </target>
  -
  -  <!-- Check for required libraries -->
  -  <target name="bootstrap-check" unless="project-bootstraped-already">
  -    <!-- Check for required extensions here -->
  -    <property name="project-have-bootstrap-dependencies-already" value="true"/>
  -  </target>
  -
  -  <!-- 
  -     |  Configure the project and module build systems.
  -     |
  -     |  This will recurse to all configured modules can invoke there
  -     |  'configure' target.
  -    -->
  -  <target name="configure"
  -       depends="project-configure, all-configure"
  -       unless="project-configured-already"/>
  -
  -  <!-- 
  -     |  Configure the project build system.
  -     |
  -     |  o Updates/installs example files if they exist
  -     |  o Invokes the 'configure-hook' target, which should be defined in 
  -     |    config.xml.
  -     |
  -     |  This target will not run once the project-configured-already 
  -     |  property is set.
  -    -->
  -  <target name="project-configure" unless="project-configured-already">
  -    <property name="project.examples" value="${project.config}/etc"/>
  -    <property name="project.examples.extension" value="-example"/>
  -    <copy todir="${project.config}" filtering="yes">
  -      <fileset dir="${project.examples}/">
  -         <include name="**/*${project.examples.extension}"/>
  -      </fileset>
  -      <mapper type="glob" from="*${project.examples.extension}" to="*"/>
  -    </copy>
   
  -    <antcall target="configure-hook"/>
  -    <property name="project-configured-already" value="true"/>
  -  </target>
  -
  -  <!-- Disable execution of the configure target -->
  -  <target name="disable-configure">
  -    <property name="project-configured-already" value="true"/>
  -  </target>
  -
  -  <!-- 
  -     |  Initialize the build system.
  -     |
  -     |  o Sets the timestamp and build.number properties
  -     |  o Installs property defaults
  -     |  o Invokes to 'init-hook' target which should be defined in config.xml
  -     |  o Displays some project information
  -     |  o Resolves properties for psuedo late-binding
  -     |  o Installs filters for each property
  -     |
  -     |  This target will not run once the initialized-already property is set.
  -    -->
  -  <target name="init" 
  -       depends="project-configure, bootstrap" 
  -       unless="project-initialized-already">
  +  <!-- Initialize the build system. -->
  +  <target name="init" unless="project-initialized-already"
  +       depends="init-buildlog">
       <tstamp>
         <format property="build.number" pattern="yyyyMMddHHmm"/>
       </tstamp>
  -    <property name="build.id" value="${build.number}"/>
  +    <property name="build.id" value="DEV"/>
   
  +    <copy file="${control.root}/etc/local.properties-example"
  +          tofile="${control.root}/local.properties" filtering="yes"/>
  +    <property file="${control.root}/etc/local.properties"/>
       <property resource="planet57/tools/buildmagic/common.properties"/>
  -    <call target="init-hook" unless="bypass-init-hook"/>
  +
  +    <call target="configure"/>
       <projectinfo/>
   
       <resolver force="${buildmagic.resolveproperties.force}"/>
       <propertyfilter all="${buildmagic.propertyfilter.all}"/>
  -
       <property name="project-initialized-already" value="true"/>
     </target>
   
  -  <!-- Disable execution of the init target -->
  -  <target name="disable-init">
  -    <property name="project-initialized-already" value="true"/>
  +  <target name="init-buildlog" unless="buildlog-disabled">
  +    <record name="${basedir}/build.log" append="no" loglevel="info"/>
  +    <property name="buildlog-disabled" value="true"/>
     </target>
  +
  +
  +  <!-- ================================================================== -->
  +  <!-- Project Configuration                                              -->
  +  <!-- ================================================================== -->
  +
  +  <!-- Project name(s) & version -->
  +  <property name="project.name" value="jbossmq"/>
  +  <property name="project.Name" value="JBossMQ"/>
  +  <property name="project.version" value="1.0.0"/>
  +
  +  <!-- ================================================================== -->
  +  <!-- Child Module Configuration                                         -->
  +  <!-- ================================================================== -->
   
  -  <!-- Disable execution of the init-hook target -->
  -  <target name="disable-init-hook">
  -    <property name="bypass-init-hook" value="true"/>
  +  <!-- The group to use by default -->
  +  <property name="groups" value="default"/>
  +
  +  <target name="configure">
  +    <!-- Sets up the module configuration. -->
  +    <moduleconfig property="modules" selected="${groups}">
  +
  +      <!-- Standard modules -->
  +      <module name="j2ee"/>
  +      <module name="naming"/>
  +      <module name="server"/>
  +      <module name="security"/>
  +      <module name="messaging"/>
  +      <module name="connector"/>
  +      <module name="pool"/>
  +      <module name="cluster"/>
  +      <module name="admin"/>
  +      <module name="testsuite"/>
  +      <module name="manual"/>
  +
  +      <!-- Plugin modules -->
  +      <module name="plugins/varia"/>
  +      <module name="plugins/jetty"/>
  +
  +      <!-- Module groups -->
  +      <group name="core">
  +        <include modules="j2ee, naming, server"/>
  +      </group>
  +
  +      <group name="standard">
  +        <include modules="security, messaging, connector, pool"/>
  +        <include modules="cluster, admin, testsuite"/>
  +      </group>
  +
  +      <group name="optional">
  +        <include modules="manual"/>
  +      </group>
  +
  +      <group name="standard-plugins">
  +        <include modules="plugins/varia, plugins/jetty"/>
  +      </group>
  +
  +      <!-- Module group sets -->
  +      <group name="default">
  +        <include groups="core, standard, standard-plugins"/>
  +      </group>
  +
  +      <group name="most">
  +        <include groups="core, standard"/>
  +      </group>
  +
  +      <group name="minimal">
  +        <include groups="core"/>
  +      </group>
  +
  +      <group name="plugins">
  +        <include groups="standard-plugins"/>
  +      </group>
  +
  +      <group name="everything">
  +        <include groups="core, standard, optional"/>
  +        <include groups="standard-plugins"/>
  +      </group>
  +
  +    </moduleconfig>
     </target>
   
   
     <!-- ================================================================== -->
  +  <!-- Tool Configuration                                                 -->
  +  <!-- ================================================================== -->
  +
  +  <!-- No non-standard tools are required for this module. -->
  +
  +
  +  <!-- ================================================================== -->
  +  <!-- Task Configuration                                                 -->
  +  <!-- ================================================================== -->
  +
  +  <!-- Skip any missing modules and issue a warning -->
  +  <property name="executemodules.skipmissing" value="true"/>
  +
  +  <!-- Define the header and footer displayed during each module execution -->
  +  <property name="executemodules.header"><![CDATA[
  +    ====================================================================== 
  +    ==  Executing '${target}' in module '${module}'...
  +    ==]]></property>
  +
  +  <property name="executemodules.footer"><![CDATA[
  +    ==
  +    ==  Finished with '${target}' in module '${module}'.
  +    ======================================================================
  +    ]]></property>
  +
  +  <!-- Where release generated files will go -->
  +  <property name="release.id" 
value="${project.name}-${project.version}-${build.id}"/>
  +  <property name="release.root" value="${project.release}/${release.id}"/>
  +
  +  <property name="release.bin" value="${release.root}/bin"/>
  +  <property name="release.client" value="${release.root}/client"/>
  +  <property name="release.conf" value="${release.root}/conf"/>
  +  <property name="release.conf.default" value="${release.conf}/default"/>
  +  <property name="release.db" value="${release.root}/db"/>
  +  <property name="release.deploy" value="${release.root}/deploy"/>
  +  <property name="release.deploy.lib" value="${release.deploy}/lib"/>
  +  <property name="release.lib" value="${release.root}/lib"/>
  +  <property name="release.lib.ext" value="${release.lib}/ext"/>
  +  <property name="release.log" value="${release.root}/log"/>
  +  <property name="release.tmp" value="${release.root}/tmp"/>
  +
  +  <!-- Documentation and examples -->
  +  <property name="release.docs" value="${release.root}/docs"/>
  +  <property name="release.examples" value="${release.docs}/examples"/>
  +  <property name="release.api" value="${release.docs}/api"/>
  +  <property name="release.module.docs" value="${release.docs}/${module}"/>
  +  <property name="release.module.api" value="${release.api}/${module}"/>
  +
  +  <!-- Not really sure why these are here -->
  +  <property name="release.admin" value="${release.root}/admin"/>
  +  <property name="release.admin.client" value="${release.admin}/client"/>
  +  <property name="release.admin.client.lib" value="${release.admin.client}/lib"/>
  +  <property name="release.admin.components" value="${release.admin}/components"/>
  +
  +
  +  <!-- ================================================================== -->
     <!-- Builds a release distribution.                                     -->
     <!-- ================================================================== -->
   
  @@ -206,15 +212,63 @@
     </target>
   
     <target name="release-archive-prepare" depends="release">
  -    <mkdir dir="${project.release}"/>
  +
  +    <delete file="${project.release}/${release.id}/conf/default/jboss.jcml"/>
  +    <copy todir="${project.release}/${release.id}/conf">
  +      <fileset dir="${control.root}/etc/conf" includes="**"/>
  +    </copy>
  +
       <property name="release.archive.basename"
              value="${project.release}/${release.id}"/>
  +
  +    <property name="release.archive.includes"
  +               value="
  +            **/bin/run.*,
  +            **/client/**,
  +            **/conf/**,
  +            **/db/**,
  +            **/lib/**,
  +            **/log/**,
  +            **/tmp/**"/>
  +
  +     <property name="release.archive.excludes"
  +               value="
  +            **/mail.properties,
  +            **/schema.ini,
  +            **/standardjaws.xml,
  +            **/standardjboss.xml,
  +            **/standardjbosscmp-jdbc.xml,
  +                
  +                **/BeanCacheMonitorJMS.jar,
  +                **/BeanCacheMonitorJMX.jar,
  +                **/jboss_init_redhat.sh,
  +                **/deploy/**,
  +                
  +            **/connector.jar,
  +            **/jaas.jar,
  +            **/stop.jar,
  +            **/jbosssx.jar,
  +            **/jcert.jar,
  +            **/deploy.jar,
  +            **/activation.jar,
  +            **/jcert.jar,
  +            **/jbosssx.jar,
  +            **/jnet.jar,
  +            **/jpl-pattern.jar,
  +            **/jpl-util.jar,
  +            **/jsr77.jar,
  +            **/mail.jar,
  +            **/xalan.jar,
  +            **/jsse.jar,
  +            **/jts.jar"/>
     </target>
   
     <target name="release-zip" depends="release-archive-prepare"
          description="Builds a ZIP release distribution.">
       <zip zipfile="${release.archive.basename}.zip">
  -      <fileset dir="${project.output}">
  +      <fileset dir="${project.release}" 
  +             includes="${release.archive.includes}" 
  +             excludes="${release.archive.excludes}">
           <include name="${release.id}/**"/>
         </fileset>
       </zip>
  @@ -223,7 +277,7 @@
     <target name="release-tar" depends="release-archive-prepare"
          description="Builds a TAR release distribution.">
       <tar tarfile="${release.archive.basename}.tar" longfile="gnu"
  -      basedir="${project.output}"
  +      basedir="${project.release}"
         includes="${release.id}/**">
       </tar>
     </target>
  @@ -239,150 +293,155 @@
   
   
     <!-- ================================================================== -->
  +  <!-- Module Execution Hooks                                             -->
  +  <!-- ================================================================== -->
  +
  +  <!--
  +     | This is currently for testing, ignore.
  +   -->
  +
  +  <target name="release-server-prepare">
  +    <echo>Preparing for server release</echo>
  +  </target>
  +
  +  <target name="release-server">
  +    <echo>Releasing server module output</echo>
  +  </target>
  +
  +
  +  <!-- ================================================================== -->
     <!-- Module Pass-through Targets                                        -->
     <!-- ================================================================== -->
   
     <!-- Invoke the 'all' on all configured modules -->
     <target name="all-all" depends="init">
  -    <execmodules target="all" modules="${modules}" root="${project.root}/${module}"
  +    <execmodules target="all" modules="${modules}" 
  +              root="${project.root}/${module}"
                 skipmissing="${executemodules.skipmissing}">
  +      <before target="${target}-${module}-prepare"/>
         <header message="${executemodules.header}"/>
         <footer message="${executemodules.footer}"/>
  +      <after target="${target}-${module}"/>
       </execmodules>
     </target>
   
     <!-- Invoke the 'clean' on all configured modules -->
     <target name="all-clean" depends="init">
  -    <execmodules target="clean" modules="${modules}" 
root="${project.root}/${module}"
  +    <execmodules target="clean" modules="${modules}" 
  +              root="${project.root}/${module}"
                 skipmissing="${executemodules.skipmissing}">
  +      <before target="${target}-${module}-prepare"/>
         <header message="${executemodules.header}"/>
         <footer message="${executemodules.footer}"/>
  +      <after target="${target}-${module}"/>
       </execmodules>
     </target>
   
     <!-- Invoke the 'clobber' on all configured modules -->
     <target name="all-clobber" depends="init">
  -    <execmodules target="clobber" modules="${modules}" 
root="${project.root}/${module}"
  +    <execmodules target="clobber" modules="${modules}" 
  +              root="${project.root}/${module}"
                 skipmissing="${executemodules.skipmissing}">
  +      <before target="${target}-${module}-prepare"/>
         <header message="${executemodules.header}"/>
         <footer message="${executemodules.footer}"/>
  +      <after target="${target}-${module}"/>
       </execmodules>
     </target>
   
  -  <!-- Invoke the 'compile' on all configured modules -->
  -  <target name="all-compile" depends="init">
  -    <execmodules target="compile" modules="${modules}" 
root="${project.root}/${module}"
  +  <!-- Invoke the 'jars' on all configured modules -->
  +  <target name="all-jars" depends="init">
  +    <execmodules target="jars" modules="${modules}" 
  +              root="${project.root}/${module}"
                 skipmissing="${executemodules.skipmissing}">
  +      <before target="${target}-${module}-prepare"/>
         <header message="${executemodules.header}"/>
         <footer message="${executemodules.footer}"/>
  +      <after target="${target}-${module}"/>
       </execmodules>
     </target>
   
  -  <!-- Invoke the 'configure' on all configured modules -->
  -  <target name="all-configure" depends="init">
  -    <execmodules target="configure" modules="${modules}" 
root="${project.root}/${module}"
  +  <!-- Invoke the 'compile' on all configured modules -->
  +  <target name="all-compile" depends="init">
  +    <execmodules target="compile" modules="${modules}" 
  +              root="${project.root}/${module}"
                 skipmissing="${executemodules.skipmissing}">
  +      <before target="${target}-${module}-prepare"/>
         <header message="${executemodules.header}"/>
         <footer message="${executemodules.footer}"/>
  +      <after target="${target}-${module}"/>
       </execmodules>
     </target>
   
     <!-- Invoke the 'docs' on all configured modules -->
     <target name="all-docs" depends="init">
  -    <execmodules target="docs" modules="${modules}" root="${project.root}/${module}"
  -              skipmissing="${executemodules.skipmissing}">
  -      <header message="${executemodules.header}"/>
  -      <footer message="${executemodules.footer}"/>
  -    </execmodules>
  -  </target>
  -
  -  <!-- Invoke the 'jars' on all configured modules -->
  -  <target name="all-jars" depends="init">
  -    <execmodules target="jars" modules="${modules}" root="${project.root}/${module}"
  +    <execmodules target="docs" modules="${modules}" 
  +              root="${project.root}/${module}"
                 skipmissing="${executemodules.skipmissing}">
  +      <before target="${target}-${module}-prepare"/>
         <header message="${executemodules.header}"/>
         <footer message="${executemodules.footer}"/>
  +      <after target="${target}-${module}"/>
       </execmodules>
     </target>
   
     <!-- Invoke the 'main' on all configured modules -->
     <target name="all-main" depends="init">
  -    <execmodules target="main" modules="${modules}" root="${project.root}/${module}"
  +    <execmodules target="main" modules="${modules}" 
  +              root="${project.root}/${module}"
                 skipmissing="${executemodules.skipmissing}">
  +      <before target="${target}-${module}-prepare"/>
         <header message="${executemodules.header}"/>
         <footer message="${executemodules.footer}"/>
  +      <after target="${target}-${module}"/>
       </execmodules>
     </target>
   
     <!-- Invoke the 'min' on all configured modules -->
     <target name="all-min" depends="init">
  -    <execmodules target="min" modules="${modules}" root="${project.root}/${module}"
  +    <execmodules target="min" modules="${modules}" 
  +              root="${project.root}/${module}"
                 skipmissing="${executemodules.skipmissing}">
  +      <before target="${target}-${module}-prepare"/>
         <header message="${executemodules.header}"/>
         <footer message="${executemodules.footer}"/>
  +      <after target="${target}-${module}"/>
       </execmodules>
     </target>
   
     <!-- Invoke the 'most' on all configured modules -->
     <target name="all-most" depends="init">
  -    <execmodules target="most" modules="${modules}" root="${project.root}/${module}"
  +    <execmodules target="most" modules="${modules}" 
  +              root="${project.root}/${module}"
                 skipmissing="${executemodules.skipmissing}">
  +      <before target="${target}-${module}-prepare"/>
         <header message="${executemodules.header}"/>
         <footer message="${executemodules.footer}"/>
  +      <after target="${target}-${module}"/>
       </execmodules>
     </target>
   
     <!-- Invoke the 'release' on all configured modules -->
     <target name="all-release" depends="init">
  -    <execmodules target="release" modules="${modules}" 
root="${project.root}/${module}"
  +    <execmodules target="release" modules="${modules}" 
  +              root="${project.root}/${module}"
                 skipmissing="${executemodules.skipmissing}">
  +      <before target="${target}-${module}-prepare"/>
         <header message="${executemodules.header}"/>
         <footer message="${executemodules.footer}"/>
  +      <after target="${target}-${module}"/>
       </execmodules>
     </target>
   
  -  <!-- Invoke the 'release-all' on all configured modules -->
  -  <target name="all-release-all" depends="init">
  -    <execmodules target="release-all" modules="${modules}" 
root="${project.root}/${module}"
  -              skipmissing="${executemodules.skipmissing}">
  -      <header message="${executemodules.header}"/>
  -      <footer message="${executemodules.footer}"/>
  -    </execmodules>
  -  </target>
  -
  -  <!-- Invoke the 'release-tar' on all configured modules -->
  -  <target name="all-release-tar" depends="init">
  -    <execmodules target="release-tar" modules="${modules}" 
root="${project.root}/${module}"
  -              skipmissing="${executemodules.skipmissing}">
  -      <header message="${executemodules.header}"/>
  -      <footer message="${executemodules.footer}"/>
  -    </execmodules>
  -  </target>
  -
  -  <!-- Invoke the 'release-tgz' on all configured modules -->
  -  <target name="all-release-tgz" depends="init">
  -    <execmodules target="release-tgz" modules="${modules}" 
root="${project.root}/${module}"
  -              skipmissing="${executemodules.skipmissing}">
  -      <header message="${executemodules.header}"/>
  -      <footer message="${executemodules.footer}"/>
  -    </execmodules>
  -  </target>
  -
  -  <!-- Invoke the 'release-zip' on all configured modules -->
  -  <target name="all-release-zip" depends="init">
  -    <execmodules target="release-zip" modules="${modules}" 
root="${project.root}/${module}"
  -              skipmissing="${executemodules.skipmissing}">
  -      <header message="${executemodules.header}"/>
  -      <footer message="${executemodules.footer}"/>
  -    </execmodules>
  -  </target>
  -
     <!-- Invoke the 'tests' on all configured modules -->
     <target name="all-tests" depends="init">
  -    <execmodules target="tests" modules="${modules}" 
root="${project.root}/${module}"
  +    <execmodules target="tests" modules="${modules}" 
  +              root="${project.root}/${module}"
                 skipmissing="${executemodules.skipmissing}">
  +      <before target="${target}-${module}-prepare"/>
         <header message="${executemodules.header}"/>
         <footer message="${executemodules.footer}"/>
  +      <after target="${target}-${module}"/>
       </execmodules>
     </target>
   
  @@ -391,7 +450,7 @@
     <!-- Cleans up generated stuff                                          -->
     <!-- ================================================================== -->
   
  -  <target name="clean-project" depends="project-configure, init">
  +  <target name="clean-project" depends="init">
       <delete dir="${project.release}"/>
       <delete dir="${project.output}"/>
     </target>
  @@ -404,7 +463,9 @@
     <!-- Clean up all generated files -->
     <target name="clobber" depends="all-clobber, clean-project"
          description="Cleans up all generated files.">
  -    <delete file="${project.config}/local.properties" quiet="true"/>
  +    <delete file="${control.root}/local.properties" quiet="true"/>
  +    <delete file="${control.root}/build.log"/>
  +    <delete file="${control.root}/run.log"/>
     </target>
   
   
  @@ -413,66 +474,22 @@
     <!-- ================================================================== -->
   
     <target name="help">
  -    <projecthelp>
  +    <projecthelp taskname="help">
         <header><![CDATA[
     The JBoss project build control module.
   ]]></header>
         <footer><![CDATA[
  -    -Dgroups=<group>[(,<group>)*      Specify the module groups.
  -    -Dmodules=<module>[(,<module>)*   Specify the modules.
  -                                      (overrides groups).
  +    -Dgroups=<group>[(,<group>)*]      Specify the module groups.
  +    -Dmodules=<module>[(,<module>)*]   Specify the modules.
  +                                       (overrides groups).
  +    -Dtest=<testcase>                  Specify the testcase to run.
       -projecthelp for all targets
       -help for full options
   ]]></footer>
       </projecthelp>
     </target>
  -
  -  <target name="mqrelease" depends="release"
  -       description="Executes the default target (release).">
  -    <property name="jbossmq.output" value="${project.output}/${release.id}"/>
  -    <mkdir dir="${jbossmq.output}"/>
  -    <copy todir="${jbossmq.output}">
  -      <fileset dir="${project.release}/${release.id}" 
  -            includes="
  -            bin/run.*,
  -            client/**,
  -            db/**,
  -            lib/**,
  -            log/**,
  -            tmp/**"
  -            
  -            excludes="
  -            **/connector.jar,
  -            **/jaas.jar,
  -            **/stop.jar,
  -            **/jbosssx.jar,
  -            **/jcert.jar,
  -            **/deploy.jar,
  -            **/activation.jar,
  -            **/jcert.jar,
  -            **/jbosssx.jar,
  -            **/jnet.jar,
  -            **/jpl-pattern.jar,
  -            **/jpl-util.jar,
  -            **/jsr77.jar,
  -            **/mail.jar,
  -            **/xalan.jar,
  -            **/jsse.jar,
  -            **/jts.jar"/>
  -    </copy>
   
  -    <mkdir dir="${jbossmq.output}/docs"/>
  -    <copy todir="${jbossmq.output}/docs">
  -      <fileset dir="${project.release}/${release.id}" 
  -            includes="docs/messaging/**"/>
  -    </copy>
  -    <mkdir dir="${jbossmq.output}/conf"/>
  -    <copy todir="${jbossmq.output}/conf">
  -      <fileset dir="${project.examples}/conf" includes="**"/>
  -    </copy>
  -  </target>
  - 
  -  <target name="main" depends="mqrelease"
  +  <target name="main" depends="release"
          description="Executes the default target (release)."/>
       
     <target name="all" depends="all-all"
  @@ -495,5 +512,52 @@
   
     <target name="tests" depends="all-tests"
          description="Execute all tests."/>
  +
  +  <!-- Invoke the 'tests' on the 'testsuite' module -->
  +  <target name="testsuite" depends="init"
  +          description="Execute the testsuite.">
  +    <execmodules target="tests" modules="testsuite"
  +              root="${project.root}/${module}"
  +              skipmissing="${executemodules.skipmissing}">
  +      <before target="${target}-${module}-prepare"/>
  +      <header message="${executemodules.header}"/>
  +      <footer message="${executemodules.footer}"/>
  +      <after target="${target}-${module}"/>
  +    </execmodules>
  +  </target>
  +
  +  <!-- Run the JBoss server. -->
  +  <property name="run.flags" value=""/>
  +
  +  <target name="run" depends="run-check-os, run-unix, run-win32"
  +          description="Runs the JBoss server."/>
  +
  +  <target name="run-check-os">
  +    <condition property="run.unix">
  +      <os family="unix"/>
  +    </condition>
  +    <condition property="run.win32">
  +      <or>
  +        <os family="windows"/>
  +        <os family="dos"/>
  +      </or>
  +    </condition>
  +  </target>
  +
  +  <target name="run-unix" depends="init" if="run.unix">
  +    <record name="${control.root}/run.log" append="no" loglevel="info"/>
  +    <exec executable="${project.release}/${release.id}/bin/run.sh"
  +       dir="${project.release}/${release.id}">
  +      <arg line="${run.flags}"/>
  +    </exec>
  +  </target>
  +
  +  <target name="run-win32" depends="init" if="run.win32">
  +    <record name="${control.root}/run.log" append="no" loglevel="info"/>
  +    <exec executable="${project.release}/${release.id}/bin/run.bat"
  +       dir="${project.release}/${release.id}">
  +      <arg line="${run.flags}"/>
  +    </exec>
  +  </target>
   
   </project>
  
  
  

_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/jboss-development

Reply via email to