You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by bw...@apache.org on 2003/04/10 11:06:34 UTC

cvs commit: maven/src/plugins-build/jar plugin.properties plugin.jelly

bwalding    2003/04/10 02:06:34

  Modified:    src/plugins-build/jar plugin.properties plugin.jelly
  Log:
  Extensions appear to break tomcat (I guess it is extension aware. We'll disable it using a property
  by default.  Most people wouldn't be using it)
  
  Revision  Changes    Path
  1.3       +1 -1      maven/src/plugins-build/jar/plugin.properties
  
  Index: plugin.properties
  ===================================================================
  RCS file: /home/cvs/maven/src/plugins-build/jar/plugin.properties,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- plugin.properties	9 Apr 2003 15:06:44 -0000	1.2
  +++ plugin.properties	10 Apr 2003 09:06:34 -0000	1.3
  @@ -1,5 +1,5 @@
   # -------------------------------------------------------------------
   # P L U G I N P R O P E R T I E S
   # -------------------------------------------------------------------
  -
  +maven.jar.manifest.extensions.add=false
   maven.remote.group=maven
  
  
  
  1.8       +19 -17    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.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- plugin.jelly	9 Apr 2003 15:06:44 -0000	1.7
  +++ plugin.jelly	10 Apr 2003 09:06:34 -0000	1.8
  @@ -24,8 +24,8 @@
       <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 -->
  +    <!-- 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}"
  @@ -59,24 +59,26 @@
               <ant:attribute name="Main-Class" value="${mainclass}"/>
           </j:if>
           
  -        <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="${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: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: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>
         </ant:manifest>
       </ant:jar>
     </goal>
  
  
  

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


Re: cvs commit: maven/src/plugins-build/jar plugin.properties plugin.jelly

Posted by Konstantin Priblouda <kp...@yahoo.com>.
--- bwalding@apache.org wrote:
> bwalding    2003/04/10 02:06:34
> 
>   Modified:    src/plugins-build/jar
> plugin.properties plugin.jelly
>   Log:
>   Extensions appear to break tomcat (I guess it is
> extension aware. We'll disable it using a property
>   by default.  Most people wouldn't be using it)
>   

I stumbled across this problem, and I think that it's 
comma separating different values -
java.util.jar.Attribute does not like it....

Judging from janed source, only [a-zA-Z0-9_\-] are
allowed there. 

regards,

=====
Konstantin Priblouda ( ko5tik )    Freelance Software developer
< http://www.pribluda.de > < play java games -> http://www.yook.de >
< render charts online -> http://www.pribluda.de/povray/ >

__________________________________________________
Do you Yahoo!?
Yahoo! Tax Center - File online, calculators, forms, and more
http://tax.yahoo.com

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