2146 Commits

Author SHA1 Message Date
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
Jesse McConnell
39674f8a8e [maven-release-plugin] prepare for next development iteration 2011-07-07 18:43:56 -05:00
Jesse McConnell
5aa94f502e [maven-release-plugin] prepare release jetty-7.4.4.v20110707 jetty-7.4.4.v20110707 2011-07-07 18:43:50 -05: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 95ff9d73f0b00a527706ace2698bd3db103b01fa.
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
ce377db72f copied binary files from jetty-8-historical 2011-07-07 18:22:34 +10:00
Greg Wilkins
17e907c2fb git diff 54e885d9670548c12cf9ffbd58702b73d373c186 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
Jesse McConnell
94cfedf912 Add an icon.jpg file to the project.
Signed-off-by: Jesse McConnell <jesse.mcconnell@gmail.com>
2011-07-06 14:41:50 -05:00
Jesse McConnell
6ed9d4c394 update scm.url
Signed-off-by: Jesse McConnell <jesse.mcconnell@gmail.com>
2011-07-06 13:33:16 -05:00
Jesse McConnell
42c129a78f set new parent version and update scm info
Signed-off-by: Jesse McConnell <jesse.mcconnell@gmail.com>
2011-07-06 13:20:44 -05: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
Michael Gorovoy
c8375b286a 308851 Converted all jetty-client tests to JUnit 4
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3457 7e9141cc-0065-0410-87d8-b60c137991c4
2011-07-01 21:06:31 +00:00
Jesse McConnell
6190961f31 [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3454 7e9141cc-0065-0410-87d8-b60c137991c4
2011-07-01 11:12:45 +00:00
Jesse McConnell
db9f79eaff [maven-release-plugin] prepare release jetty-7.4.3.v20110701
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3452 7e9141cc-0065-0410-87d8-b60c137991c4
2011-07-01 11:12:33 +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
b9fffcb9a0 [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3447 7e9141cc-0065-0410-87d8-b60c137991c4
2011-07-01 00:54:20 +00:00
Jesse McConnell
ea23a83bb3 [maven-release-plugin] prepare release jetty-7.4.3.v20110630
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3445 7e9141cc-0065-0410-87d8-b60c137991c4
2011-07-01 00:54:07 +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
Jesse McConnell
b1ca45e709 [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3441 7e9141cc-0065-0410-87d8-b60c137991c4
2011-06-30 19:49:20 +00:00
Jesse McConnell
5f5cb8ea53 [maven-release-plugin] prepare release jetty-7.4.3.v20110630
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3439 7e9141cc-0065-0410-87d8-b60c137991c4
2011-06-30 19:39:23 +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
5c9fe5b13e 350642 Dont close SCEP during NIOBuffer manipulation
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3437 7e9141cc-0065-0410-87d8-b60c137991c4
2011-06-29 04:38:47 +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
b290f203da Added TODO comments for disabled tests
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3429 7e9141cc-0065-0410-87d8-b60c137991c4
2011-06-27 15:13:22 +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
47e199af79 Removed unneeded line from MultipleConnectors example
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3425 7e9141cc-0065-0410-87d8-b60c137991c4
2011-06-24 22:50:11 +00:00
Michael Gorovoy
77b02e0ee0 350283 Excluded AsyncSslHttpExchangeTest.testPerf() from test runs on MacOS X unless stress is enabled
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3423 7e9141cc-0065-0410-87d8-b60c137991c4
2011-06-24 15:46:30 +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
Michael Gorovoy
4f0400e6f3 Updated svn:ignore properties
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3415 7e9141cc-0065-0410-87d8-b60c137991c4
2011-06-22 18:11:07 +00:00
Greg Wilkins
aa278294c3 348652 jetty.sh starts two unix processes
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3414 7e9141cc-0065-0410-87d8-b60c137991c4
2011-06-22 07:27:29 +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
Greg Wilkins
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
Greg Wilkins
489aa7a46a 349997 MBeanContainer uses weak references
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3411 7e9141cc-0065-0410-87d8-b60c137991c4
2011-06-22 05:06:45 +00:00
Jesse McConnell
6f0e0f8077 proxy server timeout on continuation checks for 0 client and exchange timeout and set continuation as 'infinite'
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3410 7e9141cc-0065-0410-87d8-b60c137991c4
2011-06-21 20:46:02 +00:00
Greg Wilkins
451580e4ee 349897 draft -09 websockets
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3409 7e9141cc-0065-0410-87d8-b60c137991c4
2011-06-21 05:33:52 +00:00