[jboss-svn-commits] JBL Code SVN: r17059 - labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/fileaccess.

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

Author: szimano
Date: 2007-12-06 06:32:09 -0500 (Thu, 06 Dec 2007)
New Revision: 17059

Modified:
   labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/fileaccess/WikiFileAccessFilter.java
Log:
wiki redirect fixed

Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/fileaccess/WikiFileAccessFilter.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/fileaccess/WikiFileAccessFilter.java	2007-12-06 08:57:54 UTC (rev 17058)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/fileaccess/WikiFileAccessFilter.java	2007-12-06 11:32:09 UTC (rev 17059)
@@ -78,6 +78,8 @@
 	private String wikiHome;
 
 	private WikiEngine wikiEngine;
+	
+	private String wikiContext;
 
 	/*
 	 * private ForgeHelper forgeHelper; private ContentManager contentManager;
@@ -121,6 +123,11 @@
 
 			// get the host
 			wikiHome = props.getProperty("wikiHome");
+			
+			props.load(FileMediaDataSource.class
+					.getResourceAsStream("/JBossWiki.properties"));
+			
+			wikiContext = props.getProperty("wikiContext");
 
 		} catch (IOException e) {
 			log.error(e);
@@ -161,10 +168,10 @@
 			// support old type link with Wiki.jsp?page=
 			if (requestURI.equals("Wiki.jsp")) {
 				if (httpRequest.getParameter("page") != null)
-					httpResponse.sendRedirect(hostURL + wikiHome + "&page="
+					httpResponse.sendRedirect(hostURL + wikiContext + "/"
 							+ httpRequest.getParameter("page"));
 				else
-					httpResponse.sendRedirect(hostURL + wikiHome);
+					httpResponse.sendRedirect(hostURL + wikiContext);
 
 				return;
 			}