[portal-commits] JBoss Portal SVN: r7921 - in branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss: portlet/content and 1 other directory.

Author: thomas.heute(a)jboss.com Date: 2007-08-14 09:45:17 -0400 (Tue, 14 Aug 2007) New Revision: 7921 Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/content/generic/GenericContentProviderRegistry.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portlet/content/ContentTypeRegistration.java Log: JBPORTAL-1629: NullPointerException after adding a google portlet to dashboard Contribution of Roman Kalyakin, thanks ! Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/content/generic/GenericContentProviderRegistry.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/content/generic/GenericContentProviderRegistry.java 2007-08-14 13:44:01 UTC (rev 7920) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/content/generic/GenericContentProviderRegistry.java 2007-08-14 13:45:17 UTC (rev 7921) @@ -28,6 +28,7 @@ import org.jboss.portal.core.model.content.spi.portlet.ContentPortlet; import org.jboss.portal.core.impl.model.content.InternalContentProviderRegistry; import org.jboss.portal.common.util.CopyOnWriteRegistry; +import org.jboss.portal.security.spi.auth.PortalAuthorizationManagerFactory; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> @@ -55,6 +56,9 @@ /** . */ private CopyOnWriteRegistry registrations = new CopyOnWriteRegistry(); + + /** . */ + private PortalAuthorizationManagerFactory pamf; public InstanceContainer getInstanceContainer() { @@ -85,6 +89,16 @@ { this.registry = registry; } + + public PortalAuthorizationManagerFactory getPortalAuthorizationManagerFactory() + { + return pamf; + } + + public void setPortalAuthorizationManagerFactory(PortalAuthorizationManagerFactory portalAuthorizationManagerFactory) + { + this.pamf = portalAuthorizationManagerFactory; + } public void register( ContentType contentType, Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portlet/content/ContentTypeRegistration.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portlet/content/ContentTypeRegistration.java 2007-08-14 13:44:01 UTC (rev 7920) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portlet/content/ContentTypeRegistration.java 2007-08-14 13:45:17 UTC (rev 7921) @@ -42,6 +42,7 @@ import org.jboss.portal.core.model.content.spi.portlet.ContentPortlet; import org.jboss.portal.core.model.instance.InstanceContainer; import org.jboss.portal.jems.as.system.JBossServiceModelMBean; +import org.jboss.portal.security.spi.auth.PortalAuthorizationManagerFactory; /** * Provide registration of a content type with a portlet instance. This listener can be used @@ -122,6 +123,11 @@ Object container = MBeanProxy.get(InstanceContainer.class, instanceContainerON, mbeanServer); mbean.setAttribute(new Attribute("InstanceContainer", container)); + // Get proxy on Portal Authorization Manager Factory + ObjectName pamfON = new ObjectName("portal:service=PortalAuthorizationManagerFactory"); + Object factory = MBeanProxy.get(PortalAuthorizationManagerFactory.class, pamfON, mbeanServer); + mbean.setAttribute(new Attribute("PortalAuthorizationManagerFactory", factory)); + // Set dependencies List dependencies = new ArrayList(); dependencies.add(contentProviderRegistryON);