Greg Wilkins
|
4e4ffaa54c
|
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannelState.java
jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
|
2013-06-17 16:29:39 +10:00 |
Joakim Erdfelt
|
ce68faf9aa
|
Reverting incompatible API change to WebSocketCreator.
+ Added javadoc about casting of parameters and note about
future change to API (possibly in 9.1)
|
2013-06-14 11:39:14 -07:00 |
|
Joakim Erdfelt
|
f34ac9b920
|
Fixing parseProtocols
|
2013-06-14 07:40:02 -07:00 |
|
Joakim Erdfelt
|
a6f50006ee
|
410372 - Make SSL client certificate information available to server websockets
|
2013-06-11 12:51:53 -07:00 |
|
Joakim Erdfelt
|
7b79b4c5f9
|
410370 - WebSocketCreator.createWebSocket() should use servlet specific parameters
+ Changing method signature of
Object createWebSocket(UpgradeRequest req, UpgradeResponse resp)
to
Object createWebSocket(ServletUpgradeRequest req, ServletUpgradeResponse resp)
|
2013-06-11 11:22:24 -07:00 |
|
Joakim Erdfelt
|
9f82849900
|
Merge from [master] to [javawebsocket-jsr]
|
2013-05-09 12:10:57 -07:00 |
Jan Bartel
|
2fb23e705c
|
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
Conflicts:
aggregates/jetty-all/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-annotations/pom.xml
jetty-ant/pom.xml
jetty-client/pom.xml
jetty-continuation/pom.xml
jetty-deploy/pom.xml
jetty-distribution/pom.xml
jetty-http/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-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-plus/pom.xml
jetty-proxy/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-server/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/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-loginservice/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-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-spec-webapp/src/main/java/com/acme/AnnotationTest.java
tests/test-webapps/test-servlet-spec/test-web-fragment/pom.xml
tests/test-webapps/test-webapp-rfc2616/pom.xml
|
2013-05-09 11:29:45 +10:00 |
|
Joakim Erdfelt
|
c114e925ef
|
Using subprotocols (its more websockety) in example instead
|
2013-05-08 12:31:48 -07:00 |
|
Joakim Erdfelt
|
3fa029ed88
|
Using query parameters in example instead
|
2013-05-08 12:26:51 -07:00 |
|
Joakim Erdfelt
|
281f150831
|
Adding more websocket servlet examples
|
2013-05-08 12:22:37 -07:00 |
|
Joakim Erdfelt
|
08161b5bf7
|
Cleaning up examples for doc
|
2013-05-08 11:27:51 -07:00 |
Jesse McConnell
|
3d600ed95e
|
[maven-release-plugin] prepare for next development iteration
|
2013-05-06 18:13:04 -05:00 |
|
Jesse McConnell
|
d832f3dc7e
|
[maven-release-plugin] prepare release jetty-9.0.3.v20130506
|
2013-05-06 18:12:55 -05:00 |
|
Joakim Erdfelt
|
a4644dc780
|
JSR-356 working out server endpoint creation
|
2013-04-23 11:06:01 -07:00 |
|
Joakim Erdfelt
|
9463eee427
|
Merge branch 'master' into javawebsocket-jsr
|
2013-04-19 09:25:03 -07:00 |
|
Greg Wilkins
|
a7073d05a6
|
updated version to 9.1.0-SNAPSHOT
|
2013-04-19 13:59:18 +10:00 |
|
Jan Bartel
|
d34bd7aec7
|
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
|
2013-04-18 12:16:24 +10:00 |
|
Jesse McConnell
|
7baaa14ba1
|
[maven-release-plugin] prepare for next development iteration
|
2013-04-17 11:46:39 -05:00 |
|
Jesse McConnell
|
e390b54b25
|
[maven-release-plugin] prepare release jetty-9.0.2.v20140417
|
2013-04-17 11:46:31 -05:00 |
|
Joakim Erdfelt
|
8088edc96c
|
Merge branch 'master' into javawebsocket-jsr
|
2013-04-15 12:12:25 -07:00 |
|
Jesse McConnell
|
0b20467c6f
|
[maven-release-plugin] prepare for next development iteration
|
2013-04-15 11:40:45 -05:00 |
|
Jesse McConnell
|
3aa4301711
|
[maven-release-plugin] prepare release jetty-9.0.2.v20140415
|
2013-04-15 11:40:37 -05:00 |
|
Jan Bartel
|
db21b42b4f
|
Update to newer 3.1 api jar published by oracle (3.1-b08 - note DOES NOT contain xsds and dtds).
|
2013-04-15 17:44:35 +10:00 |
|
Jan Bartel
|
07b844bf85
|
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
|
2013-04-11 15:55:04 +10:00 |
|
Greg Wilkins
|
b8dd8bde14
|
[maven-release-plugin] prepare for next development iteration
|
2013-04-08 12:31:34 +10:00 |
|
Greg Wilkins
|
bf3771904b
|
[maven-release-plugin] prepare release jetty-9.0.1.v20130408
|
2013-04-08 12:30:59 +10:00 |
|
Jan Bartel
|
279dff381c
|
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
Conflicts:
jetty-osgi/pom.xml
jetty-server/src/main/java/org/eclipse/jetty/server/Response.java
jetty-servlets/pom.xml
tests/test-webapps/test-jetty-webapp/pom.xml
|
2013-03-18 16:00:23 +11:00 |
|
Joakim Erdfelt
|
fd8f2b9753
|
Merge from [master] -> [javawebsocket-jsr]
|
2013-03-11 10:57:08 -07:00 |
|
Joakim Erdfelt
|
897c35c2cb
|
[maven-release-plugin] prepare for next development iteration
|
2013-03-08 11:33:23 -07:00 |
|
Joakim Erdfelt
|
cc6196af50
|
[maven-release-plugin] prepare release jetty-9.0.0.v20130308
|
2013-03-08 11:33:15 -07:00 |
|
Joakim Erdfelt
|
7fc38f6c0f
|
[maven-release-plugin] prepare for next development iteration
|
2013-03-07 19:14:19 -07:00 |
|
Joakim Erdfelt
|
96d045442f
|
[maven-release-plugin] prepare release jetty-9.0.0.v20130307
|
2013-03-07 19:14:11 -07:00 |
|
Jesse McConnell
|
778ee1411b
|
[maven-release-plugin] prepare for next development iteration
|
2013-03-06 10:21:46 -06:00 |
|
Jesse McConnell
|
d916078711
|
[maven-release-plugin] prepare release jetty-9.0.0.v20130306
|
2013-03-06 10:21:38 -06:00 |
|
Joakim Erdfelt
|
94756a42c3
|
[maven-release-plugin] prepare for next development iteration
|
2013-03-01 16:08:32 -07:00 |
|
Joakim Erdfelt
|
96dabe7e62
|
[maven-release-plugin] prepare release jetty-9.0.0.RC3
|
2013-03-01 16:08:24 -07:00 |
|
Joakim Erdfelt
|
c267c1a9d0
|
[maven-release-plugin] prepare for next development iteration
|
2013-03-01 10:26:43 -07:00 |
|
Joakim Erdfelt
|
ba15fe04e2
|
[maven-release-plugin] prepare release jetty-9.0.0.RC3
|
2013-03-01 10:26:34 -07:00 |
|
Joakim Erdfelt
|
79630de1f1
|
402148 - Update Javadoc for WebSocketServlet for new API
|
2013-03-01 09:31:29 -07:00 |
|
Joakim Erdfelt
|
29b2118870
|
[maven-release-plugin] prepare for next development iteration
|
2013-02-26 09:20:45 -07:00 |
|
Joakim Erdfelt
|
2b82b54f6d
|
[maven-release-plugin] prepare release jetty-9.0.0.RC2
|
2013-02-26 09:20:45 -07:00 |
|
Joakim Erdfelt
|
43231d8451
|
393473 - Add support for JSR-356 (javax.websocket) draft
+ Restarting branch, copying over work from November with new JSR-356
Draft 012 api in mind.
|
2013-02-12 16:19:35 -07:00 |
|
Joakim Erdfelt
|
4dc3ed38c2
|
[maven-release-plugin] prepare for next development iteration
|
2013-02-05 10:00:36 -07:00 |
|
Joakim Erdfelt
|
ed24f78498
|
[maven-release-plugin] prepare release jetty-9.0.0.RC0
|
2013-02-05 10:00:36 -07:00 |
|
Jesse McConnell
|
e073ceb06d
|
[maven-release-plugin] prepare for next development iteration
|
2013-02-05 10:00:36 -07:00 |
|
Jesse McConnell
|
2f2ad287af
|
[maven-release-plugin] prepare release jetty-9.0.0.RC0
|
2013-02-05 10:00:35 -07:00 |
|
Joakim Erdfelt
|
242f7f0f45
|
399568 - OSGi tests can't find websocket classes
+ Changing classloading in WebSocketServlet to be more OSGi friendly
|
2013-01-31 12:15:22 -07:00 |
|
Joakim Erdfelt
|
2e216dddb7
|
Consolidating WebSocketPolicy.setMax*Size() into single setMaxMessageSize()
|
2013-01-18 09:27:56 -07:00 |
|
Joakim Erdfelt
|
b938245b14
|
Adding some javadoc, cleaning up package namespaces where appropriate
|
2013-01-17 15:41:33 -07:00 |
|
Joakim Erdfelt
|
eff1262e49
|
398105 - Clean up WebSocketPolicy
|
2013-01-16 15:11:56 -07:00 |
|
Jesse McConnell
|
e1c516c7d1
|
merge from jetty-8 and update license blocks.
|
2013-01-11 17:04:53 -06:00 |
|
Jan Bartel
|
c9db4ca815
|
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
Conflicts:
jetty-proxy/pom.xml
pom.xml
|
2012-11-30 15:45:36 +11:00 |
|
Jesse McConnell
|
a0c1d85094
|
Revert "jetty-9 cleaned up serverClasses to minimum"
This reverts commit 67b5caadbb.
|
2012-11-19 10:33:54 -06:00 |
|
Greg Wilkins
|
67b5caadbb
|
jetty-9 cleaned up serverClasses to minimum
|
2012-11-19 17:42:52 +11:00 |
|
Greg Wilkins
|
4ff9bdc54d
|
jetty-9 alternative websocket discovery
|
2012-11-15 21:23:43 +11:00 |
|
Joakim Erdfelt
|
d67fdfdd85
|
Splitting out websocket-servlet to make it more friendly for WebAppClassloader
|
2012-11-12 19:42:32 -07:00 |
|
Joakim Erdfelt
|
17c6e04f47
|
Making rest of the modules use websocket-common (instead of old websocket-core)
|
2012-11-05 17:58:06 -07:00 |
|
Joakim Erdfelt
|
d19f177cae
|
First step
|
2012-11-02 11:42:44 -07:00 |
|
Joakim Erdfelt
|
494ecbb271
|
Renaming module and groupId for websocket-servlet to websocket-server to better reflect nature of module
|
2012-06-18 09:48:33 -07:00 |
|
Joakim Erdfelt
|
4c18bd5f45
|
Moving WebSocketHandler out of websocket-core into websocket-servlet
|
2012-06-18 09:37:07 -07:00 |
|
Joakim Erdfelt
|
c7b2297216
|
Moving classes around, stubbing out new classes for jetty-9 refactor
|
2012-06-12 13:15:40 -07:00 |
|
Joakim Erdfelt
|
d52de82a80
|
Splitting up websocket module into core/client/servlet modules
|
2012-06-12 12:43:29 -07:00 |