79fb2a4083
Fixing build
2015-03-12 10:42:09 -07:00
b75f8dcda4
Cleaning up cdi-websocket in prep for merge
2015-03-12 10:09:53 -07:00
e92bcccc84
Using new Decorator
2015-03-12 10:09:53 -07:00
0301de099d
Delaying decoration of websocket endpoints
2015-03-12 10:09:52 -07:00
dc81cda742
Using Jetty component listeners for CDI
2015-03-12 10:09:52 -07:00
31ee46d482
453834 - CDI Support for WebSocket
...
+ Breaking down jetty-cdi into 3 modules
* cdi-core
* cdi-servlet
* cdi-websocket
+ Creating WebSocketScope for cdi-websocket
+ Creating @Produces for jetty websocket api session
and javax.websocket.Session
+ Unit tests for new functionality
2015-03-12 10:09:52 -07:00
3008ab85e5
This developer is a dummy
2015-03-12 10:09:52 -07:00
87246263b8
453834 - CDI Support for WebSocket
...
+ Verifying ServletContextHandler behavior of Decorators
+ Marking old ServletContextHandler methods as deprecated
+ Updates to DecoratedObjectFactory
+ Removing customized weld scopes/context (for now)
+ Deferring JSR356 ServerContainer endpoint init
till Container.doStart() to allow weld to init properly first
+ Removing JSR356 BasicServerEndpointConfigurator in favor
of ContainerDefaultEndpointConfigurator
+ Only decorating server endpoints if they were created by
ContainerDefaultEndpointConfigurator, all others are trusted
to be complete and injected already.
2015-03-12 10:09:52 -07:00
e213c4488e
453834 - CDI Support for WebSocket
...
+ Updating javadoc
2015-03-12 10:09:30 -07:00
8b6a2629f8
453834 - CDI Support for WebSocket
2015-03-12 10:09:30 -07:00
3711f329a1
Breaking ant <property> caching for cdi tests
2015-03-12 10:09:30 -07:00
5b5c2369d5
Stragglers to the new year. tsk. tsk.
2015-03-12 10:09:30 -07:00
4435ba3c2b
cleaning up build warnings
2015-03-12 10:09:30 -07:00
1f3097ff16
453834 - CDI Support for WebSocket
...
+ Adding scopes to websocket to help with CDI integration
2015-03-12 10:09:30 -07:00
0c930c8640
Rename EnhancedInstantiator to DecoratedObjectFactory
2015-03-12 10:06:03 -07:00
c65e6aaab7
Attempting to validate socket + cdi
2015-03-12 10:04:50 -07:00
d6911b431f
453834 - CDI Support for WebSocket
...
+ Attempting to get new socket @Inject working
2015-03-12 10:04:50 -07:00
5c3e30d136
453834 - CDI Support for WebSocket
...
+ Changing util.Decorators to util.EnhancedInstantiator to reflect true
usage
+ Adding EnhancedInstantiator to JSR-356
2015-03-12 10:04:50 -07:00
fb88bc4c19
Making ServletContextHandler use util.Decorators
...
+ Deprecating methods that are just awkward now.
ServletContextHandler.getDecorators() - as it expects the
ServletContextHandler.Decorator version
2015-03-12 10:04:13 -07:00
2b7b5ef495
Rethinking Decorators
2015-03-12 10:04:13 -07:00
b7d719be5f
459845 - Support upgrade from http1 to http2
...
Parse setting frame.
2015-03-13 00:54:33 +11:00
e9658c0aef
Clarified ALPN properties.
2015-03-12 14:01:31 +01:00
64de5c861c
Removed forgotten System.err.println() debug statements.
2015-03-12 12:42:26 +01:00
005870811d
Fixed compilation issue: using Jetty's B64Code instead of JDK8 Base64.
2015-03-12 11:06:30 +01:00
0dd58d2efe
459845 - Support upgrade from http1 to http2
...
Moved the sneaky direct upgrade to its own method and added support to detect a standard upgrade.
The standard upgrade now creates the h2c connection and decodes the settings header, but it does not yet process the
settings nor send a response to the request.
2015-03-12 16:52:17 +11:00
a7cfc3dc2d
Renamed methods in FlowControlStrategy.
2015-03-11 20:38:40 +01:00
36f317382f
More flow control tests.
2015-03-11 18:43:00 +01:00
8673c6bba7
Clarified test and made it more reliable.
2015-03-11 17:12:38 +01:00
1dbf2be343
423974 - Optimize flow control.
...
Don't send the window update if the stream is closed.
2015-03-11 17:11:16 +01:00
560ec6301e
423974 - Optimize flow control.
...
Made the buffering flow control strategy the default.
2015-03-11 16:27:31 +01:00
9765ab1f3a
extra test resource
2015-03-11 15:46:53 +11:00
870e0ab0b3
Converted IteratingCallback to use SpinLock
2015-03-11 15:37:25 +11:00
5456de2160
debug improvements from nghttp2 testing
2015-03-11 14:23:39 +11:00
0592ecf3e9
cleaned up PushBuilder API
2015-03-11 12:06:51 +11:00
c5541cb3bd
459081 - http2 push failures.
...
Reverted sense of runnable in ExecuteProduceRun so that test harness passes.
Added RunExecute Runnable for the new dispatch semantic
2015-03-11 11:02:11 +11:00
1de53a888d
Merge remote-tracking branch 'origin/jetty-9.2.x'
...
Conflicts:
VERSION.txt
aggregates/jetty-all/pom.xml
apache-jsp/pom.xml
apache-jstl/pom.xml
examples/async-rest/async-rest-jar/pom.xml
examples/async-rest/async-rest-webapp/pom.xml
examples/async-rest/pom.xml
examples/embedded/pom.xml
examples/pom.xml
jetty-alpn/jetty-alpn-client/pom.xml
jetty-alpn/jetty-alpn-server/pom.xml
jetty-alpn/pom.xml
jetty-annotations/pom.xml
jetty-ant/pom.xml
jetty-cdi/pom.xml
jetty-client/pom.xml
jetty-continuation/pom.xml
jetty-deploy/pom.xml
jetty-distribution/pom.xml
jetty-fcgi/fcgi-client/pom.xml
jetty-fcgi/fcgi-server/pom.xml
jetty-fcgi/pom.xml
jetty-http-spi/pom.xml
jetty-http/pom.xml
jetty-http2/http2-alpn-tests/pom.xml
jetty-io/pom.xml
jetty-jaas/pom.xml
jetty-jaspi/pom.xml
jetty-jmx/pom.xml
jetty-jndi/pom.xml
jetty-jsp/pom.xml
jetty-jspc-maven-plugin/pom.xml
jetty-maven-plugin/pom.xml
jetty-monitor/pom.xml
jetty-nosql/pom.xml
jetty-osgi/jetty-osgi-alpn/pom.xml
jetty-osgi/jetty-osgi-boot-jsp/pom.xml
jetty-osgi/jetty-osgi-boot-warurl/pom.xml
jetty-osgi/jetty-osgi-boot/pom.xml
jetty-osgi/jetty-osgi-httpservice/pom.xml
jetty-osgi/jetty-osgi-npn/pom.xml
jetty-osgi/pom.xml
jetty-osgi/test-jetty-osgi-context/pom.xml
jetty-osgi/test-jetty-osgi-webapp/pom.xml
jetty-osgi/test-jetty-osgi/pom.xml
jetty-plus/pom.xml
jetty-proxy/pom.xml
jetty-quickstart/pom.xml
jetty-rewrite/pom.xml
jetty-runner/pom.xml
jetty-security/pom.xml
jetty-server/pom.xml
jetty-servlet/pom.xml
jetty-servlets/pom.xml
jetty-spdy/pom.xml
jetty-spdy/spdy-client/pom.xml
jetty-spdy/spdy-core/pom.xml
jetty-spdy/spdy-example-webapp/pom.xml
jetty-spdy/spdy-http-client-transport/pom.xml
jetty-spdy/spdy-http-common/pom.xml
jetty-spdy/spdy-http-server/pom.xml
jetty-spdy/spdy-npn-tests/pom.xml
jetty-spdy/spdy-server/pom.xml
jetty-spring/pom.xml
jetty-start/pom.xml
jetty-util-ajax/pom.xml
jetty-util/pom.xml
jetty-webapp/pom.xml
jetty-websocket/javax-websocket-client-impl/pom.xml
jetty-websocket/javax-websocket-server-impl/pom.xml
jetty-websocket/pom.xml
jetty-websocket/websocket-api/pom.xml
jetty-websocket/websocket-client/pom.xml
jetty-websocket/websocket-common/pom.xml
jetty-websocket/websocket-server/pom.xml
jetty-websocket/websocket-servlet/pom.xml
jetty-xml/pom.xml
pom.xml
tests/pom.xml
tests/test-continuation/pom.xml
tests/test-integration/pom.xml
tests/test-jmx/jmx-webapp-it/pom.xml
tests/test-jmx/jmx-webapp/pom.xml
tests/test-jmx/pom.xml
tests/test-loginservice/pom.xml
tests/test-quickstart/pom.xml
tests/test-sessions/pom.xml
tests/test-sessions/test-hash-sessions/pom.xml
tests/test-sessions/test-jdbc-sessions/pom.xml
tests/test-sessions/test-mongodb-sessions/pom.xml
tests/test-sessions/test-sessions-common/pom.xml
tests/test-webapps/pom.xml
tests/test-webapps/test-jaas-webapp/pom.xml
tests/test-webapps/test-jetty-webapp/pom.xml
tests/test-webapps/test-jndi-webapp/pom.xml
tests/test-webapps/test-mock-resources/pom.xml
tests/test-webapps/test-proxy-webapp/pom.xml
tests/test-webapps/test-servlet-spec/pom.xml
tests/test-webapps/test-servlet-spec/test-container-initializer/pom.xml
tests/test-webapps/test-servlet-spec/test-spec-webapp/pom.xml
tests/test-webapps/test-servlet-spec/test-web-fragment/pom.xml
tests/test-webapps/test-webapp-rfc2616/pom.xml
2015-03-11 10:39:38 +11:00
48887377c9
459081 - http2 push failures.
...
Introduced ExecutionStrategy.dispatch() to handle the case where
resources that are being pushed block.
2015-03-11 00:12:57 +01:00
e3fd0056cf
[maven-release-plugin] prepare for next development iteration
2015-03-10 08:00:22 -05:00
9d648f4000
[maven-release-plugin] prepare release jetty-9.2.10.v20150310
2015-03-10 08:00:14 -05:00
21f6bb6edf
set for relesae
2015-03-10 07:28:11 -05:00
8d9b7613c9
add for dev
2015-03-10 07:27:11 -05:00
38250545fc
Improved exception handling, aborting the exchange rather than throwing.
2015-03-10 10:36:24 +01:00
bab7888c59
Fixed HttpClient Javadocs.
2015-03-10 10:15:41 +01:00
a88d52b4e0
Merged branch 'jetty-9.2.x' into 'master'.
2015-03-09 12:31:39 +01:00
ddc901f736
Fixed MappedByteBufferPool.Tagged.
...
The problem was that release uses ByteBuffer.isDirect() to know where
to put the released buffer, and Tagged was always creating heap buffers.
This leads to a very high miss ratio in the pool, which causes OOME in
some tests.
2015-03-09 12:30:15 +01:00
b7715fb3eb
Merged branch 'jetty-9.2.x' into 'master'.
2015-03-07 23:26:59 +01:00
7c915bcba2
461643 - HttpContent.advance() race.
...
Fixed by correctly synchronizing on ContentProvider.iterator.hasNext()
and ContentProvider.iterator.next() for those ContentProviders that
require it, such as DeferredContentProvider.
2015-03-07 23:13:21 +01:00
66e1f0a863
Made the tag counter a non-static variable.
...
This was needed to avoid random test failures where a test running
before another could increase the tag and fail the test.
2015-03-07 22:35:02 +01:00
d63ed9864d
445518 - Provide different error callbacks to ProxyServlet.
...
Method names have been rationalized, and the old names deprecated.
Now methods have "clientRequest", "proxyRequest", "serverResponse" and
"proxyResponse" in their names to indicate the operation they belong to.
2015-03-07 22:32:59 +01:00
a13a55e242
Introduced LeakDetector.id() to be consistent in logging the resource ID.
2015-03-07 22:32:59 +01:00
Joakim Erdfelt
Greg Wilkins
Simone Bordet
Jesse McConnell