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
|
5df7ab401d
|
Fix errors from small osgi refactor; comment out some test code
|
2013-05-28 15:10:12 +10:00 |
|
Jan Bartel
|
82b0ae2c63
|
Ensure jetty.home set as Server attribute on defaultJettyServer instance
|
2013-05-28 14:58:21 +10:00 |
|
Jan Bartel
|
7e797d8eed
|
408910 META-INF/jetty-webapp-context.xml file should be able to refer to bundle-relative locations
|
2013-05-28 13:10:49 +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 |
|
Greg Wilkins
|
5397f16559
|
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-17 14:09:17 +10:00 |
|
Greg Wilkins
|
01768562ca
|
398467 Servlet 3.1 Non Blocking IO
fixed ResourceHandler
|
2013-05-16 14:27:32 +10:00 |
|
Jan Bartel
|
2fb23e705c
|
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
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-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-spec-webapp/src/main/java/com/acme/AnnotationTest.java
tests/test-webapps/test-servlet-spec/test-web-fragment/pom.xml
tests/test-webapps/test-webapp-rfc2616/pom.xml
|
2013-05-09 11:29:45 +10:00 |
|
Jesse McConnell
|
3d600ed95e
|
[maven-release-plugin] prepare for next development iteration
|
2013-05-06 18:13:04 -05:00 |
|
Jesse McConnell
|
d832f3dc7e
|
[maven-release-plugin] prepare release jetty-9.0.3.v20130506
|
2013-05-06 18:12:55 -05: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
|
e7ecfd2b2b
|
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
Conflicts:
jetty-server/src/test/java/org/eclipse/jetty/server/ResponseTest.java
|
2013-05-02 09:07:24 +10:00 |
|
Jan Bartel
|
140419c097
|
406618 Jetty startup in OSGi Equinox fails when using option jetty.home.bundle=org.eclipse.jetty.osgi.boot
|
2013-04-29 15:48:46 +10:00 |
|
Greg Wilkins
|
a7073d05a6
|
updated version to 9.1.0-SNAPSHOT
|
2013-04-19 13:59:18 +10:00 |
|
Jan Bartel
|
d34bd7aec7
|
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
|
2013-04-18 12:16:24 +10:00 |
|
Jesse McConnell
|
7baaa14ba1
|
[maven-release-plugin] prepare for next development iteration
|
2013-04-17 11:46:39 -05:00 |
|
Jesse McConnell
|
e390b54b25
|
[maven-release-plugin] prepare release jetty-9.0.2.v20140417
|
2013-04-17 11:46:31 -05:00 |
|
Jesse McConnell
|
0b20467c6f
|
[maven-release-plugin] prepare for next development iteration
|
2013-04-15 11:40:45 -05:00 |
|
Jesse McConnell
|
3aa4301711
|
[maven-release-plugin] prepare release jetty-9.0.2.v20140415
|
2013-04-15 11:40:37 -05:00 |
|
Jan Bartel
|
db21b42b4f
|
Update to newer 3.1 api jar published by oracle (3.1-b08 - note DOES NOT contain xsds and dtds).
|
2013-04-15 17:44:35 +10:00 |
|
Jan Bartel
|
07b844bf85
|
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
|
2013-04-11 15:55:04 +10:00 |
|
Jan Bartel
|
8a0ba267c1
|
Rename some jetty-osgi classes, add comments, organize imports.
|
2013-04-11 15:14:08 +10:00 |
|
Jan Bartel
|
6783975707
|
Prune unused code; add more comments; rename classes.
|
2013-04-11 15:14:08 +10:00 |
|
Jan Bartel
|
76df005c64
|
405119 Tidy up comments and code formatting for osgi
|
2013-04-11 10:23:20 +10:00 |
|
Greg Wilkins
|
b8dd8bde14
|
[maven-release-plugin] prepare for next development iteration
|
2013-04-08 12:31:34 +10:00 |
|
Greg Wilkins
|
bf3771904b
|
[maven-release-plugin] prepare release jetty-9.0.1.v20130408
|
2013-04-08 12:30:59 +10:00 |
|
Jan Bartel
|
7523c5234c
|
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
Conflicts:
jetty-jsp/pom.xml
|
2013-04-04 13:31:33 +11:00 |
|
Jan Bartel
|
4951b1ccc4
|
404176 Jetty's AnnotationConfiguration class does not scan non-jar resources on the container classpath
|
2013-03-28 19:33:52 +11: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
|
c5ace89ffd
|
Updated npn.version property to 1.1.5
|
2013-03-14 14:02:25 +11:00 |
|
Simone Bordet
|
0c4d457fce
|
Updated npn-boot version to 1.1.5.
|
2013-03-13 22:36:30 +01:00 |
|
Jesse McConnell
|
1112c268ee
|
updated for source bundle name fix and add osgi version build helper call
|
2013-03-12 15:29:41 -05:00 |
|
Joakim Erdfelt
|
897c35c2cb
|
[maven-release-plugin] prepare for next development iteration
|
2013-03-08 11:33:23 -07:00 |
|
Joakim Erdfelt
|
cc6196af50
|
[maven-release-plugin] prepare release jetty-9.0.0.v20130308
|
2013-03-08 11:33:15 -07:00 |
|
Joakim Erdfelt
|
7fc38f6c0f
|
[maven-release-plugin] prepare for next development iteration
|
2013-03-07 19:14:19 -07:00 |
|
Joakim Erdfelt
|
96d045442f
|
[maven-release-plugin] prepare release jetty-9.0.0.v20130307
|
2013-03-07 19:14:11 -07:00 |
|
Jesse McConnell
|
778ee1411b
|
[maven-release-plugin] prepare for next development iteration
|
2013-03-06 10:21:46 -06:00 |
|
Jesse McConnell
|
d916078711
|
[maven-release-plugin] prepare release jetty-9.0.0.v20130306
|
2013-03-06 10:21:38 -06:00 |
|
Joakim Erdfelt
|
c4add8d964
|
Adding jetty-osgi-npn module.
|
2013-03-05 13:54:23 -07: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
|
0ed3638660
|
401966 Ensure OSGI WebApp as Service (WebAppContext) can be deployed only through ServiceWebAppProvider
|
2013-02-28 19:48:42 +11:00 |
|
Joakim Erdfelt
|
29b2118870
|
[maven-release-plugin] prepare for next development iteration
|
2013-02-26 09:20:45 -07:00 |
|
Joakim Erdfelt
|
2b82b54f6d
|
[maven-release-plugin] prepare release jetty-9.0.0.RC2
|
2013-02-26 09:20:45 -07:00 |
|
Jan Bartel
|
ea0996f63a
|
Removing dead and unused modules
|
2013-02-21 22:41:11 +11:00 |
|
Jan Bartel
|
07e878bda1
|
Removing accidental add of copy of old test-jetty-osgi
|
2013-02-21 22:24:18 +11:00 |
|
Jan Bartel
|
1ce132b6d3
|
Merge remote-tracking branch 'origin/master' into osgi_fix_jetty9
|
2013-02-21 21:39:07 +11:00 |
|
Jan Bartel
|
f1daea663a
|
Removing accidental add
|
2013-02-21 20:15:26 +11:00 |
|