brett 2004/04/03 20:01:36
Modified: jdeveloper plugin.jelly project.xml
Log:
remove use of target, replace with properties
Revision Changes Path
1.8 +8 -5 maven-plugins/jdeveloper/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven-plugins/jdeveloper/plugin.jelly,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- plugin.jelly 4 Mar 2004 18:36:12 -0000 1.7
+++ plugin.jelly 4 Apr 2004 04:01:36 -0000 1.8
@@ -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">
1.27 +1 -1 maven-plugins/jdeveloper/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven-plugins/jdeveloper/project.xml,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- project.xml 10 Mar 2004 14:08:52 -0000 1.26
+++ project.xml 4 Apr 2004 04:01:36 -0000 1.27
@@ -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>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]