ffad720991
Fixing Javadoc errors that JDK 1.7 complains about
2013-08-14 11:50:07 -07:00
e0382bc4ae
414740 Removed the parent peeking Loader
2013-08-09 17:53:43 +10:00
47a8809ec7
413018 ServletContext.addListener() should throw IllegalArgumentException if arg is not correct type of listener
2013-08-02 12:26:54 +10:00
ca37782229
412829 Allow any mappings from web-default.xml to be overridden by web.xml
2013-07-23 12:18:18 +10:00
4e4ffaa54c
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannelState.java
jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
2013-06-17 16:29:39 +10:00
232eb4491a
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletContextHandler.java
jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java
2013-06-17 13:13:59 +10:00
64d979a780
409449 Ensure servlets, filters and listeners added via dynamic registration, annotations or descriptors are cleaned on context restarts
2013-06-12 15:41:03 +10:00
d2794584e1
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
jetty-server/src/main/java/org/eclipse/jetty/server/Response.java
2013-06-07 15:48:22 +10:00
7bb3a7be28
409556 Resource files not closed
...
Made Resource a closeable so that it is easier to close in a try(){} block. Deprecated release() and made it close() instead.
FileResource no longer extends URLResource as it can more efficiently implement all the methods with pure File operations and have no
connections or streams that need to be release/closed
2013-06-03 18:21:11 +10:00
b59949253d
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/EncodingHttpWriter.java
jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
jetty-server/src/main/java/org/eclipse/jetty/server/Iso88591HttpWriter.java
jetty-server/src/main/java/org/eclipse/jetty/server/Utf8HttpWriter.java
2013-05-30 17:17:54 +10:00
3d553e79a9
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
jetty-webapp/src/main/java/org/eclipse/jetty/webapp/StandardDescriptorProcessor.java
2013-05-29 11:05:09 +10:00
54b62eafcb
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2013-05-29 10:54:53 +10:00
9f2a641dc0
409133 Empty <welcome-file> causes StackOverflowError
2013-05-29 10:21:53 +10:00
15e0d50b79
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
2013-05-23 09:50:27 +10:00
74a4077dad
Add package-info.java files to all jetty packages.
2013-05-21 15:09:49 -05:00
f544d6e701
405422 Implement servlet3.1 spec sections 4.4.3 and 8.1.4 for new HttpSessionIdListener class
2013-05-03 18:27:51 +10:00
3df03e18d7
405437 Implement section 13.8.4 Uncovered HTTP methods
2013-04-23 13:52:41 +10:00
4951b1ccc4
404176 Jetty's AnnotationConfiguration class does not scan non-jar resources on the container classpath
2013-03-28 19:33:52 +11:00
8dc6aca9cd
393972 Improve WebAppContext classloading javadoc
2013-03-15 15:42:07 +11:00
45916182d8
393971 Improve setParentLoaderPriorty javadoc
2013-03-15 15:38:31 +11:00
a3159e932f
402726 - WebAppContext references old WebSocket packages in system and server classes
...
+ Removing redundant WebSocketServlet references
+ Changing comments to be more clear about the roles of the 2 remaining
entries
2013-03-08 07:47:10 -07:00
c396622770
401495 removed unused getOutputStream
2013-03-04 17:38:00 +11:00
42475b1564
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
jetty-webapp/src/main/java/org/eclipse/jetty/webapp/StandardDescriptorProcessor.java
2013-02-26 12:50:30 +11:00
8f4b569076
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
...
Conflicts:
jetty-webapp/src/main/java/org/eclipse/jetty/webapp/StandardDescriptorProcessor.java
2013-02-26 10:44:58 +11:00
a65adcdd38
401531 StringIndexOutOfBoundsException for "/*" <url-pattern> of <jsp-property-group>
2013-02-25 17:45:22 +11:00
2d310ac82e
401642 Less verbose INFOs
2013-02-25 14:42:30 +11:00
59ada108b2
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java
jetty-client/src/test/java/org/eclipse/jetty/client/ExternalSiteTest.java
jetty-client/src/test/java/org/eclipse/jetty/client/SslBytesServerTest.java
jetty-http/src/main/java/org/eclipse/jetty/http/HttpParser.java
jetty-io/src/main/java/org/eclipse/jetty/io/nio/SslConnection.java
jetty-io/src/test/java/org/eclipse/jetty/io/nio/SelectChannelEndPointSslTest.java
jetty-servlets/src/main/java/org/eclipse/jetty/servlets/ProxyServlet.java
jetty-servlets/src/test/java/org/eclipse/jetty/servlets/ProxyServletTest.java
jetty-util/src/test/java/org/eclipse/jetty/util/resource/ResourceTest.java
jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java
test-jetty-webapp/pom.xml
2013-02-22 12:47:02 +11:00
a23f2451cd
Merge branch 'jetty-7' into jetty-8
2013-02-19 09:41:10 -07:00
e210dfbcca
401211 - Remove requirement for jetty-websocket.jar in WEB-INF/lib
...
+ Adding appropriate configuration in WebAppContext to use
WebSocketServlet from server classloader. Similar to how
the WebSocket interface and WebSocketFactory are also
defined.
+ Marking jetty-websocket as provided in test webapp
2013-02-19 09:38:32 -07:00
39c5d6c141
merge from jetty-8
2013-02-15 12:47:04 -06:00
9c40cca59f
merge from jetty-7
2013-02-15 12:11:25 -06:00
cf98276b32
[Bug 394064] ensure that JarFile instances are closed on JarFileResource.release()
2013-02-15 11:59:39 -06:00
b132663c2b
jetty-9 made WebAppContext configuration additive
2013-01-31 12:21:04 +11:00
e1c516c7d1
merge from jetty-8 and update license blocks.
2013-01-11 17:04:53 -06:00
863944873d
merge from 7 and update license blocks for 2013
2013-01-11 15:01:16 -06:00
a4dbb5823c
update license blocks for 2013
2013-01-11 14:57:51 -06:00
27c31fb403
jetty-9 organised imports. Cleaned up some TODOs
2013-01-11 16:37:32 +11:00
3efcc2af41
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/Request.java
jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
jetty-servlet/src/main/java/org/eclipse/jetty/servlet/DefaultServlet.java
jetty-servlets/src/main/java/org/eclipse/jetty/servlets/GzipFilter.java
2013-01-10 16:24:41 +11:00
2aab780eba
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
tests/test-integration/src/test/java/org/eclipse/jetty/test/jsp/JspMatchingTest.java
2013-01-07 23:45:38 +11:00
ccda9bb10b
397535 Support pluggable alias checking to support symbolic links
2013-01-07 19:57:52 +11:00
346918577f
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
jetty-client/src/main/java/org/eclipse/jetty/client/AsyncHttpConnection.java
jetty-server/src/main/java/org/eclipse/jetty/server/AbstractHttpConnection.java
jetty-server/src/main/java/org/eclipse/jetty/server/Server.java
jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
jetty-servlets/src/main/java/org/eclipse/jetty/servlets/MultiPartFilter.java
jetty-servlets/src/test/java/org/eclipse/jetty/servlets/MultipartFilterTest.java
jetty-util/src/main/java/org/eclipse/jetty/util/MultiPartInputStream.java
jetty-util/src/test/java/org/eclipse/jetty/util/MultiPartInputStreamTest.java
jetty-webapp/src/test/java/org/eclipse/jetty/webapp/WebAppContextTest.java
test-jetty-servlet/src/main/java/org/eclipse/jetty/testing/ServletTester.java
test-jetty-webapp/src/main/java/com/acme/CookieDump.java
test-jetty-webapp/src/main/java/com/acme/HelloWorld.java
2012-12-22 15:12:17 +11:00
69b9856998
Squashing JMX warnings on jetty startup
2012-12-19 13:50:51 -07:00
f9e76b1620
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
...
Conflicts:
jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
jetty-servlets/src/main/java/org/eclipse/jetty/servlets/MultiPartFilter.java
jetty-util/src/main/java/org/eclipse/jetty/util/ReadLineInputStream.java
2012-12-14 11:48:55 +11:00
10deb68ced
396472 org.eclipse.jetty.websocket needs to be removed from serverclasses as it should only be a systemclass
2012-12-13 19:58:50 +11:00
99201dd521
396473 JettyWebXMlConfiguration does not reset serverclasses
2012-12-13 19:58:50 +11:00
a478271828
JETTY-1533 handle URL with no path
2012-12-13 07:59:21 +11:00
e612c19eb7
JETTY-796 jetty ant plugin improvements
2012-12-07 16:27:17 +11:00
f0cc03ede5
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/Response.java
jetty-server/src/main/java/org/eclipse/jetty/server/session/HashSessionManager.java
jetty-server/src/main/java/org/eclipse/jetty/server/session/HashedSession.java
jetty-server/src/test/java/org/eclipse/jetty/server/ResponseTest.java
jetty-servlets/src/test/java/org/eclipse/jetty/servlets/MultipartFilterTest.java
2012-11-22 17:01:55 +11:00
90a86d3a6b
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2012-11-22 16:26:38 +11:00
597649d4aa
394719 remove regex from classpath matching
2012-11-22 15:41:01 +11:00
Joakim Erdfelt
Greg Wilkins
Jan Bartel
Jesse McConnell