Commit Graph

735 Commits

Author SHA1 Message Date
Greg Wilkins b02cdc10c1 Merge remote-tracking branch 'origin/master' into jetty-http2 2014-08-22 16:11:47 +10:00
Greg Wilkins 589d05afe0 Added 3rd party module licenses 2014-08-22 11:48:55 +10:00
Jesse McConnell 8619a12ca0 Revert "added console modules"
This reverts commit fb53617a55.
2014-08-21 08:30:34 -05:00
Jesse McConnell 39d597da74 Revert "Improved console modules to put wars in lib"
This reverts commit 49f0e7af43.
2014-08-21 08:30:19 -05:00
Jesse McConnell 9baae458a4 Revert "improved jamon configuration"
This reverts commit b7408757c3.
2014-08-21 08:27:50 -05:00
Greg Wilkins 23eba39748 Merge remote-tracking branch 'origin/master' into jetty-http2 2014-08-21 16:39:45 +10:00
Greg Wilkins b7408757c3 improved jamon configuration 2014-08-21 16:03:27 +10:00
Greg Wilkins 49f0e7af43 Improved console modules to put wars in lib 2014-08-21 15:45:55 +10:00
Greg Wilkins fb53617a55 added console modules 2014-08-21 14:03:38 +10:00
Greg Wilkins af27566d2b fixed JSP issues 2014-08-21 11:42:21 +10:00
Greg Wilkins 98b654ba20 Merge remote-tracking branch 'origin/master' into jetty-http2
Conflicts:
	jetty-distribution/pom.xml
2014-08-14 08:38:25 +10:00
Jan Bartel 9a848e3425 Prevent copy of unncessary apache-jstl jar to distro lib. 2014-08-13 15:42:17 +10:00
Greg Wilkins b983fab972 Merge remote-tracking branch 'origin/master' into jetty-http2 2014-08-13 13:44:06 +10:00
Jan Bartel aedfb662b6 441649 - Update to jsp and el Apache Jasper 8.0.9 2014-08-13 11:01:05 +10:00
Simone Bordet 814c84a212 Introduced configuration properties for ALPN/NPN advertised protocols.
No more need to copy protonego-alpn.xml to a jetty.base to specify
which protocols are advertised and in which order.
Instead, simply specify:

alpn.protocols=h2-14,http/1.1
alpn.defaultProtocol=http/1.1

in start.ini (in the example above for http2).
2014-08-12 18:54:33 +02:00
Simone Bordet d2fa4dca60 Introduced configuration properties for ALPN/NPN advertised protocols.
No more need to copy protonego-alpn.xml to a jetty.base to specify
which protocols are advertised.
Instead, simply specify:

protonego.protocols=h2-14,http/1.1
protonego.defaultProtocol=http/1.1

in start.ini (in the example above for http2).
2014-08-11 23:59:26 +02:00
Greg Wilkins 287e86b7aa decomposed https,http2 and spdy modules to share ServerConnector 2014-08-07 12:58:12 +10:00
Joakim Erdfelt cb42ef2167 [maven-release-plugin] prepare for next development iteration 2014-07-23 11:18:01 -07:00
Joakim Erdfelt dc62cb5ac7 [maven-release-plugin] prepare release jetty-9.2.2.v20140723 2014-07-23 11:17:55 -07:00
Simone Bordet 334db9fe72 Updated version to 9.3.0-SNAPSHOT. 2014-06-16 21:33:03 +02:00
Simone Bordet a6329451a1 Updated HTTP2 modules to be included in the distribution. 2014-06-16 18:15:13 +02:00
Simone Bordet adaeeefe32 Merged branch 'master' into 'jetty-http2'. 2014-06-16 16:08:40 +02:00
Simone Bordet 7613385578 Moved NPN[Client|Server]Connection[Factory] classes to their own
modules, akin for the ALPN classes, and refactored all code that was
referencing them.
2014-06-16 12:46:26 +02:00
Jan Bartel 4896672c94 435895 jetty spring module is not in distribution 2014-06-16 12:19:24 +02:00
Jesse McConnell c3ee0711ca [maven-release-plugin] prepare for next development iteration 2014-06-09 13:37:54 -05:00
Jesse McConnell 06b494eeac [maven-release-plugin] prepare release jetty-9.2.1.v20140609 2014-06-09 13:37:49 -05:00
Greg Wilkins 8f4aeeeb8d updated version to 10.0.0-SNAPSHOT 2014-06-04 15:08:54 +02:00
Jesse McConnell 2e859e4ae2 [maven-release-plugin] prepare for next development iteration 2014-05-26 12:04:15 -05:00
Jesse McConnell 71ad2114c5 [maven-release-plugin] prepare release jetty-9.2.0.v20140526 2014-05-26 12:04:08 -05:00
Jesse McConnell 8936b160c2 Merge branch 'master' into release-9 2014-05-26 10:46:39 -05:00
Greg Wilkins 3f95a601df jetty.sh start-stop-daemon runs in JETTY_BASE 2014-05-26 17:06:22 +02:00
Greg Wilkins 4fa5a5ff81 fixed JETTY_PID in jetty.sh 2014-05-26 16:59:36 +02:00
Greg Wilkins 8e43129a2b fixed JETTY_STATE to use JETTY_ARGS 2014-05-26 15:03:23 +02:00
Simone Bordet 80f6266c21 Using spaces instead of tabs. 2014-05-26 12:28:12 +02:00
Greg Wilkins 5edf15241b started mechanism uses Properties
list Properties in --dry-run
fix start log file
2014-05-25 22:54:15 +02:00
Jesse McConnell d59dbe936b [maven-release-plugin] prepare for next development iteration 2014-05-23 09:59:19 -05:00
Jesse McConnell edc7646a4c [maven-release-plugin] prepare release jetty-9.2.0.v20140523 2014-05-23 09:59:13 -05:00
Jesse McConnell 6a3cab2a2f [maven-release-plugin] prepare for next development iteration 2014-05-15 14:44:37 -05:00
Jesse McConnell eec01cbff4 [maven-release-plugin] prepare release jetty-9.2.0.RC0 2014-05-15 14:44:28 -05:00
Jesse McConnell 4d2fdee7fc [maven-release-plugin] prepare for next development iteration 2014-05-08 11:44:34 -05:00
Jesse McConnell 4515fe661b [maven-release-plugin] prepare release jetty-9.2.0.M1 2014-05-08 11:44:27 -05:00
Jan Bartel dfb751c331 Make clear org.apache.jasper.compiler.disablejsr199 only applies to glassfish 2014-05-07 15:43:46 +02:00
Jan Bartel 9c9eed1d33 Make clear org.apache.jasper.compiler.disablejsr199 only applies to gla 2014-05-07 15:42:34 +02:00
Greg Wilkins 00d61ce133 fixed jsp demo distribution 2014-04-28 15:35:57 +02:00
Greg Wilkins ce5af1d521 424982 improved PID check in jetty.sh 2014-04-25 12:56:41 +02:00
Greg Wilkins 9a7af6cbd3 readded websocket to demo base 2014-04-10 12:59:07 +10:00
Greg Wilkins 303fa57eaf improved protonego module structure to avoid ini files of parameterized modules 2014-04-03 16:50:33 +11:00
Greg Wilkins 157a54ec5c 430341 Use apache jsp/jstl by default in 9.2.0 2014-04-03 14:16:13 +11:00
Joakim Erdfelt 077887141f Updating alpn and npn modules to protonego 2014-04-01 13:09:49 -07:00
Greg Wilkins c5e1e249e7 set version for 9.2.x 2014-03-31 11:35:06 +11:00