From e0ef2ccc9903e7780ace81f496b3100a7d020e51 Mon Sep 17 00:00:00 2001 From: markt Date: Fri, 6 Nov 2009 18:26:39 +0000 Subject: [PATCH] Comet didn't work at all under a security manger. Need to allow web apps access to the comet interfaces so move those interfaces to a separate package so we can grant access. git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@833510 13f79535-47bb-0310-9956-ffa450edef68 --- conf/catalina.policy | 3 +++ java/org/apache/catalina/Valve.java | 1 + java/org/apache/catalina/{ => comet}/CometEvent.java | 2 +- java/org/apache/catalina/{ => comet}/CometFilter.java | 2 +- java/org/apache/catalina/{ => comet}/CometFilterChain.java | 2 +- java/org/apache/catalina/{ => comet}/CometProcessor.java | 2 +- java/org/apache/catalina/connector/CometEventImpl.java | 2 +- java/org/apache/catalina/connector/CoyoteAdapter.java | 2 +- java/org/apache/catalina/core/ApplicationFilterChain.java | 8 ++++---- java/org/apache/catalina/core/ApplicationFilterFactory.java | 2 +- java/org/apache/catalina/core/StandardContextValve.java | 2 +- java/org/apache/catalina/core/StandardEngineValve.java | 2 +- java/org/apache/catalina/core/StandardHostValve.java | 2 +- java/org/apache/catalina/core/StandardWrapperValve.java | 4 ++-- java/org/apache/catalina/filters/RemoteAddrFilter.java | 4 ++-- java/org/apache/catalina/filters/RemoteHostFilter.java | 4 ++-- java/org/apache/catalina/filters/RequestFilter.java | 6 +++--- java/org/apache/catalina/valves/CometConnectionManagerValve.java | 4 ++-- java/org/apache/catalina/valves/ValveBase.java | 2 +- modules/bayeux/java/org/apache/tomcat/bayeux/BayeuxServlet.java | 4 ++-- modules/bayeux/java/org/apache/tomcat/bayeux/ClientImpl.java | 2 +- modules/bayeux/java/org/apache/tomcat/bayeux/RequestBase.java | 2 +- modules/bayeux/java/org/apache/tomcat/bayeux/RequestFactory.java | 2 +- modules/bayeux/java/org/apache/tomcat/bayeux/TomcatBayeux.java | 2 +- .../java/org/apache/tomcat/bayeux/request/MetaConnectRequest.java | 2 +- .../org/apache/tomcat/bayeux/request/MetaDisconnectRequest.java | 2 +- .../org/apache/tomcat/bayeux/request/MetaHandshakeRequest.java | 2 +- .../org/apache/tomcat/bayeux/request/MetaSubscribeRequest.java | 2 +- .../org/apache/tomcat/bayeux/request/MetaUnsubscribeRequest.java | 2 +- .../java/org/apache/tomcat/bayeux/request/PublishRequest.java | 2 +- webapps/docs/aio.xml | 2 +- webapps/examples/WEB-INF/classes/chat/ChatServlet.java | 4 ++-- 32 files changed, 45 insertions(+), 41 deletions(-) rename java/org/apache/catalina/{ => comet}/CometEvent.java (99%) rename java/org/apache/catalina/{ => comet}/CometFilter.java (99%) rename java/org/apache/catalina/{ => comet}/CometFilterChain.java (97%) rename java/org/apache/catalina/{ => comet}/CometProcessor.java (97%) diff --git a/conf/catalina.policy b/conf/catalina.policy index 63e4b62fa..8a8e51fa4 100644 --- a/conf/catalina.policy +++ b/conf/catalina.policy @@ -146,6 +146,9 @@ grant { // Precompiled JSPs need access to these system properties. permission java.util.PropertyPermission "org.apache.jasper.runtime.BodyContentImpl.LIMIT_BUFFER", "read"; permission java.util.PropertyPermission "org.apache.el.parser.COERCE_TO_ZERO", "read"; + + // Applications using Comet need to be able to access this package + permission java.lang.RuntimePermission "accessClassInPackage.org.apache.catalina.comet"; }; diff --git a/java/org/apache/catalina/Valve.java b/java/org/apache/catalina/Valve.java index 414317032..e2a29fc4d 100644 --- a/java/org/apache/catalina/Valve.java +++ b/java/org/apache/catalina/Valve.java @@ -22,6 +22,7 @@ package org.apache.catalina; import java.io.IOException; import javax.servlet.ServletException; +import org.apache.catalina.comet.CometEvent; import org.apache.catalina.connector.Request; import org.apache.catalina.connector.Response; diff --git a/java/org/apache/catalina/CometEvent.java b/java/org/apache/catalina/comet/CometEvent.java similarity index 99% rename from java/org/apache/catalina/CometEvent.java rename to java/org/apache/catalina/comet/CometEvent.java index 341a57e61..29a884a49 100644 --- a/java/org/apache/catalina/CometEvent.java +++ b/java/org/apache/catalina/comet/CometEvent.java @@ -16,7 +16,7 @@ */ -package org.apache.catalina; +package org.apache.catalina.comet; import java.io.IOException; diff --git a/java/org/apache/catalina/CometFilter.java b/java/org/apache/catalina/comet/CometFilter.java similarity index 99% rename from java/org/apache/catalina/CometFilter.java rename to java/org/apache/catalina/comet/CometFilter.java index 55cd327c4..2b69bc475 100644 --- a/java/org/apache/catalina/CometFilter.java +++ b/java/org/apache/catalina/comet/CometFilter.java @@ -16,7 +16,7 @@ */ -package org.apache.catalina; +package org.apache.catalina.comet; import java.io.IOException; diff --git a/java/org/apache/catalina/CometFilterChain.java b/java/org/apache/catalina/comet/CometFilterChain.java similarity index 97% rename from java/org/apache/catalina/CometFilterChain.java rename to java/org/apache/catalina/comet/CometFilterChain.java index f0632fcd7..b4ca50e68 100644 --- a/java/org/apache/catalina/CometFilterChain.java +++ b/java/org/apache/catalina/comet/CometFilterChain.java @@ -16,7 +16,7 @@ */ -package org.apache.catalina; +package org.apache.catalina.comet; import java.io.IOException; diff --git a/java/org/apache/catalina/CometProcessor.java b/java/org/apache/catalina/comet/CometProcessor.java similarity index 97% rename from java/org/apache/catalina/CometProcessor.java rename to java/org/apache/catalina/comet/CometProcessor.java index 38e9f3bc3..a652129a4 100644 --- a/java/org/apache/catalina/CometProcessor.java +++ b/java/org/apache/catalina/comet/CometProcessor.java @@ -16,7 +16,7 @@ */ -package org.apache.catalina; +package org.apache.catalina.comet; import java.io.IOException; diff --git a/java/org/apache/catalina/connector/CometEventImpl.java b/java/org/apache/catalina/connector/CometEventImpl.java index 0da2f561a..051d56667 100644 --- a/java/org/apache/catalina/connector/CometEventImpl.java +++ b/java/org/apache/catalina/connector/CometEventImpl.java @@ -24,7 +24,7 @@ import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.catalina.CometEvent; +import org.apache.catalina.comet.CometEvent; import org.apache.tomcat.util.res.StringManager; public class CometEventImpl implements CometEvent { diff --git a/java/org/apache/catalina/connector/CoyoteAdapter.java b/java/org/apache/catalina/connector/CoyoteAdapter.java index 2aabdc7d6..16c1d4235 100644 --- a/java/org/apache/catalina/connector/CoyoteAdapter.java +++ b/java/org/apache/catalina/connector/CoyoteAdapter.java @@ -24,11 +24,11 @@ import java.util.EnumSet; import javax.servlet.SessionTrackingMode; -import org.apache.catalina.CometEvent; import org.apache.catalina.Context; import org.apache.catalina.Globals; import org.apache.catalina.Wrapper; import org.apache.tomcat.util.res.StringManager; +import org.apache.catalina.comet.CometEvent; import org.apache.catalina.core.AsyncContextImpl; import org.apache.catalina.util.URLEncoder; import org.apache.coyote.ActionCode; diff --git a/java/org/apache/catalina/core/ApplicationFilterChain.java b/java/org/apache/catalina/core/ApplicationFilterChain.java index 2b577a96f..49da22a02 100644 --- a/java/org/apache/catalina/core/ApplicationFilterChain.java +++ b/java/org/apache/catalina/core/ApplicationFilterChain.java @@ -32,12 +32,12 @@ import javax.servlet.ServletResponse; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.catalina.CometEvent; -import org.apache.catalina.CometFilter; -import org.apache.catalina.CometFilterChain; -import org.apache.catalina.CometProcessor; import org.apache.catalina.Globals; import org.apache.catalina.InstanceEvent; +import org.apache.catalina.comet.CometEvent; +import org.apache.catalina.comet.CometFilter; +import org.apache.catalina.comet.CometFilterChain; +import org.apache.catalina.comet.CometProcessor; import org.apache.catalina.security.SecurityUtil; import org.apache.catalina.util.InstanceSupport; import org.apache.tomcat.util.res.StringManager; diff --git a/java/org/apache/catalina/core/ApplicationFilterFactory.java b/java/org/apache/catalina/core/ApplicationFilterFactory.java index b8b981cb6..6a450e699 100644 --- a/java/org/apache/catalina/core/ApplicationFilterFactory.java +++ b/java/org/apache/catalina/core/ApplicationFilterFactory.java @@ -23,9 +23,9 @@ import javax.servlet.DispatcherType; import javax.servlet.Servlet; import javax.servlet.ServletRequest; -import org.apache.catalina.CometFilter; import org.apache.catalina.Globals; import org.apache.catalina.Wrapper; +import org.apache.catalina.comet.CometFilter; import org.apache.catalina.connector.Request; import org.apache.catalina.deploy.FilterMap; diff --git a/java/org/apache/catalina/core/StandardContextValve.java b/java/org/apache/catalina/core/StandardContextValve.java index 9e8a0089e..5b91e3e2f 100644 --- a/java/org/apache/catalina/core/StandardContextValve.java +++ b/java/org/apache/catalina/core/StandardContextValve.java @@ -27,10 +27,10 @@ import javax.servlet.ServletRequestEvent; import javax.servlet.ServletRequestListener; import javax.servlet.http.HttpServletResponse; -import org.apache.catalina.CometEvent; import org.apache.catalina.Container; import org.apache.catalina.Globals; import org.apache.catalina.Wrapper; +import org.apache.catalina.comet.CometEvent; import org.apache.catalina.connector.Request; import org.apache.catalina.connector.Response; import org.apache.tomcat.util.res.StringManager; diff --git a/java/org/apache/catalina/core/StandardEngineValve.java b/java/org/apache/catalina/core/StandardEngineValve.java index b2df268ee..320720e62 100644 --- a/java/org/apache/catalina/core/StandardEngineValve.java +++ b/java/org/apache/catalina/core/StandardEngineValve.java @@ -24,8 +24,8 @@ import java.io.IOException; import javax.servlet.ServletException; import javax.servlet.http.HttpServletResponse; -import org.apache.catalina.CometEvent; import org.apache.catalina.Host; +import org.apache.catalina.comet.CometEvent; import org.apache.catalina.connector.Request; import org.apache.catalina.connector.Response; import org.apache.tomcat.util.res.StringManager; diff --git a/java/org/apache/catalina/core/StandardHostValve.java b/java/org/apache/catalina/core/StandardHostValve.java index 9dd243366..f22b9486b 100644 --- a/java/org/apache/catalina/core/StandardHostValve.java +++ b/java/org/apache/catalina/core/StandardHostValve.java @@ -27,10 +27,10 @@ import javax.servlet.ServletContext; import javax.servlet.ServletException; import javax.servlet.http.HttpServletResponse; -import org.apache.catalina.CometEvent; import org.apache.catalina.Context; import org.apache.catalina.Globals; import org.apache.catalina.Wrapper; +import org.apache.catalina.comet.CometEvent; import org.apache.catalina.connector.ClientAbortException; import org.apache.catalina.connector.Request; import org.apache.catalina.connector.Response; diff --git a/java/org/apache/catalina/core/StandardWrapperValve.java b/java/org/apache/catalina/core/StandardWrapperValve.java index 88c72f37f..d4d377cb3 100644 --- a/java/org/apache/catalina/core/StandardWrapperValve.java +++ b/java/org/apache/catalina/core/StandardWrapperValve.java @@ -29,10 +29,10 @@ import javax.servlet.ServletException; import javax.servlet.UnavailableException; import javax.servlet.http.HttpServletResponse; -import org.apache.catalina.CometEvent; -import org.apache.catalina.CometProcessor; import org.apache.catalina.Context; import org.apache.catalina.Globals; +import org.apache.catalina.comet.CometEvent; +import org.apache.catalina.comet.CometProcessor; import org.apache.catalina.connector.ClientAbortException; import org.apache.catalina.connector.Request; import org.apache.catalina.connector.Response; diff --git a/java/org/apache/catalina/filters/RemoteAddrFilter.java b/java/org/apache/catalina/filters/RemoteAddrFilter.java index cc3febcf1..ffb252d72 100644 --- a/java/org/apache/catalina/filters/RemoteAddrFilter.java +++ b/java/org/apache/catalina/filters/RemoteAddrFilter.java @@ -26,8 +26,8 @@ import javax.servlet.ServletException; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; -import org.apache.catalina.CometEvent; -import org.apache.catalina.CometFilterChain; +import org.apache.catalina.comet.CometEvent; +import org.apache.catalina.comet.CometFilterChain; import org.apache.juli.logging.Log; import org.apache.juli.logging.LogFactory; diff --git a/java/org/apache/catalina/filters/RemoteHostFilter.java b/java/org/apache/catalina/filters/RemoteHostFilter.java index 6778b58b8..0b4c12d47 100644 --- a/java/org/apache/catalina/filters/RemoteHostFilter.java +++ b/java/org/apache/catalina/filters/RemoteHostFilter.java @@ -26,8 +26,8 @@ import javax.servlet.ServletException; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; -import org.apache.catalina.CometEvent; -import org.apache.catalina.CometFilterChain; +import org.apache.catalina.comet.CometEvent; +import org.apache.catalina.comet.CometFilterChain; import org.apache.juli.logging.Log; import org.apache.juli.logging.LogFactory; diff --git a/java/org/apache/catalina/filters/RequestFilter.java b/java/org/apache/catalina/filters/RequestFilter.java index 97f9b95ca..2499dc512 100644 --- a/java/org/apache/catalina/filters/RequestFilter.java +++ b/java/org/apache/catalina/filters/RequestFilter.java @@ -30,9 +30,9 @@ import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; import javax.servlet.http.HttpServletResponse; -import org.apache.catalina.CometEvent; -import org.apache.catalina.CometFilter; -import org.apache.catalina.CometFilterChain; +import org.apache.catalina.comet.CometEvent; +import org.apache.catalina.comet.CometFilter; +import org.apache.catalina.comet.CometFilterChain; import org.apache.tomcat.util.res.StringManager; /** diff --git a/java/org/apache/catalina/valves/CometConnectionManagerValve.java b/java/org/apache/catalina/valves/CometConnectionManagerValve.java index a9281649f..0800ed1a9 100644 --- a/java/org/apache/catalina/valves/CometConnectionManagerValve.java +++ b/java/org/apache/catalina/valves/CometConnectionManagerValve.java @@ -30,13 +30,13 @@ import javax.servlet.http.HttpSession; import javax.servlet.http.HttpSessionEvent; import javax.servlet.http.HttpSessionListener; -import org.apache.catalina.CometEvent; -import org.apache.catalina.CometProcessor; import org.apache.catalina.Context; import org.apache.catalina.Lifecycle; import org.apache.catalina.LifecycleEvent; import org.apache.catalina.LifecycleException; import org.apache.catalina.LifecycleListener; +import org.apache.catalina.comet.CometEvent; +import org.apache.catalina.comet.CometProcessor; import org.apache.catalina.connector.CometEventImpl; import org.apache.catalina.connector.Request; import org.apache.catalina.connector.Response; diff --git a/java/org/apache/catalina/valves/ValveBase.java b/java/org/apache/catalina/valves/ValveBase.java index 524b53687..a5f41fc25 100644 --- a/java/org/apache/catalina/valves/ValveBase.java +++ b/java/org/apache/catalina/valves/ValveBase.java @@ -27,7 +27,6 @@ import javax.management.MalformedObjectNameException; import javax.management.ObjectName; import javax.servlet.ServletException; -import org.apache.catalina.CometEvent; import org.apache.catalina.Contained; import org.apache.catalina.Container; import org.apache.catalina.Context; @@ -36,6 +35,7 @@ import org.apache.catalina.Host; import org.apache.catalina.Pipeline; import org.apache.catalina.Valve; import org.apache.catalina.Wrapper; +import org.apache.catalina.comet.CometEvent; import org.apache.catalina.connector.Request; import org.apache.catalina.connector.Response; import org.apache.catalina.core.ContainerBase; diff --git a/modules/bayeux/java/org/apache/tomcat/bayeux/BayeuxServlet.java b/modules/bayeux/java/org/apache/tomcat/bayeux/BayeuxServlet.java index dfb81b372..f0ce85b0f 100644 --- a/modules/bayeux/java/org/apache/tomcat/bayeux/BayeuxServlet.java +++ b/modules/bayeux/java/org/apache/tomcat/bayeux/BayeuxServlet.java @@ -24,8 +24,8 @@ import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; import javax.servlet.http.HttpServletResponse; -import org.apache.catalina.CometEvent; -import org.apache.catalina.CometProcessor; +import org.apache.catalina.comet.CometEvent; +import org.apache.catalina.comet.CometProcessor; import org.apache.juli.logging.Log; import org.apache.juli.logging.LogFactory; import org.json.JSONArray; diff --git a/modules/bayeux/java/org/apache/tomcat/bayeux/ClientImpl.java b/modules/bayeux/java/org/apache/tomcat/bayeux/ClientImpl.java index 3705e1f6d..b03f7a853 100644 --- a/modules/bayeux/java/org/apache/tomcat/bayeux/ClientImpl.java +++ b/modules/bayeux/java/org/apache/tomcat/bayeux/ClientImpl.java @@ -22,7 +22,7 @@ import java.util.Map; import java.util.Queue; import java.util.concurrent.ConcurrentLinkedQueue; -import org.apache.catalina.CometEvent; +import org.apache.catalina.comet.CometEvent; import org.json.JSONObject; import org.apache.cometd.bayeux.Bayeux; import org.apache.cometd.bayeux.Client; diff --git a/modules/bayeux/java/org/apache/tomcat/bayeux/RequestBase.java b/modules/bayeux/java/org/apache/tomcat/bayeux/RequestBase.java index 9f6036eed..a813abf21 100644 --- a/modules/bayeux/java/org/apache/tomcat/bayeux/RequestBase.java +++ b/modules/bayeux/java/org/apache/tomcat/bayeux/RequestBase.java @@ -28,7 +28,7 @@ import java.util.Date; import java.text.SimpleDateFormat; import javax.servlet.ServletException; -import org.apache.catalina.CometEvent; +import org.apache.catalina.comet.CometEvent; import org.apache.tomcat.bayeux.HttpError; import org.apache.juli.logging.Log; diff --git a/modules/bayeux/java/org/apache/tomcat/bayeux/RequestFactory.java b/modules/bayeux/java/org/apache/tomcat/bayeux/RequestFactory.java index c61718032..203d94dc1 100644 --- a/modules/bayeux/java/org/apache/tomcat/bayeux/RequestFactory.java +++ b/modules/bayeux/java/org/apache/tomcat/bayeux/RequestFactory.java @@ -18,7 +18,7 @@ package org.apache.tomcat.bayeux; import org.json.JSONObject; import org.apache.tomcat.bayeux.request.MetaHandshakeRequest; -import org.apache.catalina.CometEvent; +import org.apache.catalina.comet.CometEvent; import org.json.JSONException; import org.apache.tomcat.bayeux.request.MetaConnectRequest; import org.apache.tomcat.bayeux.request.MetaDisconnectRequest; diff --git a/modules/bayeux/java/org/apache/tomcat/bayeux/TomcatBayeux.java b/modules/bayeux/java/org/apache/tomcat/bayeux/TomcatBayeux.java index e7d33c05c..f8d68826c 100644 --- a/modules/bayeux/java/org/apache/tomcat/bayeux/TomcatBayeux.java +++ b/modules/bayeux/java/org/apache/tomcat/bayeux/TomcatBayeux.java @@ -20,7 +20,7 @@ import java.util.HashMap; import java.util.LinkedHashMap; import java.util.List; -import org.apache.catalina.CometEvent; +import org.apache.catalina.comet.CometEvent; import org.apache.catalina.tribes.util.Arrays; import org.apache.catalina.tribes.util.UUIDGenerator; import org.apache.cometd.bayeux.Bayeux; diff --git a/modules/bayeux/java/org/apache/tomcat/bayeux/request/MetaConnectRequest.java b/modules/bayeux/java/org/apache/tomcat/bayeux/request/MetaConnectRequest.java index 2eacdbc8b..f2f509af0 100644 --- a/modules/bayeux/java/org/apache/tomcat/bayeux/request/MetaConnectRequest.java +++ b/modules/bayeux/java/org/apache/tomcat/bayeux/request/MetaConnectRequest.java @@ -20,7 +20,7 @@ import java.io.IOException; import java.util.HashMap; import javax.servlet.ServletException; -import org.apache.catalina.CometEvent; +import org.apache.catalina.comet.CometEvent; import org.apache.tomcat.bayeux.HttpError; import org.apache.tomcat.bayeux.BayeuxException; import org.apache.tomcat.bayeux.BayeuxRequest; diff --git a/modules/bayeux/java/org/apache/tomcat/bayeux/request/MetaDisconnectRequest.java b/modules/bayeux/java/org/apache/tomcat/bayeux/request/MetaDisconnectRequest.java index b3dde9400..78bf7b47d 100644 --- a/modules/bayeux/java/org/apache/tomcat/bayeux/request/MetaDisconnectRequest.java +++ b/modules/bayeux/java/org/apache/tomcat/bayeux/request/MetaDisconnectRequest.java @@ -20,7 +20,7 @@ import java.io.IOException; import java.util.HashMap; import javax.servlet.ServletException; -import org.apache.catalina.CometEvent; +import org.apache.catalina.comet.CometEvent; import org.apache.tomcat.bayeux.HttpError; import org.apache.tomcat.bayeux.BayeuxException; import org.apache.tomcat.bayeux.BayeuxRequest; diff --git a/modules/bayeux/java/org/apache/tomcat/bayeux/request/MetaHandshakeRequest.java b/modules/bayeux/java/org/apache/tomcat/bayeux/request/MetaHandshakeRequest.java index 0883ae9fc..593cfef0f 100644 --- a/modules/bayeux/java/org/apache/tomcat/bayeux/request/MetaHandshakeRequest.java +++ b/modules/bayeux/java/org/apache/tomcat/bayeux/request/MetaHandshakeRequest.java @@ -20,7 +20,7 @@ import java.io.IOException; import java.util.HashMap; import javax.servlet.ServletException; -import org.apache.catalina.CometEvent; +import org.apache.catalina.comet.CometEvent; import org.apache.tomcat.bayeux.HttpError; import org.apache.tomcat.bayeux.BayeuxException; import org.apache.tomcat.bayeux.BayeuxRequest; diff --git a/modules/bayeux/java/org/apache/tomcat/bayeux/request/MetaSubscribeRequest.java b/modules/bayeux/java/org/apache/tomcat/bayeux/request/MetaSubscribeRequest.java index b6af0b2d6..af42d097c 100644 --- a/modules/bayeux/java/org/apache/tomcat/bayeux/request/MetaSubscribeRequest.java +++ b/modules/bayeux/java/org/apache/tomcat/bayeux/request/MetaSubscribeRequest.java @@ -22,7 +22,7 @@ import java.util.Iterator; import java.util.List; import javax.servlet.ServletException; -import org.apache.catalina.CometEvent; +import org.apache.catalina.comet.CometEvent; import org.apache.tomcat.bayeux.HttpError; import org.apache.tomcat.bayeux.BayeuxException; import org.apache.tomcat.bayeux.BayeuxRequest; diff --git a/modules/bayeux/java/org/apache/tomcat/bayeux/request/MetaUnsubscribeRequest.java b/modules/bayeux/java/org/apache/tomcat/bayeux/request/MetaUnsubscribeRequest.java index e8b3e163d..62e4c8f4f 100644 --- a/modules/bayeux/java/org/apache/tomcat/bayeux/request/MetaUnsubscribeRequest.java +++ b/modules/bayeux/java/org/apache/tomcat/bayeux/request/MetaUnsubscribeRequest.java @@ -22,7 +22,7 @@ import java.util.Iterator; import java.util.List; import javax.servlet.ServletException; -import org.apache.catalina.CometEvent; +import org.apache.catalina.comet.CometEvent; import org.apache.tomcat.bayeux.HttpError; import org.apache.tomcat.bayeux.BayeuxException; import org.apache.tomcat.bayeux.BayeuxRequest; diff --git a/modules/bayeux/java/org/apache/tomcat/bayeux/request/PublishRequest.java b/modules/bayeux/java/org/apache/tomcat/bayeux/request/PublishRequest.java index 017d1812c..b714d11de 100644 --- a/modules/bayeux/java/org/apache/tomcat/bayeux/request/PublishRequest.java +++ b/modules/bayeux/java/org/apache/tomcat/bayeux/request/PublishRequest.java @@ -20,7 +20,7 @@ import java.io.IOException; import java.util.HashMap; import javax.servlet.ServletException; -import org.apache.catalina.CometEvent; +import org.apache.catalina.comet.CometEvent; import org.apache.tomcat.bayeux.HttpError; import org.apache.tomcat.bayeux.BayeuxException; import org.apache.tomcat.bayeux.BayeuxRequest; diff --git a/webapps/docs/aio.xml b/webapps/docs/aio.xml index 4cc4c53ce..4cb28fe41 100644 --- a/webapps/docs/aio.xml +++ b/webapps/docs/aio.xml @@ -58,7 +58,7 @@

- Servlets which implement the org.apache.catalina.CometProcessor + Servlets which implement the org.apache.catalina.comet.CometProcessor interface will have their event method invoked rather than the usual service method, according to the event which occurred. The event object gives access to the usual request and response objects, which may be used in the diff --git a/webapps/examples/WEB-INF/classes/chat/ChatServlet.java b/webapps/examples/WEB-INF/classes/chat/ChatServlet.java index 8028f407a..8e24cbfe7 100644 --- a/webapps/examples/WEB-INF/classes/chat/ChatServlet.java +++ b/webapps/examples/WEB-INF/classes/chat/ChatServlet.java @@ -24,8 +24,8 @@ import java.io.InputStream; import java.io.PrintWriter; import java.util.ArrayList; -import org.apache.catalina.CometEvent; -import org.apache.catalina.CometProcessor; +import org.apache.catalina.comet.CometEvent; +import org.apache.catalina.comet.CometProcessor; import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; -- 2.11.0