Greg Wilkins
|
e0382bc4ae
|
414740 Removed the parent peeking Loader
|
2013-08-09 17:53:43 +10:00 |
Jan Bartel
|
06ef5b7930
|
Merge remote-tracking branch 'origin/master' into jetty-9.1
Conflicts:
jetty-annotations/src/test/java/org/eclipse/jetty/annotations/TestAnnotationParser.java
jetty-http/src/main/java/org/eclipse/jetty/http/HttpParser.java
|
2013-08-09 15:59:29 +10:00 |
|
Jan Bartel
|
b17696325b
|
Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java
|
2013-08-09 15:14:09 +10:00 |
|
Jan Bartel
|
6a22a9f5b9
|
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
|
2013-08-09 14:46:25 +10:00 |
|
Jan Bartel
|
66620b77b8
|
414507 Ensure AnnotationParser ignores parent dir hierarchy when checking for hidden dirnames
|
2013-08-09 14:19:04 +10:00 |
Joakim Erdfelt
|
012804bdd9
|
414725 - Annotation Scanning should exclude webapp basedir from path validation checks
+ Checking in @Ignore'd test demonstrating the bug
|
2013-08-08 15:05:31 -07:00 |
|
Jan Bartel
|
1f3ec4b538
|
Merge remote-tracking branch 'origin/master' into jetty-9.1
|
2013-08-08 14:31:33 +10:00 |
|
Jan Bartel
|
bd1b19b45c
|
Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java
jetty-annotations/src/test/java/org/eclipse/jetty/annotations/TestAnnotationParser.java
|
2013-08-08 14:24:19 +10:00 |
|
Jan Bartel
|
f22217392b
|
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
Conflicts:
jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java
|
2013-08-08 12:28:51 +10:00 |
|
Jan Bartel
|
f983629434
|
414507 AnnotationParser should skip classes in hidden dirs or with . name prefix
|
2013-08-08 12:09:29 +10:00 |
|
Joakim Erdfelt
|
941989e5cb
|
Tweaking generics.
|
2013-07-26 14:04:17 -07:00 |
Jesse McConnell
|
20bd1e0f96
|
[maven-release-plugin] prepare for next development iteration
|
2013-07-26 11:50:17 -05:00 |
|
Jesse McConnell
|
49c3b2c32a
|
[maven-release-plugin] prepare release jetty-8.1.12.v20130726
|
2013-07-26 11:49:58 -05:00 |
|
Jesse McConnell
|
6ed360c480
|
reset for release
|
2013-07-26 11:23:57 -05:00 |
|
Jesse McConnell
|
1a5117e9ab
|
[maven-release-plugin] prepare release jetty-8.1.12.v20130726
|
2013-07-26 11:18:24 -05:00 |
|
Jesse McConnell
|
650e8e93ae
|
[maven-release-plugin] prepare for next development iteration
|
2013-07-26 10:57:33 -05:00 |
|
Jesse McConnell
|
e7e2fce56e
|
[maven-release-plugin] prepare release jetty-7.6.12.v20130726
|
2013-07-26 10:57:26 -05:00 |
Simone Bordet
|
5c7eb9e265
|
Reverted version to 7.6.12-SNAPSHOT.
|
2013-07-26 13:36:35 +02:00 |
|
Jesse McConnell
|
49045558ef
|
[maven-release-plugin] prepare for next development iteration
|
2013-07-25 14:07:12 -05:00 |
|
Jesse McConnell
|
9b888d5c22
|
[maven-release-plugin] prepare release jetty-7.6.12.v20130725
|
2013-07-25 14:06:53 -05:00 |
|
Jesse McConnell
|
de2840ca1e
|
[maven-release-plugin] prepare for next development iteration
|
2013-07-25 12:52:15 -05:00 |
|
Jesse McConnell
|
3e94867f7f
|
[maven-release-plugin] prepare release jetty-8.1.12.v20130725
|
2013-07-25 12:52:07 -05:00 |
|
Jesse McConnell
|
bc679809f8
|
[maven-release-plugin] prepare for next development iteration
|
2013-07-25 11:25:58 -05:00 |
|
Jesse McConnell
|
39ec9b8051
|
[maven-release-plugin] prepare release jetty-7.6.12.v20130725
|
2013-07-25 11:25:51 -05:00 |
|
Jesse McConnell
|
e0ad2c4ee1
|
[maven-release-plugin] prepare for next development iteration
|
2013-07-25 07:52:39 -05:00 |
|
Jesse McConnell
|
99712058ca
|
[maven-release-plugin] prepare release jetty-8.1.11.v20130725
|
2013-07-25 07:52:32 -05:00 |
|
Jesse McConnell
|
767dbe6778
|
[maven-release-plugin] prepare for next development iteration
|
2013-07-25 07:48:09 -05:00 |
|
Jesse McConnell
|
cfa6076c4f
|
[maven-release-plugin] prepare release jetty-7.6.11.v20130725
|
2013-07-25 07:48:02 -05:00 |
|
Jan Bartel
|
bd2add0ae9
|
Update to post-release (servlet 3.1/javaee) versions of javaee dependencies. WARNING: jetty-schemas from jetty-toolchain needs to be changed from SNAPSHOT to final release.
|
2013-07-12 13:53:58 +10:00 |
|
Joakim Erdfelt
|
78b5f7df1f
|
[maven-release-plugin] prepare for next development iteration
|
2013-06-25 08:29:26 -07:00 |
|
Joakim Erdfelt
|
5f2c937fcb
|
[maven-release-plugin] prepare release jetty-9.0.4.v20130625
|
2013-06-25 08:29:18 -07:00 |
|
Joakim Erdfelt
|
31faf2fe20
|
Reverting failed release from friday
|
2013-06-25 07:42:45 -07:00 |
|
Jesse McConnell
|
57bfda2a08
|
[maven-release-plugin] prepare for next development iteration
|
2013-06-21 09:49:25 -05:00 |
|
Jesse McConnell
|
c1082ad4d4
|
[maven-release-plugin] prepare release jetty-9.0.4.v20130621
|
2013-06-21 09:49:15 -05:00 |
|
Joakim Erdfelt
|
f8c457f75e
|
Merge branch 'jetty-9.1' into javawebsocket-jsr
|
2013-06-19 15:07:15 -07:00 |
|
Joakim Erdfelt
|
2da8c9c306
|
Merge branch 'master' into javawebsocket-jsr
Conflicts:
jetty-spdy/spdy-http-server/src/test/java/org/eclipse/jetty/spdy/server/http/ReferrerPushStrategyTest.java
jetty-util/src/main/java/org/eclipse/jetty/util/BufferUtil.java
jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/io/UpgradeConnection.java
jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/events/EventDriver.java
jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/ServletWebSocketRequest.java
jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketServerFactory.java
jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/WebSocketLoadRFC6455Test.java
|
2013-06-17 10:54:10 -07: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 |
|
Jesse McConnell
|
eddb49941d
|
[Bug 408600] set correct jetty.url in all pom files
|
2013-06-12 15:52:36 -05:00 |
|
Joakim Erdfelt
|
998643587d
|
Merge from [master] to [javawebsocket-jsr]
|
2013-05-30 16:44:50 -07: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 |
|
Jan Bartel
|
c53efbaff4
|
Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
example-async-rest/async-rest-jar/pom.xml
example-async-rest/async-rest-webapp/pom.xml
example-async-rest/pom.xml
example-jetty-embedded/pom.xml
jetty-aggregate/jetty-all-server/pom.xml
jetty-aggregate/jetty-all/pom.xml
jetty-aggregate/jetty-client/pom.xml
jetty-aggregate/jetty-plus/pom.xml
jetty-aggregate/jetty-server/pom.xml
jetty-aggregate/jetty-servlet/pom.xml
jetty-aggregate/jetty-webapp/pom.xml
jetty-aggregate/jetty-websocket/pom.xml
jetty-aggregate/pom.xml
jetty-ajp/pom.xml
jetty-annotations/pom.xml
jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationConfiguration.java
jetty-client/pom.xml
jetty-continuation/pom.xml
jetty-deploy/pom.xml
jetty-distribution/pom.xml
jetty-http-spi/pom.xml
jetty-http/pom.xml
jetty-http/src/main/java/org/eclipse/jetty/http/gzip/AbstractCompressedStream.java
jetty-io/pom.xml
jetty-jaspi/pom.xml
jetty-jmx/pom.xml
jetty-jndi/pom.xml
jetty-jsp/pom.xml
jetty-monitor/pom.xml
jetty-nested/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/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-overlay-deployer/pom.xml
jetty-plus/pom.xml
jetty-policy/pom.xml
jetty-rewrite/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-core/pom.xml
jetty-spdy/spdy-jetty-http-webapp/pom.xml
jetty-spdy/spdy-jetty-http/pom.xml
jetty-spdy/spdy-jetty/pom.xml
jetty-start/pom.xml
jetty-util/pom.xml
jetty-webapp/pom.xml
jetty-websocket/pom.xml
jetty-xml/pom.xml
pom.xml
test-continuation/pom.xml
test-jetty-nested/pom.xml
test-jetty-servlet/pom.xml
test-jetty-webapp/pom.xml
tests/pom.xml
tests/test-integration/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-mongodb-sessions/pom.xml
tests/test-sessions/test-sessions-common/pom.xml
tests/test-webapps/pom.xml
tests/test-webapps/test-webapp-rfc2616/pom.xml
|
2013-05-30 15:36:38 +10:00 |
|
Jan Bartel
|
c869aad145
|
409436 NPE on context restart using dynamic servlet registration
|
2013-05-30 15:16:43 +10:00 |
|
Jan Bartel
|
af02e9b16d
|
Update to version to 8.1.12-SNAPSHOT after last release
|
2013-05-30 10:52:39 +10:00 |
|
Greg Wilkins
|
10539d5a3f
|
fixed NPE in injection
|
2013-05-29 09:14:27 +10:00 |
|
Greg Wilkins
|
15e0d50b79
|
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
|
2013-05-23 09:50:27 +10:00 |
|
Joakim Erdfelt
|
598ecd7d7f
|
Merge branch 'master' into javawebsocket-jsr
|
2013-05-22 09:25:06 -07:00 |
|
Jesse McConnell
|
725dc261c8
|
Merge branch 'release-8' into jetty-8
|
2013-05-22 10:44:14 -05:00 |
|
Jesse McConnell
|
a1a6f0e5f2
|
Merge branch 'release-7' into jetty-7
|
2013-05-22 10:39:24 -05:00 |
|
Jesse McConnell
|
74a4077dad
|
Add package-info.java files to all jetty packages.
|
2013-05-21 15:09:49 -05:00 |
|
Jesse McConnell
|
742f6a063d
|
[Bug 408600] set correct jetty.url in all pom files
|
2013-05-21 13:16:39 -05:00 |