[CONF] Confluence Changes in the last 24 hours
- This is a daily summary of all recent changes in Confluence. - Updated Spaces: - Felix (FELIX) http://cwiki.apache.org/confluence/display/FELIX | |-Pages Added or Edited in This Space |-- Apache Felix Commons was last edited by erodriguez (08:08 PM). | http://cwiki.apache.org/confluence/display/FELIX/Apache+Felix+Commons |-- iPOJO was last edited by clement.escoffier (01:48 AM). | http://cwiki.apache.org/confluence/display/FELIX/iPOJO |-- iPOJO Concepts Overview was created by clement.escoffier (01:43 AM). | http://cwiki.apache.org/confluence/display/FELIX/iPOJO+Concepts+Overview Apache ActiveMQ (ACTIVEMQ) http://cwiki.apache.org/confluence/display/ACTIVEMQ | |-Pages Added or Edited in This Space |-- ActiveMQ CPP 2.0 RC1 Now Available! was created by nmittler (09:02 AM). | http://cwiki.apache.org/confluence/display/ACTIVEMQ/2007/04/07/ActiveMQ+CPP+2.0+RC1+Now+Available%21 |-- ActiveMQ CPP 2.0 Release was last edited by nmittler (08:56 AM). | http://cwiki.apache.org/confluence/display/ACTIVEMQ/ActiveMQ+CPP+2.0+Release |-- Configuring ActiveMQ CPP was last edited by tabish121 (06:43 AM). | http://cwiki.apache.org/confluence/display/ACTIVEMQ/Configuring+ActiveMQ+CPP |-- ActiveMQ CPP Overview was last edited by tabish121 (06:40 AM). | http://cwiki.apache.org/confluence/display/ACTIVEMQ/ActiveMQ+CPP+Overview Apache Struts 2 Documentation (WW) http://cwiki.apache.org/confluence/display/WW | |-Pages Added or Edited in This Space |-- Ajax Tags was last edited by [EMAIL PROTECTED] (08:35 PM). | http://cwiki.apache.org/confluence/display/WW/Ajax+Tags |-- ajax head template was last edited by [EMAIL PROTECTED] (06:23 PM). | http://cwiki.apache.org/confluence/display/WW/ajax+head+template |-- Package Configuration was last edited by psartini (02:53 PM). | http://cwiki.apache.org/confluence/display/WW/Package+Configuration |-- Why do I get a javax.el.ELException when using OGNL with JSP2.1? was created by psartini (11:20 AM). | http://cwiki.apache.org/confluence/pages/viewpage.action?pageId=51045 |-- FAQs was last edited by psartini (11:12 AM). | http://cwiki.apache.org/confluence/display/WW/FAQs |-- Extending an Application with Custom Plugins was last edited by husted (09:05 AM). | http://cwiki.apache.org/confluence/display/WW/Extending+an+Application+with+Custom+Plugins |-- Tutorials was last edited by husted (08:39 AM). | http://cwiki.apache.org/confluence/display/WW/Tutorials Apache Tuscany (TUSCANY) http://cwiki.apache.org/confluence/display/TUSCANY | |-Pages Added or Edited in This Space |-- DAS Overview was last edited by [EMAIL PROTECTED] (11:43 PM). | http://cwiki.apache.org/confluence/display/TUSCANY/DAS+Overview |-- LDAP JAVA DAS was created by [EMAIL PROTECTED] (11:40 PM). | http://cwiki.apache.org/confluence/display/TUSCANY/LDAP+JAVA+DAS Apache Directory LDAP Studio (DIRxSTUDIO) http://cwiki.apache.org/confluence/display/DIRxSTUDIO | |-Pages Added or Edited in This Space |-- Building was last edited by seelmann (03:03 AM). | http://cwiki.apache.org/confluence/display/DIRxSTUDIO/Building Apache Wicket (WICKET) http://cwiki.apache.org/confluence/display/WICKET | |-Pages Added or Edited in This Space |-- Migrate-1.3 was last edited by jcompagner (03:31 AM). | http://cwiki.apache.org/confluence/display/WICKET/Migrate-1.3 | |-New Comments in This Space |-- http://cwiki.apache.org/confluence/display/WICKET/Wicket+QuickStart (1) - 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: r526628 - /struts/struts1/trunk/core/src/main/resources/org/apache/struts/resources/struts-config_1_4.dtd
Author: pbenedict Date: Sun Apr 8 18:06:36 2007 New Revision: 526628 URL: http://svn.apache.org/viewvc?view=rev&rev=526628 Log: STR-3004: Add actionId attribute to action-mapping Modified: struts/struts1/trunk/core/src/main/resources/org/apache/struts/resources/struts-config_1_4.dtd Modified: struts/struts1/trunk/core/src/main/resources/org/apache/struts/resources/struts-config_1_4.dtd URL: http://svn.apache.org/viewvc/struts/struts1/trunk/core/src/main/resources/org/apache/struts/resources/struts-config_1_4.dtd?view=diff&rev=526628&r1=526627&r2=526628 == --- struts/struts1/trunk/core/src/main/resources/org/apache/struts/resources/struts-config_1_4.dtd (original) +++ struts/struts1/trunk/core/src/main/resources/org/apache/struts/resources/struts-config_1_4.dtd Sun Apr 8 18:06:36 2007 @@ -354,6 +354,11 @@ to process a request for a specific module-relative URI. The following attributes are defined: + actionIdThe name which uniquely identifies the mapping within a + module. The Controlelr has built-in recognition for URIs + that begin with an actionId and will automatically + translate forwards. + attribute Name of the request-scope or session-scope attribute that is used to access our ActionForm bean, if it is other than the bean's specified "name". Optional if "name" is specified, @@ -467,6 +472,7 @@ --> +
svn commit: r526638 - /struts/struts1/trunk/core/src/main/java/org/apache/struts/action/Action.java
Author: pbenedict Date: Sun Apr 8 20:02:03 2007 New Revision: 526638 URL: http://svn.apache.org/viewvc?view=rev&rev=526638 Log: STR-3024: Added ERROR, INPUT, LOGIN, SUCCESS constants Modified: struts/struts1/trunk/core/src/main/java/org/apache/struts/action/Action.java Modified: struts/struts1/trunk/core/src/main/java/org/apache/struts/action/Action.java URL: http://svn.apache.org/viewvc/struts/struts1/trunk/core/src/main/java/org/apache/struts/action/Action.java?view=diff&rev=526638&r1=526637&r2=526638 == --- struts/struts1/trunk/core/src/main/java/org/apache/struts/action/Action.java (original) +++ struts/struts1/trunk/core/src/main/java/org/apache/struts/action/Action.java Sun Apr 8 20:02:03 2007 @@ -76,7 +76,43 @@ * functionality. */ private static TokenProcessor token = TokenProcessor.getInstance(); + +/** + * The action execution was a failure. Show an error view, possibly asking + * the user to retry entering data. + * + * @since Struts 1.4 + */ +public static final String ERROR = "error"; +/** + * The action execution require more input in order to succeed. This + * result is typically used if a form handling action has been executed + * so as to provide defaults for a form. The form associated with the + * handler should be shown to the end user. + * + * This result is also used if the given input params are invalid, + * meaning the user should try providing input again. + * + * @since Struts 1.4 + */ +public static final String INPUT = "input"; + +/** + * The action could not execute, since the user most was not logged in. + * The login view should be shown. + * + * @since Struts 1.4 + */ +public static final String LOGIN = "login"; + +/** + * The action execution was successful. Show result view to the end user. + * + * @since Struts 1.4 + */ +public static final String SUCCESS = "success"; + // NOTE: We can make the tken variable protected and remove Action's // token methods or leave it private and allow the token methods to // delegate their calls.
svn commit: r526641 - /struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractSelectInput.java
Author: pbenedict
Date: Sun Apr 8 20:52:50 2007
New Revision: 526641
URL: http://svn.apache.org/viewvc?view=rev&rev=526641
Log:
STR-3025: Search for INPUT mapping
Modified:
struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractSelectInput.java
Modified:
struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractSelectInput.java
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractSelectInput.java?view=diff&rev=526641&r1=526640&r2=526641
==
---
struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractSelectInput.java
(original)
+++
struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractSelectInput.java
Sun Apr 8 20:52:50 2007
@@ -22,6 +22,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.struts.action.Action;
import org.apache.struts.chain.contexts.ActionContext;
import org.apache.struts.config.ActionConfig;
import org.apache.struts.config.ForwardConfig;
@@ -74,16 +75,36 @@
LOG.trace("Finding ForwardConfig for '" + input + "'");
}
-forwardConfig = actionConfig.findForwardConfig(input);
-
-if (forwardConfig == null) {
-forwardConfig = moduleConfig.findForwardConfig(input);
+// 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.
+if (input != null) {
+forwardConfig = actionConfig.findForwardConfig(input);
+if (forwardConfig == null) {
+forwardConfig = moduleConfig.findForwardConfig(input);
+}
+} else {
+forwardConfig = actionConfig.findForwardConfig(Action.INPUT);
+if (forwardConfig == null) {
+forwardConfig =
moduleConfig.findForwardConfig(Action.INPUT);
+}
}
} else {
if (LOG.isTraceEnabled()) {
LOG.trace("Delegating to forward() for '" + input + "'");
}
+// If no input parameter is specified, try to find one in the
+// module under the standard conventional "input" name. Because
+// the Controller is not setup to treat the input parameter as
+// a mapping, the action mapping check is skipped.
+if (input == null) {
+forwardConfig = moduleConfig.findForwardConfig(Action.INPUT);
+if (forwardConfig != null) {
+input = Action.INPUT;
+}
+}
+
forwardConfig = forward(actionCtx, moduleConfig, input);
}
