You are viewing a plain text version of this content. The canonical link for it is here.
Posted to alexandria-dev@jakarta.apache.org by sa...@apache.org on 2001/04/20 19:56:31 UTC

cvs commit: jakarta-alexandria/proposal/antgump/xsl antgump-all.xsl

sanders     01/04/20 10:56:30

  Modified:    proposal/antgump build.xml
               proposal/antgump/xsl antgump-all.xsl
  Added:       proposal/antgump gump.workspace.properties
                        workspace.master.xml
  Removed:     proposal/antgump athena.xml build.py
  Log:
  Many changes from a patch submitted by Jason van Zyl (jvanzyl@apache.org)
  
  Revision  Changes    Path
  1.2       +108 -31   jakarta-alexandria/proposal/antgump/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-alexandria/proposal/antgump/build.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- build.xml	2001/04/01 05:28:20	1.1
  +++ build.xml	2001/04/20 17:56:22	1.2
  @@ -1,37 +1,114 @@
   <project name="Tinderbox" default="main" basedir=".">
  -	<property name="sourcefilename" value="${basedir}/tinderbox.xml"/>
  -	<target name="clean">
  -		<delete dir="work"/>
  -	</target>
  -	<target name="main" depends="clean">
  -		<echo message="Step 1  - Creating working directory"/>
  -		<mkdir dir="work"/>
  -		
  -		<echo message="Step 2  - Merging projects into workspace"/>
  -		<style in="${sourcefilename}" out="work/merge.xml" style="../gump/stylesheet/merge.xsl"  destdir="work"/>
   
  -		<echo message="Step 3  - Sorting projects into dependency order"/>
  -		<style in="work/merge.xml" out="work/sorted.xml" style="../gump/stylesheet/sortdep.xsl"  destdir="work"/>
  +  <property file="${user.home}/gump.workspace.properties"/>
  +  <property file="gump.workspace.properties"/>
   
  -		<echo message="Step 4  - Sorting projects into alphabetical order"/>
  -		<style in="work/sorted.xml" out="work/sorted-alpha.xml" style="xsl/antgump-sortalpha.xsl"  destdir="work"/>
  +  <property name="work.dir" value="${basedir}/temp"/>
  +  <property name="workspace.master" value="workspace.master.xml"/>
  +  <property name="workspace.copy" value="${work.dir}/workspace.xml"/>
   
  -		<echo message="Step 5  - Create Gump Master Build File (work/gump-all.xml)"/>
  -		<style in="work/sorted.xml" out="work/antgumpall.xml" style="xsl/antgump-all.xsl"  destdir="work"/>
  -		
  -		<echo message="Step 6  - Preparing Sandbox"/>
  -		<ant antfile="antgumpall.xml" target="prepare" dir="work"/>		
  -		
  -		<echo message="Step 7  - Create all project build files"/>
  -		<java classname="com.icl.saxon.StyleSheet" fork="yes">
  -			<arg line="work/sorted.xml xsl/antgump-each.xsl"/>
  -			<classpath id="saxonpath">
  -				<pathelement location="${basedir}/saxon.jar"/>
  -			</classpath>
  -		</java>
  +  <target name="clean">
  +    <delete dir="${work.dir}"/>
  +  </target>
  +  
  +
  +  <target name="main" depends="clean,workspace">
  +    <echo message="Step 1 - Creating working directory - ${work.dir}"/>
  +    <mkdir dir="${work.dir}"/>
  +
  +    <echo message="Step 2 - Merging projects into workspace"/>
  +    <style in="${workspace.copy}" 
  +          out="${work.dir}/merge.xml" 
  +        style="../gump/stylesheet/merge.xsl"  
  +       destdir="${work.dir}"/>
  +
  +    <echo message="Step 3 - Sorting projects into dependency order"/>
  +    <style in="${work.dir}/merge.xml" 
  +          out="${work.dir}/sorted.xml" 
  +        style="../gump/stylesheet/sortdep.xsl"  
  +      destdir="${work.dir}"/>
  +
  +    <echo message="Step 4 - Sorting projects into alphabetical order"/>
  +    <style in="${work.dir}/sorted.xml" 
  +          out="${work.dir}/sorted-alpha.xml" 
  +        style="xsl/antgump-sortalpha.xsl"  
  +      destdir="${work.dir}"/>
  +
  +    <echo message="Step 5 - Create Gump Master Build File (${work.dir}/gump-all.xml)"/>
  +    <style in="${work.dir}/sorted.xml" 
  +          out="${work.dir}/antgumpall.xml" 
  +        style="xsl/antgump-all.xsl"  
  +      destdir="${work.dir}"/>
   		
  -		<echo message="Step 8  - Building everything (work/antgumpall.xml)"/>
  -		<ant antfile="antgumpall.xml" target="build-all" dir="work"/>		
  +    <echo message="Step 6 - Preparing Sandbox"/>
  +    <ant antfile="antgumpall.xml" target="prepare" dir="${work.dir}"/>
  +
  +    <echo message="Step 7 - Create all project build files"/>
  +    <java classname="com.icl.saxon.StyleSheet" fork="yes">
  +      <arg line="${work.dir}/sorted.xml xsl/antgump-each.xsl"/>
  +      <classpath id="saxonpath">
  +        <pathelement location="${basedir}/saxon.jar"/>
  +      </classpath>
  +    </java>
   		
  -	</target>
  -</project>
  +    <echo message="Step 8 - Building everything (${work.dir}/antgumpall.xml)"/>
  +    <ant antfile="antgumpall.xml" target="build-all" dir="${work.dir}"/>
  +  </target>
  +
  +
  +  <target name="workspace">
  +      
  +    <!-- Gump installation properties -->
  +    
  +    <filter token="WORKSPACE_VERSION" value="${workspace.version}"/>
  +    <filter token="GUMP_HOME" value="${gump.home}"/>
  +    <filter token="GUMP_BASEDIR" value="${gump.base.dir}"/>
  +    <filter token="GUMP_CVSDIR"  value="${gump.cvs.dir}"/>
  +    <filter token="GUMP_LIBDIR"  value="${gump.lib.dir}"/>
  +
  +    <!-- Gump CVS login properties -->
  +
  +    <filter token="GUMP_CVS_LOGIN_BSF"          
  +      value="${gump.cvs.login.bsf}"/>
  +    
  +    <filter token="GUMP_CVS_LOGIN_CASTOR"       
  +      value="${gump.cvs.login.castor}"/>
  +    
  +    <filter token="GUMP_CVS_LOGIN_FREEMARKER"   
  +      value="${gump.cvs.login.freemarker}"/>
  +    
  +    <filter token="GUMP_CVS_LOGIN_JAKARTA"      
  +      value="${gump.cvs.login.jakarta}"/>
  +    
  +    <filter token="GUMP_CVS_LOGIN_JDOM"         
  +      value="${gump.cvs.login.jdom}"/>
  +    
  +    <filter token="GUMP_CVS_LOGIN_JUNIT"        
  +      value="${gump.cvs.login.junit}"/>
  +
  +    <filter token="GUMP_CVS_LOGIN_MOZILLA"      
  +      value="${gump.cvs.login.mozilla}"/>
  +    
  +    <filter token="GUMP_CVS_LOGIN_JSERVPUB"     
  +      value="${gump.cvs.login.jservpub}"/>
  +
  +    <filter token="GUMP_CVS_LOGIN_TIGRIS"
  +      value="${gump.cvs.login.tigris}"/>
  +
  +    <filter token="GUMP_CVS_LOGIN_XML"          
  +      value="${gump.cvs.login.xml}"/>
  +    
  +    <filter token="GUMP_CVS_LOGIN_WHICHEVER"
  +      value="${gump.cvs.login.whichever}"/>
  +
  +    <delete file="${workspace.copy}"/>
  +
  +    <copy 
  +      file="${workspace.master}" 
  +      tofile="${workspace.copy}"
  +      filtering="yes"
  +    />
  +          
  +  </target>
  +
  +</project>
  \ No newline at end of file
  
  
  
  1.1                  jakarta-alexandria/proposal/antgump/gump.workspace.properties
  
  Index: gump.workspace.properties
  ===================================================================
  # -----------------------------------------------
  # Workspace version
  # -----------------------------------------------
  workspace.version = 0.2
  
  # -----------------------------------------------
  # Properties for gump installation setup.
  # -----------------------------------------------
  gump.home = /opt/jakarta/jakarta-alexandria/proposal/gump
  gump.base.dir = /home/sanders/antgump
  gump.cvs.dir = /home/sanders/antgump-cvs
  gump.lib.dir = /home/sanders/java
  
  # -----------------------------------------------
  # Properties for CVS login.
  # -----------------------------------------------
  gump.cvs.login.bsf = anoncvs
  gump.cvs.login.castor = anoncvs
  gump.cvs.login.freemarker = anonymous
  gump.cvs.login.jakarta = sanders
  gump.cvs.login.jdom = anonymous
  gump.cvs.login.junit = anonymous
  gump.cvs.login.mozilla = anonymous
  gump.cvs.login.jservpub = jservpub
  gump.cvs.login.tigris = guest
  gump.cvs.login.xml = anoncvs
  gump.cvs.login.whichever = anoncvs
  
  
  
  1.1                  jakarta-alexandria/proposal/antgump/workspace.master.xml
  
  Index: workspace.master.xml
  ===================================================================
  <workspace basedir="@GUMP_BASEDIR@" 
              cvsdir="@GUMP_CVSDIR@" 
             version="@WORKSPACE_VERSION@">
  
    <build sysclasspath="only"/>
  
    <!-- Apache.Jakarta -->
  
    <project href="@GUMP_HOME@/project/jakarta-alexandria.xml"/>
    <project href="@GUMP_HOME@/project/jakarta-ant.xml"/>
    <project href="@GUMP_HOME@/project/jakarta-avalon-cornerstone.xml"/>
    <project href="@GUMP_HOME@/project/jakarta-avalon-logkit.xml"/>
    <project href="@GUMP_HOME@/project/jakarta-avalon-phoenix.xml"/>
    <project href="@GUMP_HOME@/project/jakarta-avalon-testlet.xml"/>
    <project href="@GUMP_HOME@/project/jakarta-avalon.xml"/>
    <project href="@GUMP_HOME@/project/jakarta-commons.xml"/>
    <project href="@GUMP_HOME@/project/jakarta-ecs.xml"/>
    <project href="@GUMP_HOME@/project/jakarta-james.xml"/>
    <project href="@GUMP_HOME@/project/jakarta-jetspeed.xml"/>
    <project href="@GUMP_HOME@/project/jakarta-jmeter.xml"/>
    <project href="@GUMP_HOME@/project/jakarta-log4j.xml"/>
    <project href="@GUMP_HOME@/project/jakarta-oro.xml"/>
    <project href="@GUMP_HOME@/project/jakarta-regexp.xml"/>
    <project href="@GUMP_HOME@/project/jakarta-servletapi-4.xml"/>
    <project href="@GUMP_HOME@/project/jakarta-servletapi.xml"/>
    <project href="@GUMP_HOME@/project/jakarta-site2.xml"/>
    <project href="@GUMP_HOME@/project/jakarta-slide.xml"/>
    <project href="@GUMP_HOME@/project/jakarta-struts.xml"/>
    <project href="@GUMP_HOME@/project/jakarta-taglibs.xml"/>
    <project href="@GUMP_HOME@/project/jakarta-tomcat-40.xml"/>
    <!-- project href="@GUMP_HOME@/project/jakarta-tomcat-41.xml"/ -->
    <project href="@GUMP_HOME@/project/jakarta-tomcat.xml"/>
    <project href="@GUMP_HOME@/project/jakarta-tools.xml"/>
    <project href="@GUMP_HOME@/project/jakarta-turbine.xml"/>
    <project href="@GUMP_HOME@/project/jakarta-velocity.xml"/>
    <project href="@GUMP_HOME@/project/jakarta-watchdog.xml"/>
  
    <!-- Apache.XML -->
  
    <project href="@GUMP_HOME@/project/xml-axis.xml"/>
    <project href="@GUMP_HOME@/project/xml-batik.xml"/>
    <project href="@GUMP_HOME@/project/xml-cocoon.xml"/>
    <project href="@GUMP_HOME@/project/xml-cocoon2.xml"/>
    <project href="@GUMP_HOME@/project/xml-crimson.xml"/>
    <project href="@GUMP_HOME@/project/xml-fop.xml"/>
    <project href="@GUMP_HOME@/project/xml-site.xml"/>
    <project href="@GUMP_HOME@/project/xml-soap.xml"/>
    <project href="@GUMP_HOME@/project/xml-stylebook.xml"/>
    <project href="@GUMP_HOME@/project/xml-xalan.xml"/>
    <project href="@GUMP_HOME@/project/xml-xerces.xml"/>
    <project href="@GUMP_HOME@/project/xml-xerces2.xml"/>
  
    <!-- Apache.Java -->
  
    <project href="@GUMP_HOME@/project/town.xml"/>
  
    <!-- other -->
  
    <project href="@GUMP_HOME@/project/bsf.xml"/>
    <project href="@GUMP_HOME@/project/castor.xml"/>
    <project href="@GUMP_HOME@/project/freemarker.xml"/>
    <project href="@GUMP_HOME@/project/jdom.xml"/>
    <project href="@GUMP_HOME@/project/jtidy.xml"/>
    <project href="@GUMP_HOME@/project/junit.xml"/>
    <project href="@GUMP_HOME@/project/openejb.xml"/>
    <project href="@GUMP_HOME@/project/openjms.xml"/>
    <project href="@GUMP_HOME@/project/openorb.xml"/>
    <project href="@GUMP_HOME@/project/rhino.xml"/>
    <project href="@GUMP_HOME@/project/scarab.xml"/>
    <project href="@GUMP_HOME@/project/tyrex.xml"/>
    <project href="@GUMP_HOME@/project/village.xml"/>
  
    <!-- Sun -->
  
    <project href="@GUMP_HOME@/project/ejb.xml"      
             home="@GUMP_LIBDIR@/ejb-2_0-pfd"/>
    <project href="@GUMP_HOME@/project/j2ee-connector.xml" 
             home="@GUMP_LIBDIR@/j2ee_connector-1_0-pfd2"/>
    <project href="@GUMP_HOME@/project/jaas.xml"     
             home="@GUMP_LIBDIR@/jaas1_0"/>
    <project href="@GUMP_HOME@/project/jaf.xml"      
             home="@GUMP_LIBDIR@/jaf-1.0.1"/>
    <project href="@GUMP_HOME@/project/javamail.xml" 
             home="@GUMP_LIBDIR@/javamail-1.2"/>
    <project href="@GUMP_HOME@/project/jaxp.xml"     
             home="@GUMP_LIBDIR@/jaxp1.0.1"/>
    <project href="@GUMP_HOME@/project/jaxp11.xml"   
             home="@GUMP_LIBDIR@/jaxp-1.1"/>
    <project href="@GUMP_HOME@/project/jdbc.xml"     
             home="@GUMP_LIBDIR@/jdbc2_0"/>
    <project href="@GUMP_HOME@/project/jms.xml"      
             home="@GUMP_LIBDIR@/jms1.0.2"/>
    <project href="@GUMP_HOME@/project/jmx.xml"      
             home="@GUMP_LIBDIR@/jmx-1_0"/>
    <project href="@GUMP_HOME@/project/jndi.xml"     
             home="@GUMP_LIBDIR@/jndi1_2_1"/>
    <project href="@GUMP_HOME@/project/jsse.xml"     
             home="@GUMP_LIBDIR@/jsse1.0.2"/>
    <project href="@GUMP_HOME@/project/jta.xml"      
             home="@GUMP_LIBDIR@/jta-spec1_0_1"/>
    <project href="@GUMP_HOME@/project/jts.xml"      
             home="@GUMP_LIBDIR@/jts1_0"/>
  
    <!-- CVS Repository overrides -->
    <repository href="@GUMP_HOME@/repository/exolab.xml"/>
    <repository href="@GUMP_HOME@/repository/sourceforge.xml"/>
  
    <cvs-repository>
      <tree name="bsf"
        root=":pserver:@GUMP_CVS_LOGIN_BSF@@oss.software.ibm.com:/usr/cvs/bsf"/>
  
      <tree name="jdom" 
        root=":pserver:@GUMP_CVS_LOGIN_JDOM@@cvs.jdom.org:/home/cvspublic"/>
  
      <tree name="jakarta"
        root=":pserver:@GUMP_CVS_LOGIN_JAKARTA@@jakarta.apache.org:/home/cvspublic"/>
  
      <tree name="mozilla"
        root=":pserver:@GUMP_CVS_LOGIN_MOZILLA@@cvs-mirror.mozilla.org:/cvsroot"/>
  
      <tree name="tigris" 
        root=":pserver:@GUMP_CVS_LOGIN_TIGRIS@@cvs.tigris.org:/cvs"/>
  
      <tree name="whichever"
        root=":pserver:@GUMP_CVS_LOGIN_WHICHEVER@@share.whichever.com:/home/cvspublic"/>
      
      <tree name="xml"
        root=":pserver:@GUMP_CVS_LOGIN_XML@@xml.apache.org:/home/cvspublic"/>
    </cvs-repository>
  
  </workspace>
  
  
  
  1.2       +19 -3     jakarta-alexandria/proposal/antgump/xsl/antgump-all.xsl
  
  Index: antgump-all.xsl
  ===================================================================
  RCS file: /home/cvs/jakarta-alexandria/proposal/antgump/xsl/antgump-all.xsl,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- antgump-all.xsl	2001/04/01 05:24:21	1.1
  +++ antgump-all.xsl	2001/04/20 17:56:26	1.2
  @@ -8,11 +8,13 @@
     <xsl:template match="/workspace">
       <xsl:variable name="basedir" select="@basedir"/>
       <project name="Gump Master Buildfile" default="build-all" basedir=".">
  +
         <target name="init">
           <tstamp>
             <format property="TODAY_LONG" pattern="dddd,  MMMM DD, yyyy"/>
           </tstamp>
         </target>
  +
         <target name="prepare">
           <delete dir="{@basedir}"/>
   <!--        <delete dir="{@cvsdir}"/> -->
  @@ -22,10 +24,12 @@
             <mkdir dir="{$basedir}/{@srcdir}"/>
           </xsl:for-each>
         </target>
  +
         <target name="build-all" depends="init">
           <antcall target="status-page"/>
           <xsl:apply-templates select="project" mode="build"/>
         </target>
  +
         <target name="status-page" depends="init">
   			<echo message="index.html"/>
           <java classname="com.icl.saxon.StyleSheet" fork="yes">
  @@ -33,7 +37,7 @@
               <xsl:attribute name="line">
                 <xsl:text>-o </xsl:text>
                 <xsl:value-of select="$basedir"/>
  -              <xsl:text>/index.html ../html/index.html ../xsl/antgump-status-all.xsl filename=../work/sorted-alpha.xml today=${DSTAMP}-${TSTAMP}</xsl:text>
  +              <xsl:text>/index.html ../html/index.html ../xsl/antgump-status-all.xsl filename=${work.dir}/sorted-alpha.xml today=${DSTAMP}-${TSTAMP}</xsl:text>
               </xsl:attribute>
             </arg>
             <classpath id="saxon">
  @@ -46,7 +50,7 @@
               <xsl:attribute name="line">
                 <xsl:text>-o </xsl:text>
                 <xsl:value-of select="$basedir"/>
  -              <xsl:text>/cvs_index.html ../html/cvs_index.html ../xsl/antgump-status-all.xsl filename=../work/sorted-alpha.xml today=${DSTAMP}-${TSTAMP}</xsl:text>
  +              <xsl:text>/cvs_index.html ../html/cvs_index.html ../xsl/antgump-status-all.xsl filename=${work.dir}/sorted-alpha.xml today=${DSTAMP}-${TSTAMP}</xsl:text>
               </xsl:attribute>
             </arg>
             <classpath>
  @@ -72,7 +76,7 @@
               <xsl:attribute name="line">
                 <xsl:text>-o </xsl:text>
                 <xsl:value-of select="$basedir"/>
  -              <xsl:text>/source_index.html ../html/source_index.html ../xsl/antgump-status-all.xsl filename=../work/sorted-alpha.xml sourcefile=../</xsl:text>
  +              <xsl:text>/source_index.html ../html/source_index.html ../xsl/antgump-status-all.xsl filename=${work.dir}/sorted-alpha.xml sourcefile=../</xsl:text>
                 <xsl:value-of select="$thisfilename"/>
                 <xsl:text> today=${DSTAMP}-${TSTAMP}</xsl:text>
               </xsl:attribute>
  @@ -119,3 +123,15 @@
     </xsl:template>
   
   </xsl:stylesheet>
  +
  +
  +
  +
  +
  +
  +
  +
  +
  +
  +
  +
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: alexandria-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: alexandria-dev-help@jakarta.apache.org