diff --git a/pom.xml b/pom.xml index 1fc2d27a9f2..0b87680ed62 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.eclipse.jetty - jetty-spdy-project + spdy-project 1.0.0-SNAPSHOT pom SPDY :: Project @@ -14,31 +14,35 @@ - jetty-spdy-core + spdy-core + spdy-jetty + spdy-jetty-http + + + maven-enforcer-plugin + + + require-jdk7 + + enforce + + + + + [1.7,) + + + + + + + + - - maven-enforcer-plugin - 1.0.1 - - - require-jdk7 - - enforce - - - - - [1.7,) - - - - - - maven-compiler-plugin 2.3.2 @@ -47,8 +51,27 @@ 1.7 + + maven-enforcer-plugin + 1.0.1 + + + maven-surefire-plugin + 2.11 + + + + + junit + junit + 4.8.2 + test + + + + diff --git a/jetty-spdy-core/pom.xml b/spdy-core/pom.xml similarity index 93% rename from jetty-spdy-core/pom.xml rename to spdy-core/pom.xml index 9e0e24a9950..5ae10af7ecb 100644 --- a/jetty-spdy-core/pom.xml +++ b/spdy-core/pom.xml @@ -4,12 +4,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.eclipse.jetty - jetty-spdy-project + spdy-project 1.0.0-SNAPSHOT 4.0.0 - jetty-spdy-core + spdy-core SPDY :: Core @@ -52,8 +52,6 @@ junit junit - 4.8.2 - test org.slf4j diff --git a/jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/CompressionFactory.java b/spdy-core/src/main/java/org/eclipse/jetty/spdy/CompressionFactory.java similarity index 100% rename from jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/CompressionFactory.java rename to spdy-core/src/main/java/org/eclipse/jetty/spdy/CompressionFactory.java diff --git a/jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/ISession.java b/spdy-core/src/main/java/org/eclipse/jetty/spdy/ISession.java similarity index 100% rename from jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/ISession.java rename to spdy-core/src/main/java/org/eclipse/jetty/spdy/ISession.java diff --git a/jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/IStream.java b/spdy-core/src/main/java/org/eclipse/jetty/spdy/IStream.java similarity index 100% rename from jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/IStream.java rename to spdy-core/src/main/java/org/eclipse/jetty/spdy/IStream.java diff --git a/jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/SessionException.java b/spdy-core/src/main/java/org/eclipse/jetty/spdy/SessionException.java similarity index 100% rename from jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/SessionException.java rename to spdy-core/src/main/java/org/eclipse/jetty/spdy/SessionException.java diff --git a/jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/StandardCompressionFactory.java b/spdy-core/src/main/java/org/eclipse/jetty/spdy/StandardCompressionFactory.java similarity index 100% rename from jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/StandardCompressionFactory.java rename to spdy-core/src/main/java/org/eclipse/jetty/spdy/StandardCompressionFactory.java diff --git a/jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/StandardSession.java b/spdy-core/src/main/java/org/eclipse/jetty/spdy/StandardSession.java similarity index 100% rename from jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/StandardSession.java rename to spdy-core/src/main/java/org/eclipse/jetty/spdy/StandardSession.java diff --git a/jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/StandardStream.java b/spdy-core/src/main/java/org/eclipse/jetty/spdy/StandardStream.java similarity index 100% rename from jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/StandardStream.java rename to spdy-core/src/main/java/org/eclipse/jetty/spdy/StandardStream.java diff --git a/jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/StreamException.java b/spdy-core/src/main/java/org/eclipse/jetty/spdy/StreamException.java similarity index 100% rename from jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/StreamException.java rename to spdy-core/src/main/java/org/eclipse/jetty/spdy/StreamException.java diff --git a/jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/api/ByteBufferDataInfo.java b/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/ByteBufferDataInfo.java similarity index 100% rename from jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/api/ByteBufferDataInfo.java rename to spdy-core/src/main/java/org/eclipse/jetty/spdy/api/ByteBufferDataInfo.java diff --git a/jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/api/BytesDataInfo.java b/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/BytesDataInfo.java similarity index 100% rename from jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/api/BytesDataInfo.java rename to spdy-core/src/main/java/org/eclipse/jetty/spdy/api/BytesDataInfo.java diff --git a/jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/api/DataInfo.java b/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/DataInfo.java similarity index 100% rename from jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/api/DataInfo.java rename to spdy-core/src/main/java/org/eclipse/jetty/spdy/api/DataInfo.java diff --git a/jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/api/GoAwayInfo.java b/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/GoAwayInfo.java similarity index 100% rename from jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/api/GoAwayInfo.java rename to spdy-core/src/main/java/org/eclipse/jetty/spdy/api/GoAwayInfo.java diff --git a/jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/api/Headers.java b/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/Headers.java similarity index 100% rename from jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/api/Headers.java rename to spdy-core/src/main/java/org/eclipse/jetty/spdy/api/Headers.java diff --git a/jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/api/HeadersInfo.java b/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/HeadersInfo.java similarity index 100% rename from jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/api/HeadersInfo.java rename to spdy-core/src/main/java/org/eclipse/jetty/spdy/api/HeadersInfo.java diff --git a/jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/api/PingInfo.java b/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/PingInfo.java similarity index 100% rename from jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/api/PingInfo.java rename to spdy-core/src/main/java/org/eclipse/jetty/spdy/api/PingInfo.java diff --git a/jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/api/ReplyInfo.java b/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/ReplyInfo.java similarity index 100% rename from jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/api/ReplyInfo.java rename to spdy-core/src/main/java/org/eclipse/jetty/spdy/api/ReplyInfo.java diff --git a/jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/api/RstInfo.java b/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/RstInfo.java similarity index 100% rename from jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/api/RstInfo.java rename to spdy-core/src/main/java/org/eclipse/jetty/spdy/api/RstInfo.java diff --git a/jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/api/SPDY.java b/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/SPDY.java similarity index 100% rename from jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/api/SPDY.java rename to spdy-core/src/main/java/org/eclipse/jetty/spdy/api/SPDY.java diff --git a/jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/api/SPDYException.java b/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/SPDYException.java similarity index 100% rename from jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/api/SPDYException.java rename to spdy-core/src/main/java/org/eclipse/jetty/spdy/api/SPDYException.java diff --git a/jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/api/Session.java b/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/Session.java similarity index 100% rename from jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/api/Session.java rename to spdy-core/src/main/java/org/eclipse/jetty/spdy/api/Session.java diff --git a/jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/api/SessionStatus.java b/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/SessionStatus.java similarity index 100% rename from jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/api/SessionStatus.java rename to spdy-core/src/main/java/org/eclipse/jetty/spdy/api/SessionStatus.java diff --git a/jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/api/SettingsInfo.java b/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/SettingsInfo.java similarity index 100% rename from jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/api/SettingsInfo.java rename to spdy-core/src/main/java/org/eclipse/jetty/spdy/api/SettingsInfo.java diff --git a/jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/api/Stream.java b/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/Stream.java similarity index 100% rename from jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/api/Stream.java rename to spdy-core/src/main/java/org/eclipse/jetty/spdy/api/Stream.java diff --git a/jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/api/StreamStatus.java b/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/StreamStatus.java similarity index 100% rename from jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/api/StreamStatus.java rename to spdy-core/src/main/java/org/eclipse/jetty/spdy/api/StreamStatus.java diff --git a/jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/api/StringDataInfo.java b/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/StringDataInfo.java similarity index 100% rename from jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/api/StringDataInfo.java rename to spdy-core/src/main/java/org/eclipse/jetty/spdy/api/StringDataInfo.java diff --git a/jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/api/SynInfo.java b/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/SynInfo.java similarity index 100% rename from jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/api/SynInfo.java rename to spdy-core/src/main/java/org/eclipse/jetty/spdy/api/SynInfo.java diff --git a/jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/api/server/ServerSessionFrameListener.java b/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/server/ServerSessionFrameListener.java similarity index 100% rename from jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/api/server/ServerSessionFrameListener.java rename to spdy-core/src/main/java/org/eclipse/jetty/spdy/api/server/ServerSessionFrameListener.java diff --git a/jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/ControlFrame.java b/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/ControlFrame.java similarity index 100% rename from jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/ControlFrame.java rename to spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/ControlFrame.java diff --git a/jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/ControlFrameType.java b/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/ControlFrameType.java similarity index 100% rename from jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/ControlFrameType.java rename to spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/ControlFrameType.java diff --git a/jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/DataFrame.java b/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/DataFrame.java similarity index 100% rename from jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/DataFrame.java rename to spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/DataFrame.java diff --git a/jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/GoAwayFrame.java b/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/GoAwayFrame.java similarity index 100% rename from jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/GoAwayFrame.java rename to spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/GoAwayFrame.java diff --git a/jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/HeadersFrame.java b/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/HeadersFrame.java similarity index 100% rename from jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/HeadersFrame.java rename to spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/HeadersFrame.java diff --git a/jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/NoOpFrame.java b/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/NoOpFrame.java similarity index 100% rename from jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/NoOpFrame.java rename to spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/NoOpFrame.java diff --git a/jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/PingFrame.java b/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/PingFrame.java similarity index 100% rename from jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/PingFrame.java rename to spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/PingFrame.java diff --git a/jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/RstStreamFrame.java b/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/RstStreamFrame.java similarity index 100% rename from jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/RstStreamFrame.java rename to spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/RstStreamFrame.java diff --git a/jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/SettingsFrame.java b/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/SettingsFrame.java similarity index 100% rename from jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/SettingsFrame.java rename to spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/SettingsFrame.java diff --git a/jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/SynReplyFrame.java b/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/SynReplyFrame.java similarity index 100% rename from jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/SynReplyFrame.java rename to spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/SynReplyFrame.java diff --git a/jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/SynStreamFrame.java b/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/SynStreamFrame.java similarity index 100% rename from jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/SynStreamFrame.java rename to spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/SynStreamFrame.java diff --git a/jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/WindowUpdateFrame.java b/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/WindowUpdateFrame.java similarity index 100% rename from jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/WindowUpdateFrame.java rename to spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/WindowUpdateFrame.java diff --git a/jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/ControlFrameGenerator.java b/spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/ControlFrameGenerator.java similarity index 100% rename from jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/ControlFrameGenerator.java rename to spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/ControlFrameGenerator.java diff --git a/jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/DataFrameGenerator.java b/spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/DataFrameGenerator.java similarity index 100% rename from jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/DataFrameGenerator.java rename to spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/DataFrameGenerator.java diff --git a/jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/Generator.java b/spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/Generator.java similarity index 100% rename from jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/Generator.java rename to spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/Generator.java diff --git a/jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/GoAwayGenerator.java b/spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/GoAwayGenerator.java similarity index 100% rename from jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/GoAwayGenerator.java rename to spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/GoAwayGenerator.java diff --git a/jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/HeadersBlockGenerator.java b/spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/HeadersBlockGenerator.java similarity index 100% rename from jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/HeadersBlockGenerator.java rename to spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/HeadersBlockGenerator.java diff --git a/jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/HeadersGenerator.java b/spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/HeadersGenerator.java similarity index 100% rename from jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/HeadersGenerator.java rename to spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/HeadersGenerator.java diff --git a/jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/NoOpGenerator.java b/spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/NoOpGenerator.java similarity index 100% rename from jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/NoOpGenerator.java rename to spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/NoOpGenerator.java diff --git a/jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/PingGenerator.java b/spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/PingGenerator.java similarity index 100% rename from jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/PingGenerator.java rename to spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/PingGenerator.java diff --git a/jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/RstStreamGenerator.java b/spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/RstStreamGenerator.java similarity index 100% rename from jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/RstStreamGenerator.java rename to spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/RstStreamGenerator.java diff --git a/jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/SettingsGenerator.java b/spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/SettingsGenerator.java similarity index 100% rename from jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/SettingsGenerator.java rename to spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/SettingsGenerator.java diff --git a/jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/SynReplyGenerator.java b/spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/SynReplyGenerator.java similarity index 100% rename from jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/SynReplyGenerator.java rename to spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/SynReplyGenerator.java diff --git a/jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/SynStreamGenerator.java b/spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/SynStreamGenerator.java similarity index 100% rename from jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/SynStreamGenerator.java rename to spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/SynStreamGenerator.java diff --git a/jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/WindowUpdateGenerator.java b/spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/WindowUpdateGenerator.java similarity index 100% rename from jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/WindowUpdateGenerator.java rename to spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/WindowUpdateGenerator.java diff --git a/jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/ControlFrameBodyParser.java b/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/ControlFrameBodyParser.java similarity index 100% rename from jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/ControlFrameBodyParser.java rename to spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/ControlFrameBodyParser.java diff --git a/jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/ControlFrameParser.java b/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/ControlFrameParser.java similarity index 100% rename from jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/ControlFrameParser.java rename to spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/ControlFrameParser.java diff --git a/jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/DataFrameParser.java b/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/DataFrameParser.java similarity index 100% rename from jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/DataFrameParser.java rename to spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/DataFrameParser.java diff --git a/jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/GoAwayBodyParser.java b/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/GoAwayBodyParser.java similarity index 100% rename from jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/GoAwayBodyParser.java rename to spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/GoAwayBodyParser.java diff --git a/jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/HeadersBlockParser.java b/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/HeadersBlockParser.java similarity index 100% rename from jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/HeadersBlockParser.java rename to spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/HeadersBlockParser.java diff --git a/jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/HeadersBodyParser.java b/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/HeadersBodyParser.java similarity index 100% rename from jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/HeadersBodyParser.java rename to spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/HeadersBodyParser.java diff --git a/jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/NoOpBodyParser.java b/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/NoOpBodyParser.java similarity index 100% rename from jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/NoOpBodyParser.java rename to spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/NoOpBodyParser.java diff --git a/jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/Parser.java b/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/Parser.java similarity index 100% rename from jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/Parser.java rename to spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/Parser.java diff --git a/jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/PingBodyParser.java b/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/PingBodyParser.java similarity index 100% rename from jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/PingBodyParser.java rename to spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/PingBodyParser.java diff --git a/jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/RstStreamBodyParser.java b/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/RstStreamBodyParser.java similarity index 100% rename from jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/RstStreamBodyParser.java rename to spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/RstStreamBodyParser.java diff --git a/jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/SettingsBodyParser.java b/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/SettingsBodyParser.java similarity index 100% rename from jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/SettingsBodyParser.java rename to spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/SettingsBodyParser.java diff --git a/jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/SynReplyBodyParser.java b/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/SynReplyBodyParser.java similarity index 100% rename from jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/SynReplyBodyParser.java rename to spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/SynReplyBodyParser.java diff --git a/jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/SynStreamBodyParser.java b/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/SynStreamBodyParser.java similarity index 100% rename from jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/SynStreamBodyParser.java rename to spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/SynStreamBodyParser.java diff --git a/jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/UnknownControlFrameBodyParser.java b/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/UnknownControlFrameBodyParser.java similarity index 100% rename from jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/UnknownControlFrameBodyParser.java rename to spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/UnknownControlFrameBodyParser.java diff --git a/jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/WindowUpdateBodyParser.java b/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/WindowUpdateBodyParser.java similarity index 100% rename from jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/WindowUpdateBodyParser.java rename to spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/WindowUpdateBodyParser.java diff --git a/jetty-spdy-core/src/test/java/org/eclipse/jetty/spdy/api/ClientUsageTest.java b/spdy-core/src/test/java/org/eclipse/jetty/spdy/api/ClientUsageTest.java similarity index 100% rename from jetty-spdy-core/src/test/java/org/eclipse/jetty/spdy/api/ClientUsageTest.java rename to spdy-core/src/test/java/org/eclipse/jetty/spdy/api/ClientUsageTest.java diff --git a/jetty-spdy-core/src/test/java/org/eclipse/jetty/spdy/api/ServerUsageTest.java b/spdy-core/src/test/java/org/eclipse/jetty/spdy/api/ServerUsageTest.java similarity index 100% rename from jetty-spdy-core/src/test/java/org/eclipse/jetty/spdy/api/ServerUsageTest.java rename to spdy-core/src/test/java/org/eclipse/jetty/spdy/api/ServerUsageTest.java diff --git a/jetty-spdy-core/src/test/java/org/eclipse/jetty/spdy/frames/GoAwayGenerateParseTest.java b/spdy-core/src/test/java/org/eclipse/jetty/spdy/frames/GoAwayGenerateParseTest.java similarity index 100% rename from jetty-spdy-core/src/test/java/org/eclipse/jetty/spdy/frames/GoAwayGenerateParseTest.java rename to spdy-core/src/test/java/org/eclipse/jetty/spdy/frames/GoAwayGenerateParseTest.java diff --git a/jetty-spdy-core/src/test/java/org/eclipse/jetty/spdy/frames/HeadersGenerateParseTest.java b/spdy-core/src/test/java/org/eclipse/jetty/spdy/frames/HeadersGenerateParseTest.java similarity index 100% rename from jetty-spdy-core/src/test/java/org/eclipse/jetty/spdy/frames/HeadersGenerateParseTest.java rename to spdy-core/src/test/java/org/eclipse/jetty/spdy/frames/HeadersGenerateParseTest.java diff --git a/jetty-spdy-core/src/test/java/org/eclipse/jetty/spdy/frames/NoOpGenerateParseTest.java b/spdy-core/src/test/java/org/eclipse/jetty/spdy/frames/NoOpGenerateParseTest.java similarity index 100% rename from jetty-spdy-core/src/test/java/org/eclipse/jetty/spdy/frames/NoOpGenerateParseTest.java rename to spdy-core/src/test/java/org/eclipse/jetty/spdy/frames/NoOpGenerateParseTest.java diff --git a/jetty-spdy-core/src/test/java/org/eclipse/jetty/spdy/frames/PingGenerateParseTest.java b/spdy-core/src/test/java/org/eclipse/jetty/spdy/frames/PingGenerateParseTest.java similarity index 100% rename from jetty-spdy-core/src/test/java/org/eclipse/jetty/spdy/frames/PingGenerateParseTest.java rename to spdy-core/src/test/java/org/eclipse/jetty/spdy/frames/PingGenerateParseTest.java diff --git a/jetty-spdy-core/src/test/java/org/eclipse/jetty/spdy/frames/RstStreamGenerateParseTest.java b/spdy-core/src/test/java/org/eclipse/jetty/spdy/frames/RstStreamGenerateParseTest.java similarity index 100% rename from jetty-spdy-core/src/test/java/org/eclipse/jetty/spdy/frames/RstStreamGenerateParseTest.java rename to spdy-core/src/test/java/org/eclipse/jetty/spdy/frames/RstStreamGenerateParseTest.java diff --git a/jetty-spdy-core/src/test/java/org/eclipse/jetty/spdy/frames/SettingsGenerateParseTest.java b/spdy-core/src/test/java/org/eclipse/jetty/spdy/frames/SettingsGenerateParseTest.java similarity index 100% rename from jetty-spdy-core/src/test/java/org/eclipse/jetty/spdy/frames/SettingsGenerateParseTest.java rename to spdy-core/src/test/java/org/eclipse/jetty/spdy/frames/SettingsGenerateParseTest.java diff --git a/jetty-spdy-core/src/test/java/org/eclipse/jetty/spdy/frames/SynReplyGenerateParseTest.java b/spdy-core/src/test/java/org/eclipse/jetty/spdy/frames/SynReplyGenerateParseTest.java similarity index 100% rename from jetty-spdy-core/src/test/java/org/eclipse/jetty/spdy/frames/SynReplyGenerateParseTest.java rename to spdy-core/src/test/java/org/eclipse/jetty/spdy/frames/SynReplyGenerateParseTest.java diff --git a/jetty-spdy-core/src/test/java/org/eclipse/jetty/spdy/frames/SynStreamGenerateParseTest.java b/spdy-core/src/test/java/org/eclipse/jetty/spdy/frames/SynStreamGenerateParseTest.java similarity index 100% rename from jetty-spdy-core/src/test/java/org/eclipse/jetty/spdy/frames/SynStreamGenerateParseTest.java rename to spdy-core/src/test/java/org/eclipse/jetty/spdy/frames/SynStreamGenerateParseTest.java diff --git a/jetty-spdy-core/src/test/java/org/eclipse/jetty/spdy/frames/TestSPDYParserListener.java b/spdy-core/src/test/java/org/eclipse/jetty/spdy/frames/TestSPDYParserListener.java similarity index 100% rename from jetty-spdy-core/src/test/java/org/eclipse/jetty/spdy/frames/TestSPDYParserListener.java rename to spdy-core/src/test/java/org/eclipse/jetty/spdy/frames/TestSPDYParserListener.java diff --git a/jetty-spdy-core/src/test/java/org/eclipse/jetty/spdy/frames/WindowUpdateGenerateParseTest.java b/spdy-core/src/test/java/org/eclipse/jetty/spdy/frames/WindowUpdateGenerateParseTest.java similarity index 100% rename from jetty-spdy-core/src/test/java/org/eclipse/jetty/spdy/frames/WindowUpdateGenerateParseTest.java rename to spdy-core/src/test/java/org/eclipse/jetty/spdy/frames/WindowUpdateGenerateParseTest.java diff --git a/jetty-spdy-core/src/test/java/org/eclipse/jetty/spdy/parser/LiveChromiumRequestParserTest.java b/spdy-core/src/test/java/org/eclipse/jetty/spdy/parser/LiveChromiumRequestParserTest.java similarity index 100% rename from jetty-spdy-core/src/test/java/org/eclipse/jetty/spdy/parser/LiveChromiumRequestParserTest.java rename to spdy-core/src/test/java/org/eclipse/jetty/spdy/parser/LiveChromiumRequestParserTest.java diff --git a/jetty-spdy-core/src/test/java/org/eclipse/jetty/spdy/parser/ParseVersusCacheBenchmarkTest.java b/spdy-core/src/test/java/org/eclipse/jetty/spdy/parser/ParseVersusCacheBenchmarkTest.java similarity index 100% rename from jetty-spdy-core/src/test/java/org/eclipse/jetty/spdy/parser/ParseVersusCacheBenchmarkTest.java rename to spdy-core/src/test/java/org/eclipse/jetty/spdy/parser/ParseVersusCacheBenchmarkTest.java diff --git a/jetty-spdy-core/src/test/resources/log4j.properties b/spdy-core/src/test/resources/log4j.properties similarity index 100% rename from jetty-spdy-core/src/test/resources/log4j.properties rename to spdy-core/src/test/resources/log4j.properties diff --git a/spdy-jetty-http/pom.xml b/spdy-jetty-http/pom.xml new file mode 100644 index 00000000000..ff64c094f01 --- /dev/null +++ b/spdy-jetty-http/pom.xml @@ -0,0 +1,27 @@ + + + + org.eclipse.jetty + spdy-project + 1.0.0-SNAPSHOT + + + 4.0.0 + spdy-jetty-http + SPDY :: Jetty HTTP Layer + + + + org.eclipse.jetty + spdy-jetty + ${project.version} + + + junit + junit + + + + diff --git a/jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/nio/http/HTTPOverSPDYAsyncConnectionFactory.java b/spdy-jetty-http/src/main/java/org/eclipse/jetty/spdy/http/HTTPOverSPDYAsyncConnectionFactory.java similarity index 96% rename from jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/nio/http/HTTPOverSPDYAsyncConnectionFactory.java rename to spdy-jetty-http/src/main/java/org/eclipse/jetty/spdy/http/HTTPOverSPDYAsyncConnectionFactory.java index f412bbd9b92..a156fda68cc 100644 --- a/jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/nio/http/HTTPOverSPDYAsyncConnectionFactory.java +++ b/spdy-jetty-http/src/main/java/org/eclipse/jetty/spdy/http/HTTPOverSPDYAsyncConnectionFactory.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.eclipse.jetty.spdy.nio.http; +package org.eclipse.jetty.spdy.http; import java.io.IOException; import java.nio.ByteBuffer; @@ -22,6 +22,9 @@ import java.nio.ByteBuffer; import org.eclipse.jetty.http.HttpException; import org.eclipse.jetty.io.AsyncEndPoint; import org.eclipse.jetty.server.Connector; +import org.eclipse.jetty.spdy.EmptyAsyncEndPoint; +import org.eclipse.jetty.spdy.SPDYAsyncConnection; +import org.eclipse.jetty.spdy.ServerSPDYAsyncConnectionFactory; import org.eclipse.jetty.spdy.api.DataInfo; import org.eclipse.jetty.spdy.api.Headers; import org.eclipse.jetty.spdy.api.HeadersInfo; @@ -29,9 +32,6 @@ import org.eclipse.jetty.spdy.api.ReplyInfo; import org.eclipse.jetty.spdy.api.Stream; import org.eclipse.jetty.spdy.api.SynInfo; import org.eclipse.jetty.spdy.api.server.ServerSessionFrameListener; -import org.eclipse.jetty.spdy.nio.EmptyAsyncEndPoint; -import org.eclipse.jetty.spdy.nio.SPDYAsyncConnection; -import org.eclipse.jetty.spdy.nio.ServerSPDYAsyncConnectionFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/nio/http/HTTPSPDYAsyncConnection.java b/spdy-jetty-http/src/main/java/org/eclipse/jetty/spdy/http/HTTPSPDYAsyncConnection.java similarity index 99% rename from jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/nio/http/HTTPSPDYAsyncConnection.java rename to spdy-jetty-http/src/main/java/org/eclipse/jetty/spdy/http/HTTPSPDYAsyncConnection.java index 92aecebd3f1..2ee2c2ba0e4 100644 --- a/jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/nio/http/HTTPSPDYAsyncConnection.java +++ b/spdy-jetty-http/src/main/java/org/eclipse/jetty/spdy/http/HTTPSPDYAsyncConnection.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.eclipse.jetty.spdy.nio.http; +package org.eclipse.jetty.spdy.http; import java.io.EOFException; import java.io.IOException; @@ -41,10 +41,10 @@ import org.eclipse.jetty.io.nio.NIOBuffer; import org.eclipse.jetty.server.AbstractHttpConnection; import org.eclipse.jetty.server.Connector; import org.eclipse.jetty.server.Server; +import org.eclipse.jetty.spdy.SPDYAsyncConnection; import org.eclipse.jetty.spdy.api.Headers; import org.eclipse.jetty.spdy.api.ReplyInfo; import org.eclipse.jetty.spdy.api.Stream; -import org.eclipse.jetty.spdy.nio.SPDYAsyncConnection; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/nio/http/HTTPSPDYServerConnector.java b/spdy-jetty-http/src/main/java/org/eclipse/jetty/spdy/http/HTTPSPDYServerConnector.java similarity index 89% rename from jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/nio/http/HTTPSPDYServerConnector.java rename to spdy-jetty-http/src/main/java/org/eclipse/jetty/spdy/http/HTTPSPDYServerConnector.java index 64220baeab3..e86c1b080a2 100644 --- a/jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/nio/http/HTTPSPDYServerConnector.java +++ b/spdy-jetty-http/src/main/java/org/eclipse/jetty/spdy/http/HTTPSPDYServerConnector.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.eclipse.jetty.spdy.nio.http; +package org.eclipse.jetty.spdy.http; -import org.eclipse.jetty.spdy.nio.SPDYServerConnector; +import org.eclipse.jetty.spdy.SPDYServerConnector; public class HTTPSPDYServerConnector extends SPDYServerConnector { diff --git a/jetty-spdy-core/src/test/java/org/eclipse/jetty/spdy/nio/http/HTTPOverSPDYTest.java b/spdy-jetty-http/src/test/java/org/eclipse/jetty/spdy/http/HTTPOverSPDYTest.java similarity index 85% rename from jetty-spdy-core/src/test/java/org/eclipse/jetty/spdy/nio/http/HTTPOverSPDYTest.java rename to spdy-jetty-http/src/test/java/org/eclipse/jetty/spdy/http/HTTPOverSPDYTest.java index d132f0c5e12..6bda1e968db 100644 --- a/jetty-spdy-core/src/test/java/org/eclipse/jetty/spdy/nio/http/HTTPOverSPDYTest.java +++ b/spdy-jetty-http/src/test/java/org/eclipse/jetty/spdy/http/HTTPOverSPDYTest.java @@ -14,19 +14,23 @@ * limitations under the License. */ -package org.eclipse.jetty.spdy.nio.http; +package org.eclipse.jetty.spdy.http; import java.io.BufferedReader; import java.io.IOException; +import java.net.InetSocketAddress; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.Request; +import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.handler.AbstractHandler; -import org.eclipse.jetty.spdy.AbstractTest; +import org.eclipse.jetty.spdy.SPDYClient; +import org.eclipse.jetty.spdy.SPDYServerConnector; import org.eclipse.jetty.spdy.api.Headers; import org.eclipse.jetty.spdy.api.ReplyInfo; import org.eclipse.jetty.spdy.api.SPDY; @@ -34,20 +38,83 @@ import org.eclipse.jetty.spdy.api.Session; import org.eclipse.jetty.spdy.api.Stream; import org.eclipse.jetty.spdy.api.StringDataInfo; import org.eclipse.jetty.spdy.api.SynInfo; -import org.eclipse.jetty.spdy.api.server.ServerSessionFrameListener; -import org.eclipse.jetty.spdy.nio.SPDYServerConnector; +import org.eclipse.jetty.util.thread.QueuedThreadPool; +import org.eclipse.jetty.util.thread.ThreadPool; +import org.junit.After; import org.junit.Assert; import org.junit.Ignore; +import org.junit.Rule; import org.junit.Test; +import org.junit.rules.TestWatchman; +import org.junit.runners.model.FrameworkMethod; -public class HTTPOverSPDYTest extends AbstractTest +public class HTTPOverSPDYTest { - @Override - protected SPDYServerConnector newSPDYServerConnector(ServerSessionFrameListener listener) + @Rule + public final TestWatchman testName = new TestWatchman() + { + @Override + public void starting(FrameworkMethod method) + { + super.starting(method); + System.err.printf("Running %s.%s()%n", + method.getMethod().getDeclaringClass().getName(), + method.getName()); + } + }; + + protected Server server; + protected SPDYClient.Factory clientFactory; + protected SPDYServerConnector connector; + + protected InetSocketAddress startHTTPServer(Handler handler) throws Exception + { + server = new Server(); + connector = newHTTPSPDYServerConnector(); + connector.setPort(0); + server.addConnector(connector); + server.setHandler(handler); + server.start(); + return new InetSocketAddress("localhost", connector.getLocalPort()); + } + + protected SPDYServerConnector newHTTPSPDYServerConnector() { return new HTTPSPDYServerConnector(); } + protected Session startClient(InetSocketAddress socketAddress, Session.FrameListener frameListener) throws Exception + { + if (clientFactory == null) + { + QueuedThreadPool threadPool = new QueuedThreadPool(); + threadPool.setName(threadPool.getName() + "-client"); + clientFactory = newSPDYClientFactory(threadPool); + clientFactory.start(); + } + return clientFactory.newSPDYClient().connect(socketAddress, frameListener).get(); + } + + protected SPDYClient.Factory newSPDYClientFactory(ThreadPool threadPool) + { + return new SPDYClient.Factory(threadPool); + } + + @After + public void destroy() throws Exception + { + if (clientFactory != null) + { + clientFactory.stop(); + clientFactory.join(); + } + if (server != null) + { + server.stop(); + server.join(); + } + } + @Ignore @Test public void test100Continue() throws Exception diff --git a/spdy-jetty/pom.xml b/spdy-jetty/pom.xml new file mode 100644 index 00000000000..5428fb15201 --- /dev/null +++ b/spdy-jetty/pom.xml @@ -0,0 +1,27 @@ + + + + org.eclipse.jetty + spdy-project + 1.0.0-SNAPSHOT + + 4.0.0 + + spdy-jetty + SPDY :: Jetty Binding + + + + org.eclipse.jetty + spdy-core + ${project.version} + + + junit + junit + + + + diff --git a/jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/nio/AsyncConnectionFactory.java b/spdy-jetty/src/main/java/org/eclipse/jetty/spdy/AsyncConnectionFactory.java similarity index 96% rename from jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/nio/AsyncConnectionFactory.java rename to spdy-jetty/src/main/java/org/eclipse/jetty/spdy/AsyncConnectionFactory.java index 68220b3badc..37077870474 100644 --- a/jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/nio/AsyncConnectionFactory.java +++ b/spdy-jetty/src/main/java/org/eclipse/jetty/spdy/AsyncConnectionFactory.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.eclipse.jetty.spdy.nio; +package org.eclipse.jetty.spdy; import java.nio.channels.SocketChannel; diff --git a/jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/nio/EmptyAsyncConnection.java b/spdy-jetty/src/main/java/org/eclipse/jetty/spdy/EmptyAsyncConnection.java similarity index 97% rename from jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/nio/EmptyAsyncConnection.java rename to spdy-jetty/src/main/java/org/eclipse/jetty/spdy/EmptyAsyncConnection.java index f3dcd529029..e6529b1d2f3 100644 --- a/jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/nio/EmptyAsyncConnection.java +++ b/spdy-jetty/src/main/java/org/eclipse/jetty/spdy/EmptyAsyncConnection.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.eclipse.jetty.spdy.nio; +package org.eclipse.jetty.spdy; import java.io.IOException; diff --git a/jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/nio/EmptyAsyncEndPoint.java b/spdy-jetty/src/main/java/org/eclipse/jetty/spdy/EmptyAsyncEndPoint.java similarity index 99% rename from jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/nio/EmptyAsyncEndPoint.java rename to spdy-jetty/src/main/java/org/eclipse/jetty/spdy/EmptyAsyncEndPoint.java index 8912566fa88..3d4d7f702de 100644 --- a/jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/nio/EmptyAsyncEndPoint.java +++ b/spdy-jetty/src/main/java/org/eclipse/jetty/spdy/EmptyAsyncEndPoint.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.eclipse.jetty.spdy.nio; +package org.eclipse.jetty.spdy; import java.io.IOException; diff --git a/jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/nio/SPDYAsyncConnection.java b/spdy-jetty/src/main/java/org/eclipse/jetty/spdy/SPDYAsyncConnection.java similarity index 98% rename from jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/nio/SPDYAsyncConnection.java rename to spdy-jetty/src/main/java/org/eclipse/jetty/spdy/SPDYAsyncConnection.java index 1f466e822ba..ed678bf63c2 100644 --- a/jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/nio/SPDYAsyncConnection.java +++ b/spdy-jetty/src/main/java/org/eclipse/jetty/spdy/SPDYAsyncConnection.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.eclipse.jetty.spdy.nio; +package org.eclipse.jetty.spdy; import java.io.IOException; import java.nio.ByteBuffer; @@ -27,7 +27,6 @@ import org.eclipse.jetty.io.nio.AsyncConnection; import org.eclipse.jetty.io.nio.DirectNIOBuffer; import org.eclipse.jetty.io.nio.IndirectNIOBuffer; import org.eclipse.jetty.io.nio.NIOBuffer; -import org.eclipse.jetty.spdy.ISession; import org.eclipse.jetty.spdy.ISession.Controller; import org.eclipse.jetty.spdy.api.SPDY; import org.eclipse.jetty.spdy.api.SPDYException; diff --git a/jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/nio/SPDYClient.java b/spdy-jetty/src/main/java/org/eclipse/jetty/spdy/SPDYClient.java similarity index 98% rename from jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/nio/SPDYClient.java rename to spdy-jetty/src/main/java/org/eclipse/jetty/spdy/SPDYClient.java index 9dbdb1360fc..305bc1cbe76 100644 --- a/jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/nio/SPDYClient.java +++ b/spdy-jetty/src/main/java/org/eclipse/jetty/spdy/SPDYClient.java @@ -19,7 +19,7 @@ * and open the template in the editor. */ -package org.eclipse.jetty.spdy.nio; +package org.eclipse.jetty.spdy; import java.io.IOException; import java.net.InetSocketAddress; @@ -45,9 +45,6 @@ import org.eclipse.jetty.io.nio.SelectChannelEndPoint; import org.eclipse.jetty.io.nio.SelectorManager; import org.eclipse.jetty.io.nio.SslConnection; import org.eclipse.jetty.npn.NextProtoNego; -import org.eclipse.jetty.spdy.CompressionFactory; -import org.eclipse.jetty.spdy.StandardCompressionFactory; -import org.eclipse.jetty.spdy.StandardSession; import org.eclipse.jetty.spdy.api.Session; import org.eclipse.jetty.spdy.api.Session.FrameListener; import org.eclipse.jetty.spdy.generator.Generator; diff --git a/jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/nio/SPDYServerConnector.java b/spdy-jetty/src/main/java/org/eclipse/jetty/spdy/SPDYServerConnector.java similarity index 99% rename from jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/nio/SPDYServerConnector.java rename to spdy-jetty/src/main/java/org/eclipse/jetty/spdy/SPDYServerConnector.java index 1d31259b02f..1bd870f9eb3 100644 --- a/jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/nio/SPDYServerConnector.java +++ b/spdy-jetty/src/main/java/org/eclipse/jetty/spdy/SPDYServerConnector.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.eclipse.jetty.spdy.nio; +package org.eclipse.jetty.spdy; import java.nio.channels.SocketChannel; import java.util.ArrayList; diff --git a/jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/nio/ServerSPDYAsyncConnectionFactory.java b/spdy-jetty/src/main/java/org/eclipse/jetty/spdy/ServerSPDYAsyncConnectionFactory.java similarity index 94% rename from jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/nio/ServerSPDYAsyncConnectionFactory.java rename to spdy-jetty/src/main/java/org/eclipse/jetty/spdy/ServerSPDYAsyncConnectionFactory.java index 93880fa384a..ff0198c88af 100644 --- a/jetty-spdy-core/src/main/java/org/eclipse/jetty/spdy/nio/ServerSPDYAsyncConnectionFactory.java +++ b/spdy-jetty/src/main/java/org/eclipse/jetty/spdy/ServerSPDYAsyncConnectionFactory.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.eclipse.jetty.spdy.nio; +package org.eclipse.jetty.spdy; import java.io.IOException; import java.nio.channels.SocketChannel; @@ -22,9 +22,6 @@ import java.nio.channels.SocketChannel; import org.eclipse.jetty.io.AsyncEndPoint; import org.eclipse.jetty.io.Connection; import org.eclipse.jetty.io.nio.AsyncConnection; -import org.eclipse.jetty.spdy.CompressionFactory; -import org.eclipse.jetty.spdy.StandardCompressionFactory; -import org.eclipse.jetty.spdy.StandardSession; import org.eclipse.jetty.spdy.api.server.ServerSessionFrameListener; import org.eclipse.jetty.spdy.generator.Generator; import org.eclipse.jetty.spdy.parser.Parser; diff --git a/jetty-spdy-core/src/test/java/org/eclipse/jetty/spdy/AbstractTest.java b/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/AbstractTest.java similarity index 85% rename from jetty-spdy-core/src/test/java/org/eclipse/jetty/spdy/AbstractTest.java rename to spdy-jetty/src/test/java/org/eclipse/jetty/spdy/AbstractTest.java index 2d756714427..f1063025f0f 100644 --- a/jetty-spdy-core/src/test/java/org/eclipse/jetty/spdy/AbstractTest.java +++ b/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/AbstractTest.java @@ -18,12 +18,9 @@ package org.eclipse.jetty.spdy; import java.net.InetSocketAddress; -import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.spdy.api.Session; import org.eclipse.jetty.spdy.api.server.ServerSessionFrameListener; -import org.eclipse.jetty.spdy.nio.SPDYClient; -import org.eclipse.jetty.spdy.nio.SPDYServerConnector; import org.eclipse.jetty.util.ssl.SslContextFactory; import org.eclipse.jetty.util.thread.QueuedThreadPool; import org.eclipse.jetty.util.thread.ThreadPool; @@ -46,11 +43,12 @@ public abstract class AbstractTest method.getName()); } }; + protected Server server; protected SPDYClient.Factory clientFactory; protected SPDYServerConnector connector; - protected InetSocketAddress startSPDYServer(ServerSessionFrameListener listener) throws Exception + protected InetSocketAddress startServer(ServerSessionFrameListener listener) throws Exception { server = new Server(); connector = newSPDYServerConnector(listener); @@ -60,17 +58,6 @@ public abstract class AbstractTest return new InetSocketAddress("localhost", connector.getLocalPort()); } - protected InetSocketAddress startHTTPServer(Handler handler) throws Exception - { - server = new Server(); - connector = newSPDYServerConnector(null); - connector.setPort(0); - server.addConnector(connector); - server.setHandler(handler); - server.start(); - return new InetSocketAddress("localhost", connector.getLocalPort()); - } - protected SPDYServerConnector newSPDYServerConnector(ServerSessionFrameListener listener) { return new SPDYServerConnector(listener); diff --git a/jetty-spdy-core/src/test/java/org/eclipse/jetty/spdy/ConcurrentSynDataReplyDataTest.java b/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/ConcurrentSynDataReplyDataTest.java similarity index 98% rename from jetty-spdy-core/src/test/java/org/eclipse/jetty/spdy/ConcurrentSynDataReplyDataTest.java rename to spdy-jetty/src/test/java/org/eclipse/jetty/spdy/ConcurrentSynDataReplyDataTest.java index 994495b02e1..20932b85a03 100644 --- a/jetty-spdy-core/src/test/java/org/eclipse/jetty/spdy/ConcurrentSynDataReplyDataTest.java +++ b/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/ConcurrentSynDataReplyDataTest.java @@ -64,7 +64,7 @@ public class ConcurrentSynDataReplyDataTest extends AbstractTest }; } }; - final Session session = startClient(startSPDYServer(serverSessionFrameListener), null); + final Session session = startClient(startServer(serverSessionFrameListener), null); final int iterations = 50; final int count = 50; diff --git a/jetty-spdy-core/src/test/java/org/eclipse/jetty/spdy/GoAwayTest.java b/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/GoAwayTest.java similarity index 93% rename from jetty-spdy-core/src/test/java/org/eclipse/jetty/spdy/GoAwayTest.java rename to spdy-jetty/src/test/java/org/eclipse/jetty/spdy/GoAwayTest.java index 8377974154b..a3617a46253 100644 --- a/jetty-spdy-core/src/test/java/org/eclipse/jetty/spdy/GoAwayTest.java +++ b/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/GoAwayTest.java @@ -33,11 +33,10 @@ import org.eclipse.jetty.spdy.api.Stream; import org.eclipse.jetty.spdy.api.StringDataInfo; import org.eclipse.jetty.spdy.api.SynInfo; import org.eclipse.jetty.spdy.api.server.ServerSessionFrameListener; +import org.hamcrest.CoreMatchers; import org.junit.Assert; import org.junit.Test; -import static org.hamcrest.CoreMatchers.instanceOf; - public class GoAwayTest extends AbstractTest { @Test @@ -61,7 +60,7 @@ public class GoAwayTest extends AbstractTest latch.countDown(); } }; - Session session = startClient(startSPDYServer(serverSessionFrameListener), null); + Session session = startClient(startServer(serverSessionFrameListener), null); session.syn(SPDY.V2, new SynInfo(true), null); @@ -94,7 +93,7 @@ public class GoAwayTest extends AbstractTest latch.countDown(); } }; - Session session = startClient(startSPDYServer(serverSessionFrameListener), clientSessionFrameListener); + Session session = startClient(startServer(serverSessionFrameListener), clientSessionFrameListener); Stream stream1 = session.syn(SPDY.V2, new SynInfo(true), null); @@ -138,7 +137,7 @@ public class GoAwayTest extends AbstractTest ref.get().syn(SPDY.V2, new SynInfo(true), null); } }; - Session session = startClient(startSPDYServer(serverSessionFrameListener), clientSessionFrameListener); + Session session = startClient(startServer(serverSessionFrameListener), clientSessionFrameListener); ref.set(session); session.syn(SPDY.V2, new SynInfo(true), null); @@ -190,7 +189,7 @@ public class GoAwayTest extends AbstractTest goAwayLatch.countDown(); } }; - Session session = startClient(startSPDYServer(serverSessionFrameListener), clientSessionFrameListener); + Session session = startClient(startServer(serverSessionFrameListener), clientSessionFrameListener); // First stream is processed ok final CountDownLatch reply1Latch = new CountDownLatch(1); @@ -218,7 +217,7 @@ public class GoAwayTest extends AbstractTest } catch (SPDYException x) { - Assert.assertThat(x.getCause(), instanceOf(ClosedChannelException.class)); + Assert.assertThat(x.getCause(), CoreMatchers.instanceOf(ClosedChannelException.class)); } // Be sure the last good stream is the first diff --git a/jetty-spdy-core/src/test/java/org/eclipse/jetty/spdy/HeadersTest.java b/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/HeadersTest.java similarity index 96% rename from jetty-spdy-core/src/test/java/org/eclipse/jetty/spdy/HeadersTest.java rename to spdy-jetty/src/test/java/org/eclipse/jetty/spdy/HeadersTest.java index 8007671bb5d..be4b6397910 100644 --- a/jetty-spdy-core/src/test/java/org/eclipse/jetty/spdy/HeadersTest.java +++ b/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/HeadersTest.java @@ -54,7 +54,7 @@ public class HeadersTest extends AbstractTest } }; - Session session = startClient(startSPDYServer(serverSessionFrameListener), null); + Session session = startClient(startServer(serverSessionFrameListener), null); final CountDownLatch latch = new CountDownLatch(1); session.syn(SPDY.V2, new SynInfo(false), new Stream.FrameListener.Adapter() diff --git a/jetty-spdy-core/src/test/java/org/eclipse/jetty/spdy/nio/IdleTimeoutTest.java b/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/IdleTimeoutTest.java similarity index 96% rename from jetty-spdy-core/src/test/java/org/eclipse/jetty/spdy/nio/IdleTimeoutTest.java rename to spdy-jetty/src/test/java/org/eclipse/jetty/spdy/IdleTimeoutTest.java index cecda299024..332637c4539 100644 --- a/jetty-spdy-core/src/test/java/org/eclipse/jetty/spdy/nio/IdleTimeoutTest.java +++ b/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/IdleTimeoutTest.java @@ -14,14 +14,13 @@ * limitations under the License. */ -package org.eclipse.jetty.spdy.nio; +package org.eclipse.jetty.spdy; import java.net.InetSocketAddress; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import org.eclipse.jetty.server.Server; -import org.eclipse.jetty.spdy.AbstractTest; import org.eclipse.jetty.spdy.api.GoAwayInfo; import org.eclipse.jetty.spdy.api.ReplyInfo; import org.eclipse.jetty.spdy.api.SPDY; @@ -149,7 +148,7 @@ public class IdleTimeoutTest extends AbstractTest public void testClientEnforcingIdleTimeout() throws Exception { final CountDownLatch latch = new CountDownLatch(1); - InetSocketAddress address = startSPDYServer(new ServerSessionFrameListener.Adapter() + InetSocketAddress address = startServer(new ServerSessionFrameListener.Adapter() { @Override public Stream.FrameListener onSyn(Stream stream, SynInfo synInfo) @@ -183,7 +182,7 @@ public class IdleTimeoutTest extends AbstractTest public void testClientEnforcingIdleTimeoutWithUnrespondedStream() throws Exception { final CountDownLatch latch = new CountDownLatch(1); - InetSocketAddress address = startSPDYServer(new ServerSessionFrameListener.Adapter() + InetSocketAddress address = startServer(new ServerSessionFrameListener.Adapter() { @Override public void onGoAway(Session session, GoAwayInfo goAwayInfo) @@ -211,7 +210,7 @@ public class IdleTimeoutTest extends AbstractTest { final long maxIdleTime = 1000; final CountDownLatch latch = new CountDownLatch(1); - InetSocketAddress address = startSPDYServer(new ServerSessionFrameListener.Adapter() + InetSocketAddress address = startServer(new ServerSessionFrameListener.Adapter() { @Override public Stream.FrameListener onSyn(Stream stream, SynInfo synInfo) diff --git a/jetty-spdy-core/src/test/java/org/eclipse/jetty/spdy/PingTest.java b/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/PingTest.java similarity index 94% rename from jetty-spdy-core/src/test/java/org/eclipse/jetty/spdy/PingTest.java rename to spdy-jetty/src/test/java/org/eclipse/jetty/spdy/PingTest.java index 36a88d58cc9..92c12fa2e91 100644 --- a/jetty-spdy-core/src/test/java/org/eclipse/jetty/spdy/PingTest.java +++ b/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/PingTest.java @@ -43,7 +43,7 @@ public class PingTest extends AbstractTest latch.countDown(); } }; - Session session = startClient(startSPDYServer(null), clientSessionFrameListener); + Session session = startClient(startServer(null), clientSessionFrameListener); PingInfo pingInfo = session.ping(SPDY.V2); Assert.assertEquals(1, pingInfo.getPingId() % 2); @@ -76,7 +76,7 @@ public class PingTest extends AbstractTest pingLatch.countDown(); } }; - startClient(startSPDYServer(serverSessionFrameListener), null); + startClient(startServer(serverSessionFrameListener), null); Assert.assertTrue(pingLatch.await(5, TimeUnit.SECONDS)); } diff --git a/jetty-spdy-core/src/test/java/org/eclipse/jetty/spdy/SSLSynReplyTest.java b/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/SSLSynReplyTest.java similarity index 94% rename from jetty-spdy-core/src/test/java/org/eclipse/jetty/spdy/SSLSynReplyTest.java rename to spdy-jetty/src/test/java/org/eclipse/jetty/spdy/SSLSynReplyTest.java index 92cff021b1f..1cba13fbd45 100644 --- a/jetty-spdy-core/src/test/java/org/eclipse/jetty/spdy/SSLSynReplyTest.java +++ b/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/SSLSynReplyTest.java @@ -18,8 +18,6 @@ package org.eclipse.jetty.spdy; import org.eclipse.jetty.npn.NextProtoNego; import org.eclipse.jetty.spdy.api.server.ServerSessionFrameListener; -import org.eclipse.jetty.spdy.nio.SPDYClient; -import org.eclipse.jetty.spdy.nio.SPDYServerConnector; import org.eclipse.jetty.util.ssl.SslContextFactory; import org.eclipse.jetty.util.thread.ThreadPool; import org.junit.Assume; diff --git a/jetty-spdy-core/src/test/java/org/eclipse/jetty/spdy/SettingsTest.java b/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/SettingsTest.java similarity index 94% rename from jetty-spdy-core/src/test/java/org/eclipse/jetty/spdy/SettingsTest.java rename to spdy-jetty/src/test/java/org/eclipse/jetty/spdy/SettingsTest.java index 29fe6ef0fdc..4977c069bc4 100644 --- a/jetty-spdy-core/src/test/java/org/eclipse/jetty/spdy/SettingsTest.java +++ b/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/SettingsTest.java @@ -48,7 +48,7 @@ public class SettingsTest extends AbstractTest latch.countDown(); } }; - Session session = startClient(startSPDYServer(serverSessionFrameListener), null); + Session session = startClient(startServer(serverSessionFrameListener), null); session.settings(SPDY.V2, clientSettingsInfo); @@ -83,7 +83,7 @@ public class SettingsTest extends AbstractTest } }; - startClient(startSPDYServer(serverSessionFrameListener), clientSessionFrameListener); + startClient(startServer(serverSessionFrameListener), clientSessionFrameListener); Assert.assertTrue(latch.await(5, TimeUnit.SECONDS)); } diff --git a/jetty-spdy-core/src/test/java/org/eclipse/jetty/spdy/SynReplyTest.java b/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/SynReplyTest.java similarity index 96% rename from jetty-spdy-core/src/test/java/org/eclipse/jetty/spdy/SynReplyTest.java rename to spdy-jetty/src/test/java/org/eclipse/jetty/spdy/SynReplyTest.java index 652055b1e5e..e564698f058 100644 --- a/jetty-spdy-core/src/test/java/org/eclipse/jetty/spdy/SynReplyTest.java +++ b/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/SynReplyTest.java @@ -65,7 +65,7 @@ public class SynReplyTest extends AbstractTest } }; - Session session = startClient(startSPDYServer(serverSessionFrameListener), null); + Session session = startClient(startServer(serverSessionFrameListener), null); final CountDownLatch streamCreatedLatch = new CountDownLatch(1); final CountDownLatch streamRemovedLatch = new CountDownLatch(1); @@ -154,7 +154,7 @@ public class SynReplyTest extends AbstractTest } }; - Session session = startClient(startSPDYServer(serverSessionFrameListener), null); + Session session = startClient(startServer(serverSessionFrameListener), null); final CountDownLatch streamRemovedLatch = new CountDownLatch(1); session.addListener(new Session.StreamListener.Adapter() @@ -210,7 +210,7 @@ public class SynReplyTest extends AbstractTest } }; - Session session = startClient(startSPDYServer(serverSessionFrameListener), null); + Session session = startClient(startServer(serverSessionFrameListener), null); final CountDownLatch replyLatch = new CountDownLatch(1); final CountDownLatch dataLatch1 = new CountDownLatch(1); @@ -318,7 +318,7 @@ public class SynReplyTest extends AbstractTest } }; - startClient(startSPDYServer(serverSessionFrameListener), clientSessionFrameListener); + startClient(startServer(serverSessionFrameListener), clientSessionFrameListener); Assert.assertTrue(synLatch.await(5, TimeUnit.SECONDS)); Assert.assertTrue(replyLatch.await(5, TimeUnit.SECONDS)); @@ -348,7 +348,7 @@ public class SynReplyTest extends AbstractTest latch.countDown(); } }; - Session session = startClient(startSPDYServer(serverSessionFrameListener), null); + Session session = startClient(startServer(serverSessionFrameListener), null); Stream stream = session.syn(SPDY.V2, new SynInfo(true), null); diff --git a/jetty-spdy-core/src/test/resources/keystore.jks b/spdy-jetty/src/test/resources/keystore.jks similarity index 100% rename from jetty-spdy-core/src/test/resources/keystore.jks rename to spdy-jetty/src/test/resources/keystore.jks diff --git a/spdy-jetty/src/test/resources/log4j.properties b/spdy-jetty/src/test/resources/log4j.properties new file mode 100644 index 00000000000..aa88d6427ed --- /dev/null +++ b/spdy-jetty/src/test/resources/log4j.properties @@ -0,0 +1,14 @@ +# LOG4J levels: OFF, FATAL, ERROR, WARN, INFO, DEBUG, ALL +# +log4j.rootLogger=ALL,CONSOLE + +log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender +#log4j.appender.CONSOLE.threshold=INFO +log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout +#log4j.appender.CONSOLE.layout.ConversionPattern=%d %t [%5p][%c{1}] %m%n +log4j.appender.CONSOLE.layout.ConversionPattern=%d %t [%5p][%c{1}] %m%n +log4j.appender.CONSOLE.target=System.err + +# Level tuning +log4j.logger.org.eclipse.jetty=INFO +#log4j.logger.org.eclipse.jetty.spdy=DEBUG diff --git a/jetty-spdy-core/src/test/resources/truststore.jks b/spdy-jetty/src/test/resources/truststore.jks similarity index 100% rename from jetty-spdy-core/src/test/resources/truststore.jks rename to spdy-jetty/src/test/resources/truststore.jks