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
91e0e981aa
330764 Command line properties passed to start.jar --exec
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2547 7e9141cc-0065-0410-87d8-b60c137991c4
2010-11-22 04:01:25 +00:00
59f5bcce5b
330265 start.jar --stop kills --exec subprocess
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2534 7e9141cc-0065-0410-87d8-b60c137991c4
2010-11-17 22:41:33 +00:00
095d728f31
improved help and debugging
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2490 7e9141cc-0065-0410-87d8-b60c137991c4
2010-11-10 21:04:14 +00:00
5e6bcdc009
removed debug println
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2476 7e9141cc-0065-0410-87d8-b60c137991c4
2010-11-07 23:38:03 +00:00
0e6f62664d
323985 Xmlconfiguration pulls start.jar config properties
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2326 7e9141cc-0065-0410-87d8-b60c137991c4
2010-10-06 23:43:14 +00:00
7982f19471
removed debug
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2302 7e9141cc-0065-0410-87d8-b60c137991c4
2010-09-28 04:27:57 +00:00
ee2d8e635e
#323985 renames to clarify code
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2258 7e9141cc-0065-0410-87d8-b60c137991c4
2010-09-08 06:09:05 +00:00
46c4b7daa7
319519 Warn about duplicate configuration files
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2108 7e9141cc-0065-0410-87d8-b60c137991c4
2010-07-12 15:48:20 +00:00
3b5c2dd465
317906 OPTIONS correctly handles TRACE
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2056 7e9141cc-0065-0410-87d8-b60c137991c4
2010-06-28 14:53:12 +00:00
fe6a6e86ed
315748 made --daemon log non appendable
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1930 7e9141cc-0065-0410-87d8-b60c137991c4
2010-06-07 00:21:42 +00:00
cf039140fb
315748 added --pre support in start.jar
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1929 7e9141cc-0065-0410-87d8-b60c137991c4
2010-06-07 00:02:08 +00:00
2dee039305
Minor cleanup of Main. adding System.exit codes, using System.err more consistently. Adding write checks to --daemon
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1926 7e9141cc-0065-0410-87d8-b60c137991c4
2010-06-04 23:19:15 +00:00
0cbb47daba
315748 add --daemon
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1921 7e9141cc-0065-0410-87d8-b60c137991c4
2010-06-04 16:00:32 +00:00
b3c156a988
315748 Removed --fromDaemon from start.jar
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1919 7e9141cc-0065-0410-87d8-b60c137991c4
2010-06-04 11:02:16 +00:00
78587f820c
315744 Fixed STOP.PORT and STOP.KEY in start.jar
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1918 7e9141cc-0065-0410-87d8-b60c137991c4
2010-06-04 10:05:32 +00:00
d127e61569
288563
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1877 7e9141cc-0065-0410-87d8-b60c137991c4
2010-05-26 14:02:22 +00:00
71a5df65f0
improved README.txt
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1839 7e9141cc-0065-0410-87d8-b60c137991c4
2010-05-22 08:01:18 +00:00
21ca5db320
Fixing javadoc
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1771 7e9141cc-0065-0410-87d8-b60c137991c4
2010-05-12 22:42:20 +00:00
cc6b89040f
310094 Improved start.jar options handling and configs
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1682 7e9141cc-0065-0410-87d8-b60c137991c4
2010-05-03 23:01:42 +00:00
9b9cdd45fd
Fixes #308865 (Update test suite to JUnit4 - Module jetty-start).
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1633 7e9141cc-0065-0410-87d8-b60c137991c4
2010-04-30 15:18:24 +00:00
4fe6fa388f
310094 Improved start.jar usage and config files
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1548 7e9141cc-0065-0410-87d8-b60c137991c4
2010-04-22 12:59:40 +00:00
32a02d38c2
better readme
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1387 7e9141cc-0065-0410-87d8-b60c137991c4
2010-03-17 10:51:39 +00:00
8733b438db
simplified start
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1223 7e9141cc-0065-0410-87d8-b60c137991c4
2010-01-29 05:03:47 +00:00
163b50e119
Bug 300733 - Jars from lib/ext are not visible for my web application
...
Add section "ext" (as a dynamic section).
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1220 7e9141cc-0065-0410-87d8-b60c137991c4
2010-01-28 03:18:29 +00:00
f9455c7712
demo websocket implementation
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1087 7e9141cc-0065-0410-87d8-b60c137991c4
2009-11-23 08:44:37 +00:00
eb04a44ca6
improved start properties
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@989 7e9141cc-0065-0410-87d8-b60c137991c4
2009-10-15 00:48:59 +00:00
440e584870
289960 start.jar assumes command line args are configs
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@958 7e9141cc-0065-0410-87d8-b60c137991c4
2009-09-30 23:13:47 +00:00
ef917ddd20
standardize log DEBUG
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@918 7e9141cc-0065-0410-87d8-b60c137991c4
2009-09-16 06:26:51 +00:00
5e40f89cef
standardize log DEBUG
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@915 7e9141cc-0065-0410-87d8-b60c137991c4
2009-09-16 05:56:39 +00:00
Jan Bartel
Greg Wilkins
Thomas Becker
Michael Gorovoy
Greg Wilkins
Jesse McConnell
Joakim Erdfelt
Simone Bordet
Jan Bartel