Greg Wilkins
be6f876621
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
VERSION.txt
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
jetty-aggregate/jetty-all-server/pom.xml
jetty-aggregate/jetty-client/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-annotations/pom.xml
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-io/pom.xml
jetty-jaspi/pom.xml
jetty-jmx/pom.xml
jetty-jndi/pom.xml
jetty-jsp/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/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-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-server/pom.xml
jetty-start/pom.xml
jetty-util-ajax/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
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-jetty-webapp/pom.xml
tests/test-webapps/test-webapp-rfc2616/pom.xml
2013-09-19 17:08:40 +10:00
Greg Wilkins
52aba6f1aa
updated VERSIONS.txt with 7 relase
2013-09-19 17:01:46 +10:00
Greg Wilkins
3acda280a8
416577 enhanced shutdown handler to send shutdown at startup
2013-09-19 12:28:07 +10:00
Greg Wilkins
ba5a709245
416577 enhanced shutdown handler to send shutdown at startup
2013-09-19 09:19:55 +10:00
Greg Wilkins
c6a29339ab
417475 Do not null context Trie during dynamic deploy
2013-09-19 09:00:57 +10:00
Thomas Becker
016fbbb07f
416453 Add comments to embedded MinimalServlets example
2013-09-18 17:55:24 +02:00
Thomas Becker
6377503caa
416453 Add comments to embedded ManyConnectors example
2013-09-18 17:55:24 +02:00
Thomas Becker
36efbb9869
416453 Add comments to embedded FileServer example
2013-09-18 17:55:23 +02:00
Thomas Becker
b4a8871b62
416453 Add comments to embedded SpdyServer example
2013-09-18 17:55:23 +02:00
Joakim Erdfelt
c5775a6ccf
Using correct version for master
2013-09-17 09:41:45 -07:00
Jesse McConnell
2d35fa9558
Merge branch 'release-8' into jetty-8
2013-09-17 11:39:30 -05:00
Thomas Becker
74a75e3d42
test chat fix
2013-09-17 14:39:00 +02:00
Thomas Becker
000793a7aa
416940 avoid download of spring-beans.dtd
2013-09-17 12:40:23 +02:00
Jesse McConnell
2b4475b046
set for dev
2013-09-16 16:08:29 -05:00
Jesse McConnell
120d2d885b
[maven-release-plugin] prepare for next development iteration
2013-09-16 12:42:17 -05:00
Jesse McConnell
a6c4c30d2a
[maven-release-plugin] prepare release jetty-8.1.13.v20130916
2013-09-16 12:42:06 -05:00
Jesse McConnell
a816863c30
set for release
2013-09-16 12:15:36 -05:00
Jesse McConnell
a5e1f0d8f7
Merge branch 'jetty-8' into release-8
2013-09-16 12:14:24 -05:00
Thomas Becker
257e1a9f2e
416674 run all jetty-ant tests on random ports
2013-09-16 18:05:31 +02:00
Greg Wilkins
ea22c21281
Merge remote-tracking branch 'origin/jetty-8'
2013-09-16 23:35:27 +10:00
Greg Wilkins
4ae547b988
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2013-09-16 23:31:09 +10:00
Greg Wilkins
30bab30d9b
Revert "Merge branch 'release-8' into jetty-8"
...
This reverts commit 463ef68dc32c1733d805f85c86c7adb8c488a6be, reversing
changes made to de544ddfbfd36dfa24cf127a521b00e674b2dbfc.
2013-09-16 23:28:59 +10:00
Greg Wilkins
2629f93397
Revert "Merge branch 'release-7' into jetty-7"
...
This reverts commit 624a0d7e455330836ed8b99c39a1686cd1210869, reversing
changes made to 3eb84f99a45d81acf55deb1c12be9ac9b6042d1f.
Conflicts:
VERSION.txt
2013-09-16 23:23:59 +10:00
Greg Wilkins
0e2f3990b1
reset VERSION.txt
2013-09-16 20:12:50 +10:00
Greg Wilkins
05d039b426
413684 deprecated unsafe alias checkers
...
removed debugs
2013-09-16 19:30:59 +10:00
Greg Wilkins
a731ec13c8
413684 deprecated unsafe alias checkers
2013-09-16 19:30:45 +10:00
Greg Wilkins
9fef8215ed
417225 added Container.addEventListener method
2013-09-16 10:48:51 +10:00
Greg Wilkins
9113767907
417260 Protected targets matched as true URI path segments
2013-09-16 10:07:59 +10:00
Thomas Becker
624a0d7e45
Merge branch 'release-7' into jetty-7
2013-09-13 18:06:06 +02:00
Thomas Becker
463ef68dc3
Merge branch 'release-8' into jetty-8
2013-09-13 18:05:14 +02:00
Jan Bartel
0b80b9ba36
417110 Demo / html body end tag missing in authfail.html
2013-09-13 12:13:47 +10:00
Greg Wilkins
0e981d8d98
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
jetty-jmx/src/main/java/org/eclipse/jetty/jmx/MBeanContainer.java
jetty-monitor/src/test/java/org/eclipse/jetty/monitor/AttrEventTriggerTest.java
2013-09-12 15:07:02 +10:00
Greg Wilkins
423dc1e443
416990 JMX names statically unique
...
Concurrent access to counter
2013-09-12 12:52:28 +10:00
Greg Wilkins
4d1c7ed28d
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
2013-09-12 12:50:57 +10:00
Jan Bartel
0abeb876dc
Update start.ini to handle different versions of npn boot jar
2013-09-12 12:37:50 +10:00
Greg Wilkins
de544ddfbf
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2013-09-12 12:30:03 +10:00
Greg Wilkins
3eb84f99a4
416990 JMX names statically unique
...
Fixed monitor test to reset uniqueness
2013-09-12 12:29:24 +10:00
Greg Wilkins
e4035f8cf2
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
jetty-http/src/main/java/org/eclipse/jetty/http/HttpGenerator.java
jetty-jmx/src/main/java/org/eclipse/jetty/jmx/MBeanContainer.java
jetty-servlets/src/test/java/org/eclipse/jetty/servlets/ProxyServletTest.java
2013-09-12 11:08:03 +10:00
Greg Wilkins
da2bbdea3c
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2013-09-12 10:40:54 +10:00
Greg Wilkins
c842c5c505
416990 JMX names statically unique
2013-09-12 10:40:26 +10:00
Jan Bartel
be2ecca599
Move npn profiles to parent pom so that npn.version is available to other modules (eg osgi)
2013-09-12 10:06:01 +10:00
Thomas Becker
5ab692b62e
Updating VERSION.txt top section
2013-09-11 12:26:24 +02:00
Simone Bordet
9910db17cb
Added profile for JDK 1.7.0_40.
2013-09-11 09:15:39 +02:00
Thomas Becker
b95d6948a8
[maven-release-plugin] prepare for next development iteration
2013-09-10 20:44:44 +02:00
Thomas Becker
5692cff532
[maven-release-plugin] prepare release jetty-8.1.13.v20130910
2013-09-10 20:44:29 +02:00
Thomas Becker
2bffdf508c
Merge branch 'release-8' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into release-8
2013-09-10 19:56:12 +02:00
Thomas Becker
911043b5be
ProxyServletTest create test dir if it doesn't exist
2013-09-10 18:02:46 +02:00
Thomas Becker
8fd97dad0e
Updating VERSION.txt top section
2013-09-10 17:42:53 +02:00
Thomas Becker
994d8baa3f
Merge branch 'jetty-8' into release-8
2013-09-10 17:40:25 +02:00
Thomas Becker
d6d6b53ee8
Updating VERSION.txt top section
2013-09-10 17:33:51 +02:00
