[jboss-svn-commits] JBL Code SVN: r9596 - in labs/jbosslabs/trunk/portal-extensions/jbosswiki: src/application/META-INF and 1 other directory.

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

Author: szimano
Date: 2007-02-19 09:31:04 -0500 (Mon, 19 Feb 2007)
New Revision: 9596

Modified:
   labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/fileaccess/WikiFileAccessFilter.java
   labs/jbosslabs/trunk/portal-extensions/jbosswiki/src/application/META-INF/application.xml
Log:
wiki fileaccess in /wiki-files

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-02-19 13:39:09 UTC (rev 9595)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/fileaccess/WikiFileAccessFilter.java	2007-02-19 14:31:04 UTC (rev 9596)
@@ -151,7 +151,7 @@
 					"UTF-8");
 
 			// get off "/wiki/" from the begining
-			requestURI = requestURI.substring("/wiki/".length());
+			requestURI = requestURI.substring((httpRequest.getContextPath() + "/").length());
 
 			// support old type link with Wiki.jsp?page=
 			if (requestURI.equals("Wiki.jsp")) {

Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/src/application/META-INF/application.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/src/application/META-INF/application.xml	2007-02-19 13:39:09 UTC (rev 9595)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/src/application/META-INF/application.xml	2007-02-19 14:31:04 UTC (rev 9596)
@@ -6,6 +6,7 @@
 	<module>
 		<web>
 			<web-uri>wiki.war</web-uri>
+			<context-root>wiki-files</context-root>
 		</web>
 	</module>
 	<module>