Author: chris.laprun(a)jboss.com Date: 2008-01-15 11:16:29 -0500 (Tue, 15 Jan 2008) New Revision: 9513 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/PortletControllerContextImpl.java modules/portlet/trunk/test/src/test/resources/portlet-test-war/WEB-INF/jboss-beans.xml Log: - Minor code improvements and generification. 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-01-15 14:39:35 UTC (rev 9512) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/PortletApplicationDeployer.java 2008-01-15 16:16:29 UTC (rev 9513) @@ -22,38 +22,38 @@ ******************************************************************************/ package org.jboss.portal.portlet.test; -import org.jboss.portal.web.WebAppListener; -import org.jboss.portal.web.WebAppEvent; -import org.jboss.portal.web.WebAppLifeCycleEvent; -import org.jboss.portal.web.WebApp; -import org.jboss.portal.web.ServletContainer; +import org.apache.log4j.Logger; +import org.jboss.kernel.Kernel; +import org.jboss.kernel.spi.dependency.KernelControllerContext; +import org.jboss.kernel.spi.dependency.KernelControllerContextAware; +import org.jboss.portal.common.io.IOTools; +import org.jboss.portal.portlet.container.PortletApplication; +import org.jboss.portal.portlet.container.PortletApplicationRegistrationContext; +import org.jboss.portal.portlet.container.PortletApplicationRegistry; +import org.jboss.portal.portlet.container.PortletContainer; +import org.jboss.portal.portlet.impl.metadata.PortletApplication10MetaData; import static org.jboss.portal.portlet.impl.metadata.PortletMetaDataConstants.PORTLET_JSR_168_NS; import static org.jboss.portal.portlet.impl.metadata.PortletMetaDataConstants.PORTLET_JSR_286_NS; -import org.jboss.portal.portlet.impl.metadata.PortletApplication10MetaData; -import org.jboss.portal.portlet.test.metadata.impl.AnnotationPortletApplication20MetaData; +import org.jboss.portal.portlet.test.metadata.factory.PortletApplicationModelFactory; import org.jboss.portal.portlet.test.metadata.impl.AnnotationPortletApplication10MetaData; +import org.jboss.portal.portlet.test.metadata.impl.AnnotationPortletApplication20MetaData; import org.jboss.portal.portlet.test.metadata.impl.ValueTrimmingFilter; -import org.jboss.portal.portlet.test.metadata.factory.PortletApplicationModelFactory; -import org.jboss.portal.portlet.container.PortletApplication; -import org.jboss.portal.portlet.container.PortletContainer; -import org.jboss.portal.portlet.container.PortletApplicationRegistry; -import org.jboss.portal.portlet.container.PortletApplicationRegistrationContext; -import org.jboss.portal.common.io.IOTools; -import org.jboss.kernel.spi.dependency.KernelControllerContextAware; -import org.jboss.kernel.spi.dependency.KernelControllerContext; -import org.jboss.kernel.Kernel; +import org.jboss.portal.web.ServletContainer; +import org.jboss.portal.web.WebApp; +import org.jboss.portal.web.WebAppEvent; +import org.jboss.portal.web.WebAppLifeCycleEvent; +import org.jboss.portal.web.WebAppListener; +import org.jboss.xb.binding.JBossXBException; import org.jboss.xb.binding.Unmarshaller; import org.jboss.xb.binding.UnmarshallerFactory; -import org.jboss.xb.binding.JBossXBException; -import org.jboss.xb.binding.sunday.unmarshalling.SingletonSchemaResolverFactory; import org.jboss.xb.binding.sunday.unmarshalling.DefaultSchemaResolver; -import org.apache.log4j.Logger; +import org.jboss.xb.binding.sunday.unmarshalling.SingletonSchemaResolverFactory; -import java.util.Map; -import java.util.HashMap; -import java.net.URL; -import java.io.InputStream; import java.io.IOException; +import java.io.InputStream; +import java.net.URL; +import java.util.HashMap; +import java.util.Map; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> @@ -62,18 +62,12 @@ public class PortletApplicationDeployer implements WebAppListener, KernelControllerContextAware { - /** The schema resolver factory. */ - private static SingletonSchemaResolverFactory factory; - - /** The schema resolver. */ - private static DefaultSchemaResolver resolver; - static { try { - factory = SingletonSchemaResolverFactory.getInstance(); - resolver = (DefaultSchemaResolver) factory.getSchemaBindingResolver(); + SingletonSchemaResolverFactory factory = SingletonSchemaResolverFactory.getInstance(); + DefaultSchemaResolver resolver = (DefaultSchemaResolver)factory.getSchemaBindingResolver(); /** SchemaResolver */ resolver.addSchemaLocation(PORTLET_JSR_168_NS, "portlet-app_1_0.xsd"); @@ -100,13 +94,14 @@ private KernelControllerContext controllerContext; /** . */ - private Map deploymentMap = new HashMap(); + private Map<String, PortletApplicationDeployment> deploymentMap = new HashMap<String, PortletApplicationDeployment>(); /** . */ private ClassLoader classLoader; /** . */ - private final Map registrationContextMap = new HashMap(); + private final Map<PortletApplication, PortletApplicationRegistrationContext> registrationContextMap = + new HashMap<PortletApplication, PortletApplicationRegistrationContext>(); /** . */ private Object driver; @@ -147,7 +142,7 @@ { WebAppLifeCycleEvent lifeCycleEvent = (WebAppLifeCycleEvent)event; String cp = event.getWebApp().getContextPath(); - switch(lifeCycleEvent.getType()) + switch (lifeCycleEvent.getType()) { case WebAppLifeCycleEvent.ADDED: log.debug("Going to install war file" + cp); @@ -197,7 +192,7 @@ private void remove(WebApp webApp) { - PortletApplicationDeployment deployment = (PortletApplicationDeployment)deploymentMap.remove(webApp.getContextPath()); + PortletApplicationDeployment deployment = deploymentMap.remove(webApp.getContextPath()); if (deployment != null) { ClassLoader oldCL = Thread.currentThread().getContextClassLoader(); @@ -290,38 +285,30 @@ return null; } - /** - * Called by MC to install application. - */ + /** Called by MC to install application. */ public void installPortletApplication(PortletApplication application) { PortletApplicationRegistrationContext context = registry.registerPortletApplication(application); registrationContextMap.put(application, context); } - /** - * Called by MC to install container. - */ + /** Called by MC to install container. */ public void installPortletContainer(PortletContainer container) { - PortletApplicationRegistrationContext context = (PortletApplicationRegistrationContext)registrationContextMap.get(container.getApplication()); + PortletApplicationRegistrationContext context = registrationContextMap.get(container.getApplication()); context.registerPortlet(container); } - /** - * Called by MC to uninstall application. - */ + /** Called by MC to uninstall application. */ public void uninstallPortletApplication(PortletApplication application) { registry.unregisterPortletApplication(application); } - /** - * Called by MC to uninstall container. - */ + /** Called by MC to uninstall container. */ public void uninstallPortletContainer(PortletContainer container) { - PortletApplicationRegistrationContext context = (PortletApplicationRegistrationContext)registrationContextMap.get(container.getApplication()); + PortletApplicationRegistrationContext context = registrationContextMap.get(container.getApplication()); context.unregisterPortlet(container); } } Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/PortletControllerContextImpl.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/PortletControllerContextImpl.java 2008-01-15 14:39:35 UTC (rev 9512) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/PortletControllerContextImpl.java 2008-01-15 16:16:29 UTC (rev 9513) @@ -22,24 +22,24 @@ ******************************************************************************/ package org.jboss.portal.portlet.test; -import org.jboss.portal.web.IllegalRequestException; -import org.jboss.portal.web.WebRequest; -import org.jboss.portal.web.Body; -import org.jboss.portal.portlet.test.url.ParameterDecoder; -import org.jboss.portal.portlet.PortletInvoker; +import org.jboss.portal.Mode; +import org.jboss.portal.WindowState; +import org.jboss.portal.common.util.ParameterMap; +import org.jboss.portal.common.util.Tools; import org.jboss.portal.portlet.Portlet; -import org.jboss.portal.portlet.PortletInvokerException; import org.jboss.portal.portlet.PortletContext; -import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; +import org.jboss.portal.portlet.PortletInvoker; +import org.jboss.portal.portlet.PortletInvokerException; import org.jboss.portal.portlet.invocation.PortletInvocation; -import org.jboss.portal.common.util.ParameterMap; -import org.jboss.portal.common.util.Tools; -import org.jboss.portal.Mode; -import org.jboss.portal.WindowState; +import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; +import org.jboss.portal.portlet.test.url.ParameterDecoder; +import org.jboss.portal.web.Body; +import org.jboss.portal.web.IllegalRequestException; +import org.jboss.portal.web.WebRequest; +import javax.servlet.ServletContext; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javax.servlet.ServletContext; import java.io.IOException; import java.util.Collection; @@ -73,7 +73,7 @@ /** . */ private final PortletInvoker invoker; - + public PortletControllerContextImpl( HttpServletRequest req, HttpServletResponse resp, @@ -89,13 +89,14 @@ // PortletInvoker invoker = (PortletInvoker)servletContext.getAttribute("ConsumerPortletInvoker"); - // - String pathInfo = req.getPathInfo(); - String targetId; + PortalNavigationalState navState; + PortletController.Action action; + // decode request + String pathInfo = req.getPathInfo(); if (pathInfo != null && pathInfo.startsWith("/") && pathInfo.length() > 1) { - targetId = StringCodec.decode(pathInfo.substring(1)); + String targetId = StringCodec.decode(pathInfo.substring(1)); WebRequest ri = new WebRequest(req); ParameterDecoder decoder = PortletURLRenderer.builder.createDecoder(); @@ -104,7 +105,6 @@ // ParameterMap metaParameters = decoder.getMetaParameters(); - PortalNavigationalState navState; if (navStateScope == NAV_SCOPE) { String ns = metaParameters.getValue("ns"); @@ -134,7 +134,6 @@ } // - PortletController.Action action; String type = metaParameters.getValue("type"); // @@ -152,23 +151,11 @@ { action = new PortletController.PortletRender(targetId, actualParameters, formParameters, mode, windowState); } - - // - this.navState = navState; - this.action = action; - this.req = req; - this.resp = resp; - this.servletContext = servletContext; - this.invoker = invoker; } else { - this.navState = new PortalNavigationalState(); - this.action = null; - this.req = req; - this.resp = resp; - this.servletContext = servletContext; - this.invoker = invoker; + navState = new PortalNavigationalState(); + action = null; // if (navStateScope == SESSION_SCOPE) @@ -176,6 +163,13 @@ req.getSession().setAttribute("nav_state", navState); } } + + this.navState = navState; + this.action = action; + this.req = req; + this.resp = resp; + this.servletContext = servletContext; + this.invoker = invoker; } public PortletController.Action getRequest() 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-01-15 14:39:35 UTC (rev 9512) +++ modules/portlet/trunk/test/src/test/resources/portlet-test-war/WEB-INF/jboss-beans.xml 2008-01-15 16:16:29 UTC (rev 9513) @@ -25,10 +25,10 @@ xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd" xmlns="urn:jboss:bean-deployer"> - <bean name="TestDriverServer" class="org.jboss.unit.remote.driver.RemoteTestDriverServer"> - </bean> + <bean name="TestDriverServer" class="org.jboss.unit.remote.driver.RemoteTestDriverServer"/> - <bean name="TestDriverServerExporter" class="org.jboss.portal.test.framework.impl.generic.server.GenericServiceExporter"> + <bean name="TestDriverServerExporter" + class="org.jboss.portal.test.framework.impl.generic.server.GenericServiceExporter"> <constructor> <parameter>socket://localhost:5400</parameter> <parameter><inject bean="TestDriverServer"/></parameter> @@ -37,8 +37,8 @@ </bean> <!-- An application registry mainly for listeners --> - <bean name="PortletApplicationRegistry" class="org.jboss.portal.portlet.impl.container.PortletApplicationRegistryImpl"> - </bean> + <bean name="PortletApplicationRegistry" + class="org.jboss.portal.portlet.impl.container.PortletApplicationRegistryImpl"/> <bean name="PortletApplicationDeployer" class="org.jboss.portal.portlet.test.PortletApplicationDeployer"> <property name="registry"><inject bean="PortletApplicationRegistry"/></property> @@ -46,8 +46,7 @@ <property name="driver"><inject bean="TestDriverServer"/></property> </bean> - <bean name="PortletAPIFactory" class="org.jboss.portal.portlet.impl.jsr168.PortletAPIFactoryImpl"> - </bean> + <bean name="PortletAPIFactory" class="org.jboss.portal.portlet.impl.jsr168.PortletAPIFactoryImpl"/> <!-- The ServletContainerFactory --> <bean name="ServletContainerFactory" class="org.jboss.portal.web.impl.DefaultServletContainerFactory"> @@ -79,22 +78,18 @@ </bean> <!-- Container stack --> - <bean name="ValveInterceptor" class="org.jboss.portal.portlet.aspects.portlet.ValveInterceptor"> - </bean> - <bean name="SecureTransportInterceptor" class="org.jboss.portal.portlet.aspects.portlet.SecureTransportInterceptor"> - </bean> - <bean name="ContextDispatcherInterceptor" class="org.jboss.portal.portlet.aspects.portlet.ContextDispatcherInterceptor"> + <bean name="ValveInterceptor" class="org.jboss.portal.portlet.aspects.portlet.ValveInterceptor"/> + <bean name="SecureTransportInterceptor" class="org.jboss.portal.portlet.aspects.portlet.SecureTransportInterceptor"/> + <bean name="ContextDispatcherInterceptor" + class="org.jboss.portal.portlet.aspects.portlet.ContextDispatcherInterceptor"> <property name="servletContainerFactory"><inject bean="ServletContainerFactory"/></property> </bean> - <bean name="WindowStatesInterceptor" class="org.jboss.portal.portlet.aspects.portlet.WindowStatesInterceptor"> - </bean> - <bean name="ModesInterceptor" class="org.jboss.portal.portlet.aspects.portlet.ModesInterceptor"> - </bean> - <bean name="ProducerCacheInterceptor" class="org.jboss.portal.portlet.aspects.portlet.ProducerCacheInterceptor"> - </bean> + <bean name="WindowStatesInterceptor" class="org.jboss.portal.portlet.aspects.portlet.WindowStatesInterceptor"/> + <bean name="ModesInterceptor" class="org.jboss.portal.portlet.aspects.portlet.ModesInterceptor"/> + <bean name="ProducerCacheInterceptor" class="org.jboss.portal.portlet.aspects.portlet.ProducerCacheInterceptor"/> <bean name="ContainerStackFactory" class="org.jboss.portal.portlet.test.InterceptorStackFactoryImpl"> <property name="interceptors"> - <array > + <array> <inject bean="ValveInterceptor"/> <inject bean="SecureTransportInterceptor"/> <inject bean="ContextDispatcherInterceptor"/> @@ -112,7 +107,8 @@ </bean> <!-- The producer persistence manager --> - <bean name="ProducerPersistenceManager" class="org.jboss.portal.portlet.impl.state.producer.PortletStatePersistenceManagerService"></bean> + <bean name="ProducerPersistenceManager" + class="org.jboss.portal.portlet.impl.state.producer.PortletStatePersistenceManagerService"/> <!-- The producer state management policy --> <bean name="ProducerStateManagementPolicy" class="org.jboss.portal.portlet.impl.state.StateManagementPolicyService"> @@ -120,7 +116,7 @@ </bean> <!-- The producer state converter --> - <bean name="ProducerStateConverter" class="org.jboss.portal.portlet.impl.state.StateConverterV0"></bean> + <bean name="ProducerStateConverter" class="org.jboss.portal.portlet.impl.state.StateConverterV0"/> <!-- The producer portlet invoker --> <bean name="ProducerPortletInvoker" class="org.jboss.portal.portlet.state.producer.ProducerPortletInvoker">