Author: oching
Date: Tue May 29 03:12:01 2007
New Revision: 542475
URL: http://svn.apache.org/viewvc?view=rev&rev=542475
Log:
MRM-378 Applied patch submitted by Philip Dodds. Added mailing lists and
dependecies in ShowArtifactAction. Also updated the field names used in the
<c:if> conditions in mailingLists.jspf, and added the classifer in the
showArtifactLink tag in artifactDependencies.jspf.
Modified:
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/ShowArtifactAction.java
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/artifactDependencies.jspf
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/mailingLists.jspf
Modified:
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/ShowArtifactAction.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/ShowArtifactAction.java?view=diff&rev=542475&r1=542474&r2=542475
==============================================================================
---
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/ShowArtifactAction.java
(original)
+++
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/ShowArtifactAction.java
Tue May 29 03:12:01 2007
@@ -26,10 +26,12 @@
import org.apache.maven.archiva.database.ObjectNotFoundException;
import org.apache.maven.archiva.database.browsing.RepositoryBrowsing;
import org.apache.maven.archiva.model.ArchivaProjectModel;
+import org.apache.maven.archiva.model.ProjectRepository;
import org.codehaus.plexus.xwork.action.PlexusActionSupport;
import java.util.Collections;
import java.util.List;
+import java.util.Iterator;
/**
* Browse the repository.
@@ -73,6 +75,10 @@
*/
private List reports;
+ private List mailingLists;
+
+ private List dependencies;
+
/**
* Show the versioned project information tab.
*
@@ -96,7 +102,8 @@
// TODO: should this be the whole set of artifacts, and be more like
the maven dependencies report?
// this.dependencies = VersionMerger.wrap(
project.getModel().getDependencies() );
-
+ this.dependencies = model.getDependencies();
+
return SUCCESS;
}
@@ -107,7 +114,8 @@
throws ObjectNotFoundException, ArchivaDatabaseException
{
this.model = repoBrowsing.selectVersion( groupId, artifactId, version
);
-
+ this.mailingLists = model.getMailingLists();
+
return SUCCESS;
}
@@ -205,5 +213,15 @@
public List getReports()
{
return reports;
+ }
+
+ public List getMailingLists()
+ {
+ return mailingLists;
+ }
+
+ public List getDependencies()
+ {
+ return dependencies;
}
}
Modified:
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/artifactDependencies.jspf
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/artifactDependencies.jspf?view=diff&rev=542475&r1=542474&r2=542475
==============================================================================
---
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/artifactDependencies.jspf
(original)
+++
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/artifactDependencies.jspf
Tue May 29 03:12:01 2007
@@ -31,7 +31,7 @@
<p>
<my:showArtifactLink groupId="${dependency.groupId}"
artifactId="${dependency.artifactId}"
- version="${dependency.version}"
versions="${dependency.versions}" scope="${dependency.scope}"
+ version="${dependency.version}"
scope="${dependency.scope}"
classifier="${dependency.classifier}"/>
</p>
</c:forEach>
Modified:
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/mailingLists.jspf
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/mailingLists.jspf?view=diff&rev=542475&r1=542474&r2=542475
==============================================================================
---
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/mailingLists.jspf
(original)
+++
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/mailingLists.jspf
Tue May 29 03:12:01 2007
@@ -31,22 +31,22 @@
</p>
--%>
<ul>
- <c:if test="${!empty(mailingList.subscribe)}">
+ <c:if test="${!empty(mailingList.subscribeAddress)}">
<li>
<b>Subscribe:</b>
- <a href="mailto:${mailingList.subscribe}";>${mailingList.subscribe}</a>
+ <a
href="mailto:${mailingList.subscribeAddress}";>${mailingList.subscribeAddress}</a>
</li>
</c:if>
- <c:if test="${!empty(mailingList.post)}">
+ <c:if test="${!empty(mailingList.postAddress)}">
<li>
<b>Post:</b>
- <a href="mailto:${mailingList.post}";>${mailingList.post}</a>
+ <a
href="mailto:${mailingList.postAddress}";>${mailingList.postAddress}</a>
</li>
</c:if>
- <c:if test="${!empty(mailingList.unsubscribe)}">
+ <c:if test="${!empty(mailingList.unsubscribeAddress)}">
<li>
<b>Unsubscribe:</b>
- <a
href="mailto:${mailingList.unsubscribe}";>${mailingList.unsubscribe}</a>
+ <a
href="mailto:${mailingList.unsubscribeAddress}";>${mailingList.unsubscribeAddress}</a>
</li>
</c:if>
<%-- TODO: not in the POM yet
@@ -55,17 +55,17 @@
<a href="mailto:${mailingList.owner}";>${mailingList.owner}</a>
</li>
--%>
- <c:if test="${!empty(mailingList.archive)}">
+ <c:if test="${!empty(mailingList.mainArchiveUrl)}">
<li>
<b>Archive:</b>
<ul>
<li>
- <a href="${mailingList.archive}">${mailingList.archive}</a>
+ <a
href="${mailingList.mainArchiveUrl}">${mailingList.mainArchiveUrl}</a>
</li>
</ul>
</li>
</c:if>
- <c:if test="${!empty(mailingList.otherArchives)}">
+ <%-- <c:if test="${!empty(mailingList.otherArchives)}">
<li>
<b>Other Archives:</b>
<ul>
@@ -76,7 +76,7 @@
</c:forEach>
</ul>
</li>
- </c:if>
+ </c:if> --%>
</ul>
</c:forEach>
<c:if test="${empty(mailingLists)}">
