Commit Graph

809 Commits

Author SHA1 Message Date
Thomas Becker bdb75b9881 jetty-9 jetty-util remove plugin.xml from assembly 2012-09-05 10:43:30 +02:00
Thomas Becker db3fbb9cb3 jetty-9 jetty-plugins now reads from multiple cofigurable groupIds. Currently org/eclipse/jetty and org/mortbay/jetty 2012-09-05 10:41:45 +02:00
Thomas Becker 0b77a69571 Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-plugin 2012-09-04 12:10:56 +02:00
Thomas Becker 694a07dac6 jetty-9 jetty-plugins now uses zip instead of jar files. Local maven repository is now being read and found located by settings.xml or default location. small improvements 2012-09-04 12:03:37 +02:00
Greg Wilkins 4fce4d0e53 jetty-9 ConcurrentScheduler refinements 2012-09-03 17:46:11 +10:00
Greg Wilkins 3f3b269cca jetty-9 ConcurrentScheduler refinements 2012-09-03 15:32:44 +10:00
Greg Wilkins e29e55ffcc jetty-9 ConcurrentScheduler refinements 2012-09-03 15:29:01 +10:00
Greg Wilkins c3776764f4 jetty-9 ConcurrentScheduler refinements 2012-09-03 15:24:36 +10:00
Greg Wilkins bb3dcc1c5b jetty-9 eased scheduler test 2012-09-01 07:10:42 +10:00
Simone Bordet d18fcc05e3 Jetty9 - Added copyright header. 2012-08-31 12:17:08 +02:00
Greg Wilkins fd5776cf86 jetty-9 improved comments 2012-08-31 17:53:18 +10:00
Greg Wilkins 83dbca6553 jetty-9 reworked the schedulers 2012-08-31 13:22:58 +10:00
Thomas Becker 8fbe6c59d5 jetty-9 merge 2012-08-29 17:27:26 +02:00
Simone Bordet acb89e0d2f Jetty9 - Added copyright header. 2012-08-28 21:55:44 +02:00
Greg Wilkins d8b287134f jetty-9 improved range request processing and tests 2012-08-27 12:17:40 +10:00
Greg Wilkins cb5dd493fb jetty-9 merged jetty-9-aggregation 2012-08-27 10:24:34 +10:00
Greg Wilkins 1d654a08cf jetty-9 restructured graceful shutdown 2012-08-24 20:16:23 +10:00
Simone Bordet 06b2de17d5 Merge branch 'jetty-9-aggregation' into jetty-9-spdy-http 2012-08-24 11:52:29 +02:00
Greg Wilkins c707ba11d1 jetty-9 improved SSL shutdown input 2012-08-24 17:56:22 +10:00
Greg Wilkins fac03a306b jetty-9 more server test fixes 2012-08-24 16:53:36 +10:00
Greg Wilkins d59a47d376 jetty-9 simplified error handling 2012-08-23 17:32:10 +10:00
Greg Wilkins 325bfc290d jetty-9 work in progress on moving aggregation out of HttpChannel 2012-08-20 20:43:10 +10:00
Greg Wilkins 2900b4df02 jetty-9 some post merge fixes 2012-08-18 10:37:09 +10:00
Jesse McConnell 6ffaa478c4 standardize license headers 2012-08-17 16:09:49 -05:00
Joakim Erdfelt 3d1d76d214 Merge from jetty-8 to jetty-9 (license header standarization) 2012-08-17 13:44:22 -07:00
Jesse McConnell 5de0cee1eb merge from master + license block standardization 2012-08-17 14:50:43 -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
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 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
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 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 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
Jesse McConnell aae7c4da68 removed managed=true from ManagedOperation and ManagedAttribute 2012-08-13 17:19:59 -05:00
Jesse McConnell 11dbce81c8 wire up way to remove the need for managed=true on ManagedAttribute 2012-08-13 16:48:52 -05:00
Greg Wilkins c84b496330 jetty-9 more work on stop/close. Turned on statistics all of the time, but still not enough. more work needed. 2012-08-12 11:24:24 +10:00
Jesse McConnell 01f4bb2623 Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9 2012-08-11 11:40:48 -05:00
Jesse McConnell 86daeab0ca Remove Managed annotation and convert the context handler over to the new usage 2012-08-11 11:40:32 -05:00
Greg Wilkins 488f53f8d6 jetty-9 cleaned up the stop and stopTimeout handlng 2012-08-11 12:51:32 +10:00
Jesse McConnell 608e74b9bf add note to readonly annotation element 2012-08-10 17:26:38 -05:00
Jesse McConnell 752a2e7d64 more annotation jmx jiggering 2012-08-10 17:23:59 -05:00
Joakim Erdfelt d922013313 Merge branch 'multimap-ng' into jetty-9 2012-08-10 15:13:07 -07:00
Joakim Erdfelt b8de9a35a4 [multimap-ng] moving UrlEncoded over and fixing various other failing tests 2012-08-10 14:42:35 -07:00
Jesse McConnell 6d3d7b0df8 [Bug 380924] xmlconfiguration <Configure and <New supports named constructors, including dynamic ordering of parameters 2012-08-10 15:44:08 -05:00
Joakim Erdfelt dfebb117b7 [multimap-ng] step 2, make MultiMap a generic, and remove LazyList use 2012-08-10 12:46:30 -07:00
Joakim Erdfelt 74490580da Merge branch 'jetty-9' into multimap-ng 2012-08-10 11:32:42 -07:00
Joakim Erdfelt da0e5a1ef6 [multimap-ng] step 1, make MultiMap participate as a full fledged member of the Collections framework 2012-08-10 10:25:10 -07:00