Author: remy.maucherat(a)jboss.com Date: 2008-01-31 09:36:54 -0500 (Thu, 31 Jan 2008) New Revision: 414 Added: trunk/java/org/jboss/web/comet/ Removed: trunk/java/org/apache/comet/ Modified: trunk/java/org/apache/catalina/Valve.java trunk/java/org/apache/catalina/connector/CometEventImpl.java trunk/java/org/apache/catalina/connector/CoyoteAdapter.java trunk/java/org/apache/catalina/core/ApplicationFilterChain.java trunk/java/org/apache/catalina/core/ApplicationFilterFactory.java trunk/java/org/apache/catalina/core/StandardContextValve.java trunk/java/org/apache/catalina/core/StandardEngineValve.java trunk/java/org/apache/catalina/core/StandardHostValve.java trunk/java/org/apache/catalina/core/StandardWrapperValve.java trunk/java/org/apache/catalina/valves/CometConnectionManagerValve.java trunk/java/org/apache/catalina/valves/ValveBase.java trunk/java/org/jboss/web/comet/CometEvent.java trunk/java/org/jboss/web/comet/CometFilter.java trunk/java/org/jboss/web/comet/CometFilterChain.java trunk/java/org/jboss/web/comet/CometProcessor.java trunk/webapps/docs/changelog.xml Log: - As the API and functionality is a bit different from the Tomcat version, I think it is more appropriate to move to a different package, at least for now. Modified: trunk/java/org/apache/catalina/Valve.java =================================================================== --- trunk/java/org/apache/catalina/Valve.java 2008-01-31 11:50:48 UTC (rev 413) +++ trunk/java/org/apache/catalina/Valve.java 2008-01-31 14:36:54 UTC (rev 414) @@ -24,7 +24,7 @@ import org.apache.catalina.connector.Request; import org.apache.catalina.connector.Response; -import org.apache.comet.CometEvent; +import org.jboss.web.comet.CometEvent; /** Modified: trunk/java/org/apache/catalina/connector/CometEventImpl.java =================================================================== --- trunk/java/org/apache/catalina/connector/CometEventImpl.java 2008-01-31 11:50:48 UTC (rev 413) +++ trunk/java/org/apache/catalina/connector/CometEventImpl.java 2008-01-31 14:36:54 UTC (rev 414) @@ -24,7 +24,7 @@ import javax.servlet.http.HttpServletResponse; import org.apache.catalina.util.StringManager; -import org.apache.comet.CometEvent; +import org.jboss.web.comet.CometEvent; public class CometEventImpl implements CometEvent { Modified: trunk/java/org/apache/catalina/connector/CoyoteAdapter.java =================================================================== --- trunk/java/org/apache/catalina/connector/CoyoteAdapter.java 2008-01-31 11:50:48 UTC (rev 413) +++ trunk/java/org/apache/catalina/connector/CoyoteAdapter.java 2008-01-31 14:36:54 UTC (rev 414) @@ -25,7 +25,6 @@ import org.apache.catalina.Wrapper; import org.apache.catalina.util.StringManager; import org.apache.catalina.util.URLEncoder; -import org.apache.comet.CometEvent; import org.apache.coyote.ActionCode; import org.apache.coyote.Adapter; import org.apache.tomcat.util.buf.B2CConverter; @@ -36,6 +35,7 @@ import org.apache.tomcat.util.http.ServerCookie; import org.apache.tomcat.util.net.SocketStatus; import org.jboss.logging.Logger; +import org.jboss.web.comet.CometEvent; /** Modified: trunk/java/org/apache/catalina/core/ApplicationFilterChain.java =================================================================== --- trunk/java/org/apache/catalina/core/ApplicationFilterChain.java 2008-01-31 11:50:48 UTC (rev 413) +++ trunk/java/org/apache/catalina/core/ApplicationFilterChain.java 2008-01-31 14:36:54 UTC (rev 414) @@ -37,10 +37,10 @@ import org.apache.catalina.security.SecurityUtil; import org.apache.catalina.util.InstanceSupport; import org.apache.catalina.util.StringManager; -import org.apache.comet.CometEvent; -import org.apache.comet.CometFilter; -import org.apache.comet.CometFilterChain; -import org.apache.comet.CometProcessor; +import org.jboss.web.comet.CometEvent; +import org.jboss.web.comet.CometFilter; +import org.jboss.web.comet.CometFilterChain; +import org.jboss.web.comet.CometProcessor; /** * Implementation of <code>javax.servlet.FilterChain</code> used to manage Modified: trunk/java/org/apache/catalina/core/ApplicationFilterFactory.java =================================================================== --- trunk/java/org/apache/catalina/core/ApplicationFilterFactory.java 2008-01-31 11:50:48 UTC (rev 413) +++ trunk/java/org/apache/catalina/core/ApplicationFilterFactory.java 2008-01-31 14:36:54 UTC (rev 414) @@ -27,7 +27,7 @@ import org.apache.catalina.Wrapper; import org.apache.catalina.connector.Request; import org.apache.catalina.deploy.FilterMap; -import org.apache.comet.CometFilter; +import org.jboss.web.comet.CometFilter; /** * Factory for the creation and caching of Filters and creationg Modified: trunk/java/org/apache/catalina/core/StandardContextValve.java =================================================================== --- trunk/java/org/apache/catalina/core/StandardContextValve.java 2008-01-31 11:50:48 UTC (rev 413) +++ trunk/java/org/apache/catalina/core/StandardContextValve.java 2008-01-31 14:36:54 UTC (rev 414) @@ -34,8 +34,8 @@ import org.apache.catalina.connector.Response; import org.apache.catalina.util.StringManager; import org.apache.catalina.valves.ValveBase; -import org.apache.comet.CometEvent; import org.apache.tomcat.util.buf.MessageBytes; +import org.jboss.web.comet.CometEvent; /** * Valve that implements the default basic behavior for the Modified: trunk/java/org/apache/catalina/core/StandardEngineValve.java =================================================================== --- trunk/java/org/apache/catalina/core/StandardEngineValve.java 2008-01-31 11:50:48 UTC (rev 413) +++ trunk/java/org/apache/catalina/core/StandardEngineValve.java 2008-01-31 14:36:54 UTC (rev 414) @@ -29,7 +29,7 @@ import org.apache.catalina.connector.Response; import org.apache.catalina.util.StringManager; import org.apache.catalina.valves.ValveBase; -import org.apache.comet.CometEvent; +import org.jboss.web.comet.CometEvent; /** Modified: trunk/java/org/apache/catalina/core/StandardHostValve.java =================================================================== --- trunk/java/org/apache/catalina/core/StandardHostValve.java 2008-01-31 11:50:48 UTC (rev 413) +++ trunk/java/org/apache/catalina/core/StandardHostValve.java 2008-01-31 14:36:54 UTC (rev 414) @@ -36,8 +36,8 @@ import org.apache.catalina.util.RequestUtil; import org.apache.catalina.util.StringManager; import org.apache.catalina.valves.ValveBase; -import org.apache.comet.CometEvent; import org.jboss.logging.Logger; +import org.jboss.web.comet.CometEvent; /** Modified: trunk/java/org/apache/catalina/core/StandardWrapperValve.java =================================================================== --- trunk/java/org/apache/catalina/core/StandardWrapperValve.java 2008-01-31 11:50:48 UTC (rev 413) +++ trunk/java/org/apache/catalina/core/StandardWrapperValve.java 2008-01-31 14:36:54 UTC (rev 414) @@ -35,10 +35,10 @@ import org.apache.catalina.connector.Response; import org.apache.catalina.util.StringManager; import org.apache.catalina.valves.ValveBase; -import org.apache.comet.CometEvent; -import org.apache.comet.CometProcessor; import org.apache.tomcat.util.buf.MessageBytes; import org.apache.tomcat.util.log.SystemLogHandler; +import org.jboss.web.comet.CometEvent; +import org.jboss.web.comet.CometProcessor; /** * Valve that implements the default basic behavior for the Modified: trunk/java/org/apache/catalina/valves/CometConnectionManagerValve.java =================================================================== --- trunk/java/org/apache/catalina/valves/CometConnectionManagerValve.java 2008-01-31 11:50:48 UTC (rev 413) +++ trunk/java/org/apache/catalina/valves/CometConnectionManagerValve.java 2008-01-31 14:36:54 UTC (rev 414) @@ -38,7 +38,7 @@ import org.apache.catalina.connector.Response; import org.apache.catalina.util.LifecycleSupport; import org.apache.catalina.util.StringManager; -import org.apache.comet.CometEvent; +import org.jboss.web.comet.CometEvent; /** Modified: trunk/java/org/apache/catalina/valves/ValveBase.java =================================================================== --- trunk/java/org/apache/catalina/valves/ValveBase.java 2008-01-31 11:50:48 UTC (rev 413) +++ trunk/java/org/apache/catalina/valves/ValveBase.java 2008-01-31 14:36:54 UTC (rev 414) @@ -39,8 +39,8 @@ import org.apache.catalina.connector.Response; import org.apache.catalina.core.ContainerBase; import org.apache.catalina.util.StringManager; -import org.apache.comet.CometEvent; import org.jboss.logging.Logger; +import org.jboss.web.comet.CometEvent; /** Copied: trunk/java/org/jboss/web/comet (from rev 413, trunk/java/org/apache/comet) Modified: trunk/java/org/jboss/web/comet/CometEvent.java =================================================================== --- trunk/java/org/apache/comet/CometEvent.java 2008-01-31 11:50:48 UTC (rev 413) +++ trunk/java/org/jboss/web/comet/CometEvent.java 2008-01-31 14:36:54 UTC (rev 414) @@ -16,7 +16,7 @@ */ -package org.apache.comet; +package org.jboss.web.comet; import java.io.IOException; Modified: trunk/java/org/jboss/web/comet/CometFilter.java =================================================================== --- trunk/java/org/apache/comet/CometFilter.java 2008-01-31 11:50:48 UTC (rev 413) +++ trunk/java/org/jboss/web/comet/CometFilter.java 2008-01-31 14:36:54 UTC (rev 414) @@ -16,7 +16,7 @@ */ -package org.apache.comet; +package org.jboss.web.comet; import java.io.IOException; Modified: trunk/java/org/jboss/web/comet/CometFilterChain.java =================================================================== --- trunk/java/org/apache/comet/CometFilterChain.java 2008-01-31 11:50:48 UTC (rev 413) +++ trunk/java/org/jboss/web/comet/CometFilterChain.java 2008-01-31 14:36:54 UTC (rev 414) @@ -16,7 +16,7 @@ */ -package org.apache.comet; +package org.jboss.web.comet; import java.io.IOException; Modified: trunk/java/org/jboss/web/comet/CometProcessor.java =================================================================== --- trunk/java/org/apache/comet/CometProcessor.java 2008-01-31 11:50:48 UTC (rev 413) +++ trunk/java/org/jboss/web/comet/CometProcessor.java 2008-01-31 14:36:54 UTC (rev 414) @@ -16,7 +16,7 @@ */ -package org.apache.comet; +package org.jboss.web.comet; import java.io.IOException; Modified: trunk/webapps/docs/changelog.xml =================================================================== --- trunk/webapps/docs/changelog.xml 2008-01-31 11:50:48 UTC (rev 413) +++ trunk/webapps/docs/changelog.xml 2008-01-31 14:36:54 UTC (rev 414) @@ -56,10 +56,10 @@ <update> Add context listener configuration. (remm) </update> + <add> + Expanded and revised Tomcat 6.0 Comet API as org.jboss.web.comet API. (remm) + </add> <update> - Expanded Comet API as org.apache.comet API. (remm) - </update> - <update> Remove user database functionality, which didn't see any development besides the original memory based backend introduced in Tomcat 4.1. Also remove associated roles management features. (remm)