svn commit: r521644 - in /struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2: actions/TilesAction.java commands/TilesPreProcessor.java preparer/ActionPreparer.java preparer/UrlPreparer
Author: apetrelli
Date: Fri Mar 23 02:32:53 2007
New Revision: 521644
URL: http://svn.apache.org/viewvc?view=rev&rev=521644
Log:
STR-3017
Tiles 2 integration module aligned to code refactoring of Tiles 2.
Modified:
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/actions/TilesAction.java
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/commands/TilesPreProcessor.java
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/preparer/ActionPreparer.java
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/preparer/UrlPreparer.java
Modified:
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/actions/TilesAction.java
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/actions/TilesAction.java?view=diff&rev=521644&r1=521643&r2=521644
==
---
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/actions/TilesAction.java
(original)
+++
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/actions/TilesAction.java
Fri Mar 23 02:32:53 2007
@@ -29,7 +29,7 @@
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
-import org.apache.tiles.ComponentContext;
+import org.apache.tiles.AttributeContext;
import org.apache.tiles.access.TilesAccess;
/**
@@ -38,7 +38,7 @@
* called when action is invoked. The difference is, that the execute() method
takes
* an additional parameter : tile context.
* This class extends Struts Action. Subclasses should override
- * execute(ComponentContext ...) method instead of Struts
+ * execute(AttributeContext ...) method instead of Struts
* execute(ActionMapping ...) method.
* @version $Rev$ $Date$
*/
@@ -66,8 +66,8 @@
throws Exception {
// Try to retrieve tile context
-ComponentContext context =
TilesAccess.getContainer(request.getSession()
- .getServletContext()).getComponentContext(request,
response);
+AttributeContext context =
TilesAccess.getContainer(request.getSession()
+ .getServletContext()).getAttributeContext(request,
response);
if (context == null) {
throw new ServletException(
"Can't find Tile context for '"
@@ -96,7 +96,7 @@
* @since Struts 1.1
*/
public ActionForward execute(
-ComponentContext context,
+AttributeContext context,
ActionMapping mapping,
ActionForm form,
HttpServletRequest request,
Modified:
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/commands/TilesPreProcessor.java
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/commands/TilesPreProcessor.java?view=diff&rev=521644&r1=521643&r2=521644
==
---
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/commands/TilesPreProcessor.java
(original)
+++
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/commands/TilesPreProcessor.java
Fri Mar 23 02:32:53 2007
@@ -70,7 +70,7 @@
* to a RequestDispatcher.
*
* Note that if the command finds a previously existing
- * ComponentContext in the request, then it
+ * AttributeContext in the request, then it
* infers that it has been called from within another tile,
* so instead of changing the ForwardConfig in the chain
* Context, the command uses RequestDispatcher
Modified:
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/preparer/ActionPreparer.java
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/preparer/ActionPreparer.java?view=diff&rev=521644&r1=521643&r2=521644
==
---
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/preparer/ActionPreparer.java
(original)
+++
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/preparer/ActionPreparer.java
Fri Mar 23 02:32:53 2007
@@ -22,7 +22,7 @@
package org.apache.struts.tiles2.preparer;
import org.apache.struts.action.Action;
-import org.apache.tiles.ComponentContext;
+import org.apache.tiles.AttributeContext;
import org.apache.tiles.TilesException;
import org.apache.tiles.context.TilesRequestContext;
import org.apache.tiles.context.servlet.ServletTilesRequestContext;
@@ -49,7 +49,7 @@
}
public void execute(TilesRequestContext tilesContext,
-ComponentContext componentContext) throws Exception {
+AttributeContext attributeContext) throws Exception {
if (tilesContext instanceof ServletTilesRequestContext) {
ServletTilesRequestContext servlet
Issues Closed: week of 2007-03-23
Struts2 - Friday, March 23, 2007 21 closed in last 7 days [WW-1526] Error with handling static resources under WebSphere 6 Ted Husted - Bug - [2.0.7, 2.1.0] http://issues.apache.org/struts/browse/WW-1526 [WW-1827] QA - CheckboxInterceptorTest Unassigned - Improvement - [2.0.7] http://issues.apache.org/struts/browse/WW-1827 [WW-1765] struts.xml include dependant packages not loading properly Unassigned - Bug - [] http://issues.apache.org/struts/browse/WW-1765 [WW-1826] Invalid parent package causes NPE Don Brown - Bug - [2.0.7] http://issues.apache.org/struts/browse/WW-1826 [WW-1799] StringLength validator is inconsistent client side and server side Ted Husted - Bug - [2.0.7, 2.1.0] http://issues.apache.org/struts/browse/WW-1799 [WW-1771] Update DateTimePicker tag documentation Musachy Barroso - Bug - [2.0.7] http://issues.apache.org/struts/browse/WW-1771 [WW-1801] Remove Spring dependency from MailReader Ted Husted - Improvement - [2.0.7] http://issues.apache.org/struts/browse/WW-1801 [WW-1795] Why does IE do that Ted Husted - Improvement - [2.0.7] http://issues.apache.org/struts/browse/WW-1795 [WW-1710] Ajaxed form tag throws js exception Musachy Barroso - Bug - [2.0.7] http://issues.apache.org/struts/browse/WW-1710 [WW-1772] Select tag breaks when multiple=true Unassigned - Bug - [2.0.7, 2.1.0] http://issues.apache.org/struts/browse/WW-1772 [WW-1757] freemarker.core.InvalidReferenceException: s.datetimepicker not found. Musachy Barroso - Bug - [2.1.0] http://issues.apache.org/struts/browse/WW-1757 [WW-1823] rename getAutocompleterModel to getAutocompleter in StrutsModels Musachy Barroso - Bug - [2.0.7] http://issues.apache.org/struts/browse/WW-1823 [WW-1179] allow WW:A to puslish data to ww:div Unassigned - New Feature - [2.0.6] http://issues.apache.org/struts/browse/WW-1179 [WW-1767] Struts 2.0.7 omnibus ticket Ted Husted - Task - [2.0.7] http://issues.apache.org/struts/browse/WW-1767 [WW-1820] Struts2 Webapps won't deploy due to filter start error (Tomcat 5.0.28) Rene Gielen - Bug - [2.0.7] http://issues.apache.org/struts/browse/WW-1820 [WW-1824] Showcase - cosmetic issue at freemarker menu Unassigned - Bug - [2.0.7] http://issues.apache.org/struts/browse/WW-1824 [WW-1806] Add page or FAQ explaining DevMode Philip Luppens - Improvement - [2.0.7] http://issues.apache.org/struts/browse/WW-1806 [WW-1828] Login Action validation config file named "Logon-validation.xml" so doesn't validate. Unassigned - Bug - [2.0.7, 2.1.0] http://issues.apache.org/struts/browse/WW-1828 [WW-1825] Anchor tag inserts newline at end of tag Ted Husted - Bug - [2.0.7, 2.1.0] http://issues.apache.org/struts/browse/WW-1825 [WW-1814] Default TypeConverters always created with default ObjectFactory Ted Husted - Bug - [2.0.7, 2.1.0] http://issues.apache.org/struts/browse/WW-1814 [WW-1803] ScopeIntercaptor null references on session serialization Unassigned - Bug - [2.0.7, 2.1.0] http://issues.apache.org/struts/browse/WW-1803
svn commit: r521828 - /struts/struts2/trunk/core/src/main/resources/META-INF/struts-tags.tld
Author: jmitchell Date: Fri Mar 23 10:54:18 2007 New Revision: 521828 URL: http://svn.apache.org/viewvc?view=rev&rev=521828 Log: WW-1834 -- Remove old struts-tags-tld. It is currently being generated during the Maven build Removed: struts/struts2/trunk/core/src/main/resources/META-INF/struts-tags.tld
svn commit: r521984 - in /struts/struts1/trunk: core/src/main/java/org/apache/struts/action/ core/src/main/java/org/apache/struts/chain/commands/servlet/ core/src/test/java/org/apache/struts/action/ f
Author: bayard
Date: Fri Mar 23 23:30:50 2007
New Revision: 521984
URL: http://svn.apache.org/viewvc?view=rev&rev=521984
Log:
Merging -r505116:519563
https://svn.apache.org/repos/asf/struts/struts1/branches/STRUTS_1_3_BRANCH/
into trunk as per STR-3018
Added:
struts/struts1/trunk/src/site/xdoc/userGuide/release-notes-1_3_6.xml
- copied unchanged from r519563,
struts/struts1/branches/STRUTS_1_3_BRANCH/src/site/xdoc/userGuide/release-notes-1_3_6.xml
struts/struts1/trunk/src/site/xdoc/userGuide/release-notes-1_3_7.xml
- copied unchanged from r519563,
struts/struts1/branches/STRUTS_1_3_BRANCH/src/site/xdoc/userGuide/release-notes-1_3_7.xml
Modified:
struts/struts1/trunk/core/src/main/java/org/apache/struts/action/ActionRedirect.java
struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/servlet/CreateAction.java
struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/servlet/SelectAction.java
struts/struts1/trunk/core/src/test/java/org/apache/struts/action/TestActionRedirect.java
struts/struts1/trunk/faces/pom.xml
struts/struts1/trunk/faces/src/main/resources/META-INF/tld/struts-faces.tld
struts/struts1/trunk/src/site/xdoc/userGuide/index.xml
struts/struts1/trunk/src/site/xdoc/userGuide/release-notes.xml
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/html/LinkTag.java
Modified:
struts/struts1/trunk/core/src/main/java/org/apache/struts/action/ActionRedirect.java
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/core/src/main/java/org/apache/struts/action/ActionRedirect.java?view=diff&rev=521984&r1=521983&r2=521984
==
---
struts/struts1/trunk/core/src/main/java/org/apache/struts/action/ActionRedirect.java
(original)
+++
struts/struts1/trunk/core/src/main/java/org/apache/struts/action/ActionRedirect.java
Fri Mar 23 23:30:50 2007
@@ -131,7 +131,7 @@
setName(baseConfig.getName());
setPath(baseConfig.getPath());
setModule(baseConfig.getModule());
-setRedirect(baseConfig.getRedirect());
+setRedirect(true);
inheritProperties(baseConfig);
initializeParameters();
}
Modified:
struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/servlet/CreateAction.java
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/servlet/CreateAction.java?view=diff&rev=521984&r1=521983&r2=521984
==
---
struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/servlet/CreateAction.java
(original)
+++
struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/servlet/CreateAction.java
Fri Mar 23 23:30:50 2007
@@ -65,8 +65,7 @@
action = (Action) actions.get(type);
if (action == null) {
-log.info("Initialize action of type: " + type);
-action = (Action) ClassUtils.getApplicationInstance(type);
+action = createAction(context, type);
actions.put(type, action);
}
}
@@ -79,5 +78,23 @@
}
return (action);
+}
+
+
+/**
+ * Invoked by getAction when the Action
+ * actually has to be created. If the instance is already created and
+ * cached, this method will not be called.
+ *
+ * @param context The Context for this request
+ * @param type Name of class to instantiate
+ * @return Instantiated Action class
+ * @throws Exception if there are any problems instantiating the Action
+ * class.
+ * @since Struts 1.3.7
+ */
+protected Action createAction(ActionContext context, String type) throws
Exception {
+log.info("Initialize action of type: " + type);
+return (Action) ClassUtils.getApplicationInstance(type);
}
}
Modified:
struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/servlet/SelectAction.java
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/servlet/SelectAction.java?view=diff&rev=521984&r1=521983&r2=521984
==
---
struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/servlet/SelectAction.java
(original)
+++
struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/servlet/SelectAction.java
Fri Mar 23 23:30:50 2007
@@ -46,20 +46,20 @@
// For prefix matching, match on the path info
path = (String) request.getAttribute(Constants.INCLUDE_PATH_INFO);
-if (path == null) {
+if ((path == null) || (path.length() == 0)) {
path = request.getPathInfo();
}
// For extension matching, match on the servlet path
[CONF] Confluence Changes in the last 24 hours
- This is a daily summary of all recent changes in Confluence. - Updated Spaces: - Apache Geronimo v1.2 (GMOxDOC12) http://cwiki.apache.org/confluence/display/GMOxDOC12 | |-Pages Added or Edited in This Space |-- Apache Roller on Geronimo (1.2 Ok) was created by ppe (05:10 PM). | http://cwiki.apache.org/confluence/display/GMOxDOC12/Apache+Roller+on+Geronimo+%281.2+Ok%29 Apache Camel (CAMEL) http://cwiki.apache.org/confluence/display/CAMEL | |-Pages Added or Edited in This Space |-- Download was last edited by chirino (06:44 PM). | http://cwiki.apache.org/confluence/display/CAMEL/Download |-- Banner was last edited by chirino (05:19 PM). | http://cwiki.apache.org/confluence/display/CAMEL/Banner Apache CXF 2.0 Documentation (CXF20DOC) http://cwiki.apache.org/confluence/display/CXF20DOC | |-Pages Added or Edited in This Space |-- Service Routing was created by jliu (02:09 AM). | http://cwiki.apache.org/confluence/display/CXF20DOC/Service+Routing |-- Index was last edited by jliu (12:45 AM). | http://cwiki.apache.org/confluence/display/CXF20DOC/Index Apache Roller (ROLLER) http://cwiki.apache.org/confluence/display/ROLLER | |-Pages Added or Edited in This Space |-- Proposal Individual Templates by Action was last edited by agilliland (04:00 PM). | http://cwiki.apache.org/confluence/display/ROLLER/Proposal+Individual+Templates+by+Action |-- Proposal Roller 4.0 Release was last edited by snoopdave (08:00 AM). | http://cwiki.apache.org/confluence/display/ROLLER/Proposal+Roller+4.0+Release |-- Testing Roller 3.1 was last edited by snoopdave (07:27 AM). | http://cwiki.apache.org/confluence/display/ROLLER/Testing+Roller+3.1 | |-New Comments in This Space |-- http://cwiki.apache.org/confluence/display/ROLLER/Proposal+Individual+Templates+by+Action (1) Apache ActiveMQ (ACTIVEMQ) http://cwiki.apache.org/confluence/display/ACTIVEMQ | |-Pages Added or Edited in This Space |-- ActiveMQ 4.1.1 Release was last edited by chirino (08:19 PM). | http://cwiki.apache.org/confluence/display/ACTIVEMQ/ActiveMQ+4.1.1+Release |-- Navigation was last edited by jstrachan (04:28 AM). | http://cwiki.apache.org/confluence/display/ACTIVEMQ/Navigation Apache Geronimo v1.1 (GMOxDOC11) http://cwiki.apache.org/confluence/display/GMOxDOC11 | |-Pages Added or Edited in This Space |-- geronimo-application.xml was last edited by [EMAIL PROTECTED] (01:09 AM). | http://cwiki.apache.org/confluence/display/GMOxDOC11/geronimo-application.xml |-- geronimo-web.xml - español was last edited by [EMAIL PROTECTED] (12:12 AM). | http://cwiki.apache.org/confluence/pages/viewpage.action?pageId=49761 Apache ServiceMix (SM) http://cwiki.apache.org/confluence/display/SM | |-Pages Added or Edited in This Space |-- Home was last edited by gnodet (04:54 AM). | http://cwiki.apache.org/confluence/display/SM/Home |-- Remote-debugging ServiceMix in Eclipse was created by prossma (04:49 AM). | http://cwiki.apache.org/confluence/display/SM/Remote-debugging+ServiceMix+in+Eclipse Apache Struts 2 Documentation (WW) http://cwiki.apache.org/confluence/display/WW | |-Pages Added or Edited in This Space |-- OGNL was last edited by husted (05:31 PM). | http://cwiki.apache.org/confluence/display/WW/OGNL |-- Writing Interceptors was last edited by husted (11:56 AM). | http://cwiki.apache.org/confluence/display/WW/Writing+Interceptors |-- Obtaining an IDEA license was last edited by husted (08:26 AM). | http://cwiki.apache.org/confluence/display/WW/Obtaining+an+IDEA+license | |-New Comments in This Space |-- http://cwiki.apache.org/confluence/display/WW/CRUD+Demo+I (1) Apache Ode (ODExSITE) http://cwiki.apache.org/confluence/display/ODExSITE | |-Pages Added or Edited in This Space |-- Logo was created by mriou (08:23 AM). | http://cwiki.apache.org/confluence/display/ODExSITE/Logo |-- Index was last edited by mriou (08:25 AM). | http://cwiki.apache.org/confluence/display/ODExSITE/Index Apache Wicket (WICKET) http://cwiki.apache.org/confluence/display/WICKET | |-Pages Added or Edited in This Space |-- FAQs was last edited by dashorst (07:06 AM). | http://cwiki.apache.org/confluence/display/WICKET/FAQs |-- Wicket 1.3.0 incubating checkpoint 1 was last edited by frankbille (01:46 AM). | http://cwiki.apache.org/confluence/display/WICKET/Wicket+1.3.0+incubating+checkpoint+1 Apache Geronimo Samples (GMOxSAMPLES) http://cwiki.apache.org/confluence/display/GMOxSAMPLES | |-Pages Added or Edited in This Space |-- Apache Roller on Geronimo (1.2 Ok) was created by ppe (04:14 PM). | http://cwiki.apache.org/confluence/display/GMOxSAMPLES/Apache+Roller+on+Geronimo+%281.2+Ok%29 - CONFLUENCE INFORMATION This messag
