Why did you revert the license too?

I'd suggest replacing c:set with c:url to remove all the expressions and avoid the problem in that entirely. I'd also suggest extracting the <pre/> fragment out into a separate file.

- Brett

On 04/01/2007, at 5:37 AM, [EMAIL PROTECTED] wrote:

Author: joakime
Date: Wed Jan  3 10:37:41 2007
New Revision: 492246

URL: http://svn.apache.org/viewvc?view=rev&rev=492246
Log:
Reverting reformatting.

Modified:
maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/ admin/managedRepositories.jsp

Modified: maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB- INF/jsp/admin/managedRepositories.jsp URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva- webapp/src/main/webapp/WEB-INF/jsp/admin/managedRepositories.jsp? view=diff&rev=492246&r1=492245&r2=492246 ====================================================================== ======== --- maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/ admin/managedRepositories.jsp (original) +++ maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/ admin/managedRepositories.jsp Wed Jan 3 10:37:41 2007
@@ -1,20 +1,17 @@
 <%--
-  ~ Licensed to the Apache Software Foundation (ASF) under one
-  ~ or more contributor license agreements.  See the NOTICE file
-  ~ distributed with this work for additional information
-  ~ regarding copyright ownership.  The ASF licenses this file
-  ~ to you under the Apache License, Version 2.0 (the
-  ~ "License"); you may not use this file except in compliance
-  ~ with the License.  You may obtain a copy of the License at
+  ~ Copyright 2005-2006 The Apache Software Foundation.
   ~
-  ~   http://www.apache.org/licenses/LICENSE-2.0
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
   ~
-  ~ Unless required by applicable law or agreed to in writing,
-  ~ software distributed under the License is distributed on an
-  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  ~ KIND, either express or implied.  See the License for the
-  ~ specific language governing permissions and limitations
-  ~ under the License.
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+ ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
   --%>

 <%@ taglib prefix="ww" uri="/webwork" %>
@@ -33,9 +30,8 @@

 <div id="contentArea">

-<c:set var="urlbase">${pageContext.request.scheme}://$ {pageContext.request.serverName} - :${pageContext.request.serverPort}$ {pageContext.request.contextPath}/repository/
-</c:set>
+<%-- DO NOT REFORMAT THIS LINE --%>
+<c:set var="urlbase">${pageContext.request.scheme}://$ {pageContext.request.serverName}:${pageContext.request.serverPort}$ {pageContext.request.contextPath}/repository/</c:set>

 <div>
   <div style="float: right">
@@ -54,94 +50,91 @@
 </c:if>
 <c:forEach items="${repositories}" var="repository" varStatus="i">
<pss:ifAnyAuthorized permissions="archiva-edit-repository, archiva-delete-repository" resource="${repository.id}">
-    <div>
-      <div style="float: right">
- <ww:url id="editRepositoryUrl" action="editRepository" method="input">
-          <ww:param name="repoId" value="%{'${repository.id}'}"/>
-        </ww:url>
- <ww:url id="deleteRepositoryUrl" action="deleteRepository" method="input">
-          <ww:param name="repoId" value="%{'${repository.id}'}"/>
-        </ww:url>
-          <%-- TODO replace with icons --%>
-        <ww:a href="%{editRepositoryUrl}">Edit Repository</ww:a>
-        <ww:a href="%{deleteRepositoryUrl}">Delete Repository</ww:a>
-      </div>
-      <h3>${repository.name}</h3>
-      <table class="infoTable">
-        <tr>
-          <th>Identifier</th>
-          <td>
-            <code>${repository.id}</code>
-          </td>
-        </tr>
-        <tr>
-          <th>Directory</th>
-          <td>${repository.directory}</td>
-        </tr>
-        <tr>
-          <th>WebDAV URL</th>
- <td><a href="${urlbase}${repository.urlName}">${urlbase}$ {repository.urlName}</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 Included</th>
- <td class="${repository.includeSnapshots ? 'doneMark' : 'errorMark'} booleanIcon"> ${repository.includeSnapshots}</td>
-        </tr>
-        <tr>
-          <th>Indexed</th>
- <td class="${repository.indexed ? 'doneMark' : 'errorMark'} booleanIcon"> ${repository.indexed}</td>
-        </tr>
-        <tr>
-          <th>POM Snippet</th>
- <td><a href="#" onclick="Effect.toggle('repoPom$ {repository.id}','slide'); return false;">Show POM Snippet</a><br/>
+  <div>
+    <div style="float: right">
+ <ww:url id="editRepositoryUrl" action="editRepository" method="input">
+        <ww:param name="repoId" value="%{'${repository.id}'}" />
+      </ww:url>
+ <ww:url id="deleteRepositoryUrl" action="deleteRepository" method="input">
+        <ww:param name="repoId" value="%{'${repository.id}'}" />
+      </ww:url>
+      <%-- TODO replace with icons --%>
+      <ww:a href="%{editRepositoryUrl}">Edit Repository</ww:a>
+      <ww:a href="%{deleteRepositoryUrl}">Delete Repository</ww:a>
+    </div>
+    <h3>${repository.name}</h3>
+    <table class="infoTable">
+      <tr>
+        <th>Identifier</th>
+        <td>
+          <code>${repository.id}</code>
+        </td>
+      </tr>
+      <tr>
+        <th>Directory</th>
+        <td>${repository.directory}</td>
+      </tr>
+      <tr>
+        <th>WebDAV URL</th>
+ <td><a href="${urlbase}${repository.urlName}">${urlbase}$ {repository.urlName}</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 Included</th>
+ <td class="${repository.includeSnapshots ? 'doneMark' : 'errorMark'} booleanIcon"> ${repository.includeSnapshots}</td>
+      </tr>
+      <tr>
+        <th>Indexed</th>
+ <td class="${repository.indexed ? 'doneMark' : 'errorMark'} booleanIcon"> ${repository.indexed}</td>
+      </tr>
+      <tr>
+        <th>POM Snippet</th>
+ <td><a href="#" onclick="Effect.toggle('repoPom$ {repository.id}','slide'); return false;">Show POM Snippet</a><br />
+<%-- DO NOT REFORMAT THIS SECTION --%>
<pre class="pom" style="display: none;" id="repoPom$ {repository.id}"><code>&lt;project>
   ...
   &lt;distributionManagement>
- &lt;${repository.includeSnapshots ? 'snapshotRepository' : 'repository'}>
-  &lt;id>${repository.id}&lt;/id>
-  &lt;url>dav:${urlbase}${repository.urlName}&lt;/url>
-  <c:if test="${repository.layout != 'default'}">
-    &lt;layout>${repository.layout}&lt;/layout>
-  </c:if>
- &lt;/${repository.includeSnapshots ? 'snapshotRepository' : 'repository'}> + &lt;${repository.includeSnapshots ? 'snapshotRepository' : 'repository'}>
+      &lt;id>${repository.id}&lt;/id>
+ &lt;url>dav:${urlbase}${repository.urlName}&lt;/url><c:if test="${repository.layout != 'default'}">
+      &lt;layout>${repository.layout}&lt;/layout></c:if>
+ &lt;/${repository.includeSnapshots ? 'snapshotRepository' : 'repository'}>
   &lt;/distributionManagement>
-
+
   &lt;repositories>
-  &lt;repository>
-  &lt;id>${repository.id}&lt;/id>
-  &lt;name>${repository.name}&lt;/name>
-  &lt;url>${urlbase}${repository.urlName}&lt;/url>
-  <c:if test="${repository.layout != 'default'}">
-    &lt;layout>${repository.layout}&lt;/layout>
-  </c:if>
-  &lt;releases>
- &lt;enabled>${repository.includeSnapshots ? 'false' : 'true'} &lt;/enabled>
-  &lt;/releases>
-  &lt;snapshots>
- &lt;enabled>${repository.includeSnapshots ? 'true' : 'false'} &lt;/enabled>
-  &lt;/snapshots>
-  &lt;/repository>
+    &lt;repository>
+      &lt;id>${repository.id}&lt;/id>
+      &lt;name>${repository.name}&lt;/name>
+ &lt;url>${urlbase}${repository.urlName}&lt;/url><c:if test="$ {repository.layout != 'default'}">
+      &lt;layout>${repository.layout}&lt;/layout></c:if>
+      &lt;releases>
+ &lt;enabled>${repository.includeSnapshots ? 'false' : 'true'}&lt;/enabled>
+      &lt;/releases>
+      &lt;snapshots>
+ &lt;enabled>${repository.includeSnapshots ? 'true' : 'false'}&lt;/enabled>
+      &lt;/snapshots>
+    &lt;/repository>
   &lt;/repositories>
   ...
-  &lt;/project>
-</code></pre>
-          </td>
-        </tr>
-      </table>
-    </div>
+&lt;/project>
+</code></pre>
+        </td>
+      </tr>
+    </table>
+  </div>
   </pss:ifAnyAuthorized>
 </c:forEach>
 </div>

Reply via email to