Commit Graph

651 Commits

Author SHA1 Message Date
Jan Bartel 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
Jan Bartel d4c4a7aee0 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2012-11-06 15:31:47 +11:00
Jan Bartel fe09ca0e66 391623 Add option to --stop to wait for target jetty to stop 2012-11-06 14:35:37 +11:00
Greg Wilkins 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
Greg Wilkins e076e8a8f0 393363 Use Locale.ENGLISH for all toUpperCase and toLowerCase calls 2012-11-02 13:19:07 +11:00
Greg Wilkins 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
Greg Wilkins 13f6940fc3 393363 Use Locale.ENGLISH for all toUpperCase and toLowerCase calls 2012-11-02 13:16:53 +11:00
Joakim Erdfelt b6cca66914 Fixing compile issue. File.getName(Locale) is not allowed. 2012-11-01 19:12:36 -07:00
Greg Wilkins 65202e9abe 393363 Use Locale.ENGLISH for all toUpperCase and toLowerCase calls 2012-11-02 11:55:00 +11:00
Jan Bartel 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
Greg Wilkins e4069c6939 392237 improved configuration defaults to match documentation 2012-10-22 17:48:41 +11:00
Greg Wilkins 9a1972e142 Merge remote-tracking branch 'origin/jetty-8' 2012-10-22 15:17:45 +11:00
Jan Bartel e8a77e7fce Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2012-10-21 20:20:04 +11:00
Jan Bartel 63ec4e4a39 392525 Add option to --stop-wait to specify timeout 2012-10-21 20:18:45 +11:00
Greg Wilkins 2b13648b0e 392237 fixed many TODOs and many minor code cleanups 2012-10-19 16:17:30 +11:00
Greg Wilkins 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
Jan Bartel 7625f0b8b3 Merge remote-tracking branch 'origin/master' into jetty-8 2012-10-11 16:34:16 +11:00
Jan Bartel 86b51e608f 391623 Add option to --stop to wait for target jetty to stop 2012-10-11 13:40:33 +11:00
Greg Wilkins 68ee346b8a jetty-9 combined the Container and AggregateLifeCycle into ContainerLifeCycle 2012-09-21 11:45:51 +10:00
Jan Bartel de17f8ec45 Merge remote-tracking branch 'origin/master' into jetty-8 2012-09-20 17:03:21 +10:00
Jan Bartel 1c5d007384 389965 OPTIONS should allow spaces in comma separated list 2012-09-20 17:02:18 +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 fd1ab0ed55 merge from master 2012-08-23 16:44:30 -05:00
Thomas Becker 2bd6cf2ebf Merge branch 'master' of ssh://git.eclipse.org:29418/jetty/org.eclipse.jetty.project 2012-08-21 11:19:02 +02:00
Thomas Becker 1721a56c6d 369349: directory with spaces --dry-run fix 2012-08-20 19:16:03 +02:00
Jesse McConnell f137b5fc38 add space between license and header 2012-08-20 08:33:06 -05: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
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
Greg Wilkins 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
Greg Wilkins 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
Joakim Erdfelt 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
Greg Wilkins 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
Greg Wilkins 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
Greg Wilkins 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
Greg Wilkins 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
Greg Wilkins 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
Joakim Erdfelt 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
Greg Wilkins 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
Simone Bordet 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
Greg Wilkins 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
Greg Wilkins 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
Greg Wilkins 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
Jan Bartel 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
Greg Wilkins 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
Greg Wilkins 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
Joakim Erdfelt 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
Greg Wilkins 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
Greg Wilkins 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
Jesse McConnell 1dd4d93527 289145 reload functionality to jetty policy an remove refresh() calls from constructor
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@860 7e9141cc-0065-0410-87d8-b60c137991c4
2009-09-10 19:52:16 +00:00
Joakim Erdfelt d7c6df193c Adding test for Absolute on xml paths on command line.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@761 7e9141cc-0065-0410-87d8-b60c137991c4
2009-08-25 15:14:56 +00:00
Greg Wilkins 2c4db31b34 287496 Use start.ini always and added --exec
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@760 7e9141cc-0065-0410-87d8-b60c137991c4
2009-08-25 08:54:14 +00:00
Jesse McConnell 1b4d8bf8f2 set policy file to correct setting in start.config
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@731 7e9141cc-0065-0410-87d8-b60c137991c4
2009-08-17 23:20:22 +00:00
Greg Wilkins 2097eac0d9 286242 Ported jetty-setuid from jetty-6
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@730 7e9141cc-0065-0410-87d8-b60c137991c4
2009-08-17 23:03:00 +00:00
Jesse McConnell b33d2298ad fix up the --secure option
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@713 7e9141cc-0065-0410-87d8-b60c137991c4
2009-08-13 19:19:01 +00:00
Greg Wilkins 50fc3906aa Added discoverable start options
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@707 7e9141cc-0065-0410-87d8-b60c137991c4
2009-08-13 01:30:40 +00:00
Joakim Erdfelt 2eb8343277 Fixing DEBUG per discussion on jetty-dev
* if DEBUG=true is provided on start.jar, then
  System property org.eclipse.jetty.util.log.stderr.DEBUG = true
  System property org.eclipse.jetty.start.DEBUG = true

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@705 7e9141cc-0065-0410-87d8-b60c137991c4
2009-08-12 20:45:53 +00:00
Joakim Erdfelt 0f56762ce8 Adding dynamic OPTIONS options discovery.
* Adding new dynamic classpath section identifier using syntax discussed
  on irc.  [=path_to_dir/*]

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@704 7e9141cc-0065-0410-87d8-b60c137991c4
2009-08-12 20:14:54 +00:00
Joakim Erdfelt 8890819c16 Fixing bug with active option additions with --secure.
* The --secure added options were being set BEFORE the config was read.
  It should be set after the Config is read, so that any defaults
  and commandline OPTIONS are kept.

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@701 7e9141cc-0065-0410-87d8-b60c137991c4
2009-08-11 20:35:03 +00:00
Jesse McConnell 9f70dc338a add --secure --version options for dumping security info
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@698 7e9141cc-0065-0410-87d8-b60c137991c4
2009-08-11 18:50:08 +00:00
Joakim Erdfelt 266b3ccbcc Adding boilerplate for jetty-security work Jesse is doing.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@690 7e9141cc-0065-0410-87d8-b60c137991c4
2009-08-11 16:29:37 +00:00
Joakim Erdfelt 3f2706f159 Updating start.jar to have OPTIONS default in start.config.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@681 7e9141cc-0065-0410-87d8-b60c137991c4
2009-08-11 02:28:58 +00:00
Joakim Erdfelt 6deb6a6446 [277403] remove system properties
* Removing many of the jetty specific System.getProperty() usages to
  make embedding more useful, replacing with fields in objects that can
  be set using standard Java mechanisms.

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@625 7e9141cc-0065-0410-87d8-b60c137991c4
2009-08-03 20:58:25 +00:00
Greg Wilkins a65431c1c5 refined option names after feedback
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@589 7e9141cc-0065-0410-87d8-b60c137991c4
2009-07-27 05:29:39 +00:00
Joakim Erdfelt 9ad7377e13 284475 update jetty.sh for new OPTIONS syntax
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@588 7e9141cc-0065-0410-87d8-b60c137991c4
2009-07-24 02:56:21 +00:00
Joakim Erdfelt bb50e1bac8 284510 Enhance jetty-start for diagnosis and unit testing
Merging in changes made on /jetty-start-enhancement/ branch



git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@587 7e9141cc-0065-0410-87d8-b60c137991c4
2009-07-23 21:50:09 +00:00
Joakim Erdfelt ce97a37180 283344 - Startup on windows is broken
* Fixing path name munging that improperly converted "jetty.home/=$(jetty.home)" to "jetty.home\\=$(jetty.home)", and paths ending in "/**" to "\\**" which broke logic.

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@553 7e9141cc-0065-0410-87d8-b60c137991c4
2009-07-13 23:12:18 +00:00
Jesse McConnell ef7b66b071 for small property expansion it is possible to fail to expand strings as the subsequent indexOf checks can leave some length of the strings unscanned
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@497 7e9141cc-0065-0410-87d8-b60c137991c4
2009-07-08 19:39:13 +00:00
Jesse McConnell e8862a3fb1 switch policy start option to secure
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@491 7e9141cc-0065-0410-87d8-b60c137991c4
2009-07-07 18:11:58 +00:00
Jesse McConnell 8fe2fe566b Adding in commented out code that is required
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@368 7e9141cc-0065-0410-87d8-b60c137991c4
2009-06-11 19:04:13 +00:00
Jesse McConnell b9b14e438e converted to reflection based custom policy loading
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@360 7e9141cc-0065-0410-87d8-b60c137991c4
2009-06-10 19:19:35 +00:00
Greg Wilkins 5c7dfe1dbb help text
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@358 7e9141cc-0065-0410-87d8-b60c137991c4
2009-06-10 09:54:43 +00:00
Jesse McConnell 8ef8fab8b5 remove comment
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@333 7e9141cc-0065-0410-87d8-b60c137991c4
2009-06-05 19:05:29 +00:00
Greg Wilkins 4f83801178 canonical start path
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@298 7e9141cc-0065-0410-87d8-b60c137991c4
2009-05-27 01:53:44 +00:00
Greg Wilkins aa5d47a35f moved distribution and start back to jetty-*
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@293 7e9141cc-0065-0410-87d8-b60c137991c4
2009-05-26 23:58:18 +00:00
Greg Wilkins 020f12e948 renamed non runtime modules
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@283 7e9141cc-0065-0410-87d8-b60c137991c4
2009-05-26 01:16:27 +00:00
Jesse McConnell 9442ab7eee [BUG 277551] initial integration for the OPTIONS=policy mechanism, the wiring is here, need to find or write a policy file parser though, nothing seems appropraite license wise I have seen so far
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@263 7e9141cc-0065-0410-87d8-b60c137991c4
2009-05-22 21:20:14 +00:00
Jesse McConnell 0b8640696d jetty-assembly -> jetty-distribution
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@262 7e9141cc-0065-0410-87d8-b60c137991c4
2009-05-22 15:33:34 +00:00
Greg Wilkins f9a8e45c9c 277403 reduced usage of system properties
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@256 7e9141cc-0065-0410-87d8-b60c137991c4
2009-05-22 02:54:42 +00:00
Greg Wilkins 429fef0dc4 added snapshot to version after last release
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@190 7e9141cc-0065-0410-87d8-b60c137991c4
2009-04-23 22:04:51 +00:00
Greg Wilkins 95cdbc95d6 tweaks to fix names after move
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@179 7e9141cc-0065-0410-87d8-b60c137991c4
2009-04-22 08:18:31 +00:00
Greg Wilkins afc329b24b improved error reporting and more options
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@173 7e9141cc-0065-0410-87d8-b60c137991c4
2009-04-22 02:42:46 +00:00
Jan Bartel 076de74e39 Make jetty-jndi, jetty-plus, jetty-annotations work
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@95 7e9141cc-0065-0410-87d8-b60c137991c4
2009-04-02 08:57:12 +00:00
Greg Wilkins 9f948fbcd4 simplified start.config
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@92 7e9141cc-0065-0410-87d8-b60c137991c4
2009-04-02 06:29:54 +00:00
Jan Bartel 13920b74b5 Add debug for checking class availability
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@91 7e9141cc-0065-0410-87d8-b60c137991c4
2009-04-02 06:27:34 +00:00
Greg Wilkins 92c7f86c7d errors
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@90 7e9141cc-0065-0410-87d8-b60c137991c4
2009-04-02 05:58:09 +00:00
Greg Wilkins c74552eeff removed repository
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@88 7e9141cc-0065-0410-87d8-b60c137991c4
2009-04-02 05:40:24 +00:00
Greg Wilkins 13d4e0af1f handlers cannot be updated after start
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@86 7e9141cc-0065-0410-87d8-b60c137991c4
2009-04-02 04:59:19 +00:00
Greg Wilkins da627b843f jetty @ eclipse initial commit
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@8 7e9141cc-0065-0410-87d8-b60c137991c4
2009-03-24 21:07:27 +00:00