[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-serv23993/src/java/org/jahia/portlet/jforum

Modified Files:
      Tag: b1_6
        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.7
retrieving revision 1.7.2.1
diff -u -b -r1.7 -r1.7.2.1
--- JForumPortletBridge.java    15 Oct 2008 11:43:54 -0000      1.7
+++ JForumPortletBridge.java    16 Mar 2009 09:16:55 -0000      1.7.2.1
@@ -4,13 +4,10 @@
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Enumeration;
-import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
-import java.util.Set;
 
 import javax.portlet.ActionRequest;
 import javax.portlet.ActionResponse;
@@ -43,7 +40,9 @@
 import org.apache.log4j.Logger;
 import org.jahia.portlet.fileupload.PortletRequestContext;
 
+import com.finalist.cmsc.mmbase.PropertiesUtil;
 import com.finalist.cmsc.portlets.CmscPortlet;
+import com.finalist.cmsc.util.ServerUtil;
 
 import freemarker.template.SimpleHash;
 
@@ -166,12 +165,29 @@
 
       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);
-         defaultRequestUri = "forums/list.page";
+
+         if(ServerUtil.isLive()) {
+            String stagingPath = 
PropertiesUtil.getProperty("system.stagingpath");
+            if(StringUtils.isEmpty(stagingPath)) {
+               logger.info("Properity system.stagingpath is null");
+            }
+            if (!stagingPath.endsWith("/")) {
+               stagingPath += "/";
+            }
+            defaultRequestUri = stagingPath+"forums/list.page";
+         }
+         else {
+            String contextPath = request.getContextPath();
+            if (!contextPath.endsWith("/")) {
+               contextPath += "/";
+            }
+            defaultRequestUri += contextPath+"forums/list.page";
+         }
          defaultModule = "forums";
          defaultAction = "list";
          if (isAlreadyInstalled()) {
@@ -478,7 +494,7 @@
          String language = "en_US";
          String charset = (String) 
request.getPortletSession().getAttribute("javax.servlet.jsp.jstl.fmt.request.charset");
 
-         if (!locale.getLanguage().equals("en") && 
StringUtils.isEmpty(locale.getCountry())) {
+         if (locale != null && !locale.getLanguage().equals("en") && 
StringUtils.isEmpty(locale.getCountry())) {
             locale = Locale.getDefault();
             language = locale.getLanguage() + "_" + locale.getCountry();
          }
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs