[CONF] Confluence Changes in the last 24 hours
- This is a daily summary of all recent changes in Confluence. - Updated Spaces: - Apache FTPServer Project (FTPSERVER) http://cwiki.apache.org/confluence/display/FTPSERVER | |-Pages Added or Edited in This Space |-- Listeners was last edited by ngn (12:55 PM). | http://cwiki.apache.org/confluence/display/FTPSERVER/Listeners |-- TLSSSL Support was last edited by ngn (12:53 PM). | http://cwiki.apache.org/confluence/display/FTPSERVER/TLSSSL+Support Apache CXF 2.0 Documentation (CXF20DOC) http://cwiki.apache.org/confluence/display/CXF20DOC | |-Pages Added or Edited in This Space |-- Servlet Transport was last edited by ekarulf (02:58 PM). | http://cwiki.apache.org/confluence/display/CXF20DOC/Servlet+Transport Apache Struts 2 Plugin Registry (S2PLUGINS) http://cwiki.apache.org/confluence/display/S2PLUGINS | |-Pages Added or Edited in This Space |-- OSGi Plugin was created by mrdon (07:31 AM). | http://cwiki.apache.org/confluence/display/S2PLUGINS/OSGi+Plugin Apache ServiceMix (SM) http://cwiki.apache.org/confluence/display/SM | |-Pages Added or Edited in This Space |-- 2.4. Beginner - Configuring the servicemix-file SU was created by gertvanthienen (05:51 AM). | http://cwiki.apache.org/confluence/display/SM/2.4.+Beginner+-+Configuring+the+servicemix-file+SU |-- 4. Examples was last edited by gertvanthienen (05:48 AM). | http://cwiki.apache.org/confluence/display/SM/4.+Examples |-- 2.3. Beginner - Creating our first SU module was created by gertvanthienen (05:07 AM). | http://cwiki.apache.org/confluence/display/SM/2.3.+Beginner+-+Creating+our+first+SU+module |-- 2.2. Beginner - Starting the Maven project was last edited by gertvanthienen (05:09 AM). | http://cwiki.apache.org/confluence/display/SM/2.2.+Beginner+-+Starting+the+Maven+project Apache Cayenne Documentation v2.0 (CAYDOC20) http://cwiki.apache.org/confluence/display/CAYDOC20 | |-Pages Added or Edited in This Space |-- JAR Files and Dependencies was last edited by andrus (10:28 AM). | http://cwiki.apache.org/confluence/display/CAYDOC20/JAR+Files+and+Dependencies |-- Guide to 1.1 Features was last edited by andrus (10:28 AM). | http://cwiki.apache.org/confluence/display/CAYDOC20/Guide+to+1.1+Features Tuscany Wiki (TUSCANYWIKI) http://cwiki.apache.org/confluence/display/TUSCANYWIKI | |-Pages Added or Edited in This Space |-- Resolving WSDL and XSD artifacts was created by rfeng (09:19 AM). | http://cwiki.apache.org/confluence/display/TUSCANYWIKI/Resolving+WSDL+and+XSD+artifacts Apache Cayenne Documentation v1.2 (CAYDOC12) http://cwiki.apache.org/confluence/display/CAYDOC12 | |-Pages Added or Edited in This Space |-- DataViews was last edited by andrus (10:28 AM). | http://cwiki.apache.org/confluence/display/CAYDOC12/DataViews |-- JAR Files and Dependencies was last edited by andrus (10:28 AM). | http://cwiki.apache.org/confluence/display/CAYDOC12/JAR+Files+and+Dependencies Apache Cayenne Documentation (CAYDOC) http://cwiki.apache.org/confluence/display/CAYDOC | |-Pages Added or Edited in This Space |-- Lifecycle Callbacks was last edited by andrus (03:29 PM). | http://cwiki.apache.org/confluence/display/CAYDOC/Lifecycle+Callbacks |-- Remote Object Persistence Lifecycle Callbacks was last edited by andrus (12:33 PM). | http://cwiki.apache.org/confluence/display/CAYDOC/Remote+Object+Persistence+Lifecycle+Callbacks |-- Guide to 1.1 Features was last edited by andrus (10:32 AM). | http://cwiki.apache.org/confluence/display/CAYDOC/Guide+to+1.1+Features |-- Cayenne Guide was last edited by andrus (10:27 AM). | http://cwiki.apache.org/confluence/display/CAYDOC/Cayenne+Guide Apache Tuscany (TUSCANY) http://cwiki.apache.org/confluence/display/TUSCANY | |-Pages Added or Edited in This Space |-- DAS Java was last edited by [EMAIL PROTECTED] (10:00 PM). | http://cwiki.apache.org/confluence/display/TUSCANY/DAS+Java Apache Cayenne DataViews (CAYDV) http://cwiki.apache.org/confluence/display/CAYDV | |-Pages Added or Edited in This Space |-- DataViews in Action was last edited by andrus (10:36 AM). | http://cwiki.apache.org/confluence/display/CAYDV/DataViews+in+Action |-- DVModeler GUI Tool was last edited by andrus (10:34 AM). | http://cwiki.apache.org/confluence/display/CAYDV/DVModeler+GUI+Tool |-- Index was last edited by andrus (10:32 AM). | http://cwiki.apache.org/confluence/display/CAYDV/Index |-- Swing Applications was last edited by andrus (10:28 AM). | http://cwiki.apache.org/confluence/display/CAYDV/Swing+Applications |-- DataView Concepts was last edited by andrus (10:28 AM). | http://cwiki.apache.org/confluence/display/CAYDV/DataView+Concepts - CONFLUENCE INFORMATION Thi
svn commit: r560880 - /struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/template/FreemarkerTemplateEngine.java
Author: rgielen
Date: Mon Jul 30 00:04:19 2007
New Revision: 560880
URL: http://svn.apache.org/viewvc?view=rev&rev=560880
Log:
WW-1661:
Minor code cleanups
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/template/FreemarkerTemplateEngine.java
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/template/FreemarkerTemplateEngine.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/template/FreemarkerTemplateEngine.java?view=diff&rev=560880&r1=560879&r2=560880
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/template/FreemarkerTemplateEngine.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/template/FreemarkerTemplateEngine.java
Mon Jul 30 00:04:19 2007
@@ -20,32 +20,28 @@
*/
package org.apache.struts2.components.template;
-import java.io.IOException;
-import java.io.Writer;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.struts2.ServletActionContext;
-import org.apache.struts2.StrutsConstants;
-import org.apache.struts2.views.freemarker.FreemarkerManager;
-
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.ActionInvocation;
import com.opensymphony.xwork2.inject.Inject;
import com.opensymphony.xwork2.util.ClassLoaderUtil;
import com.opensymphony.xwork2.util.ValueStack;
-
import freemarker.template.Configuration;
import freemarker.template.SimpleHash;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.struts2.ServletActionContext;
+import org.apache.struts2.StrutsConstants;
+import org.apache.struts2.views.freemarker.FreemarkerManager;
+
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.Writer;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
/**
* Freemarker based template engine.
@@ -54,8 +50,8 @@
static Class bodyContent = null;
private FreemarkerManager freemarkerManager;
-private HashMap templates = new
HashMap();
-private HashSet missingTemplates = new HashSet();
+private final HashMap templates =
new HashMap();
+private final HashSet missingTemplates = new HashSet();
private boolean freemarkerCaching = false;
static {
@@ -95,8 +91,8 @@
freemarker.template.Template template = null;
String templateName = null;
Exception exception = null;
-for (Iterator iterator = templates.iterator(); iterator.hasNext();) {
-Template t = (Template) iterator.next();
+for (Object template1 : templates) {
+Template t = (Template) template1;
templateName = getFinalTemplateName(t);
if (freemarkerCaching) {
if (!isTemplateMissing(templateName)) {
@@ -202,14 +198,14 @@
protected freemarker.template.Template findInCache(String templateName) {
synchronized(templates) {
-return (freemarker.template.Template) templates.get(templateName);
+return templates.get(templateName);
}
}
/**
* Enables or disables Struts caching of Freemarker templates. By default
disabled.
* Set struts.freemarker.templatesCache=true to enable cache
- * @param caching true if the template engine should cache freemarker
template
+ * @param cacheTemplates "true" if the template engine should cache
freemarker template
* internally
*/
@Inject(StrutsConstants.STRUTS_FREEMARKER_TEMPLATES_CACHE)
svn commit: r560881 - in /struts/struts2/branches/STRUTS_2_0_X/core/src/main: java/org/apache/struts2/ java/org/apache/struts2/components/template/ java/org/apache/struts2/config/ resources/org/apache
Author: rgielen
Date: Mon Jul 30 00:05:55 2007
New Revision: 560881
URL: http://svn.apache.org/viewvc?view=rev&rev=560881
Log:
WW-1661:
Backporting Freemarker template caching to 2.0.x tree
Modified:
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/StrutsConstants.java
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/template/FreemarkerTemplateEngine.java
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java
struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/org/apache/struts2/default.properties
Modified:
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/StrutsConstants.java
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/StrutsConstants.java?view=diff&rev=560881&r1=560880&r2=560881
==
---
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/StrutsConstants.java
(original)
+++
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/StrutsConstants.java
Mon Jul 30 00:05:55 2007
@@ -76,6 +76,9 @@
/** The org.apache.struts2.views.freemarker.FreemarkerManager
implementation class */
public static final String STRUTS_FREEMARKER_MANAGER_CLASSNAME =
"struts.freemarker.manager.classname";
+/** Cache Freemarker templates */
+public static final String STRUTS_FREEMARKER_TEMPLATES_CACHE =
"struts.freemarker.templatesCache";
+
/** org.apache.struts2.views.velocity.VelocityManager implementation class
*/
public static final String STRUTS_VELOCITY_MANAGER_CLASSNAME =
"struts.velocity.manager.classname";
Modified:
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/template/FreemarkerTemplateEngine.java
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/template/FreemarkerTemplateEngine.java?view=diff&rev=560881&r1=560880&r2=560881
==
---
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/template/FreemarkerTemplateEngine.java
(original)
+++
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/template/FreemarkerTemplateEngine.java
Mon Jul 30 00:05:55 2007
@@ -22,9 +22,7 @@
import java.io.IOException;
import java.io.Writer;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
@@ -33,6 +31,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.struts2.ServletActionContext;
+import org.apache.struts2.StrutsConstants;
import org.apache.struts2.views.freemarker.FreemarkerManager;
import com.opensymphony.xwork2.inject.Inject;
@@ -41,8 +40,7 @@
import com.opensymphony.xwork2.ActionInvocation;
import com.opensymphony.xwork2.util.ValueStack;
-import freemarker.template.Configuration;
-import freemarker.template.SimpleHash;
+import freemarker.template.*;
/**
* Freemarker based template engine.
@@ -51,6 +49,10 @@
static Class bodyContent = null;
private FreemarkerManager freemarkerManager;
+private final HashMap templates =
new HashMap();
+private final HashSet missingTemplates = new HashSet();
+private boolean freemarkerCaching = false;
+
static {
try {
bodyContent =
ClassLoaderUtil.loadClass("javax.servlet.jsp.tagext.BodyContent",
@@ -88,16 +90,35 @@
freemarker.template.Template template = null;
String templateName = null;
Exception exception = null;
-for (Iterator iterator = templates.iterator(); iterator.hasNext();) {
-Template t = (Template) iterator.next();
+for (Object template1 : templates) {
+Template t = (Template) template1;
templateName = getFinalTemplateName(t);
-try {
-// try to load, and if it works, stop at the first one
-template = config.getTemplate(templateName);
-break;
-} catch (IOException e) {
-if (exception == null) {
-exception = e;
+if (freemarkerCaching) {
+if (!isTemplateMissing(templateName)) {
+try {
+template = findInCache(templateName); // look in
cache first
+if (template == null) {
+// try to load, and if it works, stop at the first
one
+template = config.getTemplate(templateName);
+addToCache(templateName, template);
+}
svn commit: r560894 - in /struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/template: FreemarkerTemplateEngine.java JspTemplateEngine.java Template.java VelocityTem
Author: rgielen
Date: Mon Jul 30 02:05:32 2007
New Revision: 560894
URL: http://svn.apache.org/viewvc?view=rev&rev=560894
Log:
Code cleanups / generification
Modified:
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/template/FreemarkerTemplateEngine.java
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/template/JspTemplateEngine.java
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/template/Template.java
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/template/VelocityTemplateEngine.java
Modified:
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/template/FreemarkerTemplateEngine.java
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/template/FreemarkerTemplateEngine.java?view=diff&rev=560894&r1=560893&r2=560894
==
---
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/template/FreemarkerTemplateEngine.java
(original)
+++
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/template/FreemarkerTemplateEngine.java
Mon Jul 30 02:05:32 2007
@@ -84,14 +84,13 @@
Configuration config =
freemarkerManager.getConfiguration(servletContext);
// get the list of templates we can use
-List templates =
templateContext.getTemplate().getPossibleTemplates(this);
+List templates =
templateContext.getTemplate().getPossibleTemplates(this);
// find the right template
freemarker.template.Template template = null;
String templateName = null;
Exception exception = null;
-for (Object template1 : templates) {
-Template t = (Template) template1;
+for (Template t : templates) {
templateName = getFinalTemplateName(t);
if (freemarkerCaching) {
if (!isTemplateMissing(templateName)) {
Modified:
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/template/JspTemplateEngine.java
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/template/JspTemplateEngine.java?view=diff&rev=560894&r1=560893&r2=560894
==
---
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/template/JspTemplateEngine.java
(original)
+++
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/template/JspTemplateEngine.java
Mon Jul 30 02:05:32 2007
@@ -20,19 +20,16 @@
*/
package org.apache.struts2.components.template;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.jsp.PageContext;
-
+import com.opensymphony.xwork2.util.ValueStack;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.struts2.ServletActionContext;
import org.apache.struts2.components.Include;
import org.apache.struts2.components.UIBean;
-import com.opensymphony.xwork2.util.ValueStack;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.jsp.PageContext;
+import java.util.List;
/**
* JSP based template engine.
@@ -50,11 +47,10 @@
ValueStack stack = templateContext.getStack();
stack.push(tag);
PageContext pageContext = (PageContext)
stack.getContext().get(ServletActionContext.PAGE_CONTEXT);
-List templates = template.getPossibleTemplates(this);
+List templates = template.getPossibleTemplates(this);
Exception exception = null;
boolean success = false;
-for (Iterator iterator = templates.iterator(); iterator.hasNext();) {
-Template t = (Template) iterator.next();
+for (Template t : templates) {
try {
Include.include(getFinalTemplateName(t), pageContext.getOut(),
pageContext.getRequest(), (HttpServletResponse)
pageContext.getResponse());
Modified:
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/template/Template.java
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/template/Template.java?view=diff&rev=560894&r1=560893&r2=560894
==
---
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/template/Template.java
(original)
+++
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/template/Template.java
Mon Jul 30 02:05:32 2007
@@ -59,8 +59,8 @@
svn commit: r560895 - in /struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/template: FreemarkerTemplateEngine.java JspTemplateEngine.java Template.java VelocityTemplateEngine.java
Author: rgielen
Date: Mon Jul 30 02:06:37 2007
New Revision: 560895
URL: http://svn.apache.org/viewvc?view=rev&rev=560895
Log:
Code cleanups / generification
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/template/FreemarkerTemplateEngine.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/template/JspTemplateEngine.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/template/Template.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/template/VelocityTemplateEngine.java
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/template/FreemarkerTemplateEngine.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/template/FreemarkerTemplateEngine.java?view=diff&rev=560895&r1=560894&r2=560895
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/template/FreemarkerTemplateEngine.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/template/FreemarkerTemplateEngine.java
Mon Jul 30 02:06:37 2007
@@ -85,14 +85,13 @@
Configuration config =
freemarkerManager.getConfiguration(servletContext);
// get the list of templates we can use
-List templates =
templateContext.getTemplate().getPossibleTemplates(this);
+List templates =
templateContext.getTemplate().getPossibleTemplates(this);
// find the right template
freemarker.template.Template template = null;
String templateName = null;
Exception exception = null;
-for (Object template1 : templates) {
-Template t = (Template) template1;
+for (Template t : templates) {
templateName = getFinalTemplateName(t);
if (freemarkerCaching) {
if (!isTemplateMissing(templateName)) {
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/template/JspTemplateEngine.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/template/JspTemplateEngine.java?view=diff&rev=560895&r1=560894&r2=560895
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/template/JspTemplateEngine.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/template/JspTemplateEngine.java
Mon Jul 30 02:06:37 2007
@@ -20,19 +20,16 @@
*/
package org.apache.struts2.components.template;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.jsp.PageContext;
-
+import com.opensymphony.xwork2.util.ValueStack;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.struts2.ServletActionContext;
import org.apache.struts2.components.Include;
import org.apache.struts2.components.UIBean;
-import com.opensymphony.xwork2.util.ValueStack;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.jsp.PageContext;
+import java.util.List;
/**
* JSP based template engine.
@@ -50,11 +47,10 @@
ValueStack stack = templateContext.getStack();
stack.push(tag);
PageContext pageContext = (PageContext)
stack.getContext().get(ServletActionContext.PAGE_CONTEXT);
-List templates = template.getPossibleTemplates(this);
+List templates = template.getPossibleTemplates(this);
Exception exception = null;
boolean success = false;
-for (Iterator iterator = templates.iterator(); iterator.hasNext();) {
-Template t = (Template) iterator.next();
+for (Template t : templates) {
try {
Include.include(getFinalTemplateName(t), pageContext.getOut(),
pageContext.getRequest(), (HttpServletResponse)
pageContext.getResponse());
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/template/Template.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/template/Template.java?view=diff&rev=560895&r1=560894&r2=560895
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/template/Template.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/template/Template.java
Mon Jul 30 02:06:37 2007
@@ -59,8 +59,8 @@
return name;
}
-public List getPossibleTemplates(TemplateEngine engine) {
-List list = new ArrayList(3);
+public List getPossibleTemplates(TemplateEngine engine) {
+List list = new ArrayList(3);
Template template = t
svn commit: r560966 - /struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java
Author: mrdon
Date: Mon Jul 30 06:08:11 2007
New Revision: 560966
URL: http://svn.apache.org/viewvc?view=rev&rev=560966
Log:
Making the mapper easier to extend
WW-2078
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java?view=diff&rev=560966&r1=560965&r2=560966
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java
Mon Jul 30 06:08:11 2007
@@ -162,25 +162,25 @@
*/
public class DefaultActionMapper implements ActionMapper {
-static final String METHOD_PREFIX = "method:";
+protected static final String METHOD_PREFIX = "method:";
-static final String ACTION_PREFIX = "action:";
+protected static final String ACTION_PREFIX = "action:";
-static final String REDIRECT_PREFIX = "redirect:";
+protected static final String REDIRECT_PREFIX = "redirect:";
-static final String REDIRECT_ACTION_PREFIX = "redirect-action:";
+protected static final String REDIRECT_ACTION_PREFIX = "redirect-action:";
-private boolean allowDynamicMethodCalls = true;
+protected boolean allowDynamicMethodCalls = true;
-private boolean allowSlashesInActionNames = false;
+protected boolean allowSlashesInActionNames = false;
-private boolean alwaysSelectFullNamespace = false;
+protected boolean alwaysSelectFullNamespace = false;
-private PrefixTrie prefixTrie = null;
+protected PrefixTrie prefixTrie = null;
-List extensions = new ArrayList() {{ add("action");}};
+protected List extensions = new ArrayList() {{ add("action");}};
-private Container container;
+protected Container container;
public DefaultActionMapper() {
prefixTrie = new PrefixTrie() {
@@ -266,7 +266,16 @@
public void setContainer(Container container) {
this.container = container;
}
-
+
+@Inject(StrutsConstants.STRUTS_ACTION_EXTENSION)
+public void setExtensions(String extensions) {
+if (!"".equals(extensions)) {
+this.extensions = Arrays.asList(extensions.split(","));
+} else {
+this.extensions = null;
+}
+}
+
/*
* (non-Javadoc)
*
@@ -347,7 +356,7 @@
* @param mapping
*The action mapping to populate
*/
-void parseNameAndNamespace(String uri, ActionMapping mapping,
+protected void parseNameAndNamespace(String uri, ActionMapping mapping,
ConfigurationManager configManager) {
String namespace, name;
int lastSlash = uri.lastIndexOf("/");
@@ -401,7 +410,7 @@
*The action name
* @return The action name without its extension
*/
-String dropExtension(String name) {
+protected String dropExtension(String name) {
if (extensions == null) {
return name;
}
@@ -419,7 +428,7 @@
/**
* Returns null if no extension is specified.
*/
-String getDefaultExtension() {
+protected String getDefaultExtension() {
if (extensions == null) {
return null;
} else {
@@ -427,15 +436,6 @@
}
}
-@Inject(StrutsConstants.STRUTS_ACTION_EXTENSION)
-public void setExtensions(String extensions) {
-if (!"".equals(extensions)) {
-this.extensions = Arrays.asList(extensions.split(","));
-} else {
-this.extensions = null;
-}
-}
-
/**
* Gets the uri from the request
*
@@ -443,7 +443,7 @@
*The request
* @return The uri
*/
-String getUri(HttpServletRequest request) {
+protected String getUri(HttpServletRequest request) {
// handle http dispatcher includes.
String uri = (String) request
.getAttribute("javax.servlet.include.servlet_path");
Issues Opened: week of 2007-07-30
Struts2 - Monday, July 30, 2007 20 opened in last 7 days [WW-2056] ActionMapper: submit tag method attribute apply to all action(include action result) Cleven Lee - Bug - [] http://issues.apache.org/struts/browse/WW-2056 [WW-2066] Add ognl info in the validation message attribute Florent Ramière - Improvement - [] http://issues.apache.org/struts/browse/WW-2066 [WW-2077] Change parseWidgets to false in djConfig inside head FTL .Should be false for better performance! Felipe Rodrigues - Improvement - [] http://issues.apache.org/struts/browse/WW-2077 [WW-2061] Tabindex not working on autocompleter Benjamin McCann - Bug - [] http://issues.apache.org/struts/browse/WW-2061 [WW-2072] DefaultWorkflowInterceptor should not perform any validation, just direct flow based on validation errors available in the ValidationAware instance Musachy Barroso - Bug - [] http://issues.apache.org/struts/browse/WW-2072 [WW-2059] JSONValidationInterceptor broken if Action is ModelDriven Piero Sartini - Sub-task - [] http://issues.apache.org/struts/browse/WW-2059 [WW-2065] Field-validator params and ognl Florent Ramière - New Feature - [] http://issues.apache.org/struts/browse/WW-2065 [WW-2073] File upload - maximum size validation does not work; (JakartaMultiPartRequest with struts.multipart.maxSize overrides fileInterceptor.maxsize) Lukasz Racon - Bug - [] http://issues.apache.org/struts/browse/WW-2073 [WW-2058] Client side validation in xhtml template and clearErrorMessages not working in firefox with hidden fields Max Pimm - Bug - [] http://issues.apache.org/struts/browse/WW-2058 [WW-2075] Add configuration for the Maven release plugin Antonio Petrelli - Task - [] http://issues.apache.org/struts/browse/WW-2075 [WW-2069] Drop "id" and "name" attributes" on the tags where they are deprecated. Musachy Barroso - Task - [] http://issues.apache.org/struts/browse/WW-2069 [WW-2054] Struts 2.0.10 omnibus ticket Ted Husted - Task - [] http://issues.apache.org/struts/browse/WW-2054 [WW-2076] validation.xml cause action not called Han Zhang - Bug - [] http://issues.apache.org/struts/browse/WW-2076 [WW-2070] Add an object browser to the debugging interceptor Musachy Barroso - New Feature - [] http://issues.apache.org/struts/browse/WW-2070 [WW-2063] Fix Subversion properties Antonio Petrelli - Bug - [] http://issues.apache.org/struts/browse/WW-2063 [WW-2074] Enable "Project Information" and "Project Reports" in websites Antonio Petrelli - Task - [] http://issues.apache.org/struts/browse/WW-2074 [WW-2068] struts.locale is ignored as constant in struts.xml, does work when specified in struts.properties Dieter van Baarle - Bug - [] http://issues.apache.org/struts/browse/WW-2068 [WW-2067] Make tabbed pane usable without the need for AJAX Hubert Grininger - Improvement - [] http://issues.apache.org/struts/browse/WW-2067 [WW-2071] UIBean.end does not fail when an exception happens Antonio Petrelli - Bug - [] http://issues.apache.org/struts/browse/WW-2071 [WW-2060] Add third party license info Antonio Petrelli - Task - [] http://issues.apache.org/struts/browse/WW-2060
svn commit: r561217 - /struts/struts2/branches/STRUTS_2_0_X/apps/portlet/src/main/webapp/WEB-INF/portlet.xml
Author: jholmes Date: Mon Jul 30 19:35:32 2007 New Revision: 561217 URL: http://svn.apache.org/viewvc?view=rev&rev=561217 Log: Fix formatting to be all spaces instead of a mix of spaces and tabs. Also fix init param comments that were incorrect. Modified: struts/struts2/branches/STRUTS_2_0_X/apps/portlet/src/main/webapp/WEB-INF/portlet.xml Modified: struts/struts2/branches/STRUTS_2_0_X/apps/portlet/src/main/webapp/WEB-INF/portlet.xml URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/apps/portlet/src/main/webapp/WEB-INF/portlet.xml?view=diff&rev=561217&r1=561216&r2=561217 == --- struts/struts2/branches/STRUTS_2_0_X/apps/portlet/src/main/webapp/WEB-INF/portlet.xml (original) +++ struts/struts2/branches/STRUTS_2_0_X/apps/portlet/src/main/webapp/WEB-INF/portlet.xml Mon Jul 30 19:35:32 2007 @@ -1,118 +1,128 @@ -http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; -xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"; id="struts-portlet"> - -Struts Test Portlet -StrutsPortlet -Struts Test Portlet - - org.apache.struts2.portlet.dispatcher.Jsr168Dispatcher - - - - viewNamespace - /view - - - - defaultViewAction - index - - - - editNamespace - /edit - - - - defaultEditAction - index - - - - helpNamespace - /help - - - - defaultHelpAction - index - - - - -0 - - - text/html - edit - help - - -en - - - My StrutsPortlet portlet - SP - struts,portlet - - +http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"; +xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; +xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"; +id="struts-portlet"> + + +Struts Test Portlet +StrutsPortlet +Struts Test Portlet + + org.apache.struts2.portlet.dispatcher.Jsr168Dispatcher + + + +viewNamespace +/view + + + + +defaultViewAction +index + + + + +editNamespace +/edit + + + + +defaultEditAction +index + + + + +helpNamespace +/help + + + + +defaultHelpAction +index + + +0 + + +text/html +edit +help + + +en + + +My StrutsPortlet portlet +SP +struts,portlet + + - -Struts Test Portlet2 -StrutsPortlet2 -Struts Test Portlet2 - - org.apache.struts2.portlet.dispatcher.Jsr168Dispatcher - - - - viewNamespace - /view - - - - defaultViewAction - index - - - - editNamespace - /edit - - - - defaultEditAction - index - - - - helpNamespace - /help - - - - defaultHelpAction - index - - - - -0 - - - text/html - edit - help - - -en - - - My StrutsPortlet portlet2 - SP2 - struts,portlet - - + +Struts Test Portlet2 +StrutsPortlet2 +Struts Test Portlet2 + + org.apache.struts2.portlet.dispatcher.Jsr168Dispatcher + + + +viewNamespace +/view + + + + +defaultViewAction +index + + + + +editNamespace +/edit + + + + +defaultEditAction +index + + + + +helpNamespace +/help + + + + +defaultHelpAction +index + + +0 + + +text/html +edit +help + + +en + + +My StrutsPortlet portlet2 +SP2 +struts,portlet + +
svn commit: r561218 - /struts/struts2/trunk/apps/portlet/src/main/webapp/WEB-INF/portlet.xml
Author: jholmes Date: Mon Jul 30 19:37:02 2007 New Revision: 561218 URL: http://svn.apache.org/viewvc?view=rev&rev=561218 Log: Fix formatting to be all spaces instead of a mix of spaces and tabs. Also fix init param comments that were incorrect. Modified: struts/struts2/trunk/apps/portlet/src/main/webapp/WEB-INF/portlet.xml Modified: struts/struts2/trunk/apps/portlet/src/main/webapp/WEB-INF/portlet.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/portlet/src/main/webapp/WEB-INF/portlet.xml?view=diff&rev=561218&r1=561217&r2=561218 == --- struts/struts2/trunk/apps/portlet/src/main/webapp/WEB-INF/portlet.xml (original) +++ struts/struts2/trunk/apps/portlet/src/main/webapp/WEB-INF/portlet.xml Mon Jul 30 19:37:02 2007 @@ -1,118 +1,128 @@ -http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; -xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"; id="struts-portlet"> - -Struts Test Portlet -StrutsPortlet -Struts Test Portlet - - org.apache.struts2.portlet.dispatcher.Jsr168Dispatcher - - - - viewNamespace - /view - - - - defaultViewAction - index - - - - editNamespace - /edit - - - - defaultEditAction - index - - - - helpNamespace - /help - - - - defaultHelpAction - index - - - - -0 - - - text/html - edit - help - - -en - - - My StrutsPortlet portlet - SP - struts,portlet - - +http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"; +xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; +xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"; +id="struts-portlet"> + + +Struts Test Portlet +StrutsPortlet +Struts Test Portlet + + org.apache.struts2.portlet.dispatcher.Jsr168Dispatcher + + + +viewNamespace +/view + + + + +defaultViewAction +index + + + + +editNamespace +/edit + + + + +defaultEditAction +index + + + + +helpNamespace +/help + + + + +defaultHelpAction +index + + +0 + + +text/html +edit +help + + +en + + +My StrutsPortlet portlet +SP +struts,portlet + + - -Struts Test Portlet2 -StrutsPortlet2 -Struts Test Portlet2 - - org.apache.struts2.portlet.dispatcher.Jsr168Dispatcher - - - - viewNamespace - /view - - - - defaultViewAction - index - - - - editNamespace - /edit - - - - defaultEditAction - index - - - - helpNamespace - /help - - - - defaultHelpAction - index - - - - -0 - - - text/html - edit - help - - -en - - - My StrutsPortlet portlet2 - SP2 - struts,portlet - - + +Struts Test Portlet2 +StrutsPortlet2 +Struts Test Portlet2 + + org.apache.struts2.portlet.dispatcher.Jsr168Dispatcher + + + +viewNamespace +/view + + + + +defaultViewAction +index + + + + +editNamespace +/edit + + + + +defaultEditAction +index + + + + +helpNamespace +/help + + + + +defaultHelpAction +index + + +0 + + +text/html +edit +help + + +en + + +My StrutsPortlet portlet2 +SP2 +struts,portlet + +
svn commit: r561219 - /struts/struts2/trunk/apps/portlet/src/main/webapp/WEB-INF/portlet.xml
Author: jholmes Date: Mon Jul 30 19:44:54 2007 New Revision: 561219 URL: http://svn.apache.org/viewvc?view=rev&rev=561219 Log: Specify XML version and encoding. Modified: struts/struts2/trunk/apps/portlet/src/main/webapp/WEB-INF/portlet.xml Modified: struts/struts2/trunk/apps/portlet/src/main/webapp/WEB-INF/portlet.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/portlet/src/main/webapp/WEB-INF/portlet.xml?view=diff&rev=561219&r1=561218&r2=561219 == --- struts/struts2/trunk/apps/portlet/src/main/webapp/WEB-INF/portlet.xml (original) +++ struts/struts2/trunk/apps/portlet/src/main/webapp/WEB-INF/portlet.xml Mon Jul 30 19:44:54 2007 @@ -1,3 +1,5 @@ + + http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd";
svn commit: r561220 - /struts/struts2/branches/STRUTS_2_0_X/apps/portlet/src/main/webapp/WEB-INF/portlet.xml
Author: jholmes Date: Mon Jul 30 19:45:40 2007 New Revision: 561220 URL: http://svn.apache.org/viewvc?view=rev&rev=561220 Log: Specify XML version and encoding. Modified: struts/struts2/branches/STRUTS_2_0_X/apps/portlet/src/main/webapp/WEB-INF/portlet.xml Modified: struts/struts2/branches/STRUTS_2_0_X/apps/portlet/src/main/webapp/WEB-INF/portlet.xml URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/apps/portlet/src/main/webapp/WEB-INF/portlet.xml?view=diff&rev=561220&r1=561219&r2=561220 == --- struts/struts2/branches/STRUTS_2_0_X/apps/portlet/src/main/webapp/WEB-INF/portlet.xml (original) +++ struts/struts2/branches/STRUTS_2_0_X/apps/portlet/src/main/webapp/WEB-INF/portlet.xml Mon Jul 30 19:45:40 2007 @@ -1,3 +1,5 @@ + + http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd";
svn commit: r561222 - /struts/struts2/branches/STRUTS_2_0_X/apps/portlet/src/main/webapp/WEB-INF/web.xml
Author: jholmes Date: Mon Jul 30 19:57:33 2007 New Revision: 561222 URL: http://svn.apache.org/viewvc?view=rev&rev=561222 Log: Fix formatting to be all spaces instead of a mix of spaces and tabs. Modified: struts/struts2/branches/STRUTS_2_0_X/apps/portlet/src/main/webapp/WEB-INF/web.xml Modified: struts/struts2/branches/STRUTS_2_0_X/apps/portlet/src/main/webapp/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/apps/portlet/src/main/webapp/WEB-INF/web.xml?view=diff&rev=561222&r1=561221&r2=561222 == --- struts/struts2/branches/STRUTS_2_0_X/apps/portlet/src/main/webapp/WEB-INF/web.xml (original) +++ struts/struts2/branches/STRUTS_2_0_X/apps/portlet/src/main/webapp/WEB-INF/web.xml Mon Jul 30 19:57:33 2007 @@ -1,49 +1,48 @@ -http://java.sun.com/dtd/web-app_2_3.dtd";> + +http://java.sun.com/dtd/web-app_2_3.dtd";> + - - - contextConfigLocation - /WEB-INF/applicationContext*.xml - - - action2 - - org.apache.struts2.dispatcher.FilterDispatcher - - - - - action2 - /* - - + + + +contextConfigLocation +/WEB-INF/applicationContext*.xml + + + +Struts2 + org.apache.struts2.dispatcher.FilterDispatcher + + + +Struts2 +/* + + - - org.springframework.web.context.ContextLoaderListener - - - - - org.apache.struts2.portlet.context.ServletContextHolderListener - - - - - - preparator - - org.apache.struts2.portlet.context.PreparatorServlet - - - - dwr - uk.ltd.getahead.dwr.DWRServlet - - - - dwr - /dwr/* - + org.springframework.web.context.ContextLoaderListener + + + + org.apache.struts2.portlet.context.ServletContextHolderListener + + + +preparator + org.apache.struts2.portlet.context.PreparatorServlet + + + +dwr +uk.ltd.getahead.dwr.DWRServlet + + + +dwr +/dwr/* +
svn commit: r561223 - /struts/struts2/trunk/apps/portlet/src/main/webapp/WEB-INF/web.xml
Author: jholmes Date: Mon Jul 30 19:58:36 2007 New Revision: 561223 URL: http://svn.apache.org/viewvc?view=rev&rev=561223 Log: Fix formatting to be all spaces instead of a mix of spaces and tabs. Modified: struts/struts2/trunk/apps/portlet/src/main/webapp/WEB-INF/web.xml Modified: struts/struts2/trunk/apps/portlet/src/main/webapp/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/portlet/src/main/webapp/WEB-INF/web.xml?view=diff&rev=561223&r1=561222&r2=561223 == --- struts/struts2/trunk/apps/portlet/src/main/webapp/WEB-INF/web.xml (original) +++ struts/struts2/trunk/apps/portlet/src/main/webapp/WEB-INF/web.xml Mon Jul 30 19:58:36 2007 @@ -1,49 +1,48 @@ -http://java.sun.com/dtd/web-app_2_3.dtd";> + +http://java.sun.com/dtd/web-app_2_3.dtd";> + - - - contextConfigLocation - /WEB-INF/applicationContext*.xml - - - action2 - - org.apache.struts2.dispatcher.FilterDispatcher - - - - - action2 - /* - - + + + +contextConfigLocation +/WEB-INF/applicationContext*.xml + + + +Struts2 + org.apache.struts2.dispatcher.FilterDispatcher + + + +Struts2 +/* + + - - org.springframework.web.context.ContextLoaderListener - - - - - org.apache.struts2.portlet.context.ServletContextHolderListener - - - - - - preparator - - org.apache.struts2.portlet.context.PreparatorServlet - - - - dwr - uk.ltd.getahead.dwr.DWRServlet - - - - dwr - /dwr/* - + org.springframework.web.context.ContextLoaderListener + + + + org.apache.struts2.portlet.context.ServletContextHolderListener + + + +preparator + org.apache.struts2.portlet.context.PreparatorServlet + + + +dwr +uk.ltd.getahead.dwr.DWRServlet + + + +dwr +/dwr/* +
