04d703c062
365302: clean up old Logger mbeans
2012-01-13 13:59:49 +11:00
de005c68fd
Revert "Merge branch 'release-8'"
...
This reverts commit 9e72457941df12605f0e
2011-11-30 16:27:30 +11:00
55d5020980
Merge remote-tracking branch 'origin/master' into jetty-8
...
Conflicts:
VERSION.txt
jetty-server/src/main/java/org/eclipse/jetty/server/AbstractHttpConnection.java
jetty-server/src/main/java/org/eclipse/jetty/server/Response.java
jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
2011-11-29 09:06:25 +11:00
d55477388b
more debug in tests
2011-11-22 00:12:56 +11:00
127a5af8d7
Merge remote-tracking branch 'origin/master' into jetty-8
2011-11-17 10:59:54 +11:00
af4c40d793
fixed SSL buffer pool
2011-11-09 17:39:59 +11:00
d862348b4c
Merge remote-tracking branch 'origin/master' into jetty-8
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/HttpConnection.java
2011-10-06 18:31:57 +11:00
a8f24a2b64
360066 jsps referenced in web.xml <jsp-file> elements do not compile
2011-10-06 17:32:31 +11:00
32dbb1bddb
Merge remote-tracking branch 'origin/master' 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/pom.xml
jetty-ajp/pom.xml
jetty-annotations/pom.xml
jetty-client/pom.xml
jetty-continuation/pom.xml
jetty-deploy/pom.xml
jetty-deploy/src/main/config/etc/jetty-deploy.xml
jetty-distribution/pom.xml
jetty-http/pom.xml
jetty-io/pom.xml
jetty-jaspi/pom.xml
jetty-jmx/pom.xml
jetty-jndi/pom.xml
jetty-jsp-2.1/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-jsp/src/main/java/org/eclipse/jetty/osgi/boot/jsp/FragmentActivator.java
jetty-osgi/jetty-osgi-boot-logback/pom.xml
jetty-osgi/jetty-osgi-boot-warurl/pom.xml
jetty-osgi/jetty-osgi-boot/pom.xml
jetty-osgi/jetty-osgi-equinoxtools/pom.xml
jetty-osgi/jetty-osgi-httpservice/pom.xml
jetty-osgi/jetty-osgi-servletbridge/pom.xml
jetty-osgi/jetty-osgi-servletbridge/src/main/java/org/eclipse/jetty/osgi/servletbridge/FrameworkLauncherExtended.java
jetty-osgi/jetty-osgi-servletbridge/src/main/webapp/WEB-INF/web.xml
jetty-osgi/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-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
jetty-servlet/pom.xml
jetty-servlets/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-jetty6/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-sessions-common/pom.xml
tests/test-webapps/pom.xml
tests/test-webapps/test-webapp-rfc2616/pom.xml
2011-10-04 17:45:15 +11:00
11ae5c7dd3
JETTY-1434
...
Add a jsp that exercises jstl.
2011-09-26 20:59:37 +10:00
298a623fe9
357959 - Include javadoc in distribution
...
+ Adjusting /javadoc/ proxy configuration in test-jetty-webapp to
now be /javadoc-proxy/, along with providing a link to the
distribution's /javadoc/ path as well.
2011-09-16 11:05:07 -07:00
670e8de261
352050: Fixed infinite redirect loop for /remote.html in testapp
2011-09-13 11:58:30 -07:00
246fb51cfc
357163 - jetty 8 ought to proxy jetty8 javadocs
...
+ Fixing proxy configuration to use jetty8 javadocs destination.
2011-09-13 10:43:08 -07:00
1e079f06c9
Merge remote-tracking branch 'origin/master' into jetty-8
2011-09-01 14:11:53 +10:00
4ace183764
Merging from master
2011-08-25 12:09:36 -07:00
def117775d
353073 recycle buffer
2011-08-25 12:28:49 +10:00
f6d45d5650
293739 - Deprecate static Jetty Log usage in favor of named logs
...
+ Finished conversion of the rest of jetty 7.x
2011-08-24 13:14:28 -07:00
ee1afa5e97
353073 cleaned up no context logging
2011-08-16 17:59:28 +10:00
050cb83b35
Merge remote-tracking branch 'origin/master' into jetty-8
...
Conflicts:
jetty-osgi/jetty-osgi-equinoxtools/src/main/java/org/eclipse/jetty/osgi/equinoxtools/console/EquinoxConsoleWebSocketServlet.java
jetty-servlets/src/test/java/org/eclipse/jetty/servlets/GzipFilterTest.java
jetty-websocket/pom.xml
2011-08-12 18:43:15 +10:00
6b9ecd0806
353073 Improved client API to use futures
2011-08-11 11:50:23 +10:00
02a66a00fb
Merge remote-tracking branch 'origin/master' into jetty-8
...
Conflicts:
VERSION.txt
jetty-osgi/jetty-osgi-boot-logback/META-INF/MANIFEST.MF
jetty-osgi/jetty-osgi-equinoxtools/src/main/java/org/eclipse/jetty/osgi/equinoxtools/WebEquinoxToolsActivator.java
pom.xml
2011-08-01 14:39:39 +10:00
2806869cfd
353073 test harness for websocket client and improved ietf draft 10 compliance
2011-08-01 12:35:01 +10:00
93cc111a02
Merge remote-tracking branch 'origin/master' into jetty-8
...
Conflicts:
VERSION.txt
jetty-io/src/main/java/org/eclipse/jetty/io/nio/IndirectNIOBuffer.java
2011-07-25 17:42:30 +10:00
3302d54bab
352684 ensure test harness completes
2011-07-21 22:36:19 +10:00
86f7e76c4d
Merge of 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/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-http/pom.xml
jetty-io/pom.xml
jetty-jaspi/pom.xml
jetty-jmx/pom.xml
jetty-jndi/pom.xml
jetty-jsp-2.1/pom.xml
jetty-nested/pom.xml
jetty-osgi/jetty-osgi-boot-jsp/pom.xml
jetty-osgi/jetty-osgi-boot-logback/pom.xml
jetty-osgi/jetty-osgi-boot-warurl/pom.xml
jetty-osgi/jetty-osgi-boot/META-INF/MANIFEST.MF
jetty-osgi/jetty-osgi-boot/pom.xml
jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/OSGiAppProvider.java
jetty-osgi/jetty-osgi-equinoxtools/META-INF/MANIFEST.MF
jetty-osgi/jetty-osgi-equinoxtools/pom.xml
jetty-osgi/jetty-osgi-equinoxtools/src/main/java/org/eclipse/jetty/osgi/equinoxtools/console/EquinoxConsoleContinuationServlet.java
jetty-osgi/jetty-osgi-httpservice/pom.xml
jetty-osgi/jetty-osgi-servletbridge/pom.xml
jetty-osgi/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-servlets/src/main/java/org/eclipse/jetty/servlets/ProxyServlet.java
jetty-start/pom.xml
jetty-util/pom.xml
jetty-webapp/pom.xml
jetty-websocket/pom.xml
jetty-xml/pom.xml
pom.xml
test-continuation-jetty6/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-sessions-common/pom.xml
tests/test-webapps/pom.xml
tests/test-webapps/test-webapp-rfc2616/pom.xml
2011-07-11 12:05:58 +10:00
17e907c2fb
git diff 54e885d967 remotes/origin/jetty-8-historical | patch -p1 ; git add -A
2011-07-07 18:18:24 +10:00
9807ac7f21
JETTY-1380 Jetty Rewrite example does not work in Hightide
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3458 7e9141cc-0065-0410-87d8-b60c137991c4
2011-07-01 21:06:34 +00:00
31ac6dd388
348935 Close A tag in directory listing
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3412 7e9141cc-0065-0410-87d8-b60c137991c4
2011-06-22 05:49:12 +00:00
4f42ec794e
more getResource debugging
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3272 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-26 02:58:32 +00:00
694db8e81e
JETTY-1146 Encode jsessionid in sendRedirect
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3267 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-26 01:06:52 +00:00
5223f6f77c
345543 Always close endpoint on SSLException
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3125 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-12 08:00:29 +00:00
58652d8f09
342700 refine websocket API for anticipated changes
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3013 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-13 11:05:35 +00:00
e5bad59c14
minor clean ups and removed debug
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2997 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-11 08:18:01 +00:00
31d8e8b3dc
337685 more common code
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2880 7e9141cc-0065-0410-87d8-b60c137991c4
2011-03-11 05:00:45 +00:00
e20fa91252
337685 Update websocket API in preparation for draft -07
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2877 7e9141cc-0065-0410-87d8-b60c137991c4
2011-03-10 13:15:27 +00:00
996ff90660
328306 Serialization of FormAuthentication
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2380 7e9141cc-0065-0410-87d8-b60c137991c4
2010-10-21 09:58:13 +00:00
1596451908
324369 Implement draft-ietf-hybi-thewebsocketprotocol-01
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2245 7e9141cc-0065-0410-87d8-b60c137991c4
2010-09-03 07:05:53 +00:00
3c1d186d31
322448 Added jetty-dir.css for directory listings
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2215 7e9141cc-0065-0410-87d8-b60c137991c4
2010-08-16 14:37:58 +00:00
50de9c814e
322448 Added jetty-dir.css for directory listings
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2214 7e9141cc-0065-0410-87d8-b60c137991c4
2010-08-16 14:36:39 +00:00
a5e1cea005
321232 BasicAuthenticator ignores bad Authorization header
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2205 7e9141cc-0065-0410-87d8-b60c137991c4
2010-08-04 04:47:48 +00:00
cbc47fca80
320073 local loader
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2191 7e9141cc-0065-0410-87d8-b60c137991c4
2010-07-28 13:48:54 +00:00
0443786d8e
320073 reconsile configuration mechanism
...
Reconsiled the jetty-8 configuration mechanism with the capability to share the MetaData between instances
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2168 7e9141cc-0065-0410-87d8-b60c137991c4
2010-07-22 03:20:41 +00:00
701bbe1e3e
clean up from rebase merge
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2114 7e9141cc-0065-0410-87d8-b60c137991c4
2010-07-14 01:59:43 +00:00
9afacd6b26
fixed timeout
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2105 7e9141cc-0065-0410-87d8-b60c137991c4
2010-07-12 08:45:08 +00:00
9f0a75da75
319334 improved resource cache
...
Made the cache use concurrent data structures
Removed the dual NIO/BIO caches
Use the cache for streaming data
made DefaultServlet check for shared cache
some javadoc cleanups
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2085 7e9141cc-0065-0410-87d8-b60c137991c4
2010-07-09 04:45:52 +00:00
aaac4de094
cleaned up remote filter
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2070 7e9141cc-0065-0410-87d8-b60c137991c4
2010-07-05 11:54:47 +00:00
2efec8a0ad
able to run the jetty-test-webapp as a web-bundle
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2052 7e9141cc-0065-0410-87d8-b60c137991c4
2010-06-28 09:36:38 +00:00
76d1e6bb30
bug 316560 and bug 316909 geenrate a web-bundle from the test-jetty-webapp that will be used during the automated testing of jetty-osgi
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2044 7e9141cc-0065-0410-87d8-b60c137991c4
2010-06-24 22:57:34 +00:00
331a750ce0
316449 Websocket disconnect fix
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1996 7e9141cc-0065-0410-87d8-b60c137991c4
2010-06-11 03:58:21 +00:00
595f0e6f72
JETTY-1231 support context request log
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1933 7e9141cc-0065-0410-87d8-b60c137991c4
2010-06-07 10:15:05 +00:00
Greg Wilkins
Jan Bartel
Joakim Erdfelt
Thomas Becker
Michael Gorovoy
Greg Wilkins
Hugues Malphettes