[cvs] expresso commit by ppilgrim: Many methods in

[JCorporate Ltd]

Log Message:
-----------
Many methods in org.apache.struts.util.RequestUtils and
org.apache.struts.util.ResponseUtils are deprecated. Replace
RequestUtils.* and ResponseUtils.* with
org.apache.struts.taglib.TagUtils.getInstance().* See also
http://wiki.apache.org/struts/StrutsUpgradeNotes11to124

Modified Files:
--------------
    expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/struts/taglib/html:
        ExLinkTag.java

Revision Data
-------------
Index: ExLinkTag.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/struts/taglib/html/ExLinkTag.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/ext/struts/taglib/html/ExLinkTag.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/ext/struts/taglib/html/ExLinkTag.java -u -r1.9 -r1.10
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/struts/taglib/html/ExLinkTag.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/struts/taglib/html/ExLinkTag.java
@@ -64,6 +64,17 @@
 
 package com.jcorporate.expresso.ext.struts.taglib.html;
 
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.JspWriter;
+
+import org.apache.struts.taglib.TagUtils;
+import org.apache.struts.taglib.html.LinkTag;
+
 import com.jcorporate.expresso.core.controller.ControllerElement;
 import com.jcorporate.expresso.core.controller.ControllerException;
 import com.jcorporate.expresso.core.controller.Transition;
@@ -71,16 +82,6 @@
 import com.jcorporate.expresso.core.misc.StringUtil;
 import com.jcorporate.expresso.ext.struts.taglib.ControllerUtils;
 import com.jcorporate.expresso.services.dbobj.Setup;
-import org.apache.struts.taglib.html.LinkTag;
-import org.apache.struts.util.RequestUtils;
-import org.apache.struts.util.ResponseUtils;
-
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.JspWriter;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.util.Map;
 
 /**
  * Tag for input fields of type "Link".
@@ -110,7 +111,7 @@
             StringBuffer results = new StringBuffer("<a name=\"");
             results.append(linkName);
             results.append("\">");
-            ResponseUtils.write(pageContext, results.toString());
+            TagUtils.getInstance().write(pageContext, results.toString());
             return (EVAL_BODY_TAG);
         }
 
@@ -118,18 +119,20 @@
         StringBuffer results = new StringBuffer("<a href=\"");
         String url = hyperlink();
         if (url != null) {
-            results.append(response.encodeURL(ResponseUtils.filter(url)));
+            results.append(response.encodeURL(TagUtils.getInstance().filter(url)));
         } else {
             // We're not working with a Transition object, so processing is as for
             // standard Struts
-            Map params = RequestUtils.computeParameters
-                    (pageContext, paramId, paramName, paramProperty, paramScope,
-                            name, property, scope, transaction);
+            Map params = TagUtils.getInstance().computeParameters(
+                    pageContext, paramId, paramName, 
+                    paramProperty, paramScope,
+                    name, property, scope, transaction);
             try {
-                url = RequestUtils.computeURL(pageContext, forward, href,
-                        page, action, params, anchor, false);
+                url = TagUtils.getInstance().computeURLWithCharEncoding(
+                        pageContext, forward, href, page, 
+                        null, action, params, anchor, false, false);
             } catch (MalformedURLException e) {
-                RequestUtils.saveException(pageContext, e);
+                TagUtils.getInstance().saveException(pageContext, e);
                 throw new JspException(e.toString());
             }
             results.append(url);