6df9ef3a15
Updating to version 10.0.0-SNAPSHOT
2019-07-12 06:54:56 +10:00
8cbfd51e80
Updating to version 10.0.0-alpha0
2019-07-12 06:54:56 +10:00
a34e641a27
Updating to version 10.0.0-SNAPSHOT
2019-07-11 17:20:27 +10:00
2e58f2f515
Updating to version 10.0.0-alpha0
2019-07-11 14:19:45 +10:00
d744d097de
Checkstyle cleanup ( #3847 )
...
* Checkstyle cleanup
* fixed bug from reformat
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-07-03 17:24:08 +02:00
5568f833e7
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-07-03 16:53:00 +02:00
bb7fb48f08
Fix checkstyle warnings for tests. ( #3846 )
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-07-03 16:42:20 +02:00
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
9706d70484
Jetty 9.4.x reformat ( #3811 )
...
* Removing Legacy Method Separators
* Restyling branch `jetty-9.4.x`
* Applying changes highlighted by checkstyle
* Applying XML restyling
* Fixing XML codestyle for IntelliJ
* Fixing XML style mistakes
* Revert "Applying XML restyling"
* Updating checkstyle for XML codestyle
* Reformatting pom.xml files
* Fixed empty string from line wraps
* Update intellij style to not do expression relative formatting. Reformatted code based on that.
* Increasing line split on Eclipse IDE Formatter to 512
* Restoring setting on internal default value.
+ IntelliJ will not export settings on things that set to their
internal default values.
We want to keep those values as a hedge against future default
value changes in future releases of IntelliJ.
* Fixing intellij codestyle
* do not allow single line simple methods
* misc checkstyle fixes
* re-exported with correct name and all values
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-06-24 17:40:30 +02:00
343cf732b9
Issue #3789 XmlConfiguration Set Property ( #3790 )
...
Issue #3789 XmlConfiguration Set Property
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-06-21 21:04:53 +02:00
ae21126cad
Updating to version 9.4.20-SNAPSHOT
2019-06-10 13:40:17 -05:00
68a9498092
Merge branch `jetty-9.4.x` into `jetty-10.0.x`
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-10 11:51:55 -05:00
afcf563148
Updating to version 9.4.19.v20190610
2019-06-10 11:17:56 -05:00
5dbc0bdaa5
Merge pull request #3745 from eclipse/jetty-9.4.x-3743-xmlconfig-locations
...
Issue #3743 - Using Location based XmlConfiguration where possible
2019-06-10 11:08:51 -05:00
826d68e80a
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2019-06-10 11:41:47 +02:00
63109108a8
Issue #3751 - Use Modern DTD/FPI consistently
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-07 07:21:59 -05:00
66aa966596
Revert "Issue #3743 - Updating usages of configure_9_3.dtd to use proper syntax"
...
This reverts commit fc97acf1ea
2019-06-07 07:03:44 -05:00
fc97acf1ea
Issue #3743 - Updating usages of configure_9_3.dtd to use proper syntax
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-06 14:06:46 -05:00
6686083462
Issue #3743 - Using only Location based XmlConfiguration in Jetty itself
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-06 11:55:01 -05:00
5c58ad70df
fix unit test
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-05-10 16:18:00 +10:00
a305660c54
Merge branch `jetty-9.4.x` into `jetty-10.0.x`
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
# Conflicts:
# jetty-server/src/main/config/etc/jetty-ssl-context.xml
# jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/ClientContainer.java
# jetty-websocket/javax-websocket-server-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/server/ServerContainer.java
# jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/WebSocketClient.java
# jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketServerFactory.java
2019-05-07 13:54:27 -05:00
8a4f4d390c
Issue #3620 - Applying changes from review
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-05-03 10:13:25 -05:00
78a71b71cc
Issue #3620 - Exit Server.start() if LifeCycle.start() fails
...
+ DeploymentManager will hang onto errors encountered and report them
en-masse if on it's own doStart().
+ Added jetty-deploy test cases.
+ Added test-distribution test case.
+ Updated test-distribution to allow this kind of test case.
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-05-02 18:51:06 -05:00
52bb963186
Merge branch `jetty-9.4.x` into `jetty-10.0.x`
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
# Conflicts:
# aggregates/jetty-all-compact3/pom.xml
# jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientTest.java
# jetty-deploy/src/test/java/org/eclipse/jetty/deploy/bindings/GlobalWebappConfigBindingTest.java
# jetty-fcgi/fcgi-server/src/test/java/org/eclipse/jetty/fcgi/server/HttpClientTest.java
# jetty-http/src/test/java/org/eclipse/jetty/http/HttpParserTest.java
# jetty-http2/http2-alpn-tests/pom.xml
# jetty-http2/http2-http-client-transport/pom.xml
# jetty-infinispan/infinispan-remote-query/src/test/java/org/eclipse/jetty/server/session/infinispan/RemoteQueryManagerTest.java
# jetty-proxy/src/test/java/org/eclipse/jetty/proxy/ConnectHandlerTest.java
# jetty-server/src/test/java/org/eclipse/jetty/server/HttpConnectionTest.java
# jetty-server/src/test/java/org/eclipse/jetty/server/ProxyConnectionTest.java
# jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncContextTest.java
# jetty-servlet/src/test/java/org/eclipse/jetty/servlet/ErrorPageTest.java
# jetty-servlets/src/test/java/org/eclipse/jetty/servlets/CrossOriginFilterTest.java
# jetty-servlets/src/test/java/org/eclipse/jetty/servlets/GzipDefaultTest.java
# jetty-servlets/src/test/java/org/eclipse/jetty/servlets/GzipTester.java
# jetty-servlets/src/test/java/org/eclipse/jetty/servlets/HeaderFilterTest.java
# jetty-servlets/src/test/java/org/eclipse/jetty/servlets/PutFilterTest.java
# jetty-util/src/test/java/org/eclipse/jetty/util/BufferUtilTest.java
# jetty-util/src/test/java/org/eclipse/jetty/util/resource/ResourceCollectionTest.java
# jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/DecoderReaderManySmallTest.java
# jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/DelayedStartClientOnServerTest.java
# jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/DelayedStartClientTest.java
# jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/AltFilterTest.java
# jetty-websocket/jetty-websocket-client/src/test/java/org/eclipse/jetty/websocket/client/HttpClientInitTest.java
# jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/ClientCloseTest.java
# jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/io/AbstractWebSocketConnection.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/extensions/compress/ByteAccumulatorTest.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/WSServer.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/WebSocketServerFactoryTest.java
# jetty-xml/src/test/java/org/eclipse/jetty/xml/XmlConfigurationTest.java
# pom.xml
# tests/jetty-http-tools/src/main/java/org/eclipse/jetty/http/tools/matchers/HttpFieldsMatchers.java
# tests/test-http-client-transport/pom.xml
# tests/test-http-client-transport/src/test/java/org/eclipse/jetty/http/client/ServerTimeoutsTest.java
# tests/test-integration/src/test/java/org/eclipse/jetty/test/support/rawhttp/HttpResponseTesterTest.java
2019-05-01 15:02:31 -05:00
df716e1b23
Migrating away from junit5 deprecated isIn() to is(in())
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-04-30 12:33:28 -05:00
734be56938
Updating to version 9.4.19-SNAPSHOT
2019-04-29 16:27:23 -05:00
e1bc35120a
Updating to version 9.4.18.v20190429
2019-04-29 15:40:33 -05:00
05bb111580
Updating to version 9.4.18-SNAPSHOT
2019-04-18 15:59:49 -05:00
aa1c656c31
Updating to version 9.4.17.v20190418
2019-04-18 14:44:28 -05:00
79537a5f51
Updating to version 9.4.17-SNAPSHOT
2019-04-11 11:00:24 -05:00
e0aa4ae4c0
Updating to version 9.4.16.v20190411
2019-04-11 10:01:26 -05:00
40c2e76786
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2019-04-06 13:45:54 +02:00
1c956dc470
Issue #3361 thread safe addHandler
...
Updates from review:
- undeploy destroys context
- reinstated mapContexts
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-03-26 14:15:36 +11:00
f2e9f2f7b3
Issue #3361 thread safe addHandler
...
Updates from review:
- private fields
- better blocker for deployment
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-03-21 17:11:47 +11:00
790dbbfaaa
Issue #3361 thread safe addHandler
...
Updates from review:
- private fields
- callbacks on deploy/undeploy
- more deprecated javadoc
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-03-21 10:24:14 +11:00
1accced62f
Issue #3361 thread safe addHandler
...
Added new thread safe methods deployHandler and undeployHandler
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-03-20 18:18:55 +11:00
95a6b76851
Merge branch `jetty-9.4.x` into `jetty-10.0.x`
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
# Conflicts:
# examples/embedded/src/main/java/org/eclipse/jetty/embedded/OneWebApp.java
# jetty-osgi/test-jetty-osgi/pom.xml
# jetty-server/src/main/java/org/eclipse/jetty/server/Server.java
# jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketServerFactory.java
2019-03-15 16:00:59 -05:00
32c5726f13
Issue #3429 - Adding WebAppProvider.scan() method to JMX
...
+ Fixing up some bad JMX attributes as well.
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-03-13 15:00:41 -05:00
e476cec6d3
Issue #1676 - Removing deprecated methods and classes
...
+ Changing usages of JVM deprecated classes / methods as well
+ Cleaning up test cases and javadoc
+ Removing test methods that rely on deprecated and now removed concepts
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-02-28 17:54:28 -05:00
9cdb59d4d7
Updating to version 9.4.16-SNAPSHOT
2019-02-15 13:35:15 -05:00
eb70b24016
Updating to version 9.4.15.v20190215
2019-02-15 11:53:00 -05:00
b9f89af847
Fixes #3320 - Review Jetty 10 module-info.java.
...
Reviewed module-info.java files.
For those that have a "requires static" added a comment about
why the dependency is optional.
Rearranged directives in alphabetical order.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-08 17:30:27 +01:00
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
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
63f2023e05
happy new year!!
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-01-01 12:17:53 +10:00
9b7afd8a03
Happy new year!! ( #3232 )
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-01-01 11:52:16 +10:00
0dcdcc7baf
Jetty 10.0.x fix surefire arg line (to avoid locale dependent build) ( #3183 )
...
* surefire.argLine replaced by jetty.surefire.argLine
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-12-06 09:09:06 +10:00
c0655ce634
Revert "fix argLine inheritance ( #3177 )"
...
This reverts commit 3e6ab2d1ac
2018-12-03 13:25:00 +10:00
3e6ab2d1ac
fix argLine inheritance ( #3177 )
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-12-03 11:20:20 +10:00
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
Greg Wilkins
Jan Bartel
Joakim Erdfelt
Simone Bordet
olivier lamy