9bb6d91742
414635 Modular start.d and jetty.base property
...
dependencies
2013-08-20 17:04:20 +10:00
bead95314a
414635 Modular start.d and jetty.base property
...
Added more info in README.TXT files
2013-08-19 13:22:02 +10:00
42387785bd
fix start.ini
2013-08-15 12:07:47 -05:00
145f544861
414635 Modular start.d and jetty.base property
...
Added --enable and --disable
2013-08-15 22:57:43 +10:00
c80100b4a9
[maven-release-plugin] prepare for next development iteration
2013-08-15 19:13:27 +10:00
e7e7e45500
[maven-release-plugin] prepare release jetty-9.0.5.v20130815
2013-08-15 19:13:13 +10:00
716430bb03
[maven-release-plugin] rollback the release of jetty-9.0.5.v20130815
2013-08-15 18:03:49 +10:00
3d13c15d35
[maven-release-plugin] prepare release jetty-9.0.5.v20130815
2013-08-15 17:22:03 +10:00
7947b35134
Reset version for rerun of 9.0.5
2013-08-15 16:47:03 +10:00
4383c9042d
[maven-release-plugin] prepare for next development iteration
2013-08-13 14:20:56 -05:00
160d34ec23
[maven-release-plugin] prepare release jetty-9.0.5.v20130813
2013-08-13 14:20:47 -05:00
dcf98fd675
414635 Modular start.d and jetty.base property
...
Made https and spdy mutually exclusive
2013-08-08 18:07:42 +10:00
21e7b67cc7
414635 Modular start.d and jetty.base property
2013-08-08 17:53:52 +10:00
6278f8eb30
JSR-356 - making the JSR happy enough to start
2013-08-06 09:32:49 -07:00
12f6853900
WebSocket - enabling WebSocket on distribution
2013-08-06 09:20:02 -07:00
fac202e1ac
Update new jetty-schemas to 3.1.RC0. Update to 3.1 before 9.1 milestone release.
2013-07-12 14:45:56 +10:00
bd2add0ae9
Update to post-release (servlet 3.1/javaee) versions of javaee dependencies. WARNING: jetty-schemas from jetty-toolchain needs to be changed from SNAPSHOT to final release.
2013-07-12 13:53:58 +10:00
e35914e400
Merge remote-tracking branch 'origin/master' into jetty-9.1
...
Conflicts:
jetty-http/src/main/java/org/eclipse/jetty/http/HttpParser.java
jetty-server/src/main/java/org/eclipse/jetty/server/HttpConnection.java
2013-07-09 00:32:41 +10:00
2d3f0bfe0b
412466 Improved search for unset JETTY_HOME
2013-07-08 14:27:13 +10:00
e4716e05e1
Merge remote-tracking branch 'origin/master' into jetty-9.1
...
Conflicts:
aggregates/jetty-all/pom.xml
examples/async-rest/async-rest-jar/pom.xml
examples/async-rest/async-rest-webapp/pom.xml
examples/async-rest/pom.xml
examples/embedded/pom.xml
examples/pom.xml
jetty-annotations/pom.xml
jetty-ant/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-jaas/pom.xml
jetty-jaspi/pom.xml
jetty-jmx/pom.xml
jetty-jndi/pom.xml
jetty-jsp/pom.xml
jetty-jspc-maven-plugin/pom.xml
jetty-maven-plugin/pom.xml
jetty-monitor/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/jetty-osgi-npn/pom.xml
jetty-osgi/pom.xml
jetty-osgi/test-jetty-osgi-context/pom.xml
jetty-osgi/test-jetty-osgi-webapp/pom.xml
jetty-plus/pom.xml
jetty-proxy/pom.xml
jetty-rewrite/pom.xml
jetty-runner/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-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-server/pom.xml
jetty-spring/pom.xml
jetty-start/pom.xml
jetty-util-ajax/pom.xml
jetty-util/pom.xml
jetty-webapp/pom.xml
jetty-websocket/pom.xml
jetty-websocket/websocket-api/pom.xml
jetty-websocket/websocket-client/pom.xml
jetty-websocket/websocket-common/pom.xml
jetty-websocket/websocket-server/pom.xml
jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/Fuzzer.java
jetty-websocket/websocket-servlet/pom.xml
jetty-xml/pom.xml
pom.xml
tests/pom.xml
tests/test-continuation/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-jaas-webapp/pom.xml
tests/test-webapps/test-jetty-webapp/pom.xml
tests/test-webapps/test-jndi-webapp/pom.xml
tests/test-webapps/test-mock-resources/pom.xml
tests/test-webapps/test-proxy-webapp/pom.xml
tests/test-webapps/test-servlet-spec/pom.xml
tests/test-webapps/test-servlet-spec/test-container-initializer/pom.xml
tests/test-webapps/test-servlet-spec/test-spec-webapp/pom.xml
tests/test-webapps/test-servlet-spec/test-web-fragment/pom.xml
tests/test-webapps/test-webapp-rfc2616/pom.xml
2013-06-27 09:12:28 +10:00
78b5f7df1f
[maven-release-plugin] prepare for next development iteration
2013-06-25 08:29:26 -07:00
5f2c937fcb
[maven-release-plugin] prepare release jetty-9.0.4.v20130625
2013-06-25 08:29:18 -07:00
31faf2fe20
Reverting failed release from friday
2013-06-25 07:42:45 -07:00
018a51a04e
Merge branch 'master' into release-9
2013-06-21 15:18:46 -05:00
4db892d6b3
update links on root context of distro
2013-06-21 11:29:02 -05:00
57bfda2a08
[maven-release-plugin] prepare for next development iteration
2013-06-21 09:49:25 -05:00
c1082ad4d4
[maven-release-plugin] prepare release jetty-9.0.4.v20130621
2013-06-21 09:49:15 -05:00
4f6732a7e9
Use dependencyManagement to control servlet-api and jsp related jars; update to latest servlet-api and el jars post spec finalization.
2013-06-21 18:41:35 +10:00
4e4ffaa54c
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannelState.java
jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
2013-06-17 16:29:39 +10:00
eddb49941d
[Bug 408600] set correct jetty.url in all pom files
2013-06-12 15:52:36 -05:00
53270e7edb
410522 JETTY_PORT sets jetty.port property instead of -Djetty.port
2013-06-12 13:13:09 +10:00
cbac0ea5fa
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
2013-05-16 07:24:49 +10:00
affc41ddf5
fixed comment
2013-05-10 19:47:01 +10:00
bd153af2e2
Update to temporarily use jsp 2.3 and el 3.0 from maven
2013-05-09 17:17:46 +10:00
2fb23e705c
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
...
Conflicts:
aggregates/jetty-all/pom.xml
examples/async-rest/async-rest-jar/pom.xml
examples/async-rest/async-rest-webapp/pom.xml
examples/async-rest/pom.xml
examples/embedded/pom.xml
examples/pom.xml
jetty-annotations/pom.xml
jetty-ant/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-jaas/pom.xml
jetty-jaspi/pom.xml
jetty-jmx/pom.xml
jetty-jndi/pom.xml
jetty-jsp/pom.xml
jetty-jspc-maven-plugin/pom.xml
jetty-maven-plugin/pom.xml
jetty-monitor/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/jetty-osgi-npn/pom.xml
jetty-osgi/pom.xml
jetty-osgi/test-jetty-osgi-context/pom.xml
jetty-osgi/test-jetty-osgi-webapp/pom.xml
jetty-plus/pom.xml
jetty-proxy/pom.xml
jetty-rewrite/pom.xml
jetty-runner/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-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-server/pom.xml
jetty-spring/pom.xml
jetty-start/pom.xml
jetty-util-ajax/pom.xml
jetty-util/pom.xml
jetty-webapp/pom.xml
jetty-websocket/pom.xml
jetty-websocket/websocket-api/pom.xml
jetty-websocket/websocket-client/pom.xml
jetty-websocket/websocket-common/pom.xml
jetty-websocket/websocket-server/pom.xml
jetty-websocket/websocket-servlet/pom.xml
jetty-xml/pom.xml
pom.xml
tests/pom.xml
tests/test-continuation/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-jaas-webapp/pom.xml
tests/test-webapps/test-jetty-webapp/pom.xml
tests/test-webapps/test-jndi-webapp/pom.xml
tests/test-webapps/test-mock-resources/pom.xml
tests/test-webapps/test-proxy-webapp/pom.xml
tests/test-webapps/test-servlet-spec/pom.xml
tests/test-webapps/test-servlet-spec/test-container-initializer/pom.xml
tests/test-webapps/test-servlet-spec/test-spec-webapp/pom.xml
tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/java/com/acme/AnnotationTest.java
tests/test-webapps/test-servlet-spec/test-web-fragment/pom.xml
tests/test-webapps/test-webapp-rfc2616/pom.xml
2013-05-09 11:29:45 +10:00
ddb84cd55d
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
2013-05-08 06:23:15 -05:00
7448c4fe57
add https listener config to 900-demo.ini
2013-05-07 10:46:11 +02:00
3d600ed95e
[maven-release-plugin] prepare for next development iteration
2013-05-06 18:13:04 -05:00
d832f3dc7e
[maven-release-plugin] prepare release jetty-9.0.3.v20130506
2013-05-06 18:12:55 -05:00
a5c143063f
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
2013-05-06 17:00:47 +10:00
b182f09b2c
405944 Check annotation and resource injection is supported for AsyncListener
2013-05-06 16:32:38 +10:00
b89de0346d
updated jndi, jaas and annotation tests to webapps.demo
2013-05-06 16:16:43 +10:00
8d0cf5e949
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
2013-05-06 14:46:28 +10:00
d3f33909c2
improved comments for ini files
2013-05-06 09:26:14 +10:00
0d181d9a75
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
2013-05-03 16:59:39 +10:00
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
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
ce0c37cd6c
renamed
2013-05-02 08:28:01 +10:00
7ce709519a
405327 Merge branch jetty-9-modularstart
2013-04-29 15:44:56 +10:00
9558d7e815
modular start.ini files and --download start option
2013-04-26 13:53:28 +10:00
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
31b6d341d0
405530 Fixed root value for JETTY_START in jetty.sh
2013-04-22 12:40:41 +10:00
a7073d05a6
updated version to 9.1.0-SNAPSHOT
2013-04-19 13:59:18 +10:00
7baaa14ba1
[maven-release-plugin] prepare for next development iteration
2013-04-17 11:46:39 -05:00
e390b54b25
[maven-release-plugin] prepare release jetty-9.0.2.v20140417
2013-04-17 11:46:31 -05:00
0b20467c6f
[maven-release-plugin] prepare for next development iteration
2013-04-15 11:40:45 -05:00
3aa4301711
[maven-release-plugin] prepare release jetty-9.0.2.v20140415
2013-04-15 11:40:37 -05:00
b8dd8bde14
[maven-release-plugin] prepare for next development iteration
2013-04-08 12:31:34 +10:00
bf3771904b
[maven-release-plugin] prepare release jetty-9.0.1.v20130408
2013-04-08 12:30:59 +10:00
ea60965803
404323 Improved parameterization of https and SPDY
2013-03-28 17:09:29 +11:00
de0c0910dd
wire monitor into distro, reenable setuid for osx
2013-03-26 10:32:45 -05:00
ab373a5503
404323 Improved parameterization of https and SPDY
2013-03-26 15:03:15 +11:00
9079bae9c0
404323 Improved parameterization of https and SPDY
2013-03-26 13:38:28 +11:00
948b260b7d
Merge remote-tracking branch 'origin/jetty-8'
2013-03-22 12:59:28 +11:00
50119acb66
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2013-03-22 12:58:55 +11:00
e553e2ec1f
403281 jetty.sh waits for started or failure before returning
2013-03-22 12:58:31 +11:00
ba920bf09e
updated npn example
2013-03-22 11:59:38 +11:00
2858a2587e
Merge remote-tracking branch 'origin/jetty-8'
2013-03-22 11:55:39 +11:00
e4fb243adf
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2013-03-22 11:54:44 +11:00
61be691a0c
403281 jetty.sh waits for started or failure before returning
2013-03-22 11:54:09 +11:00
662de165a4
Merge remote-tracking branch 'origin/jetty-8'
2013-03-22 11:34:26 +11:00
ea5fcfd20d
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2013-03-22 11:32:53 +11:00
e083f9d95a
403281 jetty.sh waits for started or failure before returning
2013-03-22 11:31:15 +11:00
2dec200c5d
disabled setuid for osx until built
2013-03-18 15:41:37 +11:00
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
d21c8e5ca4
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2013-03-18 10:53:14 +11:00
7ba6bb92b0
403281 jetty.sh waits for started or failure before returning
2013-03-16 10:36:43 +11:00
436febc498
402694 setuid as LifeCycle listener
2013-03-15 13:33:20 +11:00
55b7111cd5
Merge remote-tracking branch 'origin/jetty-8'
2013-03-15 08:33:53 +11:00
6448758fc0
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2013-03-15 08:33:14 +11:00
cc34bdc20a
403281 jetty.sh waits for started or failure before returning
2013-03-15 08:32:24 +11:00
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
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
a7238f2688
403281 jetty.sh waits for started before OK
2013-03-14 11:44:04 +11:00
acb5919844
[maven-release-plugin] prepare for next development iteration
2013-03-12 09:10:50 -05:00
d6ebdc0a4a
[maven-release-plugin] prepare release jetty-7.6.10.v20130312
2013-03-12 09:10:42 -05:00
0405c8ded6
[maven-release-plugin] prepare for next development iteration
2013-03-12 09:05:25 -05:00
852178cd01
[maven-release-plugin] prepare release jetty-8.1.10.v20130312
2013-03-12 09:05:14 -05:00
9e4fc0e91f
Merge branch 'jetty-8'
2013-03-12 08:32:55 -05:00
d358030299
Merge branch 'jetty-7' into jetty-8
2013-03-12 08:32:34 -05:00
9fd5881f93
[Bug 402735] jetty.sh to support status which is == check
2013-03-12 08:30:30 -05:00
897c35c2cb
[maven-release-plugin] prepare for next development iteration
2013-03-08 11:33:23 -07:00
cc6196af50
[maven-release-plugin] prepare release jetty-9.0.0.v20130308
2013-03-08 11:33:15 -07:00
7fc38f6c0f
[maven-release-plugin] prepare for next development iteration
2013-03-07 19:14:19 -07:00
96d045442f
[maven-release-plugin] prepare release jetty-9.0.0.v20130307
2013-03-07 19:14:11 -07:00
778ee1411b
[maven-release-plugin] prepare for next development iteration
2013-03-06 10:21:46 -06:00
d916078711
[maven-release-plugin] prepare release jetty-9.0.0.v20130306
2013-03-06 10:21:38 -06:00
a4f2e743d0
399070 add updated version of npn-boot jar to start.ini
2013-03-05 17:03:07 +11:00
7c442735c0
fix bad blog url
2013-03-01 16:43:17 -06:00
ec083b4ecc
jetty-9 link to jetty blogs
2013-02-28 12:46:28 +11:00
29b2118870
[maven-release-plugin] prepare for next development iteration
2013-02-26 09:20:45 -07:00
2b82b54f6d
[maven-release-plugin] prepare release jetty-9.0.0.RC2
2013-02-26 09:20:45 -07:00
b82a781113
400864 Added LowResourcesMonitor
2013-02-18 20:03:36 +11:00
4dc3ed38c2
[maven-release-plugin] prepare for next development iteration
2013-02-05 10:00:36 -07:00
ed24f78498
[maven-release-plugin] prepare release jetty-9.0.0.RC0
2013-02-05 10:00:36 -07:00
e073ceb06d
[maven-release-plugin] prepare for next development iteration
2013-02-05 10:00:36 -07:00
2f2ad287af
[maven-release-plugin] prepare release jetty-9.0.0.RC0
2013-02-05 10:00:35 -07:00
209d5bc12f
399721 - Change <Ref id= ...> to <Ref refid= ...>
2013-02-01 13:03:11 +01:00
7b7a6dc03a
jetty-9 added properties to start.ini
2013-02-01 12:08:22 +11:00
5c58878c3c
[maven-release-plugin] prepare for next development iteration
2013-01-31 11:34:38 -06:00
ebbe37294f
[maven-release-plugin] prepare release jetty-8.1.9.v20130131
2013-01-31 11:34:30 -06:00
a5e1e04af1
[maven-release-plugin] prepare for next development iteration
2013-01-31 08:42:20 -06:00
b7fb18fd65
[maven-release-plugin] prepare release jetty-7.6.9.v20130131
2013-01-31 08:42:12 -06:00
54fab80d01
Merging from jetty-8 to master
2013-01-29 16:24:51 -06:00
f0c6b9bc82
Merge branch 'jetty-7' into jetty-8
2013-01-29 15:51:56 -06:00
ddce31a323
[Bug 396574] add JETTY_HOME as a location for pid to be found
2013-01-29 14:48:25 -06:00
54c6928f58
Merge branch 'jetty-8'
2013-01-29 14:09:22 -06:00
01f7bc1e12
Merge branch 'jetty-7' into jetty-8
2013-01-29 14:08:25 -06:00
b9b7e76b7c
[Bug 396574] add /Users/jesse/installs/jetty as a location for pid to be found
2013-01-29 14:07:27 -06:00
e26c60e073
Merge jetty-8 to master
2013-01-29 14:06:47 -06:00
3b6cab63e2
Merge branch 'jetty-7' into jetty-8
2013-01-29 13:42:29 -06:00
35ebe6cea3
[Bug 394541] remove continuation jar from distro, add as dep to test-jetty-webapp
2013-01-29 13:34:45 -06:00
13fd8bc184
[Bug 370384] jetty-aggregate not used in jetty-distribution
2013-01-28 12:45:12 -06:00
503f292172
Fix typo in start.ini comments and switch ordering of jetty-plus.xml and jetty-annotations.xml
2013-01-25 10:54:25 +11:00
360615c51a
398582 Move lib/jta jar into lib/jndi
2013-01-20 11:07:01 +11:00
2e926b8de8
[maven-release-plugin] prepare for next development iteration
2012-12-26 12:52:42 -07:00
fe44428a85
[maven-release-plugin] prepare release jetty-9.0.0.M5
2012-12-26 12:52:34 -07:00
ef472ed01b
Merge from master to release-9
2012-12-26 12:28:58 -07:00
3c7b78b8f4
adjust to fit
2012-12-26 15:20:19 -03:00
82d6388a59
Address javadoc linkages in test webapp and root context
2012-12-26 15:05:17 -03:00
5f16dd756f
remove jetty-all javadoc from dependencies
2012-12-26 12:58:12 -03:00
f9c36c55e0
[maven-release-plugin] prepare for next development iteration
2012-12-21 11:47:06 -07:00
78e14912aa
[maven-release-plugin] prepare release jetty-9.0.0.M4
2012-12-21 11:46:58 -07:00
ea2f87f4be
Disabling jetty-all
2012-12-21 11:30:06 -07:00
53892b1d31
Update with setuid bits
2012-12-06 17:19:15 -06:00
748282d6d3
set final dest name on linux so
2012-12-06 10:07:58 -06:00
eefb0bc8fd
remove jetty-setuid from master and use the toolchain setuid in the distribution
2012-12-06 10:06:38 -06:00
ddb1a1b719
classifier->type
2012-12-04 20:11:25 -06:00
835d65bb2d
add in dependencies in profiles for setuid stuff so build ordering is correct
2012-12-04 18:11:47 -06:00
ec4d926b4b
[Bug 395649] add jetty-setuid back into jetty 9 and distribution
2012-12-04 16:52:26 -06:00
1b5de5ae64
Readd unpack spdy jars in jetty-distribution
2012-11-29 12:01:06 +01:00
800ef53fef
Remove jetty-monitor execution target from jetty-distribution
2012-11-29 11:51:37 +01:00
4d823c28bf
jetty-9 added jetty-all for javadoc, reinstated static context for javadoc, made proxy to xref
2012-11-29 17:41:54 +11:00
9a4e5f3301
jetty-9 Added proxy test webapp. Refined no servlet context handling
2012-11-26 16:57:37 +11:00
f89909e301
jetty-9 cleaning up dependencies
2012-11-23 16:25:57 +11:00
3131c67a2f
jetty-9 updated start.ini to latest NPN
2012-11-20 10:19:43 +11:00
ebd807b904
Revert "jetty-9 moved the jetty demos to webapps-demos controlled by start.d/demos.ini"
...
This reverts commit 4bd36e3d38
2012-11-19 10:33:45 -06:00
4bd36e3d38
jetty-9 moved the jetty demos to webapps-demos controlled by start.d/demos.ini
2012-11-19 18:35:32 +11:00
d67fdfdd85
Splitting out websocket-servlet to make it more friendly for WebAppClassloader
2012-11-12 19:42:32 -07:00
bb27f561c1
[maven-release-plugin] prepare for next development iteration
2012-11-05 12:24:06 -06:00
1d767e99a3
[maven-release-plugin] prepare release jetty-8.1.8.v20121105
2012-11-05 12:23:59 -06:00
70d591c430
[maven-release-plugin] prepare for next development iteration
2012-11-05 12:16:03 -06:00
017826b4eb
[maven-release-plugin] prepare release jetty-7.6.8.v20121105
2012-11-05 12:15:57 -06:00
94c05e6c2e
Porting test webapps from codehaus to jetty-9
2012-11-02 15:43:05 +11:00
bca34dd87b
jetty-9 cleanups for doco fetches
2012-11-02 14:27:33 +11:00
af732a758e
392237 distribute rewrite
2012-10-26 09:42:07 +11:00
e4069c6939
392237 improved configuration defaults to match documentation
2012-10-22 17:48:41 +11:00
f3912f5ecc
jetty-9 updated README
2012-10-18 10:20:22 +11:00
dd651b0d9f
Expose more stuff via jmx like threadpool details, connector details, etc.
...
Enhance start.ini documentation for spdy.
2012-10-17 13:37:34 +02:00
57492fe3ce
fix typo in start.ini
2012-10-17 13:37:34 +02:00
d15f2077a0
jetty-9 enable JSP by default
2012-10-17 22:01:57 +11:00
8c5ad05eb8
jetty-9 removed the contexts-available directory
2012-10-17 19:53:40 +11:00
8e30750a7b
jetty-9 jetty.xml should be the first config file loaded by start.ini. Move jetty-logging.xml behind jetty.xml in start.ini.
2012-10-16 14:39:25 +02:00
f5d3fec4f8
jetty-9 removed context deployer and merged context and webapps directory
2012-10-15 22:05:33 +11:00
bc4550f9b2
image licence added
2012-10-15 11:45:30 +11:00
6c011025b6
jetty-9 added a pretty welcome page
2012-10-12 15:36:32 +11:00
d173e91ef5
Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9
2012-10-12 13:05:31 +11:00
8c3fa91b26
jetty-9 reverted to more start.ini rather than start.d usage as we will not be using plugins. More configuration documentation added
2012-10-11 16:15:57 +11:00
8ee47f8a8d
update distribution remote resources
2012-09-26 09:47:46 -07:00
69a632a7cc
remove artifacts resources from distro
2012-09-25 08:22:44 -05:00
9a58e9e671
address jetty 8 -> 9 differences
2012-09-24 16:04:10 -05:00
68ee346b8a
jetty-9 combined the Container and AggregateLifeCycle into ContainerLifeCycle
2012-09-21 11:45:51 +10:00
bfe08d1a99
jetty-9 - Reorganized SPDY modules.
...
This change was due to the fact that the old spdy-core and spdy-jetty modules had classes in the same package,
which is a problem for OSGi.
The old spdy-jetty module has been split in 2: spdy-client and spdy-server, and other SPDY modules just underwent a
renaming to make them more sound.
2012-09-18 23:33:31 +02:00
9940796a32
jetty-9 xml configurations
2012-09-13 14:43:03 +10:00
a8994178f5
[maven-release-plugin] prepare for next development iteration
2012-09-10 14:18:11 -05:00
92180a9700
[maven-release-plugin] prepare release jetty-7.6.7.v20120910
2012-09-10 14:18:01 -05:00
10e4027579
[maven-release-plugin] prepare for next development iteration
2012-09-10 13:59:34 -05:00
57a6258f96
[maven-release-plugin] prepare release jetty-8.1.7.v20120910
2012-09-10 13:59:10 -05:00
1ec8b2621b
[maven-release-plugin] prepare release jetty-7.6.7.v20120910
2012-09-10 13:47:05 -05:00
4180d7e1f5
prepare for release
2012-09-10 12:59:04 -05:00
73ebe89019
jetty-9 refactored configuration
2012-09-10 20:26:14 +10:00
2dfcebfc04
jetty-9 distribution working
2012-09-06 14:54:55 +10:00
d37deeea74
[maven-release-plugin] prepare for next development iteration
2012-09-03 13:33:18 -05:00
b418b0dd57
[maven-release-plugin] prepare for next development iteration
2012-09-03 13:33:16 -05:00
41e9b1f6e2
[maven-release-plugin] prepare release jetty-7.6.6.v20120903
2012-09-03 13:33:10 -05:00
6c0b0af2fe
[maven-release-plugin] prepare release jetty-8.1.6.v20120903
2012-09-03 13:33:08 -05:00
f96576fdda
[Bug 387928] retire jetty-ajp
2012-08-23 14:10:05 -05:00
03ebcc881c
jetty-9 include more modules
2012-08-09 19:31:50 +10:00
b1750c0aae
jetty-9 fixed bad merge of poms
2012-07-20 15:20:57 +10:00
136514948f
[maven-release-plugin] prepare for next development iteration
2012-07-16 13:24:49 -05:00
1bbc677a09
[maven-release-plugin] prepare release jetty-8.1.5.v20120716
2012-07-16 13:24:42 -05:00
f755d014cd
[maven-release-plugin] prepare for next development iteration
2012-07-16 13:23:59 -05:00
04b7e807a0
[maven-release-plugin] prepare release jetty-7.6.5.v20120716
2012-07-16 13:23:53 -05:00
c00bb2d6ca
reset for release
2012-07-16 12:55:22 -05:00
f59b2a0632
reset release
2012-07-16 12:54:36 -05:00
205e8f74f0
[maven-release-plugin] prepare for next development iteration
2012-07-13 10:20:48 -05:00
c3b5269d60
[maven-release-plugin] prepare release jetty-8.1.5.v20120713
2012-07-13 10:20:23 -05:00
12ecc10c6a
[maven-release-plugin] prepare for next development iteration
2012-07-13 09:35:08 -05:00
bf40110fb8
[maven-release-plugin] prepare release jetty-7.6.5.v20120713
2012-07-13 09:34:52 -05:00
30e8e40ef2
[maven-release-plugin] prepare for next development iteration
2012-05-24 15:41:45 -05:00
667cf9a643
[maven-release-plugin] prepare release jetty-8.1.4.v20120524
2012-05-24 15:41:38 -05:00
d23a3c90b5
[maven-release-plugin] prepare for next development iteration
2012-05-24 15:40:47 -05:00
57c73283d8
[maven-release-plugin] prepare release jetty-7.6.4.v20120524
2012-05-24 15:40:35 -05:00
e45a89694a
[maven-release-plugin] prepare for next development iteration
2012-05-24 09:30:58 -05:00
36fc6fe890
[maven-release-plugin] prepare release jetty-8.1.4.v20120524
2012-05-24 09:30:52 -05:00
035e16aedc
[maven-release-plugin] prepare for next development iteration
2012-05-24 09:27:27 -05:00
f8c629026d
[maven-release-plugin] prepare release jetty-7.6.4.v20120524
2012-05-24 09:27:21 -05:00
c7a9adaa32
reset for release
2012-05-24 08:33:44 -05:00
c8fe38733f
reset versions for release
2012-05-24 08:30:26 -05:00
ea176f0586
[maven-release-plugin] prepare for next development iteration
2012-05-22 15:14:05 -05:00
3fdda881d8
[maven-release-plugin] prepare release jetty-8.1.4.v20120522
2012-05-22 15:13:56 -05:00
300a37319a
[maven-release-plugin] prepare for next development iteration
2012-05-22 14:34:10 -05:00
9ccd059375
[maven-release-plugin] prepare release jetty-7.6.4.v20120522
2012-05-22 14:33:59 -05:00
d292c67b7d
[maven-release-plugin] prepare for next development iteration
2012-04-16 09:37:37 -05:00
eabdb734ef
[maven-release-plugin] prepare release jetty-8.1.3.v20120416
2012-04-16 09:37:31 -05:00
10e269ad68
[maven-release-plugin] prepare for next development iteration
2012-04-16 09:37:15 -05:00
df1f709ea2
[maven-release-plugin] prepare release jetty-7.6.3.v20120416
2012-04-16 09:37:08 -05:00
b64909900c
[maven-release-plugin] prepare for next development iteration
2012-04-13 15:31:47 -05:00
2c0a35d430
[maven-release-plugin] prepare release jetty-8.1.3.v20120413
2012-04-13 15:31:38 -05:00
b963840d40
[maven-release-plugin] prepare for next development iteration
2012-04-13 15:29:14 -05:00
a652ee7396
[maven-release-plugin] prepare release jetty-7.6.3.v20120413
2012-04-13 15:29:05 -05:00
fe6298e5be
Merge branch 'master' into jetty-8
2012-04-13 14:59:15 -05:00
cbc820a272
replace config extraction
2012-04-13 14:58:09 -05:00
4f7c896b3d
merge from master
2012-04-13 14:10:30 -05:00
edd255b3de
remove old references
2012-04-13 13:51:33 -05:00
77d3bc8531
wire for correct java 6 and java 7 usage
2012-04-13 12:33:46 -05:00
72040202d4
Reverted release back to 8.1.3-SNAPSHOT.
2012-04-13 17:27:37 +02:00
85710fb9ea
Reverted release back to 7.6.3-SNAPSHOT.
2012-04-13 16:59:06 +02:00
3b87e91cbe
[maven-release-plugin] prepare for next development iteration
2012-04-12 10:29:30 -05:00
308b010744
[maven-release-plugin] prepare release jetty-8.1.3.v20120412
2012-04-12 10:29:20 -05:00
cdcc0922c3
[maven-release-plugin] prepare for next development iteration
2012-04-12 09:49:52 -05:00
5966c86571
[maven-release-plugin] prepare release jetty-7.6.3.v20120412
2012-04-12 09:49:46 -05:00
d8b1d80e4e
Merge remote-tracking branch 'origin/master' into jetty-8
...
Conflicts:
jetty-spdy/spdy-jetty-http-webapp/pom.xml
jetty-spdy/spdy-jetty-http/pom.xml
jetty-spdy/spdy-jetty/pom.xml
2012-03-19 17:22:02 +11:00
b3ac9235f7
add spdy to the distribution and make npn-boot test dependency pull from internal to build as opposed to out of a local repository
2012-03-16 12:46:47 -05:00
b4985ad0d5
[maven-release-plugin] prepare for next development iteration
2012-03-08 23:53:50 -06:00
7a99af4ffe
[maven-release-plugin] prepare release jetty-8.1.2.v20120308
2012-03-08 23:53:42 -06:00
246e3ed756
[maven-release-plugin] prepare for next development iteration
2012-03-08 21:09:46 -06:00
a63b3fdc5e
[maven-release-plugin] prepare release jetty-7.6.2.v20120308
2012-03-08 21:09:37 -06:00
50d92ec8ef
reset versions
2012-03-06 17:07:53 -06:00
f12e3c390c
reset versions
2012-03-06 17:06:10 -06:00
d1c8c477ea
[maven-release-plugin] prepare for next development iteration
2012-03-02 08:57:43 -06:00
b75868e84f
[maven-release-plugin] prepare release jetty-8.1.2.v20120302
2012-03-02 08:57:19 -06:00
51311d050e
[maven-release-plugin] prepare for next development iteration
2012-03-02 08:37:46 -06:00
a8296ec3d5
[maven-release-plugin] prepare release jetty-7.6.2.v20120302
2012-03-02 08:37:38 -06:00
ac79497dee
[maven-release-plugin] prepare for next development iteration
2012-02-15 14:29:36 -06:00
3705b424c8
[maven-release-plugin] prepare release jetty-8.1.1.v20120215
2012-02-15 14:29:28 -06:00
efb6883cf0
[maven-release-plugin] prepare for next development iteration
2012-02-15 14:22:19 -06:00
baf2b94f77
[maven-release-plugin] prepare release jetty-7.6.1.v20120215
2012-02-15 14:22:12 -06:00
91c526cc48
Merge branch 'master' into jetty-8
2012-02-02 16:44:24 -06:00
33a73c69fd
370386 Remove META-INF from jetty distro
2012-02-02 16:24:08 +11:00
Greg Wilkins
Jesse McConnell
Jan Bartel
Joakim Erdfelt
Thomas Becker
Simone Bordet
Greg Wilkins