From 788ca006a6fe03d89bcfda63afb8d721a8c64705 Mon Sep 17 00:00:00 2001
From: dion <dion@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 10 Feb 2003 03:55:59 +0000
Subject: [PATCH] Use license file from license plugin rather than hardcoding

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@112872 13f79535-47bb-0310-9956-ffa450edef68
---
 ejb/plugin.jelly  | 7 +++++--
 j2ee/plugin.jelly | 6 ++++--
 war/plugin.jelly  | 8 +++++---
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/ejb/plugin.jelly b/ejb/plugin.jelly
index db2f7a0a..bb6709f3 100644
--- a/ejb/plugin.jelly
+++ b/ejb/plugin.jelly
@@ -55,9 +55,12 @@
         <setProperty name="manifest" value="${maven.ejb.manifest}" />
       </j:if>
 
-      <metainf dir="${basedir}">
-        <include name="LICENSE.txt"/>
+      <j:set var="licenseFileName"><license:fileName/></j:set>
+      <util:file name="${licenseFileName}" var="licenseFile"/>
+      <metainf dir="${licenseFile.canonicalFile.parent}">
+        <include name="${licenseFile.canonicalFile.name}"/>
       </metainf>
+
       <manifest>
         <attribute name="Built-By" value="${user.name}"/>
         <attribute name="Created-By" value="Apache Jakarta Maven"/>
diff --git a/j2ee/plugin.jelly b/j2ee/plugin.jelly
index 266a0d15..97eef1ab 100644
--- a/j2ee/plugin.jelly
+++ b/j2ee/plugin.jelly
@@ -61,8 +61,10 @@
       </j:forEach>
 
       <!-- include license -->
-      <metainf dir="${basedir}">
-        <include name="LICENSE.txt"/>
+      <j:set var="licenseFileName"><license:fileName/></j:set>
+      <util:file name="${licenseFileName}" var="licenseFile"/>
+      <metainf dir="${licenseFile.canonicalFile.parent}">
+        <include name="${licenseFile.canonicalFile.name}"/>
       </metainf>
 
       <!-- standard manifest entries -->
diff --git a/war/plugin.jelly b/war/plugin.jelly
index 0b513637..96a20ac3 100644
--- a/war/plugin.jelly
+++ b/war/plugin.jelly
@@ -58,9 +58,11 @@
         </classes>
       </j:if>
 
-      <metainf dir="${basedir}">
-        <include name="LICENSE.txt"/>
-      </metainf>      
+      <j:set var="licenseFileName"><license:fileName/></j:set>
+      <util:file name="${licenseFileName}" var="licenseFile"/>
+      <metainf dir="${licenseFile.canonicalFile.parent}">
+        <include name="${licenseFile.canonicalFile.name}"/>
+      </metainf>
 
       <manifest>
         <attribute name="Built-By" value="${user.name}" />