Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
14,076 Commits 70 Branches 462 Tags 370 MiB
Commit Graph

951 Commits

Author SHA1 Message Date
Joakim Erdfelt 9cf0e34a1d Updating to version 9.4.0-SNAPSHOT 2015-10-07 15:41:32 -07:00
Joakim Erdfelt 37296bec3c Updating to version 9.3.4.v20151007 2015-10-07 14:58:38 -07:00
Jan Bartel c70d11c27d Ensure webapp classloader used to reinflate session from gcloudatastore 2015-10-02 10:32:41 +10:00
Jesse McConnell 6409366499 [maven-release-plugin] prepare for next development iteration 2015-08-27 10:11:29 -05:00
Jesse McConnell 3086adc965 [maven-release-plugin] prepare release jetty-9.3.3.v20150827 2015-08-27 10:11:21 -05:00
Jesse McConnell f8734f23ce [maven-release-plugin] prepare for next development iteration 2015-08-25 14:10:01 -05:00
Jesse McConnell e9edf4c24b [maven-release-plugin] prepare release jetty-9.3.3.v20150825 2015-08-25 14:09:54 -05:00
Joakim Erdfelt a3684f7fb8 [maven-release-plugin] prepare for next development iteration 2015-07-30 09:47:57 -07:00
Joakim Erdfelt 798fc8118b [maven-release-plugin] prepare release jetty-9.2.13.v20150730 2015-07-30 09:47:48 -07:00
Joakim Erdfelt 4b3879845d [maven-release-plugin] prepare for next development iteration 2015-07-30 07:02:10 -07:00
Joakim Erdfelt 6b7e9ac4b0 [maven-release-plugin] prepare release jetty-9.3.2.v20150730 2015-07-30 07:02:02 -07:00
Jesse McConnell 9b790c38ce [maven-release-plugin] prepare for next development iteration 2015-07-14 11:42:34 -05:00
Jesse McConnell b35d32f2b8 [maven-release-plugin] prepare release jetty-9.3.1.v20150714 2015-07-14 11:42:28 -05:00
Jesse McConnell 7204707902 [maven-release-plugin] prepare for next development iteration 2015-07-09 12:14:38 -05:00
Jesse McConnell 3b1533673e [maven-release-plugin] prepare release jetty-9.2.12.v20150709 2015-07-09 12:14:30 -05:00
Jesse McConnell 4897fd605d 460671 - Rationalize property names (fix for jetty.sh) 2015-06-30 11:38:46 -05:00
Jesse McConnell 60e45a940e [maven-release-plugin] prepare for next development iteration 2015-06-15 15:34:11 -05:00
Jesse McConnell d3dec8d513 [maven-release-plugin] prepare release jetty-9.2.12.M0 2015-06-15 15:34:03 -05:00
Joakim Erdfelt cf6c4a914e Updating version to 9.3.1-SNAPSHOT 2015-06-15 10:25:49 -07:00
Joakim Erdfelt 1a9da9f9e4 Updating versions to 9.3.0.v20150612 2015-06-12 09:34:24 -07:00
Joakim Erdfelt c6ac82f50b Merge branch 'master' into release-9.3 2015-06-12 09:30:46 -07:00
Joakim Erdfelt 7c737a587b Removing [version] sections in modules 2015-06-12 09:14:34 -07:00
Joakim Erdfelt 496b4dfc83 [maven-release-plugin] prepare for next development iteration 2015-06-11 15:08:36 -07:00
Joakim Erdfelt f53c5d8fac [maven-release-plugin] prepare release jetty-9.3.0.v20150611 2015-06-11 15:08:29 -07:00
Joakim Erdfelt 916efd6aa7 469860 - Add module metadata versioning to support backwards compat 
+ Adding [version] section to all existing jetty 9.3 distro modules
+ Updating testcases in jetty-start with new [version] sections too
+ Adding extra testcases for versioned modules
 2015-06-10 10:59:18 -07:00
Jesse McConnell bfe6c2638e [maven-release-plugin] prepare for next development iteration 2015-05-29 09:06:42 -05:00
Jesse McConnell 71e0f4d8ce [maven-release-plugin] prepare release jetty-9.2.11.v20150529 2015-05-29 09:06:36 -05:00
Jesse McConnell a7087cbfbf [maven-release-plugin] prepare for next development iteration 2015-05-28 10:06:51 -05:00
Jesse McConnell 913c63e597 [maven-release-plugin] prepare release jetty-9.2.11.v20150528 2015-05-28 10:03:44 -05:00
Greg Wilkins 5d041ad54f 466645 Allow XmlConfiguration Properties to use Elements or Attributes 2015-05-07 16:24:11 +10:00
Jan Bartel dbf4b2d72d 466669 Add nosql.mod into jetty distro 2015-05-07 16:12:50 +10:00
Greg Wilkins f4faf7cb37 remove etc/ketystore from jetty home in distro 2015-05-07 10:40:22 +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 0cd3f1dfd7 Add infinispan session mgr to distro 2015-04-02 12:22:48 +11:00
Jan Bartel abb74087a5 Remove dup cdi jars from lib; use individual weld jars not aggregate 2015-04-01 15:55:09 +11:00
Joakim Erdfelt 739b6c9556 Fixing CDI module behavior 2015-03-25 15:33:26 -07:00
Jesse McConnell da4f95f3d3 [maven-release-plugin] prepare for next development iteration 2015-03-25 09:08:27 -05:00
Jesse McConnell e92fd438fd [maven-release-plugin] prepare release jetty-9.2.11.M0 2015-03-25 09:08:21 -05:00
Jesse McConnell e3fd0056cf [maven-release-plugin] prepare for next development iteration 2015-03-10 08:00:22 -05:00
Jesse McConnell 9d648f4000 [maven-release-plugin] prepare release jetty-9.2.10.v20150310 2015-03-10 08:00:14 -05:00
Jesse McConnell 1659d83978 [maven-release-plugin] prepare for next development iteration 2015-02-24 10:38:33 -06:00
Jesse McConnell dc0c3f4c52 [maven-release-plugin] prepare release jetty-9.2.9.v20150224 2015-02-24 10:38:28 -06:00
Jan Bartel d85662bd6e 459681 Remove Glassfish JSP in favor of Apache JSP 2015-02-18 19:25:20 +11:00
Jesse McConnell ce5db2ca55 [maven-release-plugin] prepare for next development iteration 2015-02-17 16:02:22 -06:00
Jesse McConnell 26b7597928 [maven-release-plugin] prepare release jetty-9.2.8.v20150217 2015-02-17 16:02:16 -06: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
Greg Wilkins 2162455b72 Removed SPDY and NPN 
Because jetty 9.3 is targetted for HTTP2, we have removed support for SPDY and NPN.
 2015-02-11 14:20:06 +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
Jesse McConnell aa22842c20 [maven-release-plugin] prepare for next development iteration 2015-01-16 17:48:29 -06:00
Jesse McConnell 8c58a9abc4 [maven-release-plugin] prepare release jetty-9.2.7.v20150116 2015-01-16 17:48:23 -06:00
Jesse McConnell 81bb8411d1 [maven-release-plugin] prepare for next development iteration 2015-01-16 12:06:36 -06:00
Jesse McConnell 7865f88b81 [maven-release-plugin] prepare release jetty-9.2.7.v20150116 2015-01-16 12:06:30 -06:00
Jesse McConnell db991355a2 [maven-release-plugin] prepare for next development iteration 2015-01-16 10:41:45 -06:00
Jesse McConnell 6930abb8d3 [maven-release-plugin] prepare release jetty-9.2.7.v20140116 2015-01-16 10:41:39 -06:00
Jesse McConnell 9225b124a4 [maven-release-plugin] prepare for next development iteration 2015-01-16 08:21:35 -06:00
Jesse McConnell ebd563e64d [maven-release-plugin] prepare release 9.2.7.v20140116 2015-01-16 08:21:29 -06: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
Jan Bartel bc22ba72dc [maven-release-plugin] prepare for next development iteration 2014-12-05 16:45:12 +01:00
Jan Bartel 1cc075cf98 [maven-release-plugin] prepare release jetty-9.2.6.v20141205 2014-12-05 16:45:01 +01:00
Jesse McConnell 127b48c932 [maven-release-plugin] prepare for next development iteration 2014-12-03 09:00:57 -06:00
Jesse McConnell 028f4b9610 [maven-release-plugin] prepare release jetty-9.2.6.v20141203 2014-12-03 09:00:46 -06:00
Jesse McConnell 1263d1f3c8 [maven-release-plugin] prepare for next development iteration 2014-12-03 08:26:47 -06:00
Jesse McConnell 5c7f706496 [maven-release-plugin] prepare release jetty-9.2.6.v20141203 2014-12-03 08:26:35 -06:00
Greg Wilkins 1159111c52 Merge remote-tracking branch 'origin/jetty-9.2.x' 
Conflicts:
	jetty-io/src/main/java/org/eclipse/jetty/io/SelectChannelEndPoint.java
	jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java
 2014-11-27 13:34:45 +11:00
Jan Bartel 16737804c8 452261 - Multiple servlets map to path *.jsp when using jsp-property-group 2014-11-26 15:36:36 +11: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
Simone Bordet 2eb6e06387 Added required property "jsp-impl" set to "apache" to build the distro. 2014-11-20 12:57:47 +01:00
Joakim Erdfelt f792c900ed Making setup demo-base actions split for --add-to-start, then --add-to-startd to avoid ambiguous action on transitive nodes 2014-11-19 16:44:43 -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
Jesse McConnell 09846e324d [maven-release-plugin] prepare for next development iteration 2014-11-12 17:13:19 -06:00
Jesse McConnell 97d2bd95a6 [maven-release-plugin] prepare release jetty-9.2.5.v20141112 2014-11-12 17:13:14 -06: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
Jesse McConnell 5d0595cabd [maven-release-plugin] prepare for next development iteration 2014-11-03 13:46:58 -06:00
Jesse McConnell 772ff0bfd4 [maven-release-plugin] prepare release jetty-9.2.4.v20141103 2014-11-03 13:46:52 -06: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
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
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
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
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 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
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
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 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 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