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

424 Commits

Author SHA1 Message Date
Olivier Lamy f36eba4577
class.newInstance is deprecated #2435 (#2437) 
* Class.newInstance() is deprecated in Java 9+ #2435

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2018-04-17 19:07:20 +10:00
Joakim Erdfelt 1c04f9838d Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x-fixed 2018-03-22 16:42:42 -05:00
WalkerWatch 534b8ea38b Add edit warning for .mod files. Resolves #173 2018-03-15 13:23:42 -04:00
Joakim Erdfelt e3e3f9eb0b Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x-fixed 2018-03-06 11:16:25 -06:00
Lachlan Roberts a639ee9275 Resolved errorprone MissingOverride warnings #2206 
`@Override` was added to methods which were missing the annotation #2206

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2018-03-01 13:59:25 +11:00
Greg Wilkins ec51926622 reduce fragility of tests 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2018-02-19 19:22:32 +11:00
Joakim Erdfelt d5a0878019 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2018-01-09 10:08:30 -06:00
Joakim Erdfelt 21365234f8 Issue #2108 - Updating license headers for year 2018 2018-01-09 09:44:41 -06:00
Joakim Erdfelt 41ed9f29f4 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2018-01-09 09:37:25 -06:00
Joakim Erdfelt fa4c7b0ca9 Issue #2108 - Updating license headers for year 2018 2018-01-09 08:39:37 -06:00
Joakim Erdfelt 067fc5d2d8 Issue #2108 - Upgrade licenses for 2018 2018-01-09 07:42:06 -06:00
Jan Bartel 582e12fa60 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-11-23 12:59:32 +01:00
Adam Retter ad88309401 Don't create a session for every request if not required when doing form authentication 
Signed-off-by: Adam Retter <adam.retter@googlemail.com>
 2017-11-21 13:53:57 +00:00
Greg Wilkins 1b7ebf5599 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-09-23 00:22:57 +10:00
Greg Wilkins bc47942d17 Issue #1200 Improve PathWatcher 
Squashed commit of the following:

commit 08b5acccf87c3b99152a8042d650aadf7e43c5ff
Merge: cea3366 daeb844
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Sep 5 12:43:01 2017 +1000

    Merge branch 'jetty-9.4.x' into jetty-9.4.x-1200

commit cea3366625e16debf66e07284ab7afa89e73a32d
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Sep 5 12:42:21 2017 +1000

    Issue #1200 ignore OSX failure

commit fd2493f2b30ffb19f4b404636e1e38c8612cb502
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Sep 5 12:11:05 2017 +1000

    Issue #1789 PropertyUserStoreTest failures on windows

commit 89aa59ca7b16a393edc77116b13050d2d8a2c3e2
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Sep 5 11:56:52 2017 +1000

    Issue #1200 fixes for windows

commit 1904b4566d9224a19729f83a7b49a5ab23aaa5d8
Merge: 74d770e eec6453
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Sep 5 11:45:19 2017 +1000

    Merge branch 'jetty-9.4.x' into jetty-9.4.x-1200

commit 74d770e557e8ff613a5965cb430a7b83ee75bd45
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Sep 1 10:47:05 2017 +1000

    Issue #1200 fixes for windows

commit f4ee0e97dcd0a07257cea8da8b3106f71150957f
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Aug 31 10:24:07 2017 +1000

    Issue #1200 improved tests for long duration quiet time

commit 17381cbb0bbebe3ea27ed5f55caeb45c2856e1be
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Aug 31 10:03:04 2017 +1000

    Issue #1200 fixed javadoc

commit b3a12c15167ce77a9781942680ca2d5c872374dd
Merge: ed0db46 ce4adb5
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Aug 31 09:41:50 2017 +1000

    Merge branch 'jetty-9.4.x-1200' of github.com:eclipse/jetty.project into jetty-9.4.x-1200

commit ed0db46f495f27491ba58e6c4353cf1ef6f2061e
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Aug 31 09:39:46 2017 +1000

    Issue #1200 Improved PathWatcher

commit ce4adb54ed58d39789ea1ba4f5d58035e57980ce
Merge: f993a7c 48aaecb
Author: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Date:   Wed Aug 30 16:38:07 2017 -0700

    Merge branch 'jetty-9.4.x-1200' of github.com:eclipse/jetty.project into jetty-9.4.x-1200

commit f993a7c83ee7294a34b00cea68242adb7993e565
Author: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Date:   Wed Aug 30 16:37:45 2017 -0700

    Issue #1200 - adding some important OSX/HFS+ timing differences

    + We should really be testing the FileSystem (not the OS) to make the timing
       constants be more sane. (APFS for example should be much lower on newer
       OSX installations

commit 48aaecb4dd291d94d591c1545f671eecff1e3587
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Aug 31 08:50:42 2017 +1000

    Issue #1200 Improved PathWatcher diff

commit 1917f8b177d163bd42c07d5a2715858e7cf9787a
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Aug 31 08:36:40 2017 +1000

    Issue #1200 Improved PathWatcher diff

commit ecf002395a426ee3c00a4b42a32222e61805234f
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Aug 31 08:22:41 2017 +1000

    Issue #1200 Test improved PathWatcher

commit 0d76544093cbcddd9b29fc2c92a4d0bb0a6839a8
Merge: 0fd7187 eb1320f
Author: Greg Wilkins <gregw@webtide.com>
Date:   Wed Aug 30 16:43:15 2017 +1000

    Merge branch 'jetty-9.4.x' into jetty-9.4.x-1200

commit 0fd7187f908ed2d1bed24d5d82e25cb7ec244b0e
Author: Greg Wilkins <gregw@webtide.com>
Date:   Wed Aug 30 15:58:24 2017 +1000

    Issue #1200 Improve PathWatcher
 2017-09-05 12:44:31 +10:00
Joakim Erdfelt 02f0649840 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-08-28 11:33:12 -07:00
Greg Wilkins 08a000b7a7 Issue #1520 wrong IO 2017-08-28 16:28:18 +10:00
Greg Wilkins 5f34e0bce8 Issue #1520 2017-08-28 16:03:51 +10:00
Greg Wilkins 6390b335fc Issue #1520 
Removed a lot of cruft from this class that had accumulated over the years.
Deprecated methods like setConfigPath(File) and setConfigPath(String)
removed asymmetries like setConfigPath(String) and Path getConfigPath()
removed redundant configResource field
improved jarfile extraction to work for all string setters.
do not hot reload extracted config
fixed code style issues
 2017-08-28 15:59:36 +10:00
Simone Bordet 2a3deb0a10 Removed leftover System.err debug line. 2017-08-24 11:01:34 +02:00
Joakim Erdfelt 3ec5f8fa3d Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-08-09 16:21:08 -07:00
Joakim Erdfelt 1311052b15 Cleaning up state of branch to match the original jetty-9.4.x 
+ Does not include changes to /jetty-cdi/
+ Does not include changes to /jetty-websocket/ for javax.websocket-1.1
 2017-08-08 09:47:04 -07:00
Josh Elser c6d86122db Fix a bug around handling "Negotiate" case-insensitively in SpnegoAut… (#1710) 
* Fix a bug around handling "Negotiate" case-insensitively in SpnegoAuthenticator

Closes #1709

Signed-off-by: Josh Elser <elserj@apache.org>

* Clean up isAuthSchemeNegotiate(String) since we don't need to use startsWith()

Signed-off-by: Josh Elser <elserj@apache.org>
 2017-08-08 09:16:01 -07:00
Josh Elser 1fd3e4ad1b Sends the WWW-Authenticate header if a non-Negotiate authorization he… (#1700) 
* Sends the WWW-Authenticate header if a non-Negotiate authorization header was given

Fixes #1698

Signed-off-by: Josh Elser <elserj@apache.org>

* Dumb compilation error

Signed-off-by: Josh Elser <elserj@apache.org>

* Adds a test to show the challenge is sent.

Signed-off-by: Josh Elser <elserj@apache.org>

* Refactor the conditionals per Greg's suggestion

Signed-off-by: Josh Elser <elserj@apache.org>

* Add the expected license header

Signed-off-by: Josh Elser <elserj@apache.org>
 2017-08-08 09:15:45 -07:00
Greg Wilkins e7ef74dd4f removed deprecated test method usage 2017-08-08 09:10:25 -07:00
Greg Wilkins 6494c2ce7c Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-08-02 12:22:37 +10:00
Josh Elser 34a450cd9d Sends the WWW-Authenticate header if a non-Negotiate authorization he… (#1700) 
* Sends the WWW-Authenticate header if a non-Negotiate authorization header was given

Fixes #1698

Signed-off-by: Josh Elser <elserj@apache.org>

* Dumb compilation error

Signed-off-by: Josh Elser <elserj@apache.org>

* Adds a test to show the challenge is sent.

Signed-off-by: Josh Elser <elserj@apache.org>

* Refactor the conditionals per Greg's suggestion

Signed-off-by: Josh Elser <elserj@apache.org>

* Add the expected license header

Signed-off-by: Josh Elser <elserj@apache.org>
 2017-08-02 04:18:04 +02:00
Greg Wilkins 34b25ff385 Issue #1676 removed deprecated PathMap 2017-07-18 19:59:07 +02:00
Joakim Erdfelt a9c329859d Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-07-12 13:18:12 -07:00
Joakim Erdfelt ee8d4c1587 gitattributes followup 2017-07-06 16:24:31 -07:00
Greg Wilkins 10bb8c3605 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-06-06 12:27:52 +02:00
Greg Wilkins c4ae7ab8d9 removed deprecated test method usage 2017-06-06 12:27:21 +02:00
Greg Wilkins ab4d300ae7 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-05-30 17:43:19 +02:00
Jan Bartel 79883c739d Merge pull request #1545 from olamy/bugfix/1520 
PropertyUserStore should extract packed config file #1520
 2017-05-23 11:51:48 +02:00
olivier lamy 7d600b0c54 #1520 reuse code from JarResource to extract packed file 
Signed-off-by: olivier lamy <olamy@webtide.com>
 2017-05-18 16:04:41 +10:00
olivier lamy 8b94f2f275 correctly close ZipInputstream #1520 
Signed-off-by: olivier lamy <olamy@webtide.com>
 2017-05-17 10:55:11 +10:00
Simone Bordet bc2f3193ab Merged branch 'jetty-9.4.x' into 'master'. 2017-05-16 11:37:01 +02:00
Simone Bordet bd2f3db69f Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2017-05-16 11:35:01 +02:00
Simone Bordet 1ef845556b Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'. 2017-05-16 10:44:46 +02:00
Simone Bordet 042f325f1c Fixes #1556 - A timing channel in Password.java. 2017-05-16 10:41:08 +02:00
olivier lamy e9f75e81d9 PropertyUserStore should extract packed config file #1520 
Signed-off-by: olivier lamy <olamy@webtide.com>
 2017-05-12 14:57:46 +10:00
Simone Bordet cab1ec77ad Merged branch 'jetty-9.4.x' into 'master'. 2017-05-02 10:03:30 +02:00
Jan Bartel 84bc74754d Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2017-05-01 17:53:38 +02:00
Jan Bartel 5f65f2916f Issue #1390 
Remove this.web_url.path
 2017-05-01 17:37:05 +02:00
Greg Wilkins 68caf72835 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-05-01 13:30:41 +02:00
olivier lamy 970cec230b prefer LOG.debug to System.err.println 
Signed-off-by: olivier lamy <olamy@webtide.com>
 2017-04-21 11:44:50 +10:00
Jan Bartel e1bd46023e Issue #1481 
Fix bug
 2017-04-20 18:10:34 +10:00
olivier lamy 9f3841d8e0 fix after review 
Signed-off-by: olivier lamy <olamy@webtide.com>
 2017-04-20 15:41:26 +10:00
olivier lamy 626327fa67 add as simple unit test #1481 2017-04-20 15:03:04 +10:00
olivier lamy 6a88e13b3a make those methods public for external use 
Signed-off-by: olivier lamy <olamy@webtide.com>
 2017-04-20 15:03:04 +10:00
olivier lamy 99a98127cd #1481 HashLogin has now a setter to configure the UserStore implementation to use 
Signed-off-by: olivier lamy <olamy@webtide.com>
 2017-04-20 15:03:04 +10:00
olivier lamy a2f89f2bf9 implementation for #1481 
Add a new base class UserStore

Signed-off-by: olivier lamy <olamy@webtide.com>
 2017-04-20 15:03:04 +10:00
Greg Wilkins dd084b4e74 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-03-30 17:20:22 +11:00
Joakim Erdfelt 3dcd318c02 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2017-03-10 14:05:39 -07:00
Joakim Erdfelt 95feaa6198 Fixing NPE 2017-03-10 14:05:19 -07:00
Joakim Erdfelt 92afe54c1d Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2017-03-10 13:22:32 -07:00
Joakim Erdfelt e25007cb79 Issue #1390 - Addressing new File(URL) use in Windows 
+ Fixing HashLoginService to track its Config via File reference only
  (dropping support for URL reference)
+ Adding new `this.web-inf.path` property that jetty-web.xml can use
 2017-03-10 12:47:06 -07:00
Joakim Erdfelt c5c7be2bc5 Merge branch 'jetty-9.4.x' 2017-02-02 16:23:13 -07:00
Joakim Erdfelt 5e57b9562f Merge branch 'jetty-9.3.x' into jetty-9.4.x 2017-02-02 16:14:10 -07:00
Joakim Erdfelt 9a8f22d5dd Testing Updates 
+ Upgrading to jetty-test-helper 4.0
+ Removing use of org.eclipse.jetty.toolchain.test.SimpleRequest
+ Removing use of org.eclipse.jetty.toolchain.test.http.SimpleHttpParser
+ Removing use of org.eclipse.jetty.toolchain.test.http.SimpleHttpResponse
+ Updating long since deprecated (and now removed) known quirky methods
  in jetty-test-helper and the test classes.
 2017-02-02 15:51:38 -07:00
Simone Bordet cef2ff9522 Happy New Year 2017. 2017-01-19 19:31:53 +01:00
Simone Bordet 0c8273f2ca Happy New Year 2017. 2017-01-19 19:26:41 +01:00
Simone Bordet 07838b057f Happy New Year 2017. 2017-01-19 18:54:03 +01:00
Simone Bordet 347c48d657 Revert "resolve merge and update license headers" 
This reverts commit 53b31b03dd, reversing
changes made to 4565c186d7.
 2017-01-19 18:26:43 +01:00
Jesse McConnell 53b31b03dd resolve merge and update license headers 2017-01-19 09:33:16 -06:00
Jesse McConnell ce3e6dafec update license headers to 2017 2017-01-19 09:30:00 -06:00
Jan Bartel c6fa0cdd69 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-01-18 17:28:21 +11:00
Jan Bartel 65987b03ba Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2017-01-18 17:27:53 +11:00
Jan Bartel ae0a8c7f2b Issue #1267 2017-01-18 17:26:23 +11:00
Jan Bartel 4b2b5e0eed Issue #1267 2017-01-18 17:24:20 +11:00
Jan Bartel 69babbf38c Issue #1224 
This reverts commit 3d35484dc7 and provides different solution.
 2017-01-09 12:07:29 +11:00
Jan Bartel 3d35484dc7 Issue #1222 2017-01-07 15:05:06 +11:00
Simone Bordet df91fc1092 Merged branch 'jetty-9.4.x' into 'master'. 2016-11-25 09:05:51 +01:00
Greg Wilkins dd2f9d73b6 tests cleanup 2016-11-25 14:37:19 +11:00
Joakim Erdfelt fa6d9029fc Merge branch 'jetty-9.4.x' 2016-11-15 14:30:19 -07:00
Simone Bordet 7716ada9dd Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-11-07 19:26:18 +01:00
Simone Bordet 42e865227d Fixes #1081 - DigestAuthenticator does not check the realm sent by the client. 2016-11-07 19:25:06 +01:00
Simone Bordet 6ae72e6f7d Code cleanups. 2016-11-07 19:25:06 +01:00
Greg Wilkins 07f547782f Cleanup metadata and HttpURI usage 2016-08-10 16:28:05 +10:00
Jan Bartel d28dffb16e Remove SessionManager; refactor names of session classes; add start modules for new session arch 2016-04-15 11:08:46 +10:00
Jan Bartel 273e87a851 Merge branch 'master' into session-refactor 2016-02-02 18:23:39 +01:00
Jan Bartel fdf127ee19 486497 NPE in MappedLoginService 2016-02-02 10:09:48 +01:00
Jan Bartel d8c33e8dca 486497 NPE in MappedLoginService 2016-02-01 17:42:56 +01:00
Jan Bartel a8c29334ca Merge branch 'master' into session-refactor 
Conflicts:
	jetty-nosql/src/main/java/org/eclipse/jetty/nosql/NoSqlSession.java
	jetty-nosql/src/main/java/org/eclipse/jetty/nosql/NoSqlSessionManager.java
	jetty-server/src/main/java/org/eclipse/jetty/server/session/AbstractSession.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/main/java/org/eclipse/jetty/server/session/MemSession.java
	jetty-server/src/test/java/org/eclipse/jetty/server/session/FileSessionManagerTest.java
	tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/StopSessionManagerDeleteSessionTest.java
	tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/StopSessionManagerPreserveSessionTest.java
 2016-02-01 13:59:12 +01:00
Joakim Erdfelt 4032b8579a Happy New Year 2016 (take #2) 2016-01-04 15:14:27 -07:00
Joakim Erdfelt ac24196b0d Happy New Year 2016 2016-01-04 14:34:20 -07:00
Joakim Erdfelt cd39fd84fe Happy New Year 2016 2016-01-04 14:31:22 -07:00
Joakim Erdfelt b5db18378d Happy New Year 2016 2016-01-04 14:21:26 -07:00
Jan Bartel 163a59a18c Merge branch 'master' into session-refactor 2015-12-18 14:26:14 +11:00
Jan Bartel 316a2e8661 484603 HashLoginService does not stop its PropertyUserStore 2015-12-18 12:35:42 +11:00
Jan Bartel ecbfe7c1d0 484603 HashLoginService does not stop its PropertyUserStore 2015-12-18 11:52:56 +11:00
Jan Bartel d9d3b04526 484603 HashLoginService does not stop its PropertyUserStore 2015-12-18 11:40:19 +11:00
Greg Wilkins 3527c6a71b StringUtil.csvSplit(String) 
Conflicts:
	jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/AbstractJettyMojo.java
	jetty-security/src/main/java/org/eclipse/jetty/security/PropertyUserStore.java
	jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/PushCacheFilter.java
	jetty-util/src/main/java/org/eclipse/jetty/util/StringUtil.java
	jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlConfiguration.java
 2015-12-08 14:54:33 -07:00
Jan Bartel 9ff55cb301 Merge branch 'master' into session-refactor 
Conflicts:
	jetty-infinispan/src/main/java/org/eclipse/jetty/session/infinispan/InfinispanSessionManager.java
	jetty-nosql/src/main/java/org/eclipse/jetty/nosql/NoSqlSessionManager.java
	jetty-nosql/src/main/java/org/eclipse/jetty/nosql/mongodb/MongoSessionIdManager.java
	jetty-nosql/src/main/java/org/eclipse/jetty/nosql/mongodb/MongoSessionManager.java
	jetty-server/src/main/java/org/eclipse/jetty/server/session/JDBCSessionIdManager.java
	jetty-server/src/main/java/org/eclipse/jetty/server/session/JDBCSessionManager.java
	tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/JdbcTestServer.java
	tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/MongoTestServer.java
	tests/test-sessions/test-sessions-common/src/main/java/org/eclipse/jetty/server/session/AbstractInvalidationSessionTest.java
 2015-12-03 16:57:51 +11:00
Joakim Erdfelt 040b2c9b31 More Javadoc fixes 2015-11-30 11:53:57 -07:00
Joakim Erdfelt 3357162cc6 Merge branch 'jetty-9.3.x' 
Conflicts:
	jetty-plus/src/main/java/org/eclipse/jetty/plus/security/DataSourceLoginService.java
	jetty-security/src/main/java/org/eclipse/jetty/security/HashLoginService.java
	jetty-security/src/main/java/org/eclipse/jetty/security/JDBCLoginService.java
 2015-11-30 11:31:58 -07:00
Joakim Erdfelt fe84c34bde Fixing Javadoc for Java 8 based builds 2015-11-30 11:28:16 -07:00
Jan Bartel 81b2a6a4de 483059 Remove cache of authenticated users 2015-11-26 15:31:19 +11:00
Jan Bartel c7ab05a0b8 Refactor jaas login sequence to only fetch role data if user is authenticated according to that module. 2015-11-25 14:02:12 +11:00
Jan Bartel 6e37f4886a Refactor jaas login sequence to only fetch role data if user is authenticated according to that module. 2015-11-25 13:58:27 +11:00