Bommels05/maven-plugins
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix MAVEN-781.

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@113959 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
evenisse
2003-09-05 08:53:03 +00:00
parent 0a57a7ea1c
commit e98a40afd7
2 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
jbuilder/plugin.jelly
View File

@@ -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>

3
jbuilder/xdocs/changes.xml
View File

@@ -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>