412 Commits

Author SHA1 Message Date
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 53b31b03ddda3776f3db71e28e55312b1c982092, reversing
changes made to 4565c186d7491a97d72217a96e86b15ced506de6.
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 3d35484dc7622180907035e579ed5523f4afa3fe 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
Greg Wilkins
a311c8bde1 480904 - jetty-util Loader simplification
The Loader has been simplified to now just be a switch between loading from the context loader,
the same loader as another class or the system loader.    Multiple loaders will never be tried.

A new runWithServerClassAccess(PriviledgedAction) method has been added to WebAppClassLoader, that
is now used during configuration for actions that need access to both the WEB-INF/lib classes and
the server classes (eg jetty-web.xml and env.xml).

The JMX MBean mechanism has also been modified to look for an MBean class in the same loader that
object came from before attempting the context loader (only if different).
2015-11-19 12:14:05 +11:00
Greg Wilkins
ff0d1b4c14 481903 Module Descriptions 2015-11-12 10:48:04 +11:00
Jan Bartel
c5489bd7b2 Renaming from temporary session.x package 2015-10-23 14:10:42 +11:00
Greg Wilkins
04062a8383 Improved graceful shutdown and added tests 2015-07-02 16:57:56 +10:00
Greg Wilkins
3e401a62e9 StringUtil.csvSplit(String) 2015-06-19 16:48:53 +10:00
Joakim Erdfelt
c6ac82f50b Merge branch 'master' into release-9.3 2015-06-12 09:30:46 -07:00
Joakim Erdfelt
7c737a587b Removing [version] sections in modules 2015-06-12 09:14:34 -07:00
Joakim Erdfelt
7d1ba7d0b7 Ignoring problematic tests on OSX 2015-06-11 15:15:15 -07:00
Joakim Erdfelt
916efd6aa7 469860 - Add module metadata versioning to support backwards compat
+ Adding [version] section to all existing jetty 9.3 distro modules
+ Updating testcases in jetty-start with new [version] sections too
+ Adding extra testcases for versioned modules
2015-06-10 10:59:18 -07:00
Jan Bartel
30e14fd256 469241 Make PathWatcher stoppable and restartable 2015-06-04 17:10:48 +10:00
Jan Bartel
7c375c2bce 469241 Support more of existing Scanner behaviour for PathWatcher 2015-06-03 19:00:24 +10:00
Joakim Erdfelt
292d35dafd Making testcase more resilient to FileSystem behavior 2015-05-04 10:34:05 -07:00