77fdfb8754
Updated ALPN version for JDK 8u60.
2015-09-21 16:19:48 +02:00
aca2aa56ad
475483 - Starting Jetty with [exec] should use properties file.
...
Added --exec-properties to allow the name of the properties file to be set
and for it not to be deleted on exit.
2015-08-21 09:03:26 +10:00
837a36e3ec
475483 - Starting Jetty with [exec] should use properties file.
...
Now using a properties file in case of [exec], and moved the
properties file inside the $jetty.base directory.
2015-08-20 15:04:04 +02:00
d02a5c3c8b
474361 - Handle JVM version extensions like -internal
...
+ Refreshed Version.java to handle parsing alternate syntaxes
+ Introduced Version.toShortString() for the non-suffixed versions
+ Using updated Version obj in StartArgs.setProperty("java.version")
to allow both normal System property access and arbitrary property
setting on command line to work in a consistent fashion.
2015-08-05 17:08:40 -07:00
aa75bcf078
Updated ALPN versions for JDK 8u51.
2015-07-28 16:23:08 +02:00
dea406d2b3
Updated ALPN versions for JDK 8u51.
2015-07-27 11:04:27 +02:00
9d8d56b401
Remove unused start property defaults
2015-06-19 15:38:43 +10:00
8e635001de
Use precompiled patterns
2015-06-19 15:36:57 +10:00
13b63c194b
Default values for properties in ini files
...
While this feature is not strictly needed, the patch contains some good code cleanups. So it will be applied and then the default feature
removed in a subsequent commit.
2015-06-19 15:27:47 +10:00
d6665f274c
Using static ref
2015-06-12 10:33:05 -07:00
d557d3cab0
Removed JDK 7 references.
2015-06-12 18:46:44 +02:00
7711789852
Updating start.jar & tests with new [version] behavior
2015-06-12 09:22:04 -07:00
ae3e9ac79a
469982 - Produce warning for dynamic modules with ini-templates seen during --add-to-start
...
+ Chaning Module.isVirtual() to Module.isDynamic()
+ Adding javadoc for Module.isDynamic()
+ Adding warning for builders on start.ini and start.d/*.ini with
dynamic modules with [ini-template] sections
2015-06-11 12:03:31 -07:00
c78f9e2b7c
Cleaning up unused testing bits
2015-06-11 07:01:05 -07:00
2672430b6b
469860 - Add module metadata versioning to support backwards compat
...
+ Tweaking defaults/ini section naming per discussion yesterday.
2015-06-11 06:54:25 -07:00
5d01c7f2f2
Using correct section
2015-06-10 16:20:07 -07:00
ac7e4e925c
469799 - Transitive module dependencies without ini templates are still added to ini
...
+ Fixing --add-to-start(d)=<>
2015-06-10 14:05:05 -07:00
d439113712
Making jetty.version discoverable via properties file on classpath too (for test cases)
2015-06-10 13:35:39 -07:00
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
8bbbb2ff54
469860 - Add module metadata versioning to support backwards compat
...
+ Added [version] section support to start.jar
+ Updated start testing to use as-is distro configuration for test cases
2015-06-10 10:42:40 -07:00
73147d2c8e
Revert "469341 jetty-startw template properties during --module enabling"
...
This reverts commit 6c2780b9cf
2015-06-09 16:14:32 -07:00
6c2780b9cf
469341 jetty-startw template properties during --module enabling
2015-06-04 13:43:14 +10:00
6cabf8452e
468347 - Fix modules/debuglog.mod.
2015-05-26 18:22:22 +02:00
3323a4e88d
Updated property names: sslConfig -> sslContext.
2015-05-26 18:03:55 +02:00
2b53c98112
467165 - Add --skip-file-validation to start.jar --help output
...
+ Added to usage.txt
2015-05-14 15:28:26 -07:00
d09aa16142
Removing unused text
2015-05-14 15:28:23 -07:00
a423416f6f
pretty print dry-run only in debug mode
2015-05-14 14:01:25 +10:00
e91d3dd18e
466647 - Add ${jetty.tag.version} property and expand URL properties
...
+ Add missing Props.expand(String) for:
* the --add-to-start(d) options
* the Module.hasFiles() method
2015-05-06 19:09:30 -07:00
151df819af
466647 - Add ${jetty.tag.version} property and expand URL properties
...
+ Adding ${jetty.tag.version}
* If Implementation-Version is defined, then it will use it
* If Implementation-Version contains "-SNAPSHOT" then "master" is used
* If no Implementation-Version found, then it uses "master"
2015-05-06 16:23:47 -07:00
3a0a85ebc9
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
2015-05-01 09:43:20 -07:00
2271464406
430951 Support SNI with ExtendedSslContextFactory
...
Made modules do automatic selection of Extended SSL Context if running java 8
2015-05-01 15:50:06 +10:00
194b1d349a
Fixing build on OSX
2015-04-30 19:15:17 -07:00
2fce87ee2f
Fixing test path assumptions on OSX
2015-04-30 17:20:01 -07:00
2a86d49ab4
465867 - Implement --skip-file-validation=<module>
...
+ Adding --skip-file-validation=<module> support
2015-04-30 12:08:45 -07:00
fb958833de
464419 Removed xinetd support
2015-04-30 16:44:23 +10:00
f7adc1aa5f
464727 - Update Javadoc for Java 8 DocLint
2015-04-22 18:37:55 -07:00
fb58ca79c0
Bug 464442 - Enable parallel class loading
...
Change-Id: If23cc99214efe8d3a75d0ab0d337020524b6709f
Signed-off-by: Philippe Marschall <philippe.marschall@netcetera.ch>
2015-04-22 02:28:37 -04:00
09b5f680b7
464727 - Update Javadoc for Java 8 DocLint
...
Eliminate empty tag warnings
+ Changed <p/> to <p>
+ Changed <br/> to <br>
2015-04-15 14:38:35 -07:00
b26552cbb5
Merged branch 'jetty-9.2.x' into 'master'.
2015-04-15 19:21:11 +02:00
6fa863d6be
Updated ALPN and NPN versions for JDK 7u79, 7u80 and 8u45.
2015-04-15 19:09:46 +02:00
fd158a231b
460671 - Rationalize property names.
...
Fixed typos.
2015-04-14 22:11:59 +02:00
f4a6b4b5eb
460671 - Rationalize property names.
...
Made requestlog use a similar configuration to logging and debugmod modules.
2015-04-14 22:11:59 +02:00
76080faaf0
464633 - Change Selection.how to Selection.criteria
2015-04-14 12:05:05 -07:00
d9ffed0a07
451973 - Ambiguous module init location when mixing --add-to-start & --add-to-startd in the same exec
...
+ In case of ambiguous selection, defaults to start.ini, with warning
message
2015-04-14 12:05:05 -07:00
05784f46b4
464555 - ALPN module download attempts to download jar before dir exists
...
+ Ensure directory exists for output before download is attempted.
2015-04-13 17:37:24 -07:00
0e2b1856b5
464556 - Restrict start module downloads to ${jetty.base} paths only
...
+ Restrict [files] section references (download/uri/maven) to
output only in ${jetty.base} tree
2015-04-13 17:37:24 -07:00
cea577bd17
463144 - modules do not see pre-downloaded ALPN libs
...
+ Test all BaseHome configured locations for download file existence.
2015-04-13 17:37:24 -07:00
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
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
1cb0449be3
Organised imports
2015-03-26 12:32:15 +11:00
1d99c0af7b
Merge remote-tracking branch 'origin/jetty-9.2.x'
2015-03-25 14:00:23 +11:00
8c652fd5bd
462546 - ShutdownMonitor should bind to jetty.host
...
Added STOP.HOST system property. jetty.host is specific to a connector and a server may listen to many hosts
2015-03-25 13:58:19 +11:00
d20c7707b7
Merged branch 'jetty-9.2.x' into 'master'.
2015-03-24 20:56:26 +01:00
3b31d6aa12
Added ALPN files for JDK 8u40.
2015-03-24 12:52:16 +01:00
6e952d4618
Merge branch 'jetty-9.2.x'
...
Conflicts:
jetty-start/src/main/java/org/eclipse/jetty/start/Main.java
jetty-start/src/test/java/org/eclipse/jetty/start/LicensingTest.java
2015-03-16 10:25:15 -07:00
4a41317501
459273 - Redundant license notices
...
+ Adding missing .hasFiles() check in download path.
2015-03-13 13:35:04 -07:00
a32c9ed79c
Merge branch 'jetty-9.2.x'
...
Conflicts:
jetty-http/src/main/java/org/eclipse/jetty/http/HttpParser.java
jetty-start/src/main/java/org/eclipse/jetty/start/Main.java
jetty-start/src/main/java/org/eclipse/jetty/start/Module.java
2015-02-23 18:05:19 -07:00
2141cc2dc3
459273 - Redundant license notices
...
+ Only showing license acknowledgement request screen
if [FILES] section contains content that does not (yet) exist
2015-02-23 16:49:07 -07:00
7bb3127ee1
Making jetty-start test cases more aligned with real distro configuration
2015-02-19 16:23:40 -07:00
4b6d024c85
Using webdefault.xml from jetty-distribution in test cases
2015-02-18 12:39:06 -07:00
2c9edae231
459681 Remove Glassfish JSP in favor of Apache JSP
...
+ Fixed names in apache-jsp and apache-jstl modules
+ Updated jetty-start tests to better represent new distribution
structure.
2015-02-18 11:46:58 -07:00
f7b9206b2e
Eliminating final protonego references
2015-02-12 10:14:01 -07:00
cab76950e1
459655 - Remove SPDY and NPN
...
+ Removed src/test/resources/usecases/home
+ Updated src/test/resources/dist-home to represent current distribution
configuration for Jetty 9.3.0 without SPDY or NPN
+ Changed all test cases to use new dist-home
+ Refactored TestUseCases and TestBaseUseCases for @Parameterized and
consistent naming in src/test/resources/usecases/
2015-02-11 10:05:51 -07:00
b073e4f52c
Fixed URIs in NPN and ALPN *.mod files.
2015-01-30 16:18:10 +01:00
1ccd0d0dba
Merged branch 'jetty-9.2.x' into 'master'.
2015-01-30 12:08:27 +01:00
4c751e10e1
Updated ALPN and NPN versions.
...
NPN to version 1.1.10.v20150130 for OpenJDK 7u75 and 7u76.
ALPN to version 7.1.3.v20150130 for OpenJDK 7u75 and 7u76,
and to version 8.1.3.v20150130 for OpenJDK 8u31.
2015-01-30 11:55:28 +01:00
a3201a3c81
Happy New Year 2015
2015-01-07 17:06:59 -07:00
6a0668b7a1
Happy New Year 2015
2015-01-07 17:03:30 -07:00
3fddabbba0
Updated ALPN version to 7.1.2.v20141202 and 8.1.2.v20141202 in *.mod files.
2014-12-02 17:49:31 +01:00
12b25b786e
Updated ALPN version to 7.1.2.v20141202 and 8.1.2.v20141202 in *.mod
...
files.
2014-12-02 17:42:51 +01:00
1d12decce7
changing .getEnabled() to .getSelected()
2014-11-20 16:25:00 -07:00
9ea0b74f73
Tweaking output of selected modules tree in --list-modules to be more clear
2014-11-20 16:25:00 -07:00
69daa8d76d
Cleanup of no longer needed code.
...
+ Removing Modules.normalizeDependencies()
+ Using Modules.resolveNode() instead
+ Chaning Modules.resolveNode() to not throw Exception
2014-11-20 09:53:02 -07:00
df9414eab2
Making test failure message more meaningful (including full stacktrace)
2014-11-20 09:52:33 -07:00
2020e07243
Removing test noise
2014-11-20 09:52:10 -07:00
1604cffc0b
Fixing HowUniquePredicate
2014-11-20 08:48:35 -07:00
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
466fce4b80
452329 - Transitive modules in start.jar --add-to-start(d) are not added if enabled already in tree
...
+ Modules can now be re-added.
based on the node.selection.how == name
and all other node selections must
be node.selection.explicit == false
2014-11-19 17:32:12 -07:00
9d3852cb98
Fixing build
2014-11-19 17:00:48 -07:00
7b5b81e76f
Ignoring failing test
2014-11-19 17:00:27 -07:00
d786c4a57e
452322 - Restore progress messages for --add-to-start(d) use
2014-11-19 16:57:52 -07:00
89baf907b6
452323 - Start --list-config makes no hint on transitive enabled modules
...
+ Eliminating lots of now dead code (#uncoding)
+ Making ambiguous add detection more sane.
2014-11-19 16:42:55 -07:00
005b513653
452323 - Start --list-config makes no hint on transitive enabled modules
...
+ Refactoring out the Graph + Node logic into its own package
+ Changing Matcher to Predicate
+ Introducing new Node.selection Set which tracks how the various nodes
are selected, along with with ability to track directly selected (aka
explicit) vs transitive.
+ Module now extends from Node
+ Modules now extends from Graph<Module>
2014-11-19 15:59:54 -07:00
1561de0f81
Cleaning up resolveEnabled() deprecation
2014-11-19 10:27:25 -07:00
88900593de
Fixing 2 typos
2014-11-17 13:56:55 -07:00
dbf6f2e644
451973 - Ambiguous module init location when mixing --add-to-start & --add-to-startd in the same exec
...
+ Cleaning up entire base buildout into BaseBuilder class
+ The management of the configuration is maintained in
- StartDirBuilder
- StartIniBuilder
+ The buildout of the directories from the [files] section is now
maintained by the BaseBuilder itself.
+ Using new FileInitializer system as well
+ Using new Licensing system as well
2014-11-17 13:21:01 -07:00
61e480c2c1
451974 - Combine multiple start license acknowledgement into one
...
+ Initial work to combine licensing into a single event
Depends on work from bug #451973
2014-11-17 13:20:12 -07:00
453ab6d5c7
Supporting optional use of maven local repository for download content
2014-11-14 12:15:07 -07:00
ccaddc5d43
Working on utility to update maven refs
2014-11-14 09:53:18 -07:00
15bf5b02f8
Updating Main.initFiles() to be extensible
2014-11-13 14:23:26 -07:00
50b6391be1
Merge remote-tracking branch 'origin/jetty-9.2.x'
...
Conflicts:
VERSION.txt
aggregates/jetty-all/pom.xml
apache-jsp/pom.xml
apache-jstl/pom.xml
examples/async-rest/async-rest-jar/pom.xml
examples/async-rest/async-rest-webapp/pom.xml
examples/async-rest/pom.xml
examples/embedded/pom.xml
examples/pom.xml
jetty-alpn/jetty-alpn-client/pom.xml
jetty-alpn/jetty-alpn-server/pom.xml
jetty-alpn/pom.xml
jetty-annotations/pom.xml
jetty-ant/pom.xml
jetty-cdi/pom.xml
jetty-client/pom.xml
jetty-continuation/pom.xml
jetty-deploy/pom.xml
jetty-distribution/pom.xml
jetty-fcgi/fcgi-client/pom.xml
jetty-fcgi/fcgi-server/pom.xml
jetty-fcgi/pom.xml
jetty-http-spi/pom.xml
jetty-http/pom.xml
jetty-io/pom.xml
jetty-jaas/pom.xml
jetty-jaspi/pom.xml
jetty-jmx/pom.xml
jetty-jndi/pom.xml
jetty-jsp/pom.xml
jetty-jspc-maven-plugin/pom.xml
jetty-maven-plugin/pom.xml
jetty-monitor/pom.xml
jetty-nosql/pom.xml
jetty-osgi/jetty-osgi-alpn/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/jetty-osgi-npn/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-plus/pom.xml
jetty-proxy/pom.xml
jetty-quickstart/pom.xml
jetty-rewrite/pom.xml
jetty-runner/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-alpn-tests/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-client-transport/pom.xml
jetty-spdy/spdy-http-common/pom.xml
jetty-spdy/spdy-http-server/pom.xml
jetty-spdy/spdy-npn-tests/pom.xml
jetty-spdy/spdy-server/pom.xml
jetty-spring/pom.xml
jetty-start/pom.xml
jetty-util-ajax/pom.xml
jetty-util/pom.xml
jetty-webapp/pom.xml
jetty-websocket/javax-websocket-client-impl/pom.xml
jetty-websocket/javax-websocket-server-impl/pom.xml
jetty-websocket/pom.xml
jetty-websocket/websocket-api/pom.xml
jetty-websocket/websocket-client/pom.xml
jetty-websocket/websocket-common/pom.xml
jetty-websocket/websocket-server/pom.xml
jetty-websocket/websocket-servlet/pom.xml
jetty-xml/pom.xml
pom.xml
tests/pom.xml
tests/test-continuation/pom.xml
tests/test-integration/pom.xml
tests/test-loginservice/pom.xml
tests/test-quickstart/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-jaas-webapp/pom.xml
tests/test-webapps/test-jetty-webapp/pom.xml
tests/test-webapps/test-jndi-webapp/pom.xml
tests/test-webapps/test-mock-resources/pom.xml
tests/test-webapps/test-proxy-webapp/pom.xml
tests/test-webapps/test-servlet-spec/pom.xml
tests/test-webapps/test-servlet-spec/test-container-initializer/pom.xml
tests/test-webapps/test-servlet-spec/test-spec-webapp/pom.xml
tests/test-webapps/test-servlet-spec/test-web-fragment/pom.xml
tests/test-webapps/test-webapp-rfc2616/pom.xml
2014-11-05 10:36:57 +11:00
04fc803b0e
448446 - org.eclipse.jetty.start.Main create classloader duplicate
...
+ Reuse ClassLoader instead.
2014-11-04 15:04:30 -07:00
1d88eab518
Merge branch 'jetty-9.2.x'
...
Conflicts:
jetty-start/src/main/java/org/eclipse/jetty/start/Main.java
2014-11-03 10:19:49 -07:00
214246061e
449291 - --create-files downloads without license
...
+ Adding dist-home replicationa real distribution
Adding RebuildTestResources.java to help rebuild this dist-home
occasionally. There is no need to keep this directory up to date
as religiously and frequently as the main distribution.
+ Adding LicenseTest.java to test various licensing scenarios
+ Added ability to ask for license via --create-files flows
2014-11-03 10:18:18 -07:00
153dd4023e
Removing support for module [ini-template] use of --module=<name>
...
+ That form of use is not recommended during --add-to-start
+ Should encourage use of [depend] section instead
2014-11-03 09:19:05 -07:00
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
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
a6e00bc642
Merge remote-tracking branch 'origin/jetty-9.2.x'
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/handler/ResourceHandler.java
jetty-util/src/test/java/org/eclipse/jetty/util/resource/AbstractFSResourceTest.java
2014-10-30 14:36:50 +11:00
7cbd3c0488
440925 - NPE when using relative paths for --start-log-file
2014-10-29 16:25:55 -07:00
8899f6d360
Merge branch 'jetty-9.2.x'
...
Conflicts:
VERSION.txt
2014-10-29 15:52:05 -07:00
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
7c40c0e2be
Removing 2 second sleep
2014-10-29 14:33:46 -07:00
8a72a153a1
Merge branch 'jetty-9.2.x'
2014-10-28 12:32:55 -07:00
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
f4f600ff05
Code cleanup (post-merge)
2014-10-28 09:45:25 -07:00
607a560ebd
Merge branch 'jetty-9.2.x' into cdi-testing
2014-10-28 09:36:34 -07:00
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
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
6ff43a0af1
Merge branch 'jetty-9.2.x' into cdi-testing
2014-10-27 13:42:30 -07:00
6268421dd0
Merged branch 'jetty-9.2.x' into 'master'.
2014-10-16 18:05:12 +02:00
6f42d21ed5
446063 - ALPN Fail SSL Handshake if no supported Application Protocols.
2014-10-16 15:31:24 +02:00
890d7a8d1f
Merged branch 'jetty-9.2.x' into 'master'.
2014-10-13 22:01:20 +02:00
9796457dfc
446672 - NPN Specification issue in the case no protocols are selected.
2014-10-13 21:27:11 +02:00
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
67db9e67de
Merge branch 'jetty-9.2.x' into cdi-testing
2014-10-09 12:42:14 -07:00
2f696e87bd
445258 - STOP.WAIT is not really respected
...
Fixing stupid typo / copy / paste bug
2014-10-08 15:01:05 -07:00
bf7637a2df
Reworking cdi-webapp-it to also use new cdi module
2014-09-26 17:16:35 -07:00
5507e267ae
Merge remote-tracking branch 'origin/master' into jetty-http2
...
Conflicts:
jetty-server/src/main/config/etc/jetty-https.xml
jetty-server/src/main/config/modules/ssl.mod
jetty-start/src/main/java/org/eclipse/jetty/start/Modules.java
2014-08-29 15:49:25 +10:00
69390954dc
435322 acceptor and selector configuration/priority
2014-08-29 15:36:19 +10:00
b02cdc10c1
Merge remote-tracking branch 'origin/master' into jetty-http2
2014-08-22 16:11:47 +10:00
589d05afe0
Added 3rd party module licenses
2014-08-22 11:48:55 +10:00
23eba39748
Merge remote-tracking branch 'origin/master' into jetty-http2
2014-08-21 16:39:45 +10:00
af27566d2b
fixed JSP issues
2014-08-21 11:42:21 +10:00
c1b66a3ea3
Fixed start.jar property as properties issue
2014-08-21 10:45:28 +10:00
7700d1ce53
Testcase is sensitive to System Property from other tests.
...
+ Making the testcase for PathFinderTest not discover jetty.base, as
this value can be obtained from System Property (set from another
test case) giving false success/failure based on run order.
2014-08-19 10:33:04 -07:00
287e86b7aa
decomposed https,http2 and spdy modules to share ServerConnector
2014-08-07 12:58:12 +10:00
3a6879d3e8
expanded tabs in indents
2014-07-23 16:49:05 +10:00
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
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
bad3165d8a
Fixing jdk 8 test failure
2014-06-25 08:24:24 -07:00
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
605f32b022
Adding extra tests for bad startup configurations
2014-06-18 10:32:38 -07:00
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
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
424e421439
Added JDK 7u60 files and configuration for NPN and ALPN.
2014-06-11 18:45:45 +02:00
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
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
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
0c54ad2f20
432321 - jetty-start / Allow defining extra start directories for common configurations
...
+ Updating usage.txt
2014-06-06 08:40:52 -07:00
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
7ee2f4e367
Fixing extraneous output and duplicate ${jetty.base}/${jetty.base} references when using --add-to-startd
2014-06-04 11:24:42 -07:00
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
bbab2e7832
436524 - Start / Downloadable [files] references in modules cannot use ":" themselves
...
+ Switching out support for ":" to "|"
2014-06-03 17:09:48 -07:00
bbd3774e38
Adjusting --exec to [exec]
2014-05-26 07:43:57 -07:00
92ffcfc0f8
expand properties on command line for exec
2014-05-26 16:16:33 +02:00
0d70ae87b2
turn off startlog redirect when starting
2014-05-26 00:46:32 +02:00
5edf15241b
started mechanism uses Properties
...
list Properties in --dry-run
fix start log file
2014-05-25 22:54:15 +02:00
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
51324a2786
434505 Allow property files on start.jar command line
...
Signed-off-by: Tom Zeller<tzeller@dragonacea.biz>
(cherry picked from commit d621df3c34
2014-05-13 12:31:06 +02:00
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
5db6f65354
Increasing visibility for Ben
2014-05-08 14:08:13 -07:00
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
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
60f2200184
Merged branch 'jetty-9.1.x' into 'master'.
2014-04-16 11:10:18 +02:00
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
348cd406c8
Removing deprecated methods
2014-04-15 14:54:19 -07:00
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
641fa869fa
381220: start.log rollover
2012-06-01 16:42:02 +02:00
34954bc617
Merge remote-tracking branch 'origin/master' into jetty-8
2012-05-22 17:28:40 +02:00
d7fec35028
379116: start.jar fix to shutdown child processes with --exec. Remove finally block and replace with a shutdown hook in _exec if branch.
...
Change-Id: I85af53090a2797f433aca22276b413762999a477
2012-05-10 17:04:47 +02:00
17269583fb
Merge remote-tracking branch 'origin/master' into jetty-8
2012-03-30 12:05:46 +11:00
22f437c36d
375490 NPE with --help on command line
2012-03-28 14:47:27 +11:00
64e526dad4
Remove duplicate websocket entry in start.config
2012-03-15 10:47:16 +11:00
c7b42cdb06
Merge remote-tracking branch 'origin/master' into jetty-8
2012-02-29 20:07:33 +11:00
c95da2aa18
372806 Command line should accept relative paths for xml config files
2012-02-29 18:09:29 +11:00
6b079ae3d8
merge from master
2012-02-01 17:25:08 -06:00
449302bcde
369349: fix --exec classpath issue, spaces in directory names fix
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2012-02-01 19:04:09 +11:00
b20c0ae45c
Bug 370120 - jvm arguments added via start.ini and --exec are missing spaces
...
+ moving from Runtime.exec() to ProcessBuilder/Process.start()
2012-01-30 17:02:29 -07:00
f02244fbf6
Merge branch 'dryrun-with-spaces'
2012-01-30 15:51:19 -07:00
b7e9d701d5
Bug 369349 - space in filename fix broke integration tests
...
+ fixing argument escaping so that it works with test-integration and
jetty-osgi
2012-01-30 15:35:31 -07:00
b9590a575d
Bug 369349 - space in filename fix broke integration tests
...
+ adding more tests for binary in command line.
2012-01-30 13:01:50 -07:00
b56f1bdcdf
Bug 369349 - space in filename fix broke integration tests
...
+ Attempting to fix space and quote issues with new CommandLineBuilder
class and tests.
2012-01-30 12:03:03 -07:00
cd7ae20778
370120 - jvm arguments added via start.ini and --exec are missing spaces
...
+ Allow jetty.version to be overridden via jetty.version system
property.
2012-01-30 10:01:13 -07:00
9f667257f1
370120: --exec jvm arguments missing spaces fix
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2012-01-30 09:17:59 -07:00
40963a884e
Revert "Making --dry-run work with paths that have spaces"
...
This reverts commit 3df95d45c2
2012-01-30 09:17:53 -07:00
49198a8a5c
Revert "369349 replace quotes with a space escape method"
...
This reverts commit bc5ac3622a
2012-01-30 09:17:48 -07:00
c918bb4e3c
Merge branch 'master' into jetty-8
2012-01-25 10:31:44 -06:00
bc5ac3622a
369349 replace quotes with a space escape method
2012-01-23 13:13:28 +11:00
3df95d45c2
Making --dry-run work with paths that have spaces
2012-01-20 11:27:38 -07:00
3f172067c4
Fixing tests so that when run on a CI within jetty itself,
2012-01-20 11:12:26 -07:00
1fbec51c8a
Merge remote-tracking branch 'origin/master' into jetty-8
2012-01-10 16:08:59 +11:00
58c57a9ea0
367635: report errors
2012-01-09 11:24:25 +11:00
48438dc914
367635: Add test for parsing start.d files, small changes
2012-01-09 11:23:24 +11:00
3141b50fa0
Merge remote-tracking branch 'origin/master' into jetty-8
2011-12-30 20:19:39 +11:00
f62c6edcb9
367635 Added support for start.d directory
2011-12-30 09:43:20 +11:00
de005c68fd
Revert "Merge branch 'release-8'"
...
This reverts commit 9e72457941df12605f0e
2011-11-30 16:27:30 +11:00
32dbb1bddb
Merge remote-tracking branch 'origin/master' into jetty-8
...
Conflicts:
VERSION.txt
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/pom.xml
jetty-ajp/pom.xml
jetty-annotations/pom.xml
jetty-client/pom.xml
jetty-continuation/pom.xml
jetty-deploy/pom.xml
jetty-deploy/src/main/config/etc/jetty-deploy.xml
jetty-distribution/pom.xml
jetty-http/pom.xml
jetty-io/pom.xml
jetty-jaspi/pom.xml
jetty-jmx/pom.xml
jetty-jndi/pom.xml
jetty-jsp-2.1/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-jsp/src/main/java/org/eclipse/jetty/osgi/boot/jsp/FragmentActivator.java
jetty-osgi/jetty-osgi-boot-logback/pom.xml
jetty-osgi/jetty-osgi-boot-warurl/pom.xml
jetty-osgi/jetty-osgi-boot/pom.xml
jetty-osgi/jetty-osgi-equinoxtools/pom.xml
jetty-osgi/jetty-osgi-httpservice/pom.xml
jetty-osgi/jetty-osgi-servletbridge/pom.xml
jetty-osgi/jetty-osgi-servletbridge/src/main/java/org/eclipse/jetty/osgi/servletbridge/FrameworkLauncherExtended.java
jetty-osgi/jetty-osgi-servletbridge/src/main/webapp/WEB-INF/web.xml
jetty-osgi/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-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
jetty-servlet/pom.xml
jetty-servlets/pom.xml
jetty-start/pom.xml
jetty-util/pom.xml
jetty-webapp/pom.xml
jetty-websocket/pom.xml
jetty-xml/pom.xml
pom.xml
test-continuation-jetty6/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-sessions-common/pom.xml
tests/test-webapps/pom.xml
tests/test-webapps/test-webapp-rfc2616/pom.xml
2011-10-04 17:45:15 +11:00
76c0479ed3
JETTY-1439 space in directory installation path causes classloader problem
2011-09-28 11:26:24 +10:00
236bd193e0
Merge remote-tracking branch 'origin/master' into jetty-8
...
Conflicts:
VERSION.txt
jetty-server/src/main/java/org/eclipse/jetty/server/SessionManager.java
jetty-server/src/main/java/org/eclipse/jetty/server/session/AbstractSessionManager.java
jetty-server/src/main/java/org/eclipse/jetty/server/session/SessionHandler.java
2011-07-11 14:54:23 +10:00
86f7e76c4d
Merge of jetty-7 into jetty-8
...
Conflicts:
VERSION.txt
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/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/pom.xml
jetty-io/pom.xml
jetty-jaspi/pom.xml
jetty-jmx/pom.xml
jetty-jndi/pom.xml
jetty-jsp-2.1/pom.xml
jetty-nested/pom.xml
jetty-osgi/jetty-osgi-boot-jsp/pom.xml
jetty-osgi/jetty-osgi-boot-logback/pom.xml
jetty-osgi/jetty-osgi-boot-warurl/pom.xml
jetty-osgi/jetty-osgi-boot/META-INF/MANIFEST.MF
jetty-osgi/jetty-osgi-boot/pom.xml
jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/OSGiAppProvider.java
jetty-osgi/jetty-osgi-equinoxtools/META-INF/MANIFEST.MF
jetty-osgi/jetty-osgi-equinoxtools/pom.xml
jetty-osgi/jetty-osgi-equinoxtools/src/main/java/org/eclipse/jetty/osgi/equinoxtools/console/EquinoxConsoleContinuationServlet.java
jetty-osgi/jetty-osgi-httpservice/pom.xml
jetty-osgi/jetty-osgi-servletbridge/pom.xml
jetty-osgi/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-servlets/src/main/java/org/eclipse/jetty/servlets/ProxyServlet.java
jetty-start/pom.xml
jetty-util/pom.xml
jetty-webapp/pom.xml
jetty-websocket/pom.xml
jetty-xml/pom.xml
pom.xml
test-continuation-jetty6/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-sessions-common/pom.xml
tests/test-webapps/pom.xml
tests/test-webapps/test-webapp-rfc2616/pom.xml
2011-07-11 12:05:58 +10:00
8babf3ae17
351576 Do not use deprecated method File.toURL()
2011-07-08 17:21:02 -04:00
17e907c2fb
git diff 54e885d967 remotes/origin/jetty-8-historical | patch -p1 ; git add -A
2011-07-07 18:18:24 +10:00
4840dbf39f
347717 start.jar destroys dependent child of --exec
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3359 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-31 03:39:42 +00:00
412db03d50
remove unsupported and deprecated --secure option, use jetty-policy.xml configuration instead with the policy OPTION
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3116 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-10 21:51:21 +00:00
9b1f8d3889
343172 Check package implementor for version
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3084 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-06 06:31:21 +00:00
48fb924a46
cleanups for demo
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3078 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-06 05:55:03 +00:00
57c2cc31fa
343482 refactored overlay deployer layout to use WAR layout - work in progress
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3032 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-27 00:51:08 +00:00
505a44d56c
336668 policy supports cert validation, refactored jetty policy to support better reload mechanism
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2802 7e9141cc-0065-0410-87d8-b60c137991c4
2011-02-18 21:07:22 +00:00
0b41841e0a
335641 added a sweep to check for error
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2728 7e9141cc-0065-0410-87d8-b60c137991c4
2011-02-02 20:09:47 +00:00
892bd690e0
Bug 333771 - System properties are not available inside XML configuration
...
file by using the 'property' tag.
* Made lookups of Properties by the Start Config use Jetty Property then
System Properties, and lastly default values when requested.
* Made XmlConfiguration use layered property lookup from Start Config,
benefitting XmlConfiguration of the same logic.
* Made all use of Start Config.getProperty() use static references
per the method signature.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2646 7e9141cc-0065-0410-87d8-b60c137991c4
2011-01-10 18:10:15 +00:00
d43b6faaac
Bug 333875 - Monitor class constructor now public
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2641 7e9141cc-0065-0410-87d8-b60c137991c4
2011-01-10 15:16:21 +00:00
Simone Bordet
Greg Wilkins
Joakim Erdfelt
Greg Wilkins
Philippe Marschall
Jesse McConnell
Jan Bartel
Thomas Becker
Jan Bartel
Michael Gorovoy
Greg Wilkins
Joakim Erdfelt