[jboss-svn-commits] JBL Code SVN: r16591 - in labs/jbosslabs/trunk/portal-extensions: forge-mapper/src/java/org/jboss/labs/mapper/command/delegating/page and 1 other directory.

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

Author: szimano
Date: 2007-11-14 08:26:53 -0500 (Wed, 14 Nov 2007)
New Revision: 16591

Modified:
   labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-server.war/WEB-INF/web.xml
   labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/delegating/page/WikiCF.java
Log:
wiki Wiki.jsp?page=... handling

Modified: labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-server.war/WEB-INF/web.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-server.war/WEB-INF/web.xml	2007-11-14 12:13:53 UTC (rev 16590)
+++ labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-server.war/WEB-INF/web.xml	2007-11-14 13:26:53 UTC (rev 16591)
@@ -101,12 +101,12 @@
    		<param-value>/wiki,/auth/wiki,/authsec/wiki</param-value>
    		<description>Wiki context</description>
    	</init-param>
-   </filter> -->
+   </filter>
 
    <filter-mapping>
    	<filter-name>wikiRedirect</filter-name>
    	<url-pattern>/*</url-pattern>
-   </filter-mapping>
+   </filter-mapping>  -->
    
     <filter>
       <filter-name>redirectFilter</filter-name>

Modified: labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/delegating/page/WikiCF.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/delegating/page/WikiCF.java	2007-11-14 12:13:53 UTC (rev 16590)
+++ labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/delegating/page/WikiCF.java	2007-11-14 13:26:53 UTC (rev 16591)
@@ -61,8 +61,9 @@
 		return new RenderPageCommand(wikiPageId);
 	}
 
-	public ControllerCommand doMapping(ControllerContext controllerContext, ServerInvocation invocation,
-			String host, String contextPath, PathParser parser, Page portalPage) {
+	public ControllerCommand doMapping(ControllerContext controllerContext,
+			ServerInvocation invocation, String host, String contextPath,
+			PathParser parser, Page portalPage) {
 		String firstToken = parser.getFirstToken();
 		String language = null;
 		String current = parser.getCurrent();
@@ -78,7 +79,8 @@
 		String page = null;
 		while (parser.hasFirstToken()) {
 			firstToken = parser.getFirstToken();
-			if (Character.isUpperCase(firstToken.charAt(0))) {
+			if (Character.isUpperCase(firstToken.charAt(0))
+					&& !firstToken.equals("Wiki.jsp")) {
 				if (page == null) {
 					page = firstToken;
 				} else {
@@ -116,13 +118,13 @@
 
 		Window wikiWindow = (Window) getContainer().getObject(windowId);
 		if (hasMetaParameter(invocation)) {
-			return getPortalObjectCF().doMapping(controllerContext, invocation, wikiWindow,
-					params, false);
+			return getPortalObjectCF().doMapping(controllerContext, invocation,
+					wikiWindow, params, false);
 		} else {
 			params.put(PortletRequestDecoder.META_PARAMETER, Integer
 					.toString(PortletRequestDecoder.RENDER_MASK));
-			return getPortalObjectCF().doMapping(controllerContext, invocation, wikiWindow,
-					params, false);
+			return getPortalObjectCF().doMapping(controllerContext, invocation,
+					wikiWindow, params, false);
 		}
 	}
 }