9c205c3278
Merge branch 'release'
2012-01-20 11:36:25 -06:00
c2d33f8f69
set for dev
2012-01-20 11:34:23 -06:00
80ffe47e7e
Tweaking test assertion for variety of values seen in various JVMs (with comments)
2012-01-20 10:32:03 -07:00
16833ca8c9
[maven-release-plugin] prepare for next development iteration
2012-01-20 10:50:24 -06:00
dd80d7e868
[maven-release-plugin] prepare release jetty-7.6.0.RC5
2012-01-20 10:50:14 -06:00
1c467b1e6c
Merge branch 'master' into release
2012-01-20 10:03:52 -06:00
45bede6fda
368992 - NPE in HttpGenerator.prepareBuffers() test case.
2012-01-20 16:57:42 +01:00
1e3273d20c
set for release
2012-01-20 08:42:24 -06:00
5fbe21dbee
Merge branch 'master' into release
2012-01-20 08:41:12 -06:00
f8004b9160
Merge branch 'release' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into release
2012-01-20 08:40:06 -06:00
de16f76725
369048: one more test
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2012-01-20 13:38:42 +11:00
a594734241
369048: more test cases for ConstraintSecurityHandler
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2012-01-20 13:38:24 +11:00
e1b12a633b
Merge remote-tracking branch 'origin/master' into jetty-8
...
Conflicts:
jetty-distribution/pom.xml
jetty-osgi/test-jetty-osgi/pom.xml
2012-01-20 13:00:32 +11:00
02d53f9612
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
2012-01-20 12:40:58 +11:00
8e69edaf9e
368992 avoid non-blocking flush when writing to avoid setting !_writable without _writeblocked
2012-01-20 12:40:34 +11:00
cdba99aee5
359329 Prevent reinvocation of LoginModule.login with jaspi for already authed user
2012-01-20 08:01:35 +11:00
4fe85c9c1e
additional more informative test error messages
2012-01-19 13:42:07 -06:00
8e262aca04
[369120] more descriptive test failure output
2012-01-19 11:26:17 -06:00
50e551de64
368992: improved logging
2012-01-19 23:11:27 +11:00
5cd9dbc6d3
removed unneeded imports
2012-01-19 23:08:54 +11:00
7cd887d48b
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
2012-01-19 12:40:07 +11:00
f79bdfaf2e
368992 clear interest ops for double dispatch even if no read/write blocked threads
2012-01-19 12:39:45 +11:00
ec7eb3348a
Revert "Get rid of javax.activation."
...
this was not appropriate for jetty7 which needs to support java 1.5 which is not universally bundling javax.activation as previously understood. The original commit should stand for jetty 8 though which will be handled during that merge
This reverts commit fae4f3fda9
2012-01-18 15:16:34 -06:00
dba80219b1
[368593] javax.activation is _not_ present in 1.5.0_18
2012-01-18 08:29:43 -06:00
fa24681df9
[368593] remove profile altogether, javax.activation is part of all
...
modern jvm and a separate dependency should not be required any longer
2012-01-18 07:57:25 -06:00
6a55f2c882
368948 - POM for jetty-jndi references unknown version for javax.activation.
2012-01-18 13:24:35 +01:00
486af62635
Improved logging of exceptions; now stack traces are printed in debug mode, if the exception is rethrown.
2012-01-18 12:38:28 +01:00
f039d00910
Made SslConnection logger a per-instance variable, to avoid lock contention with other SslConnection instances.
2012-01-18 10:05:35 +01:00
7f1de41953
368920 - JettyAwareLogger always formats the arguments.
2012-01-18 10:03:18 +01:00
f7b3a2cdfc
Merge remote-tracking branch 'origin/master' into jetty-8
2012-01-18 17:05:42 +11:00
0a88d47a23
Merge branch 'jetty-8' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-8
2012-01-18 17:05:22 +11:00
c696f14450
368821 improved test harness
2012-01-18 15:24:20 +11:00
98684397fd
Merge remote-tracking branch 'origin/master' into jetty-8
2012-01-18 14:17:41 +11:00
3e04cac272
JETTY-1475 made output state fields volatile to provide memory barrier for non dispatched thread IO
2012-01-18 14:16:09 +11:00
9ff8633554
368821 SslConnection.handle always calls wrapped Connection.handle, so state can be processed
2012-01-18 13:39:24 +11:00
b57bf3b600
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
2012-01-17 23:06:46 +01:00
e609a65e61
368821 - SSL Spin on asyncDispatch.
...
Test (for now ignored) that reproduces the problem.
2012-01-17 23:05:41 +01:00
6e38a97d7f
When dumping the selector, we should take the keys only once, otherwise the set of keys may change between calls.
2012-01-17 23:00:34 +01:00
ea24258dee
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
2012-01-18 07:41:49 +11:00
1ac71de645
368632 Remove superfluous removal of org.apache.catalina.jsp_file
2012-01-18 07:41:16 +11:00
b6a51f0c06
Updating testcase to indicate reason of failure (when testing on OSX)
2012-01-17 13:33:41 -07:00
7cb15929f7
Merge branch 'master' into jetty-8
2012-01-17 13:37:28 -06:00
90184ab3c3
Latest merge from master
2012-01-17 13:36:44 -06:00
fc3d2f0599
Setting TRACE tests to @Ignore pending review of changes for realmless security constraints that have rendered the TRACE tests invalid for integration testing of the default configuration
2012-01-17 12:16:55 -07:00
6da9a22c09
Minor update to VERSION.txt format
2012-01-17 11:21:18 -07:00
1537433b81
368821 Only do SSL asyncDispatch for temp buffer fills
2012-01-17 23:59:12 +11:00
c1b2eedadc
368773 process data constraints without realm
2012-01-17 22:53:53 +11:00
50fe23882a
368787 always set token view to new header buffers in httpparser
2012-01-17 15:24:52 +11:00
81c48518b6
368635 moved lifecycle state reporting from toString to dump
2012-01-16 15:37:32 +11:00
ef9ac7760d
368635 moved lifecycle state reporting from toString to dump
2012-01-16 15:24:31 +11:00
Jesse McConnell
Joakim Erdfelt
Simone Bordet
Thomas Becker
Greg Wilkins
Jan Bartel