Commit Graph

684 Commits

Author SHA1 Message Date
Greg Wilkins 589d05afe0 Added 3rd party module licenses 2014-08-22 11:48:55 +10:00
Greg Wilkins af27566d2b fixed JSP issues 2014-08-21 11:42:21 +10:00
Greg Wilkins c1b66a3ea3 Fixed start.jar property as properties issue 2014-08-21 10:45:28 +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
Greg Wilkins 3a6879d3e8 expanded tabs in indents 2014-07-23 16:49:05 +10:00
Joakim Erdfelt e39adb337f 439672 support using Apache commons daemon for managing Jetty
Signed-off-by: marko asplund <marko.asplund@gmail.com>
2014-07-17 08:37:50 -07:00
Joakim Erdfelt 6faf94e4c1 437462 - consistent test failure in jetty-start under windows
+ Fixing up logic to be more lenient for case insensitive nature of
  microsoft windows (it was tripping up over C:\ vs c:\ difference)
2014-06-26 15:29:05 -07:00
Joakim Erdfelt bad3165d8a Fixing jdk 8 test failure 2014-06-25 08:24:24 -07:00
Joakim Erdfelt d92f6c6fd3 437395 - Start / Properties in template sections should be default applied for enabled modules
+ Fixing typo in enableModule()
+ Fixing concurrent modification exception during walk of parents in
  enableModule()
2014-06-19 10:18:51 -07:00
Joakim Erdfelt 605f32b022 Adding extra tests for bad startup configurations 2014-06-18 10:32:38 -07:00
Joakim Erdfelt 4ba530b5ad 437395 - Start / Properties in template sections should be default applied for enabled modules
+ Adding test cases for jsp-impl usecase that triggered this bug.
2014-06-17 10:42:04 -07:00
Joakim Erdfelt 5fa564efa8 437395 - Start / Properties in template sections should be default applied for enabled modules
+ Initial edits to support loading of Module [INI-TEMPLATE] section
  as default values for the enabled module.
2014-06-17 10:42:04 -07:00
Simone Bordet 424e421439 Added JDK 7u60 files and configuration for NPN and ALPN. 2014-06-11 18:45:45 +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
Jesse McConnell 10b6c574ae Merge branch 'master' into release-9 2014-06-09 13:07:22 -05:00
Joakim Erdfelt 7790ba9657 432192 - jetty-start / Allow JETTY_LOGS use for start-log-file
+ Internal initialization & validation of start-log-file is
  done via BaseHome.getPath(String) to allow the path to be
  anywhere on the filesystem, not just under ${jetty.base}
2014-06-06 12:33:57 -07:00
Joakim Erdfelt 646d85a68b 436388 - Allow case-insensitive STOP.KEY and STOP.PORT use
+ Internal (to start.jar) use of properties are now case-insensitive
2014-06-06 12:30:00 -07:00
Joakim Erdfelt 11b08b77e6 436524 - Start / Downloadable [files] references in modules cannot use ":" themselves
+ Updating usage.txt to indicate new use of "|"
2014-06-06 12:25:28 -07:00
Joakim Erdfelt 0c54ad2f20 432321 - jetty-start / Allow defining extra start directories for common configurations
+ Updating usage.txt
2014-06-06 08:40:52 -07:00
Joakim Erdfelt 5f8ed9519b Restore Origin/Source information of raw arguments from ConfigSource(s)
+ Change will remember where each raw argument from a DirConfigSource
  comes from (previously only remembered the origin of properties)
2014-06-04 15:48:58 -07:00
Joakim Erdfelt 7ee2f4e367 Fixing extraneous output and duplicate ${jetty.base}/${jetty.base} references when using --add-to-startd 2014-06-04 11:24:42 -07:00
Joakim Erdfelt d31811f067 436520 - Start / Allow https and file urls in jetty-start's module download mechanism
+ Work to enable this mostly performed in Bug #436524
+ Some minor work to add more tests for this new syntax.
2014-06-04 11:14:35 -07:00
Joakim Erdfelt bbab2e7832 436524 - Start / Downloadable [files] references in modules cannot use ":" themselves
+ Switching out support for ":" to "|"
2014-06-03 17:09:48 -07: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
Joakim Erdfelt bbd3774e38 Adjusting --exec to [exec] 2014-05-26 07:43:57 -07:00
Greg Wilkins 92ffcfc0f8 expand properties on command line for exec 2014-05-26 16:16:33 +02:00
Greg Wilkins 0d70ae87b2 turn off startlog redirect when starting 2014-05-26 00:46:32 +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
Joakim Erdfelt 69e6701106 435086 - ${jetty.base}/resources not on classpath when using --module=resources
+ Adding test case for resource.mod
+ Fixing java.nio.file.PathMatcher use to not include trailing slash for
  directory matches.
2014-05-16 09:55:36 -07:00
Greg Wilkins 51324a2786 434505 Allow property files on start.jar command line
Signed-off-by: Tom Zeller<tzeller@dragonacea.biz>

(cherry picked from commit d621df3c34)

Conflicts:
	jetty-start/src/main/java/org/eclipse/jetty/start/FS.java
	jetty-start/src/main/java/org/eclipse/jetty/start/StartArgs.java
2014-05-13 12:31:06 +02:00
Joakim Erdfelt b7b29ca4a3 432321 - jetty-start / Allow defining extra start directories for common configurations
+ renaming --extra-start-dir=<path> to
           --include-jetty-dir=<path>
2014-05-08 15:05:28 -07:00
Joakim Erdfelt 5db6f65354 Increasing visibility for Ben 2014-05-08 14:08:13 -07:00
Joakim Erdfelt 5cc6833f50 433563 - Jetty fails to startup on windows - InvalidPathException
+ PathMatchers.isAbsolute() and .getSearchRoot() adjusted to not
  rely on Path object behavior differences between Unix and Windows
+ Updated StartArgs processing of --lib to automatically expand
  extra lib references prior to submitting them to the internal
  BaseHome for processing as pattern for paths.
+ Updated test cases for new behavior.
2014-04-29 14:25:06 -07:00
Joakim Erdfelt 1de043d6c3 433563 - Jetty fails to startup on windows - InvalidPathException
+ Adjusted PathMatchers.isAbsolute() to only consider the
  search root, and not the whole path.
2014-04-28 13:59:55 -07:00
Simone Bordet 60f2200184 Merged branch 'jetty-9.1.x' into 'master'. 2014-04-16 11:10:18 +02:00
Simone Bordet 40c82a99ab Added profile in the main pom.xml to build with JDK 7u55.
Added new NPN module files for  JDK 7u55, referencing the new NPN version required by JDK 7u55.
2014-04-16 11:06:50 +02:00
Joakim Erdfelt 348cd406c8 Removing deprecated methods 2014-04-15 14:54:19 -07:00
Joakim Erdfelt e5314d4a3e 432321 - jetty-start / Allow defining extra start directories for common configurations
+ Adding Config Search order output to --list-config
2014-04-15 13:40:16 -07:00
Joakim Erdfelt dc3362ba3c Removing deprecated methods 2014-04-15 12:22:53 -07:00
Joakim Erdfelt 41ab91988b 432321 - jetty-start / Allow defining extra start directories for common configurations
+ Fixing jetty.base default detection to use user.dir instead of
  jetty.home
2014-04-15 10:32:28 -07:00
Joakim Erdfelt 599595f544 FS utility class cleanup of unused code 2014-04-15 10:31:27 -07:00
Joakim Erdfelt 8f733169f5 432321 - jetty-start / Allow defining extra start directories for common configurations
+ Final work for unit testing happiness
+ BaseHome is now configured via ConfigSources (as intended)
+ StartArgs now parses the ConfigSources list (in reverse)
+ CommandLineConfigSource now does all of the ${jetty.base} and
  ${jetty.home} determination (from properties and env, with
  fallbacks)
2014-04-11 14:26:35 -07:00
Joakim Erdfelt eff78efe3c 432321 - jetty-start / Allow defining extra start directories for common configurations
+ Integration of ConfigSources with rest of startup.
2014-04-10 16:45:11 -07:00
Joakim Erdfelt 682a01792f 432321 - jetty-start / Allow defining extra start directories for common configurations
+ Introduction of ConfigSources (a properly ordered list of ConfigSource
  impls) to aide in initial setup of configuration sources, prior to
  being parsed by StartArgs for the final runtime configuration of
  the jetty server.
2014-04-10 11:54:27 -07:00