Commit Graph

735 Commits

Author SHA1 Message Date
Timothy A. Bish 67273afa5a update some plugin versions.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1514891 13f79535-47bb-0310-9956-ffa450edef68
2013-08-16 20:52:13 +00:00
James Strachan 65034359a5 Updated to the latest hawtio release for AMQ-4594
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1513929 13f79535-47bb-0310-9956-ffa450edef68
2013-08-14 15:30:04 +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
Timothy A. Bish ac8e38fb69 update some plugin versions and ensure we use the property value in all child poms.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1504919 13f79535-47bb-0310-9956-ffa450edef68
2013-07-19 15:33:33 +00:00
Claus Ibsen 8abbfb2376 Dependency upgrades and better aligned with Camel 2.12.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1502580 13f79535-47bb-0310-9956-ffa450edef68
2013-07-12 14:50:33 +00:00
Claus Ibsen bb7c33124b Upgraded to Karaf 2.3.2
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1502430 13f79535-47bb-0310-9956-ffa450edef68
2013-07-12 05:54:00 +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
Timothy A. Bish dd69af43bc fix: https://issues.apache.org/jira/browse/AMQ-4604
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1498515 13f79535-47bb-0310-9956-ffa450edef68
2013-07-01 15:19:59 +00:00
Bosanac Dejan 06dae40d94 https://issues.apache.org/jira/browse/AMQ-4593 - upgrade snappy java
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1495392 13f79535-47bb-0310-9956-ffa450edef68
2013-06-21 11:31:23 +00:00
Hiram R. Chirino 21ddc98591 Fixes AMQ-4587: AMQP to JMS transformer fails to properly map AMQP specific property types like UnsignedInteger
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1494216 13f79535-47bb-0310-9956-ffa450edef68
2013-06-18 17:24:56 +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
Bosanac Dejan e5676f65d9 https://issues.apache.org/jira/browse/AMQ-4574 - fix osgi range as well
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1489869 13f79535-47bb-0310-9956-ffa450edef68
2013-06-05 13:46:35 +00:00
Bosanac Dejan b2a91b96c4 https://issues.apache.org/jira/browse/AMQ-4574 - EndpointCompleter functionality for camel component
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1489843 13f79535-47bb-0310-9956-ffa450edef68
2013-06-05 12:56:55 +00:00
Claus Ibsen 6a83487086 AMQ-4552: activemq feature to install in karaf. Still some problems.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1485655 13f79535-47bb-0310-9956-ffa450edef68
2013-05-23 11:54:10 +00:00
Hiram R. Chirino 6e71964291 Update the leveldb API version.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1485209 13f79535-47bb-0310-9956-ffa450edef68
2013-05-22 13:41:02 +00:00
Hiram R. Chirino 18eb6b239d Add the plugin repo since the plugin has not made it to central yet.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1484512 13f79535-47bb-0310-9956-ffa450edef68
2013-05-20 16:08:41 +00:00
Hiram R. Chirino 870fa687d5 Added profile that adds console timestamps.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1484510 13f79535-47bb-0310-9956-ffa450edef68
2013-05-20 16:02:45 +00:00
Hiram R. Chirino 4ca6f230d5 Switch to released mqtt client version.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1484486 13f79535-47bb-0310-9956-ffa450edef68
2013-05-20 14:23:13 +00:00
Hiram R. Chirino 4aac5a6bf3 Fixes AMQ-4544: Cant send MQTT message to AMQP endpoints
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1484143 13f79535-47bb-0310-9956-ffa450edef68
2013-05-18 16:39:35 +00:00
Hiram R. Chirino f20e17ae32 Latest hawtdispatch snapshot should fix the hang in the MQTT SSL test.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1484012 13f79535-47bb-0310-9956-ffa450edef68
2013-05-17 22:03:38 +00:00
Bosanac Dejan 87a29847bb upgrading leveldbjni to 1.7
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1481849 13f79535-47bb-0310-9956-ffa450edef68
2013-05-13 13:49:20 +00:00
Hiram R. Chirino e0ae445900 For AMQ-4338: Lets see if using a newer MQTT client helps. Also hook into the client tracing and use the auto fail test support base class to timeout the tests if they take too long.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1481092 13f79535-47bb-0310-9956-ffa450edef68
2013-05-10 16:52:47 +00:00
Timothy A. Bish b5f6bc3c90 https://issues.apache.org/jira/browse/AMQ-4524
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1480282 13f79535-47bb-0310-9956-ffa450edef68
2013-05-08 14:05:30 +00:00
Hiram R. Chirino 5c6b8ba11f Adding an initial spike of a M/S replicated leveldb store. Replication protocol is working nicely, just need automated M/S election bits.
Move tests in a test package.
Rename the HA* classes to DFS*.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1476719 13f79535-47bb-0310-9956-ffa450edef68
2013-04-28 03:53:57 +00:00
Timothy A. Bish 32042a5b8b update some deps with bugfix versions.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1466287 13f79535-47bb-0310-9956-ffa450edef68
2013-04-09 23:29:40 +00:00
Bosanac Dejan 0507ad380b https://issues.apache.org/jira/browse/AMQ-4418 - refactor web demo to be war that can be ran in karaf
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1462479 13f79535-47bb-0310-9956-ffa450edef68
2013-03-29 13:34:34 +00:00
Jonathan Anstey 734b9babba AMQ-4412 - align jackson version with Camel
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1461819 13f79535-47bb-0310-9956-ffa450edef68
2013-03-27 19:30:06 +00:00
Bosanac Dejan 4276091e21 https://issues.apache.org/jira/browse/AMQ-4377 - bring back activemq-blueprint module
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1456991 13f79535-47bb-0310-9956-ffa450edef68
2013-03-15 15:42:36 +00:00
Gary Tully e5768c009b move pax exam itests after osgi and web console builds so they pick up the latest bundles
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1450840 13f79535-47bb-0310-9956-ffa450edef68
2013-02-27 16:55:33 +00:00
Gary Tully 30b20b3f38 https://issues.apache.org/jira/browse/AMQ-4341 - apply patch from ioannis with thanks
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1450550 13f79535-47bb-0310-9956-ffa450edef68
2013-02-27 00:36:48 +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
Hiram R. Chirino cd5e1f3d99 update the leveldbjni version
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1444823 13f79535-47bb-0310-9956-ffa450edef68
2013-02-11 15:19:40 +00:00
Bosanac Dejan 386b7bb844 improving building maven site
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1444071 13f79535-47bb-0310-9956-ffa450edef68
2013-02-08 15:30:53 +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
Gary Tully 38a63c15fb fix dependency version
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1441472 13f79535-47bb-0310-9956-ffa450edef68
2013-02-01 14:57:45 +00:00
Timothy A. Bish a3bfd17e7d revert to surefire 2.10 for now 2.13 seems to have some issues
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1441299 13f79535-47bb-0310-9956-ffa450edef68
2013-02-01 02:59:59 +00:00
Timothy A. Bish fe2489fc4b bump versions of plugin and dependencies to latest patch releases prior to v5.8 release.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1441100 13f79535-47bb-0310-9956-ffa450edef68
2013-01-31 18:22:54 +00:00
Timothy A. Bish 1e86ac0508 Bumping surefire to v2.13 since it fixes some problems with empty report files that happens with some of our failing tests.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1440594 13f79535-47bb-0310-9956-ffa450edef68
2013-01-30 19:19:37 +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
Hiram R. Chirino 373ed3622c Pickup release proton lib
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1439499 13f79535-47bb-0310-9956-ffa450edef68
2013-01-28 17:02:34 +00:00
Hiram R. Chirino c441e3a66c Almost all the amqp joram tests are passing with the QPID 0.20 client.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1438797 13f79535-47bb-0310-9956-ffa450edef68
2013-01-26 00:41:48 +00:00
Gary Tully 91b0780af3 pick up priton snap
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1438736 13f79535-47bb-0310-9956-ffa450edef68
2013-01-25 21:48:31 +00:00
Timothy A. Bish 095224f327 couple more bugifx version updates
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1438596 13f79535-47bb-0310-9956-ffa450edef68
2013-01-25 17:12:34 +00:00
Timothy A. Bish 0cb78fa1de Bump latest bugfix version of xstream v1.4.4
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1438584 13f79535-47bb-0310-9956-ffa450edef68
2013-01-25 16:50:09 +00:00
Hiram R. Chirino 15298cb1b4 Switch to proton snapshot to pick up fix /w link closing. Also make a link fail if the address is an empty string.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1438570 13f79535-47bb-0310-9956-ffa450edef68
2013-01-25 16:07:12 +00:00
Hiram R. Chirino d0a06160e0 Upgrade the leveldbjni version to fix potential corruption issues. See: https://issues.apache.org/jira/browse/APLO-282
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1438024 13f79535-47bb-0310-9956-ffa450edef68
2013-01-24 14:46:01 +00:00
Bosanac Dejan 77c0cf9206 https://issues.apache.org/jira/browse/AMQ-4034 - copy all neccessary resources to activemq-osgi bundle
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1437368 13f79535-47bb-0310-9956-ffa450edef68
2013-01-23 12:37:13 +00:00
Claus Ibsen 06e67e02bb Use osgi 4.3.1 which works better with java7
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1436860 13f79535-47bb-0310-9956-ffa450edef68
2013-01-22 12:08:38 +00:00
Bosanac Dejan 1b27f95393 https://issues.apache.org/jira/browse/AMQ-4034 - fixing activemq-broker feature
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1433970 13f79535-47bb-0310-9956-ffa450edef68
2013-01-16 15:05:53 +00:00
Bosanac Dejan eff119471d https://issues.apache.org/jira/browse/AMQ-4034 - first stab at karaf integration tests
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1433543 13f79535-47bb-0310-9956-ffa450edef68
2013-01-15 17:29:20 +00:00
Claus Ibsen 38f24afbd5 AMQ-4257: Upgraded to Aries Blueprint 1.0.0
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1433333 13f79535-47bb-0310-9956-ffa450edef68
2013-01-15 10:03:18 +00:00
Claus Ibsen d8766963a9 AMQ-4256: Upgraded to OSGi 4.3.0
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1433328 13f79535-47bb-0310-9956-ffa450edef68
2013-01-15 09:42:20 +00:00
Timothy A. Bish a25df91fcd https://issues.apache.org/jira/browse/AMQ-4253
update spring version 3.1.1-RELEASE

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1432997 13f79535-47bb-0310-9956-ffa450edef68
2013-01-14 17:16:45 +00:00
Hiram R. Chirino 69ff572f88 Switch to a released version of proton
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1430373 13f79535-47bb-0310-9956-ffa450edef68
2013-01-08 16:46:04 +00:00
Hiram R. Chirino 1949846c0a Switch to scala 2.10
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1429079 13f79535-47bb-0310-9956-ffa450edef68
2013-01-04 20:02:27 +00:00
Hiram R. Chirino 8eb11a3aa7 Added a activemq-osgi module which is an uber OSGi bundle of all the ActiveMQ jars to make integrating into OSGi a little simpler.
Adding karaf-itests module.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1428537 13f79535-47bb-0310-9956-ffa450edef68
2013-01-03 18:37:45 +00:00
Hiram R. Chirino 650d2b4d52 Add a profile to generate a dependency graph of the modules.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1427860 13f79535-47bb-0310-9956-ffa450edef68
2013-01-02 16:56:56 +00:00
Timothy A. Bish 2aecbc48a0 bump commons-net to latest bugfix version.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1424058 13f79535-47bb-0310-9956-ffa450edef68
2012-12-19 19:45:40 +00:00
Timothy A. Bish 73f0fc7820 Update to latest camel 2.10.3 release.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1423956 13f79535-47bb-0310-9956-ffa450edef68
2012-12-19 17:05:43 +00:00
Hiram R. Chirino 3ef55fa82b Simplify LevelDB store build, use latest versions of leveldb.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1418698 13f79535-47bb-0310-9956-ffa450edef68
2012-12-08 16:01:55 +00:00
Hiram R. Chirino 537e598a84 reclassify the amqp joram tests which are passing/will pass and are still broken and why.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1415182 13f79535-47bb-0310-9956-ffa450edef68
2012-11-29 14:33:01 +00:00
Hiram R. Chirino 3016b39249 Moved the JMS mapping logic into a proton module.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1414990 13f79535-47bb-0310-9956-ffa450edef68
2012-11-28 23:16:42 +00:00
Jonathan Anstey 6c8e89652f AMQ-4179 - can't install activemq-extra feature
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1410325 13f79535-47bb-0310-9956-ffa450edef68
2012-11-16 13:05:00 +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 11e0df8e04 Fixing up activemq-amqp build a bit.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1408917 13f79535-47bb-0310-9956-ffa450edef68
2012-11-13 19:49:23 +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 c5cf03806d Refactored out the remaining plugins in the activemq-core module into their own modules.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1406686 13f79535-47bb-0310-9956-ffa450edef68
2012-11-07 16:00:07 +00:00
Hiram R. Chirino 58aca86981 Refactor all the core broker classes from the activemq-core module into the activemq-broker module.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1406629 13f79535-47bb-0310-9956-ffa450edef68
2012-11-07 13:37:50 +00:00
Hiram R. Chirino 9a8f6e415d Refactored the classes needed to run an ActiveMQ JMS client out from the activemq-core module to the activemq-client module.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1406466 13f79535-47bb-0310-9956-ffa450edef68
2012-11-07 05:00:17 +00:00
Hiram R. Chirino 8bae15a2a2 Flatten out the module structure out a bit.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1406463 13f79535-47bb-0310-9956-ffa450edef68
2012-11-07 04:48:19 +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
Timothy A. Bish ec231d38b1 fix for: https://issues.apache.org/jira/browse/AMQ-4054 dont' need Axis dep anymore
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1404743 13f79535-47bb-0310-9956-ffa450edef68
2012-11-01 20:08:31 +00:00
Timothy A. Bish 34f18b6fc7 Update a couple things to latest patch versions
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1404178 13f79535-47bb-0310-9956-ffa450edef68
2012-10-31 14:57:18 +00:00
Claus Ibsen 4018202226 Upgraded to Camel 2.10.2
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1403632 13f79535-47bb-0310-9956-ffa450edef68
2012-10-30 07:14:43 +00:00
Claus Ibsen 5b63698924 AMQ-4112: Upgraded to MQTT 1.4 and polished tests.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1399151 13f79535-47bb-0310-9956-ffa450edef68
2012-10-17 08:35:00 +00:00
Claus Ibsen 9e94ee40a2 AMQ-3723: Upgraded to xbean 3.12
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1398643 13f79535-47bb-0310-9956-ffa450edef68
2012-10-16 04:53:46 +00:00
Gary Tully 84ba54b24f move fast, all and broken test exclusions to profiles so that exclusions are merged correctly. revert to surefire 2.10 pending fix for http://jira.codehaus.org/browse/SUREFIRE-913. To run all tests use: -Dactivemq.tests=all
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1395978 13f79535-47bb-0310-9956-ffa450edef68
2012-10-09 11:49:17 +00:00
Hiram R. Chirino 7fe30bc0cc Making more progress on the AMQP implementation.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1393782 13f79535-47bb-0310-9956-ffa450edef68
2012-10-03 21:46:46 +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 df8b1d578c rolling back scm info
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1392969 13f79535-47bb-0310-9956-ffa450edef68
2012-10-02 15:25:50 +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
Claus Ibsen 74a80fee32 Initial add of itests
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1392774 13f79535-47bb-0310-9956-ffa450edef68
2012-10-02 07:47:23 +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
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
Hiram R. Chirino b20d5411d1 Fixes AMQ-4080: Integrate the Fusesource LevelDB module into the ActiveMQ build.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1389882 13f79535-47bb-0310-9956-ffa450edef68
2012-09-25 14:32:28 +00:00
Bosanac Dejan 89c0790d90 reverting release plugin version as this one doesn't work well with gpg
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1389829 13f79535-47bb-0310-9956-ffa450edef68
2012-09-25 12:17:11 +00:00
Bosanac Dejan 5aed30d5df removing activemq-version pom variable and using project.version directly
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1389803 13f79535-47bb-0310-9956-ffa450edef68
2012-09-25 11:12:45 +00:00
Claus Ibsen 08185743c1 AMQ-4069: Upgraded maven plugin versions to latest releases.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1388390 13f79535-47bb-0310-9956-ffa450edef68
2012-09-21 09:35:01 +00:00
Claus Ibsen 0b9873c057 Added missing license header. More exclude to rat plugin.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1388356 13f79535-47bb-0310-9956-ffa450edef68
2012-09-21 07:42:59 +00:00
Claus Ibsen 0147739360 Added missing license header. More exclude to rat plugin.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1388354 13f79535-47bb-0310-9956-ffa450edef68
2012-09-21 07:36:48 +00:00
Claus Ibsen b9621e66d4 Upgraded to Jetty 7.6.7
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1387055 13f79535-47bb-0310-9956-ffa450edef68
2012-09-18 08:46:59 +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
Claus Ibsen 83a9c62b7c AMQ-4057: Upgraded to http client 4.2.1 for http transport.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1386574 13f79535-47bb-0310-9956-ffa450edef68
2012-09-17 12:05:18 +00:00
Claus Ibsen f653fbfe14 AMQ-4047: activemq-option feature included needed JARs
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1386535 13f79535-47bb-0310-9956-ffa450edef68
2012-09-17 10:00:53 +00:00
Claus Ibsen 9ddfd8008e AMQ-4041: Upgraded JARs in feature. As well fixing it.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1383884 13f79535-47bb-0310-9956-ffa450edef68
2012-09-12 11:21:28 +00:00
Claus Ibsen 13222cd4a4 Upgraded to apache 11 in pom.xml
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1383806 13f79535-47bb-0310-9956-ffa450edef68
2012-09-12 06:59:46 +00:00
Claus Ibsen 8a300c17b6 AMQ-4038: Favor using JARs from maven central, to avoid 3rd part repos. AMQ-4039: Upgraded JAR dependencies.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1383805 13f79535-47bb-0310-9956-ffa450edef68
2012-09-12 06:54:32 +00:00
Claus Ibsen 6da942706e AMQ-4038: Favor using JARs from maven central, to avoid 3rd part repos. AMQ-4039: Upgraded JAR dependencies.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1383801 13f79535-47bb-0310-9956-ffa450edef68
2012-09-12 06:30:31 +00:00
Bosanac Dejan f344696a4a give tests a little bit more time, to check if it will help with occasional failures on slow machines
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1380264 13f79535-47bb-0310-9956-ffa450edef68
2012-09-03 15:10:23 +00:00
Claus Ibsen 5abbfc2200 AMQ-4013: Upgraded to xbean 3.11.1
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1379918 13f79535-47bb-0310-9956-ffa450edef68
2012-09-02 06:38:57 +00:00
Claus Ibsen d6025b8a09 Upgraded to Camel 2.10.1
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1379310 13f79535-47bb-0310-9956-ffa450edef68
2012-08-31 06:35:16 +00:00
Timothy A. Bish 80242339ec Update to commons-pool v 1.6 for: https://issues.apache.org/jira/browse/AMQ-4006
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1379082 13f79535-47bb-0310-9956-ffa450edef68
2012-08-30 19:35:06 +00:00
Bosanac Dejan dfbdbf6a50 https://issues.apache.org/jira/browse/AMQ-3983 - osgi dependency
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1375543 13f79535-47bb-0310-9956-ffa450edef68
2012-08-21 13:44:49 +00:00
Robert Davies d45dedbd23 updated to Apache Camel 2.10 - https://issues.apache.org/jira/browse/AMQ-3960
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1371147 13f79535-47bb-0310-9956-ffa450edef68
2012-08-09 10:23:43 +00:00
Timothy A. Bish 46e8e17295 bunp to some bugfix release versions
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1370797 13f79535-47bb-0310-9956-ffa450edef68
2012-08-08 15:03:13 +00:00
Timothy A. Bish 0de65c1963 fix for: https://issues.apache.org/jira/browse/AMQ-3859
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1365036 13f79535-47bb-0310-9956-ffa450edef68
2012-07-24 13:20:44 +00:00
Bosanac Dejan cb27f9148d https://issues.apache.org/jira/browse/AMQ-3812 - creating fuse-extra karaf feature for deployin mqtt transport and leveldb
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1362037 13f79535-47bb-0310-9956-ffa450edef68
2012-07-16 13:51:12 +00:00
Timothy A. Bish ee17789e48 fix for: https://issues.apache.org/jira/browse/AMQ-3890 make leveldb optional
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1361378 13f79535-47bb-0310-9956-ffa450edef68
2012-07-13 20:20:28 +00:00
Timothy A. Bish d162fa07b7 fix for: https://issues.apache.org/jira/browse/AMQ-3534
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1359883 13f79535-47bb-0310-9956-ffa450edef68
2012-07-10 20:11:20 +00:00
Timothy A. Bish fd24ab8036 Update to Apache v10 parent and bump to some later patch releases
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1359735 13f79535-47bb-0310-9956-ffa450edef68
2012-07-10 15:49:00 +00:00
Bosanac Dejan 1f862ba3cd https://issues.apache.org/jira/browse/AMQ-3791 - CachedLDAPAuthorizationMap improvements
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1347580 13f79535-47bb-0310-9956-ffa450edef68
2012-06-07 11:58:40 +00:00
Robert Davies db5798d9cc Update MQTT client library to 1.2
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1341527 13f79535-47bb-0310-9956-ffa450edef68
2012-05-22 15:25:16 +00:00
Bosanac Dejan 9629b968ee https://issues.apache.org/jira/browse/AMQ-3832 - maven bundle plugin upgrade
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1336078 13f79535-47bb-0310-9956-ffa450edef68
2012-05-09 10:55:22 +00:00
Hiram R. Chirino 574bd5876b Switch latest released leveldb sore impl.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1333595 13f79535-47bb-0310-9956-ffa450edef68
2012-05-03 19:42:51 +00:00
Gary Tully 92d9d1cb7a version is depreciated in place of project.version
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1333039 13f79535-47bb-0310-9956-ffa450edef68
2012-05-02 13:30:22 +00:00
Timothy A. Bish 015ac1c8a3 Update pom.xml to fix the build, instead of hardcoding <activemq-version> its now set to which seems to work on local builds here.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1333029 13f79535-47bb-0310-9956-ffa450edef68
2012-05-02 13:12:05 +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
Timothy A. Bish 0b1b932ea7 Update the <activemq-version> tag to the correct 5.7-SNAPSHOT value
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1330473 13f79535-47bb-0310-9956-ffa450edef68
2012-04-25 18:30:16 +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 bb51af38e1 upgrading activeio to 3.1.4
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1329814 13f79535-47bb-0310-9956-ffa450edef68
2012-04-24 16:01:19 +00:00
Timothy A. Bish 227e7ab5f5 AMQ-3235 update camel to v2.9.2 before 5.6 RC
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1329738 13f79535-47bb-0310-9956-ffa450edef68
2012-04-24 14:10:35 +00:00
Bosanac Dejan 974f6896a4 fixing licenses
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1327985 13f79535-47bb-0310-9956-ffa450edef68
2012-04-19 15:15:19 +00:00
Gary Tully da7add92fe https://issues.apache.org/jira/browse/AMQ-3681 - update derby version to pick up dependency on implementation of java.sql.Statement#setQueryTimeout
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1326594 13f79535-47bb-0310-9956-ffa450edef68
2012-04-16 13:08:03 +00:00
Robert Davies 8f7b18f962 updated depedency on fusemq-leveldb to version 1.1 for https://issues.apache.org/jira/browse/AMQ-3772
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1326055 13f79535-47bb-0310-9956-ffa450edef68
2012-04-14 05:22:56 +00:00
Timothy A. Bish e100c92614 Bump Camel version to v2.9.1
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1325996 13f79535-47bb-0310-9956-ffa450edef68
2012-04-13 22:34:57 +00:00
Robert Davies 555d8890ac dependency for MQTT support - see https://issues.apache.org/jira/browse/AMQ-3786
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1304983 13f79535-47bb-0310-9956-ffa450edef68
2012-03-25 06:30:59 +00:00
Hiram R. Chirino b96bb1ff4b Add the fusesource snapshot repo so that the leveldb snapshot can be downloaded.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1303502 13f79535-47bb-0310-9956-ffa450edef68
2012-03-21 18:59:21 +00:00
Hiram R. Chirino 21a9a6596b Use the snapshot version of the leveldb store..
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1302911 13f79535-47bb-0310-9956-ffa450edef68
2012-03-20 14:20:26 +00:00
Robert Davies 5ea1c1c042 updated for https://issues.apache.org/jira/browse/AMQ-3772
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1302490 13f79535-47bb-0310-9956-ffa450edef68
2012-03-19 14:58:55 +00:00
Timothy A. Bish c0cf753e19 apply fix for: https://issues.apache.org/jira/browse/AMQ-3740
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1294318 13f79535-47bb-0310-9956-ffa450edef68
2012-02-27 20:44:17 +00:00
Timothy A. Bish 46ccaafcfc fix for: https://issues.apache.org/jira/browse/AMQ-3693
fix for: https://issues.apache.org/jira/browse/AMQ-3508

Upgrades Jetty to v7.6.1

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1293432 13f79535-47bb-0310-9956-ffa450edef68
2012-02-24 21:36:39 +00:00
Timothy A. Bish fb06ca48c2 Up Camel version to 2.9.0
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1292300 13f79535-47bb-0310-9956-ffa450edef68
2012-02-22 14:17:30 +00:00
Willem Ning Jiang e8074fdc0f Upgrade xbean spring to 3.9
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1224693 13f79535-47bb-0310-9956-ffa450edef68
2011-12-26 08:20:16 +00:00
Timothy A. Bish 5396b2bca1 Update XStream and slf4j to latest releases
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1201067 13f79535-47bb-0310-9956-ffa450edef68
2011-11-11 22:03:11 +00:00
Timothy A. Bish 48bf681246 https://issues.apache.org/jira/browse/AMQ-3235
Bumping Camel to 2.8.2

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1189949 13f79535-47bb-0310-9956-ffa450edef68
2011-10-27 19:21:33 +00:00
Hiram R. Chirino 0d01b16e25 Fixes AMQ-3570: Improve ActiveMQ's XSD to allow elements to appear in any order
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1189740 13f79535-47bb-0310-9956-ffa450edef68
2011-10-27 13:19:49 +00:00
Gary Tully 07eef8e293 https://issues.apache.org/jira/browse/AMQ-3563 - Update javadoc links to point to JDK 1.6 and JEE 1.5. Patch applied with thanks.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1188788 13f79535-47bb-0310-9956-ffa450edef68
2011-10-25 16:57:39 +00:00
Timothy A. Bish e7784672ac https://issues.apache.org/jira/browse/AMQ-3504
Move to the latest Jetty version that still allows the Web Console to work.  This version has the latest websocket updates that jetty has to offer.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1187817 13f79535-47bb-0310-9956-ffa450edef68
2011-10-22 22:22:51 +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 617c436d24 https://issues.apache.org/jira/browse/AMQ-3521
Update the javadocs link in the parent pom

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1180033 13f79535-47bb-0310-9956-ffa450edef68
2011-10-07 13:23:17 +00:00
Timothy A. Bish c3a0de54b7 Move to the latest Apache parent pom and fix some permission issues in the assembly generation.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1179837 13f79535-47bb-0310-9956-ffa450edef68
2011-10-06 20:35:51 +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 06c00c1db8 https://issues.apache.org/jira/browse/AMQ-2961 - revert osgi-core to 4.1.0 as the 4.3.0 requires osgi.framework > 1.6, limiting number of container which can run it
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1170694 13f79535-47bb-0310-9956-ffa450edef68
2011-09-14 15:46:37 +00:00
Gary Tully ede4964539 remove duplicate declaration of mvn-jar-plugin
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1170243 13f79535-47bb-0310-9956-ffa450edef68
2011-09-13 17:07:25 +00:00
Claus Ibsen e97044d7ee AMQ-3494: Upgrade to Camel 2.8.1
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1170054 13f79535-47bb-0310-9956-ffa450edef68
2011-09-13 06:02:47 +00:00
Bosanac Dejan bb2f0db7b8 https://issues.apache.org/jira/browse/AMQ-3427 - maven jar and archiver plugin updates
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1163987 13f79535-47bb-0310-9956-ffa450edef68
2011-09-01 10:26:33 +00:00
Timothy A. Bish c54967d4fe apply changes for https://issues.apache.org/jira/browse/AMQ-2961 updates some versions of dependencies and clean up the versions in the pom files so its easier to change in the future.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1161672 13f79535-47bb-0310-9956-ffa450edef68
2011-08-25 18:05:45 +00:00
Bosanac Dejan ff9f2fe167 https://issues.apache.org/jira/browse/AMQ-3463 - upgrade maven-bundle-plugin
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1161619 13f79535-47bb-0310-9956-ffa450edef68
2011-08-25 16:03:09 +00:00
Timothy A. Bish 8acbf4ceb5 Fix for AMQ-3468. Updated to XStream v1.4.1
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1160923 13f79535-47bb-0310-9956-ffa450edef68
2011-08-23 23:10:41 +00:00
Bosanac Dejan 4b6648eba1 https://issues.apache.org/jira/browse/AMQ-3463 - osgi and maven metadata
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1160656 13f79535-47bb-0310-9956-ffa450edef68
2011-08-23 12:25:22 +00:00
Bosanac Dejan 4682d399ba https://issues.apache.org/jira/browse/AMQ-3463 - osgi and maven metadata
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1160316 13f79535-47bb-0310-9956-ffa450edef68
2011-08-22 15:58:44 +00:00
Timothy A. Bish 5700d3004b Update to latest slf4j on log4j now that pax logging supports it in its latest releases.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1159917 13f79535-47bb-0310-9956-ffa450edef68
2011-08-20 21:36:34 +00:00
Bosanac Dejan 4798cea181 https://issues.apache.org/jira/browse/AMQ-3427 - compile on jdk7
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1153425 13f79535-47bb-0310-9956-ffa450edef68
2011-08-03 10:53:12 +00:00
Bosanac Dejan 70997eeaf9 https://issues.apache.org/jira/browse/AMQ-3427 - compile with jdk7
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1152720 13f79535-47bb-0310-9956-ffa450edef68
2011-08-01 09:53:47 +00:00
Willem Ning Jiang 5e6f8a1ee8 AMQ-3417 upgrade Camel version to 2.8.0
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1151406 13f79535-47bb-0310-9956-ffa450edef68
2011-07-27 09:51:07 +00:00
Timothy A. Bish f352e1e447 revert changes from https://issues.apache.org/jira/browse/AMQ-3329
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1129946 13f79535-47bb-0310-9956-ffa450edef68
2011-05-31 22:34:00 +00:00
Timothy A. Bish e560055b70 fix for: https://issues.apache.org/jira/browse/AMQ-3329
Update pom to include the same webconsole version as the other camel components.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1125371 13f79535-47bb-0310-9956-ffa450edef68
2011-05-20 13:10:48 +00:00
Gary Tully 101e7110bc https://issues.apache.org/jira/browse/AMQ-3305 - Implement "exactly once" delivery with kahaDB and XA in the event of a failure post prepare.
Fixed up transaction broker recovery processing and kahadb store such that pending recovered
messages and acks wait for and respect the eventual xa transction outcome. Essentially
implementing exactly once delivery semantics on failure. Updated the camel jms to jdbc
test route to validate correct failure recovery processing with geronimo, test pulls in
xa wrappers from jencks and openejb such that NamedXAResources are registered with geronimo.
Additional unit tests added.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1100208 13f79535-47bb-0310-9956-ffa450edef68
2011-05-06 13:27:49 +00:00
Bosanac Dejan 26cf6a7f26 https://issues.apache.org/jira/browse/AMQ-826 - ldap based authorization - making tests work again, upgrading to apache ds 1.5.7, fixing ldif
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1091401 13f79535-47bb-0310-9956-ffa450edef68
2011-04-12 13:25:34 +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 8e3e5839e9 change camel to version 2.7.0
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1085377 13f79535-47bb-0310-9956-ffa450edef68
2011-03-25 14:02:45 +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 536755170c https://issues.apache.org/jira/browse/AMQ-3235 - use old web console
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1084208 13f79535-47bb-0310-9956-ffa450edef68
2011-03-22 15:00:56 +00:00
Bosanac Dejan 8ba02a395f https://issues.apache.org/jira/browse/AMQ-3235 - upgrade to camel 2.8-SNAPSHOT
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1084132 13f79535-47bb-0310-9956-ffa450edef68
2011-03-22 11:09:52 +00:00
Bruce Snyder da66c46847 AMQ-2968 - Add Apache commons daemon (jsvc/procrun) start/stop support.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1079638 13f79535-47bb-0310-9956-ffa450edef68
2011-03-09 01:42:36 +00:00
Bosanac Dejan 2f47288da2 https://issues.apache.org/jira/browse/AMQ-3142 - upgrade to karaf 2.2.0
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1077868 13f79535-47bb-0310-9956-ffa450edef68
2011-03-04 11:00:24 +00:00
Hiram R. Chirino c1f4dc94bb Fixes AMQ-3184 : Upgrade to Camel 2.6.0
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1071848 13f79535-47bb-0310-9956-ffa450edef68
2011-02-18 00:50:35 +00:00
Bosanac Dejan a806882adb https://issues.apache.org/jira/browse/AMQ-3177 - slf4j final touch
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1069754 13f79535-47bb-0310-9956-ffa450edef68
2011-02-11 11:25:24 +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 a71c1e354e https://issues.apache.org/jira/browse/AMQ-3105 - require JDK 6 and fix an bug for osx
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1052512 13f79535-47bb-0310-9956-ffa450edef68
2010-12-24 14:18:15 +00:00
Gary Tully dbaf2b1c8c fix version post release - back to snap
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1039325 13f79535-47bb-0310-9956-ffa450edef68
2010-11-26 12:15:12 +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 e8a32d56f8 updating activemq-version
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1039281 13f79535-47bb-0310-9956-ffa450edef68
2010-11-26 09:37:39 +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
Bosanac Dejan 97a2838007 [maven-release-plugin] prepare release activemq-5.4.2
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1039018 13f79535-47bb-0310-9956-ffa450edef68
2010-11-25 12:32:01 +00:00
Bosanac Dejan 52aaa0a7f3 fixing licenses
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1033853 13f79535-47bb-0310-9956-ffa450edef68
2010-11-11 09:26:35 +00:00
Bosanac Dejan 90fb6e6e0f https://issues.apache.org/activemq/browse/AMQ-2989 - xmpp3
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1024215 13f79535-47bb-0310-9956-ffa450edef68
2010-10-19 12:18:20 +00:00
Bosanac Dejan e3f784df2a https://issues.apache.org/activemq/browse/AMQ-2972 - stomp over web socket - upgrade Jetty
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1022029 13f79535-47bb-0310-9956-ffa450edef68
2010-10-13 08:49:46 +00:00
Bosanac Dejan d28be4dfb4 https://issues.apache.org/activemq/browse/AMQ-2885 - upgrading aries and karaf
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1001699 13f79535-47bb-0310-9956-ffa450edef68
2010-09-27 12:14:59 +00:00
Hadrian Zbarcea 9aced62c4c update activemq-version post release
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@998398 13f79535-47bb-0310-9956-ffa450edef68
2010-09-18 04:46:34 +00:00
Hadrian Zbarcea 4802804da3 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@998393 13f79535-47bb-0310-9956-ffa450edef68
2010-09-18 02:24:50 +00:00
Hadrian Zbarcea 037b306ca6 [maven-release-plugin] prepare release activemq-5.4.1
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@998391 13f79535-47bb-0310-9956-ffa450edef68
2010-09-18 02:24:21 +00:00
Hadrian Zbarcea 19e8203299 refined rat exclusions
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@998389 13f79535-47bb-0310-9956-ffa450edef68
2010-09-18 01:42:32 +00:00
Hadrian Zbarcea 1b3d4f805a refined rat exclusions
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@998388 13f79535-47bb-0310-9956-ffa450edef68
2010-09-18 01:34:26 +00:00
Hadrian Zbarcea a368127517 Update rat plugin configuration
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@998376 13f79535-47bb-0310-9956-ffa450edef68
2010-09-18 00:35:58 +00:00
Gary Tully c9460a0231 include smx repo so aries 0.1-r964701 can be resolved, needed till karaf updates to 0.2-incubating - https://issues.apache.org/activemq/browse/AMQ-2885
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@996692 13f79535-47bb-0310-9956-ffa450edef68
2010-09-13 21:22:37 +00:00
Gary Tully e5201f6450 0.2-incubating aries-blueprint is now in central, best to use that - https://issues.apache.org/activemq/browse/AMQ-2885
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@996680 13f79535-47bb-0310-9956-ffa450edef68
2010-09-13 20:35:08 +00:00
Jonathan Anstey bea9f68d9a AMQ-2896 - configure maven-eclipse-plugin so it doesn't try and get a 2.8-SNAPSHOT version that doesn't exist
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@991936 13f79535-47bb-0310-9956-ffa450edef68
2010-09-02 13:56:07 +00:00
Bosanac Dejan 28bc447954 https://issues.apache.org/activemq/browse/AMQ-2460 - encrypted passwords
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@991934 13f79535-47bb-0310-9956-ffa450edef68
2010-09-02 13:47:40 +00:00
Bosanac Dejan f3c81eebb9 https://issues.apache.org/activemq/browse/AMQ-2885 - upgrade aries
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@990825 13f79535-47bb-0310-9956-ffa450edef68
2010-08-30 15:32:14 +00:00
Gary Tully 28d18651d9 fix up version ref post release process
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@985873 13f79535-47bb-0310-9956-ffa450edef68
2010-08-16 11:19:31 +00:00
Hadrian Zbarcea d2380c8e8a [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@985386 13f79535-47bb-0310-9956-ffa450edef68
2010-08-13 22:14:13 +00:00
Hadrian Zbarcea a440b6c677 [maven-release-plugin] prepare release activemq-5.4.0
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@985384 13f79535-47bb-0310-9956-ffa450edef68
2010-08-13 22:13:50 +00:00
Bosanac Dejan d3bb57d0bc [maven-release-plugin] rollback the release of activemq-5.4.0
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@985250 13f79535-47bb-0310-9956-ffa450edef68
2010-08-13 15:41:21 +00:00
Bosanac Dejan 760f56875a [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@985239 13f79535-47bb-0310-9956-ffa450edef68
2010-08-13 15:25:21 +00:00
Bosanac Dejan d3fc97aba2 [maven-release-plugin] prepare release activemq-5.4.0
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@985237 13f79535-47bb-0310-9956-ffa450edef68
2010-08-13 15:24:34 +00:00
Bosanac Dejan d649a9184b rollbacking the previous RC
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@985222 13f79535-47bb-0310-9956-ffa450edef68
2010-08-13 14:54:03 +00:00
Bosanac Dejan 61e47a2345 upgrade release plugin to 2.0
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@985217 13f79535-47bb-0310-9956-ffa450edef68
2010-08-13 14:48:17 +00:00
Gary Tully 317bee8f6f fix activemq-version ref post release
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@984744 13f79535-47bb-0310-9956-ffa450edef68
2010-08-12 12:37:57 +00:00
Hadrian Zbarcea 0fad136cc6 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@984126 13f79535-47bb-0310-9956-ffa450edef68
2010-08-10 17:07:29 +00:00
Hadrian Zbarcea 30d7a7d7d3 [maven-release-plugin] prepare release activemq-5.4.0
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@984124 13f79535-47bb-0310-9956-ffa450edef68
2010-08-10 17:06:59 +00:00
Hadrian Zbarcea ac652da52d [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@983897 13f79535-47bb-0310-9956-ffa450edef68
2010-08-10 09:02:54 +00:00
Hadrian Zbarcea 3f8cb55122 [maven-release-plugin] prepare release activemq-5.4.0
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@983895 13f79535-47bb-0310-9956-ffa450edef68
2010-08-10 09:02:36 +00:00
Hadrian Zbarcea 45116abe3a [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@983854 13f79535-47bb-0310-9956-ffa450edef68
2010-08-10 02:16:19 +00:00
Hadrian Zbarcea 3796cf4497 [maven-release-plugin] prepare release activemq-5.4.0
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@983852 13f79535-47bb-0310-9956-ffa450edef68
2010-08-10 02:15:55 +00:00
David Jencks 05a2ffb9dc protobuf 1.1 is released, 1.1-SNAPSHOT no longer available
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@983353 13f79535-47bb-0310-9956-ffa450edef68
2010-08-08 06:05:13 +00:00
Bosanac Dejan 474a30d7ce reverting to annotation spec 1.0 and including activemq-ra in the feature
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@982934 13f79535-47bb-0310-9956-ffa450edef68
2010-08-06 11:34:06 +00:00
Bosanac Dejan e1f6acf038 upgrade geronimo annotation spec to 1.1
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@982665 13f79535-47bb-0310-9956-ffa450edef68
2010-08-05 15:35:09 +00:00
Bosanac Dejan f5e8d90337 upgrading to karaf 2.0.0
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@981445 13f79535-47bb-0310-9956-ffa450edef68
2010-08-02 10:33:10 +00:00
Robert Davies 40f921dab9 updated to Apache Camel 2.4.0
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@966510 13f79535-47bb-0310-9956-ffa450edef68
2010-07-22 05:54:04 +00:00
Bosanac Dejan 145c80a298 https://issues.apache.org/activemq/browse/AMQ-2574 - removing runtime OSGi dependency
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@964847 13f79535-47bb-0310-9956-ffa450edef68
2010-07-16 16:20:21 +00:00
Bosanac Dejan 3817ed9a97 https://issues.apache.org/activemq/browse/AMQ-2825 - jettison 1.2
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@964087 13f79535-47bb-0310-9956-ffa450edef68
2010-07-14 15:51:37 +00:00
Bosanac Dejan d1fa2baf40 https://issues.apache.org/activemq/browse/AMQ-2815 - first stab at moving karaf commands to activemq
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@961712 13f79535-47bb-0310-9956-ffa450edef68
2010-07-08 11:11:22 +00:00
Gary Tully 4160249750 resolve https://issues.apache.org/activemq/browse/AMQ-2603 - update to org.apache.geronimo.specs:geronimo-j2ee-management_1.1_spec:1.0.1
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@960857 13f79535-47bb-0310-9956-ffa450edef68
2010-07-06 09:55:17 +00:00
Bosanac Dejan 412730b899 https://issues.apache.org/activemq/browse/AMQ-2570 - use spring 3.0.x
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@960485 13f79535-47bb-0310-9956-ffa450edef68
2010-07-05 08:33:53 +00:00
Guillaume Nodet f0a446f395 AMQ-2762: Support for blueprint as a custom namespace handler
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@950728 13f79535-47bb-0310-9956-ffa450edef68
2010-06-02 19:10:57 +00:00
Gary Tully a4983690cb add in apache.snapshots plugin repo for protobuf 1.1
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@947981 13f79535-47bb-0310-9956-ffa450edef68
2010-05-25 09:30:41 +00:00
Gary Tully 87b1ab15fe add in apache.snapshots repo for protobuf 1.1
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@947960 13f79535-47bb-0310-9956-ffa450edef68
2010-05-25 08:37:39 +00:00
Hiram R. Chirino 09642bbcfa upgrade to activemq-protobuf-1.1-SNAPSHOT fixes one of the errors in the XARecoveryBrokerTest
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@947439 13f79535-47bb-0310-9956-ffa450edef68
2010-05-23 16:13:23 +00:00
Gary Tully 5555f7c7e1 lock down surefire plugin version
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@943084 13f79535-47bb-0310-9956-ffa450edef68
2010-05-11 11:13:53 +00:00
Gary Tully 79d303d802 some maven future proofing - resolve warn about pom property references
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@941712 13f79535-47bb-0310-9956-ffa450edef68
2010-05-06 13:09:16 +00:00
Bosanac Dejan 76de7c05e6 https://issues.apache.org/activemq/browse/AMQ-2702 - introducing activemq-spring module
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@935952 13f79535-47bb-0310-9956-ffa450edef68
2010-04-20 15:05:29 +00:00
Bosanac Dejan c8d775dcc3 adapt site deploy url
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@926658 13f79535-47bb-0310-9956-ffa450edef68
2010-03-23 16:47:32 +00:00
Bosanac Dejan eb7275d53a disabling surefire and cobertura reports as they make site building long and doesn't add too much value in era of hudson and sonar
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@926616 13f79535-47bb-0310-9956-ffa450edef68
2010-03-23 15:27:26 +00:00
David Jencks 24d47d289d AMQ-2638 use the apache 7 pom
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@919659 13f79535-47bb-0310-9956-ffa450edef68
2010-03-05 22:44:55 +00:00
David Jencks 7cefb7ae73 AMQ-2637 widen osgi import version ranges
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@919561 13f79535-47bb-0310-9956-ffa450edef68
2010-03-05 19:45:10 +00:00
Gary Tully a5e9060119 camel 2.2.0 needed to ensure container is started from requestor with 3.0 https://issues.apache.org/activemq/browse/AMQ-2547 - upgrading trunk to spring 3.0.1.RELEASE
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@917534 13f79535-47bb-0310-9956-ffa450edef68
2010-03-01 14:02:59 +00:00