evenisse 2003/09/05 01:53:03
Modified: src/plugins-build/jbuilder plugin.jelly
src/plugins-build/jbuilder/xdocs changes.xml
Log:
Fix MAVEN-781.
Revision Changes Path
1.15 +12 -11 maven/src/plugins-build/jbuilder/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/jbuilder/plugin.jelly,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- plugin.jelly 22 Aug 2003 09:08:09 -0000 1.14
+++ plugin.jelly 5 Sep 2003 08:53:03 -0000 1.15
@@ -23,15 +23,15 @@
<!-- The following parameters can be used with the getDefaultProject -->
<!-- tag by setting the appropriate attribute when invoking the tag: -->
<!-- -->
- <!-- @param project The name of the variable that will contain the -->
- <!-- JBuilder default project. -->
- <!-- @param userHome The name of the variable that will contain the -->
- <!-- JBuilder user home directory. -->
+ <!-- @param project The name of the variable in the caller's context -->
+ <!-- that will contain the JBuilder default project. -->
+ <!-- @param userHome The name of the variable in the caller's context -->
+ <!-- that will contain the JBuilder user home directory.-->
<!-- ================================================================== -->
<def:tag name="getDefaultProject">
<j:set var="jbuilderDirs"
value=".jbuilder9,.jbuilder8,.jbuilder7,.jbuilder6,.jbuilder5,.jbuilder4,.jbuilder" />
- <j:expr value="${context.setVariable(userHome, null)}" />
- <j:expr value="${context.setVariable(project, null)}" />
+ <j:set var="${userHome}" value="null" scope="parent"/>
+ <j:set var="${project}" value="null" scope="parent"/>
<u:tokenize var="jbuilderDirList" delim=",">${jbuilderDirs}</u:tokenize>
<j:forEach var="dir" items="${jbuilderDirList}">
<j:set var="home" value="${maven.jbuilder.userHome}/${dir}" />
@@ -65,10 +65,11 @@
<!-- -->
<!-- @param artifact The artifact. -->
<!-- @param userHome The JBuilder user home directory. -->
- <!-- @param libraryList Optional name of the variable that contains a -->
- <!-- a semi-colon separated list of library names. -->
- <!-- If the variable is supplied, then the name of -->
- <!-- the generated library will be appended. -->
+ <!-- @param libraryList Optional name of a variable in the caller's -->
+ <!-- context that contains a semi-colon separated -->
+ <!-- list of library names. If the variable is -->
+ <!-- supplied, then the name of the generated -->
+ <!-- library will be appended. -->
<!-- @param verbose Optional flag to enable verbose output. -->
<!-- ================================================================== -->
<def:tag name="generateArtifactLibrary">
@@ -169,7 +170,7 @@
<j:set var="libs" value="${libs};" />
</j:if>
<j:set var="libs" value="${libs}${libraryName}" />
- <j:expr value="${context.setVariable(libraryList,libs)}" />
+ <j:set var="${libraryList}" value="${libs}" scope="parent" />
</j:if>
</def:tag>
1.6 +3 -0 maven/src/plugins-build/jbuilder/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/jbuilder/xdocs/changes.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- changes.xml 22 Aug 2003 09:08:09 -0000 1.5
+++ changes.xml 5 Sep 2003 08:53:03 -0000 1.6
@@ -7,6 +7,9 @@
<body>
<release version="1.3" date="In CVS">
+ <action dev="evenisse" type="fix" due-to="David Zeleznik">
+ Fix MAVEN-781.
+ </action>
<action dev="evenisse" type="add">
Fix MAVEN-668.
</action>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
