Commit Graph

77 Commits

Author SHA1 Message Date
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
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
Thomas Becker accc3b321a config fix 2012-11-02 17:16:13 +01:00
Thomas Becker 3d3e077509 393281: Add User-Agent filter to ReferrerPushStrategy 2012-11-02 13:21:42 +01:00
Greg Wilkins add3c2b381 392237 improved names and examples for documentation 2012-10-29 17:59:39 +11:00
Simone Bordet 605b0360e1 HTTP client: reviewed API.
The API were inconsistent: sometimes using the C format for getters and setters
(e.g. String host(), void host(String)), sometimes using the JavaBeans format.

Now the API stick with the JavaBean format apart the "fluent" API in Request,
that is in the fluent format (i.e. C setter format, but returning this instead of void).
2012-10-26 23:42:18 +02:00
Hugues Malphettes 3261318984 Add equinox-3.7.0 to the osgi frameworks tested
3.7.0 is correctly cached by pax-exam unlike 3.7.1
3.7.2 is not supported with the current version of
pax-exam-2.x
2012-10-19 23:51:29 +08:00
Hugues Malphettes 582de3e0f8 Avoid downloaded equinox for each test
Somehow equinox-3.7.1 is downloaded by pax-exam on each testThat makes
the execution of the tests very slow.
This looks specific to equinox-3.7.1
Commenting it out until we find a better way.
2012-10-19 23:46:01 +08:00
Hugues Malphettes 8253a31614 Re-enabling the SPDy test. Hopefully someone will point what was wrong 2012-10-16 11:48:54 +08:00
Jesse McConnell f22eedf6b8 comment out spdy osgi tests for m1 release 2012-10-15 11:18:10 -05:00