Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
24,152 Commits 68 Branches 465 Tags 360 MiB
Commit Graph

260 Commits

Author SHA1 Message Date
Simone Bordet 0c8273f2ca Happy New Year 2017. 2017-01-19 19:26:41 +01:00
Simone Bordet 07838b057f Happy New Year 2017. 2017-01-19 18:54:03 +01:00
Simone Bordet 347c48d657 Revert "resolve merge and update license headers" 
This reverts commit 53b31b03dd, reversing
changes made to 4565c186d7.
 2017-01-19 18:26:43 +01:00
Jesse McConnell 53b31b03dd resolve merge and update license headers 2017-01-19 09:33:16 -06:00
Jesse McConnell ce3e6dafec update license headers to 2017 2017-01-19 09:30:00 -06:00
Jan Bartel 64e8d1ff5d Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-06-08 10:42:28 +10:00
Greg Wilkins c8c4677e4d Issue #620 Fixed missing call to super(pattern) 2016-06-08 08:26:26 +10:00
Greg Wilkins 094de7548e Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-05-12 12:50:21 +10:00
Greg Wilkins fc9063eeb9 Issue #553 
Turn off path compaction as a side effect in rewrite handler.
There is an explicit rule for that!
 2016-05-12 12:49:37 +10:00
Greg Wilkins 70e8662bfd Issue #515 #467 
Use the alternate modules provided by #515 as dependency for compact path rewrite of #467
 2016-05-04 16:21:59 +10:00
Greg Wilkins 23ad5a2bdf Merge remote-tracking branch 'origin/jetty-9.3.x' 2016-04-05 12:23:32 +10:00
Greg Wilkins b087e6db28 Issue #467 Compact // rule 
Improved the rewrite classes and modules to make it easier to compact // withing a URL.
This can now be done with --module=rewrite,rewrite-compactpath
 2016-04-05 12:13:29 +10:00
Greg Wilkins df79ad689a Merge remote-tracking branch 'origin/jetty-9.3.x' 2016-02-04 07:00:13 +01:00
Greg Wilkins 6c9a444b6c 486530 - Handler added to WebAppContext prevents ServletContext initialization 
Added warnings for loops and inappropriate handlers.
Used insertHandler in more XML files
 2016-02-03 10:54:39 +01:00
Joakim Erdfelt ac24196b0d Happy New Year 2016 2016-01-04 14:34:20 -07:00
Joakim Erdfelt cd39fd84fe Happy New Year 2016 2016-01-04 14:31:22 -07:00
Joakim Erdfelt b5db18378d Happy New Year 2016 2016-01-04 14:21:26 -07:00
Jan Bartel 81b2a6a4de 483059 Remove cache of authenticated users 2015-11-26 15:31:19 +11:00
Joakim Erdfelt ea9c9d5f8d 482173 - Track original Query string in Rewrite RuleContainer too 2015-11-24 08:51:22 -07:00
Joakim Erdfelt cfca16f64d 482173 - Track original Query string in Rewrite RuleContainer too 2015-11-23 09:00:59 -07:00
Greg Wilkins ff0d1b4c14 481903 Module Descriptions 2015-11-12 10:48:04 +11:00
Greg Wilkins 9a66395f0c Fixed demobase example xml 2015-10-26 09:45:28 +11:00
Greg Wilkins 746c556c94 Added ASYNC to default DispatcherTypes in rewriteHandler 2015-10-22 23:34:47 +11:00
Joakim Erdfelt 0476d4d28d Supplementing redirect rules with RedirectUtil 
+ Redirect rules should produce full URI for "Location" header
+ Redirect rules should produce no response body content
 2015-07-23 13:27:43 -07:00
Joakim Erdfelt 6cea37aec9 473319 - Parameterize status code on Redirect Rules for alternate use 
+ Both RedirectRegexRule and RedirectPatternRule support any 3xx
  redirection status code.
+ Deleted MovedPermanently Rules in favor of this more centralized
  approach.
 2015-07-23 09:11:20 -07:00
Joakim Erdfelt 7bf6cec74e 473309 - Add special (non-replacement) Terminating rules to jetty-rewrite 
+ Adding TerminatingPatternRule (and test)
+ Adding TerminatingRegexRule (and test)
 2015-07-22 13:29:10 -07:00
Joakim Erdfelt a469e78bdb 473307 - Add 301 Moved Permanently Rules to jetty-rewrite 
+ Adding MovedPermanentlyRegexRule (and test)
+ Adding MovedPermanentlyPatternRule (and test)
 2015-07-22 11:31:56 -07:00
Joakim Erdfelt 7c737a587b Removing [version] sections in modules 2015-06-12 09:14:34 -07:00
Joakim Erdfelt 916efd6aa7 469860 - Add module metadata versioning to support backwards compat 
+ Adding [version] section to all existing jetty 9.3 distro modules
+ Updating testcases in jetty-start with new [version] sections too
+ Adding extra testcases for versioned modules
 2015-06-10 10:59:18 -07:00
Greg Wilkins 5d041ad54f 466645 Allow XmlConfiguration Properties to use Elements or Attributes 2015-05-07 16:24:11 +10:00
Joakim Erdfelt f7adc1aa5f 464727 - Update Javadoc for Java 8 DocLint 2015-04-22 18:37:55 -07:00
Simone Bordet 599ab9bb1b 460671 - Rationalize property names. 
Property format is now "jetty.<module|component>.<propertyName>".

Updated all references with new properties.
 2015-04-13 16:21:48 +02:00
Greg Wilkins 1cb0449be3 Organised imports 2015-03-26 12:32:15 +11:00
Joakim Erdfelt 130afb9535 Merge branch 'jetty-9.2.x' 
Conflicts:
	jetty-client/src/main/java/org/eclipse/jetty/client/LeakTrackingConnectionPool.java
	jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientLoadTest.java
	jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientUploadDuringServerShutdown.java
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpInput.java
	jetty-spdy/spdy-server/src/test/java/org/eclipse/jetty/spdy/server/SynDataReplyDataLoadTest.java
	jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/TooFastClientTest.java
 2015-03-06 15:57:52 -07:00
Greg Wilkins a6a71e4705 458140 Added DispatcherType support to RewriteHandler 2015-03-06 16:29:54 +11:00
Greg Wilkins afdc522d20 fixed merge 2015-01-23 12:15:28 +01:00
Greg Wilkins 437dbbef01 removed deprecated legacy rewrite rule 2015-01-23 11:38:34 +01:00
Joakim Erdfelt a3201a3c81 Happy New Year 2015 2015-01-07 17:06:59 -07:00
Joakim Erdfelt 6a0668b7a1 Happy New Year 2015 2015-01-07 17:03:30 -07:00
Simone Bordet e8c88cfd9c Merged branch 'jetty-9.2.x' into 'master'. 2014-12-22 21:32:09 +01:00
Greg Wilkins 4d7ea8127e Revert "453829 removed code with yahoo copyright" 
This reverts commit 65c7b621f6.
The yahoo copyright messages were removed by the contributor in the bugzilla/pullrequest
 2014-12-11 13:47:07 +01:00
Greg Wilkins 71529bdde3 Merge remote-tracking branch 'origin/jetty-9.2.x' 2014-12-04 01:36:49 +11:00
Greg Wilkins 65c7b621f6 453829 removed code with yahoo copyright 2014-12-04 01:36:14 +11:00
Greg Wilkins e30a8705d8 453829 Added HeaderRegexRule 
Also-by: Charlie Kim <charlesk@yahoo-inc.com>
Signed-off-by: Greg Wilkins <gregw@intalio.com>
 2014-12-04 01:32:25 +11:00
Greg Wilkins d39a995acf 453829 Added HeaderRegexRule 
Also-by: Charlie Kim <charlesk@yahoo-inc.com>
Signed-off-by: Greg Wilkins <gregw@intalio.com>
 2014-12-04 01:30:15 +11:00
Greg Wilkins b5971484a5 Basic push mechanism skeleton 2014-08-06 10:50:55 +10:00
Greg Wilkins 22e57ef7b7 refactored Request to use new HttpURI 2014-07-25 15:03:51 +10:00
Greg Wilkins 7f62f2600b refactored URI handling 2014-07-20 10:23:47 +10:00
Greg Wilkins 55ca09a00e 438190 findbug improvements 2014-07-10 14:41:32 +10:00
Greg Wilkins 28ad689bcb 437996 avoid async status race by not setting 200 on handled 2014-06-24 12:27:03 +02:00
Greg Wilkins 8a166840d1 Revert "remove java7 generics" 
This reverts commit e3c594b152.
 2014-03-24 11:55:50 +11:00
Greg Wilkins e3c594b152 remove java7 generics 2014-03-24 11:53:21 +11:00
Greg Wilkins 0d876de759 414206 Rewrite rules re-encode requestURI 2014-03-20 11:32:01 +11:00
Joakim Erdfelt a12fd9ea03 Happy New Year - 2014! 2014-01-02 14:50:14 -07:00
Greg Wilkins ffddaeceec 421775 CookiePatternRule only sets cookie if not set already 2013-11-25 11:47:15 +11:00
Greg Wilkins f567bddad9 global clean up imports 2013-11-04 13:48:03 +11:00
Greg Wilkins eb3bb660b5 Merge remote-tracking branch 'origin/master' into jetty-9.1 
Conflicts:
	jetty-client/src/main/java/org/eclipse/jetty/client/util/DigestAuthentication.java
	jetty-client/src/test/java/org/eclipse/jetty/client/HttpReceiverTest.java
	jetty-client/src/test/java/org/eclipse/jetty/client/HttpSenderTest.java
	jetty-http/src/main/java/org/eclipse/jetty/http/HttpField.java
	jetty-server/src/test/java/org/eclipse/jetty/server/AbstractHttpTest.java
	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/AbstractDoSFilterTest.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/HeadersBlockGenerator.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/HeadersBlockParser.java
	jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/ClientUpgradeRequest.java
	jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/WebSocketFrame.java
	jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/WebSocketSession.java
	jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/extensions/compress/DeflateCompressionMethodTest.java
	jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/extensions/compress/PerMessageDeflateExtensionTest.java
 2013-11-03 18:22:09 +11:00
Mikhail Mazursky 6b0269a16d [Bug 420930] Use Charset to specify character encoding 
Signed-off-by: Mikhail Mazursky <mikhail.mazursky@gmail.com>
 2013-11-02 14:44:36 +06:00
Joakim Erdfelt 5965e695fa Cleaning up modules 2013-10-24 14:06:50 -07:00
Jesse McConnell ac30f5c9bd update other jetty mods to new format 2013-08-29 16:39:28 -05:00
Jesse McConnell 725e405dac first pass for mod files for distribution 2013-08-22 11:53:58 -05:00
Joakim Erdfelt 949ed55aab Fixing malformed Javadoc warnings in jetty-rewrite 2013-08-14 12:46:25 -07:00
Jan Bartel d99e47830d 414923 CompactPathRule needs to also compact the uri 2013-08-13 10:55:14 +10:00
Thomas Becker ebfa3b97ba 410800 Make RewritePatternRule queryString aware 2013-07-19 14:12:47 +02:00
Thomas Becker 41a0e06e43 410800 Make RewritePatternRule queryString aware 2013-07-19 14:10:58 +02:00
Greg Wilkins 5ddaf9acbf 398467 Servlet 3.1 Non Blocking IO 
Make sure that onAllDataRead is correctly dispatched
 2013-07-08 13:00:03 +10:00
Greg Wilkins 8fd796a394 409012 added reference to example rewrite rules 2013-05-31 18:29:44 +10:00
Jesse McConnell 74a4077dad Add package-info.java files to all jetty packages. 2013-05-21 15:09:49 -05:00
Greg Wilkins b89de0346d updated jndi, jaas and annotation tests to webapps.demo 2013-05-06 16:16:43 +10:00
Greg Wilkins fd099aa77d 404511 Replaced all StringMap usage with Tries 2013-03-28 13:20:47 +11:00
Simone Bordet 209d5bc12f 399721 - Change <Ref id= ...> to <Ref refid= ...> 2013-02-01 13:03:11 +01: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
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
Joakim Erdfelt 9fde0c56ab Merge branch 'jetty-7' into jetty-8 2012-12-27 14:22:57 -07:00
Joakim Erdfelt 2591ceb8f5 Fixing testcase 2012-12-27 09:57:20 -07:00
Jesse McConnell 863109b552 resolving merge issue 2012-12-27 13:49:31 -03:00
Jesse McConnell 525aa8b208 [Bug 397190] improve ValidUrlRule to iterate on codepoints 2012-12-27 13:26:47 -03:00
Joakim Erdfelt 6fca5fc6f9 Found valid Unicode URI that fails ValidUrlRule 2012-12-27 08:09:07 -07: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
Greg Wilkins 6f098dd69c jetty-9 use DateCache timer to set Date header once per second 2012-12-10 12:58:14 +11:00
Greg Wilkins b3e1114313 Merge remote-tracking branch 'origin/jetty-8' 
Conflicts:
	VERSION.txt
	jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/webapp/WebBundleTrackerCustomizer.java
	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/MultipartFilterTest.java
	jetty-util/src/main/java/org/eclipse/jetty/util/MultiPartInputStreamParser.java
	jetty-util/src/main/java/org/eclipse/jetty/util/TypeUtil.java
	jetty-util/src/test/java/org/eclipse/jetty/util/MultiPartInputStreamTest.java
	jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlConfiguration.java
 2012-11-30 12:04:00 +11:00
Jesse McConnell 61e5aba531 Merge branch 'jetty-7' into jetty-8 2012-11-29 11:31:27 -06:00
Jesse McConnell a22f2a25eb tweak tests and add some commenting 2012-11-29 11:30:02 -06:00
Jesse McConnell 51bb01e14b decode the request uri and validate that 2012-11-29 11:23:16 -06:00
Jesse McConnell a5081abc55 add license headers 2012-11-29 10:54:35 -06:00
Jesse McConnell 90b8f60e7b [Bug 395380] add ValidUrlRule to jetty-rewrite 2012-11-29 10:53:50 -06:00
Thomas Becker dd180a8c48 394681: fix jetty-rewrite.xml to match test webapps new context /test 2012-11-20 17:09:36 +01:00
Greg Wilkins 52464a5ba6 Merge remote-tracking branch 'origin/jetty-8' 
Conflicts:
	jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java
	jetty-annotations/src/main/java/org/eclipse/jetty/annotations/ResourceAnnotationHandler.java
	jetty-client/src/test/java/org/eclipse/jetty/client/SslHttpExchangeTest.java
	jetty-client/src/test/java/org/eclipse/jetty/client/SslSecurityListenerTest.java
	jetty-deploy/src/main/java/org/eclipse/jetty/deploy/WebAppDeployer.java
	jetty-deploy/src/main/java/org/eclipse/jetty/deploy/providers/ContextProvider.java
	jetty-http/src/main/resources/org/eclipse/jetty/http/mime.properties
	jetty-http/src/test/java/org/eclipse/jetty/http/HttpFieldsTest.java
	jetty-io/src/main/java/org/eclipse/jetty/io/nio/SelectChannelEndPoint.java
	jetty-jmx/src/main/java/org/eclipse/jetty/jmx/MBeanContainer.java
	jetty-jmx/src/main/java/org/eclipse/jetty/jmx/ObjectMBean.java
	jetty-overlay-deployer/src/main/java/org/eclipse/jetty/overlays/OverlayedAppProvider.java
	jetty-plus/src/main/java/org/eclipse/jetty/plus/annotation/Injection.java
	jetty-plus/src/main/java/org/eclipse/jetty/plus/security/DataSourceLoginService.java
	jetty-proxy/src/main/java/org/eclipse/jetty/proxy/ProxyServlet.java
	jetty-rewrite/src/main/java/org/eclipse/jetty/rewrite/handler/ProxyRule.java
	jetty-security/src/main/java/org/eclipse/jetty/security/authentication/FormAuthenticator.java
	jetty-server/src/main/java/org/eclipse/jetty/server/session/JDBCSessionIdManager.java
	jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/proxy/ProxyHTTPSPDYConnection.java
	jetty-spdy/spdy-jetty-http/src/main/java/org/eclipse/jetty/spdy/http/ServerHTTPSPDYAsyncConnection.java
	jetty-start/src/main/java/org/eclipse/jetty/start/Main.java
	jetty-util/src/main/java/org/eclipse/jetty/util/Fields.java
	jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketClientFactory.java
	jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketConnectionRFC6455.java
	jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketClientTest.java
	jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketMessageRFC6455Test.java
	test-jetty-nested/src/main/java/org/eclipse/jetty/nested/Dump.java
	test-jetty-webapp/src/main/java/com/acme/Dump.java
 2012-11-02 14:08:05 +11:00
Greg Wilkins e076e8a8f0 393363 Use Locale.ENGLISH for all toUpperCase and toLowerCase calls 2012-11-02 13:19:07 +11:00
Greg Wilkins 8723408731 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 
Conflicts:
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/MultiPartFilter.java
 2012-11-02 13:17:53 +11:00
Greg Wilkins 65202e9abe 393363 Use Locale.ENGLISH for all toUpperCase and toLowerCase calls 2012-11-02 11:55:00 +11:00
Jesse McConnell b5fd095055 added test case to validate the existing regex rewrite rule as wired up 2012-10-31 10:24:51 -05:00
Greg Wilkins add3c2b381 392237 improved names and examples for documentation 2012-10-29 17:59:39 +11:00
Greg Wilkins 2b13648b0e 392237 fixed many TODOs and many minor code cleanups 2012-10-19 16:17:30 +11:00
Greg Wilkins 9d0828614f jetty-9 ported rewrite 2012-10-12 23:56:44 +11:00
Greg Wilkins 129583679a jetty-9 javadoc improvements and renamed SelectChannelConnector to ServerConnector 2012-09-17 17:37:56 +10:00
Joakim Erdfelt 3d1d76d214 Merge from jetty-8 to jetty-9 (license header standarization) 2012-08-17 13:44:22 -07:00
Jesse McConnell 5de0cee1eb merge from master + license block standardization 2012-08-17 14:50:43 -05:00
Jesse McConnell 00ed549898 standardize license header blocks 2012-08-16 19:11:27 -05:00
Simone Bordet 136f7924fd Jetty9 - Refactored usage of components that were using custom stop timeout to use the get/setStopTimeout() methods inherited from AbstractLifeCycle. 2012-08-10 19:02:16 +02:00
Simone Bordet 822abe514e Jetty9 - Improved idle timeout handling. 
Idle timeouts are not enforced anymore by polling the AsyncEndPoints from the SelectorManager,
but instead the AsyncEndPoints now take a SchedulerExecutorService as parameter and perform
their own enforcing of the idle timeout.

Also removed a few Timer usages (replaced by SchedulerExecutorService) and fixed XML files
referencing old APIs.
 2012-07-24 10:38:28 +02:00
Simone Bordet d2a0cb5c50 Jetty9 - Fixed compilation problems. 2012-07-23 15:38:27 +02:00
Greg Wilkins ee2d289f63 Merge remote-tracking branch 'origin/master' into jetty-8 
Conflicts:
	jetty-npn/pom.xml
	jetty-osgi/jetty-osgi-boot-jsp/META-INF/MANIFEST.MF
	jetty-osgi/jetty-osgi-boot-jsp/src/main/java/org/eclipse/jetty/osgi/boot/jasper/WebappRegistrationCustomizerImpl.java
	jetty-osgi/jetty-osgi-boot-jsp/src/main/java/org/eclipse/jetty/osgi/boot/jsp/FragmentActivator.java
	jetty-osgi/jetty-osgi-boot-logback/META-INF/MANIFEST.MF
	jetty-osgi/jetty-osgi-boot-warurl/META-INF/MANIFEST.MF
	jetty-osgi/jetty-osgi-boot/META-INF/MANIFEST.MF
	jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/webapp/WebBundleDeployerHelper.java
	jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/webapp/WebBundleTrackerCustomizer.java
	jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/utils/internal/DefaultFileLocatorHelper.java
	jetty-osgi/jetty-osgi-equinoxtools/META-INF/MANIFEST.MF
	jetty-osgi/jetty-osgi-httpservice/META-INF/MANIFEST.MF
	jetty-spdy/spdy-jetty-http-webapp/pom.xml
	jetty-spdy/spdy-jetty-http/pom.xml
	jetty-spdy/spdy-jetty/pom.xml
 2012-04-12 16:02:34 +10:00
Greg Wilkins 4412d311a9 370081:fixed test reset 2012-04-11 17:21:02 +10:00
Greg Wilkins 9dfa9f9937 370081: correctly set URI for query strings 2012-04-10 14:21:07 +10:00
Simone Bordet 5624a5721e Merged from master. 2012-03-14 18:24:57 +01:00
Greg Wilkins 9155ee46d0 373951: regexrewrite will apply URI for all non null rule returns, even if target has not changed 2012-03-12 23:59:23 +11:00
Greg Wilkins 67ce45928c added $Q handling to RewriteReqexRule 2012-03-12 12:25:24 +11:00
Jesse McConnell 0731cbe64d Merge branch 'master' into jetty-8 2012-02-22 14:42:39 -06:00
Thomas Becker 9adabd0f2a 370966: RewriteHandler javadoc config example fix 2012-02-22 08:05:16 -06:00
Jesse McConnell 6b079ae3d8 merge from master 2012-02-01 17:25:08 -06:00
Greg Wilkins cacc5aefa2 370081: Handle null capture groups and query strings 2012-01-30 09:25:42 +11:00
Jesse McConnell ab94c48735 merge from master 2012-01-26 10:44:21 -06:00
Greg Wilkins 6b0a97012c Added RegexTargetHandler 2012-01-26 23:14:39 +11:00
Jan Bartel 691efcc7ca Merge remote-tracking branch 'origin/master' into jetty-8 2012-01-11 16:35:57 +11:00
Simone Bordet 297625b446 Removed redundant code and cleaned up. 2012-01-10 17:42:52 +01:00
Greg Wilkins a7783ae568 368240: Fixed the start of dependent beans 2012-01-11 01:04:01 +11:00
Greg Wilkins 968a2ac95b 368240: Added concept of join to AggregateLifeCycle. Used by HttpClient and AbstractConnector 2012-01-11 00:09:34 +11:00
Greg Wilkins de005c68fd Revert "Merge branch 'release-8'" 
This reverts commit 9e72457941, reversing
changes made to df12605f0e.
 2011-11-30 16:27:30 +11:00
Jan Bartel 127a5af8d7 Merge remote-tracking branch 'origin/master' into jetty-8 2011-11-17 10:59:54 +11:00
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
Jesse McConnell 2b6fec713c Merge branch 'master' into jetty-8 2011-11-02 16:47:04 -05:00
Jan Bartel 56c1ddf117 JETTY-1442 add _hostHeader setter for ProxyRule 2011-10-31 14:43:20 +11:00
Jesse McConnell 94124f7412 merge from master 2011-10-26 15:26:49 -05:00
Jesse McConnell bda185602d address dtd issues 2011-10-25 11:27:43 -05:00
Jan Bartel fc497fe1e8 Merge remote-tracking branch 'origin/master' into jetty-8 2011-10-24 16:30:10 +11: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
Jan Bartel 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
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
Jan Bartel 1e079f06c9 Merge remote-tracking branch 'origin/master' into jetty-8 2011-09-01 14:11:53 +10: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
Jan Bartel 6e8afd6795 Merge remote-tracking branch 'origin/master' into jetty-8 
Conflicts:
	VERSION.txt
 2011-08-16 11:35:46 +10:00
Michael Gorovoy 6fb751e216 354397 RewriteRegexRule handles special characters in regex group 2011-08-15 12:24:07 -04: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 93f3ec1731 test harness cleanups after performance branch merge 2011-07-18 16:45:08 +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
Greg Wilkins 17e907c2fb git diff 54e885d967 remotes/origin/jetty-8-historical | patch -p1 ; git add -A 2011-07-07 18:18:24 +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