svn commit: r408016 - in /struts/action2/trunk/core/src: main/java/org/apache/struts/action2/components/ main/java/org/apache/struts/action2/views/jsp/ui/ main/resources/META-INF/ main/resources/org/a

2006-05-20 Thread tmjee 
Author: tmjee
Date: Sat May 20 09:11:06 2006
New Revision: 408016

URL: http://svn.apache.org/viewvc?rev=408016&view=rev
Log:
WW-1316


Added:

struts/action2/trunk/core/src/main/resources/org/apache/struts/action2/static/tree.css
   (with props)

struts/action2/trunk/core/src/test/java/org/apache/struts/action2/views/jsp/ui/Category.java
   (with props)

struts/action2/trunk/core/src/test/java/org/apache/struts/action2/views/jsp/ui/TreeTest.java
   (with props)

struts/action2/trunk/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/tree-1.txt
   (with props)

struts/action2/trunk/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/tree-2.txt
   (with props)
Modified:

struts/action2/trunk/core/src/main/java/org/apache/struts/action2/components/Tree.java

struts/action2/trunk/core/src/main/java/org/apache/struts/action2/views/jsp/ui/TreeNodeTag.java

struts/action2/trunk/core/src/main/java/org/apache/struts/action2/views/jsp/ui/TreeTag.java
struts/action2/trunk/core/src/main/resources/META-INF/taglib.tld
struts/action2/trunk/core/src/main/resources/template/ajax/tree.ftl
struts/action2/trunk/core/src/main/resources/template/ajax/treenode.ftl

Modified: 
struts/action2/trunk/core/src/main/java/org/apache/struts/action2/components/Tree.java
URL: 
http://svn.apache.org/viewvc/struts/action2/trunk/core/src/main/java/org/apache/struts/action2/components/Tree.java?rev=408016&r1=408015&r2=408016&view=diff
==
--- 
struts/action2/trunk/core/src/main/java/org/apache/struts/action2/components/Tree.java
 (original)
+++ 
struts/action2/trunk/core/src/main/java/org/apache/struts/action2/components/Tree.java
 Sat May 20 09:11:06 2006
@@ -25,17 +25,34 @@
  * description="Render a tree widget."
  */
 public class Tree extends ClosingUIBean {
-private static final String TEMPLATE = "tree-close";
+
+   private static final String TEMPLATE = "tree-close";
 private static final String OPEN_TEMPLATE = "tree";
+
 private String toggle = "fade";
 private String treeSelectedTopic;
 private String treeExpandedTopic;
 private String treeCollapsedTopic;
-private String openAll;
 protected String rootNodeAttr;
 protected String childCollectionProperty;
 protected String nodeTitleProperty;
 protected String nodeIdProperty;
+private String showRootGrid;
+
+private String showGrid;
+private String blankIconSrc;
+   private String gridIconSrcL;
+   private String gridIconSrcV;
+   private String gridIconSrcP;
+   private String gridIconSrcC;
+   private String gridIconSrcX;
+   private String gridIconSrcY;
+   private String expandIconSrcPlus;
+   private String expandIconSrcMinus;
+   private String iconWidth;
+   private String iconHeight;
+   private String toggleDuration;
+private String templateCssPath;
 
 public Tree(OgnlValueStack stack, HttpServletRequest request, 
HttpServletResponse response) {
 super(stack, request, response);
@@ -75,8 +92,6 @@
 addParameter("treeCollapsedTopic", findString(treeCollapsedTopic));
 }
 
-addParameter("openAll", Boolean.valueOf(openAll));
-
 if (rootNodeAttr != null) {
 addParameter("rootNode", findValue(rootNodeAttr));
 }
@@ -92,6 +107,64 @@
 if (nodeIdProperty != null) {
 addParameter("nodeIdProperty", findString(nodeIdProperty));
 }
+
+if (showRootGrid != null) {
+   addParameter("showRootGrid", findValue(showRootGrid, 
Boolean.class));
+}
+
+
+if (showGrid != null) {
+   addParameter("showGrid", findValue(showGrid, Boolean.class));
+}
+
+if (blankIconSrc != null) {
+   addParameter("blankIconSrc", findString(blankIconSrc));
+}
+
+   if (gridIconSrcL != null) {
+   addParameter("gridIconSrcL", findString(gridIconSrcL));
+   }
+   
+   if (gridIconSrcV != null) {
+   addParameter("gridIconSrcV", findString(gridIconSrcV));
+   }
+   
+   if (gridIconSrcP != null)  {
+   addParameter("gridIconSrcP", findString(gridIconSrcP));
+   }
+   
+   if (gridIconSrcC != null) {
+   addParameter("gridIconSrcC", findString(gridIconSrcC));
+   }
+   
+   if (gridIconSrcX != null) {
+   addParameter("gridIconSrcX", findString(gridIconSrcX));
+   }
+   
+   if (gridIconSrcY != null) {
+   addParameter("gridIconSrcY", findString(gridIconSrcY));
+   }
+   
+   if (expandIconSrcPlus != null) {
+   addParameter("expandIconSrcPlus", 
findString(expandIconSrcPlus));
+   }
+   
+   if (expandIconSrcMinus != null) {
+   addParameter("expandIconSrcMinus", 
findString

svn commit: r408019 - in /struts/action2/trunk/apps/showcase/src/main: java/org/apache/struts/action2/showcase/ webapp/WEB-INF/ webapp/WEB-INF/classes/ webapp/tags/ui/

2006-05-20 Thread tmjee 
Author: tmjee
Date: Sat May 20 09:14:37 2006
New Revision: 408019

URL: http://svn.apache.org/viewvc?rev=408019&view=rev
Log:
WW-1293


Added:

struts/action2/trunk/apps/showcase/src/main/java/org/apache/struts/action2/showcase/DynamicTreeSelectAction.java
   (with props)

struts/action2/trunk/apps/showcase/src/main/java/org/apache/struts/action2/showcase/ShowDynamicTreeAction.java
   (with props)

struts/action2/trunk/apps/showcase/src/main/webapp/tags/ui/dynamicTreeSelect.jsp
   (with props)

struts/action2/trunk/apps/showcase/src/main/webapp/tags/ui/staticTreeSelect.jsp 
  (with props)

struts/action2/trunk/apps/showcase/src/main/webapp/tags/ui/treeExampleDynamic.jsp
   (with props)

struts/action2/trunk/apps/showcase/src/main/webapp/tags/ui/treeExampleStatic.jsp
   (with props)
Modified:

struts/action2/trunk/apps/showcase/src/main/webapp/WEB-INF/classes/xwork-tags-ui.xml
struts/action2/trunk/apps/showcase/src/main/webapp/WEB-INF/decorators.xml
struts/action2/trunk/apps/showcase/src/main/webapp/tags/ui/index.jsp

Added: 
struts/action2/trunk/apps/showcase/src/main/java/org/apache/struts/action2/showcase/DynamicTreeSelectAction.java
URL: 
http://svn.apache.org/viewvc/struts/action2/trunk/apps/showcase/src/main/java/org/apache/struts/action2/showcase/DynamicTreeSelectAction.java?rev=408019&view=auto
==
--- 
struts/action2/trunk/apps/showcase/src/main/java/org/apache/struts/action2/showcase/DynamicTreeSelectAction.java
 (added)
+++ 
struts/action2/trunk/apps/showcase/src/main/java/org/apache/struts/action2/showcase/DynamicTreeSelectAction.java
 Sat May 20 09:14:37 2006
@@ -0,0 +1,30 @@
+package org.apache.struts.action2.showcase;
+
+import org.apache.struts.action2.showcase.ajax.tree.Category;
+
+import com.opensymphony.xwork.ActionSupport;
+
+public class DynamicTreeSelectAction extends ActionSupport {
+
+   private long nodeId;
+   private Category currentCategory;
+   
+   
+   public void setNodeId(long nodeId) {
+   this.nodeId = nodeId;
+   }
+   public long getNodeId() {
+   return nodeId;
+   }
+   
+   
+   public String execute() throws Exception {
+   currentCategory = Category.getById(nodeId);
+   return SUCCESS;
+   }
+   
+   
+   public String getNodeName() {
+   return currentCategory.getName();
+   }
+}

Propchange: 
struts/action2/trunk/apps/showcase/src/main/java/org/apache/struts/action2/showcase/DynamicTreeSelectAction.java
--
svn:eol-style = native

Added: 
struts/action2/trunk/apps/showcase/src/main/java/org/apache/struts/action2/showcase/ShowDynamicTreeAction.java
URL: 
http://svn.apache.org/viewvc/struts/action2/trunk/apps/showcase/src/main/java/org/apache/struts/action2/showcase/ShowDynamicTreeAction.java?rev=408019&view=auto
==
--- 
struts/action2/trunk/apps/showcase/src/main/java/org/apache/struts/action2/showcase/ShowDynamicTreeAction.java
 (added)
+++ 
struts/action2/trunk/apps/showcase/src/main/java/org/apache/struts/action2/showcase/ShowDynamicTreeAction.java
 Sat May 20 09:14:37 2006
@@ -0,0 +1,14 @@
+package org.apache.struts.action2.showcase;
+
+import org.apache.struts.action2.showcase.ajax.tree.Category;
+
+import com.opensymphony.xwork.ActionSupport;
+
+
+public class ShowDynamicTreeAction extends ActionSupport {
+   
+   public Category getTreeRootNode() {
+   return Category.getById(1);
+   }
+}
+

Propchange: 
struts/action2/trunk/apps/showcase/src/main/java/org/apache/struts/action2/showcase/ShowDynamicTreeAction.java
--
svn:eol-style = native

Modified: 
struts/action2/trunk/apps/showcase/src/main/webapp/WEB-INF/classes/xwork-tags-ui.xml
URL: 
http://svn.apache.org/viewvc/struts/action2/trunk/apps/showcase/src/main/webapp/WEB-INF/classes/xwork-tags-ui.xml?rev=408019&r1=408018&r2=408019&view=diff
==
--- 
struts/action2/trunk/apps/showcase/src/main/webapp/WEB-INF/classes/xwork-tags-ui.xml
 (original)
+++ 
struts/action2/trunk/apps/showcase/src/main/webapp/WEB-INF/classes/xwork-tags-ui.xml
 Sat May 20 09:14:37 2006
@@ -36,5 +36,18 @@
 
tooltipExample.jsp
 
+
+   /tags/ui/treeExampleDynamic.jsp
+
+   
+   
+   
+
+
+   /tags/ui/staticTreeSelect.jsp
+
+
+   /tags/ui/dynamicTreeSelect.jsp
+
 
 

Modified: 
struts/action2/trunk/apps/showcase/src/main/webapp/WEB-INF/decorators.xml
URL: 
http://svn.apache.org/viewvc/struts/action2/trunk/apps/showcase/src/main/webapp

svn commit: r408026 - /struts/action2/trunk/core/src/main/java/org/apache/struts/action2/components/Tree.java

2006-05-20 Thread tmjee 
Author: tmjee
Date: Sat May 20 09:40:08 2006
New Revision: 408026

URL: http://svn.apache.org/viewvc?rev=408026&view=rev
Log:
updated javadoc example snippet


Modified:

struts/action2/trunk/core/src/main/java/org/apache/struts/action2/components/Tree.java

Modified: 
struts/action2/trunk/core/src/main/java/org/apache/struts/action2/components/Tree.java
URL: 
http://svn.apache.org/viewvc/struts/action2/trunk/core/src/main/java/org/apache/struts/action2/components/Tree.java?rev=408026&r1=408025&r2=408026&view=diff
==
--- 
struts/action2/trunk/core/src/main/java/org/apache/struts/action2/components/Tree.java
 (original)
+++ 
struts/action2/trunk/core/src/main/java/org/apache/struts/action2/components/Tree.java
 Sat May 20 09:40:08 2006
@@ -17,9 +17,24 @@
  *
  * 
  * 
- * 
+ * <-- statically --<
+ * 
+ * 
+ * or 
+ * 
+ * <-- dynamically -->
+ * 
+ *
+ *
+ *
+ *
+ *&;lt;/saf:treenode>
+ *
+ * 
+ * 
  * 
  * 
+ * 
  *
  * @a2.tag name="tree" tld-body-content="JSP" 
tld-tag-class="org.apache.struts.action2.views.jsp.ui.TreeTag"
  * description="Render a tree widget."

svn commit: r408029 - /struts/action2/trunk/apps/showcase/src/main/webapp/tags/ui/treeExampleDynamic.jsp

2006-05-20 Thread tmjee 
Author: tmjee
Date: Sat May 20 09:54:54 2006
New Revision: 408029

URL: http://svn.apache.org/viewvc?rev=408029&view=rev
Log:
- added snippet 


Modified:

struts/action2/trunk/apps/showcase/src/main/webapp/tags/ui/treeExampleDynamic.jsp

Modified: 
struts/action2/trunk/apps/showcase/src/main/webapp/tags/ui/treeExampleDynamic.jsp
URL: 
http://svn.apache.org/viewvc/struts/action2/trunk/apps/showcase/src/main/webapp/tags/ui/treeExampleDynamic.jsp?rev=408029&r1=408028&r2=408029&view=diff
==
--- 
struts/action2/trunk/apps/showcase/src/main/webapp/tags/ui/treeExampleDynamic.jsp
 (original)
+++ 
struts/action2/trunk/apps/showcase/src/main/webapp/tags/ui/treeExampleDynamic.jsp
 Sat May 20 09:54:54 2006
@@ -7,6 +7,8 @@
 
 
 
+
+

svn commit: r408031 - /struts/action2/trunk/apps/showcase/src/main/webapp/WEB-INF/classes/xwork-tags-ui.xml

2006-05-20 Thread tmjee 
Author: tmjee
Date: Sat May 20 09:55:19 2006
New Revision: 408031

URL: http://svn.apache.org/viewvc?rev=408031&view=rev
Log:
- added snippet


Modified:

struts/action2/trunk/apps/showcase/src/main/webapp/WEB-INF/classes/xwork-tags-ui.xml

Modified: 
struts/action2/trunk/apps/showcase/src/main/webapp/WEB-INF/classes/xwork-tags-ui.xml
URL: 
http://svn.apache.org/viewvc/struts/action2/trunk/apps/showcase/src/main/webapp/WEB-INF/classes/xwork-tags-ui.xml?rev=408031&r1=408030&r2=408031&view=diff
==
--- 
struts/action2/trunk/apps/showcase/src/main/webapp/WEB-INF/classes/xwork-tags-ui.xml
 (original)
+++ 
struts/action2/trunk/apps/showcase/src/main/webapp/WEB-INF/classes/xwork-tags-ui.xml
 Sat May 20 09:55:19 2006
@@ -1,4 +1,9 @@
-http://www.opensymphony.com/xwork/xwork-1.1.1.dtd";>
+
+
+http://www.opensymphony.com/xwork/xwork-1.1.1.dtd";>
+   
 
 
 
@@ -36,11 +41,19 @@
 
tooltipExample.jsp
 
+
+
+
 
/tags/ui/treeExampleDynamic.jsp
 
+
+
+


+   
+   

 
 
@@ -50,4 +63,6 @@
/tags/ui/dynamicTreeSelect.jsp
 
 
+
+

svn commit: r408033 - /struts/action2/trunk/apps/showcase/src/main/webapp/tags/ui/treeExampleStatic.jsp

2006-05-20 Thread tmjee 
Author: tmjee
Date: Sat May 20 09:55:57 2006
New Revision: 408033

URL: http://svn.apache.org/viewvc?rev=408033&view=rev
Log:
- added snippet


Modified:

struts/action2/trunk/apps/showcase/src/main/webapp/tags/ui/treeExampleStatic.jsp

Modified: 
struts/action2/trunk/apps/showcase/src/main/webapp/tags/ui/treeExampleStatic.jsp
URL: 
http://svn.apache.org/viewvc/struts/action2/trunk/apps/showcase/src/main/webapp/tags/ui/treeExampleStatic.jsp?rev=408033&r1=408032&r2=408033&view=diff
==
--- 
struts/action2/trunk/apps/showcase/src/main/webapp/tags/ui/treeExampleStatic.jsp
 (original)
+++ 
struts/action2/trunk/apps/showcase/src/main/webapp/tags/ui/treeExampleStatic.jsp
 Sat May 20 09:55:57 2006
@@ -6,6 +6,8 @@
 
 
 
+
+

svn commit: r408034 - /struts/shale/trunk/build/maven2/shale-tiles.pom

2006-05-20 Thread wsmoak 
Author: wsmoak
Date: Sat May 20 09:56:49 2006
New Revision: 408034

URL: http://svn.apache.org/viewvc?rev=408034&view=rev
Log:
Corrected the Standalone Tiles groupId.
Reported By: Yoshitaka Tanaka 

Modified:
struts/shale/trunk/build/maven2/shale-tiles.pom

Modified: struts/shale/trunk/build/maven2/shale-tiles.pom
URL: 
http://svn.apache.org/viewvc/struts/shale/trunk/build/maven2/shale-tiles.pom?rev=408034&r1=408033&r2=408034&view=diff
==
--- struts/shale/trunk/build/maven2/shale-tiles.pom (original)
+++ struts/shale/trunk/build/maven2/shale-tiles.pom Sat May 20 09:56:49 2006
@@ -36,7 +36,7 @@
   
 
   
- org.apache.tiles
+ org.apache.struts.tiles
  tiles-core
  0.2-SNAPSHOT

svn commit: r408035 - /struts/action2/trunk/core/src/main/java/org/apache/struts/action2/components/Tree.java

2006-05-20 Thread tmjee 
Author: tmjee
Date: Sat May 20 09:57:33 2006
New Revision: 408035

URL: http://svn.apache.org/viewvc?rev=408035&view=rev
Log:
- added apache license at the top


Modified:

struts/action2/trunk/core/src/main/java/org/apache/struts/action2/components/Tree.java

Modified: 
struts/action2/trunk/core/src/main/java/org/apache/struts/action2/components/Tree.java
URL: 
http://svn.apache.org/viewvc/struts/action2/trunk/core/src/main/java/org/apache/struts/action2/components/Tree.java?rev=408035&r1=408034&r2=408035&view=diff
==
--- 
struts/action2/trunk/core/src/main/java/org/apache/struts/action2/components/Tree.java
 (original)
+++ 
struts/action2/trunk/core/src/main/java/org/apache/struts/action2/components/Tree.java
 Sat May 20 09:57:33 2006
@@ -1,3 +1,20 @@
+/*
+ * $Id$
+ *
+ * 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.struts.action2.components;
 
 import com.opensymphony.xwork.util.OgnlValueStack;

svn commit: r408036 - /struts/action2/trunk/apps/showcase/src/main/java/org/apache/struts/action2/showcase/ShowDynamicTreeAction.java

2006-05-20 Thread tmjee 
Author: tmjee
Date: Sat May 20 09:59:30 2006
New Revision: 408036

URL: http://svn.apache.org/viewvc?rev=408036&view=rev
Log:
- added snippet


Modified:

struts/action2/trunk/apps/showcase/src/main/java/org/apache/struts/action2/showcase/ShowDynamicTreeAction.java

Modified: 
struts/action2/trunk/apps/showcase/src/main/java/org/apache/struts/action2/showcase/ShowDynamicTreeAction.java
URL: 
http://svn.apache.org/viewvc/struts/action2/trunk/apps/showcase/src/main/java/org/apache/struts/action2/showcase/ShowDynamicTreeAction.java?rev=408036&r1=408035&r2=408036&view=diff
==
--- 
struts/action2/trunk/apps/showcase/src/main/java/org/apache/struts/action2/showcase/ShowDynamicTreeAction.java
 (original)
+++ 
struts/action2/trunk/apps/showcase/src/main/java/org/apache/struts/action2/showcase/ShowDynamicTreeAction.java
 Sat May 20 09:59:30 2006
@@ -4,6 +4,7 @@
 
 import com.opensymphony.xwork.ActionSupport;
 
+// START SNIPPET: treeExampleDynamicJavaShow 
 
 public class ShowDynamicTreeAction extends ActionSupport {

@@ -11,4 +12,6 @@
return Category.getById(1);
}
 }
+
+// END SNIPPET: treeExampleDynamicJavaShow

svn commit: r408037 - /struts/action2/trunk/apps/showcase/src/main/java/org/apache/struts/action2/showcase/DynamicTreeSelectAction.java

2006-05-20 Thread tmjee 
Author: tmjee
Date: Sat May 20 10:00:14 2006
New Revision: 408037

URL: http://svn.apache.org/viewvc?rev=408037&view=rev
Log:
- added snippet


Modified:

struts/action2/trunk/apps/showcase/src/main/java/org/apache/struts/action2/showcase/DynamicTreeSelectAction.java

Modified: 
struts/action2/trunk/apps/showcase/src/main/java/org/apache/struts/action2/showcase/DynamicTreeSelectAction.java
URL: 
http://svn.apache.org/viewvc/struts/action2/trunk/apps/showcase/src/main/java/org/apache/struts/action2/showcase/DynamicTreeSelectAction.java?rev=408037&r1=408036&r2=408037&view=diff
==
--- 
struts/action2/trunk/apps/showcase/src/main/java/org/apache/struts/action2/showcase/DynamicTreeSelectAction.java
 (original)
+++ 
struts/action2/trunk/apps/showcase/src/main/java/org/apache/struts/action2/showcase/DynamicTreeSelectAction.java
 Sat May 20 10:00:14 2006
@@ -4,6 +4,8 @@
 
 import com.opensymphony.xwork.ActionSupport;
 
+//START SNIPPET: treeExampleDynamicJavaSelected
+
 public class DynamicTreeSelectAction extends ActionSupport {
 
private long nodeId;
@@ -28,3 +30,6 @@
return currentCategory.getName();
}
 }
+
+//START SNIPPET: treeExampleDynamicJavaSelected
+

svn commit: r408085 - /struts/action/trunk/tiles/src/main/java/org/apache/struts/tiles/commands/TilesPreProcessor.java

2006-05-20 Thread germuska 
Author: germuska
Date: Sat May 20 12:53:11 2006
New Revision: 408085

URL: http://svn.apache.org/viewvc?rev=408085&view=rev
Log:
STR-2879: fix behavior when used with modules to be consistent with Struts 
1.2.x.   Specifically, dispatch forwards for tiles within the 
TilesPreProcessor, rather than creating a ForwardConfig and leaving that 
responsibility to a later chain command (e.g. PerformForward).  Also, change 
chain behavior slightly; for both includes and forwards, TilesPreProcessor 
returns false  (i.e. 'continue processing chain'), but sets the ForwardConfig 
to null if TilesPreProcessor has called  requestDispatcher.(forward|include).  
This would potentially allow someone to have housekeeping commands in the chain 
which  would be able to execute, while preventing PerformForward from believing 
that it needs to do anything. 

Modified:

struts/action/trunk/tiles/src/main/java/org/apache/struts/tiles/commands/TilesPreProcessor.java

Modified: 
struts/action/trunk/tiles/src/main/java/org/apache/struts/tiles/commands/TilesPreProcessor.java
URL: 
http://svn.apache.org/viewvc/struts/action/trunk/tiles/src/main/java/org/apache/struts/tiles/commands/TilesPreProcessor.java?rev=408085&r1=408084&r2=408085&view=diff
==
--- 
struts/action/trunk/tiles/src/main/java/org/apache/struts/tiles/commands/TilesPreProcessor.java
 (original)
+++ 
struts/action/trunk/tiles/src/main/java/org/apache/struts/tiles/commands/TilesPreProcessor.java
 Sat May 20 12:53:11 2006
@@ -209,15 +209,14 @@
 if (doInclude) {
 log.info("Tiles process complete; doInclude with " + uri);
 doInclude(sacontext, uri);
-return (true);
 } else {
-// create an "instant" forward config which can be used
-// by an AbstractPerformForward later as if our ForwardConfig
-// were the one actually returned by an executing Action
 log.info("Tiles process complete; forward to " + uri);
-sacontext.setForwardConfig( new ForwardConfig("tiles-chain", uri, 
false) );
-return (false);
+doForward(sacontext, uri);
 }
+
+log.debug("Tiles processed, so clearing forward config from context.");
+sacontext.setForwardConfig( null );
+return (false);
 }
 
 
@@ -234,18 +233,50 @@
 String uri)
 throws IOException, ServletException {
 
-HttpServletRequest request = context.getRequest();
+RequestDispatcher rd = getRequiredDispatcher(context, uri);
+
+if (rd != null) {
+rd.include(context.getRequest(), context.getResponse());
+}
+}
+
+/**
+ * Do an include of specified URI using a 
RequestDispatcher.
+ *
+ * @param context a chain servlet/web context
+ * @param uri Context-relative URI to include
+ */
+protected void doForward(
+ServletActionContext context,
+String uri)
+throws IOException, ServletException {
+
+RequestDispatcher rd = getRequiredDispatcher(context, uri);
 
-HttpServletResponse response = context.getResponse();
+if (rd != null) {
+rd.forward(context.getRequest(), context.getResponse());
+}
+}
+
+/**
+ * Get the RequestDispatcher for the specified 
uri.  If it is not found, 
+ * send a 500 error as a response and return null; 
+ *  
+ * @param context the current ServletActionContext
+ * @param uri the ServletContext-relative URI of the request dispatcher to 
find.
+ * @return the RequestDispatcher, or null if none is returned 
from the ServletContext.
+ * @throws IOException if getRequestDispatcher(uri) has an 
error.
+ */
+private RequestDispatcher getRequiredDispatcher(ServletActionContext 
context, String uri) throws IOException {
 RequestDispatcher rd = context.getContext().getRequestDispatcher(uri);
 if (rd == null) {
+log.debug("No request dispatcher found for " + uri);
+HttpServletResponse response = context.getResponse();
 response.sendError(
 HttpServletResponse.SC_INTERNAL_SERVER_ERROR,
 "Error getting RequestDispatcher for " + uri);
-return;
 }
-rd.include(request, response);
+return rd;
 }
-
 
 }

svn commit: r408140 - in /struts/action2/trunk/core/src: main/java/org/apache/struts/action2/jsf/FacesSetupInterceptor.java test/java/org/apache/struts/action2/views/freemarker/FreemarkerManagerTest.j

2006-05-20 Thread mrdon 
Author: mrdon
Date: Sat May 20 23:24:37 2006
New Revision: 408140

URL: http://svn.apache.org/viewvc?rev=408140&view=rev
Log:
Fixing jsf setup interceptor to not complain so loudly if jsf isn't present, 
fixed freemarker
test to properly extend StrutsTestCase

Modified:

struts/action2/trunk/core/src/main/java/org/apache/struts/action2/jsf/FacesSetupInterceptor.java

struts/action2/trunk/core/src/test/java/org/apache/struts/action2/views/freemarker/FreemarkerManagerTest.java

Modified: 
struts/action2/trunk/core/src/main/java/org/apache/struts/action2/jsf/FacesSetupInterceptor.java
URL: 
http://svn.apache.org/viewvc/struts/action2/trunk/core/src/main/java/org/apache/struts/action2/jsf/FacesSetupInterceptor.java?rev=408140&r1=408139&r2=408140&view=diff
==
--- 
struts/action2/trunk/core/src/main/java/org/apache/struts/action2/jsf/FacesSetupInterceptor.java
 (original)
+++ 
struts/action2/trunk/core/src/main/java/org/apache/struts/action2/jsf/FacesSetupInterceptor.java
 Sat May 20 23:24:37 2006
@@ -57,8 +57,17 @@
 * Initializes the lifecycle and factories
 */
public void init() {
-   facesContextFactory = (FacesContextFactory) FactoryFinder
+   try {
+   facesContextFactory = (FacesContextFactory) 
FactoryFinder

.getFactory(FactoryFinder.FACES_CONTEXT_FACTORY);
+   } catch (Exception ex) {
+   log.debug("Unable to initialize faces", ex);
+   }
+   
+   if (facesContextFactory == null) {
+   log.info("Unable to initialize jsf interceptors 
probably due missing JSF framework initialization");
+   return;
+   }
// Javadoc says: Lifecycle instance is shared across multiple
// simultaneous requests, it must be implemented in a 
thread-safe
// manner.

Modified: 
struts/action2/trunk/core/src/test/java/org/apache/struts/action2/views/freemarker/FreemarkerManagerTest.java
URL: 
http://svn.apache.org/viewvc/struts/action2/trunk/core/src/test/java/org/apache/struts/action2/views/freemarker/FreemarkerManagerTest.java?rev=408140&r1=408139&r2=408140&view=diff
==
--- 
struts/action2/trunk/core/src/test/java/org/apache/struts/action2/views/freemarker/FreemarkerManagerTest.java
 (original)
+++ 
struts/action2/trunk/core/src/test/java/org/apache/struts/action2/views/freemarker/FreemarkerManagerTest.java
 Sat May 20 23:24:37 2006
@@ -18,16 +18,15 @@
 package org.apache.struts.action2.views.freemarker;
 
 import org.apache.struts.action2.StrutsConstants;
+import org.apache.struts.action2.StrutsTestCase;
 import org.apache.struts.action2.config.Configuration;
 import org.apache.struts.action2.views.jsp.StrutsMockServletContext;
 
-import junit.framework.TestCase;
-
 /**
  * Test case for FreemarkerManager 
  * 
  */
-public class FreemarkerManagerTest extends TestCase {
+public class FreemarkerManagerTest extends StrutsTestCase {

public void testIfStrutsEncodingIsSetProperty() throws Exception {
Configuration.set(StrutsConstants.STRUTS_I18N_ENCODING, 
"UTF-8");

svn commit: r408141 - in /struts/action2/trunk: apps/showcase/pom.xml core/pom.xml

2006-05-20 Thread mrdon 
Author: mrdon
Date: Sat May 20 23:28:30 2006
New Revision: 408141

URL: http://svn.apache.org/viewvc?rev=408141&view=rev
Log:
Fixing myfaces dependencies to use 1.1.2 and correct group id

Modified:
struts/action2/trunk/apps/showcase/pom.xml
struts/action2/trunk/core/pom.xml

Modified: struts/action2/trunk/apps/showcase/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/action2/trunk/apps/showcase/pom.xml?rev=408141&r1=408140&r2=408141&view=diff
==
--- struts/action2/trunk/apps/showcase/pom.xml (original)
+++ struts/action2/trunk/apps/showcase/pom.xml Sat May 20 23:28:30 2006
@@ -85,12 +85,12 @@
 


-myfaces
+org.apache.myfaces.core
 myfaces-impl
 1.1.2
   
   
-myfaces
+org.apache.myfaces.core
 myfaces-api
 1.1.2
  

Modified: struts/action2/trunk/core/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/action2/trunk/core/pom.xml?rev=408141&r1=408140&r2=408141&view=diff
==
--- struts/action2/trunk/core/pom.xml (original)
+++ struts/action2/trunk/core/pom.xml Sat May 20 23:28:30 2006
@@ -260,9 +260,9 @@
 
 
 
-myfaces
-myfaces-jsf-api
-1.0.9
+org.apache.myfaces.core
+myfaces-api
+1.1.2
 provided