Commit Graph

313 Commits

Author SHA1 Message Date
Jesse McConnell 28e63af76b [maven-release-plugin] prepare release jetty-project-7.4.2.vTEST
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3182 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-17 19:56:45 +00:00
Jesse McConnell 0793141d2c [maven-release-plugin] rollback the release of jetty-project-7.4.2.vTEST
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3181 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-17 19:39:59 +00:00
Jesse McConnell be9da35ef4 set for test
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3180 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-17 19:39:17 +00:00
Greg Wilkins f8dc394adb [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3137 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-13 04:48:47 +00:00
Greg Wilkins 6e0649ab3f [maven-release-plugin] prepare release jetty-7.4.1.v20110513
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3135 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-13 04:48:21 +00:00
Jesse McConnell 314a59192d [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3131 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-12 19:57:07 +00:00
Jesse McConnell fadbd0bdc5 [maven-release-plugin] prepare release jetty-7.4.1.v20110512
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3129 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-12 19:56:53 +00:00
Greg Wilkins 5d0f1b88f4 [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3128 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-12 09:02:46 +00:00
Greg Wilkins 83b6c19cca [maven-release-plugin] prepare release jetty-7.4.1
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3126 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-12 09:02:19 +00:00
Jesse McConnell 412db03d50 remove unsupported and deprecated --secure option, use jetty-policy.xml configuration instead with the policy OPTION
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3116 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-10 21:51:21 +00:00
Greg Wilkins 9b1f8d3889 343172 Check package implementor for version
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3084 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-06 06:31:21 +00:00
Greg Wilkins 48fb924a46 cleanups for demo
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3078 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-06 05:55:03 +00:00
Greg Wilkins 57c2cc31fa 343482 refactored overlay deployer layout to use WAR layout - work in progress
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3032 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-27 00:51:08 +00:00
Greg Wilkins 936b80dd46 [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3018 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-14 02:22:30 +00:00
Greg Wilkins a01a1edd70 [maven-release-plugin] prepare release jetty-7.4.0.v20110414
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3016 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-14 02:22:04 +00:00
Greg Wilkins b43b2607ad [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2992 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-07 01:24:34 +00:00
Greg Wilkins b6d04cc349 [maven-release-plugin] prepare release jetty-7.4.0.RC0
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2990 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-07 01:24:08 +00:00
Greg Wilkins 50541649ca Get ready for 7.4 release
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2952 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-01 03:42:09 +00:00
Greg Wilkins c2bc7a5ddd [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2864 7e9141cc-0065-0410-87d8-b60c137991c4
2011-03-07 05:42:13 +00:00
Greg Wilkins 1d5a6de9c7 [maven-release-plugin] prepare release jetty-7.3.1.v20110307
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2862 7e9141cc-0065-0410-87d8-b60c137991c4
2011-03-07 05:41:43 +00:00
Greg Wilkins db438ca86f [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2854 7e9141cc-0065-0410-87d8-b60c137991c4
2011-03-04 03:58:46 +00:00
Greg Wilkins 70bd1c2085 [maven-release-plugin] prepare release jetty-7.3.1.v20110304
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2852 7e9141cc-0065-0410-87d8-b60c137991c4
2011-03-04 03:58:19 +00:00
Jesse McConnell 505a44d56c 336668 policy supports cert validation, refactored jetty policy to support better reload mechanism
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2802 7e9141cc-0065-0410-87d8-b60c137991c4
2011-02-18 21:07:22 +00:00
Greg Wilkins cdf2490336 [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2739 7e9141cc-0065-0410-87d8-b60c137991c4
2011-02-03 11:46:23 +00:00
Greg Wilkins 8fddea6796 [maven-release-plugin] prepare release jetty-7.3.0.v20110203
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2737 7e9141cc-0065-0410-87d8-b60c137991c4
2011-02-03 11:45:58 +00:00
Jesse McConnell e9e2236760 [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2732 7e9141cc-0065-0410-87d8-b60c137991c4
2011-02-02 20:52:37 +00:00
Jesse McConnell 30de087cdd [maven-release-plugin] prepare release jetty-7.3.0.20110202
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2730 7e9141cc-0065-0410-87d8-b60c137991c4
2011-02-02 20:52:24 +00:00
Greg Wilkins 0b41841e0a 335641 added a sweep to check for error
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2728 7e9141cc-0065-0410-87d8-b60c137991c4
2011-02-02 20:09:47 +00:00
Jesse McConnell 1f576b96a8 [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2725 7e9141cc-0065-0410-87d8-b60c137991c4
2011-02-02 14:43:14 +00:00
Jesse McConnell ab06234807 [maven-release-plugin] prepare release jetty-7.3.0.v20110202
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2723 7e9141cc-0065-0410-87d8-b60c137991c4
2011-02-02 14:42:58 +00:00
Joakim Erdfelt acc4f230fc Merging back /branches/jetty-bug-296978 revs 2674:HEAD
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2709 7e9141cc-0065-0410-87d8-b60c137991c4
2011-01-28 18:58:47 +00:00
Greg Wilkins cfd2c0e7d2 revert to 7.3.0-SNAPSHOT
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2703 7e9141cc-0065-0410-87d8-b60c137991c4
2011-01-28 01:16:38 +00:00
Jesse McConnell c9365cb777 [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2684 7e9141cc-0065-0410-87d8-b60c137991c4
2011-01-24 19:48:29 +00:00
Jesse McConnell 4127ce5430 [maven-release-plugin] prepare release jetty-7.3.0.v20112401
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2682 7e9141cc-0065-0410-87d8-b60c137991c4
2011-01-24 19:48:11 +00:00
Joakim Erdfelt 892bd690e0 Bug 333771 - System properties are not available inside XML configuration
file by using the 'property' tag.

* Made lookups of Properties by the Start Config use Jetty Property then
  System Properties, and lastly default values when requested.
* Made XmlConfiguration use layered property lookup from Start Config,
  benefitting XmlConfiguration of the same logic.
* Made all use of Start Config.getProperty() use static references
  per the method signature.

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2646 7e9141cc-0065-0410-87d8-b60c137991c4
2011-01-10 18:10:15 +00:00
Jesse McConnell d43b6faaac Bug 333875 - Monitor class constructor now public
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2641 7e9141cc-0065-0410-87d8-b60c137991c4
2011-01-10 15:16:21 +00:00
Greg Wilkins 7656b37934 switch trunk to 7.3.x
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2614 7e9141cc-0065-0410-87d8-b60c137991c4
2010-12-21 10:22:53 +00:00
Greg Wilkins 703aca3449 [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2598 7e9141cc-0065-0410-87d8-b60c137991c4
2010-12-06 14:15:23 +00:00
Greg Wilkins 155d31e65e [maven-release-plugin] prepare release jetty-7.2.2.v20101205
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2596 7e9141cc-0065-0410-87d8-b60c137991c4
2010-12-06 14:14:59 +00:00
Greg Wilkins c73c4268e9 rolled back failed release
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2595 7e9141cc-0065-0410-87d8-b60c137991c4
2010-12-06 11:08:57 +00:00
Greg Wilkins 65524be6d0 gpg use agent
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2592 7e9141cc-0065-0410-87d8-b60c137991c4
2010-12-06 10:27:02 +00:00
Jesse McConnell 0ee51e7844 [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2587 7e9141cc-0065-0410-87d8-b60c137991c4
2010-12-03 16:28:52 +00:00
Jesse McConnell ef73282704 [maven-release-plugin] prepare release jetty-7.2.2.v20101203
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2585 7e9141cc-0065-0410-87d8-b60c137991c4
2010-12-03 16:28:37 +00:00
Jesse McConnell 28abc4cae5 [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2581 7e9141cc-0065-0410-87d8-b60c137991c4
2010-12-03 15:48:00 +00:00
Jesse McConnell 8684dc5805 [maven-release-plugin] prepare release jetty-7.2.2.v20101203
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2579 7e9141cc-0065-0410-87d8-b60c137991c4
2010-12-03 15:47:47 +00:00
Jesse McConnell e4f078cec6 [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2572 7e9141cc-0065-0410-87d8-b60c137991c4
2010-12-01 19:42:49 +00:00
Jesse McConnell fcab138ac8 [maven-release-plugin] prepare release jetty-7.2.2.v20101201
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2570 7e9141cc-0065-0410-87d8-b60c137991c4
2010-12-01 19:42:36 +00:00
Jesse McConnell 654544b5ec [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2563 7e9141cc-0065-0410-87d8-b60c137991c4
2010-11-30 20:06:11 +00:00
Jesse McConnell e79f494d79 [maven-release-plugin] prepare release jetty-7.2.2.v20101201
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2561 7e9141cc-0065-0410-87d8-b60c137991c4
2010-11-30 20:05:47 +00:00
Greg Wilkins 91e0e981aa 330764 Command line properties passed to start.jar --exec
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2547 7e9141cc-0065-0410-87d8-b60c137991c4
2010-11-22 04:01:25 +00:00
Greg Wilkins 59f5bcce5b 330265 start.jar --stop kills --exec subprocess
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2534 7e9141cc-0065-0410-87d8-b60c137991c4
2010-11-17 22:41:33 +00:00
Jesse McConnell 62726cc4e2 [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2498 7e9141cc-0065-0410-87d8-b60c137991c4
2010-11-11 16:20:20 +00:00
Jesse McConnell e0b27726c2 [maven-release-plugin] prepare release jetty-7.2.1.v20101111
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2496 7e9141cc-0065-0410-87d8-b60c137991c4
2010-11-11 16:19:58 +00:00
Jesse McConnell 678e364270 [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2494 7e9141cc-0065-0410-87d8-b60c137991c4
2010-11-10 21:33:07 +00:00
Jesse McConnell d6b1040f69 [maven-release-plugin] prepare release jetty-7.2.1.v20101111
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2492 7e9141cc-0065-0410-87d8-b60c137991c4
2010-11-10 21:32:47 +00:00
Greg Wilkins 095d728f31 improved help and debugging
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2490 7e9141cc-0065-0410-87d8-b60c137991c4
2010-11-10 21:04:14 +00:00
Greg Wilkins 5e6bcdc009 removed debug println
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2476 7e9141cc-0065-0410-87d8-b60c137991c4
2010-11-07 23:38:03 +00:00
Jesse McConnell 87f58a2863 [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2379 7e9141cc-0065-0410-87d8-b60c137991c4
2010-10-20 19:49:47 +00:00
Jesse McConnell 1a9136f4f0 [maven-release-plugin] prepare release jetty-7.2.0.v20101020
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2377 7e9141cc-0065-0410-87d8-b60c137991c4
2010-10-20 19:49:33 +00:00
Jesse McConnell 5ab4634dfb [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2367 7e9141cc-0065-0410-87d8-b60c137991c4
2010-10-19 19:49:45 +00:00
Jesse McConnell 83d4febd1e [maven-release-plugin] prepare release jetty-7.2.0.v20101020
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2365 7e9141cc-0065-0410-87d8-b60c137991c4
2010-10-19 19:49:32 +00:00
Jesse McConnell d84b549aca reset version to remove RC# from version string to maintain support with osgi versioning
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2356 7e9141cc-0065-0410-87d8-b60c137991c4
2010-10-18 19:16:49 +00:00
Jesse McConnell 0fcbbbf1e9 reset version
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2355 7e9141cc-0065-0410-87d8-b60c137991c4
2010-10-18 18:47:42 +00:00
Jesse McConnell 9b07b75df7 [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2354 7e9141cc-0065-0410-87d8-b60c137991c4
2010-10-15 20:33:58 +00:00
Jesse McConnell 933c065d1b [maven-release-plugin] prepare release jetty-7.2.0.RC1
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2352 7e9141cc-0065-0410-87d8-b60c137991c4
2010-10-15 20:33:45 +00:00
Greg Wilkins 0e6f62664d 323985 Xmlconfiguration pulls start.jar config properties
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2326 7e9141cc-0065-0410-87d8-b60c137991c4
2010-10-06 23:43:14 +00:00
Jesse McConnell d389d12771 [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2311 7e9141cc-0065-0410-87d8-b60c137991c4
2010-10-01 22:25:30 +00:00
Jesse McConnell 89bd58d11b [maven-release-plugin] prepare release jetty-7.2.0.RC0
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2309 7e9141cc-0065-0410-87d8-b60c137991c4
2010-10-01 22:25:18 +00:00
Greg Wilkins 7982f19471 removed debug
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2302 7e9141cc-0065-0410-87d8-b60c137991c4
2010-09-28 04:27:57 +00:00
Greg Wilkins ee2d8e635e #323985 renames to clarify code
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2258 7e9141cc-0065-0410-87d8-b60c137991c4
2010-09-08 06:09:05 +00:00
Greg Wilkins 46c4b7daa7 319519 Warn about duplicate configuration files
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2108 7e9141cc-0065-0410-87d8-b60c137991c4
2010-07-12 15:48:20 +00:00
Greg Wilkins b02766dd53 [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2078 7e9141cc-0065-0410-87d8-b60c137991c4
2010-07-05 14:10:04 +00:00
Greg Wilkins 82923e5197 [maven-release-plugin] prepare release jetty-7.1.5.v20100705
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2076 7e9141cc-0065-0410-87d8-b60c137991c4
2010-07-05 14:09:39 +00:00
Greg Wilkins a4d25de6c4 [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2073 7e9141cc-0065-0410-87d8-b60c137991c4
2010-07-05 12:43:19 +00:00
Greg Wilkins f2726d74d1 [maven-release-plugin] prepare release jetty-7.1.5.v20100705
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2071 7e9141cc-0065-0410-87d8-b60c137991c4
2010-07-05 12:42:53 +00:00
Greg Wilkins 3b5c2dd465 317906 OPTIONS correctly handles TRACE
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2056 7e9141cc-0065-0410-87d8-b60c137991c4
2010-06-28 14:53:12 +00:00
Joakim Erdfelt 04d29783e3 Limiting scope of Findbugs run.
Configuring Reporting for PMD, Findbugs, JXR, JavaDoc.
Fixing PMD configuration inheritence bug with sub-projects.

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2013 7e9141cc-0065-0410-87d8-b60c137991c4
2010-06-16 17:21:50 +00:00
Greg Wilkins 0104b834b8 [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1995 7e9141cc-0065-0410-87d8-b60c137991c4
2010-06-11 00:17:47 +00:00
Greg Wilkins 8193236dba [maven-release-plugin] prepare release jetty-7.1.4.v20100610
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1993 7e9141cc-0065-0410-87d8-b60c137991c4
2010-06-11 00:16:54 +00:00
Greg Wilkins a70c798da6 [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1987 7e9141cc-0065-0410-87d8-b60c137991c4
2010-06-10 06:20:13 +00:00
Greg Wilkins 5ee4d16dd2 [maven-release-plugin] prepare release jetty-7.1.4.v20100609
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1985 7e9141cc-0065-0410-87d8-b60c137991c4
2010-06-10 06:19:32 +00:00
Greg Wilkins 3ed02a05e7 [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1979 7e9141cc-0065-0410-87d8-b60c137991c4
2010-06-10 01:54:22 +00:00
Greg Wilkins 14609bedfd [maven-release-plugin] prepare release jetty-7.1.4.v20090609
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1977 7e9141cc-0065-0410-87d8-b60c137991c4
2010-06-10 01:53:46 +00:00
Greg Wilkins 7c7630bc75 [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1974 7e9141cc-0065-0410-87d8-b60c137991c4
2010-06-10 00:38:09 +00:00
Greg Wilkins 725c514706 [maven-release-plugin] prepare release jetty-7.1.4.v20100609
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1972 7e9141cc-0065-0410-87d8-b60c137991c4
2010-06-10 00:37:23 +00:00
Joakim Erdfelt 991a2b4077 [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1961 7e9141cc-0065-0410-87d8-b60c137991c4
2010-06-09 19:05:57 +00:00
Joakim Erdfelt 0d5e373020 [maven-release-plugin] prepare release jetty-7.1.4.v20100609
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1959 7e9141cc-0065-0410-87d8-b60c137991c4
2010-06-09 19:05:43 +00:00
Greg Wilkins fe6a6e86ed 315748 made --daemon log non appendable
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1930 7e9141cc-0065-0410-87d8-b60c137991c4
2010-06-07 00:21:42 +00:00
Greg Wilkins cf039140fb 315748 added --pre support in start.jar
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1929 7e9141cc-0065-0410-87d8-b60c137991c4
2010-06-07 00:02:08 +00:00
Joakim Erdfelt 2dee039305 Minor cleanup of Main. adding System.exit codes, using System.err more consistently. Adding write checks to --daemon
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1926 7e9141cc-0065-0410-87d8-b60c137991c4
2010-06-04 23:19:15 +00:00
Greg Wilkins 0cbb47daba 315748 add --daemon
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1921 7e9141cc-0065-0410-87d8-b60c137991c4
2010-06-04 16:00:32 +00:00
Greg Wilkins b3c156a988 315748 Removed --fromDaemon from start.jar
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1919 7e9141cc-0065-0410-87d8-b60c137991c4
2010-06-04 11:02:16 +00:00
Greg Wilkins 78587f820c 315744 Fixed STOP.PORT and STOP.KEY in start.jar
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1918 7e9141cc-0065-0410-87d8-b60c137991c4
2010-06-04 10:05:32 +00:00
Joakim Erdfelt 533ae0950d [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1897 7e9141cc-0065-0410-87d8-b60c137991c4
2010-05-26 19:14:50 +00:00
Joakim Erdfelt e00a8d20d6 [maven-release-plugin] prepare release jetty-7.1.3.v20100526
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1895 7e9141cc-0065-0410-87d8-b60c137991c4
2010-05-26 19:14:23 +00:00
Greg Wilkins d127e61569 288563
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1877 7e9141cc-0065-0410-87d8-b60c137991c4
2010-05-26 14:02:22 +00:00
Greg Wilkins 610c20a37e [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1848 7e9141cc-0065-0410-87d8-b60c137991c4
2010-05-23 21:00:22 +00:00
Greg Wilkins e71c645b06 [maven-release-plugin] prepare release jetty-7.1.2.v20100523
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1846 7e9141cc-0065-0410-87d8-b60c137991c4
2010-05-23 20:59:52 +00:00
Greg Wilkins aa46212a2e [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1843 7e9141cc-0065-0410-87d8-b60c137991c4
2010-05-22 08:25:49 +00:00
Greg Wilkins f1f2846fe4 [maven-release-plugin] prepare release jetty-7.1.2.v20100522
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1841 7e9141cc-0065-0410-87d8-b60c137991c4
2010-05-22 08:25:26 +00:00
Greg Wilkins 71a5df65f0 improved README.txt
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1839 7e9141cc-0065-0410-87d8-b60c137991c4
2010-05-22 08:01:18 +00:00
Jesse McConnell 2969e456a7 [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1837 7e9141cc-0065-0410-87d8-b60c137991c4
2010-05-21 20:19:03 +00:00
Jesse McConnell 802eb30d74 [maven-release-plugin] prepare release jetty-7.1.2.v20100521
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1835 7e9141cc-0065-0410-87d8-b60c137991c4
2010-05-21 20:18:48 +00:00
Joakim Erdfelt a4473b746b [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1814 7e9141cc-0065-0410-87d8-b60c137991c4
2010-05-17 19:00:56 +00:00
Joakim Erdfelt 149e118699 [maven-release-plugin] prepare release jetty-7.1.1.v20100517
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1812 7e9141cc-0065-0410-87d8-b60c137991c4
2010-05-17 19:00:40 +00:00
Joakim Erdfelt 21ca5db320 Fixing javadoc
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1771 7e9141cc-0065-0410-87d8-b60c137991c4
2010-05-12 22:42:20 +00:00
Jesse McConnell d67252fe2e [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1735 7e9141cc-0065-0410-87d8-b60c137991c4
2010-05-05 20:27:56 +00:00
Jesse McConnell 718d0e94b3 [maven-release-plugin] prepare release jetty-7.1.0.v20100505
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1733 7e9141cc-0065-0410-87d8-b60c137991c4
2010-05-05 20:27:20 +00:00
Jesse McConnell 6e395884a6 [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1700 7e9141cc-0065-0410-87d8-b60c137991c4
2010-05-04 21:42:37 +00:00
Jesse McConnell 3ad4b4bb18 [maven-release-plugin] prepare release jetty-7.1.0.RC1
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1698 7e9141cc-0065-0410-87d8-b60c137991c4
2010-05-04 21:38:31 +00:00
Jesse McConnell 0e541fcf2b [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1695 7e9141cc-0065-0410-87d8-b60c137991c4
2010-05-04 20:03:29 +00:00
Jesse McConnell 485bc3b2a6 [maven-release-plugin] prepare release jetty-7.1.0.RC1
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1693 7e9141cc-0065-0410-87d8-b60c137991c4
2010-05-04 20:03:09 +00:00
Greg Wilkins cc6b89040f 310094 Improved start.jar options handling and configs
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1682 7e9141cc-0065-0410-87d8-b60c137991c4
2010-05-03 23:01:42 +00:00
Simone Bordet 9b9cdd45fd Fixes #308865 (Update test suite to JUnit4 - Module jetty-start).
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1633 7e9141cc-0065-0410-87d8-b60c137991c4
2010-04-30 15:18:24 +00:00
Jesse McConnell a7fc4bf77a [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1609 7e9141cc-0065-0410-87d8-b60c137991c4
2010-04-27 16:11:20 +00:00
Jesse McConnell 88b8c01199 [maven-release-plugin] prepare release jetty-7.1.0.RC0
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1607 7e9141cc-0065-0410-87d8-b60c137991c4
2010-04-27 16:10:58 +00:00
Jesse McConnell 1eba7b979a [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1591 7e9141cc-0065-0410-87d8-b60c137991c4
2010-04-27 13:44:10 +00:00
Jesse McConnell a6a2cac78c [maven-release-plugin] prepare release jetty-7.1.0.RC0
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1589 7e9141cc-0065-0410-87d8-b60c137991c4
2010-04-27 13:43:40 +00:00
Greg Wilkins 4fe6fa388f 310094 Improved start.jar usage and config files
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1548 7e9141cc-0065-0410-87d8-b60c137991c4
2010-04-22 12:59:40 +00:00
Jesse McConnell 50dd4c94b1 [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1433 7e9141cc-0065-0410-87d8-b60c137991c4
2010-03-31 16:46:40 +00:00
Jesse McConnell ff7ae57f00 [maven-release-plugin] prepare release jetty-project-7.0.2.v20100331
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1431 7e9141cc-0065-0410-87d8-b60c137991c4
2010-03-31 16:46:26 +00:00
Greg Wilkins 32a02d38c2 better readme
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1387 7e9141cc-0065-0410-87d8-b60c137991c4
2010-03-17 10:51:39 +00:00
Greg Wilkins 8733b438db simplified start
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1223 7e9141cc-0065-0410-87d8-b60c137991c4
2010-01-29 05:03:47 +00:00
Jan Bartel 163b50e119 Bug 300733 - Jars from lib/ext are not visible for my web application
Add section "ext" (as a dynamic section).


git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1220 7e9141cc-0065-0410-87d8-b60c137991c4
2010-01-28 03:18:29 +00:00
Greg Wilkins e143ea826c [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1098 7e9141cc-0065-0410-87d8-b60c137991c4
2009-11-25 02:10:28 +00:00
Greg Wilkins 184d5df776 [maven-release-plugin] prepare release jetty-7.0.1.v20091125
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1096 7e9141cc-0065-0410-87d8-b60c137991c4
2009-11-25 02:06:41 +00:00
Jesse McConnell ef96101e68 [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1093 7e9141cc-0065-0410-87d8-b60c137991c4
2009-11-24 17:59:51 +00:00
Jesse McConnell a2a38f6a34 [maven-release-plugin] prepare release jetty-7.0.1.v20091123
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1091 7e9141cc-0065-0410-87d8-b60c137991c4
2009-11-24 17:59:22 +00:00
Greg Wilkins f9455c7712 demo websocket implementation
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1087 7e9141cc-0065-0410-87d8-b60c137991c4
2009-11-23 08:44:37 +00:00
Jesse McConnell 153bd88fc6 [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1086 7e9141cc-0065-0410-87d8-b60c137991c4
2009-11-22 14:11:27 +00:00
Jesse McConnell dfbd0b47b5 [maven-release-plugin] prepare release jetty-7.0.1.v20091122
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1084 7e9141cc-0065-0410-87d8-b60c137991c4
2009-11-22 14:07:52 +00:00
Jesse McConnell 4bb4112521 [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1067 7e9141cc-0065-0410-87d8-b60c137991c4
2009-11-18 17:41:17 +00:00
Jesse McConnell bdee1f039f [maven-release-plugin] prepare release jetty-7.0.1.v20091117
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1065 7e9141cc-0065-0410-87d8-b60c137991c4
2009-11-18 17:41:02 +00:00
Jesse McConnell b85de61651 [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1057 7e9141cc-0065-0410-87d8-b60c137991c4
2009-11-17 03:07:25 +00:00
Jesse McConnell e58f1ca595 [maven-release-plugin] prepare release jetty-7.0.1.v20091116
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1055 7e9141cc-0065-0410-87d8-b60c137991c4
2009-11-17 03:06:58 +00:00
Greg Wilkins eb04a44ca6 improved start properties
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@989 7e9141cc-0065-0410-87d8-b60c137991c4
2009-10-15 00:48:59 +00:00
Joakim Erdfelt 440e584870 289960 start.jar assumes command line args are configs
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@958 7e9141cc-0065-0410-87d8-b60c137991c4
2009-09-30 23:13:47 +00:00
Greg Wilkins ef917ddd20 standardize log DEBUG
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@918 7e9141cc-0065-0410-87d8-b60c137991c4
2009-09-16 06:26:51 +00:00
Greg Wilkins 5e40f89cef standardize log DEBUG
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@915 7e9141cc-0065-0410-87d8-b60c137991c4
2009-09-16 05:56:39 +00:00
Jesse McConnell 1dd4d93527 289145 reload functionality to jetty policy an remove refresh() calls from constructor
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@860 7e9141cc-0065-0410-87d8-b60c137991c4
2009-09-10 19:52:16 +00:00
Joakim Erdfelt db1479e571 Merging from revision 787:HEAD on /branches/jetty-7.0.1/ to /trunk/
* Bumping up version to 7.0.1-SNAPSHOT
* Adding jetty-webapp-verifier from /sandbox/
* Changes to jetty-webapp for jetty-centralized-logging from /sandbox/
* Fixes to jetty-policy to support jetty-webapp-verifier



git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@835 7e9141cc-0065-0410-87d8-b60c137991c4
2009-09-08 20:31:00 +00:00
Jesse McConnell a7f504f899 [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@776 7e9141cc-0065-0410-87d8-b60c137991c4
2009-08-27 15:18:06 +00:00
Jesse McConnell 0cf3c00feb [maven-release-plugin] prepare release jetty-7.0.0.RC5
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@774 7e9141cc-0065-0410-87d8-b60c137991c4
2009-08-27 15:17:44 +00:00
Joakim Erdfelt d7c6df193c Adding test for Absolute on xml paths on command line.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@761 7e9141cc-0065-0410-87d8-b60c137991c4
2009-08-25 15:14:56 +00:00
Greg Wilkins 2c4db31b34 287496 Use start.ini always and added --exec
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@760 7e9141cc-0065-0410-87d8-b60c137991c4
2009-08-25 08:54:14 +00:00
Greg Wilkins e417420b70 [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@739 7e9141cc-0065-0410-87d8-b60c137991c4
2009-08-18 02:41:23 +00:00
Greg Wilkins 974d4c1927 [maven-release-plugin] prepare release jetty-7.0.0.RC4
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@737 7e9141cc-0065-0410-87d8-b60c137991c4
2009-08-18 02:39:48 +00:00
Jesse McConnell 1b4d8bf8f2 set policy file to correct setting in start.config
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@731 7e9141cc-0065-0410-87d8-b60c137991c4
2009-08-17 23:20:22 +00:00
Greg Wilkins 2097eac0d9 286242 Ported jetty-setuid from jetty-6
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@730 7e9141cc-0065-0410-87d8-b60c137991c4
2009-08-17 23:03:00 +00:00
Jesse McConnell b33d2298ad fix up the --secure option
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@713 7e9141cc-0065-0410-87d8-b60c137991c4
2009-08-13 19:19:01 +00:00