Author: apetrelli
Date: Fri Feb 23 06:35:50 2007
New Revision: 510958
URL: http://svn.apache.org/viewvc?view=rev&rev=510958
Log:
Updated to follow the changes in Tiles API. See TILES-114.
Modified:
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/TilesRequestProcessor.java
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/actions/DefinitionDispatcherAction.java
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/commands/TilesPreProcessor.java
Modified:
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/TilesRequestProcessor.java
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/TilesRequestProcessor.java?view=diff&rev=510958&r1=510957&r2=510958
==============================================================================
---
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/TilesRequestProcessor.java
(original)
+++
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/TilesRequestProcessor.java
Fri Feb 23 06:35:50 2007
@@ -106,10 +106,10 @@
boolean retValue = false;
- if (container.isValidDefinition(request, response, definitionName)) {
+ if (container.isValidDefinition(definitionName, request, response)) {
retValue = response.isCommitted();
try {
- container.render(request, response, definitionName);
+ container.render(definitionName, request, response);
} catch (TilesException e) {
throw new ServletException("Cannot render definition '"
+ definitionName + "'");
Modified:
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/actions/DefinitionDispatcherAction.java
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/actions/DefinitionDispatcherAction.java?view=diff&rev=510958&r1=510957&r2=510958
==============================================================================
---
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/actions/DefinitionDispatcherAction.java
(original)
+++
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/actions/DefinitionDispatcherAction.java
Fri Feb 23 06:35:50 2007
@@ -109,9 +109,9 @@
// Read definition from factory, but we can create it here.
TilesContainer container = TilesAccess.getContainer(request
.getSession().getServletContext());
- if (container != null && container.isValidDefinition(request, response,
- name)) {
- container.render(request, response, name);
+ if (container != null
+ && container.isValidDefinition(name, request, response)) {
+ container.render(name, request, response);
} else {
log.error("Can't get definition '" + name + "'.");
return mapping.findForward("error");
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=510958&r1=510957&r2=510958
==============================================================================
---
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 Feb 23 06:35:50 2007
@@ -102,10 +102,10 @@
return false;
}
- if (container.isValidDefinition(sacontext.getRequest(),
- sacontext.getResponse(), forwardConfig.getPath())) {
- container.render(sacontext.getRequest(),
sacontext.getResponse(),
- forwardConfig.getPath());
+ if (container.isValidDefinition(forwardConfig.getPath(),
+ sacontext.getRequest(), sacontext.getResponse())) {
+ container.render(forwardConfig.getPath(),
+ sacontext.getRequest(), sacontext.getResponse());
} else {
// ignore not found
if (log.isDebugEnabled()) {
