Hi Konstantin,
[This mail is send CC:Maven-user-mailing-list, since it's probably of
intertest for some maven+xdoclet users]
tried to register to xdoclet JIRA but it seems to be broken - the
important buttons link me to the global "OpenSymphony" instead of
"XDoclet"... so I was unable to create a issue.
So please excuse that I send the following patch personally to you:
Project: XDoclet
Prio: Minor
Components : XDoclet-Maven-Plugin
Version: occurred in 1.2b2, probably in all
Env: linux+jdk1.4.0+maven1.0-b9 and w2k+jdk1.4.1+maven1.0b9
1)
Type: Bug
Desc: plugin.jelly uses ${maven.xdoclet.ejbdoclet.destDir} internally
but does not add it to the maven path, instead the hard-coded dir
${maven.build.dir}/xdoclet/ejbdoclet" is used (line 8615)
2)
Type: Enhancement
Desc: plugin.jelly does not check for properties
maven.xdoclet.ejbdoclet.fileset.${fileset_index}.dir
I have added a seuqence that defaults to ${pom.build.sourceDirectory}
but uses above property if set (line 6127ff)
Attached is a diff -u -w of the modified plugin.jelly from
maven-xdoclet-plugin-1.2b2.jar - together for both changes.
Thanks a lot for patching/committing. If you need more info, feel free
to mail me.
Feel free to add me to the xdoclet contributor list if you like.
cu
--
Martin Skopp
Riege Software International GmbH
Support: mailto:[EMAIL PROTECTED], Information: http://www.riege.com
This email is intended to be viewed with a nonproportional font.
Public Key on http://www.keyserver.net, Key-ID: 3D4027B5
Fingerprint: 1970 C78D 9A1D 99FA 5CE4 5C0D 29E6 6A95 3D40 27B5
--- plugin.orig 2003-06-13 09:02:17.000000000 +0200
+++ plugin.jelly 2003-06-13 09:08:05.000000000 +0200
@@ -6127,7 +6127,12 @@
<j:forEach begin="0" end="10" indexVar="fileset_index">
<j:set var="fileset_index_var_name"
value="maven.xdoclet.ejbdoclet.fileset.${fileset_index}"/>
<j:if test="${context.getVariable(fileset_index_var_name) != null}">
- <fileset dir="${pom.build.sourceDirectory}">
+ <j:set var="fileset_dir_var_name"
value="maven.xdoclet.ejbdoclet.fileset.${fileset_index}.dir"/>
+ <j:set var="fileset_source_dir"
value="${context.getVariable(fileset_dir_var_name)}"/>
+ <j:if test="${fileset_source_dir == null}">
+ <j:set var="fileset_source_dir"
value="${pom.build.sourceDirectory}"/>
+ </j:if>
+ <fileset dir="${fileset_source_dir}">
<j:set var="fileset_index_include_var_name"
value="maven.xdoclet.ejbdoclet.fileset.${fileset_index}.include"/>
<j:set var="fileset_index_exclude_var_name"
value="maven.xdoclet.ejbdoclet.fileset.${fileset_index}.exclude"/>
<j:if
test="${context.getVariable(fileset_index_include_var_name) != null}">
@@ -8615,7 +8620,7 @@
destination folder to the compile path. This way, people don't have to deal
with maven:addPath in their own
maven.xml scripts. This has been tested with Maven from CVS HEAD on
2002.12.15. (AH)
-->
- <path id="ejbdoclet.java.compile.src.set"
location="${maven.build.dir}/xdoclet/ejbdoclet"/>
+ <path id="ejbdoclet.java.compile.src.set"
location="${maven.xdoclet.ejbdoclet.destDir}"/>
<maven:addPath id="maven.compile.src.set"
refid="ejbdoclet.java.compile.src.set"/>
</goal>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
