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,976 Commits 55 Branches 466 Tags
Commit Graph

9976 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joakim Erdfelt
1d88eab518 Merge branch 'jetty-9.2.x' 
Conflicts:
	jetty-start/src/main/java/org/eclipse/jetty/start/Main.java
 2014-11-03 10:19:49 -07:00
Joakim Erdfelt
214246061e 449291 - --create-files downloads without license 
+ Adding dist-home replicationa real distribution
  Adding RebuildTestResources.java to help rebuild this dist-home
  occasionally.  There is no need to keep this directory up to date
  as religiously and frequently as the main distribution.
+ Adding LicenseTest.java to test various licensing scenarios
+ Added ability to ask for license via --create-files flows
 2014-11-03 10:18:18 -07:00
Simone Bordet
64597b318c Merged branch 'jetty-9.2.x' into 'master'. 2014-11-03 17:25:37 +01:00
Joakim Erdfelt
153dd4023e Removing support for module [ini-template] use of --module=<name> 
+ That form of use is not recommended during --add-to-start
+ Should encourage use of [depend] section instead
 2014-11-03 09:19:05 -07:00
Joakim Erdfelt
83e3a29fbd 449003 - WARNING: Cannot enable requested module [protonego-impl]: not a valid module name 
+ Making protonego-impl/(npn|alpn).mod not contain default configuration
 2014-11-03 09:19:05 -07:00
Simone Bordet
9c64fb73e4 449603 - OutputStreamContentProvider hangs when host is not available. 
Fixed by having HttpRequest.abort() to fail the ContentProvider.
In this way, the ContentProvider knows, even before being used to
send the request content, that the request has failed, and may
forward the failure to the client code.
 2014-11-03 16:50:59 +01:00
Simone Bordet
cbd7b75e10 Removed unused code. 2014-11-03 10:55:13 +01:00
Jesse McConnell
1c4a08b35b [maven-release-plugin] prepare for next development iteration 2014-10-31 09:58:16 -05:00
Jesse McConnell
a4ff7bf841 [maven-release-plugin] prepare release jetty-9.2.4.v20141031 2014-10-31 09:58:10 -05:00
Jesse McConnell
7c35f04152 set for release 2014-10-31 09:28:38 -05:00
Greg Wilkins
e3bda4efbe 446564 Refactored RequestLog Mechanism 
RequestLog can now be set on the HttpChannel and is called during the onCommitted callback.
The RequestLog may be set either on the server or via an updated RequestLogHandler that can
be applied to a specific context.
 2014-10-31 13:31:29 +11:00
Jan Bartel
947a872203 Merge remote-tracking branch 'origin/jetty-9.2.x' 2014-10-31 13:31:12 +11:00
Jan Bartel
30081946d7 449372 Make jvmArgs of jetty:run-forked configurable from command line 2014-10-31 13:29:45 +11:00
Joakim Erdfelt
43b3cd9f46 449003 - WARNING: Cannot enable requested module [protonego-impl]: not a valid module name 
+ Making protonego-impl/(npn|alpn).mod not contain default configuration
 2014-10-30 15:05:24 -07:00
Greg Wilkins
d970e3d58b Merge remote-tracking branch 'origin/jetty-9.2.x' 
Conflicts:
	VERSION.txt
 2014-10-31 07:43:53 +11:00
Jesse McConnell
e1b73a64eb [maven-release-plugin] prepare for next development iteration 2014-10-30 11:28:41 -05:00
Jesse McConnell
5770cc1179 [maven-release-plugin] prepare release jetty-9.2.4.v20141030 2014-10-30 11:28:35 -05:00
Jesse McConnell
19d9456756 set for release 2014-10-30 10:58:44 -05:00
Greg Wilkins
154daa524a Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2014-10-30 18:06:37 +11:00
Greg Wilkins
171f7b5352 improved protocol info log 2014-10-30 17:48:24 +11:00
Jan Bartel
d0a6a34fcc 448675 Impossible to set own Threadpool when using jetty-maven-plugin 2014-10-30 17:19:22 +11:00
Greg Wilkins
71d1c434e4 Merge remote-tracking branch 'origin/jetty-9.2.x' 2014-10-30 16:58:55 +11:00
Greg Wilkins
2332b4f734 449175 Removed extra space in NCSA log 2014-10-30 16:42:31 +11:00
Greg Wilkins
4b0193247b 448841 Clarified selectors==0 javadoc 
448840 Clarified ServerConnector javadoc
448839 Fixed javadoc typo in ServerConnector
 2014-10-30 15:50:54 +11:00
Greg Wilkins
a6e00bc642 Merge remote-tracking branch 'origin/jetty-9.2.x' 
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/handler/ResourceHandler.java
	jetty-util/src/test/java/org/eclipse/jetty/util/resource/AbstractFSResourceTest.java
 2014-10-30 14:36:50 +11:00
Greg Wilkins
414479795e 443550 improved FileResource encoded alias checking 
removed extra debug
 2014-10-30 14:29:00 +11:00
Greg Wilkins
8eab088a35 443550 improved FileResource encoded alias checking 2014-10-30 14:12:43 +11:00
Greg Wilkins
cde420a2fc 448225 Removed unnecessary synchronize on initParser 2014-10-30 11:32:26 +11:00
Greg Wilkins
9189c934d9 444722 Fixed order of setReuseAddress call 2014-10-30 11:28:45 +11:00
Joakim Erdfelt
20febe4405 Bumping up version 2014-10-29 16:56:10 -07:00
Joakim Erdfelt
e72fed9d4e Bumping up versions 2014-10-29 16:40:43 -07:00
Joakim Erdfelt
7cbd3c0488 440925 - NPE when using relative paths for --start-log-file 2014-10-29 16:25:55 -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