From 5fe90af20482c06b321b2e8eba90ee440369cbd7 Mon Sep 17 00:00:00 2001
From: brett <brett@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sun, 4 Apr 2004 04:01:36 +0000
Subject: [PATCH] remove use of target, replace with properties

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@114979 13f79535-47bb-0310-9956-ffa450edef68
---
 jdeveloper/plugin.jelly | 13 ++++++++-----
 jdeveloper/project.xml  |  2 +-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/jdeveloper/plugin.jelly b/jdeveloper/plugin.jelly
index 4481961d..6476a4d1 100644
--- a/jdeveloper/plugin.jelly
+++ b/jdeveloper/plugin.jelly
@@ -20,6 +20,7 @@
 
 <project
   xmlns:ant="jelly:ant"
+  xmlns:maven="jelly:maven"
   xmlns:j="jelly:core" 
   xmlns:util="jelly:util">
   <!--==================================================================-->
@@ -37,6 +38,8 @@
     <!--  
       We use the JavaSourceTool to get the relative path
       -->
+    <maven:makeRelativePath path="${maven.build.dir}" var="mavenBuildDir" basedir="${basedir}" separator="/" />
+    <maven:makeRelativePath path="${maven.docs.dest}" var="mavenDocsDest" basedir="${basedir}" separator="/" />
     <j:useBean var="javaSourceTool" class="org.apache.maven.jdeveloper.JavaSourceTool"/>      
     <j:file name="${basedir}/${pom.artifactId}.jpr" prettyPrint="true" xmlns="http://xmlns.oracle.com/jdeveloper/903/jproject" encoding="Cp1252">         
       <project nselem="project" class="oracle.jdeveloper.model.JProject">
@@ -45,7 +48,7 @@
           <Item class="java.lang.String">${pom.package}</Item>      
          </defaultPackages>
          <dependencyList/>
-         <htmlRootDirectory path="target/docs/"/>       
+         <htmlRootDirectory path="${mavenDocsDest}/" />
          <j2eeWebAppName>${maven.jdeveloper.workspace}-${maven.war.final.name}</j2eeWebAppName>
          <j2eeWebContextRoot>${maven.jdeveloper.workspace}-${ear.bundle.war.context-root}</j2eeWebContextRoot>             
          <listOfChildren class="oracle.ide.model.DataList">
@@ -181,7 +184,7 @@
                          <heapSize>32</heapSize>
                          <miscOptions class="java.lang.String"/>
                          <oneOneFormat>false</oneOneFormat>
-                         <outputDirectory path="target/docs/jdeveloper-javadoc/"/>
+                         <outputDirectory path="${mavenDocsDest}/jdeveloper-javadoc/"/>
                          <scope>-protected</scope>
                        </Value>
                     </Item>
@@ -229,7 +232,7 @@
                         <additionalClassPath>
                            <entries class="[Ljava.net.URL;"/>
                         </additionalClassPath>
-                        <outputDirectory path="target/jdeveloper-classes/"/>
+                        <outputDirectory path="${mavenBuildDir}/jdeveloper-classes/"/>
                       </Value>
                     </Item>
                     <Item>
@@ -356,8 +359,8 @@
               <j:if test="${pom.build.integrationUnitTestSourceDirectory}!= ''">
                 <Item path="${pom.build.integrationUnitTestSourceDirectory}"/>
               </j:if>
-              <Item path="target/xdoclet/ejbdoclet"/>
-              <Item path="target/xdoclet/jmxdoclet"/>
+              <Item path="${mavenBuildDir}/xdoclet/ejbdoclet"/>
+              <Item path="${mavenBuildDir}/xdoclet/jmxdoclet"/>
             </entries>     
           </projectSourcePath>
           <properties class="java.util.HashMap">
diff --git a/jdeveloper/project.xml b/jdeveloper/project.xml
index 1b643b52..b77cbb68 100644
--- a/jdeveloper/project.xml
+++ b/jdeveloper/project.xml
@@ -23,7 +23,7 @@
   <pomVersion>3</pomVersion>
   <id>maven-jdeveloper-plugin</id>
   <name>Maven JDeveloper Plug-in</name>
-  <currentVersion>1.3</currentVersion>
+  <currentVersion>1.4-SNAPSHOT</currentVersion>
   <inceptionYear>2002</inceptionYear>
   <description>A plugin to generate various files for Oracle's JDeveloper IDE and ease the use of Maven within that environment</description>
   <shortDescription>JDeveloper Plugin for Maven</shortDescription>