Author: julien(a)jboss.com Date: 2008-02-19 06:39:23 -0500 (Tue, 19 Feb 2008) New Revision: 10026 Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/container/PortletContainerInvoker.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/ManagedPortletApplication.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/ManagedPortletContainer.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/PortletApplicationDeployer.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/PortletApplicationDeployment.java modules/portlet/trunk/test/src/test/resources/portlet-test-war/WEB-INF/jboss-beans.xml modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/jboss-beans.xml Log: - better pojoisation of portlet container / portlet applications - removed the usage of the contianer registry listener for updating the portlet container invoker Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/container/PortletContainerInvoker.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/container/PortletContainerInvoker.java 2008-02-19 10:58:39 UTC (rev 10025) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/container/PortletContainerInvoker.java 2008-02-19 11:39:23 UTC (rev 10026) @@ -54,20 +54,17 @@ * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision: 7226 $ */ -public class PortletContainerInvoker implements PortletInvoker, PortletApplicationRegistryListener +public class PortletContainerInvoker implements PortletInvoker { /** The key under which the portlet container is stored in the request scope of the invocation. */ public static final String PORTLET_CONTAINER = "PORTLET_CONTAINER"; /** . */ - private PortletApplicationRegistry registry; - - /** . */ private InterceptorStackFactory stackFactory; /** . */ - private Map<String, Portlet> portlets; + private Map<String, Portlet> portlets = new HashMap<String, Portlet>(); /** . */ private InvocationHandler handler = new InvocationHandler() @@ -92,16 +89,6 @@ } }; - public PortletApplicationRegistry getRegistry() - { - return registry; - } - - public void setRegistry(PortletApplicationRegistry registry) - { - this.registry = registry; - } - public InterceptorStackFactory getStackFactory() { return stackFactory; @@ -112,7 +99,7 @@ this.stackFactory = stackFactory; } - public synchronized void portletContainerRegistered(PortletContainer portletContainer) + public void addPortletContainer(PortletContainer portletContainer) { Map<String, Portlet> portlets = new HashMap<String, Portlet>(this.portlets); PortletImpl portlet = new PortletImpl(portletContainer); @@ -122,7 +109,7 @@ this.portlets = portlets; } - public synchronized void portletContainerUnregistered(PortletContainer portletContainer) + public void removePortletContainer(PortletContainer portletContainer) { Map<String, Portlet> portlets = new HashMap<String, Portlet>(this.portlets); PortletImpl portlet = new PortletImpl(portletContainer); @@ -134,29 +121,10 @@ public synchronized void start() throws Exception { - Map<String, Portlet> portlets = new HashMap<String, Portlet>(); - for (PortletApplication portletApplication : registry.getPortletApplications()) - { - for (PortletContainer portletContainer : portletApplication.getPortletContainers()) - { - PortletImpl portlet = new PortletImpl(portletContainer); - portlets.put(portlet.getContext().getId(), portlet); - } - } - - // - this.portlets = portlets; - - // - registry.addListener(this); } public synchronized void stop() throws Exception { - registry.removeListener(this); - - // - portlets = new HashMap<String, Portlet>(); } public Set<Portlet> getPortlets() Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/ManagedPortletApplication.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/ManagedPortletApplication.java 2008-02-19 10:58:39 UTC (rev 10025) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/ManagedPortletApplication.java 2008-02-19 11:39:23 UTC (rev 10026) @@ -23,11 +23,7 @@ package org.jboss.portal.portlet.test; import org.jboss.portal.portlet.container.PortletApplicationContext; -import org.jboss.portal.portlet.impl.jsr168.PortletApplicationImpl; -import org.jboss.portal.portlet.impl.jsr168.spi.PortletAPIFactory; -import org.jboss.portal.portlet.impl.info.ContainerPortletApplicationInfo; -import org.jboss.portal.portlet.impl.metadata.PortletApplication10MetaData; -import org.jboss.portal.portlet.metadata.JBossApplicationMetaData; +import org.jboss.portal.portlet.container.PortletApplication; import org.jboss.portal.web.WebApp; import org.jboss.portal.common.NotYetImplemented; @@ -46,49 +42,44 @@ private final WebApp webApp; /** . */ - final PortletApplicationImpl portletApplication; + private PortletApplication portletApplication; /** . */ private final Map<String, ManagedPortletContainer> managedPortletContainers; - public ManagedPortletApplication( - ContainerPortletApplicationInfo portletApplicationInfo, - PortletApplication10MetaData portletApplicationMetaData, - JBossApplicationMetaData jbossApplicationMetaData, - PortletAPIFactory portletAPIFactory, - WebApp webApp) + public ManagedPortletApplication(WebApp webApp) { this.webApp = webApp; - this.portletApplication = new PortletApplicationImpl( - portletApplicationInfo, - portletApplicationMetaData, - jbossApplicationMetaData, - portletAPIFactory); + this.portletApplication = null; this.managedPortletContainers = new HashMap<String, ManagedPortletContainer>(); } public void addManagedPortletContainer(ManagedPortletContainer managedPortletContainer) { - managedPortletContainers.put(managedPortletContainer.portletContainer.getId(), managedPortletContainer); - portletApplication.addContainer(managedPortletContainer.portletContainer); + managedPortletContainers.put(managedPortletContainer.getPortletContainer().getId(), managedPortletContainer); } public void removeManagedPortletContainer(ManagedPortletContainer managedPortletContainer) { - portletApplication.removeContainer(managedPortletContainer.portletContainer); - managedPortletContainers.remove(managedPortletContainer.portletContainer.getId()); + managedPortletContainers.remove(managedPortletContainer.getPortletContainer().getId()); } + public PortletApplication getPortletApplication() + { + return portletApplication; + } + + public void setPortletApplication(PortletApplication portletApplication) + { + this.portletApplication = portletApplication; + } + public void start() throws Exception { - portletApplication.setContext(this); - portletApplication.start(); } public void stop() { - portletApplication.stop(); - portletApplication.setContext(null); } // PortletApplicationContext **************************************************************************************** Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/ManagedPortletContainer.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/ManagedPortletContainer.java 2008-02-19 10:58:39 UTC (rev 10025) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/ManagedPortletContainer.java 2008-02-19 11:39:23 UTC (rev 10026) @@ -23,8 +23,7 @@ package org.jboss.portal.portlet.test; import org.jboss.portal.portlet.container.PortletContainerContext; -import org.jboss.portal.portlet.impl.jsr168.PortletContainerImpl; -import org.jboss.portal.portlet.impl.info.ContainerPortletInfo; +import org.jboss.portal.portlet.container.PortletContainer; import org.jboss.portal.common.NotYetImplemented; /** @@ -35,16 +34,11 @@ { /** . */ - final PortletContainerImpl portletContainer; + private PortletContainer portletContainer; /** . */ private ManagedPortletApplication managedPortletApplication; - public ManagedPortletContainer(ContainerPortletInfo portletInfo) - { - portletContainer = new PortletContainerImpl(portletInfo); - } - public ManagedPortletApplication getManagedPortletApplication() { return managedPortletApplication; @@ -52,29 +46,25 @@ public void setManagedPortletApplication(ManagedPortletApplication managedPortletApplication) { - if (managedPortletApplication != null) - { - portletContainer.setApplication(managedPortletApplication.portletApplication); - } - else - { - portletContainer.setApplication(null); - } - - // this.managedPortletApplication = managedPortletApplication; } + public PortletContainer getPortletContainer() + { + return portletContainer; + } + + public void setPortletContainer(PortletContainer portletContainer) + { + this.portletContainer = portletContainer; + } + public void start() throws Exception { - portletContainer.setContext(this); - portletContainer.start(); } public void stop() { - portletContainer.stop(); - portletContainer.setContext(null); } // Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/PortletApplicationDeployer.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/PortletApplicationDeployer.java 2008-02-19 10:58:39 UTC (rev 10025) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/PortletApplicationDeployer.java 2008-02-19 11:39:23 UTC (rev 10026) @@ -272,10 +272,9 @@ /** Called by MC to install application. */ public void addManagedPortletApplication(ManagedPortletApplication managedPortletApplication) { - PortletApplication portletApplication = managedPortletApplication.portletApplication; + PortletApplication portletApplication = managedPortletApplication.getPortletApplication(); PortletApplicationRegistrationContext context = registry.registerPortletApplication(portletApplication); registrationContextMap.put(managedPortletApplication, context); - } /** Called by MC to install container. */ @@ -283,14 +282,14 @@ { ManagedPortletApplication managedPortletApplication = managedPortletContainer.getManagedPortletApplication(); PortletApplicationRegistrationContext context = registrationContextMap.get(managedPortletApplication); - PortletContainer portletContainer = managedPortletContainer.portletContainer; + PortletContainer portletContainer = managedPortletContainer.getPortletContainer(); context.registerPortlet(portletContainer); } /** Called by MC to uninstall application. */ public void removeManagedPortletApplication(ManagedPortletApplication managedPortletApplication) { - PortletApplication portletApplication = managedPortletApplication.portletApplication; + PortletApplication portletApplication = managedPortletApplication.getPortletApplication(); registry.unregisterPortletApplication(portletApplication); } @@ -299,7 +298,7 @@ { ManagedPortletApplication managedPortletApplication = managedPortletContainer.getManagedPortletApplication(); PortletApplicationRegistrationContext context = registrationContextMap.get(managedPortletApplication); - PortletContainer portletContainer = managedPortletContainer.portletContainer; + PortletContainer portletContainer = managedPortletContainer.getPortletContainer(); context.unregisterPortlet(portletContainer); } } Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/PortletApplicationDeployment.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/PortletApplicationDeployment.java 2008-02-19 10:58:39 UTC (rev 10025) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/PortletApplicationDeployment.java 2008-02-19 11:39:23 UTC (rev 10026) @@ -44,6 +44,8 @@ import org.jboss.portal.portlet.impl.info.ContainerPortletApplicationInfo; import org.jboss.portal.portlet.impl.info.ContainerPortletInfo; import org.jboss.portal.portlet.impl.jsr168.ContainerInfoBuilderContextImpl; +import org.jboss.portal.portlet.impl.jsr168.PortletApplicationImpl; +import org.jboss.portal.portlet.impl.jsr168.PortletContainerImpl; import org.jboss.portal.portlet.impl.jsr168.spi.PortletAPIFactory; import org.jboss.portal.portlet.impl.metadata.PortletApplication10MetaData; import org.jboss.portal.portlet.metadata.JBossApplicationMetaData; @@ -53,6 +55,7 @@ import java.util.Collections; import java.util.LinkedHashMap; import java.util.List; +import java.util.HashSet; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> @@ -76,14 +79,6 @@ /** . */ private final LinkedHashMap<String, KernelControllerContext> installed; -// /** . */ -//// private KernelControllerContext portletApplicationControllerContext; -// -// /** . */ -//// private List<KernelControllerContext> portletContainerControllerContexts = new ArrayList<KernelControllerContext>(); -// -// /** . */ - public PortletApplicationDeployment(Kernel kernel, WebApp webApp, PortletApplication10MetaData metaData) { this.kernel = kernel; @@ -93,16 +88,21 @@ this.installed = new LinkedHashMap<String, KernelControllerContext>(); } - public AbstractBeanMetaData createManagedPortletContainerMetaData(String managedPortletContainerId, ContainerPortletInfo portletInfo) + public AbstractBeanMetaData createManagedPortletContainerMetaData(String managedPortletContainerId) { AbstractBeanMetaData beanMD = new AbstractBeanMetaData(managedPortletContainerId, ManagedPortletContainer.class.getName()); // AbstractConstructorMetaData ctorMD = new AbstractConstructorMetaData(); - ctorMD.setParameters(Tools.toList((ParameterMetaData)new AbstractParameterMetaData(ContainerPortletInfo.class.getName(), portletInfo))); + ctorMD.setParameters(new ArrayList<ParameterMetaData>()); beanMD.setConstructor(ctorMD); // + beanMD.setProperties(new HashSet<PropertyMetaData>()); + beanMD.setInstalls(new ArrayList<InstallMetaData>()); + beanMD.setUninstalls(new ArrayList<InstallMetaData>()); + + // beanMD.setStart(new AbstractLifecycleMetaData("start")); beanMD.setStop(new AbstractLifecycleMetaData("stop")); @@ -110,21 +110,69 @@ return beanMD; } - public AbstractBeanMetaData createManagedPortletApplicationMetaData(ContainerPortletApplicationInfo portletApplicationInfo, String managedPortletApplicationId) + public AbstractBeanMetaData createManagedPortletApplicationMetaData(String managedPortletApplicationId) { AbstractBeanMetaData beanMD = new AbstractBeanMetaData(managedPortletApplicationId, ManagedPortletApplication.class.getName()); // AbstractConstructorMetaData ctorMD = new AbstractConstructorMetaData(); + ctorMD.setParameters(Tools.toList((ParameterMetaData)new AbstractParameterMetaData(WebApp.class.getName(), webApp))); + beanMD.setConstructor(ctorMD); + + // + beanMD.setProperties(new HashSet<PropertyMetaData>()); + beanMD.setInstalls(new ArrayList<InstallMetaData>()); + beanMD.setUninstalls(new ArrayList<InstallMetaData>()); + + // + beanMD.setStart(new AbstractLifecycleMetaData("start")); + beanMD.setStop(new AbstractLifecycleMetaData("stop")); + + // + return beanMD; + } + + public AbstractBeanMetaData createPortletContainerMetaData(String portletContainerId, ContainerPortletInfo portletInfo) + { + AbstractBeanMetaData beanMD = new AbstractBeanMetaData(portletContainerId, PortletContainerImpl.class.getName()); + + // + AbstractConstructorMetaData ctorMD = new AbstractConstructorMetaData(); + ctorMD.setParameters(Tools.toList((ParameterMetaData)new AbstractParameterMetaData(ContainerPortletInfo.class.getName(), portletInfo))); + beanMD.setConstructor(ctorMD); + + // + beanMD.setProperties(new HashSet<PropertyMetaData>()); + beanMD.setInstalls(new ArrayList<InstallMetaData>()); + beanMD.setUninstalls(new ArrayList<InstallMetaData>()); + + // + beanMD.setStart(new AbstractLifecycleMetaData("start")); + beanMD.setStop(new AbstractLifecycleMetaData("stop")); + + // + return beanMD; + } + + public AbstractBeanMetaData createPortletApplicationMetaData(ContainerPortletApplicationInfo portletApplicationInfo, String portletApplicationId) + { + AbstractBeanMetaData beanMD = new AbstractBeanMetaData(portletApplicationId, PortletApplicationImpl.class.getName()); + + // + AbstractConstructorMetaData ctorMD = new AbstractConstructorMetaData(); ctorMD.setParameters(Tools.toList( (ParameterMetaData)new AbstractParameterMetaData(ContainerPortletApplicationInfo.class.getName(), portletApplicationInfo), new AbstractParameterMetaData(PortletApplication10MetaData.class.getName(), metaData), new AbstractParameterMetaData(JBossApplicationMetaData.class.getName(), (Object)null), - new AbstractParameterMetaData(PortletAPIFactory.class.getName(), new AbstractDependencyValueMetaData("PortletAPIFactory")), - new AbstractParameterMetaData(WebApp.class.getName(), webApp))); + new AbstractParameterMetaData(PortletAPIFactory.class.getName(), new AbstractDependencyValueMetaData("PortletAPIFactory")))); beanMD.setConstructor(ctorMD); // + beanMD.setProperties(new HashSet<PropertyMetaData>()); + beanMD.setInstalls(new ArrayList<InstallMetaData>()); + beanMD.setUninstalls(new ArrayList<InstallMetaData>()); + + // beanMD.setStart(new AbstractLifecycleMetaData("start")); beanMD.setStop(new AbstractLifecycleMetaData("stop")); @@ -158,109 +206,87 @@ for (ContainerPortletInfo containerInfo : builder.getPortlets()) { // + String portletContainerId = "PortletContainer[" + webApp.getContextPath() + "," + containerInfo.getName() + "]"; String managedPortletContainerId = "ManagedPortletContainer[" + webApp.getContextPath() + "," + containerInfo.getName() + "]"; // - AbstractBeanMetaData managedPortletContainerMD = createManagedPortletContainerMetaData(managedPortletContainerId, containerInfo); + AbstractBeanMetaData portletContainerMD = createPortletContainerMetaData(portletContainerId, containerInfo); + AbstractBeanMetaData managedPortletContainerMD = createManagedPortletContainerMetaData(managedPortletContainerId); -/* - // Inject the managed portlet container and the portlet application in the portlet container + // AbstractDependencyValueMetaData portletContainerContextDependencyMD = new AbstractDependencyValueMetaData(managedPortletContainerId); portletContainerContextDependencyMD.setDependentState(ControllerState.INSTANTIATED); - AbstractDependencyValueMetaData portletApplicationDependencyMD = new AbstractDependencyValueMetaData(portletApplicationId); - portletApplicationDependencyMD.setDependentState(ControllerState.INSTALLED); - portletContainerMD.setProperties(Tools.toSet( - (PropertyMetaData)new AbstractPropertyMetaData("context", portletContainerContextDependencyMD), - new AbstractPropertyMetaData("application", portletApplicationDependencyMD))); + portletContainerMD.getProperties().add(new AbstractPropertyMetaData("context", portletContainerContextDependencyMD)); - // Inject the portlet container in the managed portlet container + // AbstractDependencyValueMetaData portletContainerDependencyMD = new AbstractDependencyValueMetaData(portletContainerId); - portletContainerDependencyMD.setDependentState(ControllerState.INSTALLED); - managedPortletContainerMD.setProperties(Tools.toSet((PropertyMetaData)new AbstractPropertyMetaData("peer", portletContainerDependencyMD))); + portletContainerDependencyMD.setDependentState(ControllerState.START); + managedPortletContainerMD.getProperties().add(new AbstractPropertyMetaData("portletContainer", portletContainerDependencyMD)); - // Install the portlet container on the managed portlet container and on the portlet application + // + AbstractDependencyValueMetaData portletApplicationDependencyMD = new AbstractDependencyValueMetaData(portletApplicationId); + portletApplicationDependencyMD.setDependentState(ControllerState.START); + portletContainerMD.getProperties().add(new AbstractPropertyMetaData("application", portletApplicationDependencyMD)); + + // Install the portlet container on the portlet application AbstractInstallMetaData installPortletContainerMD = new AbstractInstallMetaData(); installPortletContainerMD.setBean(portletApplicationId); installPortletContainerMD.setParameters(Collections.singletonList((ParameterMetaData)new AbstractParameterMetaData(new ThisValueMetaData()))); installPortletContainerMD.setMethodName("addContainer"); - portletContainerMD.setInstalls(Tools.toList((InstallMetaData)installPortletContainerMD)); + installPortletContainerMD.setDependentState(ControllerState.START); + portletContainerMD.getInstalls().add(installPortletContainerMD); - // Uninstall the portlet container from the managed portlet container and from the portlet application + // Uninstall the portlet container from the portlet application AbstractInstallMetaData uninstallPortletContainerMD = new AbstractInstallMetaData(); uninstallPortletContainerMD.setBean(portletApplicationId); uninstallPortletContainerMD.setParameters(Collections.singletonList((ParameterMetaData)new AbstractParameterMetaData(new ThisValueMetaData()))); uninstallPortletContainerMD.setMethodName("removeContainer"); - portletContainerMD.setUninstalls(Tools.toList((InstallMetaData)uninstallPortletContainerMD)); + uninstallPortletContainerMD.setDependentState(ControllerState.START); + managedPortletContainerMD.getUninstalls().add(uninstallPortletContainerMD); - // Install the managed portlet container on the portlet application deployer - AbstractInstallMetaData installManagedPortletContainerMD = new AbstractInstallMetaData(); - installManagedPortletContainerMD.setBean("PortletApplicationDeployer"); - installManagedPortletContainerMD.setParameters(Collections.singletonList((ParameterMetaData)new AbstractParameterMetaData(new ThisValueMetaData()))); - installManagedPortletContainerMD.setMethodName("installManagedPortletContainer"); - managedPortletContainerMD.setInstalls(Collections.singletonList((InstallMetaData)installManagedPortletContainerMD)); - - // Uninstall the managed portlet container from the portlet application deployer - AbstractInstallMetaData uninstallManagedPortletCotainerMD = new AbstractInstallMetaData(); - uninstallManagedPortletCotainerMD.setBean("PortletApplicationDeployer"); - uninstallManagedPortletCotainerMD.setParameters(Collections.singletonList((ParameterMetaData)new AbstractParameterMetaData(new ThisValueMetaData()))); - uninstallManagedPortletCotainerMD.setMethodName("uninstallManagedPortletContainer"); - managedPortletContainerMD.setUninstalls(Collections.singletonList((InstallMetaData)uninstallManagedPortletCotainerMD)); -*/ - // Inject the managed portlet application in the managed portlet container AbstractDependencyValueMetaData managedPortletApplicationDependencyMD = new AbstractDependencyValueMetaData(managedPortletApplicationId); - managedPortletContainerMD.setProperties(Tools.toSet((PropertyMetaData)new AbstractPropertyMetaData("managedPortletApplication", managedPortletApplicationDependencyMD))); + managedPortletApplicationDependencyMD.setDependentState(ControllerState.START); + managedPortletContainerMD.getProperties().add(new AbstractPropertyMetaData("managedPortletApplication", managedPortletApplicationDependencyMD)); // Install the managed portlet container on the managed portlet application AbstractInstallMetaData installManagedPortletContainerMD = new AbstractInstallMetaData(); installManagedPortletContainerMD.setBean(managedPortletApplicationId); installManagedPortletContainerMD.setParameters(Collections.singletonList((ParameterMetaData)new AbstractParameterMetaData(new ThisValueMetaData()))); installManagedPortletContainerMD.setMethodName("addManagedPortletContainer"); - managedPortletContainerMD.setInstalls(Collections.singletonList((InstallMetaData)installManagedPortletContainerMD)); + installManagedPortletContainerMD.setDependentState(ControllerState.START); + managedPortletContainerMD.getInstalls().add(installManagedPortletContainerMD); // Uninstall the managed portlet container from the managed portlet application AbstractInstallMetaData uninstallManagedPortletContainerMD = new AbstractInstallMetaData(); uninstallManagedPortletContainerMD.setBean(managedPortletApplicationId); uninstallManagedPortletContainerMD.setParameters(Collections.singletonList((ParameterMetaData)new AbstractParameterMetaData(new ThisValueMetaData()))); uninstallManagedPortletContainerMD.setMethodName("removeManagedPortletContainer"); - managedPortletContainerMD.setUninstalls(Collections.singletonList((InstallMetaData)uninstallManagedPortletContainerMD)); + uninstallManagedPortletContainerMD.setDependentState(ControllerState.START); + managedPortletContainerMD.getUninstalls().add(uninstallManagedPortletContainerMD); // + toInstall.add(portletContainerMD); toInstall.add(managedPortletContainerMD); } // - AbstractBeanMetaData managedPortletApplicationMD = createManagedPortletApplicationMetaData(builder.getApplication(), managedPortletApplicationId); + AbstractBeanMetaData portletApplicationMD = createPortletApplicationMetaData(builder.getApplication(), portletApplicationId); + AbstractBeanMetaData managedPortletApplicationMD = createManagedPortletApplicationMetaData(managedPortletApplicationId); -/* - // Inject the managed portlet application in the portlet application + // AbstractDependencyValueMetaData portletApplicationContextDependencyMD = new AbstractDependencyValueMetaData(managedPortletApplicationId); portletApplicationContextDependencyMD.setDependentState(ControllerState.INSTANTIATED); - portletApplicationMD.setProperties(Collections.singleton((PropertyMetaData)new AbstractPropertyMetaData("context", portletApplicationContextDependencyMD))); + portletApplicationMD.getProperties().add(new AbstractPropertyMetaData("context", portletApplicationContextDependencyMD)); - // Inject the portlet application managed portlet application + // AbstractDependencyValueMetaData portletApplicationDependencyMD = new AbstractDependencyValueMetaData(portletApplicationId); - portletApplicationDependencyMD.setDependentState(ControllerState.INSTALLED); - managedPortletApplicationMD.setProperties(Tools.toSet((PropertyMetaData)new AbstractPropertyMetaData("peer", portletApplicationDependencyMD))); + portletApplicationDependencyMD.setDependentState(ControllerState.START); + managedPortletApplicationMD.getProperties().add(new AbstractPropertyMetaData("portletApplication", portletApplicationDependencyMD)); - // Install the managed portlet application on the portlet application deployer - AbstractInstallMetaData installManagedPortletApplicationMD = new AbstractInstallMetaData(); - installManagedPortletApplicationMD.setBean("PortletApplicationDeployer"); - installManagedPortletApplicationMD.setParameters(Collections.singletonList((ParameterMetaData)new AbstractParameterMetaData(new ThisValueMetaData()))); - installManagedPortletApplicationMD.setMethodName("installManagedPortletApplication"); - managedPortletApplicationMD.setInstalls(Collections.singletonList((InstallMetaData)installManagedPortletApplicationMD)); - - // Uninstall the managed portlet application from the portlet application deployer - AbstractInstallMetaData uninstallManagedPortletApplicationMD = new AbstractInstallMetaData(); - uninstallManagedPortletApplicationMD.setBean("PortletApplicationDeployer"); - uninstallManagedPortletApplicationMD.setParameters(Collections.singletonList((ParameterMetaData)new AbstractParameterMetaData(new ThisValueMetaData()))); - uninstallManagedPortletApplicationMD.setMethodName("uninstallManagedPortletApplication"); - managedPortletApplicationMD.setUninstalls(Collections.singletonList((InstallMetaData)uninstallManagedPortletApplicationMD)); -*/ - // + toInstall.add(portletApplicationMD); toInstall.add(managedPortletApplicationMD); -// toInstall.add(portletApplicationMD); // Install beans for (AbstractBeanMetaData beanMetaData : toInstall) Modified: modules/portlet/trunk/test/src/test/resources/portlet-test-war/WEB-INF/jboss-beans.xml =================================================================== --- modules/portlet/trunk/test/src/test/resources/portlet-test-war/WEB-INF/jboss-beans.xml 2008-02-19 10:58:39 UTC (rev 10025) +++ modules/portlet/trunk/test/src/test/resources/portlet-test-war/WEB-INF/jboss-beans.xml 2008-02-19 11:39:23 UTC (rev 10026) @@ -103,7 +103,8 @@ <!-- The portlet container invoker --> <bean name="PortletContainerInvoker" class="org.jboss.portal.portlet.container.PortletContainerInvoker"> <property name="stackFactory"><inject bean="ContainerStackFactory"/></property> - <property name="registry"><inject bean="PortletApplicationRegistry"/></property> + <incallback method="addPortletContainer"/> + <uncallback method="removePortletContainer"/> </bean> <!-- The producer persistence manager --> Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/jboss-beans.xml =================================================================== --- modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/jboss-beans.xml 2008-02-19 10:58:39 UTC (rev 10025) +++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/jboss-beans.xml 2008-02-19 11:39:23 UTC (rev 10026) @@ -91,7 +91,8 @@ <!-- The portlet container invoker --> <bean name="PortletContainerInvoker" class="org.jboss.portal.portlet.container.PortletContainerInvoker"> <property name="stackFactory"><inject bean="ContainerStackFactory"/></property> - <property name="registry"><inject bean="PortletApplicationRegistry"/></property> + <incallback method="addPortletContainer"/> + <uncallback method="removePortletContainer"/> </bean> <!-- The producer persistence manager -->