5084a1430f
Fixing build.
...
+ Bumping jetty-test-helper to 2.0
+ Bumping jetty-version-maven-plugin to 1.0.10
+ Fixing JDK 1.5 build warts
+ Updating Stress use for new "test.stress" property introduced by upgrades
2013-03-14 16:52:52 -07:00
6448758fc0
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2013-03-15 08:33:14 +11:00
cc34bdc20a
403281 jetty.sh waits for started or failure before returning
2013-03-15 08:32:24 +11:00
1cb201ef14
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
...
Conflicts:
VERSION.txt
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-client/pom.xml
jetty-continuation/pom.xml
jetty-deploy/pom.xml
jetty-distribution/pom.xml
jetty-distribution/src/main/resources/bin/jetty.sh
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-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-03-14 12:40:29 +11:00
38d701753c
403281 jetty.sh waits for started before OK
...
Conflicts:
jetty-distribution/src/main/resources/bin/jetty.sh
2013-03-14 11:50:06 +11:00
f85168a9ac
Merge branch 'release-8' into jetty-8
2013-03-12 14:26:52 -05:00
859c15ada3
Merge branch 'release-7' into jetty-7
2013-03-12 14:26:30 -05:00
0959b5a848
set for dev
2013-03-12 14:24:55 -05:00
728dada3b0
set for dev
2013-03-12 14:24:34 -05:00
acb5919844
[maven-release-plugin] prepare for next development iteration
2013-03-12 09:10:50 -05:00
d6ebdc0a4a
[maven-release-plugin] prepare release jetty-7.6.10.v20130312
2013-03-12 09:10:42 -05:00
0405c8ded6
[maven-release-plugin] prepare for next development iteration
2013-03-12 09:05:25 -05:00
852178cd01
[maven-release-plugin] prepare release jetty-8.1.10.v20130312
2013-03-12 09:05:14 -05:00
04732ab345
set for release
2013-03-12 08:38:25 -05:00
fdda21c167
Merge branch 'jetty-8' into release-8
2013-03-12 08:37:45 -05:00
c83e023ac3
set for release
2013-03-12 08:35:57 -05:00
d5328b0932
Merge branch 'jetty-7' into release-7
2013-03-12 08:34:31 -05:00
d358030299
Merge branch 'jetty-7' into jetty-8
2013-03-12 08:32:34 -05:00
9fd5881f93
[Bug 402735] jetty.sh to support status which is == check
2013-03-12 08:30:30 -05:00
97eec14651
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2013-03-11 12:47:10 +11:00
59f8d375b9
402833 Test harness for global error page and hide exception message from reason string
2013-03-11 12:12:07 +11:00
9055132144
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2013-03-08 13:45:56 +11:00
57cff606fd
400144 When loading a session fails the JDBCSessionManger produces duplicate session IDs
2013-03-08 13:33:48 +11:00
face3b3584
392129 fixed handling of timeouts after startAsync
2013-03-08 09:35:08 +11:00
621b1489e1
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2013-03-07 12:17:20 +11:00
a636fbfe7b
400142 ConcurrentModificationException in JDBC SessionManger
...
As part of this fix, refactored the JDBCSession to remove the SessionData object.
2013-03-07 12:02:27 +11:00
60a6340f8f
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2013-03-07 08:36:23 +11:00
1e0b9d4d97
402485 reseed secure random
2013-03-07 08:34:42 +11:00
0c941a878d
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2013-03-05 14:42:55 +11:00
777817dd0f
399799 do not hold lock while calling invalidation listeners
2013-03-05 14:32:17 +11:00
7abbc44474
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2013-03-05 10:40:45 +11:00
cf54341ae6
399967 Shutdown hook calls destroy
2013-03-05 10:36:37 +11:00
095e66db33
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2013-03-02 10:17:35 +11:00
3ed3dfc7a1
402048 org.eclipse.jetty.server.ShutdownMonitor doesn't stop after the jetty server is stopped
2013-03-02 10:12:24 +11:00
bf154404fe
402048 org.eclipse.jetty.server.ShutdownMonitor thread doesn't stop after the jetty server is stopped
2013-03-01 19:58:44 +11:00
caa0199efe
400312 ServletContextListener.contextInitialized() is not called when added in ServletContainerInitializer.onStartup
2013-03-01 18:09:19 +11:00
a3400f0092
Fixed merge error.
2013-02-27 19:50:46 +01:00
f28bd1d010
Merged branch jetty-7.
2013-02-27 17:30:22 +01:00
90bab0eb66
401908 - Enhance DosFilter to allow dynamic configuration of attributes.
2013-02-27 16:23:17 +01:00
1627b6eaf7
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2013-02-26 12:41:54 +11:00
0e9f74ad29
401531 StringIndexOutOfBoundsException for "/*" <url-pattern> of <jsp-property-group> fix for multiple mappings to *.jsp
2013-02-26 12:38:07 +11:00
283cd58147
Merge branch 'jetty-7' into jetty-8
2013-02-25 16:54:16 -07:00
2ed0dc8fff
Fixing websocket testcase
2013-02-25 16:53:32 -07:00
8f4b569076
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
...
Conflicts:
jetty-webapp/src/main/java/org/eclipse/jetty/webapp/StandardDescriptorProcessor.java
2013-02-26 10:44:58 +11:00
a65adcdd38
401531 StringIndexOutOfBoundsException for "/*" <url-pattern> of <jsp-property-group>
2013-02-25 17:45:22 +11:00
4cb0a964ef
401485 zip file closed exception
2013-02-22 18:25:40 +11:00
95f166b374
Merge branch 'jetty-7' into jetty-8
2013-02-21 17:34:19 -07:00
6a48749f0c
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
...
Conflicts:
jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java
2013-02-22 11:32:57 +11:00
c7dd114cb6
401317 - Make Safari 5.x websocket support minVersion level error more clear
...
+ Making error message about minVersion configurable more clear on both
the Logging on the server side, and the HTTP/1.1 400 error response
line
2013-02-21 17:23:17 -07:00
3d179bc418
Making testcase JDK 1.5 compatible
2013-02-21 17:23:17 -07:00
Joakim Erdfelt
Greg Wilkins
Jesse McConnell
Jan Bartel
Simone Bordet