User: user57  
  Date: 01/07/27 17:48:00

  Modified:    .        Tag: jboss_buildmagic build.xml config.xml
  Added:       .        Tag: jboss_buildmagic build.sh
  Removed:     .        Tag: jboss_buildmagic build
  Log:
   o updated buildmagic-tasks.jar to a modification to the <call> task to
     have if & unless attributes.
   o hooked up the server module, moving all (most) of the src/lib libraries
     to thirdparty/**
   o removed select org/jboss/jdbc/ classes (which were moved to jbosspool)
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.4   +10 -4     jboss-j2ee/Attic/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-j2ee/Attic/build.xml,v
  retrieving revision 1.1.2.3
  retrieving revision 1.1.2.4
  diff -u -r1.1.2.3 -r1.1.2.4
  --- build.xml 2001/07/26 21:04:22     1.1.2.3
  +++ build.xml 2001/07/28 00:48:00     1.1.2.4
  @@ -27,7 +27,7 @@
   <!--                                                                        -->
   <!-- ====================================================================== -->
   
  -<!-- $Id: build.xml,v 1.1.2.3 2001/07/26 21:04:22 user57 Exp $ -->
  +<!-- $Id: build.xml,v 1.1.2.4 2001/07/28 00:48:00 user57 Exp $ -->
   
   <project name="jboss-j2ee" default="main">
   
  @@ -163,7 +163,7 @@
       <echo>Module root is ${module.root}</echo>
   
       <!-- Execute module init hook -->
  -    <antcall target="init-hook"/>
  +    <call target="init-hook" unless="bypass-init-hook"/>
   
       <!-- Resolve all properties & install filters -->
       <resolver force="${buildmagic.resolveproperties.force}"/>
  @@ -178,6 +178,12 @@
       <property name="initialized-already" value="true"/>
     </target>
   
  +  <!-- Disable execution of the init-hook target -->
  +  <target name="disable-init-hook">
  +    <property name="bypass-init-hook" value="true"/>
  +  </target>
  +
  +
   
     <!-- ================================================================== -->
     <!-- Compile                                                            -->
  @@ -348,7 +354,7 @@
     <!-- ================================================================== -->
   
     <!-- Clean up all build output -->
  -  <target name="clean" depends="init"
  +  <target name="clean" depends="disable-configure, init"
          description="Cleans up most generated files.">
       <delete dir="${module.build}"/>
       <delete dir="${module.release}"/>
  @@ -356,7 +362,7 @@
     </target>
   
     <!-- Clean up all generated files -->
  -  <target name="clobber" depends="disable-configure, clean"
  +  <target name="clobber" depends="clean"
          description="Cleans up all generated files.">
       <!-- Clean up configure generated files -->
       <delete file="${module.root}/local.properties" quiet="true"/>
  
  
  
  1.1.2.2   +27 -5     jboss-j2ee/Attic/config.xml
  
  Index: config.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-j2ee/Attic/config.xml,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- config.xml        2001/07/26 05:39:29     1.1.2.1
  +++ config.xml        2001/07/28 00:48:00     1.1.2.2
  @@ -14,7 +14,7 @@
   <!--                                                                        -->
   <!-- ====================================================================== -->
   
  -<!-- $Id: config.xml,v 1.1.2.1 2001/07/26 05:39:29 user57 Exp $ -->
  +<!-- $Id: config.xml,v 1.1.2.2 2001/07/28 00:48:00 user57 Exp $ -->
   
     <!-- ================================================================== -->
     <!-- Module Setup                                                       -->
  @@ -54,9 +54,26 @@
       <pathelement path="${jaas.lib}/jaas.jar"/>
     </path>
   
  -  <!-- ${classpath} and ${classpath.local} must have a value -->
  -  <property name="classpath" value=""/>
  -  <property name="classpath.local" value=""/>
  +  <!-- The combined library classpath -->
  +  <path id="classpath.library">
  +    <path refid="jaas.classpath"/>
  +  </path>
  +
  +
  +  <!-- ================================================================== -->
  +  <!-- Dependent Module Setup                                             -->
  +  <!-- ================================================================== -->
  + 
  +  <!-- 
  +     |  Dependent module paths should not use fileset expansion as that 
  +     |  will throw an exception if the directory does not exist.  Use
  +     |  a require task from the init-hook target to notify users when
  +     |  a library from a dependent module does not exist.
  +    -->
  +
  +  <!-- The combined depedant module classpath -->
  +  <path id="classpath.dependentmodules">
  +  </path>
   
   
     <!-- ================================================================== -->
  @@ -65,8 +82,13 @@
   
     <!-- The combined thirdparty classpath -->
     <path id="classpath.thirdparty">
  -    <path refid="jaas.classpath"/>
  +    <path refid="classpath.library"/>
  +    <path refid="classpath.dependentmodules"/>
     </path>
  +
  +  <!-- ${classpath} and ${classpath.local} must have a value -->
  +  <property name="classpath" value=""/>
  +  <property name="classpath.local" value=""/>
   
     <!-- The classpath required to build classes. -->
     <path id="javac.classpath">
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.1   +116 -0    jboss-j2ee/Attic/build.sh
  
  
  
  

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

Reply via email to