dgraham 2002/10/25 16:54:53
Modified: src/share/org/apache/struts/taglib/template InsertTag.java
PutTag.java package.html GetTag.java
src/share/org/apache/struts/taglib/template/util
ContentMapStack.java Content.java ContentMap.java
Log:
deprecated template taglib in favor of Tiles.
Revision Changes Path
1.13 +13 -4
jakarta-struts/src/share/org/apache/struts/taglib/template/InsertTag.java
Index: InsertTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/template/InsertTag.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- InsertTag.java 14 Oct 2002 18:16:18 -0000 1.12
+++ InsertTag.java 25 Oct 2002 23:54:53 -0000 1.13
@@ -79,6 +79,7 @@
*
* @author David Geary
* @version $Revision$ $Date$
+ * @deprecated Use Tiles instead.
*/
public class InsertTag extends TagSupport {
@@ -103,6 +104,7 @@
/**
* Set the template attribute.
+ * @deprecated Use Tiles instead.
*/
public void setTemplate(String template) {
@@ -112,6 +114,7 @@
/**
* Get the template attribute.
+ * @deprecated Use Tiles instead.
*/
public String getTemplate() {
@@ -121,6 +124,7 @@
/**
* Get the map attribute.
+ * @deprecated Use Tiles instead.
*/
public ContentMap getContentMap() {
@@ -132,6 +136,7 @@
* Process the start tag by pushing this tag's map onto the
* content map stack.
* See org.apache.struts.taglib.template.util.ContentMapStack.
+ * @deprecated Use Tiles instead.
*/
public int doStartTag() throws JspException {
@@ -143,6 +148,7 @@
/**
* Process the end tag by including the template.
+ * @deprecated Use Tiles instead.
*/
public int doEndTag() throws JspException {
@@ -169,6 +175,7 @@
/**
* This method is a convenience for <template:put> tags for
* putting content into the map.
+ * @deprecated Use Tiles instead.
*/
public void put(String name, Content content) {
@@ -180,6 +187,7 @@
/**
* Reset member values for reuse. This method calls super.release(),
* which invokes TagSupport.release(), which typically does nothing.
+ * @deprecated Use Tiles instead.
*/
public void release() {
@@ -195,6 +203,7 @@
* one present.
*
* @param exception Exception to be conditionally saved
+ * @deprecated Use Tiles instead.
*/
private void saveException(Throwable exception) {
1.10 +18 -4
jakarta-struts/src/share/org/apache/struts/taglib/template/PutTag.java
Index: PutTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/template/PutTag.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- PutTag.java 29 Apr 2001 05:34:49 -0000 1.9
+++ PutTag.java 25 Oct 2002 23:54:53 -0000 1.10
@@ -75,6 +75,7 @@
*
* @author David Geary
* @version $Revision$ $Date$
+ * @deprecated Use Tiles instead.
*/
public class PutTag extends BodyTagSupport {
@@ -108,6 +109,7 @@
/**
* Set the content name.
+ * @deprecated Use Tiles instead.
*/
public void setName(String name) {
@@ -118,6 +120,7 @@
/**
*
* @param name The role the user must be in to store content.
+ * @deprecated Use Tiles instead.
*/
public void setRole(String role) {
@@ -128,6 +131,7 @@
/**
* Set the content's URI (if it's to be included) or text (if it's to
* be printed).
+ * @deprecated Use Tiles instead.
*/
public void setContent(String content) {
@@ -139,6 +143,7 @@
/**
* Set direct to true, and content will be printed directly, instead
* of included (direct == false).
+ * @deprecated Use Tiles instead.
*/
public void setDirect(String direct) {
@@ -148,6 +153,7 @@
/**
* Get the name attribute.
+ * @deprecated Use Tiles instead.
*/
public String getName() {
@@ -157,6 +163,7 @@
/**
* Get the role attribute.
+ * @deprecated Use Tiles instead.
*/
public String getRole() {
@@ -166,6 +173,7 @@
/**
* Get the content attribute.
+ * @deprecated Use Tiles instead.
*/
public String getContent() {
@@ -175,6 +183,7 @@
/**
* Returns the direct attribute associated with this tag.
+ * @deprecated Use Tiles instead.
*/
public String getDirect() {
if(hasBody()) return "true";
@@ -187,6 +196,7 @@
*
* @exception JspException if this tag is not enclosed by
* <template:insert>.
+ * @deprecated Use Tiles instead.
*/
public int doEndTag() throws JspException {
@@ -212,6 +222,7 @@
/**
* Reset member values for reuse. This method calls super.release(),
* which invokes TagSupport.release(), which typically does nothing.
+ * @deprecated Use Tiles instead.
*/
public void release() {
@@ -223,6 +234,7 @@
/**
* Returns the content associated with this tag.
+ * @deprecated Use Tiles instead.
*/
private String getActualContent() throws JspException {
@@ -248,6 +260,7 @@
/**
* Returns a boolean indicating whether this tag has a body.
+ * @deprecated Use Tiles instead.
*/
private boolean hasBody() {
if (bodyContent == null)
@@ -260,6 +273,7 @@
* Convenience method for locating ancestor tags by class name.
*
* @param className The name of the ancestor class.
+ * @deprecated Use Tiles instead.
*/
private TagSupport getAncestor(String className)
throws JspException {
1.3 +4 -0
jakarta-struts/src/share/org/apache/struts/taglib/template/package.html
Index: package.html
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/template/package.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- package.html 29 Mar 2002 23:30:49 -0000 1.2
+++ package.html 25 Oct 2002 23:54:53 -0000 1.3
@@ -5,6 +5,10 @@
</head>
<body bgcolor="white">
+ <p>
+ <b>Note:</b> As of Struts 1.1 the template tag library is
+ deprecated in favor of Tiles.
+ </p>
<p> The "struts-template" tag library contains tags that are useful in
creating dynamic JSP templates for pages which share a common format.
These templates are best used when it is likely that a layout shared
1.13 +14 -4
jakarta-struts/src/share/org/apache/struts/taglib/template/GetTag.java
Index: GetTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/template/GetTag.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- GetTag.java 12 Mar 2002 05:55:08 -0000 1.12
+++ GetTag.java 25 Oct 2002 23:54:53 -0000 1.13
@@ -78,6 +78,7 @@
*
* @author David Geary
* @version $Revision$ $Date$
+ * @deprecated Use Tiles instead.
*/
public class GetTag extends TagSupport {
@@ -103,6 +104,7 @@
/**
* Set the flush-before-include property
* @param flush The new flush property
+ * @deprecated Use Tiles instead.
*/
public void setFlush(boolean flush) {
@@ -113,6 +115,7 @@
/**
* Set the name attribute
* @param name The name of the content to get.
+ * @deprecated Use Tiles instead.
*/
public void setName(String name) {
@@ -123,6 +126,7 @@
/**
* Set the role attribute
* @param name The role the user must be in to retrieve content.
+ * @deprecated Use Tiles instead.
*/
public void setRole(String role) {
@@ -132,6 +136,7 @@
/**
* Get the flush-before-include attribute.
+ * @deprecated Use Tiles instead.
*/
public boolean getFlush() {
@@ -142,6 +147,7 @@
/**
* Get the name attribute.
+ * @deprecated Use Tiles instead.
*/
public String getName() {
@@ -151,6 +157,7 @@
/**
* Get the role attribute.
+ * @deprecated Use Tiles instead.
*/
public String getRole() {
@@ -163,6 +170,7 @@
/**
* Print content named by setName() or include it, depending
* on the content's direct attribute.
+ * @deprecated Use Tiles instead.
*/
public int doStartTag() throws JspException {
@@ -206,6 +214,7 @@
/**
* Reset member values for reuse. This method calls super.release(),
* which invokes TagSupport.release(), which typically does nothing.
+ * @deprecated Use Tiles instead.
*/
public void release() {
@@ -221,6 +230,7 @@
* one present.
*
* @param exception Exception to be conditionally saved
+ * @deprecated Use Tiles instead.
*/
private void saveException(Throwable exception) {
1.3 +9 -4
jakarta-struts/src/share/org/apache/struts/taglib/template/util/ContentMapStack.java
Index: ContentMapStack.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/template/util/ContentMapStack.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ContentMapStack.java 29 Apr 2001 05:34:50 -0000 1.2
+++ ContentMapStack.java 25 Oct 2002 23:54:53 -0000 1.3
@@ -69,6 +69,7 @@
*
* @author David Geary
* @version $Revision$ $Date$
+ * @deprecated Use Tiles instead.
*/
public class ContentMapStack {
@@ -88,6 +89,7 @@
* page context.
*
* @param pc The page context associated with a custom tag.
+ * @deprecated Use Tiles instead.
*/
public static Stack getStack(PageContext pc) {
@@ -107,6 +109,7 @@
* Peek at the map on top of the stack.
*
* @param pc The page context associated with a custom tag.
+ * @deprecated Use Tiles instead.
*/
public static ContentMap peek(PageContext pc) {
@@ -120,6 +123,7 @@
*
* @param pc The page context associated with a custom tag.
* @param map A content map that gets pushed onto the stack.
+ * @deprecated Use Tiles instead.
*/
public static void push(PageContext pc, ContentMap map) {
@@ -131,6 +135,7 @@
/**
*
* @param pc The page context associated with a custom tag.
+ * @deprecated Use Tiles instead.
*/
public static ContentMap pop(PageContext pc) {
1.5 +9 -4
jakarta-struts/src/share/org/apache/struts/taglib/template/util/Content.java
Index: Content.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/template/util/Content.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Content.java 25 Jun 2002 01:30:41 -0000 1.4
+++ Content.java 25 Oct 2002 23:54:53 -0000 1.5
@@ -77,6 +77,7 @@
*
* @author David Geary
* @version $Revision$
+ * @deprecated Use Tiles instead.
*/
public class Content implements java.io.Serializable {
@@ -110,6 +111,7 @@
*
* @param content The content's URI
* @param direct Is content printed directly (true) or included (false)?
+ * @deprecated Use Tiles instead.
*/
public Content(String content, String direct) {
@@ -123,6 +125,7 @@
/**
* Return content.
+ * @deprecated Use Tiles instead.
*/
public String getContent() {
@@ -133,6 +136,7 @@
/**
* Is content to be printed directly (isDirect() == true)
* instead of included (isDirect() == false).
+ * @deprecated Use Tiles instead.
*/
public boolean isDirect() {
@@ -143,6 +147,7 @@
/**
* Returns a string representation of the content.
+ * @deprecated Use Tiles instead.
*/
public String toString() {
1.5 +8 -4
jakarta-struts/src/share/org/apache/struts/taglib/template/util/ContentMap.java
Index: ContentMap.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/template/util/ContentMap.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ContentMap.java 25 Jun 2002 01:30:41 -0000 1.4
+++ ContentMap.java 25 Oct 2002 23:54:53 -0000 1.5
@@ -68,6 +68,7 @@
*
* @author David Geary
* @version $Revision$ $Date$
+ * @deprecated Use Tiles instead.
*/
public class ContentMap implements java.io.Serializable {
@@ -76,6 +77,7 @@
/**
* Explicitly declare a do-nothing, no-arg constructor.
+ * @deprecated Use Tiles instead.
*/
public ContentMap() { }
@@ -95,6 +97,7 @@
*
* @param name The content's name
* @param content The content
+ * @deprecated Use Tiles instead.
*/
public void put(String name, Content content) {
@@ -107,6 +110,7 @@
* Returns the content associated with name.
*
* @param name Name of content to retrieve
+ * @deprecated Use Tiles instead.
*/
public Content get(String name) {
--
To unsubscribe, e-mail: <mailto:struts-dev-unsubscribe@;jakarta.apache.org>
For additional commands, e-mail: <mailto:struts-dev-help@;jakarta.apache.org>
