Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Moving ExtensionConfig out of .api and into .extensions where it belongs

This commit is contained in:
Joakim Erdfelt 2012-07-05 16:29:14 -07:00
parent 11280ca22d
commit 8fa35533b6
11 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/extensions/AbstractExtension.java
View File

@ -15,7 +15,6 @@
*******************************************************************************/ *******************************************************************************/
package org.eclipse.jetty.websocket.extensions; package org.eclipse.jetty.websocket.extensions;
import org.eclipse.jetty.websocket.api.ExtensionConfig;
public class AbstractExtension implements Extension public class AbstractExtension implements Extension
{ {

1
jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/extensions/Extension.java
View File

@ -15,7 +15,6 @@
*******************************************************************************/ *******************************************************************************/
package org.eclipse.jetty.websocket.extensions; package org.eclipse.jetty.websocket.extensions;
import org.eclipse.jetty.websocket.api.ExtensionConfig;
public interface Extension public interface Extension
{ {

2
jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/api/ExtensionConfig.java → jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/extensions/ExtensionConfig.java
View File

@ -1,4 +1,4 @@
package org.eclipse.jetty.websocket.api; package org.eclipse.jetty.websocket.extensions;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;

2
jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/extensions/deflate/DeflateFrameExtension.java
View File

@ -20,8 +20,8 @@ import java.util.zip.Inflater;
import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.log.Logger;
import org.eclipse.jetty.websocket.api.ExtensionConfig;
import org.eclipse.jetty.websocket.extensions.AbstractExtension; import org.eclipse.jetty.websocket.extensions.AbstractExtension;
import org.eclipse.jetty.websocket.extensions.ExtensionConfig;
/** /**
* @TODO Implement proposed deflate frame draft * @TODO Implement proposed deflate frame draft

2
jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/extensions/fragment/FragmentExtension.java
View File

@ -15,8 +15,8 @@
*******************************************************************************/ *******************************************************************************/
package org.eclipse.jetty.websocket.extensions.fragment; package org.eclipse.jetty.websocket.extensions.fragment;
import org.eclipse.jetty.websocket.api.ExtensionConfig;
import org.eclipse.jetty.websocket.extensions.AbstractExtension; import org.eclipse.jetty.websocket.extensions.AbstractExtension;
import org.eclipse.jetty.websocket.extensions.ExtensionConfig;
public class FragmentExtension extends AbstractExtension public class FragmentExtension extends AbstractExtension
{ {

2
jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/io/WebSocketAsyncConnection.java
View File

@ -16,11 +16,11 @@ import org.eclipse.jetty.util.BufferUtil;
import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.util.Callback;
import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.log.Logger;
import org.eclipse.jetty.websocket.api.ExtensionConfig;
import org.eclipse.jetty.websocket.api.StatusCode; import org.eclipse.jetty.websocket.api.StatusCode;
import org.eclipse.jetty.websocket.api.WebSocketConnection; import org.eclipse.jetty.websocket.api.WebSocketConnection;
import org.eclipse.jetty.websocket.api.WebSocketPolicy; import org.eclipse.jetty.websocket.api.WebSocketPolicy;
import org.eclipse.jetty.websocket.callbacks.WebSocketCloseCallback; import org.eclipse.jetty.websocket.callbacks.WebSocketCloseCallback;
import org.eclipse.jetty.websocket.extensions.ExtensionConfig;
import org.eclipse.jetty.websocket.frames.BinaryFrame; import org.eclipse.jetty.websocket.frames.BinaryFrame;
import org.eclipse.jetty.websocket.frames.CloseFrame; import org.eclipse.jetty.websocket.frames.CloseFrame;
import org.eclipse.jetty.websocket.frames.TextFrame; import org.eclipse.jetty.websocket.frames.TextFrame;

2
jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/ServletWebSocketRequest.java
View File

@ -8,7 +8,7 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletRequestWrapper; import javax.servlet.http.HttpServletRequestWrapper;
import org.eclipse.jetty.util.QuotedStringTokenizer; import org.eclipse.jetty.util.QuotedStringTokenizer;
import org.eclipse.jetty.websocket.api.ExtensionConfig; import org.eclipse.jetty.websocket.extensions.ExtensionConfig;
public class ServletWebSocketRequest extends HttpServletRequestWrapper implements WebSocketRequest public class ServletWebSocketRequest extends HttpServletRequestWrapper implements WebSocketRequest
{ {

2
jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/ServletWebSocketResponse.java
View File

@ -7,7 +7,7 @@ import java.util.List;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpServletResponseWrapper; import javax.servlet.http.HttpServletResponseWrapper;
import org.eclipse.jetty.websocket.api.ExtensionConfig; import org.eclipse.jetty.websocket.extensions.ExtensionConfig;
public class ServletWebSocketResponse extends HttpServletResponseWrapper implements WebSocketResponse public class ServletWebSocketResponse extends HttpServletResponseWrapper implements WebSocketResponse
{ {

2
jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketRequest.java
View File

@ -2,7 +2,7 @@ package org.eclipse.jetty.websocket.server;
import java.util.List; import java.util.List;
import org.eclipse.jetty.websocket.api.ExtensionConfig; import org.eclipse.jetty.websocket.extensions.ExtensionConfig;
public interface WebSocketRequest public interface WebSocketRequest
{ {

2
jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketResponse.java
View File

@ -3,7 +3,7 @@ package org.eclipse.jetty.websocket.server;
import java.io.IOException; import java.io.IOException;
import java.util.List; import java.util.List;
import org.eclipse.jetty.websocket.api.ExtensionConfig; import org.eclipse.jetty.websocket.extensions.ExtensionConfig;
public interface WebSocketResponse public interface WebSocketResponse
{ {

2
jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketServerFactory.java
View File

@ -34,12 +34,12 @@ import org.eclipse.jetty.util.component.AbstractLifeCycle;
import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.log.Logger;
import org.eclipse.jetty.websocket.annotations.WebSocket; import org.eclipse.jetty.websocket.annotations.WebSocket;
import org.eclipse.jetty.websocket.api.ExtensionConfig;
import org.eclipse.jetty.websocket.api.WebSocketException; import org.eclipse.jetty.websocket.api.WebSocketException;
import org.eclipse.jetty.websocket.api.WebSocketPolicy; import org.eclipse.jetty.websocket.api.WebSocketPolicy;
import org.eclipse.jetty.websocket.driver.EventMethodsCache; import org.eclipse.jetty.websocket.driver.EventMethodsCache;
import org.eclipse.jetty.websocket.driver.WebSocketEventDriver; import org.eclipse.jetty.websocket.driver.WebSocketEventDriver;
import org.eclipse.jetty.websocket.extensions.Extension; import org.eclipse.jetty.websocket.extensions.Extension;
import org.eclipse.jetty.websocket.extensions.ExtensionConfig;
import org.eclipse.jetty.websocket.extensions.deflate.DeflateFrameExtension; import org.eclipse.jetty.websocket.extensions.deflate.DeflateFrameExtension;
import org.eclipse.jetty.websocket.extensions.fragment.FragmentExtension; import org.eclipse.jetty.websocket.extensions.fragment.FragmentExtension;
import org.eclipse.jetty.websocket.extensions.identity.IdentityExtension; import org.eclipse.jetty.websocket.extensions.identity.IdentityExtension;