[portal-commits] JBoss Portal SVN: r7966 - 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-16 18:06:31 -0400 (Thu, 16 Aug 2007) New Revision: 7966 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-1627: Problem destroying service portal:service=ContentRenderer,type=GoogleWidgetPortletInstance Fix bad undeployment of generic content types 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-16 19:03:25 UTC (rev 7965) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/content/generic/GenericContentProviderRegistry.java 2007-08-16 22:06:31 UTC (rev 7966) @@ -110,7 +110,8 @@ provider.setDecorateContent(true); provider.setContentPortletInfo(contentPortlet); provider.setRegistry(registry); - + provider.setPortalAuthorizationManagerFactory(pamf); + // Keep track registrations.register(contentType, provider); 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-16 19:03:25 UTC (rev 7965) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portlet/content/ContentTypeRegistration.java 2007-08-16 22:06:31 UTC (rev 7966) @@ -132,6 +132,7 @@ List dependencies = new ArrayList(); dependencies.add(contentProviderRegistryON); dependencies.add(instanceContainerON); + dependencies.add(pamfON); mbeanServer.invoke(scObjectName, "register", new Object[] {objectName, dependencies} , new String[] {"javax.management.ObjectName", "java.util.Collection"}); // Start the mbean @@ -164,8 +165,7 @@ // Stop the mbean MBeanServer mbeanServer = MBeanServerLocator.locateJBoss(); mbeanServer.invoke(scObjectName, "stop", new ObjectName[] {objectName} , new String[] {"javax.management.ObjectName"}); - - mbeanServer.unregisterMBean(objectName); + mbeanServer.invoke(scObjectName, "remove", new Object[] {objectName} , new String[] {"javax.management.ObjectName"}); } catch(Exception e) {