Eclipse/jetty.project
1
0
Fork 0
mirror of https://github.com/jetty/jetty.project.git synced 2025-02-24 00:17:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,847 Commits 55 Branches 466 Tags
Commit Graph

110 Commits

Author SHA1 Message Date
Jan Bartel
17269583fb Merge remote-tracking branch 'origin/master' into jetty-8 2012-03-30 12:05:46 +11:00
Jan Bartel
22f437c36d 375490 NPE with --help on command line 2012-03-28 14:47:27 +11:00
Jan Bartel
64e526dad4 Remove duplicate websocket entry in start.config 2012-03-15 10:47:16 +11:00
Jan Bartel
c7b42cdb06 Merge remote-tracking branch 'origin/master' into jetty-8 2012-02-29 20:07:33 +11:00
Jan Bartel
c95da2aa18 372806 Command line should accept relative paths for xml config files 2012-02-29 18:09:29 +11:00
Jesse McConnell
6b079ae3d8 merge from master 2012-02-01 17:25:08 -06:00
Thomas Becker
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
Joakim Erdfelt
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
Joakim Erdfelt
f02244fbf6 Merge branch 'dryrun-with-spaces' 2012-01-30 15:51:19 -07:00
Joakim Erdfelt
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
Joakim Erdfelt
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
Joakim Erdfelt
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
Joakim Erdfelt
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
Thomas Becker
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
Thomas Becker
40963a884e Revert "Making --dry-run work with paths that have spaces" 
This reverts commit 3df95d45c27c924c1f0e76c4c16a3f796ddf2470.

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2012-01-30 09:17:53 -07:00
Thomas Becker
49198a8a5c Revert "369349 replace quotes with a space escape method" 
This reverts commit bc5ac3622aa39b6e60b96ab24b0fb11c09535172.

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2012-01-30 09:17:48 -07:00
Jesse McConnell
c918bb4e3c Merge branch 'master' into jetty-8 2012-01-25 10:31:44 -06:00
Greg Wilkins
bc5ac3622a 369349 replace quotes with a space escape method 2012-01-23 13:13:28 +11:00
Joakim Erdfelt
3df95d45c2 Making --dry-run work with paths that have spaces 2012-01-20 11:27:38 -07:00
Joakim Erdfelt
3f172067c4 Fixing tests so that when run on a CI within jetty itself, 2012-01-20 11:12:26 -07:00
Jan Bartel
1fbec51c8a Merge remote-tracking branch 'origin/master' into jetty-8 2012-01-10 16:08:59 +11:00
Greg Wilkins
58c57a9ea0 367635: report errors 2012-01-09 11:24:25 +11:00
Thomas Becker
48438dc914 367635: Add test for parsing start.d files, small changes 2012-01-09 11:23:24 +11:00
Greg Wilkins
3141b50fa0 Merge remote-tracking branch 'origin/master' into jetty-8 2011-12-30 20:19:39 +11:00
Greg Wilkins
f62c6edcb9 367635 Added support for start.d directory 2011-12-30 09:43:20 +11:00
Greg Wilkins
de005c68fd Revert "Merge branch 'release-8'" 
This reverts commit 9e72457941e98eb2ee1adf64f2bc53160b01e34d, reversing
changes made to df12605f0e3e549c07c96968eedfd382fd6f274e.
 2011-11-30 16:27:30 +11:00
Jan Bartel
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
Jan Bartel
76c0479ed3 JETTY-1439 space in directory installation path causes classloader problem 2011-09-28 11:26:24 +10:00
Jan Bartel
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
Jan Bartel
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
Michael Gorovoy
8babf3ae17 351576 Do not use deprecated method File.toURL() 2011-07-08 17:21:02 -04:00
Greg Wilkins
17e907c2fb git diff 54e885d9670548c12cf9ffbd58702b73d373c186 remotes/origin/jetty-8-historical | patch -p1 ; git add -A 2011-07-07 18:18:24 +10:00
Greg Wilkins
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
Jesse McConnell
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
Greg Wilkins
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
Greg Wilkins
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
Greg Wilkins
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
Jesse McConnell
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
Greg Wilkins
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
Joakim Erdfelt
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
Jesse McConnell
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
Greg Wilkins
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
Greg Wilkins
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
Greg Wilkins
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
Greg Wilkins
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
Greg Wilkins
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
Greg Wilkins
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
Greg Wilkins
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
Greg Wilkins
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
Greg Wilkins
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