[portal-commits] JBoss Portal SVN: r10278 - in modules/web/trunk/web/src: main/java/org/jboss/portal/web/impl and 1 other directories.

Author: chris.laprun(a)jboss.com Date: 2008-03-12 22:51:41 -0400 (Wed, 12 Mar 2008) New Revision: 10278 Modified: modules/web/trunk/web/src/main/java/org/jboss/portal/web/ServletContainer.java modules/web/trunk/web/src/main/java/org/jboss/portal/web/impl/DefaultServletContainer.java modules/web/trunk/web/src/test/java/org/jboss/portal/test/web/container/ServletContainerTestCase.java Log: Moved register method back to ServletContainer interface as it's needed by 2.7 Modified: modules/web/trunk/web/src/main/java/org/jboss/portal/web/ServletContainer.java =================================================================== --- modules/web/trunk/web/src/main/java/org/jboss/portal/web/ServletContainer.java 2008-03-13 00:45:45 UTC (rev 10277) +++ modules/web/trunk/web/src/main/java/org/jboss/portal/web/ServletContainer.java 2008-03-13 02:51:41 UTC (rev 10278) @@ -22,6 +22,8 @@ ******************************************************************************/ package org.jboss.portal.web; +import org.jboss.portal.web.spi.ServletContainerContext; + import javax.servlet.ServletContext; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; @@ -80,4 +82,13 @@ HttpServletResponse response, RequestDispatchCallback callback, Object handback) throws ServletException, IOException; + + /** + * Register a servlet container context. The registration is considered as successful if no existing context is + * already registered. + * + * @param context the servlet container context to register + * @throws IllegalArgumentException if the context is null + */ + void register(ServletContainerContext context); } Modified: modules/web/trunk/web/src/main/java/org/jboss/portal/web/impl/DefaultServletContainer.java =================================================================== --- modules/web/trunk/web/src/main/java/org/jboss/portal/web/impl/DefaultServletContainer.java 2008-03-13 00:45:45 UTC (rev 10277) +++ modules/web/trunk/web/src/main/java/org/jboss/portal/web/impl/DefaultServletContainer.java 2008-03-13 02:51:41 UTC (rev 10278) @@ -66,13 +66,6 @@ /** The callback. */ private RegistrationImpl registration; - /** - * Register a servlet container context. The registration is considered as successful if no existing context is - * already registered. - * - * @param context the servlet container context to register - * @throws IllegalArgumentException if the context is null - */ public void register(ServletContainerContext context) { synchronized (lock) Modified: modules/web/trunk/web/src/test/java/org/jboss/portal/test/web/container/ServletContainerTestCase.java =================================================================== --- modules/web/trunk/web/src/test/java/org/jboss/portal/test/web/container/ServletContainerTestCase.java 2008-03-13 00:45:45 UTC (rev 10277) +++ modules/web/trunk/web/src/test/java/org/jboss/portal/test/web/container/ServletContainerTestCase.java 2008-03-13 02:51:41 UTC (rev 10278) @@ -24,6 +24,7 @@ import org.jboss.portal.web.WebAppListener; import org.jboss.portal.web.WebAppEvent; +import org.jboss.portal.web.ServletContainer; import org.jboss.portal.web.impl.DefaultServletContainer; import org.jboss.portal.web.spi.ServletContainerContext; import org.jboss.portal.common.util.Tools; @@ -44,7 +45,7 @@ @Test public void testContextRegistrationLifeCycle() { - DefaultServletContainer container = new DefaultServletContainer(); + ServletContainer container = new DefaultServletContainer(); ServletContainerContextImpl scc = new ServletContainerContextImpl(); // @@ -92,7 +93,7 @@ @Test public void testConcurrentContextRegistrations() { - DefaultServletContainer container = new DefaultServletContainer(); + ServletContainer container = new DefaultServletContainer(); ServletContainerContextImpl scc1 = new ServletContainerContextImpl(); ServletContainerContextImpl scc2 = new ServletContainerContextImpl(); @@ -121,7 +122,7 @@ @Test public void testContextRegistrationCancellationUnregistersWebApps() { - DefaultServletContainer container = new DefaultServletContainer(); + ServletContainer container = new DefaultServletContainer(); ServletContainerContextImpl scc = new ServletContainerContextImpl(); WebAppRegistry registry = new WebAppRegistry(); @@ -144,7 +145,7 @@ @Test public void testListenerDoubleRegistration() { - DefaultServletContainer container = new DefaultServletContainer(); + ServletContainer container = new DefaultServletContainer(); ServletContainerContextImpl scc = new ServletContainerContextImpl(); WebAppRegistry registry = new WebAppRegistry(); @@ -173,7 +174,7 @@ @Test public void testListenerIsNotified() { - DefaultServletContainer container = new DefaultServletContainer(); + ServletContainer container = new DefaultServletContainer(); ServletContainerContextImpl scc = new ServletContainerContextImpl(); WebAppRegistry registry = new WebAppRegistry(); @@ -218,7 +219,7 @@ @Test public void testServletContainerThrowsIAE() { - DefaultServletContainer container = new DefaultServletContainer(); + ServletContainer container = new DefaultServletContainer(); try { container.register(null); @@ -248,7 +249,7 @@ @Test public void testServletContainerThrowsISE() throws Exception { - DefaultServletContainer container = new DefaultServletContainer(); + ServletContainer container = new DefaultServletContainer(); try { container.include(null, null, null, null, null); @@ -262,7 +263,7 @@ @Test public void testListenerFailure() { - DefaultServletContainer container = new DefaultServletContainer(); + ServletContainer container = new DefaultServletContainer(); ServletContainerContextImpl scc = new ServletContainerContextImpl(); WebAppRegistry registry = new WebAppRegistry();