ARTEMIS-565 Replace json.org with javax.json
authorJohn D. Ament <johndament@apache.org>
Sun, 17 Jul 2016 23:05:19 +0000 (19:05 -0400)
committerClebert Suconic <clebertsuconic@apache.org>
Tue, 26 Jul 2016 01:44:57 +0000 (21:44 -0400)
commitd0ecf0f3a51ec82dd33b596ea948aa2994716b1b
tree2035aa7ff9f8b7aa3e52bbb20469ee9d81289c4b
parente66478020c863af9db1b13533ccbdbd64e84095b
ARTEMIS-565 Replace json.org with javax.json

Javax.json is a newer JSR, but has an ASF compliant version, is pretty close to the original JSON.org API and will support a standard annotation based JSON-B solution at some point soon.
Updated integration tests and removed JSON.org from license.
50 files changed:
LICENSE
artemis-commons/src/main/java/org/apache/activemq/artemis/utils/StringEscapeUtils.java [new file with mode: 0644]
artemis-core-client/pom.xml
artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/JsonUtil.java [new file with mode: 0644]
artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/TransportConfiguration.java
artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/AddressSettingsInfo.java
artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/DayCounterInfo.java
artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ManagementHelper.java
artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/RoleInfo.java
artemis-core-client/src/main/java/org/apache/activemq/artemis/core/security/Role.java
artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/json/JSONArray.java [deleted file]
artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/json/JSONException.java [deleted file]
artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/json/JSONObject.java [deleted file]
artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/json/JSONString.java [deleted file]
artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/json/JSONTokener.java [deleted file]
artemis-core-client/src/test/java/org/apache/activemq/artemis/api/core/management/AddressSettingsInfoTest.java [new file with mode: 0644]
artemis-distribution/pom.xml
artemis-distribution/src/main/assembly/dep.xml
artemis-features/src/main/resources/features.xml
artemis-jms-client/pom.xml
artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/JMSConnectionInfo.java
artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/JMSConsumerInfo.java
artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/JMSSessionInfo.java
artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/SubscriptionInfo.java
artemis-jms-server/pom.xml
artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/management/impl/JMSQueueControlImpl.java
artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/management/impl/JMSServerControlImpl.java
artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/management/impl/JMSTopicControlImpl.java
artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/impl/JMSServerManagerImpl.java
artemis-server/src/main/java/org/apache/activemq/artemis/api/core/management/MessageCounterInfo.java
artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ActiveMQServerControlImpl.java
artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/AddressControlImpl.java
artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/BroadcastGroupControlImpl.java
artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ClusterConnectionControlImpl.java
artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/QueueControlImpl.java
artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ServerSession.java
artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerSessionImpl.java
artemis-server/src/main/java/org/apache/activemq/artemis/core/transaction/TransactionDetail.java
pom.xml
tests/integration-tests/pom.xml
tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/aerogear/AeroGearBasicServerTest.java
tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSQueueControlTest.java
tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSServerControlTest.java
tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/TopicControlTest.java
tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlTest.java
tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/BroadcastGroupControlTest.java
tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ClusterConnectionControlTest.java
tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ManagementHelperTest.java
tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ManagementWithPagingServerTest.java
tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/QueueControlTest.java