Commit Graph

760 Commits

Author SHA1 Message Date
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
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 7cbd3c0488 440925 - NPE when using relative paths for --start-log-file 2014-10-29 16:25:55 -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 7c40c0e2be Removing 2 second sleep 2014-10-29 14:33:46 -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 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 f4f600ff05 Code cleanup (post-merge) 2014-10-28 09:45:25 -07:00
Joakim Erdfelt 607a560ebd Merge branch 'jetty-9.2.x' into cdi-testing 2014-10-28 09:36:34 -07:00
Joakim Erdfelt 653cb32ede Adjusting start/run warning messages on missing file content.
+ Leaving behavior of missing directories alone.
+ See bug #427204 for old behavior bug
2014-10-28 09:35:11 -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 6ff43a0af1 Merge branch 'jetty-9.2.x' into cdi-testing 2014-10-27 13:42:30 -07:00
Simone Bordet 6f42d21ed5 446063 - ALPN Fail SSL Handshake if no supported Application Protocols. 2014-10-16 15:31:24 +02:00
Simone Bordet 9796457dfc 446672 - NPN Specification issue in the case no protocols are selected. 2014-10-13 21:27:11 +02:00
Joakim Erdfelt 67db9e67de Merge branch 'jetty-9.2.x' into cdi-testing 2014-10-09 12:42:14 -07:00
Joakim Erdfelt 2f696e87bd 445258 - STOP.WAIT is not really respected
Fixing stupid typo / copy / paste bug
2014-10-08 15:01:05 -07:00
Joakim Erdfelt bf7637a2df Reworking cdi-webapp-it to also use new cdi module 2014-09-26 17:16:35 -07: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 69390954dc 435322 acceptor and selector configuration/priority 2014-08-29 15:36:19 +10:00
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
Greg Wilkins 0e458c80f4 reverted version to SNAPSHOT 2014-04-10 16:37:25 +10:00
Joakim Erdfelt 1b9f0cb945 Cleanup of Main.moduleIni() to .buildIni() with better documentation 2014-04-09 10:02:28 -07:00
Joakim Erdfelt 5ecf564dfa 432321 - jetty-start / Allow defining extra start directories for common configurations
+ Identified test cases for extra-start-dir logic
+ Working on layered ConfigSource approach to handling extra-start-dir
2014-04-09 09:51:20 -07:00
Joakim Erdfelt a9c01d3607 432321 - jetty-start / Allow defining extra start directories for common configurations
+ Initial impl of BaseHome with support for lookups on extra start dirs
2014-04-08 09:57:52 -07:00
Joakim Erdfelt e793c85eb4 Cleanup and documentation of StartArgs in prep for extra-start-dirs 2014-04-08 06:45:04 -07:00
Joakim Erdfelt 87f2deed65 Squelching prior notified loop detection 2014-04-08 06:11:42 -07:00
Joakim Erdfelt 9d0143b704 Making searchDepth configurable via System property 2014-04-08 06:08:39 -07:00
Joakim Erdfelt ce75625f0f Preparing BaseHome for extra-start-dirs 2014-04-08 06:08:21 -07:00
Joakim Erdfelt eb53a9ce6d Minor fix for ConcurrentModificationException 2014-04-07 10:31:34 -07:00
Greg Wilkins 2b2d3ac762 Fixed start.jar handling of expanded modules during --add-to-start 2014-04-07 13:11:41 +10:00
Greg Wilkins cf430665b5 Fixed start.jar handling of expanded modules during --add-to-start 2014-04-04 14:09:46 +11:00
Greg Wilkins 6e9879cc6b removed debug 2014-04-03 19:12:49 +11: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
Jesse McConnell c616ece6c7 [maven-release-plugin] prepare release jetty-9.1.4.v20140401 2014-04-02 10:55:21 -05:00
Greg Wilkins c5e1e249e7 set version for 9.2.x 2014-03-31 11:35:06 +11:00
Joakim Erdfelt f3d312698f 425736 - jetty-start / Jetty 9 fails to startup with --exec option if Java path contain
+ Using .addRawArg() to avoid space escaping for Java Bin
2014-03-28 09:59:16 -07:00
Joakim Erdfelt 2f6f210174 430747 - jetty-start / Allow --lib and module [lib] to recursively add jars
+ --lib={pattern} now supported
  + regular searching rules (for BaseHome) apply
  + even supporting multiple lib pattern entries via File.pathSeparator
    separation, resulting in support for command lines like this:
       --lib=/opt/common/lib/**.jar:lib/db/*.jar
  + {pattern} can be any valid java.nio.file.PathMatcher of syntax "glob:"
    (since we rely on File.pathSeparator to break apart the --lib line
    the existence of that same char in "glob:" and "regex:" means that
    supporting both syntaxes of (regex and glob) isn't going to make
    writing this line easy for the user.  opting for glob only seems
    like a good compromise)
2014-03-26 19:22:20 -07:00
Joakim Erdfelt dfbe5c92c6 426920 - jetty-start / BaseHome.listFilesRegex() and .recurseDir() do not detect filesystem loops
+ Using java.nio.files to walk directory tree and detect filesystem
  loops
+ All standard PathMatching patterns now work. ("glob:" and "regex:")
2014-03-26 19:01:05 -07:00
Joakim Erdfelt a52925efcc 431279 - jetty-start / Unable to start jetty if no properties are defined.
+ Removed spurious check for no properties set (as System Properties are
  not part of that check, but should have been, which essentially means
  that there is never no properties available)
2014-03-26 11:34:08 -07:00
Joakim Erdfelt 6600abd3f9 Adding more start debug for lib resolution steps 2014-03-26 11:34:06 -07:00
Joakim Erdfelt a55ae9e58c 427204 - jetty-start / startup incorrectly requires directory in jetty.base
+ Removing start failure on missing [files] entries as this would
  prevent startup when the user has configured to alternative files
  locations.  The modules directives for [files] are defaults,
  best practice, not required content.  It now warns only on
  missing download directives.
2014-03-21 11:54:41 -07:00
Joakim Erdfelt 2afd16ec39 427368 - start.sh fails quietly on command line error
+ Correcting bad --daemon use
+ Adding start-log-file command line instead
+ Adding feedback about start-log-file use
2014-03-11 14:29:11 -07:00
Jesse McConnell 0ec0d452e9 [maven-release-plugin] prepare for next development iteration 2014-03-07 09:10:08 -06:00