590 Commits

Author SHA1 Message Date
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
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
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
Jesse McConnell
381615f52d merge from master 2012-03-07 16:44:31 -06: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
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
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