[portal-commits] JBoss Portal SVN: r11747 - in modules/web/trunk/web/src: main/java/org/jboss/portal/web/impl/tomcat and 1 other directories.
Author: mwringe
Date: 2008-08-27 10:21:54 -0400 (Wed, 27 Aug 2008)
New Revision: 11747
Removed:
modules/web/trunk/web/src/main/java/org/jboss/portal/web/impl/jboss/
Modified:
modules/web/trunk/web/src/main/java/org/jboss/portal/web/impl/tomcat/TC6ServletContainerContext.java
modules/web/trunk/web/src/test/resources/support/jboss-5.0-container-servlet/server-war/WEB-INF/web.xml
Log:
Update JBoss AS5 support to not require changes to StandardHost.startChildren.
Modified:
modules/web/trunk/web/src/main/java/org/jboss/portal/web/impl/tomcat/TC6ServletContainerContext.java
===================================================================
---
modules/web/trunk/web/src/main/java/org/jboss/portal/web/impl/tomcat/TC6ServletContainerContext.java 2008-08-27
12:34:31 UTC (rev 11746)
+++
modules/web/trunk/web/src/main/java/org/jboss/portal/web/impl/tomcat/TC6ServletContainerContext.java 2008-08-27
14:21:54 UTC (rev 11747)
@@ -146,7 +146,7 @@
}
}
- protected void start()
+ void start()
{
DefaultServletContainerFactory.registerContext(this);
@@ -165,7 +165,7 @@
engine.addContainerListener(this);
}
- protected void stop()
+ void stop()
{
engine.removeContainerListener(this);
Modified:
modules/web/trunk/web/src/test/resources/support/jboss-5.0-container-servlet/server-war/WEB-INF/web.xml
===================================================================
---
modules/web/trunk/web/src/test/resources/support/jboss-5.0-container-servlet/server-war/WEB-INF/web.xml 2008-08-27
12:34:31 UTC (rev 11746)
+++
modules/web/trunk/web/src/test/resources/support/jboss-5.0-container-servlet/server-war/WEB-INF/web.xml 2008-08-27
14:21:54 UTC (rev 11747)
@@ -39,7 +39,7 @@
</listener>
<servlet>
<servlet-name>ContainerServlet</servlet-name>
-
<servlet-class>org.jboss.portal.web.impl.jboss.JB5ContainerServlet</servlet-class>
+
<servlet-class>org.jboss.portal.web.impl.tomcat.TC6ContainerServlet</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>
<servlet>