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/12/18 14:06:06 UTC
svn commit: r727715 - in /tiles/framework/branches/TILES_2_0_X: ./
src/site/apt/ src/site/apt/dev/ src/site/apt/migration/
src/site/apt/tutorial/ src/site/resources/images/ src/site/xdoc/dev/
src/site/xdoc/images/ tiles-api/src/main/java/org/apache/til...
Author: apetrelli
Date: Thu Dec 18 05:06:06 2008
New Revision: 727715
URL: http://svn.apache.org/viewvc?rev=727715&view=rev
Log:
TILES-339
Merged from trunk to TILES_2_0_X branch.
Applied patch posted by Zach Bailey.
Added:
tiles/framework/branches/TILES_2_0_X/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/TilesBodyTag.java
- copied unchanged from r727708, tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/TilesBodyTag.java
tiles/framework/branches/TILES_2_0_X/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/TilesTag.java
- copied unchanged from r727708, tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/TilesTag.java
Modified:
tiles/framework/branches/TILES_2_0_X/ (props changed)
tiles/framework/branches/TILES_2_0_X/src/site/apt/config-reference.apt (props changed)
tiles/framework/branches/TILES_2_0_X/src/site/apt/dev/ (props changed)
tiles/framework/branches/TILES_2_0_X/src/site/apt/getting_started.apt (props changed)
tiles/framework/branches/TILES_2_0_X/src/site/apt/migration/ (props changed)
tiles/framework/branches/TILES_2_0_X/src/site/apt/selenium.apt (props changed)
tiles/framework/branches/TILES_2_0_X/src/site/apt/tutorial/ (props changed)
tiles/framework/branches/TILES_2_0_X/src/site/resources/images/page_to_page.png (props changed)
tiles/framework/branches/TILES_2_0_X/src/site/resources/images/tiled_page.png (props changed)
tiles/framework/branches/TILES_2_0_X/src/site/xdoc/dev/building.xml (props changed)
tiles/framework/branches/TILES_2_0_X/src/site/xdoc/dev/snapshots.xml (props changed)
tiles/framework/branches/TILES_2_0_X/src/site/xdoc/images/page_to_page.svg (props changed)
tiles/framework/branches/TILES_2_0_X/src/site/xdoc/images/tiled_page.svg (props changed)
tiles/framework/branches/TILES_2_0_X/tiles-api/src/main/java/org/apache/tiles/reflect/ (props changed)
tiles/framework/branches/TILES_2_0_X/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/AddAttributeTag.java
tiles/framework/branches/TILES_2_0_X/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/AddListAttributeTag.java
tiles/framework/branches/TILES_2_0_X/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/AttributeTagSupport.java
tiles/framework/branches/TILES_2_0_X/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/ImportAttributeTag.java
tiles/framework/branches/TILES_2_0_X/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/InsertAttributeTag.java
tiles/framework/branches/TILES_2_0_X/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/InsertTemplateTag.java
tiles/framework/branches/TILES_2_0_X/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/PutAttributeTag.java
tiles/framework/branches/TILES_2_0_X/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/PutListAttributeTag.java
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-jsp/src/main/java/org/apache/tiles/jsp/taglib/RoleSecurityTagSupport.java
tiles/framework/branches/TILES_2_0_X/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/UseAttributeTag.java
tiles/framework/branches/TILES_2_0_X/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/definition/DefinitionTag.java
tiles/framework/branches/TILES_2_0_X/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/definition/DestroyContainerTag.java
tiles/framework/branches/TILES_2_0_X/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/definition/InitContainerTag.java
Propchange: tiles/framework/branches/TILES_2_0_X/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 18 05:06:06 2008
@@ -1 +1 @@
-/tiles/framework/trunk:676655,680114-680116,693549-693560,694754,700541,701807,701815,705699,708901
+/tiles/framework/trunk:676655,680114-680116,693549-693560,694754,700541,701807,701815,705699,708901,727707-727708
Propchange: tiles/framework/branches/TILES_2_0_X/src/site/apt/config-reference.apt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 18 05:06:06 2008
@@ -1 +1 @@
-/tiles/framework/trunk/src/site/apt/config-reference.apt:694754,700541,701807,701815,705699,708901
+/tiles/framework/trunk/src/site/apt/config-reference.apt:694754,700541,701807,701815,705699,708901,727707-727708
Propchange: tiles/framework/branches/TILES_2_0_X/src/site/apt/dev/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 18 05:06:06 2008
@@ -1 +1 @@
-/tiles/framework/trunk/src/site/apt/dev:694754,700541,701807,701815,705699,708901
+/tiles/framework/trunk/src/site/apt/dev:694754,700541,701807,701815,705699,708901,727707-727708
Propchange: tiles/framework/branches/TILES_2_0_X/src/site/apt/getting_started.apt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 18 05:06:06 2008
@@ -1 +1 @@
-/tiles/framework/trunk/src/site/apt/getting_started.apt:694754,700541,701807,701815,705699,708901
+/tiles/framework/trunk/src/site/apt/getting_started.apt:694754,700541,701807,701815,705699,708901,727707-727708
Propchange: tiles/framework/branches/TILES_2_0_X/src/site/apt/migration/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 18 05:06:06 2008
@@ -1 +1 @@
-/tiles/framework/trunk/src/site/apt/migration:694754,700541,701807,701815,705699,708901
+/tiles/framework/trunk/src/site/apt/migration:694754,700541,701807,701815,705699,708901,727707-727708
Propchange: tiles/framework/branches/TILES_2_0_X/src/site/apt/selenium.apt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 18 05:06:06 2008
@@ -1 +1 @@
-/tiles/framework/trunk/src/site/apt/selenium.apt:694754,700541,701807,701815,705699,708901
+/tiles/framework/trunk/src/site/apt/selenium.apt:694754,700541,701807,701815,705699,708901,727707-727708
Propchange: tiles/framework/branches/TILES_2_0_X/src/site/apt/tutorial/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 18 05:06:06 2008
@@ -1 +1 @@
-/tiles/framework/trunk/src/site/apt/tutorial:694754,700541,701807,701815,705699,708901
+/tiles/framework/trunk/src/site/apt/tutorial:694754,700541,701807,701815,705699,708901,727707-727708
Propchange: tiles/framework/branches/TILES_2_0_X/src/site/resources/images/page_to_page.png
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 18 05:06:06 2008
@@ -1 +1 @@
-/tiles/framework/trunk/src/site/resources/images/page_to_page.png:694754,700541,701807,701815,705699,708901
+/tiles/framework/trunk/src/site/resources/images/page_to_page.png:694754,700541,701807,701815,705699,708901,727707-727708
Propchange: tiles/framework/branches/TILES_2_0_X/src/site/resources/images/tiled_page.png
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 18 05:06:06 2008
@@ -1 +1 @@
-/tiles/framework/trunk/src/site/resources/images/tiled_page.png:694754,700541,701807,701815,705699,708901
+/tiles/framework/trunk/src/site/resources/images/tiled_page.png:694754,700541,701807,701815,705699,708901,727707-727708
Propchange: tiles/framework/branches/TILES_2_0_X/src/site/xdoc/dev/building.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 18 05:06:06 2008
@@ -1 +1 @@
-/tiles/framework/trunk/src/site/xdoc/dev/building.xml:694754,700541,701807,701815,705699,708901
+/tiles/framework/trunk/src/site/xdoc/dev/building.xml:694754,700541,701807,701815,705699,708901,727707-727708
Propchange: tiles/framework/branches/TILES_2_0_X/src/site/xdoc/dev/snapshots.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 18 05:06:06 2008
@@ -1 +1 @@
-/tiles/framework/trunk/src/site/xdoc/dev/snapshots.xml:694754,700541,701807,701815,705699,708901
+/tiles/framework/trunk/src/site/xdoc/dev/snapshots.xml:694754,700541,701807,701815,705699,708901,727707-727708
Propchange: tiles/framework/branches/TILES_2_0_X/src/site/xdoc/images/page_to_page.svg
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 18 05:06:06 2008
@@ -1 +1 @@
-/tiles/framework/trunk/src/site/xdoc/images/page_to_page.svg:694754,700541,701807,701815,705699,708901
+/tiles/framework/trunk/src/site/xdoc/images/page_to_page.svg:694754,700541,701807,701815,705699,708901,727707-727708
Propchange: tiles/framework/branches/TILES_2_0_X/src/site/xdoc/images/tiled_page.svg
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 18 05:06:06 2008
@@ -1 +1 @@
-/tiles/framework/trunk/src/site/xdoc/images/tiled_page.svg:694754,700541,701807,701815,705699,708901
+/tiles/framework/trunk/src/site/xdoc/images/tiled_page.svg:694754,700541,701807,701815,705699,708901,727707-727708
Propchange: tiles/framework/branches/TILES_2_0_X/tiles-api/src/main/java/org/apache/tiles/reflect/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 18 05:06:06 2008
@@ -1 +1 @@
-/tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/reflect:693549-693560,694754,700541,701807,701815,705699,708901
+/tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/reflect:693549-693560,694754,700541,701807,701815,705699,708901,727707-727708
Modified: tiles/framework/branches/TILES_2_0_X/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/AddAttributeTag.java
URL: http://svn.apache.org/viewvc/tiles/framework/branches/TILES_2_0_X/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/AddAttributeTag.java?rev=727715&r1=727714&r2=727715&view=diff
==============================================================================
--- tiles/framework/branches/TILES_2_0_X/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/AddAttributeTag.java (original)
+++ tiles/framework/branches/TILES_2_0_X/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/AddAttributeTag.java Thu Dec 18 05:06:06 2008
@@ -135,8 +135,8 @@
* Release all allocated resources.
*/
@Override
- public void release() {
- super.release();
+ protected void reset() {
+ super.reset();
value = null;
type = null;
}
Modified: tiles/framework/branches/TILES_2_0_X/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/AddListAttributeTag.java
URL: http://svn.apache.org/viewvc/tiles/framework/branches/TILES_2_0_X/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/AddListAttributeTag.java?rev=727715&r1=727714&r2=727715&view=diff
==============================================================================
--- tiles/framework/branches/TILES_2_0_X/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/AddListAttributeTag.java (original)
+++ tiles/framework/branches/TILES_2_0_X/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/AddListAttributeTag.java Thu Dec 18 05:06:06 2008
@@ -71,15 +71,6 @@
}
/**
- * Release the state of this put list by
- * clearing the contents of the list.
- */
- public void release() {
- super.setValue(null);
- super.release();
- }
-
- /**
* Process nested ≶addAttribute> tag.
* <p/>
* Places the value of the nested tag within the
Modified: tiles/framework/branches/TILES_2_0_X/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/AttributeTagSupport.java
URL: http://svn.apache.org/viewvc/tiles/framework/branches/TILES_2_0_X/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/AttributeTagSupport.java?rev=727715&r1=727714&r2=727715&view=diff
==============================================================================
--- tiles/framework/branches/TILES_2_0_X/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/AttributeTagSupport.java (original)
+++ tiles/framework/branches/TILES_2_0_X/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/AttributeTagSupport.java Thu Dec 18 05:06:06 2008
@@ -27,7 +27,6 @@
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.PageContext;
-import javax.servlet.jsp.tagext.TagSupport;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
@@ -37,7 +36,7 @@
*
* @version $Rev$ $Date$
*/
-public abstract class AttributeTagSupport extends TagSupport {
+public abstract class AttributeTagSupport extends TilesTag {
/**
@@ -110,9 +109,14 @@
}
/** {@inheritDoc} */
- public void release() {
+ @Override
+ protected void reset() {
+ super.reset();
scopeName = null;
scope = PageContext.PAGE_SCOPE;
+ ignore = false;
+ attribute = null;
+ attributeContext = null;
}
/** {@inheritDoc} */
Modified: tiles/framework/branches/TILES_2_0_X/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/ImportAttributeTag.java
URL: http://svn.apache.org/viewvc/tiles/framework/branches/TILES_2_0_X/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/ImportAttributeTag.java?rev=727715&r1=727714&r2=727715&view=diff
==============================================================================
--- tiles/framework/branches/TILES_2_0_X/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/ImportAttributeTag.java (original)
+++ tiles/framework/branches/TILES_2_0_X/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/ImportAttributeTag.java Thu Dec 18 05:06:06 2008
@@ -65,6 +65,13 @@
this.toName = toName;
}
+ /** {@inheritDoc} */
+ @Override
+ protected void reset() {
+ super.reset();
+ this.toName = null;
+ }
+
/**
* Expose the requested property from attribute context.
*
Modified: tiles/framework/branches/TILES_2_0_X/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/InsertAttributeTag.java
URL: http://svn.apache.org/viewvc/tiles/framework/branches/TILES_2_0_X/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/InsertAttributeTag.java?rev=727715&r1=727714&r2=727715&view=diff
==============================================================================
--- tiles/framework/branches/TILES_2_0_X/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/InsertAttributeTag.java (original)
+++ tiles/framework/branches/TILES_2_0_X/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/InsertAttributeTag.java Thu Dec 18 05:06:06 2008
@@ -91,8 +91,9 @@
}
/** {@inheritDoc} */
- public void release() {
- super.release();
+ @Override
+ protected void reset() {
+ super.reset();
this.name = null;
this.value = null;
}
Modified: tiles/framework/branches/TILES_2_0_X/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/InsertTemplateTag.java
URL: http://svn.apache.org/viewvc/tiles/framework/branches/TILES_2_0_X/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/InsertTemplateTag.java?rev=727715&r1=727714&r2=727715&view=diff
==============================================================================
--- tiles/framework/branches/TILES_2_0_X/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/InsertTemplateTag.java (original)
+++ tiles/framework/branches/TILES_2_0_X/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/InsertTemplateTag.java Thu Dec 18 05:06:06 2008
@@ -63,6 +63,13 @@
}
/** {@inheritDoc} */
+ @Override
+ protected void reset() {
+ super.reset();
+ this.template = null;
+ }
+
+ /** {@inheritDoc} */
protected void render() throws JspException {
// FIXME This code should be changed once the overriding template
// facility will be available, so it can be managed by the Tiles
Modified: tiles/framework/branches/TILES_2_0_X/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/PutAttributeTag.java
URL: http://svn.apache.org/viewvc/tiles/framework/branches/TILES_2_0_X/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/PutAttributeTag.java?rev=727715&r1=727714&r2=727715&view=diff
==============================================================================
--- tiles/framework/branches/TILES_2_0_X/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/PutAttributeTag.java (original)
+++ tiles/framework/branches/TILES_2_0_X/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/PutAttributeTag.java Thu Dec 18 05:06:06 2008
@@ -170,11 +170,10 @@
this.type = type;
}
- /**
- * Release all allocated resources.
- */
- public void release() {
- super.release();
+ /** {@inheritDoc} */
+ @Override
+ protected void reset() {
+ super.reset();
name = null;
value = null;
type = null;
Modified: tiles/framework/branches/TILES_2_0_X/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/PutListAttributeTag.java
URL: http://svn.apache.org/viewvc/tiles/framework/branches/TILES_2_0_X/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/PutListAttributeTag.java?rev=727715&r1=727714&r2=727715&view=diff
==============================================================================
--- tiles/framework/branches/TILES_2_0_X/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/PutListAttributeTag.java (original)
+++ tiles/framework/branches/TILES_2_0_X/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/PutListAttributeTag.java Thu Dec 18 05:06:06 2008
@@ -71,13 +71,10 @@
return (SKIP_BODY);
}
- /**
- * Release the state of this put list by
- * clearing the contents of the list.
- */
- public void release() {
- super.setValue(null);
- super.release();
+ /** {@inheritDoc} */
+ @Override
+ protected void reset() {
+ super.reset();
}
/**
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=727715&r1=727714&r2=727715&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 Thu Dec 18 05:06:06 2008
@@ -126,11 +126,14 @@
/** {@inheritDoc} */
- public void release() {
+ @Override
+ protected void reset() {
+ super.reset();
preparer = null;
flush = false;
ignore = false;
- super.release();
+ container = null;
+ attributeContext = null;
}
/** {@inheritDoc} */
Modified: tiles/framework/branches/TILES_2_0_X/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/RoleSecurityTagSupport.java
URL: http://svn.apache.org/viewvc/tiles/framework/branches/TILES_2_0_X/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/RoleSecurityTagSupport.java?rev=727715&r1=727714&r2=727715&view=diff
==============================================================================
--- tiles/framework/branches/TILES_2_0_X/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/RoleSecurityTagSupport.java (original)
+++ tiles/framework/branches/TILES_2_0_X/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/RoleSecurityTagSupport.java Thu Dec 18 05:06:06 2008
@@ -26,7 +26,6 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.BodyTagSupport;
import java.io.IOException;
/**
@@ -35,7 +34,7 @@
* @since Tiles 2.0
* @version $Rev$ $Date$
*/
-public abstract class RoleSecurityTagSupport extends BodyTagSupport {
+public abstract class RoleSecurityTagSupport extends TilesBodyTag {
/**
* The log instance for this tag.
@@ -69,6 +68,13 @@
}
/** {@inheritDoc} */
+ @Override
+ protected void reset() {
+ super.reset();
+ this.role = null;
+ }
+
+ /** {@inheritDoc} */
public int doEndTag() throws JspException {
try {
if (isAccessAllowed()) {
@@ -87,14 +93,6 @@
return EVAL_PAGE;
}
-
-
- /** {@inheritDoc} */
- public void release() {
- super.release();
- this.role = null;
- }
-
/**
* Executes the tag. It is called inside {@link #doEndTag()}.
*
Modified: tiles/framework/branches/TILES_2_0_X/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/UseAttributeTag.java
URL: http://svn.apache.org/viewvc/tiles/framework/branches/TILES_2_0_X/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/UseAttributeTag.java?rev=727715&r1=727714&r2=727715&view=diff
==============================================================================
--- tiles/framework/branches/TILES_2_0_X/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/UseAttributeTag.java (original)
+++ tiles/framework/branches/TILES_2_0_X/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/UseAttributeTag.java Thu Dec 18 05:06:06 2008
@@ -42,15 +42,6 @@
private String classname = null;
/**
- * Release all allocated resources.
- */
- public void release() {
- super.release();
- classname = null;
- id = null;
- }
-
- /**
* Get class name.
*
* @return class name
@@ -69,6 +60,12 @@
this.classname = name;
}
+ /** {@inheritDoc} */
+ protected void reset() {
+ super.reset();
+ classname = null;
+ id = null;
+ }
/**
* Expose the requested attribute from attribute context.
Modified: tiles/framework/branches/TILES_2_0_X/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/definition/DefinitionTag.java
URL: http://svn.apache.org/viewvc/tiles/framework/branches/TILES_2_0_X/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/definition/DefinitionTag.java?rev=727715&r1=727714&r2=727715&view=diff
==============================================================================
--- tiles/framework/branches/TILES_2_0_X/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/definition/DefinitionTag.java (original)
+++ tiles/framework/branches/TILES_2_0_X/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/definition/DefinitionTag.java Thu Dec 18 05:06:06 2008
@@ -26,12 +26,12 @@
import org.apache.tiles.TilesException;
import org.apache.tiles.jsp.taglib.PutAttributeTag;
import org.apache.tiles.jsp.taglib.PutAttributeTagParent;
+import org.apache.tiles.jsp.taglib.TilesTag;
import org.apache.tiles.mgmt.MutableTilesContainer;
import org.apache.tiles.Attribute.AttributeType;
import org.apache.tiles.access.TilesAccess;
import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.TagSupport;
import java.util.Map;
import java.util.HashMap;
@@ -42,7 +42,7 @@
*
* @version $Rev$ $Date$
*/
-public class DefinitionTag extends TagSupport
+public class DefinitionTag extends TilesTag
implements PutAttributeTagParent {
@@ -174,8 +174,9 @@
}
/** {@inheritDoc} */
- public void release() {
- super.release();
+ @Override
+ protected void reset() {
+ super.reset();
name = null;
template = null;
extend = null;
Modified: tiles/framework/branches/TILES_2_0_X/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/definition/DestroyContainerTag.java
URL: http://svn.apache.org/viewvc/tiles/framework/branches/TILES_2_0_X/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/definition/DestroyContainerTag.java?rev=727715&r1=727714&r2=727715&view=diff
==============================================================================
--- tiles/framework/branches/TILES_2_0_X/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/definition/DestroyContainerTag.java (original)
+++ tiles/framework/branches/TILES_2_0_X/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/definition/DestroyContainerTag.java Thu Dec 18 05:06:06 2008
@@ -22,16 +22,16 @@
import org.apache.tiles.TilesException;
import org.apache.tiles.access.TilesAccess;
+import org.apache.tiles.jsp.taglib.TilesTag;
import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.TagSupport;
/**
* Destroys the accessible container.
*
* @version $Rev$ $Date$
*/
-public class DestroyContainerTag extends TagSupport {
+public class DestroyContainerTag extends TilesTag {
/** {@inheritDoc} */
@Override
Modified: tiles/framework/branches/TILES_2_0_X/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/definition/InitContainerTag.java
URL: http://svn.apache.org/viewvc/tiles/framework/branches/TILES_2_0_X/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/definition/InitContainerTag.java?rev=727715&r1=727714&r2=727715&view=diff
==============================================================================
--- tiles/framework/branches/TILES_2_0_X/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/definition/InitContainerTag.java (original)
+++ tiles/framework/branches/TILES_2_0_X/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/definition/InitContainerTag.java Thu Dec 18 05:06:06 2008
@@ -30,6 +30,7 @@
import org.apache.tiles.factory.TilesContainerFactory;
import org.apache.tiles.jsp.taglib.PutAttributeTag;
import org.apache.tiles.jsp.taglib.PutAttributeTagParent;
+import org.apache.tiles.jsp.taglib.TilesBodyTag;
import org.apache.tiles.mgmt.MutableTilesContainer;
import javax.servlet.RequestDispatcher;
@@ -37,7 +38,6 @@
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.BodyTagSupport;
import java.io.InputStream;
import java.net.MalformedURLException;
import java.net.URL;
@@ -53,7 +53,7 @@
*
* @version $Rev$ $Date$
*/
-public class InitContainerTag extends BodyTagSupport
+public class InitContainerTag extends TilesBodyTag
implements PutAttributeTagParent {
/**
@@ -98,8 +98,9 @@
}
/** {@inheritDoc} */
- public void release() {
- super.release();
+ @Override
+ protected void reset() {
+ super.reset();
containerFactory = null;
initParameters = null;
}