Jesse McConnell
3aa4301711
[maven-release-plugin] prepare release jetty-9.0.2.v20140415
2013-04-15 11:40:37 -05:00
Jan Bartel
7b2b5231ca
405531 Implement Part.getSubmittedFileName()
2013-04-15 17:59:19 +10: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
Simone Bordet
9fd155d36e
Marked the test with @Stress.
2013-04-12 14:07:58 +02:00
Simone Bordet
de7adaf0d2
Reverted usages of ConcurrentArrayBlockingQueue until proven it's correctly implemented.
2013-04-12 13:58:31 +02: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
a0ec3b6834
removed commented out line
2013-04-11 12:00:41 +10:00
Greg Wilkins
4c04f5dd40
403591 do not use the ConcurrentArrayBlockingQueue for thread pool, selector and async request log
2013-04-11 11:46:07 +10:00
Greg Wilkins
c7c3e4455f
404511 fixed poor methods in ArrayTernaryTrie
2013-04-11 11:46:07 +10:00
Greg Wilkins
5728077faf
Merge remote-tracking branch 'origin/release-9'
2013-04-11 06:24:01 +10:00
Simone Bordet
aa4e79efe2
Ignoring queue benchmark tests as they take too long to run.
2013-04-09 23:05:34 +02:00
Simone Bordet
45253bfb2a
Added benchmark for queues.
2013-04-09 12:13:53 +02: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
Greg Wilkins
4be4c954a5
Merge remote-tracking branch 'origin/jetty-8'
2013-04-05 09:59:03 +11:00
Greg Wilkins
6b3cb20720
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2013-04-05 09:58:33 +11:00
Greg Wilkins
b58066451e
404958 Fixed Resource.newSystemResource striped / handling
2013-04-05 09:58:05 +11:00
Simone Bordet
72219d016b
404610 - Reintroduce ability to disallow TLS renegotiation.
2013-04-04 17:11:01 +02:00
Thomas Becker
fc31a16c23
404881 Allow regexs for SslContextFactory.setIncludeCipherSuites() and .setExcludeCipherSuites()
2013-04-04 15:08:15 +02:00
Jan Bartel
7523c5234c
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
...
Conflicts:
jetty-jsp/pom.xml
2013-04-04 13:31:33 +11:00
Jan Bartel
af5f8aac33
403122 Session replication fails with ClassNotFoundException when session attribute is Java dynamic proxy
2013-03-28 15:02:33 +11:00
Greg Wilkins
fd099aa77d
404511 Replaced all StringMap usage with Tries
2013-03-28 13:20:47 +11:00
Jan Bartel
28bb68a8ae
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2013-03-26 10:57:16 +11:00
Jan Bartel
af53d94b8b
404283 org.eclipse.jetty.util.Scanner.scanFile() dies with an NPE if listFiles() returns null
2013-03-26 10:55:37 +11:00
Jan Bartel
5ebf6996c5
404283 org.eclipse.jetty.util.Scanner.scanFile() dies with an NPE if listFiles() returns null
2013-03-26 10:18:32 +11:00
Greg Wilkins
b2f3a05503
403591 do not use the ConcurrentArrayBlockingQueue for thread pool, selector and async request log
2013-03-21 09:24:02 +11:00
Greg Wilkins
76607e20a5
403591 do not use the ConcurrentArrayBlockingQueue for thread pool, selector and async request log
2013-03-18 16:19:58 +11: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
Greg Wilkins
8514e8452b
403591 use the ConcurrentArrayBlockingQueue for thread pool, selector and async request log
2013-03-18 15:37:00 +11:00
Greg Wilkins
5f1980f408
merged unsafe blocking Q, removed unsafe usage and usage of Q
2013-03-18 13:27:37 +11:00
Greg Wilkins
ba9d70589a
Merge branch 'master' into unsafe
2013-03-18 12:02:37 +11:00
Simone Bordet
0d2fc88384
Fixed put() and timed offer() implementations in Unbounded.
2013-03-18 01:51:24 +01:00
Greg Wilkins
e8d76ef12c
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
examples/embedded/src/main/java/org/eclipse/jetty/embedded/SpdyServer.java
jetty-client/src/test/java/org/eclipse/jetty/client/HttpExchangeTest.java
jetty-io/src/test/java/org/eclipse/jetty/io/ThreadLocalBuffersTest.java
jetty-server/src/main/config/etc/jetty-requestlog.xml
jetty-server/src/test/java/org/eclipse/jetty/server/AsyncStressTest.java
jetty-server/src/test/java/org/eclipse/jetty/server/HttpServerTestFixture.java
jetty-server/src/test/java/org/eclipse/jetty/server/StressTest.java
jetty-servlets/pom.xml
2013-03-18 11:09:13 +11:00
Greg Wilkins
9535f0b599
385488 non existing resources in collection are just warnings
2013-03-15 15:07:20 +11:00
Greg Wilkins
c577783fa6
inject new Q into ThreadPool
2013-03-15 12:30:49 +11:00
Greg Wilkins
17e1839089
Merge branch 'master' into unsafe
2013-03-15 11:15:33 +11:00
Joakim Erdfelt
8a96cc8c4a
Merge branch 'jetty-7' into jetty-8
2013-03-14 16:54:35 -07:00
Joakim Erdfelt
5084a1430f
Fixing build.
...
+ Bumping jetty-test-helper to 2.0
+ Bumping jetty-version-maven-plugin to 1.0.10
+ Fixing JDK 1.5 build warts
+ Updating Stress use for new "test.stress" property introduced by upgrades
2013-03-14 16:52:52 -07:00
Greg Wilkins
1cb201ef14
Merge remote-tracking branch 'origin/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/jetty-websocket/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-distribution/src/main/resources/bin/jetty.sh
jetty-http-spi/pom.xml
jetty-http/pom.xml
jetty-io/pom.xml
jetty-jaspi/pom.xml
jetty-jmx/pom.xml
jetty-jndi/pom.xml
jetty-jsp/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-warurl/pom.xml
jetty-osgi/jetty-osgi-boot/pom.xml
jetty-osgi/jetty-osgi-httpservice/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-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-spdy/pom.xml
jetty-spdy/spdy-core/pom.xml
jetty-spdy/spdy-jetty-http-webapp/pom.xml
jetty-spdy/spdy-jetty-http/pom.xml
jetty-spdy/spdy-jetty/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/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-mongodb-sessions/pom.xml
tests/test-sessions/test-sessions-common/pom.xml
tests/test-webapps/pom.xml
tests/test-webapps/test-webapp-rfc2616/pom.xml
2013-03-14 12:40:29 +11:00
Greg Wilkins
38d701753c
403281 jetty.sh waits for started before OK
...
Conflicts:
jetty-distribution/src/main/resources/bin/jetty.sh
2013-03-14 11:50:06 +11:00
Greg Wilkins
a7238f2688
403281 jetty.sh waits for started before OK
2013-03-14 11:44:04 +11:00
Simone Bordet
f0a9f9caa0
Fixed signalling in ConcurrentArrayBlockingQueue.
2013-03-14 00:09:44 +01:00
Greg Wilkins
29b83dff9b
402626 Do not required endpoint host checking by default
2013-03-14 09:25:28 +11:00
Simone Bordet
4a8b7409af
Second draft implementation of bounded and unbounded ConcurrentArrayBlockingQueue.
2013-03-13 22:57:37 +01:00
Simone Bordet
e40e2a9913
Merged branch 'master' into 'unsafe'.
2013-03-13 22:37:36 +01:00
Jesse McConnell
acb5919844
[maven-release-plugin] prepare for next development iteration
2013-03-12 09:10:50 -05:00
Jesse McConnell
d6ebdc0a4a
[maven-release-plugin] prepare release jetty-7.6.10.v20130312
2013-03-12 09:10:42 -05:00
Jesse McConnell
0405c8ded6
[maven-release-plugin] prepare for next development iteration
2013-03-12 09:05:25 -05:00
Jesse McConnell
852178cd01
[maven-release-plugin] prepare release jetty-8.1.10.v20130312
2013-03-12 09:05:14 -05:00
Simone Bordet
ef834aebe4
Draft implementation of bounded and unbounded ConcurrentArrayBlockingQueue.
2013-03-11 17:00:43 +01:00
Joakim Erdfelt
bbf44a5d32
Merge branch 'release-9'
2013-03-09 06:16:25 -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
Greg Wilkins
97de9fc6be
399967 Destroyables destroyed on undeploy and shutdown hook
2013-03-08 09:49:47 +11:00
Greg Wilkins
4b58eae39b
399967 Destroyables destroyed on undeploy and shutdown hook
2013-03-08 09:48:58 +11:00
Simone Bordet
91e5720ca2
Introduced a concurrent queue based on array chunks to reduce allocation,
...
to be used as drop-in replacement of j.u.c.ConcurrentLinkedQueue.
Using it in SelectorManager.ManagedSelector, but build fails on OSGi.
2013-03-07 10:00:50 +01:00
Greg Wilkins
2a0bfea187
395620 do not managed inherited life cycle listeners
2013-03-07 11:27:45 +11: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
Greg Wilkins
7abbc44474
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2013-03-05 10:40:45 +11:00
Greg Wilkins
cf54341ae6
399967 Shutdown hook calls destroy
2013-03-05 10:36:37 +11:00
Greg Wilkins
b8473122de
399967 call Destroyable.destroy() when a managed been is removed from ContainerLifeCycle
2013-03-05 08:09:08 +11:00
Greg Wilkins
c396622770
401495 removed unused getOutputStream
2013-03-04 17:38:00 +11: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
Jan Bartel
e95301b906
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
jetty-servlets/src/test/java/org/eclipse/jetty/servlets/ProxyServletTest.java
jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketFactory.java
jetty-websocket/src/test/java/org/eclipse/jetty/websocket/helper/SafariD00.java
2013-02-22 18:37:29 +11:00
Jan Bartel
4cb0a964ef
401485 zip file closed exception
2013-02-22 18:25:40 +11:00
Jan Bartel
59ada108b2
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java
jetty-client/src/test/java/org/eclipse/jetty/client/ExternalSiteTest.java
jetty-client/src/test/java/org/eclipse/jetty/client/SslBytesServerTest.java
jetty-http/src/main/java/org/eclipse/jetty/http/HttpParser.java
jetty-io/src/main/java/org/eclipse/jetty/io/nio/SslConnection.java
jetty-io/src/test/java/org/eclipse/jetty/io/nio/SelectChannelEndPointSslTest.java
jetty-servlets/src/main/java/org/eclipse/jetty/servlets/ProxyServlet.java
jetty-servlets/src/test/java/org/eclipse/jetty/servlets/ProxyServletTest.java
jetty-util/src/test/java/org/eclipse/jetty/util/resource/ResourceTest.java
jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java
test-jetty-webapp/pom.xml
2013-02-22 12:47:02 +11:00
Simone Bordet
8418acdae4
401414 - Hostname verification fails.
...
Now using host name instead of host address to create SSLEngines.
2013-02-21 21:08:59 +01:00
Greg Wilkins
b82a781113
400864 Added LowResourcesMonitor
2013-02-18 20:03:36 +11:00
Jesse McConnell
39c5d6c141
merge from jetty-8
2013-02-15 12:47:04 -06:00
Jesse McConnell
9c40cca59f
merge from jetty-7
2013-02-15 12:11:25 -06:00
Jesse McConnell
cf98276b32
[Bug 394064] ensure that JarFile instances are closed on JarFileResource.release()
2013-02-15 11:59:39 -06:00
Simone Bordet
df56bd3c27
400014 - Http async client DNS performance.
...
Introduced SocketAddressResolver to perform DNS resolution in a separate thread,
and updated HttpClient to make use of it.
2013-02-14 21:37:29 +01:00
Thomas Becker
bb3c1433f4
400184: SslContextFactory change. Disable hostname verification if trustAll is set
2013-02-07 11:50:19 +01: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
Simone Bordet
209d5bc12f
399721 - Change <Ref id= ...> to <Ref refid= ...>
2013-02-01 13:03:11 +01:00
Greg Wilkins
626f10678c
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
VERSION.txt
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
jetty-aggregate/jetty-all-server/pom.xml
jetty-aggregate/jetty-client/pom.xml
jetty-aggregate/jetty-plus/pom.xml
jetty-aggregate/jetty-servlet/pom.xml
jetty-aggregate/jetty-webapp/pom.xml
jetty-aggregate/jetty-websocket/pom.xml
jetty-aggregate/pom.xml
jetty-annotations/pom.xml
jetty-client/pom.xml
jetty-continuation/pom.xml
jetty-deploy/pom.xml
jetty-distribution/pom.xml
jetty-http-spi/pom.xml
jetty-http/pom.xml
jetty-io/pom.xml
jetty-jaspi/pom.xml
jetty-jmx/pom.xml
jetty-jndi/pom.xml
jetty-jsp/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/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-policy/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-server/pom.xml
jetty-spring/pom.xml
jetty-start/pom.xml
jetty-util-ajax/pom.xml
jetty-util/pom.xml
jetty-util/src/main/java/org/eclipse/jetty/util/UrlEncoded.java
jetty-util/src/main/java/org/eclipse/jetty/util/Utf8StringBuilder.java
jetty-util/src/test/java/org/eclipse/jetty/util/URLEncodedTest.java
jetty-webapp/pom.xml
jetty-websocket/pom.xml
jetty-xml/pom.xml
pom.xml
test-continuation/pom.xml
test-jetty-nested/pom.xml
test-jetty-servlet/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-mongodb-sessions/pom.xml
tests/test-sessions/test-sessions-common/pom.xml
tests/test-webapps/pom.xml
tests/test-webapps/test-jetty-webapp/pom.xml
tests/test-webapps/test-webapp-rfc2616/pom.xml
2013-02-01 22:15:44 +11:00
Greg Wilkins
e8de7bd905
Merge remote-tracking branch 'origin/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/jetty-websocket/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-spi/pom.xml
jetty-http/pom.xml
jetty-io/pom.xml
jetty-jaspi/pom.xml
jetty-jmx/pom.xml
jetty-jndi/pom.xml
jetty-jsp/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-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/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-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-spdy/pom.xml
jetty-spdy/spdy-core/pom.xml
jetty-spdy/spdy-jetty-http-webapp/pom.xml
jetty-spdy/spdy-jetty-http/pom.xml
jetty-spdy/spdy-jetty/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/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-mongodb-sessions/pom.xml
tests/test-sessions/test-sessions-common/pom.xml
tests/test-webapps/pom.xml
tests/test-webapps/test-webapp-rfc2616/pom.xml
2013-02-01 18:22:04 +11:00
Greg Wilkins
1610329d3e
399703 made encoding error handling consistent
2013-02-01 15:31:55 +11:00
Greg Wilkins
376114e794
397168 backed of test timing
2013-02-01 10:41:58 +11:00
Jesse McConnell
5c58878c3c
[maven-release-plugin] prepare for next development iteration
2013-01-31 11:34:38 -06:00
Jesse McConnell
ebbe37294f
[maven-release-plugin] prepare release jetty-8.1.9.v20130131
2013-01-31 11:34:30 -06:00
Jesse McConnell
a5e1e04af1
[maven-release-plugin] prepare for next development iteration
2013-01-31 08:42:20 -06:00
Jesse McConnell
b7fb18fd65
[maven-release-plugin] prepare release jetty-7.6.9.v20130131
2013-01-31 08:42:12 -06:00
Jesse McConnell
1f35b72d54
[Bug 381351] defaults for keymanager and trustmanager come from their factories and not hardcoded
2013-01-28 16:25:21 -06:00
Jesse McConnell
a086451bc7
[Bug 393933] remove deprecated classes/methods and consolidate some static methods to SslContextFactory
2013-01-28 16:15:34 -06:00
Simone Bordet
1737669df4
399242 - Reduce/eliminate false sharing in BlockingArrayQueue.
...
Now head and tail are stored in an array, spaced by empty elements to avoid false sharing.
2013-01-28 12:32:03 +01:00
Jesse McConnell
368d7bbb72
Merge branch 'jetty-7' into jetty-8
2013-01-25 11:35:11 -06:00
Greg Wilkins
4a1a4700c3
382237 support non java JSON classes
2013-01-25 12:28:54 +11:00
Simone Bordet
29d2854027
397769 - TimerScheduler does not relinquish cancelled tasks.
...
Now the scheduler submits itself as a task that runs every second to purge the task queue.
2013-01-24 16:06:20 +01:00
Thomas Becker
99c34d5227
398280: SslContextFactory _trustAll defaults to false now
2013-01-18 14:07:24 +01:00
Thomas Becker
9ebea3938d
393385: Make hostname verification configurable in SslContextFactory and enable it by default (See http://www.ietf.org/rfc/rfc2818.txt section 3.1)
2013-01-17 10:28:15 +01:00
Greg Wilkins
46e13b305b
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
jetty-util/src/test/java/org/eclipse/jetty/util/URLEncodedTest.java
2013-01-17 11:00:20 +11:00
Greg Wilkins
9cf08249e0
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2013-01-17 09:16:40 +11:00
Greg Wilkins
747eeb87c1
398337 UTF-16 percent encoding in UTF-16 form content
2013-01-17 09:04:04 +11:00
Greg Wilkins
43f14e8ee9
jetty-9 fixed multiple Trie full attempts
2013-01-15 20:33:47 +11:00
Greg Wilkins
3a52ceca50
jetty-9 fixed year in header
2013-01-14 18:04:18 +11:00
Greg Wilkins
2d7b96bab1
jetty-9 added Ternary Trie impl for connection field cache
2013-01-14 17:36:03 +11:00
Jesse McConnell
e1c516c7d1
merge from jetty-8 and update license blocks.
2013-01-11 17:04:53 -06:00
Jesse McConnell
863944873d
merge from 7 and update license blocks for 2013
2013-01-11 15:01:16 -06:00
Jesse McConnell
a4dbb5823c
update license blocks for 2013
2013-01-11 14:57:51 -06:00
Greg Wilkins
e6d3397c1c
jetty-9 removed alias option
2013-01-11 08:50:09 +11:00
Simone Bordet
a5b46fb039
Reintroduced method deleted by mistake.
2013-01-10 10:38:22 +01:00
Simone Bordet
f096380a35
Introduced capability of configuring the daemon property on schedulers.
...
Also added the name property to ScheduledExecutorScheduler.
2013-01-10 10:26:04 +01:00
Simone Bordet
34cc0e5d82
Optimized memory usage of AttributesMap.
...
Attributes are used rarely, so AttributesMap was creating a ConcurrentHashMap
that was never used.
In cases where AttributesMap is heavily used (for example CometD) this proved
to save a significant amount of memory footprint.
2013-01-10 09:40:21 +01:00
Greg Wilkins
25324b666c
jetty-9 made Trie abstract and added TreeTrie for the HttpParser cache to save space
2013-01-10 17:31:57 +11:00
Greg Wilkins
3efcc2af41
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/Request.java
jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
jetty-servlet/src/main/java/org/eclipse/jetty/servlet/DefaultServlet.java
jetty-servlets/src/main/java/org/eclipse/jetty/servlets/GzipFilter.java
2013-01-10 16:24:41 +11:00
Simone Bordet
fa412b4668
397769 - TimerScheduler does not relinquish cancelled tasks.
...
Implemented ScheduledExecutorScheduler, using JDK's ScheduledExecutorService implementation and configuring it to remove tasks on cancel.
2013-01-09 17:06:37 +01:00
Greg Wilkins
2aab780eba
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
tests/test-integration/src/test/java/org/eclipse/jetty/test/jsp/JspMatchingTest.java
2013-01-07 23:45:38 +11:00
Greg Wilkins
ccda9bb10b
397535 Support pluggable alias checking to support symbolic links
2013-01-07 19:57:52 +11:00
Jan Bartel
8d0e776b2a
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
jetty-start/src/main/resources/org/eclipse/jetty/start/start.config
jetty-util/src/main/java/org/eclipse/jetty/util/MultiPartInputStream.java
test-jetty-webapp/pom.xml
tests/test-integration/pom.xml
2013-01-07 12:47:32 +11:00
Jan Bartel
d2c2e8693f
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2013-01-07 10:38:48 +11:00
Joakim Erdfelt
c23f722286
Reverting validation changes to FileResource and disabling tests
2013-01-02 10:32:16 -07:00
Jesse McConnell
c1e5b0b80c
[Bug 397111] Tolerate empty or excessive whitespace preceeding MultiParts
2012-12-31 15:57:28 -03:00
Joakim Erdfelt
9fde0c56ab
Merge branch 'jetty-7' into jetty-8
2012-12-27 14:22:57 -07:00
Joakim Erdfelt
9009f6abbf
Adding safety checks for FileResource references with null characters.
...
* Adding testcase for Jsp + DefaultServlet w/aliasing turned on
with null characters in the request url.
* Adding validateUri() method to FileResource
2012-12-27 11:44:19 -07:00
Greg Wilkins
31def06214
jetty-9 URI parsing passed ByteBuffer so that strange query string encodings can be supported
2012-12-24 19:17:00 +11:00
Jan Bartel
73d90623c7
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
jetty-servlet/src/main/java/org/eclipse/jetty/servlet/DefaultServlet.java
jetty-servlet/src/test/java/org/eclipse/jetty/servlet/DefaultServletTest.java
2012-12-24 16:48:12 +11:00
Jan Bartel
23e41673bf
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2012-12-24 14:45:16 +11:00
Jan Bartel
f0a9930693
397112 Requests with byte-range throws NPE if requested file has no mimetype (eg no file extension)
2012-12-24 13:52:28 +11:00
Jan Bartel
37ac5e7b16
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
jetty-http/src/main/java/org/eclipse/jetty/http/HttpURI.java
jetty-servlets/src/test/java/org/eclipse/jetty/servlets/MultipartFilterTest.java
jetty-util/src/main/java/org/eclipse/jetty/util/MultiPartInputStream.java
jetty-util/src/test/java/org/eclipse/jetty/util/MultiPartInputStreamTest.java
jetty-util/src/test/java/org/eclipse/jetty/util/URLEncodedTest.java
2012-12-22 16:42:33 +11:00
Jan Bartel
c7b6ed72e8
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
2012-12-22 15:13:49 +11:00
Jan Bartel
346918577f
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
jetty-client/src/main/java/org/eclipse/jetty/client/AsyncHttpConnection.java
jetty-server/src/main/java/org/eclipse/jetty/server/AbstractHttpConnection.java
jetty-server/src/main/java/org/eclipse/jetty/server/Server.java
jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
jetty-servlets/src/main/java/org/eclipse/jetty/servlets/MultiPartFilter.java
jetty-servlets/src/test/java/org/eclipse/jetty/servlets/MultipartFilterTest.java
jetty-util/src/main/java/org/eclipse/jetty/util/MultiPartInputStream.java
jetty-util/src/test/java/org/eclipse/jetty/util/MultiPartInputStreamTest.java
jetty-webapp/src/test/java/org/eclipse/jetty/webapp/WebAppContextTest.java
test-jetty-servlet/src/main/java/org/eclipse/jetty/testing/ServletTester.java
test-jetty-webapp/src/main/java/com/acme/CookieDump.java
test-jetty-webapp/src/main/java/com/acme/HelloWorld.java
2012-12-22 15:12:17 +11:00
Jan Bartel
3a236c6735
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
...
Conflicts:
jetty-servlets/src/main/java/org/eclipse/jetty/servlets/MultiPartFilter.java
2012-12-22 14:05:29 +11:00
Greg Wilkins
d4c4637f4d
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2012-12-22 12:30:20 +11:00
Greg Wilkins
810ff3802f
397110 Accept %uXXXX encodings in URIs
2012-12-22 12:00:54 +11:00
Simone Bordet
64196c6dea
Improved BlockingArrayQueue.
...
Removed redundant field _capacity and correctly implemented remove(int) and iterators.
2012-12-21 17:13:07 +01:00
Simone Bordet
3fb5af01f2
Code cleanup plus optimizations plus javadocs improvements.
...
Following the JDK optimization, the lock fields are now read into local variables.
Optimized various reads of fields into local variables.
2012-12-21 17:13:07 +01:00
Jan Bartel
32e1d0f29c
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/Server.java
jetty-servlets/src/main/java/org/eclipse/jetty/servlets/MultiPartFilter.java
jetty-servlets/src/test/java/org/eclipse/jetty/servlets/MultipartFilterTest.java
2012-12-21 13:00:14 +11:00
Jan Bartel
7202631515
396886 MultiPartFilter strips bad escaping on filename="..."
2012-12-20 13:48:45 +11:00
Greg Wilkins
f7c2e85040
jetty-9 per parser fields cache
2012-12-20 13:13:46 +11:00
Greg Wilkins
ba684637df
jetty-9 minor optimisations
2012-12-20 12:03:00 +11:00
Greg Wilkins
b1bd23e3cb
jetty-9 minor optimisations
2012-12-20 10:46:22 +11:00
Joakim Erdfelt
128cf0a6b4
396886 - MultiPartFilter strips bad escaping on filename="..."
2012-12-18 18:19:17 -07:00
Greg Wilkins
4d34e83c1c
jetty-9 replaced Trie with indexed implementation
2012-12-17 19:21:28 +11:00
Jan Bartel
2966192aa4
395794 NullPointerException in when requesting a file without extension
2012-12-17 13:58:39 +11:00
Greg Wilkins
ecf7563a79
jetty-9 use direct buffers for generated headers
2012-12-14 14:07:42 +11:00
Jan Bartel
a9247d6617
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
jetty-util/src/main/java/org/eclipse/jetty/util/MultiPartInputStream.java
jetty-util/src/test/java/org/eclipse/jetty/util/MultiPartInputStreamTest.java
2012-12-14 12:08:03 +11:00
Jan Bartel
f9e76b1620
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
...
Conflicts:
jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
jetty-servlets/src/main/java/org/eclipse/jetty/servlets/MultiPartFilter.java
jetty-util/src/main/java/org/eclipse/jetty/util/ReadLineInputStream.java
2012-12-14 11:48:55 +11:00
Jan Bartel
aacc8a1712
396459 Log specific message for empty request body for multipart mime requests
2012-12-14 11:02:44 +11:00
Jan Bartel
892cafd9a3
396459 Log specific message for empty request body for multipart mime requests
2012-12-14 10:42:58 +11:00
Joakim Erdfelt
b513244395
Bug 392371 - JavaUtilLog performing expensive format for unlogged items
...
* Adding isLoggable checks where format() is used
2012-12-12 14:39:17 -07:00
Simone Bordet
0ff769e633
Introduced HttpCookieStore.Empty to disable cookies in HttpClient and in the websocket client.
2012-12-12 18:35:10 +01:00
Simone Bordet
b9b16529d5
Removed jetty-client's CookieStore to use java.net.CookieStore instead.
...
This unifies the usage of CookieStores between jetty-client and jetty-websocket, and hopefully other modules as well.
2012-12-12 10:18:18 +01:00
Simone Bordet
8e98148350
Introduced setQueue(), removed maxQueued() and renamed maxIdleTimeMs() to idleTimeout().
...
The reason for this change is that CometD needs a way to explicitly set the queue implementation
in load testing to measure latencies.
Property maxQueued was used to decide, at start time, what queue implementation to use, but
now that can be set explicitly with setQueue().
The rename was done because in all other places the idle timeout has been renamed so.
2012-12-11 14:45:43 +01:00
Joakim Erdfelt
11d7617298
Including hashcode in BufferUtils.toDetailString()
2012-12-10 09:23:18 -07:00
Greg Wilkins
6f098dd69c
jetty-9 use DateCache timer to set Date header once per second
2012-12-10 12:58:14 +11:00
Greg Wilkins
979d6dbbf9
367638 throw exception for excess form keys
2012-12-08 10:05:32 +11:00
Greg Wilkins
a20d984d30
jetty-9 Added Trie for cached string lookup. HttpFields does not use StringMap
2012-12-08 01:41:00 +11:00
Thomas Becker
db6fdca3b9
395922: Unit test that checks if ControlFrameBytes are sent in the right order even with priorization
2012-12-07 11:39:53 +01:00
Joakim Erdfelt
7c0f7cc8f4
Fixing for JDK5.
2012-12-03 12:55:37 -07: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
Greg Wilkins
b3e1114313
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
VERSION.txt
jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/webapp/WebBundleTrackerCustomizer.java
jetty-servlets/src/test/java/org/eclipse/jetty/servlets/MultipartFilterTest.java
jetty-util/src/main/java/org/eclipse/jetty/util/MultiPartInputStreamParser.java
jetty-util/src/main/java/org/eclipse/jetty/util/TypeUtil.java
jetty-util/src/test/java/org/eclipse/jetty/util/MultiPartInputStreamTest.java
jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlConfiguration.java
2012-11-30 12:04:00 +11:00
Greg Wilkins
d269015c7d
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2012-11-30 09:09:22 +11:00
Greg Wilkins
cfa1c1e2e4
395394 allow logging from boot classloader
2012-11-30 07:56:38 +11:00
Joakim Erdfelt
62ebbbac3c
Making test more reliable on non-US machines
2012-11-29 10:23:20 -07:00
Joakim Erdfelt
916097f787
Validating that URIUtil.decodePath() can handle null characters
2012-11-29 10:20:41 -07:00
Jan Bartel
2d97e5b0ca
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2012-11-29 17:18:51 +11:00
Jan Bartel
2723c415bf
395215 Multipart mime with just LF and no CRLF
2012-11-29 16:48:21 +11:00
Jan Bartel
9f5801c3fd
395215 Multipart mime with just LF and no CRLF
2012-11-29 15:57:16 +11:00
Greg Wilkins
d78ec063ee
395220 New InputStream extension to allow a mix of EOL styles between headers and content
2012-11-29 13:40:25 +11:00
Greg Wilkins
249068551f
395220 New InputStream extension to allow a mix of EOL styles between headers and content
2012-11-29 13:29:24 +11:00
Simone Bordet
ee893d8526
Corrected changes introduced with Promise.
...
Save creation of iterators for every append() and prepend() in StandardSession.
Removed PromisingCallback, only used by SPDY and better implemented otherwise.
2012-11-23 13:16:32 +01:00
Jan Bartel
ba8057867e
Merge remote-tracking branch 'origin/jetty-8'
2012-11-23 15:04:20 +11:00
Jan Bartel
8241089364
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2012-11-23 14:45:34 +11:00
Jan Bartel
769260f251
392417 Prevent Cookie parsing interpreting unicode chars
2012-11-23 12:29:53 +11:00
Greg Wilkins
9edac367c8
394854 optimised promise implementation
2012-11-23 12:18:52 +11:00
Greg Wilkins
7737dc8c76
394854 Implemented Promise
2012-11-23 12:18:51 +11:00
Jan Bartel
4befd6395b
Merge remote-tracking branch 'origin/jetty-8'
2012-11-22 12:08:42 +11:00
Jan Bartel
4cf77cea31
394839 Allow multipart mime with no boundary
2012-11-22 09:55:12 +11:00
Thomas Becker
1dc3fcaf9b
394671 Fix setting loglevel on commandline, organize import, fix javadoc
2012-11-20 17:56:37 +01:00
Simone Bordet
a5df0ab456
Updated jetty-spring module.
2012-11-20 17:42:45 +01:00
Thomas Becker
9044819085
394671: Fix setting loglevel on commandline via -Dorg.eclipse.jetty.LEVEL=DEBUG
2012-11-20 16:21:42 +01:00
Greg Wilkins
b5c6555a4a
392237 Improved handling of SPDY async send
2012-11-16 10:45:08 +11:00
Jan Bartel
6aa01d4517
394357 Make JarResource constructors protected
2012-11-15 17:20:55 +11:00
Simone Bordet
c07bab8a05
394215 - Scheduled tasks throwing exceptions kill java.util.Timer thread.
...
Wrapping the the task run() method into a try/catch to avoid that the Timer thread dies.
2012-11-13 19:32:10 +01:00
Simone Bordet
ba40f7897d
Completed port of ConnectHandler and ProxyServlet implementations.
2012-11-13 15:35:51 +01:00
Simone Bordet
9abc3988fb
B64 coding and decoding now throws the unchecked UnsupportedCharsetException
...
rather than the checked UnsupportedEncodingException.
2012-11-13 11:29:54 +01:00
Greg Wilkins
8ff291d223
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
jetty-http/src/main/java/org/eclipse/jetty/http/HttpContent.java
jetty-overlay-deployer/src/main/java/org/eclipse/jetty/overlays/OverlayedAppProvider.java
jetty-overlay-deployer/src/main/java/org/eclipse/jetty/overlays/TemplateContext.java
jetty-server/src/main/java/org/eclipse/jetty/server/AbstractHttpConnection.java
jetty-server/src/main/java/org/eclipse/jetty/server/ResourceCache.java
jetty-server/src/main/java/org/eclipse/jetty/server/handler/ResourceHandler.java
jetty-server/src/test/java/org/eclipse/jetty/server/ResourceCacheTest.java
jetty-servlet/src/main/java/org/eclipse/jetty/servlet/DefaultServlet.java
jetty-servlet/src/test/java/org/eclipse/jetty/servlet/DefaultServletTest.java
jetty-servlets/src/main/java/org/eclipse/jetty/servlets/GzipFilter.java
jetty-servlets/src/main/java/org/eclipse/jetty/servlets/gzip/AbstractCompressedStream.java
jetty-servlets/src/main/java/org/eclipse/jetty/servlets/gzip/CompressedResponseWrapper.java
2012-11-12 12:30:26 +11:00
Greg Wilkins
3d3b035b22
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
...
Conflicts:
jetty-servlet/src/test/java/org/eclipse/jetty/servlet/DefaultServletTest.java
2012-11-12 09:08:53 +11:00
Greg Wilkins
0f60eb751d
393947 additional tests
2012-11-11 10:25:10 +11:00
Greg Wilkins
75aedbbf45
393947 implement ETags and update gzip filter to handle them
2012-11-11 09:52:26 +11:00
Jan Bartel
8e47864bcf
392850 ContextLoaderListener not called in 9.0.0.M1 and M2
2012-11-08 14:02:35 +11:00
Jan Bartel
6b04056371
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
VERSION.txt
example-async-rest/async-rest-jar/pom.xml
example-async-rest/async-rest-webapp/pom.xml
example-async-rest/pom.xml
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/jetty-websocket/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-spi/pom.xml
jetty-http/pom.xml
jetty-io/pom.xml
jetty-jaspi/pom.xml
jetty-jmx/pom.xml
jetty-jndi/pom.xml
jetty-jsp/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-warurl/pom.xml
jetty-osgi/jetty-osgi-boot/pom.xml
jetty-osgi/jetty-osgi-httpservice/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-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-spdy/pom.xml
jetty-spdy/spdy-core/pom.xml
jetty-spdy/spdy-jetty-http-webapp/pom.xml
jetty-spdy/spdy-jetty-http/pom.xml
jetty-spdy/spdy-jetty/pom.xml
jetty-start/pom.xml
jetty-util/pom.xml
jetty-util/src/main/java/org/eclipse/jetty/util/MultiPartInputStream.java
jetty-webapp/pom.xml
jetty-websocket/pom.xml
jetty-xml/pom.xml
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-mongodb-sessions/pom.xml
tests/test-sessions/test-sessions-common/pom.xml
tests/test-webapps/pom.xml
tests/test-webapps/test-webapp-rfc2616/pom.xml
2012-11-06 16:12:00 +11:00
Jesse McConnell
bb27f561c1
[maven-release-plugin] prepare for next development iteration
2012-11-05 12:24:06 -06:00
Jesse McConnell
1d767e99a3
[maven-release-plugin] prepare release jetty-8.1.8.v20121105
2012-11-05 12:23:59 -06:00
Jesse McConnell
70d591c430
[maven-release-plugin] prepare for next development iteration
2012-11-05 12:16:03 -06:00
Jesse McConnell
017826b4eb
[maven-release-plugin] prepare release jetty-7.6.8.v20121105
2012-11-05 12:15:57 -06:00
Jesse McConnell
55de6fc6e4
add import for Locale
2012-11-05 11:31:11 -06:00
Jan Bartel
0c84eefdcc
Rename AggregateLifeCycle to ContainerLifeCycle in javadoc
2012-11-05 12:16:39 +11:00
Jan Bartel
2a2215cf0b
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
2012-11-02 16:59:11 +11:00
Greg Wilkins
52464a5ba6
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java
jetty-annotations/src/main/java/org/eclipse/jetty/annotations/ResourceAnnotationHandler.java
jetty-client/src/test/java/org/eclipse/jetty/client/SslHttpExchangeTest.java
jetty-client/src/test/java/org/eclipse/jetty/client/SslSecurityListenerTest.java
jetty-deploy/src/main/java/org/eclipse/jetty/deploy/WebAppDeployer.java
jetty-deploy/src/main/java/org/eclipse/jetty/deploy/providers/ContextProvider.java
jetty-http/src/main/resources/org/eclipse/jetty/http/mime.properties
jetty-http/src/test/java/org/eclipse/jetty/http/HttpFieldsTest.java
jetty-io/src/main/java/org/eclipse/jetty/io/nio/SelectChannelEndPoint.java
jetty-jmx/src/main/java/org/eclipse/jetty/jmx/MBeanContainer.java
jetty-jmx/src/main/java/org/eclipse/jetty/jmx/ObjectMBean.java
jetty-overlay-deployer/src/main/java/org/eclipse/jetty/overlays/OverlayedAppProvider.java
jetty-plus/src/main/java/org/eclipse/jetty/plus/annotation/Injection.java
jetty-plus/src/main/java/org/eclipse/jetty/plus/security/DataSourceLoginService.java
jetty-proxy/src/main/java/org/eclipse/jetty/proxy/ProxyServlet.java
jetty-rewrite/src/main/java/org/eclipse/jetty/rewrite/handler/ProxyRule.java
jetty-security/src/main/java/org/eclipse/jetty/security/authentication/FormAuthenticator.java
jetty-server/src/main/java/org/eclipse/jetty/server/session/JDBCSessionIdManager.java
jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/proxy/ProxyHTTPSPDYConnection.java
jetty-spdy/spdy-jetty-http/src/main/java/org/eclipse/jetty/spdy/http/ServerHTTPSPDYAsyncConnection.java
jetty-start/src/main/java/org/eclipse/jetty/start/Main.java
jetty-util/src/main/java/org/eclipse/jetty/util/Fields.java
jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketClientFactory.java
jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketConnectionRFC6455.java
jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketClientTest.java
jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketMessageRFC6455Test.java
test-jetty-nested/src/main/java/org/eclipse/jetty/nested/Dump.java
test-jetty-webapp/src/main/java/com/acme/Dump.java
2012-11-02 14:08:05 +11:00
Greg Wilkins
e076e8a8f0
393363 Use Locale.ENGLISH for all toUpperCase and toLowerCase calls
2012-11-02 13:19:07 +11:00
Greg Wilkins
8723408731
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
...
Conflicts:
jetty-servlets/src/main/java/org/eclipse/jetty/servlets/MultiPartFilter.java
2012-11-02 13:17:53 +11:00