Index: plugin.jelly
===================================================================
RCS file: /home/cvspublic/maven-plugins/jar/plugin.jelly,v
retrieving revision 1.43
diff -u -r1.43 plugin.jelly
--- plugin.jelly	11 Sep 2004 01:16:36 -0000	1.43
+++ plugin.jelly	5 Oct 2004 17:22:52 -0000
@@ -57,12 +57,6 @@
     <ant:available property="maven.jar.manifest.available" 
       file="${maven.jar.manifest}"/>
 
-    <j:set var="specificationTitle" value="${pom.shortDescription.trim()}"/>
-    <j:if test="${specificationTitle.length() gt 49}">
-      <ant:echo>Warning: shortDescription is greater than 49 characters - trimming for specification title.</ant:echo>
-      <j:set var="specificationTitle" value="${specificationTitle.substring(0,46)}..."/>
-    </j:if>
-
     <!-- 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
@@ -87,9 +81,14 @@
       </ant:metainf>
       <ant:manifest>
         <ant:attribute name="Built-By" value="${user.name}"/>
-        <ant:attribute name="Created-By" value="Apache Maven"/>
-        <ant:attribute name="Package" value="${pom.package}"/>
-        <ant:attribute name="Build-Jdk" value="${java.version}"/>
+
+        <!-- getStatic tag doesn't work in Maven 1.0 -->
+        <j:getStatic var="mavenVersion" className="org.apache.maven.MavenSession" field="APP_VERSION"/>
+        <j:if test="${mavenVersion == null}">
+          <j:set var="mavenVersion" value="1.0"/>
+        </j:if>
+
+        <ant:attribute name="Maven-Version" value="${mavenVersion}"/>
 
         <j:set var="jarClasspath" value="${maven.jar.manifest.classpath.add}"/>
         <j:if test="${jarClasspath}">
@@ -98,20 +97,11 @@
                     <j:set var="maven.jar.classpath" value="${maven.jar.classpath} ${dep.artifact}" /> 
                 </j:if>
             </j:forEach>
-            <j:if test="${maven.jar.classpath.length() != 0}">
+            <j:if test="${!empty(maven.jar.classpath)}">
                 <ant:attribute name="Class-Path" value="${maven.jar.classpath}"/>
             </j:if>
         </j:if>
-        <!-- added supplementary entries -->
-        <ant:attribute name="Extension-Name" value="${pom.artifactId}"/>
-        <ant:attribute name="Specification-Title" value="${specificationTitle}" />
-        <ant:attribute name="Specification-Vendor" value="${pom.organization.name}"/>
-        <!--
-        <ant:attribute name="Specification-Version" value="${pom.currentVersion}"/>
-        -->
-        <ant:attribute name="Implementation-Title" value="${pom.package}"/>
-        <ant:attribute name="Implementation-Vendor" value="${pom.organization.name}"/>
-        <ant:attribute name="Implementation-Version" value="${pom.currentVersion}"/>
+
         <j:set var="mainclass" value="${maven.jar.mainclass}" />
         <j:if test="${!empty(mainclass)}">
             <ant:attribute name="Main-Class" value="${mainclass}"/>
@@ -150,14 +140,24 @@
           </j:forEach>        
         </j:if>
 
-        <j:if test="${context.getVariable('maven.jar.manifest.attributes.list') != null}">
+        <util:replace var="packagePath" oldChar="." newChar="/" value="${pom.package}"/>
+        <ant:section name="${packagePath}/">
+          <ant:attribute name="Extension-name" value="${pom.package}"/>
+          <ant:attribute name="Specification-Title" value="${pom.name}"/>
+          <ant:attribute name="Specification-Vendor" value="${pom.organization.name}"/>
+          <ant:attribute name="Specification-Version" value="${pom.currentVersion}"/>
+          <ant:attribute name="Implementation-Title" value="${pom.package}"/>
+          <ant:attribute name="Implementation-Vendor" value="${pom.organization.name}"/>
+          <ant:attribute name="Implementation-Version" value="${pom.currentVersion}"/>
+          <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: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>
+        </ant:section>
 
         <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>