Commit Graph

600 Commits

Author SHA1 Message Date
Joakim Erdfelt e207ea357e Minor update to invalid utf8 test case (expanding bad examples) 2011-11-02 17:22:32 -07:00
Jesse McConnell 2b6fec713c Merge branch 'master' into jetty-8 2011-11-02 16:47:04 -05:00
Joakim Erdfelt e088acc559 Resolving merge 2011-10-28 13:42:07 -07:00
Joakim Erdfelt 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
Joakim Erdfelt aa73830199 Updating java comments to make clear the purpose of this new static{} block 2011-10-28 10:57:32 -07:00
Joakim Erdfelt 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
Joakim Erdfelt c02f98b7e6 More classpath mucking about in Sfl4jTestJarsRunner 2011-10-28 09:48:59 -07:00
Joakim Erdfelt 9c9f2bd7c3 Making Sfl4jTestJarsRunner use its own classloader for loading the test 2011-10-28 09:23:11 -07:00
Joakim Erdfelt 21c43b1ab9 Making Sfl4jTestJarsRunner use its own classloader for loading the test 2011-10-28 09:21:46 -07:00
Jesse McConnell 062ccd7e70 trial classloader 2011-10-28 11:15:02 -05:00
Jesse McConnell 148459bc8f trial classloader 2011-10-28 11:14:14 -05:00
Joakim Erdfelt 5c516c9e7b Making fixes to StdErrLogTest 2011-10-28 09:12:29 -07:00
Joakim Erdfelt c174304996 Making fixes to StdErrLogTest 2011-10-28 09:11:21 -07:00
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
Joakim Erdfelt af45063a54 Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2011-10-25 16:21:39 -07:00
Greg Wilkins 61664d3c0f Added concept of SslConnection 2011-10-26 01:15:59 +11:00
Jesse McConnell d5320d95ba [maven-release-plugin] prepare for next development iteration 2011-10-24 15:02:30 -05:00
Jesse McConnell d02f74a50c [maven-release-plugin] prepare release jetty-8.0.4.v20111024 2011-10-24 15:02:23 -05:00
Jesse McConnell 1d86da8f68 [maven-release-plugin] prepare for next development iteration 2011-10-24 14:52:54 -05:00
Jesse McConnell 5f349ecc92 [maven-release-plugin] prepare release jetty-7.5.4.v20111024 2011-10-24 14:52:48 -05: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 5140a95144 refactored HttpConnection name 2011-10-20 15:12:19 +11: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 a38f2a9e68 [maven-release-plugin] prepare for next development iteration 2011-10-11 10:16:54 -05:00
Jesse McConnell 55a1be5435 [maven-release-plugin] prepare release jetty-8.0.3.v20111011 2011-10-11 10:16:47 -05:00
Jesse McConnell 925335dab2 merge from master 2011-10-11 09:43:27 -05:00
Jesse McConnell 7d10182034 [maven-release-plugin] prepare for next development iteration 2011-10-11 08:47:07 -05:00
Jesse McConnell b6ac542604 [maven-release-plugin] prepare release jetty-7.5.3.v20111011 2011-10-11 08:47:00 -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 b55ec9bac1 [maven-release-plugin] prepare for next development iteration 2011-10-06 17:59:52 -05:00
Jesse McConnell e32e8b1377 [maven-release-plugin] prepare release jetty-8.0.2.v20111006 2011-10-06 17:59:46 -05:00
Jesse McConnell 0c55c774d4 [maven-release-plugin] prepare for next development iteration 2011-10-06 17:25:38 -05:00
Jesse McConnell 4d822759de [maven-release-plugin] prepare release jetty-7.5.2.v20111006 2011-10-06 17:25:32 -05:00
Jesse McConnell b58006b4a4 [maven-release-plugin] prepare for next development iteration 2011-10-06 09:43:37 -05:00
Jesse McConnell 7eca345e8d [maven-release-plugin] prepare release jetty-7.5.2.v20111006 2011-10-06 09:43:31 -05: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 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
Jesse McConnell d5304b2cbc [maven-release-plugin] prepare for next development iteration 2011-09-08 12:20:15 -05:00
Jesse McConnell c33548d38a [maven-release-plugin] prepare release jetty-8.0.1.v20110908 2011-09-08 12:19:24 -05: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 721c8ab682 updating version.txt and resetting pom version to 8.0.1-SNAPSHOT 2011-09-08 11:54:53 -05:00
Jesse McConnell f8c1858efb Merge branch 'jetty-8' into release-8 2011-09-08 11:52:23 -05:00
Jesse McConnell 97dee04a68 merge over from jetty7 2011-09-08 11:51:48 -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
Jesse McConnell 4e47d6a7fa [maven-release-plugin] prepare for next development iteration 2011-09-07 18:16:58 -05:00
Jesse McConnell d77a12962b [maven-release-plugin] prepare release jetty-8.0.1.v20110907 2011-09-07 18:16:50 -05: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 7c7fc30b90 Merge over from jetty 7 master 2011-09-07 16:08:35 -05:00
Jesse McConnell 1744b5bce1 reset from release 2011-09-07 11:09:46 -05:00
Jesse McConnell ae86ad6d4e [maven-release-plugin] prepare for next development iteration 2011-09-07 10:03:16 -05:00
Jesse McConnell 86383afbd2 [maven-release-plugin] prepare release jetty-7.5.1.v20110907 2011-09-07 10:03:10 -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 40dcb10ed8 [maven-release-plugin] prepare for next development iteration 2011-09-01 12:24:32 -05:00
Jesse McConnell db14b194fa [maven-release-plugin] prepare release jetty-8.0.0.v20110901 2011-09-01 12:24:24 -05:00
Jesse McConnell 402352962d Merge branch 'master' into jetty-8 2011-09-01 11:24:21 -05:00
Jesse McConnell a728021edf [maven-release-plugin] prepare for next development iteration 2011-09-01 11:17:05 -05:00
Jesse McConnell 882308f781 [maven-release-plugin] prepare release jetty-7.5.0.c20110901 2011-09-01 11:16:58 -05:00
Jesse McConnell c3e170bb74 Merge branch 'master' into release 2011-09-01 10:56:08 -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
Jesse McConnell 57e9045635 [maven-release-plugin] prepare for next development iteration 2011-08-31 14:17:32 -05:00
Jesse McConnell 317491a4d7 [maven-release-plugin] prepare release jetty-7.5.0.v20110901 2011-08-31 14:17:25 -05:00
Joakim Erdfelt e60df19490 [maven-release-plugin] prepare for next development iteration 2011-08-30 13:13:46 -07:00
Joakim Erdfelt 460c754e4e [maven-release-plugin] prepare release jetty-7.5.0.RC2 2011-08-30 13:13:39 -07:00
Joakim Erdfelt 7663a83616 [maven-release-plugin] rollback the release of jetty-7.5.0.RC2 2011-08-30 12:52:45 -07:00
Joakim Erdfelt 4c5c954d23 [maven-release-plugin] prepare release jetty-7.5.0.RC2 2011-08-30 12:47:42 -07: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
Joakim Erdfelt 79db394552 Merge from trunk 2011-08-26 10:12:45 -07:00
Greg Wilkins c99498af91 353073 factory pattern for clients 2011-08-26 11:50:33 +10:00
Joakim Erdfelt 953b3512f7 293739 - Deprecate static Jetty Log usage in favor of named logs
+ Adding StdErrLog.setPrintLongNames(boolean) to allow configuration
  of long form or condensed form log names.
2011-08-25 11:23:46 -07:00
Joakim Erdfelt f6d45d5650 293739 - Deprecate static Jetty Log usage in favor of named logs
+ Finished conversion of the rest of jetty 7.x
2011-08-24 13:14:28 -07:00
Joakim Erdfelt 396bb04b86 293739 - Deprecate static Jetty Log usage in favor of named logs
+ Finished conversion of jetty-util
2011-08-24 10:22:37 -07:00
Joakim Erdfelt 786098e9f1 Adding tests for Named Logging 2011-08-24 09:31:28 -07:00
Joakim Erdfelt 644694b704 Setting @deprecated on the anonymous (non-named) Log usage. 2011-08-23 09:18:16 -07:00
Greg Wilkins e5a3cb9cef [maven-release-plugin] prepare for next development iteration 2011-08-19 22:17:46 +10:00
Greg Wilkins f0b4ffffda [maven-release-plugin] prepare release jetty-7.5.0.RC1 2011-08-19 22:17:33 +10:00
Michael Gorovoy 0720ba9c04 355162 Allow creating an empty resource collection 2011-08-18 17:13:25 -04:00
Jan Bartel 0dfbf8bb0d JETTY-1414 HashLoginService doesn't refresh realm if specified config filename is not an absolute platform specific value
Also add extra debug to scanner.
2011-08-18 16:09:02 +10:00
Michael Gorovoy fa7364ac1b 276670 SLF4J loggers show correct location information 2011-08-16 16:25:51 -04:00
Simone Bordet faaeabd243 Code cleanup and properly synchronized. 2011-08-16 18:26:37 +02:00
Jesse McConnell 4700979200 [maven-release-plugin] prepare for next development iteration 2011-08-16 09:26:56 -05:00
Jesse McConnell 3ae78dfbb2 [maven-release-plugin] prepare release jetty-8.0.0.RC0 2011-08-16 09:26:48 -05:00
Jesse McConnell 4d7ba354e1 [maven-release-plugin] prepare for next development iteration 2011-08-15 14:18:53 -05:00
Jesse McConnell 2175bae0a0 [maven-release-plugin] prepare release jetty-7.5.0.RC0 2011-08-15 14:18:42 -05:00
Jan Bartel 050cb83b35 Merge remote-tracking branch 'origin/master' into jetty-8
Conflicts:
	jetty-osgi/jetty-osgi-equinoxtools/src/main/java/org/eclipse/jetty/osgi/equinoxtools/console/EquinoxConsoleWebSocketServlet.java
	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/GzipFilterTest.java
	jetty-websocket/pom.xml
2011-08-12 18:43:15 +10:00
Greg Wilkins 1529892105 352684 Added a Dumpable to the thread monitor 2011-08-12 15:24:38 +10:00
Joakim Erdfelt 5e2583084d Making various changes for Java 1.5isms + Generic support 2011-08-05 18:10:46 -07:00
Joakim Erdfelt dc236529b0 Adding unit testing to MultiMap 2011-08-05 18:09:40 -07:00
Joakim Erdfelt 05bd98d822 352133 - Generally resolve java 1.5isms
+ Expanding on the test cases for LazyList to make sure that it behaves
  well with Generics in the mix.
2011-08-04 15:02:21 -07:00
Simone Bordet 449db20d7d Fixes #353862 (Improve performance of QuotedStringTokenizer.quote()). Corrected various implementation mistakes (thanks test suite). 2011-08-04 14:44:21 +02:00
Simone Bordet 01cbaf528b Fixes #353862 (Improve performance of QuotedStringTokenizer.quote()). 2011-08-04 12:15:39 +02:00
Joakim Erdfelt 4b7b44249e 352133 - Generally resolve java 1.5isms
+ Expanding on the test cases for LazyList to make sure that it behaves
  well with Generics in the mix.
2011-08-03 08:23:59 -07:00
Jan Bartel 93cc111a02 Merge remote-tracking branch 'origin/master' into jetty-8
Conflicts:
	VERSION.txt
	jetty-io/src/main/java/org/eclipse/jetty/io/nio/IndirectNIOBuffer.java
2011-07-25 17:42:30 +10:00
Greg Wilkins 70d7d3c9a5 reverted version 2011-07-18 09:15:31 +10:00
Greg Wilkins a26ddd5933 created performance version 2011-07-14 15:38:25 +10:00
Jesse McConnell 0816c3cdab noticed this class is a hold over from 1.2 support so switched its
single usage over to Collections.singletonList()
2011-07-13 13:16:59 -05:00
Jan Bartel 236bd193e0 Merge remote-tracking branch 'origin/master' into jetty-8
Conflicts:
	VERSION.txt
	jetty-server/src/main/java/org/eclipse/jetty/server/SessionManager.java
	jetty-server/src/main/java/org/eclipse/jetty/server/session/AbstractSessionManager.java
	jetty-server/src/main/java/org/eclipse/jetty/server/session/SessionHandler.java
2011-07-11 14:54:23 +10:00
Jan Bartel 86f7e76c4d Merge of 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/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-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-nested/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/META-INF/MANIFEST.MF
	jetty-osgi/jetty-osgi-boot/pom.xml
	jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/OSGiAppProvider.java
	jetty-osgi/jetty-osgi-equinoxtools/META-INF/MANIFEST.MF
	jetty-osgi/jetty-osgi-equinoxtools/pom.xml
	jetty-osgi/jetty-osgi-equinoxtools/src/main/java/org/eclipse/jetty/osgi/equinoxtools/console/EquinoxConsoleContinuationServlet.java
	jetty-osgi/jetty-osgi-httpservice/pom.xml
	jetty-osgi/jetty-osgi-servletbridge/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-servlets/src/main/java/org/eclipse/jetty/servlets/ProxyServlet.java
	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-07-11 12:05:58 +10:00
Michael Gorovoy c3e3eb0fd9 Added accidentally omitted file 2011-07-08 17:58:26 -04:00
Michael Gorovoy 8babf3ae17 351576 Do not use deprecated method File.toURL() 2011-07-08 17:21:02 -04:00
Jesse McConnell 39674f8a8e [maven-release-plugin] prepare for next development iteration 2011-07-07 18:43:56 -05:00
Jesse McConnell 5aa94f502e [maven-release-plugin] prepare release jetty-7.4.4.v20110707 2011-07-07 18:43:50 -05:00
Michael Gorovoy 2eaad85a0c 350634 Reverted FileResource constructor changes
This reverts commit 95ff9d73f0.
2011-07-07 18:04:28 -04:00
Jan Bartel 7908c4e825 JETTY-1153 Default charset/encoding of HTTP POST requests 2011-07-07 19:56:17 +10:00
Greg Wilkins 17e907c2fb git diff 54e885d967 remotes/origin/jetty-8-historical | patch -p1 ; git add -A 2011-07-07 18:18:24 +10:00
Jesse McConnell 6190961f31 [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3454 7e9141cc-0065-0410-87d8-b60c137991c4
2011-07-01 11:12:45 +00:00
Jesse McConnell db9f79eaff [maven-release-plugin] prepare release jetty-7.4.3.v20110701
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3452 7e9141cc-0065-0410-87d8-b60c137991c4
2011-07-01 11:12:33 +00:00
Greg Wilkins baabacfe95 reverted to 7.4.4-SNAPSHOT
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3448 7e9141cc-0065-0410-87d8-b60c137991c4
2011-07-01 02:22:56 +00:00
Jesse McConnell b9fffcb9a0 [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3447 7e9141cc-0065-0410-87d8-b60c137991c4
2011-07-01 00:54:20 +00:00
Jesse McConnell ea23a83bb3 [maven-release-plugin] prepare release jetty-7.4.3.v20110630
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3445 7e9141cc-0065-0410-87d8-b60c137991c4
2011-07-01 00:54:07 +00:00
Jesse McConnell b1ca45e709 [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3441 7e9141cc-0065-0410-87d8-b60c137991c4
2011-06-30 19:49:20 +00:00
Jesse McConnell 5f5cb8ea53 [maven-release-plugin] prepare release jetty-7.4.3.v20110630
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3439 7e9141cc-0065-0410-87d8-b60c137991c4
2011-06-30 19:39:23 +00:00
Michael Gorovoy 95ff9d73f0 350634 Cleanup FileResource construction
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3434 7e9141cc-0065-0410-87d8-b60c137991c4
2011-06-29 00:59:41 +00:00