Commit Graph

783 Commits

Author SHA1 Message Date
Jan Bartel 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
Jan Bartel 56866b3e68 Bug 353465 - JAASLoginService ignores callbackHandlerClass 2011-08-01 12:55:32 +10:00
Jesse McConnell 062feb4750 [Bug 353165] remove a directory check for directories of jar files,
rational being that some users wish to point to unpacked jar files
using symbolic links and this was preventing that behavior
2011-07-29 11:21:13 -05:00
Jan Bartel 6081e74fe6 353285 - ServletSecurity annotation ignored 2011-07-29 12:03:35 +10:00
Jan Bartel c2cf8077b3 Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
Conflicts:
	VERSION.txt
2011-07-29 11:09:52 +10:00
Jan Bartel 991c186159 353095 - maven-jetty-plugin: PermGen leak due to javax.el.BeanELResolver 2011-07-29 11:07:20 +10:00
Jesse McConnell 9b4ab80ea6 [Bug 353210] align bundle version in MANIFEST.MF 2011-07-27 09:38:30 -05:00
Greg Wilkins 5859a85919 353073 WebSocketClient 2011-07-26 17:31:55 +10:00
Jan Bartel 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
Greg Wilkins ee02bb4b17 Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2011-07-22 11:04:11 +10:00
Greg Wilkins f496c26c71 352421 HttpURI paths beginning with . 2011-07-22 11:03:48 +10:00
Michael Gorovoy 2790badf6d 352786 GzipFilter fails to pass parameters to GzipResponseWrapper 2011-07-21 13:11:36 -04:00
Michael Gorovoy 0cc914c4bb 352684 Implemented spinning thread analyzer 2011-07-20 19:30:44 -04:00
Greg Wilkins 61b2a5c751 298502 Handle 200 Connect responses with no content-length 2011-07-15 15:50:41 +10:00
Greg Wilkins 6349100c9d Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2011-07-15 15:22:51 +10:00
Jan Bartel 21f924fa1d 352176 - xml parsing on startElement should be more flexible on using qName or localName 2011-07-15 15:21:04 +10:00
Greg Wilkins b62c5cdde6 298502 added ProxyFakeTunnelTest.java to demonstrate the issue 2011-07-15 15:06:26 +10:00
Jan Bartel 295634a369 352046 - Need try/catch around features set in XmlParser 2011-07-14 15:50:37 +10:00
Jan Bartel e04627a4ca Add release date for 8.0.0.M3 to VERSION.txt for correctness. 2011-07-12 11:06:46 +10:00
Jan Bartel f1b743a114 Enable annotations by default (because they are needed by servlet 3.0) 2011-07-11 18:00:34 +10:00
Jan Bartel 236bd193e0 Merge remote-tracking branch 'origin/master' into jetty-8
Conflicts:
	VERSION.txt
	jetty-server/src/main/java/org/eclipse/jetty/server/SessionManager.java
	jetty-server/src/main/java/org/eclipse/jetty/server/session/AbstractSessionManager.java
	jetty-server/src/main/java/org/eclipse/jetty/server/session/SessionHandler.java
2011-07-11 14:54:23 +10:00
Jan Bartel 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
Michael Gorovoy 8babf3ae17 351576 Do not use deprecated method File.toURL() 2011-07-08 17:21:02 -04:00
Greg Wilkins 4e8598eb00 351516 Refactored sessions to better support nosql session managers 2011-07-08 17:43:53 +10:00
Jesse McConnell 9eb0f5354d update version for release 2011-07-07 18:29:26 -05:00
Michael Gorovoy 2eaad85a0c 350634 Reverted FileResource constructor changes
This reverts commit 95ff9d73f0.
2011-07-07 18:04:28 -04:00
Jan Bartel 7908c4e825 JETTY-1153 Default charset/encoding of HTTP POST requests 2011-07-07 19:56:17 +10:00
Greg Wilkins 17e907c2fb git diff 54e885d967 remotes/origin/jetty-8-historical | patch -p1 ; git add -A 2011-07-07 18:18:24 +10:00
Michael Gorovoy a7eabf0757 350397 SelectChannelConnector does not shutdown gracefully 2011-07-06 16:14:54 -04:00
Jan Bartel c88fc8cd25 351199 - HttpServletResponse.encodeURL() wrongly encodes an url without path when cookies are disabled
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3465 7e9141cc-0065-0410-87d8-b60c137991c4
2011-07-06 07:29:19 +00:00
Jan Bartel f7ee9a98ee 345268 JDBCSessionManager does not work with maxInactiveInterval = -1
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3461 7e9141cc-0065-0410-87d8-b60c137991c4
2011-07-04 08:08:52 +00:00
Jan Bartel dd3361047d 351039 Forward dispatch should retain locale
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3460 7e9141cc-0065-0410-87d8-b60c137991c4
2011-07-04 02:54:58 +00:00
Michael Gorovoy b5a2e7e426 308851 Converted all jetty-client module tests to JUnit 4
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3459 7e9141cc-0065-0410-87d8-b60c137991c4
2011-07-02 00:57:56 +00:00
Michael Gorovoy 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
Jesse McConnell aed90c1bb6 adjust VERSION.txt for new release
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3451 7e9141cc-0065-0410-87d8-b60c137991c4
2011-07-01 10:58:12 +00:00
Jesse McConnell b4c5512ff4 adjust VERSION.txt for new release
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3450 7e9141cc-0065-0410-87d8-b60c137991c4
2011-07-01 10:57:14 +00:00
Jan Bartel 8fcac4a34e 324704 JDBC Session Manager reloading session
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3449 7e9141cc-0065-0410-87d8-b60c137991c4
2011-07-01 05:59:20 +00:00
Greg Wilkins baabacfe95 reverted to 7.4.4-SNAPSHOT
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3448 7e9141cc-0065-0410-87d8-b60c137991c4
2011-07-01 02:22:56 +00:00
Jesse McConnell d440e5262f version.txt for release
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3444 7e9141cc-0065-0410-87d8-b60c137991c4
2011-07-01 00:39:19 +00:00
Michael Gorovoy c17b91fa86 JETTY-1385 NPE in jetty client's HTttpExchange.setRequestContentSource(InputStream)
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3438 7e9141cc-0065-0410-87d8-b60c137991c4
2011-06-29 19:01:17 +00:00
Greg Wilkins c2a6df4c47 350642 Do not close SCEP during NIOBuffer manipulation
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3436 7e9141cc-0065-0410-87d8-b60c137991c4
2011-06-29 02:51:09 +00:00
Greg Wilkins 97291cc28a JETTY-1390 RewriteHandler handles encoded URIs
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3435 7e9141cc-0065-0410-87d8-b60c137991c4
2011-06-29 01:47:02 +00:00
Michael Gorovoy 95ff9d73f0 350634 Cleanup FileResource construction
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3434 7e9141cc-0065-0410-87d8-b60c137991c4
2011-06-29 00:59:41 +00:00
Michael Gorovoy 0b9f348132 308851 Convert HttpExchangeTest and related tests to JUnit 4
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3433 7e9141cc-0065-0410-87d8-b60c137991c4
2011-06-29 00:17:13 +00:00
Michael Gorovoy 9235b429bb 347468 o.e.j.deploy.binding.GlobalWebappConfigBindingTest fails on Windows platform
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3432 7e9141cc-0065-0410-87d8-b60c137991c4
2011-06-28 18:00:19 +00:00
Simone Bordet 77394d0c4b Fixes #350533 (Add "Origin" to the list of allowed headers in CrossOriginFilter).
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3431 7e9141cc-0065-0410-87d8-b60c137991c4
2011-06-28 09:28:18 +00:00
Michael Gorovoy 28a0c0ff75 350287 Disable ScanningAppProviderRuntimeUpdatesTest on Windows
This reverts commit 2edcef1343eca17e300dc1cd7fedcabf17c2baf6.

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3427 7e9141cc-0065-0410-87d8-b60c137991c4
2011-06-25 01:21:01 +00:00
Michael Gorovoy dbd782dfbc 350287 ScanningAppProviderRuntimeUpdatesTest fails on Windows
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3426 7e9141cc-0065-0410-87d8-b60c137991c4
2011-06-24 22:50:15 +00:00
Michael Gorovoy 7f68abfa73 Merge branch '332200'
Conflicts:
	VERSION.txt

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3416 7e9141cc-0065-0410-87d8-b60c137991c4
2011-06-23 21:20:15 +00:00
Greg Wilkins fb477ee1bd 348652 jetty.sh starts two unix processes
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3413 7e9141cc-0065-0410-87d8-b60c137991c4
2011-06-22 05:57:38 +00:00