Author: sohil.shah(a)jboss.com Date: 2008-09-12 12:43:15 -0400 (Fri, 12 Sep 2008) New Revision: 11898 Modified: branches/JBoss_Portal_2_6_6_JBPORTAL-2109/cms/src/main/org/jboss/portal/cms/workflow/CMSWorkflowUtil.java branches/JBoss_Portal_2_6_6_JBPORTAL-2109/cms/src/main/org/jboss/portal/cms/workflow/FinalizePublish.java Log: JBPORTAL-2109 - CMS Security Issue with LDAP/Clustered mode (solving issue with JNDI lookups on slave nodes) Modified: branches/JBoss_Portal_2_6_6_JBPORTAL-2109/cms/src/main/org/jboss/portal/cms/workflow/CMSWorkflowUtil.java =================================================================== --- branches/JBoss_Portal_2_6_6_JBPORTAL-2109/cms/src/main/org/jboss/portal/cms/workflow/CMSWorkflowUtil.java 2008-09-12 16:23:49 UTC (rev 11897) +++ branches/JBoss_Portal_2_6_6_JBPORTAL-2109/cms/src/main/org/jboss/portal/cms/workflow/CMSWorkflowUtil.java 2008-09-12 16:43:15 UTC (rev 11898) @@ -25,8 +25,11 @@ import java.util.List; import java.util.Locale; -import javax.naming.InitialContext; +import javax.management.MBeanServer; +import javax.management.ObjectName; +import org.jboss.mx.util.MBeanProxy; +import org.jboss.mx.util.MBeanServerLocator; import org.jboss.portal.cms.CMS; import org.jboss.portal.cms.Command; import org.jboss.portal.cms.model.Content; @@ -101,15 +104,13 @@ return content; } - /** - * - * @return - */ - private static CMS getCMSService() + /** @return */ + public static CMS getCMSService() { try { - return (CMS)new InitialContext().lookup("java:/portal/CMS"); + MBeanServer mbeanServer = MBeanServerLocator.locateJBoss(); + return (CMS)MBeanProxy.get(CMS.class, new ObjectName("portal:service=CMS"), mbeanServer); } catch (Exception e) { Modified: branches/JBoss_Portal_2_6_6_JBPORTAL-2109/cms/src/main/org/jboss/portal/cms/workflow/FinalizePublish.java =================================================================== --- branches/JBoss_Portal_2_6_6_JBPORTAL-2109/cms/src/main/org/jboss/portal/cms/workflow/FinalizePublish.java 2008-09-12 16:23:49 UTC (rev 11897) +++ branches/JBoss_Portal_2_6_6_JBPORTAL-2109/cms/src/main/org/jboss/portal/cms/workflow/FinalizePublish.java 2008-09-12 16:43:15 UTC (rev 11898) @@ -31,7 +31,6 @@ import org.jbpm.graph.def.ActionHandler; import org.jbpm.graph.exe.ExecutionContext; -import javax.naming.InitialContext; import java.util.List; import java.util.Locale; import java.util.ArrayList; @@ -181,7 +180,7 @@ { try { - return (CMS)new InitialContext().lookup("java:/portal/CMS"); + return CMSWorkflowUtil.getCMSService(); } catch (Exception e) {