2444 Commits

Author SHA1 Message Date
Jesse McConnell
e32e8b1377 [maven-release-plugin] prepare release jetty-8.0.2.v20111006 2011-10-06 17:59:46 -05:00
Jesse McConnell
0c55c774d4 [maven-release-plugin] prepare for next development iteration 2011-10-06 17:25:38 -05:00
Jesse McConnell
4d822759de [maven-release-plugin] prepare release jetty-7.5.2.v20111006 2011-10-06 17:25:32 -05:00
Jesse McConnell
b58006b4a4 [maven-release-plugin] prepare for next development iteration 2011-10-06 09:43:37 -05:00
Jesse McConnell
7eca345e8d [maven-release-plugin] prepare release jetty-7.5.2.v20111006 2011-10-06 09:43:31 -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
Thomas Becker
b3e6ebf416 Fix for #358121 (Utf8Appendable refactored to use Bjoern Hoehrmann's decoder).
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2011-09-21 11:58:17 +02:00
Joakim Erdfelt
82f48ada9a 342161 - ScannerTest fails intermittently on Mac OS X
+ changing test directory to use test specific directory to avoid
  conflicts with /tmp directory reuse amoung other tests.
2011-09-13 11:48:16 -07:00
Greg Wilkins
c5e6378b84 357338 Improve UTF-8 validation 2011-09-12 13:14:09 +10:00
Joakim Erdfelt
11ca71700f Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2011-09-09 09:53:28 -07:00
Joakim Erdfelt
f84c859bbc 357216 - Logging via Log4J does not expand braces in format strings
+ Made JettyAwareLogger more resilient to logger downstream
  implementations by making it perform the slf4j message formatting
  before handing it off to the LocationAwareLogger method(s)
2011-09-09 09:51:52 -07: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
f8c1858efb Merge branch 'jetty-8' into release-8 2011-09-08 11:52:23 -05:00
Jesse McConnell
97dee04a68 merge over from jetty7 2011-09-08 11:51:48 -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
4a575d4958 Merge branch 'master' into release 2011-09-08 11:36:48 -05:00
Greg Wilkins
e914e0f97f improved websocket handling of error cases for autobahn test suite 2011-09-09 01:52:27 +10: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
cf45e7b647 356823 correctly decode close codes. Send not utf-8 close code. 2011-09-07 11:37:46 +10:00
Greg Wilkins
ba5af45d17 350634 Added Resource.newResource(File) 2011-09-06 14:29:33 +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
402352962d Merge branch 'master' into jetty-8 2011-09-01 11:24:21 -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
Jesse McConnell
c3e170bb74 Merge branch 'master' into release 2011-09-01 10:56:08 -05:00
Simone Bordet
93aed81e34 Added protected getter for the job queue. 2011-09-01 16:50:49 +02:00
Simone Bordet
d55abffe2d Refactored job.run() into its own method to allow subclasses to override to perform pre/post actions. 2011-09-01 16:29:26 +02: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
45148353ec 293739 Hide stacks in named log testing. Various other minor log cleanups in output. 2011-08-30 16:05:21 +10:00
Greg Wilkins
33fa7afb47 356144 added SelectorManager.setSelectorPriorityDelta(int) 2011-08-30 14:24:28 +10:00
Joakim Erdfelt
79db394552 Merge from trunk 2011-08-26 10:12:45 -07:00
Greg Wilkins
c99498af91 353073 factory pattern for clients 2011-08-26 11:50:33 +10:00