Author: brett
Date: Sun Aug 27 23:56:25 2006
New Revision: 437575
URL: http://svn.apache.org/viewvc?rev=437575&view=rev
Log:
[MRM-144] change to server-side comment
Modified:
maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/index.jsp
maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/proxiedRepositories.jsp
maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/syncedRepositories.jsp
maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/artifactInfo.jspf
Modified:
maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/index.jsp
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/index.jsp?rev=437575&r1=437574&r2=437575&view=diff
==============================================================================
---
maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/index.jsp
(original)
+++
maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/index.jsp
Sun Aug 27 23:56:25 2006
@@ -102,7 +102,7 @@
</tr>
<tr>
<th>Type</th>
- <!-- TODO: can probably just use layout appended to a key prefix in
i18n to simplify this -->
+ <%-- 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'}">
Modified:
maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/proxiedRepositories.jsp
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/proxiedRepositories.jsp?rev=437575&r1=437574&r2=437575&view=diff
==============================================================================
---
maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/proxiedRepositories.jsp
(original)
+++
maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/proxiedRepositories.jsp
Sun Aug 27 23:56:25 2006
@@ -57,7 +57,7 @@
</tr>
<tr>
<th>Type</th>
- <!-- TODO: can probably just use layout appended to a key prefix in i18n
to simplify this -->
+ <%-- 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'}">
@@ -72,7 +72,7 @@
<tr>
<th>Snapshots</th>
<td>
- <!-- TODO! turn into a tag -->
+ <%-- TODO! turn into a tag --%>
<c:choose>
<c:when test="${repository.snapshotsPolicy == 'disabled'}">
Disabled
@@ -95,7 +95,7 @@
<tr>
<th>Releases</th>
<td>
- <!-- TODO! turn into a tag -->
+ <%-- TODO! turn into a tag --%>
<c:choose>
<c:when test="${repository.releasesPolicy == 'disabled'}">
Disabled
@@ -118,7 +118,7 @@
<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 -->
+ <%-- 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>
Modified:
maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/syncedRepositories.jsp
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/syncedRepositories.jsp?rev=437575&r1=437574&r2=437575&view=diff
==============================================================================
---
maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/syncedRepositories.jsp
(original)
+++
maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/syncedRepositories.jsp
Sun Aug 27 23:56:25 2006
@@ -20,7 +20,7 @@
<html>
<head>
<title>Administration</title>
- <ww:head />
+ <ww:head/>
</head>
<body>
@@ -28,117 +28,117 @@
<h1>Administration</h1>
<div id="contentArea">
- <h2>Synced Repositories</h2>
+<h2>Synced Repositories</h2>
- <ww:set name="syncedRepositories" value="syncedRepositories" />
- <c:if test="${empty(syncedRepositories)}">
- <strong>There are no synced repositories configured yet.</strong>
- </c:if>
- <c:forEach items="${syncedRepositories}" var="repository" varStatus="i">
- <div>
- <div style="float: right">
- <%-- TODO replace with icons --%>
- <a href="<ww:url action="editSyncedRepository"
method="input"><ww:param name="repoId" value="%{'${repository.id}'}"
/></ww:url>">Edit
- Repository</a> | <a
- href="<ww:url action="deleteSyncedRepository"
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>Method</th>
- <td>${repository.method}</td>
- </tr>
- <c:choose>
- <c:when test="${repository.method == 'cvs'}">
- <tr>
- <th>CVS Root</th>
- <td>${repository.properties['cvsRoot']}</td>
- </tr>
- </c:when>
- <c:when test="${repository.method == 'svn'}">
- <tr>
- <th>Subversion URL</th>
- <td>${repository.properties['svnUrl']}</td>
- </tr>
- <tr>
- <th>Subversion Username</th>
- <td>${repository.properties['username']}</td>
- </tr>
- </c:when>
- <c:when test="${repository.method == 'rsync'}">
- <tr>
- <th>Rsync Host</th>
- <td>${repository.properties['rsyncHost']}</td>
- </tr>
- <tr>
- <th>Rsync Directory</th>
- <td>${repository.properties['rsyncDirectory']}</td>
- </tr>
- <tr>
- <th>Rsync Method</th>
- <td>
- <c:choose>
- <c:when test="${repository.properties['rsyncMethod'] ==
'rsync'}">
- Anonymous
- </c:when>
- <c:when test="${repository.properties['rsyncMethod'] ==
'ssh'}">
- SSH
- </c:when>
- </c:choose>
- </td>
- </tr>
- <tr>
- <th>Username</th>
- <td>${repository.properties['username']}</td>
- </tr>
- </c:when>
- <c:when test="${repository.method == 'file'}">
- <tr>
- <th>Directory</th>
- <td>${repository.properties['directory']}</td>
- </tr>
- </c:when>
- </c:choose>
- <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>Synced to</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>Schedule</th>
- <td>${repository.cronExpression}</td>
- </tr>
- </table>
+<ww:set name="syncedRepositories" value="syncedRepositories"/>
+<c:if test="${empty(syncedRepositories)}">
+ <strong>There are no synced repositories configured yet.</strong>
+</c:if>
+<c:forEach items="${syncedRepositories}" var="repository" varStatus="i">
+ <div>
+ <div style="float: right">
+ <%-- TODO replace with icons --%>
+ <a href="<ww:url action="editSyncedRepository" method="input"><ww:param
name="repoId" value="%{'${repository.id}'}" /></ww:url>">Edit
+ Repository</a> | <a
+ href="<ww:url action="deleteSyncedRepository" method="input"><ww:param
name="repoId" value="%{'${repository.id}'}" /></ww:url>">Delete
+ Repository</a>
</div>
- </c:forEach>
+ <h3>${repository.name}</h3>
+ <table>
+ <tr>
+ <th>Identifier</th>
+ <td>
+ <code>${repository.id}</code>
+ </td>
+ </tr>
+ <tr>
+ <th>Method</th>
+ <td>${repository.method}</td>
+ </tr>
+ <c:choose>
+ <c:when test="${repository.method == 'cvs'}">
+ <tr>
+ <th>CVS Root</th>
+ <td>${repository.properties['cvsRoot']}</td>
+ </tr>
+ </c:when>
+ <c:when test="${repository.method == 'svn'}">
+ <tr>
+ <th>Subversion URL</th>
+ <td>${repository.properties['svnUrl']}</td>
+ </tr>
+ <tr>
+ <th>Subversion Username</th>
+ <td>${repository.properties['username']}</td>
+ </tr>
+ </c:when>
+ <c:when test="${repository.method == 'rsync'}">
+ <tr>
+ <th>Rsync Host</th>
+ <td>${repository.properties['rsyncHost']}</td>
+ </tr>
+ <tr>
+ <th>Rsync Directory</th>
+ <td>${repository.properties['rsyncDirectory']}</td>
+ </tr>
+ <tr>
+ <th>Rsync Method</th>
+ <td>
+ <c:choose>
+ <c:when test="${repository.properties['rsyncMethod'] ==
'rsync'}">
+ Anonymous
+ </c:when>
+ <c:when test="${repository.properties['rsyncMethod'] ==
'ssh'}">
+ SSH
+ </c:when>
+ </c:choose>
+ </td>
+ </tr>
+ <tr>
+ <th>Username</th>
+ <td>${repository.properties['username']}</td>
+ </tr>
+ </c:when>
+ <c:when test="${repository.method == 'file'}">
+ <tr>
+ <th>Directory</th>
+ <td>${repository.properties['directory']}</td>
+ </tr>
+ </c:when>
+ </c:choose>
+ <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>Synced to</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>Schedule</th>
+ <td>${repository.cronExpression}</td>
+ </tr>
+ </table>
+ </div>
+</c:forEach>
- <p>
- <a href="<ww:url action="addSyncedRepository" method="input" />">Add
Repository</a>
- </p>
+<p>
+ <a href="<ww:url action="addSyncedRepository" method="input" />">Add
Repository</a>
+</p>
</div>
</body>
Modified:
maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/artifactInfo.jspf
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/artifactInfo.jspf?rev=437575&r1=437574&r2=437575&view=diff
==============================================================================
---
maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/artifactInfo.jspf
(original)
+++
maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/artifactInfo.jspf
Sun Aug 27 23:56:25 2006
@@ -28,10 +28,10 @@
<a href="${url}">${model.artifactId}</a> /
<strong>${model.version}</strong>
- <!-- TODO: new versions?
+ <%-- TODO: new versions?
(<strong class="statusFailed">Newer version available:</strong>
<a href="artifact.html">2.0.3</a>)
- -->
+ --%>
</p>
<p>${mode.description}</p>
@@ -87,14 +87,14 @@
</td>
</tr>
--%>
- <!-- TODO: origin
+ <%-- TODO: origin
<tr>
<th>Origin</th>
<td>
<a href="TODO">Apache Repository</a>
</td>
</tr>
- -->
+ --%>
</table>
<c:if test="${!empty(model.url) || model.organization != null ||
!empty(model.licenses)
