You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tiles.apache.org by ap...@apache.org on 2008/04/11 20:02:34 UTC
svn commit: r647249 - in /tiles/framework/branches/TILES_2_0_X:
tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/RenderTagSupport.java
tiles-test/src/test/selenium/ConfiguredDefinitionExceptionTest.html
Author: apetrelli
Date: Fri Apr 11 11:02:32 2008
New Revision: 647249
URL: http://svn.apache.org/viewvc?rev=647249&view=rev
Log:
TILES-238
Merge from trunk to TILES_2_0_X
Modified:
tiles/framework/branches/TILES_2_0_X/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/RenderTagSupport.java
tiles/framework/branches/TILES_2_0_X/tiles-test/src/test/selenium/ConfiguredDefinitionExceptionTest.html
Modified: tiles/framework/branches/TILES_2_0_X/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/RenderTagSupport.java
URL: http://svn.apache.org/viewvc/tiles/framework/branches/TILES_2_0_X/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/RenderTagSupport.java?rev=647249&r1=647248&r2=647249&view=diff
==============================================================================
--- tiles/framework/branches/TILES_2_0_X/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/RenderTagSupport.java (original)
+++ tiles/framework/branches/TILES_2_0_X/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/RenderTagSupport.java Fri Apr 11 11:02:32 2008
@@ -20,14 +20,11 @@
*/
package org.apache.tiles.jsp.taglib;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.tiles.Attribute;
import org.apache.tiles.TilesException;
import org.apache.tiles.Attribute.AttributeType;
import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.TryCatchFinally;
import java.io.IOException;
/**
@@ -47,12 +44,7 @@
* @version $Rev$ $Date$
*/
public abstract class RenderTagSupport extends ContainerTagSupport
- implements TryCatchFinally, PutAttributeTagParent {
-
- /**
- * The logging object.
- */
- private static final Log LOG = LogFactory.getLog(RenderTagSupport.class);
+ implements PutAttributeTagParent {
/**
* The view preparer to use before the rendering.
@@ -145,15 +137,6 @@
public int doStartTag() throws JspException {
super.doStartTag();
return isAccessAllowed() ? EVAL_BODY_BUFFERED : SKIP_BODY;
- }
-
- /** {@inheritDoc} */
- public void doCatch(Throwable throwable) throws Throwable {
- LOG.error("Error during rendering", throwable);
- }
-
- /** {@inheritDoc} */
- public void doFinally() {
}
/**
Modified: tiles/framework/branches/TILES_2_0_X/tiles-test/src/test/selenium/ConfiguredDefinitionExceptionTest.html
URL: http://svn.apache.org/viewvc/tiles/framework/branches/TILES_2_0_X/tiles-test/src/test/selenium/ConfiguredDefinitionExceptionTest.html?rev=647249&r1=647248&r2=647249&view=diff
==============================================================================
--- tiles/framework/branches/TILES_2_0_X/tiles-test/src/test/selenium/ConfiguredDefinitionExceptionTest.html (original)
+++ tiles/framework/branches/TILES_2_0_X/tiles-test/src/test/selenium/ConfiguredDefinitionExceptionTest.html Fri Apr 11 11:02:32 2008
@@ -41,12 +41,7 @@
<td></td>
</tr>
<tr>
- <td>assertTextPresent</td>
- <td>This is the title.</td>
- <td></td>
-</tr>
-<tr>
- <td>assertTextPresent</td>
+ <td>assertTextNotPresent</td>
<td>This is a body</td>
<td></td>
</tr>