28 Commits

Author SHA1 Message Date
Greg Wilkins
7a082280f1 Merge remote-tracking branch 'origin/master' into jetty-7.6
Conflicts:
	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-client/src/main/java/org/eclipse/jetty/client/HttpConnection.java
	jetty-client/src/main/java/org/eclipse/jetty/client/SelectConnector.java
	jetty-continuation/pom.xml
	jetty-deploy/pom.xml
	jetty-distribution/pom.xml
	jetty-http-spi/pom.xml
	jetty-http/pom.xml
	jetty-http/src/main/java/org/eclipse/jetty/http/ssl/SslContextFactory.java
	jetty-io/pom.xml
	jetty-io/src/main/java/org/eclipse/jetty/io/nio/ChannelEndPoint.java
	jetty-io/src/main/java/org/eclipse/jetty/io/nio/SelectChannelEndPoint.java
	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-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/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-start/pom.xml
	jetty-util/pom.xml
	jetty-util/src/test/java/org/eclipse/jetty/util/log/LogTest.java
	jetty-util/src/test/java/org/eclipse/jetty/util/log/NamedLogTest.java
	jetty-webapp/pom.xml
	jetty-websocket/pom.xml
	jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketConnectionD13.java
	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-11-07 18:09:31 +11:00
Jan Bartel
56c1ddf117 JETTY-1442 add _hostHeader setter for ProxyRule 2011-10-31 14:43:20 +11:00
Jesse McConnell
bda185602d address dtd issues 2011-10-25 11:27:43 -05:00
Greg Wilkins
a642f7b55c Merge remote-tracking branch 'origin/master' into jetty-7.6
Conflicts:
	jetty-http/src/main/java/org/eclipse/jetty/http/HttpGenerator.java
	jetty-io/src/main/java/org/eclipse/jetty/io/nio/SslSelectChannelEndPoint.java
2011-10-24 11:27:42 +11:00
Greg Wilkins
cd0628ab66 Added isDebugEnabled guards to debugging that generates garbage 2011-10-22 09:39:54 +11:00
Greg Wilkins
5140a95144 refactored HttpConnection name 2011-10-20 15:12:19 +11:00
Jesse McConnell
ba0ee9f216 [Bug 358925] bit more javadoc on usage 2011-09-26 17:50:27 -05:00
Jesse McConnell
7bc092bf8b [Bug 358925] add common jetty-client proxy configuration setttings 2011-09-26 17:50:27 -05:00
Jesse McConnell
bee0a6e777 [Bug 358925] adjust some code and add license block 2011-09-26 17:50:27 -05:00
Thomas Becker
e14cc536ee JETTY-1415: Start/Stop Server and Client only once in test, code format 2011-09-26 17:50:27 -05:00
Thomas Becker
5e6a9ea78e beautified code, added javadoc 2011-09-26 17:50:27 -05:00
Thomas Becker
0d8bd99d6a Basic functionality for ProxyRule implemented 2011-09-26 17:50:27 -05:00
Thomas Becker
88ce9aceb2 Added ProxyRule.java and ProxyRuleTest.java 2011-09-26 17:50:27 -05:00
Joakim Erdfelt
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
Michael Gorovoy
6fb751e216 354397 RewriteRegexRule handles special characters in regex group 2011-08-15 12:24:07 -04:00
Greg Wilkins
93f3ec1731 test harness cleanups after performance branch merge 2011-07-18 16:45:08 +10: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
d6923903cb 331803: Update XML configuration files to use proper arguments for startup commands in examples
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2698 7e9141cc-0065-0410-87d8-b60c137991c4
2011-01-26 16:24:35 +00:00
Greg Wilkins
db2f4cbcb2 322683 made RewriteHandler thread safe
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2211 7e9141cc-0065-0410-87d8-b60c137991c4
2010-08-16 03:58:52 +00:00
Simone Bordet
a3297f8233 Fix for #308860 (Update test suite to JUnit4 - Module jetty-rewrite).
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1747 7e9141cc-0065-0410-87d8-b60c137991c4
2010-05-10 16:28:52 +00:00
Greg Wilkins
4690be611a #309185 more javadoc fixes
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1628 7e9141cc-0065-0410-87d8-b60c137991c4
2010-04-30 08:53:19 +00:00
Joakim Erdfelt
6bc437c298 309185 - Fix the over 300 Javadoc warnings
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1626 7e9141cc-0065-0410-87d8-b60c137991c4
2010-04-29 23:03:04 +00:00
Greg Wilkins
aea99b14aa 304307 JETTY-1133 Handle ;jsessionid in FROM Auth
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1326 7e9141cc-0065-0410-87d8-b60c137991c4
2010-03-02 08:37:02 +00:00
Athena Yao
17b94b6dc0 [BUG 291589]
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@978 7e9141cc-0065-0410-87d8-b60c137991c4
2009-10-07 12:06:36 +00:00
Joakim Erdfelt
3a7cc3809f 271535 Adding integration tests, and enabling RFC2616 tests.
Adding /tests/test-integration/ tree, along with new RedirectRegexRule.



git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@496 7e9141cc-0065-0410-87d8-b60c137991c4
2009-07-08 19:28:16 +00:00
Greg Wilkins
5255060588 275396 Added ScopedHandler to set servlet scope before security handler
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@209 7e9141cc-0065-0410-87d8-b60c137991c4
2009-05-12 14:09:54 +00:00
Greg Wilkins
5e11796031 configure.dtd
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@150 7e9141cc-0065-0410-87d8-b60c137991c4
2009-04-15 01:52:39 +00:00
Greg Wilkins
da627b843f jetty @ eclipse initial commit
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@8 7e9141cc-0065-0410-87d8-b60c137991c4
2009-03-24 21:07:27 +00:00