Author: julien(a)jboss.com Date: 2008-02-19 19:03:59 -0500 (Tue, 19 Feb 2008) New Revision: 10036 Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/PortletApplicationDeployment.java modules/portlet/trunk/test/src/test/resources/portal/samples/basic-war/WEB-INF/portlet.xml modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/demo3.jsp Log: add a couple of stuff 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 22:17:41 UTC (rev 10035) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/PortletApplicationDeployment.java 2008-02-20 00:03:59 UTC (rev 10036) @@ -155,6 +155,12 @@ List<AbstractBeanMetaData> toInstall = new ArrayList<AbstractBeanMetaData>(); // + AbstractBeanMetaData kernelPortletApplicationMD = createKernelPortletApplicationMetaData(builder.getApplication(), kernelPortletApplicationId); + + // + toInstall.add(kernelPortletApplicationMD); + + // for (ContainerPortletInfo containerInfo : builder.getPortlets()) { // @@ -165,7 +171,7 @@ // Inject the kernel portlet application in the kernel portlet container AbstractDependencyValueMetaData kernelPortletApplicationDependencyMD = new AbstractDependencyValueMetaData(kernelPortletApplicationId); - kernelPortletApplicationDependencyMD.setDependentState(ControllerState.START); +// kernelPortletApplicationDependencyMD.setDependentState(ControllerState.START); kernelPortletContainerMD.getProperties().add(new AbstractPropertyMetaData("kernelPortletApplication", kernelPortletApplicationDependencyMD)); // Install the kernel portlet container on the kernel portlet application @@ -173,7 +179,7 @@ installKernelPortletContainerMD.setBean(kernelPortletApplicationId); installKernelPortletContainerMD.setParameters(Collections.singletonList((ParameterMetaData)new AbstractParameterMetaData(new ThisValueMetaData()))); installKernelPortletContainerMD.setMethodName("addKernelPortletContainer"); - installKernelPortletContainerMD.setDependentState(ControllerState.START); +// installKernelPortletContainerMD.setState(ControllerState.st); kernelPortletContainerMD.getInstalls().add(installKernelPortletContainerMD); // Uninstall the kernel portlet container from the kernel portlet application @@ -181,19 +187,13 @@ uninstallKernelPortletContainerMD.setBean(kernelPortletApplicationId); uninstallKernelPortletContainerMD.setParameters(Collections.singletonList((ParameterMetaData)new AbstractParameterMetaData(new ThisValueMetaData()))); uninstallKernelPortletContainerMD.setMethodName("removeKernelPortletContainer"); - uninstallKernelPortletContainerMD.setDependentState(ControllerState.START); +// uninstallKernelPortletContainerMD.setState(ControllerState.INSTANTIATED); kernelPortletContainerMD.getUninstalls().add(uninstallKernelPortletContainerMD); // toInstall.add(kernelPortletContainerMD); } - // - AbstractBeanMetaData kernelPortletApplicationMD = createKernelPortletApplicationMetaData(builder.getApplication(), kernelPortletApplicationId); - - // - toInstall.add(kernelPortletApplicationMD); - // Install beans for (AbstractBeanMetaData beanMetaData : toInstall) { Modified: modules/portlet/trunk/test/src/test/resources/portal/samples/basic-war/WEB-INF/portlet.xml =================================================================== --- modules/portlet/trunk/test/src/test/resources/portal/samples/basic-war/WEB-INF/portlet.xml 2008-02-19 22:17:41 UTC (rev 10035) +++ modules/portlet/trunk/test/src/test/resources/portal/samples/basic-war/WEB-INF/portlet.xml 2008-02-20 00:03:59 UTC (rev 10036) @@ -34,7 +34,7 @@ <mime-type>text/html</mime-type> </supports> <portlet-info> - <title>ExceptionPortlet</title> + <title>Exception portlet</title> </portlet-info> </portlet> @@ -48,8 +48,22 @@ <mime-type>text/javascript</mime-type> </supports> <portlet-info> - <title>HeaderPortlet</title> + <title>Header portlet</title> </portlet-info> </portlet> + <portlet> + <portlet-name>FailDuringInitPortlet</portlet-name> + <portlet-class>org.jboss.portal.portlet.portal.samples.basic.FailDuringInitPortlet</portlet-class> + <supports> + <mime-type>text/html</mime-type> + </supports> + <supports> + <mime-type>text/javascript</mime-type> + </supports> + <portlet-info> + <title>Fail during init portlet</title> + </portlet-info> + </portlet> + </portlet-app> Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/demo3.jsp =================================================================== --- modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/demo3.jsp 2008-02-19 22:17:41 UTC (rev 10035) +++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/demo3.jsp 2008-02-20 00:03:59 UTC (rev 10036) @@ -14,9 +14,10 @@ <jbp:portlet name="Foo" applicationName="bar"/> </jsp:attribute> <jsp:attribute name="rightcol"> + <jbp:portlet name="ExceptionPortlet" applicationName="samples-basic"/> - <jbp:portlet name="HeaderPortlet" applicationName="samples-basic" id="header-portlet"/> + <jbp:portlet name="FailDuringInitPortlet" applicationName="samples-basic" id="header-portlet"/> </jsp:attribute>