evenisse 2003/09/04 03:12:36
Modified: src/plugins-build/file-activity/src/plugin-resources
maven-file-activity-plugin.jsl
src/plugins-build/file-activity/xdocs changes.xml
Log:
Fix url generation when pom.repository.url isn't empty.
Revision Changes Path
1.3 +15 -2
maven/src/plugins-build/file-activity/src/plugin-resources/maven-file-activity-plugin.jsl
Index: maven-file-activity-plugin.jsl
===================================================================
RCS file:
/home/cvs/maven/src/plugins-build/file-activity/src/plugin-resources/maven-file-activity-plugin.jsl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- maven-file-activity-plugin.jsl 30 Jul 2003 00:50:37 -0000 1.2
+++ maven-file-activity-plugin.jsl 4 Sep 2003 10:12:36 -0000 1.3
@@ -35,8 +35,21 @@
<tr>
<td>
<j:choose>
- <j:when test="${pom.repository.url != ''})">
- <a
href="${pom.repository.url.toString().trim()}${name}">${name}</a>
+ <j:when test="${pom.repository.url != ''}">
+ <j:set var="repositoryUrl" value="${pom.repository.url}"/>
+ <j:choose>
+ <j:when test="${repositoryUrl.indexOf('?')>0}">
+ <j:set var="repository"
value="${repositoryUrl.substring(0, repositoryUrl.indexOf('?'))}"/>
+ <j:set var="tmpMultiRepoParam"
value="${repositoryUrl.substring(repository.length())}"/>
+ <j:set var="oneRepoParam"
value="?${tmpMultiRepoParam.substring(1)}"/>
+ </j:when>
+ <j:otherwise>
+ <j:set var="repository" value="${repositoryUrl}"/>
+ <j:set var="oneRepoParam" value=""/>
+ </j:otherwise>
+ </j:choose>
+ <j:set var="urlFile"
value="${repository.trim()}${name.trim()}${oneRepoParam.trim()}"/>
+ <a href="${urlFile}">${name}</a>
</j:when>
<j:otherwise>
${name}
1.3 +3 -0 maven/src/plugins-build/file-activity/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/file-activity/xdocs/changes.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- changes.xml 8 Jul 2003 11:01:07 -0000 1.2
+++ changes.xml 4 Sep 2003 10:12:36 -0000 1.3
@@ -8,6 +8,9 @@
<body>
<release version="1.3" date="in CVS">
<action dev="evenisse" type="fix">
+ Fix url generation when pom.repository.url isn't empty.
+ </action>
+ <action dev="evenisse" type="fix">
Add xml declaration to generated report. Fixed for character encoding.
</action>
<action dev="evenisse" type="fix">
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
