User: user57  
  Date: 01/09/03 22:08:06

  Modified:    jboss    build.sh build.xml
  Log:
   o module release is now a control module pull
   o removed min targets
  
  Revision  Changes    Path
  1.6       +4 -1      build/jboss/build.sh
  
  Index: build.sh
  ===================================================================
  RCS file: /cvsroot/jboss/build/jboss/build.sh,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- build.sh  2001/08/28 04:53:07     1.5
  +++ build.sh  2001/09/04 05:08:06     1.6
  @@ -8,12 +8,15 @@
   ##                                                                          ##
   ### ====================================================================== ###
   
  -# $Id: build.sh,v 1.5 2001/08/28 04:53:07 user57 Exp $
  +# $Id: build.sh,v 1.6 2001/09/04 05:08:06 user57 Exp $
   
   PROGNAME=`basename $0`
   DIRNAME=`dirname $0`
   GREP="grep"
   ROOT="/"
  +
  +# Ignore user's ANT_HOME if it is set
  +ANT_HOME=""
   
   # the default search path for ant
   ANT_SEARCH_PATH="\
  
  
  
  1.16      +840 -133  build/jboss/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /cvsroot/jboss/build/jboss/build.xml,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- build.xml 2001/09/03 09:10:12     1.15
  +++ build.xml 2001/09/04 05:08:06     1.16
  @@ -10,9 +10,9 @@
   <!--                                                                        -->
   <!-- ====================================================================== -->
   
  -<!-- $Id: build.xml,v 1.15 2001/09/03 09:10:12 kimptoc Exp $ -->
  +<!-- $Id: build.xml,v 1.16 2001/09/04 05:08:06 user57 Exp $ -->
   
  -<project default="main">
  +<project default="main" name="JBoss/Build">
   
     <!-- ================================================================== -->
     <!-- Initialization                                                     -->
  @@ -42,21 +42,6 @@
     <!-- Initialize the build system. -->
     <target name="init" unless="project-initialized-already"
          depends="init-buildlog">
  -
  -    <echo message="user.home = ${user.home}"/>
  -    <echo message="build.compiler = ${build.compiler}"/>
  -    <echo message="java.home = ${java.home}"/>
  -    <echo message="java.class.path = ${java.class.path}"/>
  -    <echo message="java.version = ${java.version}"/>
  -    <echo message="java.vendor = ${java.vendor}"/>
  -    <echo message="java.vm.version = ${java.vm.version}"/>
  -    <echo message="java.vm.name = ${java.vm.name}"/>
  -    <echo message="java.vm.info = ${java.vm.info}"/>
  -    <echo message="os.name = ${os.name}"/>
  -    <echo message="os.arch = ${os.name}"/>
  -    <echo message="os.version = ${os.name}"/>
  -    <echo message=""/>
  -
       <tstamp>
         <format property="build.number" pattern="yyyyMMddHHmm"/>
       </tstamp>
  @@ -73,6 +58,8 @@
       <resolver force="${buildmagic.resolveproperties.force}"/>
       <propertyfilter all="${buildmagic.propertyfilter.all}"/>
       <property name="project-initialized-already" value="true"/>
  +
  +    <call target="show-environment"/>
     </target>
   
     <target name="init-buildlog" unless="buildlog-disabled">
  @@ -80,6 +67,21 @@
       <property name="buildlog-disabled" value="true"/>
     </target>
   
  +  <target name="show-environment" if="build.verbose">
  +    <echo message="user.home = ${user.home}"/>
  +    <echo message="build.compiler = ${build.compiler}"/>
  +    <echo message="java.home = ${java.home}"/>
  +    <echo message="java.class.path = ${java.class.path}"/>
  +    <echo message="java.version = ${java.version}"/>
  +    <echo message="java.vendor = ${java.vendor}"/>
  +    <echo message="java.vm.version = ${java.vm.version}"/>
  +    <echo message="java.vm.name = ${java.vm.name}"/>
  +    <echo message="java.vm.info = ${java.vm.info}"/>
  +    <echo message="os.name = ${os.name}"/>
  +    <echo message="os.arch = ${os.name}"/>
  +    <echo message="os.version = ${os.name}"/>
  +  </target>
  +
   
     <!-- ================================================================== -->
     <!-- Project Configuration                                              -->
  @@ -99,6 +101,99 @@
   
   
     <!-- ================================================================== -->
  +  <!-- Tool Configuration                                                 -->
  +  <!-- ================================================================== -->
  +
  +  <!-- No non-standard tools are required for this module. -->
  +
  +
  +  <!-- ================================================================== -->
  +  <!-- Library Configuration                                              -->
  +  <!-- ================================================================== -->
  +
  +  <!-- Java Naming and Directory Interface (JNDI) -->
  +  <property name="sun.jndi.root" value="${thirdparty.root}/sun/jndi"/>
  +  <property name="sun.jndi.lib" value="${sun.jndi.root}/lib"/>
  +
  +  <!-- Java Management Extensions (JMX) -->
  +  <property name="sun.jmx.root" value="${thirdparty.root}/sun/jmx"/>
  +  <property name="sun.jmx.lib" value="${sun.jmx.root}/lib"/>
  +
  +  <!-- Java API for XML Processing (JAXP) -->
  +  <property name="sun.jaxp.root" value="${thirdparty.root}/sun/jaxp"/>
  +  <property name="sun.jaxp.lib" value="${sun.jaxp.root}/lib"/>
  +
  +  <!-- Java Authentication and Authorization Service (JAAS) -->
  +  <property name="sun.jaas.root" value="${thirdparty.root}/sun/jaas"/>
  +  <property name="sun.jaas.lib" value="${sun.jaas.root}/lib"/>
  +
  +  <!-- JavaBeans Activation Framework (JAF) -->
  +  <property name="sun.jaf.root" value="${thirdparty.root}/sun/jaf"/>
  +  <property name="sun.jaf.lib" value="${sun.jaf.root}/lib"/>
  +
  +  <!-- JavaMail -->
  +  <property name="sun.javamail.root" value="${thirdparty.root}/sun/javamail"/>
  +  <property name="sun.javamail.lib" value="${sun.javamail.root}/lib"/>
  +
  +  <!-- Java Transaction Service (JTS) -->
  +  <property name="sun.jts.root" value="${thirdparty.root}/sun/jts"/>
  +  <property name="sun.jts.lib" value="${sun.jts.root}/lib"/>
  +
  +  <!-- Log4j -->
  +  <property name="apache.log4j.root" value="${thirdparty.root}/apache/log4j"/>
  +  <property name="apache.log4j.lib" value="${apache.log4j.root}/lib"/>
  +
  +  <!-- EDU.oswego.cs.dl.util.concurrent -->
  +  <property name="oswego.concurrent.root" 
value="${thirdparty.root}/oswego/concurrent"/>
  +  <property name="oswego.concurrent.lib" value="${oswego.concurrent.root}/lib"/>
  +
  +  <!-- JPL-Util -->
  +  <property name="gjt.jpl-util.root" value="${thirdparty.root}/gjt/jpl-util"/>
  +  <property name="gjt.jpl-util.lib" value="${gjt.jpl-util.root}/lib"/>
  +
  +  <!-- JavaGroups -->
  +  <property name="javagroups.javagroups.root" 
value="${thirdparty.root}/javagroups/javagroups"/>
  +  <property name="javagroups.javagroups.lib" 
value="${javagroups.javagroups.root}/lib"/>
  +
  +  <!-- JSR 77 -->
  +  <property name="sun.jsr77.root" value="${thirdparty.root}/sun/jsr77"/>
  +  <property name="sun.jsr77.lib" value="${sun.jsr77.root}/lib"/>
  +
  +  <!-- gnu.regexp -->
  +  <property name="gnu.regexp.root" value="${thirdparty.root}/gnu/regexp"/>
  +  <property name="gnu.regexp.lib" value="${gnu.regexp.root}/lib"/>
  +
  +  <!-- Java Secure Socket Extension (JSSE) -->
  +  <property name="sun.jsse.root" value="${thirdparty.root}/sun/jsse"/>
  +  <property name="sun.jsse.lib" value="${sun.jsse.root}/lib"/>
  +
  +  <!-- Hypersonic SQL -->
  +  <property name="hsql.hsql.root" value="${thirdparty.root}/hsql/hsql"/>
  +  <property name="hsql.hsql.lib" value="${hsql.hsql.root}/lib"/>
  +
  +  <!-- Instant DB -->
  +  <property name="enhydra.instantdb.root" 
value="${thirdparty.root}/enhydra/instantdb"/>
  +  <property name="enhydra.instantdb.lib" value="${enhydra.instantdb.root}/lib"/>
  +
  +  <!-- Castor -->
  +  <property name="exolab.castor.root" value="${thirdparty.root}/exolab/castor"/>
  +  <property name="exolab.castor.lib" value="${exolab.castor.root}/lib"/>
  +
  +  <!-- Tyrex -->
  +  <property name="exolab.tyrex.root" value="${thirdparty.root}/exolab/tyrex"/>
  +  <property name="exolab.tyrex.lib" value="${exolab.tyrex.root}/lib"/>
  +
  +  <!-- Jetty -->
  +  <property name="mortbay.jetty.root" value="${thirdparty.root}/mortbay/jetty"/>
  +  <property name="mortbay.jetty.lib" value="${mortbay.jetty.root}/lib"/>
  +
  +  <!-- Jetty3Extra -->
  +  <property name="mortbay.jetty3extra.root" 
value="${thirdparty.root}/mortbay/jetty3extra"/>
  +  <property name="mortbay.jetty3extra.jmx" value="${mortbay.jetty3extra.root}"/>
  +  <property name="mortbay.jetty3extra.jmx.lib" 
value="${mortbay.jetty3extra.jmx}/lib"/>
  +
  +
  +  <!-- ================================================================== -->
     <!-- Child Module Configuration                                         -->
     <!-- ================================================================== -->
   
  @@ -171,13 +266,6 @@
   
   
     <!-- ================================================================== -->
  -  <!-- Tool Configuration                                                 -->
  -  <!-- ================================================================== -->
  -
  -  <!-- No non-standard tools are required for this module. -->
  -
  -
  -  <!-- ================================================================== -->
     <!-- Task Configuration                                                 -->
     <!-- ================================================================== -->
   
  @@ -199,6 +287,7 @@
     <!-- 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.archive.basename" 
value="${project.release}/${release.id}"/>
   
     <property name="release.bin" value="${release.root}/bin"/>
     <property name="release.client" value="${release.root}/client"/>
  @@ -215,9 +304,8 @@
     <!-- Documentation and examples -->
     <property name="release.docs" value="${release.root}/docs"/>
     <property name="release.examples" value="${release.docs}/examples"/>
  +  <property name="release.manual" value="${release.docs}/manual"/>
     <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"/>
  @@ -226,74 +314,18 @@
     <property name="release.admin.components" value="${release.admin}/components"/>
   
     <!-- Configuration for the nightly build and test job -->
  +  <property name="run.nightly.sleep" value="1"/> <!-- 1 minute -->
     <property name="run.nightly.email.tolist" 
value="[EMAIL PROTECTED]"/>
     <property name="run.nightly.email.from" value="[EMAIL PROTECTED]"/>
     <property name="run.nightly.email.mailhost" value="localhost"/>
   
  -  <!-- ================================================================== -->
  -  <!-- Builds a release distribution.                                     -->
  -  <!-- ================================================================== -->
  -
  -  <target name="release" depends="all-release"
  -          description="Builds a release distribution.">
  -  </target>
  -
  -  <target name="release-archive-prepare" depends="release">
  -    <mkdir dir="${project.release}"/>
  -    <property name="release.archive.basename"
  -           value="${project.release}/${release.id}"/>
  -  </target>
  -
  -  <target name="release-zip" depends="release-archive-prepare"
  -       description="Builds a ZIP release distribution.">
  -    <zip zipfile="${release.archive.basename}.zip">
  -      <fileset dir="${project.release}">
  -        <include name="${release.id}/**"/>
  -      </fileset>
  -    </zip>
  -  </target>
  -
  -  <target name="release-tar" depends="release-archive-prepare"
  -       description="Builds a TAR release distribution.">
  -    <tar tarfile="${release.archive.basename}.tar" longfile="gnu"
  -      basedir="${project.release}"
  -      includes="${release.id}/**">
  -    </tar>
  -  </target>
  -
  -  <target name="release-tgz" depends="release-tar"
  -       description="Builds a TAR-GZIP release distribution.">
  -    <gzip src="${release.archive.basename}.tar"
  -       zipfile="${release.archive.basename}.tgz"/>
  -  </target>
  -
  -  <target name="release-all" depends="release-zip, release-tgz"
  -       description="Builds a distribution for each archive type."/>
  -
  -
  -  <!-- ================================================================== -->
  -  <!-- 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">
  +  <target name="all-all" depends="init, release-dependencies">
       <execmodules target="all" modules="${modules}" 
                 root="${project.root}/${module}"
                 skipmissing="${executemodules.skipmissing}">
  @@ -304,9 +336,9 @@
       </execmodules>
     </target>
   
  -  <!-- Invoke the 'clean' on all configured modules -->
  -  <target name="all-clean" depends="init">
  -    <execmodules target="clean" modules="${modules}" 
  +  <!-- Invoke the 'most' on all configured modules -->
  +  <target name="all-most" depends="init, release-dependencies">
  +    <execmodules target="most" modules="${modules}" 
                 root="${project.root}/${module}"
                 skipmissing="${executemodules.skipmissing}">
         <before target="${target}-${module}-prepare"/>
  @@ -316,9 +348,9 @@
       </execmodules>
     </target>
   
  -  <!-- Invoke the 'clobber' on all configured modules -->
  -  <target name="all-clobber" depends="init">
  -    <execmodules target="clobber" modules="${modules}" 
  +  <!-- Invoke the 'release' on all configured modules -->
  +  <target name="all-release" depends="init, release-dependencies">
  +    <execmodules target="release" modules="${modules}" 
                 root="${project.root}/${module}"
                 skipmissing="${executemodules.skipmissing}">
         <before target="${target}-${module}-prepare"/>
  @@ -329,7 +361,7 @@
     </target>
   
     <!-- Invoke the 'jars' on all configured modules -->
  -  <target name="all-jars" depends="init">
  +  <target name="all-jars" depends="init, release-dependencies">
       <execmodules target="jars" modules="${modules}" 
                 root="${project.root}/${module}"
                 skipmissing="${executemodules.skipmissing}">
  @@ -364,9 +396,9 @@
       </execmodules>
     </target>
   
  -  <!-- Invoke the 'main' on all configured modules -->
  -  <target name="all-main" depends="init">
  -    <execmodules target="main" modules="${modules}" 
  +  <!-- Invoke the 'tests' on all configured modules -->
  +  <target name="all-tests" depends="init">
  +    <execmodules target="tests" modules="${modules}" 
                 root="${project.root}/${module}"
                 skipmissing="${executemodules.skipmissing}">
         <before target="${target}-${module}-prepare"/>
  @@ -376,9 +408,9 @@
       </execmodules>
     </target>
   
  -  <!-- Invoke the 'most' on all configured modules -->
  -  <target name="all-most" depends="init">
  -    <execmodules target="most" modules="${modules}" 
  +  <!-- Invoke the 'clean' on all configured modules -->
  +  <target name="all-clean" depends="init">
  +    <execmodules target="clean" modules="${modules}" 
                 root="${project.root}/${module}"
                 skipmissing="${executemodules.skipmissing}">
         <before target="${target}-${module}-prepare"/>
  @@ -388,9 +420,9 @@
       </execmodules>
     </target>
   
  -  <!-- Invoke the 'release' on all configured modules -->
  -  <target name="all-release" depends="init">
  -    <execmodules target="release" modules="${modules}" 
  +  <!-- Invoke the 'clobber' on all configured modules -->
  +  <target name="all-clobber" depends="init">
  +    <execmodules target="clobber" modules="${modules}" 
                 root="${project.root}/${module}"
                 skipmissing="${executemodules.skipmissing}">
         <before target="${target}-${module}-prepare"/>
  @@ -400,37 +432,720 @@
       </execmodules>
     </target>
   
  -  <!-- Invoke the 'tests' on all configured modules -->
  -  <target name="all-tests" depends="init">
  -    <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>
  +
  +  <!-- ================================================================== -->
  +  <!-- Module Output Pulling Hooks                                        -->
  +  <!-- ================================================================== -->
  +
  +  <!-- J2EE -->
  +
  +  <target name="most-j2ee">
  +    <property name="_module.name" value="j2ee" override="true"/>
  +    <property name="_module.output" override="true"
  +           value="${project.root}/${_module.name}/output"/>
  +
  +    <!-- Copy the generated libraries (lib/ext) -->
  +    <mkdir dir="${release.lib.ext}"/>
  +    <copy todir="${release.lib.ext}" filtering="no">
  +      <fileset dir="${_module.output}/lib">
  +         <include name="jboss-j2ee.jar"/>
  +      </fileset>
  +    </copy>
  +
  +    <!-- Copy the generated libraries (client) -->
  +    <mkdir dir="${release.client}"/>
  +    <copy todir="${release.client}" filtering="no">
  +      <fileset dir="${_module.output}/lib">
  +         <include name="jboss-j2ee.jar"/>
  +      </fileset>
  +    </copy>
  +  </target>
  +
  +  <target name="all-j2ee" depends="most-j2ee">
  +    <!-- Copy the generated javadocs -->
  +    <mkdir dir="${release.api}/${_module.name}"/>
  +    <copy todir="${release.api}/${_module.name}" filtering="no">
  +      <fileset dir="${_module.output}/api">
  +         <include name="**/*"/>
  +      </fileset>
  +    </copy>
  +  </target>
  +
  +  <!-- Naming -->
  +
  +  <target name="most-naming">
  +    <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="${release.lib.ext}"/>
  +    <copy todir="${release.lib.ext}" filtering="no">
  +      <fileset dir="${_module.output}/lib">
  +         <include name="jnpserver.jar"/>
  +      </fileset>
  +    </copy>
  +
  +    <!-- Copy the generated libraries (client) -->
  +    <mkdir dir="${release.client}"/>
  +    <copy todir="${release.client}" filtering="no">
  +      <fileset dir="${_module.output}/lib">
  +         <include name="jnp-client.jar"/>
  +      </fileset>
  +    </copy>
     </target>
   
  +  <target name="all-naming" depends="most-naming">
  +    <!-- Copy the generated javadocs -->
  +    <mkdir dir="${release.api}/${_module.name}"/>
  +    <copy todir="${release.api}/${_module.name}" filtering="no">
  +      <fileset dir="${_module.output}/api">
  +         <include name="**/*"/>
  +      </fileset>
  +    </copy>
  +  </target>
  +
  +  <!-- Server -->
  +
  +  <target name="most-server">
  +    <property name="_module.name" value="server" override="true"/>
  +    <property name="_module.output" override="true"
  +           value="${project.root}/${_module.name}/output"/>
  +
  +    <!-- Copy the generated libraries (lib) -->
  +    <mkdir dir="${release.lib}"/>
  +    <copy todir="${release.lib}" filtering="no">
  +      <fileset dir="${_module.output}/lib">
  +        <include name="jboss-boot.jar"/>
  +      </fileset>
  +    </copy>
  +
  +    <!-- Copy the generated libraries (lib/ext) -->
  +    <mkdir dir="${release.lib.ext}"/>
  +    <copy todir="${release.lib.ext}" filtering="no">
  +      <fileset dir="${_module.output}/lib">
  +         <include name="jboss.jar"/>
  +         <include name="jboss-spine.jar"/>
  +      </fileset>
  +    </copy>
  +
  +    <!-- Copy the generated libraries (client) -->
  +    <mkdir dir="${release.client}"/>
  +    <copy todir="${release.client}" filtering="no">
  +      <fileset dir="${_module.output}/lib">
  +         <include name="*-client.jar"/>
  +         <include name="connector.jar"/>
  +
  +         <!-- Shouldn't these go into bin ? -->
  +         <include name="stop.jar"/>
  +         <include name="deploy.jar"/>
  +      </fileset>
  +    </copy>
  +
  +    <!-- Setup the deployment directory (deploy) -->
  +    <mkdir dir="${release.deploy}"/>
  +    <copy todir="${release.deploy}" filtering="no">
  +      <fileset dir="${_module.output}/etc">
  +         <include name="deploy.txt"/>
  +      </fileset>
  +    </copy>
  +
  +    <!-- Copy the generated deployment libraries (deploy/lib) -->
  +    <mkdir dir="${release.deploy.lib}"/>
  +    <copy todir="${release.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="${release.deploy.lib}" filtering="no">
  +      <fileset dir="${_module.output}/etc/conf/default">
  +         <include name="mail-service.xml"/>
  +      </fileset>
  +    </copy>
  +
  +    <!-- Copy the mail service xml snippet  (deploy/lib) -->  
  +    <copy todir="${release.deploy.lib}" filtering="no">
  +      <fileset dir="${_module.output}/lib">
  +         <include name="jmx-connector.jsr"/>
  +      </fileset>
  +    </copy>
  +
  +    <!-- Copy the generated scripts & runnable jars (bin) -->
  +    <mkdir dir="${release.bin}"/>
  +    <copy todir="${release.bin}" filtering="no">
  +      <fileset dir="${_module.output}/bin">
  +         <include name="**/*"/>
  +      </fileset>
  +      <fileset dir="${_module.output}/lib">
  +         <include name="run.jar"/>
  +      </fileset>
  +    </copy>
  +    <chmod perm="+x">
  +      <fileset dir="${release.bin}">
  +         <include name="**/*.sh"/>
  +      </fileset>
  +    </chmod>
  +
  +    <!-- Copy the default configuration files (conf) -->
  +    <mkdir dir="${release.conf}"/>
  +    <copy todir="${release.conf}" filtering="no">
  +      <fileset dir="${_module.output}/etc/conf">
  +         <include name="**/*"/>
  +         <exclude name="mail-service.xml"/>
  +      </fileset>
  +    </copy>
   
  +    <!-- Setup the database directory (db) -->
  +    <mkdir dir="${release.db}"/>
  +    <copy todir="${release.db}" filtering="no">
  +      <fileset dir="${_module.output}/etc">
  +         <include name="db.properties"/>
  +      </fileset>
  +    </copy>
  +
  +    <!-- Setup the log file directory (log) -->
  +    <mkdir dir="${release.log}"/>
  +    <copy todir="${release.log}" filtering="no">
  +      <fileset dir="${_module.output}/etc">
  +         <include name="log.properties"/>
  +      </fileset>
  +    </copy>
  +
  +    <!-- Setup the temporary file directory (tmp) -->
  +    <mkdir dir="${release.tmp}"/>
  +    <copy todir="${release.tmp}" filtering="no">
  +      <fileset dir="${_module.output}/etc">
  +         <include name="tmp.properties"/>
  +      </fileset>
  +    </copy>
  +  </target>
  +
  +  <target name="all-server" depends="most-server">
  +    <!-- Copy the static documents (docs) -->
  +    <mkdir dir="${release.docs}"/>
  +    <copy todir="${release.docs}" filtering="no">
  +      <fileset dir="${_module.output}/docs">
  +         <include name="**/*"/>
  +      </fileset>
  +    </copy>
  +
  +    <!-- Copy the generated javadocs -->
  +    <mkdir dir="${release.api}/${_module.name}"/>
  +    <copy todir="${release.api}/${_module.name}" filtering="no">
  +      <fileset dir="${_module.output}/api">
  +         <include name="**/*"/>
  +      </fileset>
  +    </copy>
  +  </target>
  +
  +  <!-- Admin -->
  +
  +  <target name="most-admin">
  +    <property name="_module.name" value="admin" override="true"/>
  +    <property name="_module.output" override="true"
  +           value="${project.root}/${_module.name}/output"/>
  +
  +    <!-- Copy the generated scripts & runnable jars (bin) -->
  +    <mkdir dir="${release.bin}"/>
  +    <copy todir="${release.bin}" filtering="no">
  +      <fileset dir="${_module.output}/bin">
  +         <include name="**/*"/>
  +      </fileset>
  +    </copy>
  +
  +    <!-- Copy admin files (admin) -->
  +    <mkdir dir="${release.admin}"/>
  +    <copy todir="${release.admin}" filtering="no">
  +      <fileset dir="${_module.output}/lib">
  +         <include name="**/*"/>
  +      </fileset>
  +    </copy>
  +
  +    <!-- Copy admin files (admin/client) -->
  +    <mkdir dir="${release.admin.client}"/>
  +    <copy todir="${release.admin.client}" filtering="no">
  +      <fileset dir="${_module.output}/lib">
  +         <include name="monitor.jar"/>
  +      </fileset>
  +      <fileset dir="${_module.output}/etc">
  +         <include name="jndi.properties"/>
  +      </fileset>
  +    </copy>
  +
  +    <!-- Copy admin files (admin/client/lib) -->
  +    <mkdir dir="${release.admin.client.lib}"/>
  +    <copy todir="${release.admin.client.lib}" filtering="no">
  +      <fileset dir="${_module.output}/lib">
  +         <include name="**/"/>
  +      </fileset>
  +    </copy>
  +
  +    <!-- Copy admin files (admin/components) -->
  +    <mkdir dir="${release.admin.components}"/>
  +    <copy todir="${release.admin.components}" filtering="no">
  +      <fileset dir="${_module.output}/lib">
  +         <include name="SystemMonitor.jar"/>
  +         <include name="admin.jar"/>
  +      </fileset>
  +    </copy>
  +  </target>
  +
  +  <target name="all-admin" depends="most-admin">
  +    <!-- Copy the generated javadocs -->
  +    <mkdir dir="${release.api}/${_module.name}"/>
  +    <copy todir="${release.api}/${_module.name}" filtering="no">
  +      <fileset dir="${_module.output}/api">
  +         <include name="**/*"/>
  +      </fileset>
  +    </copy>
  +  </target>
  +
  +  <!-- Connector -->
  +
  +  <target name="most-connector">
  +    <property name="_module.name" value="connector" override="true"/>
  +    <property name="_module.output" override="true"
  +           value="${project.root}/${_module.name}/output"/>
  +
  +    <!-- Copy the generated libraries (lib/ext) -->
  +    <mkdir dir="${release.lib.ext}"/>
  +    <copy todir="${release.lib.ext}" filtering="no">
  +      <fileset dir="${_module.output}/lib">
  +         <include name="jbosscx.jar"/>
  +      </fileset>
  +    </copy>
  +  </target>
  +
  +  <target name="all-connector" depends="most-connector">
  +    <!-- Copy the generated javadocs -->
  +    <mkdir dir="${release.api}/${_module.name}"/>
  +    <copy todir="${release.api}/${_module.name}" filtering="no">
  +      <fileset dir="${_module.output}/api">
  +         <include name="**/*"/>
  +      </fileset>
  +    </copy>
  +  </target>
  +
  +  <!-- Messaging -->
  +
  +  <target name="most-messaging">
  +    <property name="_module.name" value="messaging" override="true"/>
  +    <property name="_module.output" override="true"
  +           value="${project.root}/${_module.name}/output"/>
  +
  +    <!-- Copy the generated libraries (lib/ext) -->
  +    <mkdir dir="${release.lib.ext}"/>
  +    <copy todir="${release.lib.ext}" filtering="no">
  +      <fileset dir="${_module.output}/lib">
  +         <include name="jbossmq.jar"/>
  +      </fileset>
  +    </copy>
  +
  +    <!-- Copy the generated libraries (client) -->
  +    <mkdir dir="${release.client}"/>
  +    <copy todir="${release.client}" filtering="no">
  +      <fileset dir="${_module.output}/lib">
  +         <include name="*-client.jar"/>
  +      </fileset>
  +    </copy>
  +
  +    <!-- Copy the default configuration files (conf) -->
  +    <mkdir dir="${release.conf}"/>
  +    <copy todir="${release.conf}" filtering="no">
  +      <fileset dir="${_module.output}/etc/conf">
  +        <include name="**/*"/>
  +      </fileset>
  +    </copy>
  +
  +    <!-- Setup the database directory (db) -->
  +    <mkdir dir="${release.db}/jbossmq"/>
  +  </target>
  +
  +  <target name="all-messaging" depends="most-messaging">
  +    <!-- Copy the static documents (docs) -->
  +    <mkdir dir="${release.docs}"/>
  +    <copy todir="${release.docs}" filtering="no">
  +      <fileset dir="${_module.output}/docs">
  +         <include name="**/*"/>
  +      </fileset>
  +    </copy>
  +
  +    <!-- Copy the generated javadocs -->
  +    <mkdir dir="${release.api}/${_module.name}"/>
  +    <copy todir="${release.api}/${_module.name}" filtering="no">
  +      <fileset dir="${_module.output}/api">
  +         <include name="**/*"/>
  +      </fileset>
  +    </copy>
  +  </target>
  +
  +  <!-- Pool -->
  +
  +  <target name="most-pool">
  +    <property name="_module.name" value="pool" override="true"/>
  +    <property name="_module.output" override="true"
  +           value="${project.root}/${_module.name}/output"/>
  +
  +    <!-- Copy the generated libraries (lib/ext) -->
  +    <mkdir dir="${release.lib.ext}"/>
  +    <copy todir="${release.lib.ext}" filtering="no">
  +      <fileset dir="${_module.output}/lib">
  +         <include name="jbosspool.jar"/>
  +      </fileset>
  +    </copy>
  +
  +    <!-- Copy the generated deployment libraries (deploy/lib) -->
  +    <mkdir dir="${release.deploy.lib}"/>
  +    <copy todir="${release.deploy.lib}" filtering="no">
  +      <fileset dir="${_module.output}/lib">
  +         <include name="*.rar"/>
  +      </fileset>
  +    </copy>
  +  </target>
  +
  +  <target name="all-pool" depends="most-pool">
  +    <!-- Copy the generated javadocs -->
  +    <mkdir dir="${release.api}/${_module.name}"/>
  +    <copy todir="${release.api}/${_module.name}" filtering="no">
  +      <fileset dir="${_module.output}/api">
  +         <include name="**/*"/>
  +      </fileset>
  +    </copy>
  +  </target>
  +
  +  <!-- Security -->
  +
  +  <target name="most-security">
  +    <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="${release.lib.ext}"/>
  +    <copy todir="${release.lib.ext}" filtering="no">
  +      <fileset dir="${_module.output}/lib">
  +         <include name="jbosssx.jar"/>
  +         <include name="jaas.jar"/>
  +      </fileset>
  +    </copy>
  +
  +    <!-- Copy the generated libraries (client) -->
  +    <mkdir dir="${release.client}"/>
  +    <copy todir="${release.client}" filtering="no">
  +      <fileset dir="${_module.output}/lib">
  +         <include name="*-client.jar"/>
  +         <include name="jaas.jar"/>
  +      </fileset>
  +      <fileset dir="${_module.output}/etc/client">
  +         <include name="*"/>
  +      </fileset>
  +    </copy>
  +  </target>
  +
  +  <target name="all-security" depends="most-security">
  +    <!-- Copy the generated javadocs -->
  +    <mkdir dir="${release.api}/${_module.name}"/>
  +    <copy todir="${release.api}/${_module.name}" filtering="no">
  +      <fileset dir="${_module.output}/api">
  +         <include name="**/*"/>
  +      </fileset>
  +    </copy>
  +  </target>
  +
  +  <!-- Cluster -->
  +
  +  <target name="most-cluster">
  +    <property name="_module.name" value="cluster" override="true"/>
  +    <property name="_module.output" override="true"
  +           value="${project.root}/${_module.name}/output"/>
  +
  +    <!-- Copy the generated libraries (lib/ext) -->
  +    <mkdir dir="${release.lib.ext}"/>
  +    <copy todir="${release.lib.ext}" filtering="no">
  +      <fileset dir="${_module.output}/lib">
  +         <include name="jbossmx.jar"/>
  +         <include name="jbossha.jar"/>
  +      </fileset>
  +    </copy>
  +
  +    <!-- Copy the generated libraries (client) -->
  +    <mkdir dir="${release.client}"/>
  +    <copy todir="${release.client}" filtering="no">
  +      <fileset dir="${_module.output}/lib">
  +         <include name="jbossha-client.jar"/>
  +      </fileset>
  +    </copy>
  +  </target>
  +
  +  <target name="all-cluster" depends="most-cluster">
  +    <!-- Copy the examples -->
  +    <mkdir dir="${release.docs}/${module}"/>
  +    <copy todir="${release.docs}/${module}" filtering="no">
  +      <fileset dir="${_module.output}">
  +         <include name="examples/*"/>
  +      </fileset>
  +    </copy>
  +
  +    <!-- Copy the generated javadocs -->
  +    <mkdir dir="${release.api}/${_module.name}"/>
  +    <copy todir="${release.api}/${_module.name}" filtering="no">
  +      <fileset dir="${_module.output}/api">
  +         <include name="**/*"/>
  +      </fileset>
  +    </copy>
  +  </target>
  +
  +  <!-- Manual -->
  +
  +  <target name="most-manual">
  +    <property name="_module.name" value="manual" override="true"/>
  +    <property name="_module.output" override="true"
  +           value="${project.root}/${_module.name}/output"/>
  +    <!-- Nothing -->
  +  </target>
  +
  +  <target name="all-manual" depends="most-manual">
  +    <!-- Copy the static documents (docs) -->
  +    <mkdir dir="${release.manual}"/>
  +    <copy todir="${release.manual}" filtering="no">
  +      <fileset dir="${_module.output}">
  +         <include name="html/**/*"/>
  +         <include name="pdf/**/*.pdf"/>
  +      </fileset>
  +    </copy>
  +  </target>
  +
  +  <!-- Plugins Varia -->
  +
  +  <target name="most-plugins/varia">
  +    <property name="_module.name" value="plugins/varia" override="true"/>
  +    <property name="_module.output" override="true"
  +           value="${project.root}/${_module.name}/output"/>
  +
  +    <!-- Copy the generated libraries (lib/ext) -->
  +    <mkdir dir="${release.lib.ext}"/>
  +    <copy todir="${release.lib.ext}" filtering="no">
  +      <fileset dir="${_module.output}/lib">
  +         <include name="**"/>
  +      </fileset>
  +    </copy>
  +
  +    <!-- Setup the database directory (db) -->
  +    <mkdir dir="${release.db}/hypersonic"/>
  +    <copy todir="${release.db}/hypersonic" filtering="no">
  +      <fileset dir="${_module.output}/etc">
  +         <include name="hypersonic.txt"/>
  +      </fileset>
  +    </copy>
  +
  +    <!-- Copy the default configuration files (conf) -->
  +    <mkdir dir="${release.conf}"/>
  +    <copy todir="${release.conf}" filtering="no">
  +      <fileset dir="${_module.output}/etc/conf">
  +         <include name="**/*"/>
  +      </fileset>
  +    </copy>
  +  </target>
  +
  +  <target name="all-plugins/varia" depends="most-plugins/varia">
  +    <!-- Copy the generated javadocs -->
  +    <mkdir dir="${release.api}/${_module.name}"/>
  +    <copy todir="${release.api}/${_module.name}" filtering="no">
  +      <fileset dir="${_module.output}/api">
  +         <include name="**/*"/>
  +      </fileset>
  +    </copy>
  +  </target>
  +
  +  <!-- Plugins Jetty -->
  +
  +  <target name="most-plugins/jetty">
  +    <property name="_module.name" value="plugins/jetty" override="true"/>
  +    <property name="_module.output" override="true"
  +           value="${project.root}/${_module.name}/output"/>
  +
  +    <!-- Copy the generated libraries (lib/ext) -->
  +    <mkdir dir="${release.lib.ext}"/>
  +    <copy todir="${release.lib.ext}" filtering="no">
  +      <fileset dir="${_module.output}/lib">
  +         <include name="**/*"/>
  +      </fileset>
  +    </copy>
  +
  +    <!-- Copy the default configuration files (conf/default) -->
  +    <mkdir dir="${release.conf.default}"/>
  +    <copy todir="${release.conf.default}" filtering="no">
  +      <fileset dir="${_module.output}/etc">
  +         <include name="jetty.xml"/>
  +         <include name="jetty.properties"/>
  +      </fileset>
  +    </copy>
  +  </target>
  +
  +  <target name="all-plugins/jetty" depends="most-plugins/jetty">
  +    <!-- Copy the generated javadocs -->
  +    <mkdir dir="${release.api}/${_module.name}"/>
  +    <copy todir="${release.api}/${_module.name}" filtering="no">
  +      <fileset dir="${_module.output}/api">
  +         <include name="**/*"/>
  +      </fileset>
  +    </copy>
  +  </target>
  +
     <!-- ================================================================== -->
  -  <!-- Cleans up generated stuff                                          -->
  +  <!-- Builds a release distribution.                                     -->
     <!-- ================================================================== -->
   
  -  <target name="clean-project" depends="init">
  -    <delete dir="${project.release}"/>
  -    <delete dir="${project.output}"/>
  +  <target name="release" 
  +          description="Builds a release distribution.">
  +    <!-- Force the build.id to the build.number -->
  +    <property name="build.id" value="${build.number}" override="true"/>
  +
  +    <call target="all-all"/>
  +    <call target="release-dependencies"/>
     </target>
   
  +  <target name="release-dependencies" depends="init">
  +    <mkdir dir="${release.lib}"/>
  +    <copy todir="${release.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="${release.lib.ext}"/>
  +    <copy todir="${release.lib.ext}" filtering="no">
  +      <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>
  +      <fileset dir="${sun.javamail.lib}">
  +        <include name="mail.jar"/>
  +      </fileset>
  +      <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>
  +      <fileset dir="${hsql.hsql.lib}">
  +        <include name="hsql.jar"/>
  +      </fileset>
  +      <fileset dir="${enhydra.instantdb.lib}">
  +        <include name="idb.jar"/>
  +      </fileset>
  +      <fileset dir="${exolab.castor.lib}">
  +        <include name="castor.jar"/>
  +      </fileset>
  +      <fileset dir="${exolab.tyrex.lib}">
  +        <include name="tyrex.jar"/>
  +      </fileset>
  +      <fileset dir="${mortbay.jetty.lib}">
  +        <include name="**/*.jar"/>
  +      </fileset>
  +      <fileset dir="${mortbay.jetty3extra.jmx.lib}">
  +        <include name="**/*.jar"/>
  +      </fileset>
  +    </copy>
  +
  +    <mkdir dir="${release.client}"/>
  +    <copy todir="${release.client}" filtering="no">
  +      <fileset dir="${sun.jndi.lib}">
  +        <include name="jndi.jar"/>
  +      </fileset>
  +      <fileset dir="${apache.log4j.lib}">
  +        <include name="log4j.jar"/>
  +      </fileset>
  +      <fileset dir="${oswego.concurrent.lib}">
  +        <include name="concurrent.jar"/>
  +      </fileset>
  +      <fileset dir="${gnu.regexp.lib}">
  +        <include name="*.jar"/>
  +      </fileset>
  +      <fileset dir="${sun.jsse.lib}">
  +        <include name="*.jar"/>
  +      </fileset>
  +    </copy>
  +  </target>
  +
  +  <target name="release-archive-prepare" depends="release">
  +    <mkdir dir="${project.release}"/>
  +  </target>
  +
  +  <target name="release-zip" depends="release-archive-prepare"
  +       description="Builds a ZIP release distribution.">
  +    <zip zipfile="${release.archive.basename}.zip">
  +      <fileset dir="${project.release}">
  +        <include name="${release.id}/**"/>
  +      </fileset>
  +    </zip>
  +  </target>
  +
  +  <target name="release-tar" depends="release-archive-prepare"
  +       description="Builds a TAR release distribution.">
  +    <tar tarfile="${release.archive.basename}.tar" longfile="gnu"
  +      basedir="${project.release}"
  +      includes="${release.id}/**">
  +    </tar>
  +  </target>
  +
  +  <target name="release-tgz" depends="release-tar"
  +       description="Builds a TAR-GZIP release distribution.">
  +    <gzip src="${release.archive.basename}.tar"
  +       zipfile="${release.archive.basename}.tgz"/>
  +  </target>
  +
  +  <target name="release-all" depends="release-zip, release-tgz"
  +       description="Builds a distribution for each archive type."/>
  +
  +
  +  <!-- ================================================================== -->
  +  <!-- Cleans up generated stuff                                          -->
  +  <!-- ================================================================== -->
  +
     <!-- Clean up all build output -->
  -  <target name="clean" depends="all-clean, clean-project"
  +  <target name="clean" depends="init, all-clean"
          description="Cleans up most generated files.">
  +    <delete dir="${project.release}"/>
  +    <delete dir="${project.output}"/>
     </target>
   
     <!-- Clean up all generated files -->
  -  <target name="clobber" depends="all-clobber, clean-project"
  +  <target name="clobber" depends="all-clobber, clean"
          description="Cleans up all generated files.">
  -    <delete file="${control.root}/local.properties" quiet="true"/>
  +    <delete file="${control.root}/local.properties"/>
       <delete file="${control.root}/build.log"/>
       <delete file="${control.root}/run.log"/>
     </target>
  @@ -461,8 +1176,8 @@
       <cvs command="update -d" dest="${project.root}"/>
     </target>
   
  -  <target name="main" depends="release"
  -       description="Executes the default target (release)."/>
  +  <target name="main" depends="most"
  +       description="Executes the default target (most)."/>
       
     <target name="all" depends="all-all"
          description="Executes all modules and builds everything."/>
  @@ -550,8 +1265,6 @@
     <!-- Run the Nightly Tasks                                              -->
     <!-- ================================================================== -->
   
  -  <!-- testing -->
  -
     <target name="run-nightly">
       <!-- perhaps refresh cvs -->
       <call target="update-workspace" unless="test.skipupdate"/>
  @@ -570,9 +1283,9 @@
         </sequential>
   
         <sequential>
  -        <echo>Waiting for JBoss to activate (1 minute)</echo>
  +        <echo>Waiting for JBoss to activate (${run.nightly.sleep} minute)</echo>
           <!-- need something to wait until jboss is up, or timeout -->
  -        <sleep minutes="1"/>
  +        <sleep minutes="${run.nightly.sleep}"/>
   
           <!-- start the testsuite (it will generate reports by default) -->
           <echo>Starting JBoss/Testsuite</echo>
  @@ -592,11 +1305,9 @@
       </parallel>
   
       <call target="run-nightly-email"/>
  -    
     </target>
   
     <target name="run-nightly-email" depends="init">
  -
       <echo>Sending Reports</echo>
       <echo message="to: ${run.nightly.email.tolist}"/>
       <echo message="from: ${run.nightly.email.from}"/>
  @@ -604,15 +1315,11 @@
   
       <!-- email output to list -->
       <mail tolist="${run.nightly.email.tolist}"
  -           subject="Automated JBoss Testsuite Results"
  -           message="Automated JBoss Testsuite Results"
  -           from="${run.nightly.email.from}"
  +       subject="Automated JBoss Testsuite Results"
  +       message="Automated JBoss Testsuite Results"
  +       from="${run.nightly.email.from}"
             mailhost="${run.nightly.email.mailhost}"
  -          files="${project.root}/testsuite/output/reports/text/TESTS-TestSuites.txt"
  -    />
  -  
  -  
  -  
  +          
files="${project.root}/testsuite/output/reports/text/TESTS-TestSuites.txt"/>
     </target>
   
   </project>
  
  
  

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

Reply via email to