Greg Wilkins
|
68ee346b8a
|
jetty-9 combined the Container and AggregateLifeCycle into ContainerLifeCycle
|
2012-09-21 11:45:51 +10:00 |
|
Greg Wilkins
|
2dfcebfc04
|
jetty-9 distribution working
|
2012-09-06 14:54:55 +10:00 |
Simone Bordet
|
06b2de17d5
|
Merge branch 'jetty-9-aggregation' into jetty-9-spdy-http
|
2012-08-24 11:52:29 +02:00 |
Jesse McConnell
|
5de0cee1eb
|
merge from master + license block standardization
|
2012-08-17 14:50:43 -05:00 |
|
Jesse McConnell
|
00ed549898
|
standardize license header blocks
|
2012-08-16 19:11:27 -05:00 |
Jan Bartel
|
ab8e8578f8
|
Merge remote-tracking branch 'origin/master' into jetty-8
|
2012-07-23 15:35:01 +10:00 |
|
Jan Bartel
|
884aee31c0
|
385651 Message 'Address already in use' not specific enough
|
2012-07-23 15:29:39 +10:00 |
|
Jesse McConnell
|
81d72052c8
|
merged master to jetty-8
|
2012-07-11 14:04:49 -05:00 |
|
Jesse McConnell
|
aa941f5711
|
quick pass through to clean up missing or incorrect license blocks
|
2012-07-11 12:29:46 -05:00 |
|
Jan Bartel
|
a7b1dd5e93
|
Merge remote-tracking branch 'origin/master' into jetty-8
|
2012-06-07 00:59:37 +02:00 |
|
Jan Bartel
|
65ee9d0d34
|
381876 Monitor should wait for child to finish before exiting.
|
2012-06-07 00:05:04 +02:00 |
|
Jan Bartel
|
9149a69446
|
Merge remote-tracking branch 'origin/master' into jetty-8
|
2012-06-04 13:49:25 +02:00 |
|
Jan Bartel
|
1f0e25ffa0
|
Merge "381220: start.log rollover"
|
2012-06-02 03:57:33 -04:00 |
|
Jan Bartel
|
9d7fc6975b
|
381401 Print log warning when stop attempt made with incorrect STOP.KEY
|
2012-06-01 20:01:44 +02:00 |
Thomas Becker
|
641fa869fa
|
381220: start.log rollover
|
2012-06-01 16:42:02 +02:00 |
|
Jan Bartel
|
34954bc617
|
Merge remote-tracking branch 'origin/master' into jetty-8
|
2012-05-22 17:28:40 +02:00 |
|
Thomas Becker
|
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 |
|
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 3df95d45c2.
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 bc5ac3622a.
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 9e72457941, reversing
changes made to df12605f0e.
|
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 54e885d967 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 |