Greg Wilkins
ace43502ad
refined start.jar mechanism to align with updated documentation
2013-09-06 16:10:03 +10:00
Jesse McConnell
ac30f5c9bd
update other jetty mods to new format
2013-08-29 16:39:28 -05:00
Greg Wilkins
d66778ad06
415826 start.jar module --enable and --disable
...
morphed mechanism into --initialize based templates
2013-08-28 09:30:03 +10:00
Jesse McConnell
725e405dac
first pass for mod files for distribution
2013-08-22 11:53:58 -05:00
Joakim Erdfelt
ddafacf765
Fixing malformed Javadoc warnings in jetty-jmx
2013-08-14 12:46:25 -07:00
Greg Wilkins
e0382bc4ae
414740 Removed the parent peeking Loader
2013-08-09 17:53:43 +10:00
Jesse McConnell
74a4077dad
Add package-info.java files to all jetty packages.
2013-05-21 15:09:49 -05:00
Greg Wilkins
d4ad2ccfc7
401641 Fixed MBean setter for String[]
2013-02-25 13:28:39 +11:00
Simone Bordet
209d5bc12f
399721 - Change <Ref id= ...> to <Ref refid= ...>
2013-02-01 13:03:11 +01:00
Jesse McConnell
e1c516c7d1
merge from jetty-8 and update license blocks.
2013-01-11 17:04:53 -06:00
Jesse McConnell
a4dbb5823c
update license blocks for 2013
2013-01-11 14:57:51 -06:00
Greg Wilkins
27c31fb403
jetty-9 organised imports. Cleaned up some TODOs
2013-01-11 16:37:32 +11:00
Jesse McConnell
12075f7196
[Bug 395168] fix unavailable attributes when return type has annotation
...
on super class
2012-11-29 15:01:48 -06:00
Greg Wilkins
52464a5ba6
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java
jetty-annotations/src/main/java/org/eclipse/jetty/annotations/ResourceAnnotationHandler.java
jetty-client/src/test/java/org/eclipse/jetty/client/SslHttpExchangeTest.java
jetty-client/src/test/java/org/eclipse/jetty/client/SslSecurityListenerTest.java
jetty-deploy/src/main/java/org/eclipse/jetty/deploy/WebAppDeployer.java
jetty-deploy/src/main/java/org/eclipse/jetty/deploy/providers/ContextProvider.java
jetty-http/src/main/resources/org/eclipse/jetty/http/mime.properties
jetty-http/src/test/java/org/eclipse/jetty/http/HttpFieldsTest.java
jetty-io/src/main/java/org/eclipse/jetty/io/nio/SelectChannelEndPoint.java
jetty-jmx/src/main/java/org/eclipse/jetty/jmx/MBeanContainer.java
jetty-jmx/src/main/java/org/eclipse/jetty/jmx/ObjectMBean.java
jetty-overlay-deployer/src/main/java/org/eclipse/jetty/overlays/OverlayedAppProvider.java
jetty-plus/src/main/java/org/eclipse/jetty/plus/annotation/Injection.java
jetty-plus/src/main/java/org/eclipse/jetty/plus/security/DataSourceLoginService.java
jetty-proxy/src/main/java/org/eclipse/jetty/proxy/ProxyServlet.java
jetty-rewrite/src/main/java/org/eclipse/jetty/rewrite/handler/ProxyRule.java
jetty-security/src/main/java/org/eclipse/jetty/security/authentication/FormAuthenticator.java
jetty-server/src/main/java/org/eclipse/jetty/server/session/JDBCSessionIdManager.java
jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/proxy/ProxyHTTPSPDYConnection.java
jetty-spdy/spdy-jetty-http/src/main/java/org/eclipse/jetty/spdy/http/ServerHTTPSPDYAsyncConnection.java
jetty-start/src/main/java/org/eclipse/jetty/start/Main.java
jetty-util/src/main/java/org/eclipse/jetty/util/Fields.java
jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketClientFactory.java
jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketConnectionRFC6455.java
jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketClientTest.java
jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketMessageRFC6455Test.java
test-jetty-nested/src/main/java/org/eclipse/jetty/nested/Dump.java
test-jetty-webapp/src/main/java/com/acme/Dump.java
2012-11-02 14:08:05 +11:00
Greg Wilkins
65202e9abe
393363 Use Locale.ENGLISH for all toUpperCase and toLowerCase calls
2012-11-02 11:55:00 +11:00
Greg Wilkins
8c3fa91b26
jetty-9 reverted to more start.ini rather than start.d usage as we will not be using plugins. More configuration documentation added
2012-10-11 16:15:57 +11:00
Greg Wilkins
950249932d
jetty-9 improved mbean names
2012-09-21 18:00:46 +10:00
Greg Wilkins
68ee346b8a
jetty-9 combined the Container and AggregateLifeCycle into ContainerLifeCycle
2012-09-21 11:45:51 +10:00
Simone Bordet
40382bad3a
jetty-9 - Removed references to JUnit 3.x.
2012-09-20 18:23:02 +02:00
Greg Wilkins
2dfcebfc04
jetty-9 distribution working
2012-09-06 14:54:55 +10:00
Simone Bordet
d7d5e4f20e
Jetty9 - Reduced test logging.
2012-08-29 22:42:35 +02:00
Simone Bordet
06b2de17d5
Merge branch 'jetty-9-aggregation' into jetty-9-spdy-http
2012-08-24 11:52:29 +02: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
00ed549898
standardize license header blocks
2012-08-16 19:11:27 -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
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
447b9ecee5
suppress duplicate attributes in the influence chain
2012-08-14 10:09:13 -05:00
Jesse McConnell
aae7c4da68
removed managed=true from ManagedOperation and ManagedAttribute
2012-08-13 17:19:59 -05:00
Jesse McConnell
74f8822e64
remove managed=true need for ManagedOperation
2012-08-13 16:50:15 -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
Jesse McConnell
752a2e7d64
more annotation jmx jiggering
2012-08-10 17:23:59 -05:00
Jesse McConnell
553cf0f404
simone added an attribute to abstractlifecycle increasing the attribute count on influences
2012-08-10 16:33:45 -05:00
Jesse McConnell
4d74adc1e5
ignore test
2012-08-10 10:48:44 -05:00
Jesse McConnell
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
Greg Wilkins
32c5f6c093
jetty-9 reduced LazyList usage
2012-08-08 11:58:50 +10:00
Jesse McConnell
6c0bb390ae
adding in some more test cases which now include the MBeanContainer
2012-08-03 16:05:04 -05:00
Greg Wilkins
5e6cd1b27f
Merge branch 'jetty-9' into jetty-9-oneconnector
...
Conflicts:
jetty-jmx/src/main/java/org/eclipse/jetty/jmx/ObjectMBean.java
jetty-jmx/src/test/java/org/eclipse/jetty/jmx/ObjectMBeanTest.java
2012-08-03 08:48:34 +10:00
Jesse McConnell
8d0ad9f3b0
fix array conversion on mbean info
2012-08-02 16:57:02 -05:00
Greg Wilkins
8366ae08c9
Merge branch 'jetty-9' into jetty-9-oneconnector
...
Conflicts:
jetty-jmx/src/test/java/org/eclipse/jetty/jmx/ObjectMBeanTest.java
2012-08-03 07:49:24 +10:00
Jesse McConnell
a945a30a37
remove lazy list usage and remove mbean container in simple test
2012-08-02 16:47:56 -05:00
Jesse McConnell
373526f8ca
proxied and managed methods are working with annotations, converted impl and test to use the 3 annotations in place of @Managed
2012-08-02 16:34:00 -05:00
Greg Wilkins
96b5c05674
jetty-9 one connector passing most tests
2012-08-02 11:51:54 +10:00
Jesse McConnell
e25ff279ae
some initial swizzle for mbean influence and improvement of unit test
2012-07-23 16:35:00 -05:00
Jesse McConnell
d6261cb714
fix attribute issue when not assocated with fields
2012-07-23 14:48:39 -05:00
Jesse McConnell
cf9166164e
initial implementation using annotations to discover mbean property information
2012-07-23 13:46:34 -05:00
Jesse McConnell
5a182c6a9d
added jetty logging properties for jetty-jmx and fleshed out the ObjectMBeanTest since it wasn't really implemented previously
2012-07-23 10:26:29 -05:00
Greg Wilkins
154a926b1b
jetty-9 merge from jetty-8. Mostly compiling but some tests still failing.
...
Merge remote-tracking branch 'origin/jetty-8' into jetty-9
Conflicts:
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-http/src/main/java/org/eclipse/jetty/http/HttpContent.java
jetty-http/src/main/java/org/eclipse/jetty/http/HttpFields.java
jetty-http/src/main/java/org/eclipse/jetty/http/HttpGenerator.java
jetty-http/src/main/java/org/eclipse/jetty/http/HttpParser.java
jetty-http/src/main/java/org/eclipse/jetty/http/gzip/CompressedResponseWrapper.java
jetty-http/src/main/java/org/eclipse/jetty/http/gzip/GzipStream.java
jetty-http/src/test/java/org/eclipse/jetty/http/HttpFieldsTest.java
jetty-http/src/test/java/org/eclipse/jetty/http/HttpGeneratorClientTest.java
jetty-io/pom.xml
jetty-io/src/main/java/org/eclipse/jetty/io/AbstractBuffers.java
jetty-io/src/main/java/org/eclipse/jetty/io/AbstractConnection.java
jetty-io/src/main/java/org/eclipse/jetty/io/AsyncEndPoint.java
jetty-io/src/main/java/org/eclipse/jetty/io/Buffer.java
jetty-io/src/main/java/org/eclipse/jetty/io/BuffersFactory.java
jetty-io/src/main/java/org/eclipse/jetty/io/ByteArrayBuffer.java
jetty-io/src/main/java/org/eclipse/jetty/io/ByteArrayEndPoint.java
jetty-io/src/main/java/org/eclipse/jetty/io/ConnectedEndPoint.java
jetty-io/src/main/java/org/eclipse/jetty/io/Connection.java
jetty-io/src/main/java/org/eclipse/jetty/io/PooledBuffers.java
jetty-io/src/main/java/org/eclipse/jetty/io/bio/StreamEndPoint.java
jetty-io/src/main/java/org/eclipse/jetty/io/bio/StringEndPoint.java
jetty-io/src/main/java/org/eclipse/jetty/io/nio/ChannelEndPoint.java
jetty-io/src/main/java/org/eclipse/jetty/io/nio/SelectChannelEndPoint.java
jetty-io/src/main/java/org/eclipse/jetty/io/nio/SelectorManager.java
jetty-io/src/main/java/org/eclipse/jetty/io/nio/SslConnection.java
jetty-io/src/test/java/org/eclipse/jetty/io/ChannelEndPointTest.java
jetty-io/src/test/java/org/eclipse/jetty/io/bio/SocketEndPointTest.java
jetty-io/src/test/java/org/eclipse/jetty/io/nio/SelectChannelEndPointSslTest.java
jetty-io/src/test/java/org/eclipse/jetty/io/nio/SelectChannelEndPointTest.java
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/pom.xml
jetty-overlay-deployer/pom.xml
jetty-plus/pom.xml
jetty-policy/pom.xml
jetty-proxy/src/test/java/org/eclipse/jetty/proxy/ProxyServletTest.java
jetty-rewrite/pom.xml
jetty-security/pom.xml
jetty-server/pom.xml
jetty-server/src/main/java/org/eclipse/jetty/server/AbstractConnector.java
jetty-server/src/main/java/org/eclipse/jetty/server/AbstractHttpConnection.java
jetty-server/src/main/java/org/eclipse/jetty/server/AsyncHttpConnection.java
jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannelState.java
jetty-server/src/main/java/org/eclipse/jetty/server/Request.java
jetty-server/src/main/java/org/eclipse/jetty/server/Response.java
jetty-server/src/main/java/org/eclipse/jetty/server/Server.java
jetty-server/src/main/java/org/eclipse/jetty/server/handler/ConnectHandler.java
jetty-server/src/main/java/org/eclipse/jetty/server/handler/GzipHandler.java
jetty-server/src/main/java/org/eclipse/jetty/server/nio/SelectChannelConnector.java
jetty-server/src/test/java/org/eclipse/jetty/server/HttpServerTestBase.java
jetty-server/src/test/java/org/eclipse/jetty/server/LocalAsyncContextTest.java
jetty-server/src/test/java/org/eclipse/jetty/server/RequestTest.java
jetty-server/src/test/java/org/eclipse/jetty/server/ResponseTest.java
jetty-server/src/test/java/org/eclipse/jetty/server/SuspendHandler.java
jetty-server/src/test/java/org/eclipse/jetty/server/handler/ConnectHandlerTest.java
jetty-server/src/test/java/org/eclipse/jetty/server/session/SessionHandlerTest.java
jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SSLCloseTest.java
jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SSLEngineTest.java
jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SslSocketServerTest.java
jetty-servlet/pom.xml
jetty-servlet/src/main/java/org/eclipse/jetty/servlet/DefaultServlet.java
jetty-servlets/pom.xml
jetty-servlets/src/main/java/org/eclipse/jetty/servlets/GzipFilter.java
jetty-servlets/src/test/java/org/eclipse/jetty/servlets/IncludableGzipFilterTest.java
jetty-servlets/src/test/java/org/eclipse/jetty/servlets/MultipartFilterTest.java
jetty-spdy/pom.xml
jetty-spdy/spdy-core/pom.xml
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/CompressionDictionary.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/CompressionFactory.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/Controller.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/ISession.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/IStream.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/IdleListener.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/Promise.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/PushSynInfo.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/SessionException.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/StandardCompressionFactory.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/StandardSession.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/StandardStream.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/StreamException.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/ByteBufferDataInfo.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/BytesDataInfo.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/DataInfo.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/GoAwayInfo.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/Headers.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/HeadersInfo.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/PingInfo.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/ReplyInfo.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/RstInfo.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/SPDY.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/SPDYException.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/Session.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/SessionFrameListener.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/SessionStatus.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/Settings.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/SettingsInfo.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/Stream.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/StreamFrameListener.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/StreamStatus.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/StringDataInfo.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/SynInfo.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/api/server/ServerSessionFrameListener.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/ControlFrame.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/ControlFrameType.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/DataFrame.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/GoAwayFrame.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/HeadersFrame.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/NoOpFrame.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/PingFrame.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/RstStreamFrame.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/SettingsFrame.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/SynReplyFrame.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/SynStreamFrame.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/frames/WindowUpdateFrame.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/ControlFrameGenerator.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/DataFrameGenerator.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/Generator.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/GoAwayGenerator.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/HeadersBlockGenerator.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/HeadersGenerator.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/NoOpGenerator.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/PingGenerator.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/RstStreamGenerator.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/SettingsGenerator.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/SynReplyGenerator.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/SynStreamGenerator.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/WindowUpdateGenerator.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/ControlFrameBodyParser.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/ControlFrameParser.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/DataFrameParser.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/GoAwayBodyParser.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/HeadersBlockParser.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/HeadersBodyParser.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/NoOpBodyParser.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/Parser.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/PingBodyParser.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/RstStreamBodyParser.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/SettingsBodyParser.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/SynReplyBodyParser.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/SynStreamBodyParser.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/UnknownControlFrameBodyParser.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/WindowUpdateBodyParser.java
jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/AsyncTimeoutTest.java
jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/StandardSessionTest.java
jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/StandardStreamTest.java
jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/api/ClientUsageTest.java
jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/api/ServerUsageTest.java
jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/frames/DataGenerateParseTest.java
jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/frames/GoAwayGenerateParseTest.java
jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/frames/HeadersGenerateParseTest.java
jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/frames/NoOpGenerateParseTest.java
jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/frames/PingGenerateParseTest.java
jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/frames/RstStreamGenerateParseTest.java
jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/frames/SettingsGenerateParseTest.java
jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/frames/SynReplyGenerateParseTest.java
jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/frames/SynStreamGenerateParseTest.java
jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/frames/TestSPDYParserListener.java
jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/frames/WindowUpdateGenerateParseTest.java
jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/parser/LiveChromiumRequestParserTest.java
jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/parser/ParseVersusCacheBenchmarkTest.java
jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/parser/UnknownControlFrameTest.java
jetty-spdy/spdy-jetty-http-webapp/pom.xml
jetty-spdy/spdy-jetty-http-webapp/src/main/config/etc/jetty-spdy.xml
jetty-spdy/spdy-jetty-http/pom.xml
jetty-spdy/spdy-jetty-http/src/main/java/org/eclipse/jetty/spdy/http/HTTPSPDYServerConnector.java
jetty-spdy/spdy-jetty-http/src/main/java/org/eclipse/jetty/spdy/http/PushStrategy.java
jetty-spdy/spdy-jetty-http/src/main/java/org/eclipse/jetty/spdy/http/ReferrerPushStrategy.java
jetty-spdy/spdy-jetty-http/src/main/java/org/eclipse/jetty/spdy/http/ServerHTTPAsyncConnectionFactory.java
jetty-spdy/spdy-jetty-http/src/main/java/org/eclipse/jetty/spdy/http/ServerHTTPSPDYAsyncConnection.java
jetty-spdy/spdy-jetty-http/src/main/java/org/eclipse/jetty/spdy/http/ServerHTTPSPDYAsyncConnectionFactory.java
jetty-spdy/spdy-jetty-http/src/test/java/org/eclipse/jetty/spdy/http/AbstractHTTPSPDYTest.java
jetty-spdy/spdy-jetty-http/src/test/java/org/eclipse/jetty/spdy/http/ConcurrentStreamsTest.java
jetty-spdy/spdy-jetty-http/src/test/java/org/eclipse/jetty/spdy/http/ProtocolNegotiationTest.java
jetty-spdy/spdy-jetty/pom.xml
jetty-spdy/spdy-jetty/src/main/java/org/eclipse/jetty/spdy/AsyncConnectionFactory.java
jetty-spdy/spdy-jetty/src/main/java/org/eclipse/jetty/spdy/EmptyAsyncConnection.java
jetty-spdy/spdy-jetty/src/main/java/org/eclipse/jetty/spdy/EmptyAsyncEndPoint.java
jetty-spdy/spdy-jetty/src/main/java/org/eclipse/jetty/spdy/SPDYAsyncConnection.java
jetty-spdy/spdy-jetty/src/main/java/org/eclipse/jetty/spdy/SPDYClient.java
jetty-spdy/spdy-jetty/src/main/java/org/eclipse/jetty/spdy/SPDYServerConnector.java
jetty-spdy/spdy-jetty/src/main/java/org/eclipse/jetty/spdy/ServerSPDYAsyncConnectionFactory.java
jetty-spdy/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/AbstractTest.java
jetty-spdy/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/ClosedStreamTest.java
jetty-spdy/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/FlowControlTest.java
jetty-spdy/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/GoAwayTest.java
jetty-spdy/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/HeadersTest.java
jetty-spdy/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/IdleTimeoutTest.java
jetty-spdy/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/PingTest.java
jetty-spdy/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/ProtocolViolationsTest.java
jetty-spdy/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/PushStreamTest.java
jetty-spdy/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/ResetStreamTest.java
jetty-spdy/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/SPDYClientFactoryTest.java
jetty-spdy/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/SPDYServerConnectorTest.java
jetty-spdy/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/SSLEngineLeakTest.java
jetty-spdy/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/SSLSynReplyTest.java
jetty-spdy/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/SettingsTest.java
jetty-spdy/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/SynDataReplyDataLoadTest.java
jetty-spdy/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/SynReplyTest.java
jetty-spdy/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/UnsupportedVersionTest.java
jetty-start/pom.xml
jetty-util/pom.xml
jetty-util/src/main/java/org/eclipse/jetty/util/URIUtil.java
jetty-webapp/pom.xml
jetty-websocket/pom.xml
jetty-websocket/src/main/java/org/eclipse/jetty/websocket/DeflateFrameExtension.java
jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketConnectionD00.java
jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketHandler.java
jetty-websocket/src/test/java/org/eclipse/jetty/websocket/SafariWebsocketDraft0Test.java
jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketServletRFCTest.java
jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/helper/SafariD00.java
jetty-xml/pom.xml
jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlConfiguration.java
jetty-xml/src/test/java/org/eclipse/jetty/xml/XmlConfigurationTest.java
pom.xml
test-continuation/pom.xml
test-jetty-nested/pom.xml
test-jetty-servlet/pom.xml
test-jetty-servlet/src/main/java/Jetty400Repro.java
test-jetty-servlet/src/main/java/org/eclipse/jetty/testing/HttpTester.java
test-jetty-servlet/src/test/java/org/eclipse/jetty/testing/HttpTesterTest.java
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
2012-07-20 11:07:57 +10:00
Greg Wilkins
2bcf611e5e
jetty-9 work in progress. Further simplification of jetty-io
2012-03-27 00:19:43 +11:00
Thomas Becker
875bcb5bb8
374995: configure jmx rmi port via SystemProperty
...
Change-Id: I35f336d4754c79717b741aea0896bd71b46ed28d
374995: configure jmx rmi host via SystemProperty,change objectname and jmxpath from jettyjmx to jmxrmi
Change-Id: Ib469d631682c9fb31aea584c38906aae0958198f
374995: configure jmx rmi host via SystemProperty,change objectname and jmxpath from jettyjmx to jmxrmi
Change-Id: I02c88c518810e03c7ae59453fa6752d80108960e
2012-03-22 13:03:22 +01:00
Greg Wilkins
81c48518b6
368635 moved lifecycle state reporting from toString to dump
2012-01-16 15:37:32 +11:00
Greg Wilkins
04d703c062
365302: clean up old Logger mbeans
2012-01-13 13:59:49 +11:00
Greg Wilkins
564cf7329c
365302: made map of loggers concurrent and shared in abstract
2012-01-12 20:39:24 +11:00
Greg Wilkins
de418bc0e4
368240: updated mbean container to use managed aggregate semantics
2012-01-12 12:25:44 +11:00
Jan Bartel
b5c85be752
363718 Setting java.rmi.server.hostname in jetty-jmx.xml
2011-11-16 09:16:47 +11:00
Greg Wilkins
a642f7b55c
Merge remote-tracking branch 'origin/master' into jetty-7.6
...
Conflicts:
jetty-http/src/main/java/org/eclipse/jetty/http/HttpGenerator.java
jetty-io/src/main/java/org/eclipse/jetty/io/nio/SslSelectChannelEndPoint.java
2011-10-24 11:27:42 +11:00
Greg Wilkins
cd0628ab66
Added isDebugEnabled guards to debugging that generates garbage
2011-10-22 09:39:54 +11:00
Greg Wilkins
6edb7c1930
organised imports
2011-10-18 15:05:22 +11:00
Joakim Erdfelt
b63e56e8e1
293739 - Deprecate static Jetty Log usage in favor of named logs
...
+ Finished conversion of jetty-xml, jetty-jmx
2011-08-24 12:47:55 -07:00
Michael Gorovoy
39fce10d74
335001 Eliminate expected exceptions from log when running in JBoss
2011-08-17 15:32:31 -04:00
Michael Gorovoy
7f68abfa73
Merge branch '332200'
...
Conflicts:
VERSION.txt
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3416 7e9141cc-0065-0410-87d8-b60c137991c4
2011-06-23 21:20:15 +00:00
Greg Wilkins
489aa7a46a
349997 MBeanContainer uses weak references
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3411 7e9141cc-0065-0410-87d8-b60c137991c4
2011-06-22 05:06:45 +00:00
Greg Wilkins
11de671982
332907 code cleanups
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3121 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-11 07:20:21 +00:00
Michael Gorovoy
a28d3bc37a
332907 Add context property to ObjectName of JMX MBeans
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3120 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-11 04:54:39 +00:00
Greg Wilkins
540ba7174f
332907 backed out the change until reviewed
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3103 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-10 02:29:06 +00:00
Michael Gorovoy
6e197c7ba2
332907 Add context property to ObjectName of JMX MBeans
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3101 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-09 18:06:31 +00:00
Michael Gorovoy
86f9f44b67
340920 Dynamically assign RMI registry port for integration testing
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2911 7e9141cc-0065-0410-87d8-b60c137991c4
2011-03-24 23:13:35 +00:00
Simone Bordet
4087072298
Code cleanup.
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2836 7e9141cc-0065-0410-87d8-b60c137991c4
2011-03-01 15:25:55 +00:00
Greg Wilkins
f9458ee5ca
332937 Added Destroyable Dumpable interfaces and reworked dependent lifecycles, specially of JNDI
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2721 7e9141cc-0065-0410-87d8-b60c137991c4
2011-02-02 01:35:38 +00:00
Greg Wilkins
6f0b83a272
333679 Refactored jetty-jmx. Improved deployer mbeans
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2630 7e9141cc-0065-0410-87d8-b60c137991c4
2011-01-06 21:35:22 +00:00
Greg Wilkins
881e599860
333679 Refactored jetty-jmx. Moved mbeans to modules.
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2629 7e9141cc-0065-0410-87d8-b60c137991c4
2011-01-06 18:04:58 +00:00
Greg Wilkins
68323125b6
improved debugging dumps
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2625 7e9141cc-0065-0410-87d8-b60c137991c4
2011-01-04 17:44:11 +00:00
Greg Wilkins
e10c14c77a
332937 Added Destroyable interface and reworked dependent lifecycles, specially of JNDI
...
Also added Dumpable interface to improve and standardize the output of nested structures while debugging
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2615 7e9141cc-0065-0410-87d8-b60c137991c4
2010-12-21 11:27:02 +00:00
Greg Wilkins
f50f5ca8a2
some generic strangeness
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2231 7e9141cc-0065-0410-87d8-b60c137991c4
2010-09-01 04:36:02 +00:00
Greg Wilkins
7bad38add1
fixed jmx
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1983 7e9141cc-0065-0410-87d8-b60c137991c4
2010-06-10 06:01:00 +00:00
Greg Wilkins
bd0adbe4c2
fixed -- in comment
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1981 7e9141cc-0065-0410-87d8-b60c137991c4
2010-06-10 03:21:36 +00:00
Greg Wilkins
cf039140fb
315748 added --pre support in start.jar
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1929 7e9141cc-0065-0410-87d8-b60c137991c4
2010-06-07 00:02:08 +00:00
Michael Gorovoy
4130f68f98
292814 make QoSFilter and DoSFilter JMX manageable
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1914 7e9141cc-0065-0410-87d8-b60c137991c4
2010-06-02 02:29:33 +00:00
Michael Gorovoy
f40ee83149
304100 Better document JMX setup in jetty-jmx.xml
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1904 7e9141cc-0065-0410-87d8-b60c137991c4
2010-05-27 16:23:16 +00:00
Jesse McConnell
33a8655c64
remove extranous references in mbean properties
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1887 7e9141cc-0065-0410-87d8-b60c137991c4
2010-05-26 18:01:09 +00:00
Simone Bordet
0e0453b2b5
Fix for #308856 (Update test suite to JUnit4 - Module jetty-jmx).
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1746 7e9141cc-0065-0410-87d8-b60c137991c4
2010-05-10 15:55:18 +00:00
Simone Bordet
c3d31d68b0
Fix for #304803 (Remove TypeUtil Integer and Long caches).
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1744 7e9141cc-0065-0410-87d8-b60c137991c4
2010-05-10 15:12:34 +00:00
Michael Gorovoy
fa7e3477e5
308009 ObjectMBean incorrectly casts getTargetException() to Exception
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1481 7e9141cc-0065-0410-87d8-b60c137991c4
2010-04-07 23:56:11 +00:00
Greg Wilkins
c121d581e5
302018 mbean
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1349 7e9141cc-0065-0410-87d8-b60c137991c4
2010-03-05 20:59:12 +00:00
Greg Wilkins
176ba8073f
302018 301089 300933 Improve statistics
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1268 7e9141cc-0065-0410-87d8-b60c137991c4
2010-02-15 22:05:22 +00:00
Greg Wilkins
8ea3b1b770
301089 Improve statistics available in StatisticsHandler and AbstractConnector
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1235 7e9141cc-0065-0410-87d8-b60c137991c4
2010-02-03 13:38:57 +00:00
Greg Wilkins
3fea82d8a4
296765 JMX Connector Server and ShutdownThread
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1140 7e9141cc-0065-0410-87d8-b60c137991c4
2009-12-10 23:21:06 +00:00
Greg Wilkins
d2898371e3
clean up tests
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1089 7e9141cc-0065-0410-87d8-b60c137991c4
2009-11-24 00:00:17 +00:00
Greg Wilkins
f9455c7712
demo websocket implementation
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1087 7e9141cc-0065-0410-87d8-b60c137991c4
2009-11-23 08:44:37 +00:00
Greg Wilkins
b170e765f3
293222 improved statistics collection for async
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1022 7e9141cc-0065-0410-87d8-b60c137991c4
2009-10-31 12:10:54 +00:00
Greg Wilkins
e8d0535d6b
COMETD-34 moved baeyux mbean to cometd
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1010 7e9141cc-0065-0410-87d8-b60c137991c4
2009-10-21 00:56:35 +00:00
Simone Bordet
92f1b1801f
Fixed #280723 : Add non blocking statistics handler.
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@833 7e9141cc-0065-0410-87d8-b60c137991c4
2009-09-08 20:07:44 +00:00
Greg Wilkins
62c605f802
JETTY-1074 JMX thread manipulation
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@627 7e9141cc-0065-0410-87d8-b60c137991c4
2009-08-04 07:36:49 +00:00
Greg Wilkins
3c71736a7a
improved deferred authentication handling
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@619 7e9141cc-0065-0410-87d8-b60c137991c4
2009-08-03 02:39:33 +00:00
Greg Wilkins
c555b7a0bf
more JMX fixes
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@178 7e9141cc-0065-0410-87d8-b60c137991c4
2009-04-22 06:17:24 +00:00
Greg Wilkins
2bd6ef266b
removed resource methods
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@177 7e9141cc-0065-0410-87d8-b60c137991c4
2009-04-22 05:45:24 +00:00
Greg Wilkins
39146e96a2
reworked JMX for new layout
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@175 7e9141cc-0065-0410-87d8-b60c137991c4
2009-04-22 05:18:01 +00:00
Greg Wilkins
899235f05f
move JMX properties to correct paths
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@172 7e9141cc-0065-0410-87d8-b60c137991c4
2009-04-22 02:42:20 +00:00
Greg Wilkins
5e11796031
configure.dtd
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@150 7e9141cc-0065-0410-87d8-b60c137991c4
2009-04-15 01:52:39 +00:00
Jan Bartel
8b2e942714
Remove old method declaration to match QueuedThreadPool class
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@144 7e9141cc-0065-0410-87d8-b60c137991c4
2009-04-14 03:58:15 +00:00
Greg Wilkins
da627b843f
jetty @ eclipse initial commit
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@8 7e9141cc-0065-0410-87d8-b60c137991c4
2009-03-24 21:07:27 +00:00