Eclipse/jetty.project
1
0
Fork 0
mirror of https://github.com/jetty/jetty.project.git synced 2025-02-24 00:17:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,945 Commits 55 Branches 466 Tags
Commit Graph

9945 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joakim Erdfelt
e72fed9d4e Bumping up versions 2014-10-29 16:40:43 -07:00
Joakim Erdfelt
8899f6d360 Merge branch 'jetty-9.2.x' 
Conflicts:
	VERSION.txt
 2014-10-29 15:52:05 -07:00
Joakim Erdfelt
149ed3a553 Enabling cdi.mod in distribution 2014-10-29 15:50:56 -07:00
Joakim Erdfelt
b132b90b03 Simplifying warning message 2014-10-29 15:49:23 -07:00
Joakim Erdfelt
733cc71791 Reworking jetty.home warning to be a module instead. 
+ This will cause it to be logged using the configured logger as well.
 2014-10-29 15:31:14 -07:00
Joakim Erdfelt
7c40c0e2be Removing 2 second sleep 2014-10-29 14:33:46 -07:00
Joakim Erdfelt
b314bfcc94 446944 - ServletTester and HttpTester should be in <classifier>tests</classifier> 
Moving HttpTester to "tests" scoped jetty-http artifact.

 + HttpTester, a testing class, was used by jetty-servlets,
   embedded-jetty-examples, and test-integration, all from
   those testing scopes.  Moved the HttpTester into the
   pre-existing jetty-http "tests" classified artifact.

Moving ServletTester to "tests" scoped jetty-servlet artifact.

 + ServletTester, a testing class, was used by jetty-servlets,
   test-integration, and test-jetty-webapp.  This move puts
   this class in the pre-existing jetty-servlet "tests" classified
   artifact.
 2014-10-29 09:50:32 -07:00
Joakim Erdfelt
8a72a153a1 Merge branch 'jetty-9.2.x' 2014-10-28 12:32:55 -07:00
Jesse McConnell
58eb6740ec [maven-release-plugin] prepare for next development iteration 2014-10-28 14:20:30 -05:00
Jesse McConnell
19a44846cf [maven-release-plugin] prepare release jetty-9.2.4.v20141028 2014-10-28 14:20:24 -05:00
Jesse McConnell
c34a7add2a set for release 2014-10-28 13:23:44 -05:00
Joakim Erdfelt
e3f71430a6 Disabling jetty-cdi from distribution (for now) 2014-10-28 10:33:01 -07:00
Joakim Erdfelt
af5f9382a4 449001 - Remove start.d directory from JETTY_HOME 
+ Reworking warning to be optional but still start Jetty also.
+ Leaving start.d out of {jetty.home} still.
 2014-10-28 10:28:17 -07:00
Joakim Erdfelt
f4f600ff05 Code cleanup (post-merge) 2014-10-28 09:45:25 -07:00
Joakim Erdfelt
a129ca89ce Cleaning up cdi deployment binding 2014-10-28 09:45:13 -07:00
Joakim Erdfelt
607a560ebd Merge branch 'jetty-9.2.x' into cdi-testing 2014-10-28 09:36:34 -07:00
Joakim Erdfelt
653cb32ede Adjusting start/run warning messages on missing file content. 
+ Leaving behavior of missing directories alone.
+ See bug #427204 for old behavior bug
 2014-10-28 09:35:11 -07:00
Joakim Erdfelt
9dd0db8eeb 449001 - Remove start.d directory from JETTY_HOME 
+ Removed start.d from {jetty.home}
+ Removed most of start.ini content as well
+ DID NOT remove or alter start.d functionality from start.jar
+ DID NOT remove or alter demo-base/start.d/ example
+ Made running jetty from {jetty.home} simply show a warning message
+ DID NOT remove ability to run jetty from {jetty.home}
  Just made it a manual process requiring intention on behalf of the
  user
 2014-10-28 09:04:25 -07:00
Joakim Erdfelt
264e0bce39 Revert "Moving HttpTester to "tests" scoped jetty-http artifact." 
This reverts commit 8d85940077f55ca8390b4fbd486081c009d2af8b.
 2014-10-28 07:50:56 -07:00
Joakim Erdfelt
1f5c03f5e9 Minor typo in SpdyServer 2014-10-28 07:49:47 -07:00
Simone Bordet
8d2acb6817 Merged branch 'jetty-9.2.x' into 'master'. 2014-10-28 11:55:44 +01:00
Simone Bordet
e32f26354d 449038 - WebSocketUpgradeFilter must support async. 
Now calling setAsyncSupported(true) for the WebSocketUpgradeFilter.
 2014-10-28 11:52:00 +01:00
Simone Bordet
7cdcd69f44 Reverted version to 9.2.4-SNAPSHOT. 2014-10-28 11:52:00 +01:00
Jesse McConnell
3a40db32ad set for dev 2014-10-27 17:30:38 -05:00
Jesse McConnell
3b745f06df [maven-release-plugin] prepare for next development iteration 2014-10-27 16:16:24 -05:00
Jesse McConnell
4f0d78c91b [maven-release-plugin] prepare release jetty-9.2.4.v20141027 2014-10-27 16:16:18 -05:00
Jesse McConnell
5caabc8a65 set for reease 2014-10-27 15:46:32 -05:00
Jesse McConnell
d17613982b [448761] ContextHandler returns incorrect servlet minor version 2014-10-27 15:43:30 -05:00
Joakim Erdfelt
6ff43a0af1 Merge branch 'jetty-9.2.x' into cdi-testing 2014-10-27 13:42:30 -07:00
Joakim Erdfelt
bfd7414b30 Minor typo in SpdyServer 2014-10-27 13:42:02 -07:00
Greg Wilkins
e19178fd82 fixed bad merge 2014-10-26 20:34:19 +11:00
Greg Wilkins
fbc131b46e Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
 2014-10-26 17:40:16 +11:00
Greg Wilkins
34a8da2ba2 445823 Moved RequestLog calling to HttpChannel 
Simplified the RequestLogHandler.  It no longer set's async listeners or tries to catch exeptions etc.
Instead it simply sets the RequestLog instance on the HttpChannel.   The HttpChannel#onCompleted method
then uses the log (if set) as the last thing before recycling the connection.  It uses the actual
bytes written (eg after compression) and the actual status sent (eg if sent from a bad message).
 2014-10-26 17:30:50 +11:00
Simone Bordet
d13cdf2592 Merged branch 'jetty-9.2.x' into 'master'. 2014-10-24 14:06:54 +02:00
Simone Bordet
c66963126f 446563 - Null HttpChannel.getCurrentHttpChannel() in ServletHandler.doFilter(). 
Moved the finally block that resets the current HttpChannel and the
thread name after the handling of the COMPLETE action.
This is necessary because AsyncListener.onComplete() (triggered by
the handling of the COMPLETE action) may perform a
RequestDispatcher.forward() that requires the current HttpChannel
thread local to be set.
 2014-10-24 14:03:06 +02:00
Greg Wilkins
4323e450c5 Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2014-10-24 15:52:28 +11:00
Greg Wilkins
31e448ffd6 Removed duplication of HttpGenerator$Info vs http.MetaData 
Use MetaData throughout code base
 2014-10-24 15:51:20 +11:00
Jan Bartel
7d5c8f2a96 Merge remote-tracking branch 'origin/jetty-9.2.x' 2014-10-24 12:51:01 +11:00
Jan Bartel
1ab6d7398c 447979 Refactor to make MetaData responsible for progressively ordering web-inf jars 2014-10-24 12:48:15 +11:00
Jesse McConnell
2da2897c37 add logs/ directory as require directory for base 2014-10-23 20:20:42 -05:00
Greg Wilkins
98a07789ce 447515 Remove GzipFilter 
Improved javadoc and comments
 2014-10-24 11:05:19 +11:00
Greg Wilkins
67e686c108 447515 Remove GzipFilter 
Added a module to apply GzipHandler to the entire server
 2014-10-24 10:48:33 +11:00
Greg Wilkins
ac1b111d57 Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2014-10-24 08:46:12 +11:00
Greg Wilkins
738c47bc55 447515 Remove GzipFilter 
Moved all usages of GzipFilter to GzipHandler
added support to ServerContextHandler to create a GzipHandler
 2014-10-24 08:17:05 +11:00
Simone Bordet
360fce58be Merged branch 'jetty-9.2.x' into 'master'. 2014-10-23 12:54:07 +02:00
Simone Bordet
fac197f868 Clarified semantic of Request.header(). 2014-10-23 12:53:37 +02:00
Simone Bordet
9cb21d1377 Merged branch 'jetty-9.2.x' into 'master'. 2014-10-23 12:42:00 +02:00
Simone Bordet
f7baf9923f Fixed issue caused by the fix to #447746: user agent header must not 
be added, but overwritten.
 2014-10-23 12:41:16 +02:00
Simone Bordet
65832dfae3 Merged branch 'jetty-9.2.x' into 'master'. 2014-10-23 11:47:02 +02:00
Simone Bordet
84b38aba15 447746 - HttpClient is always going to send User-Agent header even though I do not want it to. 2014-10-23 11:46:18 +02:00