maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snic...@apache.org
Subject svn commit: r412482 - in /maven/maven-1/plugins/trunk/war: plugin.jelly xdocs/changes.xml
Date Wed, 07 Jun 2006 18:33:45 GMT
Author: snicoll
Date: Wed Jun  7 11:33:44 2006
New Revision: 412482

URL: http://svn.apache.org/viewvc?rev=412482&view=rev
Log:
MPWAR-58: Manifest file is now generated properly.

Modified:
    maven/maven-1/plugins/trunk/war/plugin.jelly
    maven/maven-1/plugins/trunk/war/xdocs/changes.xml

Modified: maven/maven-1/plugins/trunk/war/plugin.jelly
URL: http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/war/plugin.jelly?rev=412482&r1=412481&r2=412482&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/war/plugin.jelly (original)
+++ maven/maven-1/plugins/trunk/war/plugin.jelly Wed Jun  7 11:33:44 2006
@@ -121,12 +121,16 @@
           <j:set var="specificationVersion" value="${specificationVersion}.${versionItems[2]}"
/>
         </j:if>
 
-        <ant:attribute name="Specification-Title" value="${specificationTitle}"/>
-        <ant:attribute name="Specification-Vendor" value="${pom.organization.name}"/>
-        <ant:attribute name="Specification-Version" value="${specificationVersion}"/>
-        <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}"/>
+        <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="${specificationTitle}"/>
+          <ant:attribute name="Specification-Vendor" value="${pom.organization.name}"/>
+          <ant:attribute name="Specification-Version" value="${specificationVersion}"/>
+          <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}"/>
+        </ant:section>
       </ant:manifest>
 
     </ant:jar>

Modified: maven/maven-1/plugins/trunk/war/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/war/xdocs/changes.xml?rev=412482&r1=412481&r2=412482&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/war/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/war/xdocs/changes.xml Wed Jun  7 11:33:44 2006
@@ -25,7 +25,7 @@
   </properties>
   <body>
     <release version="1.6.2-SNAPSHOT" date="in SVN">
-      <action dev="snicoll" type="fix" issue="MPWAR-47">Specification and Implementation
attributes of the manifest are now defined as main attributes.</action>
+      <action dev="snicoll" type="fix" issue="MPWAR-58">Manifest file is now generated
properly.</action>
       <action dev="snicoll" type="add" issue="MPWAR-43">Aded the ability to customize
the Class-Path entry of the manifest</action>
       <action dev="snicoll" type="update" issue="MPWAR-49">Added property <code>maven.war.resources.overwrite</code>
to control is resources overwrites the ones in the generated webapp directory.</action>
       <action dev="snicoll" type="update" issue="MPWAR-37" due-to="Troy Poppe">Added
ability to expand properties when copying war resources.</action>



Mime
View raw message