maven-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wer...@apache.org
Subject cvs commit: maven/src/plugins-build/jar plugin.jelly project.xml
Date Fri, 05 Sep 2003 15:14:20 GMT
werken      2003/09/05 08:14:20

  Modified:    src/plugins-build/jar plugin.jelly project.xml
  Log:
  MAVEN-789 from Berin L.
  
  Rev'd version to 1.3.
  
  Revision  Changes    Path
  1.20      +32 -2     maven/src/plugins-build/jar/plugin.jelly
  
  Index: plugin.jelly
  ===================================================================
  RCS file: /home/cvs/maven/src/plugins-build/jar/plugin.jelly,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- plugin.jelly	4 Sep 2003 12:18:18 -0000	1.19
  +++ plugin.jelly	5 Sep 2003 15:14:20 -0000	1.20
  @@ -7,7 +7,8 @@
     xmlns:maven="jelly:maven"
     xmlns:deploy="deploy"
     xmlns:util="jelly:util"
  -  xmlns:doc="doc">
  +  xmlns:doc="doc"
  +  xmlns:log="jelly:log">
   
     <!-- ================================================================== -->
     <!-- J A R                                                              -->
  @@ -70,7 +71,6 @@
               <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}"/>
  @@ -78,6 +78,36 @@
               <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)}"/>
  +                <log:debug>[user attribute] ${attribute}: ${value}</log:debug>
  +                <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>
  +                <log:debug>[group] Name: ${groupName}</log:debug>
  +                <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)}"/>
  +                        <log:debug>[attribute] ${attribute}: ${value}</log:debug>
  +                        <ant:attribute name="${attribute}" value="${value}"/>
  +                    </j:forEach>
  +                </ant:section>
  +            </j:forEach>
  +         </j:if>
         </ant:manifest>
       </ant:jar>
     </goal>
  
  
  
  1.12      +1 -1      maven/src/plugins-build/jar/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/maven/src/plugins-build/jar/project.xml,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- project.xml	2 Sep 2003 10:23:31 -0000	1.11
  +++ project.xml	5 Sep 2003 15:14:20 -0000	1.12
  @@ -5,7 +5,7 @@
     <pomVersion>3</pomVersion>
     <id>maven-jar-plugin</id>
     <name>Maven Jar Plug-in</name>
  -  <currentVersion>1.2-SNAPSHOT</currentVersion>
  +  <currentVersion>1.3</currentVersion>
     <description/>
     <shortDescription>Java Project Management Tools</shortDescription>
     <url>http://maven.apache.org/reference/plugins/jar/</url>
  
  
  

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


Mime
View raw message