[Generator-rt-devel] generator_runtime/src/java/generator/runtime/utils ServletUtils.java, 1.12, 1.13

[Rick K. <ric...@us...>]

Update of /cvsroot/generator-rt/generator_runtime/src/java/generator/runtime/utils
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv10921/src/java/generator/runtime/utils

Modified Files:
	ServletUtils.java 
Log Message:
use relative uris for redirects in more places

Index: ServletUtils.java
===================================================================
RCS file: /cvsroot/generator-rt/generator_runtime/src/java/generator/runtime/utils/ServletUtils.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** ServletUtils.java	27 Feb 2010 15:37:52 -0000	1.12
--- ServletUtils.java	5 Mar 2010 07:22:18 -0000	1.13
***************
*** 304,306 ****
--- 304,324 ----
          }
      }
+ 
+     public static StringBuffer getRelativeRedirectURI(HttpServletRequest request, String webrootPath,
+             String prefix, String redirectFromURI) {
+         File webroot = new File(webrootPath);
+         String internalWebAppURI = request.getServletPath()
+                 + ((request.getPathInfo() == null) ? "" : request.getPathInfo());
+         String canonicalURI = FileUtils.constructOurCanonicalVersion(
+                 new File(webroot, internalWebAppURI), webroot);
+         
+         StringBuffer uriBuf = new StringBuffer();
+         uriBuf.append(ServletUtils.makeRelativeURI(prefix + redirectFromURI, 
+                 prefix + "/" + canonicalURI));
+         String qs = request.getQueryString();
+         if (!qs.equals("")) {
+             uriBuf.append("?").append(qs);
+         }
+         return uriBuf;
+     }
  }