This closes #1231
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/b9e7e7ed Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/b9e7e7ed Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/b9e7e7ed Branch: refs/heads/master Commit: b9e7e7ed9d358448a71af6d35b269356864f6d22 Parents: eeca06d f82623a Author: Justin Bertram <[email protected]> Authored: Thu May 4 10:36:22 2017 -0500 Committer: Justin Bertram <[email protected]> Committed: Thu May 4 10:36:22 2017 -0500 ---------------------------------------------------------------------- .../apache/activemq/artemis/cli/Artemis.java | 36 +- .../artemis/cli/commands/ActionAbstract.java | 1 - .../artemis/cli/commands/Configurable.java | 2 +- .../activemq/artemis/cli/commands/Create.java | 274 ++------ .../artemis/cli/commands/HelpAction.java | 1 - .../artemis/cli/commands/InputAbstract.java | 7 +- .../activemq/artemis/cli/commands/Mask.java | 9 +- .../artemis/cli/commands/OptionsUtil.java | 65 ++ .../activemq/artemis/cli/commands/Run.java | 10 +- .../cli/commands/address/HelpAddress.java | 2 +- .../artemis/cli/commands/messages/Browse.java | 1 - .../artemis/cli/commands/messages/Consumer.java | 1 - .../cli/commands/messages/ConsumerThread.java | 320 +++++++++ .../artemis/cli/commands/messages/Producer.java | 1 - .../cli/commands/messages/ProducerThread.java | 344 +++++++++ .../artemis/cli/commands/queue/HelpQueue.java | 2 +- .../cli/commands/tools/CompactJournal.java | 65 -- .../cli/commands/tools/DecodeJournal.java | 318 --------- .../cli/commands/tools/EncodeJournal.java | 208 ------ .../artemis/cli/commands/tools/HelpData.java | 2 +- .../cli/commands/tools/LockAbstract.java | 19 +- .../artemis/cli/commands/tools/PerfJournal.java | 92 --- .../artemis/cli/commands/tools/PrintData.java | 37 +- .../cli/commands/tools/XmlDataConstants.java | 129 ---- .../cli/commands/tools/XmlDataExporter.java | 626 ----------------- .../cli/commands/tools/XmlDataExporterUtil.java | 107 --- .../cli/commands/tools/XmlDataImporter.java | 690 ------------------- .../commands/tools/journal/CompactJournal.java | 66 ++ .../commands/tools/journal/DecodeJournal.java | 296 ++++++++ .../commands/tools/journal/EncodeJournal.java | 191 +++++ .../cli/commands/tools/journal/PerfJournal.java | 92 +++ .../commands/tools/xml/XmlDataConstants.java | 81 +++ .../cli/commands/tools/xml/XmlDataExporter.java | 627 +++++++++++++++++ .../commands/tools/xml/XmlDataExporterUtil.java | 104 +++ .../cli/commands/tools/xml/XmlDataImporter.java | 614 +++++++++++++++++ .../artemis/cli/commands/user/AddUser.java | 3 +- .../commands/user/FileBasedSecStoreConfig.java | 222 ++++++ .../artemis/cli/commands/user/HelpUser.java | 10 +- .../artemis/cli/commands/user/ListUser.java | 3 +- .../cli/commands/user/PasswordAction.java | 2 +- .../artemis/cli/commands/user/RemoveUser.java | 3 +- .../artemis/cli/commands/user/ResetUser.java | 3 +- .../artemis/cli/commands/user/UserAction.java | 23 +- .../cli/commands/util/ConsumerThread.java | 320 --------- .../cli/commands/util/ProducerThread.java | 344 --------- .../artemis/cli/factory/BrokerFactory.java | 73 ++ .../cli/factory/BrokerFactoryHandler.java | 26 + .../artemis/cli/factory/BrokerHandler.java | 26 + .../artemis/cli/factory/FileBrokerHandler.java | 30 + .../factory/security/JaasSecurityHandler.java | 31 + .../cli/factory/security/SecurityHandler.java | 25 + .../security/SecurityManagerFactory.java | 35 + .../factory/xml/XmlBrokerFactoryHandler.java | 37 + .../activemq/artemis/factory/BrokerFactory.java | 82 --- .../artemis/factory/BrokerFactoryHandler.java | 28 - .../activemq/artemis/factory/BrokerHandler.java | 26 - .../artemis/factory/FileBrokerHandler.java | 30 - .../artemis/factory/JaasSecurityHandler.java | 32 - .../artemis/factory/SecurityHandler.java | 25 - .../artemis/factory/SecurityManagerFactory.java | 37 - .../factory/XmlBrokerFactoryHandler.java | 41 -- .../artemis/integration/FileBroker.java | 4 +- .../artemis/util/FileBasedSecStoreConfig.java | 222 ------ .../activemq/artemis/util/OptionsUtil.java | 67 -- .../activemq/artemis/util/ServerUtil.java | 8 +- .../artemis/broker/security/jaas-security | 2 +- .../apache/activemq/artemis/broker/server/file | 2 +- .../org/apache/activemq/artemis/broker/xml | 2 +- .../persistence/ExportFormatTest.java | 4 +- .../persistence/XmlImportExportTest.java | 6 +- .../journal/XmlImportExportStressTest.java | 4 +- .../core/journal/impl/JournalImplTestBase.java | 4 +- 72 files changed, 3466 insertions(+), 3816 deletions(-) ----------------------------------------------------------------------
