[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-jforum/src/java/org/jahia/portlet/jforum JForumPortletBridge.java

[kevinshen]

Update of 
/var/cvs/contributions/CMSContainer_Portlets/portlets-jforum/src/java/org/jahia/portlet/jforum
In directory 
james.mmbase.org:/tmp/cvs-serv24354/src/java/org/jahia/portlet/jforum

Modified Files:
      Tag: b1_5
        JForumPortletBridge.java 
Log Message:
CMSC-1104 JForum portlet does not work on test environment


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-jforum/src/java/org/jahia/portlet/jforum
See also: http://www.mmbase.org/jira/browse/CMSC-1104


Index: JForumPortletBridge.java
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-jforum/src/java/org/jahia/portlet/jforum/JForumPortletBridge.java,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -b -r1.6 -r1.6.2.1
--- JForumPortletBridge.java    3 Jul 2008 11:15:15 -0000       1.6
+++ JForumPortletBridge.java    16 Mar 2009 09:28:11 -0000      1.6.2.1
@@ -44,7 +44,8 @@
 import org.jahia.portlet.fileupload.PortletRequestContext;
 
 import com.finalist.cmsc.portlets.CmscPortlet;
-
+import com.finalist.cmsc.mmbase.PropertiesUtil;
+import com.finalist.cmsc.util.ServerUtil;
 import freemarker.template.SimpleHash;
 
 /**
@@ -166,11 +167,24 @@
 
         try {
             // default values for reuqest wrapper
-            String defaultRequestUri;
+            String defaultRequestUri = "";
             String defaultModule;
             String defaultAction;
             // Manage auto login portal user
             PortalAutoConnectUserManager userProcesseur = new 
PortalAutoConnectUserManager(request, response);
+            if(ServerUtil.isLive()) {
+               String stagingPath = 
PropertiesUtil.getProperty("system.stagingpath");
+               if(StringUtils.isEmpty(stagingPath)) {
+                  logger.info("Properity system.stagingpath is null");
+               }
+               stagingPath = checkSlash(stagingPath);
+               defaultRequestUri = stagingPath+"forums/list.page";
+            }
+            else {
+               String contextPath = request.getContextPath();
+               contextPath = checkSlash(contextPath);
+               defaultRequestUri += contextPath+"forums/list.page";
+            }
             defaultRequestUri = "forums/list.page";
             defaultModule = "forums";
             defaultAction = "list";
@@ -232,6 +246,13 @@
 
     }
 
+   private String checkSlash(String path) {
+      if (!path.endsWith("/")) {
+         path += "/";
+      }
+      return path;
+   }
+
     private void updateRemoteUser(RenderRequest request) {
         // set username in session (SSO purpose)
         PortletSession session = request.getPortletSession();
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs