Eclipse/jetty.project
1
0
Fork 0
mirror of https://github.com/jetty/jetty.project.git synced 2025-02-25 00:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,312 Commits 55 Branches 466 Tags
Commit Graph

464 Commits

Author SHA1 Message Date
Simone Bordet
209d5bc12f 399721 - Change <Ref id= ...> to <Ref refid= ...> 2013-02-01 13:03:11 +01:00
Joakim Erdfelt
1480f3d8fc 399669 - Remove WebSocketConnection in favor of websocket.api.Session 2013-01-31 12:09:04 -07: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