Commit Graph

1188 Commits

Author SHA1 Message Date
Jesse McConnell e6b25b82ea set release version.txt 2012-11-19 17:43:55 -06:00
Greg Wilkins f336511f87 Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
	VERSION.txt
	jetty-http/src/main/java/org/eclipse/jetty/http/HttpParser.java
	jetty-server/src/main/java/org/eclipse/jetty/server/AbstractHttpConnection.java
2012-11-08 14:58:10 +11:00
Greg Wilkins b3274a6baa Merge remote-tracking branch 'origin/jetty-7' into jetty-8
Conflicts:
	VERSION.txt
2012-11-08 14:41:01 +11:00
Jesse McConnell d0819605af set for dev 2012-11-06 12:01:06 -06:00
Jesse McConnell edf898bdd1 set for dev 2012-11-06 09:00:48 -06:00
Jesse McConnell a08536c8bc set for dev 2012-11-06 08:18:06 -06:00
Jesse McConnell 32d0f950a9 set for dev 2012-11-06 08:15:05 -06:00
Jesse McConnell 6fc39fc781 set for release 2012-11-06 07:45:17 -06:00
Jesse McConnell ec2fb110f1 reset 2012-11-06 07:44:12 -06:00
Jesse McConnell 7fadb8548b set for release 2012-11-06 07:41:59 -06:00
Jesse McConnell 581779a9df reset 2012-11-06 07:37:07 -06: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 9bf7d89190 set for dev 2012-11-05 14:39:50 -06:00
Jesse McConnell c74a56582a set for dev 2012-11-05 13:24:43 -06:00
Jesse McConnell 063efdc484 Updating VERSION.txt top section 2012-11-05 11:57:40 -06:00
Jesse McConnell d3565e8610 Updating VERSION.txt top section 2012-11-05 11:55:10 -06:00
Jesse McConnell 92e2ad44fc Updating VERSION.txt top section 2012-11-05 11:45:59 -06:00
Joakim Erdfelt c388d0e586 VERSION.txt cleanup + issue refresh of 9.0.0.M1 2012-10-16 12:19:22 -07:00
Jesse McConnell cd8f940bab set for dev 2012-10-15 15:08:27 -05:00
Jesse McConnell 82316d886d Updating VERSION.txt top section 2012-10-15 12:36:44 -05:00
Jesse McConnell b3ee687eda set for m0 2012-09-21 12:58:34 -05:00
Jesse McConnell 73d04ca247 set for release of milestone 2012-09-20 13:55:42 -05:00
Jesse McConnell c7f8bdfee8 prep for dev 2012-09-10 16:10:42 -05:00
Jesse McConnell ff2b988eff prep for dev 2012-09-10 15:40:04 -05:00
Jesse McConnell 0c3f1b6ab1 prep for release 2012-09-10 13:15:40 -05:00
Jesse McConnell 4180d7e1f5 prepare for release 2012-09-10 12:59:04 -05:00
Jesse McConnell 83781bce8d prepare for release 2012-09-10 12:57:18 -05:00
Jesse McConnell 33ce6e6787 prep for dev 2012-09-03 16:23:44 -05:00
Jesse McConnell fb929aca20 prep for dev 2012-09-03 14:32:38 -05:00
Jesse McConnell ff57f913e8 Updating VERSION.txt top section 2012-09-03 12:53:24 -05:00
Jesse McConnell 1587c3e8c5 Updating VERSION.txt top section 2012-09-03 12:49:16 -05:00
Thomas Becker 369bc035fc jetty-9: jetty-spdy refactored to match jetty-9. 2012-07-27 16:18:47 +02:00
Jan Bartel cdbec2c78b Merge remote-tracking branch 'origin/master' into jetty-8 2012-07-26 19:05:51 +10:00
Thomas Becker 688eec732f version.txt update 2012-07-25 20:20:17 +02:00
Jesse McConnell 3530da5515 reset for dev 2012-07-17 10:39:28 -05:00
Jesse McConnell db2118df4a reset for dev 2012-07-17 10:38:35 -05:00
Jesse McConnell 88922d3dc9 set for release 2012-07-16 12:58:26 -05:00
Jesse McConnell 5e8165e2db set for release 2012-07-16 12:58:15 -05:00
Jesse McConnell e082da1ce0 reset for release 2012-07-16 12:55:44 -05:00
Jesse McConnell f59b2a0632 reset release 2012-07-16 12:54:36 -05:00
Jesse McConnell 957d39da17 merge master 2012-07-16 12:51:18 -05:00
Jesse McConnell fc7c186cbf reset for dev 2012-07-13 12:25:39 -05:00
Jesse McConnell 9353ef6461 reset for dev 2012-07-13 12:24:20 -05:00
Jesse McConnell 0d74198345 Updating VERSION.txt top section 2012-07-13 09:07:51 -05:00
Jesse McConnell bcd2d66907 Updating VERSION.txt top section 2012-07-13 09:07:50 -05:00
Jesse McConnell f7f0a5b22b reset for dev 2012-05-24 18:01:08 -05:00
Jesse McConnell 2a4b7f49a1 reset for dev 2012-05-24 16:39:28 -05:00
Jesse McConnell d0a92ebb54 Updating VERSION.txt top section 2012-05-24 09:02:07 -05:00
Jesse McConnell aa7e1b699e Updating VERSION.txt top section 2012-05-24 09:02:05 -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
Jesse McConnell b51f521772 set for dev 2012-05-22 16:49:20 -05:00
Jesse McConnell 1eb73bae2d set for dev 2012-05-22 16:48:40 -05:00
Jesse McConnell 54d1ff7a19 Updating VERSION.txt top section 2012-05-22 11:54:50 -05:00
Jesse McConnell a2ed87a046 Updating VERSION.txt top section 2012-05-22 11:52:59 -05:00
Jesse McConnell fcf7a081ce prep for dev 2012-04-16 12:54:29 -05:00
Jesse McConnell 582f92aa21 prep for dev 2012-04-16 12:53:30 -05:00
Jesse McConnell 1aba5dd41b Updating VERSION.txt top section 2012-04-16 09:11:31 -05:00
Jesse McConnell ff29659869 Updating VERSION.txt top section 2012-04-16 09:11:00 -05:00
Jesse McConnell 461282a573 Updating VERSION.txt top section 2012-04-16 09:10:25 -05:00
Simone Bordet 45b2c3b1b5 Merged from master after fixing typo in jetty-spdy.xml. 2012-04-16 15:55:49 +02:00
Jesse McConnell 9c4a58200b prep for dev 2012-04-13 18:28:51 -05:00
Jesse McConnell 443fbdfe7d set for dev 2012-04-13 17:09:34 -05:00
Jesse McConnell 71b3f75a90 Updating VERSION.txt top section 2012-04-13 15:05:26 -05:00
Jesse McConnell 193b0d6497 Updating VERSION.txt top section 2012-04-13 15:03:22 -05:00
Jesse McConnell 4f7c896b3d merge from master 2012-04-13 14:10:30 -05:00
Jesse McConnell f8b5c0040d reset for release 2012-04-13 14:09:06 -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 92c6b5338b Updating VERSION.txt top section 2012-04-12 11:26:08 -05:00
Jesse McConnell a164adc48e Updating VERSION.txt top section 2012-04-12 10:38:19 -05:00
Jesse McConnell 7078716df4 Updating VERSION.txt top section 2012-04-12 10:01:24 -05:00
Jesse McConnell 7f06c73d6f Updating VERSION.txt top section 2012-04-12 09:16:35 -05:00
Jesse McConnell 200d9b5de0 reset for dev 2012-03-09 00:42:24 -06:00
Jesse McConnell 3561bcbf40 set for dev 2012-03-08 21:53:24 -06:00
Jesse McConnell fed765cf27 Updating VERSION.txt top section 2012-03-08 20:55:56 -06:00
Jesse McConnell 67f3f05d70 Updating VERSION.txt top section 2012-03-08 20:44:47 -06:00
Jesse McConnell 381615f52d merge from master 2012-03-07 16:44:31 -06:00
Jesse McConnell 9b669b335e update version 2012-03-02 10:47:20 -06:00
Jesse McConnell fe6445ff7d reset version for development 2012-03-02 09:26:30 -06:00
Jesse McConnell c58092f6f7 Updating VERSION.txt top section 2012-03-02 08:14:17 -06:00
Jesse McConnell 22dce614a3 Updating VERSION.txt top section 2012-03-02 08:14:16 -06:00
Jesse McConnell b391937bb8 update version 2012-02-15 16:09:42 -06:00
Jesse McConnell 56f72e6fa9 update version 2012-02-15 15:20:50 -06:00
Jesse McConnell 041bc101df update version 2012-02-15 14:05:42 -06:00
Jesse McConnell e0d7337fa3 Updating VERSION.txt top section 2012-02-15 13:58:49 -06:00
Jesse McConnell 25e1ce8a10 update version 2012-01-27 10:48:54 -06:00
Jesse McConnell 7a553b6469 set version 2012-01-27 09:06:02 -06:00
Jesse McConnell 11e7b1b1c1 update version 2012-01-27 07:52:29 -06:00
Jesse McConnell 8e65e81618 update version 2012-01-27 07:50:10 -06:00
Jesse McConnell 2a224cf377 update version 2012-01-25 12:03:15 -06:00
Jesse McConnell 704ce74f84 Updating VERSION.txt top section 2012-01-25 10:54:49 -06:00
Jesse McConnell 82126fbd91 Updating VERSION.txt top section 2012-01-25 10:53:45 -06:00
Jesse McConnell 3854701f85 Updating VERSION.txt top section 2012-01-25 09:08:12 -06:00
Jesse McConnell bdabfe5dc5 reset version for dev 2012-01-20 13:51:34 -06:00
Jesse McConnell 240fd1bf14 set for release 2012-01-20 11:43:31 -06:00
Jesse McConnell 8f9722bf4a Merge branch 'master' into jetty-8 2012-01-20 11:42:18 -06:00
Jesse McConnell c2d33f8f69 set for dev 2012-01-20 11:34:23 -06:00
Jesse McConnell 1e3273d20c set for release 2012-01-20 08:42:24 -06:00
Jesse McConnell 7cb15929f7 Merge branch 'master' into jetty-8 2012-01-17 13:37:28 -06:00
Jesse McConnell 90184ab3c3 Latest merge from master 2012-01-17 13:36:44 -06:00
Joakim Erdfelt 6da9a22c09 Minor update to VERSION.txt format 2012-01-17 11:21:18 -07:00
Jesse McConnell 593af6a226 update version 2012-01-13 12:25:01 -06:00
Jesse McConnell 38fa2d00d4 Updating VERSION.txt top section 2012-01-13 11:21:37 -06:00
Jesse McConnell 2eb1b3c3c4 Updating VERSION.txt top section 2012-01-13 09:20:05 -06:00
Jesse McConnell 60682d4b62 Updating VERSION.txt top section 2012-01-13 08:14:16 -06:00
Jan Bartel 1fbec51c8a Merge remote-tracking branch 'origin/master' into jetty-8 2012-01-10 16:08:59 +11:00
Joakim Erdfelt 505a76df05 Updating VERSION.txt top section 2012-01-05 10:54:42 -07:00
Joakim Erdfelt bbe48ddfbb Updating version jetty-7.6.0.RC3 in VERSION.txt 2012-01-05 09:26:44 -07:00
hmalphettes 4f8cff8ccd bug 367548 the nested package must not be imported twice in jetty-osgi-boot 2011-12-27 07:59:13 +08:00
Jesse McConnell ed46b71f37 Merge branch 'master' into jetty-8 2011-12-23 07:44:29 -06:00
Jesse McConnell 30bd9ee000 update version 2011-12-22 16:54:19 -06:00
Jesse McConnell 64b42a1f0c updating version.txt 2011-12-22 14:40:32 -06:00
Jesse McConnell d7ba9772f6 Updating VERSION.txt top section 2011-12-22 12:56:08 -06:00
Jesse McConnell 06882e3c56 Updating VERSION.txt top section 2011-12-22 12:51:44 -06:00
hmalphettes 49556c0f40 bug 359329. missing import/export in jetty-plus jetty-jaspi 2011-12-09 16:52:58 +08:00
Jesse McConnell c6d5d1713c update version 2011-12-06 16:31:03 -06:00
Jesse McConnell f188ea4c0f Updating VERSION.txt top section 2011-12-06 15:15:56 -06:00
Jan Bartel 0363b8100f Merge remote-tracking branch 'origin/master' into jetty-8 2011-12-05 15:24:22 +11:00
Jesse McConnell 8ef68e1e0e Updating VERSION.txt top section 2011-12-04 15:33:07 -06:00
Jesse McConnell 56cd2df556 Updating VERSION.txt top section 2011-12-04 12:11:35 -06:00
hmalphettes 89afbdf31d 360245 OSGi: javax.servlet packages version refactored 3.0 -> 2.6 2011-12-02 17:27:26 +08:00
Greg Wilkins 24ccaec3da Updating VERSION.txt top section 2011-11-30 15:50:25 +11:00
Greg Wilkins 46c10b2b8a Updating VERSION.txt top section 2011-11-30 12:46:36 +11:00
Greg Wilkins dc92728c00 Merge remote-tracking branch 'origin/master' into jetty-8
Conflicts:
	VERSION.txt
2011-11-30 12:21:02 +11:00
Greg Wilkins 0b066d3d8e Updating VERSION.txt top section 2011-11-30 07:29:32 +11:00
Greg Wilkins a47e07445a Upating VERSION.txt top section 2011-11-29 13:08:26 +11:00
Greg Wilkins f3b2289527 release version 2011-11-29 13:06:05 +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 11a79f7dee check nonce count 2011-11-28 12:06:43 +11:00
Greg Wilkins a9223fe208 ready for next release 2011-11-28 08:48:34 +11:00
Jesse McConnell 94124f7412 merge from master 2011-10-26 15:26:49 -05:00
Jesse McConnell 97d0d9d812 Updating VERSION.txt top section 2011-10-24 16:36:35 -05:00
Jesse McConnell 88bc111ac3 Updating VERSION.txt top section 2011-10-24 15:49:46 -05:00
Jesse McConnell 79c674a4ce Updating VERSION.txt top section 2011-10-24 14:40:03 -05:00
Jesse McConnell 0405be3bed Updating VERSION.txt top section 2011-10-24 14:31:16 -05:00
Jesse McConnell 2700581906 Merge from master 2011-10-13 07:59:30 -05:00
Jesse McConnell ec1a23adc9 Updating VERSION.txt top section 2011-10-11 11:03:39 -05:00
Jesse McConnell 3e62343aae Updating VERSION.txt top section 2011-10-11 09:48:57 -05:00
Jesse McConnell 2038d75c8c Updating VERSION.txt top section 2011-10-11 09:47:05 -05:00
Jesse McConnell 925335dab2 merge from master 2011-10-11 09:43:27 -05:00
Jesse McConnell 55842580aa Updating VERSION.txt top section 2011-10-11 08:25:05 -05:00
Jesse McConnell 22c15a8cb8 Updating VERSION.txt top section 2011-10-06 20:11:39 -05:00
Jesse McConnell 93c0cb62ca Updating VERSION.txt top section 2011-10-06 19:38:14 -05:00
Jesse McConnell 3e1a8c08bc Updating VERSION.txt top section 2011-10-06 17:32:47 -05:00
Jesse McConnell 97e286a1ab update VERSION 2011-10-06 17:03:58 -05:00
Jesse McConnell 7958b033b0 Updating VERSION.txt top section 2011-10-06 09:22:28 -05: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
hmalphettes ab6ff817a3 JETTY-1378 new sys property for the latest jsp-impl to force the use of the JDTCompiler when running in OSGi. 2011-10-03 09:37:53 +08:00
Simone Bordet a699ffd869 Updated VERSION.txt for #353839. 2011-09-22 12:14:15 +02:00
Simone Bordet 0bd7519a2e Fix for #358121 (Utf8Appendable refactored to use Bjoern Hoehrmann's decoder). 2011-09-21 15:54:53 +02:00
Jesse McConnell 9bcde10aa9 reset version for next release 2011-09-08 13:30:27 -05:00
Jesse McConnell 0046c5a9c2 set for next release 2011-09-08 12:45:59 -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 f7e25b2a13 Updating VERSION.txt top section 2011-09-07 17:56:28 -05:00
Jesse McConnell 66af591b8c Updating VERSION.txt top section 2011-09-07 17:52:40 -05:00
Jesse McConnell 336e3b383b reset for release 2011-09-07 17:49:08 -05:00
Jesse McConnell 7c7fc30b90 Merge over from jetty 7 master 2011-09-07 16:08:35 -05:00
Jesse McConnell 7f5cafc717 Updating VERSION.txt top section 2011-09-07 10:46:08 -05:00
Jesse McConnell 4169d610b0 Updating VERSION.txt top section 2011-09-07 09:44:20 -05:00
Greg Wilkins 04385c5c3b Fixed missing 7.4.5 2011-09-07 19:56:59 +10:00
Simone Bordet b1f95541de Fixes #356749 (WebSocket message length is computed wrongly when greater than 0xFFFF), and a bunch of other silly mistakes. 2011-09-06 00:18:02 +02:00
Simone Bordet 1f380606d1 Fixes #356695 (websocket packages should be provided), along with commit a8ce6e8878. 2011-09-05 11:29:43 +02:00
Jesse McConnell 639d12be02 Updating VERSION.txt top section 2011-09-01 12:04:40 -05:00
Jesse McConnell bfcd3f6308 Updating VERSION.txt top section 2011-09-01 11:54:29 -05:00
Jesse McConnell 7f405070cb Updating VERSION.txt top section 2011-09-01 10:57:29 -05:00
Jan Bartel 1e079f06c9 Merge remote-tracking branch 'origin/master' into jetty-8 2011-09-01 14:11:53 +10:00
Jesse McConnell d959276c9a Updating VERSION.txt top section 2011-08-31 13:58:27 -05:00
Jesse McConnell 0b1fff1a7a Updating VERSION.txt top section 2011-08-31 13:56:53 -05:00
Joakim Erdfelt b0b4c31dfe Setting Next Development Version in VERSION.txt 2011-08-30 14:01:32 -07:00
Joakim Erdfelt ce53687643 Updating VERSION.txt to 7.5.0.RC2 2011-08-30 12:29:07 -07:00
Jan Bartel 1ff02e56e2 356137 - Upgrade to jsp implementation version 2.1.3-b10 2011-08-30 11:26:21 +10:00
Michael Gorovoy 4bab65040d 356128 Removed integration tests from jetty-monitor module 2011-08-29 19:36:40 -04:00
Michael Gorovoy 0763e040e5 353014 TimeoutExchangeTest run time reduced
Patch provided by Thomas Becker <tbecker@intalio.com>
2011-08-29 16:18:45 -04:00
Michael Gorovoy 1ba88a6a4b 352188 TestClient correctly processes --host option in jetty-websocket 2011-08-29 14:13:53 -04:00
Michael Gorovoy 103d7a87c2 353623 Added new methods to HttpExchange 2011-08-26 03:49:58 -04:00
Michael Gorovoy 19a8916982 353624 HttpURI accepts java.net.URI object in constructor 2011-08-25 18:51:29 -04:00
Michael Gorovoy d40b9ccca5 Merge branch 'jetty1410' 2011-08-24 21:26:01 -04:00
Michael Gorovoy a81611400d 354080 ServletContextHandler allows to replace any subordinate handler when restarted 2011-08-24 18:14:10 -04:00
Michael Gorovoy 07b8f08a37 JETTY-1410 HTTP client handles CONTINUE 100 response correctly 2011-08-23 16:20:37 +10:00
Joakim Erdfelt b34ccc5915 Making VERSION.txt automatically update itself in the jetty-distribution tarball 2011-08-19 10:52:48 -07:00
Michael Gorovoy bb03bb090b Moved 355162 entry to correct release 2011-08-19 11:09:17 -04:00
Greg Wilkins 30603c013e set version for RC1 2011-08-19 21:55:32 +10:00
Joakim Erdfelt ffee22f357 Fixing NPE in jetty-version-maven-plugin 2011-08-18 14:36:08 -07:00
Michael Gorovoy 0720ba9c04 355162 Allow creating an empty resource collection 2011-08-18 17:13:25 -04:00
Joakim Erdfelt 64605e9129 Merging version-updates 2011-08-18 13:46:45 -07:00
Simone Bordet fc55901661 Merge remote-tracking branch 'origin/master'
Conflicts:
	VERSION.txt
2011-08-18 17:42:32 +02:00
Simone Bordet 2d6491b78f Fixes #355103 (Make allowCredentials default to true in CrossOriginFilter). 2011-08-18 17:41:21 +02:00
Jan Bartel 817ecc25c3 Part of: JETTY-1414 HashLoginService doesn't refresh realm if specified config filename is not an absolute platform specific value 2011-08-18 16:10:33 +10:00
Michael Gorovoy 39fce10d74 335001 Eliminate expected exceptions from log when running in JBoss 2011-08-17 15:32:31 -04:00
Joakim Erdfelt be4d0cf3ec Updating VERSION.txt (in a branch) with formatting (and missed entries in 7.5.0.RC0) using jetty-version-maven-plugin 2011-08-16 11:42:20 -07:00
Jesse McConnell 4eef2c792a set for release 2011-08-16 09:10:43 -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
Joakim Erdfelt c2c4234690 Fixing minor formatting issues in prep for jetty-version-maven-plugin 2011-08-15 12:54:42 -07:00
Jesse McConnell 0610ce4387 update for release 2011-08-15 14:03:25 -05:00
Michael Gorovoy 6fb751e216 354397 RewriteRegexRule handles special characters in regex group 2011-08-15 12:24:07 -04:00
Jan Bartel a8d69f44c6 352565 - cookie httponly flag ignored 2011-08-15 17:13:51 +10:00
Jan Bartel 050cb83b35 Merge remote-tracking branch 'origin/master' into jetty-8
Conflicts:
	jetty-osgi/jetty-osgi-equinoxtools/src/main/java/org/eclipse/jetty/osgi/equinoxtools/console/EquinoxConsoleWebSocketServlet.java
	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/GzipFilterTest.java
	jetty-websocket/pom.xml
2011-08-12 18:43:15 +10:00
Jan Bartel 9315e1896d 354466 - Typo in example config of jetty-plus.xml 2011-08-11 19:31:47 +10:00
Jan Bartel 548696ef60 354204 - Charset encodings property file not used 2011-08-09 13:51:14 +10:00
Michael Gorovoy d496a4f80a 354014 Content-Length is passed to wrapped response in GZipFilter 2011-08-08 18:03:36 -04:00
Simone Bordet 01cbaf528b Fixes #353862 (Improve performance of QuotedStringTokenizer.quote()). 2011-08-04 12:15:39 +02:00
Thomas Becker 0a6c7ad846 353563: HttpDestinationQueueTest too slow
Signed-off-by: Jesse McConnell <jesse.mcconnell@gmail.com>
2011-08-02 08:39:38 -05:00
Jesse McConnell cd0dd3e8ff [Bug 352999] test performance patch applied to jetty-client, thanks Thomas 2011-08-02 08:04:18 -05:00
Jan Bartel 02a66a00fb Merge remote-tracking branch 'origin/master' into jetty-8
Conflicts:
	VERSION.txt
	jetty-osgi/jetty-osgi-boot-logback/META-INF/MANIFEST.MF
	jetty-osgi/jetty-osgi-equinoxtools/src/main/java/org/eclipse/jetty/osgi/equinoxtools/WebEquinoxToolsActivator.java
	pom.xml
2011-08-01 14:39:39 +10:00
Jan Bartel 56866b3e68 Bug 353465 - JAASLoginService ignores callbackHandlerClass 2011-08-01 12:55:32 +10:00
Jesse McConnell 062feb4750 [Bug 353165] remove a directory check for directories of jar files,
rational being that some users wish to point to unpacked jar files
using symbolic links and this was preventing that behavior
2011-07-29 11:21:13 -05:00
Jan Bartel 6081e74fe6 353285 - ServletSecurity annotation ignored 2011-07-29 12:03:35 +10:00
Jan Bartel c2cf8077b3 Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
Conflicts:
	VERSION.txt
2011-07-29 11:09:52 +10:00
Jan Bartel 991c186159 353095 - maven-jetty-plugin: PermGen leak due to javax.el.BeanELResolver 2011-07-29 11:07:20 +10:00
Jesse McConnell 9b4ab80ea6 [Bug 353210] align bundle version in MANIFEST.MF 2011-07-27 09:38:30 -05:00
Greg Wilkins 5859a85919 353073 WebSocketClient 2011-07-26 17:31:55 +10:00
Jan Bartel 93cc111a02 Merge remote-tracking branch 'origin/master' into jetty-8
Conflicts:
	VERSION.txt
	jetty-io/src/main/java/org/eclipse/jetty/io/nio/IndirectNIOBuffer.java
2011-07-25 17:42:30 +10:00
Greg Wilkins ee02bb4b17 Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2011-07-22 11:04:11 +10:00
Greg Wilkins f496c26c71 352421 HttpURI paths beginning with . 2011-07-22 11:03:48 +10:00
Michael Gorovoy 2790badf6d 352786 GzipFilter fails to pass parameters to GzipResponseWrapper 2011-07-21 13:11:36 -04:00
Michael Gorovoy 0cc914c4bb 352684 Implemented spinning thread analyzer 2011-07-20 19:30:44 -04:00
Greg Wilkins 61b2a5c751 298502 Handle 200 Connect responses with no content-length 2011-07-15 15:50:41 +10:00
Greg Wilkins 6349100c9d Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2011-07-15 15:22:51 +10:00
Jan Bartel 21f924fa1d 352176 - xml parsing on startElement should be more flexible on using qName or localName 2011-07-15 15:21:04 +10:00
Greg Wilkins b62c5cdde6 298502 added ProxyFakeTunnelTest.java to demonstrate the issue 2011-07-15 15:06:26 +10:00
Jan Bartel 295634a369 352046 - Need try/catch around features set in XmlParser 2011-07-14 15:50:37 +10:00
Jan Bartel e04627a4ca Add release date for 8.0.0.M3 to VERSION.txt for correctness. 2011-07-12 11:06:46 +10:00
Jan Bartel f1b743a114 Enable annotations by default (because they are needed by servlet 3.0) 2011-07-11 18:00:34 +10:00
Jan Bartel 236bd193e0 Merge remote-tracking branch 'origin/master' into jetty-8
Conflicts:
	VERSION.txt
	jetty-server/src/main/java/org/eclipse/jetty/server/SessionManager.java
	jetty-server/src/main/java/org/eclipse/jetty/server/session/AbstractSessionManager.java
	jetty-server/src/main/java/org/eclipse/jetty/server/session/SessionHandler.java
2011-07-11 14:54:23 +10:00
Jan Bartel 86f7e76c4d Merge of 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/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/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-nested/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/META-INF/MANIFEST.MF
	jetty-osgi/jetty-osgi-boot/pom.xml
	jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/OSGiAppProvider.java
	jetty-osgi/jetty-osgi-equinoxtools/META-INF/MANIFEST.MF
	jetty-osgi/jetty-osgi-equinoxtools/pom.xml
	jetty-osgi/jetty-osgi-equinoxtools/src/main/java/org/eclipse/jetty/osgi/equinoxtools/console/EquinoxConsoleContinuationServlet.java
	jetty-osgi/jetty-osgi-httpservice/pom.xml
	jetty-osgi/jetty-osgi-servletbridge/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-servlets/src/main/java/org/eclipse/jetty/servlets/ProxyServlet.java
	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-07-11 12:05:58 +10:00
Michael Gorovoy 8babf3ae17 351576 Do not use deprecated method File.toURL() 2011-07-08 17:21:02 -04:00
Greg Wilkins 4e8598eb00 351516 Refactored sessions to better support nosql session managers 2011-07-08 17:43:53 +10:00
Jesse McConnell 9eb0f5354d update version for release 2011-07-07 18:29:26 -05:00
Michael Gorovoy 2eaad85a0c 350634 Reverted FileResource constructor changes
This reverts commit 95ff9d73f0.
2011-07-07 18:04:28 -04:00
Jan Bartel 7908c4e825 JETTY-1153 Default charset/encoding of HTTP POST requests 2011-07-07 19:56:17 +10:00
Greg Wilkins 17e907c2fb git diff 54e885d967 remotes/origin/jetty-8-historical | patch -p1 ; git add -A 2011-07-07 18:18:24 +10:00
Michael Gorovoy a7eabf0757 350397 SelectChannelConnector does not shutdown gracefully 2011-07-06 16:14:54 -04:00
Jan Bartel c88fc8cd25 351199 - HttpServletResponse.encodeURL() wrongly encodes an url without path when cookies are disabled
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3465 7e9141cc-0065-0410-87d8-b60c137991c4
2011-07-06 07:29:19 +00:00
Jan Bartel f7ee9a98ee 345268 JDBCSessionManager does not work with maxInactiveInterval = -1
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3461 7e9141cc-0065-0410-87d8-b60c137991c4
2011-07-04 08:08:52 +00:00
Jan Bartel dd3361047d 351039 Forward dispatch should retain locale
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3460 7e9141cc-0065-0410-87d8-b60c137991c4
2011-07-04 02:54:58 +00:00
Michael Gorovoy b5a2e7e426 308851 Converted all jetty-client module tests to JUnit 4
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3459 7e9141cc-0065-0410-87d8-b60c137991c4
2011-07-02 00:57:56 +00:00
Michael Gorovoy 9807ac7f21 JETTY-1380 Jetty Rewrite example does not work in Hightide
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3458 7e9141cc-0065-0410-87d8-b60c137991c4
2011-07-01 21:06:34 +00:00
Jesse McConnell aed90c1bb6 adjust VERSION.txt for new release
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3451 7e9141cc-0065-0410-87d8-b60c137991c4
2011-07-01 10:58:12 +00:00
Jesse McConnell b4c5512ff4 adjust VERSION.txt for new release
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3450 7e9141cc-0065-0410-87d8-b60c137991c4
2011-07-01 10:57:14 +00:00
Jan Bartel 8fcac4a34e 324704 JDBC Session Manager reloading session
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3449 7e9141cc-0065-0410-87d8-b60c137991c4
2011-07-01 05:59:20 +00:00
Greg Wilkins baabacfe95 reverted to 7.4.4-SNAPSHOT
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3448 7e9141cc-0065-0410-87d8-b60c137991c4
2011-07-01 02:22:56 +00:00
Jesse McConnell d440e5262f version.txt for release
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3444 7e9141cc-0065-0410-87d8-b60c137991c4
2011-07-01 00:39:19 +00:00
Michael Gorovoy c17b91fa86 JETTY-1385 NPE in jetty client's HTttpExchange.setRequestContentSource(InputStream)
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3438 7e9141cc-0065-0410-87d8-b60c137991c4
2011-06-29 19:01:17 +00:00
Greg Wilkins c2a6df4c47 350642 Do not close SCEP during NIOBuffer manipulation
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3436 7e9141cc-0065-0410-87d8-b60c137991c4
2011-06-29 02:51:09 +00:00
Greg Wilkins 97291cc28a JETTY-1390 RewriteHandler handles encoded URIs
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3435 7e9141cc-0065-0410-87d8-b60c137991c4
2011-06-29 01:47:02 +00:00
Michael Gorovoy 95ff9d73f0 350634 Cleanup FileResource construction
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3434 7e9141cc-0065-0410-87d8-b60c137991c4
2011-06-29 00:59:41 +00:00
Michael Gorovoy 0b9f348132 308851 Convert HttpExchangeTest and related tests to JUnit 4
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3433 7e9141cc-0065-0410-87d8-b60c137991c4
2011-06-29 00:17:13 +00:00
Michael Gorovoy 9235b429bb 347468 o.e.j.deploy.binding.GlobalWebappConfigBindingTest fails on Windows platform
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3432 7e9141cc-0065-0410-87d8-b60c137991c4
2011-06-28 18:00:19 +00:00