[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-serv17461/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.2.2
retrieving revision 1.6.2.3
diff -u -b -r1.6.2.2 -r1.6.2.3
--- JForumPortletBridge.java    23 Mar 2009 02:15:25 -0000      1.6.2.2
+++ JForumPortletBridge.java    23 Mar 2009 06:01:00 -0000      1.6.2.3
@@ -554,7 +554,7 @@
            
reqW.setAttribute("admin_pass1",StringUtils.isEmpty(SystemGlobals.getValue("admin.password"))?"admin2k":SystemGlobals.getValue("admin.password"));
            reqW.setAttribute("db_connection_type", "ds");
            reqW.setAttribute("site_link", "");
-           reqW.setAttribute("dbdatasource", 
StringUtils.isEmpty(SystemGlobals.getValue("database.dbdatasource"))?"java:comp/env/jdbc/jforum":SystemGlobals.getValue("database.dbdatasource"));
+           reqW.setAttribute("dbdatasource", 
StringUtils.isEmpty(SystemGlobals.getValue("database.datasource.name"))?"java:comp/env/jdbc/jforum":SystemGlobals.getValue("database.datasource.name"));
            try {
               net.jforum.context.RequestContext requestContext = new 
WebRequestContext(reqW);
               ResponseContext responseContext = new WebResponseContext(respW);
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs