Joakim Erdfelt
81356d9d18
Issue #3274 - Exclude org osgi foundation jar for conflicts with java base classes
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-04-03 17:47:45 -05:00
Joakim Erdfelt
cd3e8f0cd2
Issue #3274 - Exclude org osgi foundation jar for conflicts with java base classes
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-04-03 17:47:33 -05:00
Joakim Erdfelt
7478c04351
Merge branch jetty-9.3.x into jetty-9.4.x
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
# Conflicts:
# Jenkinsfile
# 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-java-client/pom.xml
# jetty-alpn/jetty-alpn-java-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-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-memcached-session-manager/pom.xml
# jetty-gcloud/jetty-gcloud-session-manager/pom.xml
# jetty-gcloud/pom.xml
# jetty-hazelcast/pom.xml
# jetty-http-spi/pom.xml
# jetty-http-spi/src/main/java/org/eclipse/jetty/http/spi/HttpSpiContextHandler.java
# jetty-http-spi/src/main/java/org/eclipse/jetty/http/spi/JettyHttpContext.java
# jetty-http-spi/src/main/java/org/eclipse/jetty/http/spi/JettyHttpExchangeDelegate.java
# jetty-http-spi/src/main/java/org/eclipse/jetty/http/spi/JettyHttpServerProvider.java
# 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-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyDeployWar.java
# jetty-monitor/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-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-security/src/test/java/org/eclipse/jetty/security/AliasedConstraintTest.java
# jetty-server/pom.xml
# jetty-server/src/main/java/org/eclipse/jetty/server/handler/ResourceHandler.java
# jetty-servlet/pom.xml
# jetty-servlet/src/main/java/org/eclipse/jetty/servlet/DefaultServlet.java
# jetty-servlet/src/test/java/org/eclipse/jetty/servlet/DefaultServletTest.java
# jetty-servlets/pom.xml
# jetty-servlets/src/test/java/org/eclipse/jetty/servlets/ThreadStarvationTest.java
# jetty-spring/pom.xml
# jetty-start/pom.xml
# jetty-start/src/test/java/org/eclipse/jetty/start/BaseHomeTest.java
# jetty-start/src/test/java/org/eclipse/jetty/start/ConfigurationAssert.java
# jetty-util-ajax/pom.xml
# jetty-util/pom.xml
# jetty-util/src/main/java/org/eclipse/jetty/util/resource/Resource.java
# jetty-webapp/pom.xml
# jetty-websocket/javax-websocket-client-impl/pom.xml
# jetty-websocket/javax-websocket-server-impl/pom.xml
# jetty-websocket/pom.xml
# jetty-websocket/websocket-api/pom.xml
# jetty-websocket/websocket-client/pom.xml
# jetty-websocket/websocket-common/pom.xml
# jetty-websocket/websocket-server/pom.xml
# jetty-websocket/websocket-servlet/pom.xml
# 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-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-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
2019-04-03 17:47:18 -05:00
Joakim Erdfelt
554fc39f06
Merge branch jetty-9.2.x into jetty-9.3.x
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
# Conflicts:
# jetty-http-spi/src/main/java/org/eclipse/jetty/http/spi/HttpSpiContextHandler.java
# jetty-http-spi/src/main/java/org/eclipse/jetty/http/spi/JettyHttpServerProvider.java
# jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyDeployWar.java
# jetty-security/src/test/java/org/eclipse/jetty/security/AliasedConstraintTest.java
# jetty-server/src/main/java/org/eclipse/jetty/server/handler/ResourceHandler.java
# jetty-servlet/src/test/java/org/eclipse/jetty/servlet/DefaultServletTest.java
# jetty-start/src/test/java/org/eclipse/jetty/start/BaseHomeTest.java
# jetty-start/src/test/java/org/eclipse/jetty/start/ConfigurationAssert.java
# jetty-util/src/main/java/org/eclipse/jetty/util/resource/Resource.java
2019-04-03 17:19:34 -05:00
Joakim Erdfelt
31b0de2285
Issue #3319 - Fixing listing output dir slash expectation from tests
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-04-03 17:12:26 -05:00
Joakim Erdfelt
b929f5c2db
Issue #3319 - Applying changes from review with @sbordet
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-04-03 17:01:16 -05:00
Joakim Erdfelt
ca77bd384a
Issue #3319 - Refactoring DefaultServlet Index/Listing
...
+ Now generates valid HTML5
+ Now allows column sort
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-04-03 16:28:26 -05:00
Joakim Erdfelt
1f046f44fe
Fixing CRLF issues.
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-04-03 15:24:29 -05:00
Simone Bordet
a18c2c49f9
Issue #3464 - Split SslContextFactory into Client and Server
...
Fixed a couple of places where Server was used instead of Client.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-04-03 19:24:14 +02:00
Joakim Erdfelt
edaefdbb3b
Fixing CRLF files
2019-04-03 11:56:07 -05:00
olivier lamy
0638ad1bd9
do not activate mongodb test
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-04-03 18:48:55 +10:00
Olivier Lamy
b9b1ade5da
Jetty 9.3.x same jenkinsfile as 9.4.x ( #3522 )
...
* use same Jenkinsfile as 9.4.x
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
* use only jdk8 even for javadoc
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-04-03 18:08:07 +10:00
olivier lamy
6051d135f2
fix version in pom and use trick from 9.4.x branch with flatten-maven-plugin
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-04-03 17:31:52 +10:00
Greg Wilkins
c0c2996339
fixed annotationtest
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-04-03 18:18:48 +11:00
Greg Wilkins
9f4b3542cb
Updating to version 9.3.27-SNAPSHOT
2019-04-03 17:32:08 +11:00
Lachlan Roberts
5177abba6e
close un-executed jobs on QueuedThreadPool lifecycle stop
...
- new testcase in QueuedThreadPoolTest
- added debug logs to QueuedThreadPool
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-04-03 14:10:43 +11:00
Greg Wilkins
7ec6d2fb32
Updating to version 9.3.26.v20190403
2019-04-03 13:06:51 +11:00
Greg Wilkins
61b1a217de
updated release script versions
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-04-03 12:34:46 +11:00
Greg Wilkins
1caa349a20
updated bom versions
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-04-03 12:34:20 +11:00
Lachlan Roberts
9cda1ce092
QueuedThreadPool bug - jobs disappearing on lifecycle stop
...
as the QueuedThreadPool was being stopped, jobs could be taken out of
the QueuedThreadPool job queue but then not run
also cleaned up QueuedThreadPool _runnable code to simplify it
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-04-03 10:39:10 +11:00
Simone Bordet
c4b2621f56
Merge pull request #3480 from eclipse/jetty-9.4.x-3464-split_sslcontextfactory
...
Issue #3464 - Split SslContextFactory into Client and Server
2019-04-02 12:39:37 +02:00
Simone Bordet
eaada1aa38
Issue #3464 - Split SslContextFactory into Client and Server
...
Updated documentation referencing the 2 new subclasses.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-04-02 12:38:34 +02:00
Greg Wilkins
879b9f5d6b
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-3361-thread-safe-setHandlers
2019-04-02 12:44:08 +11:00
Jesse McConnell
475331a547
really fix test on windows
2019-03-29 08:28:47 -05:00
Jesse McConnell
64f5718da3
fix test on windows
2019-03-29 08:08:29 -05:00
Jesse McConnell
3f81b46970
fix test on windows
2019-03-29 07:57:22 -05:00
Joakim Erdfelt
d0a5ba8d5a
Merge pull request #3495 from eclipse/jetty-9.4.x-3489-extraclasspath-splat-windows
...
Issue #3489 - Allowing JAR directory references on Windows
2019-03-28 08:19:06 -07:00
Lachlan Roberts
97ff7ed9c0
Issue #3106 - changes from review, adding javadoc
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-03-28 14:30:11 +11:00
Lachlan Roberts
45b2c548b0
Issue #3106 - backport WebSocket connection stats from jetty-10
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-03-28 14:30:11 +11:00
Joakim Erdfelt
73f7975189
Issue #3489 - Allowing JAR directory references on Windows
...
+ Moving Resource.newResource() to later point
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-03-27 14:14:41 -07:00
Greg Wilkins
1e4be0a98e
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-03-27 15:07:39 +11:00
Greg Wilkins
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
Greg Wilkins
ed03682071
Issue #3487 WebAppClassLoader does not definePackage
...
Added a test to the test-server-spec to demonstrate the issue
2019-03-26 13:56:00 +11:00
Joakim Erdfelt
65528f76c5
Merge pull request #3467 from eclipse/jetty-9.4.x-3422-wss-close-wait
...
Issue #3422 - WebSocket wss CLOSE_WAIT on aborted client connection
2019-03-22 11:36:40 -05:00
Joakim Erdfelt
4eb8cb1686
Issue #3422 - Using new Connection.Listener support in websocket server
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-03-21 14:40:49 -05:00
Joakim Erdfelt
e56ef9d8f8
Backporting Connection.Listener support on WebSocket server connections from jetty-10.0.x
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-03-21 14:37:41 -05:00
Joakim Erdfelt
10d3ea2548
Merge branch jetty-9.4.x-3427-classpath-with-spaces into jetty-9.4.x
2019-03-21 14:26:00 -05:00
Simone Bordet
6fb243ff6c
Issue #3464 - Split SslContextFactory into Client and Server
...
Introduced SslContextFactory subclasses Client and Server.
Replaced all usages of SslContextFactory with either Client or Server
as required.
Refactored configuration checking so that warnings are not emitted
when non necessary.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-03-21 14:42:42 +01:00
olivier lamy
0bd7008fcf
fix default jdk when no parameter are used
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-03-21 21:42:34 +10:00
olivier lamy
27d9999125
sync with script used by Jenkins
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-03-21 21:38:48 +10:00
Greg Wilkins
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
Greg Wilkins
849920ce87
Issue #3361 thread safe addHandler
...
Updates from review:
- private fields
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-03-21 10:32:43 +11:00
Greg Wilkins
944636176f
Issue #3361 thread safe addHandler
...
Updates from review:
- no return from finally
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-03-21 10:31:08 +11:00
Greg Wilkins
265afacd3f
Issue #3361 thread safe addHandler
...
Updates from review:
- private fields
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-03-21 10:27:09 +11:00
Greg Wilkins
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
Greg Wilkins
2f2c9f2f3f
Merge branch 'jetty-9.4.x-3361-thread-safe-setHandlers' of github.com:eclipse/jetty.project into jetty-9.4.x-3361-thread-safe-setHandlers
2019-03-21 10:05:45 +11:00
Greg Wilkins
a2195e5fe3
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-3361-thread-safe-setHandlers
2019-03-21 10:05:24 +11:00
Simone Bordet
512886ae7f
Issue #3361 thread safe addHandler
...
Code cleanup.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-03-20 10:51:16 +01:00
Greg Wilkins
338f56ea93
Issue #3361 thread safe addHandler
...
Improved names and javadoc.
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-03-20 18:36:48 +11:00
Jan Bartel
432fc41a32
Jetty 9.4.x 3456 programmatic authentication ( #3472 )
...
* Issue #3456 Allow multiple programmatic login/logout in same request.
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-03-20 18:19:55 +11:00
