[CONF] Confluence Changes in the last 24 hours
- This is a daily summary of all recent changes in Confluence. - Updated Spaces: - Apache Camel (CAMEL) http://cwiki.apache.org/confluence/display/CAMEL | |-Pages Added or Edited in This Space |-- File was last edited by davsclaus (01:11 PM). | http://cwiki.apache.org/confluence/display/CAMEL/File |-- Camel 2.0.0 Release was last edited by davsclaus (04:19 AM). | http://cwiki.apache.org/confluence/display/CAMEL/Camel+2.0.0+Release |-- Camel 1.5.1 Release was last edited by davsclaus (04:19 AM). | http://cwiki.apache.org/confluence/display/CAMEL/Camel+1.5.1+Release |-- FTP was last edited by davsclaus (04:12 AM). | http://cwiki.apache.org/confluence/display/CAMEL/FTP Apache Sling Website (SLINGxSITE) http://cwiki.apache.org/confluence/display/SLINGxSITE | |-Pages Added or Edited in This Space |-- Discover Sling in 15 minutes was last edited by bdelacretaz (12:52 AM). | http://cwiki.apache.org/confluence/display/SLINGxSITE/Discover+Sling+in+15+minutes Apache Lucene Mahout (MAHOUT) http://cwiki.apache.org/confluence/display/MAHOUT | |-Pages Added or Edited in This Space |-- SyntheticControlData was created by gsingers (07:49 PM). | http://cwiki.apache.org/confluence/display/MAHOUT/SyntheticControlData |-- QuickStart was last edited by gsingers (07:39 PM). | http://cwiki.apache.org/confluence/display/MAHOUT/QuickStart - 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: r721838 - /struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletActionRedirectResult.java
Author: davenewton Date: Sun Nov 30 08:04:46 2008 New Revision: 721838 URL: http://svn.apache.org/viewvc?rev=721838&view=rev Log: Fix for WW-2889 Use StringBuilder instead of StringBuffer; UrlHelper:r720222 change. Modified: struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletActionRedirectResult.java Modified: struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletActionRedirectResult.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletActionRedirectResult.java?rev=721838&r1=721837&r2=721838&view=diff == --- struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletActionRedirectResult.java (original) +++ struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletActionRedirectResult.java Sun Nov 30 08:04:46 2008 @@ -44,11 +44,11 @@ import com.opensymphony.xwork2.inject.Inject; /** - * + * * Portlet modification of the [EMAIL PROTECTED] ServletActionRedirectResult}. - * + * * - * + * * This result uses the [EMAIL PROTECTED] ActionMapper} provided by the * [EMAIL PROTECTED] ActionMapperFactory} to instruct the render phase to invoke the * specified action and (optional) namespace. This is better than the @@ -58,31 +58,31 @@ * and your application will still work. It is strongly recommended that if you * are redirecting to another action, you use this result rather than the * standard redirect result. - * + * * See examples below for an example of how request parameters could be passed * in. - * + * * - * + * * This result type takes the following parameters: - * + * * - * + * * - * + * * actionName (default) - the name of the action that will be * redirect to - * + * * namespace - used to determine which namespace the action is in * that we're redirecting to . If namespace is null, this defaults to the * current namespace - * + * * - * + * * - * + * * Example: - * + * * * *@@ -94,19 +94,19 @@ * * * - * + * ** <-- Redirect to an action in the same namespace --> * - * + * ** - * + * *dashboard.jsp *error ** *error.jsp ** <-- Pass parameters (reportType, width and height) --> * * - * + * * @see ActionMapper */ public class PortletActionRedirectResult extends PortletResult implements ReflectionExceptionHandler { @@ -210,8 +210,8 @@ } } - StringBuffer tmpLocation = new StringBuffer(actionMapper.getUriFromActionMapping(new ActionMapping(actionName, - namespace, method, null))); + StringBuilder tmpLocation = new StringBuilder(actionMapper.getUriFromActionMapping(new ActionMapping(actionName, +namespace, method, null))); UrlHelper.buildParametersString(requestParameters, tmpLocation, "&"); setLocation(tmpLocation.toString()); @@ -221,7 +221,7 @@ /** * Sets the action name -* +* * @param actionName *The name */ @@ -231,7 +231,7 @@ /** * Sets the namespace -* +* * @param namespace *The namespace */ @@ -241,7 +241,7 @@ /** * Sets the method -* +* * @param method *The method */ @@ -251,7 +251,7 @@ /** * Adds a request parameter to be added to the redirect url -* +* * @param key *The parameter name * @param value
svn commit: r721947 - /struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/MakeIterator.java
Author: wesw
Date: Sun Nov 30 18:25:47 2008
New Revision: 721947
URL: http://svn.apache.org/viewvc?rev=721947&view=rev
Log:
changing MakeIterator to support Iterable instead of Collection
per WW-2887, thanks for the patch Mathias Bogaert
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/MakeIterator.java
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/MakeIterator.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/MakeIterator.java?rev=721947&r1=721946&r2=721947&view=diff
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/MakeIterator.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/MakeIterator.java
Sun Nov 30 18:25:47 2008
@@ -50,7 +50,7 @@
if (object instanceof Map) {
return true;
-} else if (object instanceof Collection) {
+} else if (object instanceof Iterable) {
return true;
} else if (object.getClass().isArray()) {
return true;
@@ -78,8 +78,8 @@
return null;
}
-if (value instanceof Collection) {
-iterator = ((Collection) value).iterator();
+if (value instanceof Iterable) {
+iterator = ((Iterable) value).iterator();
} else if (value.getClass().isArray()) {
//need ability to support primitives; therefore, cannot
//use Object[] casting.
svn commit: r721970 - in /struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands: ./ generic/ servlet/
Author: pbenedict
Date: Sun Nov 30 21:40:50 2008
New Revision: 721970
URL: http://svn.apache.org/viewvc?rev=721970&view=rev
Log:
STR-3150: Use Chain processing constants on trunk
Modified:
struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractAuthorizeAction.java
struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractCreateAction.java
struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractExceptionHandler.java
struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractExecuteAction.java
struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractPerformForward.java
struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractPerformInclude.java
struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractPopulateActionForm.java
struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractRequestNoCache.java
struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractSelectAction.java
struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractSelectForward.java
struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractSelectInput.java
struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractSelectLocale.java
struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractSelectModule.java
struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractSetContentType.java
struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractSetOriginalURI.java
struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractValidateActionForm.java
struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/CacheMessages.java
struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/CreateActionForm.java
struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/ExceptionCatcher.java
struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/ExecuteCommand.java
struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/ExecuteDispatcher.java
struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/RemoveCachedMessages.java
struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/SelectInclude.java
struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/generic/WrappingLookupCommand.java
struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/servlet/ActionPostProcess.java
Modified:
struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractAuthorizeAction.java
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractAuthorizeAction.java?rev=721970&r1=721969&r2=721970&view=diff
==
---
struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractAuthorizeAction.java
(original)
+++
struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractAuthorizeAction.java
Sun Nov 30 21:40:50 2008
@@ -62,7 +62,7 @@
// Is this action protected by role requirements?
if (!isAuthorizationRequired(actionConfig)) {
-return (false);
+return CONTINUE_PROCESSING;
}
boolean throwEx;
@@ -83,7 +83,7 @@
throw new UnauthorizedActionException(getErrorMessage(actionCtx,
actionConfig));
} else {
-return (false);
+return CONTINUE_PROCESSING;
}
}
Modified:
struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractCreateAction.java
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractCreateAction.java?rev=721970&r1=721969&r2=721970&view=diff
==
---
struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractCreateAction.java
(original)
+++
struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractCreateAction.java
Sun Nov 30 21:40:50 2008
@@ -61,14 +61,14 @@
if ((valid == null) || !valid.booleanValue()) {
LOG.trace("Invalid form; not going to execute.");
-return (false);
+return CONTINUE_PROCESSING;
}
// Check to see if an action has already been created
if (actionCtx.getAction() != null) {
LOG.trace("already have an action [" + actionCtx.getAction() +
"]");
-return (false);
+return CONTINUE_
