Commit Graph

1187 Commits

Author SHA1 Message Date
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
Greg Wilkins 65202e9abe 393363 Use Locale.ENGLISH for all toUpperCase and toLowerCase calls 2012-11-02 11:55:00 +11:00
Joakim Erdfelt 61c607076a Mux interrim work. 2012-10-30 16:17:03 -07:00
Jan Bartel 958d0c6949 Start incorporating (EDR version) servlet 3.1 spec 2012-10-27 17:38:43 +11:00
Simone Bordet 61ba84bda5 Added toString(). 2012-10-26 14:57:06 +02:00
Simone Bordet 31b77d9ade Cleaned up implementation. 2012-10-26 14:57:06 +02:00
Greg Wilkins bf7a0ace22 392237 Added BlockingCallback optimisation 2012-10-25 22:36:13 +11:00
Joakim Erdfelt 3e07bccb71 Adding another UTF8 High Surrogate test 2012-10-19 11:18:06 -07:00
Joakim Erdfelt 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
Greg Wilkins 2b13648b0e 392237 fixed many TODOs and many minor code cleanups 2012-10-19 16:17:30 +11:00
Greg Wilkins f420f5016d 392237 Implemented HttpOutput.sendContent for large content 2012-10-19 10:16:30 +11:00
Greg Wilkins b618ce59e3 392304 fixed intermittent client SSL failure. Correctly compact in flip2fill 2012-10-18 19:55:57 +11:00
Thomas Becker 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
Greg Wilkins f5d3fec4f8 jetty-9 removed context deployer and merged context and webapps directory 2012-10-15 22:05:33 +11:00
Greg Wilkins 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
Jan Bartel 31807b7892 391188 Files written with Request.getPart().write(filename) should not be auto-deleted 2012-10-08 11:09:41 +11:00
Jan Bartel 36a2ed10be 391080 Multipart temp files can be left on disk from Request.getPart and getParts 2012-10-04 18:31:09 +10:00
Jan Bartel 25cdef966c 391080 Multipart temp files can be left on disk with MultiPartFilter 2012-10-04 15:24:23 +10:00
Jan Bartel 23fe83a689 391082 No exception if multipart input stream incomplete 2012-10-04 14:51:13 +10:00
Greg Wilkins 6cc0734a1a jetty-9 miscillaneous optimizations: donot dispatch to HTTP and SPDY; improved executorCallback 2012-10-02 13:48:51 -07:00
Jan Bartel 156e33bd23 Merge remote-tracking branch 'origin/master' into jetty-8 2012-09-28 18:47:33 +10:00
Greg Wilkins 9ee8ef7423 jetty-9 more lifecycle fixes 2012-09-21 18:00:46 +10:00
Greg Wilkins 879cdf4b82 jetty-9 further lifecycle improvements 2012-09-21 16:17:00 +10:00
Greg Wilkins 68ee346b8a jetty-9 combined the Container and AggregateLifeCycle into ContainerLifeCycle 2012-09-21 11:45:51 +10:00
Jan Bartel 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
Simone Bordet 37a7e5977d Merged branch 'jetty-9' into jetty-9-open-close. 2012-09-20 18:46:16 +02:00
Simone Bordet 40382bad3a jetty-9 - Removed references to JUnit 3.x. 2012-09-20 18:23:02 +02:00
Simone Bordet df699cde27 jetty-9 - Cleanup and JDK7-ification. 2012-09-20 17:48:05 +02:00
Greg Wilkins 0d2627b6e9 jetty-9 improved onOpen onclose handling 2012-09-20 11:05:20 +10:00
Simone Bordet 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
Greg Wilkins 129583679a jetty-9 javadoc improvements and renamed SelectChannelConnector to ServerConnector 2012-09-17 17:37:56 +10:00
Greg Wilkins b3381b4996 jetty-9 QueuedThreadPool creates new threads when idleThreads goes to 0 2012-09-17 17:36:48 +10:00
Joakim Erdfelt 859d4a09d3 Fixing test expectations 2012-09-14 14:47:27 -07:00
Simone Bordet 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
Greg Wilkins 9940796a32 jetty-9 xml configurations 2012-09-13 14:43:03 +10:00
Jesse McConnell a8994178f5 [maven-release-plugin] prepare for next development iteration 2012-09-10 14:18:11 -05:00
Jesse McConnell 92180a9700 [maven-release-plugin] prepare release jetty-7.6.7.v20120910 2012-09-10 14:18:01 -05:00
Jesse McConnell 10e4027579 [maven-release-plugin] prepare for next development iteration 2012-09-10 13:59:34 -05:00
Jesse McConnell 57a6258f96 [maven-release-plugin] prepare release jetty-8.1.7.v20120910 2012-09-10 13:59:10 -05:00
Jesse McConnell 1ec8b2621b [maven-release-plugin] prepare release jetty-7.6.7.v20120910 2012-09-10 13:47:05 -05:00
Jesse McConnell 4180d7e1f5 prepare for release 2012-09-10 12:59:04 -05:00
Greg Wilkins 73ebe89019 jetty-9 refactored configuration 2012-09-10 20:26:14 +10:00
Simone Bordet 67670c22bd jetty-9 - Removed debug code. 2012-09-07 12:05:48 +02:00
Joakim Erdfelt 3ba074ecc8 Adding .STACKS=(boolean) support to StdErrLog configuration 2012-09-06 12:33:38 -07:00
Simone Bordet d8ed9116f1 jetty-9 - Moved SPDY's Headers class to jetty-util module as Fields. 2012-09-06 13:22:04 +02:00
Simone Bordet 1c306ad89c Jetty9 - Removed code duplication for calculating the jetty version. 2012-09-06 09:16:34 +02:00
Simone Bordet 7231c82b69 Merged branch 'jetty-9' into jetty-9-client. 2012-09-06 08:41:48 +02:00
Greg Wilkins 2dfcebfc04 jetty-9 distribution working 2012-09-06 14:54:55 +10:00
Greg Wilkins 0b3865d749 jetty-9 removed unused schedulers 2012-09-06 09:12:31 +10:00
Thomas Becker bdb75b9881 jetty-9 jetty-util remove plugin.xml from assembly 2012-09-05 10:43:30 +02:00
Thomas Becker db3fbb9cb3 jetty-9 jetty-plugins now reads from multiple cofigurable groupIds. Currently org/eclipse/jetty and org/mortbay/jetty 2012-09-05 10:41:45 +02:00
Simone Bordet b18ab0e76a Jetty9 - First take at HTTP client implementation. 2012-09-04 19:20:29 +02:00
Thomas Becker 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
Thomas Becker 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
Jesse McConnell d37deeea74 [maven-release-plugin] prepare for next development iteration 2012-09-03 13:33:18 -05:00
Jesse McConnell b418b0dd57 [maven-release-plugin] prepare for next development iteration 2012-09-03 13:33:16 -05:00
Jesse McConnell 41e9b1f6e2 [maven-release-plugin] prepare release jetty-7.6.6.v20120903 2012-09-03 13:33:10 -05:00
Jesse McConnell 6c0b0af2fe [maven-release-plugin] prepare release jetty-8.1.6.v20120903 2012-09-03 13:33:08 -05:00
Jesse McConnell 6d2c793edc Merge branch 'master' into jetty-8 2012-09-03 12:48:21 -05:00
Greg Wilkins 4fce4d0e53 jetty-9 ConcurrentScheduler refinements 2012-09-03 17:46:11 +10:00
Greg Wilkins 3f3b269cca jetty-9 ConcurrentScheduler refinements 2012-09-03 15:32:44 +10:00
Greg Wilkins e29e55ffcc jetty-9 ConcurrentScheduler refinements 2012-09-03 15:29:01 +10:00
Greg Wilkins c3776764f4 jetty-9 ConcurrentScheduler refinements 2012-09-03 15:24:36 +10:00
Greg Wilkins bb3dcc1c5b jetty-9 eased scheduler test 2012-09-01 07:10:42 +10:00
Simone Bordet d18fcc05e3 Jetty9 - Added copyright header. 2012-08-31 12:17:08 +02:00
Greg Wilkins fd5776cf86 jetty-9 improved comments 2012-08-31 17:53:18 +10:00
Greg Wilkins da82238d6b improved efficiency 2012-08-31 17:19:47 +10:00
Greg Wilkins 83dbca6553 jetty-9 reworked the schedulers 2012-08-31 13:22:58 +10:00
Simone Bordet 4de5b0ad63 Merged branch 'jetty-9' into jetty-9-client. 2012-08-30 17:24:49 +02:00
Thomas Becker 8fbe6c59d5 jetty-9 merge 2012-08-29 17:27:26 +02:00
Simone Bordet acb89e0d2f Jetty9 - Added copyright header. 2012-08-28 21:55:44 +02:00
Greg Wilkins d8b287134f jetty-9 improved range request processing and tests 2012-08-27 12:17:40 +10:00
Greg Wilkins cb5dd493fb jetty-9 merged jetty-9-aggregation 2012-08-27 10:24:34 +10:00
Greg Wilkins 1d654a08cf jetty-9 restructured graceful shutdown 2012-08-24 20:16:23 +10:00
Simone Bordet 06b2de17d5 Merge branch 'jetty-9-aggregation' into jetty-9-spdy-http 2012-08-24 11:52:29 +02:00
Greg Wilkins c707ba11d1 jetty-9 improved SSL shutdown input 2012-08-24 17:56:22 +10:00
Greg Wilkins fac03a306b jetty-9 more server test fixes 2012-08-24 16:53:36 +10:00
Greg Wilkins d59a47d376 jetty-9 simplified error handling 2012-08-23 17:32:10 +10:00
Greg Wilkins 325bfc290d jetty-9 work in progress on moving aggregation out of HttpChannel 2012-08-20 20:43:10 +10:00
Greg Wilkins 2900b4df02 jetty-9 some post merge fixes 2012-08-18 10:37:09 +10:00
Jesse McConnell 6ffaa478c4 standardize license headers 2012-08-17 16:09:49 -05:00
Joakim Erdfelt 3d1d76d214 Merge from jetty-8 to jetty-9 (license header standarization) 2012-08-17 13:44:22 -07:00
Jesse McConnell 5de0cee1eb merge from master + license block standardization 2012-08-17 14:50:43 -05:00
Greg Wilkins 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
Greg Wilkins 7c94fd5f3c jetty-9 removed HttpParser.isPersistent 2012-08-17 22:06:55 +10:00
Jesse McConnell 00ed549898 standardize license header blocks 2012-08-16 19:11:27 -05:00
Jesse McConnell c82871b10f Merge branch 'master' into jetty-8 2012-08-16 17:10:35 -05:00
Jesse McConnell 2d9c4e823c migrate jetty-webapp to jmx annotations 2012-08-15 13:49:07 -05:00
Jesse McConnell c92ce4bd1e jetty-servlets migration to jmx annotations 2012-08-15 13:33:05 -05:00
Joakim Erdfelt 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
Joakim Erdfelt 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
Jesse McConnell 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
Jesse McConnell 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
Jesse McConnell aae7c4da68 removed managed=true from ManagedOperation and ManagedAttribute 2012-08-13 17:19:59 -05:00
Jesse McConnell 11dbce81c8 wire up way to remove the need for managed=true on ManagedAttribute 2012-08-13 16:48:52 -05:00
Greg Wilkins 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
Jesse McConnell 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
Jesse McConnell 86daeab0ca Remove Managed annotation and convert the context handler over to the new usage 2012-08-11 11:40:32 -05:00
Greg Wilkins 488f53f8d6 jetty-9 cleaned up the stop and stopTimeout handlng 2012-08-11 12:51:32 +10:00
Jesse McConnell 608e74b9bf add note to readonly annotation element 2012-08-10 17:26:38 -05:00
Jesse McConnell 752a2e7d64 more annotation jmx jiggering 2012-08-10 17:23:59 -05:00
Joakim Erdfelt d922013313 Merge branch 'multimap-ng' into jetty-9 2012-08-10 15:13:07 -07:00
Joakim Erdfelt b8de9a35a4 [multimap-ng] moving UrlEncoded over and fixing various other failing tests 2012-08-10 14:42:35 -07:00
Jesse McConnell 6d3d7b0df8 [Bug 380924] xmlconfiguration <Configure and <New supports named constructors, including dynamic ordering of parameters 2012-08-10 15:44:08 -05:00
Joakim Erdfelt dfebb117b7 [multimap-ng] step 2, make MultiMap a generic, and remove LazyList use 2012-08-10 12:46:30 -07:00
Joakim Erdfelt 74490580da Merge branch 'jetty-9' into multimap-ng 2012-08-10 11:32:42 -07:00
Joakim Erdfelt 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
Simone Bordet 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
Simone Bordet 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
Jesse McConnell 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
Joakim Erdfelt 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
Joakim Erdfelt 703cf000fe Fixing bad UTF8 test assumption 2012-08-10 05:51:17 -07:00
Greg Wilkins 6039e8ea23 jetty-9 fixed stderrlog test 2012-08-10 22:37:02 +10:00
Simone Bordet 598292172f Jetty9 - Code cleanup, renaming methods to be more expressive. 2012-08-10 10:29:14 +02:00
Jan Bartel 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
Greg Wilkins 16b404754e jetty-9 improved logging 2012-08-10 13:31:11 +10:00
Joakim Erdfelt 3d029695ec Replacing with optional Collections 2012-08-09 14:52:18 -07:00
Jan Bartel 0b4d2e6a0f 377055 Prevent webapp classloader leaks 2012-08-09 10:23:00 +10:00
Joakim Erdfelt 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
Greg Wilkins 689daf092d ported websocketchat to new API 2012-08-08 14:56:47 +10:00
Greg Wilkins 32c5f6c093 jetty-9 reduced LazyList usage 2012-08-08 11:58:50 +10:00
Joakim Erdfelt 28bc479417 Verifying that fast-fail on utf8 works 2012-08-07 12:16:49 -07:00
Joakim Erdfelt 5a77c0801a Adding support for Utf8Appendable.append(ByteBuffer) 2012-08-07 09:53:15 -07:00
Simone Bordet 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
Simone Bordet 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
Simone Bordet 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
Jan Bartel c0dd05683b Merge remote-tracking branch 'origin/master' into jetty-8 2012-08-03 17:25:24 +10:00
Greg Wilkins 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
Thomas Becker 88cc3bfdc6 Merge branch 'writeFlusher_refactoring' into jetty-9 2012-08-03 01:07:20 +02:00
Greg Wilkins 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
Greg Wilkins 962a0d0889 jetty-9 ensure injected threadpool is managed 2012-08-03 08:44:49 +10:00