From 4b63891aaad1e0164a7b684b11cb2be439d089b7 Mon Sep 17 00:00:00 2001 From: Andy Taylor Date: Fri, 2 Jan 2015 10:24:01 +0000 Subject: [PATCH] ACTIVEMQ6-67 - cleaned up configuration https://issues.apache.org/jira/browse/ACTIVEMQ6-67 fixed distribution so that file based security works and hot deployers as broken and no longer needed with new bootstrap. Also combined the jms and core configuration files. --- .../org/apache/activemq/cli/commands/Run.java | 41 +- .../apache/activemq/cli/commands/Stop.java | 4 +- .../factory/BasicSecurityHandler.java | 43 ++ .../activemq/factory/BrokerFactory.java | 30 +- .../activemq/factory/BrokerHandler.java | 21 +- .../apache/activemq/factory/CoreFactory.java | 51 -- ...oryHandler.java => FileBrokerHandler.java} | 19 +- .../factory/FileJmsFactoryHandler.java | 36 -- .../apache/activemq/factory/JmsFactory.java | 50 -- ...ctoryHandler.java => SecurityHandler.java} | 12 +- .../factory/SecurityManagerFactory.java | 6 +- .../Broker.java} | 12 +- .../activemq/integration/FileBroker.java | 98 ++++ .../activemq/broker}/security/basic-security | 2 +- .../activemq/broker/{core => server}/file | 2 +- .../apache/activemq/dto/BasicSecurityDTO.java | 15 + .../org/apache/activemq/dto/BrokerDTO.java | 11 +- .../dto/{JmsDTO.java => ServerDTO.java} | 5 +- .../org/apache/activemq/dto/jaxb.index | 2 - .../config/impl/FileJMSConfiguration.java | 219 +++++++ .../jms/server/embedded/EmbeddedJMS.java | 30 +- .../impl/JMSServerConfigParserImpl.java | 205 ------- .../jms/server/impl/JMSServerDeployer.java | 153 ----- .../jms/server/impl/JMSServerManagerImpl.java | 71 +-- .../main/resources/schema/activemq-jms.xsd | 7 +- .../activemq/server/ActiveMQBootstrap.java | 30 +- .../rest/queue/QueueDestinationsResource.java | 5 +- .../rest/topic/TopicDestinationsResource.java | 5 +- .../main/resources/schema/hornetq-rest.xsd | 4 +- .../activemq/rest/test/EmbeddedTest.java | 9 + .../test/resources/activemq-configuration.xml | 57 +- .../src/test/resources/activemq-jms.xml | 24 - .../test/resources/activemq-roles.properties | 8 +- .../test/resources/activemq-users.properties | 17 + .../src/test/resources/activemq-users.xml | 23 - .../activemq/core/config/Configuration.java | 11 - .../core/config/FileDeploymentManager.java | 115 ++++ .../core/config/impl/ConfigurationImpl.java | 16 - .../core/config/impl/FileConfiguration.java | 85 +-- .../impl/FileSecurityConfiguration.java | 127 ++++ .../config/impl/SecurityConfiguration.java | 103 ++++ .../activemq/core/deployers/Deployable.java | 57 ++ .../activemq/core/deployers/Deployer.java | 57 -- .../core/deployers/DeploymentManager.java | 41 -- .../impl/AddressSettingsDeployer.java | 106 ---- .../impl/BasicUserCredentialsDeployer.java | 149 ----- .../impl/FileConfigurationParser.java | 10 - .../deployers/impl/FileDeploymentManager.java | 337 ----------- .../core/deployers/impl/QueueDeployer.java | 97 ---- .../core/deployers/impl/SecurityDeployer.java | 117 ---- .../core/deployers/impl/XmlDeployer.java | 334 ----------- .../apache/activemq/core/security/User.java | 80 +++ .../activemq/core/server/ActiveMQServers.java | 8 +- .../server/embedded/EmbeddedActiveMQ.java | 7 +- .../core/server/impl/ActiveMQServerImpl.java | 74 +-- .../security/ActiveMQSecurityManager.java | 35 +- .../security/ActiveMQSecurityManagerImpl.java | 143 +---- .../core/security/JAASSecurityManager.java | 61 +- .../schema/activemq-configuration.xsd | 272 +++++---- .../main/resources/schema/activemq-server.xsd | 46 ++ .../main/resources/schema/activemq-users.xsd | 45 -- .../config/impl/ConfigurationImplTest.java | 9 - .../impl/DefaultsFileConfigurationTest.java | 8 +- .../impl/FileConfigurationParserTest.java | 21 +- .../config/impl/FileConfigurationTest.java | 24 +- .../impl/HAPolicyConfigurationTest.java | 7 +- .../activemq/tests/util/UnitTestCase.java | 1 - .../resources/ConfigurationTest-defaults.xml | 3 +- .../ConfigurationTest-full-config.xml | 91 +-- .../resources/InvalidConfigurationTest0.xml | 5 +- .../resources/InvalidConfigurationTest1.xml | 5 +- .../resources/InvalidConfigurationTest2.xml | 4 +- .../resources/InvalidConfigurationTest3.xml | 5 +- .../resources/InvalidConfigurationTest4.xml | 5 +- .../resources/InvalidConfigurationTest5.xml | 5 +- .../resources/colocated-hapolicy-config.xml | 61 +- .../resources/colocated-hapolicy-config2.xml | 46 +- .../resources/live-only-hapolicy-config.xml | 24 +- .../resources/live-only-hapolicy-config2.xml | 37 +- .../resources/live-only-hapolicy-config3.xml | 15 +- .../resources/live-only-hapolicy-config4.xml | 6 +- .../resources/live-only-hapolicy-config5.xml | 4 +- .../resources/replica-hapolicy-config.xml | 41 +- .../resources/replica-hapolicy-config2.xml | 43 +- .../resources/replica-hapolicy-config3.xml | 25 +- .../resources/replicated-hapolicy-config.xml | 23 +- .../shared-store-master-hapolicy-config.xml | 20 +- .../shared-store-slave-hapolicy-config.xml | 36 +- .../shared-store-slave-hapolicy-config2.xml | 40 +- .../shared-store-slave-hapolicy-config3.xml | 22 +- distribution/activemq/pom.xml | 100 ---- .../clustered/activemq-configuration.xml | 168 +++--- .../config/clustered/activemq-jms.xml | 29 - .../clustered/activemq-roles.properties | 17 + .../clustered/activemq-users.properties | 17 + .../config/clustered/activemq-users.xml | 27 - .../resources/config/clustered/bootstrap.xml | 2 +- .../non-clustered/activemq-configuration.xml | 124 ++-- .../config/non-clustered/activemq-jms.xml | 29 - .../non-clustered/activemq-roles.properties | 17 + .../non-clustered/activemq-users.properties | 17 + .../config/non-clustered/activemq-users.xml | 27 - .../config/non-clustered/bootstrap.xml | 10 +- .../replicated/activemq-configuration.xml | 185 +++--- .../config/replicated/activemq-jms.xml | 29 - .../replicated/activemq-roles.properties | 17 + .../replicated/activemq-users.properties | 17 + .../config/replicated/activemq-users.xml | 27 - .../resources/config/replicated/bootstrap.xml | 2 +- .../shared-store/activemq-configuration.xml | 185 +++--- .../config/shared-store/activemq-jms.xml | 29 - .../shared-store/activemq-roles.properties | 17 + .../shared-store/activemq-users.properties | 17 + .../config/shared-store/activemq-users.xml | 27 - .../config/shared-store/bootstrap.xml | 2 +- .../server0/activemq-configuration.xml | 79 ++- .../hornetq-configuration-messaging-lab.xml | 57 +- .../server0/activemq-configuration.xml | 100 ++-- .../main/resources/server0/activemq-jms.xml | 28 - .../server0/activemq-roles.properties | 17 + .../server0/activemq-users.properties | 17 + .../main/resources/server0/activemq-users.xml | 27 - .../server0/activemq-configuration.xml | 80 +-- .../activemq/server0/activemq-jms.xml | 28 - .../server0/activemq-roles.properties | 17 + .../server0/activemq-users.properties | 17 + .../activemq/server0/activemq-users.xml | 27 - .../server0/activemq-configuration.xml | 65 ++- .../activemq/server0/activemq-jms.xml | 28 - .../server0/activemq-roles.properties | 17 + .../server0/activemq-users.properties | 17 + .../activemq/server0/activemq-users.xml | 27 - .../server0/activemq-configuration.xml | 56 +- .../activemq/server0/activemq-jms.xml | 28 - .../server0/activemq-roles.properties | 17 + .../server0/activemq-users.properties | 17 + .../activemq/server0/activemq-users.xml | 27 - .../server1/activemq-configuration.xml | 58 +- .../activemq/server1/activemq-jms.xml | 28 - .../server1/activemq-roles.properties | 17 + .../server1/activemq-users.properties | 17 + .../activemq/server1/activemq-users.xml | 27 - .../server0/activemq-configuration.xml | 123 ++-- .../activemq/server0/activemq-jms.xml | 28 - .../server0/activemq-roles.properties | 17 + .../server0/activemq-users.properties | 17 + .../activemq/server0/activemq-users.xml | 27 - .../server1/activemq-configuration.xml | 67 ++- .../activemq/server1/activemq-jms.xml | 28 - .../server1/activemq-roles.properties | 17 + .../server1/activemq-users.properties | 17 + .../activemq/server1/activemq-users.xml | 27 - .../server0/activemq-configuration.xml | 63 +- .../activemq/server0/activemq-jms.xml | 28 - .../server0/activemq-roles.properties | 17 + .../server0/activemq-users.properties | 17 + .../activemq/server0/activemq-users.xml | 27 - .../server0/activemq-configuration.xml | 38 +- .../activemq/server0/activemq-jms.xml | 25 - .../server0/activemq-roles.properties | 17 + .../server0/activemq-users.properties | 17 + .../activemq/server0/activemq-users.xml | 27 - .../server0/activemq-configuration.xml | 125 ++-- .../activemq/server0/activemq-jms.xml | 28 - .../server0/activemq-roles.properties | 17 + .../server0/activemq-users.properties | 17 + .../activemq/server0/activemq-users.xml | 27 - .../server1/activemq-configuration.xml | 130 +++-- .../activemq/server1/activemq-jms.xml | 28 - .../server1/activemq-roles.properties | 17 + .../server1/activemq-users.properties | 17 + .../activemq/server1/activemq-users.xml | 27 - .../server0/activemq-configuration.xml | 131 +++-- .../activemq/server0/activemq-jms.xml | 28 - .../server0/activemq-roles.properties | 17 + .../server0/activemq-users.properties | 17 + .../activemq/server0/activemq-users.xml | 27 - .../server1/activemq-configuration.xml | 129 +++-- .../activemq/server1/activemq-jms.xml | 28 - .../server1/activemq-roles.properties | 17 + .../server1/activemq-users.properties | 17 + .../activemq/server1/activemq-users.xml | 27 - .../server2/activemq-configuration.xml | 125 ++-- .../activemq/server2/activemq-jms.xml | 28 - .../server2/activemq-roles.properties | 17 + .../server2/activemq-users.properties | 17 + .../activemq/server2/activemq-users.xml | 27 - .../server0/activemq-configuration.xml | 137 ++--- .../activemq/server0/activemq-jms.xml | 28 - .../server0/activemq-roles.properties | 17 + .../server0/activemq-users.properties | 17 + .../activemq/server0/activemq-users.xml | 27 - .../server1/activemq-configuration.xml | 149 ++--- .../activemq/server1/activemq-jms.xml | 28 - .../server1/activemq-roles.properties | 17 + .../server1/activemq-users.properties | 17 + .../activemq/server1/activemq-users.xml | 27 - .../server0/activemq-configuration.xml | 152 ++--- .../activemq/server0/activemq-jms.xml | 28 - .../server0/activemq-roles.properties | 17 + .../server0/activemq-users.properties | 17 + .../activemq/server0/activemq-users.xml | 27 - .../server1/activemq-configuration.xml | 148 ++--- .../activemq/server1/activemq-jms.xml | 28 - .../server1/activemq-roles.properties | 17 + .../server1/activemq-users.properties | 17 + .../activemq/server1/activemq-users.xml | 27 - .../server2/activemq-configuration.xml | 148 ++--- .../activemq/server2/activemq-jms.xml | 28 - .../server2/activemq-roles.properties | 17 + .../server2/activemq-users.properties | 17 + .../activemq/server2/activemq-users.xml | 27 - .../server0/activemq-configuration.xml | 144 ++--- .../activemq/server0/activemq-jms.xml | 28 - .../server0/activemq-roles.properties | 17 + .../server0/activemq-users.properties | 17 + .../activemq/server0/activemq-users.xml | 27 - .../server1/activemq-configuration.xml | 144 ++--- .../activemq/server1/activemq-jms.xml | 28 - .../server1/activemq-roles.properties | 17 + .../server1/activemq-users.properties | 17 + .../activemq/server1/activemq-users.xml | 27 - .../server0/activemq-configuration.xml | 140 ++--- .../activemq/server0/activemq-jms.xml | 28 - .../server0/activemq-roles.properties | 17 + .../server0/activemq-users.properties | 17 + .../activemq/server0/activemq-users.xml | 27 - .../server1/activemq-configuration.xml | 139 ++--- .../activemq/server1/activemq-jms.xml | 28 - .../server1/activemq-roles.properties | 17 + .../server1/activemq-users.properties | 17 + .../activemq/server1/activemq-users.xml | 27 - .../server0/activemq-configuration.xml | 140 ++--- .../activemq/server0/activemq-jms.xml | 28 - .../server0/activemq-roles.properties | 17 + .../server0/activemq-users.properties | 17 + .../activemq/server0/activemq-users.xml | 27 - .../server1/activemq-configuration.xml | 139 ++--- .../activemq/server1/activemq-jms.xml | 28 - .../server1/activemq-roles.properties | 17 + .../server1/activemq-users.properties | 17 + .../activemq/server1/activemq-users.xml | 27 - .../server2/activemq-configuration.xml | 139 ++--- .../activemq/server2/activemq-jms.xml | 28 - .../server2/activemq-roles.properties | 17 + .../server2/activemq-users.properties | 17 + .../activemq/server2/activemq-users.xml | 27 - .../server0/activemq-configuration.xml | 118 ++-- .../activemq/server0/activemq-jms.xml | 28 - .../server0/activemq-roles.properties | 17 + .../server0/activemq-users.properties | 17 + .../activemq/server0/activemq-users.xml | 27 - .../server1/activemq-configuration.xml | 120 ++-- .../activemq/server1/activemq-jms.xml | 28 - .../server1/activemq-roles.properties | 17 + .../server1/activemq-users.properties | 17 + .../activemq/server1/activemq-users.xml | 27 - .../server2/activemq-configuration.xml | 120 ++-- .../activemq/server2/activemq-jms.xml | 25 - .../server2/activemq-roles.properties | 17 + .../server2/activemq-users.properties | 17 + .../activemq/server2/activemq-users.xml | 27 - .../server3/activemq-configuration.xml | 120 ++-- .../activemq/server3/activemq-jms.xml | 25 - .../server3/activemq-roles.properties | 17 + .../server3/activemq-users.properties | 17 + .../activemq/server3/activemq-users.xml | 27 - .../server0/activemq-configuration.xml | 118 ++-- .../activemq/server0/activemq-jms.xml | 28 - .../server0/activemq-roles.properties | 17 + .../server0/activemq-users.properties | 17 + .../activemq/server0/activemq-users.xml | 27 - .../server1/activemq-configuration.xml | 120 ++-- .../activemq/server1/activemq-jms.xml | 28 - .../server1/activemq-roles.properties | 17 + .../server1/activemq-users.properties | 17 + .../activemq/server1/activemq-users.xml | 27 - .../server2/activemq-configuration.xml | 104 ++-- .../activemq/server2/activemq-jms.xml | 25 - .../server2/activemq-roles.properties | 17 + .../server2/activemq-users.properties | 17 + .../activemq/server2/activemq-users.xml | 27 - .../server0/activemq-configuration.xml | 140 ++--- .../activemq/server0/activemq-jms.xml | 28 - .../server0/activemq-roles.properties | 17 + .../server0/activemq-users.properties | 17 + .../activemq/server0/activemq-users.xml | 27 - .../server1/activemq-configuration.xml | 138 ++--- .../activemq/server1/activemq-jms.xml | 28 - .../server1/activemq-roles.properties | 17 + .../server1/activemq-users.properties | 17 + .../activemq/server1/activemq-users.xml | 27 - .../server0/activemq-configuration.xml | 198 ++++--- .../activemq/server0/activemq-jms.xml | 28 - .../server0/activemq-roles.properties | 17 + .../server0/activemq-users.properties | 17 + .../activemq/server0/activemq-users.xml | 27 - .../server1/activemq-configuration.xml | 209 +++---- .../activemq/server1/activemq-jms.xml | 28 - .../server1/activemq-roles.properties | 17 + .../server1/activemq-users.properties | 17 + .../activemq/server1/activemq-users.xml | 27 - .../server0/activemq-configuration.xml | 178 +++--- .../activemq/server0/activemq-jms.xml | 28 - .../server0/activemq-roles.properties | 17 + .../server0/activemq-users.properties | 17 + .../activemq/server0/activemq-users.xml | 27 - .../server1/activemq-configuration.xml | 167 +++--- .../activemq/server1/activemq-jms.xml | 27 - .../server1/activemq-roles.properties | 17 + .../server1/activemq-users.properties | 17 + .../activemq/server1/activemq-users.xml | 27 - .../server0/activemq-configuration.xml | 60 +- .../activemq/server0/activemq-jms.xml | 28 - .../server0/activemq-roles.properties | 17 + .../server0/activemq-users.properties | 17 + .../activemq/server0/activemq-users.xml | 27 - .../server0/activemq-configuration.xml | 77 +-- .../activemq/server0/activemq-jms.xml | 31 - .../server0/activemq-roles.properties | 17 + .../server0/activemq-users.properties | 17 + .../activemq/server0/activemq-users.xml | 27 - .../server0/activemq-configuration.xml | 75 ++- .../activemq/server0/activemq-jms.xml | 31 - .../server0/activemq-roles.properties | 17 + .../server0/activemq-users.properties | 17 + .../activemq/server0/activemq-users.xml | 27 - .../server0/activemq-configuration.xml | 172 +++--- .../activemq/server0/activemq-jms.xml | 38 -- .../server0/activemq-roles.properties | 17 + .../server0/activemq-users.properties | 17 + .../activemq/server0/activemq-users.xml | 27 - .../server1/activemq-configuration.xml | 65 ++- .../activemq/server1/activemq-jms.xml | 31 - .../server1/activemq-roles.properties | 17 + .../server1/activemq-users.properties | 17 + .../activemq/server1/activemq-users.xml | 27 - .../server0/activemq-configuration.xml | 62 +- .../activemq/server0/activemq-jms.xml | 28 - .../server0/activemq-roles.properties | 17 + .../server0/activemq-users.properties | 17 + .../activemq/server0/activemq-users.xml | 27 - .../main/resources/activemq-configuration.xml | 36 +- .../src/main/resources/activemq-jms.xml | 28 - .../main/resources/activemq-roles.properties | 17 + .../main/resources/activemq-users.properties | 17 + .../src/main/resources/activemq-users.xml | 27 - .../server0/activemq-configuration.xml | 75 ++- .../activemq/server0/activemq-jms.xml | 31 - .../server0/activemq-roles.properties | 17 + .../server0/activemq-users.properties | 17 + .../activemq/server0/activemq-users.xml | 27 - .../server0/activemq-configuration.xml | 174 +++--- .../activemq/server0/activemq-jms.xml | 28 - .../server0/activemq-roles.properties | 17 + .../server0/activemq-users.properties | 17 + .../activemq/server0/activemq-users.xml | 27 - .../server1/activemq-configuration.xml | 174 +++--- .../activemq/server1/activemq-jms.xml | 28 - .../server1/activemq-roles.properties | 17 + .../server1/activemq-users.properties | 17 + .../activemq/server1/activemq-users.xml | 27 - .../server0/activemq-configuration.xml | 62 +- .../activemq/server0/activemq-jms.xml | 28 - .../server0/activemq-roles.properties | 17 + .../server0/activemq-users.properties | 17 + .../activemq/server0/activemq-users.xml | 27 - .../server0/activemq-configuration.xml | 62 +- .../activemq/server0/activemq-jms.xml | 28 - .../server0/activemq-roles.properties | 17 + .../server0/activemq-users.properties | 17 + .../activemq/server0/activemq-users.xml | 27 - .../server0/activemq-configuration.xml | 66 ++- .../activemq/server0/activemq-jms.xml | 28 - .../server0/activemq-roles.properties | 17 + .../server0/activemq-users.properties | 17 + .../activemq/server0/activemq-users.xml | 27 - .../server0/activemq-configuration.xml | 60 +- .../activemq/server0/activemq-jms.xml | 28 - .../server0/activemq-configuration.xml | 58 +- .../activemq/server0/activemq-jms.xml | 28 - .../server0/activemq-roles.properties | 17 + .../server0/activemq-users.properties | 17 + .../activemq/server0/activemq-users.xml | 27 - .../server0/activemq-configuration.xml | 35 +- .../activemq/server0/activemq-jms.xml | 27 - .../server0/activemq-roles.properties | 17 + .../server0/activemq-users.properties | 17 + .../activemq/server0/activemq-users.xml | 27 - .../server1/activemq-configuration.xml | 41 +- .../activemq/server1/activemq-jms.xml | 27 - .../server1/activemq-roles.properties | 17 + .../server1/activemq-users.properties | 17 + .../activemq/server1/activemq-users.xml | 27 - .../server0/activemq-configuration.xml | 60 +- .../activemq/server0/activemq-jms.xml | 28 - .../server0/activemq-roles.properties | 17 + .../server0/activemq-users.properties | 17 + .../activemq/server0/activemq-users.xml | 27 - .../server0/activemq-configuration.xml | 60 +- .../activemq/server0/activemq-jms.xml | 28 - .../server0/activemq-roles.properties | 17 + .../server0/activemq-users.properties | 17 + .../activemq/server0/activemq-users.xml | 27 - .../server0/activemq-configuration.xml | 60 +- .../activemq/server0/activemq-jms.xml | 28 - .../server0/activemq-roles.properties | 17 + .../server0/activemq-users.properties | 17 + .../activemq/server0/activemq-users.xml | 27 - .../server0/activemq-configuration.xml | 64 +- .../activemq/server0/activemq-jms.xml | 28 - .../server0/activemq-roles.properties | 17 + .../server0/activemq-users.properties | 17 + .../activemq/server0/activemq-users.xml | 27 - .../server0/activemq-configuration.xml | 60 +- .../activemq/server0/activemq-jms.xml | 28 - .../server0/activemq-roles.properties | 17 + .../server0/activemq-users.properties | 17 + .../activemq/server0/activemq-users.xml | 27 - .../server0/activemq-configuration.xml | 72 ++- .../activemq/server0/activemq-jms.xml | 28 - .../server0/activemq-roles.properties | 17 + .../server0/activemq-users.properties | 17 + .../activemq/server0/activemq-users.xml | 27 - .../server0/activemq-configuration.xml | 91 +-- .../activemq/server0/activemq-jms.xml | 31 - .../server0/activemq-roles.properties | 17 + .../server0/activemq-users.properties | 17 + .../activemq/server0/activemq-users.xml | 27 - .../server0/activemq-configuration.xml | 82 +-- .../activemq/server0/activemq-jms.xml | 28 - .../server0/activemq-roles.properties | 17 + .../server0/activemq-users.properties | 17 + .../activemq/server0/activemq-users.xml | 27 - .../server0/activemq-configuration.xml | 101 ++-- .../activemq/server0/activemq-jms.xml | 31 - .../server0/activemq-roles.properties | 17 + .../server0/activemq-users.properties | 17 + .../activemq/server0/activemq-users.xml | 27 - .../server0/activemq-configuration.xml | 60 +- .../activemq/server0/activemq-jms.xml | 28 - .../server0/activemq-roles.properties | 17 + .../server0/activemq-users.properties | 17 + .../activemq/server0/activemq-users.xml | 27 - .../server0/activemq-configuration.xml | 60 +- .../activemq/server0/activemq-jms.xml | 28 - .../server0/activemq-roles.properties | 17 + .../server0/activemq-users.properties | 17 + .../activemq/server0/activemq-users.xml | 27 - .../server0/activemq-configuration.xml | 60 +- .../activemq/server0/activemq-jms.xml | 28 - .../server0/activemq-roles.properties | 17 + .../server0/activemq-users.properties | 17 + .../activemq/server0/activemq-users.xml | 27 - .../server0/activemq-configuration.xml | 126 ++-- .../activemq/server0/activemq-jms.xml | 28 - .../server0/activemq-roles.properties | 17 + .../server0/activemq-users.properties | 17 + .../activemq/server0/activemq-users.xml | 27 - .../server1/activemq-configuration.xml | 128 ++-- .../activemq/server1/activemq-jms.xml | 28 - .../server1/activemq-roles.properties | 17 + .../server1/activemq-users.properties | 17 + .../activemq/server1/activemq-users.xml | 27 - .../server2/activemq-configuration.xml | 132 +++-- .../activemq/server2/activemq-jms.xml | 28 - .../server2/activemq-roles.properties | 17 + .../server2/activemq-users.properties | 17 + .../activemq/server2/activemq-users.xml | 27 - .../server0/activemq-configuration.xml | 128 ++-- .../activemq/server0/activemq-jms.xml | 28 - .../server0/activemq-roles.properties | 17 + .../server0/activemq-users.properties | 17 + .../activemq/server0/activemq-users.xml | 27 - .../server1/activemq-configuration.xml | 128 ++-- .../activemq/server1/activemq-jms.xml | 28 - .../server1/activemq-roles.properties | 17 + .../server1/activemq-users.properties | 17 + .../activemq/server1/activemq-users.xml | 27 - .../server2/activemq-configuration.xml | 128 ++-- .../activemq/server2/activemq-jms.xml | 28 - .../server2/activemq-roles.properties | 17 + .../server2/activemq-users.properties | 17 + .../activemq/server2/activemq-users.xml | 27 - .../server0/activemq-configuration.xml | 60 +- .../activemq/server0/activemq-jms.xml | 28 - .../server0/activemq-roles.properties | 17 + .../server0/activemq-users.properties | 17 + .../activemq/server0/activemq-users.xml | 27 - .../server0/activemq-configuration.xml | 128 ++-- .../activemq/server0/activemq-jms.xml | 28 - .../server0/activemq-roles.properties | 17 + .../server0/activemq-users.properties | 17 + .../activemq/server0/activemq-users.xml | 27 - .../server1/activemq-configuration.xml | 136 +++-- .../activemq/server1/activemq-jms.xml | 28 - .../server1/activemq-roles.properties | 17 + .../server1/activemq-users.properties | 17 + .../activemq/server1/activemq-users.xml | 27 - .../server0/activemq-configuration.xml | 92 +-- .../activemq/server0/activemq-jms.xml | 28 - .../server0/activemq-roles.properties | 17 + .../server0/activemq-users.properties | 17 + .../activemq/server0/activemq-users.xml | 27 - .../server0/activemq-configuration.xml | 118 ++-- .../activemq/server0/activemq-jms.xml | 30 - .../server0/activemq-roles.properties | 17 + .../server0/activemq-users.properties | 17 + .../activemq/server0/activemq-users.xml | 27 - .../server0/activemq-configuration.xml | 49 +- .../activemq/server0/activemq-jms.xml | 27 - .../server0/activemq-configuration.xml | 64 +- .../activemq/server0/activemq-jms.xml | 28 - .../server0/activemq-roles.properties | 17 + .../server0/activemq-users.properties | 17 + .../activemq/server0/activemq-users.xml | 27 - .../server0/activemq-configuration.xml | 60 +- .../activemq/server0/activemq-jms.xml | 28 - .../server0/activemq-roles.properties | 17 + .../server0/activemq-users.properties | 17 + .../activemq/server0/activemq-users.xml | 27 - .../server0/activemq-configuration.xml | 58 +- .../activemq/server0/activemq-jms.xml | 30 - .../server0/activemq-roles.properties | 17 + .../server0/activemq-users.properties | 17 + .../activemq/server0/activemq-users.xml | 27 - .../server0/activemq-configuration.xml | 64 +- .../activemq/server0/activemq-jms.xml | 30 - .../server0/activemq-roles.properties | 17 + .../server0/activemq-users.properties | 17 + .../activemq/server0/activemq-users.xml | 27 - .../server0/activemq-configuration.xml | 72 ++- .../activemq/server0/activemq-jms.xml | 29 - .../server0/activemq-roles.properties | 17 + .../server0/activemq-users.properties | 17 + .../activemq/server0/activemq-users.xml | 27 - .../server0/activemq-configuration.xml | 157 ++--- .../activemq/server0/activemq-jms.xml | 28 - .../server0/activemq-roles.properties | 17 + .../server0/activemq-users.properties | 17 + .../activemq/server0/activemq-users.xml | 27 - .../server1/activemq-configuration.xml | 161 +++--- .../activemq/server1/activemq-jms.xml | 28 - .../server1/activemq-roles.properties | 17 + .../server1/activemq-users.properties | 17 + .../activemq/server1/activemq-users.xml | 27 - .../server0/activemq-configuration.xml | 76 +-- .../activemq/server0/activemq-jms.xml | 28 - .../server0/activemq-roles.properties | 17 + .../server0/activemq-users.properties | 17 + .../activemq/server0/activemq-users.xml | 27 - .../server0/activemq-configuration.xml | 60 +- .../activemq/server0/activemq-jms.xml | 28 - .../server0/activemq-roles.properties | 17 + .../server0/activemq-users.properties | 17 + .../activemq/server0/activemq-users.xml | 27 - .../server0/activemq-configuration.xml | 60 +- .../activemq/server0/activemq-jms.xml | 28 - .../server0/activemq-roles.properties | 17 + .../server0/activemq-users.properties | 17 + .../activemq/server0/activemq-users.xml | 27 - .../server0/activemq-configuration.xml | 118 ++-- .../activemq/server0/activemq-jms.xml | 28 - .../server0/activemq-roles.properties | 17 + .../server0/activemq-users.properties | 17 + .../activemq/server0/activemq-users.xml | 31 - .../server0/activemq-configuration.xml | 118 ++-- .../activemq/server0/activemq-jms.xml | 28 - .../server0/activemq-roles.properties | 17 + .../server0/activemq-users.properties | 17 + .../activemq/server0/activemq-users.xml | 27 - .../server1/activemq-configuration.xml | 122 ++-- .../activemq/server1/activemq-jms.xml | 28 - .../server1/activemq-roles.properties | 17 + .../server1/activemq-users.properties | 17 + .../activemq/server1/activemq-users.xml | 27 - .../server0/activemq-configuration.xml | 136 +++-- .../activemq/server0/activemq-jms.xml | 28 - .../server0/activemq-roles.properties | 17 + .../server0/activemq-users.properties | 17 + .../activemq/server0/activemq-users.xml | 27 - .../server1/activemq-configuration.xml | 144 ++--- .../activemq/server1/activemq-jms.xml | 28 - .../server1/activemq-roles.properties | 17 + .../server1/activemq-users.properties | 17 + .../activemq/server1/activemq-users.xml | 27 - .../server0/activemq-configuration.xml | 128 ++-- .../activemq/server0/activemq-jms.xml | 28 - .../server0/activemq-roles.properties | 17 + .../server0/activemq-users.properties | 17 + .../activemq/server0/activemq-users.xml | 27 - .../server1/activemq-configuration.xml | 134 +++-- .../activemq/server1/activemq-jms.xml | 28 - .../server1/activemq-roles.properties | 17 + .../server1/activemq-users.properties | 17 + .../activemq/server1/activemq-users.xml | 27 - .../server2/activemq-configuration.xml | 132 +++-- .../activemq/server2/activemq-jms.xml | 28 - .../server2/activemq-roles.properties | 17 + .../server2/activemq-users.properties | 17 + .../activemq/server2/activemq-users.xml | 27 - .../server0/activemq-configuration.xml | 128 ++-- .../activemq/server0/activemq-jms.xml | 28 - .../server0/activemq-roles.properties | 17 + .../server0/activemq-users.properties | 17 + .../activemq/server0/activemq-users.xml | 27 - .../server1/activemq-configuration.xml | 136 +++-- .../activemq/server1/activemq-jms.xml | 28 - .../server1/activemq-roles.properties | 17 + .../server1/activemq-users.properties | 17 + .../activemq/server1/activemq-users.xml | 27 - .../server0/activemq-configuration.xml | 76 +-- .../activemq/server0/activemq-jms.xml | 28 - .../server0/activemq-roles.properties | 17 + .../server0/activemq-users.properties | 17 + .../activemq/server0/activemq-users.xml | 27 - .../src/main/resources/activemq-client.xml | 20 +- .../main/resources/activemq-configuration.xml | 54 +- .../src/main/resources/activemq-jms.xml | 28 - .../main/resources/activemq-roles.properties | 17 + .../main/resources/activemq-users.properties | 17 + .../src/main/resources/activemq-users.xml | 27 - .../main/resources/activemq-configuration.xml | 46 +- .../src/main/resources/activemq-jms.xml | 28 - .../main/resources/activemq-roles.properties | 17 + .../main/resources/activemq-users.properties | 17 + .../src/main/resources/activemq-users.xml | 27 - .../src/main/resources/activemq-client.xml | 20 +- .../main/resources/activemq-configuration.xml | 54 +- .../src/main/resources/activemq-jms.xml | 28 - .../main/resources/activemq-roles.properties | 17 + .../main/resources/activemq-users.properties | 17 + .../src/main/resources/activemq-users.xml | 27 - .../src/main/resources/activemq-client.xml | 20 +- .../main/resources/activemq-configuration.xml | 55 +- .../push/src/main/resources/activemq-jms.xml | 29 - .../main/resources/activemq-roles.properties | 17 + .../main/resources/activemq-users.properties | 17 + .../src/main/resources/activemq-users.xml | 27 - .../server0/activemq-configuration.xml | 190 +++--- .../activemq/server0/activemq-jms.xml | 28 - .../server0/activemq-roles.properties | 17 + .../server0/activemq-users.properties | 17 + .../activemq/server0/activemq-users.xml | 27 - .../server1/activemq-configuration.xml | 169 +++--- .../activemq/server1/activemq-jms.xml | 28 - .../server1/activemq-roles.properties | 17 + .../server1/activemq-users.properties | 17 + .../activemq/server1/activemq-users.xml | 27 - .../server0/activemq-configuration.xml | 62 +- .../activemq/server0/activemq-jms.xml | 28 - .../server0/activemq-roles.properties | 17 + .../server0/activemq-users.properties | 17 + .../activemq/server0/activemq-users.xml | 27 - .../server0/activemq-configuration.xml | 97 ++-- .../activemq/server0/activemq-jms.xml | 31 - .../server0/activemq-roles.properties | 20 + .../server0/activemq-users.properties | 20 + .../activemq/server0/activemq-users.xml | 45 -- .../server0/activemq-configuration.xml | 60 +- .../activemq/server0/activemq-jms.xml | 28 - .../server0/activemq-roles.properties | 17 + .../server0/activemq-users.properties | 17 + .../activemq/server0/activemq-users.xml | 27 - .../main/resources/activemq-configuration.xml | 36 +- .../src/main/resources/activemq-jms.xml | 28 - .../main/resources/activemq-roles.properties | 17 + .../main/resources/activemq-users.properties | 17 + .../src/main/resources/activemq-users.xml | 27 - .../server0/activemq-configuration.xml | 72 ++- .../activemq/server0/activemq-jms.xml | 28 - .../server0/activemq-roles.properties | 17 + .../server0/activemq-users.properties | 17 + .../activemq/server0/activemq-users.xml | 27 - .../server0/activemq-configuration.xml | 64 +- .../activemq/server0/activemq-jms.xml | 30 - .../server0/activemq-roles.properties | 17 + .../server0/activemq-users.properties | 17 + .../activemq/server0/activemq-users.xml | 27 - .../server0/activemq-configuration.xml | 74 +-- .../activemq/server0/activemq-jms.xml | 28 - .../server0/activemq-roles.properties | 17 + .../server0/activemq-users.properties | 17 + .../activemq/server0/activemq-users.xml | 27 - .../server0/activemq-configuration.xml | 74 +-- .../activemq/server0/activemq-jms.xml | 28 - .../server0/activemq-roles.properties | 17 + .../server0/activemq-users.properties | 17 + .../activemq/server0/activemq-users.xml | 27 - .../server0/activemq-configuration.xml | 76 +-- .../activemq/server0/activemq-jms.xml | 28 - .../server0/activemq-roles.properties | 17 + .../server0/activemq-users.properties | 17 + .../activemq/server0/activemq-users.xml | 27 - .../server0/activemq-configuration.xml | 76 +-- .../activemq/server0/activemq-jms.xml | 28 - .../server0/activemq-roles.properties | 17 + .../server0/activemq-users.properties | 17 + .../activemq/server0/activemq-users.xml | 27 - .../server0/activemq-configuration.xml | 76 +-- .../activemq/server0/activemq-jms.xml | 28 - .../server0/activemq-roles.properties | 17 + .../server0/activemq-users.properties | 17 + .../activemq/server0/activemq-users.xml | 27 - .../server0/activemq-configuration.xml | 128 ++-- .../activemq/server0/activemq-jms.xml | 28 - .../server0/activemq-roles.properties | 17 + .../server0/activemq-users.properties | 17 + .../activemq/server0/activemq-users.xml | 27 - .../server1/activemq-configuration.xml | 132 +++-- .../activemq/server1/activemq-jms.xml | 28 - .../server1/activemq-roles.properties | 17 + .../server1/activemq-users.properties | 17 + .../activemq/server1/activemq-users.xml | 27 - .../server0/activemq-configuration.xml | 144 ++--- .../activemq/server0/activemq-jms.xml | 29 - .../server0/activemq-roles.properties | 17 + .../server0/activemq-users.properties | 17 + .../activemq/server0/activemq-users.xml | 27 - .../server1/activemq-configuration.xml | 142 ++--- .../activemq/server1/activemq-jms.xml | 29 - .../server1/activemq-roles.properties | 17 + .../server1/activemq-users.properties | 17 + .../activemq/server1/activemq-users.xml | 27 - .../server2/activemq-configuration.xml | 142 ++--- .../activemq/server2/activemq-jms.xml | 29 - .../server2/activemq-roles.properties | 17 + .../server2/activemq-users.properties | 17 + .../activemq/server2/activemq-users.xml | 27 - .../server3/activemq-configuration.xml | 142 ++--- .../activemq/server3/activemq-jms.xml | 29 - .../server3/activemq-roles.properties | 17 + .../server3/activemq-users.properties | 17 + .../activemq/server3/activemq-users.xml | 27 - .../server4/activemq-configuration.xml | 142 ++--- .../activemq/server4/activemq-jms.xml | 29 - .../server4/activemq-roles.properties | 17 + .../server4/activemq-users.properties | 17 + .../activemq/server4/activemq-users.xml | 27 - .../server5/activemq-configuration.xml | 142 ++--- .../activemq/server5/activemq-jms.xml | 29 - .../server5/activemq-roles.properties | 17 + .../server5/activemq-users.properties | 17 + .../activemq/server5/activemq-users.xml | 27 - .../server0/activemq-configuration.xml | 88 +-- .../activemq/server0/activemq-jms.xml | 28 - .../server0/activemq-roles.properties | 17 + .../server0/activemq-users.properties | 17 + .../activemq/server0/activemq-users.xml | 27 - .../server0/activemq-configuration.xml | 69 ++- .../activemq/server0/activemq-jms.xml | 39 -- .../server0/activemq-roles.properties | 17 + .../server0/activemq-users.properties | 17 + .../activemq/server0/activemq-users.xml | 27 - .../server0/activemq-configuration.xml | 62 +- .../activemq/server0/activemq-jms.xml | 28 - .../server0/activemq-roles.properties | 17 + .../server0/activemq-users.properties | 17 + .../activemq/server0/activemq-users.xml | 27 - .../server0/activemq-configuration.xml | 62 +- .../activemq/server0/activemq-jms.xml | 28 - .../server0/activemq-roles.properties | 17 + .../server0/activemq-users.properties | 17 + .../activemq/server0/activemq-users.xml | 27 - .../server0/activemq-configuration.xml | 62 +- .../activemq/server0/activemq-jms.xml | 28 - .../server0/activemq-roles.properties | 17 + .../server0/activemq-users.properties | 17 + .../activemq/server0/activemq-users.xml | 27 - .../server0/activemq-configuration.xml | 130 +++-- .../activemq/server0/activemq-jms.xml | 28 - .../server0/activemq-roles.properties | 17 + .../server0/activemq-users.properties | 17 + .../activemq/server0/activemq-users.xml | 27 - .../server1/activemq-configuration.xml | 136 +++-- .../activemq/server1/activemq-jms.xml | 28 - .../server1/activemq-roles.properties | 17 + .../server1/activemq-users.properties | 17 + .../activemq/server1/activemq-users.xml | 27 - .../server0/activemq-configuration.xml | 62 +- .../activemq/server0/activemq-jms.xml | 28 - .../server0/activemq-roles.properties | 17 + .../server0/activemq-users.properties | 17 + .../activemq/server0/activemq-users.xml | 27 - .../server0/activemq-configuration.xml | 62 +- .../activemq/server0/activemq-jms.xml | 28 - .../server0/activemq-roles.properties | 17 + .../server0/activemq-users.properties | 17 + .../activemq/server0/activemq-users.xml | 27 - .../server0/activemq-configuration.xml | 62 +- .../activemq/server0/activemq-jms.xml | 28 - .../server0/activemq-roles.properties | 17 + .../server0/activemq-users.properties | 17 + .../activemq/server0/activemq-users.xml | 27 - .../server0/activemq-configuration.xml | 62 +- .../activemq/server0/activemq-jms.xml | 28 - .../server0/activemq-roles.properties | 17 + .../server0/activemq-users.properties | 17 + .../activemq/server0/activemq-users.xml | 27 - .../normal/server0/activemq-configuration.xml | 70 +-- examples/soak/normal/server0/activemq-jms.xml | 27 - .../tests/integration/InterceptorTest.java | 12 +- .../client/AutoCreateJmsQueueTest.java | 13 +- .../failover/SecurityFailoverTest.java | 14 +- .../deployers/impl/QueueDeployerTest.java | 96 --- .../integration/jms/JMSSecurityTest.java | 9 +- .../jms/server/JMSServerDeployerTest.java | 20 - .../jms/server/JMSServerStartStopTest.java | 13 +- .../config/JMSServerConfigParserTest.java | 19 +- .../management/JMSQueueControlTest.java | 3 +- ...ManagementWithConfiguredAdminUserTest.java | 10 +- .../management/SecurityNotificationTest.java | 16 +- .../openwire/OpenWireTestBase.java | 18 +- .../ActiveMQMessageHandlerSecurityTest.java | 6 +- .../ra/ActiveMQRAClusteredTestBase.java | 1 - .../tests/integration/ra/JMSContextTest.java | 12 +- .../ra/OutgoingConnectionTest.java | 12 +- .../ra/OutgoingConnectionTestJTA.java | 11 +- .../integration/security/SecurityTest.java | 232 ++++---- ...activemq-jms-for-JMSServerDeployerTest.xml | 9 +- ...ctivemq-jms-for-JMSServerDeployerTest2.xml | 25 - .../resources/server-start-stop-config1.xml | 59 +- .../server-start-stop-jms-config1.xml | 23 - .../test/resources/spring-activemq-config.xml | 57 +- .../test/resources/spring-activemq-jms.xml | 24 - .../src/test/resources/spring-jms-beans.xml | 1 - .../tools/container/LocalTestServer.java | 7 +- .../test/resources/activemq-configuration.xml | 18 +- .../src/test/resources/activemq-jms.xml | 22 - .../src/test/resources/activemq-queues.xml | 32 - .../src/test/resources/activemq-users.xml | 26 - .../apache/activemq/jms/SpawnedJMSServer.java | 3 +- .../jms/bridge/impl/JMSBridgeImplTest.java | 1 - .../impl/ConfigurationValidationTest.java | 9 +- .../impl/AddressSettingsDeployerTest.java | 136 ----- .../BasicUserCredentialsDeployerTest.java | 546 ------------------ .../deployers/impl/FakeDeploymentManager.java | 51 -- .../impl/FileDeploymentManagerTest.java | 439 -------------- .../deployers/impl/SecurityDeployerTest.java | 317 ---------- .../core/deployers/impl/XMLDeployerTest.java | 267 --------- .../impl/ActiveMQSecurityManagerImplTest.java | 44 +- 841 files changed, 14670 insertions(+), 19937 deletions(-) create mode 100644 activemq-bootstrap/src/main/java/org/apache/activemq/factory/BasicSecurityHandler.java rename activemq-dto/src/main/java/org/apache/activemq/dto/CoreDTO.java => activemq-bootstrap/src/main/java/org/apache/activemq/factory/BrokerHandler.java (67%) delete mode 100644 activemq-bootstrap/src/main/java/org/apache/activemq/factory/CoreFactory.java rename activemq-bootstrap/src/main/java/org/apache/activemq/factory/{FileCoreFactoryHandler.java => FileBrokerHandler.java} (64%) delete mode 100644 activemq-bootstrap/src/main/java/org/apache/activemq/factory/FileJmsFactoryHandler.java delete mode 100644 activemq-bootstrap/src/main/java/org/apache/activemq/factory/JmsFactory.java rename activemq-bootstrap/src/main/java/org/apache/activemq/factory/{CoreFactoryHandler.java => SecurityHandler.java} (72%) rename activemq-bootstrap/src/main/java/org/apache/activemq/{factory/JmsFactoryHandler.java => integration/Broker.java} (76%) create mode 100644 activemq-bootstrap/src/main/java/org/apache/activemq/integration/FileBroker.java rename {activemq-server/src/main/resources/META-INF/services/org/apache/activemq => activemq-bootstrap/src/main/resources/META-INF/services/org/apache/activemq/broker}/security/basic-security (92%) rename activemq-bootstrap/src/main/resources/META-INF/services/org/apache/activemq/broker/{core => server}/file (94%) rename activemq-dto/src/main/java/org/apache/activemq/dto/{JmsDTO.java => ServerDTO.java} (95%) create mode 100644 activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/impl/FileJMSConfiguration.java delete mode 100644 activemq-jms-server/src/main/java/org/apache/activemq/jms/server/impl/JMSServerConfigParserImpl.java delete mode 100644 activemq-jms-server/src/main/java/org/apache/activemq/jms/server/impl/JMSServerDeployer.java delete mode 100644 activemq-rest/src/test/resources/activemq-jms.xml rename activemq-bootstrap/src/main/resources/META-INF/services/org/apache/activemq/broker/jms/file => activemq-rest/src/test/resources/activemq-roles.properties (76%) create mode 100644 activemq-rest/src/test/resources/activemq-users.properties delete mode 100644 activemq-rest/src/test/resources/activemq-users.xml create mode 100644 activemq-server/src/main/java/org/apache/activemq/core/config/FileDeploymentManager.java create mode 100644 activemq-server/src/main/java/org/apache/activemq/core/config/impl/FileSecurityConfiguration.java create mode 100644 activemq-server/src/main/java/org/apache/activemq/core/config/impl/SecurityConfiguration.java create mode 100644 activemq-server/src/main/java/org/apache/activemq/core/deployers/Deployable.java delete mode 100644 activemq-server/src/main/java/org/apache/activemq/core/deployers/Deployer.java delete mode 100644 activemq-server/src/main/java/org/apache/activemq/core/deployers/DeploymentManager.java delete mode 100644 activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/AddressSettingsDeployer.java delete mode 100644 activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/BasicUserCredentialsDeployer.java delete mode 100644 activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/FileDeploymentManager.java delete mode 100644 activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/QueueDeployer.java delete mode 100644 activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/SecurityDeployer.java delete mode 100644 activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/XmlDeployer.java create mode 100644 activemq-server/src/main/java/org/apache/activemq/core/security/User.java create mode 100644 activemq-server/src/main/resources/schema/activemq-server.xsd delete mode 100644 activemq-server/src/main/resources/schema/activemq-users.xsd delete mode 100644 distribution/activemq/src/main/resources/config/clustered/activemq-jms.xml create mode 100644 distribution/activemq/src/main/resources/config/clustered/activemq-roles.properties create mode 100644 distribution/activemq/src/main/resources/config/clustered/activemq-users.properties delete mode 100644 distribution/activemq/src/main/resources/config/clustered/activemq-users.xml delete mode 100644 distribution/activemq/src/main/resources/config/non-clustered/activemq-jms.xml create mode 100644 distribution/activemq/src/main/resources/config/non-clustered/activemq-roles.properties create mode 100644 distribution/activemq/src/main/resources/config/non-clustered/activemq-users.properties delete mode 100644 distribution/activemq/src/main/resources/config/non-clustered/activemq-users.xml delete mode 100644 distribution/activemq/src/main/resources/config/replicated/activemq-jms.xml create mode 100644 distribution/activemq/src/main/resources/config/replicated/activemq-roles.properties create mode 100644 distribution/activemq/src/main/resources/config/replicated/activemq-users.properties delete mode 100644 distribution/activemq/src/main/resources/config/replicated/activemq-users.xml delete mode 100644 distribution/activemq/src/main/resources/config/shared-store/activemq-jms.xml create mode 100644 distribution/activemq/src/main/resources/config/shared-store/activemq-roles.properties create mode 100644 distribution/activemq/src/main/resources/config/shared-store/activemq-users.properties delete mode 100644 distribution/activemq/src/main/resources/config/shared-store/activemq-users.xml delete mode 100644 examples/core/vertx-connector/src/main/resources/server0/activemq-jms.xml create mode 100644 examples/core/vertx-connector/src/main/resources/server0/activemq-roles.properties create mode 100644 examples/core/vertx-connector/src/main/resources/server0/activemq-users.properties delete mode 100644 examples/core/vertx-connector/src/main/resources/server0/activemq-users.xml delete mode 100644 examples/jms/aerogear/src/main/resources/activemq/server0/activemq-jms.xml create mode 100644 examples/jms/aerogear/src/main/resources/activemq/server0/activemq-roles.properties create mode 100644 examples/jms/aerogear/src/main/resources/activemq/server0/activemq-users.properties delete mode 100644 examples/jms/aerogear/src/main/resources/activemq/server0/activemq-users.xml delete mode 100644 examples/jms/applet/src/main/resources/activemq/server0/activemq-jms.xml create mode 100644 examples/jms/applet/src/main/resources/activemq/server0/activemq-roles.properties create mode 100644 examples/jms/applet/src/main/resources/activemq/server0/activemq-users.properties delete mode 100644 examples/jms/applet/src/main/resources/activemq/server0/activemq-users.xml delete mode 100644 examples/jms/application-layer-failover/src/main/resources/activemq/server0/activemq-jms.xml create mode 100644 examples/jms/application-layer-failover/src/main/resources/activemq/server0/activemq-roles.properties create mode 100644 examples/jms/application-layer-failover/src/main/resources/activemq/server0/activemq-users.properties delete mode 100644 examples/jms/application-layer-failover/src/main/resources/activemq/server0/activemq-users.xml delete mode 100644 examples/jms/application-layer-failover/src/main/resources/activemq/server1/activemq-jms.xml create mode 100644 examples/jms/application-layer-failover/src/main/resources/activemq/server1/activemq-roles.properties create mode 100644 examples/jms/application-layer-failover/src/main/resources/activemq/server1/activemq-users.properties delete mode 100644 examples/jms/application-layer-failover/src/main/resources/activemq/server1/activemq-users.xml delete mode 100644 examples/jms/bridge/src/main/resources/activemq/server0/activemq-jms.xml create mode 100644 examples/jms/bridge/src/main/resources/activemq/server0/activemq-roles.properties create mode 100644 examples/jms/bridge/src/main/resources/activemq/server0/activemq-users.properties delete mode 100644 examples/jms/bridge/src/main/resources/activemq/server0/activemq-users.xml delete mode 100644 examples/jms/bridge/src/main/resources/activemq/server1/activemq-jms.xml create mode 100644 examples/jms/bridge/src/main/resources/activemq/server1/activemq-roles.properties create mode 100644 examples/jms/bridge/src/main/resources/activemq/server1/activemq-users.properties delete mode 100644 examples/jms/bridge/src/main/resources/activemq/server1/activemq-users.xml delete mode 100644 examples/jms/browser/src/main/resources/activemq/server0/activemq-jms.xml create mode 100644 examples/jms/browser/src/main/resources/activemq/server0/activemq-roles.properties create mode 100644 examples/jms/browser/src/main/resources/activemq/server0/activemq-users.properties delete mode 100644 examples/jms/browser/src/main/resources/activemq/server0/activemq-users.xml delete mode 100644 examples/jms/client-kickoff/src/main/resources/activemq/server0/activemq-jms.xml create mode 100644 examples/jms/client-kickoff/src/main/resources/activemq/server0/activemq-roles.properties create mode 100644 examples/jms/client-kickoff/src/main/resources/activemq/server0/activemq-users.properties delete mode 100644 examples/jms/client-kickoff/src/main/resources/activemq/server0/activemq-users.xml delete mode 100644 examples/jms/client-side-failoverlistener/src/main/resources/activemq/server0/activemq-jms.xml create mode 100644 examples/jms/client-side-failoverlistener/src/main/resources/activemq/server0/activemq-roles.properties create mode 100644 examples/jms/client-side-failoverlistener/src/main/resources/activemq/server0/activemq-users.properties delete mode 100644 examples/jms/client-side-failoverlistener/src/main/resources/activemq/server0/activemq-users.xml delete mode 100644 examples/jms/client-side-failoverlistener/src/main/resources/activemq/server1/activemq-jms.xml create mode 100644 examples/jms/client-side-failoverlistener/src/main/resources/activemq/server1/activemq-roles.properties create mode 100644 examples/jms/client-side-failoverlistener/src/main/resources/activemq/server1/activemq-users.properties delete mode 100644 examples/jms/client-side-failoverlistener/src/main/resources/activemq/server1/activemq-users.xml delete mode 100644 examples/jms/client-side-load-balancing/src/main/resources/activemq/server0/activemq-jms.xml create mode 100644 examples/jms/client-side-load-balancing/src/main/resources/activemq/server0/activemq-roles.properties create mode 100644 examples/jms/client-side-load-balancing/src/main/resources/activemq/server0/activemq-users.properties delete mode 100644 examples/jms/client-side-load-balancing/src/main/resources/activemq/server0/activemq-users.xml delete mode 100644 examples/jms/client-side-load-balancing/src/main/resources/activemq/server1/activemq-jms.xml create mode 100644 examples/jms/client-side-load-balancing/src/main/resources/activemq/server1/activemq-roles.properties create mode 100644 examples/jms/client-side-load-balancing/src/main/resources/activemq/server1/activemq-users.properties delete mode 100644 examples/jms/client-side-load-balancing/src/main/resources/activemq/server1/activemq-users.xml delete mode 100644 examples/jms/client-side-load-balancing/src/main/resources/activemq/server2/activemq-jms.xml create mode 100644 examples/jms/client-side-load-balancing/src/main/resources/activemq/server2/activemq-roles.properties create mode 100644 examples/jms/client-side-load-balancing/src/main/resources/activemq/server2/activemq-users.properties delete mode 100644 examples/jms/client-side-load-balancing/src/main/resources/activemq/server2/activemq-users.xml delete mode 100644 examples/jms/clustered-durable-subscription/src/main/resources/activemq/server0/activemq-jms.xml create mode 100644 examples/jms/clustered-durable-subscription/src/main/resources/activemq/server0/activemq-roles.properties create mode 100644 examples/jms/clustered-durable-subscription/src/main/resources/activemq/server0/activemq-users.properties delete mode 100644 examples/jms/clustered-durable-subscription/src/main/resources/activemq/server0/activemq-users.xml delete mode 100644 examples/jms/clustered-durable-subscription/src/main/resources/activemq/server1/activemq-jms.xml create mode 100644 examples/jms/clustered-durable-subscription/src/main/resources/activemq/server1/activemq-roles.properties create mode 100644 examples/jms/clustered-durable-subscription/src/main/resources/activemq/server1/activemq-users.properties delete mode 100644 examples/jms/clustered-durable-subscription/src/main/resources/activemq/server1/activemq-users.xml delete mode 100644 examples/jms/clustered-grouping/src/main/resources/activemq/server0/activemq-jms.xml create mode 100644 examples/jms/clustered-grouping/src/main/resources/activemq/server0/activemq-roles.properties create mode 100644 examples/jms/clustered-grouping/src/main/resources/activemq/server0/activemq-users.properties delete mode 100644 examples/jms/clustered-grouping/src/main/resources/activemq/server0/activemq-users.xml delete mode 100644 examples/jms/clustered-grouping/src/main/resources/activemq/server1/activemq-jms.xml create mode 100644 examples/jms/clustered-grouping/src/main/resources/activemq/server1/activemq-roles.properties create mode 100644 examples/jms/clustered-grouping/src/main/resources/activemq/server1/activemq-users.properties delete mode 100644 examples/jms/clustered-grouping/src/main/resources/activemq/server1/activemq-users.xml delete mode 100644 examples/jms/clustered-grouping/src/main/resources/activemq/server2/activemq-jms.xml create mode 100644 examples/jms/clustered-grouping/src/main/resources/activemq/server2/activemq-roles.properties create mode 100644 examples/jms/clustered-grouping/src/main/resources/activemq/server2/activemq-users.properties delete mode 100644 examples/jms/clustered-grouping/src/main/resources/activemq/server2/activemq-users.xml delete mode 100644 examples/jms/clustered-jgroups/src/main/resources/activemq/server0/activemq-jms.xml create mode 100644 examples/jms/clustered-jgroups/src/main/resources/activemq/server0/activemq-roles.properties create mode 100644 examples/jms/clustered-jgroups/src/main/resources/activemq/server0/activemq-users.properties delete mode 100644 examples/jms/clustered-jgroups/src/main/resources/activemq/server0/activemq-users.xml delete mode 100644 examples/jms/clustered-jgroups/src/main/resources/activemq/server1/activemq-jms.xml create mode 100644 examples/jms/clustered-jgroups/src/main/resources/activemq/server1/activemq-roles.properties create mode 100644 examples/jms/clustered-jgroups/src/main/resources/activemq/server1/activemq-users.properties delete mode 100644 examples/jms/clustered-jgroups/src/main/resources/activemq/server1/activemq-users.xml delete mode 100644 examples/jms/clustered-queue/src/main/resources/activemq/server0/activemq-jms.xml create mode 100644 examples/jms/clustered-queue/src/main/resources/activemq/server0/activemq-roles.properties create mode 100644 examples/jms/clustered-queue/src/main/resources/activemq/server0/activemq-users.properties delete mode 100644 examples/jms/clustered-queue/src/main/resources/activemq/server0/activemq-users.xml delete mode 100644 examples/jms/clustered-queue/src/main/resources/activemq/server1/activemq-jms.xml create mode 100644 examples/jms/clustered-queue/src/main/resources/activemq/server1/activemq-roles.properties create mode 100644 examples/jms/clustered-queue/src/main/resources/activemq/server1/activemq-users.properties delete mode 100644 examples/jms/clustered-queue/src/main/resources/activemq/server1/activemq-users.xml delete mode 100644 examples/jms/clustered-standalone/src/main/resources/activemq/server0/activemq-jms.xml create mode 100644 examples/jms/clustered-standalone/src/main/resources/activemq/server0/activemq-roles.properties create mode 100644 examples/jms/clustered-standalone/src/main/resources/activemq/server0/activemq-users.properties delete mode 100644 examples/jms/clustered-standalone/src/main/resources/activemq/server0/activemq-users.xml delete mode 100644 examples/jms/clustered-standalone/src/main/resources/activemq/server1/activemq-jms.xml create mode 100644 examples/jms/clustered-standalone/src/main/resources/activemq/server1/activemq-roles.properties create mode 100644 examples/jms/clustered-standalone/src/main/resources/activemq/server1/activemq-users.properties delete mode 100644 examples/jms/clustered-standalone/src/main/resources/activemq/server1/activemq-users.xml delete mode 100644 examples/jms/clustered-standalone/src/main/resources/activemq/server2/activemq-jms.xml create mode 100644 examples/jms/clustered-standalone/src/main/resources/activemq/server2/activemq-roles.properties create mode 100644 examples/jms/clustered-standalone/src/main/resources/activemq/server2/activemq-users.properties delete mode 100644 examples/jms/clustered-standalone/src/main/resources/activemq/server2/activemq-users.xml delete mode 100644 examples/jms/clustered-static-discovery/src/main/resources/activemq/server0/activemq-jms.xml create mode 100644 examples/jms/clustered-static-discovery/src/main/resources/activemq/server0/activemq-roles.properties create mode 100644 examples/jms/clustered-static-discovery/src/main/resources/activemq/server0/activemq-users.properties delete mode 100644 examples/jms/clustered-static-discovery/src/main/resources/activemq/server0/activemq-users.xml delete mode 100644 examples/jms/clustered-static-discovery/src/main/resources/activemq/server1/activemq-jms.xml create mode 100644 examples/jms/clustered-static-discovery/src/main/resources/activemq/server1/activemq-roles.properties create mode 100644 examples/jms/clustered-static-discovery/src/main/resources/activemq/server1/activemq-users.properties delete mode 100644 examples/jms/clustered-static-discovery/src/main/resources/activemq/server1/activemq-users.xml delete mode 100644 examples/jms/clustered-static-discovery/src/main/resources/activemq/server2/activemq-jms.xml create mode 100644 examples/jms/clustered-static-discovery/src/main/resources/activemq/server2/activemq-roles.properties create mode 100644 examples/jms/clustered-static-discovery/src/main/resources/activemq/server2/activemq-users.properties delete mode 100644 examples/jms/clustered-static-discovery/src/main/resources/activemq/server2/activemq-users.xml delete mode 100644 examples/jms/clustered-static-discovery/src/main/resources/activemq/server3/activemq-jms.xml create mode 100644 examples/jms/clustered-static-discovery/src/main/resources/activemq/server3/activemq-roles.properties create mode 100644 examples/jms/clustered-static-discovery/src/main/resources/activemq/server3/activemq-users.properties delete mode 100644 examples/jms/clustered-static-discovery/src/main/resources/activemq/server3/activemq-users.xml delete mode 100644 examples/jms/clustered-static-oneway/src/main/resources/activemq/server0/activemq-jms.xml create mode 100644 examples/jms/clustered-static-oneway/src/main/resources/activemq/server0/activemq-roles.properties create mode 100644 examples/jms/clustered-static-oneway/src/main/resources/activemq/server0/activemq-users.properties delete mode 100644 examples/jms/clustered-static-oneway/src/main/resources/activemq/server0/activemq-users.xml delete mode 100644 examples/jms/clustered-static-oneway/src/main/resources/activemq/server1/activemq-jms.xml create mode 100644 examples/jms/clustered-static-oneway/src/main/resources/activemq/server1/activemq-roles.properties create mode 100644 examples/jms/clustered-static-oneway/src/main/resources/activemq/server1/activemq-users.properties delete mode 100644 examples/jms/clustered-static-oneway/src/main/resources/activemq/server1/activemq-users.xml delete mode 100644 examples/jms/clustered-static-oneway/src/main/resources/activemq/server2/activemq-jms.xml create mode 100644 examples/jms/clustered-static-oneway/src/main/resources/activemq/server2/activemq-roles.properties create mode 100644 examples/jms/clustered-static-oneway/src/main/resources/activemq/server2/activemq-users.properties delete mode 100644 examples/jms/clustered-static-oneway/src/main/resources/activemq/server2/activemq-users.xml delete mode 100644 examples/jms/clustered-topic/src/main/resources/activemq/server0/activemq-jms.xml create mode 100644 examples/jms/clustered-topic/src/main/resources/activemq/server0/activemq-roles.properties create mode 100644 examples/jms/clustered-topic/src/main/resources/activemq/server0/activemq-users.properties delete mode 100644 examples/jms/clustered-topic/src/main/resources/activemq/server0/activemq-users.xml delete mode 100644 examples/jms/clustered-topic/src/main/resources/activemq/server1/activemq-jms.xml create mode 100644 examples/jms/clustered-topic/src/main/resources/activemq/server1/activemq-roles.properties create mode 100644 examples/jms/clustered-topic/src/main/resources/activemq/server1/activemq-users.properties delete mode 100644 examples/jms/clustered-topic/src/main/resources/activemq/server1/activemq-users.xml delete mode 100644 examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server0/activemq-jms.xml create mode 100644 examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server0/activemq-roles.properties create mode 100644 examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server0/activemq-users.properties delete mode 100644 examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server0/activemq-users.xml delete mode 100644 examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server1/activemq-jms.xml create mode 100644 examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server1/activemq-roles.properties create mode 100644 examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server1/activemq-users.properties delete mode 100644 examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server1/activemq-users.xml delete mode 100644 examples/jms/colocated-failover/src/main/resources/activemq/server0/activemq-jms.xml create mode 100644 examples/jms/colocated-failover/src/main/resources/activemq/server0/activemq-roles.properties create mode 100644 examples/jms/colocated-failover/src/main/resources/activemq/server0/activemq-users.properties delete mode 100644 examples/jms/colocated-failover/src/main/resources/activemq/server0/activemq-users.xml delete mode 100644 examples/jms/colocated-failover/src/main/resources/activemq/server1/activemq-jms.xml create mode 100644 examples/jms/colocated-failover/src/main/resources/activemq/server1/activemq-roles.properties create mode 100644 examples/jms/colocated-failover/src/main/resources/activemq/server1/activemq-users.properties delete mode 100644 examples/jms/colocated-failover/src/main/resources/activemq/server1/activemq-users.xml delete mode 100644 examples/jms/consumer-rate-limit/src/main/resources/activemq/server0/activemq-jms.xml create mode 100644 examples/jms/consumer-rate-limit/src/main/resources/activemq/server0/activemq-roles.properties create mode 100644 examples/jms/consumer-rate-limit/src/main/resources/activemq/server0/activemq-users.properties delete mode 100644 examples/jms/consumer-rate-limit/src/main/resources/activemq/server0/activemq-users.xml delete mode 100644 examples/jms/dead-letter/src/main/resources/activemq/server0/activemq-jms.xml create mode 100644 examples/jms/dead-letter/src/main/resources/activemq/server0/activemq-roles.properties create mode 100644 examples/jms/dead-letter/src/main/resources/activemq/server0/activemq-users.properties delete mode 100644 examples/jms/dead-letter/src/main/resources/activemq/server0/activemq-users.xml delete mode 100644 examples/jms/delayed-redelivery/src/main/resources/activemq/server0/activemq-jms.xml create mode 100644 examples/jms/delayed-redelivery/src/main/resources/activemq/server0/activemq-roles.properties create mode 100644 examples/jms/delayed-redelivery/src/main/resources/activemq/server0/activemq-users.properties delete mode 100644 examples/jms/delayed-redelivery/src/main/resources/activemq/server0/activemq-users.xml delete mode 100644 examples/jms/divert/src/main/resources/activemq/server0/activemq-jms.xml create mode 100644 examples/jms/divert/src/main/resources/activemq/server0/activemq-roles.properties create mode 100644 examples/jms/divert/src/main/resources/activemq/server0/activemq-users.properties delete mode 100644 examples/jms/divert/src/main/resources/activemq/server0/activemq-users.xml delete mode 100644 examples/jms/divert/src/main/resources/activemq/server1/activemq-jms.xml create mode 100644 examples/jms/divert/src/main/resources/activemq/server1/activemq-roles.properties create mode 100644 examples/jms/divert/src/main/resources/activemq/server1/activemq-users.properties delete mode 100644 examples/jms/divert/src/main/resources/activemq/server1/activemq-users.xml delete mode 100644 examples/jms/durable-subscription/src/main/resources/activemq/server0/activemq-jms.xml create mode 100644 examples/jms/durable-subscription/src/main/resources/activemq/server0/activemq-roles.properties create mode 100644 examples/jms/durable-subscription/src/main/resources/activemq/server0/activemq-users.properties delete mode 100644 examples/jms/durable-subscription/src/main/resources/activemq/server0/activemq-users.xml delete mode 100644 examples/jms/embedded-simple/src/main/resources/activemq-jms.xml create mode 100644 examples/jms/embedded-simple/src/main/resources/activemq-roles.properties create mode 100644 examples/jms/embedded-simple/src/main/resources/activemq-users.properties delete mode 100644 examples/jms/embedded-simple/src/main/resources/activemq-users.xml delete mode 100644 examples/jms/expiry/src/main/resources/activemq/server0/activemq-jms.xml create mode 100644 examples/jms/expiry/src/main/resources/activemq/server0/activemq-roles.properties create mode 100644 examples/jms/expiry/src/main/resources/activemq/server0/activemq-users.properties delete mode 100644 examples/jms/expiry/src/main/resources/activemq/server0/activemq-users.xml delete mode 100644 examples/jms/ha-policy-autobackup/src/main/resources/activemq/server0/activemq-jms.xml create mode 100644 examples/jms/ha-policy-autobackup/src/main/resources/activemq/server0/activemq-roles.properties create mode 100644 examples/jms/ha-policy-autobackup/src/main/resources/activemq/server0/activemq-users.properties delete mode 100644 examples/jms/ha-policy-autobackup/src/main/resources/activemq/server0/activemq-users.xml delete mode 100644 examples/jms/ha-policy-autobackup/src/main/resources/activemq/server1/activemq-jms.xml create mode 100644 examples/jms/ha-policy-autobackup/src/main/resources/activemq/server1/activemq-roles.properties create mode 100644 examples/jms/ha-policy-autobackup/src/main/resources/activemq/server1/activemq-users.properties delete mode 100644 examples/jms/ha-policy-autobackup/src/main/resources/activemq/server1/activemq-users.xml delete mode 100644 examples/jms/http-transport/src/main/resources/activemq/server0/activemq-jms.xml create mode 100644 examples/jms/http-transport/src/main/resources/activemq/server0/activemq-roles.properties create mode 100644 examples/jms/http-transport/src/main/resources/activemq/server0/activemq-users.properties delete mode 100644 examples/jms/http-transport/src/main/resources/activemq/server0/activemq-users.xml delete mode 100644 examples/jms/instantiate-connection-factory/src/main/resources/activemq/server0/activemq-jms.xml create mode 100644 examples/jms/instantiate-connection-factory/src/main/resources/activemq/server0/activemq-roles.properties create mode 100644 examples/jms/instantiate-connection-factory/src/main/resources/activemq/server0/activemq-users.properties delete mode 100644 examples/jms/instantiate-connection-factory/src/main/resources/activemq/server0/activemq-users.xml delete mode 100644 examples/jms/interceptor/src/main/resources/activemq/server0/activemq-jms.xml create mode 100644 examples/jms/interceptor/src/main/resources/activemq/server0/activemq-roles.properties create mode 100644 examples/jms/interceptor/src/main/resources/activemq/server0/activemq-users.properties delete mode 100644 examples/jms/interceptor/src/main/resources/activemq/server0/activemq-users.xml delete mode 100644 examples/jms/jaas/src/main/resources/activemq/server0/activemq-jms.xml delete mode 100644 examples/jms/jms-auto-closeable/src/main/resources/activemq/server0/activemq-jms.xml create mode 100644 examples/jms/jms-auto-closeable/src/main/resources/activemq/server0/activemq-roles.properties create mode 100644 examples/jms/jms-auto-closeable/src/main/resources/activemq/server0/activemq-users.properties delete mode 100644 examples/jms/jms-auto-closeable/src/main/resources/activemq/server0/activemq-users.xml delete mode 100644 examples/jms/jms-bridge/src/main/resources/activemq/server0/activemq-jms.xml create mode 100644 examples/jms/jms-bridge/src/main/resources/activemq/server0/activemq-roles.properties create mode 100644 examples/jms/jms-bridge/src/main/resources/activemq/server0/activemq-users.properties delete mode 100644 examples/jms/jms-bridge/src/main/resources/activemq/server0/activemq-users.xml delete mode 100644 examples/jms/jms-bridge/src/main/resources/activemq/server1/activemq-jms.xml create mode 100644 examples/jms/jms-bridge/src/main/resources/activemq/server1/activemq-roles.properties create mode 100644 examples/jms/jms-bridge/src/main/resources/activemq/server1/activemq-users.properties delete mode 100644 examples/jms/jms-bridge/src/main/resources/activemq/server1/activemq-users.xml delete mode 100644 examples/jms/jms-completion-listener/src/main/resources/activemq/server0/activemq-jms.xml create mode 100644 examples/jms/jms-completion-listener/src/main/resources/activemq/server0/activemq-roles.properties create mode 100644 examples/jms/jms-completion-listener/src/main/resources/activemq/server0/activemq-users.properties delete mode 100644 examples/jms/jms-completion-listener/src/main/resources/activemq/server0/activemq-users.xml delete mode 100644 examples/jms/jms-context/src/main/resources/activemq/server0/activemq-jms.xml create mode 100644 examples/jms/jms-context/src/main/resources/activemq/server0/activemq-roles.properties create mode 100644 examples/jms/jms-context/src/main/resources/activemq/server0/activemq-users.properties delete mode 100644 examples/jms/jms-context/src/main/resources/activemq/server0/activemq-users.xml delete mode 100644 examples/jms/jms-shared-consumer/src/main/resources/activemq/server0/activemq-jms.xml create mode 100644 examples/jms/jms-shared-consumer/src/main/resources/activemq/server0/activemq-roles.properties create mode 100644 examples/jms/jms-shared-consumer/src/main/resources/activemq/server0/activemq-users.properties delete mode 100644 examples/jms/jms-shared-consumer/src/main/resources/activemq/server0/activemq-users.xml delete mode 100644 examples/jms/jmx/src/main/resources/activemq/server0/activemq-jms.xml create mode 100644 examples/jms/jmx/src/main/resources/activemq/server0/activemq-roles.properties create mode 100644 examples/jms/jmx/src/main/resources/activemq/server0/activemq-users.properties delete mode 100644 examples/jms/jmx/src/main/resources/activemq/server0/activemq-users.xml delete mode 100644 examples/jms/large-message/src/main/resources/activemq/server0/activemq-jms.xml create mode 100644 examples/jms/large-message/src/main/resources/activemq/server0/activemq-roles.properties create mode 100644 examples/jms/large-message/src/main/resources/activemq/server0/activemq-users.properties delete mode 100644 examples/jms/large-message/src/main/resources/activemq/server0/activemq-users.xml delete mode 100644 examples/jms/last-value-queue/src/main/resources/activemq/server0/activemq-jms.xml create mode 100644 examples/jms/last-value-queue/src/main/resources/activemq/server0/activemq-roles.properties create mode 100644 examples/jms/last-value-queue/src/main/resources/activemq/server0/activemq-users.properties delete mode 100644 examples/jms/last-value-queue/src/main/resources/activemq/server0/activemq-users.xml delete mode 100644 examples/jms/management-notifications/src/main/resources/activemq/server0/activemq-jms.xml create mode 100644 examples/jms/management-notifications/src/main/resources/activemq/server0/activemq-roles.properties create mode 100644 examples/jms/management-notifications/src/main/resources/activemq/server0/activemq-users.properties delete mode 100644 examples/jms/management-notifications/src/main/resources/activemq/server0/activemq-users.xml delete mode 100644 examples/jms/management/src/main/resources/activemq/server0/activemq-jms.xml create mode 100644 examples/jms/management/src/main/resources/activemq/server0/activemq-roles.properties create mode 100644 examples/jms/management/src/main/resources/activemq/server0/activemq-users.properties delete mode 100644 examples/jms/management/src/main/resources/activemq/server0/activemq-users.xml delete mode 100644 examples/jms/message-counters/src/main/resources/activemq/server0/activemq-jms.xml create mode 100644 examples/jms/message-counters/src/main/resources/activemq/server0/activemq-roles.properties create mode 100644 examples/jms/message-counters/src/main/resources/activemq/server0/activemq-users.properties delete mode 100644 examples/jms/message-counters/src/main/resources/activemq/server0/activemq-users.xml delete mode 100644 examples/jms/message-group/src/main/resources/activemq/server0/activemq-jms.xml create mode 100644 examples/jms/message-group/src/main/resources/activemq/server0/activemq-roles.properties create mode 100644 examples/jms/message-group/src/main/resources/activemq/server0/activemq-users.properties delete mode 100644 examples/jms/message-group/src/main/resources/activemq/server0/activemq-users.xml delete mode 100644 examples/jms/message-group2/src/main/resources/activemq/server0/activemq-jms.xml create mode 100644 examples/jms/message-group2/src/main/resources/activemq/server0/activemq-roles.properties create mode 100644 examples/jms/message-group2/src/main/resources/activemq/server0/activemq-users.properties delete mode 100644 examples/jms/message-group2/src/main/resources/activemq/server0/activemq-users.xml delete mode 100644 examples/jms/message-priority/src/main/resources/activemq/server0/activemq-jms.xml create mode 100644 examples/jms/message-priority/src/main/resources/activemq/server0/activemq-roles.properties create mode 100644 examples/jms/message-priority/src/main/resources/activemq/server0/activemq-users.properties delete mode 100644 examples/jms/message-priority/src/main/resources/activemq/server0/activemq-users.xml delete mode 100644 examples/jms/multiple-failover-failback/src/main/resources/activemq/server0/activemq-jms.xml create mode 100644 examples/jms/multiple-failover-failback/src/main/resources/activemq/server0/activemq-roles.properties create mode 100644 examples/jms/multiple-failover-failback/src/main/resources/activemq/server0/activemq-users.properties delete mode 100644 examples/jms/multiple-failover-failback/src/main/resources/activemq/server0/activemq-users.xml delete mode 100644 examples/jms/multiple-failover-failback/src/main/resources/activemq/server1/activemq-jms.xml create mode 100644 examples/jms/multiple-failover-failback/src/main/resources/activemq/server1/activemq-roles.properties create mode 100644 examples/jms/multiple-failover-failback/src/main/resources/activemq/server1/activemq-users.properties delete mode 100644 examples/jms/multiple-failover-failback/src/main/resources/activemq/server1/activemq-users.xml delete mode 100644 examples/jms/multiple-failover-failback/src/main/resources/activemq/server2/activemq-jms.xml create mode 100644 examples/jms/multiple-failover-failback/src/main/resources/activemq/server2/activemq-roles.properties create mode 100644 examples/jms/multiple-failover-failback/src/main/resources/activemq/server2/activemq-users.properties delete mode 100644 examples/jms/multiple-failover-failback/src/main/resources/activemq/server2/activemq-users.xml delete mode 100644 examples/jms/multiple-failover/src/main/resources/activemq/server0/activemq-jms.xml create mode 100644 examples/jms/multiple-failover/src/main/resources/activemq/server0/activemq-roles.properties create mode 100644 examples/jms/multiple-failover/src/main/resources/activemq/server0/activemq-users.properties delete mode 100644 examples/jms/multiple-failover/src/main/resources/activemq/server0/activemq-users.xml delete mode 100644 examples/jms/multiple-failover/src/main/resources/activemq/server1/activemq-jms.xml create mode 100644 examples/jms/multiple-failover/src/main/resources/activemq/server1/activemq-roles.properties create mode 100644 examples/jms/multiple-failover/src/main/resources/activemq/server1/activemq-users.properties delete mode 100644 examples/jms/multiple-failover/src/main/resources/activemq/server1/activemq-users.xml delete mode 100644 examples/jms/multiple-failover/src/main/resources/activemq/server2/activemq-jms.xml create mode 100644 examples/jms/multiple-failover/src/main/resources/activemq/server2/activemq-roles.properties create mode 100644 examples/jms/multiple-failover/src/main/resources/activemq/server2/activemq-users.properties delete mode 100644 examples/jms/multiple-failover/src/main/resources/activemq/server2/activemq-users.xml delete mode 100644 examples/jms/no-consumer-buffering/src/main/resources/activemq/server0/activemq-jms.xml create mode 100644 examples/jms/no-consumer-buffering/src/main/resources/activemq/server0/activemq-roles.properties create mode 100644 examples/jms/no-consumer-buffering/src/main/resources/activemq/server0/activemq-users.properties delete mode 100644 examples/jms/no-consumer-buffering/src/main/resources/activemq/server0/activemq-users.xml delete mode 100644 examples/jms/non-transaction-failover/src/main/resources/activemq/server0/activemq-jms.xml create mode 100644 examples/jms/non-transaction-failover/src/main/resources/activemq/server0/activemq-roles.properties create mode 100644 examples/jms/non-transaction-failover/src/main/resources/activemq/server0/activemq-users.properties delete mode 100644 examples/jms/non-transaction-failover/src/main/resources/activemq/server0/activemq-users.xml delete mode 100644 examples/jms/non-transaction-failover/src/main/resources/activemq/server1/activemq-jms.xml create mode 100644 examples/jms/non-transaction-failover/src/main/resources/activemq/server1/activemq-roles.properties create mode 100644 examples/jms/non-transaction-failover/src/main/resources/activemq/server1/activemq-users.properties delete mode 100644 examples/jms/non-transaction-failover/src/main/resources/activemq/server1/activemq-users.xml delete mode 100644 examples/jms/openwire/src/main/resources/activemq/server0/activemq-jms.xml create mode 100644 examples/jms/openwire/src/main/resources/activemq/server0/activemq-roles.properties create mode 100644 examples/jms/openwire/src/main/resources/activemq/server0/activemq-users.properties delete mode 100644 examples/jms/openwire/src/main/resources/activemq/server0/activemq-users.xml delete mode 100644 examples/jms/paging/src/main/resources/activemq/server0/activemq-jms.xml create mode 100644 examples/jms/paging/src/main/resources/activemq/server0/activemq-roles.properties create mode 100644 examples/jms/paging/src/main/resources/activemq/server0/activemq-users.properties delete mode 100644 examples/jms/paging/src/main/resources/activemq/server0/activemq-users.xml delete mode 100644 examples/jms/perf/src/main/resources/activemq/server0/activemq-jms.xml delete mode 100644 examples/jms/pre-acknowledge/src/main/resources/activemq/server0/activemq-jms.xml create mode 100644 examples/jms/pre-acknowledge/src/main/resources/activemq/server0/activemq-roles.properties create mode 100644 examples/jms/pre-acknowledge/src/main/resources/activemq/server0/activemq-users.properties delete mode 100644 examples/jms/pre-acknowledge/src/main/resources/activemq/server0/activemq-users.xml delete mode 100644 examples/jms/producer-rate-limit/src/main/resources/activemq/server0/activemq-jms.xml create mode 100644 examples/jms/producer-rate-limit/src/main/resources/activemq/server0/activemq-roles.properties create mode 100644 examples/jms/producer-rate-limit/src/main/resources/activemq/server0/activemq-users.properties delete mode 100644 examples/jms/producer-rate-limit/src/main/resources/activemq/server0/activemq-users.xml delete mode 100644 examples/jms/proton-cpp/src/main/resources/activemq/server0/activemq-jms.xml create mode 100644 examples/jms/proton-cpp/src/main/resources/activemq/server0/activemq-roles.properties create mode 100644 examples/jms/proton-cpp/src/main/resources/activemq/server0/activemq-users.properties delete mode 100644 examples/jms/proton-cpp/src/main/resources/activemq/server0/activemq-users.xml delete mode 100644 examples/jms/proton-j/src/main/resources/activemq/server0/activemq-jms.xml create mode 100644 examples/jms/proton-j/src/main/resources/activemq/server0/activemq-roles.properties create mode 100644 examples/jms/proton-j/src/main/resources/activemq/server0/activemq-users.properties delete mode 100644 examples/jms/proton-j/src/main/resources/activemq/server0/activemq-users.xml delete mode 100644 examples/jms/proton-ruby/src/main/resources/activemq/server0/activemq-jms.xml create mode 100644 examples/jms/proton-ruby/src/main/resources/activemq/server0/activemq-roles.properties create mode 100644 examples/jms/proton-ruby/src/main/resources/activemq/server0/activemq-users.properties delete mode 100644 examples/jms/proton-ruby/src/main/resources/activemq/server0/activemq-users.xml delete mode 100644 examples/jms/queue-message-redistribution/src/main/resources/activemq/server0/activemq-jms.xml create mode 100644 examples/jms/queue-message-redistribution/src/main/resources/activemq/server0/activemq-roles.properties create mode 100644 examples/jms/queue-message-redistribution/src/main/resources/activemq/server0/activemq-users.properties delete mode 100644 examples/jms/queue-message-redistribution/src/main/resources/activemq/server0/activemq-users.xml delete mode 100644 examples/jms/queue-message-redistribution/src/main/resources/activemq/server1/activemq-jms.xml create mode 100644 examples/jms/queue-message-redistribution/src/main/resources/activemq/server1/activemq-roles.properties create mode 100644 examples/jms/queue-message-redistribution/src/main/resources/activemq/server1/activemq-users.properties delete mode 100644 examples/jms/queue-message-redistribution/src/main/resources/activemq/server1/activemq-users.xml delete mode 100644 examples/jms/queue-requestor/src/main/resources/activemq/server0/activemq-jms.xml create mode 100644 examples/jms/queue-requestor/src/main/resources/activemq/server0/activemq-roles.properties create mode 100644 examples/jms/queue-requestor/src/main/resources/activemq/server0/activemq-users.properties delete mode 100644 examples/jms/queue-requestor/src/main/resources/activemq/server0/activemq-users.xml delete mode 100644 examples/jms/queue-selector/src/main/resources/activemq/server0/activemq-jms.xml create mode 100644 examples/jms/queue-selector/src/main/resources/activemq/server0/activemq-roles.properties create mode 100644 examples/jms/queue-selector/src/main/resources/activemq/server0/activemq-users.properties delete mode 100644 examples/jms/queue-selector/src/main/resources/activemq/server0/activemq-users.xml delete mode 100644 examples/jms/queue/src/main/resources/activemq/server0/activemq-jms.xml create mode 100644 examples/jms/queue/src/main/resources/activemq/server0/activemq-roles.properties create mode 100644 examples/jms/queue/src/main/resources/activemq/server0/activemq-users.properties delete mode 100644 examples/jms/queue/src/main/resources/activemq/server0/activemq-users.xml delete mode 100644 examples/jms/reattach-node/src/main/resources/activemq/server0/activemq-jms.xml create mode 100644 examples/jms/reattach-node/src/main/resources/activemq/server0/activemq-roles.properties create mode 100644 examples/jms/reattach-node/src/main/resources/activemq/server0/activemq-users.properties delete mode 100644 examples/jms/reattach-node/src/main/resources/activemq/server0/activemq-users.xml delete mode 100644 examples/jms/replicated-failback-static/src/main/resources/activemq/server0/activemq-jms.xml create mode 100644 examples/jms/replicated-failback-static/src/main/resources/activemq/server0/activemq-roles.properties create mode 100644 examples/jms/replicated-failback-static/src/main/resources/activemq/server0/activemq-users.properties delete mode 100644 examples/jms/replicated-failback-static/src/main/resources/activemq/server0/activemq-users.xml delete mode 100644 examples/jms/replicated-failback-static/src/main/resources/activemq/server1/activemq-jms.xml create mode 100644 examples/jms/replicated-failback-static/src/main/resources/activemq/server1/activemq-roles.properties create mode 100644 examples/jms/replicated-failback-static/src/main/resources/activemq/server1/activemq-users.properties delete mode 100644 examples/jms/replicated-failback-static/src/main/resources/activemq/server1/activemq-users.xml delete mode 100644 examples/jms/replicated-failback/src/main/resources/activemq/server0/activemq-jms.xml create mode 100644 examples/jms/replicated-failback/src/main/resources/activemq/server0/activemq-roles.properties create mode 100644 examples/jms/replicated-failback/src/main/resources/activemq/server0/activemq-users.properties delete mode 100644 examples/jms/replicated-failback/src/main/resources/activemq/server0/activemq-users.xml delete mode 100644 examples/jms/replicated-failback/src/main/resources/activemq/server1/activemq-jms.xml create mode 100644 examples/jms/replicated-failback/src/main/resources/activemq/server1/activemq-roles.properties create mode 100644 examples/jms/replicated-failback/src/main/resources/activemq/server1/activemq-users.properties delete mode 100644 examples/jms/replicated-failback/src/main/resources/activemq/server1/activemq-users.xml delete mode 100644 examples/jms/replicated-multiple-failover/src/main/resources/activemq/server0/activemq-jms.xml create mode 100644 examples/jms/replicated-multiple-failover/src/main/resources/activemq/server0/activemq-roles.properties create mode 100644 examples/jms/replicated-multiple-failover/src/main/resources/activemq/server0/activemq-users.properties delete mode 100644 examples/jms/replicated-multiple-failover/src/main/resources/activemq/server0/activemq-users.xml delete mode 100644 examples/jms/replicated-multiple-failover/src/main/resources/activemq/server1/activemq-jms.xml create mode 100644 examples/jms/replicated-multiple-failover/src/main/resources/activemq/server1/activemq-roles.properties create mode 100644 examples/jms/replicated-multiple-failover/src/main/resources/activemq/server1/activemq-users.properties delete mode 100644 examples/jms/replicated-multiple-failover/src/main/resources/activemq/server1/activemq-users.xml delete mode 100644 examples/jms/replicated-multiple-failover/src/main/resources/activemq/server2/activemq-jms.xml create mode 100644 examples/jms/replicated-multiple-failover/src/main/resources/activemq/server2/activemq-roles.properties create mode 100644 examples/jms/replicated-multiple-failover/src/main/resources/activemq/server2/activemq-users.properties delete mode 100644 examples/jms/replicated-multiple-failover/src/main/resources/activemq/server2/activemq-users.xml delete mode 100644 examples/jms/replicated-transaction-failover/src/main/resources/activemq/server0/activemq-jms.xml create mode 100644 examples/jms/replicated-transaction-failover/src/main/resources/activemq/server0/activemq-roles.properties create mode 100644 examples/jms/replicated-transaction-failover/src/main/resources/activemq/server0/activemq-users.properties delete mode 100644 examples/jms/replicated-transaction-failover/src/main/resources/activemq/server0/activemq-users.xml delete mode 100644 examples/jms/replicated-transaction-failover/src/main/resources/activemq/server1/activemq-jms.xml create mode 100644 examples/jms/replicated-transaction-failover/src/main/resources/activemq/server1/activemq-roles.properties create mode 100644 examples/jms/replicated-transaction-failover/src/main/resources/activemq/server1/activemq-users.properties delete mode 100644 examples/jms/replicated-transaction-failover/src/main/resources/activemq/server1/activemq-users.xml delete mode 100644 examples/jms/request-reply/src/main/resources/activemq/server0/activemq-jms.xml create mode 100644 examples/jms/request-reply/src/main/resources/activemq/server0/activemq-roles.properties create mode 100644 examples/jms/request-reply/src/main/resources/activemq/server0/activemq-users.properties delete mode 100644 examples/jms/request-reply/src/main/resources/activemq/server0/activemq-users.xml delete mode 100644 examples/jms/rest/dup-send/src/main/resources/activemq-jms.xml create mode 100644 examples/jms/rest/dup-send/src/main/resources/activemq-roles.properties create mode 100644 examples/jms/rest/dup-send/src/main/resources/activemq-users.properties delete mode 100644 examples/jms/rest/dup-send/src/main/resources/activemq-users.xml delete mode 100644 examples/jms/rest/javascript-chat/src/main/resources/activemq-jms.xml create mode 100644 examples/jms/rest/javascript-chat/src/main/resources/activemq-roles.properties create mode 100644 examples/jms/rest/javascript-chat/src/main/resources/activemq-users.properties delete mode 100644 examples/jms/rest/javascript-chat/src/main/resources/activemq-users.xml delete mode 100644 examples/jms/rest/jms-to-rest/src/main/resources/activemq-jms.xml create mode 100644 examples/jms/rest/jms-to-rest/src/main/resources/activemq-roles.properties create mode 100644 examples/jms/rest/jms-to-rest/src/main/resources/activemq-users.properties delete mode 100644 examples/jms/rest/jms-to-rest/src/main/resources/activemq-users.xml delete mode 100644 examples/jms/rest/push/src/main/resources/activemq-jms.xml create mode 100644 examples/jms/rest/push/src/main/resources/activemq-roles.properties create mode 100644 examples/jms/rest/push/src/main/resources/activemq-users.properties delete mode 100644 examples/jms/rest/push/src/main/resources/activemq-users.xml delete mode 100644 examples/jms/scale-down/src/main/resources/activemq/server0/activemq-jms.xml create mode 100644 examples/jms/scale-down/src/main/resources/activemq/server0/activemq-roles.properties create mode 100644 examples/jms/scale-down/src/main/resources/activemq/server0/activemq-users.properties delete mode 100644 examples/jms/scale-down/src/main/resources/activemq/server0/activemq-users.xml delete mode 100644 examples/jms/scale-down/src/main/resources/activemq/server1/activemq-jms.xml create mode 100644 examples/jms/scale-down/src/main/resources/activemq/server1/activemq-roles.properties create mode 100644 examples/jms/scale-down/src/main/resources/activemq/server1/activemq-users.properties delete mode 100644 examples/jms/scale-down/src/main/resources/activemq/server1/activemq-users.xml delete mode 100644 examples/jms/scheduled-message/src/main/resources/activemq/server0/activemq-jms.xml create mode 100644 examples/jms/scheduled-message/src/main/resources/activemq/server0/activemq-roles.properties create mode 100644 examples/jms/scheduled-message/src/main/resources/activemq/server0/activemq-users.properties delete mode 100644 examples/jms/scheduled-message/src/main/resources/activemq/server0/activemq-users.xml delete mode 100644 examples/jms/security/src/main/resources/activemq/server0/activemq-jms.xml create mode 100644 examples/jms/security/src/main/resources/activemq/server0/activemq-roles.properties create mode 100644 examples/jms/security/src/main/resources/activemq/server0/activemq-users.properties delete mode 100644 examples/jms/security/src/main/resources/activemq/server0/activemq-users.xml delete mode 100644 examples/jms/send-acknowledgements/src/main/resources/activemq/server0/activemq-jms.xml create mode 100644 examples/jms/send-acknowledgements/src/main/resources/activemq/server0/activemq-roles.properties create mode 100644 examples/jms/send-acknowledgements/src/main/resources/activemq/server0/activemq-users.properties delete mode 100644 examples/jms/send-acknowledgements/src/main/resources/activemq/server0/activemq-users.xml delete mode 100644 examples/jms/spring-integration/src/main/resources/activemq-jms.xml create mode 100644 examples/jms/spring-integration/src/main/resources/activemq-roles.properties create mode 100644 examples/jms/spring-integration/src/main/resources/activemq-users.properties delete mode 100644 examples/jms/spring-integration/src/main/resources/activemq-users.xml delete mode 100644 examples/jms/ssl-enabled/src/main/resources/activemq/server0/activemq-jms.xml create mode 100644 examples/jms/ssl-enabled/src/main/resources/activemq/server0/activemq-roles.properties create mode 100644 examples/jms/ssl-enabled/src/main/resources/activemq/server0/activemq-users.properties delete mode 100644 examples/jms/ssl-enabled/src/main/resources/activemq/server0/activemq-users.xml delete mode 100644 examples/jms/static-selector-jms/src/main/resources/activemq/server0/activemq-jms.xml create mode 100644 examples/jms/static-selector-jms/src/main/resources/activemq/server0/activemq-roles.properties create mode 100644 examples/jms/static-selector-jms/src/main/resources/activemq/server0/activemq-users.properties delete mode 100644 examples/jms/static-selector-jms/src/main/resources/activemq/server0/activemq-users.xml delete mode 100644 examples/jms/static-selector/src/main/resources/activemq/server0/activemq-jms.xml create mode 100644 examples/jms/static-selector/src/main/resources/activemq/server0/activemq-roles.properties create mode 100644 examples/jms/static-selector/src/main/resources/activemq/server0/activemq-users.properties delete mode 100644 examples/jms/static-selector/src/main/resources/activemq/server0/activemq-users.xml delete mode 100644 examples/jms/stomp-websockets/src/main/resources/activemq/server0/activemq-jms.xml create mode 100644 examples/jms/stomp-websockets/src/main/resources/activemq/server0/activemq-roles.properties create mode 100644 examples/jms/stomp-websockets/src/main/resources/activemq/server0/activemq-users.properties delete mode 100644 examples/jms/stomp-websockets/src/main/resources/activemq/server0/activemq-users.xml delete mode 100644 examples/jms/stomp/src/main/resources/activemq/server0/activemq-jms.xml create mode 100644 examples/jms/stomp/src/main/resources/activemq/server0/activemq-roles.properties create mode 100644 examples/jms/stomp/src/main/resources/activemq/server0/activemq-users.properties delete mode 100644 examples/jms/stomp/src/main/resources/activemq/server0/activemq-users.xml delete mode 100644 examples/jms/stomp1.1/src/main/resources/activemq/server0/activemq-jms.xml create mode 100644 examples/jms/stomp1.1/src/main/resources/activemq/server0/activemq-roles.properties create mode 100644 examples/jms/stomp1.1/src/main/resources/activemq/server0/activemq-users.properties delete mode 100644 examples/jms/stomp1.1/src/main/resources/activemq/server0/activemq-users.xml delete mode 100644 examples/jms/stomp1.2/src/main/resources/activemq/server0/activemq-jms.xml create mode 100644 examples/jms/stomp1.2/src/main/resources/activemq/server0/activemq-roles.properties create mode 100644 examples/jms/stomp1.2/src/main/resources/activemq/server0/activemq-users.properties delete mode 100644 examples/jms/stomp1.2/src/main/resources/activemq/server0/activemq-users.xml delete mode 100644 examples/jms/stop-server-failover/src/main/resources/activemq/server0/activemq-jms.xml create mode 100644 examples/jms/stop-server-failover/src/main/resources/activemq/server0/activemq-roles.properties create mode 100644 examples/jms/stop-server-failover/src/main/resources/activemq/server0/activemq-users.properties delete mode 100644 examples/jms/stop-server-failover/src/main/resources/activemq/server0/activemq-users.xml delete mode 100644 examples/jms/stop-server-failover/src/main/resources/activemq/server1/activemq-jms.xml create mode 100644 examples/jms/stop-server-failover/src/main/resources/activemq/server1/activemq-roles.properties create mode 100644 examples/jms/stop-server-failover/src/main/resources/activemq/server1/activemq-users.properties delete mode 100644 examples/jms/stop-server-failover/src/main/resources/activemq/server1/activemq-users.xml delete mode 100644 examples/jms/symmetric-cluster/src/main/resources/activemq/server0/activemq-jms.xml create mode 100644 examples/jms/symmetric-cluster/src/main/resources/activemq/server0/activemq-roles.properties create mode 100644 examples/jms/symmetric-cluster/src/main/resources/activemq/server0/activemq-users.properties delete mode 100644 examples/jms/symmetric-cluster/src/main/resources/activemq/server0/activemq-users.xml delete mode 100644 examples/jms/symmetric-cluster/src/main/resources/activemq/server1/activemq-jms.xml create mode 100644 examples/jms/symmetric-cluster/src/main/resources/activemq/server1/activemq-roles.properties create mode 100644 examples/jms/symmetric-cluster/src/main/resources/activemq/server1/activemq-users.properties delete mode 100644 examples/jms/symmetric-cluster/src/main/resources/activemq/server1/activemq-users.xml delete mode 100644 examples/jms/symmetric-cluster/src/main/resources/activemq/server2/activemq-jms.xml create mode 100644 examples/jms/symmetric-cluster/src/main/resources/activemq/server2/activemq-roles.properties create mode 100644 examples/jms/symmetric-cluster/src/main/resources/activemq/server2/activemq-users.properties delete mode 100644 examples/jms/symmetric-cluster/src/main/resources/activemq/server2/activemq-users.xml delete mode 100644 examples/jms/symmetric-cluster/src/main/resources/activemq/server3/activemq-jms.xml create mode 100644 examples/jms/symmetric-cluster/src/main/resources/activemq/server3/activemq-roles.properties create mode 100644 examples/jms/symmetric-cluster/src/main/resources/activemq/server3/activemq-users.properties delete mode 100644 examples/jms/symmetric-cluster/src/main/resources/activemq/server3/activemq-users.xml delete mode 100644 examples/jms/symmetric-cluster/src/main/resources/activemq/server4/activemq-jms.xml create mode 100644 examples/jms/symmetric-cluster/src/main/resources/activemq/server4/activemq-roles.properties create mode 100644 examples/jms/symmetric-cluster/src/main/resources/activemq/server4/activemq-users.properties delete mode 100644 examples/jms/symmetric-cluster/src/main/resources/activemq/server4/activemq-users.xml delete mode 100644 examples/jms/symmetric-cluster/src/main/resources/activemq/server5/activemq-jms.xml create mode 100644 examples/jms/symmetric-cluster/src/main/resources/activemq/server5/activemq-roles.properties create mode 100644 examples/jms/symmetric-cluster/src/main/resources/activemq/server5/activemq-users.properties delete mode 100644 examples/jms/symmetric-cluster/src/main/resources/activemq/server5/activemq-users.xml delete mode 100644 examples/jms/temp-queue/src/main/resources/activemq/server0/activemq-jms.xml create mode 100644 examples/jms/temp-queue/src/main/resources/activemq/server0/activemq-roles.properties create mode 100644 examples/jms/temp-queue/src/main/resources/activemq/server0/activemq-users.properties delete mode 100644 examples/jms/temp-queue/src/main/resources/activemq/server0/activemq-users.xml delete mode 100644 examples/jms/topic-hierarchies/src/main/resources/activemq/server0/activemq-jms.xml create mode 100644 examples/jms/topic-hierarchies/src/main/resources/activemq/server0/activemq-roles.properties create mode 100644 examples/jms/topic-hierarchies/src/main/resources/activemq/server0/activemq-users.properties delete mode 100644 examples/jms/topic-hierarchies/src/main/resources/activemq/server0/activemq-users.xml delete mode 100644 examples/jms/topic-selector-example1/src/main/resources/activemq/server0/activemq-jms.xml create mode 100644 examples/jms/topic-selector-example1/src/main/resources/activemq/server0/activemq-roles.properties create mode 100644 examples/jms/topic-selector-example1/src/main/resources/activemq/server0/activemq-users.properties delete mode 100644 examples/jms/topic-selector-example1/src/main/resources/activemq/server0/activemq-users.xml delete mode 100644 examples/jms/topic-selector-example2/src/main/resources/activemq/server0/activemq-jms.xml create mode 100644 examples/jms/topic-selector-example2/src/main/resources/activemq/server0/activemq-roles.properties create mode 100644 examples/jms/topic-selector-example2/src/main/resources/activemq/server0/activemq-users.properties delete mode 100644 examples/jms/topic-selector-example2/src/main/resources/activemq/server0/activemq-users.xml delete mode 100644 examples/jms/topic/src/main/resources/activemq/server0/activemq-jms.xml create mode 100644 examples/jms/topic/src/main/resources/activemq/server0/activemq-roles.properties create mode 100644 examples/jms/topic/src/main/resources/activemq/server0/activemq-users.properties delete mode 100644 examples/jms/topic/src/main/resources/activemq/server0/activemq-users.xml delete mode 100644 examples/jms/transaction-failover/src/main/resources/activemq/server0/activemq-jms.xml create mode 100644 examples/jms/transaction-failover/src/main/resources/activemq/server0/activemq-roles.properties create mode 100644 examples/jms/transaction-failover/src/main/resources/activemq/server0/activemq-users.properties delete mode 100644 examples/jms/transaction-failover/src/main/resources/activemq/server0/activemq-users.xml delete mode 100644 examples/jms/transaction-failover/src/main/resources/activemq/server1/activemq-jms.xml create mode 100644 examples/jms/transaction-failover/src/main/resources/activemq/server1/activemq-roles.properties create mode 100644 examples/jms/transaction-failover/src/main/resources/activemq/server1/activemq-users.properties delete mode 100644 examples/jms/transaction-failover/src/main/resources/activemq/server1/activemq-users.xml delete mode 100644 examples/jms/transactional/src/main/resources/activemq/server0/activemq-jms.xml create mode 100644 examples/jms/transactional/src/main/resources/activemq/server0/activemq-roles.properties create mode 100644 examples/jms/transactional/src/main/resources/activemq/server0/activemq-users.properties delete mode 100644 examples/jms/transactional/src/main/resources/activemq/server0/activemq-users.xml delete mode 100644 examples/jms/xa-heuristic/src/main/resources/activemq/server0/activemq-jms.xml create mode 100644 examples/jms/xa-heuristic/src/main/resources/activemq/server0/activemq-roles.properties create mode 100644 examples/jms/xa-heuristic/src/main/resources/activemq/server0/activemq-users.properties delete mode 100644 examples/jms/xa-heuristic/src/main/resources/activemq/server0/activemq-users.xml delete mode 100644 examples/jms/xa-receive/src/main/resources/activemq/server0/activemq-jms.xml create mode 100644 examples/jms/xa-receive/src/main/resources/activemq/server0/activemq-roles.properties create mode 100644 examples/jms/xa-receive/src/main/resources/activemq/server0/activemq-users.properties delete mode 100644 examples/jms/xa-receive/src/main/resources/activemq/server0/activemq-users.xml delete mode 100644 examples/jms/xa-send/src/main/resources/activemq/server0/activemq-jms.xml create mode 100644 examples/jms/xa-send/src/main/resources/activemq/server0/activemq-roles.properties create mode 100644 examples/jms/xa-send/src/main/resources/activemq/server0/activemq-users.properties delete mode 100644 examples/jms/xa-send/src/main/resources/activemq/server0/activemq-users.xml delete mode 100644 examples/soak/normal/server0/activemq-jms.xml delete mode 100644 tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/core/deployers/impl/QueueDeployerTest.java delete mode 100644 tests/integration-tests/src/test/resources/activemq-jms-for-JMSServerDeployerTest2.xml delete mode 100644 tests/integration-tests/src/test/resources/server-start-stop-jms-config1.xml delete mode 100644 tests/integration-tests/src/test/resources/spring-activemq-jms.xml delete mode 100644 tests/jms-tests/src/test/resources/activemq-jms.xml delete mode 100644 tests/jms-tests/src/test/resources/activemq-queues.xml delete mode 100644 tests/jms-tests/src/test/resources/activemq-users.xml delete mode 100644 tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/deployers/impl/AddressSettingsDeployerTest.java delete mode 100644 tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/deployers/impl/BasicUserCredentialsDeployerTest.java delete mode 100644 tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/deployers/impl/FakeDeploymentManager.java delete mode 100644 tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/deployers/impl/FileDeploymentManagerTest.java delete mode 100644 tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/deployers/impl/SecurityDeployerTest.java delete mode 100644 tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/deployers/impl/XMLDeployerTest.java diff --git a/activemq-bootstrap/src/main/java/org/apache/activemq/cli/commands/Run.java b/activemq-bootstrap/src/main/java/org/apache/activemq/cli/commands/Run.java index a83be7557c..9df46c0a9c 100644 --- a/activemq-bootstrap/src/main/java/org/apache/activemq/cli/commands/Run.java +++ b/activemq-bootstrap/src/main/java/org/apache/activemq/cli/commands/Run.java @@ -21,25 +21,16 @@ import io.airlift.command.Command; import org.apache.activemq.cli.ActiveMQ; import org.apache.activemq.components.ExternalComponent; -import org.apache.activemq.core.config.Configuration; import org.apache.activemq.core.server.ActiveMQComponent; -import org.apache.activemq.core.server.impl.ActiveMQServerImpl; import org.apache.activemq.dto.BrokerDTO; import org.apache.activemq.dto.ComponentDTO; import org.apache.activemq.factory.BrokerFactory; -import org.apache.activemq.factory.CoreFactory; -import org.apache.activemq.factory.JmsFactory; import org.apache.activemq.factory.SecurityManagerFactory; +import org.apache.activemq.integration.Broker; import org.apache.activemq.integration.bootstrap.ActiveMQBootstrapLogger; -import org.apache.activemq.jms.server.JMSServerManager; -import org.apache.activemq.jms.server.config.JMSConfiguration; -import org.apache.activemq.jms.server.impl.JMSServerManagerImpl; import org.apache.activemq.spi.core.security.ActiveMQSecurityManager; -import javax.management.MBeanServer; - import java.io.File; -import java.lang.management.ManagementFactory; import java.util.ArrayList; import java.util.Timer; import java.util.TimerTask; @@ -50,9 +41,10 @@ public class Run implements Action @Arguments(description = "Broker Configuration URI, default 'xml:${ACTIVEMQ_HOME}/config/non-clustered/bootstrap.xml'") String configuration; - private JMSServerManager jmsServerManager; private ArrayList components = new ArrayList<>(); + private Broker server; + @Override public Object execute(ActionContext context) throws Exception { @@ -68,32 +60,15 @@ public class Run implements Action System.out.println("Loading configuration file: " + configuration); - BrokerDTO broker = BrokerFactory.createBroker(configuration); + BrokerDTO broker = BrokerFactory.createBrokerConfiguration(configuration); - addShutdownHook(new File(broker.core.configuration).getParentFile()); - - Configuration core = CoreFactory.create(broker.core); - - JMSConfiguration jms = JmsFactory.create(broker.jms); + addShutdownHook(new File(broker.server.configuration).getParentFile()); ActiveMQSecurityManager security = SecurityManagerFactory.create(broker.security); - MBeanServer mBeanServer = ManagementFactory.getPlatformMBeanServer(); + server = BrokerFactory.createServer(broker.server, security); - ActiveMQServerImpl server = new ActiveMQServerImpl(core, mBeanServer, security); - - if (jms != null) - { - jmsServerManager = new JMSServerManagerImpl(server, jms); - } - else - { - jmsServerManager = new JMSServerManagerImpl(server); - } - - ActiveMQBootstrapLogger.LOGGER.serverStarting(); - - jmsServerManager.start(); + server.start(); if (broker.web != null) { @@ -139,7 +114,7 @@ public class Run implements Action try { //TODO stop components - jmsServerManager.stop(); + server.stop(); } catch (Exception e) { diff --git a/activemq-bootstrap/src/main/java/org/apache/activemq/cli/commands/Stop.java b/activemq-bootstrap/src/main/java/org/apache/activemq/cli/commands/Stop.java index 3aee94d5c5..e0fdc4b6ca 100644 --- a/activemq-bootstrap/src/main/java/org/apache/activemq/cli/commands/Stop.java +++ b/activemq-bootstrap/src/main/java/org/apache/activemq/cli/commands/Stop.java @@ -36,9 +36,9 @@ public class Stop implements Action { configuration = "xml:" + System.getProperty("activemq.home").replace("\\", "/") + "/config/non-clustered/bootstrap.xml"; } - BrokerDTO broker = BrokerFactory.createBroker(configuration); + BrokerDTO broker = BrokerFactory.createBrokerConfiguration(configuration); - File file = new File(broker.core.configuration).getParentFile(); + File file = new File(broker.server.configuration).getParentFile(); File stopFile = new File(file, "STOP_ME"); diff --git a/activemq-bootstrap/src/main/java/org/apache/activemq/factory/BasicSecurityHandler.java b/activemq-bootstrap/src/main/java/org/apache/activemq/factory/BasicSecurityHandler.java new file mode 100644 index 0000000000..624444042d --- /dev/null +++ b/activemq-bootstrap/src/main/java/org/apache/activemq/factory/BasicSecurityHandler.java @@ -0,0 +1,43 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.activemq.factory; + +import org.apache.activemq.core.config.impl.FileSecurityConfiguration; +import org.apache.activemq.dto.BasicSecurityDTO; +import org.apache.activemq.dto.SecurityDTO; +import org.apache.activemq.spi.core.security.ActiveMQSecurityManager; +import org.apache.activemq.spi.core.security.ActiveMQSecurityManagerImpl; + +/** + * @author Andy Taylor + */ +public class BasicSecurityHandler implements SecurityHandler +{ + @Override + public ActiveMQSecurityManager createSecurityManager(SecurityDTO security) throws Exception + { + BasicSecurityDTO fileSecurity = (BasicSecurityDTO) security; + String home = System.getProperty("activemq.home"); + FileSecurityConfiguration securityConfiguration = new FileSecurityConfiguration(fileSecurity.users.replace("${activemq.home}", home).replace("\\", "/"), + fileSecurity.roles.replace("${activemq.home}", home).replace("\\", "/"), + fileSecurity.defaultUser, + fileSecurity.maskPassword, + fileSecurity.passwordCodec); + securityConfiguration.start(); + return new ActiveMQSecurityManagerImpl(securityConfiguration); + } +} diff --git a/activemq-bootstrap/src/main/java/org/apache/activemq/factory/BrokerFactory.java b/activemq-bootstrap/src/main/java/org/apache/activemq/factory/BrokerFactory.java index 1320099459..ba11d56f40 100644 --- a/activemq-bootstrap/src/main/java/org/apache/activemq/factory/BrokerFactory.java +++ b/activemq-bootstrap/src/main/java/org/apache/activemq/factory/BrokerFactory.java @@ -18,6 +18,9 @@ package org.apache.activemq.factory; import org.apache.activemq.cli.ConfigurationException; import org.apache.activemq.dto.BrokerDTO; +import org.apache.activemq.dto.ServerDTO; +import org.apache.activemq.integration.Broker; +import org.apache.activemq.spi.core.security.ActiveMQSecurityManager; import org.apache.activemq.utils.FactoryFinder; import java.io.IOException; @@ -26,7 +29,7 @@ import java.net.URI; public class BrokerFactory { - public static BrokerDTO createBroker(URI configURI) throws Exception + public static BrokerDTO createBrokerConfiguration(URI configURI) throws Exception { if (configURI.getScheme() == null) { @@ -48,9 +51,30 @@ public class BrokerFactory return factory.createBroker(configURI); } - public static BrokerDTO createBroker(String configuration) throws Exception + public static BrokerDTO createBrokerConfiguration(String configuration) throws Exception { - return createBroker(new URI(configuration)); + return createBrokerConfiguration(new URI(configuration)); + } + + public static Broker createServer(ServerDTO brokerDTO, ActiveMQSecurityManager security) throws Exception + { + if (brokerDTO.configuration != null) + { + BrokerHandler handler; + URI configURI = new URI(brokerDTO.configuration.replace("\\", "/")); + try + { + FactoryFinder finder = new FactoryFinder("META-INF/services/org/apache/activemq/broker/server/"); + handler = (BrokerHandler)finder.newInstance(configURI.getScheme()); + } + catch (IOException ioe ) + { + throw new ConfigurationException("Invalid configuration URI, can't find configuration scheme: " + configURI.getScheme()); + } + + return handler.createServer(brokerDTO, security); + } + return null; } } diff --git a/activemq-dto/src/main/java/org/apache/activemq/dto/CoreDTO.java b/activemq-bootstrap/src/main/java/org/apache/activemq/factory/BrokerHandler.java similarity index 67% rename from activemq-dto/src/main/java/org/apache/activemq/dto/CoreDTO.java rename to activemq-bootstrap/src/main/java/org/apache/activemq/factory/BrokerHandler.java index 820d4610dd..1e8b71d0ca 100644 --- a/activemq-dto/src/main/java/org/apache/activemq/dto/CoreDTO.java +++ b/activemq-bootstrap/src/main/java/org/apache/activemq/factory/BrokerHandler.java @@ -14,19 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.dto; +package org.apache.activemq.factory; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlRootElement; +import org.apache.activemq.dto.ServerDTO; +import org.apache.activemq.integration.Broker; +import org.apache.activemq.spi.core.security.ActiveMQSecurityManager; -@XmlRootElement(name = "core") -@XmlAccessorType(XmlAccessType.FIELD) -public class CoreDTO +/** + * @author Andy Taylor + */ +public interface BrokerHandler { - - @XmlAttribute - public String configuration; - + Broker createServer(ServerDTO brokerDTO, ActiveMQSecurityManager security); } diff --git a/activemq-bootstrap/src/main/java/org/apache/activemq/factory/CoreFactory.java b/activemq-bootstrap/src/main/java/org/apache/activemq/factory/CoreFactory.java deleted file mode 100644 index eb777bfe77..0000000000 --- a/activemq-bootstrap/src/main/java/org/apache/activemq/factory/CoreFactory.java +++ /dev/null @@ -1,51 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.activemq.factory; - -import org.apache.activemq.cli.ConfigurationException; -import org.apache.activemq.core.config.Configuration; -import org.apache.activemq.core.config.impl.ConfigurationImpl; -import org.apache.activemq.dto.CoreDTO; -import org.apache.activemq.utils.FactoryFinder; - -import java.io.IOException; -import java.net.URI; - -public class CoreFactory -{ - public static Configuration create(CoreDTO core) throws Exception - { - if (core.configuration != null) - { - CoreFactoryHandler factory = null; - URI configURI = new URI(core.configuration.replace("\\", "/")); - try - { - FactoryFinder finder = new FactoryFinder("META-INF/services/org/apache/activemq/broker/core/"); - factory = (CoreFactoryHandler)finder.newInstance(configURI.getScheme()); - } - catch (IOException ioe ) - { - throw new ConfigurationException("Invalid configuration URI, can't find configuration scheme: " + configURI.getScheme()); - } - - return factory.createConfiguration(configURI); - } - return new ConfigurationImpl(); - } - -} diff --git a/activemq-bootstrap/src/main/java/org/apache/activemq/factory/FileCoreFactoryHandler.java b/activemq-bootstrap/src/main/java/org/apache/activemq/factory/FileBrokerHandler.java similarity index 64% rename from activemq-bootstrap/src/main/java/org/apache/activemq/factory/FileCoreFactoryHandler.java rename to activemq-bootstrap/src/main/java/org/apache/activemq/factory/FileBrokerHandler.java index e0fdaed488..1c4601de87 100644 --- a/activemq-bootstrap/src/main/java/org/apache/activemq/factory/FileCoreFactoryHandler.java +++ b/activemq-bootstrap/src/main/java/org/apache/activemq/factory/FileBrokerHandler.java @@ -16,18 +16,19 @@ */ package org.apache.activemq.factory; -import org.apache.activemq.core.config.Configuration; -import org.apache.activemq.core.config.impl.FileConfiguration; +import org.apache.activemq.dto.ServerDTO; +import org.apache.activemq.integration.Broker; +import org.apache.activemq.integration.FileBroker; +import org.apache.activemq.spi.core.security.ActiveMQSecurityManager; -import java.net.URI; - -public class FileCoreFactoryHandler implements CoreFactoryHandler +/** + * @author Andy Taylor + */ +public class FileBrokerHandler implements BrokerHandler { @Override - public Configuration createConfiguration(URI configuration) throws Exception + public Broker createServer(ServerDTO brokerDTO, ActiveMQSecurityManager security) { - FileConfiguration fileConfiguration = new FileConfiguration(configuration.toURL().toExternalForm()); - fileConfiguration.start(); - return fileConfiguration; + return new FileBroker(brokerDTO, security); } } diff --git a/activemq-bootstrap/src/main/java/org/apache/activemq/factory/FileJmsFactoryHandler.java b/activemq-bootstrap/src/main/java/org/apache/activemq/factory/FileJmsFactoryHandler.java deleted file mode 100644 index 6d6aff1c7d..0000000000 --- a/activemq-bootstrap/src/main/java/org/apache/activemq/factory/FileJmsFactoryHandler.java +++ /dev/null @@ -1,36 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.activemq.factory; - -import org.apache.activemq.jms.server.config.JMSConfiguration; -import org.apache.activemq.jms.server.impl.JMSServerConfigParserImpl; - -import java.io.FileInputStream; -import java.io.InputStream; -import java.net.URI; - -public class FileJmsFactoryHandler implements JmsFactoryHandler -{ - @Override - public JMSConfiguration createConfiguration(URI configuration) throws Exception - { - try (InputStream configIn = new FileInputStream(configuration.getSchemeSpecificPart())) - { - return new JMSServerConfigParserImpl().parseConfiguration(configIn); - } - } -} diff --git a/activemq-bootstrap/src/main/java/org/apache/activemq/factory/JmsFactory.java b/activemq-bootstrap/src/main/java/org/apache/activemq/factory/JmsFactory.java deleted file mode 100644 index 5b1a990a4a..0000000000 --- a/activemq-bootstrap/src/main/java/org/apache/activemq/factory/JmsFactory.java +++ /dev/null @@ -1,50 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.activemq.factory; - -import java.io.IOException; -import java.net.URI; - -import org.apache.activemq.cli.ConfigurationException; -import org.apache.activemq.dto.JmsDTO; -import org.apache.activemq.jms.server.config.JMSConfiguration; -import org.apache.activemq.utils.FactoryFinder; - -public class JmsFactory -{ - public static JMSConfiguration create(JmsDTO jms) throws Exception - { - if (jms != null && jms.configuration != null) - { - JmsFactoryHandler factory = null; - URI configURI = new URI(jms.configuration.replace("\\", "/")); - try - { - FactoryFinder finder = new FactoryFinder("META-INF/services/org/apache/activemq/broker/jms/"); - factory = (JmsFactoryHandler)finder.newInstance(configURI.getScheme()); - } - catch (IOException ioe ) - { - throw new ConfigurationException("Invalid configuration URI, can't find configuration scheme: " + configURI.getScheme()); - } - - return factory.createConfiguration(configURI); - } - - return null; - } -} diff --git a/activemq-bootstrap/src/main/java/org/apache/activemq/factory/CoreFactoryHandler.java b/activemq-bootstrap/src/main/java/org/apache/activemq/factory/SecurityHandler.java similarity index 72% rename from activemq-bootstrap/src/main/java/org/apache/activemq/factory/CoreFactoryHandler.java rename to activemq-bootstrap/src/main/java/org/apache/activemq/factory/SecurityHandler.java index 9f76cb0270..30eb25f92f 100644 --- a/activemq-bootstrap/src/main/java/org/apache/activemq/factory/CoreFactoryHandler.java +++ b/activemq-bootstrap/src/main/java/org/apache/activemq/factory/SecurityHandler.java @@ -16,11 +16,13 @@ */ package org.apache.activemq.factory; -import org.apache.activemq.core.config.Configuration; +import org.apache.activemq.dto.SecurityDTO; +import org.apache.activemq.spi.core.security.ActiveMQSecurityManager; -import java.net.URI; - -public interface CoreFactoryHandler +/** + * @author Andy Taylor + */ +public interface SecurityHandler { - Configuration createConfiguration(URI configuration) throws Exception; + ActiveMQSecurityManager createSecurityManager(SecurityDTO securityDTO) throws Exception; } diff --git a/activemq-bootstrap/src/main/java/org/apache/activemq/factory/SecurityManagerFactory.java b/activemq-bootstrap/src/main/java/org/apache/activemq/factory/SecurityManagerFactory.java index f128c36f3b..2c58007419 100644 --- a/activemq-bootstrap/src/main/java/org/apache/activemq/factory/SecurityManagerFactory.java +++ b/activemq-bootstrap/src/main/java/org/apache/activemq/factory/SecurityManagerFactory.java @@ -29,9 +29,9 @@ public class SecurityManagerFactory { if (config != null) { - FactoryFinder finder = new FactoryFinder("META-INF/services/org/apache/activemq/security/"); - ActiveMQSecurityManager manager = (ActiveMQSecurityManager)finder.newInstance(config.getClass().getAnnotation(XmlRootElement.class).name()); - return manager; + FactoryFinder finder = new FactoryFinder("META-INF/services/org/apache/activemq/broker/security/"); + SecurityHandler securityHandler = (SecurityHandler)finder.newInstance(config.getClass().getAnnotation(XmlRootElement.class).name()); + return securityHandler.createSecurityManager(config); } else { diff --git a/activemq-bootstrap/src/main/java/org/apache/activemq/factory/JmsFactoryHandler.java b/activemq-bootstrap/src/main/java/org/apache/activemq/integration/Broker.java similarity index 76% rename from activemq-bootstrap/src/main/java/org/apache/activemq/factory/JmsFactoryHandler.java rename to activemq-bootstrap/src/main/java/org/apache/activemq/integration/Broker.java index 6a35508038..8ba2f32285 100644 --- a/activemq-bootstrap/src/main/java/org/apache/activemq/factory/JmsFactoryHandler.java +++ b/activemq-bootstrap/src/main/java/org/apache/activemq/integration/Broker.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.activemq.factory; +package org.apache.activemq.integration; -import org.apache.activemq.jms.server.config.JMSConfiguration; +import org.apache.activemq.core.server.ActiveMQComponent; -import java.net.URI; - -public interface JmsFactoryHandler +/** + * A Broker os a set of ActiveMQComponents that create a Server, for instance core and jms. + */ +public interface Broker extends ActiveMQComponent { - JMSConfiguration createConfiguration(URI configuration) throws Exception; } diff --git a/activemq-bootstrap/src/main/java/org/apache/activemq/integration/FileBroker.java b/activemq-bootstrap/src/main/java/org/apache/activemq/integration/FileBroker.java new file mode 100644 index 0000000000..82e05bfa5d --- /dev/null +++ b/activemq-bootstrap/src/main/java/org/apache/activemq/integration/FileBroker.java @@ -0,0 +1,98 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.activemq.integration; + +import org.apache.activemq.core.config.FileDeploymentManager; +import org.apache.activemq.core.config.impl.FileConfiguration; +import org.apache.activemq.core.server.ActiveMQComponent; +import org.apache.activemq.dto.ServerDTO; +import org.apache.activemq.integration.bootstrap.ActiveMQBootstrapLogger; +import org.apache.activemq.jms.server.config.impl.FileJMSConfiguration; +import org.apache.activemq.spi.core.security.ActiveMQSecurityManager; + +import java.lang.management.ManagementFactory; +import java.util.Map; + +/** + * @author Andy Taylor + */ +public class FileBroker implements Broker +{ + private final String configurationUrl; + + private boolean started; + + private final ActiveMQSecurityManager securityManager; + + private Map components; + + public FileBroker(ServerDTO broker, ActiveMQSecurityManager security) + { + this.securityManager = security; + this.configurationUrl = broker.configuration; + } + + + public synchronized void start() throws Exception + { + if (started) + { + return; + } + + //todo if we start to pullout more configs from the main config then we should pull out the configuration objects from factories if available + FileConfiguration configuration = new FileConfiguration(); + FileJMSConfiguration jmsConfiguration = new FileJMSConfiguration(); + + FileDeploymentManager fileDeploymentManager = new FileDeploymentManager(configurationUrl); + fileDeploymentManager.addDeployable(configuration).addDeployable(jmsConfiguration); + fileDeploymentManager.readConfiguration(); + + components = fileDeploymentManager.buildService(securityManager, ManagementFactory.getPlatformMBeanServer()); + + ActiveMQBootstrapLogger.LOGGER.serverStarting(); + for (ActiveMQComponent component : components.values()) + { + component.start(); + } + started = true; + + + } + + @Override + public void stop() throws Exception + { + if (!started) + { + return; + } + ActiveMQComponent[] mqComponents = new ActiveMQComponent[components.size()]; + components.values().toArray(mqComponents); + for (int i = mqComponents.length - 1; i >= 0; i--) + { + mqComponents[i].stop(); + } + started = false; + } + + @Override + public boolean isStarted() + { + return false; + } +} diff --git a/activemq-server/src/main/resources/META-INF/services/org/apache/activemq/security/basic-security b/activemq-bootstrap/src/main/resources/META-INF/services/org/apache/activemq/broker/security/basic-security similarity index 92% rename from activemq-server/src/main/resources/META-INF/services/org/apache/activemq/security/basic-security rename to activemq-bootstrap/src/main/resources/META-INF/services/org/apache/activemq/broker/security/basic-security index b5b8419340..b262a51855 100644 --- a/activemq-server/src/main/resources/META-INF/services/org/apache/activemq/security/basic-security +++ b/activemq-bootstrap/src/main/resources/META-INF/services/org/apache/activemq/broker/security/basic-security @@ -14,4 +14,4 @@ ## See the License for the specific language governing permissions and ## limitations under the License. ## --------------------------------------------------------------------------- -class=org.apache.activemq.spi.core.security.ActiveMQSecurityManagerImpl +class=org.apache.activemq.factory.BasicSecurityHandler diff --git a/activemq-bootstrap/src/main/resources/META-INF/services/org/apache/activemq/broker/core/file b/activemq-bootstrap/src/main/resources/META-INF/services/org/apache/activemq/broker/server/file similarity index 94% rename from activemq-bootstrap/src/main/resources/META-INF/services/org/apache/activemq/broker/core/file rename to activemq-bootstrap/src/main/resources/META-INF/services/org/apache/activemq/broker/server/file index eee179858c..e3cf2b1fd2 100644 --- a/activemq-bootstrap/src/main/resources/META-INF/services/org/apache/activemq/broker/core/file +++ b/activemq-bootstrap/src/main/resources/META-INF/services/org/apache/activemq/broker/server/file @@ -14,4 +14,4 @@ ## See the License for the specific language governing permissions and ## limitations under the License. ## --------------------------------------------------------------------------- -class=org.apache.activemq.factory.FileCoreFactoryHandler +class=org.apache.activemq.factory.FileBrokerHandler diff --git a/activemq-dto/src/main/java/org/apache/activemq/dto/BasicSecurityDTO.java b/activemq-dto/src/main/java/org/apache/activemq/dto/BasicSecurityDTO.java index 7d640113d0..9b25d18cca 100644 --- a/activemq-dto/src/main/java/org/apache/activemq/dto/BasicSecurityDTO.java +++ b/activemq-dto/src/main/java/org/apache/activemq/dto/BasicSecurityDTO.java @@ -18,10 +18,25 @@ package org.apache.activemq.dto; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; @XmlRootElement(name = "basic-security") @XmlAccessorType(XmlAccessType.FIELD) public class BasicSecurityDTO extends SecurityDTO { + @XmlElement(required = true) + public String users; + + @XmlElement(required = true) + public String roles; + + @XmlElement(name = "default-user") + public String defaultUser; + + @XmlElement(name = "mask-password") + public Boolean maskPassword = false; + + @XmlElement + public String passwordCodec; } diff --git a/activemq-dto/src/main/java/org/apache/activemq/dto/BrokerDTO.java b/activemq-dto/src/main/java/org/apache/activemq/dto/BrokerDTO.java index 252b050ef8..a11d6b8901 100644 --- a/activemq-dto/src/main/java/org/apache/activemq/dto/BrokerDTO.java +++ b/activemq-dto/src/main/java/org/apache/activemq/dto/BrokerDTO.java @@ -27,16 +27,13 @@ import java.util.List; @XmlAccessorType(XmlAccessType.FIELD) public class BrokerDTO { - - @XmlElementRef - public CoreDTO core; - - @XmlElementRef(required = false) - public JmsDTO jms; - @XmlElementRef public SecurityDTO security; + @XmlElementRef + public ServerDTO server; + + @XmlElementRef(required = false) public WebServerDTO web; diff --git a/activemq-dto/src/main/java/org/apache/activemq/dto/JmsDTO.java b/activemq-dto/src/main/java/org/apache/activemq/dto/ServerDTO.java similarity index 95% rename from activemq-dto/src/main/java/org/apache/activemq/dto/JmsDTO.java rename to activemq-dto/src/main/java/org/apache/activemq/dto/ServerDTO.java index efa0da2994..9ef2168823 100644 --- a/activemq-dto/src/main/java/org/apache/activemq/dto/JmsDTO.java +++ b/activemq-dto/src/main/java/org/apache/activemq/dto/ServerDTO.java @@ -21,13 +21,12 @@ import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlRootElement; -@XmlRootElement(name = "jms") +@XmlRootElement(name = "server") @XmlAccessorType(XmlAccessType.FIELD) -public class JmsDTO +public class ServerDTO { @XmlAttribute public String configuration; } - diff --git a/activemq-dto/src/main/resources/org/apache/activemq/dto/jaxb.index b/activemq-dto/src/main/resources/org/apache/activemq/dto/jaxb.index index 9cffb01307..5803f734c4 100644 --- a/activemq-dto/src/main/resources/org/apache/activemq/dto/jaxb.index +++ b/activemq-dto/src/main/resources/org/apache/activemq/dto/jaxb.index @@ -15,8 +15,6 @@ ## limitations under the License. ## --------------------------------------------------------------------------- BrokerDTO -CoreDTO -JmsDTO SecurityDTO BasicSecurityDTO diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/impl/FileJMSConfiguration.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/impl/FileJMSConfiguration.java new file mode 100644 index 0000000000..b1fd386abb --- /dev/null +++ b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/impl/FileJMSConfiguration.java @@ -0,0 +1,219 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.activemq.jms.server.config.impl; + +import org.apache.activemq.api.config.ActiveMQDefaultConfiguration; +import org.apache.activemq.core.config.impl.Validators; +import org.apache.activemq.core.deployers.Deployable; +import org.apache.activemq.core.server.ActiveMQComponent; +import org.apache.activemq.core.server.impl.ActiveMQServerImpl; +import org.apache.activemq.jms.server.ActiveMQJMSServerLogger; +import org.apache.activemq.jms.server.config.JMSQueueConfiguration; +import org.apache.activemq.jms.server.config.TopicConfiguration; +import org.apache.activemq.jms.server.impl.JMSServerManagerImpl; +import org.apache.activemq.spi.core.security.ActiveMQSecurityManager; +import org.apache.activemq.utils.XMLConfigurationUtil; +import org.w3c.dom.Element; +import org.w3c.dom.NamedNodeMap; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; + +import javax.management.MBeanServer; +import java.util.ArrayList; +import java.util.Map; + +/** + * @author Andy Taylor + */ +public class FileJMSConfiguration extends JMSConfigurationImpl implements Deployable +{ + private static final String CONFIGURATION_SCHEMA_URL = "schema/activemq-jms.xsd"; + + private static final String CONFIGURATION_SCHEMA_ROOT_ELEMENT = "jms"; + + private static final String NAME_ATTR = "name"; + + private static final String QUEUE_NODE_NAME = "queue"; + + private static final String QUEUE_SELECTOR_NODE_NAME = "selector"; + + private static final String TOPIC_NODE_NAME = "topic"; + + private static final String JMX_DOMAIN_NAME = "jmx-domain"; + + private static final boolean DEFAULT_QUEUE_DURABILITY = true; + + private boolean parsed = false; + + @Override + public void parse(Element config) throws Exception + { + parseConfiguration(config); + parsed = true; + } + + @Override + public boolean isParsed() + { + return parsed; + } + + @Override + public String getRootElement() + { + return CONFIGURATION_SCHEMA_ROOT_ELEMENT; + } + + @Override + public void buildService(ActiveMQSecurityManager securityManager, MBeanServer mBeanServer, Map deployables, Map components) throws Exception + { + ActiveMQServerImpl server = (ActiveMQServerImpl) components.get("core"); + components.put(CONFIGURATION_SCHEMA_ROOT_ELEMENT, new JMSServerManagerImpl(server, this)); + } + + @Override + public String getSchema() + { + return CONFIGURATION_SCHEMA_URL; + } + + + /** + * Parse the JMS Configuration XML + */ + public void parseConfiguration(final Node rootnode) throws Exception + { + + ArrayList queues = new ArrayList<>(); + ArrayList topics = new ArrayList<>(); + + Element e = (Element) rootnode; + + String[] elements = new String[]{QUEUE_NODE_NAME, TOPIC_NODE_NAME}; + for (String element : elements) + { + NodeList children = e.getElementsByTagName(element); + for (int i = 0; i < children.getLength(); i++) + { + Node node = children.item(i); + Node keyNode = node.getAttributes().getNamedItem(NAME_ATTR); + if (keyNode == null) + { + ActiveMQJMSServerLogger.LOGGER.jmsConfigMissingKey(node); + continue; + } + + if (node.getNodeName().equals(TOPIC_NODE_NAME)) + { + topics.add(parseTopicConfiguration(node)); + } + else if (node.getNodeName().equals(QUEUE_NODE_NAME)) + { + queues.add(parseQueueConfiguration(node)); + } + } + } + + String domain = XMLConfigurationUtil.getString(e, JMX_DOMAIN_NAME, ActiveMQDefaultConfiguration.getDefaultJmxDomain(), Validators.NO_CHECK); + + newConfig(queues, topics, domain); + } + + /** + * Parse the topic node as a TopicConfiguration object + * + * @param node + * @return topic configuration + * @throws Exception + */ + public static TopicConfiguration parseTopicConfiguration(final Node node) throws Exception + { + String topicName = node.getAttributes().getNamedItem(NAME_ATTR).getNodeValue(); + + return newTopic(topicName); + } + + /** + * Parse the Queue Configuration node as a QueueConfiguration object + * + * @param node + * @return jms queue configuration + * @throws Exception + */ + public static JMSQueueConfiguration parseQueueConfiguration(final Node node) throws Exception + { + Element e = (Element) node; + NamedNodeMap atts = node.getAttributes(); + String queueName = atts.getNamedItem(NAME_ATTR).getNodeValue(); + String selectorString = null; + boolean durable = XMLConfigurationUtil.getBoolean(e, "durable", DEFAULT_QUEUE_DURABILITY); + NodeList children = node.getChildNodes(); + for (int i = 0; i < children.getLength(); i++) + { + Node child = children.item(i); + + if (QUEUE_SELECTOR_NODE_NAME.equals(children.item(i).getNodeName())) + { + Node selectorNode = children.item(i); + Node attNode = selectorNode.getAttributes().getNamedItem("string"); + selectorString = attNode.getNodeValue(); + } + } + + return newQueue(queueName, selectorString, durable); + } + + /** + * @param topicName + * @return + */ + protected static TopicConfiguration newTopic(final String topicName) + { + return new TopicConfigurationImpl() + .setName(topicName); + } + + /** + * @param queueName + * @param selectorString + * @param durable + * @return + */ + protected static JMSQueueConfiguration newQueue(final String queueName, + final String selectorString, + final boolean durable) + { + return new JMSQueueConfigurationImpl(). + setName(queueName). + setSelector(selectorString). + setDurable(durable); + } + + /** + * @param queues + * @param topics + * @param domain + * @return + */ + protected void newConfig(final ArrayList queues, + final ArrayList topics, String domain) + { + setQueueConfigurations(queues) + .setTopicConfigurations(topics) + .setDomain(domain); + } +} diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/embedded/EmbeddedJMS.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/embedded/EmbeddedJMS.java index e2d55500f3..bb6277ef2d 100644 --- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/embedded/EmbeddedJMS.java +++ b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/embedded/EmbeddedJMS.java @@ -18,11 +18,13 @@ package org.apache.activemq.jms.server.embedded; import javax.naming.Context; +import org.apache.activemq.core.config.FileDeploymentManager; import org.apache.activemq.core.registry.JndiBindingRegistry; import org.apache.activemq.core.registry.MapBindingRegistry; import org.apache.activemq.core.server.embedded.EmbeddedActiveMQ; import org.apache.activemq.jms.server.JMSServerManager; import org.apache.activemq.jms.server.config.JMSConfiguration; +import org.apache.activemq.jms.server.config.impl.FileJMSConfiguration; import org.apache.activemq.jms.server.impl.JMSServerManagerImpl; import org.apache.activemq.spi.core.naming.BindingRegistry; @@ -40,19 +42,9 @@ public class EmbeddedJMS extends EmbeddedActiveMQ { protected JMSServerManagerImpl serverManager; protected BindingRegistry registry; - protected String jmsConfigResourcePath; protected JMSConfiguration jmsConfiguration; protected Context context; - /** - * Classpath resource where JMS config file is. Defaults to 'activemq-jms.xml' - * - * @param jmsConfigResourcePath - */ - public void setJmsConfigResourcePath(String jmsConfigResourcePath) - { - this.jmsConfigResourcePath = jmsConfigResourcePath; - } public BindingRegistry getRegistry() { @@ -113,8 +105,22 @@ public class EmbeddedJMS extends EmbeddedActiveMQ { serverManager = new JMSServerManagerImpl(activeMQServer, jmsConfiguration); } - else if (jmsConfigResourcePath == null) serverManager = new JMSServerManagerImpl(activeMQServer); - else serverManager = new JMSServerManagerImpl(activeMQServer, jmsConfigResourcePath); + else + { + FileJMSConfiguration fileConfiguration = new FileJMSConfiguration(); + FileDeploymentManager deploymentManager; + if (configResourcePath != null) + { + deploymentManager = new FileDeploymentManager(configResourcePath); + } + else + { + deploymentManager = new FileDeploymentManager(); + } + deploymentManager.addDeployable(fileConfiguration); + deploymentManager.readConfiguration(); + serverManager = new JMSServerManagerImpl(activeMQServer, fileConfiguration); + } if (registry == null) { diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/impl/JMSServerConfigParserImpl.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/impl/JMSServerConfigParserImpl.java deleted file mode 100644 index cd948c13dd..0000000000 --- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/impl/JMSServerConfigParserImpl.java +++ /dev/null @@ -1,205 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.activemq.jms.server.impl; - -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.Reader; -import java.util.ArrayList; - -import org.apache.activemq.api.config.ActiveMQDefaultConfiguration; -import org.apache.activemq.core.config.impl.Validators; -import org.apache.activemq.jms.server.ActiveMQJMSServerLogger; -import org.apache.activemq.jms.server.JMSServerConfigParser; -import org.apache.activemq.jms.server.config.ConnectionFactoryConfiguration; -import org.apache.activemq.jms.server.config.JMSConfiguration; -import org.apache.activemq.jms.server.config.JMSQueueConfiguration; -import org.apache.activemq.jms.server.config.TopicConfiguration; -import org.apache.activemq.jms.server.config.impl.JMSConfigurationImpl; -import org.apache.activemq.jms.server.config.impl.JMSQueueConfigurationImpl; -import org.apache.activemq.jms.server.config.impl.TopicConfigurationImpl; -import org.apache.activemq.utils.XMLConfigurationUtil; -import org.apache.activemq.utils.XMLUtil; -import org.w3c.dom.Element; -import org.w3c.dom.NamedNodeMap; -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; - -/** - * JMS Configuration File Parser. - * - * @author Clebert Suconic - */ -public final class JMSServerConfigParserImpl implements JMSServerConfigParser -{ - protected static final String NAME_ATTR = "name"; - - public JMSServerConfigParserImpl() - { - } - - /** - * Parse the JMS Configuration XML as a JMSConfiguration object - */ - public JMSConfiguration parseConfiguration(final InputStream stream) throws Exception - { - Reader reader = new InputStreamReader(stream); - String xml = org.apache.activemq.utils.XMLUtil.readerToString(reader); - xml = XMLUtil.replaceSystemProps(xml); - return parseConfiguration(XMLUtil.stringToElement(xml)); - } - - /** - * Parse the JMS Configuration XML as a JMSConfiguration object - */ - public JMSConfiguration parseConfiguration(final Node rootnode) throws Exception - { - - ArrayList queues = new ArrayList(); - ArrayList topics = new ArrayList(); - ArrayList cfs = new ArrayList(); - String domain = ActiveMQDefaultConfiguration.getDefaultJmxDomain(); - - Element e = (Element) rootnode; - - org.apache.activemq.utils.XMLUtil.validate(rootnode, "schema/activemq-jms.xsd"); - - String[] elements = new String[]{JMSServerDeployer.QUEUE_NODE_NAME, - JMSServerDeployer.TOPIC_NODE_NAME}; - for (String element : elements) - { - NodeList children = e.getElementsByTagName(element); - for (int i = 0; i < children.getLength(); i++) - { - Node node = children.item(i); - Node keyNode = node.getAttributes().getNamedItem(JMSServerConfigParserImpl.NAME_ATTR); - if (keyNode == null) - { - ActiveMQJMSServerLogger.LOGGER.jmsConfigMissingKey(node); - continue; - } - - if (node.getNodeName().equals(JMSServerDeployer.TOPIC_NODE_NAME)) - { - topics.add(parseTopicConfiguration(node)); - } - else if (node.getNodeName().equals(JMSServerDeployer.QUEUE_NODE_NAME)) - { - queues.add(parseQueueConfiguration(node)); - } - } - } - - domain = XMLConfigurationUtil.getString(e, JMSServerDeployer.JMX_DOMAIN_NAME, ActiveMQDefaultConfiguration.getDefaultJmxDomain(), Validators.NO_CHECK); - - - JMSConfiguration value = newConfig(queues, topics, domain); - - return value; - } - - /** - * Parse the topic node as a TopicConfiguration object - * - * @param node - * @return topic configuration - * @throws Exception - */ - public TopicConfiguration parseTopicConfiguration(final Node node) throws Exception - { - String topicName = node.getAttributes().getNamedItem(JMSServerConfigParserImpl.NAME_ATTR).getNodeValue(); - - return newTopic(topicName); - } - - /** - * Parse the Queue Configuration node as a QueueConfiguration object - * - * @param node - * @return jms queue configuration - * @throws Exception - */ - public JMSQueueConfiguration parseQueueConfiguration(final Node node) throws Exception - { - Element e = (Element) node; - NamedNodeMap atts = node.getAttributes(); - String queueName = atts.getNamedItem(JMSServerConfigParserImpl.NAME_ATTR).getNodeValue(); - String selectorString = null; - boolean durable = XMLConfigurationUtil.getBoolean(e, "durable", JMSServerDeployer.DEFAULT_QUEUE_DURABILITY); - NodeList children = node.getChildNodes(); - for (int i = 0; i < children.getLength(); i++) - { - Node child = children.item(i); - - if (JMSServerDeployer.QUEUE_SELECTOR_NODE_NAME.equals(children.item(i).getNodeName())) - { - Node selectorNode = children.item(i); - Node attNode = selectorNode.getAttributes().getNamedItem("string"); - selectorString = attNode.getNodeValue(); - } - } - - return newQueue(queueName, selectorString, durable); - } - - /** - * hook for integration layers - * - * @param topicName - * @return - */ - protected TopicConfiguration newTopic(final String topicName) - { - return new TopicConfigurationImpl() - .setName(topicName); - } - - /** - * hook for integration layers - * - * @param queueName - * @param selectorString - * @param durable - * @return - */ - protected JMSQueueConfiguration newQueue(final String queueName, - final String selectorString, - final boolean durable) - { - return new JMSQueueConfigurationImpl(). - setName(queueName). - setSelector(selectorString). - setDurable(durable); - } - - /** - * hook for integration layers - * - * @param queues - * @param topics - * @param domain - * @return - */ - protected JMSConfiguration newConfig(final ArrayList queues, - final ArrayList topics, String domain) - { - return new JMSConfigurationImpl() - .setQueueConfigurations(queues) - .setTopicConfigurations(topics) - .setDomain(domain); - } -} diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/impl/JMSServerDeployer.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/impl/JMSServerDeployer.java deleted file mode 100644 index 7d3d5681ec..0000000000 --- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/impl/JMSServerDeployer.java +++ /dev/null @@ -1,153 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.activemq.jms.server.impl; - -import org.apache.activemq.core.deployers.DeploymentManager; -import org.apache.activemq.core.deployers.impl.XmlDeployer; -import org.apache.activemq.jms.server.JMSServerConfigParser; -import org.apache.activemq.jms.server.JMSServerManager; -import org.apache.activemq.jms.server.config.JMSQueueConfiguration; -import org.apache.activemq.jms.server.config.TopicConfiguration; -import org.w3c.dom.Node; - -/** - * @author Andy Taylor - * @author Tim Fox - * @author Jeff Mesnil - */ -public class JMSServerDeployer extends XmlDeployer -{ - private final JMSServerConfigParser parser; - - private final JMSServerManager jmsServerManager; - - protected static final String QUEUE_NODE_NAME = "queue"; - - protected static final String QUEUE_SELECTOR_NODE_NAME = "selector"; - - protected static final String TOPIC_NODE_NAME = "topic"; - - protected static final String JMX_DOMAIN_NAME = "jmx-domain"; - - protected static final boolean DEFAULT_QUEUE_DURABILITY = true; - - public JMSServerDeployer(final JMSServerManager jmsServerManager, - final DeploymentManager deploymentManager) - { - super(deploymentManager); - - this.jmsServerManager = jmsServerManager; - - parser = new JMSServerConfigParserImpl(); - } - - /** - * the names of the elements to deploy - * - * @return the names of the elements todeploy - */ - @Override - public String[] getElementTagName() - { - return new String[]{JMSServerDeployer.QUEUE_NODE_NAME, - JMSServerDeployer.TOPIC_NODE_NAME}; - } - - @Override - public void validate(final Node rootNode) throws Exception - { - org.apache.activemq.utils.XMLUtil.validate(rootNode, "schema/activemq-jms.xsd"); - } - - /** - * deploy an element - * - * @param node the element to deploy - * @throws Exception - */ - @Override - public void deploy(final Node node) throws Exception - { - createAndBindObject(node); - } - - /** - * Creates the object to bind, this will either be a ActiveMQQueue or ActiveMQTopic. - * - * @param node the config - * @throws Exception - */ - private void createAndBindObject(final Node node) throws Exception - { - if (node.getNodeName().equals(JMSServerDeployer.QUEUE_NODE_NAME)) - { - deployQueue(node); - } - else if (node.getNodeName().equals(JMSServerDeployer.TOPIC_NODE_NAME)) - { - deployTopic(node); - } - } - - /** - * Undeploys an element. - * - * @param node the element to undeploy - * @throws Exception - */ - @Override - public void undeploy(final Node node) throws Exception - { - if (node.getNodeName().equals(JMSServerDeployer.QUEUE_NODE_NAME)) - { - String queueName = node.getAttributes().getNamedItem(getKeyAttribute()).getNodeValue(); - jmsServerManager.removeQueueFromBindingRegistry(queueName); - } - else if (node.getNodeName().equals(JMSServerDeployer.TOPIC_NODE_NAME)) - { - String topicName = node.getAttributes().getNamedItem(getKeyAttribute()).getNodeValue(); - jmsServerManager.removeTopicFromBindingRegistry(topicName); - } - } - - @Override - public String[] getDefaultConfigFileNames() - { - return new String[]{"activemq-jms.xml"}; - } - - - /** - * @param node - * @throws Exception - */ - private void deployTopic(final Node node) throws Exception - { - TopicConfiguration topicConfig = parser.parseTopicConfiguration(node); - jmsServerManager.createTopic(false, topicConfig.getName()); - } - - /** - * @param node - * @throws Exception - */ - private void deployQueue(final Node node) throws Exception - { - JMSQueueConfiguration queueconfig = parser.parseQueueConfiguration(node); - jmsServerManager.createQueue(false, queueconfig.getName(), queueconfig.getSelector(), queueconfig.isDurable()); - } -} diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/impl/JMSServerManagerImpl.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/impl/JMSServerManagerImpl.java index 5e9fa43955..020dd368a9 100644 --- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/impl/JMSServerManagerImpl.java +++ b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/impl/JMSServerManagerImpl.java @@ -42,9 +42,6 @@ import org.apache.activemq.api.core.management.ResourceNames; import org.apache.activemq.api.jms.ActiveMQJMSClient; import org.apache.activemq.api.jms.JMSFactoryType; import org.apache.activemq.core.config.Configuration; -import org.apache.activemq.core.deployers.DeploymentManager; -import org.apache.activemq.core.deployers.impl.FileDeploymentManager; -import org.apache.activemq.core.deployers.impl.XmlDeployer; import org.apache.activemq.core.postoffice.Binding; import org.apache.activemq.core.postoffice.BindingType; import org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory; @@ -130,16 +127,10 @@ public class JMSServerManagerImpl implements JMSServerManager, ActivateCallback private JMSManagementService jmsManagementService; - private XmlDeployer jmsDeployer; - private boolean startCalled; private boolean active; - private DeploymentManager deploymentManager; - - private final String configFileName; - private JMSConfiguration config; private Configuration coreConfig; @@ -153,8 +144,6 @@ public class JMSServerManagerImpl implements JMSServerManager, ActivateCallback this.server = server; this.coreConfig = server.getConfiguration(); - - configFileName = null; } /** @@ -170,44 +159,18 @@ public class JMSServerManagerImpl implements JMSServerManager, ActivateCallback this.coreConfig = server.getConfiguration(); - configFileName = null; - this.registry = registry; } - public JMSServerManagerImpl(final ActiveMQServer server, final String configFileName) throws Exception - { - this.server = server; - - this.coreConfig = server.getConfiguration(); - - this.configFileName = configFileName; - } - public JMSServerManagerImpl(final ActiveMQServer server, final JMSConfiguration configuration) throws Exception { this.server = server; this.coreConfig = server.getConfiguration(); - configFileName = null; - config = configuration; } - /** - * Unused - */ - @Deprecated - public JMSServerManagerImpl(ActiveMQServer server, String configFilename, JMSStorageManager storageManager) - { - this.server = server; - - configFileName = null; - - storage = storageManager; - } - // ActivateCallback implementation ------------------------------------- public void preActivate() @@ -234,27 +197,7 @@ public class JMSServerManagerImpl implements JMSServerManager, ActivateCallback initJournal(); - // start the JMS deployer only if the configuration is not done using the JMSConfiguration object - if (config == null) - { - if (server.getConfiguration().isFileDeploymentEnabled()) - { - jmsDeployer = new JMSServerDeployer(this, deploymentManager); - - if (configFileName != null) - { - jmsDeployer.setConfigFileNames(new String[]{configFileName}); - } - - jmsDeployer.start(); - - deploymentManager.start(); - } - } - else - { - deploy(); - } + deploy(); for (Runnable run : cachedCommands) { @@ -285,16 +228,6 @@ public class JMSServerManagerImpl implements JMSServerManager, ActivateCallback return; } - if (jmsDeployer != null) - { - jmsDeployer.stop(); - } - - if (deploymentManager != null) - { - deploymentManager.stop(); - } - // Storage could be null on a shared store backup server before initialization if (storage != null && storage.isStarted()) { @@ -329,7 +262,6 @@ public class JMSServerManagerImpl implements JMSServerManager, ActivateCallback jmsManagementService.stop(); } - jmsDeployer = null; jmsManagementService = null; active = false; @@ -472,7 +404,6 @@ public class JMSServerManagerImpl implements JMSServerManager, ActivateCallback return; } - deploymentManager = new FileDeploymentManager(server.getConfiguration().getFileDeployerScanPeriod()); server.registerActivateCallback(this); /** * See this method's javadoc. diff --git a/activemq-jms-server/src/main/resources/schema/activemq-jms.xsd b/activemq-jms-server/src/main/resources/schema/activemq-jms.xsd index b1b728c565..0a01c32e1b 100644 --- a/activemq-jms-server/src/main/resources/schema/activemq-jms.xsd +++ b/activemq-jms-server/src/main/resources/schema/activemq-jms.xsd @@ -16,14 +16,13 @@ limitations under the License. --> - + - + diff --git a/activemq-rest/src/test/java/org/apache/activemq/rest/test/EmbeddedTest.java b/activemq-rest/src/test/java/org/apache/activemq/rest/test/EmbeddedTest.java index 1ab39d4ed2..e5a322d16d 100644 --- a/activemq-rest/src/test/java/org/apache/activemq/rest/test/EmbeddedTest.java +++ b/activemq-rest/src/test/java/org/apache/activemq/rest/test/EmbeddedTest.java @@ -27,9 +27,11 @@ import java.util.ArrayList; import java.util.List; import org.apache.activemq.api.jms.JMSFactoryType; +import org.apache.activemq.core.config.impl.FileSecurityConfiguration; import org.apache.activemq.rest.HttpHeaderProperty; import org.apache.activemq.rest.integration.EmbeddedRestActiveMQJMS; import org.apache.activemq.spi.core.naming.BindingRegistry; +import org.apache.activemq.spi.core.security.ActiveMQSecurityManagerImpl; import org.jboss.resteasy.client.ClientRequest; import org.jboss.resteasy.client.ClientResponse; import org.jboss.resteasy.spi.Link; @@ -51,6 +53,13 @@ public class EmbeddedTest { server = new EmbeddedRestActiveMQJMS(); server.getManager().setConfigResourcePath("activemq-rest.xml"); + FileSecurityConfiguration securityConfiguration = new FileSecurityConfiguration("activemq-users.properties", + "activemq-roles.properties", + "guest", + false, + null); + securityConfiguration.start(); + server.getEmbeddedJMS().setSecurityManager(new ActiveMQSecurityManagerImpl(securityConfiguration)); server.start(); List connectors = new ArrayList<>(); connectors.add("in-vm"); diff --git a/activemq-rest/src/test/resources/activemq-configuration.xml b/activemq-rest/src/test/resources/activemq-configuration.xml index 13828ec4e9..f8cb882a78 100644 --- a/activemq-rest/src/test/resources/activemq-configuration.xml +++ b/activemq-rest/src/test/resources/activemq-configuration.xml @@ -16,35 +16,42 @@ --> + xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd"> + + + + - false - + - - - org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory - - + false + - - - org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory - - + + + org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory + + - + + + org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory + + - - - - - - - - - - - + + + + + + + + + + + + + + diff --git a/activemq-rest/src/test/resources/activemq-jms.xml b/activemq-rest/src/test/resources/activemq-jms.xml deleted file mode 100644 index b6016bf508..0000000000 --- a/activemq-rest/src/test/resources/activemq-jms.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - diff --git a/activemq-bootstrap/src/main/resources/META-INF/services/org/apache/activemq/broker/jms/file b/activemq-rest/src/test/resources/activemq-roles.properties similarity index 76% rename from activemq-bootstrap/src/main/resources/META-INF/services/org/apache/activemq/broker/jms/file rename to activemq-rest/src/test/resources/activemq-roles.properties index 08e1f76ed8..4e2d44cec4 100644 --- a/activemq-bootstrap/src/main/resources/META-INF/services/org/apache/activemq/broker/jms/file +++ b/activemq-rest/src/test/resources/activemq-roles.properties @@ -1,12 +1,12 @@ ## --------------------------------------------------------------------------- ## Licensed to the Apache Software Foundation (ASF) under one or more -## contributor license agreements. See the NOTICE file distributed with +## contributor license agreements. See the NOTICE file distributed with ## this work for additional information regarding copyright ownership. ## The ASF licenses this file to You under the Apache License, Version 2.0 ## (the "License"); you may not use this file except in compliance with -## the License. You may obtain a copy of the License at +## the License. You may obtain a copy of the License at ## -## http://www.apache.org/licenses/LICENSE-2.0 +## http://www.apache.org/licenses/LICENSE-2.0 ## ## Unless required by applicable law or agreed to in writing, software ## distributed under the License is distributed on an "AS IS" BASIS, @@ -14,4 +14,4 @@ ## See the License for the specific language governing permissions and ## limitations under the License. ## --------------------------------------------------------------------------- -class=org.apache.activemq.factory.FileJmsFactoryHandler +guest=guest \ No newline at end of file diff --git a/activemq-rest/src/test/resources/activemq-users.properties b/activemq-rest/src/test/resources/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/activemq-rest/src/test/resources/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/activemq-rest/src/test/resources/activemq-users.xml b/activemq-rest/src/test/resources/activemq-users.xml deleted file mode 100644 index 61c6afecf0..0000000000 --- a/activemq-rest/src/test/resources/activemq-users.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/activemq-server/src/main/java/org/apache/activemq/core/config/Configuration.java b/activemq-server/src/main/java/org/apache/activemq/core/config/Configuration.java index 22a0b0eaba..f6974cd52f 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/config/Configuration.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/config/Configuration.java @@ -131,17 +131,6 @@ public interface Configuration extends Serializable @Deprecated Configuration setSharedStore(boolean sharedStore); - /** - * Returns whether this server will use files to configure and deploy its resources.
- * Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_FILE_DEPLOYMENT_ENABLED}. - */ - boolean isFileDeploymentEnabled(); - - /** - * Sets whether this server will use files to configure and deploy its resources. - */ - Configuration setFileDeploymentEnabled(boolean enable); - /** * Returns whether this server is using persistence and store data.
* Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_PERSISTENCE_ENABLED}. diff --git a/activemq-server/src/main/java/org/apache/activemq/core/config/FileDeploymentManager.java b/activemq-server/src/main/java/org/apache/activemq/core/config/FileDeploymentManager.java new file mode 100644 index 0000000000..66384bfcfa --- /dev/null +++ b/activemq-server/src/main/java/org/apache/activemq/core/config/FileDeploymentManager.java @@ -0,0 +1,115 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.activemq.core.config; + +import org.apache.activemq.core.deployers.Deployable; +import org.apache.activemq.core.server.ActiveMQComponent; +import org.apache.activemq.spi.core.security.ActiveMQSecurityManager; +import org.apache.activemq.utils.XMLUtil; +import org.w3c.dom.Element; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; + +import javax.management.MBeanServer; +import java.io.InputStreamReader; +import java.io.Reader; +import java.net.URL; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.Map; + +/** + * ised to build a set of ActiveMQComponents from a set of Deployables pulled out of the configuration file + */ +public class FileDeploymentManager +{ + private static final String DEFAULT_CONFIGURATION_URL = "activemq-configuration.xml"; + + private final String configurationUrl; + + LinkedHashMap deployables = new LinkedHashMap<>(); + + public FileDeploymentManager() + { + this.configurationUrl = DEFAULT_CONFIGURATION_URL; + } + + public FileDeploymentManager(String configurationUrl) + { + this.configurationUrl = configurationUrl; + } + + /* + * parse a set of configuration with the Deployables that were given. + */ + public void readConfiguration() throws Exception + { + URL url = getClass().getClassLoader().getResource(configurationUrl); + + if (url == null) + { + // The URL is outside of the classloader. Trying a pure url now + url = new URL(configurationUrl); + } + // create a reader + Reader reader = new InputStreamReader(url.openStream()); + String xml = org.apache.activemq.utils.XMLUtil.readerToString(reader); + //replace any system props + xml = XMLUtil.replaceSystemProps(xml); + Element e = org.apache.activemq.utils.XMLUtil.stringToElement(xml); + + //iterate around all the deployables + for (Deployable deployable : deployables.values()) + { + String root = deployable.getRootElement(); + NodeList children = e.getElementsByTagName(root); + //if the root element exists then parse it + if (root != null && children.getLength() > 0) + { + Node item = children.item(0); + XMLUtil.validate(item, deployable.getSchema()); + deployable.parse((Element) item); + } + } + } + + /* + * Build a set of ActiveMQComponents from the Deployables configured + */ + public Map buildService(ActiveMQSecurityManager securityManager, MBeanServer mBeanServer) throws Exception + { + Map components = new HashMap<>(); + for (Deployable deployable : deployables.values()) + { + // if the deployable was parsed then build the service + if (deployable.isParsed()) + { + deployable.buildService(securityManager, mBeanServer, deployables, components); + } + } + return components; + } + + /* + * add a Deployable to be configured + */ + public FileDeploymentManager addDeployable(Deployable deployable) + { + deployables.put(deployable.getRootElement(), deployable); + return this; + } +} diff --git a/activemq-server/src/main/java/org/apache/activemq/core/config/impl/ConfigurationImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/config/impl/ConfigurationImpl.java index 0c69c2bd9f..f951099590 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/config/impl/ConfigurationImpl.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/config/impl/ConfigurationImpl.java @@ -65,8 +65,6 @@ public class ConfigurationImpl implements Configuration private String name = "ConfigurationImpl::" + System.identityHashCode(this); - protected boolean fileDeploymentEnabled = ActiveMQDefaultConfiguration.isDefaultFileDeploymentEnabled(); - private boolean persistenceEnabled = ActiveMQDefaultConfiguration.isDefaultPersistenceEnabled(); protected long fileDeploymentScanPeriod = ActiveMQDefaultConfiguration.getDefaultFileDeployerScanPeriod(); @@ -224,17 +222,6 @@ public class ConfigurationImpl implements Configuration return !getClusterConfigurations().isEmpty(); } - public boolean isFileDeploymentEnabled() - { - return fileDeploymentEnabled; - } - - public ConfigurationImpl setFileDeploymentEnabled(final boolean enable) - { - fileDeploymentEnabled = enable; - return this; - } - public boolean isPersistenceEnabled() { return persistenceEnabled; @@ -1360,7 +1347,6 @@ public class ConfigurationImpl implements Configuration result = prime * result + ((discoveryGroupConfigurations == null) ? 0 : discoveryGroupConfigurations.hashCode()); result = prime * result + ((divertConfigurations == null) ? 0 : divertConfigurations.hashCode()); result = prime * result + (failoverOnServerShutdown ? 1231 : 1237); - result = prime * result + (fileDeploymentEnabled ? 1231 : 1237); result = prime * result + (int)(fileDeploymentScanPeriod ^ (fileDeploymentScanPeriod >>> 32)); result = prime * result + ((groupingHandlerConfiguration == null) ? 0 : groupingHandlerConfiguration.hashCode()); result = prime * result + idCacheSize; @@ -1528,8 +1514,6 @@ public class ConfigurationImpl implements Configuration return false; if (failoverOnServerShutdown != other.failoverOnServerShutdown) return false; - if (fileDeploymentEnabled != other.fileDeploymentEnabled) - return false; if (fileDeploymentScanPeriod != other.fileDeploymentScanPeriod) return false; if (groupingHandlerConfiguration == null) diff --git a/activemq-server/src/main/java/org/apache/activemq/core/config/impl/FileConfiguration.java b/activemq-server/src/main/java/org/apache/activemq/core/config/impl/FileConfiguration.java index f4bfd2130c..0d19be2c6c 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/config/impl/FileConfiguration.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/config/impl/FileConfiguration.java @@ -16,68 +16,39 @@ */ package org.apache.activemq.core.config.impl; -import java.io.InputStreamReader; -import java.io.Reader; -import java.net.URL; +import java.util.Map; +import org.apache.activemq.core.deployers.Deployable; import org.apache.activemq.core.deployers.impl.FileConfigurationParser; -import org.apache.activemq.core.server.ActiveMQServerLogger; -import org.apache.activemq.utils.XMLUtil; +import org.apache.activemq.core.server.ActiveMQComponent; +import org.apache.activemq.core.server.impl.ActiveMQServerImpl; +import org.apache.activemq.spi.core.security.ActiveMQSecurityManager; import org.w3c.dom.Element; +import javax.management.MBeanServer; + /** * A {@code FileConfiguration} reads configuration values from a file. * * @author Andy Taylor * @author Tim Fox */ -public final class FileConfiguration extends ConfigurationImpl +public final class FileConfiguration extends ConfigurationImpl implements Deployable { private static final long serialVersionUID = -4766689627675039596L; - // Constants ------------------------------------------------------------------------ - private static final String DEFAULT_CONFIGURATION_URL = "activemq-configuration.xml"; + private static final String CONFIGURATION_SCHEMA_URL = "schema/activemq-configuration.xsd"; + + private static final String CONFIGURATION_SCHEMA_ROOT_ELEMENT = "core"; // For a bridge confirmations must be activated or send acknowledgments won't return public static final int DEFAULT_CONFIRMATION_WINDOW_SIZE = 1024 * 1024; - public FileConfiguration() + private boolean parsed = false; + + @Override + public void parse(Element config) throws Exception { - configurationUrl = DEFAULT_CONFIGURATION_URL; - } - - public FileConfiguration(String configurationUrl) - { - this.configurationUrl = configurationUrl; - } - - private String configurationUrl = DEFAULT_CONFIGURATION_URL; - - private boolean started; - - public synchronized void start() throws Exception - { - if (started) - { - return; - } - - - URL url = getClass().getClassLoader().getResource(configurationUrl); - - if (url == null) - { - // The URL is outside of the classloader. Trying a pure url now - url = new URL(configurationUrl); - } - - ActiveMQServerLogger.LOGGER.debug("Loading server configuration from " + url); - - Reader reader = new InputStreamReader(url.openStream()); - String xml = org.apache.activemq.utils.XMLUtil.readerToString(reader); - xml = XMLUtil.replaceSystemProps(xml); - Element e = org.apache.activemq.utils.XMLUtil.stringToElement(xml); - FileConfigurationParser parser = new FileConfigurationParser(); // https://jira.jboss.org/browse/HORNETQ-478 - We only want to validate AIO when @@ -85,24 +56,32 @@ public final class FileConfiguration extends ConfigurationImpl // and we don't want to do it when deploying activemq-queues.xml which uses the same parser and XML format parser.setValidateAIO(true); - parser.parseMainConfig(e, this); - - started = true; + parser.parseMainConfig(config, this); + parsed = true; } - public synchronized void stop() throws Exception + @Override + public boolean isParsed() { - started = false; + return parsed; } - public String getConfigurationUrl() + @Override + public String getRootElement() { - return configurationUrl; + return CONFIGURATION_SCHEMA_ROOT_ELEMENT; } - public void setConfigurationUrl(final String configurationUrl) + @Override + public void buildService(ActiveMQSecurityManager securityManager, MBeanServer mBeanServer, Map deployables, Map components) { - this.configurationUrl = configurationUrl; + components.put(getRootElement(), new ActiveMQServerImpl(this, mBeanServer, securityManager)); + } + + @Override + public String getSchema() + { + return CONFIGURATION_SCHEMA_URL; } } diff --git a/activemq-server/src/main/java/org/apache/activemq/core/config/impl/FileSecurityConfiguration.java b/activemq-server/src/main/java/org/apache/activemq/core/config/impl/FileSecurityConfiguration.java new file mode 100644 index 0000000000..554e7598e6 --- /dev/null +++ b/activemq-server/src/main/java/org/apache/activemq/core/config/impl/FileSecurityConfiguration.java @@ -0,0 +1,127 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.activemq.core.config.impl; + +import org.apache.activemq.utils.PasswordMaskingUtil; +import org.apache.activemq.utils.SensitiveDataCodec; + +import java.net.URL; +import java.util.Properties; +import java.util.Set; + +/** + * @author Andy Taylor + */ +public class FileSecurityConfiguration extends SecurityConfiguration +{ + private final String usersUrl; + + private final String rolesUrl; + + private boolean maskPassword; + + private String passwordCodec; + + private boolean started; + + public FileSecurityConfiguration(String usersUrl, String rolesUrl, String defaultUser, Boolean maskPassword, String passwordCodec) + { + this.usersUrl = usersUrl; + this.rolesUrl = rolesUrl; + this.defaultUser = defaultUser; + this.maskPassword = maskPassword; + this.passwordCodec = passwordCodec; + } + + public void stop() throws Exception + { + users.clear(); + + roles.clear(); + + defaultUser = null; + } + + public boolean isStarted() + { + return true; + } + + + public synchronized void start() throws Exception + { + if (started) + { + return; + } + SensitiveDataCodec codec = null; + if (maskPassword) + { + if (passwordCodec != null) + { + codec = PasswordMaskingUtil.getDefaultCodec(); + } + else + { + codec = PasswordMaskingUtil.getCodec(passwordCodec); + } + } + URL theUsersUrl = getClass().getClassLoader().getResource(usersUrl); + + if (theUsersUrl == null) + { + // The URL is outside of the classloader. Trying a pure url now + theUsersUrl = new URL(usersUrl); + } + Properties userProps = new Properties(); + userProps.load(theUsersUrl.openStream()); + URL theRolesUrl = getClass().getClassLoader().getResource(usersUrl); + + if (theRolesUrl == null) + { + // The URL is outside of the classloader. Trying a pure url now + theRolesUrl = new URL(rolesUrl); + } + Properties roleProps = new Properties(); + roleProps.load(theRolesUrl.openStream()); + + Set keys = userProps.stringPropertyNames(); + + for (String username : keys) + { + String password = userProps.getProperty(username); + if (codec != null) + { + password = codec.decode(password); + } + addUser(username, password); + } + + for (String username : keys) + { + String roles = roleProps.getProperty(username); + String[] split = roles.split(","); + for (String role : split) + { + addRole(username, role.trim()); + } + } + + started = true; + + } +} diff --git a/activemq-server/src/main/java/org/apache/activemq/core/config/impl/SecurityConfiguration.java b/activemq-server/src/main/java/org/apache/activemq/core/config/impl/SecurityConfiguration.java new file mode 100644 index 0000000000..81decfd796 --- /dev/null +++ b/activemq-server/src/main/java/org/apache/activemq/core/config/impl/SecurityConfiguration.java @@ -0,0 +1,103 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.activemq.core.config.impl; + +import org.apache.activemq.core.security.User; +import org.apache.activemq.core.server.ActiveMQMessageBundle; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * @author Andy Taylor + */ +public class SecurityConfiguration +{ /** + * the current valid users + */ + protected final Map users = new HashMap(); + + protected String defaultUser = null; + + /** + * the roles for the users + */ + protected final Map> roles = new HashMap>(); + + + public void addUser(final String user, final String password) + { + if (user == null) + { + throw ActiveMQMessageBundle.BUNDLE.nullUser(); + } + if (password == null) + { + throw ActiveMQMessageBundle.BUNDLE.nullPassword(); + } + users.put(user, new User(user, password)); + } + + public void removeUser(final String user) + { + users.remove(user); + roles.remove(user); + } + + public void addRole(final String user, final String role) + { + if (roles.get(user) == null) + { + roles.put(user, new ArrayList()); + } + roles.get(user).add(role); + } + + public void removeRole(final String user, final String role) + { + if (roles.get(user) == null) + { + return; + } + roles.get(user).remove(role); + } + + /* + * set the default user for null users + */ + public void setDefaultUser(final String username) + { + defaultUser = username; + } + + public String getDefaultUser() + { + return defaultUser; + } + + public org.apache.activemq.core.security.User getUser(String username) + { + return users.get(username); + } + + public List getRole(String username) + { + return roles.get(username); + } +} diff --git a/activemq-server/src/main/java/org/apache/activemq/core/deployers/Deployable.java b/activemq-server/src/main/java/org/apache/activemq/core/deployers/Deployable.java new file mode 100644 index 0000000000..282bda43f5 --- /dev/null +++ b/activemq-server/src/main/java/org/apache/activemq/core/deployers/Deployable.java @@ -0,0 +1,57 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.activemq.core.deployers; + +import org.apache.activemq.core.server.ActiveMQComponent; +import org.apache.activemq.spi.core.security.ActiveMQSecurityManager; +import org.w3c.dom.Element; + +import javax.management.MBeanServer; +import java.util.Map; + +/** + * A Deployable is an object that can be configured via an xml configuration element in the main configuration file "activemq-configuration.xml" + * It holds all the information needed by the FileDeploymentManager to parse the configuration and build the component + */ +public interface Deployable +{ + /* + * parse the element from the xml configuration + */ + void parse(Element config) throws Exception; + + /* + * has this Deployable been parsed + */ + boolean isParsed(); + + /* + * The name of the root xml element for this Deployable, i.e. core or jms + */ + String getRootElement(); + + /* + * The schema that should be used to validate the xml + */ + String getSchema(); + + /* + * builds the service. The implementation should add a component to the components map passed in if it needs to. + */ + void buildService(ActiveMQSecurityManager securityManager, MBeanServer mBeanServer, Map deployables, Map components) throws Exception; + +} diff --git a/activemq-server/src/main/java/org/apache/activemq/core/deployers/Deployer.java b/activemq-server/src/main/java/org/apache/activemq/core/deployers/Deployer.java deleted file mode 100644 index cfdc722aa6..0000000000 --- a/activemq-server/src/main/java/org/apache/activemq/core/deployers/Deployer.java +++ /dev/null @@ -1,57 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.activemq.core.deployers; - -import java.net.URI; - -import org.apache.activemq.core.server.ActiveMQComponent; - -/** - * abstract class that helps with deployment of messaging components. - * - * @author Andy Taylor - */ -public interface Deployer extends ActiveMQComponent -{ - /** - * The name of the configuration files to look for for deployment - * - * @return The names of the config files - */ - String[] getConfigFileNames(); - - /** - * Deploy the URL for the first time - * @param uri The resource todeploy - * @throws Exception - */ - void deploy(URI uri) throws Exception; - - /** - * Redeploys a URL if changed - * @param uri The resource to redeploy - * @throws Exception - */ - void redeploy(URI uri) throws Exception; - - /** - * Undeploys a resource that has been removed - * @param uri The Resource that was deleted - * @throws Exception - */ - void undeploy(URI uri) throws Exception; -} \ No newline at end of file diff --git a/activemq-server/src/main/java/org/apache/activemq/core/deployers/DeploymentManager.java b/activemq-server/src/main/java/org/apache/activemq/core/deployers/DeploymentManager.java deleted file mode 100644 index 6f0f88241b..0000000000 --- a/activemq-server/src/main/java/org/apache/activemq/core/deployers/DeploymentManager.java +++ /dev/null @@ -1,41 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.activemq.core.deployers; - -import org.apache.activemq.core.server.ActiveMQComponent; - -/** - * This class manages any configuration files available. It will notify any deployers registered with it on changes. - * - * @author Andy Taylor - */ -public interface DeploymentManager extends ActiveMQComponent -{ - /** - * registers a deployable object which will handle the deployment of URL's - * @param deployer The deployable object - * @throws Exception - */ - void registerDeployer(Deployer deployer) throws Exception; - - /** - * unregisters a deployable object which will handle the deployment of URL's - * @param deployer The deployable object - * @throws Exception - */ - void unregisterDeployer(Deployer deployer) throws Exception; -} diff --git a/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/AddressSettingsDeployer.java b/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/AddressSettingsDeployer.java deleted file mode 100644 index d3af73a1c6..0000000000 --- a/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/AddressSettingsDeployer.java +++ /dev/null @@ -1,106 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.activemq.core.deployers.impl; - -import org.apache.activemq.api.core.Pair; -import org.apache.activemq.core.deployers.DeploymentManager; -import org.apache.activemq.core.settings.HierarchicalRepository; -import org.apache.activemq.core.settings.impl.AddressSettings; -import org.w3c.dom.Node; - -/** - * A deployer for creating a set of queue settings and adding them to a repository - * - * @author Andy Taylor - */ -public class AddressSettingsDeployer extends XmlDeployer -{ - private final HierarchicalRepository addressSettingsRepository; - - private final FileConfigurationParser parser = new FileConfigurationParser(); - - public AddressSettingsDeployer(final DeploymentManager deploymentManager, - final HierarchicalRepository addressSettingsRepository) - { - super(deploymentManager); - this.addressSettingsRepository = addressSettingsRepository; - } - - /** - * the names of the elements to deploy - * - * @return the names of the elements to deploy - */ - @Override - public String[] getElementTagName() - { - return new String[]{"address-setting"}; - } - - @Override - public void validate(final Node rootNode) throws Exception - { - org.apache.activemq.utils.XMLUtil.validate(rootNode, "schema/activemq-configuration.xsd"); - } - - /** - * deploy an element - * - * @param node the element to deploy - * @throws Exception - */ - @Override - public void deploy(final Node node) throws Exception - { - - Pair setting = parser.parseAddressSettings(node); - - addressSettingsRepository.addMatch(setting.getA(), setting.getB()); - } - - @Override - public String[] getDefaultConfigFileNames() - { - return new String[]{"activemq-configuration.xml", "activemq-queues.xml"}; - } - - /** - * Undeploys an element. - * - * @param node the element to undeploy - * @throws Exception - */ - @Override - public void undeploy(final Node node) throws Exception - { - String match = node.getAttributes().getNamedItem(getKeyAttribute()).getNodeValue(); - - addressSettingsRepository.removeMatch(match); - } - - /** - * the key attribute for the element, usually 'name' but can be overridden - * - * @return the key attribute - */ - @Override - public String getKeyAttribute() - { - return "match"; - } - -} diff --git a/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/BasicUserCredentialsDeployer.java b/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/BasicUserCredentialsDeployer.java deleted file mode 100644 index 3f2d2b09de..0000000000 --- a/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/BasicUserCredentialsDeployer.java +++ /dev/null @@ -1,149 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.activemq.core.deployers.impl; - -import org.apache.activemq.core.deployers.DeploymentManager; -import org.apache.activemq.spi.core.security.ActiveMQSecurityManager; -import org.apache.activemq.utils.PasswordMaskingUtil; -import org.apache.activemq.utils.SensitiveDataCodec; -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; - -/** - * deployer for adding security loaded from the file "activemq-users.xml" - * - * @author Andy Taylor - */ -public class BasicUserCredentialsDeployer extends XmlDeployer -{ - private final ActiveMQSecurityManager activeMQSecurityManager; - - private static final String PASSWORD_ATTRIBUTE = "password"; - - private static final String ROLES_NODE = "role"; - - private static final String ROLE_ATTR_NAME = "name"; - - private static final String DEFAULT_USER = "defaultuser"; - - private static final String USER = "user"; - - private static final String MASK_PASSWORD = "mask-password"; - - private static final String PASSWORD_CODEC = "password-codec"; - - private boolean maskPassword = false; - - private SensitiveDataCodec passwordCodec; - - public BasicUserCredentialsDeployer(final DeploymentManager deploymentManager, - final ActiveMQSecurityManager activeMQSecurityManager) - { - super(deploymentManager); - - this.activeMQSecurityManager = activeMQSecurityManager; - } - - @Override - public String[] getElementTagName() - { - return new String[]{MASK_PASSWORD, PASSWORD_CODEC, DEFAULT_USER, USER}; - } - - @Override - public void validate(final Node rootNode) throws Exception - { - org.apache.activemq.utils.XMLUtil.validate(rootNode, "schema/activemq-users.xsd"); - } - - @Override - public void deploy(final Node node) throws Exception - { - String nodeName = node.getNodeName(); - - if (MASK_PASSWORD.equals(nodeName)) - { - String value = node.getTextContent().trim(); - - maskPassword = Boolean.parseBoolean(value); - - if (maskPassword) - { - passwordCodec = PasswordMaskingUtil.getDefaultCodec(); - } - return; - } - - if (PASSWORD_CODEC.equals(nodeName)) - { - if (maskPassword) - { - String codecDesc = node.getTextContent(); - - passwordCodec = PasswordMaskingUtil.getCodec(codecDesc); - } - return; - } - - String username = node.getAttributes().getNamedItem("name").getNodeValue(); - String password = node.getAttributes() - .getNamedItem(BasicUserCredentialsDeployer.PASSWORD_ATTRIBUTE) - .getNodeValue(); - - if (maskPassword) - { - if ((password != null) && (!"".equals(password.trim()))) - { - password = passwordCodec.decode(password); - } - } - - // add the user - activeMQSecurityManager.addUser(username, password); - - if (BasicUserCredentialsDeployer.DEFAULT_USER.equalsIgnoreCase(nodeName)) - { - activeMQSecurityManager.setDefaultUser(username); - } - NodeList children = node.getChildNodes(); - for (int i = 0; i < children.getLength(); i++) - { - Node child = children.item(i); - // and add any roles - if (BasicUserCredentialsDeployer.ROLES_NODE.equalsIgnoreCase(child.getNodeName())) - { - String role = child.getAttributes() - .getNamedItem(BasicUserCredentialsDeployer.ROLE_ATTR_NAME) - .getNodeValue(); - activeMQSecurityManager.addRole(username, role); - } - } - } - - @Override - public void undeploy(final Node node) throws Exception - { - String username = node.getAttributes().getNamedItem("name").getNodeValue(); - activeMQSecurityManager.removeUser(username); - } - - @Override - public String[] getDefaultConfigFileNames() - { - return new String[]{"activemq-users.xml"}; - } -} diff --git a/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/FileConfigurationParser.java b/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/FileConfigurationParser.java index f396da3c3d..1bf0edb470 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/FileConfigurationParser.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/FileConfigurationParser.java @@ -51,7 +51,6 @@ import org.apache.activemq.core.config.ha.ReplicatedPolicyConfiguration; import org.apache.activemq.core.config.ha.SharedStoreMasterPolicyConfiguration; import org.apache.activemq.core.config.ha.SharedStoreSlavePolicyConfiguration; import org.apache.activemq.core.config.impl.ConfigurationImpl; -import org.apache.activemq.core.config.impl.FileConfiguration; import org.apache.activemq.core.config.impl.Validators; import org.apache.activemq.core.journal.impl.AIOSequentialFileFactory; import org.apache.activemq.core.journal.impl.JournalConstants; @@ -81,11 +80,6 @@ import org.w3c.dom.NodeList; */ public final class FileConfigurationParser extends XMLConfigurationUtil { - - // Constants ----------------------------------------------------- - - private static final String CONFIGURATION_SCHEMA_URL = "schema/activemq-configuration.xsd"; - // Security Parsing public static final String SECURITY_ELEMENT_NAME = "security-setting"; @@ -193,7 +187,6 @@ public final class FileConfigurationParser extends XMLConfigurationUtil public void parseMainConfig(final Element e, final Configuration config) throws Exception { - XMLUtil.validate(e, FileConfigurationParser.CONFIGURATION_SCHEMA_URL); config.setName(getString(e, "name", config.getName(), Validators.NO_CHECK)); @@ -457,9 +450,6 @@ public final class FileConfigurationParser extends XMLConfigurationUtil config.setResolveProtocols(getBoolean(e, "resolve-protocols", config.isResolveProtocols())); - // Defaults to true when using FileConfiguration - config.setFileDeploymentEnabled(getBoolean(e, "file-deployment-enabled", config instanceof FileConfiguration)); - config.setPersistenceEnabled(getBoolean(e, "persistence-enabled", config.isPersistenceEnabled())); diff --git a/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/FileDeploymentManager.java b/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/FileDeploymentManager.java deleted file mode 100644 index cb85425cff..0000000000 --- a/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/FileDeploymentManager.java +++ /dev/null @@ -1,337 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.activemq.core.deployers.impl; - -import java.io.File; -import java.io.IOException; -import java.io.UnsupportedEncodingException; -import java.net.MalformedURLException; -import java.net.URI; -import java.net.URISyntaxException; -import java.net.URL; -import java.net.URLDecoder; -import java.util.ArrayList; -import java.util.Enumeration; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.concurrent.Executors; -import java.util.concurrent.ScheduledExecutorService; -import java.util.concurrent.ScheduledFuture; -import java.util.concurrent.TimeUnit; - -import org.apache.activemq.api.core.Pair; -import org.apache.activemq.core.deployers.Deployer; -import org.apache.activemq.core.deployers.DeploymentManager; -import org.apache.activemq.core.server.ActiveMQServerLogger; - -/** - * @author Andy Taylor - * @author Tim Fox - */ -public class FileDeploymentManager implements Runnable, DeploymentManager -{ - private final List deployers = new ArrayList(); - - private final Map, DeployInfo> deployed = new HashMap, DeployInfo>(); - - private ScheduledExecutorService scheduler; - - private boolean started; - - private final long period; - - private ScheduledFuture future; - - public FileDeploymentManager(final long period) - { - this.period = period; - } - - public synchronized void start() throws Exception - { - if (started) - { - return; - } - - started = true; - - scheduler = Executors.newSingleThreadScheduledExecutor(); - - future = scheduler.scheduleWithFixedDelay(this, period, period, TimeUnit.MILLISECONDS); - } - - public synchronized void stop() - { - if (!started) - { - return; - } - - started = false; - - if (future != null) - { - future.cancel(false); - - future = null; - } - - scheduler.shutdown(); - - scheduler = null; - } - - public synchronized boolean isStarted() - { - return started; - } - - /** - * registers a Deployer object which will handle the deployment of URL's - * - * @param deployer The Deployer object - * @throws Exception - */ - public synchronized void registerDeployer(final Deployer deployer) throws Exception - { - if (!deployers.contains(deployer)) - { - deployers.add(deployer); - - String[] filenames = deployer.getConfigFileNames(); - - for (String filename : filenames) - { - ActiveMQServerLogger.LOGGER.debug("the filename is " + filename); - - Enumeration urls = Thread.currentThread().getContextClassLoader().getResources(filename); - - while (urls.hasMoreElements()) - { - URI uri = urls.nextElement().toURI(); - - ActiveMQServerLogger.LOGGER.debug("Got URI " + uri); - - try - { - ActiveMQServerLogger.LOGGER.debug("Deploying " + uri + " for " + deployer.getClass().getSimpleName()); - deployer.deploy(uri); - } - catch (Exception e) - { - ActiveMQServerLogger.LOGGER.errorDeployingURI(e, uri); - } - - Pair pair = new Pair(uri, deployer); - - deployed.put(pair, new DeployInfo(deployer, getFileFromURI(uri).lastModified())); - } - } - } - } - - @Override - public synchronized void unregisterDeployer(final Deployer deployer) throws Exception - { - if (deployers.remove(deployer)) - { - String[] filenames = deployer.getConfigFileNames(); - for (String filename : filenames) - { - Enumeration urls = Thread.currentThread().getContextClassLoader().getResources(filename); - while (urls.hasMoreElements()) - { - URI url = urls.nextElement().toURI(); - - Pair pair = new Pair(url, deployer); - - deployed.remove(pair); - } - } - } - } - - private File getFileFromURI(final URI uri) throws MalformedURLException, UnsupportedEncodingException - { - return new File(URLDecoder.decode(uri.toURL().getFile(), "UTF-8")); - } - - /** - * called by the ExecutorService every n seconds - */ - public synchronized void run() - { - if (!started) - { - return; - } - - try - { - for (Deployer deployer : deployers) - { - String[] filenames = deployer.getConfigFileNames(); - - for (String filename : filenames) - { - Enumeration urls = Thread.currentThread().getContextClassLoader().getResources(filename); - - while (urls.hasMoreElements()) - { - URL url = urls.nextElement(); - URI uri; - try - { - uri = url.toURI(); - } - catch (URISyntaxException e) - { - ActiveMQServerLogger.LOGGER.errorDeployingURI(e); - continue; - } - - Pair pair = new Pair(uri, deployer); - - DeployInfo info = deployed.get(pair); - - long newLastModified = getFileFromURI(uri).lastModified(); - - if (info == null) - { - try - { - deployer.deploy(uri); - - deployed.put(pair, new DeployInfo(deployer, getFileFromURI(uri).lastModified())); - } - catch (Exception e) - { - ActiveMQServerLogger.LOGGER.errorDeployingURI(e, uri); - } - } - else if (newLastModified > info.lastModified) - { - try - { - deployer.redeploy(uri); - - deployed.put(pair, new DeployInfo(deployer, getFileFromURI(uri).lastModified())); - } - catch (Exception e) - { - ActiveMQServerLogger.LOGGER.errorDeployingURI(e, uri); - } - } - } - } - } - List> toRemove = new ArrayList>(); - for (Map.Entry, DeployInfo> entry : deployed.entrySet()) - { - Pair pair = entry.getKey(); - try - { - if (!fileExists(pair.getA())) - { - Deployer deployer = entry.getValue().deployer; - ActiveMQServerLogger.LOGGER.debug("Undeploying " + deployer + " with url " + pair.getA()); - deployer.undeploy(pair.getA()); - toRemove.add(pair); - } - } - catch (URISyntaxException e) - { - ActiveMQServerLogger.LOGGER.errorUnDeployingURI(e, pair.getA()); - } - catch (Exception e) - { - ActiveMQServerLogger.LOGGER.errorUnDeployingURI(e, pair.getA()); - } - } - for (Pair pair : toRemove) - { - deployed.remove(pair); - } - } - catch (IOException e) - { - ActiveMQServerLogger.LOGGER.errorScanningURLs(e); - } - } - - public synchronized List getDeployers() - { - return deployers; - } - - public synchronized Map, DeployInfo> getDeployed() - { - return deployed; - } - - // Private ------------------------------------------------------- - - /** - * Checks if the URI is among the current thread context class loader's resources. - *

- * We do not check that the corresponding file exists using File.exists() directly as it would - * fail in the case the resource is loaded from inside an EAR file (see - * https://jira.jboss.org/jira/browse/HORNETQ-122) - * - * @throws URISyntaxException - */ - private boolean fileExists(final URI resourceURI) throws URISyntaxException - { - try - { - File f = getFileFromURI(resourceURI); // this was the original line, which doesn't work for - // File-URLs with white spaces: File f = new - // File(resourceURL.getPath()); - Enumeration resources = Thread.currentThread().getContextClassLoader().getResources(f.getName()); - while (resources.hasMoreElements()) - { - URI url = resources.nextElement().toURI(); - if (url.equals(resourceURI)) - { - return true; - } - } - } - catch (IOException e) - { - return false; - } - return false; - } - - // Inner classes ------------------------------------------------------------------------------------------- - - public static class DeployInfo - { - public Deployer deployer; - - public long lastModified; - - DeployInfo(final Deployer deployer, final long lastModified) - { - this.deployer = deployer; - this.lastModified = lastModified; - } - } -} diff --git a/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/QueueDeployer.java b/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/QueueDeployer.java deleted file mode 100644 index c821b9ad1b..0000000000 --- a/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/QueueDeployer.java +++ /dev/null @@ -1,97 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.activemq.core.deployers.impl; - -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.core.config.CoreQueueConfiguration; -import org.apache.activemq.core.deployers.DeploymentManager; -import org.apache.activemq.core.server.ActiveMQServer; -import org.w3c.dom.Node; - -/** - * A QueueDeployer - * - * @author Andy Taylor - * @author Jeff Mesnil - * @author Tim Fox - */ -public class QueueDeployer extends XmlDeployer -{ - private final ActiveMQServer server; - - private final FileConfigurationParser parser = new FileConfigurationParser(); - - public QueueDeployer(final DeploymentManager deploymentManager, final ActiveMQServer server) - { - super(deploymentManager); - - this.server = server; - } - - /** - * the names of the elements to deploy - * - * @return the names of the elements todeploy - */ - @Override - public String[] getElementTagName() - { - return new String[]{"queue"}; - } - - @Override - public void validate(final Node rootNode) throws Exception - { - org.apache.activemq.utils.XMLUtil.validate(rootNode, "schema/activemq-configuration.xsd"); - } - - /** - * deploy an element - * - * @param node the element to deploy - * @throws Exception - */ - @Override - public void deploy(final Node node) throws Exception - { - CoreQueueConfiguration queueConfig = parser.parseQueueConfiguration(node); - - server.deployQueue(SimpleString.toSimpleString(queueConfig.getAddress()), - SimpleString.toSimpleString(queueConfig.getName()), - SimpleString.toSimpleString(queueConfig.getFilterString()), - queueConfig.isDurable(), - false); - } - - @Override - public void undeploy(final Node node) throws Exception - { - // Undeploy means nothing for core queues - } - - /** - * The name of the configuration file name to look for for deployment - * - * @return The name of the config file - */ - @Override - public String[] getDefaultConfigFileNames() - { - return new String[]{"activemq-configuration.xml", "activemq-queues.xml"}; - } - -} diff --git a/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/SecurityDeployer.java b/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/SecurityDeployer.java deleted file mode 100644 index 3f26196918..0000000000 --- a/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/SecurityDeployer.java +++ /dev/null @@ -1,117 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.activemq.core.deployers.impl; - -import java.util.Set; - -import org.apache.activemq.api.core.Pair; -import org.apache.activemq.core.deployers.DeploymentManager; -import org.apache.activemq.core.security.Role; -import org.apache.activemq.core.settings.HierarchicalRepository; -import org.w3c.dom.Node; - -/** - * Deploys the security settings into a security repository and adds them to the security store. - * - * @author Andy Taylor - */ -public class SecurityDeployer extends XmlDeployer -{ - private static final String QUEUES_XML = "activemq-queues.xml"; - - private static final String MATCH = "match"; - - private final FileConfigurationParser parser = new FileConfigurationParser(); - - /** - * The repository to add to - */ - private final HierarchicalRepository> securityRepository; - - public SecurityDeployer(final DeploymentManager deploymentManager, - final HierarchicalRepository> securityRepository) - { - super(deploymentManager); - - this.securityRepository = securityRepository; - } - - /** - * the names of the elements to deploy - * - * @return the names of the elements todeploy - */ - @Override - public String[] getElementTagName() - { - return new String[]{FileConfigurationParser.SECURITY_ELEMENT_NAME}; - } - - @Override - public void validate(final Node rootNode) throws Exception - { - org.apache.activemq.utils.XMLUtil.validate(rootNode, "schema/activemq-configuration.xsd"); - } - - /** - * the key attribute for the element, usually 'name' but can be overridden - * - * @return the key attribute - */ - @Override - public String getKeyAttribute() - { - return SecurityDeployer.MATCH; - } - - /** - * deploy an element - * - * @param node the element to deploy - * @throws Exception - */ - @Override - public void deploy(final Node node) throws Exception - { - Pair> securityMatch = parser.parseSecurityRoles(node); - securityRepository.addMatch(securityMatch.getA(), securityMatch.getB()); - } - - /** - * undeploys an element - * - * @param node the element to undeploy - * @throws Exception - */ - @Override - public void undeploy(final Node node) throws Exception - { - String match = node.getAttributes().getNamedItem(getKeyAttribute()).getNodeValue(); - securityRepository.removeMatch(match); - } - - /** - * The name of the configuration file name to look for for deployment - * - * @return The name of the config file - */ - @Override - public String[] getDefaultConfigFileNames() - { - return new String[]{"activemq-configuration.xml", SecurityDeployer.QUEUES_XML}; - } -} diff --git a/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/XmlDeployer.java b/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/XmlDeployer.java deleted file mode 100644 index 980456366a..0000000000 --- a/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/XmlDeployer.java +++ /dev/null @@ -1,334 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.activemq.core.deployers.impl; - -import java.io.InputStreamReader; -import java.io.Reader; -import java.net.URI; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import org.apache.activemq.api.core.ActiveMQException; -import org.apache.activemq.core.deployers.Deployer; -import org.apache.activemq.core.deployers.DeploymentManager; -import org.apache.activemq.core.server.ActiveMQServerLogger; -import org.apache.activemq.utils.XMLUtil; -import org.w3c.dom.Element; -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; - -/** - * @author Andy Taylor - */ -public abstract class XmlDeployer implements Deployer -{ - protected static final String NAME_ATTR = "name"; - - private final Map> configuration = new HashMap>(); - - private final DeploymentManager deploymentManager; - - private boolean started; - - private String[] configFileNames; - - public XmlDeployer(final DeploymentManager deploymentManager) - { - this.deploymentManager = deploymentManager; - configFileNames = getDefaultConfigFileNames(); - } - - /** - * adds a URL to the already configured set of url's this deployer is handling - * @param url The URL to add - * @param name the name of the element - * @param e . - */ - public synchronized void addToConfiguration(final URI url, final String name, final Node e) - { - Map map = configuration.get(url); - if (map == null) - { - map = new HashMap(); - configuration.put(url, map); - } - map.put(name, e); - } - - /** - * Redeploys a URL if changed - * @param url The resource to redeploy - * @throws Exception - */ - @Override - public synchronized void redeploy(final URI url) throws Exception - { - Element e = getRootElement(url); - - validate(e); - - List added = new ArrayList(); - // pull out the elements that need deploying - String[] elements = getElementTagName(); - for (String element : elements) - { - NodeList children = e.getElementsByTagName(element); - for (int i = 0; i < children.getLength(); i++) - { - Node node = children.item(i); - - String name = getName(node); - - added.add(name); - // if this has never been deployed deploy - Map map = configuration.get(url); - if (map == null || map.get(name) == null) - { - deploy(node); - } - // or if it has changed redeploy - else if (hasNodeChanged(url, node, name)) - { - undeploy(node); - deploy(node); - addToConfiguration(url, name, node); - } - } - } - // now check for anything that has been removed and undeploy - if (configuration.get(url) != null) - { - Set keys = configuration.get(url).keySet(); - List removed = new ArrayList(); - - for (String key : keys) - { - if (!added.contains(key)) - { - undeploy(configuration.get(url).get(key)); - removed.add(key); - } - } - for (String s : removed) - { - configuration.get(url).remove(s); - } - } - } - - /** - * Undeploys a resource that has been removed - * @param uri The Resource that was deleted - * @throws Exception - */ - @Override - public synchronized void undeploy(final URI uri) throws Exception - { - Set keys = configuration.get(uri).keySet(); - for (String key : keys) - { - undeploy(configuration.get(uri).get(key)); - } - configuration.remove(uri); - } - - /** - * Deploy the URL for the first time - * @param url The resource to deploy - * @throws Exception - */ - @Override - public synchronized void deploy(final URI url) throws Exception - { - Element e = getRootElement(url); - - validate(e); - - Map map = configuration.get(url); - if (map == null) - { - map = new HashMap(); - configuration.put(url, map); - } - - // find all thenodes to deploy - String[] elements = getElementTagName(); - for (String element : elements) - { - NodeList children = e.getElementsByTagName(element); - for (int i = 0; i < children.getLength(); i++) - { - Node node = children.item(i); - - String name = getName(node); - - try - { - deploy(node); - } - catch (Exception e1) - { - ActiveMQServerLogger.LOGGER.unableToDeployNode(e1, node); - continue; - } - - addToConfiguration(url, name, node); - } - } - } - - /** - * The key attribute for the element, usually 'name' but can be overridden - * @return the key attribute - */ - public String getKeyAttribute() - { - return XmlDeployer.NAME_ATTR; - } - - // register with the deploymenmt manager - public synchronized void start() throws Exception - { - if (started) - { - return; - } - - deploymentManager.registerDeployer(this); - - started = true; - } - - // undeploy everything - public synchronized void stop() throws Exception - { - if (!started) - { - return; - } - - Collection> urls = configuration.values(); - for (Map hashMap : urls) - { - for (Node node : hashMap.values()) - { - try - { - undeploy(node); - } - catch (Exception e) - { - ActiveMQServerLogger.LOGGER.problemUndeployingNode(e, node); - } - } - } - deploymentManager.unregisterDeployer(this); - - started = false; - } - - public synchronized boolean isStarted() - { - return started; - } - - public String[] getConfigFileNames() - { - return configFileNames; - } - - public void setConfigFileNames(final String[] configFileNames) - { - this.configFileNames = configFileNames; - } - - /** - * the names of the elements to deploy - * @return the names of the elements todeploy - */ - public abstract String[] getElementTagName(); - - public abstract String[] getDefaultConfigFileNames(); - - /** - * deploy an element - * @param node the element to deploy - * @throws Exception - */ - public abstract void deploy(final Node node) throws Exception; - - /** - * Validate the DOM - */ - public abstract void validate(final Node rootNode) throws Exception; - - /** - * undeploys an element - * @param node the element to undeploy - * @throws Exception - */ - public abstract void undeploy(final Node node) throws Exception; - - protected Element getRootElement(final URI url) throws Exception - { - Reader reader = new InputStreamReader(url.toURL().openStream()); - String xml = org.apache.activemq.utils.XMLUtil.readerToString(reader); - xml = org.apache.activemq.utils.XMLUtil.replaceSystemProps(xml); - return org.apache.activemq.utils.XMLUtil.stringToElement(xml); - } - - private boolean hasNodeChanged(final URI url, final Node child, final String name) - { - String newTextContent = child.getTextContent(); - String origTextContent = configuration.get(url).get(name).getTextContent(); - return !newTextContent.equals(origTextContent); - } - - private String getName(Node node) throws ActiveMQException - { - - String name; - - if (node.hasAttributes()) - { - - try - { - Node keyNode = node.getAttributes().getNamedItem( - getKeyAttribute()); - - name = keyNode.getNodeValue(); - } - catch (NullPointerException e) - { - throw new ActiveMQException("Could not find " + getKeyAttribute() + " in " + XMLUtil.elementToString(node)); - } - } - else - { - - name = node.getLocalName(); - } - - return name; - } - -} \ No newline at end of file diff --git a/activemq-server/src/main/java/org/apache/activemq/core/security/User.java b/activemq-server/src/main/java/org/apache/activemq/core/security/User.java new file mode 100644 index 0000000000..528530d454 --- /dev/null +++ b/activemq-server/src/main/java/org/apache/activemq/core/security/User.java @@ -0,0 +1,80 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.activemq.core.security; + +/** +* @author Andy Taylor +*/ +public class User +{ + final String user; + + final String password; + + public User(final String user, final String password) + { + this.user = user; + this.password = password; + } + + @Override + public boolean equals(final Object o) + { + if (this == o) + { + return true; + } + if (o == null || getClass() != o.getClass()) + { + return false; + } + + User user1 = (User)o; + + if (!user.equals(user1.user)) + { + return false; + } + + return true; + } + + @Override + public int hashCode() + { + return user.hashCode(); + } + + public boolean isValid(final String user, final String password) + { + if (user == null) + { + return false; + } + return this.user.equals(user) && this.password.equals(password); + } + + public String getUser() + { + return user; + } + + public String getPassword() + { + return password; + } +} diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/ActiveMQServers.java b/activemq-server/src/main/java/org/apache/activemq/core/server/ActiveMQServers.java index 5ab885cc5f..730a2c8943 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/ActiveMQServers.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/server/ActiveMQServers.java @@ -97,9 +97,9 @@ public final class ActiveMQServers public static ActiveMQServer newActiveMQServer(Configuration config, String defUser, String defPass) { - ActiveMQSecurityManager securityManager = new ActiveMQSecurityManagerImpl(); + ActiveMQSecurityManagerImpl securityManager = new ActiveMQSecurityManagerImpl(); - securityManager.addUser(defUser, defPass); + securityManager.getConfiguration().addUser(defUser, defPass); ActiveMQServer server = ActiveMQServers.newActiveMQServer(config, ManagementFactory.getPlatformMBeanServer(), @@ -115,9 +115,9 @@ public final class ActiveMQServers String user, String password) { - ActiveMQSecurityManager securityManager = new ActiveMQSecurityManagerImpl(); + ActiveMQSecurityManagerImpl securityManager = new ActiveMQSecurityManagerImpl(); - securityManager.addUser(user, password); + securityManager.getConfiguration().addUser(user, password); ActiveMQServer server = ActiveMQServers.newActiveMQServer(config, mbeanServer, securityManager, enablePersistence); diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/embedded/EmbeddedActiveMQ.java b/activemq-server/src/main/java/org/apache/activemq/core/server/embedded/EmbeddedActiveMQ.java index 139c6edc17..45deccc860 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/embedded/EmbeddedActiveMQ.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/server/embedded/EmbeddedActiveMQ.java @@ -19,6 +19,7 @@ package org.apache.activemq.core.server.embedded; import javax.management.MBeanServer; import org.apache.activemq.core.config.Configuration; +import org.apache.activemq.core.config.FileDeploymentManager; import org.apache.activemq.core.config.impl.FileConfiguration; import org.apache.activemq.core.server.ActiveMQServer; import org.apache.activemq.core.server.impl.ActiveMQServerImpl; @@ -97,8 +98,10 @@ public class EmbeddedActiveMQ if (configuration == null) { if (configResourcePath == null) configResourcePath = "activemq-configuration.xml"; - FileConfiguration config = new FileConfiguration(configResourcePath); - config.start(); + FileDeploymentManager deploymentManager = new FileDeploymentManager(configResourcePath); + FileConfiguration config = new FileConfiguration(); + deploymentManager.addDeployable(config); + deploymentManager.readConfiguration(); configuration = config; } if (securityManager == null) diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ActiveMQServerImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ActiveMQServerImpl.java index fd412d9af5..b1f237db1e 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ActiveMQServerImpl.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ActiveMQServerImpl.java @@ -52,13 +52,6 @@ import org.apache.activemq.core.config.ConfigurationUtils; import org.apache.activemq.core.config.CoreQueueConfiguration; import org.apache.activemq.core.config.DivertConfiguration; import org.apache.activemq.core.config.impl.ConfigurationImpl; -import org.apache.activemq.core.deployers.Deployer; -import org.apache.activemq.core.deployers.DeploymentManager; -import org.apache.activemq.core.deployers.impl.AddressSettingsDeployer; -import org.apache.activemq.core.deployers.impl.BasicUserCredentialsDeployer; -import org.apache.activemq.core.deployers.impl.FileDeploymentManager; -import org.apache.activemq.core.deployers.impl.QueueDeployer; -import org.apache.activemq.core.deployers.impl.SecurityDeployer; import org.apache.activemq.core.filter.Filter; import org.apache.activemq.core.filter.impl.FilterImpl; import org.apache.activemq.core.journal.IOCriticalErrorListener; @@ -233,13 +226,6 @@ public class ActiveMQServerImpl implements ActiveMQServer private MemoryManager memoryManager; - private volatile DeploymentManager deploymentManager; - - private Deployer basicUserCredentialsDeployer; - private Deployer addressSettingsDeployer; - private Deployer queueDeployer; - private Deployer securityDeployer; - private final Map sessions = new ConcurrentHashMap(); /** @@ -661,16 +647,6 @@ public class ActiveMQServerImpl implements ActiveMQServer //before we stop any components deactivate any callbacks callDeActiveCallbacks(); - // Stop the deployers - if (configuration.isFileDeploymentEnabled()) - { - stopComponent(basicUserCredentialsDeployer); - stopComponent(addressSettingsDeployer); - stopComponent(queueDeployer); - stopComponent(securityDeployer); - stopComponent(deploymentManager); - } - stopComponent(backupManager); activation.preStorageClose(); stopComponent(pagingManager); @@ -688,7 +664,6 @@ public class ActiveMQServerImpl implements ActiveMQServer managementService.unregisterServer(); stopComponent(managementService); - stopComponent(securityManager); stopComponent(resourceManager); stopComponent(postOffice); @@ -993,11 +968,6 @@ public class ActiveMQServerImpl implements ActiveMQServer return addressSettingsRepository; } - public DeploymentManager getDeploymentManager() - { - return deploymentManager; - } - public ResourceManager getResourceManager() { return resourceManager; @@ -1633,11 +1603,6 @@ public class ActiveMQServerImpl implements ActiveMQServer // Create the hard-wired components - if (configuration.isFileDeploymentEnabled()) - { - deploymentManager = new FileDeploymentManager(configuration.getFileDeployerScanPeriod()); - } - callPreActiveCallbacks(); // startReplication(); @@ -1711,24 +1676,11 @@ public class ActiveMQServerImpl implements ActiveMQServer if (!scalingDown) { - if (configuration.isFileDeploymentEnabled()) - { - addressSettingsDeployer = new AddressSettingsDeployer(deploymentManager, addressSettingsRepository); - - addressSettingsDeployer.start(); - } - deployAddressSettingsFromConfiguration(); } storageManager.start(); - - if (securityManager != null) - { - securityManager.start(); - } - postOffice.start(); pagingManager.start(); @@ -1737,21 +1689,6 @@ public class ActiveMQServerImpl implements ActiveMQServer resourceManager.start(); - // Deploy all security related config - if (configuration.isFileDeploymentEnabled()) - { - basicUserCredentialsDeployer = new BasicUserCredentialsDeployer(deploymentManager, securityManager); - - basicUserCredentialsDeployer.start(); - - if (securityManager != null) - { - securityDeployer = new SecurityDeployer(deploymentManager, securityRepository); - - securityDeployer.start(); - } - } - deploySecurityFromConfiguration(); deployGroupingHandlerConfiguration(configuration.getGroupingHandlerConfiguration()); @@ -1794,16 +1731,7 @@ public class ActiveMQServerImpl implements ActiveMQServer // Deploy the rest of the stuff // Deploy any predefined queues - if (configuration.isFileDeploymentEnabled()) - { - queueDeployer = new QueueDeployer(deploymentManager, this); - - queueDeployer.start(); - } - else - { - deployQueuesFromConfiguration(); - } + deployQueuesFromConfiguration(); // We need to call this here, this gives any dependent server a chance to deploy its own addresses diff --git a/activemq-server/src/main/java/org/apache/activemq/spi/core/security/ActiveMQSecurityManager.java b/activemq-server/src/main/java/org/apache/activemq/spi/core/security/ActiveMQSecurityManager.java index ab8853fdf9..e1b2b1a0f2 100644 --- a/activemq-server/src/main/java/org/apache/activemq/spi/core/security/ActiveMQSecurityManager.java +++ b/activemq-server/src/main/java/org/apache/activemq/spi/core/security/ActiveMQSecurityManager.java @@ -20,14 +20,13 @@ import java.util.Set; import org.apache.activemq.core.security.CheckType; import org.apache.activemq.core.security.Role; -import org.apache.activemq.core.server.ActiveMQComponent; /** * Use to validate whether a user has is valid to connect to the server and perform certain * functions * @author Andy Taylor */ -public interface ActiveMQSecurityManager extends ActiveMQComponent +public interface ActiveMQSecurityManager { /** * is this a valid user. @@ -47,36 +46,4 @@ public interface ActiveMQSecurityManager extends ActiveMQComponent * @return true if the user is valid and they have the correct roles */ boolean validateUserAndRole(String user, String password, Set roles, CheckType checkType); - - /** - * adds a new user - * @param user the user to add - * @param password theusers password - */ - void addUser(String user, String password); - - /** - * removes a user and any roles they may have. - * @param user the user to remove - */ - void removeUser(String user); - - /** - * adds a new role for a user. - * @param user the user - * @param role the role to add - */ - void addRole(String user, String role); - - /** - * removes a role from a user - * @param user the user - * @param role the role to remove - */ - void removeRole(String user, String role); - - /* - * set the default user for null users - */ - void setDefaultUser(String username); } diff --git a/activemq-server/src/main/java/org/apache/activemq/spi/core/security/ActiveMQSecurityManagerImpl.java b/activemq-server/src/main/java/org/apache/activemq/spi/core/security/ActiveMQSecurityManagerImpl.java index e5dc4b45bc..b63e775e48 100644 --- a/activemq-server/src/main/java/org/apache/activemq/spi/core/security/ActiveMQSecurityManagerImpl.java +++ b/activemq-server/src/main/java/org/apache/activemq/spi/core/security/ActiveMQSecurityManagerImpl.java @@ -16,15 +16,13 @@ */ package org.apache.activemq.spi.core.security; -import java.util.ArrayList; -import java.util.HashMap; import java.util.List; -import java.util.Map; import java.util.Set; +import org.apache.activemq.core.config.impl.SecurityConfiguration; import org.apache.activemq.core.security.CheckType; import org.apache.activemq.core.security.Role; -import org.apache.activemq.core.server.ActiveMQMessageBundle; +import org.apache.activemq.core.security.User; /** * A basic implementation of the ActiveMQSecurityManager. This can be used within an appserver and be deployed by @@ -34,53 +32,29 @@ import org.apache.activemq.core.server.ActiveMQMessageBundle; */ public class ActiveMQSecurityManagerImpl implements ActiveMQSecurityManager { + private final SecurityConfiguration configuration; - // Static -------------------------------------------------------- - - // Attributes ---------------------------------------------------- - - /** - * the current valid users - */ - private final Map users = new HashMap(); - - private String defaultUser = null; - - /** - * the roles for the users - */ - private final Map> roles = new HashMap>(); - - // ActiveMQComponent implementation ------------------------------------------ - - public void start() + public ActiveMQSecurityManagerImpl() { + configuration = new SecurityConfiguration(); } - public void stop() + public ActiveMQSecurityManagerImpl(SecurityConfiguration configuration) { - users.clear(); - - roles.clear(); - - defaultUser = null; - } - - public boolean isStarted() - { - return true; + this.configuration = configuration; } // Public --------------------------------------------------------------------- public boolean validateUser(final String user, final String password) { - if (user == null && defaultUser == null) + if (user == null && configuration.getDefaultUser() == null) { return false; } - User theUser = users.get(user == null ? defaultUser : user); + String defaultUser = configuration.getDefaultUser(); + User theUser = configuration.getUser(user == null ? defaultUser : user); boolean ok = theUser != null && theUser.isValid(user == null ? defaultUser : user, password == null ? defaultUser : password); @@ -94,7 +68,8 @@ public class ActiveMQSecurityManagerImpl implements ActiveMQSecurityManager { if (validateUser(user, password)) { - List availableRoles = this.roles.get(user == null ? defaultUser : user); + String defaultUser = configuration.getDefaultUser(); + List availableRoles = configuration.getRole(user == null ? defaultUser : user); if (availableRoles == null) { @@ -119,98 +94,8 @@ public class ActiveMQSecurityManagerImpl implements ActiveMQSecurityManager return false; } - public void addUser(final String user, final String password) + public SecurityConfiguration getConfiguration() { - if (user == null) - { - throw ActiveMQMessageBundle.BUNDLE.nullUser(); - } - if (password == null) - { - throw ActiveMQMessageBundle.BUNDLE.nullPassword(); - } - users.put(user, new User(user, password)); - } - - public void removeUser(final String user) - { - users.remove(user); - roles.remove(user); - } - - public void addRole(final String user, final String role) - { - if (roles.get(user) == null) - { - roles.put(user, new ArrayList()); - } - roles.get(user).add(role); - } - - public void removeRole(final String user, final String role) - { - if (roles.get(user) == null) - { - return; - } - roles.get(user).remove(role); - } - - /* - * set the default user for null users - */ - public void setDefaultUser(final String username) - { - defaultUser = username; - } - - static class User - { - final String user; - - final String password; - - User(final String user, final String password) - { - this.user = user; - this.password = password; - } - - @Override - public boolean equals(final Object o) - { - if (this == o) - { - return true; - } - if (o == null || getClass() != o.getClass()) - { - return false; - } - - User user1 = (User)o; - - if (!user.equals(user1.user)) - { - return false; - } - - return true; - } - - @Override - public int hashCode() - { - return user.hashCode(); - } - - public boolean isValid(final String user, final String password) - { - if (user == null) - { - return false; - } - return this.user.equals(user) && this.password.equals(password); - } + return configuration; } } diff --git a/activemq-server/src/main/java/org/apache/activemq/spi/core/security/JAASSecurityManager.java b/activemq-server/src/main/java/org/apache/activemq/spi/core/security/JAASSecurityManager.java index 74f6925338..81d73dff9c 100644 --- a/activemq-server/src/main/java/org/apache/activemq/spi/core/security/JAASSecurityManager.java +++ b/activemq-server/src/main/java/org/apache/activemq/spi/core/security/JAASSecurityManager.java @@ -30,7 +30,6 @@ import javax.security.auth.login.LoginException; import org.apache.activemq.core.security.CheckType; import org.apache.activemq.core.security.Role; -import org.apache.activemq.core.server.ActiveMQComponent; import org.apache.activemq.core.server.ActiveMQServerLogger; /** @@ -43,7 +42,7 @@ import org.apache.activemq.core.server.ActiveMQServerLogger; * @author Tim Fox * @author Jeff Mesnil */ -public class JAASSecurityManager implements ActiveMQSecurityManager, ActiveMQComponent +public class JAASSecurityManager implements ActiveMQSecurityManager { // Static -------------------------------------------------------- @@ -53,8 +52,6 @@ public class JAASSecurityManager implements ActiveMQSecurityManager, ActiveMQCom private String configurationName; - private boolean started; - private CallbackHandler callbackHandler; private Configuration config; @@ -122,62 +119,6 @@ public class JAASSecurityManager implements ActiveMQSecurityManager, ActiveMQCom return authenticated; } - public void addRole(final String user, final String role) - { - // NO-OP - } - - public void addUser(final String user, final String password) - { - // NO-OP - } - - public void removeRole(final String user, final String role) - { - // NO-OP - } - - public void removeUser(final String user) - { - // NO-OP - } - - public void setDefaultUser(final String username) - { - // NO-OP - } - - // ActiveMQComponent implementation ----------------------------- - - /** - * lifecycle method, needs to be called - * - * @throws Exception - */ - public synchronized void start() throws Exception - { - if (started) - { - return; - } - - started = true; - } - - public synchronized void stop() - { - if (!started) - { - return; - } - started = false; - } - - public synchronized boolean isStarted() - { - return started; - } - private Subject getAuthenticatedSubject(final String user, final String password) throws LoginException { SimplePrincipal principal = user == null ? null : new SimplePrincipal(user); diff --git a/activemq-server/src/main/resources/schema/activemq-configuration.xsd b/activemq-server/src/main/resources/schema/activemq-configuration.xsd index bc6bea3ed8..7e32748d46 100644 --- a/activemq-server/src/main/resources/schema/activemq-configuration.xsd +++ b/activemq-server/src/main/resources/schema/activemq-configuration.xsd @@ -1,4 +1,4 @@ - + - - - + @@ -35,7 +36,7 @@ - + If true then the ActiveMQ Server will make use of any Protocol Managers that are in available on the classpath. If false then only the core protocol will be available, unless in Embedded mode where users @@ -46,7 +47,7 @@ - + DEPRECATED. This option is deprecated and its value will be ignored (HQ221038). A ActiveMQ server will be "clustered" when its configuration contain a cluster-configuration. @@ -55,7 +56,7 @@ - + DEPRECATED. This option is deprecated, but it will still be honored if <ha-policy> is not also used. Whether to check the cluster for a (live) server using our own server ID when starting up. This @@ -65,16 +66,8 @@ - - - - true means that the server will load configuration from the configuration files - - - - - + true means that the server will use the file based journal for persistence. @@ -82,7 +75,7 @@ - + Maximum number of threads to use for the scheduled thread pool @@ -90,7 +83,7 @@ - + Maximum number of threads to use for the thread pool. -1 means 'no limits'. @@ -98,7 +91,7 @@ - + true means that security is enabled @@ -106,7 +99,7 @@ - + how long (in ms) to wait before invalidating the security cache @@ -114,7 +107,7 @@ - + how long (in ms) to wait to acquire a file lock on the journal @@ -122,7 +115,7 @@ - + true means that the server supports wild card routing @@ -131,8 +124,7 @@ - + the name of the management address to send management messages to. It is prefixed with "jms.queue" so that JMS clients can send messages to it. @@ -142,8 +134,7 @@ - + the name of the address that consumers bind to receive management notifications @@ -152,7 +143,7 @@ - + Cluster username. It applies to all cluster configurations. @@ -160,7 +151,7 @@ - + Cluster password. It applies to all cluster configurations. @@ -201,7 +192,7 @@ - + Class name and its parameters for the Decoder used to decode the masked password. Ignored if mask-password is false. The format of this property is a full qualified class name optionally followed @@ -211,7 +202,7 @@ - + This option controls whether passwords in server configuration need be masked. If set to "true" the passwords are masked. @@ -220,7 +211,7 @@ - + XXX @@ -228,7 +219,7 @@ - + true means that the management API is available via JMX @@ -236,7 +227,7 @@ - + the JMX domain used to registered ActiveMQ MBeans in the MBeanServer @@ -244,7 +235,7 @@ - + true means that message counters are enabled @@ -252,7 +243,7 @@ - + the sample period (in ms) to use for message counters @@ -260,7 +251,7 @@ - + how many days to keep message counter history @@ -268,7 +259,7 @@ - + if set, this will override how long (in ms) to keep a connection alive without receiving a ping. -1 disables this setting. @@ -278,7 +269,7 @@ - + should certain incoming packets on the server be handed off to a thread from the thread pool for processing or should they be handled on the remoting thread? @@ -287,7 +278,7 @@ - + how long (in ms) before a transaction can be removed from the resource manager after create time @@ -295,7 +286,7 @@ - + how often (in ms) to scan for timeout transactions @@ -303,7 +294,7 @@ - + how often (in ms) to scan for expired messages @@ -311,7 +302,7 @@ - + the priority of the thread expiring messages @@ -319,7 +310,7 @@ - + the size of the cache for pre-creating message ID's @@ -327,7 +318,7 @@ - + true means that ID's are persisted to the journal @@ -335,7 +326,7 @@ - + DEPRECATED. This option is deprecated, but it will still be honored. Any interceptor specified here will be considered an "incoming" interceptor. See <remoting-incoming-interceptors> and <remoting-outgoing-interceptors>. @@ -344,7 +335,7 @@ - + a list of <class-name/> elements with the names of classes to use for interceptor incoming remoting packets @@ -353,7 +344,7 @@ - + a list of <class-name/> elements with the names of classes to use for interceptor outcoming remoting packets @@ -362,7 +353,7 @@ - + DEPRECATED. This option is deprecated, but it will still be honored if <ha-policy> is not also used. It indicates whether this server is a backup server @@ -371,7 +362,7 @@ - + DEPRECATED. This option is deprecated, but it will still be honored if <ha-policy> is not also used. Whether a server will automatically stop when a another places a request to take over its place. @@ -402,7 +393,7 @@ - + DEPRECATED. This option is deprecated, but it will still be honored if <ha-policy> is not also used. The delay to wait before fail-back occurs on (live's) restart. @@ -411,7 +402,7 @@ - + DEPRECATED. This option is deprecated, but it will still be honored if <ha-policy> is not also used. Will this backup server come live on a normal server shutdown. @@ -420,7 +411,7 @@ - + DEPRECATED. This option is deprecated, but it will still be honored if <ha-policy> is not also used. Will this server send its messages to another live server in the @@ -430,7 +421,7 @@ - + DEPRECATED. This option is deprecated, but it will still be honored if <ha-policy> is not also used. 'shared-store' applies to live and backup pairs, and it indicates if the live/backup pair share @@ -441,7 +432,7 @@ - + True means that the delivery count is persisted before delivery. False means that this only happens after a message has been cancelled. @@ -450,7 +441,7 @@ - + a list of remoting connectors configurations to create @@ -489,7 +480,7 @@ - + a list of remoting acceptors to create @@ -528,7 +519,7 @@ - + a list of broadcast groups to create @@ -541,7 +532,7 @@ - + a list of discovery groups to create @@ -560,7 +551,7 @@ - + a list of diverts to use @@ -575,7 +566,7 @@ - + a list of pre configured queues to create @@ -615,7 +606,7 @@ - + a list of bridges to create @@ -628,7 +619,7 @@ - + The HA policy of this server @@ -636,7 +627,7 @@ - + a list of cluster connections @@ -650,7 +641,7 @@ - + Message Group configuration @@ -658,7 +649,7 @@ - + the directory to store paged messages in @@ -666,7 +657,7 @@ - + the directory to store the persisted bindings to @@ -674,7 +665,7 @@ - + true means that the server will create the bindings directory on start up @@ -682,7 +673,7 @@ - + The max number of concurrent reads allowed on paging @@ -690,7 +681,7 @@ - + the directory to store the journal files in @@ -698,7 +689,7 @@ - + true means that the journal directory will be created @@ -706,7 +697,7 @@ - + the type of journal to use @@ -720,7 +711,7 @@ - + The timeout (in nanoseconds) used to flush internal buffers on the journal. The exact default value depend on whether the journal is ASYNCIO or NIO. @@ -729,8 +720,7 @@ - + The size of the internal buffer on the journal in KiB. @@ -738,7 +728,7 @@ - + if true wait for transaction data to be synchronized to the journal before returning response to client @@ -748,7 +738,7 @@ - + if true wait for non transaction data to be synced to the journal before returning response to client. @@ -764,8 +754,7 @@ - + the size (in bytes) of each journal file @@ -773,7 +762,7 @@ - + how many journal files to pre-create @@ -781,7 +770,7 @@ - + The percentage of live data on which we consider compacting the journal @@ -789,7 +778,7 @@ - + The minimal number of data files before we can start compacting @@ -797,7 +786,7 @@ - + the maximum number of write requests that can be in the AIO queue at any one time. Default is 500 for AIO and 1 for NIO. @@ -806,7 +795,7 @@ - + XXX Only meant to be used by project developers @@ -814,7 +803,7 @@ - + XXX Only meant to be used by project developers @@ -822,7 +811,7 @@ - + Interval to log server specific information (e.g. memory usage etc) @@ -830,7 +819,7 @@ - + Percentage of available memory which will trigger a warning log @@ -838,7 +827,7 @@ - + frequency to sample JVM memory in ms (or -1 to disable memory sampling) @@ -847,7 +836,7 @@ - + the directory to store large messages @@ -855,7 +844,7 @@ - + a list of security settings @@ -903,7 +892,7 @@ - + a list of address settings @@ -927,7 +916,7 @@ - + local bind address that the datagram socket is bound to @@ -935,7 +924,7 @@ - + local port to which the datagram socket is bound to @@ -966,7 +955,7 @@ - + period in milliseconds between consecutive broadcasts @@ -974,7 +963,7 @@ - + Name of JGroups configuration file. If specified, the server uses JGroups for broadcasting. @@ -982,7 +971,7 @@ - + Name of JGroups Channel. If specified, the server uses the named channel for broadcasting. @@ -1023,7 +1012,7 @@ - + Name of a JGroups configuration file. If specified, the server uses JGroups for discovery. @@ -1031,7 +1020,7 @@ - + Name of a JGroups Channel. If specified, the server uses the named channel for discovery. @@ -1039,8 +1028,7 @@ - + Period the discovery group waits after receiving the last broadcast from a particular server before removing that servers connector pair entry from its list. @@ -1051,7 +1039,7 @@ - + time to wait for an initial broadcast to give us at least one node in the cluster @@ -1147,7 +1135,7 @@ - + Any message larger than this size is considered a large message (to be sent in chunks) @@ -1156,7 +1144,7 @@ - + The period (in milliseconds) a bridge's client will check if it failed to receive a ping from the server. -1 disables this check. @@ -1165,7 +1153,7 @@ - + how long to keep a connection alive in the absence of any data arriving from the client. This should be greater than the ping period. @@ -1174,7 +1162,7 @@ - + period (in ms) between successive retries @@ -1230,7 +1218,7 @@ - + Once the bridge has received this many bytes, it sends a confirmation @@ -1254,7 +1242,7 @@ - + Upon reconnection this configures the number of time the same node on the topology will be retried before reseting the server locator and using the initial connectors @@ -1315,7 +1303,7 @@ - + The period (in milliseconds) used to check if the cluster connection has failed to receive pings from another server @@ -1324,7 +1312,7 @@ - + how long to keep a connection alive in the absence of any data arriving from the client @@ -1332,7 +1320,7 @@ - + Messages larger than this are considered large-messages @@ -1340,7 +1328,7 @@ - + How long to wait for a reply @@ -1412,7 +1400,7 @@ - + The size (in bytes) of the window used for confirming data from the server connected to. @@ -1420,7 +1408,7 @@ - + How long to wait for a reply if in the middle of a fail-over. -1 means wait forever. @@ -1428,7 +1416,7 @@ - + how often the cluster connection will notify the cluster of its existence right after joining the cluster @@ -1774,7 +1762,7 @@ - + Whether to check the cluster for a (live) server using our own server ID when starting up. This option is only necessary for performing 'fail-back' on replicating @@ -1821,14 +1809,14 @@ - + Will this server, if a backup, restart once it has been stopped because of failback or scaling down. - + Whether a server will automatically stop when a another places a request to take over its place. The use case is when a regular server stops and its backup takes over its @@ -1838,7 +1826,7 @@ - + if we have to start as a replicated server this is the delay to wait before fail-back occurs @@ -1882,7 +1870,7 @@ - + Will this server, if a backup, restart once it has been stopped because of failback or scaling down. @@ -1900,7 +1888,7 @@ - + Will this backup server come live on a normal server shutdown @@ -1911,7 +1899,7 @@ - + Whether a server will automatically stop when a another places a request to take over its place. The use case is when a regular server stops and its backup takes over its @@ -1942,7 +1930,7 @@ - + Will this server, if a backup, restart once it has been stopped because of failback or scaling down. @@ -1992,7 +1980,7 @@ - + its possible that you only want a server to partake in scale down as a receiver, via a group. In this case set scale-down to false @@ -2035,7 +2023,7 @@ - + Each cluster should choose 1 node to have a LOCAL grouping handler and all the other nodes should have REMOTE handlers @@ -2049,21 +2037,21 @@ - + A reference to a cluster connection address - + How long to wait for a decision - + How long a group binding will be used, -1 means for ever. Bindings are removed after this wait elapses. On the remote node this is used to determine how often you should re-query the main @@ -2072,7 +2060,7 @@ - + How often the reaper will be run to check for timed out group bindings. Only valid for LOCAL handlers @@ -2090,14 +2078,14 @@ - + Complex type element to configure an address. - + the address to send dead messages to @@ -2105,7 +2093,7 @@ - + the address to send expired messages to @@ -2122,7 +2110,7 @@ - + the time (in ms) to wait before redelivering a cancelled message. @@ -2146,7 +2134,7 @@ - + how many times to attempt to deliver a message before sending to dead letter address @@ -2154,7 +2142,7 @@ - + the maximum size (in bytes) to use in paging for an address (-1 means no limits) @@ -2162,7 +2150,7 @@ - + the page size (in bytes) to use for an address @@ -2170,7 +2158,7 @@ - + Number of paging files to cache in memory to avoid IO during paging navigation @@ -2195,7 +2183,7 @@ - + how many days to keep message counter history for this address @@ -2203,7 +2191,7 @@ - + whether to treat the queue as a last value queue @@ -2211,7 +2199,7 @@ - + how long (in ms) to wait after the last consumer is closed on a queue before redistributing messages. @@ -2229,7 +2217,7 @@ - + The minimum rate of message consumption allowed before a consumer is considered "slow." Measured in messages-per-second. @@ -2252,7 +2240,7 @@ - + How often to check for slow consumers on a particular queue. Measured in minutes. diff --git a/activemq-server/src/main/resources/schema/activemq-server.xsd b/activemq-server/src/main/resources/schema/activemq-server.xsd new file mode 100644 index 0000000000..552ce5f0a0 --- /dev/null +++ b/activemq-server/src/main/resources/schema/activemq-server.xsd @@ -0,0 +1,46 @@ + + + + + + + Root element for a document specifying the configuration + of a single "standalone" server that does not operate + as part of a domain. + + + + + + + + A profile declaration may include configuration + elements from other namespaces for the subsystems that make up the profile. + + + + + + + + diff --git a/activemq-server/src/main/resources/schema/activemq-users.xsd b/activemq-server/src/main/resources/schema/activemq-users.xsd deleted file mode 100644 index 828a6657a8..0000000000 --- a/activemq-server/src/main/resources/schema/activemq-users.xsd +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/activemq-server/src/test/java/org/apache/activemq/core/config/impl/ConfigurationImplTest.java b/activemq-server/src/test/java/org/apache/activemq/core/config/impl/ConfigurationImplTest.java index 9cf2498ef7..60914cd3f8 100644 --- a/activemq-server/src/test/java/org/apache/activemq/core/config/impl/ConfigurationImplTest.java +++ b/activemq-server/src/test/java/org/apache/activemq/core/config/impl/ConfigurationImplTest.java @@ -79,7 +79,6 @@ public class ConfigurationImplTest extends UnitTestCase Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultClusterUser(), conf.getClusterUser()); // OK Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultClusterPassword(), conf.getClusterPassword()); // OK Assert.assertEquals(ActiveMQDefaultConfiguration.isDefaultPersistenceEnabled(), conf.isPersistenceEnabled()); - Assert.assertEquals(ActiveMQDefaultConfiguration.isDefaultFileDeploymentEnabled(), conf.isFileDeploymentEnabled()); Assert.assertEquals(ActiveMQDefaultConfiguration.isDefaultPersistDeliveryCountBeforeDelivery(), conf.isPersistDeliveryCountBeforeDelivery()); Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultFileDeployerScanPeriod(), conf.getFileDeployerScanPeriod()); @@ -190,10 +189,6 @@ public class ConfigurationImplTest extends UnitTestCase conf.setEnabledAsyncConnectionExecution(b); Assert.assertEquals(b, conf.isAsyncConnectionExecutionEnabled()); - b = RandomUtil.randomBoolean(); - conf.setFileDeploymentEnabled(b); - Assert.assertEquals(b, conf.isFileDeploymentEnabled()); - b = RandomUtil.randomBoolean(); conf.setPersistenceEnabled(b); Assert.assertEquals(b, conf.isPersistenceEnabled()); @@ -402,10 +397,6 @@ public class ConfigurationImplTest extends UnitTestCase conf.setEnabledAsyncConnectionExecution(b); Assert.assertEquals(b, conf.isAsyncConnectionExecutionEnabled()); - b = RandomUtil.randomBoolean(); - conf.setFileDeploymentEnabled(b); - Assert.assertEquals(b, conf.isFileDeploymentEnabled()); - b = RandomUtil.randomBoolean(); conf.setPersistenceEnabled(b); Assert.assertEquals(b, conf.isPersistenceEnabled()); diff --git a/activemq-server/src/test/java/org/apache/activemq/core/config/impl/DefaultsFileConfigurationTest.java b/activemq-server/src/test/java/org/apache/activemq/core/config/impl/DefaultsFileConfigurationTest.java index 0b0ac7195e..2eb50c357b 100644 --- a/activemq-server/src/test/java/org/apache/activemq/core/config/impl/DefaultsFileConfigurationTest.java +++ b/activemq-server/src/test/java/org/apache/activemq/core/config/impl/DefaultsFileConfigurationTest.java @@ -17,6 +17,7 @@ package org.apache.activemq.core.config.impl; import org.apache.activemq.api.config.ActiveMQDefaultConfiguration; +import org.apache.activemq.core.config.FileDeploymentManager; import org.apache.activemq.core.config.ha.LiveOnlyPolicyConfiguration; import org.junit.Test; @@ -150,9 +151,10 @@ public class DefaultsFileConfigurationTest extends ConfigurationImplTest @Override protected Configuration createConfiguration() throws Exception { - FileConfiguration fc = new FileConfiguration("ConfigurationTest-defaults.xml"); - - fc.start(); + FileConfiguration fc = new FileConfiguration(); + FileDeploymentManager deploymentManager = new FileDeploymentManager("ConfigurationTest-defaults.xml"); + deploymentManager.addDeployable(fc); + deploymentManager.readConfiguration(); return fc; } diff --git a/activemq-server/src/test/java/org/apache/activemq/core/config/impl/FileConfigurationParserTest.java b/activemq-server/src/test/java/org/apache/activemq/core/config/impl/FileConfigurationParserTest.java index 7a2180c93f..76c4ccdbd1 100644 --- a/activemq-server/src/test/java/org/apache/activemq/core/config/impl/FileConfigurationParserTest.java +++ b/activemq-server/src/test/java/org/apache/activemq/core/config/impl/FileConfigurationParserTest.java @@ -23,6 +23,7 @@ import java.util.Map; import org.apache.activemq.api.config.ActiveMQDefaultConfiguration; import org.apache.activemq.core.config.Configuration; +import org.apache.activemq.core.config.FileDeploymentManager; import org.apache.activemq.core.deployers.impl.FileConfigurationParser; import org.apache.activemq.tests.util.UnitTestCase; import org.apache.activemq.utils.DefaultSensitiveStringCodec; @@ -51,11 +52,13 @@ public class FileConfigurationParserTest extends UnitTestCase for (int i = 0; i < 6; i++) { String filename = "InvalidConfigurationTest" + i + ".xml"; - FileConfiguration fc = new FileConfiguration(filename); + FileConfiguration fc = new FileConfiguration(); + FileDeploymentManager deploymentManager = new FileDeploymentManager(filename); + deploymentManager.addDeployable(fc); try { - fc.start(); + deploymentManager.readConfiguration(); fail("parsing should have failed for " + filename); } catch (java.lang.IllegalStateException e) @@ -70,8 +73,10 @@ public class FileConfigurationParserTest extends UnitTestCase public void testDivertRoutingNameIsNotRequired() throws Exception { String filename = "divertRoutingNameNotRequired.xml"; - FileConfiguration fc = new FileConfiguration(filename); - fc.start(); + FileConfiguration fc = new FileConfiguration(); + FileDeploymentManager deploymentManager = new FileDeploymentManager(filename); + deploymentManager.addDeployable(fc); + deploymentManager.readConfiguration(); } @Test @@ -131,9 +136,7 @@ public class FileConfigurationParserTest extends UnitTestCase } private static String firstPart = - "\n" + + "" + "\n" + "ActiveMQ.main.config" + "\n" + "abackupgroupname" + "\n" + "ascaledowngroupname" + "\n" + @@ -197,8 +200,8 @@ public class FileConfigurationParserTest extends UnitTestCase + "10" + "\n" + "BLOCK" + "\n" + "" + "\n" + - ""; + "" + "\n"; - private static String lastPart = ""; + private static String lastPart = ""; } diff --git a/activemq-server/src/test/java/org/apache/activemq/core/config/impl/FileConfigurationTest.java b/activemq-server/src/test/java/org/apache/activemq/core/config/impl/FileConfigurationTest.java index bf10266679..78ca8ce61c 100644 --- a/activemq-server/src/test/java/org/apache/activemq/core/config/impl/FileConfigurationTest.java +++ b/activemq-server/src/test/java/org/apache/activemq/core/config/impl/FileConfigurationTest.java @@ -27,6 +27,7 @@ import org.apache.activemq.core.config.BridgeConfiguration; import org.apache.activemq.core.config.ClusterConnectionConfiguration; import org.apache.activemq.core.config.Configuration; import org.apache.activemq.core.config.DivertConfiguration; +import org.apache.activemq.core.config.FileDeploymentManager; import org.apache.activemq.core.config.HAPolicyConfiguration; import org.apache.activemq.core.config.ha.LiveOnlyPolicyConfiguration; import org.apache.activemq.core.security.Role; @@ -48,9 +49,7 @@ public class FileConfigurationTest extends ConfigurationImplTest // Check they match the values from the test file Assert.assertEquals("SomeNameForUseOnTheApplicationServer", conf.getName()); Assert.assertEquals(false, conf.isPersistenceEnabled()); - Assert.assertEquals(true, conf.isFileDeploymentEnabled()); Assert.assertEquals(true, conf.isClustered()); - Assert.assertEquals(true, conf.isFileDeploymentEnabled()); Assert.assertEquals(12345, conf.getScheduledThreadPoolMaxSize()); Assert.assertEquals(54321, conf.getThreadPoolMaxSize()); Assert.assertEquals(false, conf.isSecurityEnabled()); @@ -355,26 +354,13 @@ public class FileConfigurationTest extends ConfigurationImplTest } - @Test - public void testSetGetConfigurationURL() - { - final String file = "ghuuhhu"; - - FileConfiguration fc = new FileConfiguration(); - - fc.setConfigurationUrl(file); - - Assert.assertEquals(file, fc.getConfigurationUrl()); - - } - @Override protected Configuration createConfiguration() throws Exception { - FileConfiguration fc = new FileConfiguration("ConfigurationTest-full-config.xml"); - - fc.start(); - + FileConfiguration fc = new FileConfiguration(); + FileDeploymentManager deploymentManager = new FileDeploymentManager("ConfigurationTest-full-config.xml"); + deploymentManager.addDeployable(fc); + deploymentManager.readConfiguration(); return fc; } } diff --git a/activemq-server/src/test/java/org/apache/activemq/core/config/impl/HAPolicyConfigurationTest.java b/activemq-server/src/test/java/org/apache/activemq/core/config/impl/HAPolicyConfigurationTest.java index 88b1e86a78..cc2cedf95c 100644 --- a/activemq-server/src/test/java/org/apache/activemq/core/config/impl/HAPolicyConfigurationTest.java +++ b/activemq-server/src/test/java/org/apache/activemq/core/config/impl/HAPolicyConfigurationTest.java @@ -16,6 +16,7 @@ */ package org.apache.activemq.core.config.impl; +import org.apache.activemq.core.config.FileDeploymentManager; import org.apache.activemq.core.server.cluster.ha.ColocatedPolicy; import org.apache.activemq.core.server.cluster.ha.HAPolicy; import org.apache.activemq.core.server.cluster.ha.LiveOnlyPolicy; @@ -423,9 +424,11 @@ public class HAPolicyConfigurationTest extends UnitTestCase protected Configuration createConfiguration(String fileName) throws Exception { - FileConfiguration fc = new FileConfiguration(fileName); + FileConfiguration fc = new FileConfiguration(); + FileDeploymentManager deploymentManager = new FileDeploymentManager(fileName); + deploymentManager.addDeployable(fc); - fc.start(); + deploymentManager.readConfiguration(); // we need this otherwise the data folder will be located under activemq-server and not on the temporary directory fc.setPagingDirectory(getTestDir() + "/" + fc.getPagingDirectory()); diff --git a/activemq-server/src/test/java/org/apache/activemq/tests/util/UnitTestCase.java b/activemq-server/src/test/java/org/apache/activemq/tests/util/UnitTestCase.java index c1cad5a0cd..6fd3286bfc 100644 --- a/activemq-server/src/test/java/org/apache/activemq/tests/util/UnitTestCase.java +++ b/activemq-server/src/test/java/org/apache/activemq/tests/util/UnitTestCase.java @@ -335,7 +335,6 @@ public abstract class UnitTestCase extends CoreUnitTestCase protected Configuration createDefaultConfig(final Map params, final String... acceptors) throws Exception { ConfigurationImpl configuration = createBasicConfig(-1) - .setFileDeploymentEnabled(false) .setJMXManagementEnabled(false) .clearAcceptorConfigurations(); diff --git a/activemq-server/src/test/resources/ConfigurationTest-defaults.xml b/activemq-server/src/test/resources/ConfigurationTest-defaults.xml index 409b304546..6c6afb066e 100644 --- a/activemq-server/src/test/resources/ConfigurationTest-defaults.xml +++ b/activemq-server/src/test/resources/ConfigurationTest-defaults.xml @@ -17,6 +17,7 @@ + xsi:schemaLocation="urn:activemq ../../src/schemas/activemq-server.xsd "> + diff --git a/activemq-server/src/test/resources/ConfigurationTest-full-config.xml b/activemq-server/src/test/resources/ConfigurationTest-full-config.xml index 3f2ab446fc..f0a5620c0e 100644 --- a/activemq-server/src/test/resources/ConfigurationTest-full-config.xml +++ b/activemq-server/src/test/resources/ConfigurationTest-full-config.xml @@ -17,12 +17,12 @@ + xsi:schemaLocation="urn:activemq ../../../../activemq-server/src/main/resources/schema/activemq-server.xsd"> + SomeNameForUseOnTheApplicationServer false true false - true false 12345 54321 @@ -250,48 +250,49 @@ 95 54321 largemessagesdir - - - - - - - - + + + + + + + + - - - a1.1 - a1.2 - 1 - 81781728121878 - 81738173872337 - 10 - 4 - 10 - 5 - NOTIFY - true - true - - - a2.1 - a2.2 - 5 - 932489234928324 - 7126716262626 - 20 - 8 - 20 - 15 - KILL - false - false - - - - - org.foo - - + + + a1.1 + a1.2 + 1 + 81781728121878 + 81738173872337 + 10 + 4 + 10 + 5 + NOTIFY + true + true + + + a2.1 + a2.2 + 5 + 932489234928324 + 7126716262626 + 20 + 8 + 20 + 15 + KILL + false + false + + + + + org.foo + + + diff --git a/activemq-server/src/test/resources/InvalidConfigurationTest0.xml b/activemq-server/src/test/resources/InvalidConfigurationTest0.xml index 2823933299..100a3e6dd3 100644 --- a/activemq-server/src/test/resources/InvalidConfigurationTest0.xml +++ b/activemq-server/src/test/resources/InvalidConfigurationTest0.xml @@ -17,7 +17,8 @@ + xsi:schemaLocation="urn:activemq ../../src/config/common/schema/activemq-server.xsd"> + SomeNameForUseOnTheApplicationServer 12345 54321 @@ -247,5 +248,5 @@ AA - + diff --git a/activemq-server/src/test/resources/InvalidConfigurationTest1.xml b/activemq-server/src/test/resources/InvalidConfigurationTest1.xml index 63ddb0c5cb..6bfde43e41 100644 --- a/activemq-server/src/test/resources/InvalidConfigurationTest1.xml +++ b/activemq-server/src/test/resources/InvalidConfigurationTest1.xml @@ -17,7 +17,8 @@ + xsi:schemaLocation="urn:activemq ../../src/config/common/schema/activemq-server.xsd"> + SomeNameForUseOnTheApplicationServer 12345 54321 @@ -247,5 +248,5 @@ 8 - + diff --git a/activemq-server/src/test/resources/InvalidConfigurationTest2.xml b/activemq-server/src/test/resources/InvalidConfigurationTest2.xml index a73a6c94fb..bd9693e87a 100644 --- a/activemq-server/src/test/resources/InvalidConfigurationTest2.xml +++ b/activemq-server/src/test/resources/InvalidConfigurationTest2.xml @@ -17,7 +17,8 @@ + xsi:schemaLocation="urn:activemq ../../src/config/common/schema/activemq-server.xsd"> + SomeNameForUseOnTheApplicationServer 12345 54321 @@ -247,5 +248,6 @@ 8 + diff --git a/activemq-server/src/test/resources/InvalidConfigurationTest3.xml b/activemq-server/src/test/resources/InvalidConfigurationTest3.xml index 98645752db..66e435ab42 100644 --- a/activemq-server/src/test/resources/InvalidConfigurationTest3.xml +++ b/activemq-server/src/test/resources/InvalidConfigurationTest3.xml @@ -17,7 +17,8 @@ + xsi:schemaLocation="urn:activemq ../../src/config/common/schema/activemq-server.xsd"> + SomeNameForUseOnTheApplicationServer 12345 54321 @@ -248,5 +249,5 @@ 8 - + diff --git a/activemq-server/src/test/resources/InvalidConfigurationTest4.xml b/activemq-server/src/test/resources/InvalidConfigurationTest4.xml index 8679141687..29f291e121 100644 --- a/activemq-server/src/test/resources/InvalidConfigurationTest4.xml +++ b/activemq-server/src/test/resources/InvalidConfigurationTest4.xml @@ -17,7 +17,8 @@ + xsi:schemaLocation="urn:activemq ../../src/config/common/schema/activemq-server.xsd"> + SomeNameForUseOnTheApplicationServer 12345 54321 @@ -246,5 +247,5 @@ 8 - + diff --git a/activemq-server/src/test/resources/InvalidConfigurationTest5.xml b/activemq-server/src/test/resources/InvalidConfigurationTest5.xml index a9339e3e27..f6f12092ab 100644 --- a/activemq-server/src/test/resources/InvalidConfigurationTest5.xml +++ b/activemq-server/src/test/resources/InvalidConfigurationTest5.xml @@ -17,7 +17,8 @@ + xsi:schemaLocation="urn:activemq ../../src/config/common/schema/activemq-server.xsd"> + SomeNameForUseOnTheApplicationServer 12345 54321 @@ -249,5 +250,5 @@ 8 - + diff --git a/activemq-server/src/test/resources/colocated-hapolicy-config.xml b/activemq-server/src/test/resources/colocated-hapolicy-config.xml index 9ae4254f19..3f401a3685 100644 --- a/activemq-server/src/test/resources/colocated-hapolicy-config.xml +++ b/activemq-server/src/test/resources/colocated-hapolicy-config.xml @@ -17,34 +17,35 @@ - - - - 44 - 33 - 3 - false - 33 - - purple - true - abcdefg - - - tiddles - 22 - 33rrrrr - false - - - boo! - - wahey - - - - - - + xsi:schemaLocation="urn:activemq ../../../../activemq-server/src/main/resources/schema/activemq-server.xsd"> + + + + + 44 + 33 + 3 + false + 33 + + purple + true + abcdefg + + + tiddles + 22 + 33rrrrr + false + + + boo! + + wahey + + + + + + diff --git a/activemq-server/src/test/resources/colocated-hapolicy-config2.xml b/activemq-server/src/test/resources/colocated-hapolicy-config2.xml index f874ece98a..415b50a009 100644 --- a/activemq-server/src/test/resources/colocated-hapolicy-config2.xml +++ b/activemq-server/src/test/resources/colocated-hapolicy-config2.xml @@ -17,28 +17,30 @@ - - - - 44 - 33 - 3 - false - 33 - - 1234 - false - - - 44 - false - false - - - + xsi:schemaLocation="urn:activemq ../../../../activemq-server/src/main/resources/schema/activemq-server.xsd"> + + + + + 44 + 33 + 3 + false + 33 + + 1234 + false + + + 44 + false + false + + + - - + + + c diff --git a/activemq-server/src/test/resources/live-only-hapolicy-config.xml b/activemq-server/src/test/resources/live-only-hapolicy-config.xml index b604a9aa93..ee0a377708 100644 --- a/activemq-server/src/test/resources/live-only-hapolicy-config.xml +++ b/activemq-server/src/test/resources/live-only-hapolicy-config.xml @@ -17,16 +17,18 @@ - - - - - boo! - - wahey - - - + xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd"> + + + + + + boo! + + wahey + + + + diff --git a/activemq-server/src/test/resources/live-only-hapolicy-config2.xml b/activemq-server/src/test/resources/live-only-hapolicy-config2.xml index ecfe109887..0541783f29 100644 --- a/activemq-server/src/test/resources/live-only-hapolicy-config2.xml +++ b/activemq-server/src/test/resources/live-only-hapolicy-config2.xml @@ -17,22 +17,23 @@ - - - - - - false - - boo! - - - sd-connector1 - sd-connector2 - - - - - + xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd"> + + + + + + + false + + boo! + + + sd-connector1 + sd-connector2 + + + + + diff --git a/activemq-server/src/test/resources/live-only-hapolicy-config3.xml b/activemq-server/src/test/resources/live-only-hapolicy-config3.xml index 62d676cebe..1f79134994 100644 --- a/activemq-server/src/test/resources/live-only-hapolicy-config3.xml +++ b/activemq-server/src/test/resources/live-only-hapolicy-config3.xml @@ -17,11 +17,12 @@ - - - - - - + xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd"> + + + + + + + diff --git a/activemq-server/src/test/resources/live-only-hapolicy-config4.xml b/activemq-server/src/test/resources/live-only-hapolicy-config4.xml index f23cd82a8e..cd05bf405a 100644 --- a/activemq-server/src/test/resources/live-only-hapolicy-config4.xml +++ b/activemq-server/src/test/resources/live-only-hapolicy-config4.xml @@ -17,7 +17,9 @@ - + xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd"> + + + diff --git a/activemq-server/src/test/resources/live-only-hapolicy-config5.xml b/activemq-server/src/test/resources/live-only-hapolicy-config5.xml index d18757a4c6..b244b9e05d 100644 --- a/activemq-server/src/test/resources/live-only-hapolicy-config5.xml +++ b/activemq-server/src/test/resources/live-only-hapolicy-config5.xml @@ -17,6 +17,8 @@ + xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd"> + + diff --git a/activemq-server/src/test/resources/replica-hapolicy-config.xml b/activemq-server/src/test/resources/replica-hapolicy-config.xml index 4cf2ef6585..8ed633cacd 100644 --- a/activemq-server/src/test/resources/replica-hapolicy-config.xml +++ b/activemq-server/src/test/resources/replica-hapolicy-config.xml @@ -17,24 +17,27 @@ - - - - tiddles - 22 - 33rrrrr - false - true - 9876 - - - boo! - - wahey - - - - + xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd"> + + + + + + tiddles + 22 + 33rrrrr + false + true + 9876 + + + boo! + + wahey + + + + + diff --git a/activemq-server/src/test/resources/replica-hapolicy-config2.xml b/activemq-server/src/test/resources/replica-hapolicy-config2.xml index e4186105cd..15e85c5da4 100644 --- a/activemq-server/src/test/resources/replica-hapolicy-config2.xml +++ b/activemq-server/src/test/resources/replica-hapolicy-config2.xml @@ -17,25 +17,28 @@ - - - - tiddles - 22 - 33rrrrr - false - - - boo! - - - sd-connector1 - sd-connector2 - - - - - + xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd"> + + + + + + tiddles + 22 + 33rrrrr + false + + + boo! + + + sd-connector1 + sd-connector2 + + + + + + diff --git a/activemq-server/src/test/resources/replica-hapolicy-config3.xml b/activemq-server/src/test/resources/replica-hapolicy-config3.xml index a748d5e097..71b86b380f 100644 --- a/activemq-server/src/test/resources/replica-hapolicy-config3.xml +++ b/activemq-server/src/test/resources/replica-hapolicy-config3.xml @@ -17,16 +17,19 @@ - - - - tiddles - 22 - 33rrrrr - false - - - + xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd"> + + + + + + tiddles + 22 + 33rrrrr + false + + + + diff --git a/activemq-server/src/test/resources/replicated-hapolicy-config.xml b/activemq-server/src/test/resources/replicated-hapolicy-config.xml index 83311ba5d8..1225208943 100644 --- a/activemq-server/src/test/resources/replicated-hapolicy-config.xml +++ b/activemq-server/src/test/resources/replicated-hapolicy-config.xml @@ -17,15 +17,18 @@ - - - - purple - true - abcdefg - - - + xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd"> + + + + + + purple + true + abcdefg + + + + diff --git a/activemq-server/src/test/resources/shared-store-master-hapolicy-config.xml b/activemq-server/src/test/resources/shared-store-master-hapolicy-config.xml index 306cbc85e2..a79589a500 100644 --- a/activemq-server/src/test/resources/shared-store-master-hapolicy-config.xml +++ b/activemq-server/src/test/resources/shared-store-master-hapolicy-config.xml @@ -17,14 +17,16 @@ - - - - 3456 - false - - - + xsi:schemaLocation="urn:activemq ../../../../activemq-server/src/main/resources/schema/activemq-server.xsd"> + + + + + 3456 + false + + + + diff --git a/activemq-server/src/test/resources/shared-store-slave-hapolicy-config.xml b/activemq-server/src/test/resources/shared-store-slave-hapolicy-config.xml index b0ffeae621..0f8bb71b32 100644 --- a/activemq-server/src/test/resources/shared-store-slave-hapolicy-config.xml +++ b/activemq-server/src/test/resources/shared-store-slave-hapolicy-config.xml @@ -17,22 +17,24 @@ - - - - true - 9876 - false - false - - - boo! - - wahey - - - - + xsi:schemaLocation="urn:activemq ../../../../activemq-server/src/main/resources/schema/activemq-server.xsd"> + + + + + true + 9876 + false + false + + + boo! + + wahey + + + + + diff --git a/activemq-server/src/test/resources/shared-store-slave-hapolicy-config2.xml b/activemq-server/src/test/resources/shared-store-slave-hapolicy-config2.xml index c88eb23988..3f5a9edf62 100644 --- a/activemq-server/src/test/resources/shared-store-slave-hapolicy-config2.xml +++ b/activemq-server/src/test/resources/shared-store-slave-hapolicy-config2.xml @@ -17,24 +17,26 @@ - - - - 5678 - true - true - - - boo! - - - sd-connector1 - sd-connector2 - - - - - + xsi:schemaLocation="urn:activemq ../../../../activemq-server/src/main/resources/schema/activemq-server.xsd"> + + + + + 5678 + true + true + + + boo! + + + sd-connector1 + sd-connector2 + + + + + + diff --git a/activemq-server/src/test/resources/shared-store-slave-hapolicy-config3.xml b/activemq-server/src/test/resources/shared-store-slave-hapolicy-config3.xml index 43126aa136..06b0fbb481 100644 --- a/activemq-server/src/test/resources/shared-store-slave-hapolicy-config3.xml +++ b/activemq-server/src/test/resources/shared-store-slave-hapolicy-config3.xml @@ -17,15 +17,17 @@ - - - - 5678 - true - true - - - + xsi:schemaLocation="urn:activemq ../../../../activemq-server/src/main/resources/schema/activemq-server.xsd"> + + + + + 5678 + true + true + + + + diff --git a/distribution/activemq/pom.xml b/distribution/activemq/pom.xml index 0be0644e15..16529bc22a 100644 --- a/distribution/activemq/pom.xml +++ b/distribution/activemq/pom.xml @@ -215,106 +215,6 @@ - - org.codehaus.mojo - xml-maven-plugin - - - package - - validate - - - - - - -

${configLocation}/clustered - ${schemaLocation}/activemq-configuration.xsd - - activemq-configuration.xml - - - - ${configLocation}/non-clustered - ${schemaLocation}/activemq-configuration.xsd - - activemq-configuration.xml - - - - ${configLocation}/replicated - ${schemaLocation}/activemq-configuration.xsd - - activemq-configuration.xml - - - - ${configLocation}/shared-store - ${schemaLocation}/activemq-configuration.xsd - - activemq-configuration.xml - - - - ${configLocation}/clustered - ${schemaLocation}/activemq-jms.xsd - - activemq-jms.xml - - - - ${configLocation}/non-clustered - ${schemaLocation}/activemq-jms.xsd - - activemq-jms.xml - - - - ${configLocation}/replicated - ${schemaLocation}/activemq-jms.xsd - - activemq-jms.xml - - - - ${configLocation}/shared-store - ${schemaLocation}/activemq-jms.xsd - - activemq-jms.xml - - - - ${configLocation}/clustered - ${schemaLocation}/activemq-users.xsd - - activemq-users.xml - - - - ${configLocation}/non-clustered - ${schemaLocation}/activemq-users.xsd - - activemq-users.xml - - - - ${configLocation}/replicated - ${schemaLocation}/activemq-users.xsd - - activemq-users.xml - - - - ${configLocation}/shared-store - ${schemaLocation}/activemq-users.xsd - - activemq-users.xml - - - - - diff --git a/distribution/activemq/src/main/resources/config/clustered/activemq-configuration.xml b/distribution/activemq/src/main/resources/config/clustered/activemq-configuration.xml index 29c34665ac..103d56795b 100644 --- a/distribution/activemq/src/main/resources/config/clustered/activemq-configuration.xml +++ b/distribution/activemq/src/main/resources/config/clustered/activemq-configuration.xml @@ -21,94 +21,96 @@ under the License. - - ${data.dir:../data}/paging - - ${data.dir:../data}/bindings - - ${data.dir:../data}/journal - - 10 - - ${data.dir:../data}/large-messages + + + + + + ${data.dir:../data}/paging - - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - - - - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - - - - + ${data.dir:../data}/bindings - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - - - - - + ${data.dir:../data}/journal - - - 231.7.7.7 - 9876 - 5000 - netty - - + 10 - - - 231.7.7.7 - 9876 - 10000 - - - - - -
jms
- netty - - - - - - - - - - - - + ${data.dir:../data}/large-messages - - - - jms.queue.DLQ - jms.queue.ExpiryQueue - 0 - 10485760 - 10 - BLOCK - - + + + org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory + + + - + + org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory + + + + + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + + + + + + + + 231.7.7.7 + 9876 + 5000 + netty + + + + + + 231.7.7.7 + 9876 + 10000 + + + + + +
jms
+ netty + + + + + + + + + + + + + + + + + jms.queue.DLQ + jms.queue.ExpiryQueue + 0 + 10485760 + 10 + BLOCK + + + diff --git a/distribution/activemq/src/main/resources/config/clustered/activemq-jms.xml b/distribution/activemq/src/main/resources/config/clustered/activemq-jms.xml deleted file mode 100644 index 73a5f4683c..0000000000 --- a/distribution/activemq/src/main/resources/config/clustered/activemq-jms.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - diff --git a/distribution/activemq/src/main/resources/config/clustered/activemq-roles.properties b/distribution/activemq/src/main/resources/config/clustered/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/distribution/activemq/src/main/resources/config/clustered/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/distribution/activemq/src/main/resources/config/clustered/activemq-users.properties b/distribution/activemq/src/main/resources/config/clustered/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/distribution/activemq/src/main/resources/config/clustered/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/distribution/activemq/src/main/resources/config/clustered/activemq-users.xml b/distribution/activemq/src/main/resources/config/clustered/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/distribution/activemq/src/main/resources/config/clustered/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/distribution/activemq/src/main/resources/config/clustered/bootstrap.xml b/distribution/activemq/src/main/resources/config/clustered/bootstrap.xml index 681a1f5fa3..74608dcf07 100644 --- a/distribution/activemq/src/main/resources/config/clustered/bootstrap.xml +++ b/distribution/activemq/src/main/resources/config/clustered/bootstrap.xml @@ -22,7 +22,7 @@ - + diff --git a/distribution/activemq/src/main/resources/config/non-clustered/activemq-configuration.xml b/distribution/activemq/src/main/resources/config/non-clustered/activemq-configuration.xml index 1f12009019..245d0bda18 100644 --- a/distribution/activemq/src/main/resources/config/non-clustered/activemq-configuration.xml +++ b/distribution/activemq/src/main/resources/config/non-clustered/activemq-configuration.xml @@ -18,70 +18,72 @@ specific language governing permissions and limitations under the License. --> - + + + + + + + ${data.dir:../data}/paging - ${data.dir:../data}/paging - - ${data.dir:../data}/bindings - - ${data.dir:../data}/journal - - 10 - - ${data.dir:../data}/large-messages - - - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - - - - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - - - - + ${data.dir:../data}/bindings - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - - - - - + ${data.dir:../data}/journal - - - - - - - - + 10 - - - - jms.queue.DLQ - jms.queue.ExpiryQueue - 0 - 10485760 - 10 - BLOCK - - + ${data.dir:../data}/large-messages + + + org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory + + + + + + org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory + + + + + + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + + + + + + + + + + + + + + + + + + jms.queue.DLQ + jms.queue.ExpiryQueue + 0 + 10485760 + 10 + BLOCK + + + diff --git a/distribution/activemq/src/main/resources/config/non-clustered/activemq-jms.xml b/distribution/activemq/src/main/resources/config/non-clustered/activemq-jms.xml deleted file mode 100644 index 73a5f4683c..0000000000 --- a/distribution/activemq/src/main/resources/config/non-clustered/activemq-jms.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - diff --git a/distribution/activemq/src/main/resources/config/non-clustered/activemq-roles.properties b/distribution/activemq/src/main/resources/config/non-clustered/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/distribution/activemq/src/main/resources/config/non-clustered/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/distribution/activemq/src/main/resources/config/non-clustered/activemq-users.properties b/distribution/activemq/src/main/resources/config/non-clustered/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/distribution/activemq/src/main/resources/config/non-clustered/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/distribution/activemq/src/main/resources/config/non-clustered/activemq-users.xml b/distribution/activemq/src/main/resources/config/non-clustered/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/distribution/activemq/src/main/resources/config/non-clustered/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/distribution/activemq/src/main/resources/config/non-clustered/bootstrap.xml b/distribution/activemq/src/main/resources/config/non-clustered/bootstrap.xml index e031b163ee..26bc04e3f0 100644 --- a/distribution/activemq/src/main/resources/config/non-clustered/bootstrap.xml +++ b/distribution/activemq/src/main/resources/config/non-clustered/bootstrap.xml @@ -18,11 +18,13 @@ - + + file:${activemq.home}/config/non-clustered/activemq-users.properties + file:${activemq.home}/config/non-clustered/activemq-roles.properties + guest + - - - + diff --git a/distribution/activemq/src/main/resources/config/replicated/activemq-configuration.xml b/distribution/activemq/src/main/resources/config/replicated/activemq-configuration.xml index 9b7cbf5459..2ae8d4da37 100644 --- a/distribution/activemq/src/main/resources/config/replicated/activemq-configuration.xml +++ b/distribution/activemq/src/main/resources/config/replicated/activemq-configuration.xml @@ -21,104 +21,107 @@ under the License. - + + + + + + - ${data.dir:../data}/paging - - ${data.dir:../data}/bindings - - ${data.dir:../data}/journal - - 10 - - ${data.dir:../data}/large-messages + ${data.dir:../data}/paging - - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - - - - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - - - - + ${data.dir:../data}/bindings - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - - - - - + ${data.dir:../data}/journal - - - 231.7.7.7 - 9876 - 5000 - netty - - + 10 - - - 231.7.7.7 - 9876 - 10000 - - - - - -
jms
- netty - - - + ${data.dir:../data}/large-messages - - - - - - - - - - - - - - + + + org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory + + + - - - - jms.queue.DLQ - jms.queue.ExpiryQueue - 0 - 10485760 - 10 - BLOCK - - + + org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory + + + + + - + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + + + + + + + + 231.7.7.7 + 9876 + 5000 + netty + + + + + + 231.7.7.7 + 9876 + 10000 + + + + + +
jms
+ netty + + + + + + + + + + + + + + + + + + + + + + + jms.queue.DLQ + jms.queue.ExpiryQueue + 0 + 10485760 + 10 + BLOCK + + + diff --git a/distribution/activemq/src/main/resources/config/replicated/activemq-jms.xml b/distribution/activemq/src/main/resources/config/replicated/activemq-jms.xml deleted file mode 100644 index 73a5f4683c..0000000000 --- a/distribution/activemq/src/main/resources/config/replicated/activemq-jms.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - diff --git a/distribution/activemq/src/main/resources/config/replicated/activemq-roles.properties b/distribution/activemq/src/main/resources/config/replicated/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/distribution/activemq/src/main/resources/config/replicated/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/distribution/activemq/src/main/resources/config/replicated/activemq-users.properties b/distribution/activemq/src/main/resources/config/replicated/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/distribution/activemq/src/main/resources/config/replicated/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/distribution/activemq/src/main/resources/config/replicated/activemq-users.xml b/distribution/activemq/src/main/resources/config/replicated/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/distribution/activemq/src/main/resources/config/replicated/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/distribution/activemq/src/main/resources/config/replicated/bootstrap.xml b/distribution/activemq/src/main/resources/config/replicated/bootstrap.xml index 037f5d2f17..54c266c2b3 100644 --- a/distribution/activemq/src/main/resources/config/replicated/bootstrap.xml +++ b/distribution/activemq/src/main/resources/config/replicated/bootstrap.xml @@ -22,7 +22,7 @@ - + diff --git a/distribution/activemq/src/main/resources/config/shared-store/activemq-configuration.xml b/distribution/activemq/src/main/resources/config/shared-store/activemq-configuration.xml index 970953ada8..1f00dae23d 100644 --- a/distribution/activemq/src/main/resources/config/shared-store/activemq-configuration.xml +++ b/distribution/activemq/src/main/resources/config/shared-store/activemq-configuration.xml @@ -21,104 +21,107 @@ under the License. - + + + + + + - ${data.dir:../data}/paging - - ${data.dir:../data}/bindings - - ${data.dir:../data}/journal - - 10 - - ${data.dir:../data}/large-messages + ${data.dir:../data}/paging - - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - - - - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - - - - + ${data.dir:../data}/bindings - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - - - - - + ${data.dir:../data}/journal - - - 231.7.7.7 - 9876 - 5000 - netty - - + 10 - - - 231.7.7.7 - 9876 - 10000 - - - - - -
jms
- netty - - - + ${data.dir:../data}/large-messages - - - - - - - - - - - - - - + + + org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory + + + - - - - jms.queue.DLQ - jms.queue.ExpiryQueue - 0 - 10485760 - 10 - BLOCK - - + + org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory + + + + + - + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + + + + + + + + 231.7.7.7 + 9876 + 5000 + netty + + + + + + 231.7.7.7 + 9876 + 10000 + + + + + +
jms
+ netty + + + + + + + + + + + + + + + + + + + + + + + jms.queue.DLQ + jms.queue.ExpiryQueue + 0 + 10485760 + 10 + BLOCK + + + diff --git a/distribution/activemq/src/main/resources/config/shared-store/activemq-jms.xml b/distribution/activemq/src/main/resources/config/shared-store/activemq-jms.xml deleted file mode 100644 index 73a5f4683c..0000000000 --- a/distribution/activemq/src/main/resources/config/shared-store/activemq-jms.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - diff --git a/distribution/activemq/src/main/resources/config/shared-store/activemq-roles.properties b/distribution/activemq/src/main/resources/config/shared-store/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/distribution/activemq/src/main/resources/config/shared-store/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/distribution/activemq/src/main/resources/config/shared-store/activemq-users.properties b/distribution/activemq/src/main/resources/config/shared-store/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/distribution/activemq/src/main/resources/config/shared-store/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/distribution/activemq/src/main/resources/config/shared-store/activemq-users.xml b/distribution/activemq/src/main/resources/config/shared-store/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/distribution/activemq/src/main/resources/config/shared-store/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/distribution/activemq/src/main/resources/config/shared-store/bootstrap.xml b/distribution/activemq/src/main/resources/config/shared-store/bootstrap.xml index 362070989f..9139f5058b 100644 --- a/distribution/activemq/src/main/resources/config/shared-store/bootstrap.xml +++ b/distribution/activemq/src/main/resources/config/shared-store/bootstrap.xml @@ -22,7 +22,7 @@ - + diff --git a/examples/core/perf/src/main/resources/server0/activemq-configuration.xml b/examples/core/perf/src/main/resources/server0/activemq-configuration.xml index 75ab162d2d..e2e6992e50 100644 --- a/examples/core/perf/src/main/resources/server0/activemq-configuration.xml +++ b/examples/core/perf/src/main/resources/server0/activemq-configuration.xml @@ -20,54 +20,53 @@ under the License. + xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd"> + + target/server0/data/messaging/bindings + target/server0/data/messaging/journal + target/server0/data/messaging/largemessages - target/server0/data/messaging/bindings + target/server0/data/messaging/paging + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + + + - target/server0/data/messaging/journal + false - target/server0/data/messaging/largemessages + true - target/server0/data/messaging/paging - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - - - - - - false - - true + true + true + ASYNCIO + 20 + 20000 + false + false - true - true - ASYNCIO - 20 - 20000 - false - false + - - - - -
perfAddress
- - + + +
perfAddress
+ + - + + diff --git a/examples/core/perf/src/main/resources/server0/hornetq-configuration-messaging-lab.xml b/examples/core/perf/src/main/resources/server0/hornetq-configuration-messaging-lab.xml index 1804f338c5..74527c9603 100644 --- a/examples/core/perf/src/main/resources/server0/hornetq-configuration-messaging-lab.xml +++ b/examples/core/perf/src/main/resources/server0/hornetq-configuration-messaging-lab.xml @@ -20,41 +20,40 @@ under the License. + xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd"> + + ${build.directory}/server0/data/messaging/bindings + ${build.directory}/server0/data/messaging/journal + ${build.directory}/server0/data/messaging/largemessages - ${build.directory}/server0/data/messaging/bindings + ${build.directory}/server0/data/messaging/paging + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + + + + - ${build.directory}/server0/data/messaging/journal + false - ${build.directory}/server0/data/messaging/largemessages + true - ${build.directory}/server0/data/messaging/paging - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - - - - - - - false - - true + /activemq-data/large-messages + /activemq-data/bindings + /activemq-data/journal + /activemq-data/paging - /activemq-data/large-messages - /activemq-data/bindings - /activemq-data/journal - /activemq-data/paging - - - -
perfAddress
- - + + +
perfAddress
+ + + diff --git a/examples/core/vertx-connector/src/main/resources/server0/activemq-configuration.xml b/examples/core/vertx-connector/src/main/resources/server0/activemq-configuration.xml index 48bac14169..fcfd7c596f 100644 --- a/examples/core/vertx-connector/src/main/resources/server0/activemq-configuration.xml +++ b/examples/core/vertx-connector/src/main/resources/server0/activemq-configuration.xml @@ -20,62 +20,66 @@ under the License. + xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd"> + + + + + + target/server0/data/messaging/bindings + target/server0/data/messaging/journal - target/server0/data/messaging/bindings + target/server0/data/messaging/largemessages - target/server0/data/messaging/journal + target/server0/data/messaging/paging + - target/server0/data/messaging/largemessages + + + org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory + + - target/server0/data/messaging/paging - + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + - - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - - - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + - + + + + + + + - - - - - - - + + +
queue.vertxQueue
+ + - - -
queue.vertxQueue
- - - - - - org.apache.activemq.integration.vertx.VertxIncomingConnectorServiceFactory - - - - - - - org.apache.activemq.integration.vertx.VertxOutgoingConnectorServiceFactory - - - - - - + + + org.apache.activemq.integration.vertx.VertxIncomingConnectorServiceFactory + + + + + + + org.apache.activemq.integration.vertx.VertxOutgoingConnectorServiceFactory + + + + + + + diff --git a/examples/core/vertx-connector/src/main/resources/server0/activemq-jms.xml b/examples/core/vertx-connector/src/main/resources/server0/activemq-jms.xml deleted file mode 100644 index 8ca9fd6e26..0000000000 --- a/examples/core/vertx-connector/src/main/resources/server0/activemq-jms.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - diff --git a/examples/core/vertx-connector/src/main/resources/server0/activemq-roles.properties b/examples/core/vertx-connector/src/main/resources/server0/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/core/vertx-connector/src/main/resources/server0/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/core/vertx-connector/src/main/resources/server0/activemq-users.properties b/examples/core/vertx-connector/src/main/resources/server0/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/core/vertx-connector/src/main/resources/server0/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/core/vertx-connector/src/main/resources/server0/activemq-users.xml b/examples/core/vertx-connector/src/main/resources/server0/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/examples/core/vertx-connector/src/main/resources/server0/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/aerogear/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/aerogear/src/main/resources/activemq/server0/activemq-configuration.xml index 2056fb1642..78e0af8cf7 100644 --- a/examples/jms/aerogear/src/main/resources/activemq/server0/activemq-configuration.xml +++ b/examples/jms/aerogear/src/main/resources/activemq/server0/activemq-configuration.xml @@ -18,55 +18,63 @@ specific language governing permissions and limitations under the License. --> - + - ${build.directory}/server0/data/messaging/bindings + + + + - ${build.directory}/server0/data/messaging/journal + - ${build.directory}/server0/data/messaging/largemessages + ${build.directory}/server0/data/messaging/bindings - ${build.directory}/server0/data/messaging/paging - - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + ${build.directory}/server0/data/messaging/journal - - - + ${build.directory}/server0/data/messaging/largemessages + + ${build.directory}/server0/data/messaging/paging + + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + + + +
jms.queue.exampleQueue
- - + + - - + + org.apache.activemq.integration.aerogear.AeroGearConnectorServiceFactory - - + + - + - - - - - - - - - - - + + + + + + + + + + + + diff --git a/examples/jms/aerogear/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/aerogear/src/main/resources/activemq/server0/activemq-jms.xml deleted file mode 100644 index 8ca9fd6e26..0000000000 --- a/examples/jms/aerogear/src/main/resources/activemq/server0/activemq-jms.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/aerogear/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/aerogear/src/main/resources/activemq/server0/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/aerogear/src/main/resources/activemq/server0/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/aerogear/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/aerogear/src/main/resources/activemq/server0/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/aerogear/src/main/resources/activemq/server0/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/aerogear/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/aerogear/src/main/resources/activemq/server0/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/examples/jms/aerogear/src/main/resources/activemq/server0/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/applet/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/applet/src/main/resources/activemq/server0/activemq-configuration.xml index 8d32f1a405..7b03d2ba19 100644 --- a/examples/jms/applet/src/main/resources/activemq/server0/activemq-configuration.xml +++ b/examples/jms/applet/src/main/resources/activemq/server0/activemq-configuration.xml @@ -18,37 +18,46 @@ specific language governing permissions and limitations under the License. --> - + - ${build.directory}/server0/data/messaging/bindings + + + + - ${build.directory}/server0/data/messaging/journal + - ${build.directory}/server0/data/messaging/largemessages + ${build.directory}/server0/data/messaging/bindings - ${build.directory}/server0/data/messaging/paging - - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + ${build.directory}/server0/data/messaging/journal - + ${build.directory}/server0/data/messaging/largemessages - - - - - - - - - - - - - + ${build.directory}/server0/data/messaging/paging + + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + + + + + + + + + + + + + + + + + + diff --git a/examples/jms/applet/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/applet/src/main/resources/activemq/server0/activemq-jms.xml deleted file mode 100644 index 96bdc27d76..0000000000 --- a/examples/jms/applet/src/main/resources/activemq/server0/activemq-jms.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/applet/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/applet/src/main/resources/activemq/server0/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/applet/src/main/resources/activemq/server0/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/applet/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/applet/src/main/resources/activemq/server0/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/applet/src/main/resources/activemq/server0/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/applet/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/applet/src/main/resources/activemq/server0/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/examples/jms/applet/src/main/resources/activemq/server0/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/application-layer-failover/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/application-layer-failover/src/main/resources/activemq/server0/activemq-configuration.xml index 0e10c2b4f8..fa76b9ebff 100644 --- a/examples/jms/application-layer-failover/src/main/resources/activemq/server0/activemq-configuration.xml +++ b/examples/jms/application-layer-failover/src/main/resources/activemq/server0/activemq-configuration.xml @@ -18,33 +18,39 @@ specific language governing permissions and limitations under the License. --> - + - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - - + + - + - - - - - - - - - - - + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + - target/data/journal - target/data/bindings - target/data/large-messages + + + + + + + + + + + + + + + target/data/journal + target/data/bindings + target/data/large-messages + diff --git a/examples/jms/application-layer-failover/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/application-layer-failover/src/main/resources/activemq/server0/activemq-jms.xml deleted file mode 100644 index 8ca9fd6e26..0000000000 --- a/examples/jms/application-layer-failover/src/main/resources/activemq/server0/activemq-jms.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/application-layer-failover/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/application-layer-failover/src/main/resources/activemq/server0/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/application-layer-failover/src/main/resources/activemq/server0/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/application-layer-failover/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/application-layer-failover/src/main/resources/activemq/server0/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/application-layer-failover/src/main/resources/activemq/server0/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/application-layer-failover/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/application-layer-failover/src/main/resources/activemq/server0/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/examples/jms/application-layer-failover/src/main/resources/activemq/server0/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/application-layer-failover/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/application-layer-failover/src/main/resources/activemq/server1/activemq-configuration.xml index f7eca758a5..87345a9e4c 100644 --- a/examples/jms/application-layer-failover/src/main/resources/activemq/server1/activemq-configuration.xml +++ b/examples/jms/application-layer-failover/src/main/resources/activemq/server1/activemq-configuration.xml @@ -19,33 +19,41 @@ specific language governing permissions and limitations under the License. --> - + - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - - + + + + - + - - - - - - - - - - - + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + - target/data/journal - target/data/bindings - target/data/large-messages + + + + + + + + + + + + + + + target/data/journal + target/data/bindings + target/data/large-messages + diff --git a/examples/jms/application-layer-failover/src/main/resources/activemq/server1/activemq-jms.xml b/examples/jms/application-layer-failover/src/main/resources/activemq/server1/activemq-jms.xml deleted file mode 100644 index 8ca9fd6e26..0000000000 --- a/examples/jms/application-layer-failover/src/main/resources/activemq/server1/activemq-jms.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/application-layer-failover/src/main/resources/activemq/server1/activemq-roles.properties b/examples/jms/application-layer-failover/src/main/resources/activemq/server1/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/application-layer-failover/src/main/resources/activemq/server1/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/application-layer-failover/src/main/resources/activemq/server1/activemq-users.properties b/examples/jms/application-layer-failover/src/main/resources/activemq/server1/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/application-layer-failover/src/main/resources/activemq/server1/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/application-layer-failover/src/main/resources/activemq/server1/activemq-users.xml b/examples/jms/application-layer-failover/src/main/resources/activemq/server1/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/examples/jms/application-layer-failover/src/main/resources/activemq/server1/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/bridge/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/bridge/src/main/resources/activemq/server0/activemq-configuration.xml index 74972aa20b..7ff1ccc110 100644 --- a/examples/jms/bridge/src/main/resources/activemq/server0/activemq-configuration.xml +++ b/examples/jms/bridge/src/main/resources/activemq/server0/activemq-configuration.xml @@ -18,70 +18,77 @@ specific language governing permissions and limitations under the License. --> - + + + + + - ${build.directory}/server0/data/messaging/bindings + - ${build.directory}/server0/data/messaging/journal + ${build.directory}/server0/data/messaging/bindings - ${build.directory}/server0/data/messaging/largemessages + ${build.directory}/server0/data/messaging/journal - ${build.directory}/server0/data/messaging/paging + ${build.directory}/server0/data/messaging/largemessages - - - - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - - - - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - - - - - - -
jms.queue.sausage-factory
- - + ${build.directory}/server0/data/messaging/paging - - - - jms.queue.sausage-factory - jms.queue.mincing-machine - - org.apache.activemq.jms.example.HatColourChangeTransformer - -1 - - remote-connector - - - + + + + + org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory + + + - + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + + + + + +
jms.queue.sausage-factory
+ + + + + + + jms.queue.sausage-factory + jms.queue.mincing-machine + + org.apache.activemq.jms.example.HatColourChangeTransformer + -1 + + remote-connector + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - diff --git a/examples/jms/bridge/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/bridge/src/main/resources/activemq/server0/activemq-jms.xml deleted file mode 100644 index 57919a22da..0000000000 --- a/examples/jms/bridge/src/main/resources/activemq/server0/activemq-jms.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/bridge/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/bridge/src/main/resources/activemq/server0/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/bridge/src/main/resources/activemq/server0/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/bridge/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/bridge/src/main/resources/activemq/server0/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/bridge/src/main/resources/activemq/server0/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/bridge/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/bridge/src/main/resources/activemq/server0/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/examples/jms/bridge/src/main/resources/activemq/server0/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/bridge/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/bridge/src/main/resources/activemq/server1/activemq-configuration.xml index c36b417011..8d6dc28be5 100644 --- a/examples/jms/bridge/src/main/resources/activemq/server1/activemq-configuration.xml +++ b/examples/jms/bridge/src/main/resources/activemq/server1/activemq-configuration.xml @@ -18,38 +18,45 @@ specific language governing permissions and limitations under the License. --> - + - ${build.directory}/server1/data/messaging/bindings + + + + + - ${build.directory}/server1/data/messaging/journal + ${build.directory}/server1/data/messaging/bindings - ${build.directory}/server1/data/messaging/largemessages + ${build.directory}/server1/data/messaging/journal + + ${build.directory}/server1/data/messaging/largemessages + + ${build.directory}/server1/data/messaging/paging + + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + + + + + + + + + + + + + + + + - ${build.directory}/server1/data/messaging/paging - - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - - - - - - - - - - - - - - - - - diff --git a/examples/jms/bridge/src/main/resources/activemq/server1/activemq-jms.xml b/examples/jms/bridge/src/main/resources/activemq/server1/activemq-jms.xml deleted file mode 100644 index 3e2e51dd74..0000000000 --- a/examples/jms/bridge/src/main/resources/activemq/server1/activemq-jms.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/bridge/src/main/resources/activemq/server1/activemq-roles.properties b/examples/jms/bridge/src/main/resources/activemq/server1/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/bridge/src/main/resources/activemq/server1/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/bridge/src/main/resources/activemq/server1/activemq-users.properties b/examples/jms/bridge/src/main/resources/activemq/server1/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/bridge/src/main/resources/activemq/server1/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/bridge/src/main/resources/activemq/server1/activemq-users.xml b/examples/jms/bridge/src/main/resources/activemq/server1/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/examples/jms/bridge/src/main/resources/activemq/server1/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/browser/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/browser/src/main/resources/activemq/server0/activemq-configuration.xml index 9f7ef1c0f8..2c4daa24b0 100644 --- a/examples/jms/browser/src/main/resources/activemq/server0/activemq-configuration.xml +++ b/examples/jms/browser/src/main/resources/activemq/server0/activemq-configuration.xml @@ -18,37 +18,46 @@ specific language governing permissions and limitations under the License. --> - + - ${build.directory}/server0/data/messaging/bindings + + + + - ${build.directory}/server0/data/messaging/journal + - ${build.directory}/server0/data/messaging/largemessages + ${build.directory}/server0/data/messaging/bindings - ${build.directory}/server0/data/messaging/paging - - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + ${build.directory}/server0/data/messaging/journal - + ${build.directory}/server0/data/messaging/largemessages + + ${build.directory}/server0/data/messaging/paging + + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - diff --git a/examples/jms/browser/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/browser/src/main/resources/activemq/server0/activemq-jms.xml deleted file mode 100644 index 8ca9fd6e26..0000000000 --- a/examples/jms/browser/src/main/resources/activemq/server0/activemq-jms.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/browser/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/browser/src/main/resources/activemq/server0/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/browser/src/main/resources/activemq/server0/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/browser/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/browser/src/main/resources/activemq/server0/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/browser/src/main/resources/activemq/server0/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/browser/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/browser/src/main/resources/activemq/server0/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/examples/jms/browser/src/main/resources/activemq/server0/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/client-kickoff/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/client-kickoff/src/main/resources/activemq/server0/activemq-configuration.xml index 2ecf4620a8..a3937f7bf1 100644 --- a/examples/jms/client-kickoff/src/main/resources/activemq/server0/activemq-configuration.xml +++ b/examples/jms/client-kickoff/src/main/resources/activemq/server0/activemq-configuration.xml @@ -18,26 +18,32 @@ specific language governing permissions and limitations under the License. --> - + + - ${build.directory}/server0/data/messaging/bindings + - ${build.directory}/server0/data/messaging/journal + - ${build.directory}/server0/data/messaging/largemessages + ${build.directory}/server0/data/messaging/bindings - ${build.directory}/server0/data/messaging/paging + ${build.directory}/server0/data/messaging/journal - - true - - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + ${build.directory}/server0/data/messaging/largemessages + + ${build.directory}/server0/data/messaging/paging + + + true + + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + diff --git a/examples/jms/client-kickoff/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/client-kickoff/src/main/resources/activemq/server0/activemq-jms.xml deleted file mode 100644 index eeb80d2ccf..0000000000 --- a/examples/jms/client-kickoff/src/main/resources/activemq/server0/activemq-jms.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - diff --git a/examples/jms/client-kickoff/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/client-kickoff/src/main/resources/activemq/server0/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/client-kickoff/src/main/resources/activemq/server0/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/client-kickoff/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/client-kickoff/src/main/resources/activemq/server0/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/client-kickoff/src/main/resources/activemq/server0/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/client-kickoff/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/client-kickoff/src/main/resources/activemq/server0/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/examples/jms/client-kickoff/src/main/resources/activemq/server0/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server0/activemq-configuration.xml index 1b2663ceb8..4b02342b3a 100644 --- a/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server0/activemq-configuration.xml +++ b/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server0/activemq-configuration.xml @@ -18,74 +18,81 @@ specific language governing permissions and limitations under the License. --> - + + + + + - ${build.directory}/server0/data/messaging/bindings + - ${build.directory}/server0/data/messaging/journal + ${build.directory}/server0/data/messaging/bindings - ${build.directory}/server0/data/messaging/largemessages + ${build.directory}/server0/data/messaging/journal - ${build.directory}/server0/data/messaging/paging + ${build.directory}/server0/data/messaging/largemessages - - - - - + ${build.directory}/server0/data/messaging/paging - - - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - - + + + + + - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - - + + + + org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory + + + - - - ${udp-address:231.7.7.7} - 9876 - 1000 - netty-connector - - + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + - - - ${udp-address:231.7.7.7} - 9876 - 60000 - - + + + ${udp-address:231.7.7.7} + 9876 + 1000 + netty-connector + + - - -
jms
- netty-connector - - - + + + ${udp-address:231.7.7.7} + 9876 + 60000 + + - - - - - - - - - - - + + +
jms
+ netty-connector + + + + + + + + + + + + + + + + diff --git a/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server0/activemq-jms.xml deleted file mode 100644 index 8ca9fd6e26..0000000000 --- a/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server0/activemq-jms.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server0/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server0/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server0/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server0/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server0/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server0/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server1/activemq-configuration.xml index 1059fb5b69..cb4d05f25a 100644 --- a/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server1/activemq-configuration.xml +++ b/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server1/activemq-configuration.xml @@ -18,74 +18,82 @@ specific language governing permissions and limitations under the License. --> - + - ${build.directory}/server0/data/messaging/bindings + + + + - ${build.directory}/server0/data/messaging/journal + - ${build.directory}/server0/data/messaging/largemessages + ${build.directory}/server0/data/messaging/bindings - ${build.directory}/server0/data/messaging/paging + ${build.directory}/server0/data/messaging/journal - - - - - + ${build.directory}/server0/data/messaging/largemessages - - - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - - - - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - - + ${build.directory}/server0/data/messaging/paging - - - ${udp-address:231.7.7.7} - 9876 - 1000 - netty-connector - - + + + + + - - - ${udp-address:231.7.7.7} - 9876 - 60000 - - + + + + org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory + + + - - -
jms
- netty-connector - - - - - - - - - - - - - - - + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + + + + + ${udp-address:231.7.7.7} + 9876 + 1000 + netty-connector + + + + + + ${udp-address:231.7.7.7} + 9876 + 60000 + + + + + +
jms
+ netty-connector + + + + + + + + + + + + + + + + diff --git a/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server1/activemq-jms.xml b/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server1/activemq-jms.xml deleted file mode 100644 index 8ca9fd6e26..0000000000 --- a/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server1/activemq-jms.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server1/activemq-roles.properties b/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server1/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server1/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server1/activemq-users.properties b/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server1/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server1/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server1/activemq-users.xml b/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server1/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server1/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/client-side-load-balancing/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/client-side-load-balancing/src/main/resources/activemq/server0/activemq-configuration.xml index 709766288c..54ec786aca 100644 --- a/examples/jms/client-side-load-balancing/src/main/resources/activemq/server0/activemq-configuration.xml +++ b/examples/jms/client-side-load-balancing/src/main/resources/activemq/server0/activemq-configuration.xml @@ -18,76 +18,81 @@ specific language governing permissions and limitations under the License. --> - - + + + + + - ${build.directory}/server0/data/messaging/bindings + + ${build.directory}/server0/data/messaging/bindings - ${build.directory}/server0/data/messaging/journal + ${build.directory}/server0/data/messaging/journal - ${build.directory}/server0/data/messaging/largemessages + ${build.directory}/server0/data/messaging/largemessages - ${build.directory}/server0/data/messaging/paging + ${build.directory}/server0/data/messaging/paging - + - - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - - - - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - - - - + + + org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory + + + - - - ${udp-address:231.7.7.7} - 9876 - 100 - netty-connector - - - - - - ${udp-address:231.7.7.7} - 9876 - 10000 - - + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + - - -
jms
- netty-connector - 0 - - - - - + + + + + ${udp-address:231.7.7.7} + 9876 + 100 + netty-connector + + + + + + ${udp-address:231.7.7.7} + 9876 + 10000 + + + + + +
jms
+ netty-connector + 0 + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - diff --git a/examples/jms/client-side-load-balancing/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/client-side-load-balancing/src/main/resources/activemq/server0/activemq-jms.xml deleted file mode 100644 index 8ca9fd6e26..0000000000 --- a/examples/jms/client-side-load-balancing/src/main/resources/activemq/server0/activemq-jms.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/client-side-load-balancing/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/client-side-load-balancing/src/main/resources/activemq/server0/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/client-side-load-balancing/src/main/resources/activemq/server0/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/client-side-load-balancing/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/client-side-load-balancing/src/main/resources/activemq/server0/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/client-side-load-balancing/src/main/resources/activemq/server0/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/client-side-load-balancing/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/client-side-load-balancing/src/main/resources/activemq/server0/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/examples/jms/client-side-load-balancing/src/main/resources/activemq/server0/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/client-side-load-balancing/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/client-side-load-balancing/src/main/resources/activemq/server1/activemq-configuration.xml index 5371617cac..e896c56e4e 100644 --- a/examples/jms/client-side-load-balancing/src/main/resources/activemq/server1/activemq-configuration.xml +++ b/examples/jms/client-side-load-balancing/src/main/resources/activemq/server1/activemq-configuration.xml @@ -18,75 +18,78 @@ specific language governing permissions and limitations under the License. --> - + + + + + + + ${build.directory}/server1/data/messaging/bindings - + ${build.directory}/server1/data/messaging/journal - ${build.directory}/server1/data/messaging/bindings + ${build.directory}/server1/data/messaging/largemessages - ${build.directory}/server1/data/messaging/journal + ${build.directory}/server1/data/messaging/paging - ${build.directory}/server1/data/messaging/largemessages + + + + org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory + + + - ${build.directory}/server1/data/messaging/paging + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + - - - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - - - - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - - - - - - - ${udp-address:231.7.7.7} - 9876 - 100 - netty-connector - - - - - - ${udp-address:231.7.7.7} - 9876 - 10000 - - + + + + ${udp-address:231.7.7.7} + 9876 + 100 + netty-connector + + - - -
jms
- netty-connector - 0 - - - - - + + + ${udp-address:231.7.7.7} + 9876 + 10000 + + + + + +
jms
+ netty-connector + 0 + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - diff --git a/examples/jms/client-side-load-balancing/src/main/resources/activemq/server1/activemq-jms.xml b/examples/jms/client-side-load-balancing/src/main/resources/activemq/server1/activemq-jms.xml deleted file mode 100644 index 8ca9fd6e26..0000000000 --- a/examples/jms/client-side-load-balancing/src/main/resources/activemq/server1/activemq-jms.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/client-side-load-balancing/src/main/resources/activemq/server1/activemq-roles.properties b/examples/jms/client-side-load-balancing/src/main/resources/activemq/server1/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/client-side-load-balancing/src/main/resources/activemq/server1/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/client-side-load-balancing/src/main/resources/activemq/server1/activemq-users.properties b/examples/jms/client-side-load-balancing/src/main/resources/activemq/server1/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/client-side-load-balancing/src/main/resources/activemq/server1/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/client-side-load-balancing/src/main/resources/activemq/server1/activemq-users.xml b/examples/jms/client-side-load-balancing/src/main/resources/activemq/server1/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/examples/jms/client-side-load-balancing/src/main/resources/activemq/server1/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/client-side-load-balancing/src/main/resources/activemq/server2/activemq-configuration.xml b/examples/jms/client-side-load-balancing/src/main/resources/activemq/server2/activemq-configuration.xml index dfa7128f0c..6bf473332a 100644 --- a/examples/jms/client-side-load-balancing/src/main/resources/activemq/server2/activemq-configuration.xml +++ b/examples/jms/client-side-load-balancing/src/main/resources/activemq/server2/activemq-configuration.xml @@ -18,75 +18,76 @@ specific language governing permissions and limitations under the License. --> - + + + + + ${build.directory}/server2/data/messaging/bindings - + ${build.directory}/server2/data/messaging/journal - ${build.directory}/server2/data/messaging/bindings + ${build.directory}/server2/data/messaging/largemessages - ${build.directory}/server2/data/messaging/journal + ${build.directory}/server2/data/messaging/paging - ${build.directory}/server2/data/messaging/largemessages + + + + org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory + + + - ${build.directory}/server2/data/messaging/paging + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + - - - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - - - - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - - - - - - - ${udp-address:231.7.7.7} - 9876 - 100 - netty-connector - - - - - - ${udp-address:231.7.7.7} - 9876 - 10000 - - + + + + ${udp-address:231.7.7.7} + 9876 + 100 + netty-connector + + - - -
jms
- netty-connector - 0 - - - - - + + + ${udp-address:231.7.7.7} + 9876 + 10000 + + - - - - - - - - - - - + + +
jms
+ netty-connector + 0 + + + + + + + + + + + + + + + + + + diff --git a/examples/jms/client-side-load-balancing/src/main/resources/activemq/server2/activemq-jms.xml b/examples/jms/client-side-load-balancing/src/main/resources/activemq/server2/activemq-jms.xml deleted file mode 100644 index 8ca9fd6e26..0000000000 --- a/examples/jms/client-side-load-balancing/src/main/resources/activemq/server2/activemq-jms.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/client-side-load-balancing/src/main/resources/activemq/server2/activemq-roles.properties b/examples/jms/client-side-load-balancing/src/main/resources/activemq/server2/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/client-side-load-balancing/src/main/resources/activemq/server2/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/client-side-load-balancing/src/main/resources/activemq/server2/activemq-users.properties b/examples/jms/client-side-load-balancing/src/main/resources/activemq/server2/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/client-side-load-balancing/src/main/resources/activemq/server2/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/client-side-load-balancing/src/main/resources/activemq/server2/activemq-users.xml b/examples/jms/client-side-load-balancing/src/main/resources/activemq/server2/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/examples/jms/client-side-load-balancing/src/main/resources/activemq/server2/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/clustered-durable-subscription/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/clustered-durable-subscription/src/main/resources/activemq/server0/activemq-configuration.xml index 686a1302eb..e53259eed8 100644 --- a/examples/jms/clustered-durable-subscription/src/main/resources/activemq/server0/activemq-configuration.xml +++ b/examples/jms/clustered-durable-subscription/src/main/resources/activemq/server0/activemq-configuration.xml @@ -18,78 +18,85 @@ specific language governing permissions and limitations under the License. --> - + - ${build.directory}/server0/data/messaging/bindings + + + + - ${build.directory}/server0/data/messaging/journal + - ${build.directory}/server0/data/messaging/largemessages + ${build.directory}/server0/data/messaging/bindings - ${build.directory}/server0/data/messaging/paging + ${build.directory}/server0/data/messaging/journal - + ${build.directory}/server0/data/messaging/largemessages - - - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - - - - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - - - - - - - ${udp-address:231.7.7.7} - 9876 - 100 - netty-connector - - - - - - ${udp-address:231.7.7.7} - 9876 - 10000 - - + ${build.directory}/server0/data/messaging/paging - - -
jms
- netty-connector - 500 - true - true - 1 - - - - + + + + org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory + + + - - - - - - - - - - - - + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + + + + + + ${udp-address:231.7.7.7} + 9876 + 100 + netty-connector + + + + + + ${udp-address:231.7.7.7} + 9876 + 10000 + + + + + +
jms
+ netty-connector + 500 + true + true + 1 + + + + + + + + + + + + + + + + + + + diff --git a/examples/jms/clustered-durable-subscription/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/clustered-durable-subscription/src/main/resources/activemq/server0/activemq-jms.xml deleted file mode 100644 index 96bdc27d76..0000000000 --- a/examples/jms/clustered-durable-subscription/src/main/resources/activemq/server0/activemq-jms.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/clustered-durable-subscription/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/clustered-durable-subscription/src/main/resources/activemq/server0/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/clustered-durable-subscription/src/main/resources/activemq/server0/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/clustered-durable-subscription/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/clustered-durable-subscription/src/main/resources/activemq/server0/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/clustered-durable-subscription/src/main/resources/activemq/server0/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/clustered-durable-subscription/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/clustered-durable-subscription/src/main/resources/activemq/server0/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/examples/jms/clustered-durable-subscription/src/main/resources/activemq/server0/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/clustered-durable-subscription/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/clustered-durable-subscription/src/main/resources/activemq/server1/activemq-configuration.xml index dd49fc2288..5a27ad7e19 100644 --- a/examples/jms/clustered-durable-subscription/src/main/resources/activemq/server1/activemq-configuration.xml +++ b/examples/jms/clustered-durable-subscription/src/main/resources/activemq/server1/activemq-configuration.xml @@ -18,79 +18,86 @@ specific language governing permissions and limitations under the License. --> - + - + + + + - ${build.directory}/server1/data/messaging/bindings - - ${build.directory}/server1/data/messaging/journal - - ${build.directory}/server1/data/messaging/largemessages - - ${build.directory}/server1/data/messaging/paging - - - - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - - - - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - - - - - - - ${udp-address:231.7.7.7} - 9876 - 100 - netty-connector - - - - - - ${udp-address:231.7.7.7} - 9876 - 10000 - - - - - -
jms
- netty-connector - 500 - true - true - 1 - - - - - - - - - - - - - - - - - + + ${build.directory}/server1/data/messaging/bindings + + ${build.directory}/server1/data/messaging/journal + + ${build.directory}/server1/data/messaging/largemessages + + ${build.directory}/server1/data/messaging/paging + + + + + org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory + + + + + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + + + + + + ${udp-address:231.7.7.7} + 9876 + 100 + netty-connector + + + + + + ${udp-address:231.7.7.7} + 9876 + 10000 + + + + + +
jms
+ netty-connector + 500 + true + true + 1 + + + + + + + + + + + + + + + + + + + + diff --git a/examples/jms/clustered-durable-subscription/src/main/resources/activemq/server1/activemq-jms.xml b/examples/jms/clustered-durable-subscription/src/main/resources/activemq/server1/activemq-jms.xml deleted file mode 100644 index 96bdc27d76..0000000000 --- a/examples/jms/clustered-durable-subscription/src/main/resources/activemq/server1/activemq-jms.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/clustered-durable-subscription/src/main/resources/activemq/server1/activemq-roles.properties b/examples/jms/clustered-durable-subscription/src/main/resources/activemq/server1/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/clustered-durable-subscription/src/main/resources/activemq/server1/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/clustered-durable-subscription/src/main/resources/activemq/server1/activemq-users.properties b/examples/jms/clustered-durable-subscription/src/main/resources/activemq/server1/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/clustered-durable-subscription/src/main/resources/activemq/server1/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/clustered-durable-subscription/src/main/resources/activemq/server1/activemq-users.xml b/examples/jms/clustered-durable-subscription/src/main/resources/activemq/server1/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/examples/jms/clustered-durable-subscription/src/main/resources/activemq/server1/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/clustered-grouping/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/clustered-grouping/src/main/resources/activemq/server0/activemq-configuration.xml index 7f5f1d547c..9d0e96b56f 100644 --- a/examples/jms/clustered-grouping/src/main/resources/activemq/server0/activemq-configuration.xml +++ b/examples/jms/clustered-grouping/src/main/resources/activemq/server0/activemq-configuration.xml @@ -18,86 +18,94 @@ specific language governing permissions and limitations under the License. --> - - + - ${build.directory}/server0/data/messaging/bindings + + + + - ${build.directory}/server0/data/messaging/journal + - ${build.directory}/server0/data/messaging/largemessages - ${build.directory}/server0/data/messaging/paging + ${build.directory}/server0/data/messaging/bindings - + ${build.directory}/server0/data/messaging/journal - - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - - - - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - - - - - - - ${udp-address:231.7.7.7} - 9876 - 100 - netty-connector - - - - - - ${udp-address:231.7.7.7} - 9876 - 10000 - - - - - + ${build.directory}/server0/data/messaging/largemessages + + ${build.directory}/server0/data/messaging/paging + + + + + + org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory + + + + + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + + + + + + ${udp-address:231.7.7.7} + 9876 + 100 + netty-connector + + + + + + ${udp-address:231.7.7.7} + 9876 + 10000 + + + + + +
jms
+ netty-connector + 500 + true + true + 1 + + + + + + LOCAL
jms
- netty-connector - 500 - true - true - 1 - - - + 5000 + -1 + 30000 + - - LOCAL -
jms
- 5000 - -1 - 30000 - - - + - - - - - - - - - - - + + + + + + + + + + + + diff --git a/examples/jms/clustered-grouping/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/clustered-grouping/src/main/resources/activemq/server0/activemq-jms.xml deleted file mode 100644 index 8ca9fd6e26..0000000000 --- a/examples/jms/clustered-grouping/src/main/resources/activemq/server0/activemq-jms.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/clustered-grouping/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/clustered-grouping/src/main/resources/activemq/server0/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/clustered-grouping/src/main/resources/activemq/server0/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/clustered-grouping/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/clustered-grouping/src/main/resources/activemq/server0/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/clustered-grouping/src/main/resources/activemq/server0/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/clustered-grouping/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/clustered-grouping/src/main/resources/activemq/server0/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/examples/jms/clustered-grouping/src/main/resources/activemq/server0/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/clustered-grouping/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/clustered-grouping/src/main/resources/activemq/server1/activemq-configuration.xml index 86ea4246c2..d72d2f31ec 100644 --- a/examples/jms/clustered-grouping/src/main/resources/activemq/server1/activemq-configuration.xml +++ b/examples/jms/clustered-grouping/src/main/resources/activemq/server1/activemq-configuration.xml @@ -18,83 +18,91 @@ specific language governing permissions and limitations under the License. --> - - + - ${build.directory}/server1/data/messaging/bindings + + + + - ${build.directory}/server1/data/messaging/journal + - ${build.directory}/server1/data/messaging/largemessages - ${build.directory}/server1/data/messaging/paging + ${build.directory}/server1/data/messaging/bindings - - - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - - - - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - - - - - - - ${udp-address:231.7.7.7} - 9876 - 100 - netty-connector - - - - - - ${udp-address:231.7.7.7} - 9876 - 10000 - - - - - + ${build.directory}/server1/data/messaging/journal + + ${build.directory}/server1/data/messaging/largemessages + + ${build.directory}/server1/data/messaging/paging + + + + + org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory + + + + + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + + + + + + ${udp-address:231.7.7.7} + 9876 + 100 + netty-connector + + + + + + ${udp-address:231.7.7.7} + 9876 + 10000 + + + + + +
jms
+ netty-connector + 500 + true + true + 1 + + + + + + REMOTE
jms
- netty-connector - 500 - true - true - 1 - - - + 5000 + - - REMOTE -
jms
- 5000 - + - - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/examples/jms/clustered-grouping/src/main/resources/activemq/server1/activemq-jms.xml b/examples/jms/clustered-grouping/src/main/resources/activemq/server1/activemq-jms.xml deleted file mode 100644 index 8ca9fd6e26..0000000000 --- a/examples/jms/clustered-grouping/src/main/resources/activemq/server1/activemq-jms.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/clustered-grouping/src/main/resources/activemq/server1/activemq-roles.properties b/examples/jms/clustered-grouping/src/main/resources/activemq/server1/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/clustered-grouping/src/main/resources/activemq/server1/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/clustered-grouping/src/main/resources/activemq/server1/activemq-users.properties b/examples/jms/clustered-grouping/src/main/resources/activemq/server1/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/clustered-grouping/src/main/resources/activemq/server1/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/clustered-grouping/src/main/resources/activemq/server1/activemq-users.xml b/examples/jms/clustered-grouping/src/main/resources/activemq/server1/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/examples/jms/clustered-grouping/src/main/resources/activemq/server1/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/clustered-grouping/src/main/resources/activemq/server2/activemq-configuration.xml b/examples/jms/clustered-grouping/src/main/resources/activemq/server2/activemq-configuration.xml index e998b2085f..b06a8f1fe2 100644 --- a/examples/jms/clustered-grouping/src/main/resources/activemq/server2/activemq-configuration.xml +++ b/examples/jms/clustered-grouping/src/main/resources/activemq/server2/activemq-configuration.xml @@ -18,83 +18,91 @@ specific language governing permissions and limitations under the License. --> - - + - ${build.directory}/server2/data/messaging/bindings + + + + - ${build.directory}/server2/data/messaging/journal + - ${build.directory}/server2/data/messaging/largemessages - ${build.directory}/server2/data/messaging/paging + ${build.directory}/server2/data/messaging/bindings - - - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - - - - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - - - - - - - ${udp-address:231.7.7.7} - 9876 - 100 - netty-connector - - - - - - ${udp-address:231.7.7.7} - 9876 - 10000 - - - - - + ${build.directory}/server2/data/messaging/journal + + ${build.directory}/server2/data/messaging/largemessages + + ${build.directory}/server2/data/messaging/paging + + + + + org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory + + + + + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + + + + + + ${udp-address:231.7.7.7} + 9876 + 100 + netty-connector + + + + + + ${udp-address:231.7.7.7} + 9876 + 10000 + + + + + +
jms
+ netty-connector + 500 + true + true + 1 + + + + + + REMOTE
jms
- netty-connector - 500 - true - true - 1 - - - + 5000 + - - REMOTE -
jms
- 5000 - + - - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/examples/jms/clustered-grouping/src/main/resources/activemq/server2/activemq-jms.xml b/examples/jms/clustered-grouping/src/main/resources/activemq/server2/activemq-jms.xml deleted file mode 100644 index 8ca9fd6e26..0000000000 --- a/examples/jms/clustered-grouping/src/main/resources/activemq/server2/activemq-jms.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/clustered-grouping/src/main/resources/activemq/server2/activemq-roles.properties b/examples/jms/clustered-grouping/src/main/resources/activemq/server2/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/clustered-grouping/src/main/resources/activemq/server2/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/clustered-grouping/src/main/resources/activemq/server2/activemq-users.properties b/examples/jms/clustered-grouping/src/main/resources/activemq/server2/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/clustered-grouping/src/main/resources/activemq/server2/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/clustered-grouping/src/main/resources/activemq/server2/activemq-users.xml b/examples/jms/clustered-grouping/src/main/resources/activemq/server2/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/examples/jms/clustered-grouping/src/main/resources/activemq/server2/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/clustered-jgroups/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/clustered-jgroups/src/main/resources/activemq/server0/activemq-configuration.xml index 68ce0d6f40..7c5ad14cce 100644 --- a/examples/jms/clustered-jgroups/src/main/resources/activemq/server0/activemq-configuration.xml +++ b/examples/jms/clustered-jgroups/src/main/resources/activemq/server0/activemq-configuration.xml @@ -18,79 +18,87 @@ specific language governing permissions and limitations under the License. --> - - + - server0/paging - - server0/bindings - - server0/journal - - server0/large-messages + + + + - + - - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - - - - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - - - - - - - 5000 - test-jgroups-file_ping.xml - active_broadcast_channel - netty-connector - - + server0/paging - - - test-jgroups-file_ping.xml - active_broadcast_channel - 10000 - - - - - -
jms
- netty-connector - 500 - true - true - 1 - - - - - + server0/bindings - - - - - - - - - - - + server0/journal + server0/large-messages + + + + + + org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory + + + + + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + + + + + + + 5000 + test-jgroups-file_ping.xml + active_broadcast_channel + netty-connector + + + + + + test-jgroups-file_ping.xml + active_broadcast_channel + 10000 + + + + + +
jms
+ netty-connector + 500 + true + true + 1 + + + + + + + + + + + + + + + + + + + diff --git a/examples/jms/clustered-jgroups/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/clustered-jgroups/src/main/resources/activemq/server0/activemq-jms.xml deleted file mode 100644 index 8ca9fd6e26..0000000000 --- a/examples/jms/clustered-jgroups/src/main/resources/activemq/server0/activemq-jms.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/clustered-jgroups/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/clustered-jgroups/src/main/resources/activemq/server0/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/clustered-jgroups/src/main/resources/activemq/server0/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/clustered-jgroups/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/clustered-jgroups/src/main/resources/activemq/server0/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/clustered-jgroups/src/main/resources/activemq/server0/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/clustered-jgroups/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/clustered-jgroups/src/main/resources/activemq/server0/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/examples/jms/clustered-jgroups/src/main/resources/activemq/server0/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/clustered-jgroups/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/clustered-jgroups/src/main/resources/activemq/server1/activemq-configuration.xml index 918b237927..f1238ea142 100644 --- a/examples/jms/clustered-jgroups/src/main/resources/activemq/server1/activemq-configuration.xml +++ b/examples/jms/clustered-jgroups/src/main/resources/activemq/server1/activemq-configuration.xml @@ -18,78 +18,86 @@ specific language governing permissions and limitations under the License. --> - - + - server1/paging - - server1/bindings - - server1/journal - - server1/large-messages + + + + - - - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - - - - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - - - - + - - - 5000 - test-jgroups-file_ping.xml - active_broadcast_channel - netty-connector - - - - - test-jgroups-file_ping.xml - active_broadcast_channel - 10000 - - - - - -
jms
- netty-connector - 500 - true - true - 1 - - - - - + server1/paging - - - - - - - - - - - + server1/bindings + server1/journal + + server1/large-messages + + + + + org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory + + + + + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + + + + + + + 5000 + test-jgroups-file_ping.xml + active_broadcast_channel + netty-connector + + + + + + test-jgroups-file_ping.xml + active_broadcast_channel + 10000 + + + + + +
jms
+ netty-connector + 500 + true + true + 1 + + + + + + + + + + + + + + + + + + + diff --git a/examples/jms/clustered-jgroups/src/main/resources/activemq/server1/activemq-jms.xml b/examples/jms/clustered-jgroups/src/main/resources/activemq/server1/activemq-jms.xml deleted file mode 100644 index 8ca9fd6e26..0000000000 --- a/examples/jms/clustered-jgroups/src/main/resources/activemq/server1/activemq-jms.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/clustered-jgroups/src/main/resources/activemq/server1/activemq-roles.properties b/examples/jms/clustered-jgroups/src/main/resources/activemq/server1/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/clustered-jgroups/src/main/resources/activemq/server1/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/clustered-jgroups/src/main/resources/activemq/server1/activemq-users.properties b/examples/jms/clustered-jgroups/src/main/resources/activemq/server1/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/clustered-jgroups/src/main/resources/activemq/server1/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/clustered-jgroups/src/main/resources/activemq/server1/activemq-users.xml b/examples/jms/clustered-jgroups/src/main/resources/activemq/server1/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/examples/jms/clustered-jgroups/src/main/resources/activemq/server1/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/clustered-queue/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/clustered-queue/src/main/resources/activemq/server0/activemq-configuration.xml index 389ebb2230..a68192c75b 100644 --- a/examples/jms/clustered-queue/src/main/resources/activemq/server0/activemq-configuration.xml +++ b/examples/jms/clustered-queue/src/main/resources/activemq/server0/activemq-configuration.xml @@ -18,77 +18,85 @@ specific language governing permissions and limitations under the License. --> - - + - target/server0/data/messaging/bindings + + + + - target/server0/data/messaging/journal + - target/server0/data/messaging/largemessages - target/server0/data/messaging/paging - + target/server0/data/messaging/bindings - - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - - - - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - - - - - - - ${udp-address:231.7.7.7} - 9876 - 100 - netty-connector - - - - - - ${udp-address:231.7.7.7} - 9876 - 10000 - - - - - -
jms
- netty-connector - 500 - true - true - 1 - - - - - + target/server0/data/messaging/journal - - - - - - - - - - - + target/server0/data/messaging/largemessages + target/server0/data/messaging/paging + + + + + org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory + + + + + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + + + + + + ${udp-address:231.7.7.7} + 9876 + 100 + netty-connector + + + + + + ${udp-address:231.7.7.7} + 9876 + 10000 + + + + + +
jms
+ netty-connector + 500 + true + true + 1 + + + + + + + + + + + + + + + + + + + diff --git a/examples/jms/clustered-queue/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/clustered-queue/src/main/resources/activemq/server0/activemq-jms.xml deleted file mode 100644 index 8ca9fd6e26..0000000000 --- a/examples/jms/clustered-queue/src/main/resources/activemq/server0/activemq-jms.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/clustered-queue/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/clustered-queue/src/main/resources/activemq/server0/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/clustered-queue/src/main/resources/activemq/server0/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/clustered-queue/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/clustered-queue/src/main/resources/activemq/server0/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/clustered-queue/src/main/resources/activemq/server0/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/clustered-queue/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/clustered-queue/src/main/resources/activemq/server0/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/examples/jms/clustered-queue/src/main/resources/activemq/server0/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/clustered-queue/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/clustered-queue/src/main/resources/activemq/server1/activemq-configuration.xml index 239386e92a..3a9588d25e 100644 --- a/examples/jms/clustered-queue/src/main/resources/activemq/server1/activemq-configuration.xml +++ b/examples/jms/clustered-queue/src/main/resources/activemq/server1/activemq-configuration.xml @@ -18,78 +18,85 @@ specific language governing permissions and limitations under the License. --> - - + + + + + + + + - target/server1/data/messaging/bindings + target/server1/data/messaging/bindings - target/server1/data/messaging/journal + target/server1/data/messaging/journal - target/server1/data/messaging/largemessages + target/server1/data/messaging/largemessages - target/server1/data/messaging/paging + target/server1/data/messaging/paging - - - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - - - - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - - - - - - - ${udp-address:231.7.7.7} - 9876 - 100 - netty-connector - - - - - - ${udp-address:231.7.7.7} - 9876 - 10000 - - - - - -
jms
- netty-connector - 500 - true - true - 1 - - - - - + + + + org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory + + + - - - - - - - - - - - + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + + + + + ${udp-address:231.7.7.7} + 9876 + 100 + netty-connector + + + + + + ${udp-address:231.7.7.7} + 9876 + 10000 + + + + + +
jms
+ netty-connector + 500 + true + true + 1 + + + + + + + + + + + + + + + + + + + diff --git a/examples/jms/clustered-queue/src/main/resources/activemq/server1/activemq-jms.xml b/examples/jms/clustered-queue/src/main/resources/activemq/server1/activemq-jms.xml deleted file mode 100644 index 8ca9fd6e26..0000000000 --- a/examples/jms/clustered-queue/src/main/resources/activemq/server1/activemq-jms.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/clustered-queue/src/main/resources/activemq/server1/activemq-roles.properties b/examples/jms/clustered-queue/src/main/resources/activemq/server1/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/clustered-queue/src/main/resources/activemq/server1/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/clustered-queue/src/main/resources/activemq/server1/activemq-users.properties b/examples/jms/clustered-queue/src/main/resources/activemq/server1/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/clustered-queue/src/main/resources/activemq/server1/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/clustered-queue/src/main/resources/activemq/server1/activemq-users.xml b/examples/jms/clustered-queue/src/main/resources/activemq/server1/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/examples/jms/clustered-queue/src/main/resources/activemq/server1/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/clustered-standalone/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/clustered-standalone/src/main/resources/activemq/server0/activemq-configuration.xml index 63cb1718ca..4c275b13f9 100644 --- a/examples/jms/clustered-standalone/src/main/resources/activemq/server0/activemq-configuration.xml +++ b/examples/jms/clustered-standalone/src/main/resources/activemq/server0/activemq-configuration.xml @@ -18,77 +18,85 @@ specific language governing permissions and limitations under the License. --> - - + - target/server0/data/messaging/bindings + + + + - target/server0/data/messaging/journal + - target/server0/data/messaging/largemessages - target/server0/data/messaging/paging - + target/server0/data/messaging/bindings - - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - - - - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - - - - - - - ${udp-address:231.7.7.7} - 9876 - 100 - netty-connector - - - - - - ${udp-address:231.7.7.7} - 9876 - 10000 - - - - - -
jms
- netty-connector - 500 - true - true - 1 - - - - - + target/server0/data/messaging/journal - - - - - - - - - - - + target/server0/data/messaging/largemessages + target/server0/data/messaging/paging + + + + + org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory + + + + + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + + + + + + ${udp-address:231.7.7.7} + 9876 + 100 + netty-connector + + + + + + ${udp-address:231.7.7.7} + 9876 + 10000 + + + + + +
jms
+ netty-connector + 500 + true + true + 1 + + + + + + + + + + + + + + + + + + + diff --git a/examples/jms/clustered-standalone/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/clustered-standalone/src/main/resources/activemq/server0/activemq-jms.xml deleted file mode 100644 index 96bdc27d76..0000000000 --- a/examples/jms/clustered-standalone/src/main/resources/activemq/server0/activemq-jms.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/clustered-standalone/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/clustered-standalone/src/main/resources/activemq/server0/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/clustered-standalone/src/main/resources/activemq/server0/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/clustered-standalone/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/clustered-standalone/src/main/resources/activemq/server0/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/clustered-standalone/src/main/resources/activemq/server0/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/clustered-standalone/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/clustered-standalone/src/main/resources/activemq/server0/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/examples/jms/clustered-standalone/src/main/resources/activemq/server0/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/clustered-standalone/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/clustered-standalone/src/main/resources/activemq/server1/activemq-configuration.xml index cfd1af831c..1f12bb3a66 100644 --- a/examples/jms/clustered-standalone/src/main/resources/activemq/server1/activemq-configuration.xml +++ b/examples/jms/clustered-standalone/src/main/resources/activemq/server1/activemq-configuration.xml @@ -18,78 +18,85 @@ specific language governing permissions and limitations under the License. --> - - + + + + + + + + - target/server1/data/messaging/bindings + target/server1/data/messaging/bindings - target/server1/data/messaging/journal + target/server1/data/messaging/journal - target/server1/data/messaging/largemessages + target/server1/data/messaging/largemessages - target/server1/data/messaging/paging + target/server1/data/messaging/paging - - - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - - - - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - - - - - - - ${udp-address:231.7.7.7} - 9876 - 100 - netty-connector - - - - - - ${udp-address:231.7.7.7} - 9876 - 10000 - - - - - -
jms
- netty-connector - 500 - true - true - 1 - - - - - + + + + org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory + + + - - - - - - - - - - - + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + + + + + ${udp-address:231.7.7.7} + 9876 + 100 + netty-connector + + + + + + ${udp-address:231.7.7.7} + 9876 + 10000 + + + + + +
jms
+ netty-connector + 500 + true + true + 1 + + + + + + + + + + + + + + + + + + + diff --git a/examples/jms/clustered-standalone/src/main/resources/activemq/server1/activemq-jms.xml b/examples/jms/clustered-standalone/src/main/resources/activemq/server1/activemq-jms.xml deleted file mode 100644 index 96bdc27d76..0000000000 --- a/examples/jms/clustered-standalone/src/main/resources/activemq/server1/activemq-jms.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/clustered-standalone/src/main/resources/activemq/server1/activemq-roles.properties b/examples/jms/clustered-standalone/src/main/resources/activemq/server1/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/clustered-standalone/src/main/resources/activemq/server1/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/clustered-standalone/src/main/resources/activemq/server1/activemq-users.properties b/examples/jms/clustered-standalone/src/main/resources/activemq/server1/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/clustered-standalone/src/main/resources/activemq/server1/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/clustered-standalone/src/main/resources/activemq/server1/activemq-users.xml b/examples/jms/clustered-standalone/src/main/resources/activemq/server1/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/examples/jms/clustered-standalone/src/main/resources/activemq/server1/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/clustered-standalone/src/main/resources/activemq/server2/activemq-configuration.xml b/examples/jms/clustered-standalone/src/main/resources/activemq/server2/activemq-configuration.xml index 35d1f9cb29..6721e1854e 100644 --- a/examples/jms/clustered-standalone/src/main/resources/activemq/server2/activemq-configuration.xml +++ b/examples/jms/clustered-standalone/src/main/resources/activemq/server2/activemq-configuration.xml @@ -18,78 +18,85 @@ specific language governing permissions and limitations under the License. --> - - + + + + + + + + - target/server2/data/messaging/bindings + target/server2/data/messaging/bindings - target/server2/data/messaging/journal + target/server2/data/messaging/journal - target/server2/data/messaging/largemessages + target/server2/data/messaging/largemessages - target/server2/data/messaging/paging + target/server2/data/messaging/paging - - - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - - - - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - - - - - - - ${udp-address:231.7.7.7} - 9876 - 100 - netty-connector - - - - - - ${udp-address:231.7.7.7} - 9876 - 10000 - - - - - -
jms
- netty-connector - 500 - true - true - 1 - - - - - + + + + org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory + + + - - - - - - - - - - - + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + + + + + ${udp-address:231.7.7.7} + 9876 + 100 + netty-connector + + + + + + ${udp-address:231.7.7.7} + 9876 + 10000 + + + + + +
jms
+ netty-connector + 500 + true + true + 1 + + + + + + + + + + + + + + + + + + + diff --git a/examples/jms/clustered-standalone/src/main/resources/activemq/server2/activemq-jms.xml b/examples/jms/clustered-standalone/src/main/resources/activemq/server2/activemq-jms.xml deleted file mode 100644 index 96bdc27d76..0000000000 --- a/examples/jms/clustered-standalone/src/main/resources/activemq/server2/activemq-jms.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/clustered-standalone/src/main/resources/activemq/server2/activemq-roles.properties b/examples/jms/clustered-standalone/src/main/resources/activemq/server2/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/clustered-standalone/src/main/resources/activemq/server2/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/clustered-standalone/src/main/resources/activemq/server2/activemq-users.properties b/examples/jms/clustered-standalone/src/main/resources/activemq/server2/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/clustered-standalone/src/main/resources/activemq/server2/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/clustered-standalone/src/main/resources/activemq/server2/activemq-users.xml b/examples/jms/clustered-standalone/src/main/resources/activemq/server2/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/examples/jms/clustered-standalone/src/main/resources/activemq/server2/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/clustered-static-discovery/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/clustered-static-discovery/src/main/resources/activemq/server0/activemq-configuration.xml index 347098a400..b3a86a60d6 100644 --- a/examples/jms/clustered-static-discovery/src/main/resources/activemq/server0/activemq-configuration.xml +++ b/examples/jms/clustered-static-discovery/src/main/resources/activemq/server0/activemq-configuration.xml @@ -18,67 +18,75 @@ specific language governing permissions and limitations under the License. --> - - + - ${build.directory}/server0/data/messaging/bindings + + + + - ${build.directory}/server0/data/messaging/journal + - ${build.directory}/server0/data/messaging/largemessages - ${build.directory}/server0/data/messaging/paging + ${build.directory}/server0/data/messaging/bindings - + ${build.directory}/server0/data/messaging/journal - - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - - - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - - - - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - - - - - -
jms
- netty-connector - 500 - true - true - 1 - - server1-connector - - - - - + ${build.directory}/server0/data/messaging/largemessages - - - - - - - - - - - + ${build.directory}/server0/data/messaging/paging + + + + + org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory + + + + + org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory + + + + + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + + + + +
jms
+ netty-connector + 500 + true + true + 1 + + server1-connector + + + + + + + + + + + + + + + + + + + diff --git a/examples/jms/clustered-static-discovery/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/clustered-static-discovery/src/main/resources/activemq/server0/activemq-jms.xml deleted file mode 100644 index 8ca9fd6e26..0000000000 --- a/examples/jms/clustered-static-discovery/src/main/resources/activemq/server0/activemq-jms.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/clustered-static-discovery/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/clustered-static-discovery/src/main/resources/activemq/server0/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/clustered-static-discovery/src/main/resources/activemq/server0/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/clustered-static-discovery/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/clustered-static-discovery/src/main/resources/activemq/server0/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/clustered-static-discovery/src/main/resources/activemq/server0/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/clustered-static-discovery/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/clustered-static-discovery/src/main/resources/activemq/server0/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/examples/jms/clustered-static-discovery/src/main/resources/activemq/server0/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/clustered-static-discovery/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/clustered-static-discovery/src/main/resources/activemq/server1/activemq-configuration.xml index 0ba2d73de0..0026e8d765 100644 --- a/examples/jms/clustered-static-discovery/src/main/resources/activemq/server1/activemq-configuration.xml +++ b/examples/jms/clustered-static-discovery/src/main/resources/activemq/server1/activemq-configuration.xml @@ -18,67 +18,75 @@ specific language governing permissions and limitations under the License. --> - - + - ${build.directory}/server1/data/messaging/bindings + + + + - ${build.directory}/server1/data/messaging/journal + - ${build.directory}/server1/data/messaging/largemessages - ${build.directory}/server1/data/messaging/paging + ${build.directory}/server1/data/messaging/bindings - - - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - - - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - - - - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - - - - - - -
jms
- netty-connector - 500 - true - true - 1 - - server0-connector - - - - - + ${build.directory}/server1/data/messaging/journal - - - - - - - - - - - + ${build.directory}/server1/data/messaging/largemessages + ${build.directory}/server1/data/messaging/paging + + + + + org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory + + + + + org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory + + + + + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + + + + + +
jms
+ netty-connector + 500 + true + true + 1 + + server0-connector + + + + + + + + + + + + + + + + + + + diff --git a/examples/jms/clustered-static-discovery/src/main/resources/activemq/server1/activemq-jms.xml b/examples/jms/clustered-static-discovery/src/main/resources/activemq/server1/activemq-jms.xml deleted file mode 100644 index 8ca9fd6e26..0000000000 --- a/examples/jms/clustered-static-discovery/src/main/resources/activemq/server1/activemq-jms.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/clustered-static-discovery/src/main/resources/activemq/server1/activemq-roles.properties b/examples/jms/clustered-static-discovery/src/main/resources/activemq/server1/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/clustered-static-discovery/src/main/resources/activemq/server1/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/clustered-static-discovery/src/main/resources/activemq/server1/activemq-users.properties b/examples/jms/clustered-static-discovery/src/main/resources/activemq/server1/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/clustered-static-discovery/src/main/resources/activemq/server1/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/clustered-static-discovery/src/main/resources/activemq/server1/activemq-users.xml b/examples/jms/clustered-static-discovery/src/main/resources/activemq/server1/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/examples/jms/clustered-static-discovery/src/main/resources/activemq/server1/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/clustered-static-discovery/src/main/resources/activemq/server2/activemq-configuration.xml b/examples/jms/clustered-static-discovery/src/main/resources/activemq/server2/activemq-configuration.xml index 3eafb06106..ecf594d8ba 100644 --- a/examples/jms/clustered-static-discovery/src/main/resources/activemq/server2/activemq-configuration.xml +++ b/examples/jms/clustered-static-discovery/src/main/resources/activemq/server2/activemq-configuration.xml @@ -15,67 +15,75 @@ ~ limitations under the License. --> - - + - ${build.directory}/server2/data/messaging/bindings + + + + - ${build.directory}/server2/data/messaging/journal + - ${build.directory}/server2/data/messaging/largemessages - ${build.directory}/server2/data/messaging/paging + ${build.directory}/server2/data/messaging/bindings - - - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - - - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - - - - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - - - - - - -
jms
- netty-connector - 500 - true - true - 1 - - server0-connector - - - - - + ${build.directory}/server2/data/messaging/journal - - - - - - - - - - - + ${build.directory}/server2/data/messaging/largemessages + ${build.directory}/server2/data/messaging/paging + + + + + org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory + + + + + org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory + + + + + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + + + + + +
jms
+ netty-connector + 500 + true + true + 1 + + server0-connector + + + + + + + + + + + + + + + + + + + diff --git a/examples/jms/clustered-static-discovery/src/main/resources/activemq/server2/activemq-jms.xml b/examples/jms/clustered-static-discovery/src/main/resources/activemq/server2/activemq-jms.xml deleted file mode 100644 index e254e36840..0000000000 --- a/examples/jms/clustered-static-discovery/src/main/resources/activemq/server2/activemq-jms.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/examples/jms/clustered-static-discovery/src/main/resources/activemq/server2/activemq-roles.properties b/examples/jms/clustered-static-discovery/src/main/resources/activemq/server2/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/clustered-static-discovery/src/main/resources/activemq/server2/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/clustered-static-discovery/src/main/resources/activemq/server2/activemq-users.properties b/examples/jms/clustered-static-discovery/src/main/resources/activemq/server2/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/clustered-static-discovery/src/main/resources/activemq/server2/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/clustered-static-discovery/src/main/resources/activemq/server2/activemq-users.xml b/examples/jms/clustered-static-discovery/src/main/resources/activemq/server2/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/examples/jms/clustered-static-discovery/src/main/resources/activemq/server2/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/clustered-static-discovery/src/main/resources/activemq/server3/activemq-configuration.xml b/examples/jms/clustered-static-discovery/src/main/resources/activemq/server3/activemq-configuration.xml index 63a382ea52..70b809e4e3 100644 --- a/examples/jms/clustered-static-discovery/src/main/resources/activemq/server3/activemq-configuration.xml +++ b/examples/jms/clustered-static-discovery/src/main/resources/activemq/server3/activemq-configuration.xml @@ -15,67 +15,75 @@ ~ limitations under the License. --> - - + - ${build.directory}/server3/data/messaging/bindings + + + + - ${build.directory}/server3/data/messaging/journal + - ${build.directory}/server3/data/messaging/largemessages - ${build.directory}/server3/data/messaging/paging + ${build.directory}/server3/data/messaging/bindings - - - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - - - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - - - - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - - - - - - -
jms
- netty-connector - 500 - true - true - 1 - - server0-connector - - - - - + ${build.directory}/server3/data/messaging/journal - - - - - - - - - - - + ${build.directory}/server3/data/messaging/largemessages + ${build.directory}/server3/data/messaging/paging + + + + + org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory + + + + + org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory + + + + + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + + + + + +
jms
+ netty-connector + 500 + true + true + 1 + + server0-connector + + + + + + + + + + + + + + + + + + + diff --git a/examples/jms/clustered-static-discovery/src/main/resources/activemq/server3/activemq-jms.xml b/examples/jms/clustered-static-discovery/src/main/resources/activemq/server3/activemq-jms.xml deleted file mode 100644 index e254e36840..0000000000 --- a/examples/jms/clustered-static-discovery/src/main/resources/activemq/server3/activemq-jms.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/examples/jms/clustered-static-discovery/src/main/resources/activemq/server3/activemq-roles.properties b/examples/jms/clustered-static-discovery/src/main/resources/activemq/server3/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/clustered-static-discovery/src/main/resources/activemq/server3/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/clustered-static-discovery/src/main/resources/activemq/server3/activemq-users.properties b/examples/jms/clustered-static-discovery/src/main/resources/activemq/server3/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/clustered-static-discovery/src/main/resources/activemq/server3/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/clustered-static-discovery/src/main/resources/activemq/server3/activemq-users.xml b/examples/jms/clustered-static-discovery/src/main/resources/activemq/server3/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/examples/jms/clustered-static-discovery/src/main/resources/activemq/server3/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/clustered-static-oneway/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/clustered-static-oneway/src/main/resources/activemq/server0/activemq-configuration.xml index c1eb5cbe8a..8aa3505e71 100644 --- a/examples/jms/clustered-static-oneway/src/main/resources/activemq/server0/activemq-configuration.xml +++ b/examples/jms/clustered-static-oneway/src/main/resources/activemq/server0/activemq-configuration.xml @@ -15,67 +15,75 @@ ~ limitations under the License. --> - - + - ${build.directory}/server0/data/messaging/bindings + + + + - ${build.directory}/server0/data/messaging/journal + - ${build.directory}/server0/data/messaging/largemessages - ${build.directory}/server0/data/messaging/paging + ${build.directory}/server0/data/messaging/bindings - + ${build.directory}/server0/data/messaging/journal - - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - - - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - - - - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - - - - - -
jms
- netty-connector - 500 - true - true - 2 - - server1-connector - - - - - + ${build.directory}/server0/data/messaging/largemessages - - - - - - - - - - - + ${build.directory}/server0/data/messaging/paging + + + + + org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory + + + + + org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory + + + + + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + + + + +
jms
+ netty-connector + 500 + true + true + 2 + + server1-connector + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/examples/jms/clustered-static-oneway/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/clustered-static-oneway/src/main/resources/activemq/server0/activemq-jms.xml deleted file mode 100644 index 8ca9fd6e26..0000000000 --- a/examples/jms/clustered-static-oneway/src/main/resources/activemq/server0/activemq-jms.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/clustered-static-oneway/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/clustered-static-oneway/src/main/resources/activemq/server0/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/clustered-static-oneway/src/main/resources/activemq/server0/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/clustered-static-oneway/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/clustered-static-oneway/src/main/resources/activemq/server0/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/clustered-static-oneway/src/main/resources/activemq/server0/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/clustered-static-oneway/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/clustered-static-oneway/src/main/resources/activemq/server0/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/examples/jms/clustered-static-oneway/src/main/resources/activemq/server0/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/clustered-static-oneway/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/clustered-static-oneway/src/main/resources/activemq/server1/activemq-configuration.xml index c4e5060c33..7ca95283c2 100644 --- a/examples/jms/clustered-static-oneway/src/main/resources/activemq/server1/activemq-configuration.xml +++ b/examples/jms/clustered-static-oneway/src/main/resources/activemq/server1/activemq-configuration.xml @@ -15,67 +15,75 @@ ~ limitations under the License. --> - - + - ${build.directory}/server1/data/messaging/bindings + + + + - ${build.directory}/server1/data/messaging/journal + - ${build.directory}/server1/data/messaging/largemessages - ${build.directory}/server1/data/messaging/paging + ${build.directory}/server1/data/messaging/bindings - - - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - - - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - - - - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - - - - - - -
jms
- netty-connector - 500 - true - true - 2 - - server2-connector - - - - - + ${build.directory}/server1/data/messaging/journal - - - - - - - - - - - + ${build.directory}/server1/data/messaging/largemessages + ${build.directory}/server1/data/messaging/paging + + + + + org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory + + + + + org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory + + + + + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + + + + + +
jms
+ netty-connector + 500 + true + true + 2 + + server2-connector + + + + + + + + + + + + + + + + + + + diff --git a/examples/jms/clustered-static-oneway/src/main/resources/activemq/server1/activemq-jms.xml b/examples/jms/clustered-static-oneway/src/main/resources/activemq/server1/activemq-jms.xml deleted file mode 100644 index 8ca9fd6e26..0000000000 --- a/examples/jms/clustered-static-oneway/src/main/resources/activemq/server1/activemq-jms.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/clustered-static-oneway/src/main/resources/activemq/server1/activemq-roles.properties b/examples/jms/clustered-static-oneway/src/main/resources/activemq/server1/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/clustered-static-oneway/src/main/resources/activemq/server1/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/clustered-static-oneway/src/main/resources/activemq/server1/activemq-users.properties b/examples/jms/clustered-static-oneway/src/main/resources/activemq/server1/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/clustered-static-oneway/src/main/resources/activemq/server1/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/clustered-static-oneway/src/main/resources/activemq/server1/activemq-users.xml b/examples/jms/clustered-static-oneway/src/main/resources/activemq/server1/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/examples/jms/clustered-static-oneway/src/main/resources/activemq/server1/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/clustered-static-oneway/src/main/resources/activemq/server2/activemq-configuration.xml b/examples/jms/clustered-static-oneway/src/main/resources/activemq/server2/activemq-configuration.xml index 374d1de2fd..fb52efabe3 100644 --- a/examples/jms/clustered-static-oneway/src/main/resources/activemq/server2/activemq-configuration.xml +++ b/examples/jms/clustered-static-oneway/src/main/resources/activemq/server2/activemq-configuration.xml @@ -15,59 +15,67 @@ ~ limitations under the License. --> - - + - ${build.directory}/server2/data/messaging/bindings + + + + - ${build.directory}/server2/data/messaging/journal + - ${build.directory}/server2/data/messaging/largemessages - ${build.directory}/server2/data/messaging/paging + ${build.directory}/server2/data/messaging/bindings - - - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - - - - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - - - - - - -
jms
- netty-connector - 500 - true - true - 2 - - - - + ${build.directory}/server2/data/messaging/journal - - - - - - - - - - - + ${build.directory}/server2/data/messaging/largemessages + ${build.directory}/server2/data/messaging/paging + + + + + org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory + + + + + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + + + + + +
jms
+ netty-connector + 500 + true + true + 2 + + + + + + + + + + + + + + + + + + diff --git a/examples/jms/clustered-static-oneway/src/main/resources/activemq/server2/activemq-jms.xml b/examples/jms/clustered-static-oneway/src/main/resources/activemq/server2/activemq-jms.xml deleted file mode 100644 index e254e36840..0000000000 --- a/examples/jms/clustered-static-oneway/src/main/resources/activemq/server2/activemq-jms.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/examples/jms/clustered-static-oneway/src/main/resources/activemq/server2/activemq-roles.properties b/examples/jms/clustered-static-oneway/src/main/resources/activemq/server2/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/clustered-static-oneway/src/main/resources/activemq/server2/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/clustered-static-oneway/src/main/resources/activemq/server2/activemq-users.properties b/examples/jms/clustered-static-oneway/src/main/resources/activemq/server2/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/clustered-static-oneway/src/main/resources/activemq/server2/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/clustered-static-oneway/src/main/resources/activemq/server2/activemq-users.xml b/examples/jms/clustered-static-oneway/src/main/resources/activemq/server2/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/examples/jms/clustered-static-oneway/src/main/resources/activemq/server2/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/clustered-topic/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/clustered-topic/src/main/resources/activemq/server0/activemq-configuration.xml index 24c749213c..76a93e22ff 100644 --- a/examples/jms/clustered-topic/src/main/resources/activemq/server0/activemq-configuration.xml +++ b/examples/jms/clustered-topic/src/main/resources/activemq/server0/activemq-configuration.xml @@ -18,79 +18,87 @@ specific language governing permissions and limitations under the License. --> - - + - ${build.directory}/server0/data/messaging/bindings + + + + - ${build.directory}/server0/data/messaging/journal + - ${build.directory}/server0/data/messaging/largemessages - ${build.directory}/server0/data/messaging/paging + ${build.directory}/server0/data/messaging/bindings - + ${build.directory}/server0/data/messaging/journal - - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - - - - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - - - - + ${build.directory}/server0/data/messaging/largemessages - - - ${udp-address:231.7.7.7} - 9876 - 100 - netty-connector - - - - - - ${udp-address:231.7.7.7} - 9876 - 10000 - - - - - -
jms
- netty-connector - 500 - true - true - 1 - - - - - + ${build.directory}/server0/data/messaging/paging - - - - - - - - - - - + + + + org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory + + + + + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + + + + + + + ${udp-address:231.7.7.7} + 9876 + 100 + netty-connector + + + + + + ${udp-address:231.7.7.7} + 9876 + 10000 + + + + + +
jms
+ netty-connector + 500 + true + true + 1 + + + + + + + + + + + + + + + + + + + diff --git a/examples/jms/clustered-topic/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/clustered-topic/src/main/resources/activemq/server0/activemq-jms.xml deleted file mode 100644 index 96bdc27d76..0000000000 --- a/examples/jms/clustered-topic/src/main/resources/activemq/server0/activemq-jms.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/clustered-topic/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/clustered-topic/src/main/resources/activemq/server0/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/clustered-topic/src/main/resources/activemq/server0/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/clustered-topic/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/clustered-topic/src/main/resources/activemq/server0/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/clustered-topic/src/main/resources/activemq/server0/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/clustered-topic/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/clustered-topic/src/main/resources/activemq/server0/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/examples/jms/clustered-topic/src/main/resources/activemq/server0/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/clustered-topic/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/clustered-topic/src/main/resources/activemq/server1/activemq-configuration.xml index fb290db39e..dd5bd1938e 100644 --- a/examples/jms/clustered-topic/src/main/resources/activemq/server1/activemq-configuration.xml +++ b/examples/jms/clustered-topic/src/main/resources/activemq/server1/activemq-configuration.xml @@ -18,77 +18,85 @@ specific language governing permissions and limitations under the License. --> - - + - ${build.directory}/server1/data/messaging/bindings + + + + - ${build.directory}/server1/data/messaging/journal + - ${build.directory}/server1/data/messaging/largemessages - ${build.directory}/server1/data/messaging/paging + ${build.directory}/server1/data/messaging/bindings - - - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - - - - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - - - - - - - ${udp-address:231.7.7.7} - 9876 - 100 - netty-connector - - - - - - ${udp-address:231.7.7.7} - 9876 - 10000 - - - - - -
jms
- netty-connector - 500 - true - true - 1 - - - + ${build.directory}/server1/data/messaging/journal - + ${build.directory}/server1/data/messaging/largemessages - - - - - - - - - - - + ${build.directory}/server1/data/messaging/paging + + + + org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory + + + + + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + + + + + + ${udp-address:231.7.7.7} + 9876 + 100 + netty-connector + + + + + + ${udp-address:231.7.7.7} + 9876 + 10000 + + + + + +
jms
+ netty-connector + 500 + true + true + 1 + + + + + + + + + + + + + + + + + + + diff --git a/examples/jms/clustered-topic/src/main/resources/activemq/server1/activemq-jms.xml b/examples/jms/clustered-topic/src/main/resources/activemq/server1/activemq-jms.xml deleted file mode 100644 index 96bdc27d76..0000000000 --- a/examples/jms/clustered-topic/src/main/resources/activemq/server1/activemq-jms.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/clustered-topic/src/main/resources/activemq/server1/activemq-roles.properties b/examples/jms/clustered-topic/src/main/resources/activemq/server1/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/clustered-topic/src/main/resources/activemq/server1/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/clustered-topic/src/main/resources/activemq/server1/activemq-users.properties b/examples/jms/clustered-topic/src/main/resources/activemq/server1/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/clustered-topic/src/main/resources/activemq/server1/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/clustered-topic/src/main/resources/activemq/server1/activemq-users.xml b/examples/jms/clustered-topic/src/main/resources/activemq/server1/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/examples/jms/clustered-topic/src/main/resources/activemq/server1/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server0/activemq-configuration.xml index e4daee5f41..10daa9f47c 100644 --- a/examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server0/activemq-configuration.xml +++ b/examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server0/activemq-configuration.xml @@ -18,113 +18,121 @@ specific language governing permissions and limitations under the License. --> - + + + + + + + + - target/server0/data/messaging/bindings + target/server0/data/messaging/bindings - target/server0/data/messaging/journal + target/server0/data/messaging/journal - target/server0/data/messaging/largemessages + target/server0/data/messaging/largemessages - target/server0/data/messaging/paging - + target/server0/data/messaging/paging + - - - org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory - - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - - + + + org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory + + + org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory + + + - - - - org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - - + + + + org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + - - - - ${udp-address:231.7.7.7} - 9876 - 100 - netty-connector - - + + + + ${udp-address:231.7.7.7} + 9876 + 100 + netty-connector + + - - - ${udp-address:231.7.7.7} - 9876 - 10000 - - + + + ${udp-address:231.7.7.7} + 9876 + 10000 + + - - -
jms
- netty-connector - 500 - - 5 - true - true - 1 - - - + + +
jms
+ netty-connector + 500 + + 5 + true + true + 1 + + + - - - - - 100 - -1 - 2000 - 1 - true - - - - - - - + + + + + 100 + -1 + 2000 + 1 + true + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server0/activemq-jms.xml deleted file mode 100644 index 8ca9fd6e26..0000000000 --- a/examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server0/activemq-jms.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server0/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server0/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server0/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server0/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server0/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server0/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server1/activemq-configuration.xml index dab73593f0..f17aeb35cf 100644 --- a/examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server1/activemq-configuration.xml +++ b/examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server1/activemq-configuration.xml @@ -18,114 +18,121 @@ specific language governing permissions and limitations under the License. --> - - + + + + + + + + - target/server1/data/messaging/bindings + target/server1/data/messaging/bindings - target/server1/data/messaging/journal + target/server1/data/messaging/journal - target/server1/data/messaging/largemessages + target/server1/data/messaging/largemessages - target/server1/data/messaging/paging + target/server1/data/messaging/paging - - - - org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory - - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - - - - - - - org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - - - - - - - ${udp-address:231.7.7.7} - 9876 - 100 - netty-connector - - - - - - ${udp-address:231.7.7.7} - 9876 - 10000 - - - - - -
jms
- netty-connector - 500 - - 5 - true - true - 1 - - - + + + + org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory + + + org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory + + + - - - - - 100 - -1 - 2000 - 1 - true - - - - - - - - - + + + + org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + - - - - - - - - - - - - - - - - - - - - - - + + + + ${udp-address:231.7.7.7} + 9876 + 100 + netty-connector + + + + + ${udp-address:231.7.7.7} + 9876 + 10000 + + + + + +
jms
+ netty-connector + 500 + + 5 + true + true + 1 + + + + + + + + + 100 + -1 + 2000 + 1 + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server1/activemq-jms.xml b/examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server1/activemq-jms.xml deleted file mode 100644 index 8ca9fd6e26..0000000000 --- a/examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server1/activemq-jms.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server1/activemq-roles.properties b/examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server1/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server1/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server1/activemq-users.properties b/examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server1/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server1/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server1/activemq-users.xml b/examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server1/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server1/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/colocated-failover/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/colocated-failover/src/main/resources/activemq/server0/activemq-configuration.xml index 47aceb2bfe..0537927e65 100644 --- a/examples/jms/colocated-failover/src/main/resources/activemq/server0/activemq-configuration.xml +++ b/examples/jms/colocated-failover/src/main/resources/activemq/server0/activemq-configuration.xml @@ -18,93 +18,101 @@ specific language governing permissions and limitations under the License. --> - - + - target/server0/data/messaging/bindings + + + + - target/server0/data/messaging/journal - - target/server0/data/messaging/largemessages - - target/server0/data/messaging/paging - - - - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - - - - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - - - - - - - ${udp-address:231.7.7.7} - 9876 - 100 - netty-connector - - - - - - ${udp-address:231.7.7.7} - 9876 - 10000 - - - - - -
jms
- netty-connector - 500 - true - true - 1 - - - - - - - - - 100 - -1 - 2000 - 1 - true - - - - - - - - - - - - - - - - - - - + + target/server0/data/messaging/bindings + + target/server0/data/messaging/journal + + target/server0/data/messaging/largemessages + + target/server0/data/messaging/paging + + + + + org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory + + + + + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + + + + + + ${udp-address:231.7.7.7} + 9876 + 100 + netty-connector + + + + + + ${udp-address:231.7.7.7} + 9876 + 10000 + + + + + +
jms
+ netty-connector + 500 + true + true + 1 + + + + + + + + + 100 + -1 + 2000 + 1 + true + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/jms/colocated-failover/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/colocated-failover/src/main/resources/activemq/server0/activemq-jms.xml deleted file mode 100644 index 8ca9fd6e26..0000000000 --- a/examples/jms/colocated-failover/src/main/resources/activemq/server0/activemq-jms.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/colocated-failover/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/colocated-failover/src/main/resources/activemq/server0/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/colocated-failover/src/main/resources/activemq/server0/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/colocated-failover/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/colocated-failover/src/main/resources/activemq/server0/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/colocated-failover/src/main/resources/activemq/server0/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/colocated-failover/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/colocated-failover/src/main/resources/activemq/server0/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/examples/jms/colocated-failover/src/main/resources/activemq/server0/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/colocated-failover/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/colocated-failover/src/main/resources/activemq/server1/activemq-configuration.xml index e581e3e1d9..27150711fb 100644 --- a/examples/jms/colocated-failover/src/main/resources/activemq/server1/activemq-configuration.xml +++ b/examples/jms/colocated-failover/src/main/resources/activemq/server1/activemq-configuration.xml @@ -18,93 +18,100 @@ specific language governing permissions and limitations under the License. --> - - + + + + + + + + - target/server1/data/messaging/bindings + target/server1/data/messaging/bindings - target/server1/data/messaging/journal + target/server1/data/messaging/journal - target/server1/data/messaging/largemessages + target/server1/data/messaging/largemessages - target/server1/data/messaging/paging + target/server1/data/messaging/paging - - - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - - - - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - - - - - - - ${udp-address:231.7.7.7} - 9876 - 100 - netty-connector - - - - - - ${udp-address:231.7.7.7} - 9876 - 10000 - - - - - -
jms
- netty-connector - 500 - true - true - 1 - - - + + + + org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory + + + - - - - - 100 - -1 - 2000 - 1 - true - - - - - - - + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + - - - - - - - - - - - + + + + ${udp-address:231.7.7.7} + 9876 + 100 + netty-connector + + + + + ${udp-address:231.7.7.7} + 9876 + 10000 + + + + + +
jms
+ netty-connector + 500 + true + true + 1 + + + + + + + + + 100 + -1 + 2000 + 1 + true + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/jms/colocated-failover/src/main/resources/activemq/server1/activemq-jms.xml b/examples/jms/colocated-failover/src/main/resources/activemq/server1/activemq-jms.xml deleted file mode 100644 index fe1c02c217..0000000000 --- a/examples/jms/colocated-failover/src/main/resources/activemq/server1/activemq-jms.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - diff --git a/examples/jms/colocated-failover/src/main/resources/activemq/server1/activemq-roles.properties b/examples/jms/colocated-failover/src/main/resources/activemq/server1/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/colocated-failover/src/main/resources/activemq/server1/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/colocated-failover/src/main/resources/activemq/server1/activemq-users.properties b/examples/jms/colocated-failover/src/main/resources/activemq/server1/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/colocated-failover/src/main/resources/activemq/server1/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/colocated-failover/src/main/resources/activemq/server1/activemq-users.xml b/examples/jms/colocated-failover/src/main/resources/activemq/server1/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/examples/jms/colocated-failover/src/main/resources/activemq/server1/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/consumer-rate-limit/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/consumer-rate-limit/src/main/resources/activemq/server0/activemq-configuration.xml index 69def3b435..bb8c2d13cb 100644 --- a/examples/jms/consumer-rate-limit/src/main/resources/activemq/server0/activemq-configuration.xml +++ b/examples/jms/consumer-rate-limit/src/main/resources/activemq/server0/activemq-configuration.xml @@ -18,37 +18,45 @@ specific language governing permissions and limitations under the License. --> - + - ${build.directory}/server0/data/messaging/bindings + + + + - ${build.directory}/server0/data/messaging/journal + - ${build.directory}/server0/data/messaging/largemessages + ${build.directory}/server0/data/messaging/bindings - ${build.directory}/server0/data/messaging/paging - - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + ${build.directory}/server0/data/messaging/journal - + ${build.directory}/server0/data/messaging/largemessages - - - - - - - - - - - + ${build.directory}/server0/data/messaging/paging + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + + + + + + + + + + + + + + + + diff --git a/examples/jms/consumer-rate-limit/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/consumer-rate-limit/src/main/resources/activemq/server0/activemq-jms.xml deleted file mode 100644 index 8ca9fd6e26..0000000000 --- a/examples/jms/consumer-rate-limit/src/main/resources/activemq/server0/activemq-jms.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/consumer-rate-limit/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/consumer-rate-limit/src/main/resources/activemq/server0/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/consumer-rate-limit/src/main/resources/activemq/server0/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/consumer-rate-limit/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/consumer-rate-limit/src/main/resources/activemq/server0/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/consumer-rate-limit/src/main/resources/activemq/server0/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/consumer-rate-limit/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/consumer-rate-limit/src/main/resources/activemq/server0/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/examples/jms/consumer-rate-limit/src/main/resources/activemq/server0/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/dead-letter/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/dead-letter/src/main/resources/activemq/server0/activemq-configuration.xml index 734bf37f48..04f259815a 100644 --- a/examples/jms/dead-letter/src/main/resources/activemq/server0/activemq-configuration.xml +++ b/examples/jms/dead-letter/src/main/resources/activemq/server0/activemq-configuration.xml @@ -18,45 +18,56 @@ specific language governing permissions and limitations under the License. --> - + - ${build.directory}/server0/data/messaging/bindings + + + - ${build.directory}/server0/data/messaging/journal + + + - ${build.directory}/server0/data/messaging/largemessages + - ${build.directory}/server0/data/messaging/paging - - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + ${build.directory}/server0/data/messaging/bindings - + ${build.directory}/server0/data/messaging/journal - - - - - - - - - - - + ${build.directory}/server0/data/messaging/largemessages - - - - jms.queue.deadLetterQueue - 3 - - + ${build.directory}/server0/data/messaging/paging + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + + + + + + + + + + + + + + + + + + + jms.queue.deadLetterQueue + 3 + + + + diff --git a/examples/jms/dead-letter/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/dead-letter/src/main/resources/activemq/server0/activemq-jms.xml deleted file mode 100644 index ab34dccf2f..0000000000 --- a/examples/jms/dead-letter/src/main/resources/activemq/server0/activemq-jms.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - diff --git a/examples/jms/dead-letter/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/dead-letter/src/main/resources/activemq/server0/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/dead-letter/src/main/resources/activemq/server0/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/dead-letter/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/dead-letter/src/main/resources/activemq/server0/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/dead-letter/src/main/resources/activemq/server0/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/dead-letter/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/dead-letter/src/main/resources/activemq/server0/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/examples/jms/dead-letter/src/main/resources/activemq/server0/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/delayed-redelivery/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/delayed-redelivery/src/main/resources/activemq/server0/activemq-configuration.xml index 771bf4b354..22a572e53c 100644 --- a/examples/jms/delayed-redelivery/src/main/resources/activemq/server0/activemq-configuration.xml +++ b/examples/jms/delayed-redelivery/src/main/resources/activemq/server0/activemq-configuration.xml @@ -18,44 +18,55 @@ specific language governing permissions and limitations under the License. --> - + - ${build.directory}/server0/data/messaging/bindings + + + - ${build.directory}/server0/data/messaging/journal + + + - ${build.directory}/server0/data/messaging/largemessages + - ${build.directory}/server0/data/messaging/paging - - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + ${build.directory}/server0/data/messaging/bindings - + ${build.directory}/server0/data/messaging/journal - - - - - - - - - - - + ${build.directory}/server0/data/messaging/largemessages - - - - 5000 - - + ${build.directory}/server0/data/messaging/paging + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + + + + + + + + + + + + + + + + + + + 5000 + + + + diff --git a/examples/jms/delayed-redelivery/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/delayed-redelivery/src/main/resources/activemq/server0/activemq-jms.xml deleted file mode 100644 index ab34dccf2f..0000000000 --- a/examples/jms/delayed-redelivery/src/main/resources/activemq/server0/activemq-jms.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - diff --git a/examples/jms/delayed-redelivery/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/delayed-redelivery/src/main/resources/activemq/server0/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/delayed-redelivery/src/main/resources/activemq/server0/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/delayed-redelivery/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/delayed-redelivery/src/main/resources/activemq/server0/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/delayed-redelivery/src/main/resources/activemq/server0/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/delayed-redelivery/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/delayed-redelivery/src/main/resources/activemq/server0/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/examples/jms/delayed-redelivery/src/main/resources/activemq/server0/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/divert/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/divert/src/main/resources/activemq/server0/activemq-configuration.xml index 7f10438932..f3d403489b 100644 --- a/examples/jms/divert/src/main/resources/activemq/server0/activemq-configuration.xml +++ b/examples/jms/divert/src/main/resources/activemq/server0/activemq-configuration.xml @@ -18,93 +18,113 @@ specific language governing permissions and limitations under the License. --> - + - - + + - ${build.directory}/server0/data/messaging/bindings + + - ${build.directory}/server0/data/messaging/journal + + - ${build.directory}/server0/data/messaging/largemessages + + - ${build.directory}/server0/data/messaging/paging + + + - + - - - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - - + - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - - - - - - - - -
jms.queue.priceForwarding
- - + ${build.directory}/server0/data/messaging/bindings - - - order-divert -
jms.queue.orders
- jms.topic.spyTopic - false - - - - prices-divert -
jms.topic.priceUpdates
- jms.queue.priceForwarding - - org.apache.activemq.jms.example.AddForwardingTimeTransformer - true - - - - - - - - jms.queue.priceForwarding - jms.topic.newYorkPriceUpdates - -1 - - newyork-connector - - - + ${build.directory}/server0/data/messaging/journal - + ${build.directory}/server0/data/messaging/largemessages - - - - - - - - - - - + ${build.directory}/server0/data/messaging/paging + + + + + + org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory + + + + + + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + + + + + + + +
jms.queue.priceForwarding
+ + + + + + order-divert +
jms.queue.orders
+ jms.topic.spyTopic + false + + + + prices-divert +
jms.topic.priceUpdates
+ jms.queue.priceForwarding + + org.apache.activemq.jms.example.AddForwardingTimeTransformer + + true + + + + + + + + jms.queue.priceForwarding + jms.topic.newYorkPriceUpdates + -1 + + newyork-connector + + + + + + + + + + + + + + + + + + + diff --git a/examples/jms/divert/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/divert/src/main/resources/activemq/server0/activemq-jms.xml deleted file mode 100644 index f755f59839..0000000000 --- a/examples/jms/divert/src/main/resources/activemq/server0/activemq-jms.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/examples/jms/divert/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/divert/src/main/resources/activemq/server0/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/divert/src/main/resources/activemq/server0/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/divert/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/divert/src/main/resources/activemq/server0/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/divert/src/main/resources/activemq/server0/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/divert/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/divert/src/main/resources/activemq/server0/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/examples/jms/divert/src/main/resources/activemq/server0/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/divert/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/divert/src/main/resources/activemq/server1/activemq-configuration.xml index 66c73b69f1..00a0f5546b 100644 --- a/examples/jms/divert/src/main/resources/activemq/server1/activemq-configuration.xml +++ b/examples/jms/divert/src/main/resources/activemq/server1/activemq-configuration.xml @@ -18,39 +18,50 @@ specific language governing permissions and limitations under the License. --> - + - ${build.directory}/server1/data/messaging/bindings + + - ${build.directory}/server1/data/messaging/journal + - ${build.directory}/server1/data/messaging/largemessages + + - ${build.directory}/server1/data/messaging/paging + - + ${build.directory}/server1/data/messaging/bindings - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - - - - + ${build.directory}/server1/data/messaging/journal - - - - - - - - - - - + ${build.directory}/server1/data/messaging/largemessages + ${build.directory}/server1/data/messaging/paging + + + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + + + + + + + + + + + + + + + + + diff --git a/examples/jms/divert/src/main/resources/activemq/server1/activemq-jms.xml b/examples/jms/divert/src/main/resources/activemq/server1/activemq-jms.xml deleted file mode 100644 index 9e0471ef77..0000000000 --- a/examples/jms/divert/src/main/resources/activemq/server1/activemq-jms.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - diff --git a/examples/jms/divert/src/main/resources/activemq/server1/activemq-roles.properties b/examples/jms/divert/src/main/resources/activemq/server1/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/divert/src/main/resources/activemq/server1/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/divert/src/main/resources/activemq/server1/activemq-users.properties b/examples/jms/divert/src/main/resources/activemq/server1/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/divert/src/main/resources/activemq/server1/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/divert/src/main/resources/activemq/server1/activemq-users.xml b/examples/jms/divert/src/main/resources/activemq/server1/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/examples/jms/divert/src/main/resources/activemq/server1/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/durable-subscription/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/durable-subscription/src/main/resources/activemq/server0/activemq-configuration.xml index 0d37b7f6e6..234fe3c0ab 100644 --- a/examples/jms/durable-subscription/src/main/resources/activemq/server0/activemq-configuration.xml +++ b/examples/jms/durable-subscription/src/main/resources/activemq/server0/activemq-configuration.xml @@ -18,39 +18,47 @@ specific language governing permissions and limitations under the License. --> - + - ${build.directory}/server0/data/messaging/bindings + + + + - ${build.directory}/server0/data/messaging/journal + - ${build.directory}/server0/data/messaging/largemessages + ${build.directory}/server0/data/messaging/bindings - ${build.directory}/server0/data/messaging/paging - - + ${build.directory}/server0/data/messaging/journal - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - - + ${build.directory}/server0/data/messaging/largemessages - + ${build.directory}/server0/data/messaging/paging - - - - - - - - - - - + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + + + + + + + + + + + + + + + + + diff --git a/examples/jms/durable-subscription/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/durable-subscription/src/main/resources/activemq/server0/activemq-jms.xml deleted file mode 100644 index 96bdc27d76..0000000000 --- a/examples/jms/durable-subscription/src/main/resources/activemq/server0/activemq-jms.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/durable-subscription/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/durable-subscription/src/main/resources/activemq/server0/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/durable-subscription/src/main/resources/activemq/server0/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/durable-subscription/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/durable-subscription/src/main/resources/activemq/server0/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/durable-subscription/src/main/resources/activemq/server0/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/durable-subscription/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/durable-subscription/src/main/resources/activemq/server0/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/examples/jms/durable-subscription/src/main/resources/activemq/server0/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/embedded-simple/src/main/resources/activemq-configuration.xml b/examples/jms/embedded-simple/src/main/resources/activemq-configuration.xml index b30cf114fd..5524d10cca 100644 --- a/examples/jms/embedded-simple/src/main/resources/activemq-configuration.xml +++ b/examples/jms/embedded-simple/src/main/resources/activemq-configuration.xml @@ -18,30 +18,38 @@ specific language governing permissions and limitations under the License. --> - + - false + + + + - - + + + false + + + org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory - - + + - + - - - + + + - - + + + diff --git a/examples/jms/embedded-simple/src/main/resources/activemq-jms.xml b/examples/jms/embedded-simple/src/main/resources/activemq-jms.xml deleted file mode 100644 index db274847bb..0000000000 --- a/examples/jms/embedded-simple/src/main/resources/activemq-jms.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/embedded-simple/src/main/resources/activemq-roles.properties b/examples/jms/embedded-simple/src/main/resources/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/embedded-simple/src/main/resources/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/embedded-simple/src/main/resources/activemq-users.properties b/examples/jms/embedded-simple/src/main/resources/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/embedded-simple/src/main/resources/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/embedded-simple/src/main/resources/activemq-users.xml b/examples/jms/embedded-simple/src/main/resources/activemq-users.xml deleted file mode 100644 index eb938c0874..0000000000 --- a/examples/jms/embedded-simple/src/main/resources/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/expiry/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/expiry/src/main/resources/activemq/server0/activemq-configuration.xml index 625522ea8e..bdbb007e57 100644 --- a/examples/jms/expiry/src/main/resources/activemq/server0/activemq-configuration.xml +++ b/examples/jms/expiry/src/main/resources/activemq/server0/activemq-configuration.xml @@ -18,44 +18,55 @@ specific language governing permissions and limitations under the License. --> - + - ${build.directory}/server0/data/messaging/bindings + + + - ${build.directory}/server0/data/messaging/journal + + + - ${build.directory}/server0/data/messaging/largemessages + - ${build.directory}/server0/data/messaging/paging - - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + ${build.directory}/server0/data/messaging/bindings - + ${build.directory}/server0/data/messaging/journal - - - - - - - - - - - + ${build.directory}/server0/data/messaging/largemessages - - - - jms.queue.expiryQueue - - + ${build.directory}/server0/data/messaging/paging + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + + + + + + + + + + + + + + + + + + + jms.queue.expiryQueue + + + + diff --git a/examples/jms/expiry/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/expiry/src/main/resources/activemq/server0/activemq-jms.xml deleted file mode 100644 index 3165349b4d..0000000000 --- a/examples/jms/expiry/src/main/resources/activemq/server0/activemq-jms.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - diff --git a/examples/jms/expiry/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/expiry/src/main/resources/activemq/server0/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/expiry/src/main/resources/activemq/server0/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/expiry/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/expiry/src/main/resources/activemq/server0/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/expiry/src/main/resources/activemq/server0/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/expiry/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/expiry/src/main/resources/activemq/server0/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/examples/jms/expiry/src/main/resources/activemq/server0/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/ha-policy-autobackup/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/ha-policy-autobackup/src/main/resources/activemq/server0/activemq-configuration.xml index 236347a46b..6dc0b1c9d6 100644 --- a/examples/jms/ha-policy-autobackup/src/main/resources/activemq/server0/activemq-configuration.xml +++ b/examples/jms/ha-policy-autobackup/src/main/resources/activemq/server0/activemq-configuration.xml @@ -18,96 +18,104 @@ specific language governing permissions and limitations under the License. --> - + - target/server0/data/messaging/bindings + + + + - target/server0/data/messaging/journal + - target/server0/data/messaging/largemessages + target/server0/data/messaging/bindings - target/server0/data/messaging/paging - + target/server0/data/messaging/journal - - - org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory - - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - - - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - - - - - - - org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - - - - - - - - 1 - true - 1000 - - invm-connector + target/server0/data/messaging/largemessages + + target/server0/data/messaging/paging + + + + + org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory + + + org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory + + + + + org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory + + + + + + + + org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + + + + + + + 1 + true + 1000 + + invm-connector + server1-connector + netty-connector + + + + + + invm-connector + + + + + + + + + +
jms
+ netty-connector + 500 + true + true + 1 + server1-connector - netty-connector - - - - - - invm-connector - - - - - - + + + - - -
jms
- netty-connector - 500 - true - true - 1 - - server1-connector - - - - - + - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/examples/jms/ha-policy-autobackup/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/ha-policy-autobackup/src/main/resources/activemq/server0/activemq-jms.xml deleted file mode 100644 index 8ca9fd6e26..0000000000 --- a/examples/jms/ha-policy-autobackup/src/main/resources/activemq/server0/activemq-jms.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/ha-policy-autobackup/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/ha-policy-autobackup/src/main/resources/activemq/server0/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/ha-policy-autobackup/src/main/resources/activemq/server0/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/ha-policy-autobackup/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/ha-policy-autobackup/src/main/resources/activemq/server0/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/ha-policy-autobackup/src/main/resources/activemq/server0/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/ha-policy-autobackup/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/ha-policy-autobackup/src/main/resources/activemq/server0/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/examples/jms/ha-policy-autobackup/src/main/resources/activemq/server0/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/ha-policy-autobackup/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/ha-policy-autobackup/src/main/resources/activemq/server1/activemq-configuration.xml index baf389c91a..33465514da 100644 --- a/examples/jms/ha-policy-autobackup/src/main/resources/activemq/server1/activemq-configuration.xml +++ b/examples/jms/ha-policy-autobackup/src/main/resources/activemq/server1/activemq-configuration.xml @@ -18,96 +18,104 @@ specific language governing permissions and limitations under the License. --> - + - target/server1/data/messaging/bindings + + + + - target/server1/data/messaging/journal + - target/server1/data/messaging/largemessages + target/server1/data/messaging/bindings - target/server1/data/messaging/paging + target/server1/data/messaging/journal - - - - org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory - - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - - - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - - - - - - - org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - - - - - - - - 1 - true - 1000 - - invm-connector + target/server1/data/messaging/largemessages + + target/server1/data/messaging/paging + + + + + org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory + + + org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory + + + + + org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory + + + + + + + + org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + + + + + + + 1 + true + 1000 + + invm-connector + server0-connector + netty-connector + + + + + + invm-connector + + + + + + + + + +
jms
+ netty-connector + 500 + true + true + 1 + server0-connector - netty-connector - - - - - - invm-connector - - - - - - + + + - - -
jms
- netty-connector - 500 - true - true - 1 - - server0-connector - - - - - + - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/examples/jms/ha-policy-autobackup/src/main/resources/activemq/server1/activemq-jms.xml b/examples/jms/ha-policy-autobackup/src/main/resources/activemq/server1/activemq-jms.xml deleted file mode 100644 index 8ca9fd6e26..0000000000 --- a/examples/jms/ha-policy-autobackup/src/main/resources/activemq/server1/activemq-jms.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/ha-policy-autobackup/src/main/resources/activemq/server1/activemq-roles.properties b/examples/jms/ha-policy-autobackup/src/main/resources/activemq/server1/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/ha-policy-autobackup/src/main/resources/activemq/server1/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/ha-policy-autobackup/src/main/resources/activemq/server1/activemq-users.properties b/examples/jms/ha-policy-autobackup/src/main/resources/activemq/server1/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/ha-policy-autobackup/src/main/resources/activemq/server1/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/ha-policy-autobackup/src/main/resources/activemq/server1/activemq-users.xml b/examples/jms/ha-policy-autobackup/src/main/resources/activemq/server1/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/examples/jms/ha-policy-autobackup/src/main/resources/activemq/server1/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/http-transport/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/http-transport/src/main/resources/activemq/server0/activemq-configuration.xml index df4003f0fa..4cb457b407 100644 --- a/examples/jms/http-transport/src/main/resources/activemq/server0/activemq-configuration.xml +++ b/examples/jms/http-transport/src/main/resources/activemq/server0/activemq-configuration.xml @@ -18,39 +18,47 @@ specific language governing permissions and limitations under the License. --> - + - ${build.directory}/server0/data/messaging/bindings + + + + - ${build.directory}/server0/data/messaging/journal + - ${build.directory}/server0/data/messaging/largemessages + ${build.directory}/server0/data/messaging/bindings - ${build.directory}/server0/data/messaging/paging - - + ${build.directory}/server0/data/messaging/journal - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - - + ${build.directory}/server0/data/messaging/largemessages - + ${build.directory}/server0/data/messaging/paging - - - - - - - - - - - + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + + + + + + + + + + + + + + + + + diff --git a/examples/jms/http-transport/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/http-transport/src/main/resources/activemq/server0/activemq-jms.xml deleted file mode 100644 index 8ca9fd6e26..0000000000 --- a/examples/jms/http-transport/src/main/resources/activemq/server0/activemq-jms.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/http-transport/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/http-transport/src/main/resources/activemq/server0/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/http-transport/src/main/resources/activemq/server0/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/http-transport/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/http-transport/src/main/resources/activemq/server0/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/http-transport/src/main/resources/activemq/server0/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/http-transport/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/http-transport/src/main/resources/activemq/server0/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/examples/jms/http-transport/src/main/resources/activemq/server0/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/instantiate-connection-factory/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/instantiate-connection-factory/src/main/resources/activemq/server0/activemq-configuration.xml index 4195b0ade9..6857c9181f 100644 --- a/examples/jms/instantiate-connection-factory/src/main/resources/activemq/server0/activemq-configuration.xml +++ b/examples/jms/instantiate-connection-factory/src/main/resources/activemq/server0/activemq-configuration.xml @@ -18,38 +18,46 @@ specific language governing permissions and limitations under the License. --> - + - ${build.directory}/server0/data/messaging/bindings + + + + - ${build.directory}/server0/data/messaging/journal + - ${build.directory}/server0/data/messaging/largemessages + ${build.directory}/server0/data/messaging/bindings - ${build.directory}/server0/data/messaging/paging - - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - - + ${build.directory}/server0/data/messaging/journal - + ${build.directory}/server0/data/messaging/largemessages - - - - - - - - - - - + ${build.directory}/server0/data/messaging/paging + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + + + + + + + + + + + + + + + + + diff --git a/examples/jms/instantiate-connection-factory/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/instantiate-connection-factory/src/main/resources/activemq/server0/activemq-jms.xml deleted file mode 100644 index b9026f5268..0000000000 --- a/examples/jms/instantiate-connection-factory/src/main/resources/activemq/server0/activemq-jms.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/instantiate-connection-factory/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/instantiate-connection-factory/src/main/resources/activemq/server0/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/instantiate-connection-factory/src/main/resources/activemq/server0/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/instantiate-connection-factory/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/instantiate-connection-factory/src/main/resources/activemq/server0/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/instantiate-connection-factory/src/main/resources/activemq/server0/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/instantiate-connection-factory/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/instantiate-connection-factory/src/main/resources/activemq/server0/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/examples/jms/instantiate-connection-factory/src/main/resources/activemq/server0/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/interceptor/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/interceptor/src/main/resources/activemq/server0/activemq-configuration.xml index 3fbbedbd3a..1005b59dbe 100644 --- a/examples/jms/interceptor/src/main/resources/activemq/server0/activemq-configuration.xml +++ b/examples/jms/interceptor/src/main/resources/activemq/server0/activemq-configuration.xml @@ -18,42 +18,50 @@ specific language governing permissions and limitations under the License. --> - + - ${build.directory}/server0/data/messaging/bindings + + + + - ${build.directory}/server0/data/messaging/journal + - ${build.directory}/server0/data/messaging/largemessages + ${build.directory}/server0/data/messaging/bindings - ${build.directory}/server0/data/messaging/paging + ${build.directory}/server0/data/messaging/journal + + ${build.directory}/server0/data/messaging/largemessages + + ${build.directory}/server0/data/messaging/paging - - org.apache.activemq.jms.example.SimpleInterceptor - - - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + + org.apache.activemq.jms.example.SimpleInterceptor + - + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + - - - - - - - - - - - + + + + + + + + + + + + + + diff --git a/examples/jms/interceptor/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/interceptor/src/main/resources/activemq/server0/activemq-jms.xml deleted file mode 100644 index 8ca9fd6e26..0000000000 --- a/examples/jms/interceptor/src/main/resources/activemq/server0/activemq-jms.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/interceptor/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/interceptor/src/main/resources/activemq/server0/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/interceptor/src/main/resources/activemq/server0/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/interceptor/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/interceptor/src/main/resources/activemq/server0/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/interceptor/src/main/resources/activemq/server0/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/interceptor/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/interceptor/src/main/resources/activemq/server0/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/examples/jms/interceptor/src/main/resources/activemq/server0/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/jaas/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/jaas/src/main/resources/activemq/server0/activemq-configuration.xml index 69def3b435..bb8c2d13cb 100644 --- a/examples/jms/jaas/src/main/resources/activemq/server0/activemq-configuration.xml +++ b/examples/jms/jaas/src/main/resources/activemq/server0/activemq-configuration.xml @@ -18,37 +18,45 @@ specific language governing permissions and limitations under the License. --> - + - ${build.directory}/server0/data/messaging/bindings + + + + - ${build.directory}/server0/data/messaging/journal + - ${build.directory}/server0/data/messaging/largemessages + ${build.directory}/server0/data/messaging/bindings - ${build.directory}/server0/data/messaging/paging - - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + ${build.directory}/server0/data/messaging/journal - + ${build.directory}/server0/data/messaging/largemessages - - - - - - - - - - - + ${build.directory}/server0/data/messaging/paging + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + + + + + + + + + + + + + + + + diff --git a/examples/jms/jaas/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/jaas/src/main/resources/activemq/server0/activemq-jms.xml deleted file mode 100644 index 8ca9fd6e26..0000000000 --- a/examples/jms/jaas/src/main/resources/activemq/server0/activemq-jms.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/jms-auto-closeable/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/jms-auto-closeable/src/main/resources/activemq/server0/activemq-configuration.xml index a20afadc00..f69eef9f6d 100644 --- a/examples/jms/jms-auto-closeable/src/main/resources/activemq/server0/activemq-configuration.xml +++ b/examples/jms/jms-auto-closeable/src/main/resources/activemq/server0/activemq-configuration.xml @@ -18,36 +18,44 @@ specific language governing permissions and limitations under the License. --> - + - ${build.directory}/server0/data/messaging/bindings + + + + - ${build.directory}/server0/data/messaging/journal + - ${build.directory}/server0/data/messaging/largemessages + ${build.directory}/server0/data/messaging/bindings - ${build.directory}/server0/data/messaging/paging - - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + ${build.directory}/server0/data/messaging/journal - + ${build.directory}/server0/data/messaging/largemessages - - - - - - - - - - + ${build.directory}/server0/data/messaging/paging + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + + + + + + + + + + + + + + + diff --git a/examples/jms/jms-auto-closeable/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/jms-auto-closeable/src/main/resources/activemq/server0/activemq-jms.xml deleted file mode 100644 index 8ca9fd6e26..0000000000 --- a/examples/jms/jms-auto-closeable/src/main/resources/activemq/server0/activemq-jms.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/jms-auto-closeable/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/jms-auto-closeable/src/main/resources/activemq/server0/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/jms-auto-closeable/src/main/resources/activemq/server0/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/jms-auto-closeable/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/jms-auto-closeable/src/main/resources/activemq/server0/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/jms-auto-closeable/src/main/resources/activemq/server0/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/jms-auto-closeable/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/jms-auto-closeable/src/main/resources/activemq/server0/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/examples/jms/jms-auto-closeable/src/main/resources/activemq/server0/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/jms-bridge/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/jms-bridge/src/main/resources/activemq/server0/activemq-configuration.xml index e0c502474b..26f3455089 100644 --- a/examples/jms/jms-bridge/src/main/resources/activemq/server0/activemq-configuration.xml +++ b/examples/jms/jms-bridge/src/main/resources/activemq/server0/activemq-configuration.xml @@ -18,31 +18,38 @@ specific language governing permissions and limitations under the License. --> - + - ${build.directory}/server0/data/messaging/bindings + + + - ${build.directory}/server0/data/messaging/journal + - ${build.directory}/server0/data/messaging/largemessages + ${build.directory}/server0/data/messaging/bindings - ${build.directory}/server0/data/messaging/paging + ${build.directory}/server0/data/messaging/journal - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + ${build.directory}/server0/data/messaging/largemessages - + ${build.directory}/server0/data/messaging/paging + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + + - + + diff --git a/examples/jms/jms-bridge/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/jms-bridge/src/main/resources/activemq/server0/activemq-jms.xml deleted file mode 100644 index 9d53251732..0000000000 --- a/examples/jms/jms-bridge/src/main/resources/activemq/server0/activemq-jms.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - diff --git a/examples/jms/jms-bridge/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/jms-bridge/src/main/resources/activemq/server0/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/jms-bridge/src/main/resources/activemq/server0/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/jms-bridge/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/jms-bridge/src/main/resources/activemq/server0/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/jms-bridge/src/main/resources/activemq/server0/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/jms-bridge/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/jms-bridge/src/main/resources/activemq/server0/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/examples/jms/jms-bridge/src/main/resources/activemq/server0/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/jms-bridge/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/jms-bridge/src/main/resources/activemq/server1/activemq-configuration.xml index 07ffe946b6..0d32af49df 100644 --- a/examples/jms/jms-bridge/src/main/resources/activemq/server1/activemq-configuration.xml +++ b/examples/jms/jms-bridge/src/main/resources/activemq/server1/activemq-configuration.xml @@ -18,34 +18,41 @@ specific language governing permissions and limitations under the License. --> - + - ${build.directory}/server1/data/messaging/bindings + + + - ${build.directory}/server1/data/messaging/journal + - ${build.directory}/server1/data/messaging/largemessages + ${build.directory}/server1/data/messaging/bindings - ${build.directory}/server1/data/messaging/paging + ${build.directory}/server1/data/messaging/journal - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - - - - + ${build.directory}/server1/data/messaging/largemessages - + ${build.directory}/server1/data/messaging/paging + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + + + + + - + + diff --git a/examples/jms/jms-bridge/src/main/resources/activemq/server1/activemq-jms.xml b/examples/jms/jms-bridge/src/main/resources/activemq/server1/activemq-jms.xml deleted file mode 100644 index da23bd39be..0000000000 --- a/examples/jms/jms-bridge/src/main/resources/activemq/server1/activemq-jms.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - diff --git a/examples/jms/jms-bridge/src/main/resources/activemq/server1/activemq-roles.properties b/examples/jms/jms-bridge/src/main/resources/activemq/server1/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/jms-bridge/src/main/resources/activemq/server1/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/jms-bridge/src/main/resources/activemq/server1/activemq-users.properties b/examples/jms/jms-bridge/src/main/resources/activemq/server1/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/jms-bridge/src/main/resources/activemq/server1/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/jms-bridge/src/main/resources/activemq/server1/activemq-users.xml b/examples/jms/jms-bridge/src/main/resources/activemq/server1/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/examples/jms/jms-bridge/src/main/resources/activemq/server1/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/jms-completion-listener/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/jms-completion-listener/src/main/resources/activemq/server0/activemq-configuration.xml index 69def3b435..bb8c2d13cb 100644 --- a/examples/jms/jms-completion-listener/src/main/resources/activemq/server0/activemq-configuration.xml +++ b/examples/jms/jms-completion-listener/src/main/resources/activemq/server0/activemq-configuration.xml @@ -18,37 +18,45 @@ specific language governing permissions and limitations under the License. --> - + - ${build.directory}/server0/data/messaging/bindings + + + + - ${build.directory}/server0/data/messaging/journal + - ${build.directory}/server0/data/messaging/largemessages + ${build.directory}/server0/data/messaging/bindings - ${build.directory}/server0/data/messaging/paging - - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + ${build.directory}/server0/data/messaging/journal - + ${build.directory}/server0/data/messaging/largemessages - - - - - - - - - - - + ${build.directory}/server0/data/messaging/paging + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + + + + + + + + + + + + + + + + diff --git a/examples/jms/jms-completion-listener/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/jms-completion-listener/src/main/resources/activemq/server0/activemq-jms.xml deleted file mode 100644 index 8ca9fd6e26..0000000000 --- a/examples/jms/jms-completion-listener/src/main/resources/activemq/server0/activemq-jms.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/jms-completion-listener/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/jms-completion-listener/src/main/resources/activemq/server0/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/jms-completion-listener/src/main/resources/activemq/server0/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/jms-completion-listener/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/jms-completion-listener/src/main/resources/activemq/server0/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/jms-completion-listener/src/main/resources/activemq/server0/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/jms-completion-listener/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/jms-completion-listener/src/main/resources/activemq/server0/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/examples/jms/jms-completion-listener/src/main/resources/activemq/server0/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/jms-context/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/jms-context/src/main/resources/activemq/server0/activemq-configuration.xml index 69def3b435..bb8c2d13cb 100644 --- a/examples/jms/jms-context/src/main/resources/activemq/server0/activemq-configuration.xml +++ b/examples/jms/jms-context/src/main/resources/activemq/server0/activemq-configuration.xml @@ -18,37 +18,45 @@ specific language governing permissions and limitations under the License. --> - + - ${build.directory}/server0/data/messaging/bindings + + + + - ${build.directory}/server0/data/messaging/journal + - ${build.directory}/server0/data/messaging/largemessages + ${build.directory}/server0/data/messaging/bindings - ${build.directory}/server0/data/messaging/paging - - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + ${build.directory}/server0/data/messaging/journal - + ${build.directory}/server0/data/messaging/largemessages - - - - - - - - - - - + ${build.directory}/server0/data/messaging/paging + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + + + + + + + + + + + + + + + + diff --git a/examples/jms/jms-context/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/jms-context/src/main/resources/activemq/server0/activemq-jms.xml deleted file mode 100644 index 8ca9fd6e26..0000000000 --- a/examples/jms/jms-context/src/main/resources/activemq/server0/activemq-jms.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/jms-context/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/jms-context/src/main/resources/activemq/server0/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/jms-context/src/main/resources/activemq/server0/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/jms-context/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/jms-context/src/main/resources/activemq/server0/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/jms-context/src/main/resources/activemq/server0/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/jms-context/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/jms-context/src/main/resources/activemq/server0/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/examples/jms/jms-context/src/main/resources/activemq/server0/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/jms-shared-consumer/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/jms-shared-consumer/src/main/resources/activemq/server0/activemq-configuration.xml index cbe36068f1..25974c3309 100644 --- a/examples/jms/jms-shared-consumer/src/main/resources/activemq/server0/activemq-configuration.xml +++ b/examples/jms/jms-shared-consumer/src/main/resources/activemq/server0/activemq-configuration.xml @@ -18,37 +18,45 @@ specific language governing permissions and limitations under the License. --> - + - ${build.directory}/server0/data/messaging/bindings + + + + - ${build.directory}/server0/data/messaging/journal + - ${build.directory}/server0/data/messaging/largemessages + ${build.directory}/server0/data/messaging/bindings - ${build.directory}/server0/data/messaging/paging - - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + ${build.directory}/server0/data/messaging/journal - + ${build.directory}/server0/data/messaging/largemessages - - - - - - - - - - - + ${build.directory}/server0/data/messaging/paging + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + + + + + + + + + + + + + + + + diff --git a/examples/jms/jms-shared-consumer/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/jms-shared-consumer/src/main/resources/activemq/server0/activemq-jms.xml deleted file mode 100644 index 695f5785f7..0000000000 --- a/examples/jms/jms-shared-consumer/src/main/resources/activemq/server0/activemq-jms.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/jms-shared-consumer/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/jms-shared-consumer/src/main/resources/activemq/server0/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/jms-shared-consumer/src/main/resources/activemq/server0/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/jms-shared-consumer/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/jms-shared-consumer/src/main/resources/activemq/server0/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/jms-shared-consumer/src/main/resources/activemq/server0/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/jms-shared-consumer/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/jms-shared-consumer/src/main/resources/activemq/server0/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/examples/jms/jms-shared-consumer/src/main/resources/activemq/server0/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/jmx/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/jmx/src/main/resources/activemq/server0/activemq-configuration.xml index 72b112eef8..17a827840d 100644 --- a/examples/jms/jmx/src/main/resources/activemq/server0/activemq-configuration.xml +++ b/examples/jms/jmx/src/main/resources/activemq/server0/activemq-configuration.xml @@ -18,41 +18,49 @@ specific language governing permissions and limitations under the License. --> - + - ${build.directory}/server0/data/messaging/bindings + + + + - ${build.directory}/server0/data/messaging/journal + - ${build.directory}/server0/data/messaging/largemessages + ${build.directory}/server0/data/messaging/bindings - ${build.directory}/server0/data/messaging/paging + ${build.directory}/server0/data/messaging/journal + + ${build.directory}/server0/data/messaging/largemessages + + ${build.directory}/server0/data/messaging/paging - - true - - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + + true - + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + - - - - - - - - - - - + + + + + + + + + + + + + + diff --git a/examples/jms/jmx/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/jmx/src/main/resources/activemq/server0/activemq-jms.xml deleted file mode 100644 index 8ca9fd6e26..0000000000 --- a/examples/jms/jmx/src/main/resources/activemq/server0/activemq-jms.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/jmx/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/jmx/src/main/resources/activemq/server0/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/jmx/src/main/resources/activemq/server0/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/jmx/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/jmx/src/main/resources/activemq/server0/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/jmx/src/main/resources/activemq/server0/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/jmx/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/jmx/src/main/resources/activemq/server0/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/examples/jms/jmx/src/main/resources/activemq/server0/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/large-message/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/large-message/src/main/resources/activemq/server0/activemq-configuration.xml index 69def3b435..bb8c2d13cb 100644 --- a/examples/jms/large-message/src/main/resources/activemq/server0/activemq-configuration.xml +++ b/examples/jms/large-message/src/main/resources/activemq/server0/activemq-configuration.xml @@ -18,37 +18,45 @@ specific language governing permissions and limitations under the License. --> - + - ${build.directory}/server0/data/messaging/bindings + + + + - ${build.directory}/server0/data/messaging/journal + - ${build.directory}/server0/data/messaging/largemessages + ${build.directory}/server0/data/messaging/bindings - ${build.directory}/server0/data/messaging/paging - - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + ${build.directory}/server0/data/messaging/journal - + ${build.directory}/server0/data/messaging/largemessages - - - - - - - - - - - + ${build.directory}/server0/data/messaging/paging + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + + + + + + + + + + + + + + + + diff --git a/examples/jms/large-message/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/large-message/src/main/resources/activemq/server0/activemq-jms.xml deleted file mode 100644 index 8ca9fd6e26..0000000000 --- a/examples/jms/large-message/src/main/resources/activemq/server0/activemq-jms.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/large-message/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/large-message/src/main/resources/activemq/server0/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/large-message/src/main/resources/activemq/server0/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/large-message/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/large-message/src/main/resources/activemq/server0/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/large-message/src/main/resources/activemq/server0/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/large-message/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/large-message/src/main/resources/activemq/server0/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/examples/jms/large-message/src/main/resources/activemq/server0/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/last-value-queue/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/last-value-queue/src/main/resources/activemq/server0/activemq-configuration.xml index 3bd9394ee8..9159d3df6d 100644 --- a/examples/jms/last-value-queue/src/main/resources/activemq/server0/activemq-configuration.xml +++ b/examples/jms/last-value-queue/src/main/resources/activemq/server0/activemq-configuration.xml @@ -18,44 +18,52 @@ specific language governing permissions and limitations under the License. --> - + - ${build.directory}/server0/data/messaging/bindings + + + + - ${build.directory}/server0/data/messaging/journal + - ${build.directory}/server0/data/messaging/largemessages + ${build.directory}/server0/data/messaging/bindings - ${build.directory}/server0/data/messaging/paging - - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + ${build.directory}/server0/data/messaging/journal - + ${build.directory}/server0/data/messaging/largemessages - - - - - - - - - - - + ${build.directory}/server0/data/messaging/paging - - - - true - - + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + + + + + + + + + + + + + + + + + + true + + + + diff --git a/examples/jms/last-value-queue/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/last-value-queue/src/main/resources/activemq/server0/activemq-jms.xml deleted file mode 100644 index 8ca9fd6e26..0000000000 --- a/examples/jms/last-value-queue/src/main/resources/activemq/server0/activemq-jms.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/last-value-queue/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/last-value-queue/src/main/resources/activemq/server0/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/last-value-queue/src/main/resources/activemq/server0/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/last-value-queue/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/last-value-queue/src/main/resources/activemq/server0/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/last-value-queue/src/main/resources/activemq/server0/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/last-value-queue/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/last-value-queue/src/main/resources/activemq/server0/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/examples/jms/last-value-queue/src/main/resources/activemq/server0/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/management-notifications/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/management-notifications/src/main/resources/activemq/server0/activemq-configuration.xml index 9c389935df..d67d043a59 100644 --- a/examples/jms/management-notifications/src/main/resources/activemq/server0/activemq-configuration.xml +++ b/examples/jms/management-notifications/src/main/resources/activemq/server0/activemq-configuration.xml @@ -18,55 +18,66 @@ specific language governing permissions and limitations under the License. --> - + - ${build.directory}/server0/data/messaging/bindings + + + - ${build.directory}/server0/data/messaging/journal + + + - ${build.directory}/server0/data/messaging/largemessages + - ${build.directory}/server0/data/messaging/paging + ${build.directory}/server0/data/messaging/bindings + + ${build.directory}/server0/data/messaging/journal + + ${build.directory}/server0/data/messaging/largemessages + + ${build.directory}/server0/data/messaging/paging - jms.topic.notificationsTopic - - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + jms.topic.notificationsTopic - + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + - - - - - - - - - - + - - - - - - + + + + + + + + + + - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/examples/jms/management-notifications/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/management-notifications/src/main/resources/activemq/server0/activemq-jms.xml deleted file mode 100644 index 5396186c09..0000000000 --- a/examples/jms/management-notifications/src/main/resources/activemq/server0/activemq-jms.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - diff --git a/examples/jms/management-notifications/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/management-notifications/src/main/resources/activemq/server0/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/management-notifications/src/main/resources/activemq/server0/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/management-notifications/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/management-notifications/src/main/resources/activemq/server0/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/management-notifications/src/main/resources/activemq/server0/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/management-notifications/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/management-notifications/src/main/resources/activemq/server0/activemq-users.xml deleted file mode 100644 index f5c79b0867..0000000000 --- a/examples/jms/management-notifications/src/main/resources/activemq/server0/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/management/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/management/src/main/resources/activemq/server0/activemq-configuration.xml index 1f4cbc54f5..aa92a27015 100644 --- a/examples/jms/management/src/main/resources/activemq/server0/activemq-configuration.xml +++ b/examples/jms/management/src/main/resources/activemq/server0/activemq-configuration.xml @@ -18,53 +18,61 @@ specific language governing permissions and limitations under the License. --> - + - ${build.directory}/server0/data/messaging/bindings + + + + - ${build.directory}/server0/data/messaging/journal + - ${build.directory}/server0/data/messaging/largemessages + ${build.directory}/server0/data/messaging/bindings - ${build.directory}/server0/data/messaging/paging + ${build.directory}/server0/data/messaging/journal + + ${build.directory}/server0/data/messaging/largemessages + + ${build.directory}/server0/data/messaging/paging - jms.queue.activemq.management - - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + jms.queue.activemq.management - + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + - - - - - - - - - + - - - - + + + + + + + + + - - - - - - - + + + + - + + + + + + + + + + diff --git a/examples/jms/management/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/management/src/main/resources/activemq/server0/activemq-jms.xml deleted file mode 100644 index 8ca9fd6e26..0000000000 --- a/examples/jms/management/src/main/resources/activemq/server0/activemq-jms.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/management/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/management/src/main/resources/activemq/server0/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/management/src/main/resources/activemq/server0/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/management/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/management/src/main/resources/activemq/server0/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/management/src/main/resources/activemq/server0/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/management/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/management/src/main/resources/activemq/server0/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/examples/jms/management/src/main/resources/activemq/server0/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/message-counters/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/message-counters/src/main/resources/activemq/server0/activemq-configuration.xml index f4c463edaa..77fcd01235 100644 --- a/examples/jms/message-counters/src/main/resources/activemq/server0/activemq-configuration.xml +++ b/examples/jms/message-counters/src/main/resources/activemq/server0/activemq-configuration.xml @@ -18,60 +18,71 @@ specific language governing permissions and limitations under the License. --> - + - ${build.directory}/server0/data/messaging/bindings + + + - ${build.directory}/server0/data/messaging/journal + + + - ${build.directory}/server0/data/messaging/largemessages + - ${build.directory}/server0/data/messaging/paging + ${build.directory}/server0/data/messaging/bindings + + ${build.directory}/server0/data/messaging/journal + + ${build.directory}/server0/data/messaging/largemessages + + ${build.directory}/server0/data/messaging/paging - true - true - 2000 - 2 - - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + true + true + 2000 + 2 - + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + - - - - - - - - - - + - - - - - - - - - - + + + + + + + + + + - - - - jms.queue.expiryQueue - - + + + + + + + + + + + + + + jms.queue.expiryQueue + + + + diff --git a/examples/jms/message-counters/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/message-counters/src/main/resources/activemq/server0/activemq-jms.xml deleted file mode 100644 index 3165349b4d..0000000000 --- a/examples/jms/message-counters/src/main/resources/activemq/server0/activemq-jms.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - diff --git a/examples/jms/message-counters/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/message-counters/src/main/resources/activemq/server0/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/message-counters/src/main/resources/activemq/server0/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/message-counters/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/message-counters/src/main/resources/activemq/server0/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/message-counters/src/main/resources/activemq/server0/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/message-counters/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/message-counters/src/main/resources/activemq/server0/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/examples/jms/message-counters/src/main/resources/activemq/server0/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/message-group/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/message-group/src/main/resources/activemq/server0/activemq-configuration.xml index 69def3b435..bb8c2d13cb 100644 --- a/examples/jms/message-group/src/main/resources/activemq/server0/activemq-configuration.xml +++ b/examples/jms/message-group/src/main/resources/activemq/server0/activemq-configuration.xml @@ -18,37 +18,45 @@ specific language governing permissions and limitations under the License. --> - + - ${build.directory}/server0/data/messaging/bindings + + + + - ${build.directory}/server0/data/messaging/journal + - ${build.directory}/server0/data/messaging/largemessages + ${build.directory}/server0/data/messaging/bindings - ${build.directory}/server0/data/messaging/paging - - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + ${build.directory}/server0/data/messaging/journal - + ${build.directory}/server0/data/messaging/largemessages - - - - - - - - - - - + ${build.directory}/server0/data/messaging/paging + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + + + + + + + + + + + + + + + + diff --git a/examples/jms/message-group/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/message-group/src/main/resources/activemq/server0/activemq-jms.xml deleted file mode 100644 index 8ca9fd6e26..0000000000 --- a/examples/jms/message-group/src/main/resources/activemq/server0/activemq-jms.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/message-group/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/message-group/src/main/resources/activemq/server0/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/message-group/src/main/resources/activemq/server0/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/message-group/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/message-group/src/main/resources/activemq/server0/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/message-group/src/main/resources/activemq/server0/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/message-group/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/message-group/src/main/resources/activemq/server0/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/examples/jms/message-group/src/main/resources/activemq/server0/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/message-group2/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/message-group2/src/main/resources/activemq/server0/activemq-configuration.xml index 69def3b435..bb8c2d13cb 100644 --- a/examples/jms/message-group2/src/main/resources/activemq/server0/activemq-configuration.xml +++ b/examples/jms/message-group2/src/main/resources/activemq/server0/activemq-configuration.xml @@ -18,37 +18,45 @@ specific language governing permissions and limitations under the License. --> - + - ${build.directory}/server0/data/messaging/bindings + + + + - ${build.directory}/server0/data/messaging/journal + - ${build.directory}/server0/data/messaging/largemessages + ${build.directory}/server0/data/messaging/bindings - ${build.directory}/server0/data/messaging/paging - - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + ${build.directory}/server0/data/messaging/journal - + ${build.directory}/server0/data/messaging/largemessages - - - - - - - - - - - + ${build.directory}/server0/data/messaging/paging + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + + + + + + + + + + + + + + + + diff --git a/examples/jms/message-group2/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/message-group2/src/main/resources/activemq/server0/activemq-jms.xml deleted file mode 100644 index 8ca9fd6e26..0000000000 --- a/examples/jms/message-group2/src/main/resources/activemq/server0/activemq-jms.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/message-group2/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/message-group2/src/main/resources/activemq/server0/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/message-group2/src/main/resources/activemq/server0/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/message-group2/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/message-group2/src/main/resources/activemq/server0/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/message-group2/src/main/resources/activemq/server0/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/message-group2/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/message-group2/src/main/resources/activemq/server0/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/examples/jms/message-group2/src/main/resources/activemq/server0/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/message-priority/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/message-priority/src/main/resources/activemq/server0/activemq-configuration.xml index 69def3b435..bb8c2d13cb 100644 --- a/examples/jms/message-priority/src/main/resources/activemq/server0/activemq-configuration.xml +++ b/examples/jms/message-priority/src/main/resources/activemq/server0/activemq-configuration.xml @@ -18,37 +18,45 @@ specific language governing permissions and limitations under the License. --> - + - ${build.directory}/server0/data/messaging/bindings + + + + - ${build.directory}/server0/data/messaging/journal + - ${build.directory}/server0/data/messaging/largemessages + ${build.directory}/server0/data/messaging/bindings - ${build.directory}/server0/data/messaging/paging - - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + ${build.directory}/server0/data/messaging/journal - + ${build.directory}/server0/data/messaging/largemessages - - - - - - - - - - - + ${build.directory}/server0/data/messaging/paging + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + + + + + + + + + + + + + + + + diff --git a/examples/jms/message-priority/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/message-priority/src/main/resources/activemq/server0/activemq-jms.xml deleted file mode 100644 index 8ca9fd6e26..0000000000 --- a/examples/jms/message-priority/src/main/resources/activemq/server0/activemq-jms.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/message-priority/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/message-priority/src/main/resources/activemq/server0/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/message-priority/src/main/resources/activemq/server0/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/message-priority/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/message-priority/src/main/resources/activemq/server0/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/message-priority/src/main/resources/activemq/server0/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/message-priority/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/message-priority/src/main/resources/activemq/server0/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/examples/jms/message-priority/src/main/resources/activemq/server0/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/multiple-failover-failback/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/multiple-failover-failback/src/main/resources/activemq/server0/activemq-configuration.xml index 1b2663ceb8..3fd3d7701f 100644 --- a/examples/jms/multiple-failover-failback/src/main/resources/activemq/server0/activemq-configuration.xml +++ b/examples/jms/multiple-failover-failback/src/main/resources/activemq/server0/activemq-configuration.xml @@ -18,74 +18,82 @@ specific language governing permissions and limitations under the License. --> - + - ${build.directory}/server0/data/messaging/bindings + + + + - ${build.directory}/server0/data/messaging/journal + - ${build.directory}/server0/data/messaging/largemessages + ${build.directory}/server0/data/messaging/bindings - ${build.directory}/server0/data/messaging/paging + ${build.directory}/server0/data/messaging/journal - - - - - + ${build.directory}/server0/data/messaging/largemessages - - - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - - + ${build.directory}/server0/data/messaging/paging - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - - + + + + + - - - ${udp-address:231.7.7.7} - 9876 - 1000 - netty-connector - - + + + + org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory + + + - - - ${udp-address:231.7.7.7} - 9876 - 60000 - - + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + - - -
jms
- netty-connector - - - + + + ${udp-address:231.7.7.7} + 9876 + 1000 + netty-connector + + - - - - - - - - - - - + + + ${udp-address:231.7.7.7} + 9876 + 60000 + + + + + +
jms
+ netty-connector + + + + + + + + + + + + + + + + diff --git a/examples/jms/multiple-failover-failback/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/multiple-failover-failback/src/main/resources/activemq/server0/activemq-jms.xml deleted file mode 100644 index 8ca9fd6e26..0000000000 --- a/examples/jms/multiple-failover-failback/src/main/resources/activemq/server0/activemq-jms.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/multiple-failover-failback/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/multiple-failover-failback/src/main/resources/activemq/server0/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/multiple-failover-failback/src/main/resources/activemq/server0/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/multiple-failover-failback/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/multiple-failover-failback/src/main/resources/activemq/server0/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/multiple-failover-failback/src/main/resources/activemq/server0/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/multiple-failover-failback/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/multiple-failover-failback/src/main/resources/activemq/server0/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/examples/jms/multiple-failover-failback/src/main/resources/activemq/server0/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/multiple-failover-failback/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/multiple-failover-failback/src/main/resources/activemq/server1/activemq-configuration.xml index 1e95373a33..cb4d05f25a 100644 --- a/examples/jms/multiple-failover-failback/src/main/resources/activemq/server1/activemq-configuration.xml +++ b/examples/jms/multiple-failover-failback/src/main/resources/activemq/server1/activemq-configuration.xml @@ -18,74 +18,82 @@ specific language governing permissions and limitations under the License. --> - + - ${build.directory}/server0/data/messaging/bindings + + + + - ${build.directory}/server0/data/messaging/journal + - ${build.directory}/server0/data/messaging/largemessages + ${build.directory}/server0/data/messaging/bindings - ${build.directory}/server0/data/messaging/paging + ${build.directory}/server0/data/messaging/journal - - - - - + ${build.directory}/server0/data/messaging/largemessages - - - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - - - - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - - + ${build.directory}/server0/data/messaging/paging - - - ${udp-address:231.7.7.7} - 9876 - 1000 - netty-connector - - + + + + + - - - ${udp-address:231.7.7.7} - 9876 - 60000 - - + + + + org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory + + + - - -
jms
- netty-connector - - - + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + - - - - - - - - - - - + + + ${udp-address:231.7.7.7} + 9876 + 1000 + netty-connector + + + + + + ${udp-address:231.7.7.7} + 9876 + 60000 + + + + + +
jms
+ netty-connector + + + + + + + + + + + + + + + + diff --git a/examples/jms/multiple-failover-failback/src/main/resources/activemq/server1/activemq-jms.xml b/examples/jms/multiple-failover-failback/src/main/resources/activemq/server1/activemq-jms.xml deleted file mode 100644 index 8ca9fd6e26..0000000000 --- a/examples/jms/multiple-failover-failback/src/main/resources/activemq/server1/activemq-jms.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/multiple-failover-failback/src/main/resources/activemq/server1/activemq-roles.properties b/examples/jms/multiple-failover-failback/src/main/resources/activemq/server1/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/multiple-failover-failback/src/main/resources/activemq/server1/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/multiple-failover-failback/src/main/resources/activemq/server1/activemq-users.properties b/examples/jms/multiple-failover-failback/src/main/resources/activemq/server1/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/multiple-failover-failback/src/main/resources/activemq/server1/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/multiple-failover-failback/src/main/resources/activemq/server1/activemq-users.xml b/examples/jms/multiple-failover-failback/src/main/resources/activemq/server1/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/examples/jms/multiple-failover-failback/src/main/resources/activemq/server1/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/multiple-failover-failback/src/main/resources/activemq/server2/activemq-configuration.xml b/examples/jms/multiple-failover-failback/src/main/resources/activemq/server2/activemq-configuration.xml index f6c3e8a70e..39c8a74671 100644 --- a/examples/jms/multiple-failover-failback/src/main/resources/activemq/server2/activemq-configuration.xml +++ b/examples/jms/multiple-failover-failback/src/main/resources/activemq/server2/activemq-configuration.xml @@ -18,75 +18,83 @@ specific language governing permissions and limitations under the License. --> - + - ${build.directory}/server0/data/messaging/bindings + + + + - ${build.directory}/server0/data/messaging/journal + - ${build.directory}/server0/data/messaging/largemessages + ${build.directory}/server0/data/messaging/bindings - ${build.directory}/server0/data/messaging/paging + ${build.directory}/server0/data/messaging/journal - - - - - - - - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - - - - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - - + ${build.directory}/server0/data/messaging/largemessages - - - ${udp-address:231.7.7.7} - 9876 - 1000 - netty-connector - - + ${build.directory}/server0/data/messaging/paging - - - ${udp-address:231.7.7.7} - 9876 - 60000 - - + + + + + - - -
jms
- netty-connector - - - - + + + org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory + + + - - - - - - - - - - - - + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + + + + + ${udp-address:231.7.7.7} + 9876 + 1000 + netty-connector + + + + + + ${udp-address:231.7.7.7} + 9876 + 60000 + + + + + +
jms
+ netty-connector + + + + + + + + + + + + + + + + + + diff --git a/examples/jms/multiple-failover-failback/src/main/resources/activemq/server2/activemq-jms.xml b/examples/jms/multiple-failover-failback/src/main/resources/activemq/server2/activemq-jms.xml deleted file mode 100644 index 8ca9fd6e26..0000000000 --- a/examples/jms/multiple-failover-failback/src/main/resources/activemq/server2/activemq-jms.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/multiple-failover-failback/src/main/resources/activemq/server2/activemq-roles.properties b/examples/jms/multiple-failover-failback/src/main/resources/activemq/server2/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/multiple-failover-failback/src/main/resources/activemq/server2/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/multiple-failover-failback/src/main/resources/activemq/server2/activemq-users.properties b/examples/jms/multiple-failover-failback/src/main/resources/activemq/server2/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/multiple-failover-failback/src/main/resources/activemq/server2/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/multiple-failover-failback/src/main/resources/activemq/server2/activemq-users.xml b/examples/jms/multiple-failover-failback/src/main/resources/activemq/server2/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/examples/jms/multiple-failover-failback/src/main/resources/activemq/server2/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/multiple-failover/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/multiple-failover/src/main/resources/activemq/server0/activemq-configuration.xml index d0b680b7a2..0d509e16f9 100644 --- a/examples/jms/multiple-failover/src/main/resources/activemq/server0/activemq-configuration.xml +++ b/examples/jms/multiple-failover/src/main/resources/activemq/server0/activemq-configuration.xml @@ -18,76 +18,84 @@ specific language governing permissions and limitations under the License. --> - + - ${build.directory}/server0/data/messaging/bindings + + + + - ${build.directory}/server0/data/messaging/journal + - ${build.directory}/server0/data/messaging/largemessages + ${build.directory}/server0/data/messaging/bindings - ${build.directory}/server0/data/messaging/paging + ${build.directory}/server0/data/messaging/journal - - - - - + ${build.directory}/server0/data/messaging/largemessages - - - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - - + ${build.directory}/server0/data/messaging/paging - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - - + + + + + - - - ${udp-address:231.7.7.7} - 9876 - 1000 - netty-connector - - + + + + org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory + + + - - - ${udp-address:231.7.7.7} - 9876 - 60000 - - + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + - - -
jms
- netty-connector - - - - + + + ${udp-address:231.7.7.7} + 9876 + 1000 + netty-connector + + - - - - - - - - - - - + + + ${udp-address:231.7.7.7} + 9876 + 60000 + + + + +
jms
+ netty-connector + + + + + + + + + + + + + + + + + + diff --git a/examples/jms/multiple-failover/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/multiple-failover/src/main/resources/activemq/server0/activemq-jms.xml deleted file mode 100644 index 8ca9fd6e26..0000000000 --- a/examples/jms/multiple-failover/src/main/resources/activemq/server0/activemq-jms.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/multiple-failover/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/multiple-failover/src/main/resources/activemq/server0/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/multiple-failover/src/main/resources/activemq/server0/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/multiple-failover/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/multiple-failover/src/main/resources/activemq/server0/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/multiple-failover/src/main/resources/activemq/server0/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/multiple-failover/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/multiple-failover/src/main/resources/activemq/server0/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/examples/jms/multiple-failover/src/main/resources/activemq/server0/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/multiple-failover/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/multiple-failover/src/main/resources/activemq/server1/activemq-configuration.xml index df732de76c..cb4d05f25a 100644 --- a/examples/jms/multiple-failover/src/main/resources/activemq/server1/activemq-configuration.xml +++ b/examples/jms/multiple-failover/src/main/resources/activemq/server1/activemq-configuration.xml @@ -18,74 +18,82 @@ specific language governing permissions and limitations under the License. --> - + - ${build.directory}/server0/data/messaging/bindings + + + + - ${build.directory}/server0/data/messaging/journal + - ${build.directory}/server0/data/messaging/largemessages + ${build.directory}/server0/data/messaging/bindings - ${build.directory}/server0/data/messaging/paging + ${build.directory}/server0/data/messaging/journal - - - - - + ${build.directory}/server0/data/messaging/largemessages - - - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - - - - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - - + ${build.directory}/server0/data/messaging/paging - - - ${udp-address:231.7.7.7} - 9876 - 1000 - netty-connector - - + + + + + - - - ${udp-address:231.7.7.7} - 9876 - 60000 - - + + + + org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory + + + - - -
jms
- netty-connector - - - + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + - - - - - - - - - - - + + + ${udp-address:231.7.7.7} + 9876 + 1000 + netty-connector + + + + + + ${udp-address:231.7.7.7} + 9876 + 60000 + + + + + +
jms
+ netty-connector + + + + + + + + + + + + + + + + diff --git a/examples/jms/multiple-failover/src/main/resources/activemq/server1/activemq-jms.xml b/examples/jms/multiple-failover/src/main/resources/activemq/server1/activemq-jms.xml deleted file mode 100644 index 8ca9fd6e26..0000000000 --- a/examples/jms/multiple-failover/src/main/resources/activemq/server1/activemq-jms.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/multiple-failover/src/main/resources/activemq/server1/activemq-roles.properties b/examples/jms/multiple-failover/src/main/resources/activemq/server1/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/multiple-failover/src/main/resources/activemq/server1/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/multiple-failover/src/main/resources/activemq/server1/activemq-users.properties b/examples/jms/multiple-failover/src/main/resources/activemq/server1/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/multiple-failover/src/main/resources/activemq/server1/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/multiple-failover/src/main/resources/activemq/server1/activemq-users.xml b/examples/jms/multiple-failover/src/main/resources/activemq/server1/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/examples/jms/multiple-failover/src/main/resources/activemq/server1/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/multiple-failover/src/main/resources/activemq/server2/activemq-configuration.xml b/examples/jms/multiple-failover/src/main/resources/activemq/server2/activemq-configuration.xml index 2a5ffd39be..731f023ef7 100644 --- a/examples/jms/multiple-failover/src/main/resources/activemq/server2/activemq-configuration.xml +++ b/examples/jms/multiple-failover/src/main/resources/activemq/server2/activemq-configuration.xml @@ -18,74 +18,82 @@ specific language governing permissions and limitations under the License. --> - + - ${build.directory}/server0/data/messaging/bindings + + + + - ${build.directory}/server0/data/messaging/journal + - ${build.directory}/server0/data/messaging/largemessages + ${build.directory}/server0/data/messaging/bindings - ${build.directory}/server0/data/messaging/paging + ${build.directory}/server0/data/messaging/journal - - - - - + ${build.directory}/server0/data/messaging/largemessages - - - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - - - - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - - + ${build.directory}/server0/data/messaging/paging - - - ${udp-address:231.7.7.7} - 9876 - 1000 - netty-connector - - + + + + + - - - ${udp-address:231.7.7.7} - 9876 - 60000 - - + + + + org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory + + + - - -
jms
- netty-connector - - - + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + - - - - - - - - - - - + + + ${udp-address:231.7.7.7} + 9876 + 1000 + netty-connector + + + + + + ${udp-address:231.7.7.7} + 9876 + 60000 + + + + + +
jms
+ netty-connector + + + + + + + + + + + + + + + + diff --git a/examples/jms/multiple-failover/src/main/resources/activemq/server2/activemq-jms.xml b/examples/jms/multiple-failover/src/main/resources/activemq/server2/activemq-jms.xml deleted file mode 100644 index 8ca9fd6e26..0000000000 --- a/examples/jms/multiple-failover/src/main/resources/activemq/server2/activemq-jms.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/multiple-failover/src/main/resources/activemq/server2/activemq-roles.properties b/examples/jms/multiple-failover/src/main/resources/activemq/server2/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/multiple-failover/src/main/resources/activemq/server2/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/multiple-failover/src/main/resources/activemq/server2/activemq-users.properties b/examples/jms/multiple-failover/src/main/resources/activemq/server2/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/multiple-failover/src/main/resources/activemq/server2/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/multiple-failover/src/main/resources/activemq/server2/activemq-users.xml b/examples/jms/multiple-failover/src/main/resources/activemq/server2/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/examples/jms/multiple-failover/src/main/resources/activemq/server2/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/no-consumer-buffering/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/no-consumer-buffering/src/main/resources/activemq/server0/activemq-configuration.xml index 69def3b435..bb8c2d13cb 100644 --- a/examples/jms/no-consumer-buffering/src/main/resources/activemq/server0/activemq-configuration.xml +++ b/examples/jms/no-consumer-buffering/src/main/resources/activemq/server0/activemq-configuration.xml @@ -18,37 +18,45 @@ specific language governing permissions and limitations under the License. --> - + - ${build.directory}/server0/data/messaging/bindings + + + + - ${build.directory}/server0/data/messaging/journal + - ${build.directory}/server0/data/messaging/largemessages + ${build.directory}/server0/data/messaging/bindings - ${build.directory}/server0/data/messaging/paging - - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + ${build.directory}/server0/data/messaging/journal - + ${build.directory}/server0/data/messaging/largemessages - - - - - - - - - - - + ${build.directory}/server0/data/messaging/paging + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + + + + + + + + + + + + + + + + diff --git a/examples/jms/no-consumer-buffering/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/no-consumer-buffering/src/main/resources/activemq/server0/activemq-jms.xml deleted file mode 100644 index 8ca9fd6e26..0000000000 --- a/examples/jms/no-consumer-buffering/src/main/resources/activemq/server0/activemq-jms.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/no-consumer-buffering/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/no-consumer-buffering/src/main/resources/activemq/server0/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/no-consumer-buffering/src/main/resources/activemq/server0/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/no-consumer-buffering/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/no-consumer-buffering/src/main/resources/activemq/server0/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/no-consumer-buffering/src/main/resources/activemq/server0/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/no-consumer-buffering/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/no-consumer-buffering/src/main/resources/activemq/server0/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/examples/jms/no-consumer-buffering/src/main/resources/activemq/server0/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/non-transaction-failover/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/non-transaction-failover/src/main/resources/activemq/server0/activemq-configuration.xml index 1194fe652a..90beb6fdcd 100644 --- a/examples/jms/non-transaction-failover/src/main/resources/activemq/server0/activemq-configuration.xml +++ b/examples/jms/non-transaction-failover/src/main/resources/activemq/server0/activemq-configuration.xml @@ -18,74 +18,82 @@ specific language governing permissions and limitations under the License. --> - + - - - - - + + + + - + - - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - - + + + + + - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - - + - - - ${udp-address:231.7.7.7} - 9876 - 1000 - netty-connector - - + + + org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory + + + - - - ${udp-address:231.7.7.7} - 9876 - 60000 - - + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + - - -
jms
- netty-connector - - - + + + ${udp-address:231.7.7.7} + 9876 + 1000 + netty-connector + + - target/server0/data/large-messages - target/server0/data/bindings - target/server0/data/journal - target/server0/data/paging - + + + ${udp-address:231.7.7.7} + 9876 + 60000 + + - - - - - - - - - - - + + +
jms
+ netty-connector + + + + target/server0/data/large-messages + target/server0/data/bindings + target/server0/data/journal + target/server0/data/paging + + + + + + + + + + + + + + + diff --git a/examples/jms/non-transaction-failover/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/non-transaction-failover/src/main/resources/activemq/server0/activemq-jms.xml deleted file mode 100644 index 8ca9fd6e26..0000000000 --- a/examples/jms/non-transaction-failover/src/main/resources/activemq/server0/activemq-jms.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/non-transaction-failover/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/non-transaction-failover/src/main/resources/activemq/server0/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/non-transaction-failover/src/main/resources/activemq/server0/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/non-transaction-failover/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/non-transaction-failover/src/main/resources/activemq/server0/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/non-transaction-failover/src/main/resources/activemq/server0/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/non-transaction-failover/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/non-transaction-failover/src/main/resources/activemq/server0/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/examples/jms/non-transaction-failover/src/main/resources/activemq/server0/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/non-transaction-failover/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/non-transaction-failover/src/main/resources/activemq/server1/activemq-configuration.xml index cf8f43811c..54aaac13f9 100644 --- a/examples/jms/non-transaction-failover/src/main/resources/activemq/server1/activemq-configuration.xml +++ b/examples/jms/non-transaction-failover/src/main/resources/activemq/server1/activemq-configuration.xml @@ -18,75 +18,83 @@ specific language governing permissions and limitations under the License. --> - + - - - - - - - + + + + - - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - - - - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - - + - - - ${udp-address:231.7.7.7} - 9876 - 1000 - netty-connector - - + + + + + - - - ${udp-address:231.7.7.7} - 9876 - 60000 - - + - - -
jms
- netty-connector - - - + + + org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory + + + - target/server0/data/large-messages - target/server0/data/bindings - target/server0/data/journal - target/server0/data/paging - - + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + - - - - - - - - - - - - + + + ${udp-address:231.7.7.7} + 9876 + 1000 + netty-connector + + + + + + ${udp-address:231.7.7.7} + 9876 + 60000 + + + + + +
jms
+ netty-connector + + + + + target/server0/data/large-messages + target/server0/data/bindings + target/server0/data/journal + target/server0/data/paging + + + + + + + + + + + + + + + + diff --git a/examples/jms/non-transaction-failover/src/main/resources/activemq/server1/activemq-jms.xml b/examples/jms/non-transaction-failover/src/main/resources/activemq/server1/activemq-jms.xml deleted file mode 100644 index 8ca9fd6e26..0000000000 --- a/examples/jms/non-transaction-failover/src/main/resources/activemq/server1/activemq-jms.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/non-transaction-failover/src/main/resources/activemq/server1/activemq-roles.properties b/examples/jms/non-transaction-failover/src/main/resources/activemq/server1/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/non-transaction-failover/src/main/resources/activemq/server1/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/non-transaction-failover/src/main/resources/activemq/server1/activemq-users.properties b/examples/jms/non-transaction-failover/src/main/resources/activemq/server1/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/non-transaction-failover/src/main/resources/activemq/server1/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/non-transaction-failover/src/main/resources/activemq/server1/activemq-users.xml b/examples/jms/non-transaction-failover/src/main/resources/activemq/server1/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/examples/jms/non-transaction-failover/src/main/resources/activemq/server1/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/openwire/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/openwire/src/main/resources/activemq/server0/activemq-configuration.xml index bd2c2e6596..a440ba4ebd 100644 --- a/examples/jms/openwire/src/main/resources/activemq/server0/activemq-configuration.xml +++ b/examples/jms/openwire/src/main/resources/activemq/server0/activemq-configuration.xml @@ -18,53 +18,61 @@ specific language governing permissions and limitations under the License. --> - + - ${build.directory}/server0/data/messaging/bindings + + + + - ${build.directory}/server0/data/messaging/journal + - ${build.directory}/server0/data/messaging/largemessages + ${build.directory}/server0/data/messaging/bindings - ${build.directory}/server0/data/messaging/paging - - - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - - - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - - - + ${build.directory}/server0/data/messaging/journal - + ${build.directory}/server0/data/messaging/largemessages - - - - - - - - - - - - - - - - + ${build.directory}/server0/data/messaging/paging + + + org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory + + + + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/jms/openwire/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/openwire/src/main/resources/activemq/server0/activemq-jms.xml deleted file mode 100644 index 8ca9fd6e26..0000000000 --- a/examples/jms/openwire/src/main/resources/activemq/server0/activemq-jms.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/openwire/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/openwire/src/main/resources/activemq/server0/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/openwire/src/main/resources/activemq/server0/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/openwire/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/openwire/src/main/resources/activemq/server0/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/openwire/src/main/resources/activemq/server0/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/openwire/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/openwire/src/main/resources/activemq/server0/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/examples/jms/openwire/src/main/resources/activemq/server0/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/paging/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/paging/src/main/resources/activemq/server0/activemq-configuration.xml index a383d86b7c..886d572751 100644 --- a/examples/jms/paging/src/main/resources/activemq/server0/activemq-configuration.xml +++ b/examples/jms/paging/src/main/resources/activemq/server0/activemq-configuration.xml @@ -18,70 +18,80 @@ specific language governing permissions and limitations under the License. --> - + - ${build.directory}/server0/data/messaging/bindings + + + - ${build.directory}/server0/data/messaging/journal + + - ${build.directory}/server0/data/messaging/largemessages + - ${build.directory}/server0/data/messaging/paging + ${build.directory}/server0/data/messaging/bindings + + ${build.directory}/server0/data/messaging/journal + + ${build.directory}/server0/data/messaging/largemessages + + ${build.directory}/server0/data/messaging/paging - - - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - - - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + + + + org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory + + - + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + - - - - - - - - - - + - - - - - - - - - + + + + + + + + + + - - - 100000 - 20000 - + + + + + + + + + - - 10485760 - 1048576 - - - 10485760 - 1048576 - - + + + 100000 + 20000 + + + 10485760 + 1048576 + + + 10485760 + 1048576 + + + + diff --git a/examples/jms/paging/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/paging/src/main/resources/activemq/server0/activemq-jms.xml deleted file mode 100644 index 5721137f71..0000000000 --- a/examples/jms/paging/src/main/resources/activemq/server0/activemq-jms.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - diff --git a/examples/jms/paging/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/paging/src/main/resources/activemq/server0/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/paging/src/main/resources/activemq/server0/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/paging/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/paging/src/main/resources/activemq/server0/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/paging/src/main/resources/activemq/server0/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/paging/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/paging/src/main/resources/activemq/server0/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/examples/jms/paging/src/main/resources/activemq/server0/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/perf/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/perf/src/main/resources/activemq/server0/activemq-configuration.xml index 683952b305..93e4cfbabb 100644 --- a/examples/jms/perf/src/main/resources/activemq/server0/activemq-configuration.xml +++ b/examples/jms/perf/src/main/resources/activemq/server0/activemq-configuration.xml @@ -18,27 +18,34 @@ specific language governing permissions and limitations under the License. --> - + - false - true - - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - - - - - - - -
perfAddress
- - + + + + + + false + true + + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + + + + + + +
perfAddress
+ + + + diff --git a/examples/jms/perf/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/perf/src/main/resources/activemq/server0/activemq-jms.xml deleted file mode 100644 index 411ad1ddbf..0000000000 --- a/examples/jms/perf/src/main/resources/activemq/server0/activemq-jms.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - diff --git a/examples/jms/pre-acknowledge/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/pre-acknowledge/src/main/resources/activemq/server0/activemq-configuration.xml index e91019efb8..4e5a4d3bfa 100644 --- a/examples/jms/pre-acknowledge/src/main/resources/activemq/server0/activemq-configuration.xml +++ b/examples/jms/pre-acknowledge/src/main/resources/activemq/server0/activemq-configuration.xml @@ -18,40 +18,48 @@ specific language governing permissions and limitations under the License. --> - + - ${build.directory}/server0/data/messaging/bindings + + + + - ${build.directory}/server0/data/messaging/journal + - ${build.directory}/server0/data/messaging/largemessages + ${build.directory}/server0/data/messaging/bindings - ${build.directory}/server0/data/messaging/paging - - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + ${build.directory}/server0/data/messaging/journal - + ${build.directory}/server0/data/messaging/largemessages - - - - - - - - - + ${build.directory}/server0/data/messaging/paging - - - - + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + + + + + + + + + + + + + + + + + + diff --git a/examples/jms/pre-acknowledge/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/pre-acknowledge/src/main/resources/activemq/server0/activemq-jms.xml deleted file mode 100644 index 8ca9fd6e26..0000000000 --- a/examples/jms/pre-acknowledge/src/main/resources/activemq/server0/activemq-jms.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/pre-acknowledge/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/pre-acknowledge/src/main/resources/activemq/server0/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/pre-acknowledge/src/main/resources/activemq/server0/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/pre-acknowledge/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/pre-acknowledge/src/main/resources/activemq/server0/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/pre-acknowledge/src/main/resources/activemq/server0/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/pre-acknowledge/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/pre-acknowledge/src/main/resources/activemq/server0/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/examples/jms/pre-acknowledge/src/main/resources/activemq/server0/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/producer-rate-limit/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/producer-rate-limit/src/main/resources/activemq/server0/activemq-configuration.xml index 58501e8b99..bb8c2d13cb 100644 --- a/examples/jms/producer-rate-limit/src/main/resources/activemq/server0/activemq-configuration.xml +++ b/examples/jms/producer-rate-limit/src/main/resources/activemq/server0/activemq-configuration.xml @@ -18,37 +18,45 @@ specific language governing permissions and limitations under the License. --> - + - ${build.directory}/server0/data/messaging/bindings + + + + - ${build.directory}/server0/data/messaging/journal + - ${build.directory}/server0/data/messaging/largemessages + ${build.directory}/server0/data/messaging/bindings - ${build.directory}/server0/data/messaging/paging - - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + ${build.directory}/server0/data/messaging/journal - + ${build.directory}/server0/data/messaging/largemessages - - - - - - - - - - - + ${build.directory}/server0/data/messaging/paging + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + + + + + + + + + + + + + + + + diff --git a/examples/jms/producer-rate-limit/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/producer-rate-limit/src/main/resources/activemq/server0/activemq-jms.xml deleted file mode 100644 index 8ca9fd6e26..0000000000 --- a/examples/jms/producer-rate-limit/src/main/resources/activemq/server0/activemq-jms.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/producer-rate-limit/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/producer-rate-limit/src/main/resources/activemq/server0/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/producer-rate-limit/src/main/resources/activemq/server0/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/producer-rate-limit/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/producer-rate-limit/src/main/resources/activemq/server0/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/producer-rate-limit/src/main/resources/activemq/server0/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/producer-rate-limit/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/producer-rate-limit/src/main/resources/activemq/server0/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/examples/jms/producer-rate-limit/src/main/resources/activemq/server0/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/proton-cpp/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/proton-cpp/src/main/resources/activemq/server0/activemq-configuration.xml index 07fa1264af..e74ceba0ff 100644 --- a/examples/jms/proton-cpp/src/main/resources/activemq/server0/activemq-configuration.xml +++ b/examples/jms/proton-cpp/src/main/resources/activemq/server0/activemq-configuration.xml @@ -18,38 +18,46 @@ specific language governing permissions and limitations under the License. --> - + - ${build.directory}/server0/data/messaging/bindings + + + + - ${build.directory}/server0/data/messaging/journal + - ${build.directory}/server0/data/messaging/largemessages + ${build.directory}/server0/data/messaging/bindings - ${build.directory}/server0/data/messaging/paging + ${build.directory}/server0/data/messaging/journal + + ${build.directory}/server0/data/messaging/largemessages + + ${build.directory}/server0/data/messaging/paging - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + - + - - - - - - - - - - - + + + + + + + + + + + + diff --git a/examples/jms/proton-cpp/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/proton-cpp/src/main/resources/activemq/server0/activemq-jms.xml deleted file mode 100644 index 755203f723..0000000000 --- a/examples/jms/proton-cpp/src/main/resources/activemq/server0/activemq-jms.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - diff --git a/examples/jms/proton-cpp/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/proton-cpp/src/main/resources/activemq/server0/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/proton-cpp/src/main/resources/activemq/server0/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/proton-cpp/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/proton-cpp/src/main/resources/activemq/server0/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/proton-cpp/src/main/resources/activemq/server0/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/proton-cpp/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/proton-cpp/src/main/resources/activemq/server0/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/examples/jms/proton-cpp/src/main/resources/activemq/server0/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/proton-j/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/proton-j/src/main/resources/activemq/server0/activemq-configuration.xml index ab9dfadfc9..93e5eb2e58 100644 --- a/examples/jms/proton-j/src/main/resources/activemq/server0/activemq-configuration.xml +++ b/examples/jms/proton-j/src/main/resources/activemq/server0/activemq-configuration.xml @@ -18,45 +18,53 @@ specific language governing permissions and limitations under the License. --> - + - ${build.directory}/server0/data/messaging/bindings + + + + - ${build.directory}/server0/data/messaging/journal + - ${build.directory}/server0/data/messaging/largemessages + ${build.directory}/server0/data/messaging/bindings - ${build.directory}/server0/data/messaging/paging + ${build.directory}/server0/data/messaging/journal + + ${build.directory}/server0/data/messaging/largemessages + + ${build.directory}/server0/data/messaging/paging - - - + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + + - - + +
testQueue
- - + + - + - - - - - - - - - - - + + + + + + + + + + + + diff --git a/examples/jms/proton-j/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/proton-j/src/main/resources/activemq/server0/activemq-jms.xml deleted file mode 100644 index f318c1c871..0000000000 --- a/examples/jms/proton-j/src/main/resources/activemq/server0/activemq-jms.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - diff --git a/examples/jms/proton-j/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/proton-j/src/main/resources/activemq/server0/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/proton-j/src/main/resources/activemq/server0/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/proton-j/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/proton-j/src/main/resources/activemq/server0/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/proton-j/src/main/resources/activemq/server0/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/proton-j/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/proton-j/src/main/resources/activemq/server0/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/examples/jms/proton-j/src/main/resources/activemq/server0/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/proton-ruby/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/proton-ruby/src/main/resources/activemq/server0/activemq-configuration.xml index 7c55ee9988..5c443a161a 100644 --- a/examples/jms/proton-ruby/src/main/resources/activemq/server0/activemq-configuration.xml +++ b/examples/jms/proton-ruby/src/main/resources/activemq/server0/activemq-configuration.xml @@ -18,44 +18,52 @@ specific language governing permissions and limitations under the License. --> - + - ${build.directory}/server0/data/messaging/bindings + + + + - ${build.directory}/server0/data/messaging/journal + - ${build.directory}/server0/data/messaging/largemessages + ${build.directory}/server0/data/messaging/bindings - ${build.directory}/server0/data/messaging/paging - - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - - - + ${build.directory}/server0/data/messaging/journal - - + ${build.directory}/server0/data/messaging/largemessages + + ${build.directory}/server0/data/messaging/paging + + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + + + + +
testQueue
- - - + + + - - - - - - - - - - - + + + + + + + + + + + + diff --git a/examples/jms/proton-ruby/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/proton-ruby/src/main/resources/activemq/server0/activemq-jms.xml deleted file mode 100644 index 11bd1ae58e..0000000000 --- a/examples/jms/proton-ruby/src/main/resources/activemq/server0/activemq-jms.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - diff --git a/examples/jms/proton-ruby/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/proton-ruby/src/main/resources/activemq/server0/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/proton-ruby/src/main/resources/activemq/server0/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/proton-ruby/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/proton-ruby/src/main/resources/activemq/server0/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/proton-ruby/src/main/resources/activemq/server0/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/proton-ruby/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/proton-ruby/src/main/resources/activemq/server0/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/examples/jms/proton-ruby/src/main/resources/activemq/server0/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/queue-message-redistribution/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/queue-message-redistribution/src/main/resources/activemq/server0/activemq-configuration.xml index 133dded71e..c084fdf65a 100644 --- a/examples/jms/queue-message-redistribution/src/main/resources/activemq/server0/activemq-configuration.xml +++ b/examples/jms/queue-message-redistribution/src/main/resources/activemq/server0/activemq-configuration.xml @@ -18,89 +18,96 @@ specific language governing permissions and limitations under the License. --> - + - + + + + - ${build.directory}/server0/data/messaging/bindings + - ${build.directory}/server0/data/messaging/journal - ${build.directory}/server0/data/messaging/largemessages + ${build.directory}/server0/data/messaging/bindings - ${build.directory}/server0/data/messaging/paging + ${build.directory}/server0/data/messaging/journal - - - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - - - - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - - - - - - - ${udp-address:231.7.7.7} - 9876 - 100 - netty-connector - - - - - - ${udp-address:231.7.7.7} - 9876 - 10000 - - + ${build.directory}/server0/data/messaging/largemessages - - -
jms
- netty-connector - 500 - true - false - 1 - - - - - + ${build.directory}/server0/data/messaging/paging - - - - - - - - - - - + + + + org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory + + + - - - - 0 - - + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + + + + + ${udp-address:231.7.7.7} + 9876 + 100 + netty-connector + + + + + + ${udp-address:231.7.7.7} + 9876 + 10000 + + + + + +
jms
+ netty-connector + 500 + true + false + 1 + + + + + + + + + + + + + + + + + + + + + + 0 + + + + diff --git a/examples/jms/queue-message-redistribution/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/queue-message-redistribution/src/main/resources/activemq/server0/activemq-jms.xml deleted file mode 100644 index 8ca9fd6e26..0000000000 --- a/examples/jms/queue-message-redistribution/src/main/resources/activemq/server0/activemq-jms.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/queue-message-redistribution/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/queue-message-redistribution/src/main/resources/activemq/server0/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/queue-message-redistribution/src/main/resources/activemq/server0/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/queue-message-redistribution/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/queue-message-redistribution/src/main/resources/activemq/server0/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/queue-message-redistribution/src/main/resources/activemq/server0/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/queue-message-redistribution/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/queue-message-redistribution/src/main/resources/activemq/server0/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/examples/jms/queue-message-redistribution/src/main/resources/activemq/server0/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/queue-message-redistribution/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/queue-message-redistribution/src/main/resources/activemq/server1/activemq-configuration.xml index 4aefdcaf7a..be1c3ca260 100644 --- a/examples/jms/queue-message-redistribution/src/main/resources/activemq/server1/activemq-configuration.xml +++ b/examples/jms/queue-message-redistribution/src/main/resources/activemq/server1/activemq-configuration.xml @@ -18,90 +18,97 @@ specific language governing permissions and limitations under the License. --> - + - + + + + - ${build.directory}/server1/data/messaging/bindings + - ${build.directory}/server1/data/messaging/journal - ${build.directory}/server1/data/messaging/largemessages + ${build.directory}/server1/data/messaging/bindings - ${build.directory}/server1/data/messaging/paging + ${build.directory}/server1/data/messaging/journal - + ${build.directory}/server1/data/messaging/largemessages - - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - - - - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - - - - - - - ${udp-address:231.7.7.7} - 9876 - 100 - netty-connector - - - - - - ${udp-address:231.7.7.7} - 9876 - 10000 - - - - - -
jms
- netty-connector - 500 - true - false - 1 - - - - - + ${build.directory}/server1/data/messaging/paging - - - - - - - - - - - + - - - - 0 - - - + + + org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory + + + + + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + + + + + + ${udp-address:231.7.7.7} + 9876 + 100 + netty-connector + + + + + + ${udp-address:231.7.7.7} + 9876 + 10000 + + + + + +
jms
+ netty-connector + 500 + true + false + 1 + + + + + + + + + + + + + + + + + + + + + + 0 + + + + diff --git a/examples/jms/queue-message-redistribution/src/main/resources/activemq/server1/activemq-jms.xml b/examples/jms/queue-message-redistribution/src/main/resources/activemq/server1/activemq-jms.xml deleted file mode 100644 index 8ca9fd6e26..0000000000 --- a/examples/jms/queue-message-redistribution/src/main/resources/activemq/server1/activemq-jms.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/queue-message-redistribution/src/main/resources/activemq/server1/activemq-roles.properties b/examples/jms/queue-message-redistribution/src/main/resources/activemq/server1/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/queue-message-redistribution/src/main/resources/activemq/server1/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/queue-message-redistribution/src/main/resources/activemq/server1/activemq-users.properties b/examples/jms/queue-message-redistribution/src/main/resources/activemq/server1/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/queue-message-redistribution/src/main/resources/activemq/server1/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/queue-message-redistribution/src/main/resources/activemq/server1/activemq-users.xml b/examples/jms/queue-message-redistribution/src/main/resources/activemq/server1/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/examples/jms/queue-message-redistribution/src/main/resources/activemq/server1/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/queue-requestor/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/queue-requestor/src/main/resources/activemq/server0/activemq-configuration.xml index 512ab8114f..96f76e5366 100644 --- a/examples/jms/queue-requestor/src/main/resources/activemq/server0/activemq-configuration.xml +++ b/examples/jms/queue-requestor/src/main/resources/activemq/server0/activemq-configuration.xml @@ -18,44 +18,52 @@ specific language governing permissions and limitations under the License. --> - + - ${build.directory}/server0/data/messaging/bindings + + + + - ${build.directory}/server0/data/messaging/journal + - ${build.directory}/server0/data/messaging/largemessages + ${build.directory}/server0/data/messaging/bindings - ${build.directory}/server0/data/messaging/paging - - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + ${build.directory}/server0/data/messaging/journal - + ${build.directory}/server0/data/messaging/largemessages - - - - - - - - - - - - - - - - - - - + ${build.directory}/server0/data/messaging/paging + + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/jms/queue-requestor/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/queue-requestor/src/main/resources/activemq/server0/activemq-jms.xml deleted file mode 100644 index 8ca9fd6e26..0000000000 --- a/examples/jms/queue-requestor/src/main/resources/activemq/server0/activemq-jms.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/queue-requestor/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/queue-requestor/src/main/resources/activemq/server0/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/queue-requestor/src/main/resources/activemq/server0/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/queue-requestor/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/queue-requestor/src/main/resources/activemq/server0/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/queue-requestor/src/main/resources/activemq/server0/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/queue-requestor/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/queue-requestor/src/main/resources/activemq/server0/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/examples/jms/queue-requestor/src/main/resources/activemq/server0/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/queue-selector/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/queue-selector/src/main/resources/activemq/server0/activemq-configuration.xml index 6e37e2c1c0..48d96e9862 100644 --- a/examples/jms/queue-selector/src/main/resources/activemq/server0/activemq-configuration.xml +++ b/examples/jms/queue-selector/src/main/resources/activemq/server0/activemq-configuration.xml @@ -18,36 +18,44 @@ specific language governing permissions and limitations under the License. --> - + - ${build.directory}/server0/data/messaging/bindings + + + + - ${build.directory}/server0/data/messaging/journal + - ${build.directory}/server0/data/messaging/largemessages + ${build.directory}/server0/data/messaging/bindings - ${build.directory}/server0/data/messaging/paging - - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + ${build.directory}/server0/data/messaging/journal - + ${build.directory}/server0/data/messaging/largemessages - - - - - - - - - - - - + ${build.directory}/server0/data/messaging/paging + + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + + + + + + + + + + + + + + + + diff --git a/examples/jms/queue-selector/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/queue-selector/src/main/resources/activemq/server0/activemq-jms.xml deleted file mode 100644 index 8ca9fd6e26..0000000000 --- a/examples/jms/queue-selector/src/main/resources/activemq/server0/activemq-jms.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/queue-selector/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/queue-selector/src/main/resources/activemq/server0/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/queue-selector/src/main/resources/activemq/server0/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/queue-selector/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/queue-selector/src/main/resources/activemq/server0/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/queue-selector/src/main/resources/activemq/server0/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/queue-selector/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/queue-selector/src/main/resources/activemq/server0/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/examples/jms/queue-selector/src/main/resources/activemq/server0/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/queue/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/queue/src/main/resources/activemq/server0/activemq-configuration.xml index 69def3b435..bb8c2d13cb 100644 --- a/examples/jms/queue/src/main/resources/activemq/server0/activemq-configuration.xml +++ b/examples/jms/queue/src/main/resources/activemq/server0/activemq-configuration.xml @@ -18,37 +18,45 @@ specific language governing permissions and limitations under the License. --> - + - ${build.directory}/server0/data/messaging/bindings + + + + - ${build.directory}/server0/data/messaging/journal + - ${build.directory}/server0/data/messaging/largemessages + ${build.directory}/server0/data/messaging/bindings - ${build.directory}/server0/data/messaging/paging - - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + ${build.directory}/server0/data/messaging/journal - + ${build.directory}/server0/data/messaging/largemessages - - - - - - - - - - - + ${build.directory}/server0/data/messaging/paging + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + + + + + + + + + + + + + + + + diff --git a/examples/jms/queue/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/queue/src/main/resources/activemq/server0/activemq-jms.xml deleted file mode 100644 index 8ca9fd6e26..0000000000 --- a/examples/jms/queue/src/main/resources/activemq/server0/activemq-jms.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/queue/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/queue/src/main/resources/activemq/server0/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/queue/src/main/resources/activemq/server0/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/queue/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/queue/src/main/resources/activemq/server0/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/queue/src/main/resources/activemq/server0/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/queue/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/queue/src/main/resources/activemq/server0/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/examples/jms/queue/src/main/resources/activemq/server0/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/reattach-node/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/reattach-node/src/main/resources/activemq/server0/activemq-configuration.xml index 8c74a99a13..1bec9b09cc 100644 --- a/examples/jms/reattach-node/src/main/resources/activemq/server0/activemq-configuration.xml +++ b/examples/jms/reattach-node/src/main/resources/activemq/server0/activemq-configuration.xml @@ -18,69 +18,77 @@ specific language governing permissions and limitations under the License. --> - + - ${build.directory}/server0/data/messaging/bindings + + + + - ${build.directory}/server0/data/messaging/journal + - ${build.directory}/server0/data/messaging/largemessages + ${build.directory}/server0/data/messaging/bindings - ${build.directory}/server0/data/messaging/paging + ${build.directory}/server0/data/messaging/journal - + ${build.directory}/server0/data/messaging/largemessages - - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - - - - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - - - - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + ${build.directory}/server0/data/messaging/paging - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - - - - + - + + + org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory + + - - - - - - - - - + + + org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory + + + - - - - - - - - + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/jms/reattach-node/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/reattach-node/src/main/resources/activemq/server0/activemq-jms.xml deleted file mode 100644 index 8ca9fd6e26..0000000000 --- a/examples/jms/reattach-node/src/main/resources/activemq/server0/activemq-jms.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/reattach-node/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/reattach-node/src/main/resources/activemq/server0/activemq-roles.properties new file mode 100644 index 0000000000..d82bc7ed6d --- /dev/null +++ b/examples/jms/reattach-node/src/main/resources/activemq/server0/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest,admin \ No newline at end of file diff --git a/examples/jms/reattach-node/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/reattach-node/src/main/resources/activemq/server0/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/reattach-node/src/main/resources/activemq/server0/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/reattach-node/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/reattach-node/src/main/resources/activemq/server0/activemq-users.xml deleted file mode 100644 index f7538cdb2e..0000000000 --- a/examples/jms/reattach-node/src/main/resources/activemq/server0/activemq-users.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - diff --git a/examples/jms/replicated-failback-static/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/replicated-failback-static/src/main/resources/activemq/server0/activemq-configuration.xml index e3f8b90dab..a85e98e74b 100644 --- a/examples/jms/replicated-failback-static/src/main/resources/activemq/server0/activemq-configuration.xml +++ b/examples/jms/replicated-failback-static/src/main/resources/activemq/server0/activemq-configuration.xml @@ -18,71 +18,79 @@ specific language governing permissions and limitations under the License. --> - + - ${build.directory}/server0/data/messaging/bindings + + + + - ${build.directory}/server0/data/messaging/journal + - ${build.directory}/server0/data/messaging/largemessages + ${build.directory}/server0/data/messaging/bindings - ${build.directory}/server0/data/messaging/paging + ${build.directory}/server0/data/messaging/journal - exampleUser + ${build.directory}/server0/data/messaging/largemessages - secret + ${build.directory}/server0/data/messaging/paging - - - - - true - - - + exampleUser - - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - - + secret - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - - + + + + + true + + + - - -
jms
- netty-connector - - netty-backup-connector - - - - + + + org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory + + + + org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory + + + - - - - - - - - - - - + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + + + +
jms
+ netty-connector + + netty-backup-connector + + + + + + + + + + + + + + + + + + diff --git a/examples/jms/replicated-failback-static/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/replicated-failback-static/src/main/resources/activemq/server0/activemq-jms.xml deleted file mode 100644 index 8ca9fd6e26..0000000000 --- a/examples/jms/replicated-failback-static/src/main/resources/activemq/server0/activemq-jms.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/replicated-failback-static/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/replicated-failback-static/src/main/resources/activemq/server0/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/replicated-failback-static/src/main/resources/activemq/server0/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/replicated-failback-static/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/replicated-failback-static/src/main/resources/activemq/server0/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/replicated-failback-static/src/main/resources/activemq/server0/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/replicated-failback-static/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/replicated-failback-static/src/main/resources/activemq/server0/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/examples/jms/replicated-failback-static/src/main/resources/activemq/server0/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/replicated-failback-static/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/replicated-failback-static/src/main/resources/activemq/server1/activemq-configuration.xml index 51509395d9..d3bb79db10 100644 --- a/examples/jms/replicated-failback-static/src/main/resources/activemq/server1/activemq-configuration.xml +++ b/examples/jms/replicated-failback-static/src/main/resources/activemq/server1/activemq-configuration.xml @@ -18,73 +18,81 @@ specific language governing permissions and limitations under the License. --> - + - ${build.directory}/server1/data/messaging/bindings + + + + - ${build.directory}/server1/data/messaging/journal + - ${build.directory}/server1/data/messaging/largemessages + ${build.directory}/server1/data/messaging/bindings - ${build.directory}/server1/data/messaging/paging + ${build.directory}/server1/data/messaging/journal - exampleUser + ${build.directory}/server1/data/messaging/largemessages - secret + ${build.directory}/server1/data/messaging/paging - - - - true - - 0 - - - + exampleUser - - - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - - + secret - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - - + + + + true + + 0 + + + - - -
jms
- netty-connector - - netty-live-connector - - - - + + + + org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory + + + + org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory + + + - - - - - - - - - - - + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + + + +
jms
+ netty-connector + + netty-live-connector + + + + + + + + + + + + + + + + + + diff --git a/examples/jms/replicated-failback-static/src/main/resources/activemq/server1/activemq-jms.xml b/examples/jms/replicated-failback-static/src/main/resources/activemq/server1/activemq-jms.xml deleted file mode 100644 index 8ca9fd6e26..0000000000 --- a/examples/jms/replicated-failback-static/src/main/resources/activemq/server1/activemq-jms.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/replicated-failback-static/src/main/resources/activemq/server1/activemq-roles.properties b/examples/jms/replicated-failback-static/src/main/resources/activemq/server1/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/replicated-failback-static/src/main/resources/activemq/server1/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/replicated-failback-static/src/main/resources/activemq/server1/activemq-users.properties b/examples/jms/replicated-failback-static/src/main/resources/activemq/server1/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/replicated-failback-static/src/main/resources/activemq/server1/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/replicated-failback-static/src/main/resources/activemq/server1/activemq-users.xml b/examples/jms/replicated-failback-static/src/main/resources/activemq/server1/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/examples/jms/replicated-failback-static/src/main/resources/activemq/server1/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/replicated-failback/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/replicated-failback/src/main/resources/activemq/server0/activemq-configuration.xml index 5e405b7a7a..3aef7ff295 100644 --- a/examples/jms/replicated-failback/src/main/resources/activemq/server0/activemq-configuration.xml +++ b/examples/jms/replicated-failback/src/main/resources/activemq/server0/activemq-configuration.xml @@ -18,82 +18,90 @@ specific language governing permissions and limitations under the License. --> - + - ${build.directory}/server0/data/messaging/bindings + + + + - ${build.directory}/server0/data/messaging/journal + - ${build.directory}/server0/data/messaging/largemessages + ${build.directory}/server0/data/messaging/bindings - ${build.directory}/server0/data/messaging/paging + ${build.directory}/server0/data/messaging/journal - exampleUser + ${build.directory}/server0/data/messaging/largemessages - secret + ${build.directory}/server0/data/messaging/paging - - - - - true - - - + exampleUser - - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - - + secret - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - - + + + + + true + + + - - - ${udp-address:231.7.7.7} - 9876 - 1000 - netty-connector - - + + + org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory + + + - - - ${udp-address:231.7.7.7} - 9876 - 60000 - - + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + - - -
jms
- netty-connector - - - - + + + ${udp-address:231.7.7.7} + 9876 + 1000 + netty-connector + + - - - - - - - - - - - + + + ${udp-address:231.7.7.7} + 9876 + 60000 + + + + +
jms
+ netty-connector + + + + + + + + + + + + + + + + + + diff --git a/examples/jms/replicated-failback/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/replicated-failback/src/main/resources/activemq/server0/activemq-jms.xml deleted file mode 100644 index 8ca9fd6e26..0000000000 --- a/examples/jms/replicated-failback/src/main/resources/activemq/server0/activemq-jms.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/replicated-failback/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/replicated-failback/src/main/resources/activemq/server0/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/replicated-failback/src/main/resources/activemq/server0/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/replicated-failback/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/replicated-failback/src/main/resources/activemq/server0/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/replicated-failback/src/main/resources/activemq/server0/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/replicated-failback/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/replicated-failback/src/main/resources/activemq/server0/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/examples/jms/replicated-failback/src/main/resources/activemq/server0/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/replicated-failback/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/replicated-failback/src/main/resources/activemq/server1/activemq-configuration.xml index fd1125f288..81b8429560 100644 --- a/examples/jms/replicated-failback/src/main/resources/activemq/server1/activemq-configuration.xml +++ b/examples/jms/replicated-failback/src/main/resources/activemq/server1/activemq-configuration.xml @@ -18,86 +18,94 @@ specific language governing permissions and limitations under the License. --> - + - ${build.directory}/server1/data/messaging/bindings + + + + - ${build.directory}/server1/data/messaging/journal + - ${build.directory}/server1/data/messaging/largemessages + ${build.directory}/server1/data/messaging/bindings - ${build.directory}/server1/data/messaging/paging + ${build.directory}/server1/data/messaging/journal - exampleUser + ${build.directory}/server1/data/messaging/largemessages - secret + ${build.directory}/server1/data/messaging/paging - - - - true - - - + exampleUser - - - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - - + secret - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - - + + + + true + + + - - - ${udp-address:231.7.7.7} - 9876 - 1000 - netty-connector - - + + + + org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory + + + + org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory + + + - - - ${udp-address:231.7.7.7} - 9876 - 60000 - - + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + - - -
jms
- netty-connector - - - - + + + ${udp-address:231.7.7.7} + 9876 + 1000 + netty-connector + + - - - - - - - - - - - + + + ${udp-address:231.7.7.7} + 9876 + 60000 + + + + +
jms
+ netty-connector + + + + + + + + + + + + + + + + + + diff --git a/examples/jms/replicated-failback/src/main/resources/activemq/server1/activemq-jms.xml b/examples/jms/replicated-failback/src/main/resources/activemq/server1/activemq-jms.xml deleted file mode 100644 index 8ca9fd6e26..0000000000 --- a/examples/jms/replicated-failback/src/main/resources/activemq/server1/activemq-jms.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/replicated-failback/src/main/resources/activemq/server1/activemq-roles.properties b/examples/jms/replicated-failback/src/main/resources/activemq/server1/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/replicated-failback/src/main/resources/activemq/server1/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/replicated-failback/src/main/resources/activemq/server1/activemq-users.properties b/examples/jms/replicated-failback/src/main/resources/activemq/server1/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/replicated-failback/src/main/resources/activemq/server1/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/replicated-failback/src/main/resources/activemq/server1/activemq-users.xml b/examples/jms/replicated-failback/src/main/resources/activemq/server1/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/examples/jms/replicated-failback/src/main/resources/activemq/server1/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server0/activemq-configuration.xml index d9da4a4696..65db741643 100644 --- a/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server0/activemq-configuration.xml +++ b/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server0/activemq-configuration.xml @@ -18,76 +18,84 @@ specific language governing permissions and limitations under the License. --> - + - ${build.directory}/server0/data/messaging/bindings + + + + - ${build.directory}/server0/data/messaging/journal + - ${build.directory}/server0/data/messaging/largemessages + ${build.directory}/server0/data/messaging/bindings - ${build.directory}/server0/data/messaging/paging + ${build.directory}/server0/data/messaging/journal - - - - - + ${build.directory}/server0/data/messaging/largemessages - - - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - - + ${build.directory}/server0/data/messaging/paging - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - - + + + + + - - - ${udp-address:231.7.7.7} - 9876 - 1000 - netty-connector - - + + + + org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory + + + - - - ${udp-address:231.7.7.7} - 9876 - 60000 - - + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + - - -
jms
- netty-connector - - - - + + + ${udp-address:231.7.7.7} + 9876 + 1000 + netty-connector + + - - - - - - - - - - - + + + ${udp-address:231.7.7.7} + 9876 + 60000 + + + + +
jms
+ netty-connector + + + + + + + + + + + + + + + + + + diff --git a/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server0/activemq-jms.xml deleted file mode 100644 index 8ca9fd6e26..0000000000 --- a/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server0/activemq-jms.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server0/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server0/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server0/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server0/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server0/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server0/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server1/activemq-configuration.xml index 03ad71a5b1..72f1db7723 100644 --- a/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server1/activemq-configuration.xml +++ b/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server1/activemq-configuration.xml @@ -18,76 +18,84 @@ specific language governing permissions and limitations under the License. --> - + - ${build.directory}/server1/data/messaging/bindings + + + + - ${build.directory}/server1/data/messaging/journal + - ${build.directory}/server1/data/messaging/largemessages + ${build.directory}/server1/data/messaging/bindings - ${build.directory}/server1/data/messaging/paging + ${build.directory}/server1/data/messaging/journal - - - - - + ${build.directory}/server1/data/messaging/largemessages - - - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - - - - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - - + ${build.directory}/server1/data/messaging/paging - - - ${udp-address:231.7.7.7} - 9876 - 1000 - netty-connector - - + + + + + - - - ${udp-address:231.7.7.7} - 9876 - 60000 - - + + + + org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory + + + - - -
jms
- netty-connector - - - - - - - - - - - - - - - - - + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + + + + + ${udp-address:231.7.7.7} + 9876 + 1000 + netty-connector + + + + + + ${udp-address:231.7.7.7} + 9876 + 60000 + + + + + +
jms
+ netty-connector + + + + + + + + + + + + + + + + + + diff --git a/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server1/activemq-jms.xml b/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server1/activemq-jms.xml deleted file mode 100644 index 8ca9fd6e26..0000000000 --- a/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server1/activemq-jms.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server1/activemq-roles.properties b/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server1/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server1/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server1/activemq-users.properties b/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server1/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server1/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server1/activemq-users.xml b/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server1/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server1/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server2/activemq-configuration.xml b/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server2/activemq-configuration.xml index ae35a039a8..7d41ed2f39 100644 --- a/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server2/activemq-configuration.xml +++ b/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server2/activemq-configuration.xml @@ -18,75 +18,83 @@ specific language governing permissions and limitations under the License. --> - + - ${build.directory}/server2/data/messaging/bindings + + + + - ${build.directory}/server2/data/messaging/journal + - ${build.directory}/server2/data/messaging/largemessages + ${build.directory}/server2/data/messaging/bindings - ${build.directory}/server2/data/messaging/paging + ${build.directory}/server2/data/messaging/journal - - - - - - - - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - - - - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - - + ${build.directory}/server2/data/messaging/largemessages - - - ${udp-address:231.7.7.7} - 9876 - 1000 - netty-connector - - + ${build.directory}/server2/data/messaging/paging - - - ${udp-address:231.7.7.7} - 9876 - 60000 - - + + + + + - - -
jms
- netty-connector - - - - + + + org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory + + + - - - - - - - - - - - - + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + + + + + ${udp-address:231.7.7.7} + 9876 + 1000 + netty-connector + + + + + + ${udp-address:231.7.7.7} + 9876 + 60000 + + + + + +
jms
+ netty-connector + + + + + + + + + + + + + + + + + + diff --git a/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server2/activemq-jms.xml b/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server2/activemq-jms.xml deleted file mode 100644 index 8ca9fd6e26..0000000000 --- a/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server2/activemq-jms.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server2/activemq-roles.properties b/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server2/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server2/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server2/activemq-users.properties b/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server2/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server2/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server2/activemq-users.xml b/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server2/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server2/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/replicated-transaction-failover/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/replicated-transaction-failover/src/main/resources/activemq/server0/activemq-configuration.xml index acae60c240..1ceffc42ac 100644 --- a/examples/jms/replicated-transaction-failover/src/main/resources/activemq/server0/activemq-configuration.xml +++ b/examples/jms/replicated-transaction-failover/src/main/resources/activemq/server0/activemq-configuration.xml @@ -18,77 +18,85 @@ specific language governing permissions and limitations under the License. --> - + - ${build.directory}/server0/data/messaging/bindings + + + + - ${build.directory}/server0/data/messaging/journal + - ${build.directory}/server0/data/messaging/largemessages + ${build.directory}/server0/data/messaging/bindings - ${build.directory}/server0/data/messaging/paging + ${build.directory}/server0/data/messaging/journal - - - - - + ${build.directory}/server0/data/messaging/largemessages - + ${build.directory}/server0/data/messaging/paging - - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - - + + + + + - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - - + - - - ${udp-address:231.7.7.7} - 9876 - 1000 - netty-connector - - + + + org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory + + + - - - ${udp-address:231.7.7.7} - 9876 - 60000 - - + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + - - -
jms
- netty-connector - - - - + + + ${udp-address:231.7.7.7} + 9876 + 1000 + netty-connector + + - - - - - - - - - - - + + + ${udp-address:231.7.7.7} + 9876 + 60000 + + + + +
jms
+ netty-connector + + + + + + + + + + + + + + + + + + diff --git a/examples/jms/replicated-transaction-failover/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/replicated-transaction-failover/src/main/resources/activemq/server0/activemq-jms.xml deleted file mode 100644 index 8ca9fd6e26..0000000000 --- a/examples/jms/replicated-transaction-failover/src/main/resources/activemq/server0/activemq-jms.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/replicated-transaction-failover/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/replicated-transaction-failover/src/main/resources/activemq/server0/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/replicated-transaction-failover/src/main/resources/activemq/server0/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/replicated-transaction-failover/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/replicated-transaction-failover/src/main/resources/activemq/server0/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/replicated-transaction-failover/src/main/resources/activemq/server0/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/replicated-transaction-failover/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/replicated-transaction-failover/src/main/resources/activemq/server0/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/examples/jms/replicated-transaction-failover/src/main/resources/activemq/server0/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/replicated-transaction-failover/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/replicated-transaction-failover/src/main/resources/activemq/server1/activemq-configuration.xml index 261fef9f85..3acc2ae24b 100644 --- a/examples/jms/replicated-transaction-failover/src/main/resources/activemq/server1/activemq-configuration.xml +++ b/examples/jms/replicated-transaction-failover/src/main/resources/activemq/server1/activemq-configuration.xml @@ -18,78 +18,86 @@ specific language governing permissions and limitations under the License. --> - + - ${build.directory}/server1/data/messaging/bindings + + + + - ${build.directory}/server1/data/messaging/journal + - ${build.directory}/server1/data/messaging/largemessages + ${build.directory}/server1/data/messaging/bindings - ${build.directory}/server1/data/messaging/paging + ${build.directory}/server1/data/messaging/journal - - - - - - - + ${build.directory}/server1/data/messaging/largemessages - - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - - - - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - - + ${build.directory}/server1/data/messaging/paging - - - ${udp-address:231.7.7.7} - 9876 - 1000 - netty-connector - - + + + + + - - - ${udp-address:231.7.7.7} - 9876 - 60000 - - + - - -
jms
- netty-connector - - - - - + + + org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory + + + - - - - - - - - - - - - + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + + + + + ${udp-address:231.7.7.7} + 9876 + 1000 + netty-connector + + + + + + ${udp-address:231.7.7.7} + 9876 + 60000 + + + + + +
jms
+ netty-connector + + + + + + + + + + + + + + + + + + + diff --git a/examples/jms/replicated-transaction-failover/src/main/resources/activemq/server1/activemq-jms.xml b/examples/jms/replicated-transaction-failover/src/main/resources/activemq/server1/activemq-jms.xml deleted file mode 100644 index 8ca9fd6e26..0000000000 --- a/examples/jms/replicated-transaction-failover/src/main/resources/activemq/server1/activemq-jms.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/replicated-transaction-failover/src/main/resources/activemq/server1/activemq-roles.properties b/examples/jms/replicated-transaction-failover/src/main/resources/activemq/server1/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/replicated-transaction-failover/src/main/resources/activemq/server1/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/replicated-transaction-failover/src/main/resources/activemq/server1/activemq-users.properties b/examples/jms/replicated-transaction-failover/src/main/resources/activemq/server1/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/replicated-transaction-failover/src/main/resources/activemq/server1/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/replicated-transaction-failover/src/main/resources/activemq/server1/activemq-users.xml b/examples/jms/replicated-transaction-failover/src/main/resources/activemq/server1/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/examples/jms/replicated-transaction-failover/src/main/resources/activemq/server1/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/request-reply/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/request-reply/src/main/resources/activemq/server0/activemq-configuration.xml index 512ab8114f..96f76e5366 100644 --- a/examples/jms/request-reply/src/main/resources/activemq/server0/activemq-configuration.xml +++ b/examples/jms/request-reply/src/main/resources/activemq/server0/activemq-configuration.xml @@ -18,44 +18,52 @@ specific language governing permissions and limitations under the License. --> - + - ${build.directory}/server0/data/messaging/bindings + + + + - ${build.directory}/server0/data/messaging/journal + - ${build.directory}/server0/data/messaging/largemessages + ${build.directory}/server0/data/messaging/bindings - ${build.directory}/server0/data/messaging/paging - - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + ${build.directory}/server0/data/messaging/journal - + ${build.directory}/server0/data/messaging/largemessages - - - - - - - - - - - - - - - - - - - + ${build.directory}/server0/data/messaging/paging + + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/jms/request-reply/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/request-reply/src/main/resources/activemq/server0/activemq-jms.xml deleted file mode 100644 index 8ca9fd6e26..0000000000 --- a/examples/jms/request-reply/src/main/resources/activemq/server0/activemq-jms.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/request-reply/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/request-reply/src/main/resources/activemq/server0/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/request-reply/src/main/resources/activemq/server0/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/request-reply/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/request-reply/src/main/resources/activemq/server0/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/request-reply/src/main/resources/activemq/server0/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/request-reply/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/request-reply/src/main/resources/activemq/server0/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/examples/jms/request-reply/src/main/resources/activemq/server0/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/rest/dup-send/src/main/resources/activemq-client.xml b/examples/jms/rest/dup-send/src/main/resources/activemq-client.xml index 7532dcd444..a2c488b39f 100644 --- a/examples/jms/rest/dup-send/src/main/resources/activemq-client.xml +++ b/examples/jms/rest/dup-send/src/main/resources/activemq-client.xml @@ -20,13 +20,19 @@ under the License. + xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd"> - - - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - + + + + + + + + + org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory + + + diff --git a/examples/jms/rest/dup-send/src/main/resources/activemq-configuration.xml b/examples/jms/rest/dup-send/src/main/resources/activemq-configuration.xml index b3973a7d05..692e56f970 100644 --- a/examples/jms/rest/dup-send/src/main/resources/activemq-configuration.xml +++ b/examples/jms/rest/dup-send/src/main/resources/activemq-configuration.xml @@ -18,41 +18,49 @@ specific language governing permissions and limitations under the License. --> - + - false - + + + + - - + + + false + + + + org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory - - + + - - + + org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - - + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + - + - - - + + + - - + + + diff --git a/examples/jms/rest/dup-send/src/main/resources/activemq-jms.xml b/examples/jms/rest/dup-send/src/main/resources/activemq-jms.xml deleted file mode 100644 index 58c620fe70..0000000000 --- a/examples/jms/rest/dup-send/src/main/resources/activemq-jms.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/rest/dup-send/src/main/resources/activemq-roles.properties b/examples/jms/rest/dup-send/src/main/resources/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/rest/dup-send/src/main/resources/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/rest/dup-send/src/main/resources/activemq-users.properties b/examples/jms/rest/dup-send/src/main/resources/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/rest/dup-send/src/main/resources/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/rest/dup-send/src/main/resources/activemq-users.xml b/examples/jms/rest/dup-send/src/main/resources/activemq-users.xml deleted file mode 100644 index eb938c0874..0000000000 --- a/examples/jms/rest/dup-send/src/main/resources/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/rest/javascript-chat/src/main/resources/activemq-configuration.xml b/examples/jms/rest/javascript-chat/src/main/resources/activemq-configuration.xml index 89f2978617..af87f14f80 100644 --- a/examples/jms/rest/javascript-chat/src/main/resources/activemq-configuration.xml +++ b/examples/jms/rest/javascript-chat/src/main/resources/activemq-configuration.xml @@ -18,37 +18,45 @@ specific language governing permissions and limitations under the License. --> - + - false - + + + + - - + + + false + + + + org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory - - + + - - + + org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory - - + + - + - - - + + + - - + + + diff --git a/examples/jms/rest/javascript-chat/src/main/resources/activemq-jms.xml b/examples/jms/rest/javascript-chat/src/main/resources/activemq-jms.xml deleted file mode 100644 index 464c481b25..0000000000 --- a/examples/jms/rest/javascript-chat/src/main/resources/activemq-jms.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/rest/javascript-chat/src/main/resources/activemq-roles.properties b/examples/jms/rest/javascript-chat/src/main/resources/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/rest/javascript-chat/src/main/resources/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/rest/javascript-chat/src/main/resources/activemq-users.properties b/examples/jms/rest/javascript-chat/src/main/resources/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/rest/javascript-chat/src/main/resources/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/rest/javascript-chat/src/main/resources/activemq-users.xml b/examples/jms/rest/javascript-chat/src/main/resources/activemq-users.xml deleted file mode 100644 index eb938c0874..0000000000 --- a/examples/jms/rest/javascript-chat/src/main/resources/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/rest/jms-to-rest/src/main/resources/activemq-client.xml b/examples/jms/rest/jms-to-rest/src/main/resources/activemq-client.xml index 7532dcd444..a2c488b39f 100644 --- a/examples/jms/rest/jms-to-rest/src/main/resources/activemq-client.xml +++ b/examples/jms/rest/jms-to-rest/src/main/resources/activemq-client.xml @@ -20,13 +20,19 @@ under the License. + xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd"> - - - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - + + + + + + + + + org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory + + + diff --git a/examples/jms/rest/jms-to-rest/src/main/resources/activemq-configuration.xml b/examples/jms/rest/jms-to-rest/src/main/resources/activemq-configuration.xml index b3973a7d05..692e56f970 100644 --- a/examples/jms/rest/jms-to-rest/src/main/resources/activemq-configuration.xml +++ b/examples/jms/rest/jms-to-rest/src/main/resources/activemq-configuration.xml @@ -18,41 +18,49 @@ specific language governing permissions and limitations under the License. --> - + - false - + + + + - - + + + false + + + + org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory - - + + - - + + org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - - + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + - + - - - + + + - - + + + diff --git a/examples/jms/rest/jms-to-rest/src/main/resources/activemq-jms.xml b/examples/jms/rest/jms-to-rest/src/main/resources/activemq-jms.xml deleted file mode 100644 index 58c620fe70..0000000000 --- a/examples/jms/rest/jms-to-rest/src/main/resources/activemq-jms.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/rest/jms-to-rest/src/main/resources/activemq-roles.properties b/examples/jms/rest/jms-to-rest/src/main/resources/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/rest/jms-to-rest/src/main/resources/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/rest/jms-to-rest/src/main/resources/activemq-users.properties b/examples/jms/rest/jms-to-rest/src/main/resources/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/rest/jms-to-rest/src/main/resources/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/rest/jms-to-rest/src/main/resources/activemq-users.xml b/examples/jms/rest/jms-to-rest/src/main/resources/activemq-users.xml deleted file mode 100644 index eb938c0874..0000000000 --- a/examples/jms/rest/jms-to-rest/src/main/resources/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/rest/push/src/main/resources/activemq-client.xml b/examples/jms/rest/push/src/main/resources/activemq-client.xml index 7532dcd444..a2c488b39f 100644 --- a/examples/jms/rest/push/src/main/resources/activemq-client.xml +++ b/examples/jms/rest/push/src/main/resources/activemq-client.xml @@ -20,13 +20,19 @@ under the License. + xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd"> - - - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - + + + + + + + + + org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory + + + diff --git a/examples/jms/rest/push/src/main/resources/activemq-configuration.xml b/examples/jms/rest/push/src/main/resources/activemq-configuration.xml index b3973a7d05..8421a9132a 100644 --- a/examples/jms/rest/push/src/main/resources/activemq-configuration.xml +++ b/examples/jms/rest/push/src/main/resources/activemq-configuration.xml @@ -18,41 +18,50 @@ specific language governing permissions and limitations under the License. --> - + - false - + + + + + - - + + + false + + + + org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory - - + + - - + + org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - - + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + - + - - - + + + - - + + + diff --git a/examples/jms/rest/push/src/main/resources/activemq-jms.xml b/examples/jms/rest/push/src/main/resources/activemq-jms.xml deleted file mode 100644 index b494666768..0000000000 --- a/examples/jms/rest/push/src/main/resources/activemq-jms.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - diff --git a/examples/jms/rest/push/src/main/resources/activemq-roles.properties b/examples/jms/rest/push/src/main/resources/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/rest/push/src/main/resources/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/rest/push/src/main/resources/activemq-users.properties b/examples/jms/rest/push/src/main/resources/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/rest/push/src/main/resources/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/rest/push/src/main/resources/activemq-users.xml b/examples/jms/rest/push/src/main/resources/activemq-users.xml deleted file mode 100644 index eb938c0874..0000000000 --- a/examples/jms/rest/push/src/main/resources/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/scale-down/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/scale-down/src/main/resources/activemq/server0/activemq-configuration.xml index ffc5b4fe6d..5724d64d4e 100644 --- a/examples/jms/scale-down/src/main/resources/activemq/server0/activemq-configuration.xml +++ b/examples/jms/scale-down/src/main/resources/activemq/server0/activemq-configuration.xml @@ -18,99 +18,107 @@ specific language governing permissions and limitations under the License. --> - - + - target/server0/data/messaging/bindings + + + + - target/server0/data/messaging/journal - - target/server0/data/messaging/largemessages - - target/server0/data/messaging/paging - - - - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - - - - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - - - - - - - ${udp-address:231.7.7.7} - 9876 - 100 - netty-connector - - - - - - ${udp-address:231.7.7.7} - 9876 - 10000 - - - - - -
jms
- netty-connector - 500 - 5 - true - true - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + target/server0/data/messaging/bindings + + target/server0/data/messaging/journal + + target/server0/data/messaging/largemessages + + target/server0/data/messaging/paging + + + + + org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory + + + + + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + + + + + + ${udp-address:231.7.7.7} + 9876 + 100 + netty-connector + + + + + + ${udp-address:231.7.7.7} + 9876 + 10000 + + + + + +
jms
+ netty-connector + 500 + 5 + true + true + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/jms/scale-down/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/scale-down/src/main/resources/activemq/server0/activemq-jms.xml deleted file mode 100644 index 8ca9fd6e26..0000000000 --- a/examples/jms/scale-down/src/main/resources/activemq/server0/activemq-jms.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/scale-down/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/scale-down/src/main/resources/activemq/server0/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/scale-down/src/main/resources/activemq/server0/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/scale-down/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/scale-down/src/main/resources/activemq/server0/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/scale-down/src/main/resources/activemq/server0/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/scale-down/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/scale-down/src/main/resources/activemq/server0/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/examples/jms/scale-down/src/main/resources/activemq/server0/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/scale-down/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/scale-down/src/main/resources/activemq/server1/activemq-configuration.xml index 84a7e708fc..5217112114 100644 --- a/examples/jms/scale-down/src/main/resources/activemq/server1/activemq-configuration.xml +++ b/examples/jms/scale-down/src/main/resources/activemq/server1/activemq-configuration.xml @@ -18,94 +18,101 @@ specific language governing permissions and limitations under the License. --> - - + + + + + + + + - target/server1/data/messaging/bindings + target/server1/data/messaging/bindings - target/server1/data/messaging/journal + target/server1/data/messaging/journal - target/server1/data/messaging/largemessages + target/server1/data/messaging/largemessages - target/server1/data/messaging/paging + target/server1/data/messaging/paging - - - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - - - - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - - - - - - - ${udp-address:231.7.7.7} - 9876 - 100 - netty-connector - - - - - - ${udp-address:231.7.7.7} - 9876 - 10000 - - - - - -
jms
- netty-connector - 500 - 5 - true - true - 1 - - - + + + + org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory + + + + org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory + + + - - - - - - server0-connector - - - - - - + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + - - - - - - - - - - - + + + + ${udp-address:231.7.7.7} + 9876 + 100 + netty-connector + + + + + ${udp-address:231.7.7.7} + 9876 + 10000 + + + + + +
jms
+ netty-connector + 500 + 5 + true + true + 1 + + + + + + + + + + server0-connector + + + + + + + + + + + + + + + + + + + + diff --git a/examples/jms/scale-down/src/main/resources/activemq/server1/activemq-jms.xml b/examples/jms/scale-down/src/main/resources/activemq/server1/activemq-jms.xml deleted file mode 100644 index 8ca9fd6e26..0000000000 --- a/examples/jms/scale-down/src/main/resources/activemq/server1/activemq-jms.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/scale-down/src/main/resources/activemq/server1/activemq-roles.properties b/examples/jms/scale-down/src/main/resources/activemq/server1/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/scale-down/src/main/resources/activemq/server1/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/scale-down/src/main/resources/activemq/server1/activemq-users.properties b/examples/jms/scale-down/src/main/resources/activemq/server1/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/scale-down/src/main/resources/activemq/server1/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/scale-down/src/main/resources/activemq/server1/activemq-users.xml b/examples/jms/scale-down/src/main/resources/activemq/server1/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/examples/jms/scale-down/src/main/resources/activemq/server1/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/scheduled-message/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/scheduled-message/src/main/resources/activemq/server0/activemq-configuration.xml index 9f7ef1c0f8..bb8c2d13cb 100644 --- a/examples/jms/scheduled-message/src/main/resources/activemq/server0/activemq-configuration.xml +++ b/examples/jms/scheduled-message/src/main/resources/activemq/server0/activemq-configuration.xml @@ -18,37 +18,45 @@ specific language governing permissions and limitations under the License. --> - + - ${build.directory}/server0/data/messaging/bindings + + + + - ${build.directory}/server0/data/messaging/journal + - ${build.directory}/server0/data/messaging/largemessages + ${build.directory}/server0/data/messaging/bindings - ${build.directory}/server0/data/messaging/paging - - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + ${build.directory}/server0/data/messaging/journal - + ${build.directory}/server0/data/messaging/largemessages - - - - - - - - - - - - + ${build.directory}/server0/data/messaging/paging + + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + + + + + + + + + + + + + + + + diff --git a/examples/jms/scheduled-message/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/scheduled-message/src/main/resources/activemq/server0/activemq-jms.xml deleted file mode 100644 index 8ca9fd6e26..0000000000 --- a/examples/jms/scheduled-message/src/main/resources/activemq/server0/activemq-jms.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/scheduled-message/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/scheduled-message/src/main/resources/activemq/server0/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/scheduled-message/src/main/resources/activemq/server0/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/scheduled-message/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/scheduled-message/src/main/resources/activemq/server0/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/scheduled-message/src/main/resources/activemq/server0/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/scheduled-message/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/scheduled-message/src/main/resources/activemq/server0/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/examples/jms/scheduled-message/src/main/resources/activemq/server0/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/security/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/security/src/main/resources/activemq/server0/activemq-configuration.xml index 9929b4961a..79fa52f005 100644 --- a/examples/jms/security/src/main/resources/activemq/server0/activemq-configuration.xml +++ b/examples/jms/security/src/main/resources/activemq/server0/activemq-configuration.xml @@ -18,55 +18,66 @@ specific language governing permissions and limitations under the License. --> - + - ${build.directory}/server0/data/messaging/bindings + + - ${build.directory}/server0/data/messaging/journal + - ${build.directory}/server0/data/messaging/largemessages + + - ${build.directory}/server0/data/messaging/paging - - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + - + ${build.directory}/server0/data/messaging/bindings - - - - - - - - - - + ${build.directory}/server0/data/messaging/journal - - - - - - - - + ${build.directory}/server0/data/messaging/largemessages - - - - - - - - - - + ${build.directory}/server0/data/messaging/paging + + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/jms/security/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/security/src/main/resources/activemq/server0/activemq-jms.xml deleted file mode 100644 index 39741326b3..0000000000 --- a/examples/jms/security/src/main/resources/activemq/server0/activemq-jms.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - diff --git a/examples/jms/security/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/security/src/main/resources/activemq/server0/activemq-roles.properties new file mode 100644 index 0000000000..09b3f5d841 --- /dev/null +++ b/examples/jms/security/src/main/resources/activemq/server0/activemq-roles.properties @@ -0,0 +1,20 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +bill=user +andrew=europe-user,user +frank=us-user,news-user,user +sam=news-user,user \ No newline at end of file diff --git a/examples/jms/security/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/security/src/main/resources/activemq/server0/activemq-users.properties new file mode 100644 index 0000000000..0a206c6053 --- /dev/null +++ b/examples/jms/security/src/main/resources/activemq/server0/activemq-users.properties @@ -0,0 +1,20 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +bill=activemq +andrew=activemq1 +frank=activemq2 +sam=activemq3 \ No newline at end of file diff --git a/examples/jms/security/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/security/src/main/resources/activemq/server0/activemq-users.xml deleted file mode 100644 index 10d923b254..0000000000 --- a/examples/jms/security/src/main/resources/activemq/server0/activemq-users.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/examples/jms/send-acknowledgements/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/send-acknowledgements/src/main/resources/activemq/server0/activemq-configuration.xml index 69def3b435..bb8c2d13cb 100644 --- a/examples/jms/send-acknowledgements/src/main/resources/activemq/server0/activemq-configuration.xml +++ b/examples/jms/send-acknowledgements/src/main/resources/activemq/server0/activemq-configuration.xml @@ -18,37 +18,45 @@ specific language governing permissions and limitations under the License. --> - + - ${build.directory}/server0/data/messaging/bindings + + + + - ${build.directory}/server0/data/messaging/journal + - ${build.directory}/server0/data/messaging/largemessages + ${build.directory}/server0/data/messaging/bindings - ${build.directory}/server0/data/messaging/paging - - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + ${build.directory}/server0/data/messaging/journal - + ${build.directory}/server0/data/messaging/largemessages - - - - - - - - - - - + ${build.directory}/server0/data/messaging/paging + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + + + + + + + + + + + + + + + + diff --git a/examples/jms/send-acknowledgements/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/send-acknowledgements/src/main/resources/activemq/server0/activemq-jms.xml deleted file mode 100644 index 8ca9fd6e26..0000000000 --- a/examples/jms/send-acknowledgements/src/main/resources/activemq/server0/activemq-jms.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/send-acknowledgements/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/send-acknowledgements/src/main/resources/activemq/server0/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/send-acknowledgements/src/main/resources/activemq/server0/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/send-acknowledgements/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/send-acknowledgements/src/main/resources/activemq/server0/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/send-acknowledgements/src/main/resources/activemq/server0/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/send-acknowledgements/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/send-acknowledgements/src/main/resources/activemq/server0/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/examples/jms/send-acknowledgements/src/main/resources/activemq/server0/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/spring-integration/src/main/resources/activemq-configuration.xml b/examples/jms/spring-integration/src/main/resources/activemq-configuration.xml index b30cf114fd..5524d10cca 100644 --- a/examples/jms/spring-integration/src/main/resources/activemq-configuration.xml +++ b/examples/jms/spring-integration/src/main/resources/activemq-configuration.xml @@ -18,30 +18,38 @@ specific language governing permissions and limitations under the License. --> - + - false + + + + - - + + + false + + + org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory - - + + - + - - - + + + - - + + + diff --git a/examples/jms/spring-integration/src/main/resources/activemq-jms.xml b/examples/jms/spring-integration/src/main/resources/activemq-jms.xml deleted file mode 100644 index db274847bb..0000000000 --- a/examples/jms/spring-integration/src/main/resources/activemq-jms.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/spring-integration/src/main/resources/activemq-roles.properties b/examples/jms/spring-integration/src/main/resources/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/spring-integration/src/main/resources/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/spring-integration/src/main/resources/activemq-users.properties b/examples/jms/spring-integration/src/main/resources/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/spring-integration/src/main/resources/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/spring-integration/src/main/resources/activemq-users.xml b/examples/jms/spring-integration/src/main/resources/activemq-users.xml deleted file mode 100644 index eb938c0874..0000000000 --- a/examples/jms/spring-integration/src/main/resources/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/ssl-enabled/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/ssl-enabled/src/main/resources/activemq/server0/activemq-configuration.xml index b933b05698..d5398a63cc 100644 --- a/examples/jms/ssl-enabled/src/main/resources/activemq/server0/activemq-configuration.xml +++ b/examples/jms/ssl-enabled/src/main/resources/activemq/server0/activemq-configuration.xml @@ -18,42 +18,50 @@ specific language governing permissions and limitations under the License. --> - + - ${build.directory}/server0/data/messaging/bindings + + + + - ${build.directory}/server0/data/messaging/journal + - ${build.directory}/server0/data/messaging/largemessages + ${build.directory}/server0/data/messaging/bindings - ${build.directory}/server0/data/messaging/paging - - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - - - - - - + ${build.directory}/server0/data/messaging/journal - + ${build.directory}/server0/data/messaging/largemessages - - - - - - - - - - - - + ${build.directory}/server0/data/messaging/paging + + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/jms/ssl-enabled/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/ssl-enabled/src/main/resources/activemq/server0/activemq-jms.xml deleted file mode 100644 index 8ca9fd6e26..0000000000 --- a/examples/jms/ssl-enabled/src/main/resources/activemq/server0/activemq-jms.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/ssl-enabled/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/ssl-enabled/src/main/resources/activemq/server0/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/ssl-enabled/src/main/resources/activemq/server0/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/ssl-enabled/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/ssl-enabled/src/main/resources/activemq/server0/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/ssl-enabled/src/main/resources/activemq/server0/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/ssl-enabled/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/ssl-enabled/src/main/resources/activemq/server0/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/examples/jms/ssl-enabled/src/main/resources/activemq/server0/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/static-selector-jms/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/static-selector-jms/src/main/resources/activemq/server0/activemq-configuration.xml index 9f7ef1c0f8..1a12151a23 100644 --- a/examples/jms/static-selector-jms/src/main/resources/activemq/server0/activemq-configuration.xml +++ b/examples/jms/static-selector-jms/src/main/resources/activemq/server0/activemq-configuration.xml @@ -18,37 +18,47 @@ specific language governing permissions and limitations under the License. --> - + - ${build.directory}/server0/data/messaging/bindings + + + + + + - ${build.directory}/server0/data/messaging/journal + - ${build.directory}/server0/data/messaging/largemessages + ${build.directory}/server0/data/messaging/bindings - ${build.directory}/server0/data/messaging/paging - - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + ${build.directory}/server0/data/messaging/journal - + ${build.directory}/server0/data/messaging/largemessages - - - - - - - - - - - - + ${build.directory}/server0/data/messaging/paging + + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + + + + + + + + + + + + + + + + diff --git a/examples/jms/static-selector-jms/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/static-selector-jms/src/main/resources/activemq/server0/activemq-jms.xml deleted file mode 100644 index 1afc172ad3..0000000000 --- a/examples/jms/static-selector-jms/src/main/resources/activemq/server0/activemq-jms.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - diff --git a/examples/jms/static-selector-jms/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/static-selector-jms/src/main/resources/activemq/server0/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/static-selector-jms/src/main/resources/activemq/server0/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/static-selector-jms/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/static-selector-jms/src/main/resources/activemq/server0/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/static-selector-jms/src/main/resources/activemq/server0/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/static-selector-jms/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/static-selector-jms/src/main/resources/activemq/server0/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/examples/jms/static-selector-jms/src/main/resources/activemq/server0/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/static-selector/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/static-selector/src/main/resources/activemq/server0/activemq-configuration.xml index a99d4e99cd..3c3142b177 100644 --- a/examples/jms/static-selector/src/main/resources/activemq/server0/activemq-configuration.xml +++ b/examples/jms/static-selector/src/main/resources/activemq/server0/activemq-configuration.xml @@ -18,44 +18,52 @@ specific language governing permissions and limitations under the License. --> - + - ${build.directory}/server0/data/messaging/bindings + + + + - ${build.directory}/server0/data/messaging/journal + - ${build.directory}/server0/data/messaging/largemessages + ${build.directory}/server0/data/messaging/bindings - ${build.directory}/server0/data/messaging/paging - - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + ${build.directory}/server0/data/messaging/journal - - -
jms.queue.exampleQueue
- - - + ${build.directory}/server0/data/messaging/largemessages - + ${build.directory}/server0/data/messaging/paging - - - - - - - - - - - - + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + + + +
jms.queue.exampleQueue
+ + + + + + + + + + + + + + + + + + + diff --git a/examples/jms/static-selector/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/static-selector/src/main/resources/activemq/server0/activemq-jms.xml deleted file mode 100644 index 8ca9fd6e26..0000000000 --- a/examples/jms/static-selector/src/main/resources/activemq/server0/activemq-jms.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/static-selector/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/static-selector/src/main/resources/activemq/server0/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/static-selector/src/main/resources/activemq/server0/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/static-selector/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/static-selector/src/main/resources/activemq/server0/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/static-selector/src/main/resources/activemq/server0/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/static-selector/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/static-selector/src/main/resources/activemq/server0/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/examples/jms/static-selector/src/main/resources/activemq/server0/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/stomp-websockets/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/stomp-websockets/src/main/resources/activemq/server0/activemq-configuration.xml index d2218f5100..763b86d5ca 100644 --- a/examples/jms/stomp-websockets/src/main/resources/activemq/server0/activemq-configuration.xml +++ b/examples/jms/stomp-websockets/src/main/resources/activemq/server0/activemq-configuration.xml @@ -18,44 +18,52 @@ specific language governing permissions and limitations under the License. --> - + - ${build.directory}/server0/data/messaging/bindings + + + + - ${build.directory}/server0/data/messaging/journal + - ${build.directory}/server0/data/messaging/largemessages + ${build.directory}/server0/data/messaging/bindings - ${build.directory}/server0/data/messaging/paging - - - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - - + ${build.directory}/server0/data/messaging/journal - + ${build.directory}/server0/data/messaging/largemessages - - - - - - - - - - - + ${build.directory}/server0/data/messaging/paging + + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + + + + + + + + + + + + + + + + + diff --git a/examples/jms/stomp-websockets/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/stomp-websockets/src/main/resources/activemq/server0/activemq-jms.xml deleted file mode 100644 index 237c92b5ba..0000000000 --- a/examples/jms/stomp-websockets/src/main/resources/activemq/server0/activemq-jms.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/stomp-websockets/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/stomp-websockets/src/main/resources/activemq/server0/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/stomp-websockets/src/main/resources/activemq/server0/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/stomp-websockets/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/stomp-websockets/src/main/resources/activemq/server0/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/stomp-websockets/src/main/resources/activemq/server0/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/stomp-websockets/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/stomp-websockets/src/main/resources/activemq/server0/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/examples/jms/stomp-websockets/src/main/resources/activemq/server0/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/stomp/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/stomp/src/main/resources/activemq/server0/activemq-configuration.xml index 366c877b5a..0158f024a2 100644 --- a/examples/jms/stomp/src/main/resources/activemq/server0/activemq-configuration.xml +++ b/examples/jms/stomp/src/main/resources/activemq/server0/activemq-configuration.xml @@ -18,45 +18,53 @@ specific language governing permissions and limitations under the License. --> - + - ${build.directory}/server0/data/messaging/bindings + + + + - ${build.directory}/server0/data/messaging/journal + - ${build.directory}/server0/data/messaging/largemessages + ${build.directory}/server0/data/messaging/bindings - ${build.directory}/server0/data/messaging/paging - - - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - - - + ${build.directory}/server0/data/messaging/journal - + ${build.directory}/server0/data/messaging/largemessages - - - - - - - - - - - + ${build.directory}/server0/data/messaging/paging + + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + + + + + + + + + + + + + + + + + + diff --git a/examples/jms/stomp/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/stomp/src/main/resources/activemq/server0/activemq-jms.xml deleted file mode 100644 index 8ca9fd6e26..0000000000 --- a/examples/jms/stomp/src/main/resources/activemq/server0/activemq-jms.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/stomp/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/stomp/src/main/resources/activemq/server0/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/stomp/src/main/resources/activemq/server0/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/stomp/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/stomp/src/main/resources/activemq/server0/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/stomp/src/main/resources/activemq/server0/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/stomp/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/stomp/src/main/resources/activemq/server0/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/examples/jms/stomp/src/main/resources/activemq/server0/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/stomp1.1/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/stomp1.1/src/main/resources/activemq/server0/activemq-configuration.xml index 366c877b5a..0158f024a2 100644 --- a/examples/jms/stomp1.1/src/main/resources/activemq/server0/activemq-configuration.xml +++ b/examples/jms/stomp1.1/src/main/resources/activemq/server0/activemq-configuration.xml @@ -18,45 +18,53 @@ specific language governing permissions and limitations under the License. --> - + - ${build.directory}/server0/data/messaging/bindings + + + + - ${build.directory}/server0/data/messaging/journal + - ${build.directory}/server0/data/messaging/largemessages + ${build.directory}/server0/data/messaging/bindings - ${build.directory}/server0/data/messaging/paging - - - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - - - + ${build.directory}/server0/data/messaging/journal - + ${build.directory}/server0/data/messaging/largemessages - - - - - - - - - - - + ${build.directory}/server0/data/messaging/paging + + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + + + + + + + + + + + + + + + + + + diff --git a/examples/jms/stomp1.1/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/stomp1.1/src/main/resources/activemq/server0/activemq-jms.xml deleted file mode 100644 index 8ca9fd6e26..0000000000 --- a/examples/jms/stomp1.1/src/main/resources/activemq/server0/activemq-jms.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/stomp1.1/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/stomp1.1/src/main/resources/activemq/server0/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/stomp1.1/src/main/resources/activemq/server0/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/stomp1.1/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/stomp1.1/src/main/resources/activemq/server0/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/stomp1.1/src/main/resources/activemq/server0/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/stomp1.1/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/stomp1.1/src/main/resources/activemq/server0/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/examples/jms/stomp1.1/src/main/resources/activemq/server0/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/stomp1.2/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/stomp1.2/src/main/resources/activemq/server0/activemq-configuration.xml index 366c877b5a..0158f024a2 100644 --- a/examples/jms/stomp1.2/src/main/resources/activemq/server0/activemq-configuration.xml +++ b/examples/jms/stomp1.2/src/main/resources/activemq/server0/activemq-configuration.xml @@ -18,45 +18,53 @@ specific language governing permissions and limitations under the License. --> - + - ${build.directory}/server0/data/messaging/bindings + + + + - ${build.directory}/server0/data/messaging/journal + - ${build.directory}/server0/data/messaging/largemessages + ${build.directory}/server0/data/messaging/bindings - ${build.directory}/server0/data/messaging/paging - - - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - - - + ${build.directory}/server0/data/messaging/journal - + ${build.directory}/server0/data/messaging/largemessages - - - - - - - - - - - + ${build.directory}/server0/data/messaging/paging + + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + + + + + + + + + + + + + + + + + + diff --git a/examples/jms/stomp1.2/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/stomp1.2/src/main/resources/activemq/server0/activemq-jms.xml deleted file mode 100644 index 8ca9fd6e26..0000000000 --- a/examples/jms/stomp1.2/src/main/resources/activemq/server0/activemq-jms.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/stomp1.2/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/stomp1.2/src/main/resources/activemq/server0/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/stomp1.2/src/main/resources/activemq/server0/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/stomp1.2/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/stomp1.2/src/main/resources/activemq/server0/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/stomp1.2/src/main/resources/activemq/server0/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/stomp1.2/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/stomp1.2/src/main/resources/activemq/server0/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/examples/jms/stomp1.2/src/main/resources/activemq/server0/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/stop-server-failover/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/stop-server-failover/src/main/resources/activemq/server0/activemq-configuration.xml index ce50a22a90..aee53471d7 100644 --- a/examples/jms/stop-server-failover/src/main/resources/activemq/server0/activemq-configuration.xml +++ b/examples/jms/stop-server-failover/src/main/resources/activemq/server0/activemq-configuration.xml @@ -18,75 +18,83 @@ specific language governing permissions and limitations under the License. --> - + - ${build.directory}/server0/data/messaging/bindings + + + + - ${build.directory}/server0/data/messaging/journal + - ${build.directory}/server0/data/messaging/largemessages + ${build.directory}/server0/data/messaging/bindings - ${build.directory}/server0/data/messaging/paging + ${build.directory}/server0/data/messaging/journal - - - - - - - - - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - - + ${build.directory}/server0/data/messaging/largemessages - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - - + ${build.directory}/server0/data/messaging/paging - - - ${udp-address:231.7.7.7} - 9876 - 1000 - netty-connector - - + + + + + - - - ${udp-address:231.7.7.7} - 9876 - 60000 - - + + + + org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory + + + - - -
jms
- netty-connector - - - + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + - - - - - - - - - - - + + + ${udp-address:231.7.7.7} + 9876 + 1000 + netty-connector + + + + + ${udp-address:231.7.7.7} + 9876 + 60000 + + + + + +
jms
+ netty-connector + + + + + + + + + + + + + + + + + diff --git a/examples/jms/stop-server-failover/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/stop-server-failover/src/main/resources/activemq/server0/activemq-jms.xml deleted file mode 100644 index 8ca9fd6e26..0000000000 --- a/examples/jms/stop-server-failover/src/main/resources/activemq/server0/activemq-jms.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/stop-server-failover/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/stop-server-failover/src/main/resources/activemq/server0/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/stop-server-failover/src/main/resources/activemq/server0/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/stop-server-failover/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/stop-server-failover/src/main/resources/activemq/server0/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/stop-server-failover/src/main/resources/activemq/server0/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/stop-server-failover/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/stop-server-failover/src/main/resources/activemq/server0/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/examples/jms/stop-server-failover/src/main/resources/activemq/server0/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/stop-server-failover/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/stop-server-failover/src/main/resources/activemq/server1/activemq-configuration.xml index b160ad111b..e72361cb9e 100644 --- a/examples/jms/stop-server-failover/src/main/resources/activemq/server1/activemq-configuration.xml +++ b/examples/jms/stop-server-failover/src/main/resources/activemq/server1/activemq-configuration.xml @@ -18,75 +18,83 @@ specific language governing permissions and limitations under the License. --> - + - ${build.directory}/server0/data/messaging/bindings + + + + - ${build.directory}/server0/data/messaging/journal + - ${build.directory}/server0/data/messaging/largemessages + ${build.directory}/server0/data/messaging/bindings - ${build.directory}/server0/data/messaging/paging + ${build.directory}/server0/data/messaging/journal - - - - - - - - - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - - - - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - - + ${build.directory}/server0/data/messaging/largemessages - - - ${udp-address:231.7.7.7} - 9876 - 1000 - netty-connector - - + ${build.directory}/server0/data/messaging/paging - - - ${udp-address:231.7.7.7} - 9876 - 60000 - - + + + + + - - -
jms
- netty-connector - - - + + + + org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory + + + - - - - - - - - - - - - + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + + + + + ${udp-address:231.7.7.7} + 9876 + 1000 + netty-connector + + + + + + ${udp-address:231.7.7.7} + 9876 + 60000 + + + + + +
jms
+ netty-connector + + + + + + + + + + + + + + + + + diff --git a/examples/jms/stop-server-failover/src/main/resources/activemq/server1/activemq-jms.xml b/examples/jms/stop-server-failover/src/main/resources/activemq/server1/activemq-jms.xml deleted file mode 100644 index 8ca9fd6e26..0000000000 --- a/examples/jms/stop-server-failover/src/main/resources/activemq/server1/activemq-jms.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/stop-server-failover/src/main/resources/activemq/server1/activemq-roles.properties b/examples/jms/stop-server-failover/src/main/resources/activemq/server1/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/stop-server-failover/src/main/resources/activemq/server1/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/stop-server-failover/src/main/resources/activemq/server1/activemq-users.properties b/examples/jms/stop-server-failover/src/main/resources/activemq/server1/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/stop-server-failover/src/main/resources/activemq/server1/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/stop-server-failover/src/main/resources/activemq/server1/activemq-users.xml b/examples/jms/stop-server-failover/src/main/resources/activemq/server1/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/examples/jms/stop-server-failover/src/main/resources/activemq/server1/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/symmetric-cluster/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/symmetric-cluster/src/main/resources/activemq/server0/activemq-configuration.xml index 55cef58ff5..5847fdfb8c 100644 --- a/examples/jms/symmetric-cluster/src/main/resources/activemq/server0/activemq-configuration.xml +++ b/examples/jms/symmetric-cluster/src/main/resources/activemq/server0/activemq-configuration.xml @@ -18,81 +18,89 @@ specific language governing permissions and limitations under the License. --> - + - + + - ${build.directory}/server0/data/messaging/bindings + + - ${build.directory}/server0/data/messaging/journal - - ${build.directory}/server0/data/messaging/largemessages - - ${build.directory}/server0/data/messaging/paging + - + ${build.directory}/server0/data/messaging/bindings - - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - + ${build.directory}/server0/data/messaging/journal - - - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - - - - - - - ${udp-address:231.7.7.7} - 9876 - 100 - netty-connector - - - - - - ${udp-address:231.7.7.7} - 9876 - 10000 - - - - - -
jms
- netty-connector - 500 - true - false - 1 - - - - - + ${build.directory}/server0/data/messaging/largemessages - - - - - - - - - - - + ${build.directory}/server0/data/messaging/paging + + + + + + org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory + + + + + + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + + + + + + ${udp-address:231.7.7.7} + 9876 + 100 + netty-connector + + + + + + ${udp-address:231.7.7.7} + 9876 + 10000 + + + + + +
jms
+ netty-connector + 500 + true + false + 1 + + + + + + + + + + + + + + + + + + + diff --git a/examples/jms/symmetric-cluster/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/symmetric-cluster/src/main/resources/activemq/server0/activemq-jms.xml deleted file mode 100644 index 442a7bcdc5..0000000000 --- a/examples/jms/symmetric-cluster/src/main/resources/activemq/server0/activemq-jms.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - diff --git a/examples/jms/symmetric-cluster/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/symmetric-cluster/src/main/resources/activemq/server0/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/symmetric-cluster/src/main/resources/activemq/server0/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/symmetric-cluster/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/symmetric-cluster/src/main/resources/activemq/server0/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/symmetric-cluster/src/main/resources/activemq/server0/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/symmetric-cluster/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/symmetric-cluster/src/main/resources/activemq/server0/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/examples/jms/symmetric-cluster/src/main/resources/activemq/server0/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/symmetric-cluster/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/symmetric-cluster/src/main/resources/activemq/server1/activemq-configuration.xml index 625bba0433..410c96d580 100644 --- a/examples/jms/symmetric-cluster/src/main/resources/activemq/server1/activemq-configuration.xml +++ b/examples/jms/symmetric-cluster/src/main/resources/activemq/server1/activemq-configuration.xml @@ -18,79 +18,87 @@ specific language governing permissions and limitations under the License. --> - + - + + - ${build.directory}/server1/data/messaging/bindings + + - ${build.directory}/server1/data/messaging/journal + - ${build.directory}/server1/data/messaging/largemessages - ${build.directory}/server1/data/messaging/paging + ${build.directory}/server1/data/messaging/bindings - - - - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - - - - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - - - - - - - ${udp-address:231.7.7.7} - 9876 - 100 - netty-connector - - - - - - ${udp-address:231.7.7.7} - 9876 - 10000 - - - - - -
jms
- netty-connector - 500 - true - false - 1 - - - - - + ${build.directory}/server1/data/messaging/journal - - - - - - - - - - - + ${build.directory}/server1/data/messaging/largemessages + ${build.directory}/server1/data/messaging/paging + + + + + + org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory + + + + + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + + + + + + ${udp-address:231.7.7.7} + 9876 + 100 + netty-connector + + + + + + ${udp-address:231.7.7.7} + 9876 + 10000 + + + + + +
jms
+ netty-connector + 500 + true + false + 1 + + + + + + + + + + + + + + + + + + + diff --git a/examples/jms/symmetric-cluster/src/main/resources/activemq/server1/activemq-jms.xml b/examples/jms/symmetric-cluster/src/main/resources/activemq/server1/activemq-jms.xml deleted file mode 100644 index 63c534303f..0000000000 --- a/examples/jms/symmetric-cluster/src/main/resources/activemq/server1/activemq-jms.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - diff --git a/examples/jms/symmetric-cluster/src/main/resources/activemq/server1/activemq-roles.properties b/examples/jms/symmetric-cluster/src/main/resources/activemq/server1/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/symmetric-cluster/src/main/resources/activemq/server1/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/symmetric-cluster/src/main/resources/activemq/server1/activemq-users.properties b/examples/jms/symmetric-cluster/src/main/resources/activemq/server1/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/symmetric-cluster/src/main/resources/activemq/server1/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/symmetric-cluster/src/main/resources/activemq/server1/activemq-users.xml b/examples/jms/symmetric-cluster/src/main/resources/activemq/server1/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/examples/jms/symmetric-cluster/src/main/resources/activemq/server1/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/symmetric-cluster/src/main/resources/activemq/server2/activemq-configuration.xml b/examples/jms/symmetric-cluster/src/main/resources/activemq/server2/activemq-configuration.xml index 15abdab9ff..9b7d175fbc 100644 --- a/examples/jms/symmetric-cluster/src/main/resources/activemq/server2/activemq-configuration.xml +++ b/examples/jms/symmetric-cluster/src/main/resources/activemq/server2/activemq-configuration.xml @@ -18,79 +18,87 @@ specific language governing permissions and limitations under the License. --> - + - + + - ${build.directory}/server2/data/messaging/bindings + + - ${build.directory}/server2/data/messaging/journal + - ${build.directory}/server2/data/messaging/largemessages - ${build.directory}/server2/data/messaging/paging + ${build.directory}/server2/data/messaging/bindings - - - - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - - - - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - - - - - - - ${udp-address:231.7.7.7} - 9876 - 100 - netty-connector - - - - - - ${udp-address:231.7.7.7} - 9876 - 10000 - - - - - -
jms
- netty-connector - 500 - true - false - 1 - - - - - + ${build.directory}/server2/data/messaging/journal - - - - - - - - - - - + ${build.directory}/server2/data/messaging/largemessages + ${build.directory}/server2/data/messaging/paging + + + + + + org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory + + + + + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + + + + + + ${udp-address:231.7.7.7} + 9876 + 100 + netty-connector + + + + + + ${udp-address:231.7.7.7} + 9876 + 10000 + + + + + +
jms
+ netty-connector + 500 + true + false + 1 + + + + + + + + + + + + + + + + + + + diff --git a/examples/jms/symmetric-cluster/src/main/resources/activemq/server2/activemq-jms.xml b/examples/jms/symmetric-cluster/src/main/resources/activemq/server2/activemq-jms.xml deleted file mode 100644 index 63c534303f..0000000000 --- a/examples/jms/symmetric-cluster/src/main/resources/activemq/server2/activemq-jms.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - diff --git a/examples/jms/symmetric-cluster/src/main/resources/activemq/server2/activemq-roles.properties b/examples/jms/symmetric-cluster/src/main/resources/activemq/server2/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/symmetric-cluster/src/main/resources/activemq/server2/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/symmetric-cluster/src/main/resources/activemq/server2/activemq-users.properties b/examples/jms/symmetric-cluster/src/main/resources/activemq/server2/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/symmetric-cluster/src/main/resources/activemq/server2/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/symmetric-cluster/src/main/resources/activemq/server2/activemq-users.xml b/examples/jms/symmetric-cluster/src/main/resources/activemq/server2/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/examples/jms/symmetric-cluster/src/main/resources/activemq/server2/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/symmetric-cluster/src/main/resources/activemq/server3/activemq-configuration.xml b/examples/jms/symmetric-cluster/src/main/resources/activemq/server3/activemq-configuration.xml index fe81249fa5..abb7e818bf 100644 --- a/examples/jms/symmetric-cluster/src/main/resources/activemq/server3/activemq-configuration.xml +++ b/examples/jms/symmetric-cluster/src/main/resources/activemq/server3/activemq-configuration.xml @@ -18,79 +18,87 @@ specific language governing permissions and limitations under the License. --> - + - + + - ${build.directory}/server3/data/messaging/bindings + + - ${build.directory}/server3/data/messaging/journal + - ${build.directory}/server3/data/messaging/largemessages - ${build.directory}/server3/data/messaging/paging + ${build.directory}/server3/data/messaging/bindings - + ${build.directory}/server3/data/messaging/journal - - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - - - - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - - - - - - - ${udp-address:231.7.7.7} - 9876 - 100 - netty-connector - - - - - - ${udp-address:231.7.7.7} - 9876 - 10000 - - - - - -
jms
- netty-connector - 500 - true - false - 1 - - - - - + ${build.directory}/server3/data/messaging/largemessages - - - - - - - - - - - - + ${build.directory}/server3/data/messaging/paging + + + + + + org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory + + + + + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + + + + + + ${udp-address:231.7.7.7} + 9876 + 100 + netty-connector + + + + + + ${udp-address:231.7.7.7} + 9876 + 10000 + + + + + +
jms
+ netty-connector + 500 + true + false + 1 + + + + + + + + + + + + + + + + + + + diff --git a/examples/jms/symmetric-cluster/src/main/resources/activemq/server3/activemq-jms.xml b/examples/jms/symmetric-cluster/src/main/resources/activemq/server3/activemq-jms.xml deleted file mode 100644 index 63c534303f..0000000000 --- a/examples/jms/symmetric-cluster/src/main/resources/activemq/server3/activemq-jms.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - diff --git a/examples/jms/symmetric-cluster/src/main/resources/activemq/server3/activemq-roles.properties b/examples/jms/symmetric-cluster/src/main/resources/activemq/server3/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/symmetric-cluster/src/main/resources/activemq/server3/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/symmetric-cluster/src/main/resources/activemq/server3/activemq-users.properties b/examples/jms/symmetric-cluster/src/main/resources/activemq/server3/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/symmetric-cluster/src/main/resources/activemq/server3/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/symmetric-cluster/src/main/resources/activemq/server3/activemq-users.xml b/examples/jms/symmetric-cluster/src/main/resources/activemq/server3/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/examples/jms/symmetric-cluster/src/main/resources/activemq/server3/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/symmetric-cluster/src/main/resources/activemq/server4/activemq-configuration.xml b/examples/jms/symmetric-cluster/src/main/resources/activemq/server4/activemq-configuration.xml index 54b6a9cbfd..8f7c05af31 100644 --- a/examples/jms/symmetric-cluster/src/main/resources/activemq/server4/activemq-configuration.xml +++ b/examples/jms/symmetric-cluster/src/main/resources/activemq/server4/activemq-configuration.xml @@ -18,78 +18,86 @@ specific language governing permissions and limitations under the License. --> - + - + + - ${build.directory}/server4/data/messaging/bindings + + - ${build.directory}/server4/data/messaging/journal + - ${build.directory}/server4/data/messaging/largemessages - ${build.directory}/server4/data/messaging/paging + ${build.directory}/server4/data/messaging/bindings - - - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - - - - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - - - - - - - ${udp-address:231.7.7.7} - 9876 - 100 - netty-connector - - - - - - ${udp-address:231.7.7.7} - 9876 - 10000 - - - - - -
jms
- netty-connector - 500 - true - false - 1 - - - - - + ${build.directory}/server4/data/messaging/journal - - - - - - - - - - - - + ${build.directory}/server4/data/messaging/largemessages + + ${build.directory}/server4/data/messaging/paging + + + + + org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory + + + + + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + + + + + + ${udp-address:231.7.7.7} + 9876 + 100 + netty-connector + + + + + + ${udp-address:231.7.7.7} + 9876 + 10000 + + + + + +
jms
+ netty-connector + 500 + true + false + 1 + + + + + + + + + + + + + + + + + + + diff --git a/examples/jms/symmetric-cluster/src/main/resources/activemq/server4/activemq-jms.xml b/examples/jms/symmetric-cluster/src/main/resources/activemq/server4/activemq-jms.xml deleted file mode 100644 index 63c534303f..0000000000 --- a/examples/jms/symmetric-cluster/src/main/resources/activemq/server4/activemq-jms.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - diff --git a/examples/jms/symmetric-cluster/src/main/resources/activemq/server4/activemq-roles.properties b/examples/jms/symmetric-cluster/src/main/resources/activemq/server4/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/symmetric-cluster/src/main/resources/activemq/server4/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/symmetric-cluster/src/main/resources/activemq/server4/activemq-users.properties b/examples/jms/symmetric-cluster/src/main/resources/activemq/server4/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/symmetric-cluster/src/main/resources/activemq/server4/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/symmetric-cluster/src/main/resources/activemq/server4/activemq-users.xml b/examples/jms/symmetric-cluster/src/main/resources/activemq/server4/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/examples/jms/symmetric-cluster/src/main/resources/activemq/server4/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/symmetric-cluster/src/main/resources/activemq/server5/activemq-configuration.xml b/examples/jms/symmetric-cluster/src/main/resources/activemq/server5/activemq-configuration.xml index 3871258af8..319b51dadd 100644 --- a/examples/jms/symmetric-cluster/src/main/resources/activemq/server5/activemq-configuration.xml +++ b/examples/jms/symmetric-cluster/src/main/resources/activemq/server5/activemq-configuration.xml @@ -18,78 +18,86 @@ specific language governing permissions and limitations under the License. --> - + - + + - ${build.directory}/server5/data/messaging/bindings + + - ${build.directory}/server5/data/messaging/journal + - ${build.directory}/server5/data/messaging/largemessages - ${build.directory}/server5/data/messaging/paging + ${build.directory}/server5/data/messaging/bindings - - - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - - - - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - - - - - - - ${udp-address:231.7.7.7} - 9876 - 100 - netty-connector - - - - - - ${udp-address:231.7.7.7} - 9876 - 10000 - - - - - -
jms
- netty-connector - 500 - true - false - 1 - - - - - + ${build.directory}/server5/data/messaging/journal - - - - - - - - - - - - + ${build.directory}/server5/data/messaging/largemessages + + ${build.directory}/server5/data/messaging/paging + + + + + org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory + + + + + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + + + + + + ${udp-address:231.7.7.7} + 9876 + 100 + netty-connector + + + + + + ${udp-address:231.7.7.7} + 9876 + 10000 + + + + + +
jms
+ netty-connector + 500 + true + false + 1 + + + + + + + + + + + + + + + + + + + diff --git a/examples/jms/symmetric-cluster/src/main/resources/activemq/server5/activemq-jms.xml b/examples/jms/symmetric-cluster/src/main/resources/activemq/server5/activemq-jms.xml deleted file mode 100644 index 63c534303f..0000000000 --- a/examples/jms/symmetric-cluster/src/main/resources/activemq/server5/activemq-jms.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - diff --git a/examples/jms/symmetric-cluster/src/main/resources/activemq/server5/activemq-roles.properties b/examples/jms/symmetric-cluster/src/main/resources/activemq/server5/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/symmetric-cluster/src/main/resources/activemq/server5/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/symmetric-cluster/src/main/resources/activemq/server5/activemq-users.properties b/examples/jms/symmetric-cluster/src/main/resources/activemq/server5/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/symmetric-cluster/src/main/resources/activemq/server5/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/symmetric-cluster/src/main/resources/activemq/server5/activemq-users.xml b/examples/jms/symmetric-cluster/src/main/resources/activemq/server5/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/examples/jms/symmetric-cluster/src/main/resources/activemq/server5/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/temp-queue/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/temp-queue/src/main/resources/activemq/server0/activemq-configuration.xml index e5f672dab8..f0da9a7f7d 100644 --- a/examples/jms/temp-queue/src/main/resources/activemq/server0/activemq-configuration.xml +++ b/examples/jms/temp-queue/src/main/resources/activemq/server0/activemq-configuration.xml @@ -18,53 +18,61 @@ specific language governing permissions and limitations under the License. --> - + - ${build.directory}/server0/data/messaging/bindings + + + + - ${build.directory}/server0/data/messaging/journal + - ${build.directory}/server0/data/messaging/largemessages + ${build.directory}/server0/data/messaging/bindings - ${build.directory}/server0/data/messaging/paging + ${build.directory}/server0/data/messaging/journal + + ${build.directory}/server0/data/messaging/largemessages + + ${build.directory}/server0/data/messaging/paging - - - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - - - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + + + + org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory + + - + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + diff --git a/examples/jms/temp-queue/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/temp-queue/src/main/resources/activemq/server0/activemq-jms.xml deleted file mode 100644 index 00015460b3..0000000000 --- a/examples/jms/temp-queue/src/main/resources/activemq/server0/activemq-jms.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/temp-queue/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/temp-queue/src/main/resources/activemq/server0/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/temp-queue/src/main/resources/activemq/server0/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/temp-queue/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/temp-queue/src/main/resources/activemq/server0/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/temp-queue/src/main/resources/activemq/server0/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/temp-queue/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/temp-queue/src/main/resources/activemq/server0/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/examples/jms/temp-queue/src/main/resources/activemq/server0/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/topic-hierarchies/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/topic-hierarchies/src/main/resources/activemq/server0/activemq-configuration.xml index 041227e357..040919bd99 100644 --- a/examples/jms/topic-hierarchies/src/main/resources/activemq/server0/activemq-configuration.xml +++ b/examples/jms/topic-hierarchies/src/main/resources/activemq/server0/activemq-configuration.xml @@ -18,37 +18,56 @@ specific language governing permissions and limitations under the License. --> - + - ${build.directory}/server0/data/messaging/bindings + + - ${build.directory}/server0/data/messaging/journal + - ${build.directory}/server0/data/messaging/largemessages + - ${build.directory}/server0/data/messaging/paging + - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + - + - - - - - - - - - - - + + + + + ${build.directory}/server0/data/messaging/bindings + + ${build.directory}/server0/data/messaging/journal + + ${build.directory}/server0/data/messaging/largemessages + + ${build.directory}/server0/data/messaging/paging + + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + + + + + + + + + + + + + + + + diff --git a/examples/jms/topic-hierarchies/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/topic-hierarchies/src/main/resources/activemq/server0/activemq-jms.xml deleted file mode 100644 index 2843c5f3cf..0000000000 --- a/examples/jms/topic-hierarchies/src/main/resources/activemq/server0/activemq-jms.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/examples/jms/topic-hierarchies/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/topic-hierarchies/src/main/resources/activemq/server0/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/topic-hierarchies/src/main/resources/activemq/server0/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/topic-hierarchies/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/topic-hierarchies/src/main/resources/activemq/server0/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/topic-hierarchies/src/main/resources/activemq/server0/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/topic-hierarchies/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/topic-hierarchies/src/main/resources/activemq/server0/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/examples/jms/topic-hierarchies/src/main/resources/activemq/server0/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/topic-selector-example1/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/topic-selector-example1/src/main/resources/activemq/server0/activemq-configuration.xml index 8d32f1a405..841da43cc8 100644 --- a/examples/jms/topic-selector-example1/src/main/resources/activemq/server0/activemq-configuration.xml +++ b/examples/jms/topic-selector-example1/src/main/resources/activemq/server0/activemq-configuration.xml @@ -18,37 +18,45 @@ specific language governing permissions and limitations under the License. --> - + - ${build.directory}/server0/data/messaging/bindings + + + + - ${build.directory}/server0/data/messaging/journal + - ${build.directory}/server0/data/messaging/largemessages + ${build.directory}/server0/data/messaging/bindings - ${build.directory}/server0/data/messaging/paging - - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + ${build.directory}/server0/data/messaging/journal - + ${build.directory}/server0/data/messaging/largemessages - - - - - - - - - - - - + ${build.directory}/server0/data/messaging/paging + + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + + + + + + + + + + + + + + + + diff --git a/examples/jms/topic-selector-example1/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/topic-selector-example1/src/main/resources/activemq/server0/activemq-jms.xml deleted file mode 100644 index 96bdc27d76..0000000000 --- a/examples/jms/topic-selector-example1/src/main/resources/activemq/server0/activemq-jms.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/topic-selector-example1/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/topic-selector-example1/src/main/resources/activemq/server0/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/topic-selector-example1/src/main/resources/activemq/server0/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/topic-selector-example1/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/topic-selector-example1/src/main/resources/activemq/server0/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/topic-selector-example1/src/main/resources/activemq/server0/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/topic-selector-example1/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/topic-selector-example1/src/main/resources/activemq/server0/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/examples/jms/topic-selector-example1/src/main/resources/activemq/server0/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/topic-selector-example2/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/topic-selector-example2/src/main/resources/activemq/server0/activemq-configuration.xml index 8d32f1a405..841da43cc8 100644 --- a/examples/jms/topic-selector-example2/src/main/resources/activemq/server0/activemq-configuration.xml +++ b/examples/jms/topic-selector-example2/src/main/resources/activemq/server0/activemq-configuration.xml @@ -18,37 +18,45 @@ specific language governing permissions and limitations under the License. --> - + - ${build.directory}/server0/data/messaging/bindings + + + + - ${build.directory}/server0/data/messaging/journal + - ${build.directory}/server0/data/messaging/largemessages + ${build.directory}/server0/data/messaging/bindings - ${build.directory}/server0/data/messaging/paging - - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + ${build.directory}/server0/data/messaging/journal - + ${build.directory}/server0/data/messaging/largemessages - - - - - - - - - - - - + ${build.directory}/server0/data/messaging/paging + + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + + + + + + + + + + + + + + + + diff --git a/examples/jms/topic-selector-example2/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/topic-selector-example2/src/main/resources/activemq/server0/activemq-jms.xml deleted file mode 100644 index 96bdc27d76..0000000000 --- a/examples/jms/topic-selector-example2/src/main/resources/activemq/server0/activemq-jms.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/topic-selector-example2/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/topic-selector-example2/src/main/resources/activemq/server0/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/topic-selector-example2/src/main/resources/activemq/server0/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/topic-selector-example2/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/topic-selector-example2/src/main/resources/activemq/server0/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/topic-selector-example2/src/main/resources/activemq/server0/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/topic-selector-example2/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/topic-selector-example2/src/main/resources/activemq/server0/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/examples/jms/topic-selector-example2/src/main/resources/activemq/server0/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/topic/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/topic/src/main/resources/activemq/server0/activemq-configuration.xml index 8d32f1a405..841da43cc8 100644 --- a/examples/jms/topic/src/main/resources/activemq/server0/activemq-configuration.xml +++ b/examples/jms/topic/src/main/resources/activemq/server0/activemq-configuration.xml @@ -18,37 +18,45 @@ specific language governing permissions and limitations under the License. --> - + - ${build.directory}/server0/data/messaging/bindings + + + + - ${build.directory}/server0/data/messaging/journal + - ${build.directory}/server0/data/messaging/largemessages + ${build.directory}/server0/data/messaging/bindings - ${build.directory}/server0/data/messaging/paging - - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + ${build.directory}/server0/data/messaging/journal - + ${build.directory}/server0/data/messaging/largemessages - - - - - - - - - - - - + ${build.directory}/server0/data/messaging/paging + + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + + + + + + + + + + + + + + + + diff --git a/examples/jms/topic/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/topic/src/main/resources/activemq/server0/activemq-jms.xml deleted file mode 100644 index 96bdc27d76..0000000000 --- a/examples/jms/topic/src/main/resources/activemq/server0/activemq-jms.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/topic/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/topic/src/main/resources/activemq/server0/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/topic/src/main/resources/activemq/server0/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/topic/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/topic/src/main/resources/activemq/server0/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/topic/src/main/resources/activemq/server0/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/topic/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/topic/src/main/resources/activemq/server0/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/examples/jms/topic/src/main/resources/activemq/server0/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/transaction-failover/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/transaction-failover/src/main/resources/activemq/server0/activemq-configuration.xml index 24ebec6e13..911b4b39a2 100644 --- a/examples/jms/transaction-failover/src/main/resources/activemq/server0/activemq-configuration.xml +++ b/examples/jms/transaction-failover/src/main/resources/activemq/server0/activemq-configuration.xml @@ -18,77 +18,85 @@ specific language governing permissions and limitations under the License. --> - + - ${build.directory}/server0/data/messaging/bindings + + + + - ${build.directory}/server0/data/messaging/journal + - ${build.directory}/server0/data/messaging/largemessages + ${build.directory}/server0/data/messaging/bindings - ${build.directory}/server0/data/messaging/paging + ${build.directory}/server0/data/messaging/journal - - - - - - - + ${build.directory}/server0/data/messaging/largemessages - - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - - + ${build.directory}/server0/data/messaging/paging - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - - + + + + + - - - ${udp-address:231.7.7.7} - 9876 - 1000 - netty-connector - - + - - - ${udp-address:231.7.7.7} - 9876 - 60000 - - + + + org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory + + + - - -
jms
- netty-connector - - - - + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + - - - - - - - - - - - + + + ${udp-address:231.7.7.7} + 9876 + 1000 + netty-connector + + + + + ${udp-address:231.7.7.7} + 9876 + 60000 + + + + + +
jms
+ netty-connector + + + + + + + + + + + + + + + + + + diff --git a/examples/jms/transaction-failover/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/transaction-failover/src/main/resources/activemq/server0/activemq-jms.xml deleted file mode 100644 index 8ca9fd6e26..0000000000 --- a/examples/jms/transaction-failover/src/main/resources/activemq/server0/activemq-jms.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/transaction-failover/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/transaction-failover/src/main/resources/activemq/server0/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/transaction-failover/src/main/resources/activemq/server0/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/transaction-failover/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/transaction-failover/src/main/resources/activemq/server0/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/transaction-failover/src/main/resources/activemq/server0/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/transaction-failover/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/transaction-failover/src/main/resources/activemq/server0/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/examples/jms/transaction-failover/src/main/resources/activemq/server0/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/transaction-failover/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/transaction-failover/src/main/resources/activemq/server1/activemq-configuration.xml index f24508ff33..e53b6037ed 100644 --- a/examples/jms/transaction-failover/src/main/resources/activemq/server1/activemq-configuration.xml +++ b/examples/jms/transaction-failover/src/main/resources/activemq/server1/activemq-configuration.xml @@ -18,77 +18,85 @@ specific language governing permissions and limitations under the License. --> - + - ${build.directory}/server0/data/messaging/bindings + + + + - ${build.directory}/server0/data/messaging/journal + - ${build.directory}/server0/data/messaging/largemessages + ${build.directory}/server0/data/messaging/bindings - ${build.directory}/server0/data/messaging/paging + ${build.directory}/server0/data/messaging/journal - - - - - - - - - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - - - - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - - + ${build.directory}/server0/data/messaging/largemessages - - - ${udp-address:231.7.7.7} - 9876 - 1000 - netty-connector - - + ${build.directory}/server0/data/messaging/paging - - - ${udp-address:231.7.7.7} - 9876 - 60000 - - + + + + + - - -
jms
- netty-connector - - - - - + + + + org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory + + + - - - - - - - - - - - - + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + + + + + ${udp-address:231.7.7.7} + 9876 + 1000 + netty-connector + + + + + + ${udp-address:231.7.7.7} + 9876 + 60000 + + + + + +
jms
+ netty-connector + + + + + + + + + + + + + + + + + + + diff --git a/examples/jms/transaction-failover/src/main/resources/activemq/server1/activemq-jms.xml b/examples/jms/transaction-failover/src/main/resources/activemq/server1/activemq-jms.xml deleted file mode 100644 index 8ca9fd6e26..0000000000 --- a/examples/jms/transaction-failover/src/main/resources/activemq/server1/activemq-jms.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/transaction-failover/src/main/resources/activemq/server1/activemq-roles.properties b/examples/jms/transaction-failover/src/main/resources/activemq/server1/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/transaction-failover/src/main/resources/activemq/server1/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/transaction-failover/src/main/resources/activemq/server1/activemq-users.properties b/examples/jms/transaction-failover/src/main/resources/activemq/server1/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/transaction-failover/src/main/resources/activemq/server1/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/transaction-failover/src/main/resources/activemq/server1/activemq-users.xml b/examples/jms/transaction-failover/src/main/resources/activemq/server1/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/examples/jms/transaction-failover/src/main/resources/activemq/server1/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/transactional/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/transactional/src/main/resources/activemq/server0/activemq-configuration.xml index 9f7ef1c0f8..bb8c2d13cb 100644 --- a/examples/jms/transactional/src/main/resources/activemq/server0/activemq-configuration.xml +++ b/examples/jms/transactional/src/main/resources/activemq/server0/activemq-configuration.xml @@ -18,37 +18,45 @@ specific language governing permissions and limitations under the License. --> - + - ${build.directory}/server0/data/messaging/bindings + + + + - ${build.directory}/server0/data/messaging/journal + - ${build.directory}/server0/data/messaging/largemessages + ${build.directory}/server0/data/messaging/bindings - ${build.directory}/server0/data/messaging/paging - - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + ${build.directory}/server0/data/messaging/journal - + ${build.directory}/server0/data/messaging/largemessages - - - - - - - - - - - - + ${build.directory}/server0/data/messaging/paging + + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + + + + + + + + + + + + + + + + diff --git a/examples/jms/transactional/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/transactional/src/main/resources/activemq/server0/activemq-jms.xml deleted file mode 100644 index 8ca9fd6e26..0000000000 --- a/examples/jms/transactional/src/main/resources/activemq/server0/activemq-jms.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/transactional/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/transactional/src/main/resources/activemq/server0/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/transactional/src/main/resources/activemq/server0/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/transactional/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/transactional/src/main/resources/activemq/server0/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/transactional/src/main/resources/activemq/server0/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/transactional/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/transactional/src/main/resources/activemq/server0/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/examples/jms/transactional/src/main/resources/activemq/server0/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/xa-heuristic/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/xa-heuristic/src/main/resources/activemq/server0/activemq-configuration.xml index 9f7ef1c0f8..bb8c2d13cb 100644 --- a/examples/jms/xa-heuristic/src/main/resources/activemq/server0/activemq-configuration.xml +++ b/examples/jms/xa-heuristic/src/main/resources/activemq/server0/activemq-configuration.xml @@ -18,37 +18,45 @@ specific language governing permissions and limitations under the License. --> - + - ${build.directory}/server0/data/messaging/bindings + + + + - ${build.directory}/server0/data/messaging/journal + - ${build.directory}/server0/data/messaging/largemessages + ${build.directory}/server0/data/messaging/bindings - ${build.directory}/server0/data/messaging/paging - - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + ${build.directory}/server0/data/messaging/journal - + ${build.directory}/server0/data/messaging/largemessages - - - - - - - - - - - - + ${build.directory}/server0/data/messaging/paging + + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + + + + + + + + + + + + + + + + diff --git a/examples/jms/xa-heuristic/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/xa-heuristic/src/main/resources/activemq/server0/activemq-jms.xml deleted file mode 100644 index 8ca9fd6e26..0000000000 --- a/examples/jms/xa-heuristic/src/main/resources/activemq/server0/activemq-jms.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/xa-heuristic/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/xa-heuristic/src/main/resources/activemq/server0/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/xa-heuristic/src/main/resources/activemq/server0/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/xa-heuristic/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/xa-heuristic/src/main/resources/activemq/server0/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/xa-heuristic/src/main/resources/activemq/server0/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/xa-heuristic/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/xa-heuristic/src/main/resources/activemq/server0/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/examples/jms/xa-heuristic/src/main/resources/activemq/server0/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/xa-receive/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/xa-receive/src/main/resources/activemq/server0/activemq-configuration.xml index 9f7ef1c0f8..bb8c2d13cb 100644 --- a/examples/jms/xa-receive/src/main/resources/activemq/server0/activemq-configuration.xml +++ b/examples/jms/xa-receive/src/main/resources/activemq/server0/activemq-configuration.xml @@ -18,37 +18,45 @@ specific language governing permissions and limitations under the License. --> - + - ${build.directory}/server0/data/messaging/bindings + + + + - ${build.directory}/server0/data/messaging/journal + - ${build.directory}/server0/data/messaging/largemessages + ${build.directory}/server0/data/messaging/bindings - ${build.directory}/server0/data/messaging/paging - - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + ${build.directory}/server0/data/messaging/journal - + ${build.directory}/server0/data/messaging/largemessages - - - - - - - - - - - - + ${build.directory}/server0/data/messaging/paging + + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + + + + + + + + + + + + + + + + diff --git a/examples/jms/xa-receive/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/xa-receive/src/main/resources/activemq/server0/activemq-jms.xml deleted file mode 100644 index 8ca9fd6e26..0000000000 --- a/examples/jms/xa-receive/src/main/resources/activemq/server0/activemq-jms.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/xa-receive/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/xa-receive/src/main/resources/activemq/server0/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/xa-receive/src/main/resources/activemq/server0/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/xa-receive/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/xa-receive/src/main/resources/activemq/server0/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/xa-receive/src/main/resources/activemq/server0/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/xa-receive/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/xa-receive/src/main/resources/activemq/server0/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/examples/jms/xa-receive/src/main/resources/activemq/server0/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/xa-send/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/xa-send/src/main/resources/activemq/server0/activemq-configuration.xml index 9f7ef1c0f8..bb8c2d13cb 100644 --- a/examples/jms/xa-send/src/main/resources/activemq/server0/activemq-configuration.xml +++ b/examples/jms/xa-send/src/main/resources/activemq/server0/activemq-configuration.xml @@ -18,37 +18,45 @@ specific language governing permissions and limitations under the License. --> - + - ${build.directory}/server0/data/messaging/bindings + + + + - ${build.directory}/server0/data/messaging/journal + - ${build.directory}/server0/data/messaging/largemessages + ${build.directory}/server0/data/messaging/bindings - ${build.directory}/server0/data/messaging/paging - - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + ${build.directory}/server0/data/messaging/journal - + ${build.directory}/server0/data/messaging/largemessages - - - - - - - - - - - - + ${build.directory}/server0/data/messaging/paging + + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + + + + + + + + + + + + + + + + diff --git a/examples/jms/xa-send/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/xa-send/src/main/resources/activemq/server0/activemq-jms.xml deleted file mode 100644 index 8ca9fd6e26..0000000000 --- a/examples/jms/xa-send/src/main/resources/activemq/server0/activemq-jms.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - diff --git a/examples/jms/xa-send/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/xa-send/src/main/resources/activemq/server0/activemq-roles.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/xa-send/src/main/resources/activemq/server0/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/xa-send/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/xa-send/src/main/resources/activemq/server0/activemq-users.properties new file mode 100644 index 0000000000..4e2d44cec4 --- /dev/null +++ b/examples/jms/xa-send/src/main/resources/activemq/server0/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file diff --git a/examples/jms/xa-send/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/xa-send/src/main/resources/activemq/server0/activemq-users.xml deleted file mode 100644 index f63079de03..0000000000 --- a/examples/jms/xa-send/src/main/resources/activemq/server0/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/examples/soak/normal/server0/activemq-configuration.xml b/examples/soak/normal/server0/activemq-configuration.xml index 0c2bf2d743..a8d5536c09 100644 --- a/examples/soak/normal/server0/activemq-configuration.xml +++ b/examples/soak/normal/server0/activemq-configuration.xml @@ -20,39 +20,43 @@ under the License. + xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd"> + + + + + + + org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory + + + + + + - - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - - - - - - - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - - - - - - - false - - false - - 30000 - - - -
soakAddress
- - + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + + + + + + false + + false + + 30000 + + + +
soakAddress
+ + + diff --git a/examples/soak/normal/server0/activemq-jms.xml b/examples/soak/normal/server0/activemq-jms.xml deleted file mode 100644 index 14a6558580..0000000000 --- a/examples/soak/normal/server0/activemq-jms.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/InterceptorTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/InterceptorTest.java index 1f0aaca579..3395e61802 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/InterceptorTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/InterceptorTest.java @@ -41,6 +41,7 @@ import org.apache.activemq.core.protocol.core.impl.wireformat.SessionSendMessage import org.apache.activemq.core.server.ActiveMQServer; import org.apache.activemq.core.server.ServerMessage; import org.apache.activemq.spi.core.protocol.RemotingConnection; +import org.apache.activemq.spi.core.security.ActiveMQSecurityManagerImpl; import org.apache.activemq.tests.util.ServiceTestBase; import org.junit.Assert; import org.junit.Before; @@ -485,8 +486,9 @@ public class InterceptorTest extends ServiceTestBase { SimpleString ANOTHER_QUEUE = QUEUE.concat("another"); - server.getSecurityManager().addUser("dumb", "dumber"); - server.getSecurityManager().addUser("an", "other"); + ActiveMQSecurityManagerImpl securityManager = (ActiveMQSecurityManagerImpl) server.getSecurityManager(); + securityManager.getConfiguration().addUser("dumb", "dumber"); + securityManager.getConfiguration().addUser("an", "other"); server.getRemotingService().addIncomingInterceptor(new InterceptUserOnCreateQueue()); @@ -540,9 +542,9 @@ public class InterceptorTest extends ServiceTestBase @Test public void testInterceptUsernameOnConsumer() throws Exception { - - server.getSecurityManager().addUser("dumb", "dumber"); - server.getSecurityManager().addUser("an", "other"); + ActiveMQSecurityManagerImpl securityManager = (ActiveMQSecurityManagerImpl) server.getSecurityManager(); + securityManager.getConfiguration().addUser("dumb", "dumber"); + securityManager.getConfiguration().addUser("an", "other"); server.getRemotingService().addIncomingInterceptor(new InterceptUserOnCreateConsumer()); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/AutoCreateJmsQueueTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/AutoCreateJmsQueueTest.java index f76d631675..975f53592e 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/AutoCreateJmsQueueTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/AutoCreateJmsQueueTest.java @@ -32,6 +32,7 @@ import org.apache.activemq.api.core.SimpleString; import org.apache.activemq.api.jms.ActiveMQJMSClient; import org.apache.activemq.core.security.Role; import org.apache.activemq.core.server.Queue; +import org.apache.activemq.spi.core.security.ActiveMQSecurityManagerImpl; import org.apache.activemq.tests.util.JMSTestBase; import org.junit.Assert; import org.junit.Before; @@ -77,9 +78,9 @@ public class AutoCreateJmsQueueTest extends JMSTestBase @Test public void testAutoCreateOnSendToQueueSecurity() throws Exception { - server.getSecurityManager().addUser("guest", "guest"); - server.getSecurityManager().setDefaultUser("guest"); - server.getSecurityManager().addRole("guest", "rejectAll"); + ((ActiveMQSecurityManagerImpl)server.getSecurityManager()).getConfiguration().addUser("guest", "guest"); + ((ActiveMQSecurityManagerImpl)server.getSecurityManager()).getConfiguration().setDefaultUser("guest"); + ((ActiveMQSecurityManagerImpl)server.getSecurityManager()).getConfiguration().addRole("guest", "rejectAll"); Role role = new Role("rejectAll", false, false, false, false, false, false, false); Set roles = new HashSet(); roles.add(role); @@ -171,9 +172,9 @@ public class AutoCreateJmsQueueTest extends JMSTestBase public void setUp() throws Exception { super.setUp(); - server.getSecurityManager().addUser("guest", "guest"); - server.getSecurityManager().setDefaultUser("guest"); - server.getSecurityManager().addRole("guest", "allowAll"); + ((ActiveMQSecurityManagerImpl)server.getSecurityManager()).getConfiguration().addUser("guest", "guest"); + ((ActiveMQSecurityManagerImpl)server.getSecurityManager()).getConfiguration().setDefaultUser("guest"); + ((ActiveMQSecurityManagerImpl)server.getSecurityManager()).getConfiguration().addRole("guest", "allowAll"); Role role = new Role("allowAll", true, true, true, true, true, true, true); Set roles = new HashSet(); roles.add(role); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/SecurityFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/SecurityFailoverTest.java index 82500d594e..cf9c99702f 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/SecurityFailoverTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/SecurityFailoverTest.java @@ -26,7 +26,7 @@ import org.apache.activemq.core.config.ha.SharedStoreMasterPolicyConfiguration; import org.apache.activemq.core.config.ha.SharedStoreSlavePolicyConfiguration; import org.apache.activemq.core.security.Role; import org.apache.activemq.core.server.impl.InVMNodeManager; -import org.apache.activemq.spi.core.security.ActiveMQSecurityManager; +import org.apache.activemq.spi.core.security.ActiveMQSecurityManagerImpl; import org.apache.activemq.tests.integration.cluster.util.TestableServer; /** @@ -112,8 +112,8 @@ public class SecurityFailoverTest extends FailoverTest .addClusterConfiguration(basicClusterConnectionConfig(backupConnector.getName(), liveConnector.getName())); backupServer = createTestableServer(backupConfig); - ActiveMQSecurityManager securityManager = installSecurity(backupServer); - securityManager.setDefaultUser(null); + ActiveMQSecurityManagerImpl securityManager = installSecurity(backupServer); + securityManager.getConfiguration().setDefaultUser(null); liveConfig = super.createDefaultConfig() .clearAcceptorConfigurations() @@ -137,15 +137,15 @@ public class SecurityFailoverTest extends FailoverTest /** * @return */ - protected ActiveMQSecurityManager installSecurity(TestableServer server) + protected ActiveMQSecurityManagerImpl installSecurity(TestableServer server) { - ActiveMQSecurityManager securityManager = server.getServer().getSecurityManager(); - securityManager.addUser("a", "b"); + ActiveMQSecurityManagerImpl securityManager = (ActiveMQSecurityManagerImpl) server.getServer().getSecurityManager(); + securityManager.getConfiguration().addUser("a", "b"); Role role = new Role("arole", true, true, true, true, true, true, true); Set roles = new HashSet(); roles.add(role); server.getServer().getSecurityRepository().addMatch("#", roles); - securityManager.addRole("a", "arole"); + securityManager.getConfiguration().addRole("a", "arole"); return securityManager; } } diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/core/deployers/impl/QueueDeployerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/core/deployers/impl/QueueDeployerTest.java deleted file mode 100644 index fb847c9dd1..0000000000 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/core/deployers/impl/QueueDeployerTest.java +++ /dev/null @@ -1,96 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.activemq.tests.integration.core.deployers.impl; -import org.junit.Before; - -import org.junit.Test; - -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.core.deployers.DeploymentManager; -import org.apache.activemq.core.deployers.impl.FileDeploymentManager; -import org.apache.activemq.core.deployers.impl.QueueDeployer; -import org.apache.activemq.core.postoffice.Binding; -import org.apache.activemq.core.postoffice.Bindings; -import org.apache.activemq.core.postoffice.impl.LocalQueueBinding; -import org.apache.activemq.core.server.ActiveMQServer; -import org.apache.activemq.tests.util.ServiceTestBase; -import org.w3c.dom.Element; -import org.w3c.dom.NodeList; - -/** - * A QueueDeployerTest - * - * @author Jeff Mesnil - * - */ -public class QueueDeployerTest extends ServiceTestBase -{ - - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - private QueueDeployer deployer; - - private ActiveMQServer server; - - @Test - public void testParseQueueConfiguration() throws Exception - { - String xml = "" - + " " - + " " - + "
bar
" - + " " - + " false" - + " " - + " " - + ""; - - Element rootNode = org.apache.activemq.utils.XMLUtil.stringToElement(xml); - deployer.validate(rootNode); - NodeList queueNodes = rootNode.getElementsByTagName("queue"); - assertEquals(1, queueNodes.getLength()); - deployer.deploy(queueNodes.item(0)); - - Bindings bindings = server.getPostOffice().getBindingsForAddress(SimpleString.toSimpleString("bar")); - assertEquals(1, bindings.getBindings().size()); - Binding binding = bindings.getBindings().iterator().next(); - assertTrue(binding instanceof LocalQueueBinding); - LocalQueueBinding queueBinding = (LocalQueueBinding)binding; - - assertEquals("foo", queueBinding.getQueue().getName().toString()); - assertEquals("speed > 88", queueBinding.getQueue().getFilter().getFilterString().toString()); - assertEquals(false, queueBinding.getQueue().isDurable()); - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - @Override - @Before - public void setUp() throws Exception - { - super.setUp(); - - server = createServer(true); - DeploymentManager deploymentManager = new FileDeploymentManager(500); - deployer = new QueueDeployer(deploymentManager, server); - server.start(); - } -} diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/JMSSecurityTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/JMSSecurityTest.java index 50c6263833..9713a83d80 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/JMSSecurityTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/JMSSecurityTest.java @@ -22,6 +22,7 @@ import javax.jms.JMSSecurityRuntimeException; import javax.jms.QueueConnection; import javax.jms.QueueConnectionFactory; +import org.apache.activemq.spi.core.security.ActiveMQSecurityManagerImpl; import org.apache.activemq.tests.util.JMSTestBase; import org.junit.Before; import org.junit.Test; @@ -48,8 +49,8 @@ public class JMSSecurityTest extends JMSTestBase @Test public void testSecurityOnJMSContext() throws Exception { - - server.getSecurityManager().addUser("IDo", "Exist"); + ActiveMQSecurityManagerImpl securityManager = (ActiveMQSecurityManagerImpl) server.getSecurityManager(); + securityManager.getConfiguration().addUser("IDo", "Exist"); try { JMSContext ctx = cf.createContext("Idont", "exist"); @@ -66,8 +67,8 @@ public class JMSSecurityTest extends JMSTestBase @Test public void testCreateQueueConnection() throws Exception { - - server.getSecurityManager().addUser("IDo", "Exist"); + ActiveMQSecurityManagerImpl securityManager = (ActiveMQSecurityManagerImpl) server.getSecurityManager(); + securityManager.getConfiguration().addUser("IDo", "Exist"); try { QueueConnection queueC = ((QueueConnectionFactory)cf).createQueueConnection("IDont", "Exist"); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/JMSServerDeployerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/JMSServerDeployerTest.java index ba003405cf..c3b3de3602 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/JMSServerDeployerTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/JMSServerDeployerTest.java @@ -24,13 +24,10 @@ import org.apache.activemq.api.core.DiscoveryGroupConfiguration; import org.apache.activemq.api.core.TransportConfiguration; import org.apache.activemq.api.core.UDPBroadcastGroupConfiguration; import org.apache.activemq.core.config.Configuration; -import org.apache.activemq.core.deployers.DeploymentManager; -import org.apache.activemq.core.deployers.impl.FileDeploymentManager; import org.apache.activemq.core.registry.JndiBindingRegistry; import org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory; import org.apache.activemq.core.server.ActiveMQServer; import org.apache.activemq.jms.server.JMSServerManager; -import org.apache.activemq.jms.server.impl.JMSServerDeployer; import org.apache.activemq.jms.server.impl.JMSServerManagerImpl; import org.apache.activemq.tests.integration.IntegrationTestLogger; import org.apache.activemq.tests.unit.util.InVMNamingContext; @@ -39,7 +36,6 @@ import org.junit.After; import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import org.w3c.dom.Element; /** * A JMSServerDeployerTest @@ -62,23 +58,10 @@ public class JMSServerDeployerTest extends ServiceTestBase private Context context; - private DeploymentManager deploymentManager; - private Configuration config; // Public -------------------------------------------------------- - @Test - public void testValidateEmptyConfiguration() throws Exception - { - JMSServerDeployer deployer = new JMSServerDeployer(jmsServer, deploymentManager); - - String xml = " " + ""; - - Element rootNode = org.apache.activemq.utils.XMLUtil.stringToElement(xml); - deployer.validate(rootNode); - } - @Test public void testDeployUnusualQueueNames() throws Exception { @@ -154,8 +137,6 @@ public class JMSServerDeployerTest extends ServiceTestBase ActiveMQServer server = createServer(false, config); - deploymentManager = new FileDeploymentManager(config.getFileDeployerScanPeriod()); - jmsServer = new JMSServerManagerImpl(server); context = new InVMNamingContext(); jmsServer.setRegistry(new JndiBindingRegistry(context)); @@ -169,7 +150,6 @@ public class JMSServerDeployerTest extends ServiceTestBase jmsServer.stop(); jmsServer = null; context = null; - deploymentManager = null; config = null; super.tearDown(); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/JMSServerStartStopTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/JMSServerStartStopTest.java index 01815e7c1f..3d303b77ab 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/JMSServerStartStopTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/JMSServerStartStopTest.java @@ -28,11 +28,13 @@ import java.util.Set; import org.apache.activemq.api.core.TransportConfiguration; import org.apache.activemq.api.jms.ActiveMQJMSClient; import org.apache.activemq.api.jms.JMSFactoryType; +import org.apache.activemq.core.config.FileDeploymentManager; import org.apache.activemq.core.config.impl.FileConfiguration; import org.apache.activemq.core.server.ActiveMQServer; import org.apache.activemq.core.server.impl.ActiveMQServerImpl; import org.apache.activemq.jms.client.ActiveMQConnectionFactory; import org.apache.activemq.jms.server.JMSServerManager; +import org.apache.activemq.jms.server.config.impl.FileJMSConfiguration; import org.apache.activemq.jms.server.impl.JMSServerManagerImpl; import org.apache.activemq.spi.core.security.ActiveMQSecurityManager; import org.apache.activemq.spi.core.security.ActiveMQSecurityManagerImpl; @@ -196,9 +198,12 @@ public class JMSServerStartStopTest extends UnitTestCase private void start() throws Exception { - FileConfiguration fc = new FileConfiguration("server-start-stop-config1.xml"); - - fc.start(); + FileConfiguration fc = new FileConfiguration(); + FileJMSConfiguration fileConfiguration = new FileJMSConfiguration(); + FileDeploymentManager deploymentManager = new FileDeploymentManager("server-start-stop-config1.xml"); + deploymentManager.addDeployable(fc); + deploymentManager.addDeployable(fileConfiguration); + deploymentManager.readConfiguration(); fc.setJournalDirectory(getJournalDir()); fc.setBindingsDirectory(getBindingsDir()); @@ -208,7 +213,7 @@ public class JMSServerStartStopTest extends UnitTestCase ActiveMQServer liveServer = addServer(new ActiveMQServerImpl(fc, sm)); - liveJMSServer = new JMSServerManagerImpl(liveServer, "server-start-stop-jms-config1.xml"); + liveJMSServer = new JMSServerManagerImpl(liveServer, fileConfiguration); addActiveMQComponent(liveJMSServer); liveJMSServer.setRegistry(null); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/config/JMSServerConfigParserTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/config/JMSServerConfigParserTest.java index 0957a31897..81ac3cf068 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/config/JMSServerConfigParserTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/config/JMSServerConfigParserTest.java @@ -16,18 +16,14 @@ */ package org.apache.activemq.tests.integration.jms.server.config; +import org.apache.activemq.core.config.FileDeploymentManager; +import org.apache.activemq.jms.server.config.impl.FileJMSConfiguration; import org.junit.Test; -import java.io.InputStream; -import java.net.URL; - import org.apache.activemq.api.core.TransportConfiguration; import org.apache.activemq.core.config.Configuration; -import org.apache.activemq.jms.server.JMSServerConfigParser; -import org.apache.activemq.jms.server.config.JMSConfiguration; import org.apache.activemq.jms.server.config.JMSQueueConfiguration; import org.apache.activemq.jms.server.config.TopicConfiguration; -import org.apache.activemq.jms.server.impl.JMSServerConfigParserImpl; import org.apache.activemq.tests.util.ServiceTestBase; /** @@ -58,15 +54,12 @@ public class JMSServerConfigParserTest extends ServiceTestBase // anything so the parsing will work .addConnectorConfiguration("netty", new TransportConfiguration()); - JMSServerConfigParser parser = new JMSServerConfigParserImpl(); - String conf = "activemq-jms-for-JMSServerDeployerTest.xml"; - URL confURL = Thread.currentThread().getContextClassLoader().getResource(conf); - InputStream stream = confURL.openStream(); - - JMSConfiguration jmsconfig = parser.parseConfiguration(stream); - stream.close(); + FileJMSConfiguration jmsconfig = new FileJMSConfiguration(); + FileDeploymentManager deploymentManager = new FileDeploymentManager(conf); + deploymentManager.addDeployable(jmsconfig); + deploymentManager.readConfiguration(); assertEquals(1, jmsconfig.getQueueConfigurations().size()); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSQueueControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSQueueControlTest.java index 4f94ee4ea2..52711fc043 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSQueueControlTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSQueueControlTest.java @@ -1322,8 +1322,7 @@ public class JMSQueueControlTest extends ManagementTestBase super.setUp(); Configuration conf = createBasicConfig() - .addAcceptorConfiguration(new TransportConfiguration(INVM_ACCEPTOR_FACTORY)) - .setFileDeploymentEnabled(false); + .addAcceptorConfiguration(new TransportConfiguration(INVM_ACCEPTOR_FACTORY)); server = createServer(this.getName().contains("WithRealData"), conf, mbeanServer); serverManager = new JMSServerManagerImpl(server); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/SecurityManagementWithConfiguredAdminUserTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/SecurityManagementWithConfiguredAdminUserTest.java index 411ad8623a..09978fe952 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/SecurityManagementWithConfiguredAdminUserTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/SecurityManagementWithConfiguredAdminUserTest.java @@ -98,12 +98,12 @@ public class SecurityManagementWithConfiguredAdminUserTest extends SecurityManag server.start(); HierarchicalRepository> securityRepository = server.getSecurityRepository(); ActiveMQSecurityManagerImpl securityManager = (ActiveMQSecurityManagerImpl)server.getSecurityManager(); - securityManager.addUser(validAdminUser, validAdminPassword); - securityManager.addUser(invalidAdminUser, invalidAdminPassword); + securityManager.getConfiguration().addUser(validAdminUser, validAdminPassword); + securityManager.getConfiguration().addUser(invalidAdminUser, invalidAdminPassword); - securityManager.addRole(validAdminUser, "admin"); - securityManager.addRole(validAdminUser, "guest"); - securityManager.addRole(invalidAdminUser, "guest"); + securityManager.getConfiguration().addRole(validAdminUser, "admin"); + securityManager.getConfiguration().addRole(validAdminUser, "guest"); + securityManager.getConfiguration().addRole(invalidAdminUser, "guest"); Set adminRole = securityRepository.getMatch(ActiveMQDefaultConfiguration.getDefaultManagementAddress().toString()); adminRole.add(new Role("admin", true, true, true, true, true, true, true)); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/SecurityNotificationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/SecurityNotificationTest.java index ba8509baf2..27acad03d2 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/SecurityNotificationTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/SecurityNotificationTest.java @@ -16,6 +16,7 @@ */ package org.apache.activemq.tests.integration.management; import org.apache.activemq.api.core.ActiveMQException; +import org.apache.activemq.spi.core.security.ActiveMQSecurityManagerImpl; import org.junit.Before; import org.junit.After; @@ -45,7 +46,6 @@ import org.apache.activemq.core.security.CheckType; import org.apache.activemq.core.security.Role; import org.apache.activemq.core.server.ActiveMQServer; import org.apache.activemq.core.server.ActiveMQServers; -import org.apache.activemq.spi.core.security.ActiveMQSecurityManager; import org.apache.activemq.tests.util.RandomUtil; import org.apache.activemq.tests.util.UnitTestCase; @@ -112,8 +112,8 @@ public class SecurityNotificationTest extends UnitTestCase Set roles = new HashSet(); roles.add(role); server.getSecurityRepository().addMatch(address.toString(), roles); - ActiveMQSecurityManager securityManager = server.getSecurityManager(); - securityManager.addRole("guest", "roleCanNotCreateQueue"); + ActiveMQSecurityManagerImpl securityManager = (ActiveMQSecurityManagerImpl) server.getSecurityManager(); + securityManager.getConfiguration().addRole("guest", "roleCanNotCreateQueue"); SecurityNotificationTest.flush(notifConsumer); @@ -162,10 +162,10 @@ public class SecurityNotificationTest extends UnitTestCase notifQueue = RandomUtil.randomSimpleString(); - ActiveMQSecurityManager securityManager = server.getSecurityManager(); - securityManager.addUser("admin", "admin"); - securityManager.addUser("guest", "guest"); - securityManager.setDefaultUser("guest"); + ActiveMQSecurityManagerImpl securityManager = (ActiveMQSecurityManagerImpl) server.getSecurityManager(); + securityManager.getConfiguration().addUser("admin", "admin"); + securityManager.getConfiguration().addUser("guest", "guest"); + securityManager.getConfiguration().setDefaultUser("guest"); Role role = new Role("notif", true, true, true, true, true, true, true); Set roles = new HashSet(); @@ -173,7 +173,7 @@ public class SecurityNotificationTest extends UnitTestCase server.getSecurityRepository().addMatch(ActiveMQDefaultConfiguration.getDefaultManagementNotificationAddress().toString(), roles); - securityManager.addRole("admin", "notif"); + securityManager.getConfiguration().addRole("admin", "notif"); ServerLocator locator = ActiveMQClient.createServerLocatorWithoutHA(new TransportConfiguration(UnitTestCase.INVM_CONNECTOR_FACTORY)); ClientSessionFactory sf = createSessionFactory(locator); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/OpenWireTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/OpenWireTestBase.java index 95f29e2dd5..6cd907f260 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/OpenWireTestBase.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/OpenWireTestBase.java @@ -39,6 +39,7 @@ import org.apache.activemq.core.settings.impl.AddressSettings; import org.apache.activemq.jms.server.config.ConnectionFactoryConfiguration; import org.apache.activemq.jms.server.config.impl.ConnectionFactoryConfigurationImpl; import org.apache.activemq.jms.server.impl.JMSServerManagerImpl; +import org.apache.activemq.spi.core.security.ActiveMQSecurityManagerImpl; import org.apache.activemq.tests.integration.management.ManagementControlHelper; import org.apache.activemq.tests.unit.util.InVMNamingContext; import org.apache.activemq.tests.util.ServiceTestBase; @@ -88,24 +89,25 @@ public class OpenWireTestBase extends ServiceTestBase if (enableSecurity) { - server.getSecurityManager().addRole("openwireSender", "sender"); - server.getSecurityManager().addUser("openwireSender", "SeNdEr"); + ActiveMQSecurityManagerImpl securityManager = (ActiveMQSecurityManagerImpl) server.getSecurityManager(); + securityManager.getConfiguration().addRole("openwireSender", "sender"); + securityManager.getConfiguration().addUser("openwireSender", "SeNdEr"); //sender cannot receive Role senderRole = new Role("sender", true, false, false, false, true, true, false); - server.getSecurityManager().addRole("openwireReceiver", "receiver"); - server.getSecurityManager().addUser("openwireReceiver", "ReCeIvEr"); + securityManager.getConfiguration().addRole("openwireReceiver", "receiver"); + securityManager.getConfiguration().addUser("openwireReceiver", "ReCeIvEr"); //receiver cannot send Role receiverRole = new Role("receiver", false, true, false, false, true, true, false); - server.getSecurityManager().addRole("openwireGuest", "guest"); - server.getSecurityManager().addUser("openwireGuest", "GuEsT"); + securityManager.getConfiguration().addRole("openwireGuest", "guest"); + securityManager.getConfiguration().addUser("openwireGuest", "GuEsT"); //guest cannot do anything Role guestRole = new Role("guest", false, false, false, false, false, false, false); - server.getSecurityManager().addRole("openwireDestinationManager", "manager"); - server.getSecurityManager().addUser("openwireDestinationManager", "DeStInAtIoN"); + securityManager.getConfiguration().addRole("openwireDestinationManager", "manager"); + securityManager.getConfiguration().addUser("openwireDestinationManager", "DeStInAtIoN"); //guest cannot do anything Role destRole = new Role("manager", false, false, false, false, true, true, false); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ra/ActiveMQMessageHandlerSecurityTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ra/ActiveMQMessageHandlerSecurityTest.java index a8f9236224..68e93a9f35 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ra/ActiveMQMessageHandlerSecurityTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ra/ActiveMQMessageHandlerSecurityTest.java @@ -25,6 +25,7 @@ import org.apache.activemq.core.postoffice.impl.LocalQueueBinding; import org.apache.activemq.core.security.Role; import org.apache.activemq.ra.ActiveMQResourceAdapter; import org.apache.activemq.ra.inflow.ActiveMQActivationSpec; +import org.apache.activemq.spi.core.security.ActiveMQSecurityManagerImpl; import org.junit.Test; /** @@ -67,8 +68,9 @@ public class ActiveMQMessageHandlerSecurityTest extends ActiveMQRATestBase @Test public void testSimpleMessageReceivedOnQueueWithSecuritySucceeds() throws Exception { - server.getSecurityManager().addUser("testuser", "testpassword"); - server.getSecurityManager().addRole("testuser", "arole"); + ActiveMQSecurityManagerImpl securityManager = (ActiveMQSecurityManagerImpl) server.getSecurityManager(); + securityManager.getConfiguration().addUser("testuser", "testpassword"); + securityManager.getConfiguration().addRole("testuser", "arole"); Role role = new Role("arole", false, true, false, false, false, false, false); Set roles = new HashSet(); roles.add(role); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ra/ActiveMQRAClusteredTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ra/ActiveMQRAClusteredTestBase.java index 785cadb070..b33e43d4e2 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ra/ActiveMQRAClusteredTestBase.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ra/ActiveMQRAClusteredTestBase.java @@ -85,7 +85,6 @@ public class ActiveMQRAClusteredTestBase extends ActiveMQRATestBase } ConfigurationImpl configuration = createBasicConfig(-1) - .setFileDeploymentEnabled(false) .setJMXManagementEnabled(false) .clearAcceptorConfigurations() .addAcceptorConfiguration(new TransportConfiguration(INVM_ACCEPTOR_FACTORY, invmMap)) diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ra/JMSContextTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ra/JMSContextTest.java index 92c350cb81..86d4ed0d32 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ra/JMSContextTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ra/JMSContextTest.java @@ -29,6 +29,7 @@ import org.apache.activemq.ra.ActiveMQRAConnectionFactoryImpl; import org.apache.activemq.ra.ActiveMQRAConnectionManager; import org.apache.activemq.ra.ActiveMQRAManagedConnectionFactory; import org.apache.activemq.ra.ActiveMQResourceAdapter; +import org.apache.activemq.spi.core.security.ActiveMQSecurityManagerImpl; import org.apache.activemq.tests.integration.jms.bridge.TransactionManagerLocatorImpl; import org.junit.After; import org.junit.Before; @@ -51,11 +52,12 @@ public class JMSContextTest extends ActiveMQRATestBase public void setUp() throws Exception { super.setUp(); - server.getSecurityManager().addUser("testuser", "testpassword"); - server.getSecurityManager().addUser("guest", "guest"); - server.getSecurityManager().setDefaultUser("guest"); - server.getSecurityManager().addRole("testuser", "arole"); - server.getSecurityManager().addRole("guest", "arole"); + ActiveMQSecurityManagerImpl securityManager = (ActiveMQSecurityManagerImpl) server.getSecurityManager(); + securityManager.getConfiguration().addUser("testuser", "testpassword"); + securityManager.getConfiguration().addUser("guest", "guest"); + securityManager.getConfiguration().setDefaultUser("guest"); + securityManager.getConfiguration().addRole("testuser", "arole"); + securityManager.getConfiguration().addRole("guest", "arole"); Role role = new Role("arole", true, true, true, true, true, true, true); Set roles = new HashSet(); roles.add(role); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ra/OutgoingConnectionTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ra/OutgoingConnectionTest.java index be4746b15e..8fb25bd93c 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ra/OutgoingConnectionTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ra/OutgoingConnectionTest.java @@ -55,6 +55,7 @@ import org.apache.activemq.ra.ActiveMQRASession; import org.apache.activemq.ra.ActiveMQResourceAdapter; import org.apache.activemq.service.extensions.xa.ActiveMQXAResourceWrapper; import org.apache.activemq.service.extensions.xa.ActiveMQXAResourceWrapperImpl; +import org.apache.activemq.spi.core.security.ActiveMQSecurityManagerImpl; import org.apache.activemq.utils.UUIDGenerator; import org.apache.activemq.utils.VersionLoader; import org.junit.After; @@ -85,11 +86,12 @@ public class OutgoingConnectionTest extends ActiveMQRATestBase public void setUp() throws Exception { super.setUp(); - server.getSecurityManager().addUser("testuser", "testpassword"); - server.getSecurityManager().addUser("guest", "guest"); - server.getSecurityManager().setDefaultUser("guest"); - server.getSecurityManager().addRole("testuser", "arole"); - server.getSecurityManager().addRole("guest", "arole"); + ActiveMQSecurityManagerImpl securityManager = (ActiveMQSecurityManagerImpl) server.getSecurityManager(); + securityManager.getConfiguration().addUser("testuser", "testpassword"); + securityManager.getConfiguration().addUser("guest", "guest"); + securityManager.getConfiguration().setDefaultUser("guest"); + securityManager.getConfiguration().addRole("testuser", "arole"); + securityManager.getConfiguration().addRole("guest", "arole"); Role role = new Role("arole", true, true, true, true, true, true, true); Set roles = new HashSet(); roles.add(role); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ra/OutgoingConnectionTestJTA.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ra/OutgoingConnectionTestJTA.java index c1f5798b66..2d11968c8c 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ra/OutgoingConnectionTestJTA.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ra/OutgoingConnectionTestJTA.java @@ -37,6 +37,7 @@ import org.apache.activemq.ra.ActiveMQRAConnectionFactoryImpl; import org.apache.activemq.ra.ActiveMQRAConnectionManager; import org.apache.activemq.ra.ActiveMQRAManagedConnectionFactory; import org.apache.activemq.ra.ActiveMQResourceAdapter; +import org.apache.activemq.spi.core.security.ActiveMQSecurityManagerImpl; import org.apache.activemq.tests.integration.jms.bridge.TransactionManagerLocatorImpl; import org.junit.After; import org.junit.Before; @@ -70,11 +71,11 @@ public class OutgoingConnectionTestJTA extends ActiveMQRATestBase public void setUp() throws Exception { super.setUp(); - server.getSecurityManager().addUser("testuser", "testpassword"); - server.getSecurityManager().addUser("guest", "guest"); - server.getSecurityManager().setDefaultUser("guest"); - server.getSecurityManager().addRole("testuser", "arole"); - server.getSecurityManager().addRole("guest", "arole"); + ((ActiveMQSecurityManagerImpl)server.getSecurityManager()).getConfiguration().addUser("testuser", "testpassword"); + ((ActiveMQSecurityManagerImpl)server.getSecurityManager()).getConfiguration().addUser("guest", "guest"); + ((ActiveMQSecurityManagerImpl)server.getSecurityManager()).getConfiguration().setDefaultUser("guest"); + ((ActiveMQSecurityManagerImpl)server.getSecurityManager()).getConfiguration().addRole("testuser", "arole"); + ((ActiveMQSecurityManagerImpl)server.getSecurityManager()).getConfiguration().addRole("guest", "arole"); Role role = new Role("arole", true, true, true, true, true, true, true); Set roles = new HashSet(); roles.add(role); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/security/SecurityTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/security/SecurityTest.java index edef2c8769..99b12c8de8 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/security/SecurityTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/security/SecurityTest.java @@ -46,7 +46,7 @@ import org.apache.activemq.core.security.Role; import org.apache.activemq.core.server.ActiveMQServer; import org.apache.activemq.core.server.Queue; import org.apache.activemq.core.settings.HierarchicalRepository; -import org.apache.activemq.spi.core.security.ActiveMQSecurityManager; +import org.apache.activemq.spi.core.security.ActiveMQSecurityManagerImpl; import org.apache.activemq.spi.core.security.JAASSecurityManager; import org.apache.activemq.tests.util.CreateMessage; import org.apache.activemq.tests.util.ServiceTestBase; @@ -85,9 +85,9 @@ public class SecurityTest extends ServiceTestBase public void testCreateSessionWithNullUserPass() throws Exception { ActiveMQServer server = createServer(); - ActiveMQSecurityManager securityManager = server.getSecurityManager(); - securityManager.addUser("guest", "guest"); - securityManager.setDefaultUser("guest"); + ActiveMQSecurityManagerImpl securityManager = (ActiveMQSecurityManagerImpl) server.getSecurityManager(); + securityManager.getConfiguration().addUser("guest", "guest"); + securityManager.getConfiguration().setDefaultUser("guest"); server.start(); ClientSessionFactory cf = createSessionFactory(locator); @@ -140,8 +140,8 @@ public class SecurityTest extends ServiceTestBase public void testCreateSessionWithCorrectUserWrongPass() throws Exception { ActiveMQServer server = createServer(); - ActiveMQSecurityManager securityManager = server.getSecurityManager(); - securityManager.addUser("newuser", "apass"); + ActiveMQSecurityManagerImpl securityManager = (ActiveMQSecurityManagerImpl) server.getSecurityManager(); + securityManager.getConfiguration().addUser("newuser", "apass"); server.start(); ClientSessionFactory cf = createSessionFactory(locator); @@ -164,8 +164,8 @@ public class SecurityTest extends ServiceTestBase public void testCreateSessionWithCorrectUserCorrectPass() throws Exception { ActiveMQServer server = createServer(); - ActiveMQSecurityManager securityManager = server.getSecurityManager(); - securityManager.addUser("newuser", "apass"); + ActiveMQSecurityManagerImpl securityManager = (ActiveMQSecurityManagerImpl) server.getSecurityManager(); + securityManager.getConfiguration().addUser("newuser", "apass"); server.start(); ClientSessionFactory cf = createSessionFactory(locator); @@ -187,13 +187,13 @@ public class SecurityTest extends ServiceTestBase ActiveMQServer server = createServer(); server.start(); HierarchicalRepository> securityRepository = server.getSecurityRepository(); - ActiveMQSecurityManager securityManager = server.getSecurityManager(); - securityManager.addUser("auser", "pass"); + ActiveMQSecurityManagerImpl securityManager = (ActiveMQSecurityManagerImpl) server.getSecurityManager(); + securityManager.getConfiguration().addUser("auser", "pass"); Role role = new Role("arole", false, false, true, false, false, false, false); Set roles = new HashSet(); roles.add(role); securityRepository.addMatch(SecurityTest.addressA, roles); - securityManager.addRole("auser", "arole"); + securityManager.getConfiguration().addRole("auser", "arole"); ClientSessionFactory cf = createSessionFactory(locator); ClientSession session = cf.createSession("auser", "pass", false, true, true, false, -1); session.createQueue(SecurityTest.addressA, SecurityTest.queueA, true); @@ -207,13 +207,13 @@ public class SecurityTest extends ServiceTestBase server.start(); HierarchicalRepository> securityRepository = server.getSecurityRepository(); - ActiveMQSecurityManager securityManager = server.getSecurityManager(); - securityManager.addUser("auser", "pass"); + ActiveMQSecurityManagerImpl securityManager = (ActiveMQSecurityManagerImpl) server.getSecurityManager(); + securityManager.getConfiguration().addUser("auser", "pass"); Role role = new Role("arole", false, false, false, false, false, false, false); Set roles = new HashSet(); roles.add(role); securityRepository.addMatch(SecurityTest.addressA, roles); - securityManager.addRole("auser", "arole"); + securityManager.getConfiguration().addRole("auser", "arole"); ClientSessionFactory cf = createSessionFactory(locator); ClientSession session = cf.createSession("auser", "pass", false, true, true, false, -1); try @@ -238,13 +238,13 @@ public class SecurityTest extends ServiceTestBase ActiveMQServer server = createServer(); server.start(); HierarchicalRepository> securityRepository = server.getSecurityRepository(); - ActiveMQSecurityManager securityManager = server.getSecurityManager(); - securityManager.addUser("auser", "pass"); + ActiveMQSecurityManagerImpl securityManager = (ActiveMQSecurityManagerImpl) server.getSecurityManager(); + securityManager.getConfiguration().addUser("auser", "pass"); Role role = new Role("arole", false, false, true, true, false, false, false); Set roles = new HashSet(); roles.add(role); securityRepository.addMatch(SecurityTest.addressA, roles); - securityManager.addRole("auser", "arole"); + securityManager.getConfiguration().addRole("auser", "arole"); ClientSessionFactory cf = createSessionFactory(locator); ClientSession session = cf.createSession("auser", "pass", false, true, true, false, -1); session.createQueue(SecurityTest.addressA, SecurityTest.queueA, true); @@ -258,13 +258,13 @@ public class SecurityTest extends ServiceTestBase ActiveMQServer server = createServer(); server.start(); HierarchicalRepository> securityRepository = server.getSecurityRepository(); - ActiveMQSecurityManager securityManager = server.getSecurityManager(); - securityManager.addUser("auser", "pass"); + ActiveMQSecurityManagerImpl securityManager = (ActiveMQSecurityManagerImpl) server.getSecurityManager(); + securityManager.getConfiguration().addUser("auser", "pass"); Role role = new Role("arole", false, false, true, false, false, false, false); Set roles = new HashSet(); roles.add(role); securityRepository.addMatch(SecurityTest.addressA, roles); - securityManager.addRole("auser", "arole"); + securityManager.getConfiguration().addRole("auser", "arole"); ClientSessionFactory cf = createSessionFactory(locator); ClientSession session = cf.createSession("auser", "pass", false, true, true, false, -1); session.createQueue(SecurityTest.addressA, SecurityTest.queueA, true); @@ -291,13 +291,13 @@ public class SecurityTest extends ServiceTestBase server.start(); HierarchicalRepository> securityRepository = server.getSecurityRepository(); - ActiveMQSecurityManager securityManager = server.getSecurityManager(); - securityManager.addUser("auser", "pass"); + ActiveMQSecurityManagerImpl securityManager = (ActiveMQSecurityManagerImpl) server.getSecurityManager(); + securityManager.getConfiguration().addUser("auser", "pass"); Role role = new Role("arole", false, false, false, false, true, false, false); Set roles = new HashSet(); roles.add(role); securityRepository.addMatch(SecurityTest.addressA, roles); - securityManager.addRole("auser", "arole"); + securityManager.getConfiguration().addRole("auser", "arole"); ClientSessionFactory cf = createSessionFactory(locator); ClientSession session = cf.createSession("auser", "pass", false, true, true, false, -1); session.createQueue(SecurityTest.addressA, SecurityTest.queueA, false); @@ -311,13 +311,13 @@ public class SecurityTest extends ServiceTestBase server.start(); HierarchicalRepository> securityRepository = server.getSecurityRepository(); - ActiveMQSecurityManager securityManager = server.getSecurityManager(); - securityManager.addUser("auser", "pass"); + ActiveMQSecurityManagerImpl securityManager = (ActiveMQSecurityManagerImpl) server.getSecurityManager(); + securityManager.getConfiguration().addUser("auser", "pass"); Role role = new Role("arole", false, false, false, false, false, false, false); Set roles = new HashSet(); roles.add(role); securityRepository.addMatch(SecurityTest.addressA, roles); - securityManager.addRole("auser", "arole"); + securityManager.getConfiguration().addRole("auser", "arole"); ClientSessionFactory cf = createSessionFactory(locator); ClientSession session = cf.createSession("auser", "pass", false, true, true, false, -1); try @@ -342,13 +342,13 @@ public class SecurityTest extends ServiceTestBase ActiveMQServer server = createServer(); server.start(); HierarchicalRepository> securityRepository = server.getSecurityRepository(); - ActiveMQSecurityManager securityManager = server.getSecurityManager(); - securityManager.addUser("auser", "pass"); + ActiveMQSecurityManagerImpl securityManager = (ActiveMQSecurityManagerImpl) server.getSecurityManager(); + securityManager.getConfiguration().addUser("auser", "pass"); Role role = new Role("arole", false, false, false, false, true, true, false); Set roles = new HashSet(); roles.add(role); securityRepository.addMatch(SecurityTest.addressA, roles); - securityManager.addRole("auser", "arole"); + securityManager.getConfiguration().addRole("auser", "arole"); ClientSessionFactory cf = createSessionFactory(locator); ClientSession session = cf.createSession("auser", "pass", false, true, true, false, -1); session.createQueue(SecurityTest.addressA, SecurityTest.queueA, false); @@ -362,13 +362,13 @@ public class SecurityTest extends ServiceTestBase ActiveMQServer server = createServer(); server.start(); HierarchicalRepository> securityRepository = server.getSecurityRepository(); - ActiveMQSecurityManager securityManager = server.getSecurityManager(); - securityManager.addUser("auser", "pass"); + ActiveMQSecurityManagerImpl securityManager = (ActiveMQSecurityManagerImpl) server.getSecurityManager(); + securityManager.getConfiguration().addUser("auser", "pass"); Role role = new Role("arole", false, false, false, false, true, false, false); Set roles = new HashSet(); roles.add(role); securityRepository.addMatch(SecurityTest.addressA, roles); - securityManager.addRole("auser", "arole"); + securityManager.getConfiguration().addRole("auser", "arole"); ClientSessionFactory cf = createSessionFactory(locator); ClientSession session = cf.createSession("auser", "pass", false, true, true, false, -1); session.createQueue(SecurityTest.addressA, SecurityTest.queueA, false); @@ -397,9 +397,9 @@ public class SecurityTest extends ServiceTestBase HierarchicalRepository> securityRepository = server.getSecurityRepository(); - ActiveMQSecurityManager securityManager = server.getSecurityManager(); + ActiveMQSecurityManagerImpl securityManager = (ActiveMQSecurityManagerImpl) server.getSecurityManager(); - securityManager.addUser("auser", "pass"); + securityManager.getConfiguration().addUser("auser", "pass"); Role role = new Role("arole", true, true, true, false, false, false, false); @@ -409,7 +409,7 @@ public class SecurityTest extends ServiceTestBase securityRepository.addMatch(SecurityTest.addressA, roles); - securityManager.addRole("auser", "arole"); + securityManager.getConfiguration().addRole("auser", "arole"); locator.setBlockOnNonDurableSend(true); @@ -462,13 +462,13 @@ public class SecurityTest extends ServiceTestBase server.start(); HierarchicalRepository> securityRepository = server.getSecurityRepository(); - ActiveMQSecurityManager securityManager = server.getSecurityManager(); - securityManager.addUser("auser", "pass"); + ActiveMQSecurityManagerImpl securityManager = (ActiveMQSecurityManagerImpl) server.getSecurityManager(); + securityManager.getConfiguration().addUser("auser", "pass"); Role role = new Role("arole", false, false, true, false, false, false, false); Set roles = new HashSet(); roles.add(role); securityRepository.addMatch(SecurityTest.addressA, roles); - securityManager.addRole("auser", "arole"); + securityManager.getConfiguration().addRole("auser", "arole"); locator.setBlockOnNonDurableSend(true); ClientSessionFactory cf = createSessionFactory(locator); ClientSession session = cf.createSession("auser", "pass", false, true, true, false, -1); @@ -496,13 +496,13 @@ public class SecurityTest extends ServiceTestBase server.start(); HierarchicalRepository> securityRepository = server.getSecurityRepository(); - ActiveMQSecurityManager securityManager = server.getSecurityManager(); - securityManager.addUser("auser", "pass"); + ActiveMQSecurityManagerImpl securityManager = (ActiveMQSecurityManagerImpl) server.getSecurityManager(); + securityManager.getConfiguration().addUser("auser", "pass"); Role role = new Role("arole", false, false, true, false, false, false, false); Set roles = new HashSet(); roles.add(role); securityRepository.addMatch(SecurityTest.addressA, roles); - securityManager.addRole("auser", "arole"); + securityManager.getConfiguration().addRole("auser", "arole"); ClientSessionFactory cf = createSessionFactory(locator); ClientSession session = cf.createSession("auser", "pass", false, true, true, false, -1); session.createQueue(SecurityTest.addressA, SecurityTest.queueA, true); @@ -520,18 +520,18 @@ public class SecurityTest extends ServiceTestBase ActiveMQServer server = createServer(); server.start(); HierarchicalRepository> securityRepository = server.getSecurityRepository(); - ActiveMQSecurityManager securityManager = server.getSecurityManager(); - securityManager.addUser("auser", "pass"); - securityManager.addUser("guest", "guest"); - securityManager.addRole("guest", "guest"); - securityManager.setDefaultUser("guest"); + ActiveMQSecurityManagerImpl securityManager = (ActiveMQSecurityManagerImpl) server.getSecurityManager(); + securityManager.getConfiguration().addUser("auser", "pass"); + securityManager.getConfiguration().addUser("guest", "guest"); + securityManager.getConfiguration().addRole("guest", "guest"); + securityManager.getConfiguration().setDefaultUser("guest"); Role role = new Role("arole", false, true, false, false, false, false, false); Role sendRole = new Role("guest", true, false, true, false, false, false, false); Set roles = new HashSet(); roles.add(sendRole); roles.add(role); securityRepository.addMatch(SecurityTest.addressA, roles); - securityManager.addRole("auser", "arole"); + securityManager.getConfiguration().addRole("auser", "arole"); ClientSessionFactory cf = createSessionFactory(locator); ClientSession senSession = cf.createSession(false, true, true); ClientSession session = cf.createSession("auser", "pass", false, true, true, false, -1); @@ -549,18 +549,18 @@ public class SecurityTest extends ServiceTestBase ActiveMQServer server = createServer(); server.start(); HierarchicalRepository> securityRepository = server.getSecurityRepository(); - ActiveMQSecurityManager securityManager = server.getSecurityManager(); - securityManager.addUser("auser", "pass"); - securityManager.addUser("guest", "guest"); - securityManager.addRole("guest", "guest"); - securityManager.setDefaultUser("guest"); + ActiveMQSecurityManagerImpl securityManager = (ActiveMQSecurityManagerImpl) server.getSecurityManager(); + securityManager.getConfiguration().addUser("auser", "pass"); + securityManager.getConfiguration().addUser("guest", "guest"); + securityManager.getConfiguration().addRole("guest", "guest"); + securityManager.getConfiguration().setDefaultUser("guest"); Role role = new Role("arole", false, false, false, false, false, false, false); Role sendRole = new Role("guest", true, false, true, false, false, false, false); Set roles = new HashSet(); roles.add(sendRole); roles.add(role); securityRepository.addMatch(SecurityTest.addressA, roles); - securityManager.addRole("auser", "arole"); + securityManager.getConfiguration().addRole("auser", "arole"); ClientSessionFactory cf = createSessionFactory(locator); ClientSession senSession = cf.createSession(false, true, true); ClientSession session = cf.createSession("auser", "pass", false, true, true, false, -1); @@ -592,11 +592,11 @@ public class SecurityTest extends ServiceTestBase ActiveMQServer server = createServer(false, configuration); server.start(); HierarchicalRepository> securityRepository = server.getSecurityRepository(); - ActiveMQSecurityManager securityManager = server.getSecurityManager(); - securityManager.addUser("auser", "pass"); - securityManager.addUser("guest", "guest"); - securityManager.addRole("guest", "guest"); - securityManager.setDefaultUser("guest"); + ActiveMQSecurityManagerImpl securityManager = (ActiveMQSecurityManagerImpl) server.getSecurityManager(); + securityManager.getConfiguration().addUser("auser", "pass"); + securityManager.getConfiguration().addUser("guest", "guest"); + securityManager.getConfiguration().addRole("guest", "guest"); + securityManager.getConfiguration().setDefaultUser("guest"); Role role = new Role("arole", false, false, false, false, false, false, false); Role sendRole = new Role("guest", true, false, true, false, false, false, false); Role receiveRole = new Role("receiver", false, true, false, false, false, false, false); @@ -605,7 +605,7 @@ public class SecurityTest extends ServiceTestBase roles.add(role); roles.add(receiveRole); securityRepository.addMatch(SecurityTest.addressA, roles); - securityManager.addRole("auser", "arole"); + securityManager.getConfiguration().addRole("auser", "arole"); ClientSessionFactory cf = createSessionFactory(locator); ClientSession senSession = cf.createSession(false, true, true); ClientSession session = cf.createSession("auser", "pass", false, true, true, false, -1); @@ -625,12 +625,12 @@ public class SecurityTest extends ServiceTestBase fail("Invalid Exception type:" + e.getType()); } - securityManager.addRole("auser", "receiver"); + securityManager.getConfiguration().addRole("auser", "receiver"); session.createConsumer(SecurityTest.queueA); // Removing the Role... the check should be cached, so the next createConsumer shouldn't fail - securityManager.removeRole("auser", "receiver"); + securityManager.getConfiguration().removeRole("auser", "receiver"); session.createConsumer(SecurityTest.queueA); @@ -649,11 +649,11 @@ public class SecurityTest extends ServiceTestBase server.start(); HierarchicalRepository> securityRepository = server.getSecurityRepository(); - ActiveMQSecurityManager securityManager = server.getSecurityManager(); - securityManager.addUser("auser", "pass"); - securityManager.addUser("guest", "guest"); - securityManager.addRole("guest", "guest"); - securityManager.setDefaultUser("guest"); + ActiveMQSecurityManagerImpl securityManager = (ActiveMQSecurityManagerImpl) server.getSecurityManager(); + securityManager.getConfiguration().addUser("auser", "pass"); + securityManager.getConfiguration().addUser("guest", "guest"); + securityManager.getConfiguration().addRole("guest", "guest"); + securityManager.getConfiguration().setDefaultUser("guest"); Role role = new Role("arole", false, false, false, false, false, false, false); Role sendRole = new Role("guest", true, false, true, false, false, false, false); Role receiveRole = new Role("receiver", false, true, false, false, false, false, false); @@ -662,7 +662,7 @@ public class SecurityTest extends ServiceTestBase roles.add(role); roles.add(receiveRole); securityRepository.addMatch(SecurityTest.addressA, roles); - securityManager.addRole("auser", "arole"); + securityManager.getConfiguration().addRole("auser", "arole"); ClientSessionFactory cf = createSessionFactory(locator); ClientSession senSession = cf.createSession(false, true, true); ClientSession session = cf.createSession("auser", "pass", false, true, true, false, -1); @@ -682,14 +682,14 @@ public class SecurityTest extends ServiceTestBase fail("Invalid Exception type:" + e.getType()); } - securityManager.addRole("auser", "receiver"); + securityManager.getConfiguration().addRole("auser", "receiver"); session.createConsumer(SecurityTest.queueA); // Removing the Role... the check should be cached... but we used // setSecurityInvalidationInterval(0), so the // next createConsumer should fail - securityManager.removeRole("auser", "receiver"); + securityManager.getConfiguration().removeRole("auser", "receiver"); try { @@ -718,11 +718,11 @@ public class SecurityTest extends ServiceTestBase ActiveMQServer server = createServer(false, configuration); server.start(); HierarchicalRepository> securityRepository = server.getSecurityRepository(); - ActiveMQSecurityManager securityManager = server.getSecurityManager(); - securityManager.addUser("auser", "pass"); - securityManager.addUser("guest", "guest"); - securityManager.addRole("guest", "guest"); - securityManager.setDefaultUser("guest"); + ActiveMQSecurityManagerImpl securityManager = (ActiveMQSecurityManagerImpl) server.getSecurityManager(); + securityManager.getConfiguration().addUser("auser", "pass"); + securityManager.getConfiguration().addUser("guest", "guest"); + securityManager.getConfiguration().addRole("guest", "guest"); + securityManager.getConfiguration().setDefaultUser("guest"); Role role = new Role("arole", false, false, false, false, false, false, false); System.out.println("guest:" + role); Role sendRole = new Role("guest", true, false, true, false, false, false, false); @@ -734,7 +734,7 @@ public class SecurityTest extends ServiceTestBase roles.add(role); roles.add(receiveRole); securityRepository.addMatch(SecurityTest.addressA, roles); - securityManager.addRole("auser", "arole"); + securityManager.getConfiguration().addRole("auser", "arole"); ClientSessionFactory cf = createSessionFactory(locator); ClientSession senSession = cf.createSession(false, true, true); @@ -755,14 +755,14 @@ public class SecurityTest extends ServiceTestBase fail("Invalid Exception type:" + e.getType()); } - securityManager.addRole("auser", "receiver"); + securityManager.getConfiguration().addRole("auser", "receiver"); session.createConsumer(SecurityTest.queueA); // Removing the Role... the check should be cached... but we used // setSecurityInvalidationInterval(0), so the // next createConsumer should fail - securityManager.removeRole("auser", "guest"); + securityManager.getConfiguration().removeRole("auser", "guest"); ClientSession sendingSession = cf.createSession("auser", "pass", false, false, false, false, 0); ClientProducer prod = sendingSession.createProducer(SecurityTest.addressA); @@ -818,13 +818,13 @@ public class SecurityTest extends ServiceTestBase server.start(); HierarchicalRepository> securityRepository = server.getSecurityRepository(); - ActiveMQSecurityManager securityManager = server.getSecurityManager(); - securityManager.addUser("auser", "pass"); + ActiveMQSecurityManagerImpl securityManager = (ActiveMQSecurityManagerImpl) server.getSecurityManager(); + securityManager.getConfiguration().addUser("auser", "pass"); Role role = new Role("arole", false, false, false, false, false, false, true); Set roles = new HashSet(); roles.add(role); securityRepository.addMatch(configuration.getManagementAddress().toString(), roles); - securityManager.addRole("auser", "arole"); + securityManager.getConfiguration().addRole("auser", "arole"); locator.setBlockOnNonDurableSend(true); ClientSessionFactory cf = createSessionFactory(locator); ClientSession session = cf.createSession("auser", "pass", false, true, true, false, -1); @@ -840,13 +840,13 @@ public class SecurityTest extends ServiceTestBase server.start(); HierarchicalRepository> securityRepository = server.getSecurityRepository(); - ActiveMQSecurityManager securityManager = server.getSecurityManager(); - securityManager.addUser("auser", "pass"); + ActiveMQSecurityManagerImpl securityManager = (ActiveMQSecurityManagerImpl) server.getSecurityManager(); + securityManager.getConfiguration().addUser("auser", "pass"); Role role = new Role("arole", false, false, true, false, false, false, false); Set roles = new HashSet(); roles.add(role); securityRepository.addMatch(configuration.getManagementAddress().toString(), roles); - securityManager.addRole("auser", "arole"); + securityManager.getConfiguration().addRole("auser", "arole"); ClientSessionFactory cf = createSessionFactory(locator); ClientSession session = cf.createSession("auser", "pass", false, true, true, false, -1); session.createQueue(configuration.getManagementAddress().toString(), SecurityTest.queueA, true); @@ -875,13 +875,13 @@ public class SecurityTest extends ServiceTestBase server.start(); HierarchicalRepository> securityRepository = server.getSecurityRepository(); - ActiveMQSecurityManager securityManager = server.getSecurityManager(); - securityManager.addUser("auser", "pass"); + ActiveMQSecurityManagerImpl securityManager = (ActiveMQSecurityManagerImpl) server.getSecurityManager(); + securityManager.getConfiguration().addUser("auser", "pass"); Role role = new Role("arole", false, false, true, false, false, false, false); Set roles = new HashSet(); roles.add(role); securityRepository.addMatch(configuration.getManagementAddress().toString(), roles); - securityManager.addRole("auser", "arole"); + securityManager.getConfiguration().addRole("auser", "arole"); ClientSessionFactory cf = createSessionFactory(locator); ClientSession session = cf.createSession("auser", "pass", false, true, true, false, -1); session.createQueue(configuration.getManagementAddress().toString(), SecurityTest.queueA, true); @@ -978,21 +978,21 @@ public class SecurityTest extends ServiceTestBase { ActiveMQServer server = createServer(); server.start(); - ActiveMQSecurityManager securityManager = server.getSecurityManager(); - securityManager.addUser("all", "all"); - securityManager.addUser("bill", "activemq"); - securityManager.addUser("andrew", "activemq1"); - securityManager.addUser("frank", "activemq2"); - securityManager.addUser("sam", "activemq3"); - securityManager.addRole("all", "all"); - securityManager.addRole("bill", "user"); - securityManager.addRole("andrew", "europe-user"); - securityManager.addRole("andrew", "user"); - securityManager.addRole("frank", "us-user"); - securityManager.addRole("frank", "news-user"); - securityManager.addRole("frank", "user"); - securityManager.addRole("sam", "news-user"); - securityManager.addRole("sam", "user"); + ActiveMQSecurityManagerImpl securityManager = (ActiveMQSecurityManagerImpl) server.getSecurityManager(); + securityManager.getConfiguration().addUser("all", "all"); + securityManager.getConfiguration().addUser("bill", "activemq"); + securityManager.getConfiguration().addUser("andrew", "activemq1"); + securityManager.getConfiguration().addUser("frank", "activemq2"); + securityManager.getConfiguration().addUser("sam", "activemq3"); + securityManager.getConfiguration().addRole("all", "all"); + securityManager.getConfiguration().addRole("bill", "user"); + securityManager.getConfiguration().addRole("andrew", "europe-user"); + securityManager.getConfiguration().addRole("andrew", "user"); + securityManager.getConfiguration().addRole("frank", "us-user"); + securityManager.getConfiguration().addRole("frank", "news-user"); + securityManager.getConfiguration().addRole("frank", "user"); + securityManager.getConfiguration().addRole("sam", "news-user"); + securityManager.getConfiguration().addRole("sam", "user"); Role all = new Role("all", true, true, true, true, true, true, true); HierarchicalRepository> repository = server.getSecurityRepository(); Set add = new HashSet(); @@ -1117,21 +1117,21 @@ public class SecurityTest extends ServiceTestBase { ActiveMQServer server = createServer(); server.start(); - ActiveMQSecurityManager securityManager = server.getSecurityManager(); - securityManager.addUser("all", "all"); - securityManager.addUser("bill", "activemq"); - securityManager.addUser("andrew", "activemq1"); - securityManager.addUser("frank", "activemq2"); - securityManager.addUser("sam", "activemq3"); - securityManager.addRole("all", "all"); - securityManager.addRole("bill", "user"); - securityManager.addRole("andrew", "europe-user"); - securityManager.addRole("andrew", "user"); - securityManager.addRole("frank", "us-user"); - securityManager.addRole("frank", "news-user"); - securityManager.addRole("frank", "user"); - securityManager.addRole("sam", "news-user"); - securityManager.addRole("sam", "user"); + ActiveMQSecurityManagerImpl securityManager = (ActiveMQSecurityManagerImpl) server.getSecurityManager(); + securityManager.getConfiguration().addUser("all", "all"); + securityManager.getConfiguration().addUser("bill", "activemq"); + securityManager.getConfiguration().addUser("andrew", "activemq1"); + securityManager.getConfiguration().addUser("frank", "activemq2"); + securityManager.getConfiguration().addUser("sam", "activemq3"); + securityManager.getConfiguration().addRole("all", "all"); + securityManager.getConfiguration().addRole("bill", "user"); + securityManager.getConfiguration().addRole("andrew", "europe-user"); + securityManager.getConfiguration().addRole("andrew", "user"); + securityManager.getConfiguration().addRole("frank", "us-user"); + securityManager.getConfiguration().addRole("frank", "news-user"); + securityManager.getConfiguration().addRole("frank", "user"); + securityManager.getConfiguration().addRole("sam", "news-user"); + securityManager.getConfiguration().addRole("sam", "user"); Role all = new Role("all", true, true, true, true, true, true, true); HierarchicalRepository> repository = server.getSecurityRepository(); Set add = new HashSet(); diff --git a/tests/integration-tests/src/test/resources/activemq-jms-for-JMSServerDeployerTest.xml b/tests/integration-tests/src/test/resources/activemq-jms-for-JMSServerDeployerTest.xml index 99c5665db7..cff73314ae 100644 --- a/tests/integration-tests/src/test/resources/activemq-jms-for-JMSServerDeployerTest.xml +++ b/tests/integration-tests/src/test/resources/activemq-jms-for-JMSServerDeployerTest.xml @@ -16,10 +16,11 @@ --> + xsi:schemaLocation="urn:activemq ../../src/schemas/activemq-server.xsd "> + + - - - + + \ No newline at end of file diff --git a/tests/integration-tests/src/test/resources/activemq-jms-for-JMSServerDeployerTest2.xml b/tests/integration-tests/src/test/resources/activemq-jms-for-JMSServerDeployerTest2.xml deleted file mode 100644 index 99c5665db7..0000000000 --- a/tests/integration-tests/src/test/resources/activemq-jms-for-JMSServerDeployerTest2.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/tests/integration-tests/src/test/resources/server-start-stop-config1.xml b/tests/integration-tests/src/test/resources/server-start-stop-config1.xml index 028c86cf28..3a48c1e21f 100644 --- a/tests/integration-tests/src/test/resources/server-start-stop-config1.xml +++ b/tests/integration-tests/src/test/resources/server-start-stop-config1.xml @@ -16,34 +16,39 @@ --> + xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd"> + + + + - - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - - - /tmp/activemq-unit-test/start-stop-data - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + + + org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory + + - false - - - -
myAddress
- - - - + /tmp/activemq-unit-test/start-stop-data + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + + false + + + +
myAddress
+ + + + + diff --git a/tests/integration-tests/src/test/resources/server-start-stop-jms-config1.xml b/tests/integration-tests/src/test/resources/server-start-stop-jms-config1.xml deleted file mode 100644 index 7c84896260..0000000000 --- a/tests/integration-tests/src/test/resources/server-start-stop-jms-config1.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/tests/integration-tests/src/test/resources/spring-activemq-config.xml b/tests/integration-tests/src/test/resources/spring-activemq-config.xml index 11f87d2dcb..f4cd7710e9 100644 --- a/tests/integration-tests/src/test/resources/spring-activemq-config.xml +++ b/tests/integration-tests/src/test/resources/spring-activemq-config.xml @@ -18,33 +18,40 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd"> - false - false - + + + + + - - - org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory - - + false + false + - - - org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory - - + + + org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory + + - - + + + org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory + + + + + + diff --git a/tests/integration-tests/src/test/resources/spring-activemq-jms.xml b/tests/integration-tests/src/test/resources/spring-activemq-jms.xml deleted file mode 100644 index b6016bf508..0000000000 --- a/tests/integration-tests/src/test/resources/spring-activemq-jms.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - diff --git a/tests/integration-tests/src/test/resources/spring-jms-beans.xml b/tests/integration-tests/src/test/resources/spring-jms-beans.xml index e538a8c9d1..f92a69ffde 100644 --- a/tests/integration-tests/src/test/resources/spring-jms-beans.xml +++ b/tests/integration-tests/src/test/resources/spring-jms-beans.xml @@ -22,7 +22,6 @@ - diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/tools/container/LocalTestServer.java b/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/tools/container/LocalTestServer.java index 21bd249fcf..a03d45773d 100644 --- a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/tools/container/LocalTestServer.java +++ b/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/tools/container/LocalTestServer.java @@ -36,6 +36,7 @@ import org.apache.activemq.api.core.management.ResourceNames; import org.apache.activemq.api.jms.JMSFactoryType; import org.apache.activemq.api.jms.management.JMSQueueControl; import org.apache.activemq.api.jms.management.TopicControl; +import org.apache.activemq.core.config.FileDeploymentManager; import org.apache.activemq.core.config.impl.FileConfiguration; import org.apache.activemq.core.registry.JndiBindingRegistry; import org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory; @@ -117,12 +118,16 @@ public class LocalTestServer implements Server, Runnable javax.management.MBeanServer beanServer = java.lang.management.ManagementFactory.getPlatformMBeanServer(); FileConfiguration fileConfiguration = new FileConfiguration(); ActiveMQSecurityManagerImpl securityManager = new ActiveMQSecurityManagerImpl(); + securityManager.getConfiguration().addUser("guest", "guest"); + securityManager.getConfiguration().setDefaultUser("guest"); + securityManager.getConfiguration().addRole("guest", "guest"); ActiveMQServerImpl activeMQServer = new ActiveMQServerImpl(fileConfiguration, beanServer, securityManager); jmsServerManager = new JMSServerManagerImpl(activeMQServer); System.setProperty(Constants.SERVER_INDEX_PROPERTY_NAME, "" + getServerID()); jmsServerManager.setRegistry(new JndiBindingRegistry(getInitialContext())); - fileConfiguration.start(); + FileDeploymentManager deploymentManager = new FileDeploymentManager(); + deploymentManager.addDeployable(fileConfiguration).readConfiguration(); jmsServerManager.start(); started = true; diff --git a/tests/jms-tests/src/test/resources/activemq-configuration.xml b/tests/jms-tests/src/test/resources/activemq-configuration.xml index 6a15332fed..3cf56e4b36 100644 --- a/tests/jms-tests/src/test/resources/activemq-configuration.xml +++ b/tests/jms-tests/src/test/resources/activemq-configuration.xml @@ -16,7 +16,11 @@ --> + xsi:schemaLocation="urn:activemq ../../../src/schema/activemq-server.xsd"> + + + + @@ -51,4 +55,16 @@ target/data/binding target/data/journal target/data/largemessages + + + + + + + + + + + + \ No newline at end of file diff --git a/tests/jms-tests/src/test/resources/activemq-jms.xml b/tests/jms-tests/src/test/resources/activemq-jms.xml deleted file mode 100644 index 3b7ef17e38..0000000000 --- a/tests/jms-tests/src/test/resources/activemq-jms.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - diff --git a/tests/jms-tests/src/test/resources/activemq-queues.xml b/tests/jms-tests/src/test/resources/activemq-queues.xml deleted file mode 100644 index c5539f3925..0000000000 --- a/tests/jms-tests/src/test/resources/activemq-queues.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/tests/jms-tests/src/test/resources/activemq-users.xml b/tests/jms-tests/src/test/resources/activemq-users.xml deleted file mode 100644 index 05049f75da..0000000000 --- a/tests/jms-tests/src/test/resources/activemq-users.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/tests/joram-tests/src/test/java/org/apache/activemq/jms/SpawnedJMSServer.java b/tests/joram-tests/src/test/java/org/apache/activemq/jms/SpawnedJMSServer.java index 3a8b2fbbad..5ea74f3147 100644 --- a/tests/joram-tests/src/test/java/org/apache/activemq/jms/SpawnedJMSServer.java +++ b/tests/joram-tests/src/test/java/org/apache/activemq/jms/SpawnedJMSServer.java @@ -50,8 +50,7 @@ public class SpawnedJMSServer { Configuration conf = new ConfigurationImpl() .addAcceptorConfiguration(new TransportConfiguration(NettyAcceptorFactory.class.getName())) - .setSecurityEnabled(false) - .setFileDeploymentEnabled(false); + .setSecurityEnabled(false); conf.getConnectorConfigurations().put("netty", new TransportConfiguration(NettyConnectorFactory.class.getName())); diff --git a/tests/timing-tests/src/test/java/org/apache/activemq/tests/timing/jms/bridge/impl/JMSBridgeImplTest.java b/tests/timing-tests/src/test/java/org/apache/activemq/tests/timing/jms/bridge/impl/JMSBridgeImplTest.java index 4aa27e7cad..d2755edd65 100644 --- a/tests/timing-tests/src/test/java/org/apache/activemq/tests/timing/jms/bridge/impl/JMSBridgeImplTest.java +++ b/tests/timing-tests/src/test/java/org/apache/activemq/tests/timing/jms/bridge/impl/JMSBridgeImplTest.java @@ -619,7 +619,6 @@ public class JMSBridgeImplTest extends UnitTestCase super.setUp(); Configuration config = createBasicConfig() - .setFileDeploymentEnabled(false) .addAcceptorConfiguration(new TransportConfiguration(InVMAcceptorFactory.class.getName())); InVMNamingContext context = new InVMNamingContext(); jmsServer = new JMSServerManagerImpl(ActiveMQServers.newActiveMQServer(config, false)); diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/config/impl/ConfigurationValidationTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/config/impl/ConfigurationValidationTest.java index 400731f62a..283ca641a3 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/config/impl/ConfigurationValidationTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/config/impl/ConfigurationValidationTest.java @@ -16,6 +16,7 @@ */ package org.apache.activemq.tests.unit.core.config.impl; +import org.apache.activemq.core.config.FileDeploymentManager; import org.junit.Test; import org.junit.Assert; @@ -54,7 +55,7 @@ public class ConfigurationValidationTest extends UnitTestCase @Test public void testMinimalConfiguration() throws Exception { - String xml = "" + ""; + String xml = "" + ""; Element element = XMLUtil.stringToElement(xml); Assert.assertNotNull(element); XMLUtil.validate(element, "schema/activemq-configuration.xsd"); @@ -63,8 +64,10 @@ public class ConfigurationValidationTest extends UnitTestCase @Test public void testFullConfiguration() throws Exception { - FileConfiguration fc = new FileConfiguration("ConfigurationTest-full-config.xml"); - fc.start(); + FileConfiguration fc = new FileConfiguration(); + FileDeploymentManager deploymentManager = new FileDeploymentManager("ConfigurationTest-full-config.xml"); + deploymentManager.addDeployable(fc); + deploymentManager.readConfiguration(); Assert.assertEquals(true, fc.isPersistDeliveryCountBeforeDelivery()); } diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/deployers/impl/AddressSettingsDeployerTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/deployers/impl/AddressSettingsDeployerTest.java deleted file mode 100644 index c41f1923a2..0000000000 --- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/deployers/impl/AddressSettingsDeployerTest.java +++ /dev/null @@ -1,136 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.activemq.tests.unit.core.deployers.impl; -import org.junit.Before; - -import org.junit.Test; - -import org.junit.Assert; - -import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.core.deployers.DeploymentManager; -import org.apache.activemq.core.deployers.impl.AddressSettingsDeployer; -import org.apache.activemq.core.settings.HierarchicalRepository; -import org.apache.activemq.core.settings.impl.AddressFullMessagePolicy; -import org.apache.activemq.core.settings.impl.AddressSettings; -import org.apache.activemq.core.settings.impl.HierarchicalObjectRepository; -import org.apache.activemq.tests.util.UnitTestCase; -import org.apache.activemq.utils.XMLUtil; -import org.w3c.dom.Element; -import org.w3c.dom.NodeList; - -/** - * @author Andy Taylor - */ -public class AddressSettingsDeployerTest extends UnitTestCase -{ - private final String conf = "\n" + " DLQtest\n" - + " ExpiryQueueTest\n" - + " 100\n" - + " 32\n" - + " 18238172365765\n" - + " 2387273767666\n" - + " DROP\n" - + " 1000\n" - + " true\n" - + " 38383\n" - + " 2\n" - + " 12000\n" - + " true\n" - + " "; - - private AddressSettingsDeployer addressSettingsDeployer; - - private HierarchicalRepository repository; - - @Override - @Before - public void setUp() throws Exception - { - super.setUp(); - - repository = new HierarchicalObjectRepository(); - DeploymentManager deploymentManager = new FakeDeploymentManager(); - addressSettingsDeployer = new AddressSettingsDeployer(deploymentManager, repository); - } - - @Test - public void testDeploy() throws Exception - { - addressSettingsDeployer.deploy(XMLUtil.stringToElement(conf)); - AddressSettings as = repository.getMatch("queues.aq"); - Assert.assertNotNull(as); - Assert.assertEquals(new SimpleString("DLQtest"), as.getDeadLetterAddress()); - Assert.assertEquals(new SimpleString("ExpiryQueueTest"), as.getExpiryAddress()); - Assert.assertEquals(100, as.getRedeliveryDelay()); - Assert.assertEquals(32, as.getMaxDeliveryAttempts()); - Assert.assertEquals(18238172365765L, as.getMaxSizeBytes()); - Assert.assertEquals(2387273767666L, as.getPageSizeBytes()); - Assert.assertEquals(AddressFullMessagePolicy.DROP, as.getAddressFullMessagePolicy()); - Assert.assertEquals(1000, as.getMessageCounterHistoryDayLimit()); - Assert.assertTrue(as.isLastValueQueue()); - Assert.assertEquals(38383, as.getRedistributionDelay()); - Assert.assertEquals(2.0, as.getRedeliveryMultiplier(), 0.000001); - Assert.assertEquals(12000, as.getMaxRedeliveryDelay()); - Assert.assertTrue(as.isSendToDLAOnNoRoute()); - - } - - @Test - public void testDeployFromConfigurationFile() throws Exception - { - String xml = " " + "" + - conf + - "" + - ""; - - Element rootNode = org.apache.activemq.utils.XMLUtil.stringToElement(xml); - addressSettingsDeployer.validate(rootNode); - NodeList addressSettingsNode = rootNode.getElementsByTagName("address-setting"); - Assert.assertEquals(1, addressSettingsNode.getLength()); - - addressSettingsDeployer.deploy(addressSettingsNode.item(0)); - AddressSettings as = repository.getMatch("queues.aq"); - Assert.assertNotNull(as); - Assert.assertEquals(new SimpleString("DLQtest"), as.getDeadLetterAddress()); - Assert.assertEquals(new SimpleString("ExpiryQueueTest"), as.getExpiryAddress()); - Assert.assertEquals(100, as.getRedeliveryDelay()); - Assert.assertEquals(2.0, as.getRedeliveryMultiplier(), 0.000001); - Assert.assertEquals(12000, as.getMaxRedeliveryDelay()); - Assert.assertEquals(32, as.getMaxDeliveryAttempts()); - Assert.assertEquals(18238172365765L, as.getMaxSizeBytes()); - Assert.assertEquals(2387273767666L, as.getPageSizeBytes()); - Assert.assertEquals(AddressFullMessagePolicy.DROP, as.getAddressFullMessagePolicy()); - Assert.assertEquals(1000, as.getMessageCounterHistoryDayLimit()); - Assert.assertTrue(as.isLastValueQueue()); - Assert.assertEquals(38383, as.getRedistributionDelay()); - Assert.assertTrue(as.isSendToDLAOnNoRoute()); - } - - @Test - public void testUndeploy() throws Exception - { - addressSettingsDeployer.deploy(XMLUtil.stringToElement(conf)); - AddressSettings as = repository.getMatch("queues.aq"); - Assert.assertNotNull(as); - addressSettingsDeployer.undeploy(XMLUtil.stringToElement(conf)); - as = repository.getMatch("queues.aq"); - Assert.assertNull(as); - } - -} - diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/deployers/impl/BasicUserCredentialsDeployerTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/deployers/impl/BasicUserCredentialsDeployerTest.java deleted file mode 100644 index 92bcb8df0c..0000000000 --- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/deployers/impl/BasicUserCredentialsDeployerTest.java +++ /dev/null @@ -1,546 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.activemq.tests.unit.core.deployers.impl; -import org.junit.Before; -import org.junit.After; - -import org.junit.Test; - -import org.junit.Assert; -import org.apache.activemq.core.deployers.DeploymentManager; -import org.apache.activemq.core.deployers.impl.BasicUserCredentialsDeployer; -import org.apache.activemq.core.security.CheckType; -import org.apache.activemq.core.security.Role; -import org.apache.activemq.spi.core.security.ActiveMQSecurityManager; -import org.apache.activemq.tests.util.UnitTestCase; -import org.apache.activemq.utils.DefaultSensitiveStringCodec; -import org.apache.activemq.utils.XMLUtil; -import org.w3c.dom.Element; -import org.w3c.dom.Node; - -import java.net.URI; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; - -/** - * tests BasicUserCredentialsDeployer - * - * @author Andy Taylor - */ -public class BasicUserCredentialsDeployerTest extends UnitTestCase -{ - private FakeDeployer deployer; - - private FakeActiveMQUpdateableSecurityManager securityManager; - - private URI url; - - private static final String simpleSecurityXml = "\n" - + "\n" - + " \n" - + " " - + ""; - - private static final String singleUserXml = "\n" - + " \n" - + " \n" - + " \n" - + ""; - - private static final String multipleUserXml = "\n" - + " \n" - + " \n" - + " \n" - + " \n" - + " \n" - + " \n" - + " \n" - + " \n" - + " \n" - + ""; - - private static final String maskedPasswordXml = "\n" - + "true\n" - + "\n" - + " \n" - + " \n" - + " \n" - + " \n" - + " \n" - + " \n" - + " \n" - + " \n" - + " \n" - + " \n" - + " \n" - + ""; - - private static final String passwordCodecXml = "\n" - + "true\n" - + "PASSWORD_CODEC_TOKEN\n" - + "\n" - + " \n" - + " \n" - + " \n" - + " \n" - + " \n" - + " \n" - + " \n" - + " \n" - + " \n" - + " \n" - + " \n" - + ""; - - @Override - @Before - public void setUp() throws Exception - { - super.setUp(); - DeploymentManager deploymentManager = new FakeDeploymentManager(); - securityManager = new FakeActiveMQUpdateableSecurityManager(); - deployer = new FakeDeployer(deploymentManager, securityManager); - - url = new URI("http://localhost"); - } - - @Override - @After - public void tearDown() throws Exception - { - deployer = null; - - super.tearDown(); - } - - @Test - public void testSimpleDefaultSecurity() throws Exception - { - - deployer.setElement(XMLUtil.stringToElement(BasicUserCredentialsDeployerTest.simpleSecurityXml)); - deployer.deploy(url); - - Assert.assertEquals("guest", securityManager.defaultUser); - User user = securityManager.users.get("guest"); - Assert.assertNotNull(user); - Assert.assertEquals("guest", user.user); - Assert.assertEquals("guest", user.password); - List roles = securityManager.roles.get("guest"); - Assert.assertNotNull(roles); - Assert.assertEquals(1, roles.size()); - Assert.assertEquals("guest", roles.get(0)); - } - - @Test - public void testSingleUserDeploySecurity() throws Exception - { - - deployer.setElement(XMLUtil.stringToElement(BasicUserCredentialsDeployerTest.singleUserXml)); - deployer.deploy(url); - - Assert.assertNull(securityManager.defaultUser); - User user = securityManager.users.get("guest"); - Assert.assertNotNull(user); - Assert.assertEquals("guest", user.user); - Assert.assertEquals("guest", user.password); - List roles = securityManager.roles.get("guest"); - Assert.assertNotNull(roles); - Assert.assertEquals(1, roles.size()); - Assert.assertEquals("guest", roles.get(0)); - } - - @Test - public void testMultipleUserDeploySecurity() throws Exception - { - - deployer.setElement(XMLUtil.stringToElement(BasicUserCredentialsDeployerTest.multipleUserXml)); - deployer.deploy(url); - - Assert.assertNull(securityManager.defaultUser); - User user = securityManager.users.get("guest"); - Assert.assertNotNull(user); - Assert.assertEquals("guest", user.user); - Assert.assertEquals("guest", user.password); - List roles = securityManager.roles.get("guest"); - Assert.assertNotNull(roles); - Assert.assertEquals(2, roles.size()); - Assert.assertEquals("guest", roles.get(0)); - Assert.assertEquals("foo", roles.get(1)); - user = securityManager.users.get("anotherguest"); - Assert.assertNotNull(user); - Assert.assertEquals("anotherguest", user.user); - Assert.assertEquals("anotherguest", user.password); - roles = securityManager.roles.get("anotherguest"); - Assert.assertNotNull(roles); - Assert.assertEquals(3, roles.size()); - Assert.assertEquals("anotherguest", roles.get(0)); - Assert.assertEquals("foo", roles.get(1)); - Assert.assertEquals("bar", roles.get(2)); - } - - @Test - public void testMaskedPassword() throws Exception - { - String password1 = "helloworld1"; - String password2 = "helloworld2"; - String password3 = "helloworld3"; - - DefaultSensitiveStringCodec codec = new DefaultSensitiveStringCodec(); - String mask1 = (String) codec.encode(password1); - String mask2 = (String) codec.encode(password2); - String mask3 = (String) codec.encode(password3); - - String config = maskedPasswordXml.replace("PASSWORD_TOKEN1", mask1); - config = config.replace("PASSWORD_TOKEN2", mask2); - config = config.replace("PASSWORD_TOKEN3", mask3); - - deployer.setElement(XMLUtil.stringToElement(config)); - deployer.deploy(url); - - User user1 = securityManager.users.get("guest"); - User user2 = securityManager.users.get("user1"); - User user3 = securityManager.users.get("user2"); - - assertEquals(password1, user1.password); - assertEquals(password2, user2.password); - assertEquals(password3, user3.password); - } - - @Test - public void testPasswordCodec() throws Exception - { - String password1 = "helloworld1"; - String password2 = "helloworld2"; - String password3 = "helloworld3"; - - DefaultSensitiveStringCodec codec = new DefaultSensitiveStringCodec(); - Map prop = new HashMap(); - prop.put("key", "blahblah"); - codec.init(prop); - - String mask1 = (String) codec.encode(password1); - String mask2 = (String) codec.encode(password2); - String mask3 = (String) codec.encode(password3); - - String config = passwordCodecXml.replace("PASSWORD_TOKEN1", mask1); - config = config.replace("PASSWORD_TOKEN2", mask2); - config = config.replace("PASSWORD_TOKEN3", mask3); - config = config.replace("PASSWORD_CODEC_TOKEN", codec.getClass() - .getName() + ";key=blahblah"); - - deployer.setElement(XMLUtil.stringToElement(config)); - deployer.deploy(url); - - User user1 = securityManager.users.get("guest"); - User user2 = securityManager.users.get("user1"); - User user3 = securityManager.users.get("user2"); - - assertEquals(password1, user1.password); - assertEquals(password2, user2.password); - assertEquals(password3, user3.password); - } - - @Test - public void testUndeploy() throws Exception - { - - deployer.setElement(XMLUtil.stringToElement(BasicUserCredentialsDeployerTest.simpleSecurityXml)); - deployer.deploy(url); - - deployer.undeploy(url); - - User user = securityManager.users.get("guest"); - Assert.assertNull(user); - List roles = securityManager.roles.get("guest"); - Assert.assertNull(roles); - } - - @Test - public void testUndeployDifferentXml() throws Exception - { - - URI otherUrl = new URI("http://otherHost"); - - deployer.setElement(XMLUtil.stringToElement(BasicUserCredentialsDeployerTest.multipleUserXml)); - deployer.deploy(url); - - deployer.setElement(XMLUtil.stringToElement(BasicUserCredentialsDeployerTest.singleUserXml)); - deployer.deploy(otherUrl); - - deployer.setElement(XMLUtil.stringToElement(BasicUserCredentialsDeployerTest.singleUserXml)); - deployer.undeploy(otherUrl); - - Assert.assertNull(securityManager.defaultUser); - User user = securityManager.users.get("guest"); - Assert.assertNull(user); - List roles = securityManager.roles.get("guest"); - Assert.assertNull(roles); - - user = securityManager.users.get("anotherguest"); - Assert.assertNotNull(user); - Assert.assertEquals("anotherguest", user.user); - Assert.assertEquals("anotherguest", user.password); - roles = securityManager.roles.get("anotherguest"); - Assert.assertNotNull(roles); - Assert.assertEquals(3, roles.size()); - Assert.assertEquals("anotherguest", roles.get(0)); - Assert.assertEquals("foo", roles.get(1)); - Assert.assertEquals("bar", roles.get(2)); - } - - @Test - public void testRedeploy() throws Exception - { - - deployer.setElement(XMLUtil.stringToElement(BasicUserCredentialsDeployerTest.singleUserXml)); - deployer.redeploy(url); - - Assert.assertNull(securityManager.defaultUser); - - User user = securityManager.users.get("guest"); - Assert.assertNotNull(user); - Assert.assertEquals("guest", user.user); - Assert.assertEquals("guest", user.password); - List roles = securityManager.roles.get("guest"); - Assert.assertNotNull(roles); - Assert.assertEquals(1, roles.size()); - Assert.assertEquals("guest", roles.get(0)); - } - - @Test - public void testRedeploySingleUser() throws Exception - { - - deployer.setElement(XMLUtil.stringToElement(BasicUserCredentialsDeployerTest.multipleUserXml)); - deployer.deploy(url); - - deployer.setElement(XMLUtil.stringToElement(BasicUserCredentialsDeployerTest.singleUserXml)); - deployer.redeploy(url); - - Assert.assertNull(securityManager.defaultUser); - - User user = securityManager.users.get("guest"); - Assert.assertNotNull(user); - Assert.assertEquals("guest", user.user); - Assert.assertEquals("guest", user.password); - List roles = securityManager.roles.get("guest"); - Assert.assertNotNull(roles); - Assert.assertEquals(1, roles.size()); - Assert.assertEquals("guest", roles.get(0)); - - user = securityManager.users.get("anotherguest"); - Assert.assertNull(user); - roles = securityManager.roles.get("anotherguest"); - Assert.assertNull(roles); - } - - @Test - public void testRedeployMultipleUser() throws Exception - { - - deployer.setElement(XMLUtil.stringToElement(BasicUserCredentialsDeployerTest.singleUserXml)); - deployer.deploy(url); - - deployer.setElement(XMLUtil.stringToElement(BasicUserCredentialsDeployerTest.multipleUserXml)); - deployer.redeploy(url); - - Assert.assertNull(securityManager.defaultUser); - - User user = securityManager.users.get("guest"); - Assert.assertNotNull(user); - Assert.assertEquals("guest", user.user); - Assert.assertEquals("guest", user.password); - List roles = securityManager.roles.get("guest"); - Assert.assertNotNull(roles); - Assert.assertEquals(2, roles.size()); - Assert.assertEquals("guest", roles.get(0)); - Assert.assertEquals("foo", roles.get(1)); - - user = securityManager.users.get("anotherguest"); - Assert.assertNotNull(user); - Assert.assertEquals("anotherguest", user.user); - Assert.assertEquals("anotherguest", user.password); - roles = securityManager.roles.get("anotherguest"); - Assert.assertNotNull(roles); - Assert.assertEquals(3, roles.size()); - Assert.assertEquals("anotherguest", roles.get(0)); - Assert.assertEquals("foo", roles.get(1)); - Assert.assertEquals("bar", roles.get(2)); - } - - class FakeDeployer extends BasicUserCredentialsDeployer - { - private Element element; - - public FakeDeployer(DeploymentManager deploymentManager, ActiveMQSecurityManager activeMQSecurityManager) - { - super(deploymentManager, activeMQSecurityManager); - } - - public Element getElement() - { - return element; - } - - public void setElement(Element element) - { - this.element = element; - } - - @Override - protected Element getRootElement(URI url) throws Exception - { - return this.element; - } - - @Override - public void validate(Node rootNode) throws Exception - { - - } - } - - class FakeActiveMQUpdateableSecurityManager implements ActiveMQSecurityManager - { - String defaultUser; - - private final Map users = new HashMap(); - - private final Map> roles = new HashMap>(); - - public void addUser(final String user, final String password) - { - if (user == null) - { - throw new IllegalArgumentException("User cannot be null"); - } - if (password == null) - { - throw new IllegalArgumentException("password cannot be null"); - } - users.put(user, new User(user, password)); - } - - public void removeUser(final String user) - { - users.remove(user); - roles.remove(user); - } - - public void addRole(final String user, final String role) - { - if (roles.get(user) == null) - { - roles.put(user, new ArrayList()); - } - roles.get(user).add(role); - } - - public void removeRole(final String user, final String role) - { - if (roles.get(user) == null) - { - return; - } - roles.get(user).remove(role); - } - - public void setDefaultUser(final String username) - { - defaultUser = username; - } - - public boolean validateUser(final String user, final String password) - { - return false; - } - - public boolean validateUserAndRole(final String user, - final String password, - final Set roles, - final CheckType checkType) - { - return false; - } - - public void start() - { - } - - public void stop() - { - } - - public boolean isStarted() - { - return true; - } - } - - static class User - { - final String user; - - final String password; - - User(final String user, final String password) - { - this.user = user; - this.password = password; - } - - @Override - public boolean equals(final Object o) - { - if (this == o) - { - return true; - } - if (o == null || getClass() != o.getClass()) - { - return false; - } - - User user1 = (User)o; - - if (!user.equals(user1.user)) - { - return false; - } - - return true; - } - - @Override - public int hashCode() - { - return user.hashCode(); - } - - public boolean isValid(final String user, final String password) - { - if (user == null) - { - return false; - } - return this.user.equals(user) && this.password.equals(password); - } - } -} \ No newline at end of file diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/deployers/impl/FakeDeploymentManager.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/deployers/impl/FakeDeploymentManager.java deleted file mode 100644 index d5447cefc2..0000000000 --- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/deployers/impl/FakeDeploymentManager.java +++ /dev/null @@ -1,51 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.activemq.tests.unit.core.deployers.impl; - -import org.apache.activemq.core.deployers.Deployer; -import org.apache.activemq.core.deployers.DeploymentManager; - -/** - * @author Andy Taylor -*/ -class FakeDeploymentManager implements DeploymentManager -{ - private boolean started; - - public boolean isStarted() - { - return started; - } - - public void start() throws Exception - { - started = true; - } - - public void stop() throws Exception - { - started = false; - } - - public void registerDeployer(final Deployer deployer) throws Exception - { - } - - public void unregisterDeployer(final Deployer deployer) throws Exception - { - } -} diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/deployers/impl/FileDeploymentManagerTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/deployers/impl/FileDeploymentManagerTest.java deleted file mode 100644 index 96a23fcedd..0000000000 --- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/deployers/impl/FileDeploymentManagerTest.java +++ /dev/null @@ -1,439 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.activemq.tests.unit.core.deployers.impl; - -import java.io.File; -import java.net.URI; -import java.util.Map; - -import org.apache.activemq.api.core.Pair; -import org.apache.activemq.core.deployers.Deployer; -import org.apache.activemq.core.deployers.impl.FileDeploymentManager; -import org.apache.activemq.core.deployers.impl.FileDeploymentManager.DeployInfo; -import org.apache.activemq.tests.unit.UnitTestLogger; -import org.apache.activemq.tests.util.UnitTestCase; -import org.junit.Assert; -import org.junit.Test; - -/** - * A FileDeploymentManagerTest - * - * @author Tim Fox - */ -public class FileDeploymentManagerTest extends UnitTestCase -{ - @Test - public void testStartStop1() throws Exception - { - testStartStop1("fdm_test_file.xml"); - } - - @Test - public void testStartStop2() throws Exception - { - testStartStop2("fdm_test_file.xml"); - } - - @Test - public void testStartStop1WithWhitespace() throws Exception - { - testStartStop1("fdm test file.xml"); - if (!isWindows()) - { - testStartStop1("fdm\ttest\tfile.xml"); - } - } - - @Test - public void testStartStop2WithWhitespace() throws Exception - { - testStartStop2("fdm test file.xml"); - if (!isWindows()) - { - testStartStop2("fdm\ttest\tfile.xml"); - } - } - - private void testStartStop1(final String filename) throws Exception - { - FileDeploymentManager fdm = new FileDeploymentManager(Long.MAX_VALUE); - - UnitTestLogger.LOGGER.debug("Filename is " + filename); - - File file = new File("target/test-classes/"); - - file.mkdirs(); - - file = new File("target/test-classes/" + filename); - - UnitTestLogger.LOGGER.debug(file.getAbsoluteFile()); - - file.createNewFile(); - - FakeDeployer deployer = new FakeDeployer(filename); - - fdm.registerDeployer(deployer); - - fdm.unregisterDeployer(deployer); - - fdm.registerDeployer(deployer); - - fdm.start(); - try - { - URI expected = file.toURI(); - URI deployedUrl = deployer.deployedUri; - Assert.assertTrue(expected.toString().equalsIgnoreCase(deployedUrl.toString())); - deployer.deployedUri = null; - fdm.start(); - Assert.assertNull(deployer.deployedUri); - fdm.stop(); - - } - finally - { - file.delete(); - fdm.stop(); - } - } - - private void testStartStop2(final String filename) throws Exception - { - FileDeploymentManager fdm = new FileDeploymentManager(Long.MAX_VALUE); - - UnitTestLogger.LOGGER.debug("Filename is " + filename); - - File file = new File("target/test-classes/"); - - file.mkdirs(); - - file = new File("target/test-classes/" + filename); - - UnitTestLogger.LOGGER.debug(file.getAbsoluteFile()); - - file.createNewFile(); - - FakeDeployer deployer = new FakeDeployer(filename); - - fdm.start(); - - try - { - fdm.registerDeployer(deployer); - URI expected = file.toURI(); - URI deployedUrl = deployer.deployedUri; - Assert.assertTrue(expected.toString().equalsIgnoreCase(deployedUrl.toString())); - deployer.deployedUri = null; - fdm.start(); - Assert.assertNull(deployer.deployedUri); - fdm.stop(); - } - finally - { - file.delete(); - fdm.stop(); - } - } - - @Test - public void testRegisterUnregister() throws Exception - { - FileDeploymentManager fdm = new FileDeploymentManager(Long.MAX_VALUE); - - fdm.start(); - - String filename1 = "fdm_test_file.xml1"; - String filename2 = "fdm_test_file.xml2"; - String filename3 = "fdm_test_file.xml3"; - - File file1 = new File("target/test-classes/"); - File file2 = new File("target/test-classes/"); - File file3 = new File("target/test-classes/"); - - file1.mkdirs(); - file2.mkdirs(); - file3.mkdirs(); - - file1 = new File("target/test-classes/" + filename1); - file2 = new File("target/test-classes/" + filename2); - file3 = new File("target/test-classes/" + filename3); - - file1.createNewFile(); - file2.createNewFile(); - file3.createNewFile(); - - FakeDeployer deployer1 = new FakeDeployer(filename1); - FakeDeployer deployer2 = new FakeDeployer(filename2); - FakeDeployer deployer3 = new FakeDeployer(filename3); - FakeDeployer deployer4 = new FakeDeployer(filename3); // Can have multiple deployers on the same file - try - { - URI url1 = file1.toURI(); - deployer1.deploy(url1); - - URI url2 = file2.toURI(); - deployer2.deploy(url2); - - URI url3 = file3.toURI(); - deployer3.deploy(url3); - - deployer4.deploy(url3); - - fdm.registerDeployer(deployer1); - fdm.registerDeployer(deployer2); - fdm.registerDeployer(deployer3); - fdm.registerDeployer(deployer4); - - Assert.assertEquals(4, fdm.getDeployers().size()); - Assert.assertTrue(fdm.getDeployers().contains(deployer1)); - Assert.assertTrue(fdm.getDeployers().contains(deployer2)); - Assert.assertTrue(fdm.getDeployers().contains(deployer3)); - Assert.assertTrue(fdm.getDeployers().contains(deployer4)); - Assert.assertEquals(4, fdm.getDeployed().size()); - - Assert.assertEquals(file1.toURI(), deployer1.deployedUri); - Assert.assertEquals(file2.toURI(), deployer2.deployedUri); - Assert.assertEquals(file3.toURI(), deployer3.deployedUri); - Assert.assertEquals(file3.toURI(), deployer4.deployedUri); - // Registering same again should do nothing - - fdm.registerDeployer(deployer1); - - Assert.assertEquals(4, fdm.getDeployers().size()); - Assert.assertTrue(fdm.getDeployers().contains(deployer1)); - Assert.assertTrue(fdm.getDeployers().contains(deployer2)); - Assert.assertTrue(fdm.getDeployers().contains(deployer3)); - Assert.assertTrue(fdm.getDeployers().contains(deployer4)); - Assert.assertEquals(4, fdm.getDeployed().size()); - - fdm.unregisterDeployer(deployer1); - - Assert.assertEquals(3, fdm.getDeployers().size()); - Assert.assertTrue(fdm.getDeployers().contains(deployer2)); - Assert.assertTrue(fdm.getDeployers().contains(deployer3)); - Assert.assertTrue(fdm.getDeployers().contains(deployer4)); - Assert.assertEquals(3, fdm.getDeployed().size()); - - fdm.unregisterDeployer(deployer2); - fdm.unregisterDeployer(deployer3); - - Assert.assertEquals(1, fdm.getDeployers().size()); - Assert.assertTrue(fdm.getDeployers().contains(deployer4)); - Assert.assertEquals(1, fdm.getDeployed().size()); - - fdm.unregisterDeployer(deployer4); - - Assert.assertEquals(0, fdm.getDeployers().size()); - Assert.assertEquals(0, fdm.getDeployed().size()); - - // Now unregister again - should do nothing - - fdm.unregisterDeployer(deployer1); - - Assert.assertEquals(0, fdm.getDeployers().size()); - Assert.assertEquals(0, fdm.getDeployed().size()); - } - finally - { - file1.delete(); - file2.delete(); - file3.delete(); - fdm.stop(); - } - - } - - @Test - public void testRedeploy() throws Exception - { - FileDeploymentManager fdm = new FileDeploymentManager(Long.MAX_VALUE); - - fdm.start(); - - String filename = "fdm_test_file.xml1"; - - File file = new File("target/test-classes/"); - - file.mkdirs(); - - file = new File("target/test-classes/" + filename); - - file.createNewFile(); - long oldLastModified = file.lastModified(); - - FakeDeployer deployer = new FakeDeployer(filename); - try - { - URI url = file.toURI(); - deployer.deploy(url); - - fdm.registerDeployer(deployer); - Assert.assertEquals(file.toURI(), deployer.deployedUri); - // Touch the file - file.setLastModified(oldLastModified + 1000); - - deployer.redeploy(url); - - fdm.run(); - - Assert.assertEquals(1, fdm.getDeployers().size()); - Assert.assertTrue(fdm.getDeployers().contains(deployer)); - Map, DeployInfo> info = fdm.getDeployed(); - Assert.assertEquals(1, info.size()); - URI expected = file.toURI(); - URI deployedUrl = deployer.deployedUri; - Assert.assertTrue(expected.toString().equalsIgnoreCase(deployedUrl.toString())); - Pair pair = new Pair(url, deployer); - Assert.assertEquals(oldLastModified + 1000, fdm.getDeployed().get(pair).lastModified); - deployer.reDeployedUri = null; - // Scanning again should not redeploy - - fdm.run(); - - Assert.assertEquals(oldLastModified + 1000, fdm.getDeployed().get(pair).lastModified); - Assert.assertNull(deployer.reDeployedUri); - } - finally - { - file.delete(); - fdm.stop(); - } - } - - @Test - public void testUndeployAndDeployAgain() throws Exception - { - FileDeploymentManager fdm = new FileDeploymentManager(Long.MAX_VALUE); - - fdm.start(); - - String filename = "fdm_test_file.xml1"; - - File file = new File("target/test-classes/"); - - file.mkdirs(); - - file = new File("target/test-classes/" + filename); - - file.createNewFile(); - - FakeDeployer deployer = new FakeDeployer(filename); - try - { - URI uri = file.toURI(); - deployer.deploy(uri); - - fdm.registerDeployer(deployer); - - Assert.assertEquals(1, fdm.getDeployers().size()); - Assert.assertTrue(fdm.getDeployers().contains(deployer)); - Assert.assertEquals(1, fdm.getDeployed().size()); - Assert.assertEquals(file.toURI(), deployer.deployedUri); - deployer.deployedUri = null; - file.delete(); - - // This should cause undeployment - - deployer.undeploy(uri); - Assert.assertEquals(file.toURI(), deployer.unDeployedUri); - - fdm.run(); - - Assert.assertEquals(1, fdm.getDeployers().size()); - Assert.assertTrue(fdm.getDeployers().contains(deployer)); - Assert.assertEquals(0, fdm.getDeployed().size()); - - // Recreate file and it should be redeployed - - file.createNewFile(); - - deployer.deploy(uri); - - fdm.run(); - - Assert.assertEquals(1, fdm.getDeployers().size()); - Assert.assertTrue(fdm.getDeployers().contains(deployer)); - Assert.assertEquals(1, fdm.getDeployed().size()); - - Assert.assertEquals(file.toURI(), deployer.deployedUri); - } - finally - { - file.delete(); - fdm.stop(); - } - } - - class FakeDeployer implements Deployer - { - URI deployedUri; - - URI unDeployedUri; - - URI reDeployedUri; - - boolean started; - - private final String file; - - public FakeDeployer(final String file) - { - this.file = file; - } - - public String[] getConfigFileNames() - { - return new String[]{file}; - } - - @Override - public void deploy(final URI url) throws Exception - { - deployedUri = url; - } - - @Override - public void redeploy(final URI url) throws Exception - { - reDeployedUri = url; - } - - @Override - public void undeploy(final URI url) throws Exception - { - unDeployedUri = url; - } - - @Override - public void start() throws Exception - { - started = true; - } - - @Override - public void stop() throws Exception - { - started = false; - } - - @Override - public boolean isStarted() - { - return started; - } - } -} diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/deployers/impl/SecurityDeployerTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/deployers/impl/SecurityDeployerTest.java deleted file mode 100644 index e16519ec88..0000000000 --- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/deployers/impl/SecurityDeployerTest.java +++ /dev/null @@ -1,317 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.activemq.tests.unit.core.deployers.impl; - -import java.util.HashSet; -import java.util.Set; - -import org.apache.activemq.core.deployers.DeploymentManager; -import org.apache.activemq.core.deployers.impl.SecurityDeployer; -import org.apache.activemq.core.security.Role; -import org.apache.activemq.core.settings.HierarchicalRepository; -import org.apache.activemq.core.settings.impl.HierarchicalObjectRepository; -import org.apache.activemq.tests.util.UnitTestCase; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; -import org.w3c.dom.Element; -import org.w3c.dom.NodeList; - -/** - * @author Andy Taylor - */ -public class SecurityDeployerTest extends UnitTestCase -{ - private SecurityDeployer deployer; - - private final String conf = "\n" + " \n" - + " \n" - + " \n" - + " \n" - + " \n" - + " "; - - private final String confWithWhiteSpace1 = "\n" - + " \n" - + " \n" - + " \n" - + " \n" - - + " \n" - + " \n" - + " \n" - + " \n" - + " "; - - private final String confWithWhiteSpace2 = "\n" - + " \n" - + " \n" - + " \n" - + " \n" - - + " \n" - + " \n" - + " \n" - + " "; - - private final String conf2 = "\n" - + " \n" - + " \n" - + " \n" - + " \n" - + " "; - - private final String noRoles = " \n" + " "; - - private HierarchicalRepository> repository; - - @Override - @Before - public void setUp() throws Exception - { - super.setUp(); - - repository = new HierarchicalObjectRepository>(); - DeploymentManager deploymentManager = new FakeDeploymentManager(); - deployer = new SecurityDeployer(deploymentManager, repository); - } - - @Test - public void testSingle() throws Exception - { - Element e = org.apache.activemq.utils.XMLUtil.stringToElement(conf); - deployer.deploy(e); - HashSet roles = (HashSet) repository.getMatch("jms.topic.testTopic"); - Assert.assertNotNull(roles); - Assert.assertEquals(3, roles.size()); - for (Role role : roles) - { - if (role.getName().equals("guest")) - { - Assert.assertTrue(role.isConsume()); - Assert.assertFalse(role.isCreateDurableQueue()); - Assert.assertFalse(role.isCreateNonDurableQueue()); - Assert.assertFalse(role.isDeleteDurableQueue()); - Assert.assertFalse(role.isDeleteNonDurableQueue()); - Assert.assertTrue(role.isManage()); - Assert.assertTrue(role.isSend()); - } - else if (role.getName().equals("publisher")) - { - Assert.assertTrue(role.isConsume()); - Assert.assertFalse(role.isCreateDurableQueue()); - Assert.assertFalse(role.isCreateNonDurableQueue()); - Assert.assertFalse(role.isDeleteDurableQueue()); - Assert.assertFalse(role.isDeleteNonDurableQueue()); - Assert.assertTrue(role.isManage()); - Assert.assertTrue(role.isSend()); - } - else if (role.getName().equals("durpublisher")) - { - Assert.assertTrue(role.isConsume()); - Assert.assertTrue(role.isCreateDurableQueue()); - Assert.assertFalse(role.isCreateNonDurableQueue()); - Assert.assertTrue(role.isDeleteDurableQueue()); - Assert.assertFalse(role.isDeleteNonDurableQueue()); - Assert.assertTrue(role.isManage()); - Assert.assertTrue(role.isSend()); - } - else - { - Assert.fail("unexpected role"); - } - } - } - - @Test - public void testWithWhiteSpace1() throws Exception - { - testWithWhiteSpace(confWithWhiteSpace1); - } - - @Test - public void testWithWhiteSpace2() throws Exception - { - testWithWhiteSpace(confWithWhiteSpace2); - } - - private void testWithWhiteSpace(String conf) throws Exception - { - Element e = org.apache.activemq.utils.XMLUtil.stringToElement(confWithWhiteSpace1); - deployer.deploy(e); - HashSet roles = (HashSet) repository.getMatch("jms.topic.testTopic"); - Assert.assertNotNull(roles); - Assert.assertEquals(3, roles.size()); - for (Role role : roles) - { - if (role.getName().equals("guest")) - { - Assert.assertTrue(role.isConsume()); - Assert.assertTrue(role.isCreateDurableQueue()); - Assert.assertTrue(role.isCreateNonDurableQueue()); - Assert.assertTrue(role.isDeleteDurableQueue()); - Assert.assertTrue(role.isDeleteNonDurableQueue()); - Assert.assertTrue(role.isManage()); - Assert.assertTrue(role.isSend()); - } - else if (role.getName().equals("publisher")) - { - Assert.assertTrue(role.isConsume()); - Assert.assertTrue(role.isCreateDurableQueue()); - Assert.assertTrue(role.isCreateNonDurableQueue()); - Assert.assertTrue(role.isDeleteDurableQueue()); - Assert.assertTrue(role.isDeleteNonDurableQueue()); - Assert.assertTrue(role.isManage()); - Assert.assertTrue(role.isSend()); - } - else if (role.getName().equals("durpublisher")) - { - Assert.assertTrue(role.isConsume()); - Assert.assertTrue(role.isCreateDurableQueue()); - Assert.assertTrue(role.isCreateNonDurableQueue()); - Assert.assertTrue(role.isDeleteDurableQueue()); - Assert.assertTrue(role.isDeleteNonDurableQueue()); - Assert.assertTrue(role.isManage()); - Assert.assertTrue(role.isSend()); - } - else - { - Assert.fail("unexpected role"); - } - } - } - - @Test - public void testMultiple() throws Exception - { - deployer.deploy(org.apache.activemq.utils.XMLUtil.stringToElement(conf)); - deployer.deploy(org.apache.activemq.utils.XMLUtil.stringToElement(conf2)); - HashSet roles = (HashSet) repository.getMatch("jms.topic.testTopic"); - Assert.assertNotNull(roles); - Assert.assertEquals(3, roles.size()); - for (Role role : roles) - { - if (role.getName().equals("guest")) - { - Assert.assertTrue(role.isConsume()); - Assert.assertFalse(role.isCreateDurableQueue()); - Assert.assertFalse(role.isCreateNonDurableQueue()); - Assert.assertFalse(role.isDeleteDurableQueue()); - Assert.assertFalse(role.isDeleteNonDurableQueue()); - Assert.assertTrue(role.isManage()); - Assert.assertTrue(role.isSend()); - } - else if (role.getName().equals("publisher")) - { - Assert.assertTrue(role.isConsume()); - Assert.assertFalse(role.isCreateDurableQueue()); - Assert.assertFalse(role.isCreateNonDurableQueue()); - Assert.assertFalse(role.isDeleteDurableQueue()); - Assert.assertFalse(role.isDeleteNonDurableQueue()); - Assert.assertTrue(role.isManage()); - Assert.assertTrue(role.isSend()); - } - else if (role.getName().equals("durpublisher")) - { - Assert.assertTrue(role.isConsume()); - Assert.assertTrue(role.isCreateDurableQueue()); - Assert.assertFalse(role.isCreateNonDurableQueue()); - Assert.assertTrue(role.isDeleteDurableQueue()); - Assert.assertFalse(role.isDeleteNonDurableQueue()); - Assert.assertTrue(role.isManage()); - Assert.assertTrue(role.isSend()); - } - else - { - Assert.fail("unexpected role"); - } - } - roles = (HashSet) repository.getMatch("jms.topic.testQueue"); - Assert.assertNotNull(roles); - Assert.assertEquals(3, roles.size()); - for (Role role : roles) - { - if (role.getName().equals("guest")) - { - Assert.assertTrue(role.isConsume()); - Assert.assertFalse(role.isCreateDurableQueue()); - Assert.assertFalse(role.isCreateNonDurableQueue()); - Assert.assertFalse(role.isDeleteDurableQueue()); - Assert.assertFalse(role.isDeleteNonDurableQueue()); - Assert.assertFalse(role.isManage()); - Assert.assertTrue(role.isSend()); - } - else if (role.getName().equals("publisher")) - { - Assert.assertTrue(role.isConsume()); - Assert.assertFalse(role.isCreateDurableQueue()); - Assert.assertFalse(role.isCreateNonDurableQueue()); - Assert.assertFalse(role.isDeleteDurableQueue()); - Assert.assertFalse(role.isDeleteNonDurableQueue()); - Assert.assertFalse(role.isManage()); - Assert.assertTrue(role.isSend()); - } - else if (role.getName().equals("durpublisher")) - { - Assert.assertTrue(role.isConsume()); - Assert.assertFalse(role.isCreateDurableQueue()); - Assert.assertTrue(role.isCreateNonDurableQueue()); - Assert.assertFalse(role.isDeleteDurableQueue()); - Assert.assertTrue(role.isDeleteNonDurableQueue()); - Assert.assertFalse(role.isManage()); - Assert.assertTrue(role.isSend()); - } - else - { - Assert.fail("unexpected role"); - } - } - } - - @Test - public void testNoRolesAdded() throws Exception - { - deployer.deploy(org.apache.activemq.utils.XMLUtil.stringToElement(noRoles)); - HashSet roles = (HashSet) repository.getMatch("jms.topic.testQueue"); - Assert.assertNull(roles); - } - - @Test - public void testDeployFromConfigurationFile() throws Exception - { - String xml = " " + "" - + " " - + " " - + " " - + " " - + " " - + " " - + " " - + "" - + ""; - - Element rootNode = org.apache.activemq.utils.XMLUtil.stringToElement(xml); - deployer.validate(rootNode); - NodeList securityNodes = rootNode.getElementsByTagName("security-setting"); - Assert.assertEquals(1, securityNodes.getLength()); - - deployer.deploy(securityNodes.item(0)); - HashSet roles = (HashSet) repository.getMatch("jms.topic.testTopic"); - Assert.assertNotNull(roles); - Assert.assertEquals(3, roles.size()); - } -} diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/deployers/impl/XMLDeployerTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/deployers/impl/XMLDeployerTest.java deleted file mode 100644 index 1d4b3b7539..0000000000 --- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/deployers/impl/XMLDeployerTest.java +++ /dev/null @@ -1,267 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.activemq.tests.unit.core.deployers.impl; - -import java.net.URI; -import java.util.ArrayList; -import java.util.HashMap; - -import org.apache.activemq.core.deployers.impl.XmlDeployer; -import org.apache.activemq.tests.util.UnitTestCase; -import org.apache.activemq.utils.XMLUtil; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; -import org.w3c.dom.Element; -import org.w3c.dom.Node; - -/** - * tests the abstract xml deployer class - * - * @author Andy Taylor - */ -public class XMLDeployerTest extends UnitTestCase -{ - private static final String conf1 = "\n" + " content1\n" - + " content2\n" - + " content3\n" - + " content4\n" - + ""; - - private static final String conf2 = "\n" + " content1\n" - + " contenthaschanged2\n" - + " contenthaschanged3\n" - + " content4\n" - + ""; - - private static final String conf3 = "\n" + " content1\n" - + " contenthaschanged2\n" - + ""; - - private static final String conf4 = "\n" + " content1\n" - + " content2\n" - + " content3\n" - + " content4\n" - + " content5\n" - + " content6\n" - + ""; - - private URI url; - - @Override - @Before - public void setUp() throws Exception - { - super.setUp(); - url = new URI("http://localhost"); - } - - @Test - public void testDeploy() throws Exception - { - Element e = XMLUtil.stringToElement(XMLDeployerTest.conf1); - TestDeployer testDeployer = new TestDeployer(); - testDeployer.setElement(e); - testDeployer.deploy(url); - Assert.assertEquals(testDeployer.getDeployments(), 4); - Assert.assertNotNull(testDeployer.getNodes().get("test1")); - Assert.assertNotNull(testDeployer.getNodes().get("test2")); - Assert.assertNotNull(testDeployer.getNodes().get("test3")); - Assert.assertNotNull(testDeployer.getNodes().get("test4")); - Assert.assertEquals(testDeployer.getNodes().get("test1").getTextContent(), "content1"); - Assert.assertEquals(testDeployer.getNodes().get("test2").getTextContent(), "content2"); - Assert.assertEquals(testDeployer.getNodes().get("test3").getTextContent(), "content3"); - Assert.assertEquals(testDeployer.getNodes().get("test4").getTextContent(), "content4"); - } - - @Test - public void testRedeploy() throws Exception - { - Element e = XMLUtil.stringToElement(XMLDeployerTest.conf1); - TestDeployer testDeployer = new TestDeployer(); - testDeployer.setElement(e); - testDeployer.deploy(url); - e = org.apache.activemq.utils.XMLUtil.stringToElement(XMLDeployerTest.conf2); - testDeployer.setElement(e); - testDeployer.redeploy(url); - Assert.assertEquals(testDeployer.getDeployments(), 4); - Assert.assertNotNull(testDeployer.getNodes().get("test1")); - Assert.assertNotNull(testDeployer.getNodes().get("test2")); - Assert.assertNotNull(testDeployer.getNodes().get("test3")); - Assert.assertNotNull(testDeployer.getNodes().get("test4")); - Assert.assertEquals(testDeployer.getNodes().get("test1").getTextContent(), "content1"); - Assert.assertEquals(testDeployer.getNodes().get("test2").getTextContent(), "contenthaschanged2"); - Assert.assertEquals(testDeployer.getNodes().get("test3").getTextContent(), "contenthaschanged3"); - Assert.assertEquals(testDeployer.getNodes().get("test4").getTextContent(), "content4"); - } - - @Test - public void testRedeployRemovingNodes() throws Exception - { - Element e = XMLUtil.stringToElement(XMLDeployerTest.conf1); - TestDeployer testDeployer = new TestDeployer(); - testDeployer.setElement(e); - testDeployer.deploy(url); - e = org.apache.activemq.utils.XMLUtil.stringToElement(XMLDeployerTest.conf3); - testDeployer.setElement(e); - testDeployer.redeploy(url); - Assert.assertEquals(testDeployer.getDeployments(), 2); - Assert.assertNotNull(testDeployer.getNodes().get("test1")); - Assert.assertNotNull(testDeployer.getNodes().get("test2")); - Assert.assertNull(testDeployer.getNodes().get("test3")); - Assert.assertNull(testDeployer.getNodes().get("test4")); - Assert.assertEquals(testDeployer.getNodes().get("test1").getTextContent(), "content1"); - Assert.assertEquals(testDeployer.getNodes().get("test2").getTextContent(), "contenthaschanged2"); - } - - @Test - public void testRedeployAddingNodes() throws Exception - { - Element e = XMLUtil.stringToElement(XMLDeployerTest.conf1); - TestDeployer testDeployer = new TestDeployer(); - testDeployer.setElement(e); - testDeployer.deploy(url); - e = org.apache.activemq.utils.XMLUtil.stringToElement(XMLDeployerTest.conf4); - testDeployer.setElement(e); - testDeployer.redeploy(url); - Assert.assertEquals(testDeployer.getDeployments(), 6); - Assert.assertNotNull(testDeployer.getNodes().get("test1")); - Assert.assertNotNull(testDeployer.getNodes().get("test2")); - Assert.assertNotNull(testDeployer.getNodes().get("test3")); - Assert.assertNotNull(testDeployer.getNodes().get("test4")); - Assert.assertNotNull(testDeployer.getNodes().get("test5")); - Assert.assertNotNull(testDeployer.getNodes().get("test6")); - Assert.assertEquals(testDeployer.getNodes().get("test1").getTextContent(), "content1"); - Assert.assertEquals(testDeployer.getNodes().get("test2").getTextContent(), "content2"); - Assert.assertEquals(testDeployer.getNodes().get("test3").getTextContent(), "content3"); - Assert.assertEquals(testDeployer.getNodes().get("test4").getTextContent(), "content4"); - Assert.assertEquals(testDeployer.getNodes().get("test5").getTextContent(), "content5"); - Assert.assertEquals(testDeployer.getNodes().get("test6").getTextContent(), "content6"); - } - - @Test - public void testUndeploy() throws Exception - { - Element e = org.apache.activemq.utils.XMLUtil.stringToElement(XMLDeployerTest.conf1); - TestDeployer testDeployer = new TestDeployer(); - testDeployer.setElement(e); - testDeployer.deploy(url); - testDeployer.undeploy(url); - Assert.assertEquals(testDeployer.getDeployments(), 0); - Assert.assertNull(testDeployer.getNodes().get("test1")); - Assert.assertNull(testDeployer.getNodes().get("test2")); - Assert.assertNull(testDeployer.getNodes().get("test3")); - Assert.assertNull(testDeployer.getNodes().get("test4")); - } - - class TestDeployer extends XmlDeployer - { - private String elementname = "test"; - - Element element = null; - - private int deployments = 0; - - ArrayList contents = new ArrayList(); - - HashMap nodes = new HashMap(); - - public TestDeployer() - { - super(null); - } - - public HashMap getNodes() - { - return nodes; - } - - public ArrayList getContents() - { - return contents; - } - - public int getDeployments() - { - return deployments; - } - - public String getElementname() - { - return elementname; - } - - public void setElementname(final String elementname) - { - this.elementname = elementname; - } - - public Element getElement() - { - return element; - } - - public void setElement(final Element element) - { - this.element = element; - } - - @Override - public String[] getElementTagName() - { - return new String[]{elementname}; - } - - @Override - public String[] getConfigFileNames() - { - return new String[]{"test"}; - } - - @Override - public String[] getDefaultConfigFileNames() - { - return new String[0]; - } - - @Override - public void validate(final Node rootNode) throws Exception - { - } - - @Override - public void deploy(final Node node) throws Exception - { - deployments++; - contents.add(node.getTextContent()); - nodes.put(node.getAttributes().getNamedItem(XmlDeployer.NAME_ATTR).getNodeValue(), node); - } - - @Override - public void undeploy(final Node node) throws Exception - { - deployments--; - nodes.remove(node.getAttributes().getNamedItem(XmlDeployer.NAME_ATTR).getNodeValue()); - } - - @Override - protected Element getRootElement(final URI url) - { - return element; - } - } -} diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/security/impl/ActiveMQSecurityManagerImplTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/security/impl/ActiveMQSecurityManagerImplTest.java index 52cdbc30a1..b95830645a 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/security/impl/ActiveMQSecurityManagerImplTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/security/impl/ActiveMQSecurityManagerImplTest.java @@ -59,9 +59,9 @@ public class ActiveMQSecurityManagerImplTest extends UnitTestCase @Test public void testDefaultSecurity() { - securityManager.addUser("guest", "guest"); - securityManager.addRole("guest", "guest"); - securityManager.setDefaultUser("guest"); + securityManager.getConfiguration().addUser("guest", "guest"); + securityManager.getConfiguration().addRole("guest", "guest"); + securityManager.getConfiguration().setDefaultUser("guest"); Assert.assertTrue(securityManager.validateUser(null, null)); Assert.assertTrue(securityManager.validateUser("guest", "guest")); HashSet roles = new HashSet(); @@ -89,13 +89,13 @@ public class ActiveMQSecurityManagerImplTest extends UnitTestCase @Test public void testAddingUsers() { - securityManager.addUser("newuser1", "newpassword1"); + securityManager.getConfiguration().addUser("newuser1", "newpassword1"); Assert.assertTrue(securityManager.validateUser("newuser1", "newpassword1")); Assert.assertFalse(securityManager.validateUser("newuser1", "guest")); Assert.assertFalse(securityManager.validateUser("newuser1", null)); try { - securityManager.addUser("newuser2", null); + securityManager.getConfiguration().addUser("newuser2", null); Assert.fail("password cannot be null"); } catch (IllegalArgumentException e) @@ -104,7 +104,7 @@ public class ActiveMQSecurityManagerImplTest extends UnitTestCase } try { - securityManager.addUser(null, "newpassword2"); + securityManager.getConfiguration().addUser(null, "newpassword2"); Assert.fail("password cannot be null"); } catch (IllegalArgumentException e) @@ -116,29 +116,29 @@ public class ActiveMQSecurityManagerImplTest extends UnitTestCase @Test public void testRemovingUsers() { - securityManager.addUser("newuser1", "newpassword1"); + securityManager.getConfiguration().addUser("newuser1", "newpassword1"); Assert.assertTrue(securityManager.validateUser("newuser1", "newpassword1")); - securityManager.removeUser("newuser1"); + securityManager.getConfiguration().removeUser("newuser1"); Assert.assertFalse(securityManager.validateUser("newuser1", "newpassword1")); } @Test public void testRemovingInvalidUsers() { - securityManager.addUser("newuser1", "newpassword1"); + securityManager.getConfiguration().addUser("newuser1", "newpassword1"); Assert.assertTrue(securityManager.validateUser("newuser1", "newpassword1")); - securityManager.removeUser("nonuser"); + securityManager.getConfiguration().removeUser("nonuser"); Assert.assertTrue(securityManager.validateUser("newuser1", "newpassword1")); } @Test public void testAddingRoles() { - securityManager.addUser("newuser1", "newpassword1"); - securityManager.addRole("newuser1", "role1"); - securityManager.addRole("newuser1", "role2"); - securityManager.addRole("newuser1", "role3"); - securityManager.addRole("newuser1", "role4"); + securityManager.getConfiguration().addUser("newuser1", "newpassword1"); + securityManager.getConfiguration().addRole("newuser1", "role1"); + securityManager.getConfiguration().addRole("newuser1", "role2"); + securityManager.getConfiguration().addRole("newuser1", "role3"); + securityManager.getConfiguration().addRole("newuser1", "role4"); HashSet roles = new HashSet(); roles.add(new Role("role1", true, true, true, true, true, true, true)); Assert.assertTrue(securityManager.validateUserAndRole("newuser1", "newpassword1", roles, CheckType.SEND)); @@ -159,13 +159,13 @@ public class ActiveMQSecurityManagerImplTest extends UnitTestCase @Test public void testRemovingRoles() { - securityManager.addUser("newuser1", "newpassword1"); - securityManager.addRole("newuser1", "role1"); - securityManager.addRole("newuser1", "role2"); - securityManager.addRole("newuser1", "role3"); - securityManager.addRole("newuser1", "role4"); - securityManager.removeRole("newuser1", "role2"); - securityManager.removeRole("newuser1", "role4"); + securityManager.getConfiguration().addUser("newuser1", "newpassword1"); + securityManager.getConfiguration().addRole("newuser1", "role1"); + securityManager.getConfiguration().addRole("newuser1", "role2"); + securityManager.getConfiguration().addRole("newuser1", "role3"); + securityManager.getConfiguration().addRole("newuser1", "role4"); + securityManager.getConfiguration().removeRole("newuser1", "role2"); + securityManager.getConfiguration().removeRole("newuser1", "role4"); HashSet roles = new HashSet(); roles.add(new Role("role1", true, true, true, true, true, true, true)); Assert.assertTrue(securityManager.validateUserAndRole("newuser1", "newpassword1", roles, CheckType.SEND));