Commit Graph

339 Commits

Author SHA1 Message Date
Jesse McConnell b55ec9bac1 [maven-release-plugin] prepare for next development iteration 2011-10-06 17:59:52 -05:00
Jesse McConnell e32e8b1377 [maven-release-plugin] prepare release jetty-8.0.2.v20111006 2011-10-06 17:59:46 -05:00
Jan Bartel d862348b4c Merge remote-tracking branch 'origin/master' into jetty-8
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpConnection.java
2011-10-06 18:31:57 +11:00
Simone Bordet 12469af499 Fixed case where the http parser has received some but not all data, and suddenly reads -1. 2011-10-05 16:36:33 +02:00
Greg Wilkins f778867f32 357240 ensure half closed is not schedule with no progress 2011-10-05 14:48:47 +11:00
Jan Bartel 32dbb1bddb Merge remote-tracking branch 'origin/master' 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/pom.xml
	jetty-ajp/pom.xml
	jetty-annotations/pom.xml
	jetty-client/pom.xml
	jetty-continuation/pom.xml
	jetty-deploy/pom.xml
	jetty-deploy/src/main/config/etc/jetty-deploy.xml
	jetty-distribution/pom.xml
	jetty-http/pom.xml
	jetty-io/pom.xml
	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-jsp/src/main/java/org/eclipse/jetty/osgi/boot/jsp/FragmentActivator.java
	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/jetty-osgi-servletbridge/pom.xml
	jetty-osgi/jetty-osgi-servletbridge/src/main/java/org/eclipse/jetty/osgi/servletbridge/FrameworkLauncherExtended.java
	jetty-osgi/jetty-osgi-servletbridge/src/main/webapp/WEB-INF/web.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-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
	jetty-servlet/pom.xml
	jetty-servlets/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-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-10-04 17:45:15 +11:00
Greg Wilkins 79e431f330 cleanup 2011-09-29 17:36:23 +10:00
Greg Wilkins d0a2557527 357240 fixed client connection recycle 2011-09-29 15:50:09 +10:00
Greg Wilkins 6eaa1364e3 357240 work in progress 2011-09-28 16:21:57 +10:00
Thomas Becker 0d8bd99d6a Basic functionality for ProxyRule implemented 2011-09-26 17:50:27 -05:00
Greg Wilkins df0371796e fixed bad import 2011-09-26 15:03:12 +10:00
Greg Wilkins 0d09b6e310 358674 Still allows sslv3 for now 2011-09-23 14:11:04 +10:00
Greg Wilkins 75645cef0e 358674 Added include/exclude protocols to SslContextFactory 2011-09-23 08:02:42 +10:00
Jesse McConnell d5304b2cbc [maven-release-plugin] prepare for next development iteration 2011-09-08 12:20:15 -05:00
Jesse McConnell c33548d38a [maven-release-plugin] prepare release jetty-8.0.1.v20110908 2011-09-08 12:19:24 -05:00
Jesse McConnell ebdb89dc23 [maven-release-plugin] prepare for next development iteration 2011-09-08 12:00:16 -05:00
Jesse McConnell 932245a114 [maven-release-plugin] prepare release jetty-7.5.1.v20110908 2011-09-08 12:00:10 -05:00
Jesse McConnell 721c8ab682 updating version.txt and resetting pom version to 8.0.1-SNAPSHOT 2011-09-08 11:54:53 -05:00
Jesse McConnell 37d0f53b0a updating version.txt and resetting pom versions to 7.5.1-SNAPSHOT 2011-09-08 11:40:37 -05:00
Jesse McConnell 4e47d6a7fa [maven-release-plugin] prepare for next development iteration 2011-09-07 18:16:58 -05:00
Jesse McConnell d77a12962b [maven-release-plugin] prepare release jetty-8.0.1.v20110907 2011-09-07 18:16:50 -05:00
Jesse McConnell 6b614a54f0 [maven-release-plugin] prepare for next development iteration 2011-09-07 18:12:16 -05:00
Jesse McConnell ce55c8c601 [maven-release-plugin] prepare release jetty-7.5.1.v20110907 2011-09-07 18:12:09 -05:00
Jesse McConnell 7c7fc30b90 Merge over from jetty 7 master 2011-09-07 16:08:35 -05:00
Jesse McConnell 1744b5bce1 reset from release 2011-09-07 11:09:46 -05:00
Jesse McConnell ae86ad6d4e [maven-release-plugin] prepare for next development iteration 2011-09-07 10:03:16 -05:00
Jesse McConnell 86383afbd2 [maven-release-plugin] prepare release jetty-7.5.1.v20110907 2011-09-07 10:03:10 -05:00
Greg Wilkins 65a1e84886 misc findbugs cleanups 2011-09-07 15:57:18 +10:00
Jesse McConnell 40dcb10ed8 [maven-release-plugin] prepare for next development iteration 2011-09-01 12:24:32 -05:00
Jesse McConnell db14b194fa [maven-release-plugin] prepare release jetty-8.0.0.v20110901 2011-09-01 12:24:24 -05:00
Jesse McConnell a728021edf [maven-release-plugin] prepare for next development iteration 2011-09-01 11:17:05 -05:00
Jesse McConnell 882308f781 [maven-release-plugin] prepare release jetty-7.5.0.c20110901 2011-09-01 11:16:58 -05:00
Jan Bartel 1e079f06c9 Merge remote-tracking branch 'origin/master' into jetty-8 2011-09-01 14:11:53 +10:00
Jesse McConnell 57e9045635 [maven-release-plugin] prepare for next development iteration 2011-08-31 14:17:32 -05:00
Jesse McConnell 317491a4d7 [maven-release-plugin] prepare release jetty-7.5.0.v20110901 2011-08-31 14:17:25 -05:00
Joakim Erdfelt e60df19490 [maven-release-plugin] prepare for next development iteration 2011-08-30 13:13:46 -07:00
Joakim Erdfelt 460c754e4e [maven-release-plugin] prepare release jetty-7.5.0.RC2 2011-08-30 13:13:39 -07:00
Joakim Erdfelt 7663a83616 [maven-release-plugin] rollback the release of jetty-7.5.0.RC2 2011-08-30 12:52:45 -07:00
Joakim Erdfelt 4c5c954d23 [maven-release-plugin] prepare release jetty-7.5.0.RC2 2011-08-30 12:47:42 -07:00
Greg Wilkins 2a5a3a4d01 free generator buffers 2011-08-29 12:26:48 +10:00
Joakim Erdfelt 79db394552 Merge from trunk 2011-08-26 10:12:45 -07:00
Michael Gorovoy 19a8916982 353624 HttpURI accepts java.net.URI object in constructor 2011-08-25 18:51:29 -04:00
Joakim Erdfelt f15617fbb2 293739 - Deprecate static Jetty Log usage in favor of named logs
+ Finished conversion of jetty-continuation, jetty-http, jetty-io
2011-08-24 12:51:39 -07:00
Greg Wilkins e5a3cb9cef [maven-release-plugin] prepare for next development iteration 2011-08-19 22:17:46 +10:00
Greg Wilkins f0b4ffffda [maven-release-plugin] prepare release jetty-7.5.0.RC1 2011-08-19 22:17:33 +10:00
Jesse McConnell 4700979200 [maven-release-plugin] prepare for next development iteration 2011-08-16 09:26:56 -05:00
Jesse McConnell 3ae78dfbb2 [maven-release-plugin] prepare release jetty-8.0.0.RC0 2011-08-16 09:26:48 -05:00
Jan Bartel 6e8afd6795 Merge remote-tracking branch 'origin/master' into jetty-8
Conflicts:
	VERSION.txt
2011-08-16 11:35:46 +10:00
Jesse McConnell 4d7ba354e1 [maven-release-plugin] prepare for next development iteration 2011-08-15 14:18:53 -05:00
Jesse McConnell 2175bae0a0 [maven-release-plugin] prepare release jetty-7.5.0.RC0 2011-08-15 14:18:42 -05:00