Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
17,722 Commits 75 Branches 465 Tags 368 MiB
Commit Graph

17722 Commits

Author SHA1 Message Date
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
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
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
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
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 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
Greg Wilkins bda9307028
Merge pull request #3144 from lachlan-roberts/jetty-9.4.x 
Issue #113 - CustomRequestLog
 2018-11-29 09:29:43 +01:00
Lachlan Roberts 472d7a1529 Issue #113 - latency test failures fixed 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2018-11-28 22:28:40 +01:00
Lachlan Roberts c2749ff5e3 Issue #113 - fixed documentation inconsistency 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2018-11-28 16:22:37 +01:00
Lachlan Roberts e58fd93742 Issue #113 - StacklessLogging for NcsaRequestLogTest expected exceptions 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2018-11-28 16:05:03 +01:00
Jan Bartel 1baa3c3147 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2018-11-28 15:01:50 +01:00
Raymond Augé 7ef8f882bd fixes #3141 Upgrade jetty osgi tests to use spifly 1.2 (#3142) 
Signed-off-by: Raymond Auge <raymond.auge@liferay.com>
 2018-11-28 15:00:31 +01:00
Lachlan Roberts 982895719c Issue #113 - changes from review and bug fixes 
%t now takes in locale and timezone in the format string argument
instead of getting it from the setters on the CustomRequestLog class

fixed issue with multiline format strings

requestLog writers are now managed objects

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2018-11-28 14:58:28 +01:00
Greg Wilkins c9d5b91c79 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2018-11-28 13:05:57 +01:00
Alexander Kurtakov 69daacf8a9 Bring back packageRoot parameter in jetty-jspc-maven-plugin (#3157) 
* Cleanup JspcMojo.
* Remove useless import.
* Generify where possible.
* Use setWebXmlInclude instead of setWebXmlFragment.
* Add it test verifying and demonstrating how to set JspC package param.

Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
 2018-11-28 12:53:14 +01:00
Greg Wilkins 871e05fd6a
Merge pull request #3081 from eclipse/jetty-9.4.x-cleanup-webapp-context 
Cleanup webapp context
 2018-11-28 11:32:00 +01:00
Greg Wilkins e08a4e55dd Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-cleanup-webapp-context 2018-11-28 10:58:55 +01:00
Lachlan Roberts 63aa9ce97d Issue #113 - problems with latency tests and request handler name 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2018-11-28 10:52:17 +01:00
Lachlan Roberts 8aa3655c55 Issue #113 - fix to failing tests 
removed tests for %B and %b which have been removed in favor of %O
adjusted the NcsaRequestLogTest to only test ExtendedNCSA format

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2018-11-28 09:26:55 +01:00
olivier lamy 62d160ac6b Merge remote-tracking branch 'upstream/jetty-9.4.x' into jetty-10.0.x 2018-11-28 10:16:51 +10:00
Olivier Lamy bee1487ecc
copying base resources must happen when preparing packaging we must not rely on id (#3138) 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2018-11-28 10:13:04 +10:00
Olivier Lamy 9ee57192dc
use withMaven junit publisher (#3150) 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2018-11-28 10:12:07 +10:00
Lachlan Roberts b97c80b3c1 Issue #113 - testing of logConnectionStatus implemented 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2018-11-27 14:26:31 +01:00
Lachlan Roberts b35df419bb Issue #113 - reformat, javadoc update and changes after review 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2018-11-27 14:26:12 +01:00
olivier lamy 87076d5f4f Merge remote-tracking branch 'upstream/jetty-9.4.x' into jetty-10.0.x 2018-11-27 11:09:53 +10:00
Paweł Nawrocki f5445a759e Fixed invalid QoS Filter parameter names (#3149) 
Signed-off-by: Pawel Nawrocki <pnaw94@hotmail.com>
 2018-11-27 10:57:28 +10:00
Lachlan Roberts 2cd579353c Issue #113 - fix javadoc errors 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2018-11-26 14:12:16 +01:00
Greg Wilkins 0b97e02305 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2018-11-24 21:17:20 +01:00
Greg Wilkins 00e2026594 Fix conscrypt version for osgi jdk8 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2018-11-24 21:16:19 +01:00
Greg Wilkins 1e15e3e941 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2018-11-24 16:49:40 +01:00
Lachlan Roberts 7c0ea57923 Issue #113 - CustomRequestLog terminology refactor 
replaced terminology for addresses and ports to use
client and server referring to the logical connection and
local and remote referring to the physical connection to the first hop

finished implementing tests in CustomRequestLogTest otherwise
disabled tests which will be verified manually instead

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2018-11-24 10:28:57 +01:00