129 Commits

Author SHA1 Message Date
Joakim Erdfelt
cd39fd84fe Happy New Year 2016 2016-01-04 14:31:22 -07:00
Greg Wilkins
3e401a62e9 StringUtil.csvSplit(String) 2015-06-19 16:48:53 +10:00
Greg Wilkins
13b63c194b Default values for properties in ini files
While this feature is not strictly needed, the patch contains some good code cleanups.  So it will be applied and then the default feature
removed in a subsequent commit.
2015-06-19 15:27:47 +10:00
Greg Wilkins
5e8652536c 469341 Not possible to use old/deprecated start properties
Improved warnings so that if both and and new properties are set a warning is still generated that says the new property was used.

Bug: 469341
2015-06-10 13:06:03 +10:00
Greg Wilkins
69bf5ab46c Merge remote-tracking branch 'origin/jetty-9.2.x'
Conflicts:
	jetty-http-spi/src/main/java/org/eclipse/jetty/http/spi/HttpSpiContextHandler.java
	jetty-server/src/main/java/org/eclipse/jetty/server/handler/ErrorHandler.java
	jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketServerFactory.java
2015-05-29 21:05:26 +10:00
Greg Wilkins
4472b614b9 468747 - XSS vulnerability in HttpSpiContextHandler 2015-05-29 20:12:57 +10:00
Simone Bordet
f645e18622 Fixed DTD by declaring new elements Id, Name, Deprecated, Default, Class and Type. 2015-05-12 10:58:00 +02:00
Greg Wilkins
df61317f84 466645 Allow XmlConfiguration Properties to use Elements or Attributes
implemented for Array and Map
2015-05-08 08:47:38 +10:00
Greg Wilkins
e580f57d6e 466645 Allow XmlConfiguration Properties to use Elements or Attributes
implemented for New element
2015-05-07 20:15:24 +10:00
Greg Wilkins
5d041ad54f 466645 Allow XmlConfiguration Properties to use Elements or Attributes 2015-05-07 16:24:11 +10:00
Joakim Erdfelt
ed22d7e0de 464727 - Update Javadoc for Java 8 DocLint 2015-04-22 16:11:01 -07:00
Simone Bordet
337e0bd8c9 464606 - Support property expansion in "default" attribute of Property. 2015-04-14 22:11:59 +02: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
Simone Bordet
1c00cdc7c9 460670 - Support multiple names in <Property> elements. 2015-02-24 10:54:20 +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
Joakim Erdfelt
ed594425d3 Merge branch 'jetty-9.2.x'
Conflicts:
	jetty-server/src/main/config/etc/jetty.xml
	jetty-server/src/main/config/modules/server.mod
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpConfiguration.java
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpConnection.java
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
2014-11-25 12:09:21 -07:00
Greg Wilkins
ed0954f6d6 ignore bad test 2014-11-21 10:53:57 +11:00
Greg Wilkins
121a8b6ee8 improved debugging 2014-11-21 10:00:18 +11:00
Greg Wilkins
a6e00bc642 Merge remote-tracking branch 'origin/jetty-9.2.x'
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/handler/ResourceHandler.java
	jetty-util/src/test/java/org/eclipse/jetty/util/resource/AbstractFSResourceTest.java
2014-10-30 14:36:50 +11:00
Greg Wilkins
cde420a2fc 448225 Removed unnecessary synchronize on initParser 2014-10-30 11:32:26 +11:00
Greg Wilkins
ea64d32214 447216 putAll Properties in XmlConfiguration 2014-10-15 18:28:46 +11:00
Greg Wilkins
edcb56ae6b Merge remote-tracking branch 'origin/master' into jetty-http2
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
2014-08-29 12:41:52 +10:00
Greg Wilkins
4c8e2a6635 442642 Quickstart generates valid XML
Fixed issues with XmlParser and WebDescriptor that were stopping validation.
2014-08-27 16:38:49 +10:00
Greg Wilkins
23eba39748 Merge remote-tracking branch 'origin/master' into jetty-http2 2014-08-21 16:39:45 +10:00
Greg Wilkins
c1b66a3ea3 Fixed start.jar property as properties issue 2014-08-21 10:45:28 +10:00
Greg Wilkins
a14d843382 ignored osgi-spdy tests 2014-08-14 15:18:28 +10:00
Greg Wilkins
fa3d7d0f7e Merge remote-tracking branch 'origin/master' into jetty-http2
Conflicts:
	jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncContextDispatchWithQueryStrings.java
2014-07-23 16:53:13 +10:00
Greg Wilkins
3a6879d3e8 expanded tabs in indents 2014-07-23 16:49:05 +10:00
Greg Wilkins
4d2a580c2c 439375 preferred rfc7231 format is mime;charset=lowercase-9 2014-07-11 17:56:08 +10:00
Greg Wilkins
55ca09a00e 438190 findbug improvements 2014-07-10 14:41:32 +10:00
Jan Bartel
10da0e1015 439194 Refactor mvn jetty:run-forked so that it is configurable the same as the other jetty:run-X goals 2014-07-09 15:07:39 +10:00
Greg Wilkins
5edf15241b started mechanism uses Properties
list Properties in --dry-run
fix start log file
2014-05-25 22:54:15 +02:00
Simone Bordet
48c803b693 JDK 8 build fix: now test uses LinkedHashMap to avoid random position of attributes in XML. 2014-03-20 15:26:09 +01:00
Greg Wilkins
b3be247423 merged quickstart changes 2014-03-14 13:07:00 +11:00
Greg Wilkins
84fa579ec7 429616 Use UTF-8 encoding for XML 2014-03-10 15:23:08 +11:00
Greg Wilkins
6e0f8b505e 428859 patches from quickstart branch 2014-02-24 14:29:01 +11:00
Greg Wilkins
18e19260ff Apply changes resulting from the quickstart project 2014-02-13 12:31:14 +11:00
Joakim Erdfelt
a12fd9ea03 Happy New Year - 2014! 2014-01-02 14:50:14 -07:00
Thomas Becker
30487639a7 Merge commit '1f765bf9ae124eb10562b9de85d3dc5dfdc916f1' into jetty-9.1 2013-09-06 13:27:00 +02:00
Greg Wilkins
9e90e1267f fixed bad merge 2013-09-06 09:47:36 +10:00
Thomas Becker
178c38cc35 415401 Add XmlConfiguration.initializeDefaults that allows to set default values for any XmlConfiguration that may be overridden in the config file 2013-09-05 18:40:59 +02:00
Thomas Becker
9e0e173de8 415401 Add XmlConfiguration.initializeDefaults that allows to set default values for any XmlConfiguration that may be overridden in the config file 2013-09-05 17:30:59 +02:00
Greg Wilkins
e0382bc4ae 414740 Removed the parent peeking Loader 2013-08-09 17:53:43 +10:00
Joakim Erdfelt
670b6a964c 408945 XML Args ignored without DTD
+ Semi-reverting prior commit as it broke with DTD use
 + Fixing up logic to allow for <Arg> <Set> <Call> with and without DTD
 + Adding testcase that uses default constructor with <Set> calls to
   setup a class
2013-06-03 11:34:38 -07:00
Greg Wilkins
1bbab6d6f2 408945 XML Args ignored without DTD 2013-06-03 18:54:48 +10:00
Jesse McConnell
74a4077dad Add package-info.java files to all jetty packages. 2013-05-21 15:09:49 -05:00
Greg Wilkins
ea60965803 404323 Improved parameterization of https and SPDY 2013-03-28 17:09:29 +11:00
Greg Wilkins
29f155143e jetty-9 removed debug 2013-02-01 12:08:22 +11:00