Author: hermanns
Date: Thu Apr 12 00:33:52 2007
New Revision: 527815
URL: http://svn.apache.org/viewvc?view=rev&rev=527815
Log:
Updating the xwork dependency to 2.1-SNAPSHOT to fix several problems reported
to
XWork and S2:
WW-1635 struts.xml include dependant packages not loading properly
WW-1856 s18n tag appears to be broken
NOTE on XWork 2.x updates: All validators.xml files are now validated, a DTD
header
is required.
Modified:
struts/struts2/trunk/apps/portlet/src/main/resources/validators.xml
struts/struts2/trunk/assembly/pom.xml
struts/struts2/trunk/core/pom.xml
struts/struts2/trunk/core/src/site/resources/tags/ajax/a.html
struts/struts2/trunk/core/src/site/resources/tags/ajax/autocompleter.html
struts/struts2/trunk/core/src/site/resources/tags/ajax/datetimepicker.html
struts/struts2/trunk/core/src/site/resources/tags/ajax/div.html
struts/struts2/trunk/core/src/site/resources/tags/ajax/form.html
struts/struts2/trunk/core/src/site/resources/tags/ajax/submit.html
struts/struts2/trunk/core/src/site/resources/tags/ajax/tabbedpanel.html
struts/struts2/trunk/core/src/site/resources/tags/ajax/tree.html
struts/struts2/trunk/core/src/site/resources/tags/ajax/treenode.html
struts/struts2/trunk/core/src/test/resources/validators.xml
Modified: struts/struts2/trunk/apps/portlet/src/main/resources/validators.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/portlet/src/main/resources/validators.xml?view=diff&rev=527815&r1=527814&r2=527815
==============================================================================
--- struts/struts2/trunk/apps/portlet/src/main/resources/validators.xml
(original)
+++ struts/struts2/trunk/apps/portlet/src/main/resources/validators.xml Thu Apr
12 00:33:52 2007
@@ -1,3 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE validators PUBLIC
+ "-//OpenSymphony Group//XWork Validator Config 1.0//EN"
+ "http://www.opensymphony.com/xwork/xwork-validator-config-1.0.dtd";>
<validators>
<validator name="required"
class="com.opensymphony.xwork2.validator.validators.RequiredFieldValidator"/>
<validator name="requiredstring"
class="com.opensymphony.xwork2.validator.validators.RequiredStringValidator"/>
Modified: struts/struts2/trunk/assembly/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/assembly/pom.xml?view=diff&rev=527815&r1=527814&r2=527815
==============================================================================
--- struts/struts2/trunk/assembly/pom.xml (original)
+++ struts/struts2/trunk/assembly/pom.xml Thu Apr 12 00:33:52 2007
@@ -103,7 +103,7 @@
<groupId>opensymphony</groupId>
<artifactId>xwork</artifactId>
<classifier>javadoc</classifier>
- <version>2.0.0</version>
+ <version>2.1-SNAPSHOT</version>
</artifactItem>
</artifactItems>
<outputDirectory>${project.build.directory}/xwork-apidocs</outputDirectory>
Modified: struts/struts2/trunk/core/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/pom.xml?view=diff&rev=527815&r1=527814&r2=527815
==============================================================================
--- struts/struts2/trunk/core/pom.xml (original)
+++ struts/struts2/trunk/core/pom.xml Thu Apr 12 00:33:52 2007
@@ -35,7 +35,7 @@
<artifactItem>
<groupId>opensymphony</groupId>
<artifactId>xwork</artifactId>
- <version>2.0.1</version>
+ <version>2.1-SNAPSHOT</version>
<classifier>sources</classifier>
</artifactItem>
</artifactItems>
@@ -252,7 +252,7 @@
<dependency>
<groupId>opensymphony</groupId>
<artifactId>xwork</artifactId>
- <version>2.0.2-SNAPSHOT</version>
+ <version>2.1-SNAPSHOT</version>
</dependency>
<!--<dependency>-->
Modified: struts/struts2/trunk/core/src/site/resources/tags/ajax/a.html
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/site/resources/tags/ajax/a.html?view=diff&rev=527815&r1=527814&r2=527815
==============================================================================
--- struts/struts2/trunk/core/src/site/resources/tags/ajax/a.html (original)
+++ struts/struts2/trunk/core/src/site/resources/tags/ajax/a.html Thu Apr 12
00:33:52 2007
@@ -148,14 +148,6 @@
<td align="left" valign="top">Id of
element that will be shown while making request</td>
</tr>
<tr>
- <td align="left"
valign="top">javascriptTooltip</td>
- <td align="left" valign="top">false</td>
- <td align="left" valign="top">false</td>
- <td align="left" valign="top">true</td>
- <td align="left"
valign="top">Boolean</td>
- <td align="left" valign="top">Use
JavaScript to generate tooltips</td>
- </tr>
- <tr>
<td align="left" valign="top">key</td>
<td align="left" valign="top">false</td>
<td align="left" valign="top"></td>
@@ -417,23 +409,7 @@
<td align="left" valign="top"></td>
<td align="left" valign="top">true</td>
<td align="left"
valign="top">String</td>
- <td align="left"
valign="top">Deprecated. Use individual tooltip configuration attributes
instead.</td>
- </tr>
- <tr>
- <td align="left"
valign="top">tooltipCssClass</td>
- <td align="left" valign="top">false</td>
- <td align="left"
valign="top">StrutsTTClassic</td>
- <td align="left" valign="top">true</td>
- <td align="left"
valign="top">String</td>
- <td align="left" valign="top">CSS class
applied to JavaScrip tooltips</td>
- </tr>
- <tr>
- <td align="left"
valign="top">tooltipDelay</td>
- <td align="left" valign="top">false</td>
- <td align="left"
valign="top">Classic</td>
- <td align="left" valign="top">true</td>
- <td align="left"
valign="top">String</td>
- <td align="left" valign="top">Delay in
milliseconds, before showing JavaScript tooltips </td>
+ <td align="left" valign="top">Set the
tooltip configuration</td>
</tr>
<tr>
<td align="left" valign="top">value</td>
Modified:
struts/struts2/trunk/core/src/site/resources/tags/ajax/autocompleter.html
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/site/resources/tags/ajax/autocompleter.html?view=diff&rev=527815&r1=527814&r2=527815
==============================================================================
--- struts/struts2/trunk/core/src/site/resources/tags/ajax/autocompleter.html
(original)
+++ struts/struts2/trunk/core/src/site/resources/tags/ajax/autocompleter.html
Thu Apr 12 00:33:52 2007
@@ -204,14 +204,6 @@
<td align="left" valign="top">Id of
element that will be shown while request is made</td>
</tr>
<tr>
- <td align="left"
valign="top">javascriptTooltip</td>
- <td align="left" valign="top">false</td>
- <td align="left" valign="top">false</td>
- <td align="left" valign="top">true</td>
- <td align="left"
valign="top">Boolean</td>
- <td align="left" valign="top">Use
JavaScript to generate tooltips</td>
- </tr>
- <tr>
<td align="left" valign="top">key</td>
<td align="left" valign="top">false</td>
<td align="left" valign="top"></td>
@@ -537,23 +529,7 @@
<td align="left" valign="top"></td>
<td align="left" valign="top">true</td>
<td align="left"
valign="top">String</td>
- <td align="left"
valign="top">Deprecated. Use individual tooltip configuration attributes
instead.</td>
- </tr>
- <tr>
- <td align="left"
valign="top">tooltipCssClass</td>
- <td align="left" valign="top">false</td>
- <td align="left"
valign="top">StrutsTTClassic</td>
- <td align="left" valign="top">true</td>
- <td align="left"
valign="top">String</td>
- <td align="left" valign="top">CSS class
applied to JavaScrip tooltips</td>
- </tr>
- <tr>
- <td align="left"
valign="top">tooltipDelay</td>
- <td align="left" valign="top">false</td>
- <td align="left"
valign="top">Classic</td>
- <td align="left" valign="top">true</td>
- <td align="left"
valign="top">String</td>
- <td align="left" valign="top">Delay in
milliseconds, before showing JavaScript tooltips </td>
+ <td align="left" valign="top">Set the
tooltip configuration</td>
</tr>
<tr>
<td align="left" valign="top">value</td>
Modified:
struts/struts2/trunk/core/src/site/resources/tags/ajax/datetimepicker.html
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/site/resources/tags/ajax/datetimepicker.html?view=diff&rev=527815&r1=527814&r2=527815
==============================================================================
--- struts/struts2/trunk/core/src/site/resources/tags/ajax/datetimepicker.html
(original)
+++ struts/struts2/trunk/core/src/site/resources/tags/ajax/datetimepicker.html
Thu Apr 12 00:33:52 2007
@@ -124,14 +124,6 @@
<td align="left" valign="top">id for
referencing element. For UI and form tags it will be used as HTML id
attribute</td>
</tr>
<tr>
- <td align="left"
valign="top">javascriptTooltip</td>
- <td align="left" valign="top">false</td>
- <td align="left" valign="top">false</td>
- <td align="left" valign="top">true</td>
- <td align="left"
valign="top">Boolean</td>
- <td align="left" valign="top">Use
JavaScript to generate tooltips</td>
- </tr>
- <tr>
<td align="left" valign="top">key</td>
<td align="left" valign="top">false</td>
<td align="left" valign="top"></td>
@@ -385,23 +377,7 @@
<td align="left" valign="top"></td>
<td align="left" valign="top">true</td>
<td align="left"
valign="top">String</td>
- <td align="left"
valign="top">Deprecated. Use individual tooltip configuration attributes
instead.</td>
- </tr>
- <tr>
- <td align="left"
valign="top">tooltipCssClass</td>
- <td align="left" valign="top">false</td>
- <td align="left"
valign="top">StrutsTTClassic</td>
- <td align="left" valign="top">true</td>
- <td align="left"
valign="top">String</td>
- <td align="left" valign="top">CSS class
applied to JavaScrip tooltips</td>
- </tr>
- <tr>
- <td align="left"
valign="top">tooltipDelay</td>
- <td align="left" valign="top">false</td>
- <td align="left"
valign="top">Classic</td>
- <td align="left" valign="top">true</td>
- <td align="left"
valign="top">String</td>
- <td align="left" valign="top">Delay in
milliseconds, before showing JavaScript tooltips </td>
+ <td align="left" valign="top">Set the
tooltip configuration</td>
</tr>
<tr>
<td align="left" valign="top">type</td>
Modified: struts/struts2/trunk/core/src/site/resources/tags/ajax/div.html
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/site/resources/tags/ajax/div.html?view=diff&rev=527815&r1=527814&r2=527815
==============================================================================
--- struts/struts2/trunk/core/src/site/resources/tags/ajax/div.html (original)
+++ struts/struts2/trunk/core/src/site/resources/tags/ajax/div.html Thu Apr 12
00:33:52 2007
@@ -172,14 +172,6 @@
<td align="left" valign="top">Id of
element that will be shown while making request</td>
</tr>
<tr>
- <td align="left"
valign="top">javascriptTooltip</td>
- <td align="left" valign="top">false</td>
- <td align="left" valign="top">false</td>
- <td align="left" valign="top">true</td>
- <td align="left"
valign="top">Boolean</td>
- <td align="left" valign="top">Use
JavaScript to generate tooltips</td>
- </tr>
- <tr>
<td align="left" valign="top">key</td>
<td align="left" valign="top">false</td>
<td align="left" valign="top"></td>
@@ -481,23 +473,7 @@
<td align="left" valign="top"></td>
<td align="left" valign="top">true</td>
<td align="left"
valign="top">String</td>
- <td align="left"
valign="top">Deprecated. Use individual tooltip configuration attributes
instead.</td>
- </tr>
- <tr>
- <td align="left"
valign="top">tooltipCssClass</td>
- <td align="left" valign="top">false</td>
- <td align="left"
valign="top">StrutsTTClassic</td>
- <td align="left" valign="top">true</td>
- <td align="left"
valign="top">String</td>
- <td align="left" valign="top">CSS class
applied to JavaScrip tooltips</td>
- </tr>
- <tr>
- <td align="left"
valign="top">tooltipDelay</td>
- <td align="left" valign="top">false</td>
- <td align="left"
valign="top">Classic</td>
- <td align="left" valign="top">true</td>
- <td align="left"
valign="top">String</td>
- <td align="left" valign="top">Delay in
milliseconds, before showing JavaScript tooltips </td>
+ <td align="left" valign="top">Set the
tooltip configuration</td>
</tr>
<tr>
<td align="left"
valign="top">updateFreq</td>
Modified: struts/struts2/trunk/core/src/site/resources/tags/ajax/form.html
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/site/resources/tags/ajax/form.html?view=diff&rev=527815&r1=527814&r2=527815
==============================================================================
--- struts/struts2/trunk/core/src/site/resources/tags/ajax/form.html (original)
+++ struts/struts2/trunk/core/src/site/resources/tags/ajax/form.html Thu Apr 12
00:33:52 2007
@@ -92,14 +92,6 @@
<td align="left" valign="top">id for
referencing element. For UI and form tags it will be used as HTML id
attribute</td>
</tr>
<tr>
- <td align="left"
valign="top">javascriptTooltip</td>
- <td align="left" valign="top">false</td>
- <td align="left" valign="top">false</td>
- <td align="left" valign="top">true</td>
- <td align="left"
valign="top">Boolean</td>
- <td align="left" valign="top">Use
JavaScript to generate tooltips</td>
- </tr>
- <tr>
<td align="left" valign="top">key</td>
<td align="left" valign="top">false</td>
<td align="left" valign="top"></td>
@@ -353,23 +345,7 @@
<td align="left" valign="top"></td>
<td align="left" valign="top">true</td>
<td align="left"
valign="top">String</td>
- <td align="left"
valign="top">Deprecated. Use individual tooltip configuration attributes
instead.</td>
- </tr>
- <tr>
- <td align="left"
valign="top">tooltipCssClass</td>
- <td align="left" valign="top">false</td>
- <td align="left"
valign="top">StrutsTTClassic</td>
- <td align="left" valign="top">true</td>
- <td align="left"
valign="top">String</td>
- <td align="left" valign="top">CSS class
applied to JavaScrip tooltips</td>
- </tr>
- <tr>
- <td align="left"
valign="top">tooltipDelay</td>
- <td align="left" valign="top">false</td>
- <td align="left"
valign="top">Classic</td>
- <td align="left" valign="top">true</td>
- <td align="left"
valign="top">String</td>
- <td align="left" valign="top">Delay in
milliseconds, before showing JavaScript tooltips </td>
+ <td align="left" valign="top">Set the
tooltip configuration</td>
</tr>
<tr>
<td align="left"
valign="top">validate</td>
Modified: struts/struts2/trunk/core/src/site/resources/tags/ajax/submit.html
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/site/resources/tags/ajax/submit.html?view=diff&rev=527815&r1=527814&r2=527815
==============================================================================
--- struts/struts2/trunk/core/src/site/resources/tags/ajax/submit.html
(original)
+++ struts/struts2/trunk/core/src/site/resources/tags/ajax/submit.html Thu Apr
12 00:33:52 2007
@@ -164,14 +164,6 @@
<td align="left" valign="top">Set
indicator</td>
</tr>
<tr>
- <td align="left"
valign="top">javascriptTooltip</td>
- <td align="left" valign="top">false</td>
- <td align="left" valign="top">false</td>
- <td align="left" valign="top">true</td>
- <td align="left"
valign="top">Boolean</td>
- <td align="left" valign="top">Use
JavaScript to generate tooltips</td>
- </tr>
- <tr>
<td align="left" valign="top">key</td>
<td align="left" valign="top">false</td>
<td align="left" valign="top"></td>
@@ -441,23 +433,7 @@
<td align="left" valign="top"></td>
<td align="left" valign="top">true</td>
<td align="left"
valign="top">String</td>
- <td align="left"
valign="top">Deprecated. Use individual tooltip configuration attributes
instead.</td>
- </tr>
- <tr>
- <td align="left"
valign="top">tooltipCssClass</td>
- <td align="left" valign="top">false</td>
- <td align="left"
valign="top">StrutsTTClassic</td>
- <td align="left" valign="top">true</td>
- <td align="left"
valign="top">String</td>
- <td align="left" valign="top">CSS class
applied to JavaScrip tooltips</td>
- </tr>
- <tr>
- <td align="left"
valign="top">tooltipDelay</td>
- <td align="left" valign="top">false</td>
- <td align="left"
valign="top">Classic</td>
- <td align="left" valign="top">true</td>
- <td align="left"
valign="top">String</td>
- <td align="left" valign="top">Delay in
milliseconds, before showing JavaScript tooltips </td>
+ <td align="left" valign="top">Set the
tooltip configuration</td>
</tr>
<tr>
<td align="left" valign="top">type</td>
Modified:
struts/struts2/trunk/core/src/site/resources/tags/ajax/tabbedpanel.html
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/site/resources/tags/ajax/tabbedpanel.html?view=diff&rev=527815&r1=527814&r2=527815
==============================================================================
--- struts/struts2/trunk/core/src/site/resources/tags/ajax/tabbedpanel.html
(original)
+++ struts/struts2/trunk/core/src/site/resources/tags/ajax/tabbedpanel.html Thu
Apr 12 00:33:52 2007
@@ -84,14 +84,6 @@
<td align="left" valign="top">The id to
assign to the component.</td>
</tr>
<tr>
- <td align="left"
valign="top">javascriptTooltip</td>
- <td align="left" valign="top">false</td>
- <td align="left" valign="top">false</td>
- <td align="left" valign="top">true</td>
- <td align="left"
valign="top">Boolean</td>
- <td align="left" valign="top">Use
JavaScript to generate tooltips</td>
- </tr>
- <tr>
<td align="left" valign="top">key</td>
<td align="left" valign="top">false</td>
<td align="left" valign="top"></td>
@@ -321,23 +313,7 @@
<td align="left" valign="top"></td>
<td align="left" valign="top">true</td>
<td align="left"
valign="top">String</td>
- <td align="left"
valign="top">Deprecated. Use individual tooltip configuration attributes
instead.</td>
- </tr>
- <tr>
- <td align="left"
valign="top">tooltipCssClass</td>
- <td align="left" valign="top">false</td>
- <td align="left"
valign="top">StrutsTTClassic</td>
- <td align="left" valign="top">true</td>
- <td align="left"
valign="top">String</td>
- <td align="left" valign="top">CSS class
applied to JavaScrip tooltips</td>
- </tr>
- <tr>
- <td align="left"
valign="top">tooltipDelay</td>
- <td align="left" valign="top">false</td>
- <td align="left"
valign="top">Classic</td>
- <td align="left" valign="top">true</td>
- <td align="left"
valign="top">String</td>
- <td align="left" valign="top">Delay in
milliseconds, before showing JavaScript tooltips </td>
+ <td align="left" valign="top">Set the
tooltip configuration</td>
</tr>
<tr>
<td align="left" valign="top">value</td>
Modified: struts/struts2/trunk/core/src/site/resources/tags/ajax/tree.html
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/site/resources/tags/ajax/tree.html?view=diff&rev=527815&r1=527814&r2=527815
==============================================================================
--- struts/struts2/trunk/core/src/site/resources/tags/ajax/tree.html (original)
+++ struts/struts2/trunk/core/src/site/resources/tags/ajax/tree.html Thu Apr 12
00:33:52 2007
@@ -164,14 +164,6 @@
<td align="left" valign="top">The id to
use for the element</td>
</tr>
<tr>
- <td align="left"
valign="top">javascriptTooltip</td>
- <td align="left" valign="top">false</td>
- <td align="left" valign="top">false</td>
- <td align="left" valign="top">true</td>
- <td align="left"
valign="top">Boolean</td>
- <td align="left" valign="top">Use
JavaScript to generate tooltips</td>
- </tr>
- <tr>
<td align="left" valign="top">key</td>
<td align="left" valign="top">false</td>
<td align="left" valign="top"></td>
@@ -449,23 +441,7 @@
<td align="left" valign="top"></td>
<td align="left" valign="top">true</td>
<td align="left"
valign="top">String</td>
- <td align="left"
valign="top">Deprecated. Use individual tooltip configuration attributes
instead.</td>
- </tr>
- <tr>
- <td align="left"
valign="top">tooltipCssClass</td>
- <td align="left" valign="top">false</td>
- <td align="left"
valign="top">StrutsTTClassic</td>
- <td align="left" valign="top">true</td>
- <td align="left"
valign="top">String</td>
- <td align="left" valign="top">CSS class
applied to JavaScrip tooltips</td>
- </tr>
- <tr>
- <td align="left"
valign="top">tooltipDelay</td>
- <td align="left" valign="top">false</td>
- <td align="left"
valign="top">Classic</td>
- <td align="left" valign="top">true</td>
- <td align="left"
valign="top">String</td>
- <td align="left" valign="top">Delay in
milliseconds, before showing JavaScript tooltips </td>
+ <td align="left" valign="top">Set the
tooltip configuration</td>
</tr>
<tr>
<td align="left"
valign="top">treeCollapsedTopic</td>
Modified: struts/struts2/trunk/core/src/site/resources/tags/ajax/treenode.html
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/site/resources/tags/ajax/treenode.html?view=diff&rev=527815&r1=527814&r2=527815
==============================================================================
--- struts/struts2/trunk/core/src/site/resources/tags/ajax/treenode.html
(original)
+++ struts/struts2/trunk/core/src/site/resources/tags/ajax/treenode.html Thu
Apr 12 00:33:52 2007
@@ -68,14 +68,6 @@
<td align="left" valign="top">The id to
use for the element</td>
</tr>
<tr>
- <td align="left"
valign="top">javascriptTooltip</td>
- <td align="left" valign="top">false</td>
- <td align="left" valign="top">false</td>
- <td align="left" valign="top">true</td>
- <td align="left"
valign="top">Boolean</td>
- <td align="left" valign="top">Use
JavaScript to generate tooltips</td>
- </tr>
- <tr>
<td align="left" valign="top">key</td>
<td align="left" valign="top">false</td>
<td align="left" valign="top"></td>
@@ -289,23 +281,7 @@
<td align="left" valign="top"></td>
<td align="left" valign="top">true</td>
<td align="left"
valign="top">String</td>
- <td align="left"
valign="top">Deprecated. Use individual tooltip configuration attributes
instead.</td>
- </tr>
- <tr>
- <td align="left"
valign="top">tooltipCssClass</td>
- <td align="left" valign="top">false</td>
- <td align="left"
valign="top">StrutsTTClassic</td>
- <td align="left" valign="top">true</td>
- <td align="left"
valign="top">String</td>
- <td align="left" valign="top">CSS class
applied to JavaScrip tooltips</td>
- </tr>
- <tr>
- <td align="left"
valign="top">tooltipDelay</td>
- <td align="left" valign="top">false</td>
- <td align="left"
valign="top">Classic</td>
- <td align="left" valign="top">true</td>
- <td align="left"
valign="top">String</td>
- <td align="left" valign="top">Delay in
milliseconds, before showing JavaScript tooltips </td>
+ <td align="left" valign="top">Set the
tooltip configuration</td>
</tr>
<tr>
<td align="left" valign="top">value</td>
Modified: struts/struts2/trunk/core/src/test/resources/validators.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/resources/validators.xml?view=diff&rev=527815&r1=527814&r2=527815
==============================================================================
--- struts/struts2/trunk/core/src/test/resources/validators.xml (original)
+++ struts/struts2/trunk/core/src/test/resources/validators.xml Thu Apr 12
00:33:52 2007
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE validators PUBLIC
"-//OpenSymphony Group//XWork Validator Config 1.0//EN"
"http://www.opensymphony.com/xwork/xwork-validator-config-1.0.dtd";>
