Greg Wilkins
|
6b9ecd0806
|
353073 Improved client API to use futures
|
2011-08-11 11:50:23 +10:00 |
|
Greg Wilkins
|
5ea2806c08
|
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
Conflicts:
jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketClientTest.java
|
2011-08-09 15:45:17 +10:00 |
|
Greg Wilkins
|
75dacc2b61
|
fixed websocket client tests
|
2011-08-09 15:39:26 +10:00 |
|
Jesse McConnell
|
3dd582475b
|
Resolve test case issue with comment for Greg on proper order of on*
responses for websocket interface
|
2011-08-05 12:44:41 -05:00 |
|
Joakim Erdfelt
|
f930050a4a
|
Working out what testBadHandshake keeps failing
|
2011-08-05 10:11:38 -07:00 |
|
Joakim Erdfelt
|
300f449e6f
|
Working out what testBadHandshake keeps failing
|
2011-08-05 09:55:51 -07:00 |
|
Joakim Erdfelt
|
1b51da30f4
|
Working out what testBadHandshake keeps failing
|
2011-08-05 09:30:23 -07:00 |
|
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 |
|
Greg Wilkins
|
70d7d3c9a5
|
reverted version
|
2011-07-18 09:15:31 +10:00 |
|
Greg Wilkins
|
a26ddd5933
|
created performance version
|
2011-07-14 15:38:25 +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 |
|
Jesse McConnell
|
39674f8a8e
|
[maven-release-plugin] prepare for next development iteration
|
2011-07-07 18:43:56 -05:00 |
|
Jesse McConnell
|
5aa94f502e
|
[maven-release-plugin] prepare release jetty-7.4.4.v20110707
|
2011-07-07 18:43:50 -05:00 |
|
Greg Wilkins
|
17e907c2fb
|
git diff 54e885d9670548c12cf9ffbd58702b73d373c186 remotes/origin/jetty-8-historical | patch -p1 ; git add -A
|
2011-07-07 18:18:24 +10:00 |
|
Jesse McConnell
|
6190961f31
|
[maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3454 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-07-01 11:12:45 +00:00 |
|
Jesse McConnell
|
db9f79eaff
|
[maven-release-plugin] prepare release jetty-7.4.3.v20110701
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3452 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-07-01 11:12:33 +00:00 |
|
Greg Wilkins
|
baabacfe95
|
reverted to 7.4.4-SNAPSHOT
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3448 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-07-01 02:22:56 +00:00 |
|
Jesse McConnell
|
b9fffcb9a0
|
[maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3447 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-07-01 00:54:20 +00:00 |
|
Jesse McConnell
|
ea23a83bb3
|
[maven-release-plugin] prepare release jetty-7.4.3.v20110630
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3445 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-07-01 00:54:07 +00:00 |
|
Jesse McConnell
|
b1ca45e709
|
[maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3441 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-06-30 19:49:20 +00:00 |
|
Jesse McConnell
|
5f5cb8ea53
|
[maven-release-plugin] prepare release jetty-7.4.3.v20110630
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3439 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-06-30 19:39:23 +00: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 |
|
Jesse McConnell
|
54e885d967
|
[maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3289 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-05-26 12:20:58 +00:00 |
|
Jesse McConnell
|
e35f16bae5
|
[maven-release-plugin] prepare release jetty-7.4.2.v20110526
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3287 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-05-26 12:14:37 +00:00 |
|
Jesse McConnell
|
64cbf74b09
|
reset poms for release
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3286 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-05-26 11:59:36 +00:00 |
|
Greg Wilkins
|
92c1a7bc5d
|
[maven-release-plugin] prepare release jetty-7.4.2.v20110526
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3277 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-05-26 08:51:01 +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 |
|
Jesse McConnell
|
51f6df9871
|
[maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3184 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-05-17 19:57:00 +00:00 |
|
Jesse McConnell
|
28e63af76b
|
[maven-release-plugin] prepare release jetty-project-7.4.2.vTEST
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3182 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-05-17 19:56:45 +00:00 |
|
Jesse McConnell
|
0793141d2c
|
[maven-release-plugin] rollback the release of jetty-project-7.4.2.vTEST
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3181 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-05-17 19:39:59 +00:00 |
|
Jesse McConnell
|
be9da35ef4
|
set for test
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3180 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-05-17 19:39:17 +00:00 |
|
Jesse McConnell
|
898470696c
|
updating to parent-17-snapshot and various changes to work with updated maven plugins
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3164 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-05-17 13:41:15 +00:00 |
|
Greg Wilkins
|
f8dc394adb
|
[maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3137 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-05-13 04:48:47 +00:00 |
|
Greg Wilkins
|
6e0649ab3f
|
[maven-release-plugin] prepare release jetty-7.4.1.v20110513
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3135 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-05-13 04:48:21 +00:00 |
|
Jesse McConnell
|
314a59192d
|
[maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3131 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-05-12 19:57:07 +00:00 |
|
Jesse McConnell
|
fadbd0bdc5
|
[maven-release-plugin] prepare release jetty-7.4.1.v20110512
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3129 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-05-12 19:56:53 +00:00 |
|
Greg Wilkins
|
5d0f1b88f4
|
[maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3128 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-05-12 09:02:46 +00:00 |
|
Greg Wilkins
|
83b6c19cca
|
[maven-release-plugin] prepare release jetty-7.4.1
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3126 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-05-12 09:02:19 +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 |
|