Joakim Erdfelt
f510e0daf9
Making fixes to StdErrLogTest
2011-10-28 09:07:03 -07:00
Joakim Erdfelt
824e6ebc52
Merge branch 'master' into slf4j-testing
2011-10-28 08:44:44 -07:00
Greg Wilkins
84b07f359e
temporary disabled log format test
2011-10-28 15:25:10 +11:00
Joakim Erdfelt
962e4afda9
Bug 362251 - Allow Log.setDebugEnabled(true) to override on configured StdErrLog levels
2011-10-27 16:44:29 -07:00
Joakim Erdfelt
a87286a17c
WIP: testing of Slf4jLog
2011-10-27 15:56:32 -07:00
Jesse McConnell
94124f7412
merge from master
2011-10-26 15:26:49 -05:00
Joakim Erdfelt
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
Joakim Erdfelt
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
Joakim Erdfelt
064c93c53b
362111 - StdErrLog.isDebugEnabled() returns true too often
2011-10-26 10:34:33 -07:00
Greg Wilkins
4258b6f385
SslConnection server side mostly working
2011-10-26 22:55:02 +11:00
Greg Wilkins
61664d3c0f
Added concept of SslConnection
2011-10-26 01:15:59 +11:00
Joakim Erdfelt
b87cbd1181
Adding test on StdErrLog.isDebugEnabled()
2011-10-24 10:35:06 -07:00
Jan Bartel
fc497fe1e8
Merge remote-tracking branch 'origin/master' into jetty-8
2011-10-24 16:30:10 +11:00
Greg Wilkins
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
Greg Wilkins
cd0628ab66
Added isDebugEnabled guards to debugging that generates garbage
2011-10-22 09:39:54 +11:00
Simone Bordet
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
Simone Bordet
d4603e1fdd
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
2011-10-21 16:26:18 +02:00
Simone Bordet
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
Jan Bartel
0ba6fc7408
Merge remote-tracking branch 'origin/master' into jetty-8
2011-10-21 14:55:39 +11:00
Greg Wilkins
44ea5c4d85
Merge remote-tracking branch 'origin/master' into jetty-7.6
2011-10-21 10:21:54 +11:00
Joakim Erdfelt
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
Greg Wilkins
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
Greg Wilkins
22f1d83f10
360836 Accept parameters with bad UTF-8. Use replacement character
2011-10-19 16:32:05 +11:00
Greg Wilkins
c93e1c297f
360836 Accept parameters with bad UTF-8. Use replacement character
2011-10-19 16:23:56 +11:00
Jan Bartel
d71fd55665
361319 Log initialization does not catch correct exceptions on all jvms
2011-10-19 12:28:23 +11:00
Greg Wilkins
49f8b0de1a
Websocket partially refactored and passing tests
2011-10-18 21:59:49 +11:00
Greg Wilkins
6edb7c1930
organised imports
2011-10-18 15:05:22 +11:00
Greg Wilkins
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
Joakim Erdfelt
e9c398e86b
Let StdErrLog *.LEVEL come from configured properties instead
2011-10-14 08:27:08 -07:00
Jesse McConnell
925335dab2
merge from master
2011-10-11 09:43:27 -05:00
Joakim Erdfelt
64ce44c3dc
358649 - StdErrLog system properties for package/class logging LEVEL.
...
+ Fixing LogTest for deprecations in StdErrLog.setDebugEnabled()
2011-10-07 10:39:50 -07:00
Joakim Erdfelt
f81c1b68e2
358649 - StdErrLog system properties for package/class logging LEVEL.
...
* Remerging back into master now that 7.5.2 release is done.
2011-10-07 10:28:31 -07:00
Jesse McConnell
9ac4e35b96
wqRevert "358649 - StdErrLog system properties for package/class logging LEVEL."
...
This reverts commit 12dbcadedec19092f39a820ccb37fa7c347ddbc6.
2011-10-06 14:16:03 -05:00
Joakim Erdfelt
12dbcadede
358649 - StdErrLog system properties for package/class logging LEVEL.
2011-10-06 12:04:44 -07:00
Jan Bartel
32dbb1bddb
Merge remote-tracking branch 'origin/master' 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/pom.xml
jetty-ajp/pom.xml
jetty-annotations/pom.xml
jetty-client/pom.xml
jetty-continuation/pom.xml
jetty-deploy/pom.xml
jetty-deploy/src/main/config/etc/jetty-deploy.xml
jetty-distribution/pom.xml
jetty-http/pom.xml
jetty-io/pom.xml
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-jsp/src/main/java/org/eclipse/jetty/osgi/boot/jsp/FragmentActivator.java
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/jetty-osgi-servletbridge/pom.xml
jetty-osgi/jetty-osgi-servletbridge/src/main/java/org/eclipse/jetty/osgi/servletbridge/FrameworkLauncherExtended.java
jetty-osgi/jetty-osgi-servletbridge/src/main/webapp/WEB-INF/web.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-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
jetty-servlet/pom.xml
jetty-servlets/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-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-10-04 17:45:15 +11:00
Thomas Becker
b3e6ebf416
Fix for #358121 (Utf8Appendable refactored to use Bjoern Hoehrmann's decoder).
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2011-09-21 11:58:17 +02: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
Greg Wilkins
c5e6378b84
357338 Improve UTF-8 validation
2011-09-12 13:14:09 +10: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
Jesse McConnell
97dee04a68
merge over from jetty7
2011-09-08 11:51:48 -05:00
Greg Wilkins
e914e0f97f
improved websocket handling of error cases for autobahn test suite
2011-09-09 01:52:27 +10:00
Jesse McConnell
7c7fc30b90
Merge over from jetty 7 master
2011-09-07 16:08:35 -05:00
Greg Wilkins
cf45e7b647
356823 correctly decode close codes. Send not utf-8 close code.
2011-09-07 11:37:46 +10:00
Greg Wilkins
ba5af45d17
350634 Added Resource.newResource(File)
2011-09-06 14:29:33 +10:00
Jesse McConnell
402352962d
Merge branch 'master' into jetty-8
2011-09-01 11:24:21 -05:00
Simone Bordet
93aed81e34
Added protected getter for the job queue.
2011-09-01 16:50:49 +02:00
Simone Bordet
d55abffe2d
Refactored job.run() into its own method to allow subclasses to override to perform pre/post actions.
2011-09-01 16:29:26 +02:00
Jan Bartel
1e079f06c9
Merge remote-tracking branch 'origin/master' into jetty-8
2011-09-01 14:11:53 +10:00
Greg Wilkins
45148353ec
293739 Hide stacks in named log testing. Various other minor log cleanups in output.
2011-08-30 16:05:21 +10:00
Greg Wilkins
33fa7afb47
356144 added SelectorManager.setSelectorPriorityDelta(int)
2011-08-30 14:24:28 +10:00
