Greg Wilkins
b7a7a53a18
Jetty 10.0.x reformat ( #3812 )
...
* Removing Legacy Method Separators
* Restyling branch `jetty-9.4.x`
* Applying changes highlighted by checkstyle
* Removing Legacy Method Separators
* Restyling branch `jetty-10.0.x`
* Applying checkstyle changes
* Applying checkstyle changes
* Applying XML restyling
* Restyling XML in branch `jetty-10.0.x`
* Fixing XML codestyle for IntelliJ
* Fixing XML style mistakes
* Fixing XML restyling in branch `jetty-10.0.x`
* Revert "Applying XML restyling"
* Updating checkstyle for XML codestyle
* Revert "Restyling XML in branch `jetty-10.0.x`"
# Conflicts:
# jetty-xml/src/test/resources/org/eclipse/jetty/xml/configureWithAttr.xml
# jetty-xml/src/test/resources/org/eclipse/jetty/xml/configureWithElements.xml
* Adding back build-resources
* Reformatting pom.xml files
* Disabling Checkstyle job
* fixed empty string on line wrap
* reformatted with latest intellij style
* misc checkstyle fixes
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-06-24 17:42:39 +02:00
Simone Bordet
9286cdcf09
Issue #3162 - Use Jetty specific Servlet API jar.
...
Updated references to Servlet jar to "jetty-servlet-api".
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-07 13:08:26 +01:00
Simone Bordet
0d89f29e1b
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>
2019-02-04 18:51:26 +01:00
Joakim Erdfelt
c25cbf3480
Issue #3162 - Reverting not-relevant JspConfig change.
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-01-30 12:47:25 -06:00
Joakim Erdfelt
c30c8d4339
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-3162_jetty_servlet_api
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
# Conflicts:
# jetty-client/pom.xml
# jetty-http/pom.xml
# jetty-http2/http2-client/pom.xml
# jetty-http2/http2-http-client-transport/pom.xml
# jetty-http2/http2-server/pom.xml
# jetty-osgi/test-jetty-osgi/pom.xml
# jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-with-custom-class.xml
# jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty.xml
# jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootHTTP2Conscrypt.java
# jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWithAnnotations.java
# jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWithJavaxWebSocket.java
# jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWithWebSocket.java
# jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestOSGiUtil.java
# jetty-quickstart/pom.xml
# jetty-servlets/pom.xml
# jetty-util/pom.xml
# jetty-websocket/javax-websocket-client/pom.xml
# jetty-websocket/javax-websocket-server/pom.xml
# jetty-websocket/jetty-websocket-server/pom.xml
# pom.xml
2019-01-30 11:56:58 -06:00
olivier lamy
63f2023e05
happy new year!!
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-01-01 12:17:53 +10: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
olivier lamy
32912b922d
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2018-09-06 17:39:57 +10:00
olivier lamy
1504b7da93
Revert "Issue #2431 - Upgrade to Junit 5 ( #2436 )"
...
This reverts commit e24fc485396852569b0a6dac32d8872fa15ef297.
2018-09-06 09:27:11 +10:00
Joakim Erdfelt
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
Joakim Erdfelt
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
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
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
Jan Bartel
e06f5b3c3f
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-11-22 13:03:31 +01:00
Jan Bartel
8e6605a681
Issue #1817
2017-11-22 13:01:31 +01:00
Greg Wilkins
1b7ebf5599
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-09-23 00:22:57 +10:00
Simone Bordet
0bfc5a140f
Issue #1817 - JstlTest failure with JDK 9.
...
Disabled test for JDK 9.
2017-09-13 15:42:18 +02:00
Joakim Erdfelt
c5c7be2bc5
Merge branch 'jetty-9.4.x'
2017-02-02 16:23:13 -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
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
Greg Wilkins
65333e5bed
fixed bad merge
2016-05-02 18:02:55 +10:00
Greg Wilkins
a5ad291add
Squashed commit of the following: ( #528 )
...
commit 4bf6b7c9519e168444b30c1b3b310bc94f8fc556
Merge: a50e882 301fc12
Author: Greg Wilkins <gregw@webtide.com>
Date: Wed Apr 27 12:12:08 2016 +1000
Merge branch 'master' into jetty-9.4.x-Feature
commit a50e8825a3c1f0fb9a78ae8fb5b0142f1e27289b
Author: Greg Wilkins <gregw@webtide.com>
Date: Sat Apr 23 09:38:00 2016 +1000
work in progress
commit 4e286266c04d266489187bb020b65ddff6992cf1
Merge: 5ae7da0 f550fcd
Author: Greg Wilkins <gregw@webtide.com>
Date: Thu Apr 21 16:34:12 2016 +1000
Merge branch 'master' into jetty-9.4.x-Feature
commit 5ae7da049bf8ae7067be52cb083219f4542f37d7
Author: Greg Wilkins <gregw@webtide.com>
Date: Thu Apr 21 12:12:24 2016 +1000
Work in progress on Features
commit adfc430ad4cfc0a5785d440db535f73570978717
Author: Jan Bartel <janb@webtide.com>
Date: Wed Apr 20 22:05:55 2016 +1000
Refactor Configurations.isEnabledByDefault, enable all configurations by default.
commit 70cca692cc283a2153b974e00fe589a63cef89cb
Author: Jan Bartel <janb@webtide.com>
Date: Wed Apr 20 17:32:22 2016 +1000
Fix features for jsp with osgi
commit 22d2b251e93e776d90160c67c0922902de740cf3
Merge: 571d503 2c4cdbe
Author: Greg Wilkins <gregw@webtide.com>
Date: Thu Apr 14 16:19:43 2016 +1000
Merge branch 'master' into jetty-9.4.x-Feature
commit 571d50315e83e5c1d78663fbe9347490cc3921df
Author: Greg Wilkins <gregw@webtide.com>
Date: Wed Apr 13 15:36:36 2016 +1000
code comment
commit d9b229f298de6a54fa0b46f51c708230981b4f83
Author: Greg Wilkins <gregw@webtide.com>
Date: Sat Apr 9 21:24:22 2016 +1000
fixed quickstart validation
commit 154d58bf622d48c94ab7c60fd4eda4d031416d4e
Merge: 8e54aad ef92338
Author: Greg Wilkins <gregw@webtide.com>
Date: Fri Apr 8 18:25:17 2016 +1000
Merge branch 'master' into jetty-9.4.x-Feature
commit 8e54aad414ed470b8b9f51175649e0c159530ab0
Author: Greg Wilkins <gregw@webtide.com>
Date: Fri Apr 8 18:21:30 2016 +1000
general cleanup of Configuration and ClasspathPattern usage
commit 65f8e5dbd0d17fe9c22c801d19290c50bde8cfa1
Merge: ea1deda 2fb9b55
Author: Greg Wilkins <gregw@webtide.com>
Date: Fri Apr 8 09:15:28 2016 +1000
Merge branch 'master' into jetty-9.4.x-Feature
commit ea1deda4f9d4c521ca86d45cabc042b24e36e685
Merge: cfe9c83 f92588c
Author: Greg Wilkins <gregw@webtide.com>
Date: Tue Mar 15 18:21:56 2016 +1100
Merge branch 'master' into jetty-9.4.x-Feature
commit cfe9c836910f2e86c24ee0e60a2f1070e1e3e9f0
Author: Greg Wilkins <gregw@webtide.com>
Date: Tue Mar 15 17:57:23 2016 +1100
work in progress
commit 725be8c051bca65feacfce60286fef0f14973816
Author: Greg Wilkins <gregw@webtide.com>
Date: Tue Mar 15 10:11:49 2016 +1100
work in progress
commit 61d2c07534350d701276e803b9913a851a1c3be7
Author: Greg Wilkins <gregw@webtide.com>
Date: Fri Mar 11 14:01:00 2016 +1100
progress on OSGi
commit a977536c7dd979c1262b3b5d57d4c877c2d64d9b
Author: Greg Wilkins <gregw@webtide.com>
Date: Fri Mar 11 12:52:33 2016 +1100
Fixed plugin
commit f08b84ba0e98de50114c8e9bf4a065db6f47b78a
Merge: f19bd2c 8a24798
Author: Greg Wilkins <gregw@webtide.com>
Date: Fri Mar 11 12:21:55 2016 +1100
Merge branch 'master' into jetty-9.4.x-Feature
commit f19bd2c65ae947905faa731e511cc103831858a4
Author: Greg Wilkins <gregw@webtide.com>
Date: Fri Mar 11 12:21:06 2016 +1100
work in progress... all but OSGi
commit 2f15c3e4f9a107ce531f660ad40250dffeb4fcb6
Merge: 36b5687 7b1486b
Author: Greg Wilkins <gregw@webtide.com>
Date: Thu Mar 10 16:52:43 2016 +1100
Merge branch 'master' into jetty-9.4.x-Feature
commit 36b56873297e299beb3df7b8a64da7d4e9a72195
Merge: 13d914a e7081d7
Author: Greg Wilkins <gregw@webtide.com>
Date: Thu Mar 10 07:20:05 2016 +1100
Merge branch 'master' into jetty-9.4.x-Feature
commit 13d914aa7c8ba87eb7a8176de52da59f5f756228
Author: Greg Wilkins <gregw@webtide.com>
Date: Thu Mar 10 04:41:30 2016 +1100
Work in progress on Features
Moved jar discovery to META-INF
commit d41bd264ad33c45c2d4657e8a4e1b39e90399257
Author: Greg Wilkins <gregw@webtide.com>
Date: Sat Mar 5 17:48:15 2016 +0100
Work in progress towards new quickstart arch
commit c5c23698c455a854e241e3f9be975145188dd872
Merge: fd34007 692aae0
Author: Greg Wilkins <gregw@webtide.com>
Date: Sat Mar 5 11:29:18 2016 +0100
Merge branch 'master' into jetty-9.4.x-Feature
commit fd34007c3d5f92b63ec38afd92d724ecb4a8e71d
Author: Greg Wilkins <gregw@webtide.com>
Date: Sat Mar 5 11:04:35 2016 +0100
Work in progress on Features for QuickStart
commit c5f0c80cd2bd4f3977b9c91f5b046cfef2300b2b
Merge: 0e6d886 b61c5ff
Author: Greg Wilkins <gregw@webtide.com>
Date: Fri Mar 4 16:05:23 2016 +0100
Merge branch 'master' into jetty-9.4.x-Feature
commit 0e6d886b01c8a4f911bf47b13a2edc6617d38bf2
Merge: d150405 2b67e04
Author: Greg Wilkins <gregw@webtide.com>
Date: Wed Mar 2 17:32:36 2016 +0100
Merge branch 'master' into jetty-9.4.x-Feature
commit d1504055deb1df6f759d6aece8656c7492173964
Merge: 22a6cd0 3300d54
Author: Greg Wilkins <gregw@webtide.com>
Date: Wed Mar 2 15:21:20 2016 +0100
Merge branch 'master' into jetty-9.4.x-Feature
commit 22a6cd05b7135ef26205a5781783c58ba65e8927
Author: Greg Wilkins <gregw@webtide.com>
Date: Mon Feb 29 20:53:17 2016 +0100
Features work in progress
convert more server/system classes to Configurations
commit 037e04bfe54a54764a9d51a769cab5a95e863fa6
Merge: add9876 bb08b65
Author: Greg Wilkins <gregw@webtide.com>
Date: Mon Feb 29 17:11:04 2016 +0100
Merge branch 'master' into jetty-9.4.x-Feature
commit add9876f830d9524a3019979e122dc7a9b96a857
Merge: 5263f15 eb5e25c
Author: Greg Wilkins <gregw@webtide.com>
Date: Thu Feb 25 10:11:08 2016 +0100
Merge branch 'master' into jetty-9.4.x-Feature
commit 5263f15acdf66a488c622e4535cbfa17fe9d97e8
Merge: 89803ae 21fdaf5
Author: Greg Wilkins <gregw@webtide.com>
Date: Tue Feb 23 14:35:31 2016 +0100
Merge remote-tracking branch 'origin/master' into jetty-9.4.x-Feature
commit 89803aec959d8f0eea8eef59b03e56a0b2684bf0
Merge: 5fed7c7 779317d
Author: Greg Wilkins <gregw@webtide.com>
Date: Tue Feb 16 16:09:38 2016 +0100
Merge branch 'master' into jetty-9.4.x-Feature
commit 5fed7c713f549175a3641659903dddba9f75760a
Author: Greg Wilkins <gregw@webtide.com>
Date: Tue Feb 16 11:21:13 2016 +0100
fixed merge
commit ec22a1ba0bc1bfccb1deab08af8ca575040feae7
Merge: 4c8257d d0541e5
Author: Greg Wilkins <gregw@webtide.com>
Date: Tue Feb 16 10:53:16 2016 +0100
Merge branch 'master' into jetty-9.4.x-Feature
commit 4c8257d23b36a9a3ecab4ca342cf453edeffa672
Author: Greg Wilkins <gregw@webtide.com>
Date: Thu Dec 17 09:34:28 2015 +1100
Do not default quickstart
commit 57ce87770af0774c97304996b5b6c37673e9bc18
Merge: 14bde1f 96e4d72
Author: Greg Wilkins <gregw@webtide.com>
Date: Wed Dec 16 17:16:14 2015 +1100
Merge branch 'master' into jetty-9.4.x-Feature
commit 14bde1f69691f979fdb3c31f6b7841208fed0157
Author: Greg Wilkins <gregw@webtide.com>
Date: Fri Dec 4 16:26:58 2015 +1100
work in progress on Configurations as services
commit 46ce2aef3abe68bbf6816874904c76506ccc848f
Merge: 9e82fa0 ae9dc79
Author: Greg Wilkins <gregw@webtide.com>
Date: Fri Dec 4 10:11:09 2015 +1100
Merge branch 'master' into jetty-9.4.x-Feature
commit 9e82fa0a22166b75aa2012ae9e9f64ca8d0a2259
Author: Greg Wilkins <gregw@webtide.com>
Date: Fri Dec 4 08:52:37 2015 +1100
work in progress to Configurations as ServiceLoader
commit 6e11f22de469d7ae444e13912603a5a1ba0d7137
Merge: 120e330 5afa348
Author: Greg Wilkins <gregw@webtide.com>
Date: Thu Dec 3 18:16:14 2015 +1100
Merge branch 'master' into jetty-9.4.x-Feature
commit 120e33034f0cd3e5f254e36025badd98cc9ae2ab
Merge: 6c5b95d 384caf0
Author: Greg Wilkins <gregw@webtide.com>
Date: Thu Dec 3 14:20:52 2015 +1100
Merge branch 'master' into jetty-9.4.x-Feature
commit 6c5b95d6b8abd17ae985d41486b7139c972cd4cc
Merge: 722eb60 5e40bf2
Author: Greg Wilkins <gregw@webtide.com>
Date: Wed Dec 2 11:16:37 2015 +1100
Merge branch 'master' into jetty-9.4.x-Feature
commit 722eb60ce5029958f58ede16aba134fb3db6c2d4
Author: Greg Wilkins <gregw@webtide.com>
Date: Fri Nov 27 13:58:16 2015 +1100
Configurations can add server/system classes
commit 2972354db76b03f9d86e77942db86d079ba1151e
Author: Greg Wilkins <gregw@webtide.com>
Date: Fri Nov 27 11:47:03 2015 +1100
Self ordering WebApp Configurations
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2016-05-02 17:55:54 +10:00
Joakim Erdfelt
f1c34cb10f
Close #526 - Headers set from RequestDispatcher.include() not showing up in response
...
+ Adding 2 testcases to verify behavior
2016-04-26 14:04:56 -07:00
Joakim Erdfelt
14ec878d42
486530 - Handler added to WebAppContext prevents ServletContext initialization
...
+ Adding (commented out) testcase to JstlTest to demonstrate behavior
2016-01-28 13:42:18 -07:00
Joakim Erdfelt
cd39fd84fe
Happy New Year 2016
2016-01-04 14:31:22 -07:00
Joakim Erdfelt
4282d92f30
Simplifying <c:catch> from taglib testcase
2015-07-23 17:09:44 -07:00
Joakim Erdfelt
06cb0ca897
Adding <c:catch> JSTL test cases
2015-07-23 16:11:16 -07:00
Greg Wilkins
8d869bf88b
470727 - Thread Starvation with EWYK
...
Implemented NonBlockingCallbacks and fallback to PEC scheduling
2015-07-01 17:21:53 +10:00
Jan Bartel
a87823930a
471464 Parsing issues with HttpURI
...
Fixed surefire config that needs to use an isolated classloader, not a manifest classpath.
2015-07-01 17:12:30 +10:00
Joakim Erdfelt
e576271082
471388 - StringIndexOutOfBoundsException when using <c:url> with parameters
...
+ Reenabling test case, now that HttpURI parsing issues have been fixed.
2015-06-30 17:40:41 -07:00
Joakim Erdfelt
f644926b2b
471388 - StringIndexOutOfBoundsException when using <c:url> with parameters
...
Adding testcase to demonstrate the bug
2015-06-29 17:35:18 -07:00