Author: brett
Date: Fri Apr 18 03:40:45 2008
New Revision: 649453
URL: http://svn.apache.org/viewvc?rev=649453&view=rev
Log:
[MRM-694] display the groups in the repositories page
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/RepositoriesAction.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositories.jsp
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo?rev=649453&r1=649452&r2=649453&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo
Fri Apr 18 03:40:45 2008
@@ -161,6 +161,37 @@
</fields>
<codeSegments>
<codeSegment>
+ <version>1.2.0+</version>
+ <code><![CDATA[
+ private java.util.Map<String, java.util.List<String>>
repositoryToGroupMap;
+
+ public java.util.Map<String, java.util.List<String>>
getRepositoryToGroupMap()
+ {
+ if ( repositoryToGroupMap == null )
+ {
+ java.util.Map<String, java.util.List<String>> map = new
java.util.HashMap<String, java.util.List<String>>();
+
+ for ( RepositoryGroupConfiguration group :
(java.util.List<RepositoryGroupConfiguration>) repositoryGroups )
+ {
+ for ( String repositoryId : (java.util.List<String>)
group.getRepositories() )
+ {
+ java.util.List<String> groups = map.get( repositoryId );
+ if ( groups == null )
+ {
+ groups = new java.util.ArrayList<String>();
+ map.put( repositoryId, groups );
+ }
+ groups.add( group.getId() );
+ }
+ }
+
+ repositoryToGroupMap = map;
+ }
+ return repositoryToGroupMap;
+ }
+ ]]></code>
+ </codeSegment>
+ <codeSegment>
<version>1.0.0+</version>
<code><![CDATA[
public java.util.Map<String, NetworkProxyConfiguration>
getNetworkProxiesAsMap()
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/RepositoriesAction.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/RepositoriesAction.java?rev=649453&r1=649452&r2=649453&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/RepositoriesAction.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/RepositoriesAction.java
Fri Apr 18 03:40:45 2008
@@ -65,6 +65,8 @@
private List<RemoteRepositoryConfiguration> remoteRepositories;
private Map<String, RepositoryContentStatistics> repositoryStatistics;
+
+ private Map<String, List<String>> repositoryToGroupMap;
/**
* @plexus.requirement role-hint="jdo"
@@ -99,6 +101,7 @@
remoteRepositories = new ArrayList<RemoteRepositoryConfiguration>(
config.getRemoteRepositories() );
managedRepositories = new ArrayList<ManagedRepositoryConfiguration>(
config.getManagedRepositories() );
+ repositoryToGroupMap = config.getRepositoryToGroupMap();
Collections.sort( managedRepositories, new
RepositoryConfigurationComparator() );
Collections.sort( remoteRepositories, new
RepositoryConfigurationComparator() );
@@ -133,5 +136,10 @@
public String getBaseUrl()
{
return baseUrl;
+ }
+
+ public Map<String, List<String>> getRepositoryToGroupMap()
+ {
+ return repositoryToGroupMap;
}
}
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositories.jsp
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositories.jsp?rev=649453&r1=649452&r2=649453&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositories.jsp
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositories.jsp
Fri Apr 18 03:40:45 2008
@@ -116,10 +116,12 @@
<th>Directory</th>
<td>${repository.location}</td>
</tr>
-<tr>
- <th>Index Directory</th>
- <td>${repository.indexDir}</td>
-</tr>
+<c:if test="${!empty(repository.indexDir)}">
+ <tr>
+ <th>Index Directory</th>
+ <td>${repository.indexDir}</td>
+ </tr>
+</c:if>
<tr>
<th>WebDAV URL</th>
<td><a
href="${baseUrl}/${repository.id}/">${baseUrl}/${repository.id}/</a></td>
@@ -138,6 +140,16 @@
</c:choose>
</td>
</tr>
+<c:if test="${!empty(repositoryToGroupMap[repository.id])}">
+ <tr>
+ <th>Groups</th>
+ <td>
+ <c:forEach items="${repositoryToGroupMap[repository.id]}" varStatus="i"
var="group">
+ ${group}<c:if test="${!i.last}">,</c:if>
+ </c:forEach>
+ </td>
+ </tr>
+</c:if>
<tr>
<th>Releases Included</th>
<td class="${repository.releases ? 'donemark' : 'errormark'} booleanIcon">
</td>
