[jboss-svn-commits] JBL Code SVN: r15288 - labs/jbosslabs/qa/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command.

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

Author: adamw
Date: 2007-09-22 03:36:15 -0400 (Sat, 22 Sep 2007)
New Revision: 15288

Modified:
   labs/jbosslabs/qa/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/MainCF.java
Log:
MERGE 15264:15287

Modified: labs/jbosslabs/qa/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/MainCF.java
===================================================================
--- labs/jbosslabs/qa/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/MainCF.java	2007-09-22 07:26:24 UTC (rev 15287)
+++ labs/jbosslabs/qa/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/MainCF.java	2007-09-22 07:36:15 UTC (rev 15288)
@@ -116,8 +116,22 @@
             }
         	
         	sendRedirect(invocation, "/drools/" + rest);
+        	return null;
         }
         // End of redirects.
+        
+        // Checking if the last token has a .; if yes, redirecting to url with a / at the end.
+        String rest = parser.getCurrent();
+        if (rest != null) {
+        	int lastSlash = rest.lastIndexOf('/');
+        	if (lastSlash != -1) {
+        		String lastToken = rest.substring(lastSlash + 1);
+        		if (!lastToken.contains(".") && !lastToken.equals("")) {
+        			sendRedirect(invocation, parser.getFullPath() + "/");
+        			return null;
+        		}
+        	}
+        }
 
         // Getting the portal object referenced by the path.
         PortalObject target = getPortalObject(parser);
@@ -139,7 +153,7 @@
                 return cmd;
             }
 
-            // If this is unsuccessfull, doing the default page mappnig.
+            // If this is unsuccessful, doing the default page mapping.
             return getPortalObjectCF().doMapping(controllerContext, invocation, parser, (Page) target);
         } else if (target instanceof Window) {
             // If the path referenced a window, then the mapping cannot be