Author: brett
Date: Mon Jul 10 00:01:58 2006
New Revision: 420447
URL: http://svn.apache.org/viewvc?rev=420447&view=rev
Log:
add in basic validation
Added:
maven/repository-manager/trunk/maven-repository-webapp/src/main/resources/org/
maven/repository-manager/trunk/maven-repository-webapp/src/main/resources/org/apache/
maven/repository-manager/trunk/maven-repository-webapp/src/main/resources/org/apache/maven/
maven/repository-manager/trunk/maven-repository-webapp/src/main/resources/org/apache/maven/repository/
maven/repository-manager/trunk/maven-repository-webapp/src/main/resources/org/apache/maven/repository/manager/
maven/repository-manager/trunk/maven-repository-webapp/src/main/resources/org/apache/maven/repository/manager/web/
maven/repository-manager/trunk/maven-repository-webapp/src/main/resources/org/apache/maven/repository/manager/web/action/
maven/repository-manager/trunk/maven-repository-webapp/src/main/resources/org/apache/maven/repository/manager/web/action/QuickSearchAction-validation.xml
(with props)
Removed:
maven/repository-manager/trunk/maven-repository-webapp/src/main/resources/validators.xml
Modified:
maven/repository-manager/trunk/maven-repository-webapp/src/main/java/org/apache/maven/repository/manager/web/action/QuickSearchAction.java
maven/repository-manager/trunk/maven-repository-webapp/src/main/resources/xwork.xml
maven/repository-manager/trunk/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/quickSearch.jsp
maven/repository-manager/trunk/maven-repository-webapp/src/main/webapp/css/site.css
Modified:
maven/repository-manager/trunk/maven-repository-webapp/src/main/java/org/apache/maven/repository/manager/web/action/QuickSearchAction.java
URL:
http://svn.apache.org/viewvc/maven/repository-manager/trunk/maven-repository-webapp/src/main/java/org/apache/maven/repository/manager/web/action/QuickSearchAction.java?rev=420447&r1=420446&r2=420447&view=diff
==============================================================================
---
maven/repository-manager/trunk/maven-repository-webapp/src/main/java/org/apache/maven/repository/manager/web/action/QuickSearchAction.java
(original)
+++
maven/repository-manager/trunk/maven-repository-webapp/src/main/java/org/apache/maven/repository/manager/web/action/QuickSearchAction.java
Mon Jul 10 00:01:58 2006
@@ -95,8 +95,13 @@
}
else
{
- return ERROR;
+ return INPUT;
}
+ }
+
+ public String doInput()
+ {
+ return SUCCESS;
}
public String getQ()
Added:
maven/repository-manager/trunk/maven-repository-webapp/src/main/resources/org/apache/maven/repository/manager/web/action/QuickSearchAction-validation.xml
URL:
http://svn.apache.org/viewvc/maven/repository-manager/trunk/maven-repository-webapp/src/main/resources/org/apache/maven/repository/manager/web/action/QuickSearchAction-validation.xml?rev=420447&view=auto
==============================================================================
---
maven/repository-manager/trunk/maven-repository-webapp/src/main/resources/org/apache/maven/repository/manager/web/action/QuickSearchAction-validation.xml
(added)
+++
maven/repository-manager/trunk/maven-repository-webapp/src/main/resources/org/apache/maven/repository/manager/web/action/QuickSearchAction-validation.xml
Mon Jul 10 00:01:58 2006
@@ -0,0 +1,26 @@
+<!--
+ ~ Copyright 2005-2006 The Apache Software Foundation.
+ ~
+ ~ 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
+ ~
+ ~ 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.
+ -->
+
+<!DOCTYPE validators PUBLIC "-//OpenSymphony Group//XWork Validator 1.0.2//EN"
+ "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd";>
+
+<validators>
+ <field name="q">
+ <field-validator type="requiredstring">
+ <message>You must enter some search terms.</message>
+ </field-validator>
+ </field>
+</validators>
\ No newline at end of file
Propchange:
maven/repository-manager/trunk/maven-repository-webapp/src/main/resources/org/apache/maven/repository/manager/web/action/QuickSearchAction-validation.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/repository-manager/trunk/maven-repository-webapp/src/main/resources/org/apache/maven/repository/manager/web/action/QuickSearchAction-validation.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified:
maven/repository-manager/trunk/maven-repository-webapp/src/main/resources/xwork.xml
URL:
http://svn.apache.org/viewvc/maven/repository-manager/trunk/maven-repository-webapp/src/main/resources/xwork.xml?rev=420447&r1=420446&r2=420447&view=diff
==============================================================================
---
maven/repository-manager/trunk/maven-repository-webapp/src/main/resources/xwork.xml
(original)
+++
maven/repository-manager/trunk/maven-repository-webapp/src/main/resources/xwork.xml
Mon Jul 10 00:01:58 2006
@@ -26,23 +26,18 @@
<!-- Default interceptor stack. -->
<default-interceptor-ref name="defaultStack"/>
- <action name="index" class="baseAction">
+ <action name="index" class="quickSearchAction" method="input">
<result name="success"
type="dispatcher">/WEB-INF/jsp/quickSearch.jsp</result>
+ <interceptor-ref name="validationWorkflowStack"/>
</action>
<action name="quickSearch" class="quickSearchAction">
+ <result name="input"
type="dispatcher">/WEB-INF/jsp/quickSearch.jsp</result>
<result name="success"
type="dispatcher">/WEB-INF/jsp/results.jsp</result>
- <result name="error" type="dispatcher">/WEB-INF/jsp/index.jsp</result>
+ <interceptor-ref name="validationWorkflowStack"/>
</action>
- <!-- TODO! old actions -->
- <!--
- <action name="index"
class="org.apache.maven.repository.manager.web.action.BaseAction">
- <result name="success"
type="dispatcher">/WEB-INF/jsp/index.jsp</result>
- <result name="error"
type="dispatcher">/WEB-INF/jsp/index.jsp</result>
- </action>
- -->
-
+ <!-- TODO! old actions
<action name="proxy"
class="org.apache.maven.repository.proxy.web.action.RepositoryProxyAction">
<result name="success" type="stream">
<param name="contentType">application/octet-stream</param>
@@ -77,7 +72,7 @@
<result name="success"
type="dispatcher">/WEB-INF/jsp/indexConfigUpdateSuccess.jsp</result>
<result name="error" type="dispatcher">/WEB-INF/jsp/index.jsp</result>
</action>
-
+ -->
</package>
</xwork>
Modified:
maven/repository-manager/trunk/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/quickSearch.jsp
URL:
http://svn.apache.org/viewvc/maven/repository-manager/trunk/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/quickSearch.jsp?rev=420447&r1=420446&r2=420447&view=diff
==============================================================================
---
maven/repository-manager/trunk/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/quickSearch.jsp
(original)
+++
maven/repository-manager/trunk/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/quickSearch.jsp
Mon Jul 10 00:01:58 2006
@@ -16,7 +16,10 @@
--%>
<html>
-<head><title>Quick Search</title></head>
+<head>
+ <title>Quick Search</title>
+ <ww:head />
+</head>
<body>
@@ -24,8 +27,8 @@
<div id="contentArea">
<div id="searchBox">
- <ww:form action="quickSearch.action">
- <ww:textfield size="50" name="q" />
+ <ww:form method="post" action="quickSearch" validate="true">
+ <ww:textfield label="Search for" size="50" name="q" />
<ww:submit label="Go!" />
</ww:form>
<p>
Modified:
maven/repository-manager/trunk/maven-repository-webapp/src/main/webapp/css/site.css
URL:
http://svn.apache.org/viewvc/maven/repository-manager/trunk/maven-repository-webapp/src/main/webapp/css/site.css?rev=420447&r1=420446&r2=420447&view=diff
==============================================================================
---
maven/repository-manager/trunk/maven-repository-webapp/src/main/webapp/css/site.css
(original)
+++
maven/repository-manager/trunk/maven-repository-webapp/src/main/webapp/css/site.css
Mon Jul 10 00:01:58 2006
@@ -110,3 +110,8 @@
font-weight: bold;
}
+/* WebWork validation failures */
+.errorMessage {
+ color: red;
+ font-weight: bold;
+}
