From 99eda401524cf0146812d3730dbfefa52dbe50e6 Mon Sep 17 00:00:00 2001
From: evenisse <evenisse@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sat, 28 Feb 2004 14:23:22 +0000
Subject: [PATCH] MPJBUILDER-8. Generate relative path for OutPath,
 DefaultPath, DocPath, SourcePath, and TestPath tag in jbuilder project.

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@114763 13f79535-47bb-0310-9956-ffa450edef68
---
 jbuilder/plugin.jelly      | 27 ++++++++++++++++-----------
 jbuilder/xdocs/changes.xml |  7 +++++--
 2 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/jbuilder/plugin.jelly b/jbuilder/plugin.jelly
index 561aeac1..bff5f226 100644
--- a/jbuilder/plugin.jelly
+++ b/jbuilder/plugin.jelly
@@ -5,7 +5,7 @@
   xmlns:ant="jelly:ant"
   xmlns:u="jelly:util"
   xmlns:def="jelly:define"
-  xmlns:m="jelly:maven"
+  xmlns:maven="jelly:maven"
   xmlns:x="jelly:xml"
   xmlns:jbuilder="jbuilder" >
 
@@ -235,12 +235,14 @@
     <j:set var="companyLabel"     value="Company: " />
     <j:set var="copyrightLabel"   value="Copyright: " />
     <j:set var="descriptionLabel" value="Description: " />
-    <j:set var="docPath"          value="${pom.getPluginContext('maven-javadoc-plugin').getVariable('maven.javadoc.destdir')}" />
+    <maven:makeRelativePath var="relativeDocPath" basedir="${basedir}" path="${pom.getPluginContext('maven-javadoc-plugin').getVariable('maven.javadoc.destdir')}" />
+    <j:set var="docPath"          value="${relativeDocPath}" />
     <j:set var="docX" value="${maven.jbuilder.docpath}X" />
     <j:if test="${docX != 'X'}" >
       <j:set var="docPath" value="${maven.jbuilder.docpath}" />
     </j:if>
-    <j:set var="outPath"          value="${maven.jbuilder.outpath}" />
+    <maven:makeRelativePath var="relativeOutPath" basedir="${basedir}" path="${maven.jbuilder.outpath}" />
+    <j:set var="outPath"          value="${relativeOutPath}" />
     <j:set var="jdk"              value="java version ${java.vm.version}" />
     <j:set var="titleLabel"       value="Title: " />
     <j:set var="versionLabel"     value="@version" />
@@ -305,13 +307,15 @@
     <!-- Process the project's dependencies, build the project source path, and
          build the list of libraries it requires. -->
     <j:set var="includeTestPath" value="0" />
-    <j:set var="sourcePath" value="${pom.build.sourceDirectory}" />
+    <maven:makeRelativePath var="relativeSourcePath" basedir="${basedir}" path="${pom.build.sourceDirectory}" />
+    <maven:makeRelativePath var="relativeTestPath" basedir="${basedir}" path="${pom.build.unitTestSourceDirectory}" />
+    <j:set var="sourcePath" value="${relativeSourcePath}" />
     <j:set var="libraries" value="" />
     <!-- If the project has unit tests, add the test source code to the project
          path. -->
     <j:if test="${unitTestSourcesPresent}" >
       <j:set var="includeTestPath" value="1" />
-      <j:set var="sourcePath" value="${sourcePath};${pom.build.unitTestSourceDirectory}" />
+      <j:set var="sourcePath" value="${sourcePath};${relativeTestPath}" />
     </j:if>
     <!-- If the project has resources, add the directories to the project path. -->
     <j:if test="${!pom.build.resources.isEmpty()}">
@@ -397,7 +401,8 @@
     	  <property category="sys" name="CompanyLabel"     value="${companyLabel}" />
         <property category="sys" name="Copyright"        value="${copyright}" />
         <property category="sys" name="CopyrightLabel"   value="${copyrightLabel}" />
-        <property category="sys" name="DefaultPath"      value="${pom.build.sourceDirectory}" />
+        <maven:makeRelativePath var="relativeDefaultPath" basedir="${basedir}" path="${pom.build.sourceDirectory}" />
+        <property category="sys" name="DefaultPath"      value="${relativeDefaultPath}" />
         <property category="sys" name="Description"      value="${pom.description}" />
         <property category="sys" name="DescriptionLabel" value="${descriptionLabel}" />
         <property category="sys" name="DocPath"          value="${docPath}" />
@@ -405,13 +410,13 @@
         <property category="sys" name="JDK"              value="${jdk}" />
         <property category="sys" name="Libraries"        value="${libraries}" />
         <property category="sys" name="OutPath"          value="${outPath}" />
-    	  <property category="sys" name="SourcePath"       value="${sourcePath}" />
-    	  <property category="sys" name="TestPath"         value="${pom.build.unitTestSourceDirectory}" />
+    	<property category="sys" name="SourcePath"       value="${sourcePath}" />
+        <property category="sys" name="TestPath"         value="${relativeTestPath}" />
         <property category="sys" name="Title"            value="${pom.name}" />
         <property category="sys" name="TitleLabel"       value="${titleLabel}" />
-    	  <property category="sys" name="Version"          value="${pom.currentVersion}" />
-    	  <property category="sys" name="VersionLabel"     value="${versionLabel}" />
-    	  <property category="sys" name="WorkingDirectory" value="${workingDir}" />
+        <property category="sys" name="Version"          value="${pom.currentVersion}" />
+        <property category="sys" name="VersionLabel"     value="${versionLabel}" />
+        <property category="sys" name="WorkingDirectory" value="${workingDir}" />
 
         <!-- Include any explicitly specified source files -->
         <u:tokenize var="sourceFileList" delim=",">${maven.jbuilder.additionalSources}</u:tokenize>
diff --git a/jbuilder/xdocs/changes.xml b/jbuilder/xdocs/changes.xml
index 3e86a5ef..83c3ab61 100644
--- a/jbuilder/xdocs/changes.xml
+++ b/jbuilder/xdocs/changes.xml
@@ -7,11 +7,14 @@
 
   <body>
     <release version="1.4" date="in CVS">
+      <action dev="evenisse" type="fix" issue="MPJBUILDER-8">
+          Generate relative path for OutPath, DefaultPath, DocPath, SourcePath, and TestPath tag in jbuilder project.
+      </action>
       <action dev="dion" type="fix">
         Apply MAVEN-987
       </action>
-      <action dev="evenisse" type="add">
-          MPJBUILDER-7. Add support to JBuilderX.
+      <action dev="evenisse" type="add" issue="MPJBUILDER-7">
+          Add support to JBuilderX.
       </action>
     </release>