Author: oching
Date: Thu May 31 03:44:46 2007
New Revision: 543109
URL: http://svn.apache.org/viewvc?view=rev&rev=543109
Log:
MRM-381 Applied patch submitted by Teodoro Cue. Field 'md5' was changed to 'q'
in SearchAction-checksumSearch-validation.xml file as well as in
findArtifact.jsp. The result 'artifact' of action checksumSearch in xwork.xml
was also updated.
Modified:
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/SearchAction-checksumSearch-validation.xml
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/resources/xwork.xml
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/findArtifact.jsp
Modified:
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/SearchAction-checksumSearch-validation.xml
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/SearchAction-checksumSearch-validation.xml?view=diff&rev=543109&r1=543108&r2=543109
==============================================================================
---
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/SearchAction-checksumSearch-validation.xml
(original)
+++
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/SearchAction-checksumSearch-validation.xml
Thu May 31 03:44:46 2007
@@ -22,7 +22,7 @@
"http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd";>
<validators>
- <field name="md5">
+ <field name="q">
<field-validator type="requiredstring">
<message>
You must select a file, or enter the checksum. If the file was given
and you receive this message,
Modified:
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/resources/xwork.xml
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/archiva-webapp/src/main/resources/xwork.xml?view=diff&rev=543109&r1=543108&r2=543109
==============================================================================
--- maven/archiva/trunk/archiva-web/archiva-webapp/src/main/resources/xwork.xml
(original)
+++ maven/archiva/trunk/archiva-web/archiva-webapp/src/main/resources/xwork.xml
Thu May 31 03:44:46 2007
@@ -175,7 +175,7 @@
<result name="results">/WEB-INF/jsp/results.jsp</result>
<result name="error">/WEB-INF/jsp/findArtifact.jsp</result>
<result name="artifact" type="redirect">
-
/browse/${searchResults[0].groupId}/${searchResults[0].artifactId}/${searchResults[0].version}
+
/browse/${results.getHits().get(0).groupId}/${results.getHits().get(0).artifactId}/${results.getHits().get(0).version}
</result>
</action>
Modified:
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/findArtifact.jsp
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/findArtifact.jsp?view=diff&rev=543109&r1=543108&r2=543109
==============================================================================
---
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/findArtifact.jsp
(original)
+++
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/findArtifact.jsp
Thu May 31 03:44:46 2007
@@ -55,7 +55,8 @@
</noscript>
<ww:form method="POST" action="checksumSearch" namespace="/"
- onsubmit="this.md5.value =
generateMd5(this.file.value,this.md5.value); this.file.disabled = true">
+ onsubmit="this.q.value =
generateMd5(this.file.value,this.md5.value); this.file.disabled = true;">
+ <ww:hidden name="q"/>
<ww:if test="${sessionScope.uiOptions.appletFindEnabled}">
<tr>
<td class="tdLabel"><label for="checksumSearch_file"
class="label">Search for:</label></td>
