Commit Graph

514 Commits

Author SHA1 Message Date
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
Jan Bartel 9194fe1b7b 399566 Running org.eclipse.jetty.server.session.MaxInactiveMigrationTest produces stack trace 2013-01-31 15:42:27 +11:00
Greg Wilkins b132663c2b jetty-9 made WebAppContext configuration additive 2013-01-31 12:21:04 +11:00
Joakim Erdfelt 4f48bc7e7b 399343 - OnWebSocketConnect should use api.Session parameter instead.
+ Changed method signature for WebSocketListener and the various
  @OnWebSocket* annotations
2013-01-29 13:22:38 -07:00
Jesse McConnell e26c60e073 Merge jetty-8 to master 2013-01-29 14:06:47 -06:00
Jan Bartel 497acc8555 399132 check parent dir of session store against file to be removed 2013-01-27 10:18:27 +11:00
Jesse McConnell 2cbb630f8e Merge branch 'jetty-8' 2013-01-25 16:53:46 -06:00
Jesse McConnell f16fc7e7b7 Merge branch 'jetty-7' into jetty-8 2013-01-25 16:53:18 -06:00
Jesse McConnell 1a31067369 Add note about getCanonicalFile check and fix IdleSession test in test hash sessions 2013-01-25 16:25:59 -06:00
Greg Wilkins 7fd04a186f cleanup after merge 2013-01-25 11:47:47 +11:00
Jan Bartel a36c55d7a0 Update instructions for test-spec webapp 2013-01-25 11:28:40 +11:00
Jan Bartel 16ef1cbd74 Update deployment instructions for test-jndi webapp 2013-01-25 11:09:19 +11:00
Greg Wilkins dc4e525622 Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/GzipFilter.java
2013-01-21 17:04:22 +11:00
Greg Wilkins 46e13b305b Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
	jetty-util/src/test/java/org/eclipse/jetty/util/URLEncodedTest.java
2013-01-17 11:00:20 +11:00
Greg Wilkins 9cf08249e0 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-01-17 09:16:40 +11:00
Greg Wilkins c4e77feefa unit test uses fake JSP 2013-01-15 15:53:54 +11:00
Jesse McConnell e1c516c7d1 merge from jetty-8 and update license blocks. 2013-01-11 17:04:53 -06:00
Jesse McConnell 863944873d merge from 7 and update license blocks for 2013 2013-01-11 15:01:16 -06:00
Jesse McConnell a4dbb5823c update license blocks for 2013 2013-01-11 14:57:51 -06:00
Greg Wilkins 27c31fb403 jetty-9 organised imports. Cleaned up some TODOs 2013-01-11 16:37:32 +11:00
Greg Wilkins 3efcc2af41 Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/Request.java
	jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/DefaultServlet.java
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/GzipFilter.java
2013-01-10 16:24:41 +11:00
Greg Wilkins e4d51d5c16 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-01-10 13:25:51 +11:00
Greg Wilkins 1add18a57b 397535 Support pluggable alias checking to support symbolic links 2013-01-10 13:23:11 +11:00
Greg Wilkins 08afd17b88 Merge remote-tracking branch 'origin/jetty-7' into jetty-8
Conflicts:
	tests/test-integration/src/test/java/org/eclipse/jetty/test/jsp/JspAndDefaultWithoutAliasesTest.java
2013-01-10 13:04:30 +11:00
Greg Wilkins 8deb1222db Making change to reintroduce this test to merged 8 2013-01-10 13:03:27 +11:00
Greg Wilkins 8232a87411 temporarly remove test 2013-01-10 12:52:21 +11:00
Greg Wilkins 74edf1867c Merge remote-tracking branch 'origin/jetty-7' into jetty-8
Conflicts:
	tests/test-integration/src/test/java/org/eclipse/jetty/test/jsp/JspAndDefaultWithoutAliasesTest.java
2013-01-10 12:06:55 +11:00
Joakim Erdfelt 7a3b440a62 Refactoring Jsp + DefaultServlet + Resource Aliasing test cases 2013-01-09 15:22:32 -07:00
Joakim Erdfelt 83aa65415b Fixing for JDK 6 2013-01-07 09:37:13 -07:00
Greg Wilkins 2aab780eba Merge remote-tracking branch 'origin/jetty-7' into jetty-8
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
	tests/test-integration/src/test/java/org/eclipse/jetty/test/jsp/JspMatchingTest.java
2013-01-07 23:45:38 +11:00
Greg Wilkins ccda9bb10b 397535 Support pluggable alias checking to support symbolic links 2013-01-07 19:57:52 +11:00
Jan Bartel a4c547d61f Make JspMatchingTest work with jsp 2.1 using maven command line build 2013-01-07 19:18:53 +11:00
Jan Bartel 39cae560d8 Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
	tests/test-integration/pom.xml
2013-01-07 16:12:04 +11:00
Jan Bartel 8d0e776b2a Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
	jetty-start/src/main/resources/org/eclipse/jetty/start/start.config
	jetty-util/src/main/java/org/eclipse/jetty/util/MultiPartInputStream.java
	test-jetty-webapp/pom.xml
	tests/test-integration/pom.xml
2013-01-07 12:47:32 +11:00
Jan Bartel 64df770b42 Make new JspMatchingTest work with jsp2.2 for jetty-8 2013-01-07 12:34:57 +11:00
Jan Bartel d2c2e8693f Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-01-07 10:38:48 +11:00
Joakim Erdfelt c23f722286 Reverting validation changes to FileResource and disabling tests 2013-01-02 10:32:16 -07:00
Joakim Erdfelt 9fde0c56ab Merge branch 'jetty-7' into jetty-8 2012-12-27 14:22:57 -07:00
Joakim Erdfelt 1da584003a Moving new tests from test-jetty-webapp as a webapp to test-integration as embedded 2012-12-27 13:53:38 -07:00
Jesse McConnell 3c7b78b8f4 adjust to fit 2012-12-26 15:20:19 -03:00
Jesse McConnell 82d6388a59 Address javadoc linkages in test webapp and root context 2012-12-26 15:05:17 -03:00
Jesse McConnell 2bc4cdcd01 wire up transparent access for both xref and apidocs 2012-12-26 15:01:41 -03:00
Greg Wilkins 31def06214 jetty-9 URI parsing passed ByteBuffer so that strange query string encodings can be supported 2012-12-24 19:17:00 +11:00
Jan Bartel 346918577f Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
	jetty-client/src/main/java/org/eclipse/jetty/client/AsyncHttpConnection.java
	jetty-server/src/main/java/org/eclipse/jetty/server/AbstractHttpConnection.java
	jetty-server/src/main/java/org/eclipse/jetty/server/Server.java
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/MultiPartFilter.java
	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/MultipartFilterTest.java
	jetty-util/src/main/java/org/eclipse/jetty/util/MultiPartInputStream.java
	jetty-util/src/test/java/org/eclipse/jetty/util/MultiPartInputStreamTest.java
	jetty-webapp/src/test/java/org/eclipse/jetty/webapp/WebAppContextTest.java
	test-jetty-servlet/src/main/java/org/eclipse/jetty/testing/ServletTester.java
	test-jetty-webapp/src/main/java/com/acme/CookieDump.java
	test-jetty-webapp/src/main/java/com/acme/HelloWorld.java
2012-12-22 15:12:17 +11:00
Simone Bordet b6e4f98cf7 Performance improvements to HTTP client after profiling session.
The profiling suggested to reduce the number of unneeded allocations
and this required a couple of API changes.
2012-12-19 16:27:20 +01:00
Simone Bordet c9f4513a89 Reworked HTTP client API, removing usage of Future. 2012-12-19 16:27:20 +01:00
Joakim Erdfelt e308f843db Replacing FrameBytes tree with WriteBytesProvider class 2012-12-14 16:12:48 -07:00
Jan Bartel f6e5e547f0 396475 Remove unneeded websocket-server dependency from test-jetty-webapp 2012-12-13 19:58:50 +11:00
Greg Wilkins 6f098dd69c jetty-9 use DateCache timer to set Date header once per second 2012-12-10 12:58:14 +11:00
Greg Wilkins 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
Greg Wilkins 21f717078c jetty-9 handle null push strategy 2012-11-29 17:03:40 +11:00
Greg Wilkins 9931ddec94 jetty-9 fixed test webapp TestServer and improved error message 2012-11-29 17:03:40 +11:00
Greg Wilkins 5ee2ea85bb fixed path for new layout 2012-11-29 15:55:33 +11:00
Thomas Becker 0fd789216d test-jetty-weappap - Remove wiki link and replace with documentation 2012-11-27 14:26:36 +01:00
Greg Wilkins 7115ea5e12 jetty-9 added missing manifest (was ignored) 2012-11-26 20:48:56 +11:00
Greg Wilkins 3b935c9061 jetty-9 fixed assembly 2012-11-26 17:33:50 +11:00
Greg Wilkins 9a4e5f3301 jetty-9 Added proxy test webapp. Refined no servlet context handling 2012-11-26 16:57:37 +11:00
Thomas Becker ab642141d1 Add jetty-maven-plugin to test-webapp-rfc2616 2012-11-23 11:01:58 +01:00
Greg Wilkins f89909e301 jetty-9 cleaning up dependencies 2012-11-23 16:25:57 +11:00
Jan Bartel 3393108950 Fix link to jetty @ eclipse for test webapp 2012-11-23 10:52:49 +11:00
Jan Bartel 332017d84d Fix link to jetty @ eclipse 2012-11-23 10:48:28 +11:00
Jan Bartel fc2682ab02 394870 Make enablement of remote access to test webapp configurable in override-web.xml 2012-11-23 10:35:10 +11:00
Jan Bartel 5f69945b33 Update remote.html text for jetty-9 2012-11-22 21:52:56 +11:00
Thomas Becker 3ea03e7094 394860: fix test-jetty-webapp to work with mvn jetty:run again 2012-11-22 10:22:19 +01:00
Jan Bartel 11704ab986 Port IdleSessionTest to jetty-9 api 2012-11-22 18:38:23 +11:00
Greg Wilkins f0cc03ede5 Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/Response.java
	jetty-server/src/main/java/org/eclipse/jetty/server/session/HashSessionManager.java
	jetty-server/src/main/java/org/eclipse/jetty/server/session/HashedSession.java
	jetty-server/src/test/java/org/eclipse/jetty/server/ResponseTest.java
	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/MultipartFilterTest.java
2012-11-22 17:01:55 +11:00
Greg Wilkins e42b5bf970 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2012-11-22 16:35:26 +11:00
Jan Bartel 90a86d3a6b Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2012-11-22 16:26:38 +11:00
Jan Bartel f6a8005b91 Add blank for license header check 2012-11-22 16:13:44 +11:00
Jan Bartel 8920fcc128 394829 Session can not be restored after SessionManager.setIdleSavePeriod has saved the session 2012-11-22 15:50:01 +11:00
Greg Wilkins 99fbca11f2 jetty-9 turn on client OPTION for test-webapp 2012-11-20 10:04:57 +11:00
Greg Wilkins 2ad9dd5b95 jetty-9 corrected groupId after move 2012-11-20 09:53:56 +11:00
Jesse McConnell a0c1d85094 Revert "jetty-9 cleaned up serverClasses to minimum"
This reverts commit 67b5caadbb.
2012-11-19 10:33:54 -06:00
Jesse McConnell 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
Jan Bartel 3642de3b8a 392237 - Port test-integration to jetty-9 2012-11-19 18:48:03 +11:00
Greg Wilkins 4bd36e3d38 jetty-9 moved the jetty demos to webapps-demos controlled by start.d/demos.ini 2012-11-19 18:35:32 +11:00
Greg Wilkins 67b5caadbb jetty-9 cleaned up serverClasses to minimum 2012-11-19 17:42:52 +11:00
Jan Bartel be816d853b 392237 Port tests/login-service to jetty-9 2012-11-19 16:31:53 +11:00
Greg Wilkins 82117bc833 jetty-9 fixed hostHeader handling in ProxyServlet and re-enabled in test webapp 2012-11-19 16:22:27 +11:00
Greg Wilkins f21b74dcb1 jetty-9 relocated test webapp 2012-11-19 15:57:38 +11:00
Jan Bartel 0912731b89 Add test-mock-resources to plugin dependencies for test-jndi-webapp 2012-11-19 13:29:29 +11:00
Jan Bartel b000fa4f34 394545 Add jetty-jaas dependency to jetty-maven-plugin 2012-11-19 12:21:01 +11:00
Jan Bartel 13e0b40c8b Update context path from /test-annotations to /test-spec for test-spec-webapp 2012-11-08 13:54:04 +11:00
Jesse McConnell bb27f561c1 [maven-release-plugin] prepare for next development iteration 2012-11-05 12:24:06 -06:00
Jesse McConnell 1d767e99a3 [maven-release-plugin] prepare release jetty-8.1.8.v20121105 2012-11-05 12:23:59 -06:00
Jesse McConnell 70d591c430 [maven-release-plugin] prepare for next development iteration 2012-11-05 12:16:03 -06:00
Jesse McConnell 017826b4eb [maven-release-plugin] prepare release jetty-7.6.8.v20121105 2012-11-05 12:15:57 -06:00
Jan Bartel ce1c1107eb Fix license headers 2012-11-02 23:09:09 +11:00
Jan Bartel 4e7932f519 Add production warning; rename test-annotation.war to test-spec.war for jetty-9 2012-11-02 16:56:17 +11:00
Jan Bartel 94c05e6c2e Porting test webapps from codehaus to jetty-9 2012-11-02 15:43:05 +11:00
Greg Wilkins 3683653052 393303 use jetty-web.xml to explicitly add the jetty packages that need visability. This commit also sucked in some changes made to help with the documentation process (improving deployer configuration management 2012-11-01 20:20:45 +11:00
Joakim Erdfelt a1bf37f2a5 Trying to fix intellij scope concern 2012-10-30 08:35:01 -07: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
Jan Bartel 3d198a94fb Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2012-10-29 16:06:38 +11:00
Jan Bartel 8b90057b68 371170 MongoSessionManager LastAccessTimeTest fails 2012-10-29 16:05:46 +11:00
Jan Bartel d1dfc56e04 Merge remote-tracking branch 'origin/jetty-8' 2012-10-29 15:07:26 +11:00
Jan Bartel a8a015d8c2 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2012-10-29 14:44:12 +11:00
Jan Bartel 7c03c793d5 392812 MongoSessionIDManager never purges old sessions 2012-10-29 12:49:38 +11:00
Jan Bartel 262ef1386d License headers 2012-10-28 08:28:17 +11:00