This closes #640
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/110158bb Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/110158bb Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/110158bb Branch: refs/heads/master Commit: 110158bb8626a99fc988ca84f29f28e903b39dd9 Parents: e664780 d0ecf0f Author: Clebert Suconic <clebertsuco...@apache.org> Authored: Mon Jul 25 21:45:16 2016 -0400 Committer: Clebert Suconic <clebertsuco...@apache.org> Committed: Mon Jul 25 21:45:16 2016 -0400 ---------------------------------------------------------------------- LICENSE | 28 - .../artemis/utils/StringEscapeUtils.java | 108 ++ artemis-core-client/pom.xml | 8 + .../activemq/artemis/api/core/JsonUtil.java | 306 ++++ .../api/core/TransportConfiguration.java | 12 + .../core/management/AddressSettingsInfo.java | 22 +- .../api/core/management/DayCounterInfo.java | 46 +- .../api/core/management/ManagementHelper.java | 209 +-- .../artemis/api/core/management/RoleInfo.java | 19 +- .../activemq/artemis/core/security/Role.java | 16 + .../activemq/artemis/utils/json/JSONArray.java | 931 ----------- .../artemis/utils/json/JSONException.java | 56 - .../activemq/artemis/utils/json/JSONObject.java | 1540 ------------------ .../activemq/artemis/utils/json/JSONString.java | 43 - .../artemis/utils/json/JSONTokener.java | 414 ----- .../management/AddressSettingsInfoTest.java | 77 + artemis-distribution/pom.xml | 8 + artemis-distribution/src/main/assembly/dep.xml | 2 + .../src/main/resources/features.xml | 3 + artemis-jms-client/pom.xml | 1 - .../api/jms/management/JMSConnectionInfo.java | 18 +- .../api/jms/management/JMSConsumerInfo.java | 19 +- .../api/jms/management/JMSSessionInfo.java | 20 +- .../api/jms/management/SubscriptionInfo.java | 19 +- artemis-jms-server/pom.xml | 8 + .../management/impl/JMSQueueControlImpl.java | 11 +- .../management/impl/JMSServerControlImpl.java | 133 +- .../management/impl/JMSTopicControlImpl.java | 34 +- .../jms/server/impl/JMSServerManagerImpl.java | 25 +- .../api/core/management/MessageCounterInfo.java | 35 +- .../impl/ActiveMQServerControlImpl.java | 101 +- .../management/impl/AddressControlImpl.java | 8 +- .../impl/BroadcastGroupControlImpl.java | 9 +- .../impl/ClusterConnectionControlImpl.java | 15 +- .../core/management/impl/QueueControlImpl.java | 57 +- .../artemis/core/server/ServerSession.java | 4 +- .../core/server/impl/ServerSessionImpl.java | 27 +- .../core/transaction/TransactionDetail.java | 41 +- pom.xml | 17 +- tests/integration-tests/pom.xml | 10 + .../aerogear/AeroGearBasicServerTest.java | 50 +- .../server/management/JMSQueueControlTest.java | 19 +- .../server/management/JMSServerControlTest.java | 11 +- .../jms/server/management/TopicControlTest.java | 21 +- .../management/ActiveMQServerControlTest.java | 23 +- .../management/BroadcastGroupControlTest.java | 7 +- .../ClusterConnectionControlTest.java | 7 +- .../management/ManagementHelperTest.java | 81 - .../ManagementWithPagingServerTest.java | 17 +- .../management/QueueControlTest.java | 49 +- 50 files changed, 1039 insertions(+), 3706 deletions(-) ----------------------------------------------------------------------