craigmcc 01/03/06 09:14:23
Modified: src/example/org/apache/struts/example
LinkSubscriptionTag.java LinkUserTag.java
Log:
Remove excess filtering that causes the "&" to be changed to "&".
Change deprecated BeanUtils.filter() calls to ResponseUtils.filter().
PR: Bugzilla #758
Submitted by: Jean-Luc Schwab <[EMAIL PROTECTED]>
Revision Changes Path
1.5 +10 -10
jakarta-struts/src/example/org/apache/struts/example/LinkSubscriptionTag.java
Index: LinkSubscriptionTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/example/org/apache/struts/example/LinkSubscriptionTag.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- LinkSubscriptionTag.java 2001/02/02 02:26:06 1.4
+++ LinkSubscriptionTag.java 2001/03/06 17:14:18 1.5
@@ -1,13 +1,13 @@
/*
- * $Header:
/home/cvs/jakarta-struts/src/example/org/apache/struts/example/LinkSubscriptionTag.java,v
1.4 2001/02/02 02:26:06 craigmcc Exp $
- * $Revision: 1.4 $
- * $Date: 2001/02/02 02:26:06 $
+ * $Header:
/home/cvs/jakarta-struts/src/example/org/apache/struts/example/LinkSubscriptionTag.java,v
1.5 2001/03/06 17:14:18 craigmcc Exp $
+ * $Revision: 1.5 $
+ * $Date: 2001/03/06 17:14:18 $
*
* ====================================================================
*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -29,7 +29,7 @@
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
- * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
+ * 4. The names "The Jakarta Project", "Struts", and "Apache Software
* Foundation" must not be used to endorse or promote products derived
* from this software without prior written permission. For written
* permission, please contact [EMAIL PROTECTED]
@@ -70,8 +70,8 @@
import javax.servlet.jsp.JspWriter;
import javax.servlet.jsp.PageContext;
import javax.servlet.jsp.tagext.TagSupport;
-import org.apache.struts.util.BeanUtils;
import org.apache.struts.util.MessageResources;
+import org.apache.struts.util.ResponseUtils;
/**
@@ -79,7 +79,7 @@
* associated query parameters selecting a specified Subscription.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.4 $ $Date: 2001/02/02 02:26:06 $
+ * @version $Revision: 1.5 $ $Date: 2001/03/06 17:14:18 $
*/
public class LinkSubscriptionTag extends TagSupport {
@@ -184,15 +184,15 @@
else
url.append("&");
url.append("username=");
- url.append(BeanUtils.filter(subscription.getUser().getUsername()));
+ url.append(ResponseUtils.filter(subscription.getUser().getUsername()));
url.append("&host=");
- url.append(BeanUtils.filter(subscription.getHost()));
+ url.append(ResponseUtils.filter(subscription.getHost()));
// Generate the hyperlink start element
HttpServletResponse response =
(HttpServletResponse) pageContext.getResponse();
StringBuffer results = new StringBuffer("<a href=\"");
- results.append(response.encodeURL(BeanUtils.filter(url.toString())));
+ results.append(response.encodeURL(url.toString()));
results.append("\">");
// Print this element to our output writer
1.5 +7 -7
jakarta-struts/src/example/org/apache/struts/example/LinkUserTag.java
Index: LinkUserTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/example/org/apache/struts/example/LinkUserTag.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- LinkUserTag.java 2001/02/02 02:26:06 1.4
+++ LinkUserTag.java 2001/03/06 17:14:20 1.5
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-struts/src/example/org/apache/struts/example/LinkUserTag.java,v 1.4
2001/02/02 02:26:06 craigmcc Exp $
- * $Revision: 1.4 $
- * $Date: 2001/02/02 02:26:06 $
+ * $Header:
/home/cvs/jakarta-struts/src/example/org/apache/struts/example/LinkUserTag.java,v 1.5
2001/03/06 17:14:20 craigmcc Exp $
+ * $Revision: 1.5 $
+ * $Date: 2001/03/06 17:14:20 $
*
* ====================================================================
*
@@ -70,8 +70,8 @@
import javax.servlet.jsp.JspWriter;
import javax.servlet.jsp.PageContext;
import javax.servlet.jsp.tagext.TagSupport;
-import org.apache.struts.util.BeanUtils;
import org.apache.struts.util.MessageResources;
+import org.apache.struts.util.ResponseUtils;
/**
@@ -79,7 +79,7 @@
* associated query parameters selecting a specified User.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.4 $ $Date: 2001/02/02 02:26:06 $
+ * @version $Revision: 1.5 $ $Date: 2001/03/06 17:14:20 $
*/
public class LinkUserTag extends TagSupport {
@@ -184,13 +184,13 @@
else
url.append("&");
url.append("username=");
- url.append(BeanUtils.filter(user.getUsername()));
+ url.append(ResponseUtils.filter(user.getUsername()));
// Generate the hyperlink start element
HttpServletResponse response =
(HttpServletResponse) pageContext.getResponse();
StringBuffer results = new StringBuffer("<a href=\"");
- results.append(response.encodeURL(BeanUtils.filter(url.toString())));
+ results.append(response.encodeURL(url.toString()));
results.append("\">");
// Print this element to our output writer
