[CONF] Confluence Changes in the last 24 hours
- This is a daily summary of all recent changes in Confluence. - Updated Spaces: - Apache Geronimo Development (GMOxDEV) http://cwiki.apache.org/confluence/display/GMOxDEV | |-Pages Added or Edited in This Space |-- Monitoring and Management Service was last edited by ginemesis (02:24 PM). | http://cwiki.apache.org/confluence/display/GMOxDEV/Monitoring+and+Management+Service Apache CXF 2.0 Documentation (CXF20DOC) http://cwiki.apache.org/confluence/display/CXF20DOC | |-Pages Added or Edited in This Space |-- WSDL to Java was last edited by mmao (12:09 AM). | http://cwiki.apache.org/confluence/display/CXF20DOC/WSDL+to+Java Apache Struts 2 Documentation (WW) http://cwiki.apache.org/confluence/display/WW | |-Pages Added or Edited in This Space |-- Release Notes 2.0.10 was last edited by [EMAIL PROTECTED] (12:47 PM). | http://cwiki.apache.org/confluence/display/WW/Release+Notes+2.0.10 | |-New Comments in This Space |-- http://cwiki.apache.org/confluence/display/WW/Element+Annotation (1) |-- http://cwiki.apache.org/confluence/display/WW/RestfulActionMapper (1) |-- http://cwiki.apache.org/confluence/display/WW/Validation+Annotation (1) Apache Wicket Website (WICKETxSITE) http://cwiki.apache.org/confluence/display/WICKETxSITE | |-Pages Added or Edited in This Space |-- Navigation was last edited by gwynevans (12:57 PM). | http://cwiki.apache.org/confluence/display/WICKETxSITE/Navigation |-- Blogs was last edited by gwynevans (12:47 PM). | http://cwiki.apache.org/confluence/display/WICKETxSITE/Blogs Apache Cayenne (CAY) http://cwiki.apache.org/confluence/display/CAY | |-Pages Added or Edited in This Space |-- Database Support was last edited by andrus (10:52 AM). | http://cwiki.apache.org/confluence/display/CAY/Database+Support Apache Wicket (WICKET) http://cwiki.apache.org/confluence/display/WICKET | |-Pages Added or Edited in This Space |-- Rss Page was last edited by wireframe (08:45 PM). | http://cwiki.apache.org/confluence/display/WICKET/Rss+Page |-- Companies that provide services was last edited by ridabenjelloun (06:34 AM). | http://cwiki.apache.org/confluence/display/WICKET/Companies+that+provide+services Apache Geronimo v2.0 - ES (GMOxDOC20es) http://cwiki.apache.org/confluence/display/GMOxDOC20es | |-Pages Added or Edited in This Space |-- NOTAS-DE-LA-VERSION-2.0.1.TXT was last edited by [EMAIL PROTECTED] (08:22 AM). | http://cwiki.apache.org/confluence/display/GMOxDOC20es/NOTAS-DE-LA-VERSION-2.0.1.TXT Apache Directory Project Management (DIRxPMGT) http://cwiki.apache.org/confluence/display/DIRxPMGT | |-Pages Added or Edited in This Space |-- OID Assignment Scheme was last edited by akarasulu (07:13 AM). | http://cwiki.apache.org/confluence/display/DIRxPMGT/OID+Assignment+Scheme Apache Geronimo Documentation (geronimo) http://cwiki.apache.org/confluence/display/geronimo | |-Pages Added or Edited in This Space |-- Pluggable Administration Console was created by hcunico (07:01 AM). | http://cwiki.apache.org/confluence/display/geronimo/Pluggable+Administration+Console |-- Presentations was created by hcunico (06:59 AM). | http://cwiki.apache.org/confluence/display/geronimo/Presentations Apache James (JAMES) http://cwiki.apache.org/confluence/display/JAMES | |-Pages Added or Edited in This Space |-- Mailing Lists was created by bago (04:37 PM). | http://cwiki.apache.org/confluence/display/JAMES/Mailing+Lists |-- Index was created by greddin (07:28 AM). | http://cwiki.apache.org/confluence/display/JAMES/Index |-- Guidelines was created by bago (11:20 AM). | http://cwiki.apache.org/confluence/display/JAMES/Guidelines |-- News Archive was created by bago (11:13 AM). | http://cwiki.apache.org/confluence/display/JAMES/News+Archive |-- Navigation was created by bago (10:47 AM). | http://cwiki.apache.org/confluence/display/JAMES/Navigation |-- May 2007 - Apache Mime4J 0.3 Final Released was created by bago (09:43 AM). | http://cwiki.apache.org/confluence/display/JAMES/2007/08/23/May+2007+-+Apache+Mime4J+0.3+Final+Released |-- May 2007 - Mailet API sub-project lives was created by bago (09:43 AM). | http://cwiki.apache.org/confluence/display/JAMES/2007/08/23/May+2007+-+Mailet+API+sub-project+lives |-- Apr 2007 - JAMES Server 2.3.1 Final Released was created by bago (09:42 AM). | http://cwiki.apache.org/confluence/display/JAMES/2007/08/23/Apr+2007+-+JAMES+Server+2.3.1+Final+Released |-- Apr 2007 - JAMES Server 2.3.1 RC1 released was created by bago (09:42 AM). | http://cwiki.apache.org/confluence/display/JAMES/2007/08/23/Apr+2007+-+JAMES+Server+2.3.1+RC1+released |-- Apr 2007 - Apache JAMES Project Guidelines published was created by bago (09:41 AM). | http://cwiki.apache.org/confluence/display/
svn commit: r569304 - in /struts/struts2/branches/STRUTS_2_0_X/core/src: main/java/org/apache/struts2/components/ main/java/org/apache/struts2/portlet/util/ test/java/org/apache/struts2/portlet/util/
Author: nilsga Date: Fri Aug 24 02:12:20 2007 New Revision: 569304 URL: http://svn.apache.org/viewvc?rev=569304&view=rev Log: WW-1713 Backport to 2.0.x Modified: struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/Form.java struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/URL.java struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/portlet/util/PortletUrlHelper.java struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/portlet/util/PortletUrlHelperTest.java Modified: struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/Form.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/Form.java?rev=569304&r1=569303&r2=569304&view=diff == --- struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/Form.java (original) +++ struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/Form.java Fri Aug 24 02:12:20 2007 @@ -382,7 +382,7 @@ } } if (action != null) { -String result = PortletUrlHelper.buildUrl(action, namespace, +String result = PortletUrlHelper.buildUrl(action, namespace, null, getParameters(), type, portletMode, windowState); addParameter("action", result); Modified: struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/URL.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/URL.java?rev=569304&r1=569303&r2=569304&view=diff == --- struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/URL.java (original) +++ struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/URL.java Fri Aug 24 02:12:20 2007 @@ -250,7 +250,7 @@ String result; if (value == null && action != null) { if (Dispatcher.getInstance().isPortletSupportActive() && PortletActionContext.isPortletRequest()) { -result = PortletUrlHelper.buildUrl(action, namespace, parameters, portletUrlType, portletMode, windowState); +result = PortletUrlHelper.buildUrl(action, namespace, method, parameters, portletUrlType, portletMode, windowState); } else { result = determineActionURL(action, namespace, method, req, res, parameters, scheme, includeContext, encode, forceAddSchemeHostAndPort, escapeAmp); Modified: struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/portlet/util/PortletUrlHelper.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/portlet/util/PortletUrlHelper.java?rev=569304&r1=569303&r2=569304&view=diff == --- struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/portlet/util/PortletUrlHelper.java (original) +++ struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/portlet/util/PortletUrlHelper.java Fri Aug 24 02:12:20 2007 @@ -22,8 +22,8 @@ import java.io.UnsupportedEncodingException; import java.net.URLEncoder; -import java.util.HashMap; import java.util.Iterator; +import java.util.LinkedHashMap; import java.util.Map; import java.util.StringTokenizer; @@ -59,15 +59,16 @@ * * @param action The action the URL should invoke. * @param namespace The namespace of the action to invoke. + * @param method The method of the action to invoke. * @param params The parameters of the URL. * @param type The type of the url, either action or render * @param mode The PortletMode of the URL. * @param state The WindowState of the URL. * @return The URL String. */ -public static String buildUrl(String action, String namespace, Map params, +public static String buildUrl(String action, String namespace, String method, Map params, String type, String mode, String state) { -return buildUrl(action, namespace, params, null, type, mode, state, +return buildUrl(action, namespace, method, params, null, type, mode, state, true, true); } @@ -76,9 +77,10 @@ * * @see #buildUrl(String, String, Map, String, String, String) */ -public static String buildUrl(String action, String namespace, Map params, +public static String buildUrl(String action, String namespace, String method, Map params, String scheme, String type, String portletMode, String windowState, boolean includeContext,
svn commit: r569305 - /struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/portlet/dispatcher/Jsr168Dispatcher.java
Author: nilsga Date: Fri Aug 24 02:13:29 2007 New Revision: 569305 URL: http://svn.apache.org/viewvc?rev=569305&view=rev Log: WW-2013 Backport to 2.0.x Modified: struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/portlet/dispatcher/Jsr168Dispatcher.java Modified: struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/portlet/dispatcher/Jsr168Dispatcher.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/portlet/dispatcher/Jsr168Dispatcher.java?rev=569305&r1=569304&r2=569305&view=diff == --- struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/portlet/dispatcher/Jsr168Dispatcher.java (original) +++ struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/portlet/dispatcher/Jsr168Dispatcher.java Fri Aug 24 02:13:29 2007 @@ -293,6 +293,7 @@ LOG.debug("Entering render"); resetActionContext(); response.setTitle(getTitle(request)); +if(!request.getWindowState().equals(WindowState.MINIMIZED)) { try { // Check to see if an event set the render to be included directly serviceAction(request, response, getActionMapping(request), @@ -303,6 +304,7 @@ } finally { resetActionContext(); } + } } /**
svn commit: r569307 - in /struts/struts2/branches/STRUTS_2_0_X/apps/portlet: ./ src/main/java/org/apache/struts2/portlet/example/ src/main/java/org/apache/struts2/portlet/example/fileupload/ src/main/
Author: nilsga Date: Fri Aug 24 02:16:30 2007 New Revision: 569307 URL: http://svn.apache.org/viewvc?rev=569307&view=rev Log: Backported changes to portlet sample application from 2.1 Added: struts/struts2/branches/STRUTS_2_0_X/apps/portlet/src/main/java/org/apache/struts2/portlet/example/FormExampleModelDriven.java struts/struts2/branches/STRUTS_2_0_X/apps/portlet/src/main/java/org/apache/struts2/portlet/example/fileupload/ struts/struts2/branches/STRUTS_2_0_X/apps/portlet/src/main/java/org/apache/struts2/portlet/example/fileupload/FileUploadAction.java struts/struts2/branches/STRUTS_2_0_X/apps/portlet/src/main/java/org/apache/struts2/portlet/example/model/ struts/struts2/branches/STRUTS_2_0_X/apps/portlet/src/main/java/org/apache/struts2/portlet/example/model/Name.java struts/struts2/branches/STRUTS_2_0_X/apps/portlet/src/main/resources/struts-edit.xml struts/struts2/branches/STRUTS_2_0_X/apps/portlet/src/main/resources/struts-help.xml struts/struts2/branches/STRUTS_2_0_X/apps/portlet/src/main/resources/struts-view.xml struts/struts2/branches/STRUTS_2_0_X/apps/portlet/src/main/webapp/WEB-INF/view/fileUpload.jsp struts/struts2/branches/STRUTS_2_0_X/apps/portlet/src/main/webapp/WEB-INF/view/fileUploadSuccess.jsp struts/struts2/branches/STRUTS_2_0_X/apps/portlet/src/main/webapp/WEB-INF/view/formExampleInputModelDriven.jsp Modified: struts/struts2/branches/STRUTS_2_0_X/apps/portlet/pom.xml struts/struts2/branches/STRUTS_2_0_X/apps/portlet/src/main/resources/struts.xml struts/struts2/branches/STRUTS_2_0_X/apps/portlet/src/main/webapp/WEB-INF/portlet.xml struts/struts2/branches/STRUTS_2_0_X/apps/portlet/src/main/webapp/WEB-INF/view/index.jsp struts/struts2/branches/STRUTS_2_0_X/apps/portlet/src/main/webapp/WEB-INF/web.xml Modified: struts/struts2/branches/STRUTS_2_0_X/apps/portlet/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/apps/portlet/pom.xml?rev=569307&r1=569306&r2=569307&view=diff == --- struts/struts2/branches/STRUTS_2_0_X/apps/portlet/pom.xml (original) +++ struts/struts2/branches/STRUTS_2_0_X/apps/portlet/pom.xml Fri Aug 24 02:16:30 2007 @@ -8,7 +8,7 @@ 2.0.10-SNAPSHOT org.apache.struts -struts2-portlet +struts2-portlet-branch war Portlet Webapp @@ -29,6 +29,12 @@ org.apache.struts struts2-spring-plugin ${pom.version} + + + javax.servlet + servlet-api + + org.apache.struts @@ -51,20 +57,25 @@ commons-digester 1.8 - - - - javax.servlet - servlet-api - 2.4 - provided - commons-lang commons-lang -2.0 +2.1 - - + + commons-fileupload + commons-fileupload + 1.1.1 + + + commons-collections + commons-collections + 3.1 + + + log4j + log4j + 1.2.12 + Added: struts/struts2/branches/STRUTS_2_0_X/apps/portlet/src/main/java/org/apache/struts2/portlet/example/FormExampleModelDriven.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/apps/portlet/src/main/java/org/apache/struts2/portlet/example/FormExampleModelDriven.java?rev=569307&view=auto == --- struts/struts2/branches/STRUTS_2_0_X/apps/portlet/src/main/java/org/apache/struts2/portlet/example/FormExampleModelDriven.java (added) +++ struts/struts2/branches/STRUTS_2_0_X/apps/portlet/src/main/java/org/apache/struts2/portlet/example/FormExampleModelDriven.java Fri Aug 24 02:16:30 2007 @@ -0,0 +1,37 @@ +/* + * $Id: FormExample.java 471756 2006-11-06 15:01:43Z husted $ + * + * 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. + */ +package org.apache.
svn commit: r569333 - in /struts/struts2/branches/STRUTS_2_0_X/apps/portlet/src/main: java/org/apache/struts2/portlet/example/FormExample.java webapp/WEB-INF/view/formExampleInputPrg.jsp webapp/WEB-IN
Author: nilsga Date: Fri Aug 24 03:30:27 2007 New Revision: 569333 URL: http://svn.apache.org/viewvc?rev=569333&view=rev Log: WW-2105 Added redirectAction-example Added: struts/struts2/branches/STRUTS_2_0_X/apps/portlet/src/main/webapp/WEB-INF/view/formExampleInputPrg.jsp Modified: struts/struts2/branches/STRUTS_2_0_X/apps/portlet/src/main/java/org/apache/struts2/portlet/example/FormExample.java struts/struts2/branches/STRUTS_2_0_X/apps/portlet/src/main/webapp/WEB-INF/view/index.jsp Modified: struts/struts2/branches/STRUTS_2_0_X/apps/portlet/src/main/java/org/apache/struts2/portlet/example/FormExample.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/apps/portlet/src/main/java/org/apache/struts2/portlet/example/FormExample.java?rev=569333&r1=569332&r2=569333&view=diff == --- struts/struts2/branches/STRUTS_2_0_X/apps/portlet/src/main/java/org/apache/struts2/portlet/example/FormExample.java (original) +++ struts/struts2/branches/STRUTS_2_0_X/apps/portlet/src/main/java/org/apache/struts2/portlet/example/FormExample.java Fri Aug 24 03:30:27 2007 @@ -44,4 +44,7 @@ public void setLastName(String lastName) { this.lastName = lastName; } +public String displayResult() { + return "displayResult"; +} } Added: struts/struts2/branches/STRUTS_2_0_X/apps/portlet/src/main/webapp/WEB-INF/view/formExampleInputPrg.jsp URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/apps/portlet/src/main/webapp/WEB-INF/view/formExampleInputPrg.jsp?rev=569333&view=auto == --- struts/struts2/branches/STRUTS_2_0_X/apps/portlet/src/main/webapp/WEB-INF/view/formExampleInputPrg.jsp (added) +++ struts/struts2/branches/STRUTS_2_0_X/apps/portlet/src/main/webapp/WEB-INF/view/formExampleInputPrg.jsp Fri Aug 24 03:30:27 2007 @@ -0,0 +1,8 @@ +<%@ taglib prefix="s" uri="/struts-tags" %> + +Input your name + + + + + Modified: struts/struts2/branches/STRUTS_2_0_X/apps/portlet/src/main/webapp/WEB-INF/view/index.jsp URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/apps/portlet/src/main/webapp/WEB-INF/view/index.jsp?rev=569333&r1=569332&r2=569333&view=diff == --- struts/struts2/branches/STRUTS_2_0_X/apps/portlet/src/main/webapp/WEB-INF/view/index.jsp (original) +++ struts/struts2/branches/STRUTS_2_0_X/apps/portlet/src/main/webapp/WEB-INF/view/index.jsp Fri Aug 24 03:30:27 2007 @@ -4,6 +4,7 @@ Here you'll find examples of what is possible with the Struts Portlet integration framework. ">A simple form +">Form example with proper PRG ">Model driven example ">Validation ">Token
Issues Closed: week of 2007-08-24
Struts2 - Friday, August 24, 2007 15 closed in last 7 days [WW-2105] Handle redirectAction result type in a portlet Nils-Helge Garli - Bug - [2.0.10, 2.1.0] http://issues.apache.org/struts/browse/WW-2105 [WW-2106] HTML loaded by the ajax tags is parsed for dojo widgets, this should be optional and there should be a "parseContent" attribute to control it Musachy Barroso - Improvement - [2.1.0] http://issues.apache.org/struts/browse/WW-2106 [WW-2059] JSONValidationInterceptor broken if Action is ModelDriven Musachy Barroso - Sub-task - [2.1.0] http://issues.apache.org/struts/browse/WW-2059 [WW-1873] Render freemarker templates correctly under portlet environment Unassigned - Bug - [2.0.10, 2.1.0] http://issues.apache.org/struts/browse/WW-1873 [WW-2108] Make being able to remember selected tab using a cookie Rene Gielen - New Feature - [2.0.10, 2.1.0] http://issues.apache.org/struts/browse/WW-2108 [WW-2121] I want to secure my web application using Container managed security by using Websphere Application Server6.1.the security credentials are not propagated to the Filter class.Where as the same works 100% fine in TOMCAT server. Unassigned - Bug - [] http://issues.apache.org/struts/browse/WW-2121 [WW-1989] FileUpload doesn't work in portlets Nils-Helge Garli - Bug - [2.0.10, 2.1.0] http://issues.apache.org/struts/browse/WW-1989 [WW-2013] Add default window state handling Nils-Helge Garli - Improvement - [2.0.10, 2.1.0] http://issues.apache.org/struts/browse/WW-2013 [WW-1813] Tree Tag's treeSelectedTopic attribute doesn't works Musachy Barroso - Bug - [2.1.0] http://issues.apache.org/struts/browse/WW-1813 [WW-1713] Using 'url' tag library element with Action & Method doens't work. Nils-Helge Garli - Sub-task - [2.0.10, 2.1.0] http://issues.apache.org/struts/browse/WW-1713 [WW-2052] Don't set result jsp file in request parameter on redirect after POST Nils-Helge Garli - Improvement - [2.0.10, 2.1.0] http://issues.apache.org/struts/browse/WW-2052 [WW-2070] Add an object browser to the debugging interceptor Musachy Barroso - New Feature - [2.1.0] http://issues.apache.org/struts/browse/WW-2070 [WW-2053] the Interceptors:fileUpload,model-driven,servlet-config don't work in portlet Nils-Helge Garli - Bug - [2.0.10, 2.1.0] http://issues.apache.org/struts/browse/WW-2053 [WW-2130] I have java.lang.ExceptionInInitializerError when trying to use xml validation. Unassigned - Bug - [] http://issues.apache.org/struts/browse/WW-2130 [WW-2101] PreparatorServlet causes request and response objects to be used outside of service() method Nils-Helge Garli - Bug - [2.0.10, 2.1.0] http://issues.apache.org/struts/browse/WW-2101
svn commit: r569576 [1/10] - in /struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo: ./ src/ src/animation/ src/cal/ src/charting/ src/charting/svg/ src/charting/vml/
Author: musachy Date: Fri Aug 24 16:47:20 2007 New Revision: 569576 URL: http://svn.apache.org/viewvc?rev=569576&view=rev Log: WW-2134 Upgrade Dojo from 0.4.2 to 0.4.3 to address possible XSS Issues Modified: struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/build.txt struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/dojo.js struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/dojo.js.uncompressed.js struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/AdapterRegistry.js struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/Deferred.js struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/DeferredList.js struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/a11y.js struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/animation.js struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/animation/Animation.js struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/animation/AnimationEvent.js struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/animation/AnimationSequence.js struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/animation/Timer.js struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/animation/__package__.js struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/behavior.js struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/bootstrap1.js struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/browser_debug.js struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/browser_debug_xd.js struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/cal/iCalendar.js struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/cal/textDirectory.js struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/charting/Axis.js struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/charting/Chart.js struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/charting/Plot.js struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/charting/PlotArea.js struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/charting/Plotters.js struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/charting/Series.js struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/charting/__package__.js struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/charting/svg/Axis.js struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/charting/svg/PlotArea.js struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/charting/svg/Plotters.js struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/charting/vml/Axis.js struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/charting/vml/PlotArea.js struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/charting/vml/Plotters.js struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/collections/ArrayList.js struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/collections/BinaryTree.js struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/collections/Collections.js struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/collections/Dictionary.js struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/collections/Graph.js struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/collections/Queue.js struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/collections/Set.js struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/collections/SkipList.js struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/collections/SortedList.js struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/collections/Stack.js struts/struts2/trunk/plugins/dojo/src
svn commit: r569576 [8/10] - in /struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo: ./ src/ src/animation/ src/cal/ src/charting/ src/charting/svg/ src/charting/vml/
Modified: struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/widget/TreeLoadingController.js URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/widget/TreeLoadingController.js?rev=569576&r1=569575&r2=569576&view=diff == --- struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/widget/TreeLoadingController.js (original) +++ struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/widget/TreeLoadingController.js Fri Aug 24 16:47:20 2007 @@ -8,6 +8,8 @@ http://dojotoolkit.org/community/licensing.shtml */ + + dojo.provide("dojo.widget.TreeLoadingController"); dojo.require("dojo.widget.TreeBasicController"); dojo.require("dojo.event.*"); Modified: struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/widget/TreeLoadingControllerV3.js URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/widget/TreeLoadingControllerV3.js?rev=569576&r1=569575&r2=569576&view=diff == --- struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/widget/TreeLoadingControllerV3.js (original) +++ struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/widget/TreeLoadingControllerV3.js Fri Aug 24 16:47:20 2007 @@ -8,6 +8,8 @@ http://dojotoolkit.org/community/licensing.shtml */ + + dojo.provide("dojo.widget.TreeLoadingControllerV3"); dojo.require("dojo.widget.TreeBasicControllerV3"); dojo.require("dojo.event.*"); Modified: struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/widget/TreeNode.js URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/widget/TreeNode.js?rev=569576&r1=569575&r2=569576&view=diff == --- struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/widget/TreeNode.js (original) +++ struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/widget/TreeNode.js Fri Aug 24 16:47:20 2007 @@ -8,6 +8,8 @@ http://dojotoolkit.org/community/licensing.shtml */ + + dojo.provide("dojo.widget.TreeNode"); dojo.require("dojo.html.*"); dojo.require("dojo.event.*"); Modified: struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/widget/TreeNodeV3.js URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/widget/TreeNodeV3.js?rev=569576&r1=569575&r2=569576&view=diff == --- struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/widget/TreeNodeV3.js (original) +++ struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/widget/TreeNodeV3.js Fri Aug 24 16:47:20 2007 @@ -8,6 +8,8 @@ http://dojotoolkit.org/community/licensing.shtml */ + + dojo.provide("dojo.widget.TreeNodeV3"); dojo.require("dojo.html.*"); dojo.require("dojo.event.*"); Modified: struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/widget/TreeRPCController.js URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/widget/TreeRPCController.js?rev=569576&r1=569575&r2=569576&view=diff == --- struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/widget/TreeRPCController.js (original) +++ struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/widget/TreeRPCController.js Fri Aug 24 16:47:20 2007 @@ -8,6 +8,8 @@ http://dojotoolkit.org/community/licensing.shtml */ + + dojo.provide("dojo.widget.TreeRPCController"); dojo.require("dojo.event.*"); dojo.require("dojo.json"); Modified: struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/widget/TreeRpcControllerV3.js URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/widget/TreeRpcControllerV3.js?rev=569576&r1=569575&r2=569576&view=diff == --- struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/widget/TreeRpcControllerV3.js (original) +++ struts/struts2/trunk/plugins/dojo/src/main/resources
svn commit: r569582 - in /struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui: treeExampleDynamic.jsp treeExampleStatic.jsp
Author: musachy Date: Fri Aug 24 16:58:27 2007 New Revision: 569582 URL: http://svn.apache.org/viewvc?rev=569582&view=rev Log: Fix URL in tree examples Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/treeExampleDynamic.jsp struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/treeExampleStatic.jsp Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/treeExampleDynamic.jsp URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/treeExampleDynamic.jsp?rev=569582&r1=569581&r2=569582&view=diff == --- struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/treeExampleDynamic.jsp (original) +++ struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/treeExampleDynamic.jsp Fri Aug 24 16:58:27 2007 @@ -13,7 +13,7 @@
svn commit: r569601 - /struts/site/src/site/xdoc/primer.xml
Author: pbenedict Date: Fri Aug 24 20:12:58 2007 New Revision: 569601 URL: http://svn.apache.org/viewvc?rev=569601&view=rev Log: STR-3080: Fix XSLT mispelling and update Velocity URL Modified: struts/site/src/site/xdoc/primer.xml Modified: struts/site/src/site/xdoc/primer.xml URL: http://svn.apache.org/viewvc/struts/site/src/site/xdoc/primer.xml?rev=569601&r1=569600&r2=569601&view=diff == --- struts/site/src/site/xdoc/primer.xml (original) +++ struts/site/src/site/xdoc/primer.xml Fri Aug 24 20:12:58 2007 @@ -1603,11 +1603,11 @@ JasperReports -http://jakarta.apache.org/velocity/";> +http://velocity.apache.org/";> Velocity -http://www.w3.org/TR/xslt";>XLST +http://www.w3.org/TR/xslt";>XSLT
svn commit: r569602 - /struts/struts1/branches/STRUTS_1_3_BRANCH/apps/src/site/xdoc/index.xml
Author: pbenedict Date: Fri Aug 24 20:20:01 2007 New Revision: 569602 URL: http://svn.apache.org/viewvc?rev=569602&view=rev Log: STR-3026: Remove planet struts links Modified: struts/struts1/branches/STRUTS_1_3_BRANCH/apps/src/site/xdoc/index.xml Modified: struts/struts1/branches/STRUTS_1_3_BRANCH/apps/src/site/xdoc/index.xml URL: http://svn.apache.org/viewvc/struts/struts1/branches/STRUTS_1_3_BRANCH/apps/src/site/xdoc/index.xml?rev=569602&r1=569601&r2=569602&view=diff == --- struts/struts1/branches/STRUTS_1_3_BRANCH/apps/src/site/xdoc/index.xml (original) +++ struts/struts1/branches/STRUTS_1_3_BRANCH/apps/src/site/xdoc/index.xml Fri Aug 24 20:20:01 2007 @@ -41,26 +41,26 @@ -http://planetstruts.org/struts-blank/";> + Blank - + Struts Blank is a template you can use to create your own application. You can copy and rename the WAR, deploy it to your server, and start adding your own code. -http://planetstruts.org/struts-cookbook/";> + Cookbook - + Struts Cookbook is a show-and-tell application that demonstrates some common use cases. The source code for each example can be viewed through the application itself. -http://planetstruts.org/struts-examples/";> + Examples - + Struts Example is a modular application. Modules include an "exercise" application to test and demonstrate the Struts Taglibs, @@ -69,9 +69,9 @@ validation and localization features, -http://planetstruts.org/struts-mailreader/";> + MailReader - + Struts MailReader is a best-practices example of a typical web application.
svn commit: r569603 - /struts/struts1/trunk/apps/src/site/xdoc/index.xml
Author: pbenedict Date: Fri Aug 24 20:20:07 2007 New Revision: 569603 URL: http://svn.apache.org/viewvc?rev=569603&view=rev Log: STR-3026: Remove planet struts links Modified: struts/struts1/trunk/apps/src/site/xdoc/index.xml Modified: struts/struts1/trunk/apps/src/site/xdoc/index.xml URL: http://svn.apache.org/viewvc/struts/struts1/trunk/apps/src/site/xdoc/index.xml?rev=569603&r1=569602&r2=569603&view=diff == --- struts/struts1/trunk/apps/src/site/xdoc/index.xml (original) +++ struts/struts1/trunk/apps/src/site/xdoc/index.xml Fri Aug 24 20:20:07 2007 @@ -41,26 +41,26 @@ -http://planetstruts.org/struts-blank/";> + Blank - + Struts Blank is a template you can use to create your own application. You can copy and rename the WAR, deploy it to your server, and start adding your own code. -http://planetstruts.org/struts-cookbook/";> + Cookbook - + Struts Cookbook is a show-and-tell application that demonstrates some common use cases. The source code for each example can be viewed through the application itself. -http://planetstruts.org/struts-examples/";> + Examples - + Struts Example is a modular application. Modules include an "exercise" application to test and demonstrate the Struts Taglibs, @@ -69,9 +69,9 @@ validation and localization features, -http://planetstruts.org/struts-mailreader/";> + MailReader - + Struts MailReader is a best-practices example of a typical web application.
svn commit: r569606 - in /struts/struts1/branches/STRUTS_1_3_BRANCH/core/src: main/java/org/apache/struts/validator/validwhen/ test/java/org/apache/struts/validator/
Author: pbenedict Date: Fri Aug 24 20:54:59 2007 New Revision: 569606 URL: http://svn.apache.org/viewvc?rev=569606&view=rev Log: STR-3088: Treat blank strings as *null* Modified: struts/struts1/branches/STRUTS_1_3_BRANCH/core/src/main/java/org/apache/struts/validator/validwhen/ValidWhenLexer.java struts/struts1/branches/STRUTS_1_3_BRANCH/core/src/main/java/org/apache/struts/validator/validwhen/ValidWhenParser.g struts/struts1/branches/STRUTS_1_3_BRANCH/core/src/main/java/org/apache/struts/validator/validwhen/ValidWhenParser.java struts/struts1/branches/STRUTS_1_3_BRANCH/core/src/main/java/org/apache/struts/validator/validwhen/ValidWhenParserTokenTypes.java struts/struts1/branches/STRUTS_1_3_BRANCH/core/src/main/java/org/apache/struts/validator/validwhen/ValidWhenParserTokenTypes.txt struts/struts1/branches/STRUTS_1_3_BRANCH/core/src/test/java/org/apache/struts/validator/TestValidWhen.java Modified: struts/struts1/branches/STRUTS_1_3_BRANCH/core/src/main/java/org/apache/struts/validator/validwhen/ValidWhenLexer.java URL: http://svn.apache.org/viewvc/struts/struts1/branches/STRUTS_1_3_BRANCH/core/src/main/java/org/apache/struts/validator/validwhen/ValidWhenLexer.java?rev=569606&r1=569605&r2=569606&view=diff == --- struts/struts1/branches/STRUTS_1_3_BRANCH/core/src/main/java/org/apache/struts/validator/validwhen/ValidWhenLexer.java (original) +++ struts/struts1/branches/STRUTS_1_3_BRANCH/core/src/main/java/org/apache/struts/validator/validwhen/ValidWhenLexer.java Fri Aug 24 20:54:59 2007 @@ -1,4 +1,4 @@ -// $ANTLR 2.7.2: "ValidWhenParser.g" -> "ValidWhenLexer.java"$ +// $ANTLR 2.7.6 (2005-12-22): "ValidWhenParser.g" -> "ValidWhenLexer.java"$ /* * $Id$ Modified: struts/struts1/branches/STRUTS_1_3_BRANCH/core/src/main/java/org/apache/struts/validator/validwhen/ValidWhenParser.g URL: http://svn.apache.org/viewvc/struts/struts1/branches/STRUTS_1_3_BRANCH/core/src/main/java/org/apache/struts/validator/validwhen/ValidWhenParser.g?rev=569606&r1=569605&r2=569606&view=diff == --- struts/struts1/branches/STRUTS_1_3_BRANCH/core/src/main/java/org/apache/struts/validator/validwhen/ValidWhenParser.g (original) +++ struts/struts1/branches/STRUTS_1_3_BRANCH/core/src/main/java/org/apache/struts/validator/validwhen/ValidWhenParser.g Fri Aug 24 20:54:59 2007 @@ -57,12 +57,12 @@ boolean intCompare = true; if ((v1 == null) || (v2 == null)) { if (String.class.isInstance(v1)) { - if (((String) v1).length() == 0) { + if (((String) v1).trim().length() == 0) { v1 = null; } } if (String.class.isInstance(v2)) { - if (((String) v2).length() == 0) { + if (((String) v2).trim().length() == 0) { v2 = null; } } @@ -182,7 +182,7 @@ Object i3 = argStack.pop(); argStack.push(ValidatorUtils.getValueAsString(form, i3 + "[" + i4 + "]" + i5)); } -| identifier LBRACKET integer RBRACKET LBRACKET { +| identifier LBRACKET integer RBRACKET { Object i7 = argStack.pop(); Object i6 = argStack.pop(); argStack.push(ValidatorUtils.getValueAsString(form, i6 + "[" + i7 + "]")); Modified: struts/struts1/branches/STRUTS_1_3_BRANCH/core/src/main/java/org/apache/struts/validator/validwhen/ValidWhenParser.java URL: http://svn.apache.org/viewvc/struts/struts1/branches/STRUTS_1_3_BRANCH/core/src/main/java/org/apache/struts/validator/validwhen/ValidWhenParser.java?rev=569606&r1=569605&r2=569606&view=diff == --- struts/struts1/branches/STRUTS_1_3_BRANCH/core/src/main/java/org/apache/struts/validator/validwhen/ValidWhenParser.java (original) +++ struts/struts1/branches/STRUTS_1_3_BRANCH/core/src/main/java/org/apache/struts/validator/validwhen/ValidWhenParser.java Fri Aug 24 20:54:59 2007 @@ -1,4 +1,4 @@ -// $ANTLR 2.7.2: "ValidWhenParser.g" -> "ValidWhenParser.java"$ +// $ANTLR 2.7.6 (2005-12-22): "ValidWhenParser.g" -> "ValidWhenParser.java"$ /* * $Id$ @@ -69,12 +69,12 @@ boolean intCompare = true; if ((v1 == null) || (v2 == null)) { if (String.class.isInstance(v1)) { - if (((String) v1).length() == 0) { + if (((String) v1).trim().length() == 0) { v1 = null; } } if (String.class.isInstance(v2)) { - if (((String) v2).length() == 0) { + if (((String) v2).trim().length() == 0) { v2 = null;
svn commit: r569607 - in /struts/struts1/trunk/core/src: main/java/org/apache/struts/validator/validwhen/ test/java/org/apache/struts/validator/
Author: pbenedict Date: Fri Aug 24 20:55:10 2007 New Revision: 569607 URL: http://svn.apache.org/viewvc?rev=569607&view=rev Log: STR-3088: Treat blank strings as *null* Modified: struts/struts1/trunk/core/src/main/java/org/apache/struts/validator/validwhen/ValidWhenLexer.java struts/struts1/trunk/core/src/main/java/org/apache/struts/validator/validwhen/ValidWhenParser.g struts/struts1/trunk/core/src/main/java/org/apache/struts/validator/validwhen/ValidWhenParser.java struts/struts1/trunk/core/src/main/java/org/apache/struts/validator/validwhen/ValidWhenParserTokenTypes.java struts/struts1/trunk/core/src/main/java/org/apache/struts/validator/validwhen/ValidWhenParserTokenTypes.txt struts/struts1/trunk/core/src/test/java/org/apache/struts/validator/TestValidWhen.java Modified: struts/struts1/trunk/core/src/main/java/org/apache/struts/validator/validwhen/ValidWhenLexer.java URL: http://svn.apache.org/viewvc/struts/struts1/trunk/core/src/main/java/org/apache/struts/validator/validwhen/ValidWhenLexer.java?rev=569607&r1=569606&r2=569607&view=diff == --- struts/struts1/trunk/core/src/main/java/org/apache/struts/validator/validwhen/ValidWhenLexer.java (original) +++ struts/struts1/trunk/core/src/main/java/org/apache/struts/validator/validwhen/ValidWhenLexer.java Fri Aug 24 20:55:10 2007 @@ -1,4 +1,4 @@ -// $ANTLR 2.7.2: "ValidWhenParser.g" -> "ValidWhenLexer.java"$ +// $ANTLR 2.7.6 (2005-12-22): "ValidWhenParser.g" -> "ValidWhenLexer.java"$ /* * $Id$ Modified: struts/struts1/trunk/core/src/main/java/org/apache/struts/validator/validwhen/ValidWhenParser.g URL: http://svn.apache.org/viewvc/struts/struts1/trunk/core/src/main/java/org/apache/struts/validator/validwhen/ValidWhenParser.g?rev=569607&r1=569606&r2=569607&view=diff == --- struts/struts1/trunk/core/src/main/java/org/apache/struts/validator/validwhen/ValidWhenParser.g (original) +++ struts/struts1/trunk/core/src/main/java/org/apache/struts/validator/validwhen/ValidWhenParser.g Fri Aug 24 20:55:10 2007 @@ -57,12 +57,12 @@ boolean intCompare = true; if ((v1 == null) || (v2 == null)) { if (String.class.isInstance(v1)) { - if (((String) v1).length() == 0) { + if (((String) v1).trim().length() == 0) { v1 = null; } } if (String.class.isInstance(v2)) { - if (((String) v2).length() == 0) { + if (((String) v2).trim().length() == 0) { v2 = null; } } Modified: struts/struts1/trunk/core/src/main/java/org/apache/struts/validator/validwhen/ValidWhenParser.java URL: http://svn.apache.org/viewvc/struts/struts1/trunk/core/src/main/java/org/apache/struts/validator/validwhen/ValidWhenParser.java?rev=569607&r1=569606&r2=569607&view=diff == --- struts/struts1/trunk/core/src/main/java/org/apache/struts/validator/validwhen/ValidWhenParser.java (original) +++ struts/struts1/trunk/core/src/main/java/org/apache/struts/validator/validwhen/ValidWhenParser.java Fri Aug 24 20:55:10 2007 @@ -1,4 +1,4 @@ -// $ANTLR 2.7.2: "ValidWhenParser.g" -> "ValidWhenParser.java"$ +// $ANTLR 2.7.6 (2005-12-22): "ValidWhenParser.g" -> "ValidWhenParser.java"$ /* * $Id$ @@ -69,12 +69,12 @@ boolean intCompare = true; if ((v1 == null) || (v2 == null)) { if (String.class.isInstance(v1)) { - if (((String) v1).length() == 0) { + if (((String) v1).trim().length() == 0) { v1 = null; } } if (String.class.isInstance(v2)) { - if (((String) v2).length() == 0) { + if (((String) v2).trim().length() == 0) { v2 = null; } } Modified: struts/struts1/trunk/core/src/main/java/org/apache/struts/validator/validwhen/ValidWhenParserTokenTypes.java URL: http://svn.apache.org/viewvc/struts/struts1/trunk/core/src/main/java/org/apache/struts/validator/validwhen/ValidWhenParserTokenTypes.java?rev=569607&r1=569606&r2=569607&view=diff == --- struts/struts1/trunk/core/src/main/java/org/apache/struts/validator/validwhen/ValidWhenParserTokenTypes.java (original) +++ struts/struts1/trunk/core/src/main/java/org/apache/struts/validator/validwhen/ValidWhenParserTokenTypes.java Fri Aug 24 20:55:10 2007 @@ -1,4 +1,4 @@ -// $ANTLR 2.7.2: "ValidWhenParser.g" -> "ValidWhenParser.java"$ +// $ANTLR 2.7.6 (2005-12-22): "ValidWhenPar