brett 2004/04/03 19:38:03
Modified: jdee plugin.jelly project.xml
Log:
remove use of target, replace with maven.build.dir
Revision Changes Path
1.7 +7 -4 maven-plugins/jdee/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven-plugins/jdee/plugin.jelly,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- plugin.jelly 4 Mar 2004 18:36:01 -0000 1.6
+++ plugin.jelly 4 Apr 2004 03:38:03 -0000 1.7
@@ -51,11 +51,14 @@
(quote (jde-sourcepath (quote ("./${srcDir}"))))
<j:whitespace />
</j:if>
- (quote (jde-compile-option-directory "./target/classes"))
- (quote (jde-javadoc-gen-destination-directory "./target/docs/apidocs"))
+<maven:makeRelativePath path="${maven.build.dest}" var="mavenBuildDest"
separator="/" basedir="${basedir}" />
+<maven:makeRelativePath path="${maven.build.dir}" var="mavenBuildDir" separator="/"
basedir="${basedir}" />
+<maven:makeRelativePath path="${maven.docs.dest}" var="mavenDocsDest" separator="/"
basedir="${basedir}" />
+ (quote (jde-compile-option-directory "./${mavenBuildDest}"))
+ (quote (jde-javadoc-gen-destination-directory "./${mavenDocsDest}/apidocs"))
(quote (jde-project-file-name "${projectFile}"))
(quote (jde-javadoc-gen-window-title "${pom.name} - ${pom.organization}
(${pom.inceptionYear})"))
- (quote (jde-import-excluded-packages (quote ("target.*"))))
+ (quote (jde-import-excluded-packages (quote ("${mavenBuildDir}.*"))))
<j:set var="mainClass"
value="${context.getVariable('maven.jdee.application.class')}" />
@@ -63,7 +66,7 @@
(quote (jde-run-application-class "${mainClass}"))
<j:whitespace> </j:whitespace>
</j:if>
-(quote (jde-global-classpath (quote ("./target/classes"
+(quote (jde-global-classpath (quote ("./${mavenBuildDest}"
<j:if test="${unitTestSourcesPresent}">
<maven:makeRelativePath var="srcDir" basedir="${basedir}"
path="${pom.build.unitTestSourceDirectory}" />
"./${srcDir}" <j:whitespace />
1.11 +1 -1 maven-plugins/jdee/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven-plugins/jdee/project.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- project.xml 10 Mar 2004 12:03:50 -0000 1.10
+++ project.xml 4 Apr 2004 03:38:03 -0000 1.11
@@ -23,7 +23,7 @@
<pomVersion>3</pomVersion>
<id>maven-jdee-plugin</id>
<name>Maven JDEE Plug-in</name>
- <currentVersion>1.0</currentVersion>
+ <currentVersion>1.1-SNAPSHOT</currentVersion>
<description>A plugin to create a project file to be used within the
<!--
<a href="http://jdee.sunsite.dk/";>Java Developement Enviroment for Emacw</a>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
