765 Commits

Author SHA1 Message Date
Greg Wilkins
369a13d265 405327 Modular start
reverted to a single start.ini file until multiple files are fully reviewed
2013-05-02 09:23:49 +10:00
Jan Bartel
e7ecfd2b2b Merge remote-tracking branch 'origin/master' into servlet-3.1-api
Conflicts:
	jetty-server/src/test/java/org/eclipse/jetty/server/ResponseTest.java
2013-05-02 09:07:24 +10:00
Greg Wilkins
ce0c37cd6c renamed 2013-05-02 08:28:01 +10:00
Greg Wilkins
7ce709519a 405327 Merge branch jetty-9-modularstart 2013-04-29 15:44:56 +10:00
Greg Wilkins
9558d7e815 modular start.ini files and --download start option 2013-04-26 13:53:28 +10:00
Jan Bartel
2360f5dcd5 Merge remote-tracking branch 'origin/master' into servlet-3.1-api
Conflicts:
	jetty-security/src/main/java/org/eclipse/jetty/security/ConstraintSecurityHandler.java
2013-04-23 15:08:56 +10:00
Greg Wilkins
31b6d341d0 405530 Fixed root value for JETTY_START in jetty.sh 2013-04-22 12:40:41 +10:00
Greg Wilkins
a7073d05a6 updated version to 9.1.0-SNAPSHOT 2013-04-19 13:59:18 +10:00
Jesse McConnell
7baaa14ba1 [maven-release-plugin] prepare for next development iteration 2013-04-17 11:46:39 -05:00
Jesse McConnell
e390b54b25 [maven-release-plugin] prepare release jetty-9.0.2.v20140417 2013-04-17 11:46:31 -05:00
Jesse McConnell
0b20467c6f [maven-release-plugin] prepare for next development iteration 2013-04-15 11:40:45 -05:00
Jesse McConnell
3aa4301711 [maven-release-plugin] prepare release jetty-9.0.2.v20140415 2013-04-15 11:40:37 -05:00
Greg Wilkins
b8dd8bde14 [maven-release-plugin] prepare for next development iteration 2013-04-08 12:31:34 +10:00
Greg Wilkins
bf3771904b [maven-release-plugin] prepare release jetty-9.0.1.v20130408 2013-04-08 12:30:59 +10:00
Greg Wilkins
ea60965803 404323 Improved parameterization of https and SPDY 2013-03-28 17:09:29 +11:00
Jesse McConnell
de0c0910dd wire monitor into distro, reenable setuid for osx 2013-03-26 10:32:45 -05:00
Greg Wilkins
ab373a5503 404323 Improved parameterization of https and SPDY 2013-03-26 15:03:15 +11:00
Greg Wilkins
9079bae9c0 404323 Improved parameterization of https and SPDY 2013-03-26 13:38:28 +11:00
Greg Wilkins
948b260b7d Merge remote-tracking branch 'origin/jetty-8' 2013-03-22 12:59:28 +11:00
Greg Wilkins
50119acb66 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-03-22 12:58:55 +11:00
Greg Wilkins
e553e2ec1f 403281 jetty.sh waits for started or failure before returning 2013-03-22 12:58:31 +11:00
Greg Wilkins
ba920bf09e updated npn example 2013-03-22 11:59:38 +11:00
Greg Wilkins
2858a2587e Merge remote-tracking branch 'origin/jetty-8' 2013-03-22 11:55:39 +11:00
Greg Wilkins
e4fb243adf Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-03-22 11:54:44 +11:00
Greg Wilkins
61be691a0c 403281 jetty.sh waits for started or failure before returning 2013-03-22 11:54:09 +11:00
Greg Wilkins
662de165a4 Merge remote-tracking branch 'origin/jetty-8' 2013-03-22 11:34:26 +11:00
Greg Wilkins
ea5fcfd20d Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-03-22 11:32:53 +11:00
Greg Wilkins
e083f9d95a 403281 jetty.sh waits for started or failure before returning 2013-03-22 11:31:15 +11:00
Greg Wilkins
2dec200c5d disabled setuid for osx until built 2013-03-18 15:41:37 +11:00
Greg Wilkins
e8d76ef12c Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
	examples/embedded/src/main/java/org/eclipse/jetty/embedded/SpdyServer.java
	jetty-client/src/test/java/org/eclipse/jetty/client/HttpExchangeTest.java
	jetty-io/src/test/java/org/eclipse/jetty/io/ThreadLocalBuffersTest.java
	jetty-server/src/main/config/etc/jetty-requestlog.xml
	jetty-server/src/test/java/org/eclipse/jetty/server/AsyncStressTest.java
	jetty-server/src/test/java/org/eclipse/jetty/server/HttpServerTestFixture.java
	jetty-server/src/test/java/org/eclipse/jetty/server/StressTest.java
	jetty-servlets/pom.xml
2013-03-18 11:09:13 +11:00
Greg Wilkins
d21c8e5ca4 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-03-18 10:53:14 +11:00
Greg Wilkins
7ba6bb92b0 403281 jetty.sh waits for started or failure before returning 2013-03-16 10:36:43 +11:00
Greg Wilkins
436febc498 402694 setuid as LifeCycle listener 2013-03-15 13:33:20 +11:00
Greg Wilkins
55b7111cd5 Merge remote-tracking branch 'origin/jetty-8' 2013-03-15 08:33:53 +11:00
Greg Wilkins
6448758fc0 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-03-15 08:33:14 +11:00
Greg Wilkins
cc34bdc20a 403281 jetty.sh waits for started or failure before returning 2013-03-15 08:32:24 +11:00
Greg Wilkins
1cb201ef14 Merge remote-tracking branch 'origin/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/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-distribution/src/main/resources/bin/jetty.sh
	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-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
2013-03-14 12:40:29 +11:00
Greg Wilkins
38d701753c 403281 jetty.sh waits for started before OK
Conflicts:
	jetty-distribution/src/main/resources/bin/jetty.sh
2013-03-14 11:50:06 +11:00
Greg Wilkins
a7238f2688 403281 jetty.sh waits for started before OK 2013-03-14 11:44:04 +11:00
Jesse McConnell
acb5919844 [maven-release-plugin] prepare for next development iteration 2013-03-12 09:10:50 -05:00
Jesse McConnell
d6ebdc0a4a [maven-release-plugin] prepare release jetty-7.6.10.v20130312 2013-03-12 09:10:42 -05:00
Jesse McConnell
0405c8ded6 [maven-release-plugin] prepare for next development iteration 2013-03-12 09:05:25 -05:00
Jesse McConnell
852178cd01 [maven-release-plugin] prepare release jetty-8.1.10.v20130312 2013-03-12 09:05:14 -05:00
Jesse McConnell
9e4fc0e91f Merge branch 'jetty-8' 2013-03-12 08:32:55 -05:00
Jesse McConnell
d358030299 Merge branch 'jetty-7' into jetty-8 2013-03-12 08:32:34 -05:00
Jesse McConnell
9fd5881f93 [Bug 402735] jetty.sh to support status which is == check 2013-03-12 08:30:30 -05:00
Joakim Erdfelt
897c35c2cb [maven-release-plugin] prepare for next development iteration 2013-03-08 11:33:23 -07:00
Joakim Erdfelt
cc6196af50 [maven-release-plugin] prepare release jetty-9.0.0.v20130308 2013-03-08 11:33:15 -07:00
Joakim Erdfelt
7fc38f6c0f [maven-release-plugin] prepare for next development iteration 2013-03-07 19:14:19 -07:00
Joakim Erdfelt
96d045442f [maven-release-plugin] prepare release jetty-9.0.0.v20130307 2013-03-07 19:14:11 -07:00