Joakim Erdfelt
67a73c38f8
357959 - Include javadoc in distribution
...
+ Reworked how ${jetty.home}/lib folder, now created by 3
copy-dependencies declarations.
2011-09-16 09:48:19 -07:00
Greg Wilkins
8870a623f2
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
2011-09-16 15:29:42 +10:00
Greg Wilkins
a6988108c3
minor cleanups and extra debug
2011-09-16 15:29:28 +10:00
Joakim Erdfelt
a3b2a71aea
Setting back to debug level
2011-09-15 11:28:56 -07:00
Joakim Erdfelt
570134d78d
Merge branch 'bug-353509'
2011-09-15 11:18:39 -07:00
Jesse McConnell
1e8b4eb9ed
Merge branch 'master', remote-tracking branch 'origin/master'
2011-09-15 07:56:46 -05:00
Jesse McConnell
f6c480cef1
[Bug 357672] resolve issue with serializing pojos with mongodb session manager, thanks to john simone for the discovery and fix
2011-09-15 07:54:05 -05:00
Joakim Erdfelt
18c5483cc4
353509 - jetty-client unit tests are running too long
...
+ Fixing last remaining test failure with some careful
GenericServerHandler refactoring.
2011-09-14 11:23:11 -07:00
Thomas Becker
5530594128
353509: Fixed merging issues
2011-09-14 08:41:33 -07:00
hmalphettes
fd911df740
Ability to start equinox in a different thread instead of blocking the servletbrdige webapp from starting until equinox has completed to start. this is useful for cloudfoundry that at the moment complains if the webapp does not start very quickly
2011-09-14 16:34:56 +08:00
hmalphettes
1cbf5c4672
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
2011-09-14 16:34:33 +08:00
hmalphettes
901f818cb6
Ability to start equinox in a different thread instead of blocking the servletbrdige webapp from starting until equinox has completed to start. this is useful for cloudfoundry that at the moment complains if the webapp does not start very quickly
2011-09-14 16:34:15 +08:00
Greg Wilkins
54961fca1f
refined test options and output
2011-09-14 14:17:09 +10:00
Thomas Becker
670e8de261
352050: Fixed infinite redirect loop for /remote.html in testapp
2011-09-13 11:58:30 -07:00
Joakim Erdfelt
82f48ada9a
342161 - ScannerTest fails intermittently on Mac OS X
...
+ changing test directory to use test specific directory to avoid
conflicts with /tmp directory reuse amoung other tests.
2011-09-13 11:48:16 -07:00
Jan Bartel
61eba95ac6
JETTY-1430 local JNDI contexts don't carry environment
2011-09-13 17:57:50 +10:00
Joakim Erdfelt
fce4192fd9
353509 - jetty-client unit tests are running too long
2011-09-12 15:04:59 -07:00
Simone Bordet
9c43e04bb4
Guarding against NPE in case of concurrent stop().
2011-09-12 21:01:08 +02:00
Greg Wilkins
55d229e73c
357338 remove debug
2011-09-13 00:38:08 +10:00
Greg Wilkins
c5e6378b84
357338 Improve UTF-8 validation
2011-09-12 13:14:09 +10:00
Jesse McConnell
eab970e5c0
add and reformat the .gitignore
2011-09-09 16:13:23 -05:00
Jesse McConnell
56269df419
remove extra groupId element
2011-09-09 16:08:15 -05:00
Jesse McConnell
2e7d84dec8
Update to new parent pom that lets us import into indigo and m2eclipse
2011-09-09 15:42:01 -05:00
Joakim Erdfelt
11ca71700f
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
2011-09-09 09:53:28 -07:00
Joakim Erdfelt
f84c859bbc
357216 - Logging via Log4J does not expand braces in format strings
...
+ Made JettyAwareLogger more resilient to logger downstream
implementations by making it perform the slf4j message formatting
before handing it off to the LocationAwareLogger method(s)
2011-09-09 09:51:52 -07:00
Greg Wilkins
45f5fd39fe
357188 Send content buffer directly
2011-09-09 17:07:24 +10:00
Greg Wilkins
4c885ca3ad
357178 websockets draft 14 support
2011-09-09 12:10:01 +10:00
Jesse McConnell
675464e82d
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
2011-09-08 12:46:56 -05:00
Jesse McConnell
f3d0557828
Merge branch 'release'
2011-09-08 12:46:41 -05:00
Jesse McConnell
0046c5a9c2
set for next release
2011-09-08 12:45:59 -05:00
Joakim Erdfelt
03c0192cdb
Making image files from src/main/javadoc actually show up in javadoc:aggregate and -javadoc.jar files
2011-09-08 10:29:27 -07:00
Jesse McConnell
ebdb89dc23
[maven-release-plugin] prepare for next development iteration
2011-09-08 12:00:16 -05:00
Jesse McConnell
932245a114
[maven-release-plugin] prepare release jetty-7.5.1.v20110908
2011-09-08 12:00:10 -05:00
Jesse McConnell
37d0f53b0a
updating version.txt and resetting pom versions to 7.5.1-SNAPSHOT
2011-09-08 11:40:37 -05:00
Jesse McConnell
4a575d4958
Merge branch 'master' into release
2011-09-08 11:36:48 -05:00
Greg Wilkins
e914e0f97f
improved websocket handling of error cases for autobahn test suite
2011-09-09 01:52:27 +10:00
Greg Wilkins
a75b9bfb0c
357058 Acceptor thread blocking
2011-09-09 01:36:24 +10:00
Greg Wilkins
224962908d
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
2011-09-08 11:36:00 +10:00
Greg Wilkins
b8556bec76
fixes from running autobahn test suite
2011-09-08 11:35:39 +10:00
hmalphettes
8d51bc05ac
update the example osgi servlet bridge webapp
2011-09-07 17:08:24 -07:00
Jesse McConnell
6b614a54f0
[maven-release-plugin] prepare for next development iteration
2011-09-07 18:12:16 -05:00
Jesse McConnell
ce55c8c601
[maven-release-plugin] prepare release jetty-7.5.1.v20110907
2011-09-07 18:12:09 -05:00
Jesse McConnell
66af591b8c
Updating VERSION.txt top section
2011-09-07 17:52:40 -05:00
Jesse McConnell
39838ed3a5
Merge branch 'master' into release
2011-09-07 17:51:39 -05:00
Jesse McConnell
336e3b383b
reset for release
2011-09-07 17:49:08 -05:00
Jesse McConnell
cbde93f1c9
add jetty websocket as a dependency that is no longer provided
2011-09-07 13:41:08 -05:00
Jesse McConnell
eca0e31282
Add missing websocket test dependency to monitor
2011-09-07 11:50:55 -05:00
Jesse McConnell
1744b5bce1
reset from release
2011-09-07 11:09:46 -05:00
Jesse McConnell
caf6e0f1e4
Merge branch 'release'
2011-09-07 10:46:29 -05:00
Jesse McConnell
7f5cafc717
Updating VERSION.txt top section
2011-09-07 10:46:08 -05:00