Jan Bartel
|
02a66a00fb
|
Merge remote-tracking branch 'origin/master' into jetty-8
Conflicts:
VERSION.txt
jetty-osgi/jetty-osgi-boot-logback/META-INF/MANIFEST.MF
jetty-osgi/jetty-osgi-equinoxtools/src/main/java/org/eclipse/jetty/osgi/equinoxtools/WebEquinoxToolsActivator.java
pom.xml
|
2011-08-01 14:39:39 +10:00 |
Greg Wilkins
|
2806869cfd
|
353073 test harness for websocket client and improved ietf draft 10 compliance
|
2011-08-01 12:35:01 +10:00 |
|
Greg Wilkins
|
5c11d3af38
|
353073 named logger
|
2011-07-28 17:13:26 +10:00 |
|
Greg Wilkins
|
f17d271f07
|
353073 parallel test option
|
2011-07-27 11:15:38 +10:00 |
|
Greg Wilkins
|
5859a85919
|
353073 WebSocketClient
|
2011-07-26 17:31:55 +10:00 |
|
Jan Bartel
|
86f7e76c4d
|
Merge of jetty-7 into jetty-8
Conflicts:
VERSION.txt
example-jetty-embedded/pom.xml
jetty-aggregate/jetty-all-server/pom.xml
jetty-aggregate/jetty-all/pom.xml
jetty-aggregate/jetty-client/pom.xml
jetty-aggregate/jetty-plus/pom.xml
jetty-aggregate/jetty-server/pom.xml
jetty-aggregate/jetty-servlet/pom.xml
jetty-aggregate/jetty-webapp/pom.xml
jetty-aggregate/pom.xml
jetty-ajp/pom.xml
jetty-annotations/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-jaspi/pom.xml
jetty-jmx/pom.xml
jetty-jndi/pom.xml
jetty-jsp-2.1/pom.xml
jetty-nested/pom.xml
jetty-osgi/jetty-osgi-boot-jsp/pom.xml
jetty-osgi/jetty-osgi-boot-logback/pom.xml
jetty-osgi/jetty-osgi-boot-warurl/pom.xml
jetty-osgi/jetty-osgi-boot/META-INF/MANIFEST.MF
jetty-osgi/jetty-osgi-boot/pom.xml
jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/OSGiAppProvider.java
jetty-osgi/jetty-osgi-equinoxtools/META-INF/MANIFEST.MF
jetty-osgi/jetty-osgi-equinoxtools/pom.xml
jetty-osgi/jetty-osgi-equinoxtools/src/main/java/org/eclipse/jetty/osgi/equinoxtools/console/EquinoxConsoleContinuationServlet.java
jetty-osgi/jetty-osgi-httpservice/pom.xml
jetty-osgi/jetty-osgi-servletbridge/pom.xml
jetty-osgi/pom.xml
jetty-osgi/test-jetty-osgi/pom.xml
jetty-overlay-deployer/pom.xml
jetty-plus/pom.xml
jetty-policy/pom.xml
jetty-rewrite/pom.xml
jetty-security/pom.xml
jetty-server/pom.xml
jetty-servlet/pom.xml
jetty-servlets/pom.xml
jetty-servlets/src/main/java/org/eclipse/jetty/servlets/ProxyServlet.java
jetty-start/pom.xml
jetty-util/pom.xml
jetty-webapp/pom.xml
jetty-websocket/pom.xml
jetty-xml/pom.xml
pom.xml
test-continuation-jetty6/pom.xml
test-continuation/pom.xml
test-jetty-nested/pom.xml
test-jetty-servlet/pom.xml
test-jetty-webapp/pom.xml
tests/pom.xml
tests/test-integration/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-webapp-rfc2616/pom.xml
|
2011-07-11 12:05:58 +10:00 |
|
Greg Wilkins
|
17e907c2fb
|
git diff 54e885d967 remotes/origin/jetty-8-historical | patch -p1 ; git add -A
|
2011-07-07 18:18:24 +10:00 |
Greg Wilkins
|
451580e4ee
|
349897 draft -09 websockets
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3409 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-06-21 05:33:52 +00:00 |
Joakim Erdfelt
|
26d59fda32
|
Javadoc error cleanup.
+ Removing missing class references
+ Fixing empty @return statements
+ Delinking invalid direction class references
+ Correcting @param <name> typos
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3219 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-05-19 22:26:41 +00:00 |
|
Greg Wilkins
|
9f5376269a
|
public
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3075 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-05-05 00:04:25 +00:00 |
|
Greg Wilkins
|
a9a192bab5
|
344059 added x-extensions
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3060 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-05-03 02:12:23 +00:00 |
|
Greg Wilkins
|
554309e5ac
|
344059 added x-extensions
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3059 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-05-03 02:09:54 +00:00 |
|
Greg Wilkins
|
4e2d8d9c18
|
344059 added x-extensions
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3055 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-05-02 14:58:00 +00:00 |
|
Greg Wilkins
|
9f6e934c4f
|
344059 added x-extensions
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3054 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-05-02 09:30:21 +00:00 |
|
Greg Wilkins
|
88bfdd6631
|
344059 added extensions
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3053 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-05-02 09:20:36 +00:00 |
|
Greg Wilkins
|
a70bbc004d
|
344059 extension framework for websockets
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3052 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-05-02 01:42:05 +00:00 |
|
Greg Wilkins
|
3e35b74651
|
344059 Websockets draft-07
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3035 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-04-27 23:27:56 +00:00 |
|
Greg Wilkins
|
975ee04df4
|
minor cleanup of variable names and ordering
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3015 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-04-14 01:45:36 +00:00 |
|
Greg Wilkins
|
58652d8f09
|
342700 refine websocket API for anticipated changes
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3013 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-04-13 11:05:35 +00:00 |
|
Greg Wilkins
|
d3c5eddd79
|
342504 Scanner Listener
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2999 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-04-12 02:12:52 +00:00 |
|
Greg Wilkins
|
e5bad59c14
|
minor clean ups and removed debug
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2997 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-04-11 08:18:01 +00:00 |
Simone Bordet
|
7dfec125f2
|
Made interface Acceptor public, otherwise other packages such as CometD cannot implement it, and cleaned up the code.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2920 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-03-29 11:13:55 +00:00 |
|
Greg Wilkins
|
a6483bfa6f
|
340265 Improve handling of io shutdown in SSL
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2906 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-03-23 03:36:06 +00:00 |
|
Greg Wilkins
|
c26cc92857
|
337685 improved progress return
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2888 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-03-14 13:26:41 +00:00 |
|
Greg Wilkins
|
80a56c31a2
|
websocket debugging
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2887 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-03-14 12:06:28 +00:00 |
|
Greg Wilkins
|
7cca101aeb
|
improved ws tests
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2886 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-03-14 03:54:41 +00:00 |
|
Greg Wilkins
|
3a267d9dd8
|
JETTY-1245 Pooled Buffers implementation
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2885 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-03-14 03:09:56 +00:00 |
|
Greg Wilkins
|
31d8e8b3dc
|
337685 more common code
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2880 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-03-11 05:00:45 +00:00 |
|
Greg Wilkins
|
3078c8797e
|
337685 testing with FF
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2879 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-03-11 04:10:12 +00:00 |
|
Greg Wilkins
|
6cbd1225a6
|
337685 Update websocket API in preparation for draft -07
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2878 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-03-10 13:32:31 +00:00 |
|
Greg Wilkins
|
e20fa91252
|
337685 Update websocket API in preparation for draft -07
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2877 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-03-10 13:15:27 +00:00 |
|
Greg Wilkins
|
1a6cdeb12f
|
338880 Fixed failing buffer range checks
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2858 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-03-07 02:51:05 +00:00 |
|
Greg Wilkins
|
13a46c3e9c
|
337685 java 1.5
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2843 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-03-01 22:33:16 +00:00 |
|
Joakim Erdfelt
|
736131230f
|
Fixing other javadoc violations/errors
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2839 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-03-01 17:16:47 +00:00 |
|
Greg Wilkins
|
0a0deacb62
|
337685 Work in progress on draft 6 websockets
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2834 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-03-01 06:10:15 +00:00 |
|
Greg Wilkins
|
75960baeb1
|
337685 Work in progress on draft 6 websockets
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2833 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-03-01 01:21:54 +00:00 |
|
Greg Wilkins
|
2cc4fbb5ee
|
337685 Work in progress on draft 6 websockets
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2831 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-02-28 09:45:41 +00:00 |
|
Greg Wilkins
|
a4f122930a
|
337685 Work in progress on draft 5 websockets
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2810 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-02-22 03:32:07 +00:00 |
|
Joakim Erdfelt
|
f3a2a575aa
|
Fixing broken javadoc and imports
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2673 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-01-21 20:49:28 +00:00 |
|
Greg Wilkins
|
2c280fd1c4
|
proposal for websocket nonce
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2465 7e9141cc-0065-0410-87d8-b60c137991c4
|
2010-11-03 02:46:44 +00:00 |
|
Greg Wilkins
|
de178f18c6
|
324369 Improved handling of multiple versions of draft-ietf-hybi-thewebsocketprotocol
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2342 7e9141cc-0065-0410-87d8-b60c137991c4
|
2010-10-13 00:34:30 +00:00 |
|
Greg Wilkins
|
2181a0de40
|
324369 Implement draft-ietf-hybi-thewebsocketprotocol-01
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2285 7e9141cc-0065-0410-87d8-b60c137991c4
|
2010-09-20 20:25:08 +00:00 |
|
Greg Wilkins
|
e4cced21e8
|
325105 websocket ondisconnect fixed
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2274 7e9141cc-0065-0410-87d8-b60c137991c4
|
2010-09-14 12:08:46 +00:00 |
|
Greg Wilkins
|
837b477f12
|
325105 websocket ondisconnect fixed
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2273 7e9141cc-0065-0410-87d8-b60c137991c4
|
2010-09-14 11:47:07 +00:00 |
|
Greg Wilkins
|
55f10af59e
|
325128 websocket send during onConnect
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2272 7e9141cc-0065-0410-87d8-b60c137991c4
|
2010-09-14 09:13:50 +00:00 |
|
Greg Wilkins
|
f919f78f1f
|
JETTY-1270 websocket close protection
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2266 7e9141cc-0065-0410-87d8-b60c137991c4
|
2010-09-09 04:36:05 +00:00 |
|
Greg Wilkins
|
1596451908
|
324369 Implement draft-ietf-hybi-thewebsocketprotocol-01
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2245 7e9141cc-0065-0410-87d8-b60c137991c4
|
2010-09-03 07:05:53 +00:00 |
|
Greg Wilkins
|
995df89b22
|
324369 Implement draft-ietf-hybi-thewebsocketprotocol-01
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2242 7e9141cc-0065-0410-87d8-b60c137991c4
|
2010-09-03 03:41:05 +00:00 |
|
Greg Wilkins
|
8210d068c4
|
npe protection
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2136 7e9141cc-0065-0410-87d8-b60c137991c4
|
2010-07-15 12:31:25 +00:00 |
|
Greg Wilkins
|
331a750ce0
|
316449 Websocket disconnect fix
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1996 7e9141cc-0065-0410-87d8-b60c137991c4
|
2010-06-11 03:58:21 +00:00 |