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
dc3362ba3c
Removing deprecated methods
2014-04-15 12:22:53 -07:00
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
599595f544
FS utility class cleanup of unused code
2014-04-15 10:31:27 -07:00
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
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
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
1b9f0cb945
Cleanup of Main.moduleIni() to .buildIni() with better documentation
2014-04-09 10:02:28 -07:00
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
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
e793c85eb4
Cleanup and documentation of StartArgs in prep for extra-start-dirs
2014-04-08 06:45:04 -07:00
87f2deed65
Squelching prior notified loop detection
2014-04-08 06:11:42 -07:00
9d0143b704
Making searchDepth configurable via System property
2014-04-08 06:08:39 -07:00
ce75625f0f
Preparing BaseHome for extra-start-dirs
2014-04-08 06:08:21 -07:00
eb53a9ce6d
Minor fix for ConcurrentModificationException
2014-04-07 10:31:34 -07:00
2b2d3ac762
Fixed start.jar handling of expanded modules during --add-to-start
2014-04-07 13:11:41 +10:00
cf430665b5
Fixed start.jar handling of expanded modules during --add-to-start
2014-04-04 14:09:46 +11:00
6e9879cc6b
removed debug
2014-04-03 19:12:49 +11:00
303fa57eaf
improved protonego module structure to avoid ini files of parameterized modules
2014-04-03 16:50:33 +11:00
157a54ec5c
430341 Use apache jsp/jstl by default in 9.2.0
2014-04-03 14:16:13 +11:00
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
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
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
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
6600abd3f9
Adding more start debug for lib resolution steps
2014-03-26 11:34:06 -07:00
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
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
ba318ccbd3
[426003] active modules with missing dependencies fail accordingly, non-active with missing deps fail silently
2014-02-04 14:09:16 -06:00
2db90757ed
Bug 426481 fix < java 1.7.0_10 npn files
2014-01-23 10:36:29 -06:00
e4cac732cf
Updated build profiles to JDK 7u51, along with NPN modules.
2014-01-14 22:51:18 +01:00
dec67094bf
425696 - start.jar --add-to-start={module} results in error
2014-01-14 11:43:21 -07:00
3a16944fd7
Fixing path based assertions to be OS neutral (windows)
2014-01-14 11:35:08 -07:00
907eb6b03b
424598 - Module [npn] downloads wrong npn jar
...
+ Cleanup of --list-config output
2014-01-06 11:16:03 -07:00
7af87b4a04
424598 - Module [npn] downloads wrong npn jar
...
+ Separating Module logical name from file system reference name
+ [depend] references in *.mod files are tried as file system reference
names, then logical names.
+ --module=<name> are tried only as logical names.
+ All of the npn/npn-${jvm.version}.mod files are defined as logical
name of npn-boot
2014-01-06 11:16:03 -07:00
a12fd9ea03
Happy New Year - 2014!
2014-01-02 14:50:14 -07:00
ec9d807a47
Reducing noise during testing
2013-12-27 10:55:47 -07:00
966c4e0130
424390 - Allow enabling modules via regex
2013-12-27 10:52:03 -07:00
f8e44a1ae7
424168 - Module [ext] should load libraries recursively from lib/ext/
...
+ Added support for [LIB] definitions that use regex.
+ Using new expression for [LIB] sections in ext.mod
regex:lib/ext/.*\.jar$
2013-12-27 10:31:38 -07:00
31831476f1
Removing ${switch logic from Module in favor of using properties
2013-12-26 15:49:31 -07:00
bd86928f1c
Changing repo1.maven.org to central.maven.org
2013-12-26 15:45:48 -07:00
1de4502ad5
424598 - Module [npn] downloads wrong npn jar
...
+ Implemented property expansion of [depend] module names
+ Added npn/npn-${java.version}.mod files
2013-12-26 15:41:40 -07:00
fa399d4b7d
Fixing double '2152' expand
2013-12-26 13:02:10 -07:00
4777f4ff3b
417202 - Start / command line arguments with ${variable} should be expanded
...
+ Expanding properties & LIB references
2013-12-26 12:51:18 -07:00
858b737be1
424598 switch on JRE version in module download
2013-12-23 15:53:12 +11:00
e5b85055bd
423739 Start checks module files.
...
renamed option to --create-files
cleaned up logging and messages
removed switch statement.
2013-12-23 15:46:52 +11:00
2b0db585ef
424183 - Start does not find LIB (Classpath) when on non-English locale
...
+ Adding more Java Environment dump to --list-config
+ Fixing .toUpperCase() use to include Locale.ENGLISH
2013-12-16 14:18:04 -07:00
8bf4a4f263
424051 - Using --list-config can result in NPE
...
+ Adding protection for no-manifest
+ Adding bad-jar tests for no-manifest, not-a-jar, and zero-length
2013-12-14 18:03:19 -07:00
a12ad15a2c
423739 Start checks module files.
...
At runtime, required modules files are checked. Either a warning is generated
or they are downloaded/create if --download or --create is specified.
2013-12-12 17:01:51 +11:00
f567bddad9
global clean up imports
2013-11-04 13:48:03 +11:00
1620b34a6e
418441 - Use of OPTIONS= in Jetty 9.1 should display WARNING message
2013-10-03 11:53:37 -07:00
a50054c74b
Fixing typo in usage.txt
2013-09-24 11:53:23 -07:00
937a91a0db
417938 - Startup / Sort properties presented in --list-config alphabetically
2013-09-24 09:00:30 -07:00
8449ccc873
415826 modules initialised with --add-to-start and --add-to-startd
2013-09-16 11:53:46 +10:00
bb8d8fb999
415826 modules initialised with --module-start-ini and --module-startd-ini
2013-09-13 14:12:09 +10:00
ace43502ad
refined start.jar mechanism to align with updated documentation
2013-09-06 16:10:03 +10:00
5c3f498624
create directories on module ini
2013-09-06 13:06:15 +10:00
d920ef8c40
415899 - jetty-start / add --lib=<cp> capability from Jetty 7/8
...
+ Adding --lib=<cp> concept from Jetty 7/8 to allow for arbitrary
library additions, similar to how path=<name> and lib=<name>
was used back in those revisions.
2013-09-03 11:26:35 -07:00
02a838bef7
Removing unused test resources
2013-09-03 11:26:30 -07:00
444a49f97e
Adding --write-module-graph=<filename>
2013-08-30 13:08:32 -07:00
7d50302562
Fixing distribution build + demo-base start port
2013-08-29 15:26:31 -07:00
ac30f5c9bd
update other jetty mods to new format
2013-08-29 16:39:28 -05:00
6e3094e1b0
[Bug 416143] mod file format uses [type]
2013-08-29 16:13:50 -05:00
8a1f12ae81
jetty-start / fixing build + work towards demo-base
2013-08-29 11:49:33 -07:00
78dfd287e3
jetty-start / DownloadArg to its own class + Main cleanup
2013-08-29 08:59:20 -07:00
de4febf1b9
jetty-start / fixing BaseHomeTest failure
2013-08-29 08:54:12 -07:00
fad7f94619
jetty-start / removing last remnants of module persistence
2013-08-29 08:53:46 -07:00
9a40e12b70
jetty-start / import cleanup + change MODULE= to --module= in usage
2013-08-29 08:36:45 -07:00
51b0ea05ee
jetty-start / minor cleanup of BaseHome + use canonical file more consistently
2013-08-29 08:36:15 -07:00
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
e5b4f37b62
renamed README.txt to README.TXT and updated contents
2013-08-29 00:32:36 +10:00
c84063a5f8
415826 start.jar replace --enable with --initialize
...
refactored impl to be clearer when creating ini
2013-08-28 23:53:32 +10:00
c1bd267c17
415826 start.jar replace --enable with --initialize
2013-08-28 15:41:27 +10:00
d66778ad06
415826 start.jar module --enable and --disable
...
morphed mechanism into --initialize based templates
2013-08-28 09:30:03 +10:00
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
302ffe4ff1
415826 start.jar module --enable and --disable
2013-08-27 13:38:42 +10:00
ea21a1798a
415826 start.jar module --enable and --disable
2013-08-27 13:12:22 +10:00
c1517fe866
jetty-start / Making sure that download works
2013-08-26 17:11:00 -07:00
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
29670845e7
jetty-start / fleshing out with spdy test case
2013-08-26 16:08:08 -07:00
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
067fbcba8d
jetty-start / fixing test case for bootlib + jvm args
2013-08-26 15:31:06 -07:00
71a94364f3
jetty-start / cleaning up download mechanism
2013-08-26 15:25:07 -07:00
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
0ec70b66ce
[Bug 415913] support bootlib and download in modules
2013-08-26 17:18:18 -05:00
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
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
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
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
0299550d2e
Fixing license header
2013-08-26 13:18:18 -07:00
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
7c21874535
Fixing test error
2013-08-26 12:56:32 -07:00
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
b55f75ead4
415827 - jetty-start / update --help text for new command line options
2013-08-26 12:53:04 -07:00
e54a9246e8
[Bug 415825] fix stop support in modular start setup
2013-08-26 14:32:02 -05:00
14ec13000d
Moving demo related files in distro to ${jetty.base}/demo/ directory
2013-08-26 09:50:31 -07:00
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
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
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
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
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
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
cfbd3ec488
add optional module support and jmx example
2013-08-23 17:27:26 -05:00
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
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
1844b4bd3d
414635 Modular start.d and jetty.base property
...
+ Adding --list-config for identifying the configuration
2013-08-23 15:03:34 -07:00
79b2dd781e
Making TestUseCases available for building out usecases for startup
2013-08-23 14:32:33 -07:00
a4dbf57b5a
414635 Modular start.d and jetty.base property
...
+ Starting to work on test usecases.
2013-08-23 13:58:15 -07:00
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
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
5b2d9bc825
More work to get jetty to start
2013-08-22 12:45:52 -07:00
bddeb8cb77
Re-enabling PropertyPassingTest
2013-08-22 12:16:44 -07:00
e17cee533a
More cleanup in start.jar
2013-08-22 12:00:52 -07:00
f99a517c1d
update mod files
2013-08-22 12:52:56 -05:00
314169b49d
Removing start.config related classes
2013-08-22 10:40:25 -07:00
5600d411ed
Start.d in-progress, coordinating with Jesse
2013-08-22 08:50:38 -07:00
03cd15ea82
Adding Module / Modules system classes for start.d
2013-08-21 15:12:17 -07:00
77cbd9ec4b
Import cleanup
2013-08-21 15:12:17 -07:00
26fbd41376
414635 Modular start.d and jetty.base property
...
Transitive dependencies. Working jetty.base
2013-08-20 17:03:30 +10:00
f08aa88fbd
jetty-start / HomeBase -> BaseHome and fix to ini expansion order
2013-08-19 16:17:32 -07:00
c0402dec4a
414635 Modular start.d and jetty.base property
...
Merged branch jetty-9.1-altstart with cherry picks of
ecf30e472f8143998f95b46a9495fe4b92234435932b4099007636db4e1a62baed6811578613eb1b394b
2013-08-19 16:29:01 +10:00
b1b394b4bf
jetty.base is always defined.
2013-08-19 15:26:29 +10:00
578613e901
Consolidating filters
2013-08-19 15:25:27 +10:00
aed68112ce
Fixing enable/disable
...
Conflicts:
jetty-start/src/main/java/org/eclipse/jetty/start/Main.java
2013-08-19 15:25:14 +10:00
4e1a62b5c5
Using try-with-resources more consistently
2013-08-19 15:23:38 +10:00
07636dbe62
Fixing up confusion over OPTIONS vs OPTION
2013-08-19 15:19:50 +10:00
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
3443593136
Reducing code duplication
2013-08-19 14:49:46 +10:00
fe4b922127
Making warning show on System.err
2013-08-19 14:49:06 +10:00
46a94956ee
Adding HomeBase to simplify file access logic between jetty.home and jetty.base
2013-08-19 14:47:49 +10:00
998f95bfc0
More javadoc, minor cleanup
2013-08-19 14:46:36 +10:00
72f8143d5e
Removing CORBA reference?? and adding improved debug method
2013-08-19 14:44:38 +10:00
ecf30e41cb
Fixing Jar close resource leak
2013-08-19 14:43:53 +10:00
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
145f544861
414635 Modular start.d and jetty.base property
...
Added --enable and --disable
2013-08-15 22:57:43 +10:00
21e7b67cc7
414635 Modular start.d and jetty.base property
2013-08-08 17:53:52 +10:00
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
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
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
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
9abed8e85d
408904 Enhance CommandlineBuilder to not escape strings inside single quotes
2013-06-10 18:01:07 +02:00
15e0d50b79
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
2013-05-23 09:50:27 +10:00
74a4077dad
Add package-info.java files to all jetty packages.
2013-05-21 15:09:49 -05:00
b182f09b2c
405944 Check annotation and resource injection is supported for AsyncListener
2013-05-06 16:32:38 +10:00
57691ac881
405327 Modular Start.ini
...
Improved start.jar download mechanism
2013-05-02 09:38:41 +10:00
9558d7e815
modular start.ini files and --download start option
2013-04-26 13:53:28 +10:00
12d9d77cd7
399463 add start.ini documentation for OPTIONS. Remove reference to start_config
2013-02-14 16:59:55 +01:00
330845b3ce
399463 add start.ini documentation for OPTIONS
2013-02-14 15:55:46 +01:00
b132663c2b
jetty-9 made WebAppContext configuration additive
2013-01-31 12:21:04 +11:00
e1c516c7d1
merge from jetty-8 and update license blocks.
2013-01-11 17:04:53 -06:00
863944873d
merge from 7 and update license blocks for 2013
2013-01-11 15:01:16 -06:00
a4dbb5823c
update license blocks for 2013
2013-01-11 14:57:51 -06:00
27c31fb403
jetty-9 organised imports. Cleaned up some TODOs
2013-01-11 16:37:32 +11:00
8d0e776b2a
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
jetty-start/src/main/resources/org/eclipse/jetty/start/start.config
jetty-util/src/main/java/org/eclipse/jetty/util/MultiPartInputStream.java
test-jetty-webapp/pom.xml
tests/test-integration/pom.xml
2013-01-07 12:47:32 +11:00
d2c2e8693f
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2013-01-07 10:38:48 +11:00
fc9cbbf876
397321 - Wrong condition in default start.config for annotations
2013-01-07 10:36:03 +11:00
346918577f
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
jetty-client/src/main/java/org/eclipse/jetty/client/AsyncHttpConnection.java
jetty-server/src/main/java/org/eclipse/jetty/server/AbstractHttpConnection.java
jetty-server/src/main/java/org/eclipse/jetty/server/Server.java
jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
jetty-servlets/src/main/java/org/eclipse/jetty/servlets/MultiPartFilter.java
jetty-servlets/src/test/java/org/eclipse/jetty/servlets/MultipartFilterTest.java
jetty-util/src/main/java/org/eclipse/jetty/util/MultiPartInputStream.java
jetty-util/src/test/java/org/eclipse/jetty/util/MultiPartInputStreamTest.java
jetty-webapp/src/test/java/org/eclipse/jetty/webapp/WebAppContextTest.java
test-jetty-servlet/src/main/java/org/eclipse/jetty/testing/ServletTester.java
test-jetty-webapp/src/main/java/com/acme/CookieDump.java
test-jetty-webapp/src/main/java/com/acme/HelloWorld.java
2012-12-22 15:12:17 +11:00
32e1d0f29c
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/Server.java
jetty-servlets/src/main/java/org/eclipse/jetty/servlets/MultiPartFilter.java
jetty-servlets/src/test/java/org/eclipse/jetty/servlets/MultipartFilterTest.java
2012-12-21 13:00:14 +11:00
7abd512b32
391623 - Making --stop with STOP.WAIT perform graceful shutdown
...
+ Moving jetty-start Monitor to jetty-server ShutdownMonitor and
using ShutdownThread to perform a graceful shutdown instead.
2012-12-04 10:18:54 -07:00
7488452e8a
Adding some debugging
2012-12-03 14:55:22 -07:00
f89909e301
jetty-9 cleaning up dependencies
2012-11-23 16:25:57 +11:00
9044819085
394671: Fix setting loglevel on commandline via -Dorg.eclipse.jetty.LEVEL=DEBUG
2012-11-20 16:21:42 +01:00
d67fdfdd85
Splitting out websocket-servlet to make it more friendly for WebAppClassloader
2012-11-12 19:42:32 -07:00
6b04056371
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
VERSION.txt
example-async-rest/async-rest-jar/pom.xml
example-async-rest/async-rest-webapp/pom.xml
example-async-rest/pom.xml
example-jetty-embedded/pom.xml
jetty-aggregate/jetty-all-server/pom.xml
jetty-aggregate/jetty-all/pom.xml
jetty-aggregate/jetty-client/pom.xml
jetty-aggregate/jetty-plus/pom.xml
jetty-aggregate/jetty-server/pom.xml
jetty-aggregate/jetty-servlet/pom.xml
jetty-aggregate/jetty-webapp/pom.xml
jetty-aggregate/jetty-websocket/pom.xml
jetty-aggregate/pom.xml
jetty-ajp/pom.xml
jetty-annotations/pom.xml
jetty-client/pom.xml
jetty-continuation/pom.xml
jetty-deploy/pom.xml
jetty-distribution/pom.xml
jetty-http-spi/pom.xml
jetty-http/pom.xml
jetty-io/pom.xml
jetty-jaspi/pom.xml
jetty-jmx/pom.xml
jetty-jndi/pom.xml
jetty-jsp/pom.xml
jetty-monitor/pom.xml
jetty-nested/pom.xml
jetty-nosql/pom.xml
jetty-osgi/jetty-osgi-boot-jsp/pom.xml
jetty-osgi/jetty-osgi-boot-warurl/pom.xml
jetty-osgi/jetty-osgi-boot/pom.xml
jetty-osgi/jetty-osgi-httpservice/pom.xml
jetty-osgi/pom.xml
jetty-osgi/test-jetty-osgi-context/pom.xml
jetty-osgi/test-jetty-osgi-webapp/pom.xml
jetty-osgi/test-jetty-osgi/pom.xml
jetty-overlay-deployer/pom.xml
jetty-plus/pom.xml
jetty-policy/pom.xml
jetty-rewrite/pom.xml
jetty-security/pom.xml
jetty-server/pom.xml
jetty-servlet/pom.xml
jetty-servlets/pom.xml
jetty-spdy/pom.xml
jetty-spdy/spdy-core/pom.xml
jetty-spdy/spdy-jetty-http-webapp/pom.xml
jetty-spdy/spdy-jetty-http/pom.xml
jetty-spdy/spdy-jetty/pom.xml
jetty-start/pom.xml
jetty-util/pom.xml
jetty-util/src/main/java/org/eclipse/jetty/util/MultiPartInputStream.java
jetty-webapp/pom.xml
jetty-websocket/pom.xml
jetty-xml/pom.xml
pom.xml
test-continuation/pom.xml
test-jetty-nested/pom.xml
test-jetty-servlet/pom.xml
test-jetty-webapp/pom.xml
tests/pom.xml
tests/test-integration/pom.xml
tests/test-loginservice/pom.xml
tests/test-sessions/pom.xml
tests/test-sessions/test-hash-sessions/pom.xml
tests/test-sessions/test-jdbc-sessions/pom.xml
tests/test-sessions/test-mongodb-sessions/pom.xml
tests/test-sessions/test-sessions-common/pom.xml
tests/test-webapps/pom.xml
tests/test-webapps/test-webapp-rfc2616/pom.xml
2012-11-06 16:12:00 +11:00
d4c4a7aee0
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2012-11-06 15:31:47 +11:00
fe09ca0e66
391623 Add option to --stop to wait for target jetty to stop
2012-11-06 14:35:37 +11:00
52464a5ba6
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java
jetty-annotations/src/main/java/org/eclipse/jetty/annotations/ResourceAnnotationHandler.java
jetty-client/src/test/java/org/eclipse/jetty/client/SslHttpExchangeTest.java
jetty-client/src/test/java/org/eclipse/jetty/client/SslSecurityListenerTest.java
jetty-deploy/src/main/java/org/eclipse/jetty/deploy/WebAppDeployer.java
jetty-deploy/src/main/java/org/eclipse/jetty/deploy/providers/ContextProvider.java
jetty-http/src/main/resources/org/eclipse/jetty/http/mime.properties
jetty-http/src/test/java/org/eclipse/jetty/http/HttpFieldsTest.java
jetty-io/src/main/java/org/eclipse/jetty/io/nio/SelectChannelEndPoint.java
jetty-jmx/src/main/java/org/eclipse/jetty/jmx/MBeanContainer.java
jetty-jmx/src/main/java/org/eclipse/jetty/jmx/ObjectMBean.java
jetty-overlay-deployer/src/main/java/org/eclipse/jetty/overlays/OverlayedAppProvider.java
jetty-plus/src/main/java/org/eclipse/jetty/plus/annotation/Injection.java
jetty-plus/src/main/java/org/eclipse/jetty/plus/security/DataSourceLoginService.java
jetty-proxy/src/main/java/org/eclipse/jetty/proxy/ProxyServlet.java
jetty-rewrite/src/main/java/org/eclipse/jetty/rewrite/handler/ProxyRule.java
jetty-security/src/main/java/org/eclipse/jetty/security/authentication/FormAuthenticator.java
jetty-server/src/main/java/org/eclipse/jetty/server/session/JDBCSessionIdManager.java
jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/proxy/ProxyHTTPSPDYConnection.java
jetty-spdy/spdy-jetty-http/src/main/java/org/eclipse/jetty/spdy/http/ServerHTTPSPDYAsyncConnection.java
jetty-start/src/main/java/org/eclipse/jetty/start/Main.java
jetty-util/src/main/java/org/eclipse/jetty/util/Fields.java
jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketClientFactory.java
jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketConnectionRFC6455.java
jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketClientTest.java
jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketMessageRFC6455Test.java
test-jetty-nested/src/main/java/org/eclipse/jetty/nested/Dump.java
test-jetty-webapp/src/main/java/com/acme/Dump.java
2012-11-02 14:08:05 +11:00
e076e8a8f0
393363 Use Locale.ENGLISH for all toUpperCase and toLowerCase calls
2012-11-02 13:19:07 +11:00
8723408731
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
...
Conflicts:
jetty-servlets/src/main/java/org/eclipse/jetty/servlets/MultiPartFilter.java
2012-11-02 13:17:53 +11:00
13f6940fc3
393363 Use Locale.ENGLISH for all toUpperCase and toLowerCase calls
2012-11-02 13:16:53 +11:00
b6cca66914
Fixing compile issue. File.getName(Locale) is not allowed.
2012-11-01 19:12:36 -07:00
65202e9abe
393363 Use Locale.ENGLISH for all toUpperCase and toLowerCase calls
2012-11-02 11:55:00 +11:00
a74c9f176c
392237 Split jaas from jetty-plus into jetty-jaas and port the test-jaas-webapp from codehaus
2012-10-29 18:21:37 +11:00
e4069c6939
392237 improved configuration defaults to match documentation
2012-10-22 17:48:41 +11:00
9a1972e142
Merge remote-tracking branch 'origin/jetty-8'
2012-10-22 15:17:45 +11:00
e8a77e7fce
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2012-10-21 20:20:04 +11:00
63ec4e4a39
392525 Add option to --stop-wait to specify timeout
2012-10-21 20:18:45 +11:00
2b13648b0e
392237 fixed many TODOs and many minor code cleanups
2012-10-19 16:17:30 +11:00
fac580c374
Merge remote-tracking branch 'origin/jetty-8' into jetty-9
...
Conflicts:
VERSION.txt
example-async-rest/async-rest-jar/pom.xml
example-async-rest/async-rest-webapp/pom.xml
example-async-rest/pom.xml
example-jetty-embedded/pom.xml
jetty-aggregate/jetty-all-server/pom.xml
jetty-aggregate/jetty-all/pom.xml
jetty-aggregate/jetty-client/pom.xml
jetty-aggregate/jetty-server/pom.xml
jetty-aggregate/jetty-servlet/pom.xml
jetty-aggregate/jetty-webapp/pom.xml
jetty-aggregate/jetty-websocket/pom.xml
jetty-aggregate/pom.xml
jetty-ajp/src/main/java/org/eclipse/jetty/ajp/Ajp13Generator.java
jetty-annotations/pom.xml
jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AbstractDiscoverableAnnotationHandler.java
jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationConfiguration.java
jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java
jetty-annotations/src/main/java/org/eclipse/jetty/annotations/ServletContainerInitializerListener.java
jetty-annotations/src/main/java/org/eclipse/jetty/annotations/ServletSecurityAnnotationHandler.java
jetty-annotations/src/main/java/org/eclipse/jetty/annotations/WebServletAnnotation.java
jetty-annotations/src/main/java/org/eclipse/jetty/annotations/WebServletAnnotationHandler.java
jetty-client/pom.xml
jetty-continuation/pom.xml
jetty-deploy/pom.xml
jetty-distribution/pom.xml
jetty-http-spi/pom.xml
jetty-http/pom.xml
jetty-http/src/main/java/org/eclipse/jetty/http/Generator.java
jetty-http/src/main/java/org/eclipse/jetty/http/HttpFields.java
jetty-http/src/main/java/org/eclipse/jetty/http/HttpGenerator.java
jetty-http/src/main/java/org/eclipse/jetty/http/HttpURI.java
jetty-http/src/main/java/org/eclipse/jetty/http/MimeTypes.java
jetty-http/src/test/java/org/eclipse/jetty/http/HttpFieldsTest.java
jetty-io/pom.xml
jetty-io/src/main/java/org/eclipse/jetty/io/AbstractBuffer.java
jetty-io/src/main/java/org/eclipse/jetty/io/Buffer.java
jetty-io/src/main/java/org/eclipse/jetty/io/BufferUtil.java
jetty-jaspi/pom.xml
jetty-jmx/pom.xml
jetty-jndi/pom.xml
jetty-jndi/src/main/java/org/eclipse/jetty/jndi/ContextFactory.java
jetty-jndi/src/test/java/org/eclipse/jetty/jndi/java/TestJNDI.java
jetty-jsp/pom.xml
jetty-monitor/pom.xml
jetty-nested/pom.xml
jetty-nosql/pom.xml
jetty-osgi/jetty-osgi-boot-jsp/pom.xml
jetty-osgi/jetty-osgi-boot-warurl/pom.xml
jetty-osgi/jetty-osgi-boot/pom.xml
jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/OSGiDeployer.java
jetty-osgi/jetty-osgi-httpservice/pom.xml
jetty-osgi/pom.xml
jetty-osgi/test-jetty-osgi-context/pom.xml
jetty-osgi/test-jetty-osgi-webapp/pom.xml
jetty-osgi/test-jetty-osgi/pom.xml
jetty-overlay-deployer/pom.xml
jetty-plus/pom.xml
jetty-policy/pom.xml
jetty-rewrite/pom.xml
jetty-runner/pom.xml
jetty-security/pom.xml
jetty-security/src/main/java/org/eclipse/jetty/security/ConstraintSecurityHandler.java
jetty-security/src/main/java/org/eclipse/jetty/security/authentication/FormAuthenticator.java
jetty-security/src/main/java/org/eclipse/jetty/security/authentication/LoginAuthenticator.java
jetty-security/src/test/java/org/eclipse/jetty/security/ConstraintTest.java
jetty-server/pom.xml
jetty-server/src/main/java/org/eclipse/jetty/server/AbstractHttpConnection.java
jetty-server/src/main/java/org/eclipse/jetty/server/AsyncHttpConnection.java
jetty-server/src/main/java/org/eclipse/jetty/server/HttpInput.java
jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
jetty-server/src/main/java/org/eclipse/jetty/server/Request.java
jetty-server/src/main/java/org/eclipse/jetty/server/Response.java
jetty-server/src/main/java/org/eclipse/jetty/server/bio/SocketConnector.java
jetty-server/src/main/java/org/eclipse/jetty/server/session/SessionHandler.java
jetty-server/src/test/java/org/eclipse/jetty/server/HttpServerTestBase.java
jetty-server/src/test/java/org/eclipse/jetty/server/HttpURITest.java
jetty-server/src/test/java/org/eclipse/jetty/server/ResponseTest.java
jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SelectChannelServerSslTest.java
jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SslSocketServerTest.java
jetty-server/src/test/resources/jetty-logging.properties
jetty-servlet/pom.xml
jetty-servlet/src/main/java/org/eclipse/jetty/servlet/DefaultServlet.java
jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletContextHandler.java
jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHolder.java
jetty-servlet/src/test/java/org/eclipse/jetty/servlet/DispatcherTest.java
jetty-servlets/pom.xml
jetty-servlets/src/main/java/org/eclipse/jetty/servlets/GzipFilter.java
jetty-servlets/src/main/java/org/eclipse/jetty/servlets/MultiPartFilter.java
jetty-servlets/src/test/java/org/eclipse/jetty/servlets/MultipartFilterTest.java
jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/GzipTester.java
jetty-spdy/pom.xml
jetty-spdy/spdy-client/pom.xml
jetty-spdy/spdy-core/pom.xml
jetty-spdy/spdy-example-webapp/pom.xml
jetty-spdy/spdy-http-server/pom.xml
jetty-spdy/spdy-jetty-http/src/main/java/org/eclipse/jetty/spdy/http/ServerHTTPSPDYAsyncConnection.java
jetty-start/pom.xml
jetty-start/src/test/java/org/eclipse/jetty/start/CommandLineBuilderTest.java
jetty-start/src/test/java/org/eclipse/jetty/start/MainTest.java
jetty-util-ajax/pom.xml
jetty-util/pom.xml
jetty-util/src/main/java/org/eclipse/jetty/util/MultiPartInputStream.java
jetty-util/src/main/java/org/eclipse/jetty/util/log/StdErrLog.java
jetty-util/src/test/java/org/eclipse/jetty/util/MultiPartInputStreamTest.java
jetty-webapp/pom.xml
jetty-webapp/src/main/java/org/eclipse/jetty/webapp/StandardDescriptorProcessor.java
jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java
jetty-websocket/pom.xml
jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketServletRFCTest.java
jetty-websocket/src/test/java/org/eclipse/jetty/websocket/helper/MessageSender.java
jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/UnitGenerator.java
jetty-xml/pom.xml
pom.xml
test-continuation/pom.xml
test-jetty-nested/pom.xml
test-jetty-servlet/pom.xml
test-jetty-webapp/pom.xml
test-jetty-webapp/src/main/webapp/WEB-INF/web.xml
tests/pom.xml
tests/test-integration/pom.xml
tests/test-loginservice/pom.xml
tests/test-sessions/pom.xml
tests/test-sessions/test-hash-sessions/pom.xml
tests/test-sessions/test-jdbc-sessions/pom.xml
tests/test-sessions/test-mongodb-sessions/pom.xml
tests/test-sessions/test-sessions-common/pom.xml
tests/test-webapps/pom.xml
tests/test-webapps/test-webapp-rfc2616/pom.xml
2012-10-12 21:19:21 +11:00
7625f0b8b3
Merge remote-tracking branch 'origin/master' into jetty-8
2012-10-11 16:34:16 +11:00
86b51e608f
391623 Add option to --stop to wait for target jetty to stop
2012-10-11 13:40:33 +11:00
68ee346b8a
jetty-9 combined the Container and AggregateLifeCycle into ContainerLifeCycle
2012-09-21 11:45:51 +10:00
de17f8ec45
Merge remote-tracking branch 'origin/master' into jetty-8
2012-09-20 17:03:21 +10:00
1c5d007384
389965 OPTIONS should allow spaces in comma separated list
2012-09-20 17:02:18 +10:00
2dfcebfc04
jetty-9 distribution working
2012-09-06 14:54:55 +10:00
06b2de17d5
Merge branch 'jetty-9-aggregation' into jetty-9-spdy-http
2012-08-24 11:52:29 +02:00
fd1ab0ed55
merge from master
2012-08-23 16:44:30 -05:00
2bd6cf2ebf
Merge branch 'master' of ssh://git.eclipse.org:29418/jetty/org.eclipse.jetty.project
2012-08-21 11:19:02 +02:00
1721a56c6d
369349: directory with spaces --dry-run fix
2012-08-20 19:16:03 +02:00
f137b5fc38
add space between license and header
2012-08-20 08:33:06 -05:00
5de0cee1eb
merge from master + license block standardization
2012-08-17 14:50:43 -05:00
00ed549898
standardize license header blocks
2012-08-16 19:11:27 -05:00
ab8e8578f8
Merge remote-tracking branch 'origin/master' into jetty-8
2012-07-23 15:35:01 +10:00
884aee31c0
385651 Message 'Address already in use' not specific enough
2012-07-23 15:29:39 +10:00
81d72052c8
merged master to jetty-8
2012-07-11 14:04:49 -05:00
aa941f5711
quick pass through to clean up missing or incorrect license blocks
2012-07-11 12:29:46 -05:00
a7b1dd5e93
Merge remote-tracking branch 'origin/master' into jetty-8
2012-06-07 00:59:37 +02:00
65ee9d0d34
381876 Monitor should wait for child to finish before exiting.
2012-06-07 00:05:04 +02:00
9149a69446
Merge remote-tracking branch 'origin/master' into jetty-8
2012-06-04 13:49:25 +02:00
1f0e25ffa0
Merge "381220: start.log rollover"
2012-06-02 03:57:33 -04:00
9d7fc6975b
381401 Print log warning when stop attempt made with incorrect STOP.KEY
2012-06-01 20:01:44 +02:00
Joakim Erdfelt
Greg Wilkins
Jesse McConnell
Simone Bordet
Jan Bartel
Thomas Becker