Commit Graph

242 Commits

Author SHA1 Message Date
Greg Wilkins 5d041ad54f 466645 Allow XmlConfiguration Properties to use Elements or Attributes 2015-05-07 16:24:11 +10:00
Greg Wilkins 29393ace68 moved keystore to example-keystore 2015-05-01 18:23:17 +10:00
Simone Bordet b7c7211cf5 464537 - Updated setuid dependency to 1.0.3.
Also moved here jetty-setuid.xml from the setuid project, so that it
can remain in sync with its correspondent setuid.mod file.
2015-04-13 22:13:02 +02:00
Simone Bordet 599ab9bb1b 460671 - Rationalize property names.
Property format is now "jetty.<module|component>.<propertyName>".

Updated all references with new properties.
2015-04-13 16:21:48 +02:00
Jan Bartel d85662bd6e 459681 Remove Glassfish JSP in favor of Apache JSP 2015-02-18 19:25:20 +11:00
Joakim Erdfelt 20fa13605c 459655 - Remove SPDY and NPN
+ Flattening protonego-* to alpn.mod + alpn-impl/alpn-${java.version}
2015-02-11 10:58:10 -07:00
Simone Bordet be860741d5 459655 - Remove SPDY and NPN.
Cleanup of javadocs, comments, XML and other text files.
2015-02-11 16:18:07 +01:00
Greg Wilkins e19ed33341 Merge remote-tracking branch 'origin/jetty-9.2.x'
Conflicts:
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/gzip/GzipHandler.java
2015-02-11 15:08:56 +11:00
Greg Wilkins 5724b48c8d 459560 jetty.sh handles start.d and no start.ini
Also-by: Mike Dillon <mike@embody.org>
Signed-off-by: Greg Wilkins <gregw@intalio.org>
2015-02-11 14:43:35 +11:00
Joakim Erdfelt 7f0a073b54 Merge branch 'jetty-9.2.x' 2015-02-09 14:50:34 -07:00
Joakim Erdfelt 7b00f6857f Print full RUN_CMD when jetty.sh -d is called
Also-by: Mike Dillon <mike@embody.org>
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2015-02-09 14:22:40 -07:00
Greg Wilkins 2e3c223917 Merge remote-tracking branch 'origin/jetty-9.2.x' 2014-12-31 16:16:57 +01:00
Greg Wilkins d2cd28f7fa 455863 Fixed jetty.sh handling of multiple JETTY_ARGS
Also-by: Adrian Muraru <amuraru@adobe.com>
Signed-off-by: Greg Wilkins <gregw@intalio.com>
2014-12-31 16:01:54 +01:00
Joakim Erdfelt 9bd0ce1938 452503 - Start.jar --add-to-start=jstl results in GraphException: Unable to expand property in name: jsp-impl/${jsp-impl}-jstl
+ Preserving [depend] declaration order by switching from Set to List
 + Switching from BFS based selection / resolve logic in node selection
   to DFS based, to allow parent nodes to resolve completely before
   attempting other parent nodes.
2014-11-20 08:32:55 -07:00
Joakim Erdfelt d4d6cfdfa7 Removing virtual module [ssl-protonego]
+ This virtual module, rolled the ssl + protonego + (xml) into
  http2 & spdy modules instead.
2014-11-17 14:08:19 -07:00
Joakim Erdfelt 844a209823 Updating all non-test maven.org refs to maven:// 2014-11-14 10:02:46 -07:00
Joakim Erdfelt 24adca89ac Removing weld.mod (in favor of cdi.mod) 2014-11-14 06:30:01 -07:00
Greg Wilkins 59fc60972e Merge remote-tracking branch 'origin/jetty-9.2.x' 2014-11-12 17:14:06 +11:00
Greg Wilkins 9904db48ce 450894 jetty.sh does not delete JETTY_STATE at start 2014-11-12 17:01:52 +11:00
Jan Bartel 8694d9265d Merge remote-tracking branch 'origin/jetty-9.2.x'
Conflicts:
	jetty-servlets/src/test/java/org/eclipse/jetty/server/handler/gzip/GzipContentLengthTest.java
	jetty-servlets/src/test/java/org/eclipse/jetty/server/handler/gzip/GzipDefaultTest.java
	jetty-servlets/src/test/java/org/eclipse/jetty/server/handler/gzip/GzipTester.java
2014-11-07 14:10:47 +11:00
Greg Wilkins 18ed9af658 Added backward compatibility to Bash versions prior to version 3.1. The += notation is supported since Bash 3.1, but Jetty is deployed in evironments where it is impossible to upgrade Bash. This commit replace the += notation by a more portable notation.
Also-by:  Louis-Félix Tessier <louisfelix@gmail.com>
Signed-off-by: Greg Wilkins <gregw@intalio.com>
2014-11-07 11:59:19 +11: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
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
Joakim Erdfelt 8899f6d360 Merge branch 'jetty-9.2.x'
Conflicts:
	VERSION.txt
2014-10-29 15:52:05 -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 8a72a153a1 Merge branch 'jetty-9.2.x' 2014-10-28 12:32:55 -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 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
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 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 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
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
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
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