181 Commits

Author SHA1 Message Date
Greg Wilkins
ad124b6888 419309 Added symlink checker to test webapp 2013-10-14 11:59:18 +11:00
Greg Wilkins
2d53fe8744 cleaned up demo 2013-10-03 18:43:06 +10:00
Greg Wilkins
b636c58af6 fixed test.xml overlay 2013-09-30 13:56:37 +10:00
Greg Wilkins
7dec90fafb some demo cleanups 2013-09-27 17:47:31 +10:00
Greg Wilkins
cb33fa36fd Use modules to initialise demo-base where possible 2013-09-20 14:24:22 +10:00
Thomas Becker
74a75e3d42 test chat fix 2013-09-17 14:39:00 +02:00
Thomas Becker
2e064351a1 test chat fix 2013-09-17 14:36:58 +02:00
Greg Wilkins
a2a475b4af minor text cleanups in demo webapps 2013-09-13 15:51:55 +10:00
Greg Wilkins
43c92f8117 416812 - Don't start WebSocketClient for every context
turn off for all contexts in demo
2013-09-12 20:44:13 +10:00
Joakim Erdfelt
7e3ef36f16 Revert "416812 Only start WebSocketContainer if enabled by attribute"
This reverts commit a1cba900c5266ddba97a58f0e67e55b35418fc7e.
2013-09-09 09:28:33 -07:00
Greg Wilkins
a1cba900c5 416812 Only start WebSocketContainer if enabled by attribute 2013-09-09 12:27:15 +10:00
Jan Bartel
3d7c1324d9 416681 Remove unnecessary security constraints in test-jetty-webapp 2013-09-06 16:58:53 +10:00
Greg Wilkins
ef98f89e5c 416680 remove uncovered constraint warning 2013-09-06 16:56:15 +10:00
Greg Wilkins
ace43502ad refined start.jar mechanism to align with updated documentation 2013-09-06 16:10:03 +10:00
Joakim Erdfelt
d539fd7e5f Adding jsp module to demo 2013-08-30 13:09:14 -07: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
Joakim Erdfelt
8a1f12ae81 jetty-start / fixing build + work towards demo-base 2013-08-29 11:49:33 -07:00
Jan Bartel
c183c6fad5 Merge branch 'jetty-9.1' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9.1 2013-08-29 12:59:50 +10:00
Jan Bartel
280000e88a Merge remote-tracking branch 'origin/master' into jetty-9.1
Conflicts:
	VERSION.txt
	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-spi/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-overlay-deployer/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-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
	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-jetty-webapp/src/main/config/demo/webapps/test.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-08-29 12:59:32 +10:00
Greg Wilkins
c84063a5f8 415826 start.jar replace --enable with --initialize
refactored impl to be clearer when creating ini
2013-08-28 23:53:32 +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
Joakim Erdfelt
2e94149ea3 Merge branch 'jetty-9.1' into jetty-9.1-altstart 2013-08-23 11:49:41 -07:00
Greg Wilkins
e4235ea070 415744 - Reduce Future usage in websocket 2013-08-23 19:58:46 +10:00
Greg Wilkins
d2ff475834 Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
	jetty-util/src/main/java/org/eclipse/jetty/util/resource/FileResource.java
	tests/test-webapps/test-jetty-webapp/src/main/config/webapps.demo/test.xml
2013-08-23 17:17:34 +10: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
4016ba571c JSR-356 working javax.websocket demo in the distribution. 2013-08-15 12:20:06 -07:00
Joakim Erdfelt
662d00855d Adding javax.websocket chat to test-jetty-webapp 2013-08-15 12:20:06 -07:00
Jan Bartel
2c3ecf9e38 414731 Request.getCookies() should return null if there are no cookies 2013-08-09 18:08:16 +10:00
Joakim Erdfelt
2e1ad360ae Fixing compilation failure 2013-07-16 18:17:14 -07:00
Joakim Erdfelt
f8c457f75e Merge branch 'jetty-9.1' into javawebsocket-jsr 2013-06-19 15:07:15 -07:00
Joakim Erdfelt
2da8c9c306 Merge branch 'master' into javawebsocket-jsr
Conflicts:
	jetty-spdy/spdy-http-server/src/test/java/org/eclipse/jetty/spdy/server/http/ReferrerPushStrategyTest.java
	jetty-util/src/main/java/org/eclipse/jetty/util/BufferUtil.java
	jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/io/UpgradeConnection.java
	jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/events/EventDriver.java
	jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/ServletWebSocketRequest.java
	jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketServerFactory.java
	jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/WebSocketLoadRFC6455Test.java
2013-06-17 10:54:10 -07: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
Thomas Becker
391b0ee426 ChatServletTest fix test 2013-06-13 17:36:29 +02:00
Thomas Becker
df17ef8b3a 408709 refactor test-webapp's chat application. Now there's only a single request for user login and initial chat message. 2013-06-13 16:58:57 +02:00
Joakim Erdfelt
9f82849900 Merge from [master] to [javawebsocket-jsr] 2013-05-09 12:10:57 -07:00
Jan Bartel
a5c143063f Merge remote-tracking branch 'origin/master' into servlet-3.1-api 2013-05-06 17:00:47 +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
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
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
Joakim Erdfelt
346034b44f JSR-356 removing redundant try/catch 2013-04-22 11:16:01 -07:00
Greg Wilkins
03fd068ebc Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/ResourceCache.java
2013-04-22 14:20:03 +10:00
Jan Bartel
87d4690462 405533 Implement special role ** for security constraints 2013-04-19 15:53:45 +10:00
Greg Wilkins
4e3c7367af virtual host example 2013-04-15 12:29:08 +10:00