You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by br...@apache.org on 2006/08/13 05:01:52 UTC
svn commit: r431138 - in /maven/repository-manager/trunk:
maven-repository-configuration/src/main/mdo/
maven-repository-webapp/src/main/webapp/WEB-INF/jsp/admin/
maven-repository-webapp/src/main/webapp/WEB-INF/jsp/admin/include/
Author: brett
Date: Sat Aug 12 20:01:51 2006
New Revision: 431138
URL: http://svn.apache.org/viewvc?rev=431138&view=rev
Log:
[MRM-138] add web configuration for hardFail and cacheFailures
Modified:
maven/repository-manager/trunk/maven-repository-configuration/src/main/mdo/configuration.mdo
maven/repository-manager/trunk/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/admin/include/proxiedRepositoryForm.jspf
maven/repository-manager/trunk/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/admin/proxiedRepositories.jsp
Modified: maven/repository-manager/trunk/maven-repository-configuration/src/main/mdo/configuration.mdo
URL: http://svn.apache.org/viewvc/maven/repository-manager/trunk/maven-repository-configuration/src/main/mdo/configuration.mdo?rev=431138&r1=431137&r2=431138&view=diff
==============================================================================
--- maven/repository-manager/trunk/maven-repository-configuration/src/main/mdo/configuration.mdo (original)
+++ maven/repository-manager/trunk/maven-repository-configuration/src/main/mdo/configuration.mdo Sat Aug 12 20:01:51 2006
@@ -367,7 +367,8 @@
<type>boolean</type>
<defaultValue>false</defaultValue>
<description>
- Whether to cache failures to avoid re-attempting them over the network.
+ Whether to cache failures to avoid re-attempting them over the network. The cache will last for the duration
+ of the intervals specified above depending on whether it a release or snapshot.
</description>
</field>
<field>
Modified: maven/repository-manager/trunk/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/admin/include/proxiedRepositoryForm.jspf
URL: http://svn.apache.org/viewvc/maven/repository-manager/trunk/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/admin/include/proxiedRepositoryForm.jspf?rev=431138&r1=431137&r2=431138&view=diff
==============================================================================
--- maven/repository-manager/trunk/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/admin/include/proxiedRepositoryForm.jspf (original)
+++ maven/repository-manager/trunk/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/admin/include/proxiedRepositoryForm.jspf Sat Aug 12 20:01:51 2006
@@ -35,3 +35,5 @@
<ww:textfield label="Release update interval" name="releasesInterval" size="4" />
<ww:select list="configuration.repositoriesMap" name="managedRepository" label="Proxied through" />
<ww:checkbox name="useNetworkProxy" fieldValue="true" label="Use HTTP Proxy" />
+<ww:checkbox name="cacheFailures" fieldValue="true" label="Cache Failures" />
+<ww:checkbox name="hardFail" fieldValue="true" label="Fail Whole Group" />
Modified: maven/repository-manager/trunk/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/admin/proxiedRepositories.jsp
URL: http://svn.apache.org/viewvc/maven/repository-manager/trunk/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/admin/proxiedRepositories.jsp?rev=431138&r1=431137&r2=431138&view=diff
==============================================================================
--- maven/repository-manager/trunk/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/admin/proxiedRepositories.jsp (original)
+++ maven/repository-manager/trunk/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/admin/proxiedRepositories.jsp Sat Aug 12 20:01:51 2006
@@ -28,119 +28,141 @@
<h1>Administration</h1>
<div id="contentArea">
- <h2>Proxied Repositories</h2>
+<h2>Proxied Repositories</h2>
- <ww:set name="proxiedRepositories" value="proxiedRepositories" />
- <c:if test="${empty(proxiedRepositories)}">
- <strong>There are no proxied repositories configured yet.</strong>
- </c:if>
- <c:forEach items="${proxiedRepositories}" var="repository" varStatus="i">
- <div>
- <div style="float: right">
- <%-- TODO replace with icons --%>
- <a href="<ww:url action="editProxiedRepository" method="input"><ww:param name="repoId" value="%{'${repository.id}'}" /></ww:url>">Edit
- Repository</a> | <a
- href="<ww:url action="deleteProxiedRepository" method="input"><ww:param name="repoId" value="%{'${repository.id}'}" /></ww:url>">Delete
- Repository</a>
- </div>
- <h3>${repository.name}</h3>
- <table>
- <tr>
- <th>Identifier</th>
- <td>
- <code>${repository.id}</code>
- </td>
- </tr>
- <tr>
- <th>URL</th>
- <td><a href="${repository.url}">${repository.url}</a></td>
- </tr>
- <tr>
- <th>Type</th>
- <!-- TODO: can probably just use layout appended to a key prefix in i18n to simplify this -->
- <td>
- <c:choose>
- <c:when test="${repository.layout == 'default'}">
- Maven 2.x Repository
- </c:when>
- <c:otherwise>
- Maven 1.x Repository
- </c:otherwise>
- </c:choose>
- </td>
- </tr>
- <tr>
- <th>Snapshots</th>
- <td>
- <!-- TODO! turn into a tag -->
- <c:choose>
- <c:when test="${repository.snapshotsPolicy == 'disabled'}">
- <span class="statusFailed">DISABLED</span>
- </c:when>
- <c:when test="${repository.snapshotsPolicy == 'always'}">
- <span class="statusOk">ENABLED</span>: updated every request
- </c:when>
- <c:when test="${repository.snapshotsPolicy == 'hourly'}">
- <span class="statusOk">ENABLED</span>: updated hourly
- </c:when>
- <c:when test="${repository.snapshotsPolicy == 'daily'}">
- <span class="statusOk">ENABLED</span>: updated daily
- </c:when>
- <c:when test="${repository.snapshotsPolicy == 'interval'}">
- <span class="statusOk">ENABLED</span>: updated every ${repository.snapshotsInterval} minutes
- </c:when>
- </c:choose>
- </td>
- </tr>
- <tr>
- <th>Releases</th>
- <td>
- <!-- TODO! turn into a tag -->
- <c:choose>
- <c:when test="${repository.releasesPolicy == 'disabled'}">
- <span class="statusFailed">DISABLED</span>
- </c:when>
- <c:when test="${repository.releasesPolicy == 'always'}">
- <span class="statusOk">ENABLED</span>: updated every request
- </c:when>
- <c:when test="${repository.releasesPolicy == 'hourly'}">
- <span class="statusOk">ENABLED</span>: updated hourly
- </c:when>
- <c:when test="${repository.releasesPolicy == 'daily'}">
- <span class="statusOk">ENABLED</span>: updated daily
- </c:when>
- <c:when test="${repository.releasesPolicy == 'interval'}">
- <span class="statusOk">ENABLED</span>: updated every ${repository.releasesInterval} minutes
- </c:when>
- </c:choose>
- </td>
- </tr>
- <tr>
- <th>Proxied through</th>
- <td>
- <!-- TODO: this is the hard way! would be nice if there was a ref in the model so it was directly linked -->
- ${repositoriesMap[repository.managedRepository].name}
- (<code>${repositoriesMap[repository.managedRepository].id}</code>)
- </td>
- </tr>
- <tr>
- <th>Use HTTP Proxy</th>
- <td>
- <c:if test="${!repository.useNetworkProxy}">
- <span class="statusFailed">NO</span>
- </c:if>
- <c:if test="${repository.useNetworkProxy}">
- <span class="statusOk">YES</span>
- </c:if>
- </td>
- </tr>
- </table>
- </div>
- </c:forEach>
+<ww:set name="proxiedRepositories" value="proxiedRepositories" />
+<c:if test="${empty(proxiedRepositories)}">
+ <strong>There are no proxied repositories configured yet.</strong>
+</c:if>
+<c:forEach items="${proxiedRepositories}" var="repository" varStatus="i">
+<div>
+<div style="float: right">
+ <%-- TODO replace with icons --%>
+ <a href="<ww:url action="editProxiedRepository" method="input"><ww:param name="repoId" value="%{'${repository.id}'}" /></ww:url>">Edit
+ Repository</a> | <a
+ href="<ww:url action="deleteProxiedRepository" method="input"><ww:param name="repoId" value="%{'${repository.id}'}" /></ww:url>">Delete
+ Repository</a>
+</div>
+<h3>${repository.name}</h3>
+<table>
+<tr>
+ <th>Identifier</th>
+ <td>
+ <code>${repository.id}</code>
+ </td>
+</tr>
+<tr>
+ <th>URL</th>
+ <td><a href="${repository.url}">${repository.url}</a></td>
+</tr>
+<tr>
+ <th>Type</th>
+ <!-- TODO: can probably just use layout appended to a key prefix in i18n to simplify this -->
+ <td>
+ <c:choose>
+ <c:when test="${repository.layout == 'default'}">
+ Maven 2.x Repository
+ </c:when>
+ <c:otherwise>
+ Maven 1.x Repository
+ </c:otherwise>
+ </c:choose>
+ </td>
+</tr>
+<tr>
+ <th>Snapshots</th>
+ <td>
+ <!-- TODO! turn into a tag -->
+ <c:choose>
+ <c:when test="${repository.snapshotsPolicy == 'disabled'}">
+ <span class="statusFailed">DISABLED</span>
+ </c:when>
+ <c:when test="${repository.snapshotsPolicy == 'always'}">
+ <span class="statusOk">ENABLED</span>: updated every request
+ </c:when>
+ <c:when test="${repository.snapshotsPolicy == 'hourly'}">
+ <span class="statusOk">ENABLED</span>: updated hourly
+ </c:when>
+ <c:when test="${repository.snapshotsPolicy == 'daily'}">
+ <span class="statusOk">ENABLED</span>: updated daily
+ </c:when>
+ <c:when test="${repository.snapshotsPolicy == 'interval'}">
+ <span class="statusOk">ENABLED</span>: updated every ${repository.snapshotsInterval} minutes
+ </c:when>
+ </c:choose>
+ </td>
+</tr>
+<tr>
+ <th>Releases</th>
+ <td>
+ <!-- TODO! turn into a tag -->
+ <c:choose>
+ <c:when test="${repository.releasesPolicy == 'disabled'}">
+ <span class="statusFailed">DISABLED</span>
+ </c:when>
+ <c:when test="${repository.releasesPolicy == 'always'}">
+ <span class="statusOk">ENABLED</span>: updated every request
+ </c:when>
+ <c:when test="${repository.releasesPolicy == 'hourly'}">
+ <span class="statusOk">ENABLED</span>: updated hourly
+ </c:when>
+ <c:when test="${repository.releasesPolicy == 'daily'}">
+ <span class="statusOk">ENABLED</span>: updated daily
+ </c:when>
+ <c:when test="${repository.releasesPolicy == 'interval'}">
+ <span class="statusOk">ENABLED</span>: updated every ${repository.releasesInterval} minutes
+ </c:when>
+ </c:choose>
+ </td>
+</tr>
+<tr>
+ <th>Proxied through</th>
+ <td>
+ <!-- TODO: this is the hard way! would be nice if there was a ref in the model so it was directly linked -->
+ ${repositoriesMap[repository.managedRepository].name}
+ (<code>${repositoriesMap[repository.managedRepository].id}</code>)
+ </td>
+</tr>
+<tr>
+ <th>Use HTTP Proxy</th>
+ <td>
+ <c:if test="${!repository.useNetworkProxy}">
+ <span class="statusFailed">NO</span>
+ </c:if>
+ <c:if test="${repository.useNetworkProxy}">
+ <span class="statusOk">YES</span>
+ </c:if>
+ </td>
+</tr>
+<tr>
+ <th>Cache Failures</th>
+ <td>
+ <c:if test="${!repository.cacheFailures}">
+ <span class="statusFailed">NO</span>
+ </c:if>
+ <c:if test="${repository.cacheFailures}">
+ <span class="statusOk">YES</span>
+ </c:if>
+ </td>
+</tr>
+<tr>
+ <th>Fail Whole Group</th>
+ <td>
+ <c:if test="${!repository.hardFail}">
+ <span class="statusFailed">NO</span>
+ </c:if>
+ <c:if test="${repository.hardFail}">
+ <span class="statusOk">YES</span>
+ </c:if>
+ </td>
+</tr>
+</table>
+</div>
+</c:forEach>
- <p>
- <a href="<ww:url action="addProxiedRepository" method="input" />">Add Repository</a>
- </p>
+<p>
+ <a href="<ww:url action="addProxiedRepository" method="input" />">Add Repository</a>
+</p>
</div>
</body>