Commit Graph

339 Commits

Author SHA1 Message Date
Dejan Bosanac 48b0cf396c [maven-release-plugin] prepare release activemq-5.11.0 2014-12-29 12:44:20 +01:00
Dejan Bosanac 994d9b26a0 https://issues.apache.org/jira/browse/AMQ-5033 - revert changes to the rss and atom feed links, as c:url doesn't escape value 2014-12-10 12:05:28 +01:00
Daniel Kulp 6ae576cafb Minor cleanup to use a c:out to output the data 2014-08-19 13:34:53 -04:00
Andreas Kuhtz c0f28e8e0a Web-console does not initialize under Spring-4.x because dispatcher-servlet.xml has very old bean definition.
This closes #37
Signed-off-by: Daniel Kulp <dkulp@apache.org>
2014-07-30 10:23:22 -04:00
gtully 66a689df0e fix up karaf-itests , related commits https://issues.apache.org/jira/browse/AMQ-5224 https://issues.apache.org/jira/browse/AMQ-5105 Update poms to fully load into M2E - 06bb7a2716 2014-07-28 15:30:12 +01:00
Daniel Kulp 06bb7a2716 Update poms to fully load into M2E 2014-07-10 13:47:55 -04:00
Dejan Bosanac fa086396a7 [maven-release-plugin] prepare for next development iteration 2014-06-05 11:59:29 +02:00
Dejan Bosanac 58dd93e42e [maven-release-plugin] prepare release activemq-5.10.0 2014-06-05 11:59:17 +02:00
Krzysztof Sobkowiak 25600944e6 AMQ-5167 ActiveMQ web-cosole fails to start in Karaf - missing import 2014-06-05 11:33:24 +02:00
Dejan Bosanac c2cf78542f [maven-release-plugin] prepare for next development iteration 2014-06-04 11:33:17 +02:00
Dejan Bosanac 5bc741f227 [maven-release-plugin] prepare release activemq-5.10.0 2014-06-04 11:33:03 +02:00
Jason Sherman d37786ea13 Add Jetty host property to resolve URL message 2014-05-09 16:38:49 -04:00
Hadrian Zbarcea 3f32507f78 Use autocrlf consistently for line endings 2014-04-29 14:18:37 -04:00
artnaseef ae2504ab8e AMQ-5104: Add non-durable subscribers to the subscriber page, and topic-specific subscriber view for individual topics. 2014-03-14 23:10:13 -07:00
artnaseef db1e3fc9e3 AMQ-2429: Add pages listing producers for Queues and Topics. 2014-03-14 19:53:53 -07:00
artnaseef dcbac84a8c AMQ-4998: apply fix from Guilhem RAMBAL. Added use of "<c:out>" to propery html-encode the output. 2014-02-20 07:47:34 -07:00
artnaseef ec249f4dac AMQ-4175: correct the syntax on the message-view "move" operation so clicking the link works properly. 2014-02-15 20:13:32 -07:00
artnaseef c8402a6e34 AMD-4175: applied patch from Torbjørn Skyberg Knutsen: added webconsole retry operations for messages on "DLQ." and "DLT." destinations; sort queue names for move or copy operations. Also added confirmation dialogs for all message operations not already covered. 2014-02-15 19:08:33 -07:00
James Carman 0c4790bb94 AMQ-5033: webconsole url and html encoding missing 2014-02-08 21:21:40 -07:00
artnaseef f88043eaf7 AMQ-5028: merge update from dkulp: strip unused dependencies to reduce the size of the WAR file. 2014-02-06 18:28:26 -07:00
artnaseef 4985e08ea8 [AMQ-4813] correct the URL encoding of message IDs. Use <c:url> to format <a href> urls. 2014-02-06 11:54:40 -07:00
Daniel Kulp 17d1489c62 [AMQ-5029] embedded webconsole broker does not resolve activemq.data system property 2014-02-05 16:08:26 -05:00
Daniel Kulp 3321f99643 [AMQ-4174] Redirect back to queue overview after delete/moving message
Patch from Robert Balent applied
2014-02-05 15:19:44 -05:00
Daniel Kulp f74a65f4f5 Merge ../activemq into remove-sitemesh 2014-02-03 15:23:54 -05:00
Daniel Kulp f222741fdc More updates for removing sitemesh, remove activemq-all. 2014-02-03 15:13:44 -05:00
Daniel Kulp cbc227cd1c [AMQ-4994] Remove site-mesh 2014-01-31 21:46:07 -05:00
Hadrian Zbarcea f4e768760f AMQ-4994. Fix OOME while browsing deep queues 2014-01-31 16:56:21 -05:00
Claus Ibsen 25f4e874eb Polished 2013-11-22 11:01:35 +01:00
gtully 864aa6798f [maven-release-plugin] prepare for next development iteration 2013-10-14 23:38:35 +01:00
gtully 87c9bbebac [maven-release-plugin] prepare release activemq-5.9.0 2013-10-14 23:38:22 +01:00
Claus Ibsen d02f696dd0 Updated (c) to 2013 2013-10-14 09:40:41 +02:00
gtully ee0933c71e [maven-release-plugin] prepare for next development iteration 2013-10-11 14:51:36 +01:00
gtully b276006911 [maven-release-plugin] prepare release activemq-5.9.0 2013-10-11 14:51:24 +01:00
Claus Ibsen 8bfd36a1fd Polished 2013-10-10 13:59:49 +02:00
Claus Ibsen 4bfb80680a Upgraded copyright footer to 2013 2013-10-10 12:43:11 +02:00
Claus Ibsen 84c4b9db56 AMQ-7486: Log at INFO level on starting standalone broker the http url of the web console 2013-10-04 14:10:28 +02:00
Claus Ibsen afc0220147 AMQ-4371: Added back rss/atom feed support in old web console. Thanks to Robert Balent for the patch. 2013-10-02 17:55:04 +02:00
Claus Ibsen 4b0073da02 AMQ-4343: activemq-web-console can't be installed on Karaf 2.2.x. Thanks to Ioannis Canellos for the patch. 2013-09-24 09:21:29 +02:00
Bosanac Dejan 805d88af24 don't limit the web console on jetty 7; it should be able to run on newer versions as well
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1509629 13f79535-47bb-0310-9956-ffa450edef68
2013-08-02 11:17:38 +00:00
Bosanac Dejan 6167c49fc1 https://issues.apache.org/jira/browse/AMQ-4567 - readonly web console
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1498875 13f79535-47bb-0310-9956-ffa450edef68
2013-07-02 10:42:55 +00:00
Claus Ibsen 629c24ba65 Align osgi version to 4.3.1
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1485657 13f79535-47bb-0310-9956-ffa450edef68
2013-05-23 12:01:53 +00:00
Hiram R. Chirino db08d6e404 Fixes compile error.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1484142 13f79535-47bb-0310-9956-ffa450edef68
2013-05-18 16:39:22 +00:00
Bosanac Dejan 148ca81dcd https://issues.apache.org/jira/browse/AMQ-4397 - xss in cron expressions
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1459265 13f79535-47bb-0310-9956-ffa450edef68
2013-03-21 12:34:01 +00:00
Hiram R. Chirino dc86b87236 Avoid building/packing legacy/deprecated modules.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1445631 13f79535-47bb-0310-9956-ffa450edef68
2013-02-13 14:44:56 +00:00
Gary Tully 56174e770d [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1443026 13f79535-47bb-0310-9956-ffa450edef68
2013-02-06 15:45:26 +00:00
Gary Tully 5e257808f3 [maven-release-plugin] prepare release activemq-5.8.0
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1443024 13f79535-47bb-0310-9956-ffa450edef68
2013-02-06 15:43:41 +00:00
Bosanac Dejan 0d529af312 https://issues.apache.org/jira/browse/AMQ-4034 - web console osgi itest improvements
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1442162 13f79535-47bb-0310-9956-ffa450edef68
2013-02-04 16:12:21 +00:00
Bosanac Dejan 3527a4cfa0 https://issues.apache.org/jira/browse/AMQ-4034 - osgi web console, remove runtime osgi dependency
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1441461 13f79535-47bb-0310-9956-ffa450edef68
2013-02-01 14:34:50 +00:00
Gary Tully 964f8ca375 add broker nd webconsole round trip itest
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1441459 13f79535-47bb-0310-9956-ffa450edef68
2013-02-01 14:27:56 +00:00
Bosanac Dejan e8deea92b6 https://issues.apache.org/jira/browse/AMQ-4034 - osgi web console, finishing config admin configuration
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1441375 13f79535-47bb-0310-9956-ffa450edef68
2013-02-01 10:17:44 +00:00
Bosanac Dejan 0d27c49bbf https://issues.apache.org/jira/browse/AMQ-4034 - osgi web console, laying down foundations for config admin configuration
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1441064 13f79535-47bb-0310-9956-ffa450edef68
2013-01-31 16:59:49 +00:00
Bosanac Dejan dc3eb911fa https://issues.apache.org/jira/browse/AMQ-4034 - osgi web console, fixing classpath
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1441059 13f79535-47bb-0310-9956-ffa450edef68
2013-01-31 16:52:01 +00:00
Timothy A. Bish a55aae00e7 Scrub the pom files and remove old cruft and leftovers from the recent refactoring
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1439680 13f79535-47bb-0310-9956-ffa450edef68
2013-01-28 22:44:25 +00:00
Christian Posta 0bfa0cdf1a Fix for https://issues.apache.org/jira/browse/AMQ-4272 updated queueConsumers.jsp to only allow the link to connection page for connections directly to the broker, but go to network.jsp for bridge consumers
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1439193 13f79535-47bb-0310-9956-ffa450edef68
2013-01-27 21:44:55 +00:00
Timothy A. Bish 3dd24195e6 removing dependencies on activemq-core
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1431109 13f79535-47bb-0310-9956-ffa450edef68
2013-01-09 21:50:59 +00:00
Timothy A. Bish 401895a521 Apply patch for: https://issues.apache.org/jira/browse/AMQ-4218
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1420262 13f79535-47bb-0310-9956-ffa450edef68
2012-12-11 16:32:14 +00:00
Timothy A. Bish 67252fe60d fix for: https://issues.apache.org/jira/browse/AMQ-2740
Fix for NPE indicate possible CSRF attack instead.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1418061 13f79535-47bb-0310-9956-ffa450edef68
2012-12-06 20:37:04 +00:00
Timothy A. Bish 4321ae065d fix for: https://issues.apache.org/jira/browse/AMQ-3215
Fix the truncation logic to ensure all possible text is used.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1417998 13f79535-47bb-0310-9956-ffa450edef68
2012-12-06 16:49:32 +00:00
Timothy A. Bish b489fc6f75 fix for: https://issues.apache.org/jira/browse/AMQ-3215
Allow for longer names of destination while still imposing limit before a truncation occurs.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1417993 13f79535-47bb-0310-9956-ffa450edef68
2012-12-06 16:40:39 +00:00
Hiram R. Chirino 30f531d741 Changes for https://issues.apache.org/jira/browse/AMQ-4165 : Remove pure master/slave functionality
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1413846 13f79535-47bb-0310-9956-ffa450edef68
2012-11-26 21:13:25 +00:00
Gary Tully 02538ed906 ensure connection/authentication errors with broker facade end up in the log as referenced by our 500 page
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1412899 13f79535-47bb-0310-9956-ffa450edef68
2012-11-23 14:19:24 +00:00
Gary Tully 51785b1472 https://issues.apache.org/jira/browse/AMQ-4186 - fix up duplicate contenty type declaration, fix up pom so main in web-console works ok with current dependencies
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1412825 13f79535-47bb-0310-9956-ffa450edef68
2012-11-23 11:07:57 +00:00
Claus Ibsen 67f887da88 AMQ-3116: Fixed web-console to show unicode chars when browsing message bodies.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1395295 13f79535-47bb-0310-9956-ffa450edef68
2012-10-07 13:10:54 +00:00
Bosanac Dejan 0b0ed9f84d [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1392979 13f79535-47bb-0310-9956-ffa450edef68
2012-10-02 15:37:31 +00:00
Bosanac Dejan e396468d9b [maven-release-plugin] prepare release activemq-5.7.0
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1392977 13f79535-47bb-0310-9956-ffa450edef68
2012-10-02 15:37:00 +00:00
Bosanac Dejan 16dc729163 [maven-release-plugin] rollback the release of activemq-parent-5.7.0
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1392968 13f79535-47bb-0310-9956-ffa450edef68
2012-10-02 15:24:44 +00:00
Bosanac Dejan c479df0679 [maven-release-plugin] prepare release activemq-parent-5.7.0
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1392966 13f79535-47bb-0310-9956-ffa450edef68
2012-10-02 15:20:57 +00:00
Bosanac Dejan c83b70c3cd [maven-release-plugin] rollback the release of activemq-5.7.0
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1392935 13f79535-47bb-0310-9956-ffa450edef68
2012-10-02 14:44:05 +00:00
Bosanac Dejan f2af2c9187 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1392933 13f79535-47bb-0310-9956-ffa450edef68
2012-10-02 14:40:11 +00:00
Bosanac Dejan 07bed31f7b [maven-release-plugin] prepare release activemq-5.7.0
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1392929 13f79535-47bb-0310-9956-ffa450edef68
2012-10-02 14:34:36 +00:00
Bosanac Dejan 798437773a rolling back version because of failed release:perform
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1392924 13f79535-47bb-0310-9956-ffa450edef68
2012-10-02 14:22:49 +00:00
Bosanac Dejan 5094609ec5 [maven-release-plugin] prepare release activemq-5.7.0
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1392921 13f79535-47bb-0310-9956-ffa450edef68
2012-10-02 14:16:05 +00:00
Bosanac Dejan 3576fbe97a [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1392876 13f79535-47bb-0310-9956-ffa450edef68
2012-10-02 12:09:24 +00:00
Bosanac Dejan 02b2ba294e [maven-release-plugin] prepare release activemq-5.7.0
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1392874 13f79535-47bb-0310-9956-ffa450edef68
2012-10-02 12:08:45 +00:00
Claus Ibsen 87a0a4e19a AMQ-4087: Added TM to AMQ logo
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1392788 13f79535-47bb-0310-9956-ffa450edef68
2012-10-02 08:27:11 +00:00
Bosanac Dejan a8d364d030 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1392269 13f79535-47bb-0310-9956-ffa450edef68
2012-10-01 10:39:07 +00:00
Bosanac Dejan a97f821869 [maven-release-plugin] prepare release activemq-5.7.0
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1392267 13f79535-47bb-0310-9956-ffa450edef68
2012-10-01 10:38:35 +00:00
Claus Ibsen 11e6f88ded Polished
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1387909 13f79535-47bb-0310-9956-ffa450edef68
2012-09-20 08:45:34 +00:00
Claus Ibsen eedb091f83 AMQ-3727: Added osgi import. Thanks to Thomas Themel for the patch.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1387900 13f79535-47bb-0310-9956-ffa450edef68
2012-09-20 08:07:00 +00:00
Claus Ibsen b0bf0a2593 Polished
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1387097 13f79535-47bb-0310-9956-ffa450edef68
2012-09-18 11:36:31 +00:00
Claus Ibsen 183ae75048 Added uptime to web console
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1387063 13f79535-47bb-0310-9956-ffa450edef68
2012-09-18 09:04:09 +00:00
Timothy A. Bish dd8899e173 Polish: don't need to specify versions of the plugins that are managed by our parent pom.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1384713 13f79535-47bb-0310-9956-ffa450edef68
2012-09-14 10:18:34 +00:00
Bosanac Dejan 3c4848b8a5 https://issues.apache.org/jira/browse/AMQ-3696 - fix web console to show special page for slave brokers
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1363319 13f79535-47bb-0310-9956-ffa450edef68
2012-07-19 12:55:14 +00:00
Bosanac Dejan 87e300add0 https://issues.apache.org/jira/browse/AMQ-3923 - webconsole in osgi - get back jstl in war
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1361179 13f79535-47bb-0310-9956-ffa450edef68
2012-07-13 12:18:48 +00:00
Bosanac Dejan 1cd533078a https://issues.apache.org/jira/browse/AMQ-3923 - webconsole in osgi don't load css on a first page load
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1361132 13f79535-47bb-0310-9956-ffa450edef68
2012-07-13 09:56:29 +00:00
Robert Davies b6fba238bb patch applied for https://issues.apache.org/jira/browse/AMQ-3867
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1348150 13f79535-47bb-0310-9956-ffa450edef68
2012-06-08 16:52:39 +00:00
Bosanac Dejan 1b28cf1792 https://issues.apache.org/jira/browse/AMQ-3853 - activemq-web-console osgi import
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1341810 13f79535-47bb-0310-9956-ffa450edef68
2012-05-23 09:42:39 +00:00
Bosanac Dejan c587918821 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1332983 13f79535-47bb-0310-9956-ffa450edef68
2012-05-02 10:36:17 +00:00
Bosanac Dejan b7e264f917 [maven-release-plugin] prepare release activemq-5.6.0
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1332981 13f79535-47bb-0310-9956-ffa450edef68
2012-05-02 10:35:43 +00:00
Bosanac Dejan 710dc7bb20 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1329823 13f79535-47bb-0310-9956-ffa450edef68
2012-04-24 16:17:53 +00:00
Bosanac Dejan 96a9fb2502 [maven-release-plugin] prepare release activemq-5.6.0
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1329821 13f79535-47bb-0310-9956-ffa450edef68
2012-04-24 16:17:16 +00:00
Bosanac Dejan 401f768414 include eclipse jdt to make activemq-web-console jetty:run work again
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1307487 13f79535-47bb-0310-9956-ffa450edef68
2012-03-30 15:49:31 +00:00
Gary Tully f5b69f8783 https://issues.apache.org/jira/browse/AMQ-2570 - remove wildcards as they are ignored by bnd when the classes are not referenced and replace with explicit imports for the dependencies that are needed. In case of servlet, wildcard is ok as it is referenced but the spo bits of the logging package are needed for the appenders
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1300106 13f79535-47bb-0310-9956-ffa450edef68
2012-03-13 12:51:25 +00:00
Gary Tully 84a50910a6 https://issues.apache.org/jira/browse/AMQ-2570 - remove wildcards as they are ignored by bnd when the classes are not referenced. this fixes logging at the default debug level for pax logging when unbound from the war file
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1298620 13f79535-47bb-0310-9956-ffa450edef68
2012-03-08 22:22:17 +00:00
Gary Tully 14c1766843 https://issues.apache.org/jira/browse/AMQ-3743 - activemq-web-console WAR with SNAPSHOT dependencies breaks osgi Bundle-ClassPath in manifest. Make use of the war plugin outputFileNameMapping to ensure the timestamp is dropped to match the bundle-classpath
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1294359 13f79535-47bb-0310-9956-ffa450edef68
2012-02-27 22:14:54 +00:00
Timothy A. Bish 3a561cc8c7 fix for: https://issues.apache.org/jira/browse/AMQ-3248
Adds new variables for activemq.conf and activemq.data to allow for easy externalization of configuration and data files.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1245654 13f79535-47bb-0310-9956-ffa450edef68
2012-02-17 16:57:35 +00:00
Timothy A. Bish 292ff42963 apply patch for https://issues.apache.org/jira/browse/AMQ-3709 also updates the copyright year.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1242168 13f79535-47bb-0310-9956-ffa450edef68
2012-02-08 23:11:08 +00:00
Timothy A. Bish beb564f6f1 updates copyright year for to current https://issues.apache.org/jira/browse/AMQ-3078
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1241898 13f79535-47bb-0310-9956-ffa450edef68
2012-02-08 13:48:41 +00:00
Bosanac Dejan 55e7216292 https://issues.apache.org/jira/browse/AMQ-3581 - web console escape url
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1199259 13f79535-47bb-0310-9956-ffa450edef68
2011-11-08 14:29:34 +00:00
Gary Tully 39ca3de50e https://issues.apache.org/jira/browse/AMQ-3491 - Investigate and resolve LGPL dependency via camel-web. Removing camel-web dependency due to its downstream lgpl dep. We can bring it back in if/when it is cleaned up
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1181860 13f79535-47bb-0310-9956-ffa450edef68
2011-10-11 15:59:20 +00:00