[jboss-svn-commits] JBL Code SVN: r18803 - labs/jbosslabs/trunk/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal.

[jboss-svn-commits at lists.jboss.org]

Author: szimano
Date: 2008-03-10 11:33:08 -0400 (Mon, 10 Mar 2008)
New Revision: 18803

Modified:
   labs/jbosslabs/trunk/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/WikiComRedirectFilter.java
Log:
fixed filter for params

Modified: labs/jbosslabs/trunk/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/WikiComRedirectFilter.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/WikiComRedirectFilter.java	2008-03-10 14:42:02 UTC (rev 18802)
+++ labs/jbosslabs/trunk/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/WikiComRedirectFilter.java	2008-03-10 15:33:08 UTC (rev 18803)
@@ -42,25 +42,15 @@
  * This filter redirects all requests from domain/wiki_context (for example
  * jboss.com/wiki) to wikidomain/request (for example wiki.jboss.org/wiki).
  * 
- * Example configuration
- * <filter>
- *      <filter-name>wikiComRedirect</filter-name>
- *      <filter-class>org.jboss.forge.portal.WikiComRedirectFilter</filter-class>
- *      <init-param>
- *              <param-name>WIKI_DOMAIN</param-name>
- *              <param-value>wiki.jboss.org</param-value>
- *              <description>Domain that wiki is running on</description>
- *      </init-param>
- *      <init-param>
- *              <param-name>WIKI_CONTEXT</param-name>
- *              <param-value>/wiki</param-value>
- *              <description>Wiki context</description>
- *      </init-param>
- * </filter>
- *
- * <filter-mapping>
- *      <filter-name>wikiComRedirect</filter-name>
- *      <url-pattern>/*</url-pattern>
+ * Example configuration <filter> <filter-name>wikiComRedirect</filter-name>
+ * <filter-class>org.jboss.forge.portal.WikiComRedirectFilter</filter-class>
+ * <init-param> <param-name>WIKI_DOMAIN</param-name>
+ * <param-value>wiki.jboss.org</param-value> <description>Domain that wiki is
+ * running on</description> </init-param> <init-param> <param-name>WIKI_CONTEXT</param-name>
+ * <param-value>/wiki</param-value> <description>Wiki context</description>
+ * </init-param> </filter>
+ * 
+ * <filter-mapping> <filter-name>wikiComRedirect</filter-name> <url-pattern>/*</url-pattern>
  * </filter-mapping>
  */
 public class WikiComRedirectFilter implements Filter {
@@ -88,8 +78,12 @@
 			// do redirect to wiki domain
 			HttpServletResponse htRes = (HttpServletResponse) response;
 
-			htRes.sendRedirect((htReq.isSecure() ? "https" : "http") + "://"
-					+ wikiDomain + htReq.getRequestURI());
+			htRes.sendRedirect((htReq.isSecure() ? "https" : "http")
+					+ "://"
+					+ wikiDomain
+					+ htReq.getRequestURI()
+					+ (htReq.getQueryString() != null && htReq.getQueryString().length() > 0 ? "?"
+							+ htReq.getQueryString() : ""));
 			return;
 		}