Author: craigmcc
Date: Sat Sep 30 12:56:36 2006
New Revision: 451652
URL: http://svn.apache.org/viewvc?view=rev&rev=451652
Log:
Add shale-validator as a dependency, update to new tag library.
SHALE-299
Modified:
shale/framework/trunk/shale-apps/shale-usecases/pom.xml
shale/framework/trunk/shale-apps/shale-usecases/src/main/webapp/validator/test.jsp
shale/framework/trunk/shale-apps/shale-usecases/src/main/webapp/validator/thankYou.jsp
Modified: shale/framework/trunk/shale-apps/shale-usecases/pom.xml
URL:
http://svn.apache.org/viewvc/shale/framework/trunk/shale-apps/shale-usecases/pom.xml?view=diff&rev=451652&r1=451651&r2=451652
==============================================================================
--- shale/framework/trunk/shale-apps/shale-usecases/pom.xml (original)
+++ shale/framework/trunk/shale-apps/shale-usecases/pom.xml Sat Sep 30 12:56:36
2006
@@ -95,6 +95,12 @@
<dependency>
<groupId>org.apache.shale</groupId>
+ <artifactId>shale-validator</artifactId>
+ <version>${version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.shale</groupId>
<artifactId>shale-view</artifactId>
<version>${version}</version>
</dependency>
Modified:
shale/framework/trunk/shale-apps/shale-usecases/src/main/webapp/validator/test.jsp
URL:
http://svn.apache.org/viewvc/shale/framework/trunk/shale-apps/shale-usecases/src/main/webapp/validator/test.jsp?view=diff&rev=451652&r1=451651&r2=451652
==============================================================================
---
shale/framework/trunk/shale-apps/shale-usecases/src/main/webapp/validator/test.jsp
(original)
+++
shale/framework/trunk/shale-apps/shale-usecases/src/main/webapp/validator/test.jsp
Sat Sep 30 12:56:36 2006
@@ -2,6 +2,7 @@
<%@ taglib prefix="f" uri="http://java.sun.com/jsf/core"; %>
<%@ taglib prefix="h" uri="http://java.sun.com/jsf/html"; %>
<%@ taglib prefix="s" uri="http://shale.apache.org/core"; %>
+<%@ taglib prefix="val" uri="http://shale.apache.org/validator"; %>
<%@ taglib prefix="vc" uri="http://shale.apache.org/view"; %>
<%--
@@ -54,7 +55,7 @@
<f:convertNumber
minFractionDigits="2"/>
- <s:commonsValidator
+ <val:commonsValidator
type="floatRange"
min="10"
max="1000"
@@ -78,19 +79,19 @@
size="11"
value="#{validate$test.creditCard}">
- <s:commonsValidator
+ <val:commonsValidator
type="required"
arg="#{messages['prompt.creditCardNumber']}"
server="true"
client="false"/>
- <s:commonsValidator
+ <val:commonsValidator
type="creditCard"
arg="#{messages['prompt.creditCardNumber']}"
server="true"
client="false"/>
- <s:commonsValidator type="mask"
+ <val:commonsValidator type="mask"
mask="[4-6].*"
message="#{messages['validate.test.unknown.credit.card.type']}"
server="false"
@@ -113,13 +114,13 @@
<f:convertDateTime
pattern="MM/dd/yyyy"/>
- <s:commonsValidator
+ <val:commonsValidator
type="required"
arg="#{messages['prompt.expirationDate']}"
server="false"
client="true"/>
- <s:commonsValidator
+ <val:commonsValidator
type="date"
datePatternStrict="MM/dd/yyyy"
message="#{messages['validate.test.bad.expiration.date']}"
@@ -197,11 +198,11 @@
</f:facet>
<h:inputText id="amount" value="#{e.billedAmt}">
<f:convertNumber minFractionDigits="2"/>
- <s:commonsValidator type="floatRange" server="true"
client="true">
- <s:validatorVar name="arg" value="Amount" />
- <s:validatorVar name="min" value="#{e.minAmt}"/>
- <s:validatorVar name="max" value="#{e.maxAmt}"/>
- </s:commonsValidator>
+ <val:commonsValidator type="floatRange" server="true"
client="true">
+ <val:validatorVar name="arg" value="Amount" />
+ <val:validatorVar name="min" value="#{e.minAmt}"/>
+ <val:validatorVar name="max" value="#{e.maxAmt}"/>
+ </val:commonsValidator>
</h:inputText>
</h:column>
</h:dataTable>
@@ -218,7 +219,7 @@
</h:form>
</vc:subview>
-<s:validatorScript functionName="validateForm"/>
+<val:validatorScript functionName="validateForm"/>
</body>
</html>
Modified:
shale/framework/trunk/shale-apps/shale-usecases/src/main/webapp/validator/thankYou.jsp
URL:
http://svn.apache.org/viewvc/shale/framework/trunk/shale-apps/shale-usecases/src/main/webapp/validator/thankYou.jsp?view=diff&rev=451652&r1=451651&r2=451652
==============================================================================
---
shale/framework/trunk/shale-apps/shale-usecases/src/main/webapp/validator/thankYou.jsp
(original)
+++
shale/framework/trunk/shale-apps/shale-usecases/src/main/webapp/validator/thankYou.jsp
Sat Sep 30 12:56:36 2006
@@ -2,6 +2,7 @@
<%@ taglib prefix="f" uri="http://java.sun.com/jsf/core"; %>
<%@ taglib prefix="h" uri="http://java.sun.com/jsf/html"; %>
<%@ taglib prefix="s" uri="http://shale.apache.org/core"; %>
+<%@ taglib prefix="val" uri="http://shale.apache.org/validator"; %>
<%--
@@ -89,7 +90,7 @@
action="usecases$toplevel"/>
</h:panelGrid>
- <s:validatorScript functionName="validateForm"/>
+ <val:validatorScript functionName="validateForm"/>
</h:form>
