06b2de17d5
Merge branch 'jetty-9-aggregation' into jetty-9-spdy-http
2012-08-24 11:52:29 +02:00
6ffaa478c4
standardize license headers
2012-08-17 16:09:49 -05:00
3d1d76d214
Merge from jetty-8 to jetty-9 (license header standarization)
2012-08-17 13:44:22 -07:00
5de0cee1eb
merge from master + license block standardization
2012-08-17 14:50:43 -05:00
00ed549898
standardize license header blocks
2012-08-16 19:11:27 -05:00
f58d7f23e1
return embedded example to its natural state
2012-08-15 14:24:08 -05:00
c1530f6be4
add example of file server using one url and two directories for resources
2012-08-15 13:17:00 -05:00
5c3a1cfe8c
removed the wrapper element from the ManagedObject annotation, rejiggered object mbean to not need wrapper, also smoking the convert concept in objectMbean in favor of dynamically discovering it where needed since its easy with annotations
2012-08-14 16:52:17 -05:00
11dbce81c8
wire up way to remove the need for managed=true on ManagedAttribute
2012-08-13 16:48:52 -05:00
e3132d41d8
Jetty9 - Introduced ConnectionFactory for SelectChannelConnector.
...
This change abstracts out the connection creation from the connector itself,
so there can be only one connector managing all protocols, depending on
the configuration of the connection factories.
2012-08-03 18:35:34 +02:00
962a0d0889
jetty-9 ensure injected threadpool is managed
2012-08-03 08:44:49 +10:00
b63e09df61
jetty-9 rudimentary connectionFactory impl
2012-08-02 17:44:29 +10:00
96b5c05674
jetty-9 one connector passing most tests
2012-08-02 11:51:54 +10:00
851239ee56
Jetty9 - More refactorings and renamings.
2012-07-20 15:23:39 +02:00
b1750c0aae
jetty-9 fixed bad merge of poms
2012-07-20 15:20:57 +10:00
81d72052c8
merged master to jetty-8
2012-07-11 14:04:49 -05:00
aa941f5711
quick pass through to clean up missing or incorrect license blocks
2012-07-11 12:29:46 -05:00
2c4ea64f3b
372678 Embedded Examples need updates for new LoginService requirement
2012-04-02 14:48:38 +10:00
2ced86c9dd
Merge branch 'master' into jetty-8
2012-02-01 17:25:53 -06:00
2559c0558b
Bug 370372 - Fix references to SVNROOT present in pom.xml
...
+ Changing from dev.eclipse.org (svn) to git.eclipse.org (git) URLs
2012-02-01 15:41:19 -07:00
ab94c48735
merge from master
2012-01-26 10:44:21 -06:00
6b0a97012c
Added RegexTargetHandler
2012-01-26 23:14:39 +11:00
37a040bf6a
Merge remote-tracking branch 'origin/master' into jetty-8
2012-01-13 14:29:42 +11:00
04d703c062
365302: clean up old Logger mbeans
2012-01-13 13:59:49 +11:00
c6693a73ad
Merge remote-tracking branch 'origin/master' into jetty-8
2012-01-12 23:35:24 +11:00
de418bc0e4
368240: updated mbean container to use managed aggregate semantics
2012-01-12 12:25:44 +11:00
3141b50fa0
Merge remote-tracking branch 'origin/master' into jetty-8
2011-12-30 20:19:39 +11:00
009f8176a1
JETTY-1467 close half closed when idle
2011-12-28 23:09:33 +11:00
de005c68fd
Revert "Merge branch 'release-8'"
...
This reverts commit 9e72457941df12605f0e
2011-11-30 16:27:30 +11:00
0e9449ac85
Merge remote-tracking branch 'origin/master' into jetty-8
2011-11-21 18:18:09 +11:00
584bbd4bce
improved siege
2011-11-17 16:31:22 +11:00
97c711613f
added siege like load tester
2011-11-17 14:08:46 +11:00
127a5af8d7
Merge remote-tracking branch 'origin/master' into jetty-8
2011-11-17 10:59:54 +11:00
6a266e34c8
deprecated log
2011-11-09 19:37:04 +11:00
a36342438c
cleaned up some unit tests
2011-11-09 17:03:11 +11:00
5f2323418b
cleanups after the merge
2011-11-08 12:47:28 +11:00
9907125cff
improved no progress check
2011-11-07 17:14:39 +11:00
61664d3c0f
Added concept of SslConnection
2011-10-26 01:15:59 +11:00
0ba6fc7408
Merge remote-tracking branch 'origin/master' into jetty-8
2011-10-21 14:55:39 +11:00
d63577b4e9
361325 359292 Allow KeyStore to be set
2011-10-19 15:20:01 +11:00
54d0944019
no ForwardServer
2011-10-13 15:18:55 +11:00
eeb617f4d8
Adding an example of a forwarding rewrite embedded server
2011-10-12 21:00:42 -05:00
32dbb1bddb
Merge remote-tracking branch 'origin/master' 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-deploy/src/main/config/etc/jetty-deploy.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-monitor/pom.xml
jetty-nested/pom.xml
jetty-nosql/pom.xml
jetty-osgi/jetty-osgi-boot-jsp/pom.xml
jetty-osgi/jetty-osgi-boot-jsp/src/main/java/org/eclipse/jetty/osgi/boot/jsp/FragmentActivator.java
jetty-osgi/jetty-osgi-boot-logback/pom.xml
jetty-osgi/jetty-osgi-boot-warurl/pom.xml
jetty-osgi/jetty-osgi-boot/pom.xml
jetty-osgi/jetty-osgi-equinoxtools/pom.xml
jetty-osgi/jetty-osgi-httpservice/pom.xml
jetty-osgi/jetty-osgi-servletbridge/pom.xml
jetty-osgi/jetty-osgi-servletbridge/src/main/java/org/eclipse/jetty/osgi/servletbridge/FrameworkLauncherExtended.java
jetty-osgi/jetty-osgi-servletbridge/src/main/webapp/WEB-INF/web.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-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
jetty-servlet/pom.xml
jetty-servlets/pom.xml
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-10-04 17:45:15 +11:00
75645cef0e
358674 Added include/exclude protocols to SslContextFactory
2011-09-23 08:02:42 +10:00
b7b567d86d
353627 Basic Auth checks that Basic method has been send
2011-09-20 17:16:58 +10:00
57bd9f3bce
336443 Check nonce count is increasing
2011-09-20 17:04:01 +10:00
94d43e4229
356274 Start SSL socket factory in call to open()
2011-09-20 15:19:19 +10:00
1e079f06c9
Merge remote-tracking branch 'origin/master' into jetty-8
2011-09-01 14:11:53 +10:00
f6d45d5650
293739 - Deprecate static Jetty Log usage in favor of named logs
...
+ Finished conversion of the rest of jetty 7.x
2011-08-24 13:14:28 -07:00
93cc111a02
Merge remote-tracking branch 'origin/master' into jetty-8
...
Conflicts:
VERSION.txt
jetty-io/src/main/java/org/eclipse/jetty/io/nio/IndirectNIOBuffer.java
2011-07-25 17:42:30 +10:00
Simone Bordet
Jesse McConnell
Joakim Erdfelt
Greg Wilkins
Jan Bartel
Greg Wilkins
Jan Bartel