Author: markt
Date: Fri Nov 6 18:26:39 2009
New Revision: 833510
URL:
http://svn.apache.org/viewvc?rev=833510&view=revLog:
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.
Added:
tomcat/trunk/java/org/apache/catalina/comet/
tomcat/trunk/java/org/apache/catalina/comet/CometEvent.java
- copied, changed from r833271, tomcat/trunk/java/org/apache/catalina/CometEvent.java
tomcat/trunk/java/org/apache/catalina/comet/CometFilter.java
- copied, changed from r833271, tomcat/trunk/java/org/apache/catalina/CometFilter.java
tomcat/trunk/java/org/apache/catalina/comet/CometFilterChain.java
- copied, changed from r833271, tomcat/trunk/java/org/apache/catalina/CometFilterChain.java
tomcat/trunk/java/org/apache/catalina/comet/CometProcessor.java
- copied, changed from r833271, tomcat/trunk/java/org/apache/catalina/CometProcessor.java
Removed:
tomcat/trunk/java/org/apache/catalina/CometEvent.java
tomcat/trunk/java/org/apache/catalina/CometFilter.java
tomcat/trunk/java/org/apache/catalina/CometFilterChain.java
tomcat/trunk/java/org/apache/catalina/CometProcessor.java
Modified:
tomcat/trunk/conf/catalina.policy
tomcat/trunk/java/org/apache/catalina/Valve.java
tomcat/trunk/java/org/apache/catalina/connector/CometEventImpl.java
tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterChain.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterFactory.java
tomcat/trunk/java/org/apache/catalina/core/StandardContextValve.java
tomcat/trunk/java/org/apache/catalina/core/StandardEngineValve.java
tomcat/trunk/java/org/apache/catalina/core/StandardHostValve.java
tomcat/trunk/java/org/apache/catalina/core/StandardWrapperValve.java
tomcat/trunk/java/org/apache/catalina/filters/RemoteAddrFilter.java
tomcat/trunk/java/org/apache/catalina/filters/RemoteHostFilter.java
tomcat/trunk/java/org/apache/catalina/filters/RequestFilter.java
tomcat/trunk/java/org/apache/catalina/valves/CometConnectionManagerValve.java
tomcat/trunk/java/org/apache/catalina/valves/ValveBase.java
tomcat/trunk/modules/bayeux/java/org/apache/tomcat/bayeux/BayeuxServlet.java
tomcat/trunk/modules/bayeux/java/org/apache/tomcat/bayeux/ClientImpl.java
tomcat/trunk/modules/bayeux/java/org/apache/tomcat/bayeux/RequestBase.java
tomcat/trunk/modules/bayeux/java/org/apache/tomcat/bayeux/RequestFactory.java
tomcat/trunk/modules/bayeux/java/org/apache/tomcat/bayeux/TomcatBayeux.java
tomcat/trunk/modules/bayeux/java/org/apache/tomcat/bayeux/request/MetaConnectRequest.java
tomcat/trunk/modules/bayeux/java/org/apache/tomcat/bayeux/request/MetaDisconnectRequest.java
tomcat/trunk/modules/bayeux/java/org/apache/tomcat/bayeux/request/MetaHandshakeRequest.java
tomcat/trunk/modules/bayeux/java/org/apache/tomcat/bayeux/request/MetaSubscribeRequest.java
tomcat/trunk/modules/bayeux/java/org/apache/tomcat/bayeux/request/MetaUnsubscribeRequest.java
tomcat/trunk/modules/bayeux/java/org/apache/tomcat/bayeux/request/PublishRequest.java
tomcat/trunk/webapps/docs/aio.xml
tomcat/trunk/webapps/examples/WEB-INF/classes/chat/ChatServlet.java
Modified: tomcat/trunk/conf/catalina.policy
URL:
http://svn.apache.org/viewvc/tomcat/trunk/conf/catalina.policy?rev=833510&r1=833509&r2=833510&view=diff==============================================================================
--- tomcat/trunk/conf/catalina.policy (original)
+++ tomcat/trunk/conf/catalina.policy Fri Nov 6 18:26:39 2009
@@ -146,6 +146,9 @@
// 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";
};
Modified: tomcat/trunk/java/org/apache/catalina/Valve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Valve.java?rev=833510&r1=833509&r2=833510&view=diff==============================================================================
--- tomcat/trunk/java/org/apache/catalina/Valve.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Valve.java Fri Nov 6 18:26:39 2009
@@ -22,6 +22,7 @@
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;
Copied: tomcat/trunk/java/org/apache/catalina/comet/CometEvent.java (from r833271, tomcat/trunk/java/org/apache/catalina/CometEvent.java)
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/comet/CometEvent.java?p2=tomcat/trunk/java/org/apache/catalina/comet/CometEvent.java&p1=tomcat/trunk/java/org/apache/catalina/CometEvent.java&r1=833271&r2=833510&rev=833510&view=diff==============================================================================
--- tomcat/trunk/java/org/apache/catalina/CometEvent.java (original)
+++ tomcat/trunk/java/org/apache/catalina/comet/CometEvent.java Fri Nov 6 18:26:39 2009
@@ -16,7 +16,7 @@
*/
-package org.apache.catalina;
+package org.apache.catalina.comet;
import java.io.IOException;
Copied: tomcat/trunk/java/org/apache/catalina/comet/CometFilter.java (from r833271, tomcat/trunk/java/org/apache/catalina/CometFilter.java)
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/comet/CometFilter.java?p2=tomcat/trunk/java/org/apache/catalina/comet/CometFilter.java&p1=tomcat/trunk/java/org/apache/catalina/CometFilter.java&r1=833271&r2=833510&rev=833510&view=diff==============================================================================
--- tomcat/trunk/java/org/apache/catalina/CometFilter.java (original)
+++ tomcat/trunk/java/org/apache/catalina/comet/CometFilter.java Fri Nov 6 18:26:39 2009
@@ -16,7 +16,7 @@
*/
-package org.apache.catalina;
+package org.apache.catalina.comet;
import java.io.IOException;
Copied: tomcat/trunk/java/org/apache/catalina/comet/CometFilterChain.java (from r833271, tomcat/trunk/java/org/apache/catalina/CometFilterChain.java)
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/comet/CometFilterChain.java?p2=tomcat/trunk/java/org/apache/catalina/comet/CometFilterChain.java&p1=tomcat/trunk/java/org/apache/catalina/CometFilterChain.java&r1=833271&r2=833510&rev=833510&view=diff==============================================================================
--- tomcat/trunk/java/org/apache/catalina/CometFilterChain.java (original)
+++ tomcat/trunk/java/org/apache/catalina/comet/CometFilterChain.java Fri Nov 6 18:26:39 2009
@@ -16,7 +16,7 @@
*/
-package org.apache.catalina;
+package org.apache.catalina.comet;
import java.io.IOException;
Copied: tomcat/trunk/java/org/apache/catalina/comet/CometProcessor.java (from r833271, tomcat/trunk/java/org/apache/catalina/CometProcessor.java)
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/comet/CometProcessor.java?p2=tomcat/trunk/java/org/apache/catalina/comet/CometProcessor.java&p1=tomcat/trunk/java/org/apache/catalina/CometProcessor.java&r1=833271&r2=833510&rev=833510&view=diff==============================================================================
--- tomcat/trunk/java/org/apache/catalina/CometProcessor.java (original)
+++ tomcat/trunk/java/org/apache/catalina/comet/CometProcessor.java Fri Nov 6 18:26:39 2009
@@ -16,7 +16,7 @@
*/
-package org.apache.catalina;
+package org.apache.catalina.comet;
import java.io.IOException;
Modified: tomcat/trunk/java/org/apache/catalina/connector/CometEventImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/CometEventImpl.java?rev=833510&r1=833509&r2=833510&view=diff==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/CometEventImpl.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/CometEventImpl.java Fri Nov 6 18:26:39 2009
@@ -24,7 +24,7 @@
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 {
Modified: tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java?rev=833510&r1=833509&r2=833510&view=diff==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java Fri Nov 6 18:26:39 2009
@@ -24,11 +24,11 @@
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;
Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterChain.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterChain.java?rev=833510&r1=833509&r2=833510&view=diff==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterChain.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterChain.java Fri Nov 6 18:26:39 2009
@@ -32,12 +32,12 @@
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;
Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterFactory.java?rev=833510&r1=833509&r2=833510&view=diff==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterFactory.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterFactory.java Fri Nov 6 18:26:39 2009
@@ -23,9 +23,9 @@
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;
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardContextValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardContextValve.java?rev=833510&r1=833509&r2=833510&view=diff==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardContextValve.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardContextValve.java Fri Nov 6 18:26:39 2009
@@ -27,10 +27,10 @@
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;
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardEngineValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardEngineValve.java?rev=833510&r1=833509&r2=833510&view=diff==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardEngineValve.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardEngineValve.java Fri Nov 6 18:26:39 2009
@@ -24,8 +24,8 @@
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;
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardHostValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardHostValve.java?rev=833510&r1=833509&r2=833510&view=diff==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardHostValve.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardHostValve.java Fri Nov 6 18:26:39 2009
@@ -27,10 +27,10 @@
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;
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardWrapperValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardWrapperValve.java?rev=833510&r1=833509&r2=833510&view=diff==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardWrapperValve.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardWrapperValve.java Fri Nov 6 18:26:39 2009
@@ -29,10 +29,10 @@
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;
Modified: tomcat/trunk/java/org/apache/catalina/filters/RemoteAddrFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/RemoteAddrFilter.java?rev=833510&r1=833509&r2=833510&view=diff==============================================================================
--- tomcat/trunk/java/org/apache/catalina/filters/RemoteAddrFilter.java (original)
+++ tomcat/trunk/java/org/apache/catalina/filters/RemoteAddrFilter.java Fri Nov 6 18:26:39 2009
@@ -26,8 +26,8 @@
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;
Modified: tomcat/trunk/java/org/apache/catalina/filters/RemoteHostFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/RemoteHostFilter.java?rev=833510&r1=833509&r2=833510&view=diff==============================================================================
--- tomcat/trunk/java/org/apache/catalina/filters/RemoteHostFilter.java (original)
+++ tomcat/trunk/java/org/apache/catalina/filters/RemoteHostFilter.java Fri Nov 6 18:26:39 2009
@@ -26,8 +26,8 @@
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;
Modified: tomcat/trunk/java/org/apache/catalina/filters/RequestFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/RequestFilter.java?rev=833510&r1=833509&r2=833510&view=diff==============================================================================
--- tomcat/trunk/java/org/apache/catalina/filters/RequestFilter.java (original)
+++ tomcat/trunk/java/org/apache/catalina/filters/RequestFilter.java Fri Nov 6 18:26:39 2009
@@ -30,9 +30,9 @@
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;
/**
Modified: tomcat/trunk/java/org/apache/catalina/valves/CometConnectionManagerValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/CometConnectionManagerValve.java?rev=833510&r1=833509&r2=833510&view=diff==============================================================================
--- tomcat/trunk/java/org/apache/catalina/valves/CometConnectionManagerValve.java (original)
+++ tomcat/trunk/java/org/apache/catalina/valves/CometConnectionManagerValve.java Fri Nov 6 18:26:39 2009
@@ -30,13 +30,13 @@
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;
Modified: tomcat/trunk/java/org/apache/catalina/valves/ValveBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/ValveBase.java?rev=833510&r1=833509&r2=833510&view=diff==============================================================================
--- tomcat/trunk/java/org/apache/catalina/valves/ValveBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/valves/ValveBase.java Fri Nov 6 18:26:39 2009
@@ -27,7 +27,6 @@
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.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;
Modified: tomcat/trunk/modules/bayeux/java/org/apache/tomcat/bayeux/BayeuxServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/bayeux/java/org/apache/tomcat/bayeux/BayeuxServlet.java?rev=833510&r1=833509&r2=833510&view=diff==============================================================================
--- tomcat/trunk/modules/bayeux/java/org/apache/tomcat/bayeux/BayeuxServlet.java (original)
+++ tomcat/trunk/modules/bayeux/java/org/apache/tomcat/bayeux/BayeuxServlet.java Fri Nov 6 18:26:39 2009
@@ -24,8 +24,8 @@
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;
Modified: tomcat/trunk/modules/bayeux/java/org/apache/tomcat/bayeux/ClientImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/bayeux/java/org/apache/tomcat/bayeux/ClientImpl.java?rev=833510&r1=833509&r2=833510&view=diff==============================================================================
--- tomcat/trunk/modules/bayeux/java/org/apache/tomcat/bayeux/ClientImpl.java (original)
+++ tomcat/trunk/modules/bayeux/java/org/apache/tomcat/bayeux/ClientImpl.java Fri Nov 6 18:26:39 2009
@@ -22,7 +22,7 @@
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;
Modified: tomcat/trunk/modules/bayeux/java/org/apache/tomcat/bayeux/RequestBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/bayeux/java/org/apache/tomcat/bayeux/RequestBase.java?rev=833510&r1=833509&r2=833510&view=diff==============================================================================
--- tomcat/trunk/modules/bayeux/java/org/apache/tomcat/bayeux/RequestBase.java (original)
+++ tomcat/trunk/modules/bayeux/java/org/apache/tomcat/bayeux/RequestBase.java Fri Nov 6 18:26:39 2009
@@ -28,7 +28,7 @@
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;
Modified: tomcat/trunk/modules/bayeux/java/org/apache/tomcat/bayeux/RequestFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/bayeux/java/org/apache/tomcat/bayeux/RequestFactory.java?rev=833510&r1=833509&r2=833510&view=diff==============================================================================
--- tomcat/trunk/modules/bayeux/java/org/apache/tomcat/bayeux/RequestFactory.java (original)
+++ tomcat/trunk/modules/bayeux/java/org/apache/tomcat/bayeux/RequestFactory.java Fri Nov 6 18:26:39 2009
@@ -18,7 +18,7 @@
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;
Modified: tomcat/trunk/modules/bayeux/java/org/apache/tomcat/bayeux/TomcatBayeux.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/bayeux/java/org/apache/tomcat/bayeux/TomcatBayeux.java?rev=833510&r1=833509&r2=833510&view=diff==============================================================================
--- tomcat/trunk/modules/bayeux/java/org/apache/tomcat/bayeux/TomcatBayeux.java (original)
+++ tomcat/trunk/modules/bayeux/java/org/apache/tomcat/bayeux/TomcatBayeux.java Fri Nov 6 18:26:39 2009
@@ -20,7 +20,7 @@
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;
Modified: tomcat/trunk/modules/bayeux/java/org/apache/tomcat/bayeux/request/MetaConnectRequest.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/bayeux/java/org/apache/tomcat/bayeux/request/MetaConnectRequest.java?rev=833510&r1=833509&r2=833510&view=diff==============================================================================
--- tomcat/trunk/modules/bayeux/java/org/apache/tomcat/bayeux/request/MetaConnectRequest.java (original)
+++ tomcat/trunk/modules/bayeux/java/org/apache/tomcat/bayeux/request/MetaConnectRequest.java Fri Nov 6 18:26:39 2009
@@ -20,7 +20,7 @@
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;
Modified: tomcat/trunk/modules/bayeux/java/org/apache/tomcat/bayeux/request/MetaDisconnectRequest.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/bayeux/java/org/apache/tomcat/bayeux/request/MetaDisconnectRequest.java?rev=833510&r1=833509&r2=833510&view=diff==============================================================================
--- tomcat/trunk/modules/bayeux/java/org/apache/tomcat/bayeux/request/MetaDisconnectRequest.java (original)
+++ tomcat/trunk/modules/bayeux/java/org/apache/tomcat/bayeux/request/MetaDisconnectRequest.java Fri Nov 6 18:26:39 2009
@@ -20,7 +20,7 @@
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;
Modified: tomcat/trunk/modules/bayeux/java/org/apache/tomcat/bayeux/request/MetaHandshakeRequest.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/bayeux/java/org/apache/tomcat/bayeux/request/MetaHandshakeRequest.java?rev=833510&r1=833509&r2=833510&view=diff==============================================================================
--- tomcat/trunk/modules/bayeux/java/org/apache/tomcat/bayeux/request/MetaHandshakeRequest.java (original)
+++ tomcat/trunk/modules/bayeux/java/org/apache/tomcat/bayeux/request/MetaHandshakeRequest.java Fri Nov 6 18:26:39 2009
@@ -20,7 +20,7 @@
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;
Modified: tomcat/trunk/modules/bayeux/java/org/apache/tomcat/bayeux/request/MetaSubscribeRequest.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/bayeux/java/org/apache/tomcat/bayeux/request/MetaSubscribeRequest.java?rev=833510&r1=833509&r2=833510&view=diff==============================================================================
--- tomcat/trunk/modules/bayeux/java/org/apache/tomcat/bayeux/request/MetaSubscribeRequest.java (original)
+++ tomcat/trunk/modules/bayeux/java/org/apache/tomcat/bayeux/request/MetaSubscribeRequest.java Fri Nov 6 18:26:39 2009
@@ -22,7 +22,7 @@
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;
Modified: tomcat/trunk/modules/bayeux/java/org/apache/tomcat/bayeux/request/MetaUnsubscribeRequest.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/bayeux/java/org/apache/tomcat/bayeux/request/MetaUnsubscribeRequest.java?rev=833510&r1=833509&r2=833510&view=diff==============================================================================
--- tomcat/trunk/modules/bayeux/java/org/apache/tomcat/bayeux/request/MetaUnsubscribeRequest.java (original)
+++ tomcat/trunk/modules/bayeux/java/org/apache/tomcat/bayeux/request/MetaUnsubscribeRequest.java Fri Nov 6 18:26:39 2009
@@ -22,7 +22,7 @@
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;
Modified: tomcat/trunk/modules/bayeux/java/org/apache/tomcat/bayeux/request/PublishRequest.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/bayeux/java/org/apache/tomcat/bayeux/request/PublishRequest.java?rev=833510&r1=833509&r2=833510&view=diff==============================================================================
--- tomcat/trunk/modules/bayeux/java/org/apache/tomcat/bayeux/request/PublishRequest.java (original)
+++ tomcat/trunk/modules/bayeux/java/org/apache/tomcat/bayeux/request/PublishRequest.java Fri Nov 6 18:26:39 2009
@@ -20,7 +20,7 @@
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;
Modified: tomcat/trunk/webapps/docs/aio.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/aio.xml?rev=833510&r1=833509&r2=833510&view=diff==============================================================================
--- tomcat/trunk/webapps/docs/aio.xml (original)
+++ tomcat/trunk/webapps/docs/aio.xml Fri Nov 6 18:26:39 2009
@@ -58,7 +58,7 @@
<subsection name="CometEvent">
<p>
- Servlets which implement the <code>org.apache.catalina.CometProcessor</code>
+ Servlets which implement the <code>org.apache.catalina.comet.CometProcessor</code>
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
Modified: tomcat/trunk/webapps/examples/WEB-INF/classes/chat/ChatServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/chat/ChatServlet.java?rev=833510&r1=833509&r2=833510&view=diff==============================================================================
--- tomcat/trunk/webapps/examples/WEB-INF/classes/chat/ChatServlet.java (original)
+++ tomcat/trunk/webapps/examples/WEB-INF/classes/chat/ChatServlet.java Fri Nov 6 18:26:39 2009
@@ -24,8 +24,8 @@
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;
---------------------------------------------------------------------
To unsubscribe, e-mail:
dev-unsubscribe@...
For additional commands, e-mail:
dev-help@...
