Jan Bartel
|
09e22c042c
|
443661 Rename manifest and service constants for jetty osgi resource fragment code
|
2014-09-10 16:28:29 +10: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 |
|
Greg Wilkins
|
c80f556139
|
Update Password.java
Fixed typo.
Trivial fix from github/pull/21
|
2014-09-10 10:06:00 +10:00 |
|
Jesse McConnell
|
7dfd9115a4
|
Merge branch 'release-9'
|
2014-09-09 10:27:21 -05:00 |
|
Jesse McConnell
|
6ce4760cd3
|
set for dev
|
2014-09-09 10:27:03 -05:00 |
|
Jesse McConnell
|
88b19abf52
|
[maven-release-plugin] prepare for next development iteration
|
2014-09-05 09:19:30 -05:00 |
|
Jesse McConnell
|
9bfeb2221f
|
[maven-release-plugin] prepare release jetty-9.2.3.v20140905
jetty-9.2.3.v20140905
|
2014-09-05 09:19:23 -05:00 |
|
Jesse McConnell
|
480348aba9
|
set for release
|
2014-09-05 08:11:58 -05:00 |
|
Jesse McConnell
|
80d7237ea5
|
Merge branch 'master' into release-9
|
2014-09-05 08:10:24 -05:00 |
|
Jesse McConnell
|
c034544ab9
|
reset for release
|
2014-09-05 08:10:15 -05:00 |
|
Simone Bordet
|
063ad177b5
|
Fixed typo.
|
2014-09-05 15:04:38 +02:00 |
|
Simone Bordet
|
3fa302e287
|
Removed BenchmarkHelper in favour of the version present in the jetty-test-helper.
|
2014-09-05 15:04:38 +02:00 |
|
Jan Bartel
|
d9f285f5f5
|
Update versions of apache-jsp and servlet-api for osgi
|
2014-09-05 20:19:45 +10:00 |
|
Jan Bartel
|
18f9ec4c23
|
Merge branch 'apache-jsp-osgi' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into apache-jsp-osgi
|
2014-09-05 18:36:13 +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 |
|
Jan Bartel
|
e4454965d4
|
Make annotations and JNDI wortk with OSGi
|
2014-09-05 17:49:17 +10:00 |
|
Greg Wilkins
|
07ec47adfa
|
improved SSL debug logging
|
2014-09-04 19:09:39 +10:00 |
|
Greg Wilkins
|
5b97d652e1
|
Merge remote-tracking branch 'origin/master' into jetty-http2
Conflicts:
jetty-alpn/jetty-alpn-server/src/main/config/modules/protonego-impl/alpn.mod
jetty-http/src/main/java/org/eclipse/jetty/http/HttpParser.java
jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn.mod
jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/http/HttpChannelOverSPDY.java
|
2014-09-04 17:43:18 +10:00 |
|
Greg Wilkins
|
8d332b0962
|
added npn and alpn license messages
|
2014-09-04 12:29:59 +10:00 |
|
Jan Bartel
|
2adb029764
|
443172 web-fragment.xml wrongly parsed for applications running in serlvet 2.4 mode
|
2014-09-04 12:10:55 +10:00 |
|
Jan Bartel
|
51715dbcdb
|
443231 java.lang.NullPointerException on scavenge scheduling when session id manager declared before shared scheduler
|
2014-09-04 11:31:08 +10:00 |
|
Jan Bartel
|
a1587d807e
|
443262 Distinguish situation where jetty looks for tlds in META-INF but finds none vs does not look
|
2014-09-04 10:22:40 +10:00 |
|
Greg Wilkins
|
610bac49b9
|
435322 Added a idleTimeout to the SharedBlockerCallback
|
2014-09-04 09:30:21 +10:00 |
|
Greg Wilkins
|
ed8abd1d53
|
443049 Improved HttpParser illegal character messages
|
2014-09-04 09:27:42 +10:00 |
|
Jan Bartel
|
c0aef8975d
|
Switch to apache-jsp for jetty-osgi
|
2014-09-04 08:16:35 +10:00 |
|
Greg Wilkins
|
5be1fb6270
|
Merge remote-tracking branch 'origin/master' into jetty-http2
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
|
2014-09-03 15:19:54 +10:00 |
|
Greg Wilkins
|
c3647f9d9f
|
443158 Fixed HttpOutput spin
|
2014-09-03 15:01:10 +10:00 |
|
Greg Wilkins
|
e03b511415
|
trying to catch intermittent test failure
|
2014-09-03 15:00:40 +10:00 |
|
Greg Wilkins
|
0a2aeb54a1
|
435322 Added a idleTimeout to the SharedBlockerCallback
|
2014-09-03 10:46:18 +10:00 |
|
Simone Bordet
|
bb1d4946bc
|
Merged branch 'master' into 'jetty-http2'.
|
2014-09-02 10:25:31 +02:00 |
|
Simone Bordet
|
7be9f0d7a4
|
Fixed doStop() to call super before interrupting the reference queue thread.
|
2014-09-01 21:16:40 +02:00 |
|
Simone Bordet
|
5370f3c8cb
|
442950 - Embedded Jetty client requests to localhost hangs with high cpu usage (NIO OP_CONNECT Solaris/Sparc).
|
2014-09-01 12:06:18 +02:00 |
|
Simone Bordet
|
ee3ab1f8ea
|
Merged branch 'master' into 'jetty-http2'.
|
2014-09-01 11:57:09 +02:00 |
|
Simone Bordet
|
9dbd2cd9d8
|
442950 - Embedded Jetty client requests to localhost hangs with high cpu usage (NIO OP_CONNECT Solaris/Sparc).
Now checking the return value of SocketChannel.connect() to determine
whether to register the channel (true) or finish the connect (false).
|
2014-09-01 11:28:59 +02:00 |
|
Simone Bordet
|
ca2a23c35d
|
Improved Javadocs and code cleanup.
|
2014-09-01 11:28:59 +02:00 |
|
Greg Wilkins
|
277ca5c065
|
fixed merge
|
2014-08-29 17:54:28 +10:00 |
|
Greg Wilkins
|
dacc796831
|
Merge remote-tracking branch 'origin/master' into jetty-http2
Conflicts:
tests/test-quickstart/pom.xml
|
2014-08-29 17:52:58 +10:00 |
|
Greg Wilkins
|
17c9a32268
|
moved quickstart to test-quickstart
|
2014-08-29 17:35:26 +10:00 |
|
Greg Wilkins
|
a4debf68c4
|
fixed merge
|
2014-08-29 16:03:32 +10:00 |
|
Greg Wilkins
|
5507e267ae
|
Merge remote-tracking branch 'origin/master' into jetty-http2
Conflicts:
jetty-server/src/main/config/etc/jetty-https.xml
jetty-server/src/main/config/modules/ssl.mod
jetty-start/src/main/java/org/eclipse/jetty/start/Modules.java
|
2014-08-29 15:49:25 +10:00 |
|
Greg Wilkins
|
69390954dc
|
435322 acceptor and selector configuration/priority
|
2014-08-29 15:36:19 +10:00 |
|
Greg Wilkins
|
edcb56ae6b
|
Merge remote-tracking branch 'origin/master' into jetty-http2
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
|
2014-08-29 12:41:52 +10:00 |
|
Greg Wilkins
|
eee2ba206e
|
435322 Added a idleTimeout to the SharedBlockerCallback
|
2014-08-29 11:55:06 +10:00 |
|
Jan Bartel
|
21d590a74a
|
442759 Allow specific ServletContainerInitializers to be excluded
|
2014-08-28 16:52:26 +10:00 |
|
Greg Wilkins
|
d8e6331434
|
442477 Allow Symlink aliases by default
|
2014-08-27 17:33:27 +10:00 |
|
Jan Bartel
|
8f62be9fef
|
442628 Update example xml file for second server instance to extract wars
|
2014-08-27 17:22:37 +10:00 |
|
Jan Bartel
|
0aeebc4ec0
|
435988 ContainerLifeCycle: beans never stopped on remove
|
2014-08-27 17:13:07 +10:00 |
|
Greg Wilkins
|
4c8e2a6635
|
442642 Quickstart generates valid XML
Fixed issues with XmlParser and WebDescriptor that were stopping validation.
|
2014-08-27 16:38:49 +10:00 |
|
Jan Bartel
|
8ce96cdd2e
|
441475 org.eclipse.jetty.server.ResourceCache exceptions under high load
|
2014-08-27 14:46:22 +10:00 |
|