Commit Graph

834 Commits

Author SHA1 Message Date
Jesse McConnell 12ecc10c6a [maven-release-plugin] prepare for next development iteration 2012-07-13 09:35:08 -05:00
Jesse McConnell bf40110fb8 [maven-release-plugin] prepare release jetty-7.6.5.v20120713 2012-07-13 09:34:52 -05:00
Jesse McConnell 81d72052c8 merged master to jetty-8 2012-07-11 14:04:49 -05:00
Jesse McConnell aa941f5711 quick pass through to clean up missing or incorrect license blocks 2012-07-11 12:29:46 -05:00
Jesse McConnell 0fa17c13b1 Merge branch 'master' into jetty-8 2012-07-11 10:10:00 -05:00
Greg Wilkins a519ecc1fb improved SPDY dump 2012-07-03 15:31:56 +02:00
Joakim Erdfelt c5b7ff0fb4 Adding StringUtil.isBlank(String) and StringUtil.isNotBlank(String) with
tests
2012-06-26 10:45:33 -07:00
Thomas Becker 9410a8d81c 383116: fix truncated filenames for multipart file uploads containing spaces in filename 2012-06-21 16:14:47 +02:00
Jesse McConnell 571b1da632 Merge branch 'master' into jetty-8 2012-06-14 15:46:59 -05:00
Jesse McConnell a4fb0201f6 Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2012-06-14 15:46:01 -05:00
Jesse McConnell c928c1be29 [Bug #377067] add Negotiate option for security which is an alternative for Spnego 2012-06-14 15:45:41 -05:00
Simone Bordet 7f39b8b7a4 Refactored atomic updates of max and min into utility class Atomics. 2012-06-08 09:59:36 +02:00
Jan Bartel 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
Jan Bartel a7b1dd5e93 Merge remote-tracking branch 'origin/master' into jetty-8 2012-06-07 00:59:37 +02:00
Greg Wilkins 3f80ec2bc2 jetty-9 lots of renaming 2012-06-06 21:35:51 +02:00
Greg Wilkins 903e4cd0f2 jetty-9 many name and javadoc cleanups 2012-06-06 16:40:19 +02:00
Greg Wilkins 792509d459 jetty-9 jetty-deployer passing tests 2012-06-06 15:27:56 +02:00
Jan Bartel 468d7da719 Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2012-06-06 15:02:01 +02:00
Jan Bartel dc3c77b5f6 381712 Support all declared servlets that implement org.apache.jasper.servlet.JspServlet 2012-06-06 15:00:42 +02:00
Greg Wilkins 27b6d43164 381825 leave URI params in forwarded requestURI 2012-06-06 11:19:15 +02:00
Greg Wilkins c1f3545d7c jetty-9 passing jetty-servlet tests!!!! 2012-06-05 18:11:20 +02:00
Greg Wilkins 5415517cc0 jetty-9 organize imports 2012-06-05 14:06:18 +02:00
Jan Bartel 9149a69446 Merge remote-tracking branch 'origin/master' into jetty-8 2012-06-04 13:49:25 +02:00
Jan Bartel 8bcb906883 381399 Unable to stop a jetty instance that has not finished starting 2012-06-01 19:59:55 +02:00
Greg Wilkins 80ff0586a8 jetty-9 new simple SslConnection (mostly working) 2012-05-31 00:53:25 +02:00
Greg Wilkins 145938cecc jetty-9 updated more test harness 2012-05-28 09:32:12 +02:00
Jesse McConnell 30e8e40ef2 [maven-release-plugin] prepare for next development iteration 2012-05-24 15:41:45 -05:00
Jesse McConnell 667cf9a643 [maven-release-plugin] prepare release jetty-8.1.4.v20120524 2012-05-24 15:41:38 -05:00
Jesse McConnell d23a3c90b5 [maven-release-plugin] prepare for next development iteration 2012-05-24 15:40:47 -05:00
Jesse McConnell 57c73283d8 [maven-release-plugin] prepare release jetty-7.6.4.v20120524 2012-05-24 15:40:35 -05:00
Jesse McConnell e45a89694a [maven-release-plugin] prepare for next development iteration 2012-05-24 09:30:58 -05:00
Jesse McConnell 36fc6fe890 [maven-release-plugin] prepare release jetty-8.1.4.v20120524 2012-05-24 09:30:52 -05:00
Jesse McConnell 035e16aedc [maven-release-plugin] prepare for next development iteration 2012-05-24 09:27:27 -05:00
Jesse McConnell f8c629026d [maven-release-plugin] prepare release jetty-7.6.4.v20120524 2012-05-24 09:27:21 -05:00
Jesse McConnell c7a9adaa32 reset for release 2012-05-24 08:33:44 -05:00
Jesse McConnell c8fe38733f reset versions for release 2012-05-24 08:30:26 -05:00
Greg Wilkins 4473572b6d jetty-9 more progress with RFC2616 tests 2012-05-23 18:04:50 +02:00
Greg Wilkins 294150f485 jetty-9 passing timeout tests 2012-05-23 10:19:23 +02:00
Jesse McConnell ea176f0586 [maven-release-plugin] prepare for next development iteration 2012-05-22 15:14:05 -05:00
Jesse McConnell 3fdda881d8 [maven-release-plugin] prepare release jetty-8.1.4.v20120522 2012-05-22 15:13:56 -05:00
Jesse McConnell 300a37319a [maven-release-plugin] prepare for next development iteration 2012-05-22 14:34:10 -05:00
Jesse McConnell 9ccd059375 [maven-release-plugin] prepare release jetty-7.6.4.v20120522 2012-05-22 14:33:59 -05:00
Jesse McConnell ce5e5cbad2 Merge branch 'master' into jetty-8 2012-05-22 14:02:58 -05:00
Jesse McConnell 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
Jan Bartel 34954bc617 Merge remote-tracking branch 'origin/master' into jetty-8 2012-05-22 17:28:40 +02:00
Greg Wilkins ca2a040a39 380034 last modified times taken from JarEntry for JarFile resources 2012-05-22 15:05:29 +02:00
Greg Wilkins 74e0063f3c jetty-9 fixed error handling state 2012-05-18 09:27:26 +02:00
Greg Wilkins 1c319703b9 jetty-9 converted parser to consume all 2012-05-15 16:03:07 +02:00
Greg Wilkins fcfb5d704a jetty-9 AsyncByteArrayEndPoint test 2012-05-14 10:58:45 +02:00
Simone Bordet 4b8f6b8413 jetty-9 SelectorManager refactorings. 2012-05-11 19:30:30 +02:00
Greg Wilkins e348f2d4f5 jetty-9 progress on jetty-server 2012-05-10 12:19:16 +02:00
Greg Wilkins 979dae0021 jetty-9 moved FutureCallback to jetty-util 2012-05-09 18:27:09 +02:00
Simone Bordet 2b26d2f3ee Refactorings. 2012-05-08 19:00:40 +02:00
Greg Wilkins df8af92aeb jetty-9 fixed compiles 2012-05-08 18:30:22 +02:00
Jan Bartel 2131a40559 Merge remote-tracking branch 'origin/master' into jetty-8 2012-05-07 13:54:30 +02:00
Greg Wilkins 6e62ab9bbe jetty-9 slow progress on SSL robustness 2012-05-04 17:59:32 +02:00
Greg Wilkins a1d8c640ce jetty-9 removed onInputShutdown 2012-05-03 22:11:58 +02:00
Greg Wilkins 60f9d7faff jetty-9 working on ByteArrayEndPoint 2012-05-03 15:17:23 +02:00
Greg Wilkins 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
Greg Wilkins c7f25b0928 jetty-9 work in progress 2012-04-26 10:03:21 +10:00
Greg Wilkins 66e7caea86 377259: better handle bad encodings 2012-04-25 17:34:08 +10:00
Greg Wilkins 5e83df20c8 various sonar/findbug code cleanups 2012-04-25 00:00:54 +10:00
Jan Bartel 7da85a2719 377323 Request#getParts() throws ServletException when it should be throwing IllegalStateException 2012-04-24 17:25:08 +10:00
Jesse McConnell b64909900c [maven-release-plugin] prepare for next development iteration 2012-04-13 15:31:47 -05:00
Jesse McConnell 2c0a35d430 [maven-release-plugin] prepare release jetty-8.1.3.v20120413 2012-04-13 15:31:38 -05:00
Jesse McConnell b963840d40 [maven-release-plugin] prepare for next development iteration 2012-04-13 15:29:14 -05:00
Jesse McConnell a652ee7396 [maven-release-plugin] prepare release jetty-7.6.3.v20120413 2012-04-13 15:29:05 -05:00
Simone Bordet 72040202d4 Reverted release back to 8.1.3-SNAPSHOT. 2012-04-13 17:27:37 +02:00
Simone Bordet 85710fb9ea Reverted release back to 7.6.3-SNAPSHOT. 2012-04-13 16:59:06 +02:00
Jesse McConnell 3b87e91cbe [maven-release-plugin] prepare for next development iteration 2012-04-12 10:29:30 -05:00
Jesse McConnell 308b010744 [maven-release-plugin] prepare release jetty-8.1.3.v20120412 2012-04-12 10:29:20 -05:00
Jesse McConnell cdcc0922c3 [maven-release-plugin] prepare for next development iteration 2012-04-12 09:49:52 -05:00
Jesse McConnell 5966c86571 [maven-release-plugin] prepare release jetty-7.6.3.v20120412 2012-04-12 09:49:46 -05:00
Greg Wilkins b5e9de1cd8 Merge remote-tracking branch 'origin/master' into jetty-8 2012-04-12 17:16:22 +10:00
Jan Bartel 436743e7d5 367172 Remove detection for slf4j NOPLogger 2012-04-12 17:05:55 +10:00
Greg Wilkins a565c72adb 374550: remove printStackTrace calls 2012-04-12 16:51:59 +10:00
Greg Wilkins 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
Greg Wilkins 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
Greg Wilkins 9dfa9f9937 370081: correctly set URI for query strings 2012-04-10 14:21:07 +10:00
Greg Wilkins dfab993fcb jetty-9 SSL partially working 2012-04-04 13:47:46 +10:00
Jan Bartel 83a4bb71a3 374475 Response.sendRedirect does not encode UTF-8 characters properly 2012-04-03 17:03:26 +10:00
Jan Bartel ec77ba41ef 375906 Part.getHeader method not case insensitive 2012-04-03 16:57:12 +10:00
Greg Wilkins feca0aa672 jetty-9 rename to controller and processor 2012-03-30 02:04:12 +11:00
Greg Wilkins b267511f8f jetty-9 sketched out httpchannel blocking read 2012-03-28 23:31:39 +11:00
Greg Wilkins 2bcf611e5e jetty-9 work in progress. Further simplification of jetty-io 2012-03-27 00:19:43 +11:00
Greg Wilkins dc29d73d0b jetty-9 work in progress. developing ServerConnection abstraction 2012-03-21 14:42:33 +11:00
Jan Bartel 9d54ea4cde JETTY-1500 form parameters from multipart request not available via request.getParameter 2012-03-20 18:35:21 +11:00
Greg Wilkins 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
Greg Wilkins cf2c283653 protect dump from bad object toString()s 2012-03-19 11:11:48 +11:00
Jesse McConnell d717be1450 [Bug 374367] NPE in QueuedThreadPool.dump() with early java6 jvms 2012-03-16 14:52:49 -05:00
Jesse McConnell b4985ad0d5 [maven-release-plugin] prepare for next development iteration 2012-03-08 23:53:50 -06:00
Jesse McConnell 7a99af4ffe [maven-release-plugin] prepare release jetty-8.1.2.v20120308 2012-03-08 23:53:42 -06:00
Jesse McConnell 246e3ed756 [maven-release-plugin] prepare for next development iteration 2012-03-08 21:09:46 -06:00
Jesse McConnell a63b3fdc5e [maven-release-plugin] prepare release jetty-7.6.2.v20120308 2012-03-08 21:09:37 -06:00
Jesse McConnell 2e61650264 merge from master and adjust osgi bits 2012-03-08 20:32:20 -06:00
Jesse McConnell 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
Greg Wilkins e757e5e54d jetty-9 work in progress jetty-server 2012-03-08 21:37:03 +11:00
Greg Wilkins 40c9dd77bf jetty-9 javadoc and code cleanups 2012-03-08 15:23:45 +11:00
Greg Wilkins 03525bfe46 jetty-9 javadoc and code cleanups 2012-03-08 15:18:17 +11:00
Greg Wilkins 8c25941e04 jetty-9 jetty-http passing unit tests 2012-03-08 14:13:40 +11:00
Jesse McConnell 381615f52d merge from master 2012-03-07 16:44:31 -06:00
Greg Wilkins 3d12ef7075 jetty-9 work in progress 2012-03-07 17:26:33 +11:00
Jesse McConnell 50d92ec8ef reset versions 2012-03-06 17:07:53 -06:00
Jesse McConnell f12e3c390c reset versions 2012-03-06 17:06:10 -06:00
Greg Wilkins de8a1b3fe4 373272: maintain the start order of aggregate beans when adding a thread pool 2012-03-06 11:47:18 +11:00
Greg Wilkins 9ba7daceef jdk-7 build cleanup 2012-03-06 08:57:39 +11:00
Jesse McConnell d1c8c477ea [maven-release-plugin] prepare for next development iteration 2012-03-02 08:57:43 -06:00
Jesse McConnell b75868e84f [maven-release-plugin] prepare release jetty-8.1.2.v20120302 2012-03-02 08:57:19 -06:00
Jesse McConnell 51311d050e [maven-release-plugin] prepare for next development iteration 2012-03-02 08:37:46 -06:00
Jesse McConnell a8296ec3d5 [maven-release-plugin] prepare release jetty-7.6.2.v20120302 2012-03-02 08:37:38 -06:00
Greg Wilkins a4bee5b12d jetty-9 work in progress on new HttpGenerator 2012-03-02 11:39:42 +11:00
Jesse McConnell ac79497dee [maven-release-plugin] prepare for next development iteration 2012-02-15 14:29:36 -06:00
Jesse McConnell 3705b424c8 [maven-release-plugin] prepare release jetty-8.1.1.v20120215 2012-02-15 14:29:28 -06:00
Jesse McConnell efb6883cf0 [maven-release-plugin] prepare for next development iteration 2012-02-15 14:22:19 -06:00
Jesse McConnell baf2b94f77 [maven-release-plugin] prepare release jetty-7.6.1.v20120215 2012-02-15 14:22:12 -06:00
Jesse McConnell 098428dd37 Merge branch 'master' into jetty-8 2012-02-15 13:49:23 -06:00
Greg Wilkins 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
Greg Wilkins 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
Greg Wilkins 824509b0fb jetty-9 removed plurals from enum type names 2012-02-10 00:42:44 +11:00
Greg Wilkins efb6f84503 jetty-9 more compile fixes 2012-02-09 23:55:22 +11:00
Greg Wilkins 2659d87868 jetty-9 HttpParser tests passing 2012-02-09 23:27:49 +11:00
Greg Wilkins 9c1d3ff0b3 jetty-9 temporary tree map impl 2012-02-09 18:02:51 +11:00
Greg Wilkins ceac0f8525 jetty-9 half refactor of StringMap 2012-02-09 15:19:05 +11:00
Greg Wilkins 4eeaeff7b9 jetty-9 minor StringMap cleanup 2012-02-09 10:56:00 +11:00
Greg Wilkins 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
Greg Wilkins 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
Joakim Erdfelt 9207423ca0 Fixing JDK5 build abort due to bad javadocs 2012-02-06 10:01:44 -07:00
Jesse McConnell 0797e8a23d merge from master 2012-02-01 17:25:11 -06:00
Jesse McConnell 6b079ae3d8 merge from master 2012-02-01 17:25:08 -06:00
Simone Bordet ebae11da68 370137 - SslContextFactory does not respect order for [included|excluded]Protocols() and [included|excluded]CipherSuites(). 2012-01-30 16:40:04 +01:00
Jesse McConnell 6e44f4db5f [maven-release-plugin] prepare for next development iteration 2012-01-27 08:15:45 -06:00
Jesse McConnell 9d1ca3593e [maven-release-plugin] prepare release jetty-8.1.0.v20120127 2012-01-27 08:15:38 -06:00
Jesse McConnell ad6126553b [maven-release-plugin] prepare for next development iteration 2012-01-27 08:13:06 -06:00
Jesse McConnell 4e25f7bb05 [maven-release-plugin] prepare release jetty-7.6.0.v20120127 2012-01-27 08:13:00 -06:00
Jesse McConnell f2d0fd3cc8 revert back to 8.1.0-SNAPSHOT 2012-01-26 10:45:06 -06:00
Jesse McConnell 7ac9eb585f revert back to 7.6.0-SNAPSHOT 2012-01-26 10:42:11 -06:00
Jesse McConnell e98ae91ca6 [maven-release-plugin] prepare for next development iteration 2012-01-25 11:16:11 -06:00
Jesse McConnell fb30166a7f [maven-release-plugin] prepare release jetty-8.1.0.v20120125 2012-01-25 11:16:05 -06:00
Jesse McConnell c918bb4e3c Merge branch 'master' into jetty-8 2012-01-25 10:31:44 -06:00
Jesse McConnell 0c96fc40ea [maven-release-plugin] prepare for next development iteration 2012-01-25 09:31:06 -06:00
Jesse McConnell b455b7d94e [maven-release-plugin] prepare release jetty-7.6.0.v20120125 2012-01-25 09:30:55 -06:00
Greg Wilkins ee9e195b49 369602: ignore NotUtf8Exception for decodeToUtf8 2012-01-25 15:40:24 +11:00
Greg Wilkins 067e3f17cb avoid NPE with jdk 7u4ea8 changed behaviour of SslContext init 2012-01-23 16:58:29 +11:00
Greg Wilkins 5c08b06622 improved test 2012-01-23 10:19:08 +11:00
Greg Wilkins 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
Greg Wilkins 5cd9dbc6d3 removed unneeded imports 2012-01-19 23:08:54 +11:00
Simone Bordet 7f1de41953 368920 - JettyAwareLogger always formats the arguments. 2012-01-18 10:03:18 +01:00
Jesse McConnell 90184ab3c3 Latest merge from master 2012-01-17 13:36:44 -06:00
Greg Wilkins 81c48518b6 368635 moved lifecycle state reporting from toString to dump 2012-01-16 15:37:32 +11:00
Greg Wilkins ef9ac7760d 368635 moved lifecycle state reporting from toString to dump 2012-01-16 15:24:31 +11:00
Greg Wilkins c6693a73ad Merge remote-tracking branch 'origin/master' into jetty-8 2012-01-12 23:35:24 +11:00
Greg Wilkins 564cf7329c 365302: made map of loggers concurrent and shared in abstract 2012-01-12 20:39:24 +11:00
Thomas Becker 08f4b79a66 365302: LogMBean added
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2012-01-12 12:36:16 +11:00
Jan Bartel 691efcc7ca Merge remote-tracking branch 'origin/master' into jetty-8 2012-01-11 16:35:57 +11:00
Greg Wilkins cb22cfdbe5 368240: renamed to use manage/unmanage instead of join/disjoin 2012-01-11 11:06:14 +11:00
Simone Bordet bb0a320102 Improved toString(). 2012-01-10 17:41:32 +01:00
Greg Wilkins 8fcc22df32 368240: Improved handling of dispatch failure 2012-01-11 01:12:36 +11:00
Greg Wilkins a7783ae568 368240: Fixed the start of dependent beans 2012-01-11 01:04:01 +11:00
Greg Wilkins 968a2ac95b 368240: Added concept of join to AggregateLifeCycle. Used by HttpClient and AbstractConnector 2012-01-11 00:09:34 +11:00
Jan Bartel 1fbec51c8a Merge remote-tracking branch 'origin/master' into jetty-8 2012-01-10 16:08:59 +11:00
Jan Bartel 8222ef815c 368114 Protect against non-Strings in System properties for Log 2012-01-09 13:12:25 +11:00
Greg Wilkins 3141b50fa0 Merge remote-tracking branch 'origin/master' into jetty-8 2011-12-30 20:19:39 +11:00
Greg Wilkins 085c79d7d6 637638 limit number of form parameters to avoid DOS 2011-12-30 12:00:18 +11:00
hmalphettes 89afbdf31d 360245 OSGi: javax.servlet packages version refactored 3.0 -> 2.6 2011-12-02 17:27:26 +08:00
Greg Wilkins de005c68fd Revert "Merge branch 'release-8'"
This reverts commit 9e72457941, reversing
changes made to df12605f0e.
2011-11-30 16:27:30 +11:00
Greg Wilkins 631b0ba1b6 [maven-release-plugin] prepare for next development iteration 2011-11-30 13:16:54 +11:00
Greg Wilkins 9d3745f999 [maven-release-plugin] prepare release jetty-8.1.0.RC0 2011-11-30 13:16:41 +11:00
Greg Wilkins 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
Greg Wilkins b969de1788 organized imports 2011-11-28 15:32:14 +11:00
Greg Wilkins c229a55ad9 362742 improved UTF8 exception reason 2011-11-28 14:00:35 +11:00
Simone Bordet c6103f2d53 Removed usages of ThreadDeath. 2011-11-24 20:39:04 +01:00
Jan Bartel 0e9449ac85 Merge remote-tracking branch 'origin/master' into jetty-8 2011-11-21 18:18:09 +11:00
Jan Bartel 722444506a 362626 IllegalStateException thrown when SslContextFactory preconfigured with SSLContext 2011-11-21 12:30:29 +11:00
Jan Bartel b8b5df27d6 Merge remote-tracking branch 'origin/master' into jetty-8 2011-11-17 11:03:07 +11:00
Jan Bartel 127a5af8d7 Merge remote-tracking branch 'origin/master' into jetty-8 2011-11-17 10:59:54 +11:00
Greg Wilkins ec4dfc211f Simpler windows resource test 2011-11-16 17:08:16 +11:00
Simone Bordet 46aad20248 363785 - StdErrLog must use system-dependent EOL. 2011-11-15 10:19:10 +01:00
Greg Wilkins 722f390800 numerous findbugs inspired cleanups 2011-11-15 11:22:35 +11:00
Greg Wilkins 7a9b8f1e9d reverted last changes due to instability 2011-11-10 12:11:58 +11:00
Greg Wilkins d61258ec4e clean ups from review from sbordet.
Removed isBufferred
fixed instanceof ThreadDeath
avoid race with onInputShutdown
2011-11-10 10:12:37 +11:00
Greg Wilkins a36342438c cleaned up some unit tests 2011-11-09 17:03:11 +11:00
Jesse McConnell 2a6b8696d7 Merge branch 'master' into jetty-8 2011-11-08 15:59:55 -06:00
Greg Wilkins 5f2323418b cleanups after the merge 2011-11-08 12:47:28 +11:00
Greg Wilkins 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
Joakim Erdfelt e207ea357e Minor update to invalid utf8 test case (expanding bad examples) 2011-11-02 17:22:32 -07:00
Jesse McConnell 2b6fec713c Merge branch 'master' into jetty-8 2011-11-02 16:47:04 -05:00
Joakim Erdfelt e088acc559 Resolving merge 2011-10-28 13:42:07 -07:00
Joakim Erdfelt 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
Joakim Erdfelt aa73830199 Updating java comments to make clear the purpose of this new static{} block 2011-10-28 10:57:32 -07:00
Joakim Erdfelt 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
Joakim Erdfelt c02f98b7e6 More classpath mucking about in Sfl4jTestJarsRunner 2011-10-28 09:48:59 -07:00
Joakim Erdfelt 9c9f2bd7c3 Making Sfl4jTestJarsRunner use its own classloader for loading the test 2011-10-28 09:23:11 -07:00
Joakim Erdfelt 21c43b1ab9 Making Sfl4jTestJarsRunner use its own classloader for loading the test 2011-10-28 09:21:46 -07:00
Jesse McConnell 062ccd7e70 trial classloader 2011-10-28 11:15:02 -05:00
Jesse McConnell 148459bc8f trial classloader 2011-10-28 11:14:14 -05:00
Joakim Erdfelt 5c516c9e7b Making fixes to StdErrLogTest 2011-10-28 09:12:29 -07:00
Joakim Erdfelt c174304996 Making fixes to StdErrLogTest 2011-10-28 09:11:21 -07:00
Joakim Erdfelt f510e0daf9 Making fixes to StdErrLogTest 2011-10-28 09:07:03 -07:00
Joakim Erdfelt 824e6ebc52 Merge branch 'master' into slf4j-testing 2011-10-28 08:44:44 -07:00
Greg Wilkins 84b07f359e temporary disabled log format test 2011-10-28 15:25:10 +11:00