[CONF] Confluence Changes in the last 24 hours

2007-04-22 Thread confluence 
-
This is a daily summary of all recent changes in Confluence.

-
Updated Spaces:
-

OpenJPA (openjpa) http://cwiki.apache.org/confluence/display/openjpa
|
|-Pages Added or Edited in This Space
 |-- Building OpenJPA was last edited by mprudhom (11:38 AM).
 |   http://cwiki.apache.org/confluence/display/openjpa/Building+OpenJPA

Apache Roller (ROLLER) http://cwiki.apache.org/confluence/display/ROLLER
|
|-Pages Added or Edited in This Space
 |-- Roller Wiki was last edited by snoopdave (08:52 AM).
 |   http://cwiki.apache.org/confluence/display/ROLLER/Roller+Wiki
 |-- Roller Mailing Lists was last edited by snoopdave (08:49 AM).
 |   http://cwiki.apache.org/confluence/display/ROLLER/Roller+Mailing+Lists
 |-- Testing Roller 3.1 was last edited by snoopdave (08:24 AM).
 |   http://cwiki.apache.org/confluence/display/ROLLER/Testing+Roller+3.1

Apache Directory SandBox (DIRxSBOX) 
http://cwiki.apache.org/confluence/display/DIRxSBOX
|
|-Pages Added or Edited in This Space
 |-- Add your first elements to the schema was last edited by elecharny (02:48 
AM).
 |   
http://cwiki.apache.org/confluence/display/DIRxSBOX/Add+your+first+elements+to+the+schema

Apache Wicket (WICKET) http://cwiki.apache.org/confluence/display/WICKET
|
|-Pages Added or Edited in This Space
 |-- Wicket SVN was last edited by nheudecker (03:38 PM).
 |   http://cwiki.apache.org/confluence/display/WICKET/Wicket+SVN


-
CONFLUENCE INFORMATION
This message is automatically generated by Confluence

Unsubscribe or edit your notifications preferences
   http://cwiki.apache.org/confluence/users/viewnotifications.action

If you think it was sent incorrectly contact one of the administrators
   http://cwiki.apache.org/confluence/administrators.action

If you want more information on Confluence, or have a bug to report see
   http://www.atlassian.com/software/confluence

svn commit: r531322 - /struts/struts1/trunk/core/src/main/java/org/apache/struts/action/ActionMapping.java

2007-04-22 Thread pbenedict 
Author: pbenedict
Date: Sun Apr 22 20:29:53 2007
New Revision: 531322

URL: http://svn.apache.org/viewvc?view=rev&rev=531322
Log:
STR-3025: Fallback to "input" forward when controller is configured as such

Modified:

struts/struts1/trunk/core/src/main/java/org/apache/struts/action/ActionMapping.java

Modified: 
struts/struts1/trunk/core/src/main/java/org/apache/struts/action/ActionMapping.java
URL: 
http://svn.apache.org/viewvc/struts/struts1/trunk/core/src/main/java/org/apache/struts/action/ActionMapping.java?view=diff&rev=531322&r1=531321&r2=531322
==
--- 
struts/struts1/trunk/core/src/main/java/org/apache/struts/action/ActionMapping.java
 (original)
+++ 
struts/struts1/trunk/core/src/main/java/org/apache/struts/action/ActionMapping.java
 Sun Apr 22 20:29:53 2007
@@ -100,17 +100,24 @@
 }
 
 /**
- * Create (if necessary) and return an [EMAIL PROTECTED] ActionForward} 
that
- * corresponds to the input property of this Action.
- *
+ * 
+ * Create (if necessary) and return an [EMAIL PROTECTED] ActionForward} 
that
+ * corresponds to the input property of this Action.
+ * If the input parameter is specified, use that, otherwise try
+ * to find one in the mapping or the module under the standard
+ * conventional "input" name.
+ * 
  * @return The input forward for this action mapping.
  * @since Struts 1.1
  */
 public ActionForward getInputForward() {
+String input = getInput();
 if (getModuleConfig().getControllerConfig().getInputForward()) {
-return (findForward(getInput()));
-} else {
-return (new ActionForward(getInput()));
+if (input != null) {
+return findForward(input);
+}
+return findForward(Action.INPUT);
 }
+return (new ActionForward(input));
 }
 }

svn commit: r531323 - /struts/struts1/trunk/core/src/main/java/org/apache/struts/action/ActionMapping.java

2007-04-22 Thread pbenedict 
Author: pbenedict
Date: Sun Apr 22 20:36:54 2007
New Revision: 531323

URL: http://svn.apache.org/viewvc?view=rev&rev=531323
Log:
STR-3025: Enhance documentation for findInputForward

Modified:

struts/struts1/trunk/core/src/main/java/org/apache/struts/action/ActionMapping.java

Modified: 
struts/struts1/trunk/core/src/main/java/org/apache/struts/action/ActionMapping.java
URL: 
http://svn.apache.org/viewvc/struts/struts1/trunk/core/src/main/java/org/apache/struts/action/ActionMapping.java?view=diff&rev=531323&r1=531322&r2=531323
==
--- 
struts/struts1/trunk/core/src/main/java/org/apache/struts/action/ActionMapping.java
 (original)
+++ 
struts/struts1/trunk/core/src/main/java/org/apache/struts/action/ActionMapping.java
 Sun Apr 22 20:36:54 2007
@@ -23,6 +23,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.struts.config.ActionConfig;
+import org.apache.struts.config.ControllerConfig;
 import org.apache.struts.config.ForwardConfig;
 
 import java.util.ArrayList;
@@ -100,14 +101,16 @@
 }
 
 /**
- * 
- * Create (if necessary) and return an [EMAIL PROTECTED] ActionForward} 
that
+ * Create (if necessary) and return an [EMAIL PROTECTED] ActionForward} 
that
  * corresponds to the input property of this Action.
- * If the input parameter is specified, use that, otherwise try
- * to find one in the mapping or the module under the standard
- * conventional "input" name.
+ * 
+ * Since Struts 1.4: 
+ * If the input property is not specified and the Controller
+ * is configured to interpret the property as a forward, return the
+ * forward named "input" (if it exists) in this action mapping.
  * 
  * @return The input forward for this action mapping.
+ * @see ControllerConfig#getInputForward()
  * @since Struts 1.1
  */
 public ActionForward getInputForward() {