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

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

Author: adamw
Date: 2007-10-02 17:51:00 -0400 (Tue, 02 Oct 2007)
New Revision: 15519

Modified:
   labs/jbosslabs/trunk/portal-extensions/forge-kosmos-portlets/maven.xml
   labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/MainCF.java
   labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/PortalObjectCFImpl.java
Log:
Fixing mapper

Modified: labs/jbosslabs/trunk/portal-extensions/forge-kosmos-portlets/maven.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-kosmos-portlets/maven.xml	2007-10-02 21:50:10 UTC (rev 15518)
+++ labs/jbosslabs/trunk/portal-extensions/forge-kosmos-portlets/maven.xml	2007-10-02 21:51:00 UTC (rev 15519)
@@ -11,14 +11,14 @@
 	</goal>
 
 	<goal name="build">
-
+<!--
 		<ant:copy tofile="src/web/WEB-INF/portlet.xml" file="src/web/WEB-INF/portlet.template.xml" overwrite="true"/>
 		<ant:replace file="src/web/WEB-INF/portlet.xml" propertyFile="kosmos.properties">
   			<ant:replacefilter token="#{kosmos.server.address}" property="kosmos.server.address"/>
 		</ant:replace>
 		
 		<attainGoal name="prj-war-build" />
-
+-->
 	</goal>
     
 	<goal name="deploy">

Modified: labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/MainCF.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/MainCF.java	2007-10-02 21:50:10 UTC (rev 15518)
+++ labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/MainCF.java	2007-10-02 21:51:00 UTC (rev 15519)
@@ -120,15 +120,18 @@
         }
         // End of redirects.
         
-        // Checking if the last token has a .; if yes, redirecting to url with a / at the end.
-        String rest = requestPath;
-        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;
+        // Checking if the last token has a .; if no, redirecting to url with a / at the end.
+        // Doing this only with the GET method.
+        if ("GET".equals(invocation.getServerContext().getClientRequest().getMethod())) {
+        	String rest = requestPath;
+        	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;
+        			}
         		}
         	}
         }

Modified: labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/PortalObjectCFImpl.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/PortalObjectCFImpl.java	2007-10-02 21:50:10 UTC (rev 15518)
+++ labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/PortalObjectCFImpl.java	2007-10-02 21:51:00 UTC (rev 15519)
@@ -72,7 +72,7 @@
         // Decoding the window state.
         PortletRequestDecoder decoder = new PortletRequestDecoder();
         decoder.decode(queryParams, invocation.getServerContext().getBodyParameterMap());
-
+        
         // Get the window navigational state
         WindowNavigationalState windowNavState = MapperTools.getWindowNavState(controllerContext, window);
 
@@ -137,13 +137,6 @@
             throw new IllegalArgumentException("Page cannot be null.");
         }
 
-        // If a page is requested, the URL must end with a /, in order for
-        // relative paths to work.
-        if ((!parser.hasFirstToken()) && (!parser.getFullPath().endsWith("/"))) {
-            sendRedirect(invocation, parser.getFullPath()+"/");
-            return null;
-        }
-
         // Checking if there is a freezone on the page.
         String projectId = page.getDeclaredProperty(Constants.PORTAL_OBJECT_LABS_MARKER);