svn commit: r422166 - in /struts/struts2/trunk/core/src/main/resources/template: ajax/head.ftl css_xhtml/head.ftl simple/head.ftl xhtml/head.ftl

2006-07-15 Thread tmjee 
Author: tmjee
Date: Sat Jul 15 00:35:50 2006
New Revision: 422166

URL: http://svn.apache.org/viewvc?rev=422166&view=rev
Log:
WW-1380
  - fixed "ww:head tag includes parameters in URLs to stylesheets"


Modified:
struts/struts2/trunk/core/src/main/resources/template/ajax/head.ftl
struts/struts2/trunk/core/src/main/resources/template/css_xhtml/head.ftl
struts/struts2/trunk/core/src/main/resources/template/simple/head.ftl
struts/struts2/trunk/core/src/main/resources/template/xhtml/head.ftl

Modified: struts/struts2/trunk/core/src/main/resources/template/ajax/head.ftl
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/ajax/head.ftl?rev=422166&r1=422165&r2=422166&view=diff
==
--- struts/struts2/trunk/core/src/main/resources/template/ajax/head.ftl 
(original)
+++ struts/struts2/trunk/core/src/main/resources/template/ajax/head.ftl Sat Jul 
15 00:35:50 2006
@@ -1,6 +1,6 @@
 <#--include "/${parameters.templateDir}/xhtml/head.ftl" /-->
 <#include "/${parameters.templateDir}/${themeProperties.parent}/head.ftl" />
 
+src="<@saf.url includeParams='none' 
value='/struts/ajax/dojoRequire.js' includeParams="none" encode='false'  
/>">
 
+src="<@saf.url includeParams='none' value='/struts/CommonFunctions.js' 
includeParams="none" encode='false'/>">

Modified: 
struts/struts2/trunk/core/src/main/resources/template/css_xhtml/head.ftl
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/css_xhtml/head.ftl?rev=422166&r1=422165&r2=422166&view=diff
==
--- struts/struts2/trunk/core/src/main/resources/template/css_xhtml/head.ftl 
(original)
+++ struts/struts2/trunk/core/src/main/resources/template/css_xhtml/head.ftl 
Sat Jul 15 00:35:50 2006
@@ -1,2 +1,2 @@
-
+" type="text/css"/>
 <#include "/${parameters.templateDir}/simple/head.ftl" />

Modified: struts/struts2/trunk/core/src/main/resources/template/simple/head.ftl
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/head.ftl?rev=422166&r1=422165&r2=422166&view=diff
==
--- struts/struts2/trunk/core/src/main/resources/template/simple/head.ftl 
(original)
+++ struts/struts2/trunk/core/src/main/resources/template/simple/head.ftl Sat 
Jul 15 00:35:50 2006
@@ -1,13 +1,13 @@
 
 // Dojo configuration
 djConfig = {
-baseRelativePath: "<@saf.url includeParams='none' value='/struts/dojo' 
encode='false'/>",
+baseRelativePath: "<@saf.url includeParams='none' value='/struts/dojo' 
includeParams="none" encode='false'/>",
 isDebug: ${parameters.debug},
 bindEncoding: "${parameters.encoding}",
 debugAtAllCosts: true // not needed, but allows the Venkman debugger 
to work with the includes
 };
 
 
+src="<@saf.url includeParams='none' value='/struts/dojo/dojo.js' 
includeParams="none" encode='false'/>">
 
+src="<@saf.url includeParams='none' 
value='/struts/simple/dojoRequire.js' includeParams="none" 
encode='false'/>">

Modified: struts/struts2/trunk/core/src/main/resources/template/xhtml/head.ftl
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/xhtml/head.ftl?rev=422166&r1=422165&r2=422166&view=diff
==
--- struts/struts2/trunk/core/src/main/resources/template/xhtml/head.ftl 
(original)
+++ struts/struts2/trunk/core/src/main/resources/template/xhtml/head.ftl Sat 
Jul 15 00:35:50 2006
@@ -1,2 +1,2 @@
-
+" type="text/css"/>
 <#include "/${parameters.templateDir}/simple/head.ftl" />

svn commit: r422175 - in /struts/struts2/trunk/core/src: main/java/org/apache/struts2/components/ main/java/org/apache/struts2/views/freemarker/tags/ main/java/org/apache/struts2/views/jsp/ui/ main/ja

2006-07-15 Thread tmjee 
Author: tmjee
Date: Sat Jul 15 01:07:22 2006
New Revision: 422175

URL: http://svn.apache.org/viewvc?rev=422175&view=rev
Log:
WW-1379
  - removed rich text editor from Struts2


Removed:

struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/AbstractRichtexteditorConnector.java

struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/DefaultRichtexteditorConnector.java

struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/RichTextEditor.java

struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/RichTextEditorModel.java

struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractRichtexteditorResult.java

struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/RichTextEditorTag.java

struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/RichTextEditorDirective.java

struts/struts2/trunk/core/src/main/resources/template/css_xhtml/richtexteditor.ftl

struts/struts2/trunk/core/src/main/resources/template/simple/richtexteditor.ftl

struts/struts2/trunk/core/src/main/resources/template/xhtml/richtexteditor.ftl

struts/struts2/trunk/core/src/test/java/org/apache/struts2/components/AbstractRichtexteditorConnectorTest.java

struts/struts2/trunk/core/src/test/java/org/apache/struts2/components/MockRichtexteditorConnector.java

struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/AbstractRichtexteditorTest.java

struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/RichTextEditorTagTest.java

struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/richtexteditor-1.txt

struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/richtexteditor-2.txt

struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/richtexteditor-3.txt

struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/richtexteditor-4.txt
Modified:

struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/StrutsModels.java

struts/struts2/trunk/core/src/test/java/org/apache/struts2/components/ComponentTest.java

Modified: 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/StrutsModels.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/StrutsModels.java?rev=422175&r1=422174&r2=422175&view=diff
==
--- 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/StrutsModels.java
 (original)
+++ 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/StrutsModels.java
 Sat Jul 15 01:07:22 2006
@@ -73,7 +73,6 @@
 protected OptionTransferSelectModel optiontransferselect;
 protected TreeModel treeModel;
 protected UpDownSelectModel updownselect;
-protected RichTextEditorModel richtexteditorModel;
 protected OptGroupModel optGroupModel;
 
 
@@ -421,13 +420,6 @@
updownselect = new UpDownSelectModel(stack, req, res);
}
return updownselect;
-}
-
-public RichTextEditorModel getRichtexteditor() {
-   if (richtexteditorModel == null) {
-   richtexteditorModel = new RichTextEditorModel(stack, req, res);
-   }
-   return richtexteditorModel;
 }
 
 public OptGroupModel getOptgroup() {

Modified: 
struts/struts2/trunk/core/src/test/java/org/apache/struts2/components/ComponentTest.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/components/ComponentTest.java?rev=422175&r1=422174&r2=422175&view=diff
==
--- 
struts/struts2/trunk/core/src/test/java/org/apache/struts2/components/ComponentTest.java
 (original)
+++ 
struts/struts2/trunk/core/src/test/java/org/apache/struts2/components/ComponentTest.java
 Sat Jul 15 01:07:22 2006
@@ -38,7 +38,6 @@
 import org.apache.struts2.views.jsp.URLTag;
 import org.apache.struts2.views.jsp.iterator.AppendIteratorTag;
 import org.apache.struts2.views.jsp.iterator.MergeIteratorTag;
-import org.apache.struts2.views.jsp.ui.RichTextEditorTag;
 import org.apache.struts2.views.jsp.ui.TextFieldTag;
 import org.apache.struts2.views.jsp.ui.UpDownSelectTag;
 import com.opensymphony.xwork2.ActionContext;
@@ -492,32 +491,6 @@
tag.setPageContext(pageContext);
tag.setName("updownselectName");
tag.setList("{}");
-   
-   try {
-   t.doStartTag();
-   tag.doStartTag();
-   
assertEquals(tag.getComponent().getComponentStack().peek(), tag.getComponent());
-   tag.doEndTag();
-   
assertEq

[Struts Wiki] Update of "FrontPage" by TedHusted

2006-07-15 Thread Apache Wiki 
Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Struts Wiki" for change 
notification.

The following page has been changed by TedHusted:
http://wiki.apache.org/struts/FrontPage

The comment on the change is:
Update nomenclature

--
   * StrutsArticles
   * StrutsTutorials
   * StrutsBooks
+  * StrutsCatalog -- Toward an overview of Struts Design Patterns and Practices
+  * StrutsIDEGuides -- Guides to help IDE users work on and with Struts
   * [http://struts.apache.org/kickstart.html Struts Kick Start] -- Newbies 
Start Here!
-  * StrutsCatalog -- Toward an overview of Struts Design Patterns and Practices
+  * StrutsMoreAboutJSF -- JSF and Struts
+  * StrutsSolutions  -- A page to find solutions to common "ways of doing 
things"-type questions
   * StrutsUniversity -- Business presentations regarding Struts and related 
technologies
-  * StrutsSolutions  -- A page to find solutions to common "ways of doing 
things"-type questions
-  * ["StrutsIDEGuides"] -- Guides to help IDE users work on and with Struts
   * WildcardsForActionMappings -- How to use advance wildcards
  
  === Project Maintenance and Resources ===
@@ -48, +49 @@

   * Continuum -- Continnum information
  
  === Future Ideas ===
-  * StrutsAction1Planning -- Ideas for new versions of Struts Action Framework 
1.
+  * StrutsAction1Planning -- Ideas for new versions of Struts 1
-  * StrutsAction2 -- Discussion on plans/tasks for Struts Action 2.0
+  * StrutsAction2 -- Discussion on plans/tasks for Struts 2
   * StrutsWhiteboard -- Project proposals and discussion
-  * ["SAF1RoughSpots"] -- Discussions of what can be done to continue the 
evolution of Struts Action1 Framework
+  * SAF1RoughSpots -- Discussions of what can be done to continue the 
evolution of Struts 1
   * StrutsIdeaJar -- Future feature ideas
   * StrutsMultipleActionForms -- Discussion on how to support multiple 
ActionForms for a single action mapping
   * StrutsWazzup -- Pages on unresolved issues that need more discussion
@@ -81, +82 @@

  === Historic proposals and discussions on Struts 2 architecture ===
   * [:Shale:StrutsShale] -- A proposal for a next generation Struts 
architecture
   * StrutsTi -- A proposal and discussion pages for a next generation Struts 
architecture focusing on simplicity
-  * ["StrutsMoreAboutJSF"] -- JSF vs. Struts

svn commit: r422245 - in /struts/struts1/trunk: el/src/site/ extras/src/site/ faces/src/site/ scripting/src/site/ src/site/ src/site/xdoc/userGuide/ taglib/src/site/ tiles/src/site/

2006-07-15 Thread husted 
Author: husted
Date: Sat Jul 15 08:06:40 2006
New Revision: 422245

URL: http://svn.apache.org/viewvc?rev=422245&view=rev
Log:
STR-2910 Move preface from Struts 1 to Site as Key Technologies Primer so that 
it can be shared with Struts 2; Add links to Apps page; Move Sean to Emeritus 
per his request to me; Add kickers to Announcements and Volunteers so that 
section headings don't abut. 

Removed:
struts/struts1/trunk/src/site/xdoc/userGuide/preface.xml
Modified:
struts/struts1/trunk/el/src/site/site.xml
struts/struts1/trunk/extras/src/site/site.xml
struts/struts1/trunk/faces/src/site/site.xml
struts/struts1/trunk/scripting/src/site/site.xml
struts/struts1/trunk/src/site/site.xml
struts/struts1/trunk/src/site/xdoc/userGuide/building_model.xml
struts/struts1/trunk/src/site/xdoc/userGuide/index.xml
struts/struts1/trunk/src/site/xdoc/userGuide/introduction.xml
struts/struts1/trunk/taglib/src/site/site.xml
struts/struts1/trunk/tiles/src/site/site.xml

Modified: struts/struts1/trunk/el/src/site/site.xml
URL: 
http://svn.apache.org/viewvc/struts/struts1/trunk/el/src/site/site.xml?rev=422245&r1=422244&r2=422245&view=diff
==
--- struts/struts1/trunk/el/src/site/site.xml (original)
+++ struts/struts1/trunk/el/src/site/site.xml Sat Jul 15 08:06:40 2006
@@ -29,6 +29,9 @@
 
 
 
+
+
 
 

Modified: struts/struts1/trunk/extras/src/site/site.xml
URL: 
http://svn.apache.org/viewvc/struts/struts1/trunk/extras/src/site/site.xml?rev=422245&r1=422244&r2=422245&view=diff
==
--- struts/struts1/trunk/extras/src/site/site.xml (original)
+++ struts/struts1/trunk/extras/src/site/site.xml Sat Jul 15 08:06:40 2006
@@ -23,6 +23,9 @@
 
 
 
+
+
 
 

Modified: struts/struts1/trunk/faces/src/site/site.xml
URL: 
http://svn.apache.org/viewvc/struts/struts1/trunk/faces/src/site/site.xml?rev=422245&r1=422244&r2=422245&view=diff
==
--- struts/struts1/trunk/faces/src/site/site.xml (original)
+++ struts/struts1/trunk/faces/src/site/site.xml Sat Jul 15 08:06:40 2006
@@ -39,6 +39,9 @@
 
 
 
+
+
 
 

Modified: struts/struts1/trunk/scripting/src/site/site.xml
URL: 
http://svn.apache.org/viewvc/struts/struts1/trunk/scripting/src/site/site.xml?rev=422245&r1=422244&r2=422245&view=diff
==
--- struts/struts1/trunk/scripting/src/site/site.xml (original)
+++ struts/struts1/trunk/scripting/src/site/site.xml Sat Jul 15 08:06:40 2006
@@ -26,6 +26,9 @@
 
 
 
+
+
 
 

Modified: struts/struts1/trunk/src/site/site.xml
URL: 
http://svn.apache.org/viewvc/struts/struts1/trunk/src/site/site.xml?rev=422245&r1=422244&r2=422245&view=diff
==
--- struts/struts1/trunk/src/site/site.xml (original)
+++ struts/struts1/trunk/src/site/site.xml Sat Jul 15 08:06:40 2006
@@ -59,6 +59,9 @@
 
 
 
+
+
 
 

Modified: struts/struts1/trunk/src/site/xdoc/userGuide/building_model.xml
URL: 
http://svn.apache.org/viewvc/struts/struts1/trunk/src/site/xdoc/userGuide/building_model.xml?rev=422245&r1=422244&r2=422245&view=diff
==
--- struts/struts1/trunk/src/site/xdoc/userGuide/building_model.xml (original)
+++ struts/struts1/trunk/src/site/xdoc/userGuide/building_model.xml Sat Jul 15 
08:06:40 2006
@@ -400,84 +400,141 @@
 stateful or stateless
 Enterprise JavaBeans (EJBs) instead.
 
+
+
+For more about using a database with your application, see
+the
+Accessing a Database
+HowTo.
+
+
+
+For more about business logic and data access frameworks, 
+see the http://struts.apache.org/primer.html";>
+key technologies primer.
+
+
 
 
+
+
+
+
 
-
-
+
+DynaBeans combine the extensibility of JavaBeans with the
+flexibility of a Map.
+Defining even the simplest JavaBean requires defining a
+new class and coding a field and two methods for each
+property.
+The properties of a DynaBean can be configured via an XML
+descriptor.
+The virtual properti

svn commit: r422247 - in /struts/site: ./ src/site/ src/site/xdoc/

2006-07-15 Thread husted 
Author: husted
Date: Sat Jul 15 08:07:31 2006
New Revision: 422247

URL: http://svn.apache.org/viewvc?rev=422247&view=rev
Log:
STR-2910 Move preface from Struts 1 to Site as Key Technologies Primer so that 
it can be shared with Struts 2

Added:
struts/site/src/site/xdoc/preface.xml
  - copied, changed from r421880, 
struts/struts1/trunk/src/site/xdoc/userGuide/preface.xml
Modified:
struts/site/pom.xml
struts/site/src/site/site.xml
struts/site/src/site/xdoc/announce-2003.xml
struts/site/src/site/xdoc/announce-2004.xml
struts/site/src/site/xdoc/announce-2005.xml
struts/site/src/site/xdoc/announce.xml
struts/site/src/site/xdoc/bylaws.xml
struts/site/src/site/xdoc/faqs.xml
struts/site/src/site/xdoc/index.xml
struts/site/src/site/xdoc/mail.xml
struts/site/src/site/xdoc/volunteers.xml

Modified: struts/site/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/site/pom.xml?rev=422247&r1=422246&r2=422247&view=diff
==
--- struts/site/pom.xml (original)
+++ struts/site/pom.xml Sat Jul 15 08:07:31 2006
@@ -64,5 +64,16 @@
   scp://people.apache.org/www/struts.apache.org/
 
   
-
+  
+
+
+
+
+maven-site-plugin
+2.0-beta-4
+
+
+
+
+
 

Modified: struts/site/src/site/site.xml
URL: 
http://svn.apache.org/viewvc/struts/site/src/site/site.xml?rev=422247&r1=422246&r2=422247&view=diff
==
--- struts/site/src/site/site.xml (original)
+++ struts/site/src/site/site.xml Sat Jul 15 08:07:31 2006
@@ -3,18 +3,18 @@
 
 Apache Software Foundation
 http://www.apache.org/images/asf-logo.gif
-http://www.apache.org
+http://www.apache.org/
 
 
 Apache Struts
 http://struts.apache.org/images/struts.gif
-http://struts.apache.org
+http://struts.apache.org/
  
 
 
 http://www.apache.org"; /> 
-http://struts.apache.org/1.x"; />
-http://struts.apache.org/2.0"; />
+http://struts.apache.org/1.x/"; />
+http://struts.apache.org/2.0/"; />
 
 
 
@@ -30,6 +30,10 @@
 name="FAQs"
 href="faqs.html"
 />
+
 
 
 
@@ -80,12 +84,12 @@
 
 
 
 
 http://svn.apache.org/viewvc/struts/site/src/site/xdoc/announce-2003.xml?rev=422247&r1=422246&r2=422247&view=diff
==
--- struts/site/src/site/xdoc/announce-2003.xml (original)
+++ struts/site/src/site/xdoc/announce-2003.xml Sat Jul 15 08:07:31 2006
@@ -25,6 +25,10 @@
 
 
 
+
+
+Skip to: Announcements - 2002 and 
prior
+
 
 30 Jun 2003 - Struts 1.1 Final released
 

Modified: struts/site/src/site/xdoc/announce-2004.xml
URL: 
http://svn.apache.org/viewvc/struts/site/src/site/xdoc/announce-2004.xml?rev=422247&r1=422246&r2=422247&view=diff
==
--- struts/site/src/site/xdoc/announce-2004.xml (original)
+++ struts/site/src/site/xdoc/announce-2004.xml Sat Jul 15 08:07:31 2006
@@ -26,6 +26,10 @@
 
 
 
+
+Skip to: Announcements - 2003
+
+
 12 Dec 2004 - Struts 1.2.6 (Beta)
 
 The Struts team is pleased to announce the release of Struts

Modified: struts/site/src/site/xdoc/announce-2005.xml
URL: 
http://svn.apache.org/viewvc/struts/site/src/site/xdoc/announce-2005.xml?rev=422247&r1=422246&r2=422247&view=diff
==
--- struts/site/src/site/xdoc/announce-2005.xml (original)
+++ struts/site/src/site/xdoc/announce-2005.xml Sat Jul 15 08:07:31 2006
@@ -26,6 +26,11 @@
 
 
 
+
+Skip to: Announcements - 2004
+
+
+
 18 Dec 2005 - New Struts Committer: Richard
 Feit
 
@@ -220,7 +225,7 @@
 for JSF
 
 [Note: http://shale.apache.org/";>
-   Shale is now a top-level ASF project.]
+Shale is now a top-level ASF project.]
 
 
 

Modified: struts/site/src/site/xdoc/announce.xml
URL: 
http://svn.apache.org/viewvc/struts/site/src/site/xdoc/announce.xml?rev=422247&r1=422246&r2=422247&view=diff
==
--- struts/site/src/site/xdoc/announce.xml (original)
+++ struts/site/src/site/xdoc/announce.xml Sat Jul 15 08:07:31 2006
@@ -26,6 +26

svn commit: r422249 - /struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/tooltipExample.jsp

2006-07-15 Thread tmjee 
Author: tmjee
Date: Sat Jul 15 08:16:11 2006
New Revision: 422249

URL: http://svn.apache.org/viewvc?rev=422249&view=rev
Log:
WW-1317
  - removed tooltip example, as there's not much functionality to
demostrate with the change to dojo tooltip


Removed:

struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/tooltipExample.jsp

svn commit: r422250 - in /struts/struts2/trunk/apps/showcase/src/main: resources/struts-tags-ui.xml webapp/tags/ui/lotsOfRichtexteditor.jsp webapp/tags/ui/lotsOfRichtexteditorSubmit.jsp

2006-07-15 Thread tmjee 
Author: tmjee
Date: Sat Jul 15 08:19:27 2006
New Revision: 422250

URL: http://svn.apache.org/viewvc?rev=422250&view=rev
Log:
WW-1379
  - remove example that uses rich text editor


Removed:

struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/lotsOfRichtexteditor.jsp

struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/lotsOfRichtexteditorSubmit.jsp
Modified:
struts/struts2/trunk/apps/showcase/src/main/resources/struts-tags-ui.xml

Modified: 
struts/struts2/trunk/apps/showcase/src/main/resources/struts-tags-ui.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/resources/struts-tags-ui.xml?rev=422250&r1=422249&r2=422250&view=diff
==
--- struts/struts2/trunk/apps/showcase/src/main/resources/struts-tags-ui.xml 
(original)
+++ struts/struts2/trunk/apps/showcase/src/main/resources/struts-tags-ui.xml 
Sat Jul 15 08:19:27 2006
@@ -31,16 +31,6 @@
lotsOfOptiontransferselect.jsp
lotsOfOptiontransferselectSubmit.jsp
 
-
-   lotsOfRichtexteditor.jsp
-
-
-   lotsOfRichtexteditor.jsp
-   lotsOfRichtexteditorSubmit.jsp
-
-
-   tooltipExample.jsp
-

svn commit: r422251 - in /struts/struts2/trunk: apps/showcase/src/main/webapp/tags/ui/ core/src/main/java/org/apache/struts2/components/ core/src/main/resources/template/xhtml/ core/src/test/java/org/

2006-07-15 Thread tmjee 
Author: tmjee
Date: Sat Jul 15 08:24:09 2006
New Revision: 422251

URL: http://svn.apache.org/viewvc?rev=422251&view=rev
Log:
WW-1317
  - work on tooltip (changes due to switch to dojo tooltip)


Modified:
struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/example.jsp

struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/UIBean.java
struts/struts2/trunk/core/src/main/resources/template/xhtml/tooltip.ftl

struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/TooltipTest.java

struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/tooltip-1.txt

struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/tooltip-2.txt

struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/tooltip-3.txt

Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/example.jsp
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/example.jsp?rev=422251&r1=422250&r2=422251&view=diff
==
--- struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/example.jsp 
(original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/example.jsp Sat 
Jul 15 08:24:09 2006
@@ -13,7 +13,7 @@
 
 
 
-
+
 
 
-

Modified: 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/UIBean.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/UIBean.java?rev=422251&r1=422250&r2=422251&view=diff
==
--- 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/UIBean.java
 (original)
+++ 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/UIBean.java
 Sat Jul 15 08:24:09 2006
@@ -275,167 +275,23 @@
  * none
  * Set the tooltip of this particular component
  *  
+ *  
+ *  jsTooltipEnabled
+ *  String
+ *  false
+ *  Enable js tooltip rendering
+ *  
  *
  * tooltipIcon
  * String
  * /struts/static/tooltip/tooltip.gif
  * The url to the tooltip icon
- *   
- * tooltipAboveMousePointer
- * Boolean
- * false
- * Places the tooltip above the mousepointer. Additionally applied the 
tooltipOffseY allows to set the vertical distance from the mousepointer.
- *   
- *   
- * tooltipBgColor
- * String
- * #e6ecff
- * Background color of the tooltip.
- *   
- *   
- * tooltipBgImg
- * String
- * none
- * Background image.
- *   
- *   
- * tooltipBorderWidth
- * String
- * 1
- * Width of tooltip border.
- *   
- *   
- * tooltipBorderColor
- * String
- * #003399
- * Background color of the tooltip
- *   
  *   
  * tooltipDelay
  * String
  * 500
  * Tooltip shows up after the specified timeout (miliseconds). A 
behavior similar to that of OS based tooltips.
  *   
- *   
- * tooltipFixCoordinateX
- * String
- * not specified
- * Fixes the tooltip to the X co-ordinates specified. Useful for 
example if combined with tooltipSticky attribute.
- *   
- *   
- * tooltipFixCoordinateY
- * String
- * not specified
- * Fixes the tooltip to the Y co-ordinates specified. Useful for 
example if combined with tooltipSticky attribute.
- *   
- *   
- * tooltipFontColor
- * String
- * #66
- * Font color.
- *   
- *   
- * tooltipFontFace
- * String
- * arial,helvetica,sans-serif
- * Font face/family eg. verdana,geneva,sans-serif
- *   
- *   
- * tooltipFontSize
- * String
- * 11px
- * Font size + unit eg. 30px
- *   
- *   
- * tooltipFontWeight
- * String
- * normal
- * Font weight. either normal or bold
- *   
- *   
- * tooltipLeftOfMousePointer
- * Boolean
- * false
- * Tooltip positioned on the left side of the mousepointer
- *   
- *   
- * tooltipOffsetX
- * String
- * 12
- * Horizontal offset from mouse-pointer.
- *   
- *   
- * tooltipOffsetY
- * String
- * 15
- * Vertical offset from mouse-pointer.
- *   
- *   
- * tooltipOpacity
- * String
- * 100
- * Transparency of tooltip. Opacity is the opposite of transparency. 
Value must be a number between 0 (fully transparent) and 100 (opaque, no 
transparency). Not (yet) supported by Opera.
- *   
- *   
- * tooltipPadding
- * String
- * 3
- * Inner spacing, ie. the spacing between border and content, for 
instance text or image(s)
- *   
- *   
- * tooltipShadowColor
- * String
- * #cc
- * Creates shadow with the specified color.
- *   
- *   
- * tooltipShadowWidth
- * String
- * 5
- * Creates shodow with the specified width (offset).
- *   
- *   
- * tooltipStatic
- * Boolean
- * false
- * Like OS-bas

svn commit: r422253 - /struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/UIBean.java

2006-07-15 Thread tmjee 
Author: tmjee
Date: Sat Jul 15 08:42:07 2006
New Revision: 422253

URL: http://svn.apache.org/viewvc?rev=422253&view=rev
Log:
WW-1317
  - changes in javadoc (uses dojo tooltip attributes as example)
 

Modified:

struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/UIBean.java

Modified: 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/UIBean.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/UIBean.java?rev=422253&r1=422252&r2=422253&view=diff
==
--- 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/UIBean.java
 (original)
+++ 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/UIBean.java
 Sat Jul 15 08:42:07 2006
@@ -306,17 +306,17 @@
  *
  * 
  *
- * In Example 1, the textfield will inherit the tooltipAboveMousePointer 
attribte from
+ * In Example 1, the textfield will inherit the tooltipDelay adn tooltipIcon 
attribte from
  * its containing form. In other words, although it doesn't defined a 
tooltipAboveMousePointer
- * attribute, it will have that attribute defined as true inherited from its 
containing form.
+ * attribute, it will have that attributes inherited from its containing form.
  *
  * 
  *
- * In Example 2, the the textfield will inherite both the 
tooltipAboveMousePointer and
- * tooltipLeftOfMousePointer attribute from its containing form but 
tooltipLeftOfMousePointer
+ * In Example 2, the the textfield will inherite both the tooltipDelay and
+ * tooltipIcon attribute from its containing form but tooltipDelay
  * attribute is overriden at the textfield itself. Hence, the textfield 
actually will
- * have tooltipAboveMousePointer defined as true, inherited from its 
containing form and
- * tooltipLeftOfMousePointer defined as false, due to overriden at the 
textfield itself.
+ * have tooltipIcon defined as /myImages/myIcon.gif, inherited from its 
containing form and
+ * tooltipDelay defined as 5000, due to overriden at the textfield itself.
  *
  * 
  *
@@ -333,8 +333,8 @@
  *
  * 
  * 
+ * tooltipConfig="#{'tooltipDelay':'500',
+ *   'tooltipIcon='/myImages/myIcon.gif'}"  >
  *   
  * 
  *   
@@ -342,12 +342,12 @@
  *
  * 
  * 
+ * tooltipConfig="#{'tooltipDelay':'500',
+ * 'tooltipIcon':'/myImages/myIcon.gif'}" 
... >
  *   
  * 
+ *  tooltipConfig="#{'tooltipDelay':'5000'}" />
  *   
  * 
  *
@@ -357,9 +357,8 @@
  *label="Customer Name"
  *   tooltip="One of our customer Details'">
  *
- * tooltipWidth = 150 |
- * tooltipAboveMousePointer = false |
- * tooltipLeftOfMousePointer = false
+ * tooltipDelay = 500 |
+ * tooltipIcon = /myImages/myIcon.gif 
  *
  * 
  *
@@ -370,10 +369,8 @@
  * tooltip="Enter The Customer Address" >
  * 
+ *  value="#{'tooltipDelay':'500',
+ *   'tooltipIcon':'/myImages/myIcon.gif'}" />
  * 
  *
  *
@@ -381,10 +378,8 @@
  * 
  *
  * 
  *

svn commit: r422254 - in /struts/site/src/site: fml/roadmap.fml xdoc/preface.xml xdoc/primer.xml

2006-07-15 Thread husted 
Author: husted
Date: Sat Jul 15 08:45:44 2006
New Revision: 422254

URL: http://svn.apache.org/viewvc?rev=422254&view=rev
Log:
SITE-8 Add kickers to Strut 2 comparison list

Added:
struts/site/src/site/xdoc/primer.xml
  - copied unchanged from r422247, struts/site/src/site/xdoc/preface.xml
Removed:
struts/site/src/site/xdoc/preface.xml
Modified:
struts/site/src/site/fml/roadmap.fml

Modified: struts/site/src/site/fml/roadmap.fml
URL: 
http://svn.apache.org/viewvc/struts/site/src/site/fml/roadmap.fml?rev=422254&r1=422253&r2=422254&view=diff
==
--- struts/site/src/site/fml/roadmap.fml (original)
+++ struts/site/src/site/fml/roadmap.fml Sat Jul 15 08:45:44 2006
@@ -219,56 +219,38 @@
   Some key changes from Struts 1 are:

 
-
-  
-Improved design - All Struts 2 classes are based on 
interfaces. 
-Core interfaces are HTTP independant.
-  
-  
-Easy-to-test Actions - Struts 2 Actions are HTTP independant 
and 
-can be tested without resorting to mocks.
-  
-  
-Easy-to-customize controller - Struts 1 lets you customize the 
-request processor per module, Struts 2 lets you customize the 
request 
-handling per action, if you like.
-  
-  
-Easy-to-customize tags - Struts 2 tags can be customized by 
-changing an underlying stylesheet. Individual tags can be 
customized by 
-editing a FreeMarker template. No need to grok the taglib API! Both 
JSP 
-and FreeMarker tags are fully supported.
-  
-  
-No Cancel quirks - The Struts 2 Cancel button can go directly 
to a 
-different action. 
-  
-  
- Intelligent Defaults - Most configuration elements have a 
default 
- value that you can set and forget.
-  
-  
- POJO forms - No more ActionForms! Use any JavaBean you like 
or put 
- properties directly on your Action. No need to use all String 
- properties!
-  
-  
- POJO Actions - Any class can be used as an Action class. You 
don't 
- even have to implement an interface!
-  
-  
- Enhanced Results - Unlike ActionForwards, Struts 2 Results 
can 
- actually help prepare the response.
-  
-  
- Better AJAX support - The AJAX theme gives your interactive 
- applications a boost.
-   
-  
- QuickStart - Many changes can be made on the fly without 
- restarting a web container.
-  
-
+
+
+Smarter!
+
+Improved design - All Struts 2 
classes are based on interfaces. Core interfaces are HTTP independant.
+
+Intelligent Defaults - Most 
configuration elements have a default value that you can set and forget.
+
+Enhanced Results - Unlike 
ActionForwards, Struts 2 Results can actually help prepare the response.
+
+First-class AJAX support - The AJAX 
theme gives your interactive applications a boost.
+
+QuickStart - Many changes can be made 
on the fly without restarting a web container.
+
+ Easier!
+
+Easy-to-test Actions - Struts 2 
Actions are HTTP independant and can be tested without resorting to mocks.
+
+Easy-to-customize controller - Struts 
1 lets you customize the request processor per module, Struts 2 lets you 
customize the request handling per action, if you like.
+
+Easy-to-customize tags - Struts 2 
tags can be customized by changing an underlying stylesheet. Individual tags 
can be customized by editing a FreeMarker template. No need to grok the taglib 
API! Both JSP and FreeMarker tags are fully supported.
+
+Easy cancel handling - The Struts 2 
Cancel button can go directly to a different action.
+
+ POJO-ier!
+
+POJO forms - No more ActionForms! Use 
any JavaBean you like or put properties directly on your Action. No need to use 
all String properties!
+
+POJO Actions - Any class can be us

[Struts Wiki] Update of "PoweredBy" by MichaelJouravlev

2006-07-15 Thread Apache Wiki 
Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Struts Wiki" for change 
notification.

The following page has been changed by MichaelJouravlev:
http://wiki.apache.org/struts/PoweredBy

The comment on the change is:
Added Tire Kindgom website

--
   * http://www.upickhome.com - Home ownership via rent-to-own (as of July 2006)
   * http://www.rd.com - Reader's Digest website (as of July 2006) Previous 
version had been built with MS ASP (according to Netcraft.com).
   * http://www.bridgerfunding.com - commercial funding company (as of July 
2006)
+  * http://www.tirekingdom.com - Tire Kingdom, tire and automotive services 
retailer in the United States (as of July 2006)
+ 
  See also:
   * StrutsWebLinks page for the list of third party software built on Struts.
   * [http://simonpeter.com/technology/java/struts/sites.html Simon Chappel 
website] for a list of sites using struts.

svn commit: r422323 - /struts/struts1/trunk/core/pom.xml

2006-07-15 Thread wsmoak 
Author: wsmoak
Date: Sat Jul 15 17:53:02 2006
New Revision: 422323

URL: http://svn.apache.org/viewvc?rev=422323&view=rev
Log:
Exclude the transitive dependencies on myfaces-api and portlet-api that come 
from Commons Chain.
The commons-chain 1.1 pom should have marked these as optional.

Modified:
struts/struts1/trunk/core/pom.xml

Modified: struts/struts1/trunk/core/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts1/trunk/core/pom.xml?rev=422323&r1=422322&r2=422323&view=diff
==
--- struts/struts1/trunk/core/pom.xml (original)
+++ struts/struts1/trunk/core/pom.xml Sat Jul 15 17:53:02 2006
@@ -117,6 +117,16 @@
 commons-chain
 commons-chain
 1.1
+
+
+myfaces
+myfaces-api
+
+
+javax.portlet
+portlet-api
+
+
 
 
 commons-digester

svn commit: r422324 - /struts/struts1/trunk/integration/apps-it/pom.xml

2006-07-15 Thread wsmoak 
Author: wsmoak
Date: Sat Jul 15 17:55:49 2006
New Revision: 422324

URL: http://svn.apache.org/viewvc?rev=422324&view=rev
Log:
Modify the apps-it pom so the module can be built alone without specifying a 
profile.
When building from the top, the integration module is only included if -Pitest 
is used.

Modified:
struts/struts1/trunk/integration/apps-it/pom.xml

Modified: struts/struts1/trunk/integration/apps-it/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts1/trunk/integration/apps-it/pom.xml?rev=422324&r1=422323&r2=422324&view=diff
==
--- struts/struts1/trunk/integration/apps-it/pom.xml (original)
+++ struts/struts1/trunk/integration/apps-it/pom.xml Sat Jul 15 17:55:49 2006
@@ -66,14 +66,6 @@
   

 
-   
-  
-  itest
-  
-  
-  itest
-  
-  
   
 

@@ -120,7 +112,5 @@

 
  
-  
-

svn commit: r422331 - in /struts/struts1/trunk/src/site/xdoc/userGuide: index.xml introduction.xml

2006-07-15 Thread husted 
Author: husted
Date: Sat Jul 15 18:33:42 2006
New Revision: 422331

URL: http://svn.apache.org/viewvc?rev=422331&view=rev
Log:
STR 2910 Update introduction to complement primer. 

Modified:
struts/struts1/trunk/src/site/xdoc/userGuide/index.xml
struts/struts1/trunk/src/site/xdoc/userGuide/introduction.xml

Modified: struts/struts1/trunk/src/site/xdoc/userGuide/index.xml
URL: 
http://svn.apache.org/viewvc/struts/struts1/trunk/src/site/xdoc/userGuide/index.xml?rev=422331&r1=422330&r2=422331&view=diff
==
--- struts/struts1/trunk/src/site/xdoc/userGuide/index.xml (original)
+++ struts/struts1/trunk/src/site/xdoc/userGuide/index.xml Sat Jul 15 18:33:42 
2006
@@ -37,9 +37,6 @@
 into the Past!
 
 
-1.2 The
-Model-View-Controller ('MVC') Design
-Pattern
 
 
 
@@ -425,7 +422,7 @@
 
 
 Next:
-introduction
+Introduction
 
 
 

Modified: struts/struts1/trunk/src/site/xdoc/userGuide/introduction.xml
URL: 
http://svn.apache.org/viewvc/struts/struts1/trunk/src/site/xdoc/userGuide/introduction.xml?rev=422331&r1=422330&r2=422331&view=diff
==
--- struts/struts1/trunk/src/site/xdoc/userGuide/introduction.xml (original)
+++ struts/struts1/trunk/src/site/xdoc/userGuide/introduction.xml Sat Jul 15 
18:33:42 2006
@@ -79,7 +79,7 @@
 applications.
 
 
-Another model was clearly needed ...
+Clearly, another paradigm was needed ...
 
 
 Many clever developers realized that JavaServer Pages AND
@@ -121,59 +121,21 @@
 
 
 
-
+
 
-
 
 
-In the original SmallTalk Model-View-Controller framework,
-an application is seen as having three distinct parts.
-The problem domain is represented by the Model.
-The output to the user is represented by the View.
-And, the input from the user is represented by Controller.
+The term "MVC" originated with the SmallTalk 
+Model-View-Controller framework. Under MVC, 
+an application is seen as having three distinct parts. The 
+problem domain is represented by the Model. The output to 
+the user is represented by the View. And, the input from 
the 
+user is represented by Controller.
 
 
-
-In Smalltalk MVC, the View updates itself from the Model,
-via the "Observer" pattern.
-The original MVC pattern is like a closed loop:
-The View talks to the Controller, which talks to the
-Model,
-which talks to the View.
-
-
-
-But, a direct link between the Model and the View is not
-practical
-for web applications,
-so we modify the classic MVC arrangement so that it would
-look
-less like a loop and more like a horseshoe with the
-controller
-in the middle.
-
-
-
-In the MVC/Model 2 design pattern, application flow is
-mediated by a
-central Controller. The Controller delegates requests - in
-our
-case, HTTP requests - to an appropriate handler. The
-handlers
-are tied to a Model, and each handler acts as an adapter
-between the request and the Model. The Model represents,
-or
-encapsulates, an application's business logic or
-state. Control is usually then forwarded back through the
-Controller to the appropriate View. The forwarding can be
-determined by consulting a set of mappings, usually loaded
-from a database or configuration file. This provides a
-loose
-coupling between the View and Model, which can make
-applications significantly easier to create and maintain.
-

svn commit: r422333 - in /struts/site/src/site: fml/roadmap.fml xdoc/primer.xml

2006-07-15 Thread husted 
Author: husted
Date: Sat Jul 15 18:35:07 2006
New Revision: 422333

URL: http://svn.apache.org/viewvc?rev=422333&view=rev
Log:
STR 2910 Add AJAX, SOAP, and MVC to primer. 

Modified:
struts/site/src/site/fml/roadmap.fml
struts/site/src/site/xdoc/primer.xml

Modified: struts/site/src/site/fml/roadmap.fml
URL: 
http://svn.apache.org/viewvc/struts/site/src/site/fml/roadmap.fml?rev=422333&r1=422332&r2=422333&view=diff
==
--- struts/site/src/site/fml/roadmap.fml (original)
+++ struts/site/src/site/fml/roadmap.fml Sat Jul 15 18:35:07 2006
@@ -162,16 +162,26 @@
 probably find a MVC framework useful.  
 
 
-When choosing a framework, an important consideration is 
-which user interface technology you would like to use:
+When choosing a framework, two keys considerations are 
+which user interface technology and which version of Java 
+you would like to use.
+Popular user interface technologies include 
 http://java.sun.com/j2ee/javaserverfaces/";>JavaServer
 Faces
-(JSF),
-conventional
+(JSF), conventional
 http://java.sun.com/products/jsp/";>JavaServer 
Pages
 (JSP),
-or another templating technology like
+and templating technologies like
 http://jakarta.apache.org/velocity/";>Velocity.
+Another popular UI technology to consider is 
+http://www.adaptivepath.com/publications/essays/archives/000385.php";>
+AJAX.
+
+
+(For more about the technologies underlying modern web 
+applications, see the 
+
+Key Technologies primer.)
 
 
 While both Struts 1 and 2 support JSP, Velocity, and XSLT, 

Modified: struts/site/src/site/xdoc/primer.xml
URL: 
http://svn.apache.org/viewvc/struts/site/src/site/xdoc/primer.xml?rev=422333&r1=422332&r2=422333&view=diff
==
--- struts/site/src/site/xdoc/primer.xml (original)
+++ struts/site/src/site/xdoc/primer.xml Sat Jul 15 18:35:07 2006
@@ -52,6 +52,9 @@
 The HTTP Request/Response Cycle
 
 
+JavaScript, AJAX, and SOAP
+
+
 The Java Language and Application
 Frameworks
 
@@ -63,20 +66,20 @@
 ResourceBundles
 
 
-Java Servlets
+Java Servlets and Web 
Containers
 
 
 JavaServer Pages and JSP Tag
 Libraries
 
 
-Extensible Markup Language
+Extensible Markup Language (XML)
 
 
 JAAS
 
 
-Other Layers
+Model View Controller
 
 
 
@@ -88,7 +91,8 @@
 technology.
 
 
-If you are familiar with Java,
+ 
+If you are familiar with Java,
 but not these technologies,
 the best overall starting point is
 http://java.sun.com/j2ee/tutorial/1_3-fcs/index.html";>
@@ -100,7 +104,8 @@
 format.
 
 
-If you've created web applications for other platforms, you
+
+If you've created web applications for other platforms, you
 may be able to follow along
 and visit the other references as needed. The core
 technologies used by the framework are
@@ -109,7 +114,8 @@
 useful in any Java project.
 
 
-If you are not familiar with the Java language
+
+If you are not familiar with the Java language
 generally,
 then the best starting point is
 http://java.sun.com/docs/books/tutorial/index.html";>
@@ -132,7 +138,8 @@
 
 
 
-The World Wide Web was built over the Hypertext Transfer
+ 
+

[Struts Wiki] Update of "StrutsActionRelease200" by TedHusted

2006-07-15 Thread Apache Wiki 
Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Struts Wiki" for change 
notification.

The following page has been changed by TedHusted:
http://wiki.apache.org/struts/StrutsActionRelease200

The comment on the change is:
Update overall status

--
   * 
[http://issues.apache.org/struts/secure/IssueNavigator.jspa?reset=true&mode=hide&sorter/order=DESC&sorter/field=priority&resolution=-1&pid=10030&fixfor=21510
 Issue Tracker]
   * [http://wiki.apache.org/struts/StrutsTi Struts Ti Proposal]
   * [http://wiki.apache.org/struts/StrutsAction2 Migration Issues]
-  * [http://wiki.apache.org/struts/RoughSpots SAF2 Rough Spots]
+  * [http://wiki.apache.org/struts/RoughSpots Struts 2 Rough Spots]
   * [http://svn.apache.org/viewcvs.cgi/struts/action2/trunk/action-api Public 
API Whiteboard] 
   * [http://retroweaver.sourceforge.net/documentation.html Retroweaver]
  
  == Special Issues ==
  
- Struts 2.0 is based on the Web``Work 2.2 codebase. Essentially, Struts 2.0  
will be the technical equivalent of Web``Work 2.3. (The Web``Work2 codebase was 
accepted into the Struts project through the 
[http://incubator.apache.org/projects/webwork2.html Apache Incubator].) 
+ Struts 2.0 is based on the Web``Work 2.2 codebase. Essentially, Struts 2.0 
will be the technical equivalent of Web``Work 2.3. (The Web``Work2 codebase was 
accepted into the Struts project through the 
[http://incubator.apache.org/projects/webwork2.html Apache Incubator].) 
  
- For Struts 2, the core goals are to repackage the codebase as an Apache 
Struts product and to provide migration resources for Struts 1 and WW 2 
developers. A few legacy API elements will be removed, and a few new features 
will be added. 
+ For Struts 2.0, the core goals are to repackage the codebase as an Apache 
Struts product and to provide migration resources for Struts 1 and WW 2 
developers. A few legacy API elements will be removed, and a few new features 
will be added. 
  
  The Struts 2.0 release is following the 
[http://wiki.apache.org/struts/StrutsTi Struts Ti Proposal]. Struts 2.0 is 
Phase 1 of the proposal. A subsequent Struts release series (either Struts 2.1 
or Struts 3.0) will address Phase 2 of the proposal.
  
@@ -36, +36 @@

  
  The platform for Struts 2.0.x is Java 1.5, with Java 1.4 compatibity provided 
by [http://retroweaver.sourceforge.net/documentation.html Retroweaver].
  
- See also StrutsAction2.
+ See also [StrutsAction2 Struts 2].
  
  == Overall Status ==
  
  || Initial rename of packages and configuration files || Complete ||
  || Pass Web``Work2 codebase through the Incubator || Complete ||
- || [http://issues.apache.org/struts/browse/SITE-3 Setup Nightly Builds] || - 
||
+ || [http://issues.apache.org/struts/browse/SITE-3 Setup Nightly Builds] || 
Pending ||
  || [http://issues.apache.org/struts/browse/WW-1340 Update WW2 documentation 
for Struts 2] || Step 3 of 4 ||
  || [http://issues.apache.org/struts/browse/WW-1341 Utilize Cookbook format 
for Showcase and add Struts-Examples use cases] || - ||
  || [http://issues.apache.org/struts/browse/WW-1342 Remove deprecated members 
(IoC components)] || Complete ||
  || [http://issues.apache.org/struts/browse/WW-1343 Deprecate selected legacy 
API members (e.g. Around``Interceptor, "do" clause)] || Complete ||
- || [http://issues.apache.org/struts/browse/WW-1344 Update Javadoc to match 
new package and configuration naming] || - ||
+ || [http://issues.apache.org/struts/browse/WW-1344 Update Javadoc to match 
new package and configuration naming] || Complete ||
- || Implement selected new features and SAF1 features (infra) || - ||
+ || Implement selected new features and Struts 1 features (infra) || Complete 
||
  || [http://issues.apache.org/struts/browse/WW-1345 Add Struts 1 and WW2 
Migration Guides] || Initial draft added ||
- || [http://issues.apache.org/struts/browse/WW-1346 Develop routine for 
exporting wiki to HTML/PDF] || - ||
+ || [http://issues.apache.org/struts/browse/WW-1346 Develop routine for 
exporting wiki to HTML/PDF] || Pending ||
+ || [http://issues.apache.org/struts/browse/WW-1378 Develop Maven assembly to 
create distribution] || Pending ||
  || Second documentation review || - ||
  || Complete standard release plan || - ||
  || - || - ||
@@ -62, +63 @@

  || Step 1 - Setup new Confluence instance || Complete ||
  || Step 2 - Initial pass to update nomenclature and remove obsolete material 
|| Complete ||
  || Step 3 - Update "snippets" to reference ASF repository || Pending ||
- || Step 4 - Complete tutorials and other "TODO" sections || - ||
+ || Step 4 - Complete tutorials and other "TODO" sections || Pending ||
  
  == New Features Under Consideration ==

svn commit: r422341 - in /struts/maven/trunk: struts2-archetype-quickstart/ struts2-archetype-starter/

2006-07-15 Thread wsmoak 
Author: wsmoak
Date: Sat Jul 15 19:50:28 2006
New Revision: 422341

URL: http://svn.apache.org/viewvc?rev=422341&view=rev
Log:
Renamed archetype from quickstart to starter.
WW-1359

Added:
struts/maven/trunk/struts2-archetype-starter/
  - copied from r422340, struts/maven/trunk/struts2-archetype-quickstart/
Removed:
struts/maven/trunk/struts2-archetype-quickstart/

svn commit: r422342 - in /struts/maven/trunk/struts2-archetype-starter: README.txt pom.xml src/main/resources/META-INF/archetype.xml src/main/resources/archetype-resources/pom.xml src/main/resources/a

2006-07-15 Thread wsmoak 
Author: wsmoak
Date: Sat Jul 15 19:57:15 2006
New Revision: 422342

URL: http://svn.apache.org/viewvc?rev=422342&view=rev
Log:
Finish renaming the archetype from quickstart to starter.
WW-1359

Modified:
struts/maven/trunk/struts2-archetype-starter/README.txt
struts/maven/trunk/struts2-archetype-starter/pom.xml

struts/maven/trunk/struts2-archetype-starter/src/main/resources/META-INF/archetype.xml

struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/pom.xml

struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml

Modified: struts/maven/trunk/struts2-archetype-starter/README.txt
URL: 
http://svn.apache.org/viewvc/struts/maven/trunk/struts2-archetype-starter/README.txt?rev=422342&r1=422341&r2=422342&view=diff
==
--- struts/maven/trunk/struts2-archetype-starter/README.txt (original)
+++ struts/maven/trunk/struts2-archetype-starter/README.txt Sat Jul 15 19:57:15 
2006
@@ -30,7 +30,7 @@
   mvn archetype:create -DgroupId=com.myCompany.mySystem \
-DartifactId=myWebApp \
-DarchetypeGroupId=org.apache.struts \
-   -DarchetypeArtifactId=struts2-archetype-quickstart \
+   -DarchetypeArtifactId=struts2-archetype-starter \
-DarchetypeVersion=1.0-SNAPSHOT \

-DremoteRepositories=http://people.apache.org/maven-snapshot-repository
 

Modified: struts/maven/trunk/struts2-archetype-starter/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/maven/trunk/struts2-archetype-starter/pom.xml?rev=422342&r1=422341&r2=422342&view=diff
==
--- struts/maven/trunk/struts2-archetype-starter/pom.xml (original)
+++ struts/maven/trunk/struts2-archetype-starter/pom.xml Sat Jul 15 19:57:15 
2006
@@ -8,7 +8,7 @@
   
 
   4.0.0
-  struts2-archetype-quickstart
+  struts2-archetype-starter
   1.0-SNAPSHOT
   maven-plugin
 

Modified: 
struts/maven/trunk/struts2-archetype-starter/src/main/resources/META-INF/archetype.xml
URL: 
http://svn.apache.org/viewvc/struts/maven/trunk/struts2-archetype-starter/src/main/resources/META-INF/archetype.xml?rev=422342&r1=422341&r2=422342&view=diff
==
--- 
struts/maven/trunk/struts2-archetype-starter/src/main/resources/META-INF/archetype.xml
 (original)
+++ 
struts/maven/trunk/struts2-archetype-starter/src/main/resources/META-INF/archetype.xml
 Sat Jul 15 19:57:15 2006
@@ -1,7 +1,7 @@
 
 
 
-  quickstart
+  starter
   
 src/main/java/com/myComp/myApp/HelloWorldAction.java
 src/main/java/com/myComp/myApp/IndexAction.java

Modified: 
struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/pom.xml?rev=422342&r1=422341&r2=422342&view=diff
==
--- 
struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/pom.xml
 (original)
+++ 
struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/pom.xml
 Sat Jul 15 19:57:15 2006
@@ -6,9 +6,9 @@
${artifactId}
war
${version}
-   Struts 2 Quickstart Web App Sample
+   Struts 2 Starter Web App Sample
http://www.myComp.com
-   Struts 2 - Maven Archetype - Quickstart
+   Struts 2 - Maven Archetype - Starter




Modified: 
struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
URL: 
http://svn.apache.org/viewvc/struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml?rev=422342&r1=422341&r2=422342&view=diff
==
--- 
struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
 (original)
+++ 
struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
 Sat Jul 15 19:57:15 2006
@@ -4,7 +4,7 @@
"http://java.sun.com/dtd/web-app_2_3.dtd";>

 
-   SAF2 - Maven Archetype - Quickstart
+   Struts 2 - Maven Archetype - Starter

svn commit: r422376 - in /struts/struts2/trunk/apps/showcase/src/main: java/org/apache/struts2/showcase/ajax/ resources/ webapp/WEB-INF/ webapp/ajax/tabbedpanel/ webapp/ajax/tabbedpanel/nodecorate/

2006-07-15 Thread tmjee 
Author: tmjee
Date: Sat Jul 15 22:24:08 2006
New Revision: 422376

URL: http://svn.apache.org/viewvc?rev=422376&view=rev
Log:
WW-1297
  - add example into showcase that causes bug WW-1297 to appear  


Added:

struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/Example4ShowPanelAction.java
   (with props)

struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/tabbedpanel/example4.ftl

struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/tabbedpanel/nodecorate/

struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/tabbedpanel/nodecorate/panel1.ftl

struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/tabbedpanel/nodecorate/panel2.ftl

struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/tabbedpanel/nodecorate/panel2Submit.ftl

struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/tabbedpanel/nodecorate/panel3.ftl

struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/tabbedpanel/nodecorate/panel3Submit.ftl
Modified:
struts/struts2/trunk/apps/showcase/src/main/resources/struts-ajax.xml
struts/struts2/trunk/apps/showcase/src/main/webapp/WEB-INF/decorators.xml

struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/tabbedpanel/index.jsp

Added: 
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/Example4ShowPanelAction.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/Example4ShowPanelAction.java?rev=422376&view=auto
==
--- 
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/Example4ShowPanelAction.java
 (added)
+++ 
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/Example4ShowPanelAction.java
 Sat Jul 15 22:24:08 2006
@@ -0,0 +1,72 @@
+/*
+ * $Id: AjaxTestAction.java 420385 2006-07-10 00:57:05Z tmjee $
+ *
+ * Copyright 2006 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.struts2.showcase.ajax;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import com.opensymphony.xwork2.ActionSupport;
+
+/**
+ * @version $Date$ $Id$
+ */
+public class Example4ShowPanelAction extends ActionSupport {
+
+   private String name;
+   private String gender;
+   
+   private static final long serialVersionUID = 7751976335066456596L;
+
+   public String panel1() throws Exception {
+   return SUCCESS;
+   }
+   
+   public String panel2() throws Exception {
+   return SUCCESS;
+   }
+   
+   public String panel3() throws Exception {
+   return SUCCESS;
+   }
+
+   public String getGender() {
+   return gender;
+   }
+
+   public void setGender(String gender) {
+   this.gender = gender;
+   }
+
+   public String getName() {
+   return name;
+   }
+
+   public void setName(String name) {
+   this.name = name;
+   }
+   
+   public String getTodayDate() {
+   SimpleDateFormat sdf = new SimpleDateFormat("dd--");
+   return sdf.format(new Date());
+   }
+   
+   public String getTodayTime() {
+   SimpleDateFormat sdf = new SimpleDateFormat("kk:mm:ss");
+   return sdf.format(new Date());
+   }
+}

Propchange: 
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/Example4ShowPanelAction.java
--
svn:eol-style = native

Modified: struts/struts2/trunk/apps/showcase/src/main/resources/struts-ajax.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/resources/struts-ajax.xml?rev=422376&r1=422375&r2=422376&view=diff
==
--- struts/struts2/trunk/apps/showcase/src/main/resources/struts-ajax.xml 
(original)
+++ struts/struts2/trunk/apps/showcase/src/main/resources/struts-ajax.xml Sat 
Jul 15 22:24:08 2006
@@ -41,5 +41,29 @@
 
 /ajax/tree/toggle.jsp
 
+
+
+   /ajax/tabbedpanel/example4.ftl
+
+
+
+
+
+   
+
+   /ajax/tabbedpanel/nodecorate/panel1.ftl
+   
+   
+

svn commit: r422378 - /struts/struts2/trunk/core/src/main/resources/template/ajax/tab.ftl

2006-07-15 Thread tmjee 
Author: tmjee
Date: Sat Jul 15 22:37:57 2006
New Revision: 422378

URL: http://svn.apache.org/viewvc?rev=422378&view=rev
Log:
WW-1297 WW-1381
  - fix at times the all panel will appear when remote=true
  - fix when remote=true, during first load the remote content is not
displayed


Modified:
struts/struts2/trunk/core/src/main/resources/template/ajax/tab.ftl

Modified: struts/struts2/trunk/core/src/main/resources/template/ajax/tab.ftl
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/ajax/tab.ftl?rev=422378&r1=422377&r2=422378&view=diff
==
--- struts/struts2/trunk/core/src/main/resources/template/ajax/tab.ftl 
(original)
+++ struts/struts2/trunk/core/src/main/resources/template/ajax/tab.ftl Sat Jul 
15 22:37:57 2006
@@ -1,13 +1,13 @@
-
+
 
-dojoType='BindDiv'
+dojoType='BindDiv' 
 <#if parameters.href?if_exists != 
"">href="${parameters.href}"
 <#if parameters.loadingText?if_exists != 
"">loadingHtml="${parameters.loadingText?html}"
 <#if parameters.errorText?if_exists != 
"">errorHtml="${parameters.errorText?html}"
 <#if 
parameters.showErrorTransportText?exists>showTransportError='true'
-<#if 
parameters.delay?exists>delay='${parameters.delay}'
+ delay='1'
 <#if 
parameters.updateFreq?exists>refresh='${parameters.updateFreq}'
 <#if 
parameters.listenTopics?exists>listenTopics='${parameters.listenTopics}'
 <#if 
parameters.afterLoading?exists>onLoad='${parameters.afterLoading}'

[Struts Wiki] Update of "StrutsMaintenanceSvn" by WendySmoak

2006-07-15 Thread Apache Wiki 
Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Struts Wiki" for change 
notification.

The following page has been changed by WendySmoak:
http://wiki.apache.org/struts/StrutsMaintenanceSvn

The comment on the change is:
Added *.fml, removed section on svn:externals for releases.

--
  *.properties = svn:eol-style=native;svn:keywords=Date Author Id Revision 
HeadURL
  *.tld = svn:eol-style=native;svn:keywords=Date Author Id Revision HeadURL
  *.ftl = svn:eol-style=native;svn:keywords=Date Author Id Revision HeadURL
+ *.fml = svn:eol-style=native;svn:keywords=Date Author Id Revision HeadURL
  }}}
  
  === Struts Subversion Property Settings ===
@@ -118, +119 @@

  (if using vi, it will open up like this)
  
  {{{
- apps https://svn.apache.org/repos/asf/struts/apps/trunk
- bsf  https://svn.apache.org/repos/asf/struts/bsf/trunk
+ struts1   https://svn.apache.org/repos/asf/struts/struts1/trunk
- buildhttps://svn.apache.org/repos/asf/struts/build/trunk
- core https://svn.apache.org/repos/asf/struts/core/trunk
+ struts2   https://svn.apache.org/repos/asf/struts/struts2/trunk
- el   https://svn.apache.org/repos/asf/struts/el/trunk
+ maven https://svn.apache.org/repos/asf/struts/maven/trunk
- faceshttps://svn.apache.org/repos/asf/struts/faces/trunk
- flow https://svn.apache.org/repos/asf/struts/flow/trunk
- extras   https://svn.apache.org/repos/asf/struts/extras/trunk
- sandbox  https://svn.apache.org/repos/asf/struts/sandbox/trunk
+ sandbox   https://svn.apache.org/repos/asf/struts/sandbox/trunk
- site https://svn.apache.org/repos/asf/struts/site/trunk
- shalehttps://svn.apache.org/repos/asf/struts/shale/trunk
+ shale https://svn.apache.org/repos/asf/struts/shale/trunk
- taglib   https://svn.apache.org/repos/asf/struts/taglib/trunk
- tileshttps://svn.apache.org/repos/asf/struts/tiles/trunk
+ site  https://svn.apache.org/repos/asf/struts/site
- ~
- ~
- ~
  
  }}}
  
@@ -149, +140 @@

   $ svn commit -m "modified svn:externals for ???" .
  }}}
  
- 
-  Updating svn:externals after tagging a release or branching 
- 
- This is where you will change/point it to the tagged/branched versions.
- 
- Similar to the above steps, however, you have to checkout and update the 
tagged/branched versions.  Don't worry, you won't have to sit through a bunch 
of checkouts that eat up your hard disk.  We'll use a svn switch to limit 
recursion of the checkouts.
- 
- Do the steps above for setting up the SVN_EDITOR environment variable.
- 
- {{{
- 
- > cd path/to/svn/struts/checkout/
- > ll
- total 23424
- drwxr-xr-x   23 jmitchel  jmitchel   782 Nov  2 11:17 apps
- drwxr-xr-x   13 jmitchel  jmitchel   442 Nov  1 22:39 bsf
- drwxr-xr-x   21 jmitchel  jmitchel   714 Nov 14 11:48 build
- drwxr-xr-x   22 jmitchel  jmitchel   748 Nov 14 12:02 core
- drwxr-xr-x   15 jmitchel  jmitchel   510 Nov 14 11:49 el
- drwxr-xr-x9 jmitchel  jmitchel   306 Nov 14 11:49 extras
- drwxr-xr-x   19 jmitchel  jmitchel   646 Nov  1 22:39 faces
- drwxr-xr-x   13 jmitchel  jmitchel   442 Nov 14 11:49 flow
- -rw-r--r--1 jmitchel  jmitchel  1166 Sep 25 20:04 nightly.sh
- drwxr-xr-x8 jmitchel  jmitchel   272 Nov  1 22:40 plugins
- drwxr-xr-x   23 jmitchel  jmitchel   782 Nov 14 11:49 sandbox
- drwxr-xr-x   19 jmitchel  jmitchel   646 Nov  3 08:10 shale
- drwxr-xr-x   10 jmitchel  jmitchel   340 Nov  1 22:40 site
- drwxr-xr-x   23 jmitchel  jmitchel   782 Nov 14 11:50 taglib
- drwxr-xr-x   11 jmitchel  jmitchel   374 Nov 14 11:50 tiles
- 
- }}}
- 
- __IMPORTANT__ - for each subproject that is being tagged/released, do the 
following:
- 
- (I suppose if we do this enough, this could made into a script, the below is 
an example for 'core')
- 
- {{{
-  $ svn copy https://svn.apache.org/repos/asf/struts/core/trunk \
-
https://svn.apache.org/repos/asf/struts/core/tags/STRUTS_CORE_1_3_0 \
-   -m "Tagging the 1.3.0 release."
- 
- }}}
- 
- Ok, now that we've tagged it, we have to checkout this tag to modify the 
svn:externals
- 
- {{{
-  $ mkdir tmp-struts
-  $ cd tmp-struts
-  $ svn co -N 
https://svn.apache.org/repos/asf/struts/core/tags/STRUTS_CORE_1_3_0 
struts-core-1.3.0-branch
- }}}
- 
-   (*note the "-N" switch above forces svn not to recurse, 
-you don't want everything if you are simply going to fix svn:externals)
- 
- {{{
-  $ cd struts-core-1.3.0-branch
-  $ svn propedit svn:externals .   <-- don't forget the "."
- }}}
- 
- (vi will open up like this)
- 
- {{{
- apps https://svn.apache.org/repos/asf/struts/apps/trunk
- bsf  https://svn.apache.org/repos/asf/struts/bsf/trunk
- buildhttps://svn.apache.org/repos/asf/struts/build/trunk
- core https://svn.apache.org/repos/asf/struts/core/trunk
- el   https://svn.apache.org/repos/asf/struts/el/trunk
- faceshttps://svn.apache.org/repos/asf/struts