Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
5,504 Commits 68 Branches 465 Tags 359 MiB
Commit Graph

5504 Commits

Author SHA1 Message Date
Joakim Erdfelt 6311976e86 Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9 2012-08-17 13:48:22 -07:00
Joakim Erdfelt b36b41afd7 Fixing websocket-client upgrade connection -> websocket connection handling 2012-08-17 13:48:04 -07:00
Joakim Erdfelt 3d1d76d214 Merge from jetty-8 to jetty-9 (license header standarization) 2012-08-17 13:44:22 -07:00
Jesse McConnell 8e9bcf48f2 Merge branch 'master' into jetty-8 2012-08-17 14:52:03 -05:00
Jesse McConnell 5de0cee1eb merge from master + license block standardization 2012-08-17 14:50:43 -05:00
Thomas Becker ce6820b67b jetty-9: extract common stuff from HttpManyWaysToCommitTest and HttpManyWaysToAsyncCommitTest into abstract class 2012-08-17 21:29:13 +02:00
Jesse McConnell ba8ecfbcfb format->check 2012-08-17 12:01:46 -05:00
Jesse McConnell 188e749bb6 Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9 2012-08-17 11:43:15 -05:00
Jesse McConnell 5eaf946956 patch over some nasties that are exposed with starting and stopping server, needs more investigation 2012-08-17 11:43:10 -05:00
Thomas Becker 095a15f9e8 Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9 2012-08-17 17:35:33 +02:00
Thomas Becker be73cf1972 jetty-9: HttpManyWaysToAsyncCommitTest added 2012-08-17 17:34:53 +02:00
Jesse McConnell 8c0897839a replace old AbstractHttpConnection with HttpChannel to get request for session listener 2012-08-17 09:18:47 -05:00
Greg Wilkins 086e74bed8 jetty-9 merged jetty-8 
Merge remote-tracking branch 'origin/jetty-8' into jetty-9

Conflicts:
	jetty-security/src/main/java/org/eclipse/jetty/security/authentication/FormAuthenticator.java
	jetty-server/src/main/java/org/eclipse/jetty/server/AbstractHttpConnection.java
	jetty-server/src/test/java/org/eclipse/jetty/server/HttpConnectionTest.java
	jetty-util/src/main/java/org/eclipse/jetty/util/log/StdErrLog.java
	jetty-util/src/main/java/org/eclipse/jetty/util/resource/JarFileResource.java
	jetty-util/src/test/java/org/eclipse/jetty/util/log/StdErrLogTest.java
 2012-08-17 23:35:42 +10:00
Greg Wilkins 7c94fd5f3c jetty-9 removed HttpParser.isPersistent 2012-08-17 22:06:55 +10:00
Thomas Becker b0537707e3 jetty-9: Small HttpManyWaysToCommitTest fixes 2012-08-17 12:45:55 +02:00
Thomas Becker b73ca3e316 interims changes 2012-08-17 11:52:59 +02:00
Greg Wilkins e7cad67ace jetty-9 moved more fields out of HttpChannel 2012-08-17 16:41:53 +10:00
Greg Wilkins 78a529fc9d jetty-9 moved more fields out of HttpChannel 2012-08-17 16:32:36 +10:00
Greg Wilkins 2a66567a5b jetty-9 improved handling of half close 2012-08-17 15:34:53 +10:00
Jesse McConnell 00ed549898 standardize license header blocks 2012-08-16 19:11:27 -05:00
Jesse McConnell c82871b10f Merge branch 'master' into jetty-8 2012-08-16 17:10:35 -05:00
Jesse McConnell 8dc7a7b1d7 add license-check profile and header template file 2012-08-16 15:26:38 -05:00
Thomas Becker f8950b64bd merge with jetty-9 2012-08-16 09:56:51 +02:00
Thomas Becker aa22952368 interims commit 2012-08-16 09:47:33 +02:00
Greg Wilkins 6d2da78aac jetty-9 more commit fixes 2012-08-16 15:25:08 +10:00
Greg Wilkins ff76201050 jetty-9 setContentLength smaller than content written is an IllegalArgumentException 2012-08-16 14:00:14 +10:00
Greg Wilkins 4907498886 jetty-9 added Commit tests and some fixes 2012-08-16 13:27:23 +10:00
Greg Wilkins ed76d97049 jetty-9 added commit test from tbecker. Fixed issue in HttpConnection, started commenting other tests that need some changes 2012-08-16 09:02:34 +10:00
Jesse McConnell 9759c38fc0 [Bug 385448] migrate jetty jmx usage to be annotation based 2012-08-15 14:39:53 -05:00
Jesse McConnell f58d7f23e1 return embedded example to its natural state 2012-08-15 14:24:08 -05:00
Jesse McConnell c6805c3059 smoke remaining mbean files 2012-08-15 14:22:36 -05:00
Jesse McConnell e1daf7bcbd switch monitor test to annotations as well 2012-08-15 14:20:15 -05:00
Jesse McConnell 129fb06f1f migrate jetty-nosql and jetty-monitor to jmx annotations 2012-08-15 14:17:04 -05:00
Jesse McConnell 2d9c4e823c migrate jetty-webapp to jmx annotations 2012-08-15 13:49:07 -05:00
Jesse McConnell c92ce4bd1e jetty-servlets migration to jmx annotations 2012-08-15 13:33:05 -05:00
Jesse McConnell 8a1eb4a88a pom tweak 2012-08-15 13:32:42 -05:00
Jesse McConnell 563da755d1 Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9 2012-08-15 13:17:09 -05:00
Jesse McConnell c1530f6be4 add example of file server using one url and two directories for resources 2012-08-15 13:17:00 -05:00
Joakim Erdfelt ffd86fd21b Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9 2012-08-15 09:32:32 -07:00
Joakim Erdfelt 4013c750c3 Adding Utf8LineParser from websocket-client to jetty-util as it should be generally useful for others 2012-08-15 09:32:24 -07:00
Jesse McConnell a06d5e96b6 convert jetty-servlet to annotated jmx 2012-08-15 08:41:16 -05:00
Jesse McConnell b7407000cb fix logging bits 2012-08-14 17:30:28 -05:00
Jesse McConnell 1357c342d8 fix logging bits 2012-08-14 17:29:32 -05:00
Jesse McConnell 80608f386c remove old mbean files 2012-08-14 17:26:55 -05:00
Jesse McConnell 4de94e00d5 the old context and webapp deployer were smoked and removing the node attribute from the deployment manager since the Node's are not jmx objects themselves and are not converted 2012-08-14 17:14:40 -05:00
Jesse McConnell f2a2120ffe add jetty logging to jetty-deploy 2012-08-14 17:03:56 -05:00
Jesse McConnell f7054e7cd4 Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9 2012-08-14 16:53:13 -05:00
Jesse McConnell 5c3a1cfe8c removed the wrapper element from the ManagedObject annotation, rejiggered object mbean to not need wrapper, also smoking the convert concept in objectMbean in favor of dynamically discovering it where needed since its easy with annotations 2012-08-14 16:52:17 -05:00
Joakim Erdfelt 9c63ed975e Reworking client connection handling per discussion with simone 2012-08-14 09:44:21 -07:00
Jesse McConnell 447b9ecee5 suppress duplicate attributes in the influence chain 2012-08-14 10:09:13 -05:00