svn commit: r367968 - in /struts/shale/trunk/use-cases/src: java/org/apache/shale/usecases/remoting/ java/org/apache/shale/usecases/view/ web/ajax/ web/validator/
Author: dgeary
Date: Wed Jan 11 00:31:12 2006
New Revision: 367968
URL: http://svn.apache.org/viewcvs?rev=367968&view=rev
Log:
Localized the first item in the zipcode pull-down menu for the Ajax form
completion example. Localized the links, on the Ajax form completion and
Validator examples, that point back to the main usecases page. Added
appropriate entries to the French and German properties files, but left the
German values for the new properties in English.
Modified:
struts/shale/trunk/use-cases/src/java/org/apache/shale/usecases/remoting/Business.java
struts/shale/trunk/use-cases/src/java/org/apache/shale/usecases/view/Bundle.properties
struts/shale/trunk/use-cases/src/java/org/apache/shale/usecases/view/Bundle_de.properties
struts/shale/trunk/use-cases/src/java/org/apache/shale/usecases/view/Bundle_fr.properties
struts/shale/trunk/use-cases/src/java/org/apache/shale/usecases/view/Domains.java
struts/shale/trunk/use-cases/src/web/ajax/zipCode.jsp
struts/shale/trunk/use-cases/src/web/validator/test.jsp
Modified:
struts/shale/trunk/use-cases/src/java/org/apache/shale/usecases/remoting/Business.java
URL:
http://svn.apache.org/viewcvs/struts/shale/trunk/use-cases/src/java/org/apache/shale/usecases/remoting/Business.java?rev=367968&r1=367967&r2=367968&view=diff
==
---
struts/shale/trunk/use-cases/src/java/org/apache/shale/usecases/remoting/Business.java
(original)
+++
struts/shale/trunk/use-cases/src/java/org/apache/shale/usecases/remoting/Business.java
Wed Jan 11 00:31:12 2006
@@ -43,7 +43,7 @@
*parameter was put in request scope by an Ajax call--see zipCode.jsp
*for more details. When the XML response is complete, the
*protected method selectItems invokes
-*responeComplete() on the Faces context, which ends
+*responseComplete() on the Faces context, which ends
*the response.
*/
public void cityAndStateForZip() throws IOException {
@@ -54,9 +54,8 @@
String zip = (String)requestParams.get("zip");
Domains domains = (Domains) getBean("domains");
- if (zip != null) {
+ if (zip != null)
selectItems(context, domains.getCityAndStateItems(zip));
- }
else
selectItems(context, domains.getBlankCityAndStateItems());
Modified:
struts/shale/trunk/use-cases/src/java/org/apache/shale/usecases/view/Bundle.properties
URL:
http://svn.apache.org/viewcvs/struts/shale/trunk/use-cases/src/java/org/apache/shale/usecases/view/Bundle.properties?rev=367968&r1=367967&r2=367968&view=diff
==
---
struts/shale/trunk/use-cases/src/java/org/apache/shale/usecases/view/Bundle.properties
(original)
+++
struts/shale/trunk/use-cases/src/java/org/apache/shale/usecases/view/Bundle.properties
Wed Jan 11 00:31:12 2006
@@ -30,10 +30,10 @@
# Ajax Zip Code Example
ajax.zip.zipWindowTitle=Ajax with Shale Remoting
usecases.ajaxZip=Form completion
-ajax.zip.streetPrompt=Street
ajax.zip.cityPrompt=City
ajax.zip.statePrompt=State
ajax.zip.zipPrompt=Zip
+ajax.pick=pick one
# JNDI Test Labels
jndi.test.title=JNDI Test Title
Modified:
struts/shale/trunk/use-cases/src/java/org/apache/shale/usecases/view/Bundle_de.properties
URL:
http://svn.apache.org/viewcvs/struts/shale/trunk/use-cases/src/java/org/apache/shale/usecases/view/Bundle_de.properties?rev=367968&r1=367967&r2=367968&view=diff
==
---
struts/shale/trunk/use-cases/src/java/org/apache/shale/usecases/view/Bundle_de.properties
(original)
+++
struts/shale/trunk/use-cases/src/java/org/apache/shale/usecases/view/Bundle_de.properties
Wed Jan 11 00:31:12 2006
@@ -27,6 +27,14 @@
ajax.completion.finish=Beenden
ajax.completion.submit=Senden
+# Ajax Zip Code Example
+ajax.zip.zipWindowTitle=Ajax with Shale Remoting
+usecases.ajaxZip=Form Completion
+ajax.zip.cityPrompt=City
+ajax.zip.statePrompt=State
+ajax.zip.zipPrompt=Zip Code
+ajax.pick=pick one
+
# JNDI Test Labels
jndi.test.title=JNDI Test Titel
jndi.test.expected=Erwartet:
Modified:
struts/shale/trunk/use-cases/src/java/org/apache/shale/usecases/view/Bundle_fr.properties
URL:
http://svn.apache.org/viewcvs/struts/shale/trunk/use-cases/src/java/org/apache/shale/usecases/view/Bundle_fr.properties?rev=367968&r1=367967&r2=367968&view=diff
==
---
struts/shale/trunk/use-cases/src/java/org/apache/shale/usecases/view/Bundle_fr.properties
(original)
+++
struts/shale/trunk/use-cases/src/java/org/apache/shale/usecases/view/Bundle_fr.properties
Wed Jan 11 00:31:12 2006
@@ -27,6 +27,14 @@
ajax.completion.finish=Terminer
ajax.completion.submit=Soumettre
+# Ajax Zip Code Example
+ajax.zip
svn commit: r367868 - in /struts/shale/trunk/use-cases/src: java/org/apache/shale/usecases/ajax/ java/org/apache/shale/usecases/remoting/ java/org/apache/shale/usecases/view/ web/ web/WEB-INF/ web/aja
Author: dgeary
Date: Tue Jan 10 17:31:31 2006
New Revision: 367868
URL: http://svn.apache.org/viewcvs?rev=367868&view=rev
Log:
Added an Ajax example to the usecases application. The example uses Shale's
newly refactored remoting capabilities to complete a form: when you select a
zip code from a pull-down menu, city and state fields in the form are populated
with values that match the zip code.
Added:
struts/shale/trunk/use-cases/src/java/org/apache/shale/usecases/ajax/Address.java
struts/shale/trunk/use-cases/src/web/ajax/zipCode.jsp
Modified:
struts/shale/trunk/use-cases/src/java/org/apache/shale/usecases/remoting/Business.java
struts/shale/trunk/use-cases/src/java/org/apache/shale/usecases/view/Bundle.properties
struts/shale/trunk/use-cases/src/java/org/apache/shale/usecases/view/Domains.java
struts/shale/trunk/use-cases/src/web/WEB-INF/faces-config.xml
struts/shale/trunk/use-cases/src/web/usecases.jsp
Added:
struts/shale/trunk/use-cases/src/java/org/apache/shale/usecases/ajax/Address.java
URL:
http://svn.apache.org/viewcvs/struts/shale/trunk/use-cases/src/java/org/apache/shale/usecases/ajax/Address.java?rev=367868&view=auto
==
---
struts/shale/trunk/use-cases/src/java/org/apache/shale/usecases/ajax/Address.java
(added)
+++
struts/shale/trunk/use-cases/src/java/org/apache/shale/usecases/ajax/Address.java
Tue Jan 10 17:31:31 2006
@@ -0,0 +1,149 @@
+/*
+ * Copyright 2004-2005 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.
+ */
+
+package org.apache.shale.usecases.ajax;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * Simple address bean with street, city, state, and zipCode properties.
+ *
+ * $Id$
+ */
+public class Address {
+// Static
Variables
+
+
+/**
+ * The Log instance for this class.
+ */
+private static final Log log = LogFactory.getLog(Address.class);
+
+
+// --
Properties
+
+/**
+ * The street.
+ */
+private String street = null;
+
+
+/**
+ * Return the street.
+ */
+public String getStreet() {
+
+return this.street;
+
+}
+
+
+/**
+ * Set the street.
+ *
+ * @param street The new street street
+ */
+public void setStreet(String street) {
+
+this.street = street;
+
+}
+
+
+/**
+ * The city.
+ */
+private String city = null;
+
+
+/**
+ * Return the city.
+ */
+public String getCity() {
+
+return this.city;
+
+}
+
+
+/**
+ * Set the city.
+ *
+ * @param city The new city city
+ */
+public void setCity(String city) {
+
+this.city = city;
+
+}
+
+
+/**
+ * The state.
+ */
+private String state = null;
+
+
+/**
+ * Return the state.
+ */
+public String getState() {
+
+return this.state;
+
+}
+
+
+/**
+ * Set the state.
+ *
+ * @param state The new state state
+ */
+public void setState(String state) {
+
+this.state = state;
+
+}
+
+/**
+ * The zipCode.
+ */
+private String zipCode = null;
+
+
+/**
+ * Return the zipCode.
+ */
+public String getZipCode() {
+
+return this.zipCode;
+
+}
+
+
+/**
+ * Set the zipCode.
+ *
+ * @param zipCode The new zipCode zipCode
+ */
+public void setZipCode(String zipCode) {
+
+this.zipCode = zipCode;
+
+}
+
+}
Modified:
struts/shale/trunk/use-cases/src/java/org/apache/shale/usecases/remoting/Business.java
URL:
http://svn.apache.org/viewcvs/struts/shale/trunk/use-cases/src/java/org/apache/shale/usecases/remoting/Business.java?rev=367868&r1=367867&r2=367868&view=diff
==
---
struts/shale/trunk/use-cases/src/java/org/apache/shale/usecases/remoting/Business.java
(original)
+++
struts/shale/trunk/use-cases/src/java/org/apache/shale/usecases/remoting/Business.java
Tue Jan 10 17:31:31 2006
@@ -17,6 +17,8 @@
package org.apache.shale.usecases.remoting;
import java.io.IOException;
+import java.util.Map;
+
import javax.faces.context.FacesContext;
impor
svn commit: r240369 - in /struts/shale/trunk: clay-plugin/build.xml core-library/build.xml test-framework/build.xml use-cases/build.xml
Author: dgeary
Date: Fri Aug 26 18:15:30 2005
New Revision: 240369
URL: http://svn.apache.org/viewcvs?rev=240369&view=rev
Log:
Modified buildfiles to rely on JARS in the top-level lib directory that were
downloaded by download-dependencies, copy-tiles, and copy-jsf-ri ANT tasks
Modified:
struts/shale/trunk/clay-plugin/build.xml
struts/shale/trunk/core-library/build.xml
struts/shale/trunk/test-framework/build.xml
struts/shale/trunk/use-cases/build.xml
Modified: struts/shale/trunk/clay-plugin/build.xml
URL:
http://svn.apache.org/viewcvs/struts/shale/trunk/clay-plugin/build.xml?rev=240369&r1=240368&r2=240369&view=diff
==
--- struts/shale/trunk/clay-plugin/build.xml (original)
+++ struts/shale/trunk/clay-plugin/build.xml Fri Aug 26 18:15:30 2005
@@ -49,13 +49,13 @@
+
value="${lib.dir}/commons-beanutils/commons-beanutils.jar"/>
+
value="${lib.dir}/commons-collections/commons-collections.jar"/>
+
value="${lib.dir}/commons-digester/commons-digester.jar"/>
+
value="${lib.dir}/commons-logging/commons-logging.jar"/>
Modified: struts/shale/trunk/core-library/build.xml
URL:
http://svn.apache.org/viewcvs/struts/shale/trunk/core-library/build.xml?rev=240369&r1=240368&r2=240369&view=diff
==
--- struts/shale/trunk/core-library/build.xml (original)
+++ struts/shale/trunk/core-library/build.xml Fri Aug 26 18:15:30 2005
@@ -61,7 +61,6 @@
value="${validator.home}/commons-validator.jar"/>
-
@@ -114,6 +113,7 @@
+
Modified: struts/shale/trunk/test-framework/build.xml
URL:
http://svn.apache.org/viewcvs/struts/shale/trunk/test-framework/build.xml?rev=240369&r1=240368&r2=240369&view=diff
==
--- struts/shale/trunk/test-framework/build.xml (original)
+++ struts/shale/trunk/test-framework/build.xml Fri Aug 26 18:15:30 2005
@@ -47,19 +47,17 @@
+
value="${lib.dir}/commons-beanutils/commons-beanutils.jar"/>
+
value="${lib.dir}/commons-collections/commons-collections.jar"/>
+
value="${lib.dir}/commons-digester/commons-digester.jar"/>
-
-
-
-
-
-
+
+
+
+
Modified: struts/shale/trunk/use-cases/build.xml
URL:
http://svn.apache.org/viewcvs/struts/shale/trunk/use-cases/build.xml?rev=240369&r1=240368&r2=240369&view=diff
==
--- struts/shale/trunk/use-cases/build.xml (original)
+++ struts/shale/trunk/use-cases/build.xml Fri Aug 26 18:15:30 2005
@@ -49,24 +49,22 @@
+
value="${lib.dir}/commons-beanutils/commons-beanutils.jar"/>
+
value="${lib.dir}/commons-chain/commons-chain.jar"/>
+
value="${lib.dir}/commons-collections/commons-collections.jar"/>
+
value="${lib.dir}/commons-digester/commons-digester.jar"/>
+
value="${lib.dir}/commons-logging/commons-logging.jar"/>
+
value="${lib.dir}/commons-validator/commons-validator.jar"/>
-
-
-
-
-
-
+
+
+
+
@@ -75,7 +73,7 @@
-
+
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r239492 - /struts/shale/trunk/core-library/src/java/org/apache/shale/tiles/TilesViewHandler.java
Author: dgeary
Date: Tue Aug 23 17:36:40 2005
New Revision: 239492
URL: http://svn.apache.org/viewcvs?rev=239492&view=rev
Log:
Aligned Tiles view handler with latest mods to standalone Tiles, hopefully for
the last time. 8-)
Modified:
struts/shale/trunk/core-library/src/java/org/apache/shale/tiles/TilesViewHandler.java
Modified:
struts/shale/trunk/core-library/src/java/org/apache/shale/tiles/TilesViewHandler.java
URL:
http://svn.apache.org/viewcvs/struts/shale/trunk/core-library/src/java/org/apache/shale/tiles/TilesViewHandler.java?rev=239492&r1=239491&r2=239492&view=diff
==
---
struts/shale/trunk/core-library/src/java/org/apache/shale/tiles/TilesViewHandler.java
(original)
+++
struts/shale/trunk/core-library/src/java/org/apache/shale/tiles/TilesViewHandler.java
Tue Aug 23 17:36:40 2005
@@ -264,21 +264,16 @@
ServletRequest request = (ServletRequest)externalContext.getRequest();
ServletContext servletContext = (ServletContext)externalContext.
getContext();
- DefinitionsFactory factory = TilesUtil.getDefinitionsFactory(request,
-servletContext);
- if (factory == null)
-return null;
-
ComponentDefinition tile = null;
try {
- tile = factory.readDefinitions().getDefinition(name);
+ tile = TilesUtil.getDefinition(name, request, servletContext);
}
catch(NoSuchDefinitionException nsex) { /* not here */ }
catch(DefinitionsFactoryException dex) { /* not here */ }
if (tile == null && name.startsWith("/")) { // try again w/o slash...
try {
-tile = factory.readDefinitions().getDefinition(name.substring(1));
+tile = TilesUtil.getDefinition(name, request, servletContext);
}
catch(NoSuchDefinitionException nsdex) { /* not here */ }
catch(DefinitionsFactoryException dfex) { /* not here */ }
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r239476 - /struts/shale/trunk/core-library/src/java/org/apache/shale/tiles/TilesViewHandler.java
Author: dgeary
Date: Tue Aug 23 15:52:07 2005
New Revision: 239476
URL: http://svn.apache.org/viewcvs?rev=239476&view=rev
Log:
Put Tiles view handler in synch with recent changes to standalone Tiles
Modified:
struts/shale/trunk/core-library/src/java/org/apache/shale/tiles/TilesViewHandler.java
Modified:
struts/shale/trunk/core-library/src/java/org/apache/shale/tiles/TilesViewHandler.java
URL:
http://svn.apache.org/viewcvs/struts/shale/trunk/core-library/src/java/org/apache/shale/tiles/TilesViewHandler.java?rev=239476&r1=239475&r2=239476&view=diff
==
---
struts/shale/trunk/core-library/src/java/org/apache/shale/tiles/TilesViewHandler.java
(original)
+++
struts/shale/trunk/core-library/src/java/org/apache/shale/tiles/TilesViewHandler.java
Tue Aug 23 15:52:07 2005
@@ -264,22 +264,17 @@
ServletRequest request = (ServletRequest)externalContext.getRequest();
ServletContext servletContext = (ServletContext)externalContext.
getContext();
- DefinitionsFactory factory = TilesUtil.getDefinitionsFactory(request,
-servletContext);
- if (factory == null)
-return null;
-
ComponentDefinition tile = null;
try {
- tile = factory.getDefinition(name, request, servletContext);
+ tile = TilesUtil.getDefinition(name, request, servletContext);
}
catch(NoSuchDefinitionException nsex) { /* not here */ }
catch(DefinitionsFactoryException dex) { /* not here */ }
if (tile == null && name.startsWith("/")) { // try again w/o slash...
try {
-tile = factory.getDefinition(name.substring(1),
- request, servletContext);
+tile = TilesUtil.getDefinition(name.substring(1),
+ request, servletContext);
}
catch(NoSuchDefinitionException nsdex) { /* not here */ }
catch(DefinitionsFactoryException dfex) { /* not here */ }
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r231388 - /struts/sandbox/trunk/tiles/build.xml
Author: dgeary Date: Wed Aug 10 20:52:17 2005 New Revision: 231388 URL: http://svn.apache.org/viewcvs?rev=231388&view=rev Log: A couple of tweaks to get unit tests to run. Modified: struts/sandbox/trunk/tiles/build.xml Modified: struts/sandbox/trunk/tiles/build.xml URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/tiles/build.xml?rev=231388&r1=231387&r2=231388&view=diff == --- struts/sandbox/trunk/tiles/build.xml (original) +++ struts/sandbox/trunk/tiles/build.xml Wed Aug 10 20:52:17 2005 @@ -80,6 +80,7 @@ + @@ -267,7 +268,7 @@ usefile="false"/> + includes="org/apache/tiles/**/Test*.class"/> - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r225665 - /struts/core/trunk/doc/shale/features.xml
Author: dgeary
Date: Wed Jul 27 18:48:47 2005
New Revision: 225665
URL: http://svn.apache.org/viewcvs?rev=225665&view=rev
Log:
Added validation documentation. I'll add Tiles documentation soon.
Modified:
struts/core/trunk/doc/shale/features.xml
Modified: struts/core/trunk/doc/shale/features.xml
URL:
http://svn.apache.org/viewcvs/struts/core/trunk/doc/shale/features.xml?rev=225665&r1=225664&r2=225665&view=diff
==
--- struts/core/trunk/doc/shale/features.xml (original)
+++ struts/core/trunk/doc/shale/features.xml Wed Jul 27 18:48:47 2005
@@ -403,12 +403,108 @@
-
+
- FIXME - Describe validation feature.
+
-
+JavaServer Faces 1.x does not explicitly support client-side
+ validation and only provides a minimal set of server-side
+ validators. On the other hand, http://jakarta.apache.org/commons/validator/";>Apache Commons Validator
+ supports both client- and server-side validators and comes
+ with the following useful validators:
+
+Credit Card
+Date
+Email
+ Generic
+ ISBN
+ URL
+
+
+All of the preceeding validators can be executed either on
+ the client or the server, or both. Shale integrates
JavaServer Faces
+ and the Commons Validator.
+
+
+
+
+
+Shale provides two JSP tags that let you use the Commons Validator:
+ s:commonsValidator and
s:validatorScript. The
+ former lets you attach a commons validator to a JSF input
component and
+ the latter generates JavaScript validation code for
validating each JSF component
+ that has one or more Commons validators in a particular form.
You can attach as
+ many Commons validators to a single JSF input component as
you wish.
+
+
+
+
+
+Here's what you need to do to use Shale validation:
+
+ Add validator-rules.xml, from the
Commons Validator distribution,
+ to your WEB-INF directory. (You can
find a copy of validator-rules.xml
+in the Shale use-cases example. See
.../shale/use-cases/src/web/WEB-INF/validator-rules.xml)
+
+
+ Add an onsubmit attribute to your
h:form tag that calls
+the JavaScript validation function generated
by s:validatorScript.
+
+
+ Add Commons validators to JSF input components with
s:commonsValidator
+
+
+ Add an s:validatorScript tag at the
end of the h:form tag's body.
+
+
+
+Here's an example:
+
+<%@ taglib uri="http://struts.apache.org/shale/core"; prefix="s" %>
+...
+<h:form onsubmit="validateForm(this)">
+
+<h:inputText id="creditCardNumber"
+ size="16"
+ value="#{userContext.creditCardNumber}">
+
+<s:commonsValidator type="required"
+
arg="#{msgs.creditCardNumberPrompt}"
+ server="true"
+client="true"/>
+
+<s:commonsValidator type="mask"
+ mask="[4-6].*"
+
arg="#{msgs.creditCardNumberPrompt}"
+ server="true"
+client="true"/>
+
+<s:commonsValidator type="creditCard"
+
arg="#{msgs.creditCardNumberPrompt}"
+ server="true">
+</h:inputText>
+
+<h:message for="creditCardNumber" styleClass="errors"/>
+
+<s:validatorScript functionName="validateForm"/>
+</form>
+...
+
+In the preceeding example, we've attached three Commons validators
to a single
+JSF input component. To pass validation, the field must
have a value that
+ starts with a number between 4 and 6 inclusive and
that value must be a valid
+ credit card number as verified by the http://en.wikipedia.org/wiki/Luhn_algorithm";>Luhn algorithm. Two of
the
+
svn commit: r219584 - in /struts/sandbox/trunk/tiles: ./ src/conf/ src/java/org/apache/tiles/servlets/ src/java/org/apache/tiles/util/
Author: dgeary Date: Mon Jul 18 17:03:23 2005 New Revision: 219584 URL: http://svn.apache.org/viewcvs?rev=219584&view=rev Log: This checkin gives us a viable tiles-core.jar. I tested it against the simple example from tiles-original. I thought of copying over that example and the accompanying document, but we already have an examples directory here under tiles-documentation, so I thought better of it. Perhaps later. There's still some work to be done in the tiles-documentation directory and we also should think about testing. Evidently, the only test in sight for Tiles is the TilesPluginTest, which of course, is Struts specific and should probably be removed from this source tree, no? Integration tests would be easy enough with something like Canoo. What about unit tests? Anyway, here's what this checkin entails: 1. Added the Tiles servlet from tiles-original 2. svn copied RequestUtils from the Struts utils directory and removed Struts-related code (We only use 2 methods from RequestUtils, but I kept everything that wasn't Struts-related, for good measure) 3. Changed ...org.apache.taglib.tiles... to ...org.apache.tiles.taglib... in tiles-core.tld I also think we need to change the flush attribute's default to false. If you use tiles:insert in the body of an enclosing tag, you'll get an exception, which forces you to use flush="false" more often than not. Added: struts/sandbox/trunk/tiles/src/java/org/apache/tiles/servlets/ struts/sandbox/trunk/tiles/src/java/org/apache/tiles/servlets/TilesServlet.java - copied, changed from r219349, struts/sandbox/trunk/tiles-original/core-library/src/java/org/apache/tiles/servlets/TilesServlet.java struts/sandbox/trunk/tiles/src/java/org/apache/tiles/util/ struts/sandbox/trunk/tiles/src/java/org/apache/tiles/util/RequestUtils.java - copied, changed from r219345, struts/core/trunk/src/share/org/apache/struts/util/RequestUtils.java Modified: struts/sandbox/trunk/tiles/build.xml struts/sandbox/trunk/tiles/src/conf/tiles-core.tld Modified: struts/sandbox/trunk/tiles/build.xml URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/tiles/build.xml?rev=219584&r1=219583&r2=219584&view=diff == --- struts/sandbox/trunk/tiles/build.xml (original) +++ struts/sandbox/trunk/tiles/build.xml Mon Jul 18 17:03:23 2005 @@ -279,7 +279,7 @@ + description="Download freely available dependencies"> Modified: struts/sandbox/trunk/tiles/src/conf/tiles-core.tld URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/tiles/src/conf/tiles-core.tld?rev=219584&r1=219583&r2=219584&view=diff == --- struts/sandbox/trunk/tiles/src/conf/tiles-core.tld (original) +++ struts/sandbox/trunk/tiles/src/conf/tiles-core.tld Mon Jul 18 17:03:23 2005 @@ -14,7 +14,7 @@ http://jakarta.apache.org/tiles insert -org.apache.taglib.tiles.InsertTag +org.apache.tiles.taglib.InsertTag JSP template @@ -89,7 +89,7 @@ definition -org.apache.taglib.tiles.DefinitionTag +org.apache.tiles.taglib.DefinitionTag JSP id @@ -124,7 +124,7 @@ put -org.apache.taglib.tiles.PutTag +org.apache.tiles.taglib.PutTag JSP name @@ -174,7 +174,7 @@ putList -org.apache.taglib.tiles.PutListTag +org.apache.tiles.taglib.PutListTag JSP name @@ -184,7 +184,7 @@ add -org.apache.taglib.tiles.AddTag +org.apache.tiles.taglib.AddTag JSP value @@ -229,7 +229,7 @@ get -org.apache.taglib.tiles.GetTag +org.apache.tiles.taglib.GetTag empty name @@ -254,7 +254,7 @@ getAsString -org.apache.taglib.tiles.GetAttributeTag +org.apache.tiles.taglib.GetAttributeTag empty name @@ -274,8 +274,8 @@ useAttribute -org.apache.taglib.tiles.UseAttributeTag -org.apache.taglib.tiles.UseAttributeTei +org.apache.tiles.taglib.UseAttributeTag +org.apache.tiles.taglib.UseAttributeTei empty id @@ -305,7 +305,7 @@ importAttribute -org.apache.taglib.tiles.ImportAttributeTag +org.apache.tiles.taglib.ImportAttributeTag empty name @@ -325,7 +325,7 @@ initComponentDefinitions -org.apache.taglib.tiles.InitDefinitionsTag +org.apache.tiles.taglib.InitDefinitionsTag empty file Copied: struts/sandbox/trunk/tiles/src/java/org/apache/tiles/servlets/TilesServlet.java (from r219349, struts/sandbox/trunk/tiles-original/core-library/src/java/org/apache/tiles/servlets/TilesServlet.java) URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/tiles/src/java/org/apache/tiles/servlets/TilesServlet.java?p2=struts/sandbox/trunk/tiles/src/java/org/apache/tiles/servlets/TilesServlet.java&p1=struts/sandbox/trunk/tiles-original/core-library/src/java/org/apache/tiles/servlets/TilesServlet.java&r1=219349&r2=219584&rev=219584&view=diff ==
svn commit: r209369 - in /struts/shale/trunk/core-library: ./ src/java/org/apache/shale/ src/java/org/apache/shale/dialog/ src/java/org/apache/shale/tiles/
Author: dgeary
Date: Tue Jul 5 17:58:35 2005
New Revision: 209369
URL: http://svn.apache.org/viewcvs?rev=209369&view=rev
Log:
This commit contains an optional integration layer for working with standalone
Tiles. That integration, like Shale's Spring integration, is optional. If you
specify a property named tiles.home in build.properties, and build Shale's
core library, Shale will create a shale-tiles.jar file in
core-library/dist/lib. To use the Tiles integration, you include that JAR file
in your WEB-INF/lib directory.
Shale's Tiles integration is pretty simple. There's a JSF view handler
(org.apache.shale.tiles.TilesViewHandler) that preprocesses navigation view
IDs and looks for a matching tile. See the package description for
org.apache.shale.tiles for more information.
Added:
struts/shale/trunk/core-library/src/java/org/apache/shale/tiles/
struts/shale/trunk/core-library/src/java/org/apache/shale/tiles/TilesViewHandler.java
struts/shale/trunk/core-library/src/java/org/apache/shale/tiles/faces-config.xml
struts/shale/trunk/core-library/src/java/org/apache/shale/tiles/package.html
Modified:
struts/shale/trunk/core-library/build.xml
struts/shale/trunk/core-library/src/java/org/apache/shale/Bundle.properties
struts/shale/trunk/core-library/src/java/org/apache/shale/dialog/Dialog.java
struts/shale/trunk/core-library/src/java/org/apache/shale/dialog/Globals.java
Modified: struts/shale/trunk/core-library/build.xml
URL:
http://svn.apache.org/viewcvs/struts/shale/trunk/core-library/build.xml?rev=209369&r1=209368&r2=209369&view=diff
==
--- struts/shale/trunk/core-library/build.xml (original)
+++ struts/shale/trunk/core-library/build.xml Tue Jul 5 17:58:35 2005
@@ -65,6 +65,7 @@
value="${spring.home}/dist/spring-context.jar"/>
+
@@ -111,6 +112,7 @@
+
@@ -156,6 +158,7 @@
+
@@ -165,6 +168,9 @@
+
+
@@ -285,7 +293,7 @@
+ excludes="org/apache/shale/spring/** org/apache/shale/tiles/**
**/package.html"/>
@@ -305,8 +313,23 @@
+
+
+
+
+
+
+
+
+
+
-
Modified:
struts/shale/trunk/core-library/src/java/org/apache/shale/Bundle.properties
URL:
http://svn.apache.org/viewcvs/struts/shale/trunk/core-library/src/java/org/apache/shale/Bundle.properties?rev=209369&r1=209368&r2=209369&view=diff
==
--- struts/shale/trunk/core-library/src/java/org/apache/shale/Bundle.properties
(original)
+++ struts/shale/trunk/core-library/src/java/org/apache/shale/Bundle.properties
Tue Jul 5 17:58:35 2005
@@ -44,3 +44,9 @@
# org.apache.shale.component.Token
token.invalid=Invalid resubmit of the same form
+
+# org.apache.shale.tiles.TilesViewHandler
+tiles.renderingView=Rendering view {0}, looking for tile {1}
+tiles.dispatchingToTile=Dispatching to tile {0}
+tiles.dispatchingToViewHandler=Dispatching {0} to the default view handler
+
Modified:
struts/shale/trunk/core-library/src/java/org/apache/shale/dialog/Dialog.java
URL:
http://svn.apache.org/viewcvs/struts/shale/trunk/core-library/src/java/org/apache/shale/dialog/Dialog.java?rev=209369&r1=209368&r2=209369&view=diff
==
---
struts/shale/trunk/core-library/src/java/org/apache/shale/dialog/Dialog.java
(original)
+++
struts/shale/trunk/core-library/src/java/org/apache/shale/dialog/Dialog.java
Tue Jul 5 17:58:35 2005
@@ -18,7 +18,7 @@
/**
* Overall configuration of an individual dialog. During application
- * execution, this information is immutabe (so that simultaneous execution
+ * execution, this information is immutable (so that simultaneous execution
* threads may be processing states or transitions through this dialog).
* Therefore, access to configuration information is not synchronized.
*
Modified:
struts/shale/trunk/core-library/src/java/org/apache/shale/dialog/Globals.java
URL:
http://svn.apache.org/viewcvs/struts/shale/trunk/core-library/src/java/org/apache/shale/dialog/Globals.java?rev=209369&r1=209368&r2=209369&view=diff
==
---
struts/shale/trunk/core-library/src/java/org/apache/shale/dialog/Globals.java
(original)
+++
struts/shale/trunk/core-library/src/java/org/apache/shale/dialog/Globals.java
Tue Jul 5 17:58:35 2005
@@ -27,7 +27,7 @@
/**
* Context initialization parameter used to specify a comma delimited
- * list of context relative resource paths to resources continaing our
+ * list of context relative resource paths to resources
svn commit: r190662 [6/6] - in /struts/sandbox/trunk/tiles: ./ core-library/ core-library/src/ core-library/src/conf/ core-library/src/java/ core-library/src/java/org/ core-library/src/java/org/apache/ core-library/src/java/org/apache/taglib/ core-library/src/java/org/apache/taglib/tiles/ core-library/src/java/org/apache/taglib/tiles/doc-files/ core-library/src/java/org/apache/taglib/tiles/util/ core-library/src/java/org/apache/tiles/ core-library/src/java/org/apache/tiles/beans/ core-library/src/java/org/apache/tiles/definition/ core-library/src/java/org/apache/tiles/doc-files/ core-library/src/java/org/apache/tiles/servlets/ core-library/src/java/org/apache/tiles/xmlDefinition/ core-library/src/java/org/apache/util/ core-library/src/test/ examples/ examples/simple/ examples/simple/WEB-INF/ examples/simple/WEB-INF/lib/ examples/simple/graphics/ examples/simple/graphics/flags/
Added:
struts/sandbox/trunk/tiles/core-library/src/java/org/apache/util/PropertyMessageResources.java
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/tiles/core-library/src/java/org/apache/util/PropertyMessageResources.java?rev=190662&view=auto
==
---
struts/sandbox/trunk/tiles/core-library/src/java/org/apache/util/PropertyMessageResources.java
(added)
+++
struts/sandbox/trunk/tiles/core-library/src/java/org/apache/util/PropertyMessageResources.java
Tue Jun 14 14:59:13 2005
@@ -0,0 +1,290 @@
+/*
+ * Copyright 2004-2005 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.
+ */
+
+package org.apache.util;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Locale;
+import java.util.Properties;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * Concrete subclass of MessageResources that reads message keys
+ * and corresponding strings from named property resources in the same manner
+ * that java.util.PropertyResourceBundle does. The
+ * base property defines the base property resource name, and
+ * must be specified.
+ *
+ * IMPLEMENTATION NOTE - This class trades memory for
+ * speed by caching all messages located via generalizing the Locale under
+ * the original locale as well.
+ * This results in specific messages being stored in the message cache
+ * more than once, but improves response time on subsequent requests for
+ * the same locale + key combination.
+ *
+ * @author Craig R. McClanahan
+ * @author David Graham
+ * @version $Revision: 1.8 $ $Date: 2003/04/19 19:06:02 $
+ */
+public class PropertyMessageResources extends MessageResources {
+
+
+// --- Constructors
+
+
+/**
+ * Construct a new PropertyMessageResources according to the
+ * specified parameters.
+ *
+ * @param factory The MessageResourcesFactory that created us
+ * @param config The configuration parameter for this MessageResources
+ */
+public PropertyMessageResources(MessageResourcesFactory factory,
+String config) {
+
+super(factory, config);
+log.info("Initializing, config='" + config + "'");
+
+}
+
+
+/**
+ * Construct a new PropertyMessageResources according to the
+ * specified parameters.
+ *
+ * @param factory The MessageResourcesFactory that created us
+ * @param config The configuration parameter for this MessageResources
+ * @param returnNull The returnNull property we should initialize with
+ */
+public PropertyMessageResources(MessageResourcesFactory factory,
+String config, boolean returnNull) {
+
+super(factory, config, returnNull);
+log.info("Initializing, config='" + config +
+ "', returnNull=" + returnNull);
+
+}
+
+
+// - Properties
+
+
+/**
+ * The set of locale keys for which we have already loaded messages, keyed
+ * by the value calculated in localeKey().
+ */
+protected HashMap locales = new HashMap();
+
+
+/**
+ * The Log instance for this class.
+ */
+protected static final Log log =
+LogFactory.getLog(PropertyMessageResources.class);
+
+
+/**
+ * The cache of messages we have accumulated over time, keyed by the
+ * value calculated in messageKey().
+ */
+protected HashMap messages = new HashMap();
+
+
+// - Public Methods
+
+
+/**
+ * Returns a text message for the specified key, for the default Locale.
+ * A null string result will be returned by this method if no relevant
+ * message resource is found for this key or Locale, if the
+ * returnNull property is set. Otherwise, an appropriate
+ * error message will be returned.
+ *
+ * This method must be implemented by a concrete subclass.
+ *
+ * @param locale The requested message Locale, or null
+ * for the system default Locale
+ * @param key The message key to look up
+ * @return text message for the specified key and locale
+ */
+public String getMessage(Locale locale, String key) {
+
+
svn commit: r179222 - in /struts/shale/trunk: core-library/src/java/org/apache/shale/component/ValidatorScript.java use-cases/src/web/validator/test.jsp
Author: dgeary
Date: Tue May 31 08:23:36 2005
New Revision: 179222
URL: http://svn.apache.org/viewcvs?rev=179222&view=rev
Log:
Patch submitted by Manfred Klug to set the required attribute only for
server-side validation and to properly test that feature in the use case
Modified:
struts/shale/trunk/core-library/src/java/org/apache/shale/component/ValidatorScript.java
struts/shale/trunk/use-cases/src/web/validator/test.jsp
Modified:
struts/shale/trunk/core-library/src/java/org/apache/shale/component/ValidatorScript.java
URL:
http://svn.apache.org/viewcvs/struts/shale/trunk/core-library/src/java/org/apache/shale/component/ValidatorScript.java?rev=179222&r1=179221&r2=179222&view=diff
==
---
struts/shale/trunk/core-library/src/java/org/apache/shale/component/ValidatorScript.java
(original)
+++
struts/shale/trunk/core-library/src/java/org/apache/shale/component/ValidatorScript.java
Tue May 31 08:23:36 2005
@@ -106,24 +106,25 @@
for (int i = 0; i < vs.length; i++) {
if (vs[i] instanceof CommonsValidator) {
CommonsValidator v = (CommonsValidator) vs[i];
- if (!Boolean.FALSE.equals(v.getClient())) {
+ if (Boolean.TRUE.equals(v.getClient())) {
String id = c.getClientId(context);
addValidator(v.getType(), id, v);
- // Fields with empty values are not validated, so
- // we force the issue here by setting the component's
- // required attribute to true.
-
- if("required".equals(v.getType())) {
- h.setRequired(true);
- }
-
ValidatorAction action = v.getValidatorAction();
List list = action.getDependencyList();
Iterator iter = list.iterator();
while (iter.hasNext()) {
String type = (String) iter.next();
addValidator(type, id, v);
+ }
+ }
+ if (Boolean.TRUE.equals(v.getServer())) {
+ // Fields with empty values are not validated, so
+ // we force the issue here by setting the component's
+ // required attribute to true.
+
+ if("required".equals(v.getType())) {
+ h.setRequired(true);
}
}
}
Modified: struts/shale/trunk/use-cases/src/web/validator/test.jsp
URL:
http://svn.apache.org/viewcvs/struts/shale/trunk/use-cases/src/web/validator/test.jsp?rev=179222&r1=179221&r2=179222&view=diff
==
--- struts/shale/trunk/use-cases/src/web/validator/test.jsp (original)
+++ struts/shale/trunk/use-cases/src/web/validator/test.jsp Tue May 31 08:23:36
2005
@@ -75,8 +75,7 @@
+ value="#{validate$test.creditCard}">
svn commit: r179051 - /struts/shale/trunk/core-library/src/java/org/apache/shale/validator/CommonsValidator.java
Author: dgeary
Date: Mon May 30 05:24:14 2005
New Revision: 179051
URL: http://svn.apache.org/viewcvs?rev=179051&view=rev
Log:
Added Manfred Klug's patch that uses a component's submitted value for
validation instead of the converted value
Modified:
struts/shale/trunk/core-library/src/java/org/apache/shale/validator/CommonsValidator.java
Modified:
struts/shale/trunk/core-library/src/java/org/apache/shale/validator/CommonsValidator.java
URL:
http://svn.apache.org/viewcvs/struts/shale/trunk/core-library/src/java/org/apache/shale/validator/CommonsValidator.java?rev=179051&r1=179050&r2=179051&view=diff
==
---
struts/shale/trunk/core-library/src/java/org/apache/shale/validator/CommonsValidator.java
(original)
+++
struts/shale/trunk/core-library/src/java/org/apache/shale/validator/CommonsValidator.java
Mon May 30 05:24:14 2005
@@ -34,6 +34,7 @@
import java.util.logging.Logger;
import javax.faces.application.Application;
import javax.faces.application.FacesMessage;
+import javax.faces.component.EditableValueHolder;
import javax.faces.component.UIComponent;
import javax.faces.context.ExternalContext;
import javax.faces.context.FacesContext;
@@ -407,18 +408,23 @@
Object[] p = getParams();
Object[] params = new Object[p.length + 1];
- params[0] = convert(value, paramTypes[0]);
+ params[0] = convert(value, paramTypes[0], component);
for (int i = 1; i < params.length; i++)
- params[i] = convert(p[i - 1], paramTypes[i]);
+ params[i] = convert(p[i - 1], paramTypes[i], null);
try {
Boolean r = (Boolean) validatorMethod.invoke(validator, params);
if (r.equals(Boolean.FALSE)) {
-FacesMessage message = new FacesMessage(
-FacesMessage.SEVERITY_ERROR,
- getErrorMessage(value, context), null);
-throw new ValidatorException(message);
+Object errorValue = value;
+
+if(component instanceof EditableValueHolder)
+ errorValue = ((EditableValueHolder)component)
+ .getSubmittedValue();
+
+throw new ValidatorException(new FacesMessage(
+ FacesMessage.SEVERITY_ERROR,
+ getErrorMessage(errorValue, context), null));
}
} catch (IllegalAccessException ex) {
logger.log(Level.SEVERE, "can't invoke validator", ex);
@@ -509,17 +515,25 @@
// - Static
Initialization
-
/**
* A utility method that converts an object to an instance
*of a given class, such as converting "true"
*for example, into Boolean.TRUE.
+ * If the component passed to this method is an instance of
+ *EditableValueHolder and the object's class is
+ *String, this method returns the component's
+ * submitted value, without converting it to a string. The
+ * component parameter can be null.
*
* @param obj The object to convert
* @param cl The type of object to convert to
+ * @param component The component whose value we are converting
*/
- private static Object convert(Object obj, Class cl) {
+ private static Object convert(Object obj, Class cl, UIComponent component) {
if (cl.isInstance(obj)) return obj;
+ if (cl == String.class && component != null &&
+ component instanceof EditableValueHolder)
+ return ((EditableValueHolder)component).getSubmittedValue();
if (cl == String.class) return "" + obj;
if (obj instanceof String) {
String str = (String) obj;
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r178926 - in /struts/shale/trunk: core-library/src/java/org/apache/shale/component/ValidatorScript.java use-cases/src/java/org/apache/shale/usecases/view/Bundle.properties use-cases/src/java/org/apache/shale/usecases/view/Bundle_de.properties use-cases/src/web/validator/test.jsp
Author: dgeary Date: Sat May 28 21:12:52 2005 New Revision: 178926 URL: http://svn.apache.org/viewcvs?rev=178926&view=rev Log: I updated the javadocs for ValidatorScript.findCommonsValidators() to reflect handling of required validators. I also updated the validator use case so that we have a required validator on the server. (In an unrelated mod, I removed the required validator that was attached to the Amount field, because the field's converter provides 0.00 for empty input, thus obviating the need for the validatior). I updated the explanation of the validator use case in the JSP page, which meant changing Bundle.properties and Bundle_de.properties. I just copied the English text for the validation page from Bundle.properties to Bundle_de.properties; someone else will have to do the translation. Modified: struts/shale/trunk/core-library/src/java/org/apache/shale/component/ValidatorScript.java struts/shale/trunk/use-cases/src/java/org/apache/shale/usecases/view/Bundle.properties struts/shale/trunk/use-cases/src/java/org/apache/shale/usecases/view/Bundle_de.properties struts/shale/trunk/use-cases/src/web/validator/test.jsp Modified: struts/shale/trunk/core-library/src/java/org/apache/shale/component/ValidatorScript.java URL: http://svn.apache.org/viewcvs/struts/shale/trunk/core-library/src/java/org/apache/shale/component/ValidatorScript.java?rev=178926&r1=178925&r2=178926&view=diff == --- struts/shale/trunk/core-library/src/java/org/apache/shale/component/ValidatorScript.java (original) +++ struts/shale/trunk/core-library/src/java/org/apache/shale/component/ValidatorScript.java Sat May 28 21:12:52 2005 @@ -88,10 +88,13 @@ if (id != null) map.put(id, v); } - /** - * Finds all of the Commons validators for all of the components - *in a component hierarchy. + * Recursively finds all Commons validators for the all of the + *components in a component hierarchy and adds them to a map. + * If a validator's type is required, this method sets the + *associated component's required property to true. This is + *necessary because JSF does not validate empty fields unless + *a component's required property is true. * * @param c The component at the root of the component tree * @param context The FacesContext for this request Modified: struts/shale/trunk/use-cases/src/java/org/apache/shale/usecases/view/Bundle.properties URL: http://svn.apache.org/viewcvs/struts/shale/trunk/use-cases/src/java/org/apache/shale/usecases/view/Bundle.properties?rev=178926&r1=178925&r2=178926&view=diff == --- struts/shale/trunk/use-cases/src/java/org/apache/shale/usecases/view/Bundle.properties (original) +++ struts/shale/trunk/use-cases/src/java/org/apache/shale/usecases/view/Bundle.properties Sat May 28 21:12:52 2005 @@ -116,6 +116,8 @@ usecases.title=Shale Framework Use Cases usecases.validator=Commons Validator Integration usecases.validate=Validation (client- and server-side) +usecases.tiles=Tiles +usecases.tiles.simple=A Simple Tiles Example # Validation validate.test.title=Shale Validation using Commons Validator @@ -126,4 +128,10 @@ validate.test.currency.symbol=$ validate.test.unknown.credit.card.type=Unknown Credit Card Type validate.test.bad.expiration.date=Bad Expiration Date. Enter the date in this format: mm/dd/ -validate.test.description=This form has seven validators, all implemented with s:commonsValidator:Amount: required (client) and floatRange (server)Credit Card Number: required (client) mask ([4-6].*) (client) and creditCard (server)Expiration Date: required (client) date (server)Note: because of the Credit Card Number field's mix of client- and server-side validators, entering "33" in the field results in a JavaScript alert (because the mask validator catches it), but entering "55" results in server-side validation and a subsequent error message displayed in the form.See the Apache Commons Validator documentation for more information about other available validators. +validate.test.description=This form has six validators, all implemented with s:commonsValidator:Amount: floatRange (server)Credit Card Number: required (server) mask ([4-6].*) (client) and creditCard (server)Expiration Date: required (client) date (server)Note: because of the Credit Card Number field's mix of client- and server-side validators, entering "33" in the field results in a JavaScript alert (because the mask validator catches it), but entering "55" results in server-side validation and a subsequent error message displayed in the form.See the Apache Commons Validator documentation for more
svn commit: r178920 - /struts/shale/trunk/core-library/src/java/org/apache/shale/component/ValidatorScript.java
Author: dgeary
Date: Sat May 28 20:08:11 2005
New Revision: 178920
URL: http://svn.apache.org/viewcvs?rev=178920&view=rev
Log:
The s:validatorScript tag (which must come after all s:commonsValidator tags)
has a component sitting behind it that walks the component tree and generates
JavaScript for all the validators in the tree. It discovers validators in a
private findCommonsValidators method. I modified that method to look for
required validators and set the associated component's required property to
true.
Modified:
struts/shale/trunk/core-library/src/java/org/apache/shale/component/ValidatorScript.java
Modified:
struts/shale/trunk/core-library/src/java/org/apache/shale/component/ValidatorScript.java
URL:
http://svn.apache.org/viewcvs/struts/shale/trunk/core-library/src/java/org/apache/shale/component/ValidatorScript.java?rev=178920&r1=178919&r2=178920&view=diff
==
---
struts/shale/trunk/core-library/src/java/org/apache/shale/component/ValidatorScript.java
(original)
+++
struts/shale/trunk/core-library/src/java/org/apache/shale/component/ValidatorScript.java
Sat May 28 20:08:11 2005
@@ -43,19 +43,19 @@
// Private
Variables
-
+
/**
* A map of validators, representing all of the Commons Validators
- *attached to components in the current component hierarchy.
- *The keys of the map are validator type names. The values are
- *maps from IDs to CommonsValidator objects.
+ *attached to components in the current component hierarchy.
+ *The keys of the map are validator type names. The values are
+ *maps from IDs to CommonsValidator objects.
*/
private Map validators = new LinkedHashMap();
/**
* The component renders itself; therefore, this
- *method returns null.
+ *method returns null.
*/
public String getRendererType() {
return null;
@@ -64,8 +64,8 @@
/**
* Returns the component's family. In this case,
- *the component is not associated with a family,
- *so this method returns null.
+ *the component is not associated with a family,
+ *so this method returns null.
*/
public String getFamily() {
return null;
@@ -74,10 +74,10 @@
/**
* Registers a validator according to type and id.
- *
- * @param type The type of the validator
- * @param id The validator's identifier
- * @param v The Commons validator associated with the id and type
+ *
+ * @param type The type of the validator
+ * @param id The validator's identifier
+ * @param v The Commons validator associated with the id and type
*/
private void addValidator(String type, String id, CommonsValidator v) {
Map map = (Map) validators.get(type);
@@ -91,10 +91,10 @@
/**
* Finds all of the Commons validators for all of the components
- *in a component hierarchy.
- *
- * @param c The component at the root of the component tree
- * @param context The FacesContext for this request
+ *in a component hierarchy.
+ *
+ * @param c The component at the root of the component tree
+ * @param context The FacesContext for this request
*/
private void findCommonsValidators(UIComponent c, FacesContext context) {
if (c instanceof EditableValueHolder) {
@@ -106,8 +106,17 @@
if (!Boolean.FALSE.equals(v.getClient())) {
String id = c.getClientId(context);
addValidator(v.getType(), id, v);
+
+ // Fields with empty values are not validated, so
+ // we force the issue here by setting the component's
+ // required attribute to true.
+
+ if("required".equals(v.getType())) {
+ h.setRequired(true);
+ }
+
ValidatorAction action = v.getValidatorAction();
- List list =
action.getDependencyList();
+ List list = action.getDependencyList();
Iterator iter = list.iterator();
while (iter.hasNext()) {
String type = (String) iter.next();
@@ -128,8 +137,8 @@
/**
* Write the start of the script for client-side validation.
- *
- * @param writer A response writer
+ *
+ * @param writer A response writer
*/
private void writeScriptStart(ResponseWriter writer) throws IOException {
writer.startElement("script", this);
@@ -141,8 +150,8 @@
/**
* Write the end of the script for client-side validation.
- *
- * @param writer A re
svn commit: r165229 - /struts/shale/trunk/use-cases/src/web/WEB-INF/faces-config.xml
Author: dgeary Date: Thu Apr 28 16:24:30 2005 New Revision: 165229 URL: http://svn.apache.org/viewcvs?rev=165229&view=rev Log: Reinstated some navigation cases that don't use dialogs and fixed the class name of the validator Test managed bean Modified: struts/shale/trunk/use-cases/src/web/WEB-INF/faces-config.xml Modified: struts/shale/trunk/use-cases/src/web/WEB-INF/faces-config.xml URL: http://svn.apache.org/viewcvs/struts/shale/trunk/use-cases/src/web/WEB-INF/faces-config.xml?rev=165229&r1=165228&r2=165229&view=diff == --- struts/shale/trunk/use-cases/src/web/WEB-INF/faces-config.xml (original) +++ struts/shale/trunk/use-cases/src/web/WEB-INF/faces-config.xml Thu Apr 28 16:24:30 2005 @@ -112,7 +112,7 @@ validate$test - org.apache.shale.usecases.validate.Test + org.apache.shale.usecases.validator.Test request @@ -199,10 +199,6 @@ * - usecases$toplevel - /usecases.jsp - - logon$authenticated /usecases.jsp @@ -226,10 +222,9 @@ logon$unauthenticated /usecases.jsp - - validate$test - /validator/test.jsp - + +--> + validate$test /validator/test.jsp @@ -238,8 +233,22 @@ validate$thankYou /validator/thankYou.jsp + + usecases$toplevel + /usecases.jsp + + + + + + usecases$toplevel + /usecases.jsp + + + validate$test + /validator/test.jsp + ---> - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r165057 - /struts/shale/trunk/core-library/src/java/org/apache/shale/dialog/Status.java
Author: dgeary
Date: Wed Apr 27 15:06:31 2005
New Revision: 165057
URL: http://svn.apache.org/viewcvs?rev=165057&view=rev
Log:
Made the current dialog's name and state publicly available
Modified:
struts/shale/trunk/core-library/src/java/org/apache/shale/dialog/Status.java
Modified:
struts/shale/trunk/core-library/src/java/org/apache/shale/dialog/Status.java
URL:
http://svn.apache.org/viewcvs/struts/shale/trunk/core-library/src/java/org/apache/shale/dialog/Status.java?rev=165057&r1=165056&r2=165057&view=diff
==
---
struts/shale/trunk/core-library/src/java/org/apache/shale/dialog/Status.java
(original)
+++
struts/shale/trunk/core-library/src/java/org/apache/shale/dialog/Status.java
Wed Apr 27 15:06:31 2005
@@ -271,4 +271,18 @@
}
+/**
+ * Return the name of the currently executing dialog
+ */
+public String getDialogName() {
+ return peek().getDialogName();
+}
+
+/**
+ * Return the name of the currently executing dialog's state
+ */
+public String getStateName() {
+ return peek().getStateName();
+}
+
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r164962 - /struts/shale/trunk/core-library/src/java/org/apache/shale/dialog/DialogNavigationHandler.java
Author: dgeary
Date: Wed Apr 27 01:49:04 2005
New Revision: 164962
URL: http://svn.apache.org/viewcvs?rev=164962&view=rev
Log:
Modified getStatus() to store status object according to the context param
org.apache.shale.dialog.STATUS, if specified in web.xml
Modified:
struts/shale/trunk/core-library/src/java/org/apache/shale/dialog/DialogNavigationHandler.java
Modified:
struts/shale/trunk/core-library/src/java/org/apache/shale/dialog/DialogNavigationHandler.java
URL:
http://svn.apache.org/viewcvs/struts/shale/trunk/core-library/src/java/org/apache/shale/dialog/DialogNavigationHandler.java?rev=164962&r1=164961&r2=164962&view=diff
==
---
struts/shale/trunk/core-library/src/java/org/apache/shale/dialog/DialogNavigationHandler.java
(original)
+++
struts/shale/trunk/core-library/src/java/org/apache/shale/dialog/DialogNavigationHandler.java
Wed Apr 27 01:49:04 2005
@@ -262,10 +262,11 @@
private Status getStatus(FacesContext context, boolean create) {
Map map = context.getExternalContext().getSessionMap();
-Status status = (Status) map.get(getStatusKey(context));
+ String key = getStatusKey(context);
+Status status = (Status) map.get(key);
if (create && (status == null)) {
status = new Status();
-map.put(Globals.STATUS, status);
+map.put(key, status);
}
return status;
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r161962 - in struts/shale/trunk: core-library/build.xml core-library/src/java/org/apache/shale/validator/messages_de.properties use-cases/build.xml use-cases/src/web/validator/test.jsp
Author: dgeary
Date: Tue Apr 19 13:20:09 2005
New Revision: 161962
URL: http://svn.apache.org/viewcvs?view=rev&rev=161962
Log:
Added a German resource bundle, donated by Matthias Wessendorf, for the
standard Commons Validator messages.
Added:
struts/shale/trunk/core-library/src/java/org/apache/shale/validator/messages_de.properties
Modified:
struts/shale/trunk/core-library/build.xml
struts/shale/trunk/use-cases/build.xml
struts/shale/trunk/use-cases/src/web/validator/test.jsp
Modified: struts/shale/trunk/core-library/build.xml
URL:
http://svn.apache.org/viewcvs/struts/shale/trunk/core-library/build.xml?view=diff&r1=161961&r2=161962
==
--- struts/shale/trunk/core-library/build.xml (original)
+++ struts/shale/trunk/core-library/build.xml Tue Apr 19 13:20:09 2005
@@ -75,7 +75,7 @@
-
+
Added:
struts/shale/trunk/core-library/src/java/org/apache/shale/validator/messages_de.properties
URL:
http://svn.apache.org/viewcvs/struts/shale/trunk/core-library/src/java/org/apache/shale/validator/messages_de.properties?view=auto&rev=161962
==
---
struts/shale/trunk/core-library/src/java/org/apache/shale/validator/messages_de.properties
(added)
+++
struts/shale/trunk/core-library/src/java/org/apache/shale/validator/messages_de.properties
Tue Apr 19 13:20:09 2005
@@ -0,0 +1,16 @@
+errors.required={0} wird ben\u00F6tigt.
+errors.minlength={0} darf nicht kleiner als {1} Zeichen sein.
+errors.maxlength={0} darf nicht kleiner als {1} Zeichen sein.
+errors.invalid={0} ist ung\u00FCltig.
+
+errors.byte={0} muss byte sein.
+errors.short={0} muss short sein.
+errors.integer={0} muss integer sein.
+errors.long={0} muss long sein.
+errors.float={0} muss float sein.
+errors.double={0} muss double sein.
+
+errors.date={0} ist kein Datum.
+errors.range={0} liegt nicht zwischen {1} und {2}.
+errors.creditcard={0} ist keine g\u00FCltige Kreditkartenummer.
+errors.email={0} ist keine g\u00FCltige E-Mail-Adresse.
Modified: struts/shale/trunk/use-cases/build.xml
URL:
http://svn.apache.org/viewcvs/struts/shale/trunk/use-cases/build.xml?view=diff&r1=161961&r2=161962
==
--- struts/shale/trunk/use-cases/build.xml (original)
+++ struts/shale/trunk/use-cases/build.xml Tue Apr 19 13:20:09 2005
@@ -82,7 +82,7 @@
-
+
Modified: struts/shale/trunk/use-cases/src/web/validator/test.jsp
URL:
http://svn.apache.org/viewcvs/struts/shale/trunk/use-cases/src/web/validator/test.jsp?view=diff&r1=161961&r2=161962
==
--- struts/shale/trunk/use-cases/src/web/validator/test.jsp (original)
+++ struts/shale/trunk/use-cases/src/web/validator/test.jsp Tue Apr 19 13:20:09
2005
@@ -55,9 +55,9 @@
+ arg="#{messages['validate.test.amount']}"
+ server="false"
+ client="true"/>
svn commit: r161825 [2/2] - in struts/shale/trunk: ./ core-library/ core-library/src/conf/ core-library/src/java/org/apache/shale/ core-library/src/java/org/apache/shale/component/ core-library/src/java/org/apache/shale/faces/ core-library/src/java/org/apache/shale/taglib/ core-library/src/java/org/apache/shale/util/ core-library/src/java/org/apache/shale/validator/ use-cases/ use-cases/src/java/org/apache/shale/usecases/validator/ use-cases/src/java/org/apache/shale/usecases/view/ use-cases/src/web/ use-cases/src/web/WEB-INF/ use-cases/src/web/validator/
Added: struts/shale/trunk/use-cases/src/web/WEB-INF/validator-rules.xml URL: http://svn.apache.org/viewcvs/struts/shale/trunk/use-cases/src/web/WEB-INF/validator-rules.xml?view=auto&rev=161825 == --- struts/shale/trunk/use-cases/src/web/WEB-INF/validator-rules.xml (added) +++ struts/shale/trunk/use-cases/src/web/WEB-INF/validator-rules.xml Mon Apr 18 19:07:17 2005 @@ -0,0 +1,896 @@ +http://jakarta.apache.org/commons/dtds/validator_1_0.dtd";> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Modified: struts/shale/trunk/use-cases/src/web/usecases.jsp URL: http://svn.apache.org/viewcvs/struts/shale/trunk/use-cases/src/web/usecases.jsp?view=diff&r1=161824&r2=161825 == --- struts/shale/trunk/use-cases/src/web/usecases.jsp (original) +++ struts/shale/trunk/use-cases/src/web/usecases.jsp Mon Apr 18 19:07:17 2005 @@ -123,6 +123,18 @@ + + + + + + + + + + + Added: struts/shale/trunk/use-cases/src/web/validator/test.jsp URL: http://svn.apache.org/viewcvs/struts/shale/trunk/use-cases/src/web/validator/test.jsp?view=auto&rev=161825 == --- struts/shale/trunk/use-cases/src/web/validator/test.jsp (added) +++ struts/shale/trunk/use-cases/src/web/validator/test.jsp Mon Apr 18 19:07:17 2005 @@ -0,0 +1,172 @@ +<[EMAIL PROTECTED] contentType="text/html;charset=UTF-8"%> +<%@ 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://struts.apache.org/shale/core"; %> + +<%-- + + Copyright 2004-2005 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. + +--%> + + +<[EMAIL PROTECTED] file="../messages.jspf"%> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Added: struts/shale/trunk/use-cases/src/web/validator/thankYou.jsp URL: http://svn.apache.org/viewcvs/struts/shale/trunk/use-cases/src/web/validator/thankYou.jsp?view=auto&rev=161825 == --- struts/shale/trunk/use-cases/src/web/validator/thankYou.jsp (added) +++ struts/shale/trunk/use-cases/src/web/validator/thankYou.jsp Mon Apr 18 19:07:17 2005 @@ -0,0 +1,98 @@ +<[EMAIL PROTECTED] contentType="text/html;charset=UTF-8"%> +<%@ 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://struts.apache.org/shale/core"; %> + +<%-- + + Copyright 2004-2005 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. + +--%> + + +<[EMAIL PROTECTED] file="../messages.jspf"%> + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
svn commit: r161618 - struts/shale/trunk/core-library/src/java/org/apache/shale/validator
Author: dgeary Date: Sat Apr 16 19:27:25 2005 New Revision: 161618 URL: http://svn.apache.org/viewcvs?view=rev&rev=161618 Log: use-cases/build.xml now includes core-library/build.properties. I removed properties from use-cases/build.xml that were also defined in core-library/build.properties.sample. Added: struts/shale/trunk/core-library/src/java/org/apache/shale/validator/ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r161585 - struts/shale/trunk/core-library/build.properties.sample struts/shale/trunk/core-library/build.xml
Author: dgeary Date: Sat Apr 16 10:02:29 2005 New Revision: 161585 URL: http://svn.apache.org/viewcvs?view=rev&rev=161585 Log: Removed redundant property definitions from build.xml in core-library. Those properties are defined in build.properties.sample Modified: struts/shale/trunk/core-library/build.properties.sample struts/shale/trunk/core-library/build.xml Modified: struts/shale/trunk/core-library/build.properties.sample URL: http://svn.apache.org/viewcvs/struts/shale/trunk/core-library/build.properties.sample?view=diff&r1=161584&r2=161585 == --- struts/shale/trunk/core-library/build.properties.sample (original) +++ struts/shale/trunk/core-library/build.properties.sample Sat Apr 16 10:02:29 2005 @@ -37,10 +37,6 @@ # Jakarta Commons Digester library digester.home = /usr/local/commons-digester-1.6 -# (Optional) The absolute or relative pathname of the directory containing -# the "findbugs" tool (http://findbugs.sourceforge/net/) -findbugs.home = /usr/local/findbugs-0.8.6 - # The absolute or relative pathname of the JavaServer Faces # implementation jsf.home = /usr/local/jsf-1_1_01 @@ -56,11 +52,15 @@ # Servlet API classes JAR file (servlet.jar) server.home = /usr/local/jakarta-tomcat-5.0.28 -# (OPTIONAL) The absolute or relative pathname to the "dist" directory -# of the Spring Framework distribution (version 1.1.5 or later) -spring.home=/usr/local/spring-framework-1.1.5/dist - # The absolute or relative pathname of the Apache Struts # distribution struts.home = /usr/local/jakarta-struts + +# (OPTIONAL) The absolute or relative pathname to the "dist" directory +# of the Spring Framework distribution (version 1.1.5 or later) +spring.home=/usr/local/spring-framework-1.1.5 + +# (Optional) The absolute or relative pathname of the directory containing +# the "findbugs" tool (http://findbugs.sourceforge/net/) +findbugs.home = /usr/local/findbugs-0.8.6 Modified: struts/shale/trunk/core-library/build.xml URL: http://svn.apache.org/viewcvs/struts/shale/trunk/core-library/build.xml?view=diff&r1=161584&r2=161585 == --- struts/shale/trunk/core-library/build.xml (original) +++ struts/shale/trunk/core-library/build.xml Sat Apr 16 10:02:29 2005 @@ -33,16 +33,7 @@ - - - - - - - - -
svn commit: r158855 - struts/shale/trunk/core-library/src/java/org/apache/shale/faces/ShaleApplicationFilter.java
Author: dgeary Date: Wed Mar 23 16:20:02 2005 New Revision: 158855 URL: http://svn.apache.org/viewcvs?view=rev&rev=158855 Log: Fixed formatting of javadoc for ShaleApplicationFilter as an excuse to test my first Shale commit Modified: struts/shale/trunk/core-library/src/java/org/apache/shale/faces/ShaleApplicationFilter.java Modified: struts/shale/trunk/core-library/src/java/org/apache/shale/faces/ShaleApplicationFilter.java URL: http://svn.apache.org/viewcvs/struts/shale/trunk/core-library/src/java/org/apache/shale/faces/ShaleApplicationFilter.java?view=diff&r1=158854&r2=158855 == --- struts/shale/trunk/core-library/src/java/org/apache/shale/faces/ShaleApplicationFilter.java (original) +++ struts/shale/trunk/core-library/src/java/org/apache/shale/faces/ShaleApplicationFilter.java Wed Mar 23 16:20:02 2005 @@ -69,12 +69,12 @@ * * Invoke a command named preprocess (in the shale * catalog), if it exists. This is where you should insert commands to be - * executed before [EMAIL PROTECTED] ShaleApplicationFilter} passes the + * executed before [EMAIL PROTECTED] ShaleApplicationFilter} passes the * request on to the next filter or servlet. * Execute the remainder of the filter chain for this request. * Invokes a command named postprocess (in the shale * catalog), if it exists. This is where you should insert commands to be - * executed after control returns from the invoked filter or + * executed after control returns from the invoked filter or * servlet. Note that it is no longer possible, at this point, to replace * the response content produced by the filter or servlet -- that should * be done in a preprocess step. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
