f2d0fd3cc8
revert back to 8.1.0-SNAPSHOT
2012-01-26 10:45:06 -06:00
7ac9eb585f
revert back to 7.6.0-SNAPSHOT
2012-01-26 10:42:11 -06:00
e98ae91ca6
[maven-release-plugin] prepare for next development iteration
2012-01-25 11:16:11 -06:00
fb30166a7f
[maven-release-plugin] prepare release jetty-8.1.0.v20120125
2012-01-25 11:16:05 -06:00
c918bb4e3c
Merge branch 'master' into jetty-8
2012-01-25 10:31:44 -06:00
0c96fc40ea
[maven-release-plugin] prepare for next development iteration
2012-01-25 09:31:06 -06:00
b455b7d94e
[maven-release-plugin] prepare release jetty-7.6.0.v20120125
2012-01-25 09:30:55 -06:00
ee9e195b49
369602: ignore NotUtf8Exception for decodeToUtf8
2012-01-25 15:40:24 +11:00
067e3f17cb
avoid NPE with jdk 7u4ea8 changed behaviour of SslContext init
2012-01-23 16:58:29 +11:00
5c08b06622
improved test
2012-01-23 10:19:08 +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
5cd9dbc6d3
removed unneeded imports
2012-01-19 23:08:54 +11:00
7f1de41953
368920 - JettyAwareLogger always formats the arguments.
2012-01-18 10:03:18 +01:00
90184ab3c3
Latest merge from master
2012-01-17 13:36:44 -06: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
c6693a73ad
Merge remote-tracking branch 'origin/master' into jetty-8
2012-01-12 23:35:24 +11:00
564cf7329c
365302: made map of loggers concurrent and shared in abstract
2012-01-12 20:39:24 +11:00
08f4b79a66
365302: LogMBean added
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2012-01-12 12:36:16 +11:00
691efcc7ca
Merge remote-tracking branch 'origin/master' into jetty-8
2012-01-11 16:35:57 +11:00
cb22cfdbe5
368240: renamed to use manage/unmanage instead of join/disjoin
2012-01-11 11:06:14 +11:00
bb0a320102
Improved toString().
2012-01-10 17:41:32 +01:00
8fcc22df32
368240: Improved handling of dispatch failure
2012-01-11 01:12:36 +11:00
a7783ae568
368240: Fixed the start of dependent beans
2012-01-11 01:04:01 +11:00
968a2ac95b
368240: Added concept of join to AggregateLifeCycle. Used by HttpClient and AbstractConnector
2012-01-11 00:09:34 +11:00
1fbec51c8a
Merge remote-tracking branch 'origin/master' into jetty-8
2012-01-10 16:08:59 +11:00
8222ef815c
368114 Protect against non-Strings in System properties for Log
2012-01-09 13:12:25 +11:00
3141b50fa0
Merge remote-tracking branch 'origin/master' into jetty-8
2011-12-30 20:19:39 +11:00
085c79d7d6
637638 limit number of form parameters to avoid DOS
2011-12-30 12:00:18 +11:00
89afbdf31d
360245 OSGi: javax.servlet packages version refactored 3.0 -> 2.6
2011-12-02 17:27:26 +08:00
de005c68fd
Revert "Merge branch 'release-8'"
...
This reverts commit 9e72457941df12605f0e
2011-11-30 16:27:30 +11:00
631b0ba1b6
[maven-release-plugin] prepare for next development iteration
2011-11-30 13:16:54 +11:00
9d3745f999
[maven-release-plugin] prepare release jetty-8.1.0.RC0
2011-11-30 13:16:41 +11:00
55d5020980
Merge remote-tracking branch 'origin/master' into jetty-8
...
Conflicts:
VERSION.txt
jetty-server/src/main/java/org/eclipse/jetty/server/AbstractHttpConnection.java
jetty-server/src/main/java/org/eclipse/jetty/server/Response.java
jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
2011-11-29 09:06:25 +11:00
b969de1788
organized imports
2011-11-28 15:32:14 +11:00
c229a55ad9
362742 improved UTF8 exception reason
2011-11-28 14:00:35 +11:00
c6103f2d53
Removed usages of ThreadDeath.
2011-11-24 20:39:04 +01:00
0e9449ac85
Merge remote-tracking branch 'origin/master' into jetty-8
2011-11-21 18:18:09 +11:00
722444506a
362626 IllegalStateException thrown when SslContextFactory preconfigured with SSLContext
2011-11-21 12:30:29 +11:00
b8b5df27d6
Merge remote-tracking branch 'origin/master' into jetty-8
2011-11-17 11:03:07 +11:00
127a5af8d7
Merge remote-tracking branch 'origin/master' into jetty-8
2011-11-17 10:59:54 +11:00
ec4dfc211f
Simpler windows resource test
2011-11-16 17:08:16 +11:00
46aad20248
363785 - StdErrLog must use system-dependent EOL.
2011-11-15 10:19:10 +01:00
722f390800
numerous findbugs inspired cleanups
2011-11-15 11:22:35 +11:00
7a9b8f1e9d
reverted last changes due to instability
2011-11-10 12:11:58 +11:00
d61258ec4e
clean ups from review from sbordet.
...
Removed isBufferred
fixed instanceof ThreadDeath
avoid race with onInputShutdown
2011-11-10 10:12:37 +11:00
a36342438c
cleaned up some unit tests
2011-11-09 17:03:11 +11:00
2a6b8696d7
Merge branch 'master' into jetty-8
2011-11-08 15:59:55 -06:00
5f2323418b
cleanups after the merge
2011-11-08 12:47:28 +11:00
7a082280f1
Merge remote-tracking branch 'origin/master' into jetty-7.6
...
Conflicts:
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/pom.xml
jetty-ajp/pom.xml
jetty-annotations/pom.xml
jetty-client/pom.xml
jetty-client/src/main/java/org/eclipse/jetty/client/HttpConnection.java
jetty-client/src/main/java/org/eclipse/jetty/client/SelectConnector.java
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/ssl/SslContextFactory.java
jetty-io/pom.xml
jetty-io/src/main/java/org/eclipse/jetty/io/nio/ChannelEndPoint.java
jetty-io/src/main/java/org/eclipse/jetty/io/nio/SelectChannelEndPoint.java
jetty-jaspi/pom.xml
jetty-jmx/pom.xml
jetty-jndi/pom.xml
jetty-jsp-2.1/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-logback/pom.xml
jetty-osgi/jetty-osgi-boot-warurl/pom.xml
jetty-osgi/jetty-osgi-boot/pom.xml
jetty-osgi/jetty-osgi-equinoxtools/pom.xml
jetty-osgi/jetty-osgi-httpservice/pom.xml
jetty-osgi/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-start/pom.xml
jetty-util/pom.xml
jetty-util/src/test/java/org/eclipse/jetty/util/log/LogTest.java
jetty-util/src/test/java/org/eclipse/jetty/util/log/NamedLogTest.java
jetty-webapp/pom.xml
jetty-websocket/pom.xml
jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketConnectionD13.java
jetty-xml/pom.xml
pom.xml
test-continuation-jetty6/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-sessions-common/pom.xml
tests/test-webapps/pom.xml
tests/test-webapps/test-webapp-rfc2616/pom.xml
2011-11-07 18:09:31 +11:00
e207ea357e
Minor update to invalid utf8 test case (expanding bad examples)
2011-11-02 17:22:32 -07:00
2b6fec713c
Merge branch 'master' into jetty-8
2011-11-02 16:47:04 -05:00
e088acc559
Resolving merge
2011-10-28 13:42:07 -07:00
a32c1186e2
362113 - Improve Test Coverage of org.eclipse.jetty.util.log classes
...
+ JavaUtilLog coverage improvements and bug fixes
+ More in-code comments about decisions
2011-10-28 13:29:22 -07:00
aa73830199
Updating java comments to make clear the purpose of this new static{} block
2011-10-28 10:57:32 -07:00
4947bf099a
Making Log use an optional jetty-logging.properties object for pre-loading its properties (with System.getProperty override)
2011-10-28 10:30:35 -07:00
c02f98b7e6
More classpath mucking about in Sfl4jTestJarsRunner
2011-10-28 09:48:59 -07:00
9c9f2bd7c3
Making Sfl4jTestJarsRunner use its own classloader for loading the test
2011-10-28 09:23:11 -07:00
21c43b1ab9
Making Sfl4jTestJarsRunner use its own classloader for loading the test
2011-10-28 09:21:46 -07:00
062ccd7e70
trial classloader
2011-10-28 11:15:02 -05:00
148459bc8f
trial classloader
2011-10-28 11:14:14 -05:00
5c516c9e7b
Making fixes to StdErrLogTest
2011-10-28 09:12:29 -07:00
c174304996
Making fixes to StdErrLogTest
2011-10-28 09:11:21 -07:00
f510e0daf9
Making fixes to StdErrLogTest
2011-10-28 09:07:03 -07:00
824e6ebc52
Merge branch 'master' into slf4j-testing
2011-10-28 08:44:44 -07:00
84b07f359e
temporary disabled log format test
2011-10-28 15:25:10 +11:00
962e4afda9
Bug 362251 - Allow Log.setDebugEnabled(true) to override on configured StdErrLog levels
2011-10-27 16:44:29 -07:00
a87286a17c
WIP: testing of Slf4jLog
2011-10-27 15:56:32 -07:00
94124f7412
merge from master
2011-10-26 15:26:49 -05:00
464c297c01
Bug 362113 - Improve Test Coverage of org.eclipse.jetty.util.log classes
...
+ Bringing StdErrLog testing coverage up from 73% to 92%
2011-10-26 12:57:13 -07:00
1f9814a69a
362113 - Improve Test Coverage of org.eclipse.jetty.util.log classes
...
* Fixing bugs with bad level names, and adding tests for lowercase level
names.
2011-10-26 11:04:53 -07:00
064c93c53b
362111 - StdErrLog.isDebugEnabled() returns true too often
2011-10-26 10:34:33 -07:00
4258b6f385
SslConnection server side mostly working
2011-10-26 22:55:02 +11:00
af45063a54
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
2011-10-25 16:21:39 -07:00
61664d3c0f
Added concept of SslConnection
2011-10-26 01:15:59 +11:00
d5320d95ba
[maven-release-plugin] prepare for next development iteration
2011-10-24 15:02:30 -05:00
d02f74a50c
[maven-release-plugin] prepare release jetty-8.0.4.v20111024
2011-10-24 15:02:23 -05:00
1d86da8f68
[maven-release-plugin] prepare for next development iteration
2011-10-24 14:52:54 -05:00
5f349ecc92
[maven-release-plugin] prepare release jetty-7.5.4.v20111024
2011-10-24 14:52:48 -05:00
b87cbd1181
Adding test on StdErrLog.isDebugEnabled()
2011-10-24 10:35:06 -07:00
fc497fe1e8
Merge remote-tracking branch 'origin/master' into jetty-8
2011-10-24 16:30:10 +11:00
a642f7b55c
Merge remote-tracking branch 'origin/master' into jetty-7.6
...
Conflicts:
jetty-http/src/main/java/org/eclipse/jetty/http/HttpGenerator.java
jetty-io/src/main/java/org/eclipse/jetty/io/nio/SslSelectChannelEndPoint.java
2011-10-24 11:27:42 +11:00
cd0628ab66
Added isDebugEnabled guards to debugging that generates garbage
2011-10-22 09:39:54 +11:00
810223e259
361655 ExecutorThreadPool.isLowOnThreads() returns wrong value.
...
Optimized by calling getActiveCount() last, since it locks the thread pool.
2011-10-21 22:53:20 +02:00
d4603e1fdd
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
2011-10-21 16:26:18 +02:00
309e347d18
361655 ExecutorThreadPool.isLowOnThreads() returns wrong value.
...
Method isLowOnThreads() now return a value similar to what QueuedThreadPool does.
Also taken the chance to refactor constructors, and clarify that if an unbounded queue
like LinkedBlockingQueue is used, then the corePoolSize must be equal to the maxPoolSize.
2011-10-21 16:25:37 +02:00
0ba6fc7408
Merge remote-tracking branch 'origin/master' into jetty-8
2011-10-21 14:55:39 +11:00
44ea5c4d85
Merge remote-tracking branch 'origin/master' into jetty-7.6
2011-10-21 10:21:54 +11:00
385bc15726
358649 - Replace existing StdErrLog system properties for DEBUG/IGNORED with LEVEL instead.
...
Adding special case for "log.LEVEL" to set the root logging level.
2011-10-20 14:47:26 -07:00
5140a95144
refactored HttpConnection name
2011-10-20 15:12:19 +11:00
74fd2e8965
Merge branch 'master' into jetty-7.6
...
Conflicts:
jetty-client/src/main/java/org/eclipse/jetty/client/HttpConnection.java
jetty-io/src/main/java/org/eclipse/jetty/io/nio/SslSelectChannelEndPoint.java
2011-10-19 17:43:55 +11:00
22f1d83f10
360836 Accept parameters with bad UTF-8. Use replacement character
2011-10-19 16:32:05 +11:00
c93e1c297f
360836 Accept parameters with bad UTF-8. Use replacement character
2011-10-19 16:23:56 +11:00
d71fd55665
361319 Log initialization does not catch correct exceptions on all jvms
2011-10-19 12:28:23 +11:00
49f8b0de1a
Websocket partially refactored and passing tests
2011-10-18 21:59:49 +11:00
6edb7c1930
organised imports
2011-10-18 15:05:22 +11:00
e43b718fb1
Refactored NIO to better handle half closes. Applied the following policy:
...
Call shutdownOutput to signal the other end that you have written all the data that your are going to write (eg and the end of a non persistent HTTP response). This can be done either by generator (when it is complete) or coordinator or handle - but we need to decide which and have only 1 doing it.
Call shutdownInput to signal your own end that you have read -1 and to allow other local code to check that with an isInputShutdown. Ideally we could get by without any calls at all to shutdownInput, so long as we well handle reading -1 (Currently we don't). This should be done by whatever does the IO read.
Calling close should always be a real TCP close, even with SSL. SSL shutdown
The default handling of an idle callback should be close. But some connections (NOT endpoints) may implement idle as initiating a shutdown exchange (eg websocket close). If they do, this is state that should be held in the connection or parser - ie do-this-exhange-and-then-shutdown
Call close when you want to shutdown Output and you have already read -1, so input is already shutdown. We need to double verify that this is correct and that if a FIN has been received from the other end, that a close will not result in a reset. I'll do that today.
Call close when you want to shutdown Input and output has already been shutdown. This means you have read -1 after having sent a FIN.
Call close on any errors.
The current state is that server HttpConnection appears to be working well. Other connection types have not been updated and/or tested
2011-10-18 14:38:02 +11:00
e9c398e86b
Let StdErrLog *.LEVEL come from configured properties instead
2011-10-14 08:27:08 -07:00
a38f2a9e68
[maven-release-plugin] prepare for next development iteration
2011-10-11 10:16:54 -05:00
55a1be5435
[maven-release-plugin] prepare release jetty-8.0.3.v20111011
2011-10-11 10:16:47 -05:00
Jesse McConnell
Greg Wilkins
Simone Bordet
Thomas Becker
Jan Bartel
hmalphettes
Joakim Erdfelt