Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
18,098 Commits 70 Branches 462 Tags 370 MiB
Commit Graph

18098 Commits

Author SHA1 Message Date
Jan Bartel 3acb98f477
Issue #3161 Update to Apache JSP 8.5.35 (#3163) 
* Issue #3161 Update to Apache JSP 8.5.35

Signed-off-by: Jan Bartel <janb@webtide.com>
 2018-12-13 14:57:14 +11:00
Greg Wilkins fb06b82172 Issue #3030 ignore identity content encoding during parameter extraction 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2018-12-13 13:42:08 +11:00
Greg Wilkins 1176b267b5 removed -impl from websocket name and fixed SCI 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2018-12-13 10:05:10 +11:00
Greg Wilkins 52d0d62594 Configure default EndpointIdentificationAlgorithm for WebSocketCoreClient 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2018-12-13 09:36:13 +11:00
Greg Wilkins 9a67114c43 work in progress to fix websocket OSGi 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2018-12-12 17:35:46 +11:00
Jan Bartel 61686843db Issue #3162 Partial fix for javaxwebsocket in osgi, wip. 2018-12-12 14:44:04 +11:00
Joakim Erdfelt ff0aa965c4 Issue #3162 - Attempting to address ServiceLoader with javax.websocket (client) on OSGi 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2018-12-12 14:43:58 +11:00
Jan Bartel 1167adf713 Issue #3162 Partial fix for javaxwebsocket in osgi, wip. 2018-12-12 10:15:43 +11:00
Greg Wilkins 8320d88698 Disable test that fails 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2018-12-11 18:02:07 +11:00
Greg Wilkins 252bb5dd72 Merge branch 'jetty-10.0.x' into jetty-10.0.x-3129-websocket 2018-12-11 17:02:16 +11:00
Jan Bartel 6af567a4b9
Handle ServletContainerInitializer from WEB-INF/classes #3146 (#3158) 
* Handle the case where a ServletContainerInitializer comes from
WEB-INF/classes

Signed-off-by: Jan Bartel <janb@webtide.com>
 2018-12-11 06:33:44 +01:00
Simone Bordet 2497cf6feb
Merge pull request #3193 from bjorncs/low-resource-monitor 
Change access of LowResourceCheck to public
 2018-12-10 14:17:21 +01:00
Bjørn Christian Seime 71c0e47446 Change access of LowResourceCheck to public 
This interface is currently package-private while it's in the
signature of several public methods (e.g. addLowResourceCheck, getLowResourceChecks)

Signed-off-by: Bjørn Christian Seime <bjorncs@yahoo-inc.com>
 2018-12-10 13:39:29 +01:00
olivier lamy 14ffa0d981 Merge branch 'jetty-9.4.x' into jetty-10.0.x 2018-12-08 18:42:42 +10:00
Torbjørn Martinsen e7be376882 Update DoSFilter.java (#3191) 
Add missing word and remove extra space in comments
 2018-12-06 17:59:08 +10:00
Olivier Lamy 0dcdcc7baf
Jetty 10.0.x fix surefire arg line (to avoid locale dependent build) (#3183) 
* surefire.argLine replaced by jetty.surefire.argLine

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2018-12-06 09:09:06 +10:00
Greg Wilkins e8d468b3e1 work in progress 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2018-12-05 14:45:23 +01:00
Greg Wilkins 13ee892921 Merge remote-tracking branch 'remotes/lachlan/jetty-10.0.x-3129-websocketModuleRefactor' into jetty-10.0.x-3129-websocket 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2018-12-05 09:55:22 +01:00
Jan Bartel f4cf671b27 Issue #3129 Fix websocket in osgi; javax websocket test still broken. 2018-12-05 09:38:13 +01:00
Joakim Erdfelt 435dd200bd Issue #3162 - Attempting to address ServiceLoader with javax.websocket (client) on OSGi 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2018-12-04 11:31:02 -06:00
Joakim Erdfelt 7262bfd584 Issue #3162 - Fixing testcase assertions 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2018-12-04 08:50:19 -06:00
Joakim Erdfelt 97bba2eb6f Issue #3162 - Fail test early if `conscrypt-version` is undefined (like on Windows, or within an IDE) 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2018-12-04 08:48:15 -06:00
Joakim Erdfelt 24e680e272 Issue #3162 - Introducing more convenience Options for PaxExam 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2018-12-03 17:35:08 -06:00
Joakim Erdfelt 231892e276 Issue #3162 - Making dependents OSGi aware 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2018-12-03 17:34:13 -06:00
Joakim Erdfelt 01e1f01933 Issue #3162 - Correcting package name exposure (missing 's') 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2018-12-03 17:33:51 -06:00
Joakim Erdfelt db11be087a Issue #3162 - Updating XML (removing references that seem to be getting in the way) 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2018-12-03 17:33:20 -06:00
Joakim Erdfelt 7f6add586e Issue #3162 - Adding missing Configuration reference 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2018-12-03 17:32:53 -06:00
Joakim Erdfelt e16e3f1358 Issue #3162 - correcting logger name 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2018-12-03 17:32:27 -06:00
Joakim Erdfelt e0f4e5a32a Issue #3162 - correcting typo 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2018-12-03 17:32:10 -06:00
Joakim Erdfelt 85f74f198a Issue #3162 - Fixing OSGi manifest for websocket 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2018-12-03 17:31:51 -06:00
olivier lamy c0655ce634 Revert "fix argLine inheritance (#3177)" 
This reverts commit 3e6ab2d1ac.
 2018-12-03 13:25:00 +10:00
Olivier Lamy 3e6ab2d1ac
fix argLine inheritance (#3177) 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2018-12-03 11:20:20 +10:00
Greg Wilkins 18b0ad842a
Merge pull request #3160 from eclipse/jetty-10.0.x-113-customrequestlog 
Issue #113 CustomRequestLog as default in jetty-10
 2018-12-01 16:32:45 +01:00
Greg Wilkins 81ca90b1f6 Issue #113 
Deletes the deprecated NcsaRequestLog classes
Updates modules to use CustomRequestLog by default
Move jetty-customrequestlog.xml from home to base

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2018-12-01 16:31:23 +01:00
Joakim Erdfelt c3348a0a03 Issue #3162 - Correcting websocket issues in OSGi 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2018-11-30 15:03:44 -06:00
olivier lamy 3e1f814674 Merge remote-tracking branch 'upstream/jetty-9.4.x' into jetty-10.0.x 2018-11-30 17:59:42 +10:00
Olivier Lamy b4ab8a07c1
#2718 take care of starting new created context (#3145) 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2018-11-30 17:55:51 +10:00
Lachlan Roberts e8ba030904 Issue #3129 - refactor of javax websocket package names 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2018-11-29 17:43:51 +01:00
Simone Bordet 8ff82423f9 Issue #3162 - Use Jetty specific Servlet API jar. 
Removed references to jetty-osgi-servlet-api.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2018-11-29 17:36:09 +01:00
Simone Bordet 707c9ec322 Issue #3162 - Use Jetty specific Servlet API jar. 
Future proof reference of the jetty-servlet-api.jar.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2018-11-29 17:29:08 +01:00
Simone Bordet bfa2dbf68c Issue #3162 - Use Jetty specific Servlet API jar. 
* Updated module-info.java to reference the "jetty.servlet.api" module.
* Updated POMs to reference the o.e.j.toolchain:jetty-servlet-api artifact.
* Removed references to jetty-schemas.jar.
* Updated attribute "org.eclipse.jetty.server.webapp.ContainerIncludeJarPattern"
  to match the new Jetty Servlet API jar.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2018-11-29 16:51:29 +01:00
Simone Bordet 99d1983ebd Issue #3011 - Move HttpCompliance to HttpConfiguration. 
Fixed jetty-https.xml.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2018-11-29 16:41:25 +01:00
Greg Wilkins aeb200e583 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2018-11-29 12:10:58 +01:00
Greg Wilkins 132aef4420 Issue #113 
default to extended format

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2018-11-29 12:10:18 +01:00
Greg Wilkins 0d4e20b964 Issue #113 
Fixed merge to 10
 2018-11-29 11:08:55 +01:00
Greg Wilkins bbc7037171 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2018-11-29 11:06:49 +01:00
Greg Wilkins 7742650fa5 Issue #113 
Fixed property names

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2018-11-29 10:55:00 +01:00
Greg Wilkins fc39e96653 Issue #113 
Updated customrequestlog module defaults for timezone

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2018-11-29 10:34:42 +01:00
Greg Wilkins e7d4f55891 Issue #113 
Use CustomRequestLog in examples.
Convenience constructors

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2018-11-29 10:13:12 +01:00
Greg Wilkins 720e561008 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2018-11-29 09:32:50 +01:00