Jan Bartel
f21fb5d6d9
Issue #2030 fix NPE in AnnotationConfiguration with debug enabled ( #2031 )
...
* Issue #2030 fix NPE in AnnotationConfiguration with debug enabled
Signed-off-by: Jan Bartel <janb@webtide.com>
2017-12-13 11:04:55 +01:00
Jan Bartel
2df07f29e9
Jetty 9.4.x 2016 openjdk8 osgi headers ( #2026 )
...
* Issue #2016 Add osgi headers for openjdk8 alpn and add tests for http2 in osgi
Signed-off-by: Jan Bartel <janb@webtide.com>
2017-12-13 10:38:13 +01:00
Jan Bartel
3793f974d5
Issue #1909
2017-10-19 15:08:02 +11:00
Jan Bartel
37c51710b0
Issue #1213
2017-10-18 10:05:59 +11:00
Jan Bartel
0282232ca4
Issue #1868
2017-10-05 17:12:21 +11:00
Jan Bartel
d808094e82
Issue #1829
2017-09-19 14:32:34 +10:00
Jan Bartel
77d96ff36d
Issue ##1597
...
Make osgi import of javax.mail optional
2017-08-08 09:13:18 -07:00
WalkerWatch
82c909acdc
Documentation updates
2017-05-18 12:12:32 -04:00
Joakim Erdfelt
92afe54c1d
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2017-03-10 13:22:32 -07:00
Joakim Erdfelt
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
Jan Bartel
5933f70ae6
Issue #1049
...
Ensure file paths for osgi config files are correct urls
2017-03-10 09:34:20 -07:00
Joakim Erdfelt
cf507084fe
Cherry-pick Cleanup
2017-03-10 09:04:02 -07:00
Jan Bartel
7dc61365e4
Issue #1387
...
Upgraded paxexam and osgi container.
2017-03-10 09:02:40 -07:00
Jan Bartel
20c50424a3
Issue #1387
...
Upgraded paxexam and osgi container.
2017-03-10 17:28:42 +11:00
Jan Bartel
72fe2a88c2
Issue #1049
...
Ensure file paths for osgi config files are correct urls
2017-03-10 11:59:20 +11:00
Jesse McConnell
700491f0da
Merge pull request #1289 from earldouglas/its
...
Replace contraction with possesive
2017-01-28 16:23:39 -06:00
Jan Bartel
0b45f377bf
Issue #1290
2017-01-27 15:42:52 +11:00
James Earl Douglas
590838f644
Replace contraction with possesive
2017-01-26 19:26:50 -07:00
Simone Bordet
0c8273f2ca
Happy New Year 2017.
2017-01-19 19:26:41 +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 53b31b03dd
, reversing
changes made to 4565c186d7
.
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
Greg Wilkins
6c635e3263
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2016-08-12 14:06:36 +10:00
Greg Wilkins
46cdeca543
Use dynamic ports for OSGi tests
2016-08-12 14:06:14 +10:00
Jan Bartel
8f058d2b09
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2016-08-03 18:56:36 +10:00
Jan Bartel
4b920622d5
Issue #797
2016-08-03 18:33:53 +10:00
Jan Bartel
37fa778ea0
Issue #213
2016-07-27 20:13:24 +10:00
Jan Bartel
6de88fcee9
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2016-07-20 12:33:39 +10:00
Jan Bartel
9f825dadef
Issue #737
2016-07-20 12:26:41 +10:00
Joakim Erdfelt
02144e0a97
Making test keystores compatible with Java 8 restrictions
2016-06-20 17:46:21 -07:00
Simone Bordet
a8f25b550f
Fixes #487 - JDK 9 build compatibility.
...
Fixes #306 - Merge jetty-parent into jetty-project.
- Removed jetty.parent dependency, moving all relevant sections to
jetty.project's pom.xml.
- Introduced profiles for JDK 8 only modules and configuration, and
for JDK 9 only modules and configurations.
- Major cleanup of pom.xml files.
- All Maven Plugin now declared in alphabetical order in
pluginManagement section of jetty.project's pom.xml.
2016-06-06 21:28:51 +02:00
Simone Bordet
a4889eee6b
Merged branch 'jetty-9.3.x' into 'master'.
2016-02-19 16:51:47 +01:00
Simone Bordet
a57f8d0517
Updated the certificate to make the test pass with the latest JDKs.
2016-02-19 16:51:23 +01: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
81b2a6a4de
483059 Remove cache of authenticated users
2015-11-26 15:31:19 +11:00
Jan Bartel
43a28a5080
480272 Update to newer jdt ecj version
2015-10-21 15:26:26 +11:00
Jan Bartel
781a380fbd
480272 Update to newer jdt ecj version
2015-10-21 15:25:24 +11:00
Jan Bartel
03a601f2b2
477385 Make jetty osgi manifests only resolve jetty packages against a single distro version
2015-09-16 19:13:47 +10:00
Jan Bartel
5ac1c0a3b7
471623 Update to apache jsp 8.0.23
...
Use 8.0.23.M1 for jetty version of apache jsp 8.0.23
2015-07-03 15:47:05 +10:00
Simone Bordet
3323a4e88d
Updated property names: sslConfig -> sslContext.
2015-05-26 18:03:55 +02:00
Greg Wilkins
5d041ad54f
466645 Allow XmlConfiguration Properties to use Elements or Attributes
2015-05-07 16:24:11 +10:00
Jan Bartel
be3b9497a6
464630 Cannot configure Configuration classlist in osgi
2015-05-01 16:01:27 +10:00
Simone Bordet
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
Greg Wilkins
1cb0449be3
Organised imports
2015-03-26 12:32:15 +11:00
Joakim Erdfelt
6e952d4618
Merge branch 'jetty-9.2.x'
...
Conflicts:
jetty-start/src/main/java/org/eclipse/jetty/start/Main.java
jetty-start/src/test/java/org/eclipse/jetty/start/LicensingTest.java
2015-03-16 10:25:15 -07:00
Jan Bartel
afa926d45d
461919 - Use osgi-friendly serviceloader mechanism for WebSocketServletFactory
2015-03-12 18:51:05 +11:00
Joakim Erdfelt
4b6d024c85
Using webdefault.xml from jetty-distribution in test cases
2015-02-18 12:39:06 -07:00
Jan Bartel
b45389ad87
Fix http2 osgi manifests and tests
2015-02-12 10:32:16 +11:00
Greg Wilkins
2162455b72
Removed SPDY and NPN
...
Because jetty 9.3 is targetted for HTTP2, we have removed support for SPDY and NPN.
2015-02-11 14:20:06 +11:00
Joakim Erdfelt
a3201a3c81
Happy New Year 2015
2015-01-07 17:06:59 -07:00
Joakim Erdfelt
6a0668b7a1
Happy New Year 2015
2015-01-07 17:03:30 -07:00
Greg Wilkins
5011993ddf
Merge remote-tracking branch 'origin/master' into jetty-http2
...
Conflicts:
VERSION.txt
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-server/pom.xml
jetty-alpn/pom.xml
jetty-annotations/pom.xml
jetty-ant/pom.xml
jetty-client/pom.xml
jetty-continuation/pom.xml
jetty-deploy/pom.xml
jetty-distribution/pom.xml
jetty-fcgi/fcgi-client/pom.xml
jetty-fcgi/fcgi-server/pom.xml
jetty-fcgi/pom.xml
jetty-http-spi/pom.xml
jetty-http/pom.xml
jetty-io/pom.xml
jetty-jaas/pom.xml
jetty-jaspi/pom.xml
jetty-jmx/pom.xml
jetty-jndi/pom.xml
jetty-jsp/pom.xml
jetty-jspc-maven-plugin/pom.xml
jetty-maven-plugin/pom.xml
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/jetty-osgi-npn/pom.xml
jetty-osgi/pom.xml
jetty-osgi/test-jetty-osgi-context/pom.xml
jetty-osgi/test-jetty-osgi-webapp/pom.xml
jetty-osgi/test-jetty-osgi/pom.xml
jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWithJsp.java
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-servlet/pom.xml
jetty-servlets/pom.xml
jetty-spdy/pom.xml
jetty-spdy/spdy-alpn-tests/pom.xml
jetty-spdy/spdy-client/pom.xml
jetty-spdy/spdy-core/pom.xml
jetty-spdy/spdy-example-webapp/pom.xml
jetty-spdy/spdy-http-client-transport/pom.xml
jetty-spdy/spdy-http-common/pom.xml
jetty-spdy/spdy-http-server/pom.xml
jetty-spdy/spdy-npn-tests/pom.xml
jetty-spdy/spdy-server/pom.xml
jetty-spring/pom.xml
jetty-start/pom.xml
jetty-util-ajax/pom.xml
jetty-util/pom.xml
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-integration/pom.xml
tests/test-loginservice/pom.xml
tests/test-quickstart/pom.xml
tests/test-sessions/pom.xml
tests/test-sessions/test-hash-sessions/pom.xml
tests/test-sessions/test-jdbc-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
2014-09-10 14:38:18 +10:00
Jan Bartel
7c882d76c5
Make annotations and JNDI wortk with OSGi
2014-09-05 18:35:15 +10:00
Jan Bartel
7199c6ceca
Switch to apache-jsp for jetty-osgi
2014-09-05 18:35:15 +10:00
Greg Wilkins
b47f9ef605
cleaned up OSGi manifest creation
2014-08-15 19:35:49 +10:00
Greg Wilkins
a14d843382
ignored osgi-spdy tests
2014-08-14 15:18:28 +10:00
Greg Wilkins
f81bb4c000
update OSGi for ssl home and base
2014-08-14 11:21:08 +10:00
Jan Bartel
f8bf40107a
436862 Update jetty-osgi to asm-5 and spifly-1.0.1
2014-07-25 15:32:41 +10:00
Jan Bartel
02994483dc
Only test osgi with annotations in jdk < 1.8
2014-04-10 12:11:07 +10:00
Jan Bartel
a5bd46fd57
409105 Upgrade jetty-osgi build/test to use more recent pax junit test framework
2014-04-10 11:23:13 +10:00
Jan Bartel
c62500c63d
Fix alpn-related poms for osgi and osgi test cases.
2014-04-03 16:41:24 +11:00
Joakim Erdfelt
aea74ea2da
Attempting to fix OSGi build for Java 8
2014-03-25 09:01:11 -07:00
Simone Bordet
529dde5ea4
Cleaned up wrong or unused configuration, and replaced NPN with ALPN.
2014-03-21 12:22:06 +01:00
Simone Bordet
919e41114c
Updated POMs to use ALPN. TestJettyOSGiBootSpdy still not working.
2014-03-20 12:09:54 +01:00
Greg Wilkins
84fa579ec7
429616 Use UTF-8 encoding for XML
2014-03-10 15:23:08 +11:00
Jan Bartel
eacdaf7073
Make ServiceLoader.load work with jetty-osgi-boot to support annotations.
2014-03-10 13:42:06 +11:00
Jan Bartel
1e2e3fc7f2
425837 Upgrade to jstl 1.2.2
2014-01-17 14:36:08 +11:00
Joakim Erdfelt
a12fd9ea03
Happy New Year - 2014!
2014-01-02 14:50:14 -07:00
Jan Bartel
a98bbc31e0
Make jsp 2.3.2 work for jetty-9.1, bring osgi tests back into the build.
2013-09-02 17:14:17 +10:00
Greg Wilkins
e4716e05e1
Merge remote-tracking branch 'origin/master' into jetty-9.1
...
Conflicts:
aggregates/jetty-all/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-annotations/pom.xml
jetty-ant/pom.xml
jetty-client/pom.xml
jetty-continuation/pom.xml
jetty-deploy/pom.xml
jetty-distribution/pom.xml
jetty-http/pom.xml
jetty-io/pom.xml
jetty-jaas/pom.xml
jetty-jaspi/pom.xml
jetty-jmx/pom.xml
jetty-jndi/pom.xml
jetty-jsp/pom.xml
jetty-jspc-maven-plugin/pom.xml
jetty-maven-plugin/pom.xml
jetty-monitor/pom.xml
jetty-nosql/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/jetty-osgi-npn/pom.xml
jetty-osgi/pom.xml
jetty-osgi/test-jetty-osgi-context/pom.xml
jetty-osgi/test-jetty-osgi-webapp/pom.xml
jetty-plus/pom.xml
jetty-proxy/pom.xml
jetty-rewrite/pom.xml
jetty-runner/pom.xml
jetty-security/pom.xml
jetty-server/pom.xml
jetty-servlet/pom.xml
jetty-servlets/pom.xml
jetty-spdy/pom.xml
jetty-spdy/spdy-client/pom.xml
jetty-spdy/spdy-core/pom.xml
jetty-spdy/spdy-example-webapp/pom.xml
jetty-spdy/spdy-http-server/pom.xml
jetty-spdy/spdy-server/pom.xml
jetty-spring/pom.xml
jetty-start/pom.xml
jetty-util-ajax/pom.xml
jetty-util/pom.xml
jetty-webapp/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-server/src/test/java/org/eclipse/jetty/websocket/server/ab/Fuzzer.java
jetty-websocket/websocket-servlet/pom.xml
jetty-xml/pom.xml
pom.xml
tests/pom.xml
tests/test-continuation/pom.xml
tests/test-loginservice/pom.xml
tests/test-sessions/pom.xml
tests/test-sessions/test-hash-sessions/pom.xml
tests/test-sessions/test-jdbc-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
2013-06-27 09:12:28 +10:00
Thomas Becker
918632d408
411340 SpdyConnection make executeOnFillable configurable and default to true
2013-06-21 14:45:16 +02:00
Greg Wilkins
4e4ffaa54c
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannelState.java
jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
2013-06-17 16:29:39 +10:00
Jan Bartel
c5bdc019a2
409801 Jetty should allow webdefault to be specified using a relative location when running in OSGi
2013-06-11 18:39:15 +10:00
Greg Wilkins
b59949253d
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/EncodingHttpWriter.java
jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
jetty-server/src/main/java/org/eclipse/jetty/server/Iso88591HttpWriter.java
jetty-server/src/main/java/org/eclipse/jetty/server/Utf8HttpWriter.java
2013-05-30 17:17:54 +10:00
Greg Wilkins
76457d4807
409441 jetty.xml threadpool arg injection
...
Do not use arg injection for ThreadPool
2013-05-30 11:59:36 +10:00
Greg Wilkins
942f8a5c40
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
2013-05-28 22:51:31 +10:00
Jan Bartel
20aeae5914
409228 Set jetty.home property so config files work even if deployed inside a bundle
2013-05-28 11:35:09 +10:00
Jan Bartel
5c97019be1
408923 Need to be able to configure the ThreadPool for the default jetty server in osgi
2013-05-24 16:26:13 +10:00
Jan Bartel
8d0cf5e949
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
2013-05-06 14:46:28 +10:00
Jan Bartel
07e9574edf
407214 Reduce build logging of OSGi modules
2013-05-04 11:04:51 +10:00
Simone Bordet
fe1b71f4a0
Reduced build logging for Travis.
2013-05-04 00:26:29 +02:00
Jan Bartel
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
Jan Bartel
cde549c0e8
399070 org.eclipse.jetty.spdy.server must declare import of org.eclipse.jetty.npn
2013-03-05 16:51:45 +11:00
Jan Bartel
cec5f5e65a
Fixing build
2013-02-21 20:13:45 +11:00
Jan Bartel
9af4334739
committing to save changes but does not yet compile
2013-02-20 09:26:30 +11:00
Simone Bordet
209d5bc12f
399721 - Change <Ref id= ...> to <Ref refid= ...>
2013-02-01 13:03:11 +01:00
Jan Bartel
d5f03ea791
websocket-client should not be needed on osgi server test classpath
2013-02-01 11:27:38 +11:00
Thomas Becker
9ebea3938d
393385: Make hostname verification configurable in SslContextFactory and enable it by default (See http://www.ietf.org/rfc/rfc2818.txt section 3.1)
2013-01-17 10:28:15 +01:00
Jesse McConnell
e1c516c7d1
merge from jetty-8 and update license blocks.
2013-01-11 17:04:53 -06:00
Jesse McConnell
863944873d
merge from 7 and update license blocks for 2013
2013-01-11 15:01:16 -06:00
Jesse McConnell
a4dbb5823c
update license blocks for 2013
2013-01-11 14:57:51 -06:00
Greg Wilkins
27c31fb403
jetty-9 organised imports. Cleaned up some TODOs
2013-01-11 16:37:32 +11:00
Simone Bordet
c9f4513a89
Reworked HTTP client API, removing usage of Future.
2012-12-19 16:27:20 +01:00
Greg Wilkins
6f098dd69c
jetty-9 use DateCache timer to set Date header once per second
2012-12-10 12:58:14 +11:00
Joakim Erdfelt
11cbe274af
395344 Move JSR-356 (Java WebSocket API) work off to Jetty 9.1.x
2012-11-28 16:55:13 -07:00
Joakim Erdfelt
d229364f9d
Fixing jetty-osgi for new websocket artifacts
2012-11-13 12:50:27 -07:00
Greg Wilkins
7ae264e30c
jetty-9 corrections for documentation
2012-11-08 07:34:40 +11:00