325bfc290d
jetty-9 work in progress on moving aggregation out of HttpChannel
2012-08-20 20:43:10 +10:00
2900b4df02
jetty-9 some post merge fixes
2012-08-18 10:37:09 +10:00
6ffaa478c4
standardize license headers
2012-08-17 16:09:49 -05:00
3d1d76d214
Merge from jetty-8 to jetty-9 (license header standarization)
2012-08-17 13:44:22 -07:00
5de0cee1eb
merge from master + license block standardization
2012-08-17 14:50:43 -05:00
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
7c94fd5f3c
jetty-9 removed HttpParser.isPersistent
2012-08-17 22:06:55 +10:00
00ed549898
standardize license header blocks
2012-08-16 19:11:27 -05:00
c82871b10f
Merge branch 'master' into jetty-8
2012-08-16 17:10:35 -05:00
2d9c4e823c
migrate jetty-webapp to jmx annotations
2012-08-15 13:49:07 -05:00
c92ce4bd1e
jetty-servlets migration to jmx annotations
2012-08-15 13:33:05 -05:00
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
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
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
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
aae7c4da68
removed managed=true from ManagedOperation and ManagedAttribute
2012-08-13 17:19:59 -05:00
11dbce81c8
wire up way to remove the need for managed=true on ManagedAttribute
2012-08-13 16:48:52 -05:00
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
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
86daeab0ca
Remove Managed annotation and convert the context handler over to the new usage
2012-08-11 11:40:32 -05:00
488f53f8d6
jetty-9 cleaned up the stop and stopTimeout handlng
2012-08-11 12:51:32 +10:00
608e74b9bf
add note to readonly annotation element
2012-08-10 17:26:38 -05:00
752a2e7d64
more annotation jmx jiggering
2012-08-10 17:23:59 -05:00
d922013313
Merge branch 'multimap-ng' into jetty-9
2012-08-10 15:13:07 -07:00
b8de9a35a4
[multimap-ng] moving UrlEncoded over and fixing various other failing tests
2012-08-10 14:42:35 -07:00
6d3d7b0df8
[Bug 380924] xmlconfiguration <Configure and <New supports named constructors, including dynamic ordering of parameters
2012-08-10 15:44:08 -05:00
dfebb117b7
[multimap-ng] step 2, make MultiMap a generic, and remove LazyList use
2012-08-10 12:46:30 -07:00
74490580da
Merge branch 'jetty-9' into multimap-ng
2012-08-10 11:32:42 -07:00
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
c3dfd0c653
Jetty9 - Set stopTimeout to zero by default, and setting defaults for threaded component that need a non-zero stop timeout to stop properly.
2012-08-10 19:02:16 +02:00
136f7924fd
Jetty9 - Refactored usage of components that were using custom stop timeout to use the get/setStopTimeout() methods inherited from AbstractLifeCycle.
2012-08-10 19:02:16 +02:00
f92ebea9f0
updates to managed attribute, tests, objectmbean impl and a note to improve id as viewed in jconsole
2012-08-10 10:29:09 -05:00
99d001503f
Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9
2012-08-10 05:51:23 -07:00
703cf000fe
Fixing bad UTF8 test assumption
2012-08-10 05:51:17 -07:00
6039e8ea23
jetty-9 fixed stderrlog test
2012-08-10 22:37:02 +10:00
598292172f
Jetty9 - Code cleanup, renaming methods to be more expressive.
2012-08-10 10:29:14 +02:00
6dbef17e44
377055 Prevent webapp classloader leaks
...
Use the passed in classloader as an arg to Class.forName, even though the classloader is set in AbstractPreventer as the context classloader.
2012-08-10 17:48:03 +10:00
16b404754e
jetty-9 improved logging
2012-08-10 13:31:11 +10:00
3d029695ec
Replacing with optional Collections
2012-08-09 14:52:18 -07:00
0b4d2e6a0f
377055 Prevent webapp classloader leaks
2012-08-09 10:23:00 +10:00
0f4fe634a3
Adding UTF8 fast fail test case that doesn't fail as expected on the websocket side
2012-08-08 14:59:50 -07:00
689daf092d
ported websocketchat to new API
2012-08-08 14:56:47 +10:00
32c5f6c093
jetty-9 reduced LazyList usage
2012-08-08 11:58:50 +10:00
28bc479417
Verifying that fast-fail on utf8 works
2012-08-07 12:16:49 -07:00
5a77c0801a
Adding support for Utf8Appendable.append(ByteBuffer)
2012-08-07 09:53:15 -07:00
75c2b57f25
Jetty9 - Introduced configure_9_0.dtd to support constructor injection for the <Configure> element.
...
Also refactored, simplified, and moved to JDK 7 XmlConfiguration code.
2012-08-06 23:12:01 +02:00
b0041287a6
Jetty9 - Cleaned up implementation and removed warning when a bean is non managed and not started.
...
An example of such beans is the Connection.Statistics implementation.
2012-08-06 16:21:07 +02:00
e3132d41d8
Jetty9 - Introduced ConnectionFactory for SelectChannelConnector.
...
This change abstracts out the connection creation from the connector itself,
so there can be only one connector managing all protocols, depending on
the configuration of the connection factories.
2012-08-03 18:35:34 +02:00
c0dd05683b
Merge remote-tracking branch 'origin/master' into jetty-8
2012-08-03 17:25:24 +10:00
29833f000b
Merge branch 'jetty-9' into jetty-9-oneconnector
...
Conflicts:
jetty-io/src/main/java/org/eclipse/jetty/io/AsyncByteArrayEndPoint.java
jetty-io/src/main/java/org/eclipse/jetty/io/ChannelEndPoint.java
jetty-io/src/main/java/org/eclipse/jetty/io/WriteFlusher.java
jetty-io/src/main/java/org/eclipse/jetty/io/ssl/SslConnection.java
jetty-io/src/test/java/org/eclipse/jetty/io/WriteFlusherTest.java
2012-08-03 12:39:21 +10:00
Greg Wilkins
Jesse McConnell
Joakim Erdfelt
Simone Bordet
Jan Bartel