commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From di...@apache.org
Subject cvs commit: jakarta-commons/commons-build maven.xml project.properties project.xml
Date Mon, 31 May 2004 13:21:16 GMT
dirkv       2004/05/31 06:21:16

  Modified:    commons-build maven.xml project.properties project.xml
  Log:
  use maven notice and other extensions from common-collections
  switch to normal jakarta logo from main jakarta site
  date on bottom of page (uniform commons l&f)
  
  Revision  Changes    Path
  1.12      +42 -248   jakarta-commons/commons-build/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/commons-build/maven.xml,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- maven.xml	2 Mar 2004 03:21:05 -0000	1.11
  +++ maven.xml	31 May 2004 13:21:16 -0000	1.12
  @@ -67,276 +67,70 @@
     xmlns:ant="jelly:ant"
   >
   
  -  <!-- ########## BEGIN patch ############################################# -->
  +  <!-- ================================================================== -->
  +  <!-- N O T I C E                                                        -->
  +  <!-- ================================================================== -->
   
  -  <!-- patched maven-jar-plugin-1.3 & maven-dist-plugin-1.3 to include NOTICE.txt
-->
  -  <!-- remove this when a new maven release includes this feature -->
  -
  -  <goal name="jar:jar"
  -        description="Create the deliverable jar file."
  -        prereqs="test:test">
  -    <ant:available property="maven.jar.manifest.available" 
  -      file="${maven.jar.manifest}"/>
  -
  -    <!-- See http://java.sun.com/j2se/1.3/docs/guide/jar/jar.html -->
  -    <!-- See http://java.sun.com/j2se/1.4.1/docs/guide/jar/jar.html -->
  -    <ant:jar
  -      jarfile="${maven.build.dir}/${maven.final.name}.jar"
  -      basedir="${maven.build.dest}"
  -      index="${maven.jar.index}"
  -      compress="${maven.jar.compress}"
  -      excludes="${maven.jar.excludes}"> 
  -      
  -      <j:if test="${maven.jar.manifest.available}">
  -        <ant:setProperty name="manifest" value="${maven.jar.manifest}" />
  -      </j:if>
  -
  -      <j:set var="licenseFileName"><license:fileName/></j:set>
  -      <util:file name="${licenseFileName}" var="licenseFile"/>
  -      <ant:metainf dir="${licenseFile.canonicalFile.parent}">
  -        <ant:include name="LICENSE.txt"/>
  -        <ant:include name="NOTICE.txt"/>
  -      </ant:metainf>
  -      <ant:manifest>
  -        <ant:attribute name="Built-By" value="${user.name}"/>
  -        <ant:attribute name="Created-By" value="Apache Jakarta Maven"/>
  -        <ant:attribute name="Package" value="${pom.package}"/>
  -        <ant:attribute name="Build-Jdk" value="${java.version}"/>
  -        <!-- added supplementary entries -->
  -        <ant:attribute name="Extension-Name" value="${pom.artifactId}"/>
  -        <ant:attribute name="Specification-Version" value="${pom.specificationVersion}"/>
  -        <ant:attribute name="Specification-Vendor" value="${pom.organization.name}"/>
  -        <ant:attribute name="Specification-Title" value="${pom.shortDescription}"/>
  -        <ant:attribute name="Implementation-Version" value="${pom.currentVersion}"/>
  -        <ant:attribute name="Implementation-Vendor" value="${pom.organization.name}"/>
  -        <ant:attribute name="Implementation-Vendor-Id" value="${pom.organization.identifier}"/>
  -        <j:set var="mainclass" value="${pom.getPluginContext('maven-java-plugin').getVariable('maven.jar.mainclass')}"/>
  -        <j:if test="${!empty(mainclass)}">
  -            <ant:attribute name="Main-Class" value="${mainclass}"/>
  -        </j:if>
  -        
  -        <j:if test="${maven.jar.manifest.extensions.add == 'true'}">
  -          <j:set var="extensionList" value=""/>
  -          <j:forEach var="artifact" items="${pom.artifacts}">
  -            <j:set var="dep" value="${artifact.dependency}"/>
  -            <j:set var="extensionList" value="${extensionList} ${dep.artifactId}"/>
  -          </j:forEach>
  -
  -		  <j:if test="${extensionList.length() != 0}">        
  -            <j:set var="extensionList" value="${extensionList.substring(1)}"/>
  -            <ant:attribute name="Extension-List" value="${extensionList}"/>
  -          </j:if>
  -
  -          <j:forEach var="artifact" items="${pom.artifacts}">
  -            <j:set var="dep" value="${artifact.dependency}"/>
  -	        <ant:attribute name="${dep.artifactId}-Extension-Name" value="${dep.artifactId}"/>
  -            <ant:attribute name="${dep.artifactId}-Implementation-Version" value="${dep.version}"/>
  -            <ant:attribute name="${dep.artifactId}-Implementation-URL" value="http://www.ibiblio.org/maven${artifact.urlPath}"/>
  -          </j:forEach>        
  -        </j:if>
  -
  -        <j:if test="${context.getVariable('maven.jar.manifest.attributes.list') != null}">
  -            <util:tokenize var="attributeList" delim="," trim="true">${maven.jar.manifest.attributes.list}</util:tokenize>
  -            <j:forEach var="attribute" items="${attributeList}">
  -                <j:set var="name" value="maven.jar.manifest.attribute.${attribute}"/>
  -                <j:set var="value" value="${context.findVariable(name)}"/>
  -                <ant:attribute name="${attribute}" value="${value}"/>
  -            </j:forEach>
  -        </j:if>
  -
  -        <j:if test="${context.getVariable('maven.jar.manifest.groups.list') != null}">
  -            <util:tokenize var="groupList" delim="," trim="true">${maven.jar.manifest.groups.list}</util:tokenize>
  -            <j:forEach var="group" items="${groupList}">
  -                <j:set var="nameVar" value="maven.jar.manifest.${group}.name"/>
  -                <j:set var="groupName" value="${context.findVariable(nameVar)}"/>
  -                <j:set var="attributeListVar" value="maven.jar.manifest.${group}.attributes.list"/>
  -                <j:set var="groupAttributes" value="${context.findVariable(attributeListVar)}"/>
  -                <util:tokenize var="attributeList" delim="," trim="true">${groupAttributes}</util:tokenize>
  -                <ant:section name="${groupName}">
  -                    <j:forEach var="attribute" items="${attributeList}">
  -                        <j:set var="name" value="maven.jar.manifest.${group}.attribute.${attribute}"/>
  -                        <j:set var="value" value="${context.findVariable(name)}"/>
  -                        <ant:attribute name="${attribute}" value="${value}"/>
  -                    </j:forEach>
  -                </ant:section>
  -            </j:forEach>
  -         </j:if>
  -      </ant:manifest>
  -    </ant:jar>
  -  </goal>
  -
  -
  -  <ant:property name="maven.dist.assembly.dir"
  -    value="${maven.build.dir}/${maven.final.name}"/>
  -  <ant:property name="maven.dist.bin.archive.dir"
  -    value="${maven.dist.assembly.dir}/bin"/>
  -  <ant:property name="maven.dist.src.archive.dir"
  -    value="${maven.dist.assembly.dir}/src"/>
  -  <ant:property name="maven.dist.bin.assembly.dir"
  -    value="${maven.dist.assembly.dir}/bin/${maven.final.name}"/>
  -  <ant:property name="maven.dist.src.assembly.dir"
  -    value="${maven.dist.assembly.dir}/src/${maven.final.name}"/>
  -  <ant:property name="maven.dist.dir"
  -    value="${maven.build.dir}/distributions"/>
  -
  -  <goal
  -    name="dist:prepare-bin-filesystem"
  -    prereqs="xdoc:init, jar:jar, javadoc:generate"
  -    description="Builds the binary distribution file system.">
  +  <postGoal name="dist:prepare-bin-filesystem">
  +    <j:set var="maven.dist.bin.assembly.dir" value="${pom.getPluginContext('maven-dist-plugin').getVariable('maven.dist.bin.assembly.dir')}"
/>
       
  -    <!--
  -    
  -    This is the directory where everything is copied to so that it can
  -    be archived.
  -    
  -    -->
  -    
  -    <ant:delete dir="${maven.dist.bin.assembly.dir}"/>
  -    <ant:mkdir dir="${maven.dist.bin.assembly.dir}"/>
  -
  -    <ant:echo>
  -      +-------------------------------------------------------+
  -      | C R E A T I N G  B I N A R Y  D I S T R I B U T I O N |
  -      +-------------------------------------------------------+
  -    </ant:echo>
  -
  +    <!-- Copy Files -->
       <ant:copy todir="${maven.dist.bin.assembly.dir}">
         <ant:fileset dir=".">
  -        <ant:include name="README.txt"/>
  -        <ant:include name="LICENSE*"/>
  -        <ant:include name="NOTICE*"/>
  +        <ant:include name="NOTICE.txt"/>
         </ant:fileset>
       </ant:copy>
   
       <!-- Copy Jars -->
       <ant:copy todir="${maven.dist.bin.assembly.dir}">
         <ant:fileset dir="${maven.build.dir}">
  -        <ant:include name="${maven.final.name}.jar"/>
  +        <ant:include name="*.jar"/>
         </ant:fileset>
       </ant:copy>
   
  -    <!-- Copy documentation -->
  -    <j:set var="docsDest" value="${maven.docs.dest}"/>
  -    <ant:copy todir="${maven.dist.bin.assembly.dir}/docs">
  -      <ant:fileset dir="${docsDest}">
  -        <ant:include name="**"/>
  -      </ant:fileset>
  -    </ant:copy>
  -  </goal>
  -
  -  <goal
  -    name="dist:prepare-src-filesystem"
  -    description="Builds the source distribution file system.">
  -
  -    <!-- S O U R C E  D I S T R I B U T I O N -->
  -
  -    <ant:delete dir="${maven.dist.src.assembly.dir}" />
  -    <ant:mkdir dir="${maven.dist.src.assembly.dir}" />
  -
  -    <ant:echo>
  -      +-------------------------------------------------------+
  -      | C R E A T I N G  S O U R C E  D I S T R I B U T I O N |
  -      +-------------------------------------------------------+
  -    </ant:echo>
  -
  +  </postGoal>
  +  
  +  <postGoal name="dist:prepare-src-filesystem">
  +    <j:set var="maven.dist.src.assembly.dir" value="${pom.getPluginContext('maven-dist-plugin').getVariable('maven.dist.src.assembly.dir')}"
/>
  +    
  +    <!-- Copy Files -->
       <ant:copy todir="${maven.dist.src.assembly.dir}">
         <ant:fileset dir=".">
  -        <ant:include name="README.txt"/>
  -        <ant:include name="LICENSE*"/>
  -        <ant:include name="NOTICE*"/>
  -        <ant:include name="project.properties"/>
  -        <ant:include name="maven.xml"/>
  -        <ant:include name="project.xml"/>
  +        <ant:include name="NOTICE.txt"/>
         </ant:fileset>
       </ant:copy>
   
  -    <ant:available property="maven.dist.build.xml.avail"
  -               file="${basedir}/build.xml"/>
  -
  -    <j:choose>
  -      <j:when test="${maven.dist.build.xml.avail}">
  -        <ant:copy todir="${maven.dist.src.assembly.dir}" file="build.xml"/>
  -      </j:when>
  -      <j:otherwise>
  -        <attainGoal name="ant:generate-build"/>
  -        <ant:move 
  -          file="build.xml"
  -          tofile="${maven.dist.src.assembly.dir}/build.xml"/>
  -      </j:otherwise>
  -    </j:choose>
  -
  -    <!-- Copy Source -->
  -    <ant:copy todir="${maven.dist.src.assembly.dir}/src">
  -      <ant:fileset dir="${maven.src.dir}" />
  +    <!-- Copy Jars -->
  +    <ant:copy todir="${maven.dist.src.assembly.dir}">
  +      <ant:fileset dir="${maven.build.dir}">
  +        <ant:include name="*.jar"/>
  +      </ant:fileset>
       </ant:copy>
  -  </goal>
  -
  -  <goal name="dist"
  -    prereqs="dist:build"
  -    description="Build a complete distribution.">
  -  </goal>
  -        
  -  <goal
  -    name="dist:build"
  -    prereqs="dist:build-bin,dist:build-src"
  -    description="Build a complete distribution.">
  -  </goal>
  -
  -  <goal
  -    name="dist:build-setup"
  -    description="Set up directories for a distribution build">
  -    <ant:delete dir="${maven.dist.dir}"/>
  -    <ant:mkdir dir="${maven.dist.dir}"/>
  -  </goal>
  -
  -  <goal
  -    name="dist:build-bin"
  -    prereqs="dist:build-setup,dist:prepare-bin-filesystem"
  -    description="Build the binary distribution.">
  -
  -    <!-- Create a tar.gz file -->
  -    <ant:tar longfile="gnu" tarfile="${maven.dist.dir}/${maven.final.name}.tar">
  -      <ant:tarfileset dir="${maven.dist.bin.archive.dir}"/>
  -    </ant:tar>
  -
  -    <ant:gzip 
  -      zipfile="${maven.dist.dir}/${maven.final.name}.tar.gz"
  -      src="${maven.dist.dir}/${maven.final.name}.tar"
  -    />
       
  -    <ant:delete file="${maven.dist.dir}/${maven.final.name}.tar"/>
  -
  -    <!-- Create a zip file -->
  -    <ant:zip zipfile="${maven.dist.dir}/${maven.final.name}.zip">
  -      <ant:zipfileset dir="${maven.dist.bin.archive.dir}"/>
  -    </ant:zip>
  -  </goal>
  -
  -  <goal
  -    name="dist:build-src"
  -    prereqs="dist:build-setup,dist:prepare-src-filesystem"
  -    description="Build the source distribution.">
  - 
  -    <!-- Create a tar.gz file -->
  -    <ant:tar longfile="gnu" tarfile="${maven.dist.dir}/${maven.final.name}-src.tar">
  -      <ant:tarfileset dir="${maven.dist.src.archive.dir}"/>
  -    </ant:tar>
  -
  -    <ant:gzip 
  -      zipfile="${maven.dist.dir}/${maven.final.name}-src.tar.gz" 
  -      src="${maven.dist.dir}/${maven.final.name}-src.tar"
  -    />
  +    <!-- Copy XDocs -->
  +    <ant:copy todir="${maven.dist.src.assembly.dir}/xdocs">
  +      <ant:fileset dir="xdocs" />
  +    </ant:copy>
       
  -    <ant:delete file="${maven.dist.dir}/${maven.final.name}-src.tar"/>
  -
  -    <!-- Create a zip file -->
  -    <ant:zip zipfile="${maven.dist.dir}/${maven.final.name}-src.zip">
  -      <ant:zipfileset dir="${maven.dist.src.archive.dir}"/>
  -    </ant:zip>
  -
  -  </goal>
  +  </postGoal>
   
  -  <!-- ########## END patch ############################################# -->
  +  <!-- ================================================================== -->
  +  <!-- C H E C K S U M                                                    -->
  +  <!-- ================================================================== -->
  +  
  +  <postGoal name="dist:build-bin">
  +    <j:set var="distDir" value="${pom.getPluginContext('maven-dist-plugin').getVariable('maven.dist.dir')}"/>
  +    <j:set var="finalName" value="${pom.getPluginContext('maven-dist-plugin').getVariable('maven.final.name')}"/>
  +    <ant:checksum file="${distDir}/${finalName}.tar.gz"/>
  +    <ant:checksum file="${distDir}/${finalName}.zip"/>
  +  </postGoal>
  +  
  +  <postGoal name="dist:build-src">
  +    <j:set var="distDir" value="${pom.getPluginContext('maven-dist-plugin').getVariable('maven.dist.dir')}"/>
  +    <j:set var="finalName" value="${pom.getPluginContext('maven-dist-plugin').getVariable('maven.final.name')}"/>
  +    <ant:checksum file="${distDir}/${finalName}-src.tar.gz"/>
  +    <ant:checksum file="${distDir}/${finalName}-src.zip"/>
  +  </postGoal>
   
     <!-- ================================================================== -->
     <!-- B U I L D                                                          -->
  
  
  
  1.13      +2 -2      jakarta-commons/commons-build/project.properties
  
  Index: project.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/commons-build/project.properties,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- project.properties	5 Apr 2004 22:11:55 -0000	1.12
  +++ project.properties	31 May 2004 13:21:16 -0000	1.13
  @@ -45,7 +45,7 @@
   # commons site L&F
   ######################################################################
   maven.xdoc.jsl=../commons-build/commons-site.jsl
  -maven.xdoc.date=left
  +maven.xdoc.date=bottom
   maven.xdoc.poweredby.image=maven-feather.png
   maven.xdoc.developmentProcessUrl=http://jakarta.apache.org/commons/charter.html
   maven.xdoc.includeProjectDocumentation=false
  
  
  
  1.32      +1 -1      jakarta-commons/commons-build/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/commons-build/project.xml,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- project.xml	20 Apr 2004 17:39:42 -0000	1.31
  +++ project.xml	31 May 2004 13:21:16 -0000	1.32
  @@ -25,7 +25,7 @@
     <organization>
       <name>The Apache Software Foundation</name>
       <url>http://jakarta.apache.org</url>
  -    <logo>http://jakarta.apache.org/images/original-jakarta-logo.gif</logo>
  +    <logo>http://jakarta.apache.org/images/jakarta-logo.gif</logo>
     </organization>
     <inceptionYear>2001</inceptionYear>
     <logo>/images/logo.png</logo>
  
  
  

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


Mime
View raw message