Eclipse/jetty.project
1
0
Fork 0
mirror of https://github.com/jetty/jetty.project.git synced 2025-03-01 03:19:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,512 Commits 59 Branches 466 Tags
Commit Graph

400 Commits

Author SHA1 Message Date
Jan Bartel
c0f5c5a659 Merge remote-tracking branch 'origin/master' into jetty-9.1 
Conflicts:
	jetty-deploy/src/main/java/org/eclipse/jetty/deploy/providers/WebAppProvider.java
 2013-09-10 10:18:12 +10:00
Jan Bartel
f85acc7437 Merge remote-tracking branch 'origin/jetty-8' 
Conflicts:
	jetty-webapp/src/main/java/org/eclipse/jetty/webapp/StandardDescriptorProcessor.java
 2013-09-10 09:48:09 +10:00
Jan Bartel
ab9ecd277d 416266 HttpServletResponse.encodeURL() encodes on first request when only SessionTrackingMode.COOKIE is used 2013-09-10 08:57:59 +10:00
Greg Wilkins
070ce9dd22 Merge remote-tracking branch 'origin/master' into jetty-9.1 
Conflicts:
	jetty-start/src/main/java/org/eclipse/jetty/start/Main.java
	jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java
 2013-09-09 15:41:17 +10:00
Mikhail Mazursky
767faece5c [Bug 415999] Fix some of FindBugs warnings 
Mostly not closed streams/DB resources are fixed. But also less
important things.

Signed-off-by: Mikhail Mazursky <mikhail.mazursky@gmail.com>
 2013-09-09 00:24:31 -04:00
Thomas Becker
e26ce1b303 /jetty-webapp/src/main/config/etc/webdefault.xml fix xml error 2013-09-06 16:34:02 +02:00
Greg Wilkins
ef98f89e5c 416680 remove uncovered constraint warning 2013-09-06 16:56:15 +10:00
Jan Bartel
810fbdc439 Merge remote-tracking branch 'origin/master' into jetty-9.1 2013-09-05 18:31:53 +10:00
Jan Bartel
b8a4bf37e6 416597 Allow classes and jars on the webappcontext extraclasspath to be scanned for annotations 2013-09-05 18:24:12 +10:00
Jan Bartel
6fb95b8ad7 Merge remote-tracking branch 'origin/master' into jetty-9.1 2013-09-05 13:20:39 +10:00
Jan Bartel
edaa23b21e 416585 WebInfConfiguration examines webapp classloader first instead of its parent when looking for container jars 2013-09-05 13:03:45 +10:00
Jan Bartel
2ab4757450 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-09-05 12:55:19 +10:00
Jan Bartel
e764a0f2e7 416585 WebInfConfiguration examines webapp classloader first instead of its parent when looking for container jars 2013-09-05 12:47:39 +10:00
Jesse McConnell
ac30f5c9bd update other jetty mods to new format 2013-08-29 16:39:28 -05:00
Jesse McConnell
450cdb3ef4 add servlet/s mod 2013-08-22 12:21:52 -05:00
Jesse McConnell
725e405dac first pass for mod files for distribution 2013-08-22 11:53:58 -05:00
Jesse McConnell
307fdced91 Merge branch 'master' into jetty-9.1 2013-08-20 14:02:45 -05:00
Jesse McConnell
fd5d789ff5 [Bug 411069] better set compiler defaults to 1.7, including webdefault.xml for jsp 2013-08-20 13:34:33 -05:00
Jan Bartel
ccf59bf75d 412934 Ignore any re-definition of an init-param within a descriptor 
Also tidy of code.
 2013-08-20 09:45:02 +10:00
Jan Bartel
1691618024 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-08-16 11:06:42 +10:00
Jan Bartel
54a899d55f 415192 <jsp-file> maps to JspPropertyGroupServlet instead of JspServlet 2013-08-16 11:02:29 +10:00
Joakim Erdfelt
c14e0dc11e Fixing Javadoc in jetty-webapp 2013-08-14 12:46:25 -07:00
Joakim Erdfelt
ffad720991 Fixing Javadoc errors that JDK 1.7 complains about 2013-08-14 11:50:07 -07:00
Greg Wilkins
e0382bc4ae 414740 Removed the parent peeking Loader 2013-08-09 17:53:43 +10:00
Jan Bartel
47a8809ec7 413018 ServletContext.addListener() should throw IllegalArgumentException if arg is not correct type of listener 2013-08-02 12:26:54 +10:00
Jan Bartel
ca37782229 412829 Allow any mappings from web-default.xml to be overridden by web.xml 2013-07-23 12:18:18 +10:00
Greg Wilkins
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
Jan Bartel
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
Jan Bartel
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
Greg Wilkins
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
Greg Wilkins
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
Greg Wilkins
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
Jan Bartel
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
Jan Bartel
54b62eafcb Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-05-29 10:54:53 +10:00
Jan Bartel
9f2a641dc0 409133 Empty <welcome-file> causes StackOverflowError 2013-05-29 10:21:53 +10:00
Greg Wilkins
15e0d50b79 Merge remote-tracking branch 'origin/master' into servlet-3.1-api 2013-05-23 09:50:27 +10:00
Jesse McConnell
74a4077dad Add package-info.java files to all jetty packages. 2013-05-21 15:09:49 -05:00
Jan Bartel
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
Jan Bartel
3df03e18d7 405437 Implement section 13.8.4 Uncovered HTTP methods 2013-04-23 13:52:41 +10:00
Jan Bartel
4951b1ccc4 404176 Jetty's AnnotationConfiguration class does not scan non-jar resources on the container classpath 2013-03-28 19:33:52 +11:00
Greg Wilkins
8dc6aca9cd 393972 Improve WebAppContext classloading javadoc 2013-03-15 15:42:07 +11:00
Greg Wilkins
45916182d8 393971 Improve setParentLoaderPriorty javadoc 2013-03-15 15:38:31 +11:00
Joakim Erdfelt
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
Greg Wilkins
c396622770 401495 removed unused getOutputStream 2013-03-04 17:38:00 +11:00
Jan Bartel
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
Jan Bartel
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
Jan Bartel
a65adcdd38 401531 StringIndexOutOfBoundsException for "/*" <url-pattern> of <jsp-property-group> 2013-02-25 17:45:22 +11:00
Greg Wilkins
2d310ac82e 401642 Less verbose INFOs 2013-02-25 14:42:30 +11:00
Jan Bartel
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
Joakim Erdfelt
a23f2451cd Merge branch 'jetty-7' into jetty-8 2013-02-19 09:41:10 -07:00