]> source.dussan.org Git - archiva.git/commitdiff
add a lot of missing eol-style native for *.jsp
authorOlivier Lamy <olamy@apache.org>
Tue, 27 Sep 2011 20:44:41 +0000 (20:44 +0000)
committerOlivier Lamy <olamy@apache.org>
Tue, 27 Sep 2011 20:44:41 +0000 (20:44 +0000)
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1176611 13f79535-47bb-0310-9956-ffa450edef68

archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/addLegacyArtifactPath.jsp
archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/legacyArtifactPath.jsp

index 1e2f4e2134a73f7fb634920c62521dd8fea00e2d..e22a517a39fbf29e8b02c96671ccc58d5feb1b6b 100644 (file)
-<%--\r
-  ~ Licensed to the Apache Software Foundation (ASF) under one\r
-  ~ or more contributor license agreements.  See the NOTICE file\r
-  ~ distributed with this work for additional information\r
-  ~ regarding copyright ownership.  The ASF licenses this file\r
-  ~ to you under the Apache License, Version 2.0 (the\r
-  ~ "License"); you may not use this file except in compliance\r
-  ~ with the License.  You may obtain a copy of the License at\r
-  ~\r
-  ~   http://www.apache.org/licenses/LICENSE-2.0\r
-  ~\r
-  ~ Unless required by applicable law or agreed to in writing,\r
-  ~ software distributed under the License is distributed on an\r
-  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY\r
-  ~ KIND, either express or implied.  See the License for the\r
-  ~ specific language governing permissions and limitations\r
-  ~ under the License.\r
-  --%>\r
-\r
-<%@ page contentType="text/html; charset=UTF-8" %>\r
-<%@ taglib prefix="s" uri="/struts-tags" %>\r
-\r
-<html>\r
-<head>\r
-  <title>Admin: Add Legacy Artifact Path</title>\r
-  <s:head/>\r
-</head>\r
-\r
-<body>\r
-\r
-<h1>Admin: Add Legacy Artifact Path</h1>\r
-\r
-<div id="contentArea">\r
-\r
-  <p>\r
-    Enter the legacy path to map to a particular artifact reference, then adjust the fields as necessary.\r
-  </p>\r
-\r
-  <script type="text/javascript">\r
-  function parse( path )\r
-  {\r
-      var group = path.indexOf( "/" );\r
-      if ( group > 0 )\r
-      {\r
-          document.getElementById( "addLegacyArtifactPath_groupId" ).value\r
-              = path.substring( 0, group );\r
-          group += 1;\r
-          var type = path.indexOf( "/", group );\r
-          if ( type > 0 )\r
-          {\r
-              document.getElementById( "addLegacyArtifactPath_type" ).value\r
-                  = path.substring( group, type - 1 );\r
-          }\r
-          type += 1;\r
-          var version = path.indexOf( "-", type );\r
-          var ext = path.lastIndexOf( "." );\r
-          if ( version > 0 )\r
-          {\r
-              document.getElementById( "addLegacyArtifactPath_artifactId" ).value\r
-                  = path.substring( type, version );\r
-              document.getElementById( "addLegacyArtifactPath_version" ).value\r
-                  = path.substring( version + 1, ext );\r
-          }\r
-\r
-      }\r
-  }\r
-  </script>\r
-\r
-  <%-- changed the structure of displaying errorMessages & actionMessages in order for them to be escaped. --%>\r
-  <s:if test="hasActionErrors()">\r
-      <ul>\r
-      <s:iterator value="actionErrors">\r
-          <li><span class="errorMessage"><s:property escape="true" /></span></li>\r
-      </s:iterator>\r
-      </ul>\r
-  </s:if>\r
-  <s:if test="hasActionMessages()">\r
-      <ul>\r
-      <s:iterator value="actionMessages">\r
-          <li><span class="actionMessage"><s:property escape="true" /></span></li>\r
-      </s:iterator>\r
-      </ul>\r
-  </s:if>\r
-\r
-  <s:form method="post" action="addLegacyArtifactPath!commit" namespace="/admin" validate="true">\r
-    <s:textfield name="legacyArtifactPath.path" label="Path" size="50" required="true" onchange="parse( this.value )"/>\r
-    <s:textfield name="groupId" label="GroupId" size="20" required="true"/>\r
-    <s:textfield name="artifactId" label="ArtifactId" size="20" required="true"/>\r
-    <s:textfield name="version" label="Version" size="20" required="true"/>\r
-    <s:textfield name="classifier" label="Classifier" size="20" required="false"/>\r
-    <s:textfield name="type" label="Type" size="20" required="true"/>\r
-    <s:submit value="Add Legacy Artifact Path"/>\r
-  </s:form>\r
-\r
-  <script type="text/javascript">\r
-    var ref = document.getElementById("addLegacyArtifactPath_legacyArtifactPath_artifact").value;\r
-    var i = ref.indexOf( ":" );\r
-    document.getElementById("addLegacyArtifactPath_groupId").value = ref.substring( 0, i );\r
-    var j = i + 1;\r
-    var i = ref.indexOf( ":", j );\r
-    document.getElementById("addLegacyArtifactPath_artifactId").value = ref.substring( j, i );\r
-    var j = i + 1;\r
-    var i = ref.indexOf( ":", j );\r
-    document.getElementById("addLegacyArtifactPath_version").value = ref.substring( j, i );\r
-    var j = i + 1;\r
-    var i = ref.indexOf( ":", j );\r
-    document.getElementById("addLegacyArtifactPath_classifier").value = ref.substring( j, i );\r
-\r
-    document.getElementById("addLegacyArtifactPath_legacyArtifactPath_path").focus();\r
-  </script>\r
-\r
-</div>\r
-\r
-</body>\r
-</html>\r
+<%--
+  ~ 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
+  ~
+  ~   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.
+  --%>
+
+<%@ page contentType="text/html; charset=UTF-8" %>
+<%@ taglib prefix="s" uri="/struts-tags" %>
+
+<html>
+<head>
+  <title>Admin: Add Legacy Artifact Path</title>
+  <s:head/>
+</head>
+
+<body>
+
+<h1>Admin: Add Legacy Artifact Path</h1>
+
+<div id="contentArea">
+
+  <p>
+    Enter the legacy path to map to a particular artifact reference, then adjust the fields as necessary.
+  </p>
+
+  <script type="text/javascript">
+  function parse( path )
+  {
+      var group = path.indexOf( "/" );
+      if ( group > 0 )
+      {
+          document.getElementById( "addLegacyArtifactPath_groupId" ).value
+              = path.substring( 0, group );
+          group += 1;
+          var type = path.indexOf( "/", group );
+          if ( type > 0 )
+          {
+              document.getElementById( "addLegacyArtifactPath_type" ).value
+                  = path.substring( group, type - 1 );
+          }
+          type += 1;
+          var version = path.indexOf( "-", type );
+          var ext = path.lastIndexOf( "." );
+          if ( version > 0 )
+          {
+              document.getElementById( "addLegacyArtifactPath_artifactId" ).value
+                  = path.substring( type, version );
+              document.getElementById( "addLegacyArtifactPath_version" ).value
+                  = path.substring( version + 1, ext );
+          }
+
+      }
+  }
+  </script>
+
+  <%-- changed the structure of displaying errorMessages & actionMessages in order for them to be escaped. --%>
+  <s:if test="hasActionErrors()">
+      <ul>
+      <s:iterator value="actionErrors">
+          <li><span class="errorMessage"><s:property escape="true" /></span></li>
+      </s:iterator>
+      </ul>
+  </s:if>
+  <s:if test="hasActionMessages()">
+      <ul>
+      <s:iterator value="actionMessages">
+          <li><span class="actionMessage"><s:property escape="true" /></span></li>
+      </s:iterator>
+      </ul>
+  </s:if>
+
+  <s:form method="post" action="addLegacyArtifactPath!commit" namespace="/admin" validate="true">
+    <s:textfield name="legacyArtifactPath.path" label="Path" size="50" required="true" onchange="parse( this.value )"/>
+    <s:textfield name="groupId" label="GroupId" size="20" required="true"/>
+    <s:textfield name="artifactId" label="ArtifactId" size="20" required="true"/>
+    <s:textfield name="version" label="Version" size="20" required="true"/>
+    <s:textfield name="classifier" label="Classifier" size="20" required="false"/>
+    <s:textfield name="type" label="Type" size="20" required="true"/>
+    <s:submit value="Add Legacy Artifact Path"/>
+  </s:form>
+
+  <script type="text/javascript">
+    var ref = document.getElementById("addLegacyArtifactPath_legacyArtifactPath_artifact").value;
+    var i = ref.indexOf( ":" );
+    document.getElementById("addLegacyArtifactPath_groupId").value = ref.substring( 0, i );
+    var j = i + 1;
+    var i = ref.indexOf( ":", j );
+    document.getElementById("addLegacyArtifactPath_artifactId").value = ref.substring( j, i );
+    var j = i + 1;
+    var i = ref.indexOf( ":", j );
+    document.getElementById("addLegacyArtifactPath_version").value = ref.substring( j, i );
+    var j = i + 1;
+    var i = ref.indexOf( ":", j );
+    document.getElementById("addLegacyArtifactPath_classifier").value = ref.substring( j, i );
+
+    document.getElementById("addLegacyArtifactPath_legacyArtifactPath_path").focus();
+  </script>
+
+</div>
+
+</body>
+</html>
index 8ad83c25971c2a43428d1915e15ea2aee4e63c5b..fdb2f5725457c9dfcdcbfb13e099b50b9ab1e81a 100644 (file)
-<%--\r
-  ~ Licensed to the Apache Software Foundation (ASF) under one\r
-  ~ or more contributor license agreements.  See the NOTICE file\r
-  ~ distributed with this work for additional information\r
-  ~ regarding copyright ownership.  The ASF licenses this file\r
-  ~ to you under the Apache License, Version 2.0 (the\r
-  ~ "License"); you may not use this file except in compliance\r
-  ~ with the License.  You may obtain a copy of the License at\r
-  ~\r
-  ~   http://www.apache.org/licenses/LICENSE-2.0\r
-  ~\r
-  ~ Unless required by applicable law or agreed to in writing,\r
-  ~ software distributed under the License is distributed on an\r
-  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY\r
-  ~ KIND, either express or implied.  See the License for the\r
-  ~ specific language governing permissions and limitations\r
-  ~ under the License.\r
-  --%>\r
-\r
-<%@ page contentType="text/html; charset=UTF-8" %>\r
-<%@ taglib prefix="s" uri="/struts-tags" %>\r
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>\r
-<%@ taglib prefix="redback" uri="http://plexus.codehaus.org/redback/taglib-1.0" %>\r
-<%@ taglib prefix="archiva"   uri="/WEB-INF/taglib.tld" %>\r
-\r
-<html>\r
-<head>\r
-  <title>Administration - Legacy Support</title>\r
-  <s:head/>\r
-</head>\r
-\r
-<body>\r
-\r
-<h1>Administration - Legacy Artifact Path Resolution</h1>\r
-\r
-<div id="contentArea">\r
-\r
-<%-- changed the structure of displaying errorMessages & actionMessages in order for them to be escaped. --%>\r
-<s:if test="hasActionErrors()">\r
-      <ul>\r
-      <s:iterator value="actionErrors">\r
-          <li><span class="errorMessage"><s:property escape="true" /></span></li>\r
-      </s:iterator>\r
-      </ul>\r
-  </s:if>\r
-  <s:if test="hasActionMessages()">\r
-      <ul>\r
-      <s:iterator value="actionMessages">\r
-          <li><span class="actionMessage"><s:property escape="true" /></span></li>\r
-      </s:iterator>\r
-      </ul>\r
-  </s:if>\r
-\r
-<div class="admin">\r
-<div class="controls">\r
-  <redback:ifAuthorized permission="archiva-manage-configuration">\r
-    <s:url id="addLegacyArtifactPathUrl" action="addLegacyArtifactPath"/>\r
-    <s:a href="%{addLegacyArtifactPathUrl}">\r
-      <img src="<c:url value="/images/icons/create.png" />" alt="" width="16" height="16"/>\r
-      Add\r
-    </s:a>\r
-  </redback:ifAuthorized>\r
-</div>\r
-<h2>Path Mappings</h2>\r
-\r
-<c:choose>\r
-<c:when test="${empty (legacyArtifactPaths)}">\r
-  <%-- No paths. --%>\r
-  <p><strong>There are no legacy artifact paths configured yet.</strong></p>\r
-</c:when>\r
-<c:otherwise>\r
-  <%-- Display the paths. --%>\r
-\r
-<c:forEach items="${legacyArtifactPaths}" var="legacyArtifactPath" varStatus="i">\r
-<c:choose>\r
-  <c:when test='${(i.index)%2 eq 0}'>\r
-    <c:set var="rowColor" value="dark" scope="page"/>\r
-  </c:when>\r
-  <c:otherwise>\r
-    <c:set var="rowColor" value="lite" scope="page"/>\r
-  </c:otherwise>\r
-</c:choose>\r
-\r
-<div class="legacyArtifactPath ${rowColor}">\r
-    \r
-<div class="controls">\r
-    <%-- TODO: make some icons --%>\r
-  <redback:ifAnyAuthorized permissions="archiva-manage-configuration">\r
-    <s:token/>\r
-    <s:url id="deleteLegacyArtifactPath" encode="true" action="deleteLegacyArtifactPath">\r
-      <s:param name="path" value="%{#attr.legacyArtifactPath.path}"/>\r
-      <s:param name="struts.token.name">struts.token</s:param>\r
-      <s:param name="struts.token"><s:property value="struts.token"/></s:param>\r
-    </s:url>\r
-    <s:a href="%{deleteLegacyArtifactPath}">\r
-      <img src="<c:url value="/images/icons/delete.gif" />" alt="" width="16" height="16"/>\r
-      Delete\r
-    </s:a>\r
-  </redback:ifAnyAuthorized>\r
-</div>\r
-\r
-<%-- used c:out in displaying EL's so that they would be escaped --%>\r
-<table class="infoTable">\r
-<tr>\r
-  <th>Path</th>\r
-  <td>\r
-    <code><c:out value="${legacyArtifactPath.path}" /></code>\r
-  </td>\r
-</tr>\r
-<tr>\r
-  <th>Artifact</th>\r
-  <td>\r
-    <code><c:out value="${legacyArtifactPath.artifact}" /></code>\r
-  </td>\r
-</tr>\r
-</table>\r
-\r
-</div>\r
-</c:forEach>\r
-\r
-</c:otherwise>\r
-</c:choose>\r
-\r
-\r
-\r
-</div>\r
-\r
-</div>\r
-\r
-</body>\r
-</html>\r
+<%--
+  ~ 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
+  ~
+  ~   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.
+  --%>
+
+<%@ page contentType="text/html; charset=UTF-8" %>
+<%@ taglib prefix="s" uri="/struts-tags" %>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="redback" uri="http://plexus.codehaus.org/redback/taglib-1.0" %>
+<%@ taglib prefix="archiva"   uri="/WEB-INF/taglib.tld" %>
+
+<html>
+<head>
+  <title>Administration - Legacy Support</title>
+  <s:head/>
+</head>
+
+<body>
+
+<h1>Administration - Legacy Artifact Path Resolution</h1>
+
+<div id="contentArea">
+
+<%-- changed the structure of displaying errorMessages & actionMessages in order for them to be escaped. --%>
+<s:if test="hasActionErrors()">
+      <ul>
+      <s:iterator value="actionErrors">
+          <li><span class="errorMessage"><s:property escape="true" /></span></li>
+      </s:iterator>
+      </ul>
+  </s:if>
+  <s:if test="hasActionMessages()">
+      <ul>
+      <s:iterator value="actionMessages">
+          <li><span class="actionMessage"><s:property escape="true" /></span></li>
+      </s:iterator>
+      </ul>
+  </s:if>
+
+<div class="admin">
+<div class="controls">
+  <redback:ifAuthorized permission="archiva-manage-configuration">
+    <s:url id="addLegacyArtifactPathUrl" action="addLegacyArtifactPath"/>
+    <s:a href="%{addLegacyArtifactPathUrl}">
+      <img src="<c:url value="/images/icons/create.png" />" alt="" width="16" height="16"/>
+      Add
+    </s:a>
+  </redback:ifAuthorized>
+</div>
+<h2>Path Mappings</h2>
+
+<c:choose>
+<c:when test="${empty (legacyArtifactPaths)}">
+  <%-- No paths. --%>
+  <p><strong>There are no legacy artifact paths configured yet.</strong></p>
+</c:when>
+<c:otherwise>
+  <%-- Display the paths. --%>
+
+<c:forEach items="${legacyArtifactPaths}" var="legacyArtifactPath" varStatus="i">
+<c:choose>
+  <c:when test='${(i.index)%2 eq 0}'>
+    <c:set var="rowColor" value="dark" scope="page"/>
+  </c:when>
+  <c:otherwise>
+    <c:set var="rowColor" value="lite" scope="page"/>
+  </c:otherwise>
+</c:choose>
+
+<div class="legacyArtifactPath ${rowColor}">
+    
+<div class="controls">
+    <%-- TODO: make some icons --%>
+  <redback:ifAnyAuthorized permissions="archiva-manage-configuration">
+    <s:token/>
+    <s:url id="deleteLegacyArtifactPath" encode="true" action="deleteLegacyArtifactPath">
+      <s:param name="path" value="%{#attr.legacyArtifactPath.path}"/>
+      <s:param name="struts.token.name">struts.token</s:param>
+      <s:param name="struts.token"><s:property value="struts.token"/></s:param>
+    </s:url>
+    <s:a href="%{deleteLegacyArtifactPath}">
+      <img src="<c:url value="/images/icons/delete.gif" />" alt="" width="16" height="16"/>
+      Delete
+    </s:a>
+  </redback:ifAnyAuthorized>
+</div>
+
+<%-- used c:out in displaying EL's so that they would be escaped --%>
+<table class="infoTable">
+<tr>
+  <th>Path</th>
+  <td>
+    <code><c:out value="${legacyArtifactPath.path}" /></code>
+  </td>
+</tr>
+<tr>
+  <th>Artifact</th>
+  <td>
+    <code><c:out value="${legacyArtifactPath.artifact}" /></code>
+  </td>
+</tr>
+</table>
+
+</div>
+</c:forEach>
+
+</c:otherwise>
+</c:choose>
+
+
+
+</div>
+
+</div>
+
+</body>
+</html>