32912b922d
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2018-09-06 17:39:57 +10:00
1504b7da93
Revert "Issue #2431 - Upgrade to Junit 5 ( #2436 )"
...
This reverts commit e24fc48539
2018-09-06 09:27:11 +10:00
e24fc48539
Issue #2431 - Upgrade to Junit 5 ( #2436 )
...
+ Changes needed for new Junit 5
+ Migrating from Vintage junit API to Jupiter junit API
+ Relies on SNAPSHOT jetty-test-helper
- this will be a formal release once this issue has been
resolved satisfactory
+ Have jenkins always pull latest SNAPSHOT for each build
+ Adding jetty.snapshots repository
+ Using surefire 2.22.0 per advice from junit
+ Ensuring <reuseForks>true</reuseForks> to work around issue junit-team/junit5#801
+ Disabling <forkMode>always</forkMode> in maven-surefire-plugin
due to bug https://github.com/junit-team/junit5/issues/801
+ OSGi tests must remain at vintage due to PaxExam
+ Moving from vintage TestingDir to jupiter WorkDir
+ Fixing imports to use jupiter, not vintage
+ Migrating vintage ExpectedException to jupiter assertThrows
+ Migrating vintage TestName to jupiter TestInfo
+ Migrating @RunWith(Parameterized.class)
to @ParameterizedTest with Argument Sources
+ Migrating assertTrue(val.contains(needle))
to assertThat(val, containsString(needle))
+ Aligning junit versions per recommendations from @sormuras
+ Adjusting parameter order change for assertEquals()
+ Test LifeCycle Annotation Migration
junit 4 | junit 5 / jupiter
------------ | -----------
@Before | @BeforeEach
@After | @AfterEach
@BeforeClass | @BeforeAll
@AfterClass | @AfterAll
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-09-05 21:27:18 +10:00
a3f1592c50
Issue #2431 - Upgrade to Junit 5 ( #2436 )
...
+ Changes needed for new Junit 5
+ Migrating from Vintage junit API to Jupiter junit API
+ Relies on SNAPSHOT jetty-test-helper
- this will be a formal release once this issue has been
resolved satisfactory
+ Have jenkins always pull latest SNAPSHOT for each build
+ Adding jetty.snapshots repository
+ Using surefire 2.22.0 per advice from junit
+ Ensuring <reuseForks>true</reuseForks> to work around issue junit-team/junit5#801
+ Disabling <forkMode>always</forkMode> in maven-surefire-plugin
due to bug https://github.com/junit-team/junit5/issues/801
+ OSGi tests must remain at vintage due to PaxExam
+ Moving from vintage TestingDir to jupiter WorkDir
+ Fixing imports to use jupiter, not vintage
+ Migrating vintage ExpectedException to jupiter assertThrows
+ Migrating vintage TestName to jupiter TestInfo
+ Migrating @RunWith(Parameterized.class)
to @ParameterizedTest with Argument Sources
+ Migrating assertTrue(val.contains(needle))
to assertThat(val, containsString(needle))
+ Aligning junit versions per recommendations from @sormuras
+ Adjusting parameter order change for assertEquals()
+ Test LifeCycle Annotation Migration
junit 4 | junit 5 / jupiter
------------ | -----------
@Before | @BeforeEach
@After | @AfterEach
@BeforeClass | @BeforeAll
@AfterClass | @AfterAll
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-09-05 10:07:17 +10:00
f15bd225b4
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2018-08-21 14:47:19 +10:00
96218e8bc4
Fix typos detected by github.com/client9/misspell
...
Signed-off-by: Kazuhiro Sera <seratch@gmail.com>
2018-08-10 23:52:16 +09:00
30f6132117
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2018-07-03 10:55:22 -05:00
346879f2a5
Merge pull request #2664 from mperktold/jetty-9.4.x
...
Issue #2662 Unnecessary boxing conversions
2018-06-13 22:52:27 +02:00
f901efc413
Issue #2662 - Unnecessary boxing conversions
...
Signed-off-by: Matthias Perktold <tias251@gmail.com>
2018-06-13 16:20:12 +02:00
0cd4dacbac
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
# Conflicts:
# VERSION.txt
# aggregates/jetty-all-compact3/pom.xml
# aggregates/jetty-all/pom.xml
# apache-jsp/pom.xml
# apache-jstl/pom.xml
# examples/async-rest/async-rest-jar/pom.xml
# examples/async-rest/async-rest-webapp/pom.xml
# examples/async-rest/pom.xml
# examples/embedded/pom.xml
# examples/pom.xml
# jetty-alpn/jetty-alpn-client/pom.xml
# jetty-alpn/jetty-alpn-conscrypt-client/pom.xml
# jetty-alpn/jetty-alpn-conscrypt-server/pom.xml
# jetty-alpn/jetty-alpn-java-client/pom.xml
# jetty-alpn/jetty-alpn-java-server/pom.xml
# jetty-alpn/jetty-alpn-openjdk8-client/pom.xml
# jetty-alpn/jetty-alpn-openjdk8-server/pom.xml
# jetty-alpn/jetty-alpn-server/pom.xml
# jetty-alpn/pom.xml
# jetty-annotations/pom.xml
# jetty-ant/pom.xml
# jetty-bom/pom.xml
# jetty-cdi/cdi-2/pom.xml
# jetty-cdi/cdi-core/pom.xml
# jetty-cdi/cdi-full-servlet/pom.xml
# jetty-cdi/cdi-servlet/pom.xml
# jetty-cdi/cdi-websocket/pom.xml
# jetty-cdi/pom.xml
# jetty-cdi/test-cdi-webapp/pom.xml
# jetty-client/pom.xml
# jetty-continuation/pom.xml
# jetty-deploy/pom.xml
# jetty-distribution/pom.xml
# jetty-documentation/pom.xml
# jetty-fcgi/fcgi-client/pom.xml
# jetty-fcgi/fcgi-server/pom.xml
# jetty-fcgi/pom.xml
# jetty-gcloud/jetty-gcloud-session-manager/pom.xml
# jetty-gcloud/pom.xml
# jetty-hazelcast/pom.xml
# jetty-home/pom.xml
# jetty-http-spi/pom.xml
# jetty-http/pom.xml
# jetty-http2/http2-alpn-tests/pom.xml
# jetty-http2/http2-client/pom.xml
# jetty-http2/http2-common/pom.xml
# jetty-http2/http2-hpack/pom.xml
# jetty-http2/http2-http-client-transport/pom.xml
# jetty-http2/http2-server/pom.xml
# jetty-http2/pom.xml
# jetty-infinispan/pom.xml
# jetty-io/pom.xml
# jetty-jaas/pom.xml
# jetty-jaspi/pom.xml
# jetty-jmx/pom.xml
# jetty-jndi/pom.xml
# jetty-jspc-maven-plugin/pom.xml
# jetty-maven-plugin/pom.xml
# jetty-memcached/jetty-memcached-sessions/pom.xml
# jetty-memcached/pom.xml
# jetty-nosql/pom.xml
# jetty-osgi/jetty-osgi-alpn/pom.xml
# jetty-osgi/jetty-osgi-boot-jsp/pom.xml
# jetty-osgi/jetty-osgi-boot-warurl/pom.xml
# jetty-osgi/jetty-osgi-boot/pom.xml
# jetty-osgi/jetty-osgi-httpservice/pom.xml
# jetty-osgi/pom.xml
# jetty-osgi/test-jetty-osgi-context/pom.xml
# jetty-osgi/test-jetty-osgi-fragment/pom.xml
# jetty-osgi/test-jetty-osgi-server/pom.xml
# jetty-osgi/test-jetty-osgi-webapp/pom.xml
# jetty-osgi/test-jetty-osgi/pom.xml
# jetty-plus/pom.xml
# jetty-proxy/pom.xml
# jetty-quickstart/pom.xml
# jetty-rewrite/pom.xml
# jetty-runner/pom.xml
# jetty-security/pom.xml
# jetty-server/pom.xml
# jetty-server/src/main/config/etc/jetty-http.xml
# jetty-server/src/main/config/etc/jetty-ssl.xml
# jetty-servlet/pom.xml
# jetty-servlets/pom.xml
# jetty-spring/pom.xml
# jetty-start/pom.xml
# jetty-unixsocket/pom.xml
# jetty-util-ajax/pom.xml
# jetty-util/pom.xml
# jetty-util/src/main/java/org/eclipse/jetty/util/MultiException.java
# jetty-util/src/test/java/org/eclipse/jetty/util/MultiExceptionTest.java
# jetty-webapp/pom.xml
# jetty-websocket/javax-websocket-client-impl/pom.xml
# jetty-websocket/javax-websocket-server-impl/pom.xml
# jetty-websocket/javax-websocket-server-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/server/AnnotatedServerEndpointConfig.java
# jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/TrackingSocket.java
# jetty-websocket/pom.xml
# jetty-websocket/websocket-api/pom.xml
# jetty-websocket/websocket-client/pom.xml
# jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/ClientCloseTest.java
# jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/ClientConnectTest.java
# jetty-websocket/websocket-common/pom.xml
# jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/extensions/compress/ByteAccumulator.java
# jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/extensions/compress/CompressExtension.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/WebSocketRemoteEndpointTest.java
# jetty-websocket/websocket-server/pom.xml
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/WebSocketUpgradeFilterTest.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/misbehaving/MisbehavingClassTest.java
# jetty-websocket/websocket-servlet/pom.xml
# jetty-websocket/websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/extensions/FragmentExtensionTest.java
# jetty-websocket/websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/jsr356/sockets/pong/PongContextListener.java
# jetty-websocket/websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/jsr356/ConfiguratorTest.java
# jetty-xml/pom.xml
# pom.xml
# tests/pom.xml
# tests/test-continuation/pom.xml
# tests/test-http-client-transport/pom.xml
# tests/test-integration/pom.xml
# tests/test-jmx/jmx-webapp-it/pom.xml
# tests/test-jmx/jmx-webapp/pom.xml
# tests/test-jmx/pom.xml
# tests/test-loginservice/pom.xml
# tests/test-quickstart/pom.xml
# tests/test-sessions/pom.xml
# tests/test-sessions/test-file-sessions/pom.xml
# tests/test-sessions/test-gcloud-sessions/pom.xml
# tests/test-sessions/test-hazelcast-sessions/pom.xml
# tests/test-sessions/test-infinispan-sessions/pom.xml
# tests/test-sessions/test-jdbc-sessions/pom.xml
# tests/test-sessions/test-memcached-sessions/pom.xml
# tests/test-sessions/test-mongodb-sessions/pom.xml
# tests/test-sessions/test-sessions-common/pom.xml
# tests/test-webapps/pom.xml
# tests/test-webapps/test-http2-webapp/pom.xml
# tests/test-webapps/test-jaas-webapp/pom.xml
# tests/test-webapps/test-jetty-webapp/pom.xml
# tests/test-webapps/test-jndi-webapp/pom.xml
# tests/test-webapps/test-mock-resources/pom.xml
# tests/test-webapps/test-proxy-webapp/pom.xml
# tests/test-webapps/test-servlet-spec/pom.xml
# tests/test-webapps/test-servlet-spec/test-container-initializer/pom.xml
# tests/test-webapps/test-servlet-spec/test-spec-webapp/pom.xml
# tests/test-webapps/test-servlet-spec/test-web-fragment/pom.xml
# tests/test-webapps/test-webapp-rfc2616/pom.xml
2018-06-12 11:11:38 -05:00
0fb9022305
Issue #2565 Ensure bad file throws Exception for HashLoginService ( #2622 )
...
* Issue #2565 Ensure bad file throws Exception for HashLoginService
Signed-off-by: Jan Bartel <janb@webtide.com>
2018-06-07 14:51:53 +02:00
8763c6065d
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2018-04-20 11:32:46 -05:00
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
1c04f9838d
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x-fixed
2018-03-22 16:42:42 -05:00
534b8ea38b
Add edit warning for .mod files. Resolves #173
2018-03-15 13:23:42 -04:00
e3e3f9eb0b
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x-fixed
2018-03-06 11:16:25 -06:00
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
ec51926622
reduce fragility of tests
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-02-19 19:22:32 +11:00
d5a0878019
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2018-01-09 10:08:30 -06:00
21365234f8
Issue #2108 - Updating license headers for year 2018
2018-01-09 09:44:41 -06:00
41ed9f29f4
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2018-01-09 09:37:25 -06:00
fa4c7b0ca9
Issue #2108 - Updating license headers for year 2018
2018-01-09 08:39:37 -06:00
067fc5d2d8
Issue #2108 - Upgrade licenses for 2018
2018-01-09 07:42:06 -06:00
582e12fa60
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-11-23 12:59:32 +01:00
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
1b7ebf5599
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-09-23 00:22:57 +10:00
bc47942d17
Issue #1200 Improve PathWatcher
...
Squashed commit of the following:
commit 08b5acccf87c3b99152a8042d650aadf7e43c5ff
Merge: cea3366 daeb844#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#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#1200 Improve PathWatcher
2017-09-05 12:44:31 +10:00
02f0649840
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-08-28 11:33:12 -07:00
08a000b7a7
Issue #1520 wrong IO
2017-08-28 16:28:18 +10:00
5f34e0bce8
Issue #1520
2017-08-28 16:03:51 +10:00
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
2a3deb0a10
Removed leftover System.err debug line.
2017-08-24 11:01:34 +02:00
3ec5f8fa3d
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-08-09 16:21:08 -07:00
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
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
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
e7ef74dd4f
removed deprecated test method usage
2017-08-08 09:10:25 -07:00
6494c2ce7c
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-08-02 12:22:37 +10:00
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
34b25ff385
Issue #1676 removed deprecated PathMap
2017-07-18 19:59:07 +02:00
a9c329859d
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-07-12 13:18:12 -07:00
ee8d4c1587
gitattributes followup
2017-07-06 16:24:31 -07:00
10bb8c3605
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-06-06 12:27:52 +02:00
c4ae7ab8d9
removed deprecated test method usage
2017-06-06 12:27:21 +02:00
ab4d300ae7
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-05-30 17:43:19 +02:00
79883c739d
Merge pull request #1545 from olamy/bugfix/1520
...
PropertyUserStore should extract packed config file #1520
2017-05-23 11:51:48 +02:00
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
8b94f2f275
correctly close ZipInputstream #1520
...
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-05-17 10:55:11 +10:00
bc2f3193ab
Merged branch 'jetty-9.4.x' into 'master'.
2017-05-16 11:37:01 +02:00
bd2f3db69f
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2017-05-16 11:35:01 +02:00
1ef845556b
Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'.
2017-05-16 10:44:46 +02:00
042f325f1c
Fixes #1556 - A timing channel in Password.java.
2017-05-16 10:41:08 +02:00
e9f75e81d9
PropertyUserStore should extract packed config file #1520
...
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-05-12 14:57:46 +10:00
cab1ec77ad
Merged branch 'jetty-9.4.x' into 'master'.
2017-05-02 10:03:30 +02:00
84bc74754d
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2017-05-01 17:53:38 +02:00
5f65f2916f
Issue #1390
...
Remove this.web_url.path
2017-05-01 17:37:05 +02:00
68caf72835
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-05-01 13:30:41 +02:00
970cec230b
prefer LOG.debug to System.err.println
...
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-04-21 11:44:50 +10:00
e1bd46023e
Issue #1481
...
Fix bug
2017-04-20 18:10:34 +10:00
9f3841d8e0
fix after review
...
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-04-20 15:41:26 +10:00
626327fa67
add as simple unit test #1481
2017-04-20 15:03:04 +10:00
6a88e13b3a
make those methods public for external use
...
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-04-20 15:03:04 +10:00
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
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
dd084b4e74
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-03-30 17:20:22 +11:00
3dcd318c02
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2017-03-10 14:05:39 -07:00
95feaa6198
Fixing NPE
2017-03-10 14:05:19 -07:00
92afe54c1d
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2017-03-10 13:22:32 -07:00
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
c5c7be2bc5
Merge branch 'jetty-9.4.x'
2017-02-02 16:23:13 -07:00
5e57b9562f
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2017-02-02 16:14:10 -07:00
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
cef2ff9522
Happy New Year 2017.
2017-01-19 19:31:53 +01:00
0c8273f2ca
Happy New Year 2017.
2017-01-19 19:26:41 +01:00
07838b057f
Happy New Year 2017.
2017-01-19 18:54:03 +01:00
347c48d657
Revert "resolve merge and update license headers"
...
This reverts commit 53b31b03dd4565c186d7
2017-01-19 18:26:43 +01:00
53b31b03dd
resolve merge and update license headers
2017-01-19 09:33:16 -06:00
ce3e6dafec
update license headers to 2017
2017-01-19 09:30:00 -06:00
c6fa0cdd69
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-01-18 17:28:21 +11:00
65987b03ba
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2017-01-18 17:27:53 +11:00
ae0a8c7f2b
Issue #1267
2017-01-18 17:26:23 +11:00
4b2b5e0eed
Issue #1267
2017-01-18 17:24:20 +11:00
69babbf38c
Issue #1224
...
This reverts commit 3d35484dc7
2017-01-09 12:07:29 +11:00
3d35484dc7
Issue #1222
2017-01-07 15:05:06 +11:00
df91fc1092
Merged branch 'jetty-9.4.x' into 'master'.
2016-11-25 09:05:51 +01:00
dd2f9d73b6
tests cleanup
2016-11-25 14:37:19 +11:00
fa6d9029fc
Merge branch 'jetty-9.4.x'
2016-11-15 14:30:19 -07:00
7716ada9dd
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2016-11-07 19:26:18 +01:00
42e865227d
Fixes #1081 - DigestAuthenticator does not check the realm sent by the client.
2016-11-07 19:25:06 +01:00
6ae72e6f7d
Code cleanups.
2016-11-07 19:25:06 +01:00
07f547782f
Cleanup metadata and HttpURI usage
2016-08-10 16:28:05 +10:00
d28dffb16e
Remove SessionManager; refactor names of session classes; add start modules for new session arch
2016-04-15 11:08:46 +10:00
273e87a851
Merge branch 'master' into session-refactor
2016-02-02 18:23:39 +01:00
fdf127ee19
486497 NPE in MappedLoginService
2016-02-02 10:09:48 +01:00
d8c33e8dca
486497 NPE in MappedLoginService
2016-02-01 17:42:56 +01:00
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
4032b8579a
Happy New Year 2016 (take #2 )
2016-01-04 15:14:27 -07:00
ac24196b0d
Happy New Year 2016
2016-01-04 14:34:20 -07:00
cd39fd84fe
Happy New Year 2016
2016-01-04 14:31:22 -07:00
b5db18378d
Happy New Year 2016
2016-01-04 14:21:26 -07:00
163a59a18c
Merge branch 'master' into session-refactor
2015-12-18 14:26:14 +11:00
316a2e8661
484603 HashLoginService does not stop its PropertyUserStore
2015-12-18 12:35:42 +11:00
ecbfe7c1d0
484603 HashLoginService does not stop its PropertyUserStore
2015-12-18 11:52:56 +11:00
d9d3b04526
484603 HashLoginService does not stop its PropertyUserStore
2015-12-18 11:40:19 +11:00
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
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
040b2c9b31
More Javadoc fixes
2015-11-30 11:53:57 -07:00
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
fe84c34bde
Fixing Javadoc for Java 8 based builds
2015-11-30 11:28:16 -07:00
81b2a6a4de
483059 Remove cache of authenticated users
2015-11-26 15:31:19 +11:00
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
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
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
ff0d1b4c14
481903 Module Descriptions
2015-11-12 10:48:04 +11:00
c5489bd7b2
Renaming from temporary session.x package
2015-10-23 14:10:42 +11:00
04062a8383
Improved graceful shutdown and added tests
2015-07-02 16:57:56 +10:00
3e401a62e9
StringUtil.csvSplit(String)
2015-06-19 16:48:53 +10:00
c6ac82f50b
Merge branch 'master' into release-9.3
2015-06-12 09:30:46 -07:00
7c737a587b
Removing [version] sections in modules
2015-06-12 09:14:34 -07:00
7d1ba7d0b7
Ignoring problematic tests on OSX
2015-06-11 15:15:15 -07:00
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
30e14fd256
469241 Make PathWatcher stoppable and restartable
2015-06-04 17:10:48 +10:00
7c375c2bce
469241 Support more of existing Scanner behaviour for PathWatcher
2015-06-03 19:00:24 +10:00
292d35dafd
Making testcase more resilient to FileSystem behavior
2015-05-04 10:34:05 -07:00
4cbce1a627
Using PathWatcher for jetty-security to make Windows happy
2015-05-01 14:50:13 -07:00
ed22d7e0de
464727 - Update Javadoc for Java 8 DocLint
2015-04-22 16:11:01 -07:00
599ab9bb1b
460671 - Rationalize property names.
...
Property format is now "jetty.<module|component>.<propertyName>".
Updated all references with new properties.
2015-04-13 16:21:48 +02:00
5ed2f84d06
430951 Support SNI with ExtendedSslContextFactory
2015-04-02 19:12:44 +11:00
1cb0449be3
Organised imports
2015-03-26 12:32:15 +11:00
961a90d16c
Merged branch 'jetty-9.2.x' into 'master'.
2015-01-29 14:11:21 +01:00
f0159e2130
458568 JDBCLoginService javadoc incorrectly references HashLoginService
2015-01-27 23:39:05 +01:00
c23f21c761
456956 Reduce ThreadLocal.remove() weak reference garbage
...
removed getCurrentChannel thread local
2015-01-08 15:03:05 +01:00
a3201a3c81
Happy New Year 2015
2015-01-07 17:06:59 -07:00
6a0668b7a1
Happy New Year 2015
2015-01-07 17:03:30 -07:00
b5971484a5
Basic push mechanism skeleton
2014-08-06 10:50:55 +10:00
fa3d7d0f7e
Merge remote-tracking branch 'origin/master' into jetty-http2
...
Conflicts:
jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncContextDispatchWithQueryStrings.java
2014-07-23 16:53:13 +10:00
3a6879d3e8
expanded tabs in indents
2014-07-23 16:49:05 +10:00
07edbea6fe
439369 Remove unused class CrossContextPsuedoSession
2014-07-23 11:26:18 +10:00
a537fefd6b
Merge remote-tracking branch 'origin/master' into jetty-http2
2014-07-18 15:28:54 +10:00
405fd05a6e
439369 Deprecate CrossContextPseudoSession
2014-07-17 18:36:35 +10:00
3975d1170a
439753 ConstraintSecurityHandler has dead code for processing constraints
2014-07-17 18:23:14 +10:00
5e281dd449
Merge remote-tracking branch 'origin/master' into jetty-http2
...
Conflicts:
jetty-util/src/main/java/org/eclipse/jetty/util/IteratingCallback.java
2014-07-10 14:43:39 +10:00
55ca09a00e
438190 findbug improvements
2014-07-10 14:41:32 +10:00
706fe1eba3
Merge remote-tracking branch 'origin/master' into jetty-http2
2014-07-03 16:01:37 +10:00
7fbf521d4e
438204 correctly wrap IPv6 hostnames in URIs generated by jetty
2014-07-03 10:11:16 +10:00
6eceb6bd99
Merge remote-tracking branch 'origin/master' into jetty-http2
2014-06-29 08:11:41 +02:00
0751256559
438434 ResourceHandler checks aliases
2014-06-27 21:46:59 +02:00
a8964979b9
updated AliasConstraintTest to expected results
2014-06-27 21:02:07 +02:00
a68bf9139b
Adding AliasedConstraintTest for working out alias logic
2014-06-26 16:11:05 -07:00
272e1d8da5
Refactored HttpChannel to not have direct HttpParser dependency
2014-06-17 00:02:50 +02:00
c8e2a79237
fixed bad test header
2014-06-11 18:07:36 +02:00
b38bae36f1
moved http/1.1 isms out of HttpChannel into HttpConnection
2014-06-10 11:28:07 +02:00
ba4ed86e31
434386 - Request Dispatcher extracts args and prevents asyncIO.
...
Avoid to read the content from within include() or forward(), therefore
making possible to proxy the content as-is to an upstream server.
2014-05-12 10:57:13 +02:00
b186d3eb6e
428904 Add logging of which webapp has path with uncovered http methods
2014-04-28 12:17:49 +02:00
b764a1d136
433244 Security manager lifecycle cleanup
2014-04-24 15:46:08 +02:00
1089a33578
Fixed imports referencing JUnit 3 and old matcher libraries.
2014-03-27 15:34:48 +01:00
a12fd9ea03
Happy New Year - 2014!
2014-01-02 14:50:14 -07:00
3b85ef6174
424682 Session cannot be deserialized with form authentication
2013-12-27 15:29:46 +11:00
f567bddad9
global clean up imports
2013-11-04 13:48:03 +11:00
eb3bb660b5
Merge remote-tracking branch 'origin/master' into jetty-9.1
...
Conflicts:
jetty-client/src/main/java/org/eclipse/jetty/client/util/DigestAuthentication.java
jetty-client/src/test/java/org/eclipse/jetty/client/HttpReceiverTest.java
jetty-client/src/test/java/org/eclipse/jetty/client/HttpSenderTest.java
jetty-http/src/main/java/org/eclipse/jetty/http/HttpField.java
jetty-server/src/test/java/org/eclipse/jetty/server/AbstractHttpTest.java
jetty-servlets/src/test/java/org/eclipse/jetty/servlets/AbstractDoSFilterTest.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/HeadersBlockGenerator.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/HeadersBlockParser.java
jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/ClientUpgradeRequest.java
jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/WebSocketFrame.java
jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/WebSocketSession.java
jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/extensions/compress/DeflateCompressionMethodTest.java
jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/extensions/compress/PerMessageDeflateExtensionTest.java
2013-11-03 18:22:09 +11:00
6b0269a16d
[Bug 420930] Use Charset to specify character encoding
...
Signed-off-by: Mikhail Mazursky <mikhail.mazursky@gmail.com>
2013-11-02 14:44:36 +06:00
8b305e208c
397049 Cannot Provide Custom Credential to JDBCLoginService
2013-10-03 16:21:34 +10:00
070ce9dd22
Merge remote-tracking branch 'origin/master' into jetty-9.1
...
Conflicts:
jetty-start/src/main/java/org/eclipse/jetty/start/Main.java
jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java
2013-09-09 15:41:17 +10:00
767faece5c
[Bug 415999] Fix some of FindBugs warnings
...
Mostly not closed streams/DB resources are fixed. But also less
important things.
Signed-off-by: Mikhail Mazursky <mikhail.mazursky@gmail.com>
2013-09-09 00:24:31 -04:00
ac30f5c9bd
update other jetty mods to new format
2013-08-29 16:39:28 -05:00
e7d33f52a4
add security mod
2013-08-22 12:07:51 -05:00
61c08370dc
Fixing malformed Javadoc warnings in jetty-security
2013-08-14 12:46:25 -07:00
af98046d13
Merge remote-tracking branch 'origin/master' into jetty-9.1
2013-08-12 16:41:15 +10:00
e3e9264a07
414840 Request.login() throws NPE if username is null
2013-08-12 16:36:08 +10:00
2c3ecf9e38
414731 Request.getCookies() should return null if there are no cookies
2013-08-09 18:08:16 +10:00
3b7322f53b
Merged branch 'master' into 'jetty-9.1'.
2013-07-23 10:01:17 +02:00
f19421112a
405535 implement Request.isUserInRole(role) check security-role-refs defaulting to security-role if no matching ref
2013-07-23 17:20:55 +10:00
15e0d50b79
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
2013-05-23 09:50:27 +10:00
74a4077dad
Add package-info.java files to all jetty packages.
2013-05-21 15:09:49 -05:00
6cfd33a71b
397051 Make JDBCLoginService data members protected to facilitate subclassing
2013-05-20 18:27:24 +10:00
41304644e6
405432 Check implementation of section 13.4.1 @ServletSecurity for @HttpConstraint and HttpMethodConstraint clarifications
2013-05-03 14:47:56 +10:00
348cbc2173
405435 Implement servlet3.1 section 13.6.3 for 303 redirects for Form auth
2013-05-02 17:34:06 +10:00
fb43fd4c9e
Merge with master.
2013-05-02 09:07:37 +10:00
e7ecfd2b2b
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
...
Conflicts:
jetty-server/src/test/java/org/eclipse/jetty/server/ResponseTest.java
2013-05-02 09:07:24 +10:00
dbedbfa67e
406437 Digest Auth supports out of order nc
2013-04-25 10:44:33 +10:00
9f0fabe951
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
jetty-security/src/main/java/org/eclipse/jetty/security/authentication/DigestAuthenticator.java
jetty-security/src/test/java/org/eclipse/jetty/security/ConstraintTest.java
2013-04-25 10:42:27 +10:00
5306c540bf
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
...
Conflicts:
jetty-security/src/test/java/org/eclipse/jetty/security/ConstraintTest.java
2013-04-25 10:38:43 +10:00
7da94048fa
406437 Digest Auth supports out of order nc
2013-04-25 10:26:29 +10:00
8740616b37
uncommented basic tests
2013-04-25 08:58:15 +10:00
2360f5dcd5
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
...
Conflicts:
jetty-security/src/main/java/org/eclipse/jetty/security/ConstraintSecurityHandler.java
2013-04-23 15:08:56 +10:00
6c2ae7b74b
406272 Security constraints with multiple http-method-omissions can be incorrectly applied
2013-04-23 14:57:52 +10:00
3df03e18d7
405437 Implement section 13.8.4 Uncovered HTTP methods
2013-04-23 13:52:41 +10:00
87d4690462
405533 Implement special role ** for security constraints
2013-04-19 15:53:45 +10:00
6020321845
405535 Implement Request.isUserInRole(role) check security-role-refs defaulting to security-role if no matching ref
2013-04-15 18:23:32 +10:00
db21b42b4f
Update to newer 3.1 api jar published by oracle (3.1-b08 - note DOES NOT contain xsds and dtds).
2013-04-15 17:44:35 +10:00
07b844bf85
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
2013-04-11 15:55:04 +10:00
01c2322615
404325 data constraint redirection does send default port
2013-04-05 17:24:00 +11:00
533cd57b53
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
jetty-security/src/main/java/org/eclipse/jetty/security/ConstraintSecurityHandler.java
jetty-security/src/test/java/org/eclipse/jetty/security/ConstraintTest.java
2013-04-05 16:46:20 +11:00
abcb4f163b
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
...
Conflicts:
jetty-security/src/main/java/org/eclipse/jetty/security/ConstraintSecurityHandler.java
2013-04-05 16:35:37 +11:00
cada28e8cf
404325 data constraint redirection does send default port
2013-04-05 16:32:51 +11:00
279dff381c
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
...
Conflicts:
jetty-osgi/pom.xml
jetty-server/src/main/java/org/eclipse/jetty/server/Response.java
jetty-servlets/pom.xml
tests/test-webapps/test-jetty-webapp/pom.xml
2013-03-18 16:00:23 +11:00
e1c516c7d1
merge from jetty-8 and update license blocks.
2013-01-11 17:04:53 -06:00
863944873d
merge from 7 and update license blocks for 2013
2013-01-11 15:01:16 -06:00
a4dbb5823c
update license blocks for 2013
2013-01-11 14:57:51 -06:00
27c31fb403
jetty-9 organised imports. Cleaned up some TODOs
2013-01-11 16:37:32 +11:00
olivier lamy
Joakim Erdfelt
Greg Wilkins
Kazuhiro Sera
Matthias Perktold
Jan Bartel
Olivier Lamy
WalkerWatch
Lachlan Roberts
Adam Retter
Simone Bordet
Josh Elser
olivier lamy
Jesse McConnell
Joakim Erdfelt
Greg Wilkins
Jan Bartel
Mikhail Mazursky