svn commit: r1418866 - in /struts/struts2/trunk: apps/portlet/pom.xml apps/showcase/pom.xml bundles/demo/pom.xml plugins/osgi/pom.xml plugins/sitemesh/pom.xml pom.xml
Author: lukaszlenart Date: Sun Dec 9 09:45:55 2012 New Revision: 1418866 URL: http://svn.apache.org/viewvc?rev=1418866&view=rev Log: WW-3058 Upgrades only Velocity to 1.6.4 and cleans up poms a bit Modified: struts/struts2/trunk/apps/portlet/pom.xml struts/struts2/trunk/apps/showcase/pom.xml struts/struts2/trunk/bundles/demo/pom.xml struts/struts2/trunk/plugins/osgi/pom.xml struts/struts2/trunk/plugins/sitemesh/pom.xml struts/struts2/trunk/pom.xml Modified: struts/struts2/trunk/apps/portlet/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/portlet/pom.xml?rev=1418866&r1=1418865&r2=1418866&view=diff == --- struts/struts2/trunk/apps/portlet/pom.xml (original) +++ struts/struts2/trunk/apps/portlet/pom.xml Sun Dec 9 09:45:55 2012 @@ -118,22 +118,8 @@ org.apache.velocity velocity-tools -1.3 - - -velocity -velocity - - -javax.servlet -servlet-api - - -struts -struts - - + commons-digester commons-digester Modified: struts/struts2/trunk/apps/showcase/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/pom.xml?rev=1418866&r1=1418865&r2=1418866&view=diff == --- struts/struts2/trunk/apps/showcase/pom.xml (original) +++ struts/struts2/trunk/apps/showcase/pom.xml Sun Dec 9 09:45:55 2012 @@ -134,23 +134,8 @@ org.apache.velocity velocity-tools - - -velocity -velocity - - -javax.servlet -servlet-api - - -struts -struts - - - opensymphony sitemesh Modified: struts/struts2/trunk/bundles/demo/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/bundles/demo/pom.xml?rev=1418866&r1=1418865&r2=1418866&view=diff == --- struts/struts2/trunk/bundles/demo/pom.xml (original) +++ struts/struts2/trunk/bundles/demo/pom.xml Sun Dec 9 09:45:55 2012 @@ -28,12 +28,6 @@ org.apache.velocity velocity-tools true - - -velocity -velocity - - Modified: struts/struts2/trunk/plugins/osgi/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/osgi/pom.xml?rev=1418866&r1=1418865&r2=1418866&view=diff == --- struts/struts2/trunk/plugins/osgi/pom.xml (original) +++ struts/struts2/trunk/plugins/osgi/pom.xml Sun Dec 9 09:45:55 2012 @@ -32,20 +32,6 @@ org.apache.velocity velocity-tools true - - -velocity -velocity - - -javax.servlet -servlet-api - - -struts -struts - - Modified: struts/struts2/trunk/plugins/sitemesh/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/sitemesh/pom.xml?rev=1418866&r1=1418865&r2=1418866&view=diff == --- struts/struts2/trunk/plugins/sitemesh/pom.xml (original) +++ struts/struts2/trunk/plugins/sitemesh/pom.xml Sun Dec 9 09:45:55 2012 @@ -56,20 +56,8 @@ org.apache.velocity velocity-tools -1.3 true - - -velocity -velocity - - -struts -struts - - - Modified: struts/struts2/trunk/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/pom.xml?rev=1418866&r1=1418865&r2=1418866&view=diff == --- struts/struts2/trunk/pom.xml (original) +++ struts/struts2/trunk/pom.xml Sun Dec 9 09:45:55 2012 @@ -379,7 +379,7 @@ org.apache.velocity velocity -1.6.3 +1.6.4 true @@ -389,6 +389,10 @@ 1.3
svn commit: r1418881 - /struts/struts2/trunk/plugins/sitemesh/pom.xml
Author: lukaszlenart Date: Sun Dec 9 10:18:47 2012 New Revision: 1418881 URL: http://svn.apache.org/viewvc?rev=1418881&view=rev Log: WW-3058 Removes version from pom to use version from parent pom Modified: struts/struts2/trunk/plugins/sitemesh/pom.xml Modified: struts/struts2/trunk/plugins/sitemesh/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/sitemesh/pom.xml?rev=1418881&r1=1418880&r2=1418881&view=diff == --- struts/struts2/trunk/plugins/sitemesh/pom.xml (original) +++ struts/struts2/trunk/plugins/sitemesh/pom.xml Sun Dec 9 10:18:47 2012 @@ -49,7 +49,6 @@ org.apache.velocity velocity -1.6.3 true
svn commit: r1418920 - /struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/MultiselectInterceptor.java
Author: lukaszlenart
Date: Sun Dec 9 12:51:14 2012
New Revision: 1418920
URL: http://svn.apache.org/viewvc?rev=1418920&view=rev
Log:
WW-2537 clears warning about generics
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/MultiselectInterceptor.java
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/MultiselectInterceptor.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/MultiselectInterceptor.java?rev=1418920&r1=1418919&r2=1418920&view=diff
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/MultiselectInterceptor.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/MultiselectInterceptor.java
Sun Dec 9 12:51:14 2012
@@ -20,16 +20,14 @@
*/
package org.apache.struts2.interceptor;
+import com.opensymphony.xwork2.ActionInvocation;
+import com.opensymphony.xwork2.interceptor.AbstractInterceptor;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
import java.util.Set;
-import com.opensymphony.xwork2.ActionInvocation;
-import com.opensymphony.xwork2.interceptor.AbstractInterceptor;
-
-
/**
* Just as the CheckboxInterceptor checks that if only the hidden field is
present, so too does this interceptor. If
* the "__multiselect_" request parameter is present and its visible
counterpart is not, set a new request parameter to an
@@ -49,7 +47,7 @@ public class MultiselectInterceptor exte
* @see
com.opensymphony.xwork2.interceptor.Interceptor#intercept(com.opensymphony.xwork2.ActionInvocation)
*/
public String intercept(ActionInvocation actionInvocation) throws
Exception {
-Map parameters =
actionInvocation.getInvocationContext().getParameters();
+Map parameters =
actionInvocation.getInvocationContext().getParameters();
Map newParams = new HashMap();
Set keys = parameters.keySet();
@@ -74,4 +72,5 @@ public class MultiselectInterceptor exte
return actionInvocation.invoke();
}
+
}
\ No newline at end of file
svn commit: r1418923 - /struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/CheckboxInterceptor.java
Author: lukaszlenart
Date: Sun Dec 9 12:57:07 2012
New Revision: 1418923
URL: http://svn.apache.org/viewvc?rev=1418923&view=rev
Log:
WW-2537 clears warning about generics
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/CheckboxInterceptor.java
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/CheckboxInterceptor.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/CheckboxInterceptor.java?rev=1418923&r1=1418922&r2=1418923&view=diff
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/CheckboxInterceptor.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/CheckboxInterceptor.java
Sun Dec 9 12:57:07 2012
@@ -58,12 +58,13 @@ public class CheckboxInterceptor extends
private static final Logger LOG =
LoggerFactory.getLogger(CheckboxInterceptor.class);
public String intercept(ActionInvocation ai) throws Exception {
-Map parameters = ai.getInvocationContext().getParameters();
+Map parameters =
ai.getInvocationContext().getParameters();
Map newParams = new HashMap();
-Set entries = parameters.entrySet();
-for (Iterator iterator = entries.iterator();
iterator.hasNext();) {
-Map.Entry entry = iterator.next();
-String key = (String)entry.getKey();
+Set> entries = parameters.entrySet();
+
+for (Iterator> iterator =
entries.iterator(); iterator.hasNext();) {
+Map.Entry entry = iterator.next();
+String key = entry.getKey();
if (key.startsWith("__checkbox_")) {
String name = key.substring("__checkbox_".length());
svn commit: r1419038 - /struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/PrefixBasedActionMapper.java
Author: lukaszlenart
Date: Sun Dec 9 17:45:58 2012
New Revision: 1419038
URL: http://svn.apache.org/viewvc?rev=1419038&view=rev
Log:
WW-2537 cleans up code and logging
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/PrefixBasedActionMapper.java
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/PrefixBasedActionMapper.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/PrefixBasedActionMapper.java?rev=1419038&r1=1419037&r2=1419038&view=diff
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/PrefixBasedActionMapper.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/PrefixBasedActionMapper.java
Sun Dec 9 17:45:58 2012
@@ -3,8 +3,8 @@ package org.apache.struts2.dispatcher.ma
import com.opensymphony.xwork2.config.ConfigurationManager;
import com.opensymphony.xwork2.inject.Container;
import com.opensymphony.xwork2.inject.Inject;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.opensymphony.xwork2.util.logging.Logger;
+import com.opensymphony.xwork2.util.logging.LoggerFactory;
import org.apache.struts2.StrutsConstants;
import javax.servlet.http.HttpServletRequest;
@@ -14,7 +14,7 @@ import java.util.Map;
/**
*
- *
+ *
* A prefix based action mapper that is capable of delegating to other {@link
ActionMapper}s based on the request's prefix
*
* It is configured through struts.xml
@@ -37,98 +37,100 @@ import java.util.Map;
*
* @see ActionMapper
* @see ActionMapping
- *
*/
public class PrefixBasedActionMapper extends DefaultActionMapper implements
ActionMapper {
- protected transient final Log log = LogFactory.getLog(getClass());
- protected Container container;
- protected Map actionMappers = new
HashMap();
-
- @Inject
- public void setContainer(Container container) {
-this.container = container;
- }
-
- @Inject(StrutsConstants.PREFIX_BASED_MAPPER_CONFIGURATION)
- public void setPrefixBasedActionMappers(String list) {
-if (list != null) {
- String[] mappers = list.split(",");
- for (String mapper : mappers) {
-String[] thisMapper = mapper.split(":");
-if ((thisMapper != null) && (thisMapper.length == 2)) {
- String mapperPrefix = thisMapper[0].trim();
- String mapperName = thisMapper[1].trim();
- Object obj = container.getInstance(ActionMapper.class, mapperName);
- if (obj != null) {
-actionMappers.put(mapperPrefix, (ActionMapper) obj);
- } else if (log.isDebugEnabled()) {
-log.debug("invalid PrefixBasedActionMapper config entry: " +
mapper);
- }
+
+private static final Logger LOG =
LoggerFactory.getLogger(PrefixBasedActionMapper.class);
+
+protected Container container;
+protected Map actionMappers = new HashMap();
+
+@Inject
+public void setContainer(Container container) {
+this.container = container;
+}
+
+@Inject(StrutsConstants.PREFIX_BASED_MAPPER_CONFIGURATION)
+public void setPrefixBasedActionMappers(String list) {
+if (list != null) {
+String[] mappers = list.split(",");
+for (String mapper : mappers) {
+String[] thisMapper = mapper.split(":");
+if ((thisMapper != null) && (thisMapper.length == 2)) {
+String mapperPrefix = thisMapper[0].trim();
+String mapperName = thisMapper[1].trim();
+Object obj = container.getInstance(ActionMapper.class,
mapperName);
+if (obj != null) {
+actionMappers.put(mapperPrefix, (ActionMapper) obj);
+} else if (LOG.isDebugEnabled()) {
+LOG.debug("invalid PrefixBasedActionMapper config
entry: [#0]", mapper);
+}
+}
+}
}
- }
}
- }
- @SuppressWarnings("unchecked")
- public ActionMapping getMapping(HttpServletRequest request,
ConfigurationManager configManager) {
-String uri = getUri(request);
-for (int lastIndex = uri.lastIndexOf('/'); lastIndex > (-1); lastIndex =
uri.lastIndexOf('/', lastIndex-1)) {
- ActionMapper actionMapper =
actionMappers.get(uri.substring(0,lastIndex));
- if (actionMapper != null) {
-ActionMapping actionMapping = actionMapper.getMapping(request,
configManager);
-if (log.isDebugEnabled()) {
- log.debug("Using ActionMapper "+actionMapper);
-}
-if (actionMapping != null) {
- if (log.isDebugEnabled()) {
-if (actionMapping.getParams() != null) {
- log.debug("ActionMapper found mapping. Parameters:
"+actionMapping.getParams());
- for
svn commit: r1419061 - /struts/struts2/trunk/core/src/main/resources/org/apache/struts2/default.properties
Author: lukaszlenart Date: Sun Dec 9 18:09:19 2012 New Revision: 1419061 URL: http://svn.apache.org/viewvc?rev=1419061&view=rev Log: WW-3766 sets struts.freemarker.mru.max.strong.size to 0 to SoftCacheStorage which performs better in heavy loaded applications Modified: struts/struts2/trunk/core/src/main/resources/org/apache/struts2/default.properties Modified: struts/struts2/trunk/core/src/main/resources/org/apache/struts2/default.properties URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/org/apache/struts2/default.properties?rev=1419061&r1=1419060&r2=1419061&view=diff == --- struts/struts2/trunk/core/src/main/resources/org/apache/struts2/default.properties (original) +++ struts/struts2/trunk/core/src/main/resources/org/apache/struts2/default.properties Sun Dec 9 18:09:19 2012 @@ -184,8 +184,9 @@ struts.freemarker.beanwrapperCache=false ### See the StrutsBeanWrapper javadocs for more information struts.freemarker.wrapper.altMap=true -### maxStrongSize for MruCacheStorage for freemarker -struts.freemarker.mru.max.strong.size=100 +### maxStrongSize for MruCacheStorage for freemarker, when set to 0 SoftCacheStorage which performs better in heavy loaded application +### check WW-3766 for more details +struts.freemarker.mru.max.strong.size=0 ### configure the XSLTResult class to use stylesheet caching. ### Set to true for developers and false for production.
[CONF] Confluence Changes in the last 24 hours
This is a daily summary of all recent changes in Confluence. - Updated Spaces: - Apache OpenOffice Community (https://cwiki.apache.org/confluence/display/OOOUSERS) Pages - AOO 3.4.1 Respin for additional languages edited by pescetti (04:40 PM) https://cwiki.apache.org/confluence/display/OOOUSERS/AOO+3.4.1+Respin+for+additional+languages 2012 Dec edited by pescetti (02:01 PM) https://cwiki.apache.org/confluence/display/OOOUSERS/2012+Dec Apache OpenWebBeans (https://cwiki.apache.org/confluence/display/OWB) Pages - Support edited by gerdogdu (03:59 PM) https://cwiki.apache.org/confluence/display/OWB/Support Change your notification preferences: https://cwiki.apache.org/confluence/users/viewnotifications.action
