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

17709 Commits

Author SHA1 Message Date
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
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
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
Greg Wilkins 97cb063a57 Merge branch 'jetty-9.4.x' of github.com:eclipse/jetty.project into jetty-9.4.x 2018-11-23 17:01:39 +01:00
Greg Wilkins 92317a7bb4 Issue #3132 improve dump readability 
fixed tests

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2018-11-23 16:54:36 +01:00
Jan Bartel 506e4dc682 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2018-11-23 16:45:32 +01:00
Jan Bartel 4080cc6c3b Fix websocket module name changes, etc file changes, and jetty-schemas 
to make jetty-osgi work.
 2018-11-23 16:16:22 +01:00
Jan Bartel 4e672c6b27
Issue #2646 - Better handle concurrent calls to change session id and invalidate within a context (#2670) 
* Issue #2646 handle concurrent invalidate/changeid calls

Signed-off-by: Jan Bartel <janb@webtide.com>
 2018-11-23 16:15:27 +01:00
Jan Bartel 54319589a4 Fix conscrypt version for osgi 2018-11-23 16:13:30 +01:00
Lachlan Roberts 771f120508 Issue #113 - customrequestlog module 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2018-11-22 20:01:19 +01:00
Greg Wilkins fc0d2569ef Issue #3132 improve dump readability 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2018-11-22 18:08:46 +01:00
Greg Wilkins f820a57d7e Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2018-11-22 17:57:47 +01:00
Greg Wilkins 0900d5ad75
Merge pull request #3130 from eclipse/remove_test-dispatch-webapp 
remove non used test-dispatch-webapp module
 2018-11-22 17:57:10 +01:00
Simone Bordet f0fbd63a55 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2018-11-22 12:56:25 +01:00
Simone Bordet 14c2431b1d Updated Conscrypt to 1.4.1. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2018-11-22 12:46:11 +01:00
Greg Wilkins 8c10d266b2 Merge branch 'jetty-9.4.x' into jetty-9.4.x-cleanup-webapp-context 2018-11-22 12:41:47 +01:00