9fde0c56ab
Merge branch 'jetty-7' into jetty-8
2012-12-27 14:22:57 -07:00
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
31def06214
jetty-9 URI parsing passed ByteBuffer so that strange query string encodings can be supported
2012-12-24 19:17:00 +11:00
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
23e41673bf
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2012-12-24 14:45:16 +11:00
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
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
c7b6ed72e8
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
2012-12-22 15:13:49 +11:00
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
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
d4c4637f4d
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2012-12-22 12:30:20 +11:00
810ff3802f
397110 Accept %uXXXX encodings in URIs
2012-12-22 12:00:54 +11:00
64196c6dea
Improved BlockingArrayQueue.
...
Removed redundant field _capacity and correctly implemented remove(int) and iterators.
2012-12-21 17:13:07 +01:00
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
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
7202631515
396886 MultiPartFilter strips bad escaping on filename="..."
2012-12-20 13:48:45 +11:00
f7c2e85040
jetty-9 per parser fields cache
2012-12-20 13:13:46 +11:00
ba684637df
jetty-9 minor optimisations
2012-12-20 12:03:00 +11:00
b1bd23e3cb
jetty-9 minor optimisations
2012-12-20 10:46:22 +11:00
128cf0a6b4
396886 - MultiPartFilter strips bad escaping on filename="..."
2012-12-18 18:19:17 -07:00
4d34e83c1c
jetty-9 replaced Trie with indexed implementation
2012-12-17 19:21:28 +11:00
2966192aa4
395794 NullPointerException in when requesting a file without extension
2012-12-17 13:58:39 +11:00
ecf7563a79
jetty-9 use direct buffers for generated headers
2012-12-14 14:07:42 +11:00
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
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
aacc8a1712
396459 Log specific message for empty request body for multipart mime requests
2012-12-14 11:02:44 +11:00
892cafd9a3
396459 Log specific message for empty request body for multipart mime requests
2012-12-14 10:42:58 +11:00
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
0ff769e633
Introduced HttpCookieStore.Empty to disable cookies in HttpClient and in the websocket client.
2012-12-12 18:35:10 +01:00
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
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
11d7617298
Including hashcode in BufferUtils.toDetailString()
2012-12-10 09:23:18 -07:00
6f098dd69c
jetty-9 use DateCache timer to set Date header once per second
2012-12-10 12:58:14 +11:00
979d6dbbf9
367638 throw exception for excess form keys
2012-12-08 10:05:32 +11:00
a20d984d30
jetty-9 Added Trie for cached string lookup. HttpFields does not use StringMap
2012-12-08 01:41:00 +11:00
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
7c0f7cc8f4
Fixing for JDK5.
2012-12-03 12:55:37 -07:00
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
d269015c7d
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2012-11-30 09:09:22 +11:00
cfa1c1e2e4
395394 allow logging from boot classloader
2012-11-30 07:56:38 +11:00
62ebbbac3c
Making test more reliable on non-US machines
2012-11-29 10:23:20 -07:00
916097f787
Validating that URIUtil.decodePath() can handle null characters
2012-11-29 10:20:41 -07:00
2d97e5b0ca
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2012-11-29 17:18:51 +11:00
2723c415bf
395215 Multipart mime with just LF and no CRLF
2012-11-29 16:48:21 +11:00
9f5801c3fd
395215 Multipart mime with just LF and no CRLF
2012-11-29 15:57:16 +11:00
d78ec063ee
395220 New InputStream extension to allow a mix of EOL styles between headers and content
2012-11-29 13:40:25 +11:00
249068551f
395220 New InputStream extension to allow a mix of EOL styles between headers and content
2012-11-29 13:29:24 +11:00
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
ba8057867e
Merge remote-tracking branch 'origin/jetty-8'
2012-11-23 15:04:20 +11:00
8241089364
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2012-11-23 14:45:34 +11:00
769260f251
392417 Prevent Cookie parsing interpreting unicode chars
2012-11-23 12:29:53 +11:00
9edac367c8
394854 optimised promise implementation
2012-11-23 12:18:52 +11:00
7737dc8c76
394854 Implemented Promise
2012-11-23 12:18:51 +11:00
4befd6395b
Merge remote-tracking branch 'origin/jetty-8'
2012-11-22 12:08:42 +11:00
4cf77cea31
394839 Allow multipart mime with no boundary
2012-11-22 09:55:12 +11:00
1dc3fcaf9b
394671 Fix setting loglevel on commandline, organize import, fix javadoc
2012-11-20 17:56:37 +01:00
a5df0ab456
Updated jetty-spring module.
2012-11-20 17:42:45 +01:00
9044819085
394671: Fix setting loglevel on commandline via -Dorg.eclipse.jetty.LEVEL=DEBUG
2012-11-20 16:21:42 +01:00
b5c6555a4a
392237 Improved handling of SPDY async send
2012-11-16 10:45:08 +11:00
6aa01d4517
394357 Make JarResource constructors protected
2012-11-15 17:20:55 +11:00
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
ba40f7897d
Completed port of ConnectHandler and ProxyServlet implementations.
2012-11-13 15:35:51 +01:00
9abc3988fb
B64 coding and decoding now throws the unchecked UnsupportedCharsetException
...
rather than the checked UnsupportedEncodingException.
2012-11-13 11:29:54 +01:00
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
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
0f60eb751d
393947 additional tests
2012-11-11 10:25:10 +11:00
75aedbbf45
393947 implement ETags and update gzip filter to handle them
2012-11-11 09:52:26 +11:00
8e47864bcf
392850 ContextLoaderListener not called in 9.0.0.M1 and M2
2012-11-08 14:02:35 +11:00
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
55de6fc6e4
add import for Locale
2012-11-05 11:31:11 -06:00
0c84eefdcc
Rename AggregateLifeCycle to ContainerLifeCycle in javadoc
2012-11-05 12:16:39 +11:00
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
e076e8a8f0
393363 Use Locale.ENGLISH for all toUpperCase and toLowerCase calls
2012-11-02 13:19:07 +11:00
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
65202e9abe
393363 Use Locale.ENGLISH for all toUpperCase and toLowerCase calls
2012-11-02 11:55:00 +11:00
61c607076a
Mux interrim work.
2012-10-30 16:17:03 -07:00
61ba84bda5
Added toString().
2012-10-26 14:57:06 +02:00
31b77d9ade
Cleaned up implementation.
2012-10-26 14:57:06 +02:00
bf7a0ace22
392237 Added BlockingCallback optimisation
2012-10-25 22:36:13 +11:00
3e07bccb71
Adding another UTF8 High Surrogate test
2012-10-19 11:18:06 -07:00
a1d559e863
Attempting to get a grip on possible \ud807 UTF8 decoding as reported by W3C websocket working group
2012-10-19 11:15:19 -07:00
2b13648b0e
392237 fixed many TODOs and many minor code cleanups
2012-10-19 16:17:30 +11:00
f420f5016d
392237 Implemented HttpOutput.sendContent for large content
2012-10-19 10:16:30 +11:00
b618ce59e3
392304 fixed intermittent client SSL failure. Correctly compact in flip2fill
2012-10-18 19:55:57 +11:00
dd651b0d9f
Expose more stuff via jmx like threadpool details, connector details, etc.
...
Enhance start.ini documentation for spdy.
2012-10-17 13:37:34 +02:00
f5d3fec4f8
jetty-9 removed context deployer and merged context and webapps directory
2012-10-15 22:05:33 +11:00
fac580c374
Merge remote-tracking branch 'origin/jetty-8' into jetty-9
...
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-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/src/main/java/org/eclipse/jetty/ajp/Ajp13Generator.java
jetty-annotations/pom.xml
jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AbstractDiscoverableAnnotationHandler.java
jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationConfiguration.java
jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java
jetty-annotations/src/main/java/org/eclipse/jetty/annotations/ServletContainerInitializerListener.java
jetty-annotations/src/main/java/org/eclipse/jetty/annotations/ServletSecurityAnnotationHandler.java
jetty-annotations/src/main/java/org/eclipse/jetty/annotations/WebServletAnnotation.java
jetty-annotations/src/main/java/org/eclipse/jetty/annotations/WebServletAnnotationHandler.java
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-http/src/main/java/org/eclipse/jetty/http/Generator.java
jetty-http/src/main/java/org/eclipse/jetty/http/HttpFields.java
jetty-http/src/main/java/org/eclipse/jetty/http/HttpGenerator.java
jetty-http/src/main/java/org/eclipse/jetty/http/HttpURI.java
jetty-http/src/main/java/org/eclipse/jetty/http/MimeTypes.java
jetty-http/src/test/java/org/eclipse/jetty/http/HttpFieldsTest.java
jetty-io/pom.xml
jetty-io/src/main/java/org/eclipse/jetty/io/AbstractBuffer.java
jetty-io/src/main/java/org/eclipse/jetty/io/Buffer.java
jetty-io/src/main/java/org/eclipse/jetty/io/BufferUtil.java
jetty-jaspi/pom.xml
jetty-jmx/pom.xml
jetty-jndi/pom.xml
jetty-jndi/src/main/java/org/eclipse/jetty/jndi/ContextFactory.java
jetty-jndi/src/test/java/org/eclipse/jetty/jndi/java/TestJNDI.java
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-boot/src/main/java/org/eclipse/jetty/osgi/boot/OSGiDeployer.java
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-runner/pom.xml
jetty-security/pom.xml
jetty-security/src/main/java/org/eclipse/jetty/security/ConstraintSecurityHandler.java
jetty-security/src/main/java/org/eclipse/jetty/security/authentication/FormAuthenticator.java
jetty-security/src/main/java/org/eclipse/jetty/security/authentication/LoginAuthenticator.java
jetty-security/src/test/java/org/eclipse/jetty/security/ConstraintTest.java
jetty-server/pom.xml
jetty-server/src/main/java/org/eclipse/jetty/server/AbstractHttpConnection.java
jetty-server/src/main/java/org/eclipse/jetty/server/AsyncHttpConnection.java
jetty-server/src/main/java/org/eclipse/jetty/server/HttpInput.java
jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
jetty-server/src/main/java/org/eclipse/jetty/server/Request.java
jetty-server/src/main/java/org/eclipse/jetty/server/Response.java
jetty-server/src/main/java/org/eclipse/jetty/server/bio/SocketConnector.java
jetty-server/src/main/java/org/eclipse/jetty/server/session/SessionHandler.java
jetty-server/src/test/java/org/eclipse/jetty/server/HttpServerTestBase.java
jetty-server/src/test/java/org/eclipse/jetty/server/HttpURITest.java
jetty-server/src/test/java/org/eclipse/jetty/server/ResponseTest.java
jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SelectChannelServerSslTest.java
jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SslSocketServerTest.java
jetty-server/src/test/resources/jetty-logging.properties
jetty-servlet/pom.xml
jetty-servlet/src/main/java/org/eclipse/jetty/servlet/DefaultServlet.java
jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletContextHandler.java
jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHolder.java
jetty-servlet/src/test/java/org/eclipse/jetty/servlet/DispatcherTest.java
jetty-servlets/pom.xml
jetty-servlets/src/main/java/org/eclipse/jetty/servlets/GzipFilter.java
jetty-servlets/src/main/java/org/eclipse/jetty/servlets/MultiPartFilter.java
jetty-servlets/src/test/java/org/eclipse/jetty/servlets/MultipartFilterTest.java
jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/GzipTester.java
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-jetty-http/src/main/java/org/eclipse/jetty/spdy/http/ServerHTTPSPDYAsyncConnection.java
jetty-start/pom.xml
jetty-start/src/test/java/org/eclipse/jetty/start/CommandLineBuilderTest.java
jetty-start/src/test/java/org/eclipse/jetty/start/MainTest.java
jetty-util-ajax/pom.xml
jetty-util/pom.xml
jetty-util/src/main/java/org/eclipse/jetty/util/MultiPartInputStream.java
jetty-util/src/main/java/org/eclipse/jetty/util/log/StdErrLog.java
jetty-util/src/test/java/org/eclipse/jetty/util/MultiPartInputStreamTest.java
jetty-webapp/pom.xml
jetty-webapp/src/main/java/org/eclipse/jetty/webapp/StandardDescriptorProcessor.java
jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java
jetty-websocket/pom.xml
jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketServletRFCTest.java
jetty-websocket/src/test/java/org/eclipse/jetty/websocket/helper/MessageSender.java
jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/UnitGenerator.java
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
test-jetty-webapp/src/main/webapp/WEB-INF/web.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-10-12 21:19:21 +11:00
31807b7892
391188 Files written with Request.getPart().write(filename) should not be auto-deleted
2012-10-08 11:09:41 +11:00
36a2ed10be
391080 Multipart temp files can be left on disk from Request.getPart and getParts
2012-10-04 18:31:09 +10:00
25cdef966c
391080 Multipart temp files can be left on disk with MultiPartFilter
2012-10-04 15:24:23 +10:00
23fe83a689
391082 No exception if multipart input stream incomplete
2012-10-04 14:51:13 +10:00
6cc0734a1a
jetty-9 miscillaneous optimizations: donot dispatch to HTTP and SPDY; improved executorCallback
2012-10-02 13:48:51 -07:00
156e33bd23
Merge remote-tracking branch 'origin/master' into jetty-8
2012-09-28 18:47:33 +10:00
9ee8ef7423
jetty-9 more lifecycle fixes
2012-09-21 18:00:46 +10:00
879cdf4b82
jetty-9 further lifecycle improvements
2012-09-21 16:17:00 +10:00
68ee346b8a
jetty-9 combined the Container and AggregateLifeCycle into ContainerLifeCycle
2012-09-21 11:45:51 +10:00
af233a8a37
389686 Fix reference to org.eclipse.jetty.util.log.stderr.LONG system property in javadoc for StdErrLog
2012-09-21 11:25:58 +10:00
37a7e5977d
Merged branch 'jetty-9' into jetty-9-open-close.
2012-09-20 18:46:16 +02:00
40382bad3a
jetty-9 - Removed references to JUnit 3.x.
2012-09-20 18:23:02 +02:00
df699cde27
jetty-9 - Cleanup and JDK7-ification.
2012-09-20 17:48:05 +02:00
0d2627b6e9
jetty-9 improved onOpen onclose handling
2012-09-20 11:05:20 +10:00
0915b2b0ab
jetty-9 - Refactored code that was counting the number of reentrant invocations into a common utility class, ForkInvoker.
2012-09-17 14:39:13 +02:00
129583679a
jetty-9 javadoc improvements and renamed SelectChannelConnector to ServerConnector
2012-09-17 17:37:56 +10:00
b3381b4996
jetty-9 QueuedThreadPool creates new threads when idleThreads goes to 0
2012-09-17 17:36:48 +10:00
859d4a09d3
Fixing test expectations
2012-09-14 14:47:27 -07:00
ae9b32ba57
jetty-9 - Avoid to print one last empty line after each collection, since they are already separated by indentation.
2012-09-14 23:30:21 +02:00
9940796a32
jetty-9 xml configurations
2012-09-13 14:43:03 +10:00
73ebe89019
jetty-9 refactored configuration
2012-09-10 20:26:14 +10:00
67670c22bd
jetty-9 - Removed debug code.
2012-09-07 12:05:48 +02:00
3ba074ecc8
Adding .STACKS=(boolean) support to StdErrLog configuration
2012-09-06 12:33:38 -07:00
d8ed9116f1
jetty-9 - Moved SPDY's Headers class to jetty-util module as Fields.
2012-09-06 13:22:04 +02:00
1c306ad89c
Jetty9 - Removed code duplication for calculating the jetty version.
2012-09-06 09:16:34 +02:00
7231c82b69
Merged branch 'jetty-9' into jetty-9-client.
2012-09-06 08:41:48 +02:00
2dfcebfc04
jetty-9 distribution working
2012-09-06 14:54:55 +10:00
0b3865d749
jetty-9 removed unused schedulers
2012-09-06 09:12:31 +10:00
bdb75b9881
jetty-9 jetty-util remove plugin.xml from assembly
2012-09-05 10:43:30 +02:00
b18ab0e76a
Jetty9 - First take at HTTP client implementation.
2012-09-04 19:20:29 +02:00
0b77a69571
Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-plugin
2012-09-04 12:10:56 +02:00
694a07dac6
jetty-9 jetty-plugins now uses zip instead of jar files. Local maven repository is now being read and found located by settings.xml or default location. small improvements
2012-09-04 12:03:37 +02:00
6d2c793edc
Merge branch 'master' into jetty-8
2012-09-03 12:48:21 -05:00
4fce4d0e53
jetty-9 ConcurrentScheduler refinements
2012-09-03 17:46:11 +10:00
3f3b269cca
jetty-9 ConcurrentScheduler refinements
2012-09-03 15:32:44 +10:00
e29e55ffcc
jetty-9 ConcurrentScheduler refinements
2012-09-03 15:29:01 +10:00
c3776764f4
jetty-9 ConcurrentScheduler refinements
2012-09-03 15:24:36 +10:00
bb3dcc1c5b
jetty-9 eased scheduler test
2012-09-01 07:10:42 +10:00
d18fcc05e3
Jetty9 - Added copyright header.
2012-08-31 12:17:08 +02:00
fd5776cf86
jetty-9 improved comments
2012-08-31 17:53:18 +10:00
da82238d6b
improved efficiency
2012-08-31 17:19:47 +10:00
83dbca6553
jetty-9 reworked the schedulers
2012-08-31 13:22:58 +10:00
4de5b0ad63
Merged branch 'jetty-9' into jetty-9-client.
2012-08-30 17:24:49 +02:00
8fbe6c59d5
jetty-9 merge
2012-08-29 17:27:26 +02:00
acb89e0d2f
Jetty9 - Added copyright header.
2012-08-28 21:55:44 +02:00
d8b287134f
jetty-9 improved range request processing and tests
2012-08-27 12:17:40 +10:00
cb5dd493fb
jetty-9 merged jetty-9-aggregation
2012-08-27 10:24:34 +10:00
1d654a08cf
jetty-9 restructured graceful shutdown
2012-08-24 20:16:23 +10:00
06b2de17d5
Merge branch 'jetty-9-aggregation' into jetty-9-spdy-http
2012-08-24 11:52:29 +02:00
c707ba11d1
jetty-9 improved SSL shutdown input
2012-08-24 17:56:22 +10:00
fac03a306b
jetty-9 more server test fixes
2012-08-24 16:53:36 +10:00
d59a47d376
jetty-9 simplified error handling
2012-08-23 17:32:10 +10:00
325bfc290d
jetty-9 work in progress on moving aggregation out of HttpChannel
2012-08-20 20:43:10 +10:00
2900b4df02
jetty-9 some post merge fixes
2012-08-18 10:37:09 +10: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
086e74bed8
jetty-9 merged jetty-8
...
Merge remote-tracking branch 'origin/jetty-8' into jetty-9
Conflicts:
jetty-security/src/main/java/org/eclipse/jetty/security/authentication/FormAuthenticator.java
jetty-server/src/main/java/org/eclipse/jetty/server/AbstractHttpConnection.java
jetty-server/src/test/java/org/eclipse/jetty/server/HttpConnectionTest.java
jetty-util/src/main/java/org/eclipse/jetty/util/log/StdErrLog.java
jetty-util/src/main/java/org/eclipse/jetty/util/resource/JarFileResource.java
jetty-util/src/test/java/org/eclipse/jetty/util/log/StdErrLogTest.java
2012-08-17 23:35:42 +10:00
7c94fd5f3c
jetty-9 removed HttpParser.isPersistent
2012-08-17 22:06:55 +10:00
00ed549898
standardize license header blocks
2012-08-16 19:11:27 -05:00
c82871b10f
Merge branch 'master' into jetty-8
2012-08-16 17:10:35 -05:00
2d9c4e823c
migrate jetty-webapp to jmx annotations
2012-08-15 13:49:07 -05:00
c92ce4bd1e
jetty-servlets migration to jmx annotations
2012-08-15 13:33:05 -05:00
ffd86fd21b
Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9
2012-08-15 09:32:32 -07:00
4013c750c3
Adding Utf8LineParser from websocket-client to jetty-util as it should be generally useful for others
2012-08-15 09:32:24 -07:00
4de94e00d5
the old context and webapp deployer were smoked and removing the node attribute from the deployment manager since the Node's are not jmx objects themselves and are not converted
2012-08-14 17:14:40 -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
aae7c4da68
removed managed=true from ManagedOperation and ManagedAttribute
2012-08-13 17:19:59 -05:00
11dbce81c8
wire up way to remove the need for managed=true on ManagedAttribute
2012-08-13 16:48:52 -05:00
c84b496330
jetty-9 more work on stop/close. Turned on statistics all of the time, but still not enough. more work needed.
2012-08-12 11:24:24 +10:00
01f4bb2623
Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9
2012-08-11 11:40:48 -05:00
86daeab0ca
Remove Managed annotation and convert the context handler over to the new usage
2012-08-11 11:40:32 -05:00
488f53f8d6
jetty-9 cleaned up the stop and stopTimeout handlng
2012-08-11 12:51:32 +10:00
608e74b9bf
add note to readonly annotation element
2012-08-10 17:26:38 -05:00
752a2e7d64
more annotation jmx jiggering
2012-08-10 17:23:59 -05:00
d922013313
Merge branch 'multimap-ng' into jetty-9
2012-08-10 15:13:07 -07:00
b8de9a35a4
[multimap-ng] moving UrlEncoded over and fixing various other failing tests
2012-08-10 14:42:35 -07:00
6d3d7b0df8
[Bug 380924] xmlconfiguration <Configure and <New supports named constructors, including dynamic ordering of parameters
2012-08-10 15:44:08 -05:00
dfebb117b7
[multimap-ng] step 2, make MultiMap a generic, and remove LazyList use
2012-08-10 12:46:30 -07:00
74490580da
Merge branch 'jetty-9' into multimap-ng
2012-08-10 11:32:42 -07:00
da0e5a1ef6
[multimap-ng] step 1, make MultiMap participate as a full fledged member of the Collections framework
2012-08-10 10:25:10 -07:00
c3dfd0c653
Jetty9 - Set stopTimeout to zero by default, and setting defaults for threaded component that need a non-zero stop timeout to stop properly.
2012-08-10 19:02:16 +02:00
136f7924fd
Jetty9 - Refactored usage of components that were using custom stop timeout to use the get/setStopTimeout() methods inherited from AbstractLifeCycle.
2012-08-10 19:02:16 +02:00
f92ebea9f0
updates to managed attribute, tests, objectmbean impl and a note to improve id as viewed in jconsole
2012-08-10 10:29:09 -05:00
99d001503f
Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9
2012-08-10 05:51:23 -07:00
703cf000fe
Fixing bad UTF8 test assumption
2012-08-10 05:51:17 -07:00
6039e8ea23
jetty-9 fixed stderrlog test
2012-08-10 22:37:02 +10:00
598292172f
Jetty9 - Code cleanup, renaming methods to be more expressive.
2012-08-10 10:29:14 +02:00
6dbef17e44
377055 Prevent webapp classloader leaks
...
Use the passed in classloader as an arg to Class.forName, even though the classloader is set in AbstractPreventer as the context classloader.
2012-08-10 17:48:03 +10:00
16b404754e
jetty-9 improved logging
2012-08-10 13:31:11 +10:00
3d029695ec
Replacing with optional Collections
2012-08-09 14:52:18 -07:00
0b4d2e6a0f
377055 Prevent webapp classloader leaks
2012-08-09 10:23:00 +10:00
0f4fe634a3
Adding UTF8 fast fail test case that doesn't fail as expected on the websocket side
2012-08-08 14:59:50 -07:00
689daf092d
ported websocketchat to new API
2012-08-08 14:56:47 +10:00
32c5f6c093
jetty-9 reduced LazyList usage
2012-08-08 11:58:50 +10:00
28bc479417
Verifying that fast-fail on utf8 works
2012-08-07 12:16:49 -07:00
5a77c0801a
Adding support for Utf8Appendable.append(ByteBuffer)
2012-08-07 09:53:15 -07:00
75c2b57f25
Jetty9 - Introduced configure_9_0.dtd to support constructor injection for the <Configure> element.
...
Also refactored, simplified, and moved to JDK 7 XmlConfiguration code.
2012-08-06 23:12:01 +02:00
b0041287a6
Jetty9 - Cleaned up implementation and removed warning when a bean is non managed and not started.
...
An example of such beans is the Connection.Statistics implementation.
2012-08-06 16:21:07 +02: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
c0dd05683b
Merge remote-tracking branch 'origin/master' into jetty-8
2012-08-03 17:25:24 +10:00
29833f000b
Merge branch 'jetty-9' into jetty-9-oneconnector
...
Conflicts:
jetty-io/src/main/java/org/eclipse/jetty/io/AsyncByteArrayEndPoint.java
jetty-io/src/main/java/org/eclipse/jetty/io/ChannelEndPoint.java
jetty-io/src/main/java/org/eclipse/jetty/io/WriteFlusher.java
jetty-io/src/main/java/org/eclipse/jetty/io/ssl/SslConnection.java
jetty-io/src/test/java/org/eclipse/jetty/io/WriteFlusherTest.java
2012-08-03 12:39:21 +10:00
88cc3bfdc6
Merge branch 'writeFlusher_refactoring' into jetty-9
2012-08-03 01:07:20 +02:00
5e6cd1b27f
Merge branch 'jetty-9' into jetty-9-oneconnector
...
Conflicts:
jetty-jmx/src/main/java/org/eclipse/jetty/jmx/ObjectMBean.java
jetty-jmx/src/test/java/org/eclipse/jetty/jmx/ObjectMBeanTest.java
2012-08-03 08:48:34 +10:00
962a0d0889
jetty-9 ensure injected threadpool is managed
2012-08-03 08:44:49 +10:00
57f16d750d
Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9
2012-08-02 15:25:33 -07:00
8366ae08c9
Merge branch 'jetty-9' into jetty-9-oneconnector
...
Conflicts:
jetty-jmx/src/test/java/org/eclipse/jetty/jmx/ObjectMBeanTest.java
2012-08-03 07:49:24 +10:00
373526f8ca
proxied and managed methods are working with annotations, converted impl and test to use the 3 annotations in place of @Managed
2012-08-02 16:34:00 -05:00
01c40b5290
Fixing Parsing of masking bytes on slow testcase (would read in reverse order under certain conditions)
2012-08-02 10:31:37 -07:00
a4018d3484
merge with jetty-9
2012-08-02 15:00:43 +02:00
4e94601619
jetty-9: Make WriteFlusher threadsafe.
2012-08-02 14:38:54 +02:00
b63e09df61
jetty-9 rudimentary connectionFactory impl
2012-08-02 17:44:29 +10:00
b52930be14
jetty-9 merged Async and non-Async classes for EndPoint and Connection
2012-08-02 16:08:49 +10:00
96b5c05674
jetty-9 one connector passing most tests
2012-08-02 11:51:54 +10:00
d6ef039f2c
Merge branch 'jetty-9' into jetty-9-oneconnector
2012-08-02 08:15:19 +10:00
56a2cedaa5
jetty-9 further work on oneconnector... passing more tests
2012-08-02 08:14:02 +10:00
2a470631bf
Merge branch 'jetty-9' into jetty-9-oneconnector
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/ssl/SslSelectChannelConnector.java
2012-08-02 08:11:12 +10:00
9e332c9255
Fixing StdErrLogTest failures introduced by latest thread id addition
2012-08-01 15:10:32 -07:00
2f4c86be35
Making Utf8StringBuilder actually throw a NotUtf8Exception in the case of an incomplete UTF8 sequence
2012-08-01 12:58:32 -07:00
08a8260978
Jetty9 - Added the thread id to the log statement tag.
2012-07-31 16:18:42 +02:00
4d889de159
347130 Empty getResourcePaths due to ZipFileClosedException
2012-07-31 18:31:53 +10:00
039499d610
Merge branch 'jetty-9' into jetty-9-oneconnector
2012-07-28 08:26:00 +10:00
99bffa6ce0
Making QTP debug/info message conform to stack-trace & logging output rules to make debugging easier
2012-07-27 09:33:10 -07:00
fbcb14f297
jetty-9 merge with jetty-8 except jetty-osgi
2012-07-27 15:50:23 +02:00
7bee81fa82
jetty-9 factoring out HTTP dependencies from connectors
2012-07-27 20:37:42 +10:00
c7c4c6e13b
379207 backported fixes from jetty-9 to make hierarchy work
2012-07-27 15:45:12 +10:00
beaa87e3d2
Log & StdErrLog updates.
...
+ Removed deprecatd Log methods related to anonymous logging.
+ Added StdErrLog.LEVEL_OFF (and related properties *.LEVEL=OFF support)
2012-07-26 10:19:23 -07:00
cdbec2c78b
Merge remote-tracking branch 'origin/master' into jetty-8
2012-07-26 19:05:51 +10:00
b8a68b17ca
385925: make SslContextFactory.setProtocols and SslContextFactory.setCipherSuites preserve the order of the given parameters
2012-07-25 20:14:04 +02:00
e25ff279ae
some initial swizzle for mbean influence and improvement of unit test
2012-07-23 16:35:00 -05:00
88e2f3915d
add proposed annotations to replace soupy Managed annotation
2012-07-23 15:48:07 -05:00
d6261cb714
fix attribute issue when not assocated with fields
2012-07-23 14:48:39 -05:00
e987e954b0
some additional javadoc
2012-07-23 13:57:33 -05:00
cf9166164e
initial implementation using annotations to discover mbean property information
2012-07-23 13:46:34 -05:00
5a182c6a9d
added jetty logging properties for jetty-jmx and fleshed out the ObjectMBeanTest since it wasn't really implemented previously
2012-07-23 10:26:29 -05:00
100b5fb6cb
move @Name to annotation package and change @Managed to drop PARAMETER
2012-07-23 09:44:41 -05:00
ab298e511e
jetty-9 unit test cleanups
2012-07-23 17:11:59 +10:00
8101b67ce8
jetty-9 lots of code cleanups from findbugs, warnings and TODOs
2012-07-23 14:08:35 +10:00
f8ca13c3b3
Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9
2012-07-20 15:38:57 -05:00
07757a8cbb
[Bug 385448] @Managed annotation and example usage in the ContextHandler
2012-07-20 15:20:05 -05:00
cefc9ddc94
Rolling in @Slow into jetty-util
2012-07-20 11:49:15 -07:00
73883fbb29
jetty-9 extra files from last commit
2012-07-20 19:16:20 +10:00
b2a38ac3fc
jetty-9 clean jetty-util tests
2012-07-20 16:59:10 +10:00
154a926b1b
jetty-9 merge from jetty-8. Mostly compiling but some tests still failing.
...
Merge remote-tracking branch 'origin/jetty-8' into jetty-9
Conflicts:
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-http/src/main/java/org/eclipse/jetty/http/HttpContent.java
jetty-http/src/main/java/org/eclipse/jetty/http/HttpFields.java
jetty-http/src/main/java/org/eclipse/jetty/http/HttpGenerator.java
jetty-http/src/main/java/org/eclipse/jetty/http/HttpParser.java
jetty-http/src/main/java/org/eclipse/jetty/http/gzip/CompressedResponseWrapper.java
jetty-http/src/main/java/org/eclipse/jetty/http/gzip/GzipStream.java
jetty-http/src/test/java/org/eclipse/jetty/http/HttpFieldsTest.java
jetty-http/src/test/java/org/eclipse/jetty/http/HttpGeneratorClientTest.java
jetty-io/pom.xml
jetty-io/src/main/java/org/eclipse/jetty/io/AbstractBuffers.java
jetty-io/src/main/java/org/eclipse/jetty/io/AbstractConnection.java
jetty-io/src/main/java/org/eclipse/jetty/io/AsyncEndPoint.java
jetty-io/src/main/java/org/eclipse/jetty/io/Buffer.java
jetty-io/src/main/java/org/eclipse/jetty/io/BuffersFactory.java
jetty-io/src/main/java/org/eclipse/jetty/io/ByteArrayBuffer.java
jetty-io/src/main/java/org/eclipse/jetty/io/ByteArrayEndPoint.java
jetty-io/src/main/java/org/eclipse/jetty/io/ConnectedEndPoint.java
jetty-io/src/main/java/org/eclipse/jetty/io/Connection.java
jetty-io/src/main/java/org/eclipse/jetty/io/PooledBuffers.java
jetty-io/src/main/java/org/eclipse/jetty/io/bio/StreamEndPoint.java
jetty-io/src/main/java/org/eclipse/jetty/io/bio/StringEndPoint.java
jetty-io/src/main/java/org/eclipse/jetty/io/nio/ChannelEndPoint.java
jetty-io/src/main/java/org/eclipse/jetty/io/nio/SelectChannelEndPoint.java
jetty-io/src/main/java/org/eclipse/jetty/io/nio/SelectorManager.java
jetty-io/src/main/java/org/eclipse/jetty/io/nio/SslConnection.java
jetty-io/src/test/java/org/eclipse/jetty/io/ChannelEndPointTest.java
jetty-io/src/test/java/org/eclipse/jetty/io/bio/SocketEndPointTest.java
jetty-io/src/test/java/org/eclipse/jetty/io/nio/SelectChannelEndPointSslTest.java
jetty-io/src/test/java/org/eclipse/jetty/io/nio/SelectChannelEndPointTest.java
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/pom.xml
jetty-overlay-deployer/pom.xml
jetty-plus/pom.xml
jetty-policy/pom.xml
jetty-proxy/src/test/java/org/eclipse/jetty/proxy/ProxyServletTest.java
jetty-rewrite/pom.xml
jetty-security/pom.xml
jetty-server/pom.xml
jetty-server/src/main/java/org/eclipse/jetty/server/AbstractConnector.java
jetty-server/src/main/java/org/eclipse/jetty/server/AbstractHttpConnection.java
jetty-server/src/main/java/org/eclipse/jetty/server/AsyncHttpConnection.java
jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannelState.java
jetty-server/src/main/java/org/eclipse/jetty/server/Request.java
jetty-server/src/main/java/org/eclipse/jetty/server/Response.java
jetty-server/src/main/java/org/eclipse/jetty/server/Server.java
jetty-server/src/main/java/org/eclipse/jetty/server/handler/ConnectHandler.java
jetty-server/src/main/java/org/eclipse/jetty/server/handler/GzipHandler.java
jetty-server/src/main/java/org/eclipse/jetty/server/nio/SelectChannelConnector.java
jetty-server/src/test/java/org/eclipse/jetty/server/HttpServerTestBase.java
jetty-server/src/test/java/org/eclipse/jetty/server/LocalAsyncContextTest.java
jetty-server/src/test/java/org/eclipse/jetty/server/RequestTest.java
jetty-server/src/test/java/org/eclipse/jetty/server/ResponseTest.java
jetty-server/src/test/java/org/eclipse/jetty/server/SuspendHandler.java
jetty-server/src/test/java/org/eclipse/jetty/server/handler/ConnectHandlerTest.java
jetty-server/src/test/java/org/eclipse/jetty/server/session/SessionHandlerTest.java
jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SSLCloseTest.java
jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SSLEngineTest.java
jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SslSocketServerTest.java
jetty-servlet/pom.xml
jetty-servlet/src/main/java/org/eclipse/jetty/servlet/DefaultServlet.java
jetty-servlets/pom.xml
jetty-servlets/src/main/java/org/eclipse/jetty/servlets/GzipFilter.java
jetty-servlets/src/test/java/org/eclipse/jetty/servlets/IncludableGzipFilterTest.java
jetty-servlets/src/test/java/org/eclipse/jetty/servlets/MultipartFilterTest.java
jetty-spdy/pom.xml
jetty-spdy/spdy-core/pom.xml
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/CompressionDictionary.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/CompressionFactory.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/Controller.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/ISession.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/IStream.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/IdleListener.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/Promise.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/PushSynInfo.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/SessionException.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/StandardCompressionFactory.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/StandardSession.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/StandardStream.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/StreamException.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/ByteBufferDataInfo.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/BytesDataInfo.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/DataInfo.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/GoAwayInfo.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/Headers.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/HeadersInfo.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/PingInfo.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/ReplyInfo.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/RstInfo.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/SPDY.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/SPDYException.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/Session.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/SessionFrameListener.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/SessionStatus.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/Settings.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/SettingsInfo.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/Stream.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/StreamFrameListener.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/StreamStatus.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/StringDataInfo.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/SynInfo.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/server/ServerSessionFrameListener.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/ControlFrame.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/ControlFrameType.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/DataFrame.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/GoAwayFrame.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/HeadersFrame.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/NoOpFrame.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/PingFrame.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/RstStreamFrame.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/SettingsFrame.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/SynReplyFrame.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/SynStreamFrame.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/WindowUpdateFrame.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/ControlFrameGenerator.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/DataFrameGenerator.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/Generator.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/GoAwayGenerator.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/generator/HeadersGenerator.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/NoOpGenerator.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/PingGenerator.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/RstStreamGenerator.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/SettingsGenerator.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/SynReplyGenerator.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/SynStreamGenerator.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/WindowUpdateGenerator.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/ControlFrameBodyParser.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/ControlFrameParser.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/DataFrameParser.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/GoAwayBodyParser.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/HeadersBlockParser.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/HeadersBodyParser.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/NoOpBodyParser.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/Parser.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/PingBodyParser.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/RstStreamBodyParser.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/SettingsBodyParser.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/SynReplyBodyParser.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/SynStreamBodyParser.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/UnknownControlFrameBodyParser.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/WindowUpdateBodyParser.java
jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/AsyncTimeoutTest.java
jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/StandardSessionTest.java
jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/StandardStreamTest.java
jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/api/ClientUsageTest.java
jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/api/ServerUsageTest.java
jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/frames/DataGenerateParseTest.java
jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/frames/GoAwayGenerateParseTest.java
jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/frames/HeadersGenerateParseTest.java
jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/frames/NoOpGenerateParseTest.java
jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/frames/PingGenerateParseTest.java
jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/frames/RstStreamGenerateParseTest.java
jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/frames/SettingsGenerateParseTest.java
jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/frames/SynReplyGenerateParseTest.java
jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/frames/SynStreamGenerateParseTest.java
jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/frames/TestSPDYParserListener.java
jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/frames/WindowUpdateGenerateParseTest.java
jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/parser/LiveChromiumRequestParserTest.java
jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/parser/ParseVersusCacheBenchmarkTest.java
jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/parser/UnknownControlFrameTest.java
jetty-spdy/spdy-jetty-http-webapp/pom.xml
jetty-spdy/spdy-jetty-http-webapp/src/main/config/etc/jetty-spdy.xml
jetty-spdy/spdy-jetty-http/pom.xml
jetty-spdy/spdy-jetty-http/src/main/java/org/eclipse/jetty/spdy/http/HTTPSPDYServerConnector.java
jetty-spdy/spdy-jetty-http/src/main/java/org/eclipse/jetty/spdy/http/PushStrategy.java
jetty-spdy/spdy-jetty-http/src/main/java/org/eclipse/jetty/spdy/http/ReferrerPushStrategy.java
jetty-spdy/spdy-jetty-http/src/main/java/org/eclipse/jetty/spdy/http/ServerHTTPAsyncConnectionFactory.java
jetty-spdy/spdy-jetty-http/src/main/java/org/eclipse/jetty/spdy/http/ServerHTTPSPDYAsyncConnection.java
jetty-spdy/spdy-jetty-http/src/main/java/org/eclipse/jetty/spdy/http/ServerHTTPSPDYAsyncConnectionFactory.java
jetty-spdy/spdy-jetty-http/src/test/java/org/eclipse/jetty/spdy/http/AbstractHTTPSPDYTest.java
jetty-spdy/spdy-jetty-http/src/test/java/org/eclipse/jetty/spdy/http/ConcurrentStreamsTest.java
jetty-spdy/spdy-jetty-http/src/test/java/org/eclipse/jetty/spdy/http/ProtocolNegotiationTest.java
jetty-spdy/spdy-jetty/pom.xml
jetty-spdy/spdy-jetty/src/main/java/org/eclipse/jetty/spdy/AsyncConnectionFactory.java
jetty-spdy/spdy-jetty/src/main/java/org/eclipse/jetty/spdy/EmptyAsyncConnection.java
jetty-spdy/spdy-jetty/src/main/java/org/eclipse/jetty/spdy/EmptyAsyncEndPoint.java
jetty-spdy/spdy-jetty/src/main/java/org/eclipse/jetty/spdy/SPDYAsyncConnection.java
jetty-spdy/spdy-jetty/src/main/java/org/eclipse/jetty/spdy/SPDYClient.java
jetty-spdy/spdy-jetty/src/main/java/org/eclipse/jetty/spdy/SPDYServerConnector.java
jetty-spdy/spdy-jetty/src/main/java/org/eclipse/jetty/spdy/ServerSPDYAsyncConnectionFactory.java
jetty-spdy/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/AbstractTest.java
jetty-spdy/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/ClosedStreamTest.java
jetty-spdy/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/FlowControlTest.java
jetty-spdy/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/GoAwayTest.java
jetty-spdy/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/HeadersTest.java
jetty-spdy/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/IdleTimeoutTest.java
jetty-spdy/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/PingTest.java
jetty-spdy/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/ProtocolViolationsTest.java
jetty-spdy/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/PushStreamTest.java
jetty-spdy/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/ResetStreamTest.java
jetty-spdy/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/SPDYClientFactoryTest.java
jetty-spdy/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/SPDYServerConnectorTest.java
jetty-spdy/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/SSLEngineLeakTest.java
jetty-spdy/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/SSLSynReplyTest.java
jetty-spdy/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/SettingsTest.java
jetty-spdy/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/SynDataReplyDataLoadTest.java
jetty-spdy/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/SynReplyTest.java
jetty-spdy/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/UnsupportedVersionTest.java
jetty-start/pom.xml
jetty-util/pom.xml
jetty-util/src/main/java/org/eclipse/jetty/util/URIUtil.java
jetty-webapp/pom.xml
jetty-websocket/pom.xml
jetty-websocket/src/main/java/org/eclipse/jetty/websocket/DeflateFrameExtension.java
jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketConnectionD00.java
jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketHandler.java
jetty-websocket/src/test/java/org/eclipse/jetty/websocket/SafariWebsocketDraft0Test.java
jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketServletRFCTest.java
jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/helper/SafariD00.java
jetty-xml/pom.xml
jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlConfiguration.java
jetty-xml/src/test/java/org/eclipse/jetty/xml/XmlConfigurationTest.java
pom.xml
test-continuation/pom.xml
test-jetty-nested/pom.xml
test-jetty-servlet/pom.xml
test-jetty-servlet/src/main/java/Jetty400Repro.java
test-jetty-servlet/src/main/java/org/eclipse/jetty/testing/HttpTester.java
test-jetty-servlet/src/test/java/org/eclipse/jetty/testing/HttpTesterTest.java
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
2012-07-20 11:07:57 +10:00
03174b55a5
Merge branch 'jetty-9' into jetty-9-client
2012-07-19 11:52:19 +02:00
85d7f9712a
Making use of ByteBuffer.wrap() instead
2012-07-18 11:35:47 -07:00
21ef1570c7
Adding BufferUtil.toBuffer(byte[]) and .toBuffer(byte[], int, int) with tests
2012-07-18 10:38:00 -07:00
f1d4d4699f
Moving tests into jetty-util/src/test/java/org/eclipse/jetty/util/BufferUtilTest.java
2012-07-18 10:32:07 -07:00
70915bb870
Intermediate commit.
2012-07-18 17:38:05 +02: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
0fa17c13b1
Merge branch 'master' into jetty-8
2012-07-11 10:10:00 -05:00
a519ecc1fb
improved SPDY dump
2012-07-03 15:31:56 +02:00
c5b7ff0fb4
Adding StringUtil.isBlank(String) and StringUtil.isNotBlank(String) with
...
tests
2012-06-26 10:45:33 -07:00
9410a8d81c
383116: fix truncated filenames for multipart file uploads containing spaces in filename
2012-06-21 16:14:47 +02:00
571b1da632
Merge branch 'master' into jetty-8
2012-06-14 15:46:59 -05:00
a4fb0201f6
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
2012-06-14 15:46:01 -05:00
c928c1be29
[Bug #377067 ] add Negotiate option for security which is an alternative for Spnego
2012-06-14 15:45:41 -05:00
7f39b8b7a4
Refactored atomic updates of max and min into utility class Atomics.
2012-06-08 09:59:36 +02:00
f94f9a066a
Further tweak to issue 381712 to ensure method of finding system classpath is extensible to cope with other environments (eg ant etc). Also pass in parent loader to Loader.getClassPath() method.
2012-06-07 14:07:39 +02:00
a7b1dd5e93
Merge remote-tracking branch 'origin/master' into jetty-8
2012-06-07 00:59:37 +02:00
3f80ec2bc2
jetty-9 lots of renaming
2012-06-06 21:35:51 +02:00
903e4cd0f2
jetty-9 many name and javadoc cleanups
2012-06-06 16:40:19 +02:00
792509d459
jetty-9 jetty-deployer passing tests
2012-06-06 15:27:56 +02:00
468d7da719
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
2012-06-06 15:02:01 +02:00
dc3c77b5f6
381712 Support all declared servlets that implement org.apache.jasper.servlet.JspServlet
2012-06-06 15:00:42 +02:00
27b6d43164
381825 leave URI params in forwarded requestURI
2012-06-06 11:19:15 +02:00
c1f3545d7c
jetty-9 passing jetty-servlet tests!!!!
2012-06-05 18:11:20 +02:00
5415517cc0
jetty-9 organize imports
2012-06-05 14:06:18 +02:00
9149a69446
Merge remote-tracking branch 'origin/master' into jetty-8
2012-06-04 13:49:25 +02:00
8bcb906883
381399 Unable to stop a jetty instance that has not finished starting
2012-06-01 19:59:55 +02:00
80ff0586a8
jetty-9 new simple SslConnection (mostly working)
2012-05-31 00:53:25 +02:00
145938cecc
jetty-9 updated more test harness
2012-05-28 09:32:12 +02:00
4473572b6d
jetty-9 more progress with RFC2616 tests
2012-05-23 18:04:50 +02:00
294150f485
jetty-9 passing timeout tests
2012-05-23 10:19:23 +02:00
ce5e5cbad2
Merge branch 'master' into jetty-8
2012-05-22 14:02:58 -05:00
32f8900040
fix broken unit test because getting the last modified time is a time zone dependent thing and we don't _all_ live in germany and italy
2012-05-22 13:57:58 -05:00
34954bc617
Merge remote-tracking branch 'origin/master' into jetty-8
2012-05-22 17:28:40 +02:00
ca2a040a39
380034 last modified times taken from JarEntry for JarFile resources
2012-05-22 15:05:29 +02:00
74e0063f3c
jetty-9 fixed error handling state
2012-05-18 09:27:26 +02:00
1c319703b9
jetty-9 converted parser to consume all
2012-05-15 16:03:07 +02:00
fcfb5d704a
jetty-9 AsyncByteArrayEndPoint test
2012-05-14 10:58:45 +02:00
4b8f6b8413
jetty-9 SelectorManager refactorings.
2012-05-11 19:30:30 +02:00
e348f2d4f5
jetty-9 progress on jetty-server
2012-05-10 12:19:16 +02:00
979dae0021
jetty-9 moved FutureCallback to jetty-util
2012-05-09 18:27:09 +02:00
2b26d2f3ee
Refactorings.
2012-05-08 19:00:40 +02:00
df8af92aeb
jetty-9 fixed compiles
2012-05-08 18:30:22 +02:00
2131a40559
Merge remote-tracking branch 'origin/master' into jetty-8
2012-05-07 13:54:30 +02:00
6e62ab9bbe
jetty-9 slow progress on SSL robustness
2012-05-04 17:59:32 +02:00
a1d8c640ce
jetty-9 removed onInputShutdown
2012-05-03 22:11:58 +02:00
60f9d7faff
jetty-9 working on ByteArrayEndPoint
2012-05-03 15:17:23 +02:00
c61497327a
jetty-9 new jetty-io NIO.2 inspired design, mostly working but more work needed on SSL
2012-05-02 17:22:55 +02:00
c7f25b0928
jetty-9 work in progress
2012-04-26 10:03:21 +10:00
66e7caea86
377259: better handle bad encodings
2012-04-25 17:34:08 +10:00
5e83df20c8
various sonar/findbug code cleanups
2012-04-25 00:00:54 +10:00
7da85a2719
377323 Request#getParts() throws ServletException when it should be throwing IllegalStateException
2012-04-24 17:25:08 +10:00
b5e9de1cd8
Merge remote-tracking branch 'origin/master' into jetty-8
2012-04-12 17:16:22 +10:00
436743e7d5
367172 Remove detection for slf4j NOPLogger
2012-04-12 17:05:55 +10:00
a565c72adb
374550: remove printStackTrace calls
2012-04-12 16:51:59 +10:00
ee2d289f63
Merge remote-tracking branch 'origin/master' into jetty-8
...
Conflicts:
jetty-npn/pom.xml
jetty-osgi/jetty-osgi-boot-jsp/META-INF/MANIFEST.MF
jetty-osgi/jetty-osgi-boot-jsp/src/main/java/org/eclipse/jetty/osgi/boot/jasper/WebappRegistrationCustomizerImpl.java
jetty-osgi/jetty-osgi-boot-jsp/src/main/java/org/eclipse/jetty/osgi/boot/jsp/FragmentActivator.java
jetty-osgi/jetty-osgi-boot-logback/META-INF/MANIFEST.MF
jetty-osgi/jetty-osgi-boot-warurl/META-INF/MANIFEST.MF
jetty-osgi/jetty-osgi-boot/META-INF/MANIFEST.MF
jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/webapp/WebBundleDeployerHelper.java
jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/webapp/WebBundleTrackerCustomizer.java
jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/utils/internal/DefaultFileLocatorHelper.java
jetty-osgi/jetty-osgi-equinoxtools/META-INF/MANIFEST.MF
jetty-osgi/jetty-osgi-httpservice/META-INF/MANIFEST.MF
jetty-spdy/spdy-jetty-http-webapp/pom.xml
jetty-spdy/spdy-jetty-http/pom.xml
jetty-spdy/spdy-jetty/pom.xml
2012-04-12 16:02:34 +10:00
c9ce3eb108
362113: fixed StdErrLog so that it does not hold a copy of System.err and thus avoid being redirected if System.err is redirected
2012-04-12 11:32:28 +10:00
9dfa9f9937
370081: correctly set URI for query strings
2012-04-10 14:21:07 +10:00
dfab993fcb
jetty-9 SSL partially working
2012-04-04 13:47:46 +10:00
83a4bb71a3
374475 Response.sendRedirect does not encode UTF-8 characters properly
2012-04-03 17:03:26 +10:00
ec77ba41ef
375906 Part.getHeader method not case insensitive
2012-04-03 16:57:12 +10:00
feca0aa672
jetty-9 rename to controller and processor
2012-03-30 02:04:12 +11:00
b267511f8f
jetty-9 sketched out httpchannel blocking read
2012-03-28 23:31:39 +11:00
2bcf611e5e
jetty-9 work in progress. Further simplification of jetty-io
2012-03-27 00:19:43 +11:00
dc29d73d0b
jetty-9 work in progress. developing ServerConnection abstraction
2012-03-21 14:42:33 +11:00
9d54ea4cde
JETTY-1500 form parameters from multipart request not available via request.getParameter
2012-03-20 18:35:21 +11:00
d8b1d80e4e
Merge remote-tracking branch 'origin/master' into jetty-8
...
Conflicts:
jetty-spdy/spdy-jetty-http-webapp/pom.xml
jetty-spdy/spdy-jetty-http/pom.xml
jetty-spdy/spdy-jetty/pom.xml
2012-03-19 17:22:02 +11:00
cf2c283653
protect dump from bad object toString()s
2012-03-19 11:11:48 +11:00
d717be1450
[Bug 374367] NPE in QueuedThreadPool.dump() with early java6 jvms
2012-03-16 14:52:49 -05:00
2e61650264
merge from master and adjust osgi bits
2012-03-08 20:32:20 -06:00
6c81941142
[Bug 373567] cert validation issue with ocsp and crldp always being enabled when validating turned on fixed
2012-03-08 13:56:00 -06:00
e757e5e54d
jetty-9 work in progress jetty-server
2012-03-08 21:37:03 +11:00
40c9dd77bf
jetty-9 javadoc and code cleanups
2012-03-08 15:23:45 +11:00
03525bfe46
jetty-9 javadoc and code cleanups
2012-03-08 15:18:17 +11:00
8c25941e04
jetty-9 jetty-http passing unit tests
2012-03-08 14:13:40 +11:00
381615f52d
merge from master
2012-03-07 16:44:31 -06:00
3d12ef7075
jetty-9 work in progress
2012-03-07 17:26:33 +11:00
de8a1b3fe4
373272: maintain the start order of aggregate beans when adding a thread pool
2012-03-06 11:47:18 +11:00
9ba7daceef
jdk-7 build cleanup
2012-03-06 08:57:39 +11:00
a4bee5b12d
jetty-9 work in progress on new HttpGenerator
2012-03-02 11:39:42 +11:00
098428dd37
Merge branch 'master' into jetty-8
2012-02-15 13:49:23 -06:00
1fa6c998db
jetty-9 committed to taking the IO out of the generator as well now. This is currently a total work in progress... with a lot of work to do
2012-02-10 17:15:04 +11:00
5c725d4e42
jetty-9 committed to taking the IO out of the generator as well now. This is currently a total work in progress... with a lot of work to do
2012-02-10 16:37:46 +11:00
824509b0fb
jetty-9 removed plurals from enum type names
2012-02-10 00:42:44 +11:00
efb6f84503
jetty-9 more compile fixes
2012-02-09 23:55:22 +11:00
2659d87868
jetty-9 HttpParser tests passing
2012-02-09 23:27:49 +11:00
9c1d3ff0b3
jetty-9 temporary tree map impl
2012-02-09 18:02:51 +11:00
ceac0f8525
jetty-9 half refactor of StringMap
2012-02-09 15:19:05 +11:00
4eeaeff7b9
jetty-9 minor StringMap cleanup
2012-02-09 10:56:00 +11:00
60bb4a415e
jetty-9 used enums instead of cached strings. Refactor of parser in progress to IO independent style. passes 1 test
2012-02-09 01:37:03 +11:00
c1bcec61d5
jetty-9 jetty-io mostly working with all NIO buffers. Occassional failure in SSL stress test
2012-02-07 11:32:00 +11:00
9207423ca0
Fixing JDK5 build abort due to bad javadocs
2012-02-06 10:01:44 -07:00
ebae11da68
370137 - SslContextFactory does not respect order for [included|excluded]Protocols() and [included|excluded]CipherSuites().
2012-01-30 16:40:04 +01:00
c918bb4e3c
Merge branch 'master' into jetty-8
2012-01-25 10:31:44 -06:00
ee9e195b49
369602: ignore NotUtf8Exception for decodeToUtf8
2012-01-25 15:40:24 +11:00
067e3f17cb
avoid NPE with jdk 7u4ea8 changed behaviour of SslContext init
2012-01-23 16:58:29 +11:00
5c08b06622
improved test
2012-01-23 10:19:08 +11:00
e1b12a633b
Merge remote-tracking branch 'origin/master' into jetty-8
...
Conflicts:
jetty-distribution/pom.xml
jetty-osgi/test-jetty-osgi/pom.xml
2012-01-20 13:00:32 +11:00
5cd9dbc6d3
removed unneeded imports
2012-01-19 23:08:54 +11:00
7f1de41953
368920 - JettyAwareLogger always formats the arguments.
2012-01-18 10:03:18 +01:00
90184ab3c3
Latest merge from master
2012-01-17 13:36:44 -06:00
81c48518b6
368635 moved lifecycle state reporting from toString to dump
2012-01-16 15:37:32 +11:00
ef9ac7760d
368635 moved lifecycle state reporting from toString to dump
2012-01-16 15:24:31 +11:00
c6693a73ad
Merge remote-tracking branch 'origin/master' into jetty-8
2012-01-12 23:35:24 +11:00
564cf7329c
365302: made map of loggers concurrent and shared in abstract
2012-01-12 20:39:24 +11:00
08f4b79a66
365302: LogMBean added
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2012-01-12 12:36:16 +11:00
691efcc7ca
Merge remote-tracking branch 'origin/master' into jetty-8
2012-01-11 16:35:57 +11:00
cb22cfdbe5
368240: renamed to use manage/unmanage instead of join/disjoin
2012-01-11 11:06:14 +11:00
bb0a320102
Improved toString().
2012-01-10 17:41:32 +01:00
8fcc22df32
368240: Improved handling of dispatch failure
2012-01-11 01:12:36 +11:00
a7783ae568
368240: Fixed the start of dependent beans
2012-01-11 01:04:01 +11:00
968a2ac95b
368240: Added concept of join to AggregateLifeCycle. Used by HttpClient and AbstractConnector
2012-01-11 00:09:34 +11:00
1fbec51c8a
Merge remote-tracking branch 'origin/master' into jetty-8
2012-01-10 16:08:59 +11:00
8222ef815c
368114 Protect against non-Strings in System properties for Log
2012-01-09 13:12:25 +11:00
3141b50fa0
Merge remote-tracking branch 'origin/master' into jetty-8
2011-12-30 20:19:39 +11:00
085c79d7d6
637638 limit number of form parameters to avoid DOS
2011-12-30 12:00:18 +11:00
de005c68fd
Revert "Merge branch 'release-8'"
...
This reverts commit 9e72457941df12605f0e
2011-11-30 16:27:30 +11:00
55d5020980
Merge remote-tracking branch 'origin/master' into jetty-8
...
Conflicts:
VERSION.txt
jetty-server/src/main/java/org/eclipse/jetty/server/AbstractHttpConnection.java
jetty-server/src/main/java/org/eclipse/jetty/server/Response.java
jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
2011-11-29 09:06:25 +11:00
b969de1788
organized imports
2011-11-28 15:32:14 +11:00
c229a55ad9
362742 improved UTF8 exception reason
2011-11-28 14:00:35 +11:00
c6103f2d53
Removed usages of ThreadDeath.
2011-11-24 20:39:04 +01:00
0e9449ac85
Merge remote-tracking branch 'origin/master' into jetty-8
2011-11-21 18:18:09 +11:00
722444506a
362626 IllegalStateException thrown when SslContextFactory preconfigured with SSLContext
2011-11-21 12:30:29 +11:00
b8b5df27d6
Merge remote-tracking branch 'origin/master' into jetty-8
2011-11-17 11:03:07 +11:00
127a5af8d7
Merge remote-tracking branch 'origin/master' into jetty-8
2011-11-17 10:59:54 +11:00
ec4dfc211f
Simpler windows resource test
2011-11-16 17:08:16 +11:00
46aad20248
363785 - StdErrLog must use system-dependent EOL.
2011-11-15 10:19:10 +01:00
722f390800
numerous findbugs inspired cleanups
2011-11-15 11:22:35 +11:00
7a9b8f1e9d
reverted last changes due to instability
2011-11-10 12:11:58 +11:00
d61258ec4e
clean ups from review from sbordet.
...
Removed isBufferred
fixed instanceof ThreadDeath
avoid race with onInputShutdown
2011-11-10 10:12:37 +11:00
a36342438c
cleaned up some unit tests
2011-11-09 17:03:11 +11:00
2a6b8696d7
Merge branch 'master' into jetty-8
2011-11-08 15:59:55 -06:00
5f2323418b
cleanups after the merge
2011-11-08 12:47:28 +11:00
7a082280f1
Merge remote-tracking branch 'origin/master' into jetty-7.6
...
Conflicts:
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-client/src/main/java/org/eclipse/jetty/client/HttpConnection.java
jetty-client/src/main/java/org/eclipse/jetty/client/SelectConnector.java
jetty-continuation/pom.xml
jetty-deploy/pom.xml
jetty-distribution/pom.xml
jetty-http-spi/pom.xml
jetty-http/pom.xml
jetty-http/src/main/java/org/eclipse/jetty/http/ssl/SslContextFactory.java
jetty-io/pom.xml
jetty-io/src/main/java/org/eclipse/jetty/io/nio/ChannelEndPoint.java
jetty-io/src/main/java/org/eclipse/jetty/io/nio/SelectChannelEndPoint.java
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-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/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-start/pom.xml
jetty-util/pom.xml
jetty-util/src/test/java/org/eclipse/jetty/util/log/LogTest.java
jetty-util/src/test/java/org/eclipse/jetty/util/log/NamedLogTest.java
jetty-webapp/pom.xml
jetty-websocket/pom.xml
jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketConnectionD13.java
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-11-07 18:09:31 +11:00
e207ea357e
Minor update to invalid utf8 test case (expanding bad examples)
2011-11-02 17:22:32 -07:00
2b6fec713c
Merge branch 'master' into jetty-8
2011-11-02 16:47:04 -05:00
e088acc559
Resolving merge
2011-10-28 13:42:07 -07:00
a32c1186e2
362113 - Improve Test Coverage of org.eclipse.jetty.util.log classes
...
+ JavaUtilLog coverage improvements and bug fixes
+ More in-code comments about decisions
2011-10-28 13:29:22 -07:00
aa73830199
Updating java comments to make clear the purpose of this new static{} block
2011-10-28 10:57:32 -07:00
4947bf099a
Making Log use an optional jetty-logging.properties object for pre-loading its properties (with System.getProperty override)
2011-10-28 10:30:35 -07:00
c02f98b7e6
More classpath mucking about in Sfl4jTestJarsRunner
2011-10-28 09:48:59 -07:00
9c9f2bd7c3
Making Sfl4jTestJarsRunner use its own classloader for loading the test
2011-10-28 09:23:11 -07:00
21c43b1ab9
Making Sfl4jTestJarsRunner use its own classloader for loading the test
2011-10-28 09:21:46 -07:00
062ccd7e70
trial classloader
2011-10-28 11:15:02 -05:00
148459bc8f
trial classloader
2011-10-28 11:14:14 -05:00
5c516c9e7b
Making fixes to StdErrLogTest
2011-10-28 09:12:29 -07:00
c174304996
Making fixes to StdErrLogTest
2011-10-28 09:11:21 -07:00
f510e0daf9
Making fixes to StdErrLogTest
2011-10-28 09:07:03 -07:00
824e6ebc52
Merge branch 'master' into slf4j-testing
2011-10-28 08:44:44 -07:00
84b07f359e
temporary disabled log format test
2011-10-28 15:25:10 +11:00
962e4afda9
Bug 362251 - Allow Log.setDebugEnabled(true) to override on configured StdErrLog levels
2011-10-27 16:44:29 -07:00
a87286a17c
WIP: testing of Slf4jLog
2011-10-27 15:56:32 -07:00
94124f7412
merge from master
2011-10-26 15:26:49 -05:00
464c297c01
Bug 362113 - Improve Test Coverage of org.eclipse.jetty.util.log classes
...
+ Bringing StdErrLog testing coverage up from 73% to 92%
2011-10-26 12:57:13 -07:00
1f9814a69a
362113 - Improve Test Coverage of org.eclipse.jetty.util.log classes
...
* Fixing bugs with bad level names, and adding tests for lowercase level
names.
2011-10-26 11:04:53 -07:00
064c93c53b
362111 - StdErrLog.isDebugEnabled() returns true too often
2011-10-26 10:34:33 -07:00
4258b6f385
SslConnection server side mostly working
2011-10-26 22:55:02 +11:00
61664d3c0f
Added concept of SslConnection
2011-10-26 01:15:59 +11:00
b87cbd1181
Adding test on StdErrLog.isDebugEnabled()
2011-10-24 10:35:06 -07:00
fc497fe1e8
Merge remote-tracking branch 'origin/master' into jetty-8
2011-10-24 16:30:10 +11:00
a642f7b55c
Merge remote-tracking branch 'origin/master' into jetty-7.6
...
Conflicts:
jetty-http/src/main/java/org/eclipse/jetty/http/HttpGenerator.java
jetty-io/src/main/java/org/eclipse/jetty/io/nio/SslSelectChannelEndPoint.java
2011-10-24 11:27:42 +11:00
cd0628ab66
Added isDebugEnabled guards to debugging that generates garbage
2011-10-22 09:39:54 +11:00
810223e259
361655 ExecutorThreadPool.isLowOnThreads() returns wrong value.
...
Optimized by calling getActiveCount() last, since it locks the thread pool.
2011-10-21 22:53:20 +02:00
d4603e1fdd
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
2011-10-21 16:26:18 +02:00
309e347d18
361655 ExecutorThreadPool.isLowOnThreads() returns wrong value.
...
Method isLowOnThreads() now return a value similar to what QueuedThreadPool does.
Also taken the chance to refactor constructors, and clarify that if an unbounded queue
like LinkedBlockingQueue is used, then the corePoolSize must be equal to the maxPoolSize.
2011-10-21 16:25:37 +02:00
0ba6fc7408
Merge remote-tracking branch 'origin/master' into jetty-8
2011-10-21 14:55:39 +11:00
44ea5c4d85
Merge remote-tracking branch 'origin/master' into jetty-7.6
2011-10-21 10:21:54 +11:00
385bc15726
358649 - Replace existing StdErrLog system properties for DEBUG/IGNORED with LEVEL instead.
...
Adding special case for "log.LEVEL" to set the root logging level.
2011-10-20 14:47:26 -07:00
74fd2e8965
Merge branch 'master' into jetty-7.6
...
Conflicts:
jetty-client/src/main/java/org/eclipse/jetty/client/HttpConnection.java
jetty-io/src/main/java/org/eclipse/jetty/io/nio/SslSelectChannelEndPoint.java
2011-10-19 17:43:55 +11:00
Joakim Erdfelt
Greg Wilkins
Jan Bartel
Simone Bordet
Thomas Becker
Jesse McConnell
Greg Wilkins
Jan Bartel