From de167c3e10e4aaf53925609c5f50f73fb084b9da Mon Sep 17 00:00:00 2001
From: Emmanuel Venisse <evenisse@apache.org>
Date: Thu, 10 Mar 2005 09:36:44 +0000
Subject: [PATCH] Add Package in manifest from plugin configuration.

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163515 13f79535-47bb-0310-9956-ffa450edef68
---
 .../org/apache/maven/archiver/MavenArchiver.java    | 13 +++++++++----
 .../java/org/apache/maven/plugin/jar/JarMojo.java   |  9 ++++++++-
 .../java/org/apache/maven/plugin/war/WarMojo.java   |  6 ++++++
 3 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/maven-archiver/src/main/java/org/apache/maven/archiver/MavenArchiver.java b/maven-archiver/src/main/java/org/apache/maven/archiver/MavenArchiver.java
index 2837664932..2616b1d2ce 100644
--- a/maven-archiver/src/main/java/org/apache/maven/archiver/MavenArchiver.java
+++ b/maven-archiver/src/main/java/org/apache/maven/archiver/MavenArchiver.java
@@ -51,6 +51,8 @@ public Manifest getManifest( PluginExecutionRequest request )
 
         String mainClass = (String) request.getParameter( "mainClass" );
 
+        String packageName = (String) request.getParameter( "package" );
+
         boolean addClasspath = new Boolean( (String) request.getParameter( "addClasspath" ) ).booleanValue();
 
         boolean addExtensions = new Boolean( (String) request.getParameter( "addExtensions" ) ).booleanValue();
@@ -61,10 +63,13 @@ public Manifest getManifest( PluginExecutionRequest request )
         m.addConfiguredAttribute( buildAttr );
         Manifest.Attribute createdAttr = new Manifest.Attribute( "Created-By", "Apache Maven" );
         m.addConfiguredAttribute( createdAttr );
-/* TODO: need to add jar plugin config
-        Manifest.Attribute packageAttr = new Manifest.Attribute( "Package", project.getPackage() );
-        m.addConfiguredAttribute( packageAttr );
-*/
+
+        if ( packageName != null )
+        {
+            Manifest.Attribute packageAttr = new Manifest.Attribute( "Package", packageName );
+            m.addConfiguredAttribute( packageAttr );
+        }
+
         Manifest.Attribute buildJdkAttr = new Manifest.Attribute( "Build-Jdk", System.getProperty( "java.version" ) );
         m.addConfiguredAttribute( buildJdkAttr );
 
diff --git a/maven-plugins/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/JarMojo.java b/maven-plugins/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/JarMojo.java
index 4547946054..fd63a721cf 100644
--- a/maven-plugins/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/JarMojo.java
+++ b/maven-plugins/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/JarMojo.java
@@ -17,6 +17,7 @@
  */
 
 import org.apache.maven.archiver.MavenArchiver;
+import org.apache.maven.plugin.AbstractPlugin;
 import org.apache.maven.plugin.PluginExecutionRequest;
 import org.apache.maven.plugin.PluginExecutionResponse;
 
@@ -48,6 +49,12 @@
  * expression="#maven.jar.index"
  * default="false"
  * description=""
+ * @parameter name="package"
+ * type="String"
+ * required="false"
+ * validator=""
+ * expression="#maven.jar.package"
+ * description=""
  * @parameter name="manifest"
  * type="String"
  * required="false"
@@ -94,7 +101,7 @@
  * description="current MavenProject instance"
  */
 public class JarMojo
-    extends AbstractJarMojo
+    extends AbstractPlugin
 {
     /**
      * @todo Add license files in META-INF directory.
diff --git a/maven-plugins/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarMojo.java b/maven-plugins/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarMojo.java
index be525f2003..5be347573c 100644
--- a/maven-plugins/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarMojo.java
+++ b/maven-plugins/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarMojo.java
@@ -56,6 +56,12 @@
  * expression="#maven.jar.index"
  * default="false"
  * description=""
+ * @parameter name="package"
+ * type="String"
+ * required="false"
+ * validator=""
+ * expression="#maven.jar.package"
+ * description=""
  * @parameter name="manifest"
  * type="String"
  * required="false"