cmlenz 01/12/03 07:53:37
Modified: src/taglib/common/org/apache/slide/taglib/tag
ContentTagSupport.java
src/taglib/struts/org/apache/slide/taglib/tag/struts
ContentTag.java
Log:
This should help make the content-tag actually work :P
Revision Changes Path
1.2 +7 -6
jakarta-slide/src/taglib/common/org/apache/slide/taglib/tag/ContentTagSupport.java
Index: ContentTagSupport.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/taglib/common/org/apache/slide/taglib/tag/ContentTagSupport.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ContentTagSupport.java 2001/12/03 15:12:36 1.1
+++ ContentTagSupport.java 2001/12/03 15:53:37 1.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/taglib/common/org/apache/slide/taglib/tag/ContentTagSupport.java,v
1.1 2001/12/03 15:12:36 cmlenz Exp $
- * $Revision: 1.1 $
- * $Date: 2001/12/03 15:12:36 $
+ * $Header:
/home/cvs/jakarta-slide/src/taglib/common/org/apache/slide/taglib/tag/ContentTagSupport.java,v
1.2 2001/12/03 15:53:37 cmlenz Exp $
+ * $Revision: 1.2 $
+ * $Date: 2001/12/03 15:53:37 $
*
* ====================================================================
*
@@ -90,7 +90,7 @@
* </ul>
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Christopher Lenz</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public abstract class ContentTagSupport
extends TagSupport {
@@ -129,7 +129,6 @@
*/
public int doStartTag()
throws JspException {
- super.doStartTag();
HttpServletResponse response =
(HttpServletResponse)pageContext.getResponse();
@@ -140,13 +139,15 @@
throw new JspException("The Slide 'content' tag has to be used " +
"before the response has been committed.");
} else {
- response.resetBuffer();
+ response.reset();
}
// revision not found
if (revision == null) {
try {
response.sendError(HttpServletResponse.SC_NOT_FOUND);
+ // FIXME: ensure that the JSP engine does not reset the
+ // status code after processing is finished
return SKIP_PAGE;
} catch (IOException e) {
// ignore
1.2 +5 -6
jakarta-slide/src/taglib/struts/org/apache/slide/taglib/tag/struts/ContentTag.java
Index: ContentTag.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/taglib/struts/org/apache/slide/taglib/tag/struts/ContentTag.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ContentTag.java 2001/12/03 15:12:37 1.1
+++ ContentTag.java 2001/12/03 15:53:37 1.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/taglib/struts/org/apache/slide/taglib/tag/struts/ContentTag.java,v
1.1 2001/12/03 15:12:37 cmlenz Exp $
- * $Revision: 1.1 $
- * $Date: 2001/12/03 15:12:37 $
+ * $Header:
/home/cvs/jakarta-slide/src/taglib/struts/org/apache/slide/taglib/tag/struts/ContentTag.java,v
1.2 2001/12/03 15:53:37 cmlenz Exp $
+ * $Revision: 1.2 $
+ * $Date: 2001/12/03 15:53:37 $
*
* ====================================================================
*
@@ -73,7 +73,7 @@
* Extends the ContentTagSupport to work in a Struts environment.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Christopher Lenz</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public class ContentTag
extends ContentTagSupport {
@@ -90,9 +90,8 @@
*/
public int doStartTag()
throws JspException {
- System.out.println("ContentTag.doStartTag()");
- RevisionBean revision =
+ revision =
StrutsTagUtils.findRevision(this, pageContext);
return super.doStartTag();
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
