]> source.dussan.org Git - archiva.git/commitdiff
projects / archiva.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 6d9088f)
[MRM-144] change to server-side comment
authorBrett Porter <brett@apache.org>
Mon, 28 Aug 2006 06:56:25 +0000 (06:56 +0000)
committerBrett Porter <brett@apache.org>
Mon, 28 Aug 2006 06:56:25 +0000 (06:56 +0000)
git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@437575 13f79535-47bb-0310-9956-ffa450edef68

archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/index.jsp patch | blob | history
archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/proxiedRepositories.jsp patch | blob | history
archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/syncedRepositories.jsp patch | blob | history
archiva-webapp/src/main/webapp/WEB-INF/jsp/include/artifactInfo.jspf patch | blob | history

diff --git a/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/index.jsp b/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/index.jsp
index 6f8a66e789a46fd3396ae65afe8346eda40b9297..0dc1405f6f87987f2071022afb06fe0e85a3f59b 100644 (file)
--- a/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/index.jsp
+++ b/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/index.jsp
@@ -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'}">
diff --git a/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/proxiedRepositories.jsp b/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/proxiedRepositories.jsp
index b0670d29c3a1c929047e1ed7d8c3ba8f00694642..bf6334059062d81724892a8e926196aeb7eba811 100644 (file)
--- a/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/proxiedRepositories.jsp
+++ b/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/proxiedRepositories.jsp
@@ -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>
diff --git a/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/syncedRepositories.jsp b/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/syncedRepositories.jsp
index 31ad29e6402d9d379e6e00602c9b3b5e3f7216c2..7277da3aabbcd2bdd1600726504923e4cb8bc442 100644 (file)
--- a/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/syncedRepositories.jsp
+++ b/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/syncedRepositories.jsp
@@ -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>
diff --git a/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/artifactInfo.jspf b/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/artifactInfo.jspf
index a2ffb6f74c16a0d5c16ffcea1d98fcede1be1707..0ee7767f95c7ae8f9fd35db4eab45d7b0515eb69 100644 (file)
--- a/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/artifactInfo.jspf
+++ b/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/artifactInfo.jspf
@@ -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)
Apache Archiva Repository: https://github.com/apache/archiva