Greg Wilkins
f567bddad9
global clean up imports
2013-11-04 13:48:03 +11:00
Greg Wilkins
eb3bb660b5
Merge remote-tracking branch 'origin/master' into jetty-9.1
...
Conflicts:
jetty-client/src/main/java/org/eclipse/jetty/client/util/DigestAuthentication.java
jetty-client/src/test/java/org/eclipse/jetty/client/HttpReceiverTest.java
jetty-client/src/test/java/org/eclipse/jetty/client/HttpSenderTest.java
jetty-http/src/main/java/org/eclipse/jetty/http/HttpField.java
jetty-server/src/test/java/org/eclipse/jetty/server/AbstractHttpTest.java
jetty-servlets/src/test/java/org/eclipse/jetty/servlets/AbstractDoSFilterTest.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/HeadersBlockGenerator.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/HeadersBlockParser.java
jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/ClientUpgradeRequest.java
jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/WebSocketFrame.java
jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/WebSocketSession.java
jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/extensions/compress/DeflateCompressionMethodTest.java
jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/extensions/compress/PerMessageDeflateExtensionTest.java
2013-11-03 18:22:09 +11:00
Mikhail Mazursky
6b0269a16d
[Bug 420930] Use Charset to specify character encoding
...
Signed-off-by: Mikhail Mazursky <mikhail.mazursky@gmail.com>
2013-11-02 14:44:36 +06:00
Joakim Erdfelt
845c08970e
417933 - logging.mod ini template should include commented log.class settings
2013-10-30 13:14:22 -07:00
Jan Bartel
f4e95be443
Merge remote-tracking branch 'origin/master' into jetty-9.1
2013-10-28 18:01:43 +11:00
Mikhail Mazursky
c101e55c7f
[Bug 420374] Call super.close() in a finally block
...
Signed-off-by: Mikhail Mazursky <mikhail.mazursky@gmail.com>
2013-10-26 12:43:06 +06:00
Greg Wilkins
05cab9bfb4
Merge remote-tracking branch 'origin/master' into jetty-9.1
...
Conflicts:
jetty-client/src/main/java/org/eclipse/jetty/client/HttpSender.java
jetty-server/src/main/java/org/eclipse/jetty/server/handler/StatisticsHandler.java
2013-10-26 11:01:25 +11:00
Joakim Erdfelt
5965e695fa
Cleaning up modules
2013-10-24 14:06:50 -07:00
Greg Wilkins
28566c72c8
420142 reimplemented graceful shutdown
2013-10-24 17:22:08 +11:00
Greg Wilkins
d5f83a8159
420034 Removed threads/timers from Date caching
2013-10-24 11:09:17 +11:00
Greg Wilkins
323572708c
Merge remote-tracking branch 'origin/master' into jetty-9.1
...
Conflicts:
jetty-util/src/main/java/org/eclipse/jetty/util/resource/FileResource.java
2013-10-23 11:51:19 +11:00
Greg Wilkins
d38233c52d
420048 - DefaultServlet alias checks configured resourceBase
...
Fixed false positive alias detection for ; encoded as %3B in file name
2013-10-23 11:46:58 +11:00
Simone Bordet
61dcf9895e
Removed warn logging statement from Adapter.failed(Throwable) since
...
it just clutter the logs.
2013-10-22 19:18:34 +02:00
Greg Wilkins
bb7ab62c7a
419914 - QueuedThreadPool uses nanoTime
2013-10-21 15:12:07 +11:00
Simone Bordet
2d6190da59
Refactored class Fields to a better API.
2013-10-18 13:55:49 +02:00
Simone Bordet
591cf9badf
Deleted class org.eclipse.jetty.util.thread.Timeout, replacing its
...
usages with o.e.j.u.t.Scheduler.
2013-10-17 13:25:15 +02:00
Simone Bordet
c1832b29fb
Merged branch 'master' into 'jetty-9.1'.
2013-10-17 12:37:37 +02:00
Simone Bordet
7618826349
419687 - HttpClient's query parameters must be case sensitive.
...
Modified class Fields to take a boolean parameter that defines
whether it is case sensitive or not, and updated HttpRequest to use
a case sensitive Fields instance for the query parameters.
2013-10-17 12:37:01 +02:00
Simone Bordet
4da6ddc94f
403591 - improve the Blocking Q implementation.
...
Removed ConcurrentArrayBlockingQueue implementations as they were not
up to par performance wise.
2013-10-17 10:44:39 +02:00
Simone Bordet
6c2a14396e
410840 - Change SSLSession.getPeerCertificateChain() to
...
SSLSession.getPeerCertificates().
2013-10-16 17:31:40 +02:00
Greg Wilkins
8eb683f9b5
fixed merge
2013-10-14 18:00:53 +11:00
Greg Wilkins
1d5730d8d2
Merge remote-tracking branch 'origin/master' into jetty-9.1
2013-10-14 17:19:09 +11:00
Greg Wilkins
b8c8abae2e
419333 treat // as an alias in path
2013-10-14 17:16:54 +11:00
Thomas Becker
081e7d3bbd
415609 spdy replace SessionInvoker with IteratingCallback. Introduce Flusher class to separate queuing/flushing logic from StandardSession
2013-10-11 10:51:05 +02:00
Thomas Becker
33dedd15f9
Typo fix
2013-10-11 10:49:13 +02:00
Joakim Erdfelt
646b4c929b
Fixing invalid javadoc
2013-10-10 07:31:56 -07:00
Jesse McConnell
856a24b65a
[maven-release-plugin] prepare for next development iteration
2013-09-30 14:46:09 -05:00
Jesse McConnell
f466f03c6a
[maven-release-plugin] prepare release jetty-9.0.6.v20130930
2013-09-30 14:46:00 -05:00
Jesse McConnell
0b3f431d27
set version back to 9.0.6-SNAPSHOT
2013-09-30 12:33:06 -05:00
Jesse McConnell
af2e6ff911
Merge branch 'master' into release-9
2013-09-30 12:28:04 -05:00
Jan Bartel
0400289826
417561 Refactor annotation related code - make annotation phase able to be multithreaded
2013-09-30 13:27:05 +10:00
Greg Wilkins
0fac295cd8
418014 Handle NTFS canonical exceptions during alias check
...
replaced URL returns with URI
2013-09-27 15:50:36 +10:00
Greg Wilkins
080781ec0e
Merge remote-tracking branch 'origin/master' into jetty-9.1
2013-09-27 13:37:55 +10:00
Greg Wilkins
458e511ce2
418014 Handle NTFS canonical exceptions during alias check
2013-09-27 13:37:00 +10:00
Greg Wilkins
643b6c3c77
removed ExecutorCallback
2013-09-26 18:06:10 +10:00
Joakim Erdfelt
ac40e7ab6a
Fixing various javadoc errors
2013-09-25 08:11:32 -07:00
Jesse McConnell
0525498ad3
[maven-release-plugin] prepare for next development iteration
2013-09-19 15:06:31 -05:00
Jesse McConnell
c05a725db6
[maven-release-plugin] prepare release jetty-9.0.6.v20130919
2013-09-19 15:06:17 -05:00
Jan Bartel
d4c035a06f
417561 Refactor annotation related code to remove some deadwood
2013-09-19 15:43:38 +10:00
Greg Wilkins
5a801d398d
Merge remote-tracking branch 'origin/master' into jetty-9.1
2013-09-16 12:10:55 +10:00
Greg Wilkins
9fef8215ed
417225 added Container.addEventListener method
2013-09-16 10:48:51 +10:00
Greg Wilkins
070ce9dd22
Merge remote-tracking branch 'origin/master' into jetty-9.1
...
Conflicts:
jetty-start/src/main/java/org/eclipse/jetty/start/Main.java
jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java
2013-09-09 15:41:17 +10:00
Mikhail Mazursky
767faece5c
[Bug 415999] Fix some of FindBugs warnings
...
Mostly not closed streams/DB resources are fixed. But also less
important things.
Signed-off-by: Mikhail Mazursky <mikhail.mazursky@gmail.com>
2013-09-09 00:24:31 -04:00
Greg Wilkins
ace43502ad
refined start.jar mechanism to align with updated documentation
2013-09-06 16:10:03 +10:00
Joakim Erdfelt
8fdc6b05bb
Fixing logging.mod for new module format
2013-08-30 13:08:11 -07:00
Simone Bordet
cc6e2964be
Made Fields.Field constructor public.
2013-08-30 18:45:16 +02:00
Jan Bartel
c183c6fad5
Merge branch 'jetty-9.1' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9.1
2013-08-29 12:59:50 +10:00
Jan Bartel
280000e88a
Merge remote-tracking branch 'origin/master' into jetty-9.1
...
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
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-spi/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-overlay-deployer/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-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
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-jetty-webapp/src/main/config/demo/webapps/test.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-web-fragment/pom.xml
tests/test-webapps/test-webapp-rfc2616/pom.xml
2013-08-29 12:59:32 +10:00
Greg Wilkins
d66778ad06
415826 start.jar module --enable and --disable
...
morphed mechanism into --initialize based templates
2013-08-28 09:30:03 +10:00
Jesse McConnell
ef166c23e6
Merge branch 'release-9'
2013-08-23 18:58:01 -05:00