Eclipse/jetty.project
1
0
Fork 0
mirror of https://github.com/jetty/jetty.project.git synced 2025-02-22 15:15:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,418 Commits 55 Branches 466 Tags
Commit Graph

1001 Commits

Author SHA1 Message Date
Joakim Erdfelt
607a560ebd Merge branch 'jetty-9.2.x' into cdi-testing 2014-10-28 09:36:34 -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
Simone Bordet
7cdcd69f44 Reverted version to 9.2.4-SNAPSHOT. 2014-10-28 11:52:00 +01: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
Joakim Erdfelt
8e1fc56f6f CDI module now depends on JSP module 
+ weld requires javax.el + jsp to function
 2014-10-09 15:12:15 -07:00
Greg Wilkins
758ce66c8d Merge remote-tracking branch 'origin/jetty-9.2.x' 
Conflicts:
	jetty-websocket/pom.xml
	tests/test-sessions/test-mongodb-sessions/pom.xml
 2014-10-10 08:53:43 +11:00
Joakim Erdfelt
67db9e67de Merge branch 'jetty-9.2.x' into cdi-testing 2014-10-09 12:42:14 -07:00
Joakim Erdfelt
eee2ab0f10 445979 - jetty.sh fails to start when start-stop-daemon does not exist and the user is not root 
+ Adding better JETTY_USER test into jetty.sh
 2014-10-08 14:54:00 -07:00
Joakim Erdfelt
c3670d01e1 445239 - Rename weld.mod to cdi.mod to be consistent with past module namings 2014-09-26 17:15:51 -07:00
Joakim Erdfelt
ab58438600 396569 - 'bin/jetty.sh stop' reports 'OK' even when jetty was not 
running 

+ Validating PID file and contents a bit more
 2014-09-24 12:54:38 -07:00
Joakim Erdfelt
45bcb6df3a 396572 - Starting jetty from cygwin is not working properly 
+ Fixing #!/usr/bin/env bash 
  (it had extra spaces at end which breaks env lookup on cygwin)
+ Using cygpath -w liberally to allow java started from cygwin
  to find resources using windows specific path names.
 2014-09-24 10:47:26 -07:00
Joakim Erdfelt
840316797d 376365 - "jetty.sh start" returns 0 on failure 
+ simple hack to produce error 1 on xml validation issue
 2014-09-24 10:47:26 -07:00
Jan Bartel
b0a3d0a159 443893 Make a module for weld 2014-09-12 15:10:31 +10:00
Joakim Erdfelt
9249ebb6ef Using 9.2.4-SNAPSHOT for branch 2014-09-11 06:10:44 -07:00
Jesse McConnell
9bfeb2221f [maven-release-plugin] prepare release jetty-9.2.3.v20140905 2014-09-05 09:19:23 -05:00
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 fb53617a55a62ee7ad30b071711180e510039b8b.
 2014-08-21 08:30:34 -05:00
Jesse McConnell
39d597da74 Revert "Improved console modules to put wars in lib" 
This reverts commit 49f0e7af4346b8cfc96e9f490407ceb7b81a26a6.
 2014-08-21 08:30:19 -05:00
Jesse McConnell
9baae458a4 Revert "improved jamon configuration" 
This reverts commit b7408757c31e064a26b0ff0ea9dd51d06ae177b8.
 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