Commit Graph

288 Commits

Author SHA1 Message Date
Timothy Bish 4ecff14030 NO-JIRA Update master version to 5.14.0-SNAPSHOT to match the eventual
release version.
2016-01-20 12:40:20 -05:00
Christopher L. Shannon (cshannon) cfb4ca9f54 [maven-release-plugin] prepare for next development iteration 2015-11-30 13:48:58 +00:00
Christopher L. Shannon (cshannon) abfe038ddf [maven-release-plugin] prepare release activemq-5.13.0 2015-11-30 13:48:11 +00:00
Christopher L. Shannon (cshannon) f44c3d20ed https://issues.apache.org/jira/browse/AMQ-5356
Upgraded to Jetty 9.2.x to solve JDK 8 compatibility issues.
This required migrating to the new WebSocket API.
2015-09-03 11:54:57 +00:00
Christopher L. Shannon (cshannon) 04ee70a161 https://issues.apache.org/jira/browse/AMQ-5889
Adding support for auto detection of wire protocols over a transport.
OpenWire, AMQP, STOMP, and MQTT can all be detected and the broker
will properly handle each one over a given Transport.  Currently
auto TCP, NIO, SSL, and NIO+SSL transports can handle auto-detection
of the wire format and client but support could be added in the
future for other transports like websockets.
2015-08-11 19:39:29 +00:00
Timothy Bish 6cdd750ddc [maven-release-plugin] prepare for next development iteration 2015-08-10 11:04:26 -04:00
Timothy Bish a9eeb03520 [maven-release-plugin] prepare release activemq-5.12.0 2015-08-10 11:04:17 -04:00
gtully a05a9a2129 https://issues.apache.org/jira/browse/AMQ-5552 - added profile for activemq.tests=smoke to run a fast subset of tests that gives a fast verification of a full build 2015-07-09 14:10:38 +01:00
Dejan Bosanac b8698953f3 https://issues.apache.org/jira/browse/AMQ-5744 - jasypt-spring31 2015-04-24 11:56:26 +02:00
Jeff Genender 6d6ed4eaaf AMQ-5721 - Update ActiveMQ to use commons-pool2 instead of commons-pool.AMQ-5636 will need it. The JMS pool and other components should use it as well. 2015-04-16 16:01:39 +02:00
Jeff Genender 58ed95d7c8 AMQ-5636 - Update DBCP to a much more recent version 2015-03-05 08:36:26 -07:00
gtully ae595c95b1 [maven-release-plugin] prepare for next development iteration 2015-01-30 12:46:19 +00:00
gtully 4ba1a1689f [maven-release-plugin] prepare release activemq-5.11.0 2015-01-30 12:46:08 +00:00
gtully bf5a2997c7 [maven-release-plugin] prepare for next development iteration 2015-01-26 16:48:46 +00:00
gtully eec2955bde [maven-release-plugin] prepare release activemq-5.11.0 2015-01-26 16:48:37 +00:00
gtully 64fa706d54 Revert "[maven-release-plugin] prepare release activemq-5.11.0"
This reverts commit f47fbe4b89.
2015-01-26 16:39:35 +00:00
gtully f47fbe4b89 [maven-release-plugin] prepare release activemq-5.11.0 2015-01-26 16:17:43 +00:00
gtully 60f9b020cc https://issues.apache.org/jira/browse/AMQ-5515 - update to 8.1.15.v20140411 2015-01-13 12:06:54 +00:00
gtully cf62d58ae7 https://issues.apache.org/jira/browse/AMQ-5515 - tidy up jetty deps - fix jetty maven coords 2015-01-12 22:58:07 +00:00
Hadrian Zbarcea aedcae139b Revert "[maven-release-plugin] prepare release activemq-5.11.0"
This reverts commit 48b0cf396c.
2015-01-05 12:25:58 -05:00
Hadrian Zbarcea 89995f4723 Revert "[maven-release-plugin] prepare for next development iteration"
This reverts commit 7b285c6f52.
2015-01-05 12:25:47 -05:00
Dejan Bosanac 7b285c6f52 [maven-release-plugin] prepare for next development iteration 2014-12-29 12:44:32 +01:00
Dejan Bosanac 48b0cf396c [maven-release-plugin] prepare release activemq-5.11.0 2014-12-29 12:44:20 +01:00
Dejan Bosanac 4da588d4fc https://issues.apache.org/jira/browse/AMQ-5105 - problem starting broker with leveldb store 2014-07-17 17:12:52 +02: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
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
Timothy Bish 8498136f5e fix for: https://issues.apache.org/jira/browse/AMQ-5004 2014-04-30 10:08:28 -04:00
Claus Ibsen d793db4440 AMQ-5091: Upgrade to jolokia 1.2 2014-03-10 13:58:33 +01:00
Les Hazlewood f9451e56e2 Fix for https://issues.apache.org/jira/browse/AMQ-3621 - Integrate Apache Shiro with ActiveMQ as "security solution" - many thanks to Les Hazlewood (lhazlewood) for the patch!
Commit dev changes to branch.

Signed-off-by: Christian Posta <christian.posta@gmail.com>

Added shiro support to 5.9.x

Signed-off-by: Christian Posta <christian.posta@gmail.com>

Added Shiro deps to dist zip/tarball and 'all' .jar

Signed-off-by: Christian Posta <christian.posta@gmail.com>

updated version number to reflect correctly packaging Shiro features

Signed-off-by: Christian Posta <christian.posta@gmail.com>

Handled case when adding a producer might not have a specified destination.

Signed-off-by: Christian Posta <christian.posta@gmail.com>

Merged latest Connection API changes from trunk.

Signed-off-by: Christian Posta <christian.posta@gmail.com>

removed accidental addition of Stormpath's m2 repo

Signed-off-by: Christian Posta <christian.posta@gmail.com>

reverted accidental deletion of <distributionManagement>

Signed-off-by: Christian Posta <christian.posta@gmail.com>
2014-02-24 08:17:32 -07:00
Daniel Kulp 127f82a439 Remove sitemesh jar from assembly, not needed anymore 2014-02-03 14:37:46 -05:00
Kevin Earls c027552035 Upgraded surefire plugin to 2.16. AMQ-5006 2014-01-30 14:22:44 +01:00
Daniel Kulp 760ee2677a Remove hawt.io console and restore back to just the old console 2014-01-02 11:11:06 -05: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
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
Hiram Chirino c643e7f631 Make sure we test the examples/conf broker xml files. 2013-10-10 12:19:06 -04:00
Dejan Bosanac 3345e6ca25 adding proton-j-impl dependency 2013-10-10 17:51:18 +02:00
Hiram Chirino 3a0a9aae05 Include the partition module in the assembly. 2013-10-08 13:27:32 -04:00
gtully 5ec5c525dd remove duplicate pom dep -pool 2013-10-01 22:02:02 +01:00
gtully b66559ee07 https://issues.apache.org/jira/browse/AMQ-4757 activemq-jms-pool a generic jms xa pool derived from activemq-pool which activemq-pool now extends with amq specifics 2013-09-30 23:09:25 +01:00
Claus Ibsen 124300a6bb AMQ-4749: Upgrade to Xerces 2.11. Thanks to Jean Baptiste for the patch. 2013-09-28 09:09:48 +02:00
Claus Ibsen 9edc5d0511 AMQ-4745: Upgrade to json-simple 1.1.1. Thanks to Jean Baptiste for the patch. 2013-09-28 09:07:33 +02:00
Claus Ibsen 488bd9c14d AMQ-4734: Upgrade to jolokia 1.1.3 2013-09-24 08:58:48 +02:00
Dejan Bosanac f6f22df4f4 https://issues.apache.org/jira/browse/AMQ-4594 - add log plugin to hawtio 2013-09-19 14:55:17 +02:00
Gary Tully 30fc80ccc9 https://issues.apache.org/jira/browse/AMQ-4682 - include feature in assembly and osgi uber jar
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1518333 13f79535-47bb-0310-9956-ffa450edef68
2013-08-28 19:18:12 +00:00
Gary Tully 3630a41fc9 https://issues.apache.org/jira/browse/AMQ-4682 - implement runtimeConfigurationPlugin that will track xml config and react to changes. simple verification via test that adds a new network connector on the fly
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1513871 13f79535-47bb-0310-9956-ffa450edef68
2013-08-14 13:23:36 +00:00
Hiram R. Chirino 86e2426d1b Improve the replicated leveldb bits: Avoid dependencies on fabric-group stuff. Makes it easier to embed in different versions of a fabric osgi env.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1501877 13f79535-47bb-0310-9956-ffa450edef68
2013-07-10 17:49:03 +00:00
Hiram R. Chirino 7db8987ca6 Fixup the assembly packaging so that the replicated leveldb store can be used.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1491287 13f79535-47bb-0310-9956-ffa450edef68
2013-06-09 20:41:24 +00:00
Hiram R. Chirino 6e7365640d Repackage the hawtio webconsole in the standalone distro.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1491272 13f79535-47bb-0310-9956-ffa450edef68
2013-06-09 19:39:59 +00:00
Hiram R. Chirino c70d7735c0 Add the amqp module to the assembly.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1486248 13f79535-47bb-0310-9956-ffa450edef68
2013-05-24 23:04:26 +00:00
Hiram R. Chirino b2fca26213 Remove deprecated modules. Converted many AMQ store tests to be LevelDB tests.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1445633 13f79535-47bb-0310-9956-ffa450edef68
2013-02-13 14:47:40 +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
Timothy A. Bish ef24cc9a04 fix https://issues.apache.org/jira/browse/AMQ-4280
activemq-core module renamed to activemq-unit-tests

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1439685 13f79535-47bb-0310-9956-ffa450edef68
2013-01-28 23:09:54 +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
Bosanac Dejan 44a7ffa946 https://issues.apache.org/jira/browse/AMQ-4219 - jolokia support
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1420809 13f79535-47bb-0310-9956-ffa450edef68
2012-12-12 16:25:19 +00:00
Timothy A. Bish 87e878b2b5 fix for: https://issues.apache.org/jira/browse/AMQ-4169
Rename the activemq maven plugin so that they follow the maven plugin naming guidelines. 
Also update the code to use non-deprecated annotations for properties. 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1417041 13f79535-47bb-0310-9956-ffa450edef68
2012-12-04 17:19:35 +00:00
Hiram R. Chirino 8387295ade Take the activemq-amqp module out of the ustable profile, include it in the default assembly.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1408918 13f79535-47bb-0310-9956-ffa450edef68
2012-11-13 19:49:39 +00:00
Hiram R. Chirino ecaae53fe8 Moved the remaining bits to the activemq-optional module to a trash dir that we won't build anymore. We can clean it out once we are sure we don't need anything from it.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1407199 13f79535-47bb-0310-9956-ffa450edef68
2012-11-08 18:13:11 +00:00
Hiram R. Chirino 9a1ad8c8b3 Split out the activemq-http and activemq-log4j-appender modules from the activemq-optional module.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1407139 13f79535-47bb-0310-9956-ffa450edef68
2012-11-08 15:51:10 +00:00
Hiram R. Chirino 9c39f4e40a Refactored out the legacy openwire marshalers to a new module.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1406732 13f79535-47bb-0310-9956-ffa450edef68
2012-11-07 17:42:38 +00:00
Hiram R. Chirino bfbe90b399 rename the activemq-leveldb module to activemq-leveldb-store to be consistent with other store modules. Move more spring/xbean support bits into the activemq-spring module.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1406726 13f79535-47bb-0310-9956-ffa450edef68
2012-11-07 17:26:31 +00:00
Hiram R. Chirino 715010a1ea Merged the kahadb module into activemq-core since it's the only known user of the module. Will allow us to eliminate dup util classes.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1406368 13f79535-47bb-0310-9956-ffa450edef68
2012-11-06 22:03:14 +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 2daf9f16e9 AMQ-4088: Fixed kit to include httpclient/core. Trying to include execute permission on tarbal for scripts in examples.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1392799 13f79535-47bb-0310-9956-ffa450edef68
2012-10-02 09:08:36 +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
Gary Tully b469638171 fix up assembly xml configuration validtion tests - have them run by default. Pull out osgi isms to separate hook and add shutdown hook when jetty.xml is included so that it is shutdown on broker stop. Fix problems with the xml eposed by the tests
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1390204 13f79535-47bb-0310-9956-ffa450edef68
2012-09-25 22:52:28 +00:00
Hiram R. Chirino 4051799a6d More work for AMQ-4080: Include the activemq-leveldb module in the assembly, don't use the fusesource leveldb module anymore.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1389892 13f79535-47bb-0310-9956-ffa450edef68
2012-09-25 14:50:15 +00:00
Claus Ibsen 9a32e38627 AMQ-4056: Upgraded jmDNS to 3.4.1, and removed old obsolte activemq-jmdns module that is no longer needed.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1387052 13f79535-47bb-0310-9956-ffa450edef68
2012-09-18 08:44:42 +00:00
Claus Ibsen b358c05696 AMQ-4060: Upgraded Spring OXM to Spring 3 version.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1386583 13f79535-47bb-0310-9956-ffa450edef68
2012-09-17 12:38:51 +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
Robert Davies 8e05b7b733 added patch to update dependencies to include leveldb for https://issues.apache.org/jira/browse/AMQ-3772
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1325617 13f79535-47bb-0310-9956-ffa450edef68
2012-04-13 05:34:18 +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
Timothy A. Bish 082fdc5627 Fix for https://issues.apache.org/jira/browse/AMQ-3521
Moves the HTTP client up to the newest v4.1.2 release. Update some additional dependencies as well.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1179226 13f79535-47bb-0310-9956-ffa450edef68
2011-10-05 13:49:50 +00:00
Bosanac Dejan d8c142f1f4 https://issues.apache.org/jira/browse/AMQ-3249 - removing jaxb and stax from dependencies and distro
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1086566 13f79535-47bb-0310-9956-ffa450edef68
2011-03-29 12:32:34 +00:00
Gary Tully 442232514c [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1086321 13f79535-47bb-0310-9956-ffa450edef68
2011-03-28 18:02:03 +00:00
Gary Tully c94de4230a [maven-release-plugin] prepare release activemq-5.5.0
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1086315 13f79535-47bb-0310-9956-ffa450edef68
2011-03-28 17:52:07 +00:00
Bosanac Dejan a065bb1fb3 https://issues.apache.org/jira/browse/AMQ-3105 - removing icu4j as we're now requiring JDK 6
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1084237 13f79535-47bb-0310-9956-ffa450edef68
2011-03-22 16:20:51 +00:00
Bosanac Dejan 8bf987b134 https://issues.apache.org/jira/browse/AMQ-3177 - use slf4j instead of jcl
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1069405 13f79535-47bb-0310-9956-ffa450edef68
2011-02-10 14:24:01 +00:00
Bosanac Dejan 81c5b9d6d3 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1039294 13f79535-47bb-0310-9956-ffa450edef68
2010-11-26 10:01:45 +00:00
Bosanac Dejan 2781601db1 [maven-release-plugin] prepare release activemq-5.4.2
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1039292 13f79535-47bb-0310-9956-ffa450edef68
2010-11-26 10:01:35 +00:00
Bosanac Dejan 7fd8cc03d3 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1039020 13f79535-47bb-0310-9956-ffa450edef68
2010-11-25 12:32:08 +00:00