Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
11,461 Commits 62 Branches 460 Tags 368 MiB
Commit Graph

845 Commits

Author SHA1 Message Date
Jesse McConnell 4515fe661b [maven-release-plugin] prepare release jetty-9.2.0.M1 2014-05-08 11:44:27 -05:00
Jan Bartel dfb751c331 Make clear org.apache.jasper.compiler.disablejsr199 only applies to glassfish 2014-05-07 15:43:46 +02:00
Jan Bartel 9c9eed1d33 Make clear org.apache.jasper.compiler.disablejsr199 only applies to gla 2014-05-07 15:42:34 +02:00
Greg Wilkins 00d61ce133 fixed jsp demo distribution 2014-04-28 15:35:57 +02:00
Greg Wilkins ce5af1d521 424982 improved PID check in jetty.sh 2014-04-25 12:56:41 +02:00
Greg Wilkins 9a7af6cbd3 readded websocket to demo base 2014-04-10 12:59:07 +10:00
Greg Wilkins 303fa57eaf improved protonego module structure to avoid ini files of parameterized modules 2014-04-03 16:50:33 +11:00
Greg Wilkins 157a54ec5c 430341 Use apache jsp/jstl by default in 9.2.0 2014-04-03 14:16:13 +11:00
Joakim Erdfelt 077887141f Updating alpn and npn modules to protonego 2014-04-01 13:09:49 -07:00
Greg Wilkins c5e1e249e7 set version for 9.2.x 2014-03-31 11:35:06 +11:00
Greg Wilkins 18f75011b4 430490 Added JETTY_SHELL 
426738 Fixed JETTY_HOME comments
 2014-03-21 13:54:23 +11:00
Greg Wilkins 119718d86f added jetty-quickstart module 2014-03-19 09:56:19 +11:00
Simone Bordet aa8b79b30a Integrated the FastCGI module into the distribution. 2014-03-14 13:11:31 +01:00
Greg Wilkins acbe13a210 430341 - add apache jsp and jstl optional modules 2014-03-14 16:54:03 +11:00
Joakim Erdfelt 2afd16ec39 427368 - start.sh fails quietly on command line error 
+ Correcting bad --daemon use
+ Adding start-log-file command line instead
+ Adding feedback about start-log-file use
 2014-03-11 14:29:11 -07:00
Greg Wilkins 84fa579ec7 429616 Use UTF-8 encoding for XML 2014-03-10 15:23:08 +11:00
Jesse McConnell 0ec0d452e9 [maven-release-plugin] prepare for next development iteration 2014-03-07 09:10:08 -06:00
Jesse McConnell 1e555567a9 [maven-release-plugin] prepare release jetty-9.1.3.v20140225 2014-03-07 09:10:08 -06:00
Jesse McConnell eb0aea46ce set versions.txt file to new version and fix mistaken developmentVersion 2014-02-10 13:48:29 -06:00
Jesse McConnell f3d38dfb15 [maven-release-plugin] prepare for next development iteration 2014-02-10 11:17:14 -06:00
Jesse McConnell 8f6cbc9111 [maven-release-plugin] prepare release jetty-9.1.2.v20140210 2014-02-10 11:17:07 -06:00
Jan Bartel c5c553260f 424171 Old javax.activation jar interferes with email sending 2014-02-06 10:31:35 +11:00
Jan Bartel 1e2e3fc7f2 425837 Upgrade to jstl 1.2.2 2014-01-17 14:36:08 +11:00
Joakim Erdfelt 5cdd27b7b9 Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2014-01-13 19:13:32 -07:00
Joakim Erdfelt 1cad68b263 Windows file mod (0755 to 0655) changes 2014-01-13 19:13:19 -07:00
Jesse McConnell b82ec6e668 [maven-release-plugin] prepare for next development iteration 2014-01-08 16:47:09 -06:00
Jesse McConnell b99623a21d [maven-release-plugin] prepare release jetty-9.1.1.v20140108 2014-01-08 16:47:01 -06:00
Joakim Erdfelt e99ad50a90 Fixing README 2013-12-18 05:54:11 -07:00
Greg Wilkins 1731e0c69a 423392 - GzipFilter without wrapping or blocking 
ensure that servlets are enabled for demo
 2013-12-13 12:19:38 +11:00
Jan Bartel 0ac021b6fd 423875 Update jetty-distro build to use jetty-toolchain jetty-schemas 3.1.M0 2013-12-12 15:50:50 +11:00
Simone Bordet 7a235e6e69 423397 - Jetty server does not run on Linux server startup because of 
a bug in jetty.sh script.

Fixed by using the "*" instead of "+" for numbers so that sed does not
complain and it's also non-GNU compliant.
 2013-12-10 16:42:39 +01:00
Joakim Erdfelt 9172d6115b [maven-release-plugin] prepare for next development iteration 2013-11-15 16:58:44 -07:00
Joakim Erdfelt 6feeab6ec3 [maven-release-plugin] prepare release jetty-9.1.0.v20131115 2013-11-15 16:58:36 -07:00
Joakim Erdfelt 3ad20296ae Removing bogus file 2013-11-15 16:35:09 -07:00
Joakim Erdfelt 753a53f77f More overhaul of the startup scripts 2013-11-15 16:34:35 -07:00
Joakim Erdfelt 7bbc0ff4df [maven-release-plugin] rollback the release of jetty-9.1.0.v20131115 2013-11-15 16:33:52 -07:00
Joakim Erdfelt 1126e68971 [maven-release-plugin] prepare for next development iteration 2013-11-15 16:03:28 -07:00
Joakim Erdfelt d6418c73d4 [maven-release-plugin] prepare release jetty-9.1.0.v20131115 2013-11-15 16:03:20 -07:00
Joakim Erdfelt 6c372b9440 Reverting <version> to 9.1.0-SNAPSHOT 2013-11-15 15:36:26 -07:00
Jesse McConnell b5345caed1 [maven-release-plugin] prepare for next development iteration 2013-11-14 15:27:52 -06:00
Jesse McConnell 1582aa196d [maven-release-plugin] prepare release jetty-9.1.0.v20131114 2013-11-14 15:27:37 -06:00
Jan Bartel 2824d91336 Remove old javadoc.xml from distro 2013-11-11 14:09:25 +11:00
Simone Bordet 1f140548fa Updated to use a $NAME variable to create PID and state files, 
correcting also locations where these are stored (in jetty.base rather
than jetty.home).
 2013-11-07 23:46:55 +01:00
Greg Wilkins 660cf58a51 improved jetty.sh for JETTY_BASE 2013-11-07 23:28:22 +11:00
Joakim Erdfelt 5965e695fa Cleaning up modules 2013-10-24 14:06:50 -07:00
Greg Wilkins 2d53fe8744 cleaned up demo 2013-10-03 18:43:06 +10:00
Jesse McConnell 3fb3616b21 remove overlay deployer for 9.1 while it gets reconsidered in new module system 2013-09-30 19:11:34 -05:00
Jesse McConnell 856a24b65a [maven-release-plugin] prepare for next development iteration 2013-09-30 14:46:09 -05:00
Jesse McConnell f466f03c6a [maven-release-plugin] prepare release jetty-9.0.6.v20130930 2013-09-30 14:46:00 -05:00
Jesse McConnell 0b3f431d27 set version back to 9.0.6-SNAPSHOT 2013-09-30 12:33:06 -05:00
Jesse McConnell af2e6ff911 Merge branch 'master' into release-9 2013-09-30 12:28:04 -05:00
Joakim Erdfelt cc9c19fd9d Merge branch 'master' into jetty-9.1 2013-09-23 11:18:04 -07:00
Joakim Erdfelt 0e34cdf7d8 417831 - Remove jetty-logging.properties from distro/resources 2013-09-23 11:17:32 -07:00
Jan Bartel 07f3230784 412469 make module for jetty-jaspi 2013-09-20 17:56:02 +10:00
Jan Bartel cf9f007fbd 417340 Upgrade JDT compiler to one that supports source/target of Java 1.7 2013-09-20 15:36:55 +10:00
Greg Wilkins cb33fa36fd Use modules to initialise demo-base where possible 2013-09-20 14:24:22 +10:00
Jesse McConnell 0525498ad3 [maven-release-plugin] prepare for next development iteration 2013-09-19 15:06:31 -05:00
Jesse McConnell c05a725db6 [maven-release-plugin] prepare release jetty-9.0.6.v20130919 2013-09-19 15:06:17 -05:00
Jan Bartel f44787075a 417382 - Upgrade to asm 4.1 and refactor annotation parsing 2013-09-17 13:12:54 +10:00
Greg Wilkins 8449ccc873 415826 modules initialised with --add-to-start and --add-to-startd 2013-09-16 11:53:46 +10:00
Greg Wilkins bb8d8fb999 415826 modules initialised with --module-start-ini and --module-startd-ini 2013-09-13 14:12:09 +10:00
Greg Wilkins 822f5d2a0f 417108 - demo-base uses HTTPS 2013-09-13 13:02:27 +10:00
Jan Bartel 0abeb876dc Update start.ini to handle different versions of npn boot jar 2013-09-12 12:37:50 +10:00
Thomas Becker 9008210c2e setuid.mod, ext.mod fix module errors 2013-09-06 17:34:28 +02:00
Joakim Erdfelt db19102bba Fixing distribution - adding servlets.mod + javax.mail support 2013-09-06 07:53:35 -07:00
Greg Wilkins ace43502ad refined start.jar mechanism to align with updated documentation 2013-09-06 16:10:03 +10:00
Greg Wilkins c9ddc8f345 415826 start.jar replace --enable with --module-ini 
Fixed up comments in start.ini
 2013-08-30 16:30:39 +10:00
Joakim Erdfelt 7d50302562 Fixing distribution build + demo-base start port 2013-08-29 15:26:31 -07:00
Joakim Erdfelt a5addbeb5a jetty-distribution / making demo-base function? 2013-08-29 15:26:31 -07:00
Jesse McConnell 6d376c174d remove demo mod from distro init line 2013-08-29 16:43:52 -05:00
Jesse McConnell ac30f5c9bd update other jetty mods to new format 2013-08-29 16:39:28 -05:00
Greg Wilkins aec807804d 415826 start.jar replace --enable with --module-ini 
Added --module-ini and --module-start-ini
jetty.base is set from user.dir
jetty.home is set from start.jar dir
 2013-08-29 12:37:50 +10:00
Greg Wilkins e5b4f37b62 renamed README.txt to README.TXT and updated contents 2013-08-29 00:32:36 +10:00
Greg Wilkins c1bd267c17 415826 start.jar replace --enable with --initialize 2013-08-28 15:41:27 +10:00
Greg Wilkins d66778ad06 415826 start.jar module --enable and --disable 
morphed mechanism into --initialize based templates
 2013-08-28 09:30:03 +10:00
Joakim Erdfelt 866a9c96d2 jetty-start / removing --module= references in start.ini 
+ making sure that demo.mod starts jetty appropriately.
+ making sure that --disable-module=demo works as advertised with
  jetty-distribution
 2013-08-26 16:47:08 -07:00
Joakim Erdfelt 14ec13000d Moving demo related files in distro to ${jetty.base}/demo/ directory 2013-08-26 09:50:31 -07:00
Greg Wilkins e224ba5e94 415831 - rename ini keyword from MODULES= to --module= 
Also cleaned up output from --list-modules to include the source of
module enabling.
 2013-08-26 10:53:16 +10:00
Joakim Erdfelt e36ce2743e 414635 Modular start.d and jetty.base property 
+ More *.mod definition updates
+ Some safety checks in Module edge addition to prevent duplicates
+ Minor updates to README in jetty-start
 2013-08-23 15:47:50 -07:00
Joakim Erdfelt a396563340 414635 Modular start.d and jetty.base property 
+ More work on startup of real jetty server.
 2013-08-22 14:52:02 -07:00
Joakim Erdfelt 5b2d9bc825 More work to get jetty to start 2013-08-22 12:45:52 -07:00
Jesse McConnell 54091990cb remove duplicate schema.jar 2013-08-22 13:08:51 -05:00
Jesse McConnell 6ef6841a2e add modules directory 2013-08-22 12:04:11 -05:00
Jesse McConnell 8efba9fb40 bring back start.ini 2013-08-22 11:59:07 -05:00
Jesse McConnell 725e405dac first pass for mod files for distribution 2013-08-22 11:53:58 -05:00
Greg Wilkins 9bb6d91742 414635 Modular start.d and jetty.base property 
dependencies
 2013-08-20 17:04:20 +10:00
Greg Wilkins bead95314a 414635 Modular start.d and jetty.base property 
Added more info in README.TXT files
 2013-08-19 13:22:02 +10:00
Jesse McConnell 42387785bd fix start.ini 2013-08-15 12:07:47 -05:00
Greg Wilkins 145f544861 414635 Modular start.d and jetty.base property 
Added --enable and --disable
 2013-08-15 22:57:43 +10:00
Jan Bartel c80100b4a9 [maven-release-plugin] prepare for next development iteration 2013-08-15 19:13:27 +10:00
Jan Bartel e7e7e45500 [maven-release-plugin] prepare release jetty-9.0.5.v20130815 2013-08-15 19:13:13 +10:00
Jan Bartel 716430bb03 [maven-release-plugin] rollback the release of jetty-9.0.5.v20130815 2013-08-15 18:03:49 +10:00
Jan Bartel 3d13c15d35 [maven-release-plugin] prepare release jetty-9.0.5.v20130815 2013-08-15 17:22:03 +10:00
Jan Bartel 7947b35134 Reset version for rerun of 9.0.5 2013-08-15 16:47:03 +10:00
Jesse McConnell 4383c9042d [maven-release-plugin] prepare for next development iteration 2013-08-13 14:20:56 -05:00
Jesse McConnell 160d34ec23 [maven-release-plugin] prepare release jetty-9.0.5.v20130813 2013-08-13 14:20:47 -05:00
Greg Wilkins dcf98fd675 414635 Modular start.d and jetty.base property 
Made https and spdy mutually exclusive
 2013-08-08 18:07:42 +10:00
Greg Wilkins 21e7b67cc7 414635 Modular start.d and jetty.base property 2013-08-08 17:53:52 +10:00
Joakim Erdfelt 6278f8eb30 JSR-356 - making the JSR happy enough to start 2013-08-06 09:32:49 -07:00
Joakim Erdfelt 12f6853900 WebSocket - enabling WebSocket on distribution 2013-08-06 09:20:02 -07:00
Jan Bartel 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
Jan Bartel 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
Greg Wilkins 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
Greg Wilkins 2d3f0bfe0b 412466 Improved search for unset JETTY_HOME 2013-07-08 14:27:13 +10:00
Greg Wilkins 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
Joakim Erdfelt 78b5f7df1f [maven-release-plugin] prepare for next development iteration 2013-06-25 08:29:26 -07:00
Joakim Erdfelt 5f2c937fcb [maven-release-plugin] prepare release jetty-9.0.4.v20130625 2013-06-25 08:29:18 -07:00
Joakim Erdfelt 31faf2fe20 Reverting failed release from friday 2013-06-25 07:42:45 -07:00
Jesse McConnell 018a51a04e Merge branch 'master' into release-9 2013-06-21 15:18:46 -05:00
Jesse McConnell 4db892d6b3 update links on root context of distro 2013-06-21 11:29:02 -05:00
Jesse McConnell 57bfda2a08 [maven-release-plugin] prepare for next development iteration 2013-06-21 09:49:25 -05:00
Jesse McConnell c1082ad4d4 [maven-release-plugin] prepare release jetty-9.0.4.v20130621 2013-06-21 09:49:15 -05:00
Jan Bartel 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
Greg Wilkins 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
Jesse McConnell eddb49941d [Bug 408600] set correct jetty.url in all pom files 2013-06-12 15:52:36 -05:00
Greg Wilkins 53270e7edb 410522 JETTY_PORT sets jetty.port property instead of -Djetty.port 2013-06-12 13:13:09 +10:00
Jan Bartel cbac0ea5fa Merge remote-tracking branch 'origin/master' into servlet-3.1-api 2013-05-16 07:24:49 +10:00
Greg Wilkins affc41ddf5 fixed comment 2013-05-10 19:47:01 +10:00
Jan Bartel bd153af2e2 Update to temporarily use jsp 2.3 and el 3.0 from maven 2013-05-09 17:17:46 +10:00
Jan Bartel 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
Jesse McConnell ddb84cd55d Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2013-05-08 06:23:15 -05:00
Thomas Becker 7448c4fe57 add https listener config to 900-demo.ini 2013-05-07 10:46:11 +02:00
Jesse McConnell 3d600ed95e [maven-release-plugin] prepare for next development iteration 2013-05-06 18:13:04 -05:00
Jesse McConnell d832f3dc7e [maven-release-plugin] prepare release jetty-9.0.3.v20130506 2013-05-06 18:12:55 -05:00
Jan Bartel a5c143063f Merge remote-tracking branch 'origin/master' into servlet-3.1-api 2013-05-06 17:00:47 +10:00
Jan Bartel b182f09b2c 405944 Check annotation and resource injection is supported for AsyncListener 2013-05-06 16:32:38 +10:00
Greg Wilkins b89de0346d updated jndi, jaas and annotation tests to webapps.demo 2013-05-06 16:16:43 +10:00
Jan Bartel 8d0cf5e949 Merge remote-tracking branch 'origin/master' into servlet-3.1-api 2013-05-06 14:46:28 +10:00
Greg Wilkins d3f33909c2 improved comments for ini files 2013-05-06 09:26:14 +10:00
Jan Bartel 0d181d9a75 Merge remote-tracking branch 'origin/master' into servlet-3.1-api 2013-05-03 16:59:39 +10:00
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
Jesse McConnell 778ee1411b [maven-release-plugin] prepare for next development iteration 2013-03-06 10:21:46 -06:00
Jesse McConnell d916078711 [maven-release-plugin] prepare release jetty-9.0.0.v20130306 2013-03-06 10:21:38 -06:00
Jan Bartel a4f2e743d0 399070 add updated version of npn-boot jar to start.ini 2013-03-05 17:03:07 +11:00
Jesse McConnell 7c442735c0 fix bad blog url 2013-03-01 16:43:17 -06:00
Greg Wilkins ec083b4ecc jetty-9 link to jetty blogs 2013-02-28 12:46:28 +11:00
Joakim Erdfelt 29b2118870 [maven-release-plugin] prepare for next development iteration 2013-02-26 09:20:45 -07:00
Joakim Erdfelt 2b82b54f6d [maven-release-plugin] prepare release jetty-9.0.0.RC2 2013-02-26 09:20:45 -07:00
Greg Wilkins b82a781113 400864 Added LowResourcesMonitor 2013-02-18 20:03:36 +11:00
Joakim Erdfelt 4dc3ed38c2 [maven-release-plugin] prepare for next development iteration 2013-02-05 10:00:36 -07:00
Joakim Erdfelt ed24f78498 [maven-release-plugin] prepare release jetty-9.0.0.RC0 2013-02-05 10:00:36 -07:00
Jesse McConnell e073ceb06d [maven-release-plugin] prepare for next development iteration 2013-02-05 10:00:36 -07:00
Jesse McConnell 2f2ad287af [maven-release-plugin] prepare release jetty-9.0.0.RC0 2013-02-05 10:00:35 -07:00
Simone Bordet 209d5bc12f 399721 - Change <Ref id= ...> to <Ref refid= ...> 2013-02-01 13:03:11 +01:00
Greg Wilkins 7b7a6dc03a jetty-9 added properties to start.ini 2013-02-01 12:08:22 +11:00
Jesse McConnell 5c58878c3c [maven-release-plugin] prepare for next development iteration 2013-01-31 11:34:38 -06:00
Jesse McConnell ebbe37294f [maven-release-plugin] prepare release jetty-8.1.9.v20130131 2013-01-31 11:34:30 -06:00
Jesse McConnell a5e1e04af1 [maven-release-plugin] prepare for next development iteration 2013-01-31 08:42:20 -06:00
Jesse McConnell b7fb18fd65 [maven-release-plugin] prepare release jetty-7.6.9.v20130131 2013-01-31 08:42:12 -06:00
Jesse McConnell 54fab80d01 Merging from jetty-8 to master 2013-01-29 16:24:51 -06:00
Jesse McConnell f0c6b9bc82 Merge branch 'jetty-7' into jetty-8 2013-01-29 15:51:56 -06:00