Commit Graph

614 Commits

Author SHA1 Message Date
Joakim Erdfelt 02a838bef7 Removing unused test resources 2013-09-03 11:26:30 -07:00
Joakim Erdfelt 444a49f97e Adding --write-module-graph=<filename> 2013-08-30 13:08:32 -07:00
Joakim Erdfelt 7d50302562 Fixing distribution build + demo-base start port 2013-08-29 15:26:31 -07:00
Jesse McConnell ac30f5c9bd update other jetty mods to new format 2013-08-29 16:39:28 -05:00
Jesse McConnell 6e3094e1b0 [Bug 416143] mod file format uses [type] 2013-08-29 16:13:50 -05:00
Joakim Erdfelt 8a1f12ae81 jetty-start / fixing build + work towards demo-base 2013-08-29 11:49:33 -07:00
Joakim Erdfelt 78dfd287e3 jetty-start / DownloadArg to its own class + Main cleanup 2013-08-29 08:59:20 -07:00
Joakim Erdfelt de4febf1b9 jetty-start / fixing BaseHomeTest failure 2013-08-29 08:54:12 -07:00
Joakim Erdfelt fad7f94619 jetty-start / removing last remnants of module persistence 2013-08-29 08:53:46 -07:00
Joakim Erdfelt 9a40e12b70 jetty-start / import cleanup + change MODULE= to --module= in usage 2013-08-29 08:36:45 -07:00
Joakim Erdfelt 51b0ea05ee jetty-start / minor cleanup of BaseHome + use canonical file more consistently 2013-08-29 08:36:15 -07:00
Greg Wilkins aec807804d 415826 start.jar replace --enable with --module-ini
Added --module-ini and --module-start-ini
jetty.base is set from user.dir
jetty.home is set from start.jar dir
2013-08-29 12:37:50 +10:00
Greg Wilkins e5b4f37b62 renamed README.txt to README.TXT and updated contents 2013-08-29 00:32:36 +10:00
Greg Wilkins c84063a5f8 415826 start.jar replace --enable with --initialize
refactored impl to be clearer when creating ini
2013-08-28 23:53:32 +10:00
Greg Wilkins c1bd267c17 415826 start.jar replace --enable with --initialize 2013-08-28 15:41:27 +10:00
Greg Wilkins d66778ad06 415826 start.jar module --enable and --disable
morphed mechanism into --initialize based templates
2013-08-28 09:30:03 +10:00
Greg Wilkins 7d308bf8a5 Merge branch 'jetty-9.1' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9.1
Conflicts:
	jetty-start/src/main/java/org/eclipse/jetty/start/Main.java
	jetty-start/src/main/java/org/eclipse/jetty/start/StartArgs.java
2013-08-27 13:41:20 +10:00
Greg Wilkins 302ffe4ff1 415826 start.jar module --enable and --disable 2013-08-27 13:38:42 +10:00
Greg Wilkins ea21a1798a 415826 start.jar module --enable and --disable 2013-08-27 13:12:22 +10:00
Joakim Erdfelt c1517fe866 jetty-start / Making sure that download works 2013-08-26 17:11:00 -07:00
Joakim Erdfelt 866a9c96d2 jetty-start / removing --module= references in start.ini
+ making sure that demo.mod starts jetty appropriately.
+ making sure that --disable-module=demo works as advertised with
  jetty-distribution
2013-08-26 16:47:08 -07:00
Joakim Erdfelt 29670845e7 jetty-start / fleshing out with spdy test case 2013-08-26 16:08:08 -07:00
Joakim Erdfelt 38aaf38f2d jetty-start / updating test case module files.
+ updated test modules are a copy of what is being used in the
  distribution right now.
2013-08-26 15:44:33 -07:00
Joakim Erdfelt 067fbcba8d jetty-start / fixing test case for bootlib + jvm args 2013-08-26 15:31:06 -07:00
Joakim Erdfelt 71a94364f3 jetty-start / cleaning up download mechanism 2013-08-26 15:25:07 -07:00
Joakim Erdfelt 8124f151c8 415826 - jetty-start / add --enable an --disable functionality for modules
+ Ensure that --enable will work, even with a pristene base directory
2013-08-26 15:19:27 -07:00
Jesse McConnell 0ec70b66ce [Bug 415913] support bootlib and download in modules 2013-08-26 17:18:18 -05:00
Joakim Erdfelt 69892d36a6 415832 - jetty-start / fix ClassNotFound exception when starting from empty base directory
+ Displaying simple warning and not starting if appropriate.
2013-08-26 14:50:59 -07:00
Joakim Erdfelt b6dbdd98d4 415839 - jetty-start / warning about need for --exec given when not needed by default configuration
+ Adding exclusion on System properties check for jetty.home and jetty.base
2013-08-26 14:44:48 -07:00
Joakim Erdfelt c61cbaec2b 415830 - jetty-start / add more TestUseCases for home + base + modules configurations
+ Adding more complexity to module persistence mechanism test case to
   demonstrate how it works.
2013-08-26 14:35:48 -07:00
Joakim Erdfelt d53e9e4ada 415830 - jetty-start / add more TestUseCases for home + base + modules configurations
+ Adding testcase for module persistence management with home + base
2013-08-26 14:02:16 -07:00
Joakim Erdfelt 0299550d2e Fixing license header 2013-08-26 13:18:18 -07:00
Joakim Erdfelt 71e10b7bd2 415827 - jetty-start / update --help text for new command line options
+ Making help actually print out
2013-08-26 13:03:34 -07:00
Joakim Erdfelt 7c21874535 Fixing test error 2013-08-26 12:56:32 -07:00
Joakim Erdfelt cfe7e88461 415826 start.jar module --enable and --disable
+ Using new enable and disable concepts as discussed by the group
2013-08-26 12:55:25 -07:00
Joakim Erdfelt b55f75ead4 415827 - jetty-start / update --help text for new command line options 2013-08-26 12:53:04 -07:00
Jesse McConnell e54a9246e8 [Bug 415825] fix stop support in modular start setup 2013-08-26 14:32:02 -05:00
Joakim Erdfelt 14ec13000d Moving demo related files in distro to ${jetty.base}/demo/ directory 2013-08-26 09:50:31 -07:00
Joakim Erdfelt 5d05147cb0 415830 - jetty-start / add more TestUseCases for home + base + modules
configurations

+ Adding base example of enabling DB support
2013-08-26 07:12:43 -07:00
Greg Wilkins 3970295804 415826 start.jar module --enable and --disable
ensure ini files are copied or renamed as appropriate
2013-08-26 18:35:02 +10:00
Greg Wilkins 3ad746a355 415826 start.jar module --enable and --disable
Implemented the options, but not yet created the individual *.ini files
2013-08-26 18:04:36 +10:00
Greg Wilkins e224ba5e94 415831 - rename ini keyword from MODULES= to --module=
Also cleaned up output from --list-modules to include the source of
module enabling.
2013-08-26 10:53:16 +10:00
Joakim Erdfelt e36ce2743e 414635 Modular start.d and jetty.base property
+ More *.mod definition updates
+ Some safety checks in Module edge addition to prevent duplicates
+ Minor updates to README in jetty-start
2013-08-23 15:47:50 -07:00
Joakim Erdfelt 79106bbef8 414635 Modular start.d and jetty.base property
+ Adding back test case for jetty.home and/or libraries with spaces in the name
2013-08-23 15:32:44 -07:00
Jesse McConnell cfbd3ec488 add optional module support and jmx example 2013-08-23 17:27:26 -05:00
Joakim Erdfelt 135a4b4c45 414635 Modular start.d and jetty.base property
+ Making --list-config more user friendly when certain sections are empty
2013-08-23 15:22:28 -07:00
Joakim Erdfelt c70a6fdfe2 414635 Modular start.d and jetty.base property
+ Minor formatting and presentation cleanup of --list-config
2013-08-23 15:17:02 -07:00
Joakim Erdfelt 1844b4bd3d 414635 Modular start.d and jetty.base property
+ Adding --list-config for identifying the configuration
2013-08-23 15:03:34 -07:00
Joakim Erdfelt 79b2dd781e Making TestUseCases available for building out usecases for startup 2013-08-23 14:32:33 -07:00
Joakim Erdfelt a4dbf57b5a 414635 Modular start.d and jetty.base property
+ Starting to work on test usecases.
2013-08-23 13:58:15 -07:00
Joakim Erdfelt a396563340 414635 Modular start.d and jetty.base property
+ More work on startup of real jetty server.
2013-08-22 14:52:02 -07:00
Joakim Erdfelt b8e1f42b37 414635 Modular start.d and jetty.base property
+ More mod cleanup
 + Adding cyclic module reference detection and reporting
2013-08-22 14:21:52 -07:00
Joakim Erdfelt 5b2d9bc825 More work to get jetty to start 2013-08-22 12:45:52 -07:00
Joakim Erdfelt bddeb8cb77 Re-enabling PropertyPassingTest 2013-08-22 12:16:44 -07:00
Joakim Erdfelt e17cee533a More cleanup in start.jar 2013-08-22 12:00:52 -07:00
Jesse McConnell f99a517c1d update mod files 2013-08-22 12:52:56 -05:00
Joakim Erdfelt 314169b49d Removing start.config related classes 2013-08-22 10:40:25 -07:00
Joakim Erdfelt 5600d411ed Start.d in-progress, coordinating with Jesse 2013-08-22 08:50:38 -07:00
Joakim Erdfelt 03cd15ea82 Adding Module / Modules system classes for start.d 2013-08-21 15:12:17 -07:00
Joakim Erdfelt 77cbd9ec4b Import cleanup 2013-08-21 15:12:17 -07:00
Greg Wilkins 26fbd41376 414635 Modular start.d and jetty.base property
Transitive dependencies. Working jetty.base
2013-08-20 17:03:30 +10:00
Joakim Erdfelt f08aa88fbd jetty-start / HomeBase -> BaseHome and fix to ini expansion order 2013-08-19 16:17:32 -07:00
Greg Wilkins c0402dec4a 414635 Modular start.d and jetty.base property
Merged branch jetty-9.1-altstart with cherry picks of
ecf30e4
72f8143
998f95b
46a9495
fe4b922
3443593
2b40990
07636db
4e1a62b
aed6811
578613e
b1b394b
2013-08-19 16:29:01 +10:00
Joakim Erdfelt b1b394b4bf jetty.base is always defined. 2013-08-19 15:26:29 +10:00
Joakim Erdfelt 578613e901 Consolidating filters 2013-08-19 15:25:27 +10:00
Joakim Erdfelt aed68112ce Fixing enable/disable
Conflicts:
	jetty-start/src/main/java/org/eclipse/jetty/start/Main.java
2013-08-19 15:25:14 +10:00
Joakim Erdfelt 4e1a62b5c5 Using try-with-resources more consistently 2013-08-19 15:23:38 +10:00
Joakim Erdfelt 07636dbe62 Fixing up confusion over OPTIONS vs OPTION 2013-08-19 15:19:50 +10:00
Joakim Erdfelt 2b4099007f Making Config use HomeBase q
+ Cleaning up Start INI handling with new StartIni class
+ Eliminating recursive sub-ini directory issue
+ Adding NaturalSort utility class
+ Adding FS utility class

Conflicts:
	jetty-start/src/main/java/org/eclipse/jetty/start/Config.java
	jetty-start/src/main/java/org/eclipse/jetty/start/Main.java
2013-08-19 15:18:49 +10:00
Joakim Erdfelt 3443593136 Reducing code duplication 2013-08-19 14:49:46 +10:00
Joakim Erdfelt fe4b922127 Making warning show on System.err 2013-08-19 14:49:06 +10:00
Joakim Erdfelt 46a94956ee Adding HomeBase to simplify file access logic between jetty.home and jetty.base 2013-08-19 14:47:49 +10:00
Joakim Erdfelt 998f95bfc0 More javadoc, minor cleanup 2013-08-19 14:46:36 +10:00
Joakim Erdfelt 72f8143d5e Removing CORBA reference?? and adding improved debug method 2013-08-19 14:44:38 +10:00
Joakim Erdfelt ecf30e41cb Fixing Jar close resource leak 2013-08-19 14:43:53 +10:00
Greg Wilkins 84df81c288 414635 Modular start.d and jetty.base property
Fixed NPE from XmlConfiguration
reordered so command line comes after start.ini and start.d
2013-08-19 12:30:53 +10:00
Greg Wilkins 145f544861 414635 Modular start.d and jetty.base property
Added --enable and --disable
2013-08-15 22:57:43 +10:00
Greg Wilkins 21e7b67cc7 414635 Modular start.d and jetty.base property 2013-08-08 17:53:52 +10:00
Jan Bartel bd2add0ae9 Update to post-release (servlet 3.1/javaee) versions of javaee dependencies. WARNING: jetty-schemas from jetty-toolchain needs to be changed from SNAPSHOT to final release. 2013-07-12 13:53:58 +10:00
Greg Wilkins 4e4ffaa54c Merge remote-tracking branch 'origin/master' into servlet-3.1-api
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannelState.java
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
2013-06-17 16:29:39 +10:00
Jesse McConnell eddb49941d [Bug 408600] set correct jetty.url in all pom files 2013-06-12 15:52:36 -05:00
Joakim Erdfelt 5cd478c0fd 410522 - jetty start broken for command line options
+ Adding tests for the different forms of property handling in start.jar
2013-06-12 09:15:23 -07:00
Greg Wilkins d660cfcff6 Merge remote-tracking branch 'origin/master' into servlet-3.1-api
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannelState.java
	tests/test-continuation/src/test/java/org/eclipse/jetty/continuation/ContinuationBase.java
2013-06-11 11:17:04 +10:00
Thomas Becker 9abed8e85d 408904 Enhance CommandlineBuilder to not escape strings inside single quotes 2013-06-10 18:01:07 +02:00
Greg Wilkins 15e0d50b79 Merge remote-tracking branch 'origin/master' into servlet-3.1-api 2013-05-23 09:50:27 +10:00
Jesse McConnell 74a4077dad Add package-info.java files to all jetty packages. 2013-05-21 15:09:49 -05:00
Jesse McConnell 3d600ed95e [maven-release-plugin] prepare for next development iteration 2013-05-06 18:13:04 -05:00
Jesse McConnell d832f3dc7e [maven-release-plugin] prepare release jetty-9.0.3.v20130506 2013-05-06 18:12:55 -05:00
Jan Bartel b182f09b2c 405944 Check annotation and resource injection is supported for AsyncListener 2013-05-06 16:32:38 +10:00
Jan Bartel 0d181d9a75 Merge remote-tracking branch 'origin/master' into servlet-3.1-api 2013-05-03 16:59:39 +10:00
Greg Wilkins 57691ac881 405327 Modular Start.ini
Improved start.jar download mechanism
2013-05-02 09:38:41 +10:00
Jan Bartel e7ecfd2b2b Merge remote-tracking branch 'origin/master' into servlet-3.1-api
Conflicts:
	jetty-server/src/test/java/org/eclipse/jetty/server/ResponseTest.java
2013-05-02 09:07:24 +10:00
Greg Wilkins 9558d7e815 modular start.ini files and --download start option 2013-04-26 13:53:28 +10:00
Greg Wilkins a7073d05a6 updated version to 9.1.0-SNAPSHOT 2013-04-19 13:59:18 +10:00
Jesse McConnell 7baaa14ba1 [maven-release-plugin] prepare for next development iteration 2013-04-17 11:46:39 -05:00
Jesse McConnell e390b54b25 [maven-release-plugin] prepare release jetty-9.0.2.v20140417 2013-04-17 11:46:31 -05:00
Jesse McConnell 0b20467c6f [maven-release-plugin] prepare for next development iteration 2013-04-15 11:40:45 -05:00
Jesse McConnell 3aa4301711 [maven-release-plugin] prepare release jetty-9.0.2.v20140415 2013-04-15 11:40:37 -05:00
Greg Wilkins b8dd8bde14 [maven-release-plugin] prepare for next development iteration 2013-04-08 12:31:34 +10:00
Greg Wilkins bf3771904b [maven-release-plugin] prepare release jetty-9.0.1.v20130408 2013-04-08 12:30:59 +10:00