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 index 6987dc55a2..ae5730adcd 100644 --- 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 @@ -80,7 +80,7 @@ public class JMSServerDeployer extends XmlDeployer @Override public void validate(final Node rootNode) throws Exception { - org.apache.activemq.utils.XMLUtil.validate(rootNode, "schema/hornetq-jms.xsd"); + org.apache.activemq.utils.XMLUtil.validate(rootNode, "schema/activemq-jms.xsd"); } /** diff --git a/activemq-rest/src/test/resources/hornetq-configuration.xml b/activemq-rest/src/test/resources/activemq-configuration.xml similarity index 93% rename from activemq-rest/src/test/resources/hornetq-configuration.xml rename to activemq-rest/src/test/resources/activemq-configuration.xml index 91785802ec..3004a78115 100644 --- a/activemq-rest/src/test/resources/hornetq-configuration.xml +++ b/activemq-rest/src/test/resources/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> false diff --git a/examples/jms/spring-integration/src/main/resources/hornetq-jms.xml b/activemq-rest/src/test/resources/activemq-jms.xml similarity index 88% rename from examples/jms/spring-integration/src/main/resources/hornetq-jms.xml rename to activemq-rest/src/test/resources/activemq-jms.xml index 3461588092..cc3fde7c68 100644 --- a/examples/jms/spring-integration/src/main/resources/hornetq-jms.xml +++ b/activemq-rest/src/test/resources/activemq-jms.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd"> diff --git a/examples/jms/embedded-simple/src/main/resources/hornetq-users.xml b/activemq-rest/src/test/resources/activemq-users.xml similarity index 77% rename from examples/jms/embedded-simple/src/main/resources/hornetq-users.xml rename to activemq-rest/src/test/resources/activemq-users.xml index 4a9e49ae8d..11c115af70 100644 --- a/examples/jms/embedded-simple/src/main/resources/hornetq-users.xml +++ b/activemq-rest/src/test/resources/activemq-users.xml @@ -1,5 +1,5 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-users.xsd"> 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 a35511455d..86ec8c8474 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 @@ -32,7 +32,7 @@ public final class FileConfiguration extends ConfigurationImpl private static final long serialVersionUID = -4766689627675039596L; // Constants ------------------------------------------------------------------------ - private static final String DEFAULT_CONFIGURATION_URL = "hornetq-configuration.xml"; + private static final String DEFAULT_CONFIGURATION_URL = "activemq-configuration.xml"; // For a bridge confirmations must be activated or send acknowledgments won't return public static final int DEFAULT_CONFIRMATION_WINDOW_SIZE = 1024 * 1024; 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 index 4e3d2ff573..8599934894 100644 --- 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 @@ -71,7 +71,7 @@ public class AddressSettingsDeployer extends XmlDeployer @Override public String[] getDefaultConfigFileNames() { - return new String[]{"hornetq-configuration.xml", "hornetq-queues.xml"}; + return new String[]{"activemq-configuration.xml", "activemq-queues.xml"}; } /** 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 index c1acd0aab3..c72f90d836 100644 --- 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 @@ -140,6 +140,6 @@ public class BasicUserCredentialsDeployer extends XmlDeployer @Override public String[] getDefaultConfigFileNames() { - return new String[]{"hornetq-users.xml"}; + 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 b6fecba1fc..739bd4d7a9 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 @@ -69,7 +69,7 @@ import org.w3c.dom.Node; import org.w3c.dom.NodeList; /** - * Parses an XML document according to the {@literal hornetq-configuration.xsd} schema. + * Parses an XML document according to the {@literal activemq-configuration.xsd} schema. * * @author Andy Taylor * @author Tim Fox 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 index cc21cc5dfe..ece4fac248 100644 --- 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 @@ -87,7 +87,7 @@ public class QueueDeployer extends XmlDeployer @Override public String[] getDefaultConfigFileNames() { - return new String[]{"hornetq-configuration.xml", "hornetq-queues.xml"}; + 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 index dece93a9a2..dce1bda9f0 100644 --- 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 @@ -108,6 +108,6 @@ public class SecurityDeployer extends XmlDeployer @Override public String[] getDefaultConfigFileNames() { - return new String[]{"hornetq-configuration.xml", SecurityDeployer.QUEUES_XML}; + return new String[]{"activemq-configuration.xml", SecurityDeployer.QUEUES_XML}; } } diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/embedded/EmbeddedHornetQ.java b/activemq-server/src/main/java/org/apache/activemq/core/server/embedded/EmbeddedHornetQ.java index 6c6540b89e..bd9acde61e 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/embedded/EmbeddedHornetQ.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/server/embedded/EmbeddedHornetQ.java @@ -36,7 +36,7 @@ public class EmbeddedHornetQ protected MBeanServer mbeanServer; /** - * Classpath resource for hornetq server config. Defaults to 'hornetq-configuration.xml'. + * Classpath resource for hornetq server config. Defaults to 'activemq-configuration.xml'. * * @param filename */ @@ -92,7 +92,7 @@ public class EmbeddedHornetQ { if (configuration == null) { - if (configResourcePath == null) configResourcePath = "hornetq-configuration.xml"; + if (configResourcePath == null) configResourcePath = "activemq-configuration.xml"; FileConfiguration config = new FileConfiguration(configResourcePath); config.start(); configuration = config; 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 7d98ad8c37..449cc72024 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 @@ -129,7 +129,7 @@ public class FileConfigurationParserTest extends UnitTestCase private static String firstPart = "\n" + + "xsi:schemaLocation=\"urn:hornetq /schema/activemq-configuration.xsd\">\n" + "HornetQ.main.config" + "\n" + "abackupgroupname" + "\n" + "ascaledowngroupname" + "\n" + diff --git a/activemq-server/src/test/java/org/apache/activemq/core/config/impl/WrongRoleFileConfigurationParserTest.java b/activemq-server/src/test/java/org/apache/activemq/core/config/impl/WrongRoleFileConfigurationParserTest.java index bce79e46c0..610a6960ea 100644 --- a/activemq-server/src/test/java/org/apache/activemq/core/config/impl/WrongRoleFileConfigurationParserTest.java +++ b/activemq-server/src/test/java/org/apache/activemq/core/config/impl/WrongRoleFileConfigurationParserTest.java @@ -62,7 +62,7 @@ public class WrongRoleFileConfigurationParserTest extends UnitTestCase private static final String configuration = "\n" + + "xsi:schemaLocation=\"urn:hornetq /schema/activemq-configuration.xsd\">\n" + "HornetQ.main.config" + "\n" + "anodegroupname" + "\n" + "org.apache.activemq.integration.logging.Log4jLogDelegateFactory" + "\n" + diff --git a/activemq-server/src/test/resources/ConfigurationTest-defaults.xml b/activemq-server/src/test/resources/ConfigurationTest-defaults.xml index 02454d6491..417794f0ae 100644 --- a/activemq-server/src/test/resources/ConfigurationTest-defaults.xml +++ b/activemq-server/src/test/resources/ConfigurationTest-defaults.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq ../../src/schemas/activemq-configuration.xsd "> diff --git a/activemq-server/src/test/resources/ConfigurationTest-full-config.xml b/activemq-server/src/test/resources/ConfigurationTest-full-config.xml index d48240badc..c85572d4ee 100644 --- a/activemq-server/src/test/resources/ConfigurationTest-full-config.xml +++ b/activemq-server/src/test/resources/ConfigurationTest-full-config.xml @@ -1,7 +1,7 @@ + xsi:schemaLocation="urn:hornetq ../../../../hornetq-server/src/main/resources/schema/activemq-configuration.xsd"> SomeNameForUseOnTheApplicationServer false true diff --git a/activemq-server/src/test/resources/InvalidConfigurationTest0.xml b/activemq-server/src/test/resources/InvalidConfigurationTest0.xml index 9a857deeaf..80f3a8a8e2 100644 --- a/activemq-server/src/test/resources/InvalidConfigurationTest0.xml +++ b/activemq-server/src/test/resources/InvalidConfigurationTest0.xml @@ -1,7 +1,7 @@ + xsi:schemaLocation="urn:hornetq ../../src/config/common/schema/activemq-configuration.xsd"> SomeNameForUseOnTheApplicationServer 12345 54321 diff --git a/activemq-server/src/test/resources/InvalidConfigurationTest1.xml b/activemq-server/src/test/resources/InvalidConfigurationTest1.xml index f9ccd7db90..e5555613ff 100644 --- a/activemq-server/src/test/resources/InvalidConfigurationTest1.xml +++ b/activemq-server/src/test/resources/InvalidConfigurationTest1.xml @@ -1,7 +1,7 @@ + xsi:schemaLocation="urn:hornetq ../../src/config/common/schema/activemq-configuration.xsd"> SomeNameForUseOnTheApplicationServer 12345 54321 diff --git a/activemq-server/src/test/resources/InvalidConfigurationTest2.xml b/activemq-server/src/test/resources/InvalidConfigurationTest2.xml index 27b9c2b9b5..bd87e0f482 100644 --- a/activemq-server/src/test/resources/InvalidConfigurationTest2.xml +++ b/activemq-server/src/test/resources/InvalidConfigurationTest2.xml @@ -1,7 +1,7 @@ + xsi:schemaLocation="urn:hornetq ../../src/config/common/schema/activemq-configuration.xsd"> SomeNameForUseOnTheApplicationServer 12345 54321 diff --git a/activemq-server/src/test/resources/InvalidConfigurationTest3.xml b/activemq-server/src/test/resources/InvalidConfigurationTest3.xml index be9633b7fe..93ccd51eb4 100644 --- a/activemq-server/src/test/resources/InvalidConfigurationTest3.xml +++ b/activemq-server/src/test/resources/InvalidConfigurationTest3.xml @@ -1,7 +1,7 @@ + xsi:schemaLocation="urn:hornetq ../../src/config/common/schema/activemq-configuration.xsd"> SomeNameForUseOnTheApplicationServer 12345 54321 diff --git a/activemq-server/src/test/resources/InvalidConfigurationTest4.xml b/activemq-server/src/test/resources/InvalidConfigurationTest4.xml index 61d82008ee..0fab9df147 100644 --- a/activemq-server/src/test/resources/InvalidConfigurationTest4.xml +++ b/activemq-server/src/test/resources/InvalidConfigurationTest4.xml @@ -1,7 +1,7 @@ + xsi:schemaLocation="urn:hornetq ../../src/config/common/schema/activemq-configuration.xsd"> SomeNameForUseOnTheApplicationServer 12345 54321 diff --git a/activemq-server/src/test/resources/InvalidConfigurationTest5.xml b/activemq-server/src/test/resources/InvalidConfigurationTest5.xml index d524a96199..3e2cb684fa 100644 --- a/activemq-server/src/test/resources/InvalidConfigurationTest5.xml +++ b/activemq-server/src/test/resources/InvalidConfigurationTest5.xml @@ -1,7 +1,7 @@ + xsi:schemaLocation="urn:hornetq ../../src/config/common/schema/activemq-configuration.xsd"> SomeNameForUseOnTheApplicationServer 12345 54321 diff --git a/activemq-server/src/test/resources/colocated-hapolicy-config.xml b/activemq-server/src/test/resources/colocated-hapolicy-config.xml index df2be09306..d262764262 100644 --- a/activemq-server/src/test/resources/colocated-hapolicy-config.xml +++ b/activemq-server/src/test/resources/colocated-hapolicy-config.xml @@ -1,7 +1,7 @@ + xsi:schemaLocation="urn:hornetq ../../../../hornetq-server/src/main/resources/schema/activemq-configuration.xsd"> diff --git a/activemq-server/src/test/resources/colocated-hapolicy-config2.xml b/activemq-server/src/test/resources/colocated-hapolicy-config2.xml index 9a6cf5a58e..ac92bdb884 100644 --- a/activemq-server/src/test/resources/colocated-hapolicy-config2.xml +++ b/activemq-server/src/test/resources/colocated-hapolicy-config2.xml @@ -1,7 +1,7 @@ + xsi:schemaLocation="urn:hornetq ../../../../hornetq-server/src/main/resources/schema/activemq-configuration.xsd"> diff --git a/activemq-server/src/test/resources/divertRoutingNameNotRequired.xml b/activemq-server/src/test/resources/divertRoutingNameNotRequired.xml index 3e2fd17d9e..add9e834db 100644 --- a/activemq-server/src/test/resources/divertRoutingNameNotRequired.xml +++ b/activemq-server/src/test/resources/divertRoutingNameNotRequired.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> 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 ff71149c89..55bd266f30 100644 --- a/activemq-server/src/test/resources/live-only-hapolicy-config.xml +++ b/activemq-server/src/test/resources/live-only-hapolicy-config.xml @@ -1,7 +1,7 @@ + xsi:schemaLocation="urn:hornetq ../../../../hornetq-server/src/main/resources/schema/activemq-configuration.xsd"> 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 3fdc398203..13b89b6a47 100644 --- a/activemq-server/src/test/resources/live-only-hapolicy-config2.xml +++ b/activemq-server/src/test/resources/live-only-hapolicy-config2.xml @@ -1,7 +1,7 @@ + xsi:schemaLocation="urn:hornetq ../../../../hornetq-server/src/main/resources/schema/activemq-configuration.xsd"> 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 9c9bdba2dd..b4eedd3a52 100644 --- a/activemq-server/src/test/resources/live-only-hapolicy-config3.xml +++ b/activemq-server/src/test/resources/live-only-hapolicy-config3.xml @@ -1,7 +1,7 @@ + xsi:schemaLocation="urn:hornetq ../../../../hornetq-server/src/main/resources/schema/activemq-configuration.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 8e58f95bef..dded78e745 100644 --- a/activemq-server/src/test/resources/live-only-hapolicy-config4.xml +++ b/activemq-server/src/test/resources/live-only-hapolicy-config4.xml @@ -1,7 +1,7 @@ + xsi:schemaLocation="urn:hornetq ../../../../hornetq-server/src/main/resources/schema/activemq-configuration.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 e70a938156..8619256dd1 100644 --- a/activemq-server/src/test/resources/live-only-hapolicy-config5.xml +++ b/activemq-server/src/test/resources/live-only-hapolicy-config5.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq ../../../../hornetq-server/src/main/resources/schema/activemq-configuration.xsd"> diff --git a/activemq-server/src/test/resources/replica-hapolicy-config.xml b/activemq-server/src/test/resources/replica-hapolicy-config.xml index 814116f4fe..71967ffdc1 100644 --- a/activemq-server/src/test/resources/replica-hapolicy-config.xml +++ b/activemq-server/src/test/resources/replica-hapolicy-config.xml @@ -1,7 +1,7 @@ + xsi:schemaLocation="urn:hornetq ../../../../hornetq-server/src/main/resources/schema/activemq-configuration.xsd"> diff --git a/activemq-server/src/test/resources/replica-hapolicy-config2.xml b/activemq-server/src/test/resources/replica-hapolicy-config2.xml index bd625fa9de..cb515b3425 100644 --- a/activemq-server/src/test/resources/replica-hapolicy-config2.xml +++ b/activemq-server/src/test/resources/replica-hapolicy-config2.xml @@ -1,7 +1,7 @@ + xsi:schemaLocation="urn:hornetq ../../../../hornetq-server/src/main/resources/schema/activemq-configuration.xsd"> diff --git a/activemq-server/src/test/resources/replica-hapolicy-config3.xml b/activemq-server/src/test/resources/replica-hapolicy-config3.xml index 890895671f..4455163575 100644 --- a/activemq-server/src/test/resources/replica-hapolicy-config3.xml +++ b/activemq-server/src/test/resources/replica-hapolicy-config3.xml @@ -1,7 +1,7 @@ + xsi:schemaLocation="urn:hornetq ../../../../hornetq-server/src/main/resources/schema/activemq-configuration.xsd"> diff --git a/activemq-server/src/test/resources/replicated-hapolicy-config.xml b/activemq-server/src/test/resources/replicated-hapolicy-config.xml index eecfd682d2..708f36829f 100644 --- a/activemq-server/src/test/resources/replicated-hapolicy-config.xml +++ b/activemq-server/src/test/resources/replicated-hapolicy-config.xml @@ -1,7 +1,7 @@ + xsi:schemaLocation="urn:hornetq ../../../../hornetq-server/src/main/resources/schema/activemq-configuration.xsd"> 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 6ac07f163a..c83444dc33 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 @@ -1,7 +1,7 @@ + xsi:schemaLocation="urn:hornetq ../../../../hornetq-server/src/main/resources/schema/activemq-configuration.xsd"> 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 4a2f5dd276..fea2f07f5a 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 @@ -1,7 +1,7 @@ + xsi:schemaLocation="urn:hornetq ../../../../hornetq-server/src/main/resources/schema/activemq-configuration.xsd"> 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 afdb8ed948..32c5bfa102 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 @@ -1,7 +1,7 @@ + xsi:schemaLocation="urn:hornetq ../../../../hornetq-server/src/main/resources/schema/activemq-configuration.xsd"> 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 12b01ed25c..11994024bf 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 @@ -1,7 +1,7 @@ + xsi:schemaLocation="urn:hornetq ../../../../hornetq-server/src/main/resources/schema/activemq-configuration.xsd"> 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 41bf59c641..2d5c80d0ab 100644 --- a/distribution/activemq/src/main/resources/config/clustered/activemq-configuration.xml +++ b/distribution/activemq/src/main/resources/config/clustered/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> ${data.dir:../data}/paging diff --git a/distribution/activemq/src/main/resources/config/clustered/activemq-jms.xml b/distribution/activemq/src/main/resources/config/clustered/activemq-jms.xml index d2d13590ba..c5b19ec2dd 100644 --- a/distribution/activemq/src/main/resources/config/clustered/activemq-jms.xml +++ b/distribution/activemq/src/main/resources/config/clustered/activemq-jms.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd"> true diff --git a/distribution/activemq/src/main/resources/config/clustered/activemq-users.xml b/distribution/activemq/src/main/resources/config/clustered/activemq-users.xml index dcaf9800d7..8187c91683 100644 --- a/distribution/activemq/src/main/resources/config/clustered/activemq-users.xml +++ b/distribution/activemq/src/main/resources/config/clustered/activemq-users.xml @@ -1,5 +1,5 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-users.xsd"> 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 2c4246d1b6..b1abb7456d 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 @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> ${data.dir:../data}/paging 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 index d2d13590ba..c5b19ec2dd 100644 --- a/distribution/activemq/src/main/resources/config/non-clustered/activemq-jms.xml +++ b/distribution/activemq/src/main/resources/config/non-clustered/activemq-jms.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd"> true 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 index dcaf9800d7..8187c91683 100644 --- a/distribution/activemq/src/main/resources/config/non-clustered/activemq-users.xml +++ b/distribution/activemq/src/main/resources/config/non-clustered/activemq-users.xml @@ -1,5 +1,5 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-users.xsd"> 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 5071c04bef..448d9a4123 100644 --- a/distribution/activemq/src/main/resources/config/replicated/activemq-configuration.xml +++ b/distribution/activemq/src/main/resources/config/replicated/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> 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 c43c5e3c21..81a1ac62c6 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 @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> diff --git a/docs/eap-manual/en/clusters.xml b/docs/eap-manual/en/clusters.xml index 4b082fe8e1..b5eaa4e921 100644 --- a/docs/eap-manual/en/clusters.xml +++ b/docs/eap-manual/en/clusters.xml @@ -286,7 +286,7 @@ <configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd"> + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> <jmx-domain>org.apache.activemq.backup1</jmx-domain> diff --git a/docs/user-manual/en/large-messages.xml b/docs/user-manual/en/large-messages.xml index 8c2623d7c7..8c11c844d9 100644 --- a/docs/user-manual/en/large-messages.xml +++ b/docs/user-manual/en/large-messages.xml @@ -47,7 +47,7 @@ <configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd"> + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> ... <large-messages-directory>/data/large-messages</large-messages-directory> ... diff --git a/docs/user-manual/en/paging.xml b/docs/user-manual/en/paging.xml index b152a01084..ba82cb0f23 100644 --- a/docs/user-manual/en/paging.xml +++ b/docs/user-manual/en/paging.xml @@ -50,7 +50,7 @@ <configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd"> + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> ... <paging-directory>/somewhere/paging-directory</paging-directory> ... diff --git a/docs/user-manual/en/security.xml b/docs/user-manual/en/security.xml index b6c1ab506b..e9cd18723a 100644 --- a/docs/user-manual/en/security.xml +++ b/docs/user-manual/en/security.xml @@ -151,7 +151,7 @@ <configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:hornetq ../schemas/hornetq-users.xsd "> + xsi:schemaLocation="urn:hornetq ../schemas/activemq-users.xsd "> <defaultuser name="guest" password="guest"> <role name="guest"/> diff --git a/docs/user-manual/en/spring-integration.xml b/docs/user-manual/en/spring-integration.xml index 97e72e1112..2c02972c48 100644 --- a/docs/user-manual/en/spring-integration.xml +++ b/docs/user-manual/en/spring-integration.xml @@ -40,7 +40,7 @@ <configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd"> + xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd"> <!--the connection factory used by the example--> <connection-factory name="ConnectionFactory"> <connectors> diff --git a/docs/user-manual/en/using-jms.xml b/docs/user-manual/en/using-jms.xml index 05ce1c3419..6845db4cef 100644 --- a/docs/user-manual/en/using-jms.xml +++ b/docs/user-manual/en/using-jms.xml @@ -65,7 +65,7 @@ <configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:hornetq ../schemas/hornetq-jms.xsd "> + xsi:schemaLocation="urn:hornetq ../schemas/activemq-jms.xsd "> <connection-factory name="ConnectionFactory"> <connectors> @@ -151,7 +151,7 @@ <configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:hornetq ../schemas/hornetq-jms.xsd "> + xsi:schemaLocation="urn:hornetq ../schemas/activemq-jms.xsd "> <connection-factory name="ConnectionFactory" signature="queue"> <xa>true</xa> diff --git a/docs/user-manual/zh/large-messages.xml b/docs/user-manual/zh/large-messages.xml index f6d52b577a..fdba0caf10 100644 --- a/docs/user-manual/zh/large-messages.xml +++ b/docs/user-manual/zh/large-messages.xml @@ -33,7 +33,7 @@ 这个参数的名字是large-messages-directory： <configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd"> + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> ... diff --git a/docs/user-manual/zh/paging.xml b/docs/user-manual/zh/paging.xml index 436f35b198..fbe4a1f135 100644 --- a/docs/user-manual/zh/paging.xml +++ b/docs/user-manual/zh/paging.xml @@ -38,7 +38,7 @@ 可以定义全局的分页转发参数。 <configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd"> + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> ... diff --git a/docs/user-manual/zh/security.xml b/docs/user-manual/zh/security.xml index 3dc17a780c..db4ded5897 100644 --- a/docs/user-manual/zh/security.xml +++ b/docs/user-manual/zh/security.xml @@ -114,7 +114,7 @@ <configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:hornetq ../schemas/hornetq-users.xsd "> + xsi:schemaLocation="urn:hornetq ../schemas/activemq-users.xsd "> <defaultuser name="guest" password="guest"> <role name="guest"/> diff --git a/docs/user-manual/zh/using-jms.xml b/docs/user-manual/zh/using-jms.xml index 7b4c3bb3f4..2de7b50435 100644 --- a/docs/user-manual/zh/using-jms.xml +++ b/docs/user-manual/zh/using-jms.xml @@ -46,7 +46,7 @@ <configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:hornetq ../schemas/hornetq-jms.xsd "> + xsi:schemaLocation="urn:hornetq ../schemas/activemq-jms.xsd "> <connection-factory name="ConnectionFactory"> <connectors> @@ -129,7 +129,7 @@ <configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:hornetq ../schemas/hornetq-jms.xsd "> + xsi:schemaLocation="urn:hornetq ../schemas/activemq-jms.xsd "> <connection-factory name="ConnectionFactory" signature="queue"> <xa>true</xa> diff --git a/examples/core/perf/src/main/resources/server0/hornetq-configuration.xml b/examples/core/perf/src/main/resources/server0/activemq-configuration.xml similarity index 95% rename from examples/core/perf/src/main/resources/server0/hornetq-configuration.xml rename to examples/core/perf/src/main/resources/server0/activemq-configuration.xml index b8addc47e0..bba7586859 100644 --- a/examples/core/perf/src/main/resources/server0/hornetq-configuration.xml +++ b/examples/core/perf/src/main/resources/server0/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> 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 7fc797f925..a2b63e0903 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 @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> diff --git a/examples/core/twitter-connector/src/main/resources/server0/hornetq-configuration.xml b/examples/core/twitter-connector/src/main/resources/server0/activemq-configuration.xml similarity index 97% rename from examples/core/twitter-connector/src/main/resources/server0/hornetq-configuration.xml rename to examples/core/twitter-connector/src/main/resources/server0/activemq-configuration.xml index 863c73fa2e..7cc1183454 100644 --- a/examples/core/twitter-connector/src/main/resources/server0/hornetq-configuration.xml +++ b/examples/core/twitter-connector/src/main/resources/server0/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> target/server0/data/messaging/bindings diff --git a/examples/core/twitter-connector/src/main/resources/server0/hornetq-jms.xml b/examples/core/twitter-connector/src/main/resources/server0/activemq-jms.xml similarity index 88% rename from examples/core/twitter-connector/src/main/resources/server0/hornetq-jms.xml rename to examples/core/twitter-connector/src/main/resources/server0/activemq-jms.xml index 86a4c75659..112fefcc97 100644 --- a/examples/core/twitter-connector/src/main/resources/server0/hornetq-jms.xml +++ b/examples/core/twitter-connector/src/main/resources/server0/activemq-jms.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd"> diff --git a/examples/core/vertx-connector/src/main/resources/server0/hornetq-users.xml b/examples/core/twitter-connector/src/main/resources/server0/activemq-users.xml similarity index 78% rename from examples/core/vertx-connector/src/main/resources/server0/hornetq-users.xml rename to examples/core/twitter-connector/src/main/resources/server0/activemq-users.xml index dcaf9800d7..8187c91683 100644 --- a/examples/core/vertx-connector/src/main/resources/server0/hornetq-users.xml +++ b/examples/core/twitter-connector/src/main/resources/server0/activemq-users.xml @@ -1,5 +1,5 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-users.xsd"> diff --git a/examples/core/vertx-connector/src/main/resources/server0/hornetq-configuration.xml b/examples/core/vertx-connector/src/main/resources/server0/activemq-configuration.xml similarity index 96% rename from examples/core/vertx-connector/src/main/resources/server0/hornetq-configuration.xml rename to examples/core/vertx-connector/src/main/resources/server0/activemq-configuration.xml index ae4ed83de3..ef963cb93b 100644 --- a/examples/core/vertx-connector/src/main/resources/server0/hornetq-configuration.xml +++ b/examples/core/vertx-connector/src/main/resources/server0/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> target/server0/data/messaging/bindings diff --git a/examples/jms/browser/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/core/vertx-connector/src/main/resources/server0/activemq-jms.xml similarity index 88% rename from examples/jms/browser/src/main/resources/hornetq/server0/hornetq-jms.xml rename to examples/core/vertx-connector/src/main/resources/server0/activemq-jms.xml index 86a4c75659..112fefcc97 100644 --- a/examples/jms/browser/src/main/resources/hornetq/server0/hornetq-jms.xml +++ b/examples/core/vertx-connector/src/main/resources/server0/activemq-jms.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd"> diff --git a/examples/core/twitter-connector/src/main/resources/server0/hornetq-users.xml b/examples/core/vertx-connector/src/main/resources/server0/activemq-users.xml similarity index 78% rename from examples/core/twitter-connector/src/main/resources/server0/hornetq-users.xml rename to examples/core/vertx-connector/src/main/resources/server0/activemq-users.xml index dcaf9800d7..8187c91683 100644 --- a/examples/core/twitter-connector/src/main/resources/server0/hornetq-users.xml +++ b/examples/core/vertx-connector/src/main/resources/server0/activemq-users.xml @@ -1,5 +1,5 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-users.xsd"> diff --git a/examples/jms/aerogear/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/aerogear/src/main/resources/hornetq/server0/activemq-configuration.xml similarity index 96% rename from examples/jms/aerogear/src/main/resources/hornetq/server0/hornetq-configuration.xml rename to examples/jms/aerogear/src/main/resources/hornetq/server0/activemq-configuration.xml index 2e5ee6c796..10eaee947f 100644 --- a/examples/jms/aerogear/src/main/resources/hornetq/server0/hornetq-configuration.xml +++ b/examples/jms/aerogear/src/main/resources/hornetq/server0/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> ${build.directory}/server0/data/messaging/bindings diff --git a/examples/jms/aerogear/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/aerogear/src/main/resources/hornetq/server0/activemq-jms.xml similarity index 88% rename from examples/jms/aerogear/src/main/resources/hornetq/server0/hornetq-jms.xml rename to examples/jms/aerogear/src/main/resources/hornetq/server0/activemq-jms.xml index aad3f72fd5..6ceb6ed173 100644 --- a/examples/jms/aerogear/src/main/resources/hornetq/server0/hornetq-jms.xml +++ b/examples/jms/aerogear/src/main/resources/hornetq/server0/activemq-jms.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd"> diff --git a/examples/jms/applet/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/aerogear/src/main/resources/hornetq/server0/activemq-users.xml similarity index 78% rename from examples/jms/applet/src/main/resources/hornetq/server0/hornetq-users.xml rename to examples/jms/aerogear/src/main/resources/hornetq/server0/activemq-users.xml index dcaf9800d7..8187c91683 100644 --- a/examples/jms/applet/src/main/resources/hornetq/server0/hornetq-users.xml +++ b/examples/jms/aerogear/src/main/resources/hornetq/server0/activemq-users.xml @@ -1,5 +1,5 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-users.xsd"> diff --git a/examples/jms/applet/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/applet/src/main/resources/hornetq/server0/activemq-configuration.xml similarity index 94% rename from examples/jms/applet/src/main/resources/hornetq/server0/hornetq-configuration.xml rename to examples/jms/applet/src/main/resources/hornetq/server0/activemq-configuration.xml index cf8faad94b..b225b59e55 100644 --- a/examples/jms/applet/src/main/resources/hornetq/server0/hornetq-configuration.xml +++ b/examples/jms/applet/src/main/resources/hornetq/server0/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> ${build.directory}/server0/data/messaging/bindings diff --git a/examples/jms/clustered-durable-subscription/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/applet/src/main/resources/hornetq/server0/activemq-jms.xml similarity index 88% rename from examples/jms/clustered-durable-subscription/src/main/resources/hornetq/server0/hornetq-jms.xml rename to examples/jms/applet/src/main/resources/hornetq/server0/activemq-jms.xml index 0cf0008cab..252edadd5e 100644 --- a/examples/jms/clustered-durable-subscription/src/main/resources/hornetq/server0/hornetq-jms.xml +++ b/examples/jms/applet/src/main/resources/hornetq/server0/activemq-jms.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd"> diff --git a/examples/jms/aerogear/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/applet/src/main/resources/hornetq/server0/activemq-users.xml similarity index 78% rename from examples/jms/aerogear/src/main/resources/hornetq/server0/hornetq-users.xml rename to examples/jms/applet/src/main/resources/hornetq/server0/activemq-users.xml index dcaf9800d7..8187c91683 100644 --- a/examples/jms/aerogear/src/main/resources/hornetq/server0/hornetq-users.xml +++ b/examples/jms/applet/src/main/resources/hornetq/server0/activemq-users.xml @@ -1,5 +1,5 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-users.xsd"> diff --git a/examples/jms/application-layer-failover/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/application-layer-failover/src/main/resources/hornetq/server0/activemq-configuration.xml similarity index 94% rename from examples/jms/application-layer-failover/src/main/resources/hornetq/server0/hornetq-configuration.xml rename to examples/jms/application-layer-failover/src/main/resources/hornetq/server0/activemq-configuration.xml index 7f4388bd3b..d2e153f9ec 100644 --- a/examples/jms/application-layer-failover/src/main/resources/hornetq/server0/hornetq-configuration.xml +++ b/examples/jms/application-layer-failover/src/main/resources/hornetq/server0/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> diff --git a/examples/jms/interceptor/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/application-layer-failover/src/main/resources/hornetq/server0/activemq-jms.xml similarity index 88% rename from examples/jms/interceptor/src/main/resources/hornetq/server0/hornetq-jms.xml rename to examples/jms/application-layer-failover/src/main/resources/hornetq/server0/activemq-jms.xml index c2e9a5c7cb..9a03836ef0 100644 --- a/examples/jms/interceptor/src/main/resources/hornetq/server0/hornetq-jms.xml +++ b/examples/jms/application-layer-failover/src/main/resources/hornetq/server0/activemq-jms.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd"> diff --git a/examples/jms/application-layer-failover/src/main/resources/hornetq/server0/activemq-users.xml b/examples/jms/application-layer-failover/src/main/resources/hornetq/server0/activemq-users.xml new file mode 100644 index 0000000000..8187c91683 --- /dev/null +++ b/examples/jms/application-layer-failover/src/main/resources/hornetq/server0/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/examples/jms/application-layer-failover/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/application-layer-failover/src/main/resources/hornetq/server0/hornetq-users.xml deleted file mode 100644 index dcaf9800d7..0000000000 --- a/examples/jms/application-layer-failover/src/main/resources/hornetq/server0/hornetq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/jms/application-layer-failover/src/main/resources/hornetq/server1/hornetq-configuration.xml b/examples/jms/application-layer-failover/src/main/resources/hornetq/server1/activemq-configuration.xml similarity index 94% rename from examples/jms/application-layer-failover/src/main/resources/hornetq/server1/hornetq-configuration.xml rename to examples/jms/application-layer-failover/src/main/resources/hornetq/server1/activemq-configuration.xml index a24cbb3ef1..efb3de2b94 100644 --- a/examples/jms/application-layer-failover/src/main/resources/hornetq/server1/hornetq-configuration.xml +++ b/examples/jms/application-layer-failover/src/main/resources/hornetq/server1/activemq-configuration.xml @@ -1,7 +1,7 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> diff --git a/examples/jms/application-layer-failover/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/application-layer-failover/src/main/resources/hornetq/server1/activemq-jms.xml similarity index 88% rename from examples/jms/application-layer-failover/src/main/resources/hornetq/server0/hornetq-jms.xml rename to examples/jms/application-layer-failover/src/main/resources/hornetq/server1/activemq-jms.xml index c2e9a5c7cb..9a03836ef0 100644 --- a/examples/jms/application-layer-failover/src/main/resources/hornetq/server0/hornetq-jms.xml +++ b/examples/jms/application-layer-failover/src/main/resources/hornetq/server1/activemq-jms.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd"> diff --git a/examples/jms/application-layer-failover/src/main/resources/hornetq/server1/activemq-users.xml b/examples/jms/application-layer-failover/src/main/resources/hornetq/server1/activemq-users.xml new file mode 100644 index 0000000000..8187c91683 --- /dev/null +++ b/examples/jms/application-layer-failover/src/main/resources/hornetq/server1/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/examples/jms/application-layer-failover/src/main/resources/hornetq/server1/hornetq-users.xml b/examples/jms/application-layer-failover/src/main/resources/hornetq/server1/hornetq-users.xml deleted file mode 100644 index dcaf9800d7..0000000000 --- a/examples/jms/application-layer-failover/src/main/resources/hornetq/server1/hornetq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/jms/bridge/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/bridge/src/main/resources/hornetq/server0/activemq-configuration.xml similarity index 97% rename from examples/jms/bridge/src/main/resources/hornetq/server0/hornetq-configuration.xml rename to examples/jms/bridge/src/main/resources/hornetq/server0/activemq-configuration.xml index db3f6d7500..c8c0de8b7d 100644 --- a/examples/jms/bridge/src/main/resources/hornetq/server0/hornetq-configuration.xml +++ b/examples/jms/bridge/src/main/resources/hornetq/server0/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> ${build.directory}/server0/data/messaging/bindings diff --git a/examples/jms/bridge/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/bridge/src/main/resources/hornetq/server0/activemq-jms.xml similarity index 88% rename from examples/jms/bridge/src/main/resources/hornetq/server0/hornetq-jms.xml rename to examples/jms/bridge/src/main/resources/hornetq/server0/activemq-jms.xml index 19319d9585..c1ca248bd8 100644 --- a/examples/jms/bridge/src/main/resources/hornetq/server0/hornetq-jms.xml +++ b/examples/jms/bridge/src/main/resources/hornetq/server0/activemq-jms.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd"> diff --git a/examples/jms/bridge/src/main/resources/hornetq/server0/activemq-users.xml b/examples/jms/bridge/src/main/resources/hornetq/server0/activemq-users.xml new file mode 100644 index 0000000000..8187c91683 --- /dev/null +++ b/examples/jms/bridge/src/main/resources/hornetq/server0/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/examples/jms/bridge/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/bridge/src/main/resources/hornetq/server0/hornetq-users.xml deleted file mode 100644 index dcaf9800d7..0000000000 --- a/examples/jms/bridge/src/main/resources/hornetq/server0/hornetq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/jms/bridge/src/main/resources/hornetq/server1/hornetq-configuration.xml b/examples/jms/bridge/src/main/resources/hornetq/server1/activemq-configuration.xml similarity index 95% rename from examples/jms/bridge/src/main/resources/hornetq/server1/hornetq-configuration.xml rename to examples/jms/bridge/src/main/resources/hornetq/server1/activemq-configuration.xml index cbba610096..8e8bfc19f5 100644 --- a/examples/jms/bridge/src/main/resources/hornetq/server1/hornetq-configuration.xml +++ b/examples/jms/bridge/src/main/resources/hornetq/server1/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> ${build.directory}/server1/data/messaging/bindings diff --git a/examples/jms/bridge/src/main/resources/hornetq/server1/hornetq-jms.xml b/examples/jms/bridge/src/main/resources/hornetq/server1/activemq-jms.xml similarity index 88% rename from examples/jms/bridge/src/main/resources/hornetq/server1/hornetq-jms.xml rename to examples/jms/bridge/src/main/resources/hornetq/server1/activemq-jms.xml index 088d4797ee..b607b992ea 100644 --- a/examples/jms/bridge/src/main/resources/hornetq/server1/hornetq-jms.xml +++ b/examples/jms/bridge/src/main/resources/hornetq/server1/activemq-jms.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd"> diff --git a/examples/jms/bridge/src/main/resources/hornetq/server1/activemq-users.xml b/examples/jms/bridge/src/main/resources/hornetq/server1/activemq-users.xml new file mode 100644 index 0000000000..8187c91683 --- /dev/null +++ b/examples/jms/bridge/src/main/resources/hornetq/server1/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/examples/jms/bridge/src/main/resources/hornetq/server1/hornetq-users.xml b/examples/jms/bridge/src/main/resources/hornetq/server1/hornetq-users.xml deleted file mode 100644 index dcaf9800d7..0000000000 --- a/examples/jms/bridge/src/main/resources/hornetq/server1/hornetq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/jms/browser/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/browser/src/main/resources/hornetq/server0/activemq-configuration.xml similarity index 94% rename from examples/jms/browser/src/main/resources/hornetq/server0/hornetq-configuration.xml rename to examples/jms/browser/src/main/resources/hornetq/server0/activemq-configuration.xml index e4ecf12c55..6f1be9b370 100644 --- a/examples/jms/browser/src/main/resources/hornetq/server0/hornetq-configuration.xml +++ b/examples/jms/browser/src/main/resources/hornetq/server0/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> ${build.directory}/server0/data/messaging/bindings diff --git a/examples/core/vertx-connector/src/main/resources/server0/hornetq-jms.xml b/examples/jms/browser/src/main/resources/hornetq/server0/activemq-jms.xml similarity index 88% rename from examples/core/vertx-connector/src/main/resources/server0/hornetq-jms.xml rename to examples/jms/browser/src/main/resources/hornetq/server0/activemq-jms.xml index 86a4c75659..112fefcc97 100644 --- a/examples/core/vertx-connector/src/main/resources/server0/hornetq-jms.xml +++ b/examples/jms/browser/src/main/resources/hornetq/server0/activemq-jms.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd"> diff --git a/examples/jms/browser/src/main/resources/hornetq/server0/activemq-users.xml b/examples/jms/browser/src/main/resources/hornetq/server0/activemq-users.xml new file mode 100644 index 0000000000..8187c91683 --- /dev/null +++ b/examples/jms/browser/src/main/resources/hornetq/server0/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/examples/jms/browser/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/browser/src/main/resources/hornetq/server0/hornetq-users.xml deleted file mode 100644 index dcaf9800d7..0000000000 --- a/examples/jms/browser/src/main/resources/hornetq/server0/hornetq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/jms/client-kickoff/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/client-kickoff/src/main/resources/hornetq/server0/activemq-configuration.xml similarity index 92% rename from examples/jms/client-kickoff/src/main/resources/hornetq/server0/hornetq-configuration.xml rename to examples/jms/client-kickoff/src/main/resources/hornetq/server0/activemq-configuration.xml index dba0591c5f..ad0ab579d6 100644 --- a/examples/jms/client-kickoff/src/main/resources/hornetq/server0/hornetq-configuration.xml +++ b/examples/jms/client-kickoff/src/main/resources/hornetq/server0/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> ${build.directory}/server0/data/messaging/bindings diff --git a/examples/jms/client-kickoff/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/client-kickoff/src/main/resources/hornetq/server0/activemq-jms.xml similarity index 85% rename from examples/jms/client-kickoff/src/main/resources/hornetq/server0/hornetq-jms.xml rename to examples/jms/client-kickoff/src/main/resources/hornetq/server0/activemq-jms.xml index 2b8be732e3..7463578a5c 100644 --- a/examples/jms/client-kickoff/src/main/resources/hornetq/server0/hornetq-jms.xml +++ b/examples/jms/client-kickoff/src/main/resources/hornetq/server0/activemq-jms.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd"> diff --git a/examples/jms/client-kickoff/src/main/resources/hornetq/server0/activemq-users.xml b/examples/jms/client-kickoff/src/main/resources/hornetq/server0/activemq-users.xml new file mode 100644 index 0000000000..8187c91683 --- /dev/null +++ b/examples/jms/client-kickoff/src/main/resources/hornetq/server0/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/examples/jms/client-kickoff/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/client-kickoff/src/main/resources/hornetq/server0/hornetq-users.xml deleted file mode 100644 index dcaf9800d7..0000000000 --- a/examples/jms/client-kickoff/src/main/resources/hornetq/server0/hornetq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server0/activemq-configuration.xml similarity index 97% rename from examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server0/hornetq-configuration.xml rename to examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server0/activemq-configuration.xml index d63e0b7e85..6bc1876063 100644 --- a/examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server0/hornetq-configuration.xml +++ b/examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server0/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq ../../../../../../../../hornetq-server/src/main/resources/schema/activemq-configuration.xsd"> ${build.directory}/server0/data/messaging/bindings diff --git a/examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server0/activemq-jms.xml similarity index 93% rename from examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server0/hornetq-jms.xml rename to examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server0/activemq-jms.xml index feff6bfb46..13222eb9cb 100644 --- a/examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server0/hornetq-jms.xml +++ b/examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server0/activemq-jms.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd"> diff --git a/examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server0/activemq-users.xml b/examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server0/activemq-users.xml new file mode 100644 index 0000000000..8187c91683 --- /dev/null +++ b/examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server0/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server0/hornetq-users.xml deleted file mode 100644 index dcaf9800d7..0000000000 --- a/examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server0/hornetq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server1/hornetq-configuration.xml b/examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server1/activemq-configuration.xml similarity index 97% rename from examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server1/hornetq-configuration.xml rename to examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server1/activemq-configuration.xml index 4d72c829ab..b12bc898bb 100644 --- a/examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server1/hornetq-configuration.xml +++ b/examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server1/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq ../../../../../../../../hornetq-server/src/main/resources/schema/activemq-configuration.xsd"> ${build.directory}/server0/data/messaging/bindings diff --git a/examples/jms/multiple-failover/src/main/resources/hornetq/server1/hornetq-jms.xml b/examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server1/activemq-jms.xml similarity index 93% rename from examples/jms/multiple-failover/src/main/resources/hornetq/server1/hornetq-jms.xml rename to examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server1/activemq-jms.xml index b10c99e6ee..e9e4f9d850 100644 --- a/examples/jms/multiple-failover/src/main/resources/hornetq/server1/hornetq-jms.xml +++ b/examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server1/activemq-jms.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd"> diff --git a/examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server1/activemq-users.xml b/examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server1/activemq-users.xml new file mode 100644 index 0000000000..8187c91683 --- /dev/null +++ b/examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server1/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server1/hornetq-users.xml b/examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server1/hornetq-users.xml deleted file mode 100644 index dcaf9800d7..0000000000 --- a/examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server1/hornetq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server0/activemq-configuration.xml similarity index 96% rename from examples/jms/client-side-load-balancing/src/main/resources/hornetq/server0/hornetq-configuration.xml rename to examples/jms/client-side-load-balancing/src/main/resources/hornetq/server0/activemq-configuration.xml index 59bf1943bf..c4dbef4bdd 100644 --- a/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server0/hornetq-configuration.xml +++ b/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server0/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> ${build.directory}/server0/data/messaging/bindings diff --git a/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server1/hornetq-jms.xml b/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server0/activemq-jms.xml similarity index 87% rename from examples/jms/client-side-load-balancing/src/main/resources/hornetq/server1/hornetq-jms.xml rename to examples/jms/client-side-load-balancing/src/main/resources/hornetq/server0/activemq-jms.xml index 67ef63bff9..6b29273ba3 100644 --- a/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server1/hornetq-jms.xml +++ b/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server0/activemq-jms.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd"> diff --git a/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server0/activemq-users.xml b/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server0/activemq-users.xml new file mode 100644 index 0000000000..8187c91683 --- /dev/null +++ b/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server0/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server0/hornetq-users.xml deleted file mode 100644 index dcaf9800d7..0000000000 --- a/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server0/hornetq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server1/hornetq-configuration.xml b/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server1/activemq-configuration.xml similarity index 96% rename from examples/jms/client-side-load-balancing/src/main/resources/hornetq/server1/hornetq-configuration.xml rename to examples/jms/client-side-load-balancing/src/main/resources/hornetq/server1/activemq-configuration.xml index 65701147a1..b309d88986 100644 --- a/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server1/hornetq-configuration.xml +++ b/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server1/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> diff --git a/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server2/hornetq-jms.xml b/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server1/activemq-jms.xml similarity index 87% rename from examples/jms/client-side-load-balancing/src/main/resources/hornetq/server2/hornetq-jms.xml rename to examples/jms/client-side-load-balancing/src/main/resources/hornetq/server1/activemq-jms.xml index 67ef63bff9..6b29273ba3 100644 --- a/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server2/hornetq-jms.xml +++ b/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server1/activemq-jms.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd"> diff --git a/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server1/activemq-users.xml b/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server1/activemq-users.xml new file mode 100644 index 0000000000..8187c91683 --- /dev/null +++ b/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server1/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server1/hornetq-users.xml b/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server1/hornetq-users.xml deleted file mode 100644 index dcaf9800d7..0000000000 --- a/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server1/hornetq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server2/hornetq-configuration.xml b/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server2/activemq-configuration.xml similarity index 96% rename from examples/jms/client-side-load-balancing/src/main/resources/hornetq/server2/hornetq-configuration.xml rename to examples/jms/client-side-load-balancing/src/main/resources/hornetq/server2/activemq-configuration.xml index 0e755a32c2..fa981b1a59 100644 --- a/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server2/hornetq-configuration.xml +++ b/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server2/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> diff --git a/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server2/activemq-jms.xml similarity index 87% rename from examples/jms/client-side-load-balancing/src/main/resources/hornetq/server0/hornetq-jms.xml rename to examples/jms/client-side-load-balancing/src/main/resources/hornetq/server2/activemq-jms.xml index 67ef63bff9..6b29273ba3 100644 --- a/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server0/hornetq-jms.xml +++ b/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server2/activemq-jms.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd"> diff --git a/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server2/activemq-users.xml b/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server2/activemq-users.xml new file mode 100644 index 0000000000..8187c91683 --- /dev/null +++ b/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server2/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server2/hornetq-users.xml b/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server2/hornetq-users.xml deleted file mode 100644 index dcaf9800d7..0000000000 --- a/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server2/hornetq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/jms/clustered-durable-subscription/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/clustered-durable-subscription/src/main/resources/hornetq/server0/activemq-configuration.xml similarity index 97% rename from examples/jms/clustered-durable-subscription/src/main/resources/hornetq/server0/hornetq-configuration.xml rename to examples/jms/clustered-durable-subscription/src/main/resources/hornetq/server0/activemq-configuration.xml index 7811ade770..1f4fea9de5 100644 --- a/examples/jms/clustered-durable-subscription/src/main/resources/hornetq/server0/hornetq-configuration.xml +++ b/examples/jms/clustered-durable-subscription/src/main/resources/hornetq/server0/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> ${build.directory}/server0/data/messaging/bindings diff --git a/examples/jms/applet/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/clustered-durable-subscription/src/main/resources/hornetq/server0/activemq-jms.xml similarity index 88% rename from examples/jms/applet/src/main/resources/hornetq/server0/hornetq-jms.xml rename to examples/jms/clustered-durable-subscription/src/main/resources/hornetq/server0/activemq-jms.xml index 0cf0008cab..252edadd5e 100644 --- a/examples/jms/applet/src/main/resources/hornetq/server0/hornetq-jms.xml +++ b/examples/jms/clustered-durable-subscription/src/main/resources/hornetq/server0/activemq-jms.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd"> diff --git a/examples/jms/clustered-durable-subscription/src/main/resources/hornetq/server0/activemq-users.xml b/examples/jms/clustered-durable-subscription/src/main/resources/hornetq/server0/activemq-users.xml new file mode 100644 index 0000000000..8187c91683 --- /dev/null +++ b/examples/jms/clustered-durable-subscription/src/main/resources/hornetq/server0/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/examples/jms/clustered-durable-subscription/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/clustered-durable-subscription/src/main/resources/hornetq/server0/hornetq-users.xml deleted file mode 100644 index dcaf9800d7..0000000000 --- a/examples/jms/clustered-durable-subscription/src/main/resources/hornetq/server0/hornetq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/jms/clustered-durable-subscription/src/main/resources/hornetq/server1/hornetq-configuration.xml b/examples/jms/clustered-durable-subscription/src/main/resources/hornetq/server1/activemq-configuration.xml similarity index 97% rename from examples/jms/clustered-durable-subscription/src/main/resources/hornetq/server1/hornetq-configuration.xml rename to examples/jms/clustered-durable-subscription/src/main/resources/hornetq/server1/activemq-configuration.xml index b01bcd57d4..df5d0d3012 100644 --- a/examples/jms/clustered-durable-subscription/src/main/resources/hornetq/server1/hornetq-configuration.xml +++ b/examples/jms/clustered-durable-subscription/src/main/resources/hornetq/server1/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> diff --git a/examples/jms/clustered-durable-subscription/src/main/resources/hornetq/server1/hornetq-jms.xml b/examples/jms/clustered-durable-subscription/src/main/resources/hornetq/server1/activemq-jms.xml similarity index 88% rename from examples/jms/clustered-durable-subscription/src/main/resources/hornetq/server1/hornetq-jms.xml rename to examples/jms/clustered-durable-subscription/src/main/resources/hornetq/server1/activemq-jms.xml index 0cf0008cab..252edadd5e 100644 --- a/examples/jms/clustered-durable-subscription/src/main/resources/hornetq/server1/hornetq-jms.xml +++ b/examples/jms/clustered-durable-subscription/src/main/resources/hornetq/server1/activemq-jms.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd"> diff --git a/examples/jms/clustered-durable-subscription/src/main/resources/hornetq/server1/activemq-users.xml b/examples/jms/clustered-durable-subscription/src/main/resources/hornetq/server1/activemq-users.xml new file mode 100644 index 0000000000..8187c91683 --- /dev/null +++ b/examples/jms/clustered-durable-subscription/src/main/resources/hornetq/server1/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/examples/jms/clustered-durable-subscription/src/main/resources/hornetq/server1/hornetq-users.xml b/examples/jms/clustered-durable-subscription/src/main/resources/hornetq/server1/hornetq-users.xml deleted file mode 100644 index dcaf9800d7..0000000000 --- a/examples/jms/clustered-durable-subscription/src/main/resources/hornetq/server1/hornetq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/jms/clustered-grouping/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/clustered-grouping/src/main/resources/hornetq/server0/activemq-configuration.xml similarity index 97% rename from examples/jms/clustered-grouping/src/main/resources/hornetq/server0/hornetq-configuration.xml rename to examples/jms/clustered-grouping/src/main/resources/hornetq/server0/activemq-configuration.xml index 84f4f666b8..d07a9f8c0c 100644 --- a/examples/jms/clustered-grouping/src/main/resources/hornetq/server0/hornetq-configuration.xml +++ b/examples/jms/clustered-grouping/src/main/resources/hornetq/server0/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> ${build.directory}/server0/data/messaging/bindings diff --git a/examples/jms/clustered-grouping/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/clustered-grouping/src/main/resources/hornetq/server0/activemq-jms.xml similarity index 88% rename from examples/jms/clustered-grouping/src/main/resources/hornetq/server0/hornetq-jms.xml rename to examples/jms/clustered-grouping/src/main/resources/hornetq/server0/activemq-jms.xml index 86a4c75659..112fefcc97 100644 --- a/examples/jms/clustered-grouping/src/main/resources/hornetq/server0/hornetq-jms.xml +++ b/examples/jms/clustered-grouping/src/main/resources/hornetq/server0/activemq-jms.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd"> diff --git a/examples/jms/clustered-grouping/src/main/resources/hornetq/server0/activemq-users.xml b/examples/jms/clustered-grouping/src/main/resources/hornetq/server0/activemq-users.xml new file mode 100644 index 0000000000..8187c91683 --- /dev/null +++ b/examples/jms/clustered-grouping/src/main/resources/hornetq/server0/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/examples/jms/clustered-grouping/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/clustered-grouping/src/main/resources/hornetq/server0/hornetq-users.xml deleted file mode 100644 index dcaf9800d7..0000000000 --- a/examples/jms/clustered-grouping/src/main/resources/hornetq/server0/hornetq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/jms/clustered-grouping/src/main/resources/hornetq/server1/hornetq-configuration.xml b/examples/jms/clustered-grouping/src/main/resources/hornetq/server1/activemq-configuration.xml similarity index 97% rename from examples/jms/clustered-grouping/src/main/resources/hornetq/server1/hornetq-configuration.xml rename to examples/jms/clustered-grouping/src/main/resources/hornetq/server1/activemq-configuration.xml index c7bb164322..498fb4e401 100644 --- a/examples/jms/clustered-grouping/src/main/resources/hornetq/server1/hornetq-configuration.xml +++ b/examples/jms/clustered-grouping/src/main/resources/hornetq/server1/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> ${build.directory}/server1/data/messaging/bindings diff --git a/examples/jms/clustered-grouping/src/main/resources/hornetq/server1/activemq-jms.xml b/examples/jms/clustered-grouping/src/main/resources/hornetq/server1/activemq-jms.xml new file mode 100644 index 0000000000..112fefcc97 --- /dev/null +++ b/examples/jms/clustered-grouping/src/main/resources/hornetq/server1/activemq-jms.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/examples/jms/clustered-grouping/src/main/resources/hornetq/server1/activemq-users.xml b/examples/jms/clustered-grouping/src/main/resources/hornetq/server1/activemq-users.xml new file mode 100644 index 0000000000..8187c91683 --- /dev/null +++ b/examples/jms/clustered-grouping/src/main/resources/hornetq/server1/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/examples/jms/clustered-grouping/src/main/resources/hornetq/server1/hornetq-jms.xml b/examples/jms/clustered-grouping/src/main/resources/hornetq/server1/hornetq-jms.xml deleted file mode 100644 index 86a4c75659..0000000000 --- a/examples/jms/clustered-grouping/src/main/resources/hornetq/server1/hornetq-jms.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/examples/jms/clustered-grouping/src/main/resources/hornetq/server1/hornetq-users.xml b/examples/jms/clustered-grouping/src/main/resources/hornetq/server1/hornetq-users.xml deleted file mode 100644 index dcaf9800d7..0000000000 --- a/examples/jms/clustered-grouping/src/main/resources/hornetq/server1/hornetq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/jms/clustered-grouping/src/main/resources/hornetq/server2/hornetq-configuration.xml b/examples/jms/clustered-grouping/src/main/resources/hornetq/server2/activemq-configuration.xml similarity index 97% rename from examples/jms/clustered-grouping/src/main/resources/hornetq/server2/hornetq-configuration.xml rename to examples/jms/clustered-grouping/src/main/resources/hornetq/server2/activemq-configuration.xml index 1aff3190bf..bc2d598b74 100644 --- a/examples/jms/clustered-grouping/src/main/resources/hornetq/server2/hornetq-configuration.xml +++ b/examples/jms/clustered-grouping/src/main/resources/hornetq/server2/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> ${build.directory}/server2/data/messaging/bindings diff --git a/examples/jms/clustered-grouping/src/main/resources/hornetq/server2/activemq-jms.xml b/examples/jms/clustered-grouping/src/main/resources/hornetq/server2/activemq-jms.xml new file mode 100644 index 0000000000..112fefcc97 --- /dev/null +++ b/examples/jms/clustered-grouping/src/main/resources/hornetq/server2/activemq-jms.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/examples/jms/clustered-grouping/src/main/resources/hornetq/server2/activemq-users.xml b/examples/jms/clustered-grouping/src/main/resources/hornetq/server2/activemq-users.xml new file mode 100644 index 0000000000..8187c91683 --- /dev/null +++ b/examples/jms/clustered-grouping/src/main/resources/hornetq/server2/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/examples/jms/clustered-grouping/src/main/resources/hornetq/server2/hornetq-jms.xml b/examples/jms/clustered-grouping/src/main/resources/hornetq/server2/hornetq-jms.xml deleted file mode 100644 index 86a4c75659..0000000000 --- a/examples/jms/clustered-grouping/src/main/resources/hornetq/server2/hornetq-jms.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/examples/jms/clustered-grouping/src/main/resources/hornetq/server2/hornetq-users.xml b/examples/jms/clustered-grouping/src/main/resources/hornetq/server2/hornetq-users.xml deleted file mode 100644 index dcaf9800d7..0000000000 --- a/examples/jms/clustered-grouping/src/main/resources/hornetq/server2/hornetq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/jms/clustered-jgroups/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/clustered-jgroups/src/main/resources/hornetq/server0/activemq-configuration.xml similarity index 97% rename from examples/jms/clustered-jgroups/src/main/resources/hornetq/server0/hornetq-configuration.xml rename to examples/jms/clustered-jgroups/src/main/resources/hornetq/server0/activemq-configuration.xml index 48c802711a..b2fad01254 100644 --- a/examples/jms/clustered-jgroups/src/main/resources/hornetq/server0/hornetq-configuration.xml +++ b/examples/jms/clustered-jgroups/src/main/resources/hornetq/server0/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> server0/paging diff --git a/examples/jms/clustered-jgroups/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/clustered-jgroups/src/main/resources/hornetq/server0/activemq-jms.xml new file mode 100644 index 0000000000..112fefcc97 --- /dev/null +++ b/examples/jms/clustered-jgroups/src/main/resources/hornetq/server0/activemq-jms.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/examples/jms/clustered-jgroups/src/main/resources/hornetq/server0/activemq-users.xml b/examples/jms/clustered-jgroups/src/main/resources/hornetq/server0/activemq-users.xml new file mode 100644 index 0000000000..8187c91683 --- /dev/null +++ b/examples/jms/clustered-jgroups/src/main/resources/hornetq/server0/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/examples/jms/clustered-jgroups/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/clustered-jgroups/src/main/resources/hornetq/server0/hornetq-jms.xml deleted file mode 100644 index 86a4c75659..0000000000 --- a/examples/jms/clustered-jgroups/src/main/resources/hornetq/server0/hornetq-jms.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/examples/jms/clustered-jgroups/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/clustered-jgroups/src/main/resources/hornetq/server0/hornetq-users.xml deleted file mode 100644 index dcaf9800d7..0000000000 --- a/examples/jms/clustered-jgroups/src/main/resources/hornetq/server0/hornetq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/jms/clustered-jgroups/src/main/resources/hornetq/server1/hornetq-configuration.xml b/examples/jms/clustered-jgroups/src/main/resources/hornetq/server1/activemq-configuration.xml similarity index 97% rename from examples/jms/clustered-jgroups/src/main/resources/hornetq/server1/hornetq-configuration.xml rename to examples/jms/clustered-jgroups/src/main/resources/hornetq/server1/activemq-configuration.xml index 2518564a49..b9489dc04a 100644 --- a/examples/jms/clustered-jgroups/src/main/resources/hornetq/server1/hornetq-configuration.xml +++ b/examples/jms/clustered-jgroups/src/main/resources/hornetq/server1/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> server1/paging diff --git a/examples/jms/clustered-jgroups/src/main/resources/hornetq/server1/activemq-jms.xml b/examples/jms/clustered-jgroups/src/main/resources/hornetq/server1/activemq-jms.xml new file mode 100644 index 0000000000..112fefcc97 --- /dev/null +++ b/examples/jms/clustered-jgroups/src/main/resources/hornetq/server1/activemq-jms.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/examples/jms/clustered-jgroups/src/main/resources/hornetq/server1/activemq-users.xml b/examples/jms/clustered-jgroups/src/main/resources/hornetq/server1/activemq-users.xml new file mode 100644 index 0000000000..8187c91683 --- /dev/null +++ b/examples/jms/clustered-jgroups/src/main/resources/hornetq/server1/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/examples/jms/clustered-jgroups/src/main/resources/hornetq/server1/hornetq-jms.xml b/examples/jms/clustered-jgroups/src/main/resources/hornetq/server1/hornetq-jms.xml deleted file mode 100644 index 86a4c75659..0000000000 --- a/examples/jms/clustered-jgroups/src/main/resources/hornetq/server1/hornetq-jms.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/examples/jms/clustered-jgroups/src/main/resources/hornetq/server1/hornetq-users.xml b/examples/jms/clustered-jgroups/src/main/resources/hornetq/server1/hornetq-users.xml deleted file mode 100644 index dcaf9800d7..0000000000 --- a/examples/jms/clustered-jgroups/src/main/resources/hornetq/server1/hornetq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/jms/clustered-queue/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/clustered-queue/src/main/resources/hornetq/server0/activemq-configuration.xml similarity index 97% rename from examples/jms/clustered-queue/src/main/resources/hornetq/server0/hornetq-configuration.xml rename to examples/jms/clustered-queue/src/main/resources/hornetq/server0/activemq-configuration.xml index 3995d3ff68..3ae46bb44f 100644 --- a/examples/jms/clustered-queue/src/main/resources/hornetq/server0/hornetq-configuration.xml +++ b/examples/jms/clustered-queue/src/main/resources/hornetq/server0/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> target/server0/data/messaging/bindings diff --git a/examples/jms/clustered-queue/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/clustered-queue/src/main/resources/hornetq/server0/activemq-jms.xml new file mode 100644 index 0000000000..112fefcc97 --- /dev/null +++ b/examples/jms/clustered-queue/src/main/resources/hornetq/server0/activemq-jms.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/examples/jms/clustered-queue/src/main/resources/hornetq/server0/activemq-users.xml b/examples/jms/clustered-queue/src/main/resources/hornetq/server0/activemq-users.xml new file mode 100644 index 0000000000..8187c91683 --- /dev/null +++ b/examples/jms/clustered-queue/src/main/resources/hornetq/server0/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/examples/jms/clustered-queue/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/clustered-queue/src/main/resources/hornetq/server0/hornetq-jms.xml deleted file mode 100644 index 86a4c75659..0000000000 --- a/examples/jms/clustered-queue/src/main/resources/hornetq/server0/hornetq-jms.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/examples/jms/clustered-queue/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/clustered-queue/src/main/resources/hornetq/server0/hornetq-users.xml deleted file mode 100644 index dcaf9800d7..0000000000 --- a/examples/jms/clustered-queue/src/main/resources/hornetq/server0/hornetq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/jms/clustered-queue/src/main/resources/hornetq/server1/hornetq-configuration.xml b/examples/jms/clustered-queue/src/main/resources/hornetq/server1/activemq-configuration.xml similarity index 97% rename from examples/jms/clustered-queue/src/main/resources/hornetq/server1/hornetq-configuration.xml rename to examples/jms/clustered-queue/src/main/resources/hornetq/server1/activemq-configuration.xml index 8001d71b41..03f08b418d 100644 --- a/examples/jms/clustered-queue/src/main/resources/hornetq/server1/hornetq-configuration.xml +++ b/examples/jms/clustered-queue/src/main/resources/hornetq/server1/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> diff --git a/examples/jms/clustered-queue/src/main/resources/hornetq/server1/activemq-jms.xml b/examples/jms/clustered-queue/src/main/resources/hornetq/server1/activemq-jms.xml new file mode 100644 index 0000000000..112fefcc97 --- /dev/null +++ b/examples/jms/clustered-queue/src/main/resources/hornetq/server1/activemq-jms.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/examples/jms/clustered-queue/src/main/resources/hornetq/server1/activemq-users.xml b/examples/jms/clustered-queue/src/main/resources/hornetq/server1/activemq-users.xml new file mode 100644 index 0000000000..8187c91683 --- /dev/null +++ b/examples/jms/clustered-queue/src/main/resources/hornetq/server1/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/examples/jms/clustered-queue/src/main/resources/hornetq/server1/hornetq-jms.xml b/examples/jms/clustered-queue/src/main/resources/hornetq/server1/hornetq-jms.xml deleted file mode 100644 index 86a4c75659..0000000000 --- a/examples/jms/clustered-queue/src/main/resources/hornetq/server1/hornetq-jms.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/examples/jms/clustered-queue/src/main/resources/hornetq/server1/hornetq-users.xml b/examples/jms/clustered-queue/src/main/resources/hornetq/server1/hornetq-users.xml deleted file mode 100644 index dcaf9800d7..0000000000 --- a/examples/jms/clustered-queue/src/main/resources/hornetq/server1/hornetq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/jms/clustered-standalone/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/clustered-standalone/src/main/resources/hornetq/server0/activemq-configuration.xml similarity index 97% rename from examples/jms/clustered-standalone/src/main/resources/hornetq/server0/hornetq-configuration.xml rename to examples/jms/clustered-standalone/src/main/resources/hornetq/server0/activemq-configuration.xml index 0710944b04..ad9d4074eb 100644 --- a/examples/jms/clustered-standalone/src/main/resources/hornetq/server0/hornetq-configuration.xml +++ b/examples/jms/clustered-standalone/src/main/resources/hornetq/server0/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> target/server0/data/messaging/bindings diff --git a/examples/jms/clustered-standalone/src/main/resources/hornetq/server1/hornetq-jms.xml b/examples/jms/clustered-standalone/src/main/resources/hornetq/server0/activemq-jms.xml similarity index 88% rename from examples/jms/clustered-standalone/src/main/resources/hornetq/server1/hornetq-jms.xml rename to examples/jms/clustered-standalone/src/main/resources/hornetq/server0/activemq-jms.xml index 5adfbee204..e90f7c49ff 100644 --- a/examples/jms/clustered-standalone/src/main/resources/hornetq/server1/hornetq-jms.xml +++ b/examples/jms/clustered-standalone/src/main/resources/hornetq/server0/activemq-jms.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd"> diff --git a/examples/jms/clustered-standalone/src/main/resources/hornetq/server0/activemq-users.xml b/examples/jms/clustered-standalone/src/main/resources/hornetq/server0/activemq-users.xml new file mode 100644 index 0000000000..8187c91683 --- /dev/null +++ b/examples/jms/clustered-standalone/src/main/resources/hornetq/server0/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/examples/jms/clustered-standalone/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/clustered-standalone/src/main/resources/hornetq/server0/hornetq-users.xml deleted file mode 100644 index dcaf9800d7..0000000000 --- a/examples/jms/clustered-standalone/src/main/resources/hornetq/server0/hornetq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/jms/clustered-standalone/src/main/resources/hornetq/server1/hornetq-configuration.xml b/examples/jms/clustered-standalone/src/main/resources/hornetq/server1/activemq-configuration.xml similarity index 97% rename from examples/jms/clustered-standalone/src/main/resources/hornetq/server1/hornetq-configuration.xml rename to examples/jms/clustered-standalone/src/main/resources/hornetq/server1/activemq-configuration.xml index 0041537e8f..7a85bab309 100644 --- a/examples/jms/clustered-standalone/src/main/resources/hornetq/server1/hornetq-configuration.xml +++ b/examples/jms/clustered-standalone/src/main/resources/hornetq/server1/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> diff --git a/examples/jms/clustered-standalone/src/main/resources/hornetq/server2/hornetq-jms.xml b/examples/jms/clustered-standalone/src/main/resources/hornetq/server1/activemq-jms.xml similarity index 88% rename from examples/jms/clustered-standalone/src/main/resources/hornetq/server2/hornetq-jms.xml rename to examples/jms/clustered-standalone/src/main/resources/hornetq/server1/activemq-jms.xml index 5adfbee204..e90f7c49ff 100644 --- a/examples/jms/clustered-standalone/src/main/resources/hornetq/server2/hornetq-jms.xml +++ b/examples/jms/clustered-standalone/src/main/resources/hornetq/server1/activemq-jms.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd"> diff --git a/examples/jms/clustered-standalone/src/main/resources/hornetq/server1/activemq-users.xml b/examples/jms/clustered-standalone/src/main/resources/hornetq/server1/activemq-users.xml new file mode 100644 index 0000000000..8187c91683 --- /dev/null +++ b/examples/jms/clustered-standalone/src/main/resources/hornetq/server1/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/examples/jms/clustered-standalone/src/main/resources/hornetq/server1/hornetq-users.xml b/examples/jms/clustered-standalone/src/main/resources/hornetq/server1/hornetq-users.xml deleted file mode 100644 index dcaf9800d7..0000000000 --- a/examples/jms/clustered-standalone/src/main/resources/hornetq/server1/hornetq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/jms/clustered-standalone/src/main/resources/hornetq/server2/hornetq-configuration.xml b/examples/jms/clustered-standalone/src/main/resources/hornetq/server2/activemq-configuration.xml similarity index 97% rename from examples/jms/clustered-standalone/src/main/resources/hornetq/server2/hornetq-configuration.xml rename to examples/jms/clustered-standalone/src/main/resources/hornetq/server2/activemq-configuration.xml index 91074bb838..e4c7b4d4d1 100644 --- a/examples/jms/clustered-standalone/src/main/resources/hornetq/server2/hornetq-configuration.xml +++ b/examples/jms/clustered-standalone/src/main/resources/hornetq/server2/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> diff --git a/examples/jms/clustered-standalone/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/clustered-standalone/src/main/resources/hornetq/server2/activemq-jms.xml similarity index 88% rename from examples/jms/clustered-standalone/src/main/resources/hornetq/server0/hornetq-jms.xml rename to examples/jms/clustered-standalone/src/main/resources/hornetq/server2/activemq-jms.xml index 5adfbee204..e90f7c49ff 100644 --- a/examples/jms/clustered-standalone/src/main/resources/hornetq/server0/hornetq-jms.xml +++ b/examples/jms/clustered-standalone/src/main/resources/hornetq/server2/activemq-jms.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd"> diff --git a/examples/jms/clustered-standalone/src/main/resources/hornetq/server2/activemq-users.xml b/examples/jms/clustered-standalone/src/main/resources/hornetq/server2/activemq-users.xml new file mode 100644 index 0000000000..8187c91683 --- /dev/null +++ b/examples/jms/clustered-standalone/src/main/resources/hornetq/server2/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/examples/jms/clustered-standalone/src/main/resources/hornetq/server2/hornetq-users.xml b/examples/jms/clustered-standalone/src/main/resources/hornetq/server2/hornetq-users.xml deleted file mode 100644 index dcaf9800d7..0000000000 --- a/examples/jms/clustered-standalone/src/main/resources/hornetq/server2/hornetq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server0/activemq-configuration.xml similarity index 96% rename from examples/jms/clustered-static-discovery/src/main/resources/hornetq/server0/hornetq-configuration.xml rename to examples/jms/clustered-static-discovery/src/main/resources/hornetq/server0/activemq-configuration.xml index 8063eedf01..0f040922a7 100644 --- a/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server0/hornetq-configuration.xml +++ b/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server0/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> ${build.directory}/server0/data/messaging/bindings diff --git a/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server1/hornetq-jms.xml b/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server0/activemq-jms.xml similarity index 93% rename from examples/jms/clustered-static-oneway/src/main/resources/hornetq/server1/hornetq-jms.xml rename to examples/jms/clustered-static-discovery/src/main/resources/hornetq/server0/activemq-jms.xml index 7f4500bc4a..4707cf1106 100644 --- a/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server1/hornetq-jms.xml +++ b/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server0/activemq-jms.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd"> diff --git a/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server0/activemq-users.xml b/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server0/activemq-users.xml new file mode 100644 index 0000000000..8187c91683 --- /dev/null +++ b/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server0/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server0/hornetq-users.xml deleted file mode 100644 index dcaf9800d7..0000000000 --- a/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server0/hornetq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server1/hornetq-configuration.xml b/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server1/activemq-configuration.xml similarity index 96% rename from examples/jms/clustered-static-discovery/src/main/resources/hornetq/server1/hornetq-configuration.xml rename to examples/jms/clustered-static-discovery/src/main/resources/hornetq/server1/activemq-configuration.xml index e594c63ef6..f03f78f13e 100644 --- a/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server1/hornetq-configuration.xml +++ b/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server1/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> ${build.directory}/server1/data/messaging/bindings diff --git a/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server1/activemq-jms.xml similarity index 93% rename from examples/jms/clustered-static-discovery/src/main/resources/hornetq/server0/hornetq-jms.xml rename to examples/jms/clustered-static-discovery/src/main/resources/hornetq/server1/activemq-jms.xml index 7f4500bc4a..4707cf1106 100644 --- a/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server0/hornetq-jms.xml +++ b/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server1/activemq-jms.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd"> diff --git a/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server1/activemq-users.xml b/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server1/activemq-users.xml new file mode 100644 index 0000000000..8187c91683 --- /dev/null +++ b/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server1/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server1/hornetq-users.xml b/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server1/hornetq-users.xml deleted file mode 100644 index dcaf9800d7..0000000000 --- a/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server1/hornetq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server2/hornetq-configuration.xml b/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server2/activemq-configuration.xml similarity index 97% rename from examples/jms/clustered-static-discovery/src/main/resources/hornetq/server2/hornetq-configuration.xml rename to examples/jms/clustered-static-discovery/src/main/resources/hornetq/server2/activemq-configuration.xml index 289409445b..f13f4b29a8 100644 --- a/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server2/hornetq-configuration.xml +++ b/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server2/activemq-configuration.xml @@ -13,7 +13,7 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> ${build.directory}/server2/data/messaging/bindings diff --git a/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server2/hornetq-jms.xml b/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server2/activemq-jms.xml similarity index 96% rename from examples/jms/clustered-static-discovery/src/main/resources/hornetq/server2/hornetq-jms.xml rename to examples/jms/clustered-static-discovery/src/main/resources/hornetq/server2/activemq-jms.xml index dc32b3f264..f6c81fee91 100644 --- a/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server2/hornetq-jms.xml +++ b/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server2/activemq-jms.xml @@ -13,7 +13,7 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd"> diff --git a/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server2/activemq-users.xml b/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server2/activemq-users.xml new file mode 100644 index 0000000000..8187c91683 --- /dev/null +++ b/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server2/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server2/hornetq-users.xml b/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server2/hornetq-users.xml deleted file mode 100644 index dcaf9800d7..0000000000 --- a/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server2/hornetq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server3/hornetq-configuration.xml b/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server3/activemq-configuration.xml similarity index 97% rename from examples/jms/clustered-static-discovery/src/main/resources/hornetq/server3/hornetq-configuration.xml rename to examples/jms/clustered-static-discovery/src/main/resources/hornetq/server3/activemq-configuration.xml index fc3d687bcc..64b99a31b0 100644 --- a/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server3/hornetq-configuration.xml +++ b/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server3/activemq-configuration.xml @@ -13,7 +13,7 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> ${build.directory}/server3/data/messaging/bindings diff --git a/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server2/hornetq-jms.xml b/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server3/activemq-jms.xml similarity index 96% rename from examples/jms/clustered-static-oneway/src/main/resources/hornetq/server2/hornetq-jms.xml rename to examples/jms/clustered-static-discovery/src/main/resources/hornetq/server3/activemq-jms.xml index dc32b3f264..f6c81fee91 100644 --- a/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server2/hornetq-jms.xml +++ b/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server3/activemq-jms.xml @@ -13,7 +13,7 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd"> diff --git a/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server3/activemq-users.xml b/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server3/activemq-users.xml new file mode 100644 index 0000000000..8187c91683 --- /dev/null +++ b/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server3/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server3/hornetq-users.xml b/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server3/hornetq-users.xml deleted file mode 100644 index dcaf9800d7..0000000000 --- a/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server3/hornetq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server0/activemq-configuration.xml similarity index 97% rename from examples/jms/clustered-static-oneway/src/main/resources/hornetq/server0/hornetq-configuration.xml rename to examples/jms/clustered-static-oneway/src/main/resources/hornetq/server0/activemq-configuration.xml index f08789484c..a394a7017b 100644 --- a/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server0/hornetq-configuration.xml +++ b/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server0/activemq-configuration.xml @@ -13,7 +13,7 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> ${build.directory}/server0/data/messaging/bindings diff --git a/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server1/hornetq-jms.xml b/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server0/activemq-jms.xml similarity index 93% rename from examples/jms/clustered-static-discovery/src/main/resources/hornetq/server1/hornetq-jms.xml rename to examples/jms/clustered-static-oneway/src/main/resources/hornetq/server0/activemq-jms.xml index 7f4500bc4a..4707cf1106 100644 --- a/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server1/hornetq-jms.xml +++ b/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server0/activemq-jms.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd"> diff --git a/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server0/activemq-users.xml b/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server0/activemq-users.xml new file mode 100644 index 0000000000..8187c91683 --- /dev/null +++ b/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server0/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server0/hornetq-users.xml deleted file mode 100644 index dcaf9800d7..0000000000 --- a/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server0/hornetq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server1/hornetq-configuration.xml b/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server1/activemq-configuration.xml similarity index 97% rename from examples/jms/clustered-static-oneway/src/main/resources/hornetq/server1/hornetq-configuration.xml rename to examples/jms/clustered-static-oneway/src/main/resources/hornetq/server1/activemq-configuration.xml index 90422dbc60..58d1bb6a3e 100644 --- a/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server1/hornetq-configuration.xml +++ b/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server1/activemq-configuration.xml @@ -13,7 +13,7 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> ${build.directory}/server1/data/messaging/bindings diff --git a/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server1/activemq-jms.xml similarity index 93% rename from examples/jms/clustered-static-oneway/src/main/resources/hornetq/server0/hornetq-jms.xml rename to examples/jms/clustered-static-oneway/src/main/resources/hornetq/server1/activemq-jms.xml index 7f4500bc4a..4707cf1106 100644 --- a/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server0/hornetq-jms.xml +++ b/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server1/activemq-jms.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd"> diff --git a/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server1/activemq-users.xml b/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server1/activemq-users.xml new file mode 100644 index 0000000000..8187c91683 --- /dev/null +++ b/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server1/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server1/hornetq-users.xml b/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server1/hornetq-users.xml deleted file mode 100644 index dcaf9800d7..0000000000 --- a/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server1/hornetq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server2/hornetq-configuration.xml b/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server2/activemq-configuration.xml similarity index 97% rename from examples/jms/clustered-static-oneway/src/main/resources/hornetq/server2/hornetq-configuration.xml rename to examples/jms/clustered-static-oneway/src/main/resources/hornetq/server2/activemq-configuration.xml index 3754474dd7..bfb6c3f1fb 100644 --- a/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server2/hornetq-configuration.xml +++ b/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server2/activemq-configuration.xml @@ -13,7 +13,7 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> ${build.directory}/server2/data/messaging/bindings diff --git a/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server3/hornetq-jms.xml b/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server2/activemq-jms.xml similarity index 96% rename from examples/jms/clustered-static-discovery/src/main/resources/hornetq/server3/hornetq-jms.xml rename to examples/jms/clustered-static-oneway/src/main/resources/hornetq/server2/activemq-jms.xml index dc32b3f264..f6c81fee91 100644 --- a/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server3/hornetq-jms.xml +++ b/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server2/activemq-jms.xml @@ -13,7 +13,7 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd"> diff --git a/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server2/activemq-users.xml b/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server2/activemq-users.xml new file mode 100644 index 0000000000..8187c91683 --- /dev/null +++ b/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server2/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server2/hornetq-users.xml b/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server2/hornetq-users.xml deleted file mode 100644 index dcaf9800d7..0000000000 --- a/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server2/hornetq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/jms/clustered-topic/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/clustered-topic/src/main/resources/hornetq/server0/activemq-configuration.xml similarity index 97% rename from examples/jms/clustered-topic/src/main/resources/hornetq/server0/hornetq-configuration.xml rename to examples/jms/clustered-topic/src/main/resources/hornetq/server0/activemq-configuration.xml index e91313ecdf..bd2a8614a2 100644 --- a/examples/jms/clustered-topic/src/main/resources/hornetq/server0/hornetq-configuration.xml +++ b/examples/jms/clustered-topic/src/main/resources/hornetq/server0/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> ${build.directory}/server0/data/messaging/bindings diff --git a/examples/jms/clustered-topic/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/clustered-topic/src/main/resources/hornetq/server0/activemq-jms.xml similarity index 88% rename from examples/jms/clustered-topic/src/main/resources/hornetq/server0/hornetq-jms.xml rename to examples/jms/clustered-topic/src/main/resources/hornetq/server0/activemq-jms.xml index 0cf0008cab..252edadd5e 100644 --- a/examples/jms/clustered-topic/src/main/resources/hornetq/server0/hornetq-jms.xml +++ b/examples/jms/clustered-topic/src/main/resources/hornetq/server0/activemq-jms.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd"> diff --git a/examples/jms/clustered-topic/src/main/resources/hornetq/server0/activemq-users.xml b/examples/jms/clustered-topic/src/main/resources/hornetq/server0/activemq-users.xml new file mode 100644 index 0000000000..8187c91683 --- /dev/null +++ b/examples/jms/clustered-topic/src/main/resources/hornetq/server0/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/examples/jms/clustered-topic/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/clustered-topic/src/main/resources/hornetq/server0/hornetq-users.xml deleted file mode 100644 index dcaf9800d7..0000000000 --- a/examples/jms/clustered-topic/src/main/resources/hornetq/server0/hornetq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/jms/clustered-topic/src/main/resources/hornetq/server1/hornetq-configuration.xml b/examples/jms/clustered-topic/src/main/resources/hornetq/server1/activemq-configuration.xml similarity index 97% rename from examples/jms/clustered-topic/src/main/resources/hornetq/server1/hornetq-configuration.xml rename to examples/jms/clustered-topic/src/main/resources/hornetq/server1/activemq-configuration.xml index 3b92bae5a1..275d62e264 100644 --- a/examples/jms/clustered-topic/src/main/resources/hornetq/server1/hornetq-configuration.xml +++ b/examples/jms/clustered-topic/src/main/resources/hornetq/server1/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> ${build.directory}/server1/data/messaging/bindings diff --git a/examples/jms/clustered-topic/src/main/resources/hornetq/server1/activemq-jms.xml b/examples/jms/clustered-topic/src/main/resources/hornetq/server1/activemq-jms.xml new file mode 100644 index 0000000000..252edadd5e --- /dev/null +++ b/examples/jms/clustered-topic/src/main/resources/hornetq/server1/activemq-jms.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/examples/jms/clustered-topic/src/main/resources/hornetq/server1/activemq-users.xml b/examples/jms/clustered-topic/src/main/resources/hornetq/server1/activemq-users.xml new file mode 100644 index 0000000000..8187c91683 --- /dev/null +++ b/examples/jms/clustered-topic/src/main/resources/hornetq/server1/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/examples/jms/clustered-topic/src/main/resources/hornetq/server1/hornetq-jms.xml b/examples/jms/clustered-topic/src/main/resources/hornetq/server1/hornetq-jms.xml deleted file mode 100644 index 0cf0008cab..0000000000 --- a/examples/jms/clustered-topic/src/main/resources/hornetq/server1/hornetq-jms.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/examples/jms/clustered-topic/src/main/resources/hornetq/server1/hornetq-users.xml b/examples/jms/clustered-topic/src/main/resources/hornetq/server1/hornetq-users.xml deleted file mode 100644 index dcaf9800d7..0000000000 --- a/examples/jms/clustered-topic/src/main/resources/hornetq/server1/hornetq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/jms/colocated-failover-scale-down/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/colocated-failover-scale-down/src/main/resources/hornetq/server0/activemq-configuration.xml similarity index 97% rename from examples/jms/colocated-failover-scale-down/src/main/resources/hornetq/server0/hornetq-configuration.xml rename to examples/jms/colocated-failover-scale-down/src/main/resources/hornetq/server0/activemq-configuration.xml index 3aa0e25721..23e02d9093 100644 --- a/examples/jms/colocated-failover-scale-down/src/main/resources/hornetq/server0/hornetq-configuration.xml +++ b/examples/jms/colocated-failover-scale-down/src/main/resources/hornetq/server0/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> target/server0/data/messaging/bindings diff --git a/examples/jms/colocated-failover/src/main/resources/hornetq/server1/hornetq-jms.xml b/examples/jms/colocated-failover-scale-down/src/main/resources/hornetq/server0/activemq-jms.xml similarity index 93% rename from examples/jms/colocated-failover/src/main/resources/hornetq/server1/hornetq-jms.xml rename to examples/jms/colocated-failover-scale-down/src/main/resources/hornetq/server0/activemq-jms.xml index b4aff7882c..128aff29cb 100644 --- a/examples/jms/colocated-failover/src/main/resources/hornetq/server1/hornetq-jms.xml +++ b/examples/jms/colocated-failover-scale-down/src/main/resources/hornetq/server0/activemq-jms.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd"> diff --git a/examples/jms/colocated-failover-scale-down/src/main/resources/hornetq/server0/activemq-users.xml b/examples/jms/colocated-failover-scale-down/src/main/resources/hornetq/server0/activemq-users.xml new file mode 100644 index 0000000000..8187c91683 --- /dev/null +++ b/examples/jms/colocated-failover-scale-down/src/main/resources/hornetq/server0/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/examples/jms/colocated-failover-scale-down/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/colocated-failover-scale-down/src/main/resources/hornetq/server0/hornetq-users.xml deleted file mode 100644 index dcaf9800d7..0000000000 --- a/examples/jms/colocated-failover-scale-down/src/main/resources/hornetq/server0/hornetq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/jms/colocated-failover-scale-down/src/main/resources/hornetq/server1/hornetq-configuration.xml b/examples/jms/colocated-failover-scale-down/src/main/resources/hornetq/server1/activemq-configuration.xml similarity index 97% rename from examples/jms/colocated-failover-scale-down/src/main/resources/hornetq/server1/hornetq-configuration.xml rename to examples/jms/colocated-failover-scale-down/src/main/resources/hornetq/server1/activemq-configuration.xml index 72e3188374..da17cce35e 100644 --- a/examples/jms/colocated-failover-scale-down/src/main/resources/hornetq/server1/hornetq-configuration.xml +++ b/examples/jms/colocated-failover-scale-down/src/main/resources/hornetq/server1/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> diff --git a/examples/jms/colocated-failover-scale-down/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/colocated-failover-scale-down/src/main/resources/hornetq/server1/activemq-jms.xml similarity index 93% rename from examples/jms/colocated-failover-scale-down/src/main/resources/hornetq/server0/hornetq-jms.xml rename to examples/jms/colocated-failover-scale-down/src/main/resources/hornetq/server1/activemq-jms.xml index b4aff7882c..128aff29cb 100644 --- a/examples/jms/colocated-failover-scale-down/src/main/resources/hornetq/server0/hornetq-jms.xml +++ b/examples/jms/colocated-failover-scale-down/src/main/resources/hornetq/server1/activemq-jms.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd"> diff --git a/examples/jms/colocated-failover-scale-down/src/main/resources/hornetq/server1/activemq-users.xml b/examples/jms/colocated-failover-scale-down/src/main/resources/hornetq/server1/activemq-users.xml new file mode 100644 index 0000000000..8187c91683 --- /dev/null +++ b/examples/jms/colocated-failover-scale-down/src/main/resources/hornetq/server1/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/examples/jms/colocated-failover-scale-down/src/main/resources/hornetq/server1/hornetq-users.xml b/examples/jms/colocated-failover-scale-down/src/main/resources/hornetq/server1/hornetq-users.xml deleted file mode 100644 index dcaf9800d7..0000000000 --- a/examples/jms/colocated-failover-scale-down/src/main/resources/hornetq/server1/hornetq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/jms/colocated-failover/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/colocated-failover/src/main/resources/hornetq/server0/activemq-configuration.xml similarity index 97% rename from examples/jms/colocated-failover/src/main/resources/hornetq/server0/hornetq-configuration.xml rename to examples/jms/colocated-failover/src/main/resources/hornetq/server0/activemq-configuration.xml index 0d360d7a7b..d1d00766cb 100644 --- a/examples/jms/colocated-failover/src/main/resources/hornetq/server0/hornetq-configuration.xml +++ b/examples/jms/colocated-failover/src/main/resources/hornetq/server0/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> target/server0/data/messaging/bindings diff --git a/examples/jms/colocated-failover-scale-down/src/main/resources/hornetq/server1/hornetq-jms.xml b/examples/jms/colocated-failover/src/main/resources/hornetq/server0/activemq-jms.xml similarity index 93% rename from examples/jms/colocated-failover-scale-down/src/main/resources/hornetq/server1/hornetq-jms.xml rename to examples/jms/colocated-failover/src/main/resources/hornetq/server0/activemq-jms.xml index b4aff7882c..128aff29cb 100644 --- a/examples/jms/colocated-failover-scale-down/src/main/resources/hornetq/server1/hornetq-jms.xml +++ b/examples/jms/colocated-failover/src/main/resources/hornetq/server0/activemq-jms.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd"> diff --git a/examples/jms/colocated-failover/src/main/resources/hornetq/server0/activemq-users.xml b/examples/jms/colocated-failover/src/main/resources/hornetq/server0/activemq-users.xml new file mode 100644 index 0000000000..8187c91683 --- /dev/null +++ b/examples/jms/colocated-failover/src/main/resources/hornetq/server0/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/examples/jms/colocated-failover/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/colocated-failover/src/main/resources/hornetq/server0/hornetq-users.xml deleted file mode 100644 index dcaf9800d7..0000000000 --- a/examples/jms/colocated-failover/src/main/resources/hornetq/server0/hornetq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/jms/colocated-failover/src/main/resources/hornetq/server1/hornetq-configuration.xml b/examples/jms/colocated-failover/src/main/resources/hornetq/server1/activemq-configuration.xml similarity index 97% rename from examples/jms/colocated-failover/src/main/resources/hornetq/server1/hornetq-configuration.xml rename to examples/jms/colocated-failover/src/main/resources/hornetq/server1/activemq-configuration.xml index 5bb01b79c8..0b6ac6abac 100644 --- a/examples/jms/colocated-failover/src/main/resources/hornetq/server1/hornetq-configuration.xml +++ b/examples/jms/colocated-failover/src/main/resources/hornetq/server1/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> diff --git a/examples/jms/colocated-failover/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/colocated-failover/src/main/resources/hornetq/server1/activemq-jms.xml similarity index 93% rename from examples/jms/colocated-failover/src/main/resources/hornetq/server0/hornetq-jms.xml rename to examples/jms/colocated-failover/src/main/resources/hornetq/server1/activemq-jms.xml index b4aff7882c..128aff29cb 100644 --- a/examples/jms/colocated-failover/src/main/resources/hornetq/server0/hornetq-jms.xml +++ b/examples/jms/colocated-failover/src/main/resources/hornetq/server1/activemq-jms.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd"> diff --git a/examples/jms/colocated-failover/src/main/resources/hornetq/server1/activemq-users.xml b/examples/jms/colocated-failover/src/main/resources/hornetq/server1/activemq-users.xml new file mode 100644 index 0000000000..8187c91683 --- /dev/null +++ b/examples/jms/colocated-failover/src/main/resources/hornetq/server1/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/examples/jms/colocated-failover/src/main/resources/hornetq/server1/hornetq-users.xml b/examples/jms/colocated-failover/src/main/resources/hornetq/server1/hornetq-users.xml deleted file mode 100644 index dcaf9800d7..0000000000 --- a/examples/jms/colocated-failover/src/main/resources/hornetq/server1/hornetq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/jms/consumer-rate-limit/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/consumer-rate-limit/src/main/resources/hornetq/server0/activemq-configuration.xml similarity index 94% rename from examples/jms/consumer-rate-limit/src/main/resources/hornetq/server0/hornetq-configuration.xml rename to examples/jms/consumer-rate-limit/src/main/resources/hornetq/server0/activemq-configuration.xml index 320154a24c..c6594ce1ba 100644 --- a/examples/jms/consumer-rate-limit/src/main/resources/hornetq/server0/hornetq-configuration.xml +++ b/examples/jms/consumer-rate-limit/src/main/resources/hornetq/server0/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> ${build.directory}/server0/data/messaging/bindings diff --git a/examples/jms/consumer-rate-limit/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/consumer-rate-limit/src/main/resources/hornetq/server0/activemq-jms.xml similarity index 91% rename from examples/jms/consumer-rate-limit/src/main/resources/hornetq/server0/hornetq-jms.xml rename to examples/jms/consumer-rate-limit/src/main/resources/hornetq/server0/activemq-jms.xml index 189dbe772d..146a93e577 100644 --- a/examples/jms/consumer-rate-limit/src/main/resources/hornetq/server0/hornetq-jms.xml +++ b/examples/jms/consumer-rate-limit/src/main/resources/hornetq/server0/activemq-jms.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd"> diff --git a/examples/jms/consumer-rate-limit/src/main/resources/hornetq/server0/activemq-users.xml b/examples/jms/consumer-rate-limit/src/main/resources/hornetq/server0/activemq-users.xml new file mode 100644 index 0000000000..8187c91683 --- /dev/null +++ b/examples/jms/consumer-rate-limit/src/main/resources/hornetq/server0/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/examples/jms/consumer-rate-limit/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/consumer-rate-limit/src/main/resources/hornetq/server0/hornetq-users.xml deleted file mode 100644 index dcaf9800d7..0000000000 --- a/examples/jms/consumer-rate-limit/src/main/resources/hornetq/server0/hornetq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/jms/dead-letter/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/dead-letter/src/main/resources/hornetq/server0/activemq-configuration.xml similarity index 95% rename from examples/jms/dead-letter/src/main/resources/hornetq/server0/hornetq-configuration.xml rename to examples/jms/dead-letter/src/main/resources/hornetq/server0/activemq-configuration.xml index 56721ddcb0..359b5872ea 100644 --- a/examples/jms/dead-letter/src/main/resources/hornetq/server0/hornetq-configuration.xml +++ b/examples/jms/dead-letter/src/main/resources/hornetq/server0/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> ${build.directory}/server0/data/messaging/bindings diff --git a/examples/jms/dead-letter/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/dead-letter/src/main/resources/hornetq/server0/activemq-jms.xml similarity index 90% rename from examples/jms/dead-letter/src/main/resources/hornetq/server0/hornetq-jms.xml rename to examples/jms/dead-letter/src/main/resources/hornetq/server0/activemq-jms.xml index b33e218888..4bb68a2c0b 100644 --- a/examples/jms/dead-letter/src/main/resources/hornetq/server0/hornetq-jms.xml +++ b/examples/jms/dead-letter/src/main/resources/hornetq/server0/activemq-jms.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd"> diff --git a/examples/jms/dead-letter/src/main/resources/hornetq/server0/activemq-users.xml b/examples/jms/dead-letter/src/main/resources/hornetq/server0/activemq-users.xml new file mode 100644 index 0000000000..8187c91683 --- /dev/null +++ b/examples/jms/dead-letter/src/main/resources/hornetq/server0/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/examples/jms/dead-letter/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/dead-letter/src/main/resources/hornetq/server0/hornetq-users.xml deleted file mode 100644 index dcaf9800d7..0000000000 --- a/examples/jms/dead-letter/src/main/resources/hornetq/server0/hornetq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/jms/delayed-redelivery/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/delayed-redelivery/src/main/resources/hornetq/server0/activemq-configuration.xml similarity index 95% rename from examples/jms/delayed-redelivery/src/main/resources/hornetq/server0/hornetq-configuration.xml rename to examples/jms/delayed-redelivery/src/main/resources/hornetq/server0/activemq-configuration.xml index 4392eb082c..ed68d467b9 100644 --- a/examples/jms/delayed-redelivery/src/main/resources/hornetq/server0/hornetq-configuration.xml +++ b/examples/jms/delayed-redelivery/src/main/resources/hornetq/server0/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> ${build.directory}/server0/data/messaging/bindings diff --git a/examples/jms/delayed-redelivery/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/delayed-redelivery/src/main/resources/hornetq/server0/activemq-jms.xml similarity index 90% rename from examples/jms/delayed-redelivery/src/main/resources/hornetq/server0/hornetq-jms.xml rename to examples/jms/delayed-redelivery/src/main/resources/hornetq/server0/activemq-jms.xml index b33e218888..4bb68a2c0b 100644 --- a/examples/jms/delayed-redelivery/src/main/resources/hornetq/server0/hornetq-jms.xml +++ b/examples/jms/delayed-redelivery/src/main/resources/hornetq/server0/activemq-jms.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd"> diff --git a/examples/jms/delayed-redelivery/src/main/resources/hornetq/server0/activemq-users.xml b/examples/jms/delayed-redelivery/src/main/resources/hornetq/server0/activemq-users.xml new file mode 100644 index 0000000000..8187c91683 --- /dev/null +++ b/examples/jms/delayed-redelivery/src/main/resources/hornetq/server0/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/examples/jms/delayed-redelivery/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/delayed-redelivery/src/main/resources/hornetq/server0/hornetq-users.xml deleted file mode 100644 index dcaf9800d7..0000000000 --- a/examples/jms/delayed-redelivery/src/main/resources/hornetq/server0/hornetq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/jms/divert/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/divert/src/main/resources/hornetq/server0/activemq-configuration.xml similarity index 97% rename from examples/jms/divert/src/main/resources/hornetq/server0/hornetq-configuration.xml rename to examples/jms/divert/src/main/resources/hornetq/server0/activemq-configuration.xml index 50b7199685..c3b6e6868f 100644 --- a/examples/jms/divert/src/main/resources/hornetq/server0/hornetq-configuration.xml +++ b/examples/jms/divert/src/main/resources/hornetq/server0/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> diff --git a/examples/jms/divert/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/divert/src/main/resources/hornetq/server0/activemq-jms.xml similarity index 93% rename from examples/jms/divert/src/main/resources/hornetq/server0/hornetq-jms.xml rename to examples/jms/divert/src/main/resources/hornetq/server0/activemq-jms.xml index dedb230f43..fabeb71c5e 100644 --- a/examples/jms/divert/src/main/resources/hornetq/server0/hornetq-jms.xml +++ b/examples/jms/divert/src/main/resources/hornetq/server0/activemq-jms.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd"> diff --git a/examples/jms/divert/src/main/resources/hornetq/server0/activemq-users.xml b/examples/jms/divert/src/main/resources/hornetq/server0/activemq-users.xml new file mode 100644 index 0000000000..8187c91683 --- /dev/null +++ b/examples/jms/divert/src/main/resources/hornetq/server0/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/examples/jms/divert/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/divert/src/main/resources/hornetq/server0/hornetq-users.xml deleted file mode 100644 index dcaf9800d7..0000000000 --- a/examples/jms/divert/src/main/resources/hornetq/server0/hornetq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/jms/divert/src/main/resources/hornetq/server1/hornetq-configuration.xml b/examples/jms/divert/src/main/resources/hornetq/server1/activemq-configuration.xml similarity index 95% rename from examples/jms/divert/src/main/resources/hornetq/server1/hornetq-configuration.xml rename to examples/jms/divert/src/main/resources/hornetq/server1/activemq-configuration.xml index 28bc41b54f..f00069745f 100644 --- a/examples/jms/divert/src/main/resources/hornetq/server1/hornetq-configuration.xml +++ b/examples/jms/divert/src/main/resources/hornetq/server1/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> ${build.directory}/server1/data/messaging/bindings diff --git a/examples/jms/divert/src/main/resources/hornetq/server1/hornetq-jms.xml b/examples/jms/divert/src/main/resources/hornetq/server1/activemq-jms.xml similarity index 89% rename from examples/jms/divert/src/main/resources/hornetq/server1/hornetq-jms.xml rename to examples/jms/divert/src/main/resources/hornetq/server1/activemq-jms.xml index 25b6027644..92d768872e 100644 --- a/examples/jms/divert/src/main/resources/hornetq/server1/hornetq-jms.xml +++ b/examples/jms/divert/src/main/resources/hornetq/server1/activemq-jms.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd"> diff --git a/examples/jms/divert/src/main/resources/hornetq/server1/activemq-users.xml b/examples/jms/divert/src/main/resources/hornetq/server1/activemq-users.xml new file mode 100644 index 0000000000..8187c91683 --- /dev/null +++ b/examples/jms/divert/src/main/resources/hornetq/server1/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/examples/jms/divert/src/main/resources/hornetq/server1/hornetq-users.xml b/examples/jms/divert/src/main/resources/hornetq/server1/hornetq-users.xml deleted file mode 100644 index dcaf9800d7..0000000000 --- a/examples/jms/divert/src/main/resources/hornetq/server1/hornetq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/jms/durable-subscription/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/durable-subscription/src/main/resources/hornetq/server0/activemq-configuration.xml similarity index 95% rename from examples/jms/durable-subscription/src/main/resources/hornetq/server0/hornetq-configuration.xml rename to examples/jms/durable-subscription/src/main/resources/hornetq/server0/activemq-configuration.xml index 329e331286..f8787c5a4c 100644 --- a/examples/jms/durable-subscription/src/main/resources/hornetq/server0/hornetq-configuration.xml +++ b/examples/jms/durable-subscription/src/main/resources/hornetq/server0/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> ${build.directory}/server0/data/messaging/bindings diff --git a/examples/jms/durable-subscription/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/durable-subscription/src/main/resources/hornetq/server0/activemq-jms.xml new file mode 100644 index 0000000000..252edadd5e --- /dev/null +++ b/examples/jms/durable-subscription/src/main/resources/hornetq/server0/activemq-jms.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/examples/jms/durable-subscription/src/main/resources/hornetq/server0/activemq-users.xml b/examples/jms/durable-subscription/src/main/resources/hornetq/server0/activemq-users.xml new file mode 100644 index 0000000000..8187c91683 --- /dev/null +++ b/examples/jms/durable-subscription/src/main/resources/hornetq/server0/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/examples/jms/durable-subscription/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/durable-subscription/src/main/resources/hornetq/server0/hornetq-jms.xml deleted file mode 100644 index 0cf0008cab..0000000000 --- a/examples/jms/durable-subscription/src/main/resources/hornetq/server0/hornetq-jms.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/examples/jms/durable-subscription/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/durable-subscription/src/main/resources/hornetq/server0/hornetq-users.xml deleted file mode 100644 index dcaf9800d7..0000000000 --- a/examples/jms/durable-subscription/src/main/resources/hornetq/server0/hornetq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/jms/rest/javascript-chat/src/main/resources/hornetq-configuration.xml b/examples/jms/embedded-simple/src/main/resources/activemq-configuration.xml similarity index 93% rename from examples/jms/rest/javascript-chat/src/main/resources/hornetq-configuration.xml rename to examples/jms/embedded-simple/src/main/resources/activemq-configuration.xml index 9e5ab97698..e0fc1184d2 100644 --- a/examples/jms/rest/javascript-chat/src/main/resources/hornetq-configuration.xml +++ b/examples/jms/embedded-simple/src/main/resources/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> false diff --git a/activemq-rest/src/test/resources/hornetq-jms.xml b/examples/jms/embedded-simple/src/main/resources/activemq-jms.xml similarity index 88% rename from activemq-rest/src/test/resources/hornetq-jms.xml rename to examples/jms/embedded-simple/src/main/resources/activemq-jms.xml index 3461588092..cc3fde7c68 100644 --- a/activemq-rest/src/test/resources/hornetq-jms.xml +++ b/examples/jms/embedded-simple/src/main/resources/activemq-jms.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd"> diff --git a/examples/jms/rest/dup-send/src/main/resources/hornetq-users.xml b/examples/jms/embedded-simple/src/main/resources/activemq-users.xml similarity index 77% rename from examples/jms/rest/dup-send/src/main/resources/hornetq-users.xml rename to examples/jms/embedded-simple/src/main/resources/activemq-users.xml index 4a9e49ae8d..11c115af70 100644 --- a/examples/jms/rest/dup-send/src/main/resources/hornetq-users.xml +++ b/examples/jms/embedded-simple/src/main/resources/activemq-users.xml @@ -1,5 +1,5 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-users.xsd"> diff --git a/examples/jms/expiry/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/expiry/src/main/resources/hornetq/server0/activemq-configuration.xml similarity index 95% rename from examples/jms/expiry/src/main/resources/hornetq/server0/hornetq-configuration.xml rename to examples/jms/expiry/src/main/resources/hornetq/server0/activemq-configuration.xml index f6f2b3cf53..6482edb605 100644 --- a/examples/jms/expiry/src/main/resources/hornetq/server0/hornetq-configuration.xml +++ b/examples/jms/expiry/src/main/resources/hornetq/server0/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> ${build.directory}/server0/data/messaging/bindings diff --git a/examples/jms/expiry/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/expiry/src/main/resources/hornetq/server0/activemq-jms.xml similarity index 90% rename from examples/jms/expiry/src/main/resources/hornetq/server0/hornetq-jms.xml rename to examples/jms/expiry/src/main/resources/hornetq/server0/activemq-jms.xml index 9d4b206924..aad558d6cd 100644 --- a/examples/jms/expiry/src/main/resources/hornetq/server0/hornetq-jms.xml +++ b/examples/jms/expiry/src/main/resources/hornetq/server0/activemq-jms.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd"> diff --git a/examples/jms/expiry/src/main/resources/hornetq/server0/activemq-users.xml b/examples/jms/expiry/src/main/resources/hornetq/server0/activemq-users.xml new file mode 100644 index 0000000000..8187c91683 --- /dev/null +++ b/examples/jms/expiry/src/main/resources/hornetq/server0/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/examples/jms/expiry/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/expiry/src/main/resources/hornetq/server0/hornetq-users.xml deleted file mode 100644 index dcaf9800d7..0000000000 --- a/examples/jms/expiry/src/main/resources/hornetq/server0/hornetq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/jms/ha-policy-autobackup/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/ha-policy-autobackup/src/main/resources/hornetq/server0/activemq-configuration.xml similarity index 97% rename from examples/jms/ha-policy-autobackup/src/main/resources/hornetq/server0/hornetq-configuration.xml rename to examples/jms/ha-policy-autobackup/src/main/resources/hornetq/server0/activemq-configuration.xml index 586f1edde9..ead1931986 100644 --- a/examples/jms/ha-policy-autobackup/src/main/resources/hornetq/server0/hornetq-configuration.xml +++ b/examples/jms/ha-policy-autobackup/src/main/resources/hornetq/server0/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> target/server0/data/messaging/bindings diff --git a/examples/jms/ha-policy-autobackup/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/ha-policy-autobackup/src/main/resources/hornetq/server0/activemq-jms.xml new file mode 100644 index 0000000000..9ef0182132 --- /dev/null +++ b/examples/jms/ha-policy-autobackup/src/main/resources/hornetq/server0/activemq-jms.xml @@ -0,0 +1,30 @@ + + + + + + + + + + true + + 1000 + + + 1.0 + + + -1 + + + + + + + + \ No newline at end of file diff --git a/examples/jms/ha-policy-autobackup/src/main/resources/hornetq/server0/activemq-users.xml b/examples/jms/ha-policy-autobackup/src/main/resources/hornetq/server0/activemq-users.xml new file mode 100644 index 0000000000..8187c91683 --- /dev/null +++ b/examples/jms/ha-policy-autobackup/src/main/resources/hornetq/server0/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/examples/jms/ha-policy-autobackup/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/ha-policy-autobackup/src/main/resources/hornetq/server0/hornetq-jms.xml deleted file mode 100644 index d224e45a1f..0000000000 --- a/examples/jms/ha-policy-autobackup/src/main/resources/hornetq/server0/hornetq-jms.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - true - - 1000 - - - 1.0 - - - -1 - - - - - - - - \ No newline at end of file diff --git a/examples/jms/ha-policy-autobackup/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/ha-policy-autobackup/src/main/resources/hornetq/server0/hornetq-users.xml deleted file mode 100644 index dcaf9800d7..0000000000 --- a/examples/jms/ha-policy-autobackup/src/main/resources/hornetq/server0/hornetq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/jms/ha-policy-autobackup/src/main/resources/hornetq/server1/hornetq-configuration.xml b/examples/jms/ha-policy-autobackup/src/main/resources/hornetq/server1/activemq-configuration.xml similarity index 97% rename from examples/jms/ha-policy-autobackup/src/main/resources/hornetq/server1/hornetq-configuration.xml rename to examples/jms/ha-policy-autobackup/src/main/resources/hornetq/server1/activemq-configuration.xml index 058ea903c8..a605ee5981 100644 --- a/examples/jms/ha-policy-autobackup/src/main/resources/hornetq/server1/hornetq-configuration.xml +++ b/examples/jms/ha-policy-autobackup/src/main/resources/hornetq/server1/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> target/server1/data/messaging/bindings diff --git a/examples/jms/ha-policy-autobackup/src/main/resources/hornetq/server1/activemq-users.xml b/examples/jms/ha-policy-autobackup/src/main/resources/hornetq/server1/activemq-users.xml new file mode 100644 index 0000000000..8187c91683 --- /dev/null +++ b/examples/jms/ha-policy-autobackup/src/main/resources/hornetq/server1/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/examples/jms/ha-policy-autobackup/src/main/resources/hornetq/server1/hornetq-jms.xml b/examples/jms/ha-policy-autobackup/src/main/resources/hornetq/server1/hornetq-jms.xml deleted file mode 100644 index d224e45a1f..0000000000 --- a/examples/jms/ha-policy-autobackup/src/main/resources/hornetq/server1/hornetq-jms.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - true - - 1000 - - - 1.0 - - - -1 - - - - - - - - \ No newline at end of file diff --git a/examples/jms/ha-policy-autobackup/src/main/resources/hornetq/server1/hornetq-users.xml b/examples/jms/ha-policy-autobackup/src/main/resources/hornetq/server1/hornetq-users.xml deleted file mode 100644 index dcaf9800d7..0000000000 --- a/examples/jms/ha-policy-autobackup/src/main/resources/hornetq/server1/hornetq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/jms/http-transport/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/http-transport/src/main/resources/hornetq/server0/activemq-configuration.xml similarity index 95% rename from examples/jms/http-transport/src/main/resources/hornetq/server0/hornetq-configuration.xml rename to examples/jms/http-transport/src/main/resources/hornetq/server0/activemq-configuration.xml index 286335402d..bac2e09801 100644 --- a/examples/jms/http-transport/src/main/resources/hornetq/server0/hornetq-configuration.xml +++ b/examples/jms/http-transport/src/main/resources/hornetq/server0/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> ${build.directory}/server0/data/messaging/bindings diff --git a/examples/jms/http-transport/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/http-transport/src/main/resources/hornetq/server0/activemq-jms.xml new file mode 100644 index 0000000000..112fefcc97 --- /dev/null +++ b/examples/jms/http-transport/src/main/resources/hornetq/server0/activemq-jms.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/examples/jms/http-transport/src/main/resources/hornetq/server0/activemq-users.xml b/examples/jms/http-transport/src/main/resources/hornetq/server0/activemq-users.xml new file mode 100644 index 0000000000..8187c91683 --- /dev/null +++ b/examples/jms/http-transport/src/main/resources/hornetq/server0/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/examples/jms/http-transport/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/http-transport/src/main/resources/hornetq/server0/hornetq-jms.xml deleted file mode 100644 index 86a4c75659..0000000000 --- a/examples/jms/http-transport/src/main/resources/hornetq/server0/hornetq-jms.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/examples/jms/http-transport/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/http-transport/src/main/resources/hornetq/server0/hornetq-users.xml deleted file mode 100644 index dcaf9800d7..0000000000 --- a/examples/jms/http-transport/src/main/resources/hornetq/server0/hornetq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/jms/instantiate-connection-factory/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/instantiate-connection-factory/src/main/resources/hornetq/server0/activemq-configuration.xml similarity index 95% rename from examples/jms/instantiate-connection-factory/src/main/resources/hornetq/server0/hornetq-configuration.xml rename to examples/jms/instantiate-connection-factory/src/main/resources/hornetq/server0/activemq-configuration.xml index b42f50bd9b..77d7687fd6 100644 --- a/examples/jms/instantiate-connection-factory/src/main/resources/hornetq/server0/hornetq-configuration.xml +++ b/examples/jms/instantiate-connection-factory/src/main/resources/hornetq/server0/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> ${build.directory}/server0/data/messaging/bindings diff --git a/examples/jms/instantiate-connection-factory/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/instantiate-connection-factory/src/main/resources/hornetq/server0/activemq-jms.xml similarity index 77% rename from examples/jms/instantiate-connection-factory/src/main/resources/hornetq/server0/hornetq-jms.xml rename to examples/jms/instantiate-connection-factory/src/main/resources/hornetq/server0/activemq-jms.xml index cf68d6ab37..860f70774c 100644 --- a/examples/jms/instantiate-connection-factory/src/main/resources/hornetq/server0/hornetq-jms.xml +++ b/examples/jms/instantiate-connection-factory/src/main/resources/hornetq/server0/activemq-jms.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd"> diff --git a/examples/jms/instantiate-connection-factory/src/main/resources/hornetq/server0/activemq-users.xml b/examples/jms/instantiate-connection-factory/src/main/resources/hornetq/server0/activemq-users.xml new file mode 100644 index 0000000000..8187c91683 --- /dev/null +++ b/examples/jms/instantiate-connection-factory/src/main/resources/hornetq/server0/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/examples/jms/instantiate-connection-factory/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/instantiate-connection-factory/src/main/resources/hornetq/server0/hornetq-users.xml deleted file mode 100644 index dcaf9800d7..0000000000 --- a/examples/jms/instantiate-connection-factory/src/main/resources/hornetq/server0/hornetq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/jms/interceptor/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/interceptor/src/main/resources/hornetq/server0/activemq-configuration.xml similarity index 95% rename from examples/jms/interceptor/src/main/resources/hornetq/server0/hornetq-configuration.xml rename to examples/jms/interceptor/src/main/resources/hornetq/server0/activemq-configuration.xml index 0c1cc53cc8..ed38809271 100644 --- a/examples/jms/interceptor/src/main/resources/hornetq/server0/hornetq-configuration.xml +++ b/examples/jms/interceptor/src/main/resources/hornetq/server0/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> ${build.directory}/server0/data/messaging/bindings diff --git a/examples/jms/jaas/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/interceptor/src/main/resources/hornetq/server0/activemq-jms.xml similarity index 88% rename from examples/jms/jaas/src/main/resources/hornetq/server0/hornetq-jms.xml rename to examples/jms/interceptor/src/main/resources/hornetq/server0/activemq-jms.xml index c2e9a5c7cb..9a03836ef0 100644 --- a/examples/jms/jaas/src/main/resources/hornetq/server0/hornetq-jms.xml +++ b/examples/jms/interceptor/src/main/resources/hornetq/server0/activemq-jms.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd"> diff --git a/examples/jms/interceptor/src/main/resources/hornetq/server0/activemq-users.xml b/examples/jms/interceptor/src/main/resources/hornetq/server0/activemq-users.xml new file mode 100644 index 0000000000..8187c91683 --- /dev/null +++ b/examples/jms/interceptor/src/main/resources/hornetq/server0/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/examples/jms/interceptor/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/interceptor/src/main/resources/hornetq/server0/hornetq-users.xml deleted file mode 100644 index dcaf9800d7..0000000000 --- a/examples/jms/interceptor/src/main/resources/hornetq/server0/hornetq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/jms/jms-completion-listener/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/jaas/src/main/resources/hornetq/server0/activemq-configuration.xml similarity index 94% rename from examples/jms/jms-completion-listener/src/main/resources/hornetq/server0/hornetq-configuration.xml rename to examples/jms/jaas/src/main/resources/hornetq/server0/activemq-configuration.xml index 62eedebfa6..c2dc3004d5 100644 --- a/examples/jms/jms-completion-listener/src/main/resources/hornetq/server0/hornetq-configuration.xml +++ b/examples/jms/jaas/src/main/resources/hornetq/server0/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> ${build.directory}/server0/data/messaging/bindings diff --git a/examples/jms/application-layer-failover/src/main/resources/hornetq/server1/hornetq-jms.xml b/examples/jms/jaas/src/main/resources/hornetq/server0/activemq-jms.xml similarity index 88% rename from examples/jms/application-layer-failover/src/main/resources/hornetq/server1/hornetq-jms.xml rename to examples/jms/jaas/src/main/resources/hornetq/server0/activemq-jms.xml index c2e9a5c7cb..9a03836ef0 100644 --- a/examples/jms/application-layer-failover/src/main/resources/hornetq/server1/hornetq-jms.xml +++ b/examples/jms/jaas/src/main/resources/hornetq/server0/activemq-jms.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd"> diff --git a/examples/jms/jms-auto-closeable/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/jms-auto-closeable/src/main/resources/hornetq/server0/activemq-configuration.xml similarity index 94% rename from examples/jms/jms-auto-closeable/src/main/resources/hornetq/server0/hornetq-configuration.xml rename to examples/jms/jms-auto-closeable/src/main/resources/hornetq/server0/activemq-configuration.xml index 0f5789deb7..8d25acc0fc 100644 --- a/examples/jms/jms-auto-closeable/src/main/resources/hornetq/server0/hornetq-configuration.xml +++ b/examples/jms/jms-auto-closeable/src/main/resources/hornetq/server0/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> ${build.directory}/server0/data/messaging/bindings diff --git a/examples/jms/jms-auto-closeable/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/jms-auto-closeable/src/main/resources/hornetq/server0/activemq-jms.xml new file mode 100644 index 0000000000..9a03836ef0 --- /dev/null +++ b/examples/jms/jms-auto-closeable/src/main/resources/hornetq/server0/activemq-jms.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + diff --git a/examples/jms/jms-auto-closeable/src/main/resources/hornetq/server0/activemq-users.xml b/examples/jms/jms-auto-closeable/src/main/resources/hornetq/server0/activemq-users.xml new file mode 100644 index 0000000000..8187c91683 --- /dev/null +++ b/examples/jms/jms-auto-closeable/src/main/resources/hornetq/server0/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/examples/jms/jms-auto-closeable/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/jms-auto-closeable/src/main/resources/hornetq/server0/hornetq-jms.xml deleted file mode 100644 index c2e9a5c7cb..0000000000 --- a/examples/jms/jms-auto-closeable/src/main/resources/hornetq/server0/hornetq-jms.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/examples/jms/jms-auto-closeable/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/jms-auto-closeable/src/main/resources/hornetq/server0/hornetq-users.xml deleted file mode 100644 index dcaf9800d7..0000000000 --- a/examples/jms/jms-auto-closeable/src/main/resources/hornetq/server0/hornetq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/jms/jms-bridge/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/jms-bridge/src/main/resources/hornetq/server0/activemq-configuration.xml similarity index 93% rename from examples/jms/jms-bridge/src/main/resources/hornetq/server0/hornetq-configuration.xml rename to examples/jms/jms-bridge/src/main/resources/hornetq/server0/activemq-configuration.xml index ef2174fbbd..7d21ca75bf 100644 --- a/examples/jms/jms-bridge/src/main/resources/hornetq/server0/hornetq-configuration.xml +++ b/examples/jms/jms-bridge/src/main/resources/hornetq/server0/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> ${build.directory}/server0/data/messaging/bindings diff --git a/examples/jms/jms-bridge/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/jms-bridge/src/main/resources/hornetq/server0/activemq-jms.xml similarity index 90% rename from examples/jms/jms-bridge/src/main/resources/hornetq/server0/hornetq-jms.xml rename to examples/jms/jms-bridge/src/main/resources/hornetq/server0/activemq-jms.xml index a2629c97c8..2601dfcd5b 100644 --- a/examples/jms/jms-bridge/src/main/resources/hornetq/server0/hornetq-jms.xml +++ b/examples/jms/jms-bridge/src/main/resources/hornetq/server0/activemq-jms.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd"> true diff --git a/examples/jms/jms-bridge/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/jms-bridge/src/main/resources/hornetq/server0/hornetq-users.xml index dcaf9800d7..8187c91683 100644 --- a/examples/jms/jms-bridge/src/main/resources/hornetq/server0/hornetq-users.xml +++ b/examples/jms/jms-bridge/src/main/resources/hornetq/server0/hornetq-users.xml @@ -1,5 +1,5 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-users.xsd"> diff --git a/examples/jms/jms-bridge/src/main/resources/hornetq/server1/hornetq-configuration.xml b/examples/jms/jms-bridge/src/main/resources/hornetq/server1/activemq-configuration.xml similarity index 95% rename from examples/jms/jms-bridge/src/main/resources/hornetq/server1/hornetq-configuration.xml rename to examples/jms/jms-bridge/src/main/resources/hornetq/server1/activemq-configuration.xml index 7b687447e6..72b251eed5 100644 --- a/examples/jms/jms-bridge/src/main/resources/hornetq/server1/hornetq-configuration.xml +++ b/examples/jms/jms-bridge/src/main/resources/hornetq/server1/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> ${build.directory}/server1/data/messaging/bindings diff --git a/examples/jms/jms-bridge/src/main/resources/hornetq/server1/hornetq-jms.xml b/examples/jms/jms-bridge/src/main/resources/hornetq/server1/activemq-jms.xml similarity index 90% rename from examples/jms/jms-bridge/src/main/resources/hornetq/server1/hornetq-jms.xml rename to examples/jms/jms-bridge/src/main/resources/hornetq/server1/activemq-jms.xml index e46b4c27ee..585cd92efe 100644 --- a/examples/jms/jms-bridge/src/main/resources/hornetq/server1/hornetq-jms.xml +++ b/examples/jms/jms-bridge/src/main/resources/hornetq/server1/activemq-jms.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd"> true diff --git a/examples/jms/jms-bridge/src/main/resources/hornetq/server1/activemq-users.xml b/examples/jms/jms-bridge/src/main/resources/hornetq/server1/activemq-users.xml new file mode 100644 index 0000000000..8187c91683 --- /dev/null +++ b/examples/jms/jms-bridge/src/main/resources/hornetq/server1/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/examples/jms/jms-bridge/src/main/resources/hornetq/server1/hornetq-users.xml b/examples/jms/jms-bridge/src/main/resources/hornetq/server1/hornetq-users.xml deleted file mode 100644 index dcaf9800d7..0000000000 --- a/examples/jms/jms-bridge/src/main/resources/hornetq/server1/hornetq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/jms/jms-context/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/jms-completion-listener/src/main/resources/hornetq/server0/activemq-configuration.xml similarity index 94% rename from examples/jms/jms-context/src/main/resources/hornetq/server0/hornetq-configuration.xml rename to examples/jms/jms-completion-listener/src/main/resources/hornetq/server0/activemq-configuration.xml index 62eedebfa6..c2dc3004d5 100644 --- a/examples/jms/jms-context/src/main/resources/hornetq/server0/hornetq-configuration.xml +++ b/examples/jms/jms-completion-listener/src/main/resources/hornetq/server0/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> ${build.directory}/server0/data/messaging/bindings diff --git a/examples/jms/jms-completion-listener/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/jms-completion-listener/src/main/resources/hornetq/server0/activemq-jms.xml new file mode 100644 index 0000000000..9a03836ef0 --- /dev/null +++ b/examples/jms/jms-completion-listener/src/main/resources/hornetq/server0/activemq-jms.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + diff --git a/examples/jms/jms-completion-listener/src/main/resources/hornetq/server0/activemq-users.xml b/examples/jms/jms-completion-listener/src/main/resources/hornetq/server0/activemq-users.xml new file mode 100644 index 0000000000..8187c91683 --- /dev/null +++ b/examples/jms/jms-completion-listener/src/main/resources/hornetq/server0/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/examples/jms/jms-completion-listener/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/jms-completion-listener/src/main/resources/hornetq/server0/hornetq-jms.xml deleted file mode 100644 index c2e9a5c7cb..0000000000 --- a/examples/jms/jms-completion-listener/src/main/resources/hornetq/server0/hornetq-jms.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/examples/jms/jms-completion-listener/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/jms-completion-listener/src/main/resources/hornetq/server0/hornetq-users.xml deleted file mode 100644 index dcaf9800d7..0000000000 --- a/examples/jms/jms-completion-listener/src/main/resources/hornetq/server0/hornetq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/jms/no-consumer-buffering/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/jms-context/src/main/resources/hornetq/server0/activemq-configuration.xml similarity index 94% rename from examples/jms/no-consumer-buffering/src/main/resources/hornetq/server0/hornetq-configuration.xml rename to examples/jms/jms-context/src/main/resources/hornetq/server0/activemq-configuration.xml index 62eedebfa6..c2dc3004d5 100644 --- a/examples/jms/no-consumer-buffering/src/main/resources/hornetq/server0/hornetq-configuration.xml +++ b/examples/jms/jms-context/src/main/resources/hornetq/server0/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> ${build.directory}/server0/data/messaging/bindings diff --git a/examples/jms/jms-context/src/main/resources/hornetq/server0/activemq-users.xml b/examples/jms/jms-context/src/main/resources/hornetq/server0/activemq-users.xml new file mode 100644 index 0000000000..8187c91683 --- /dev/null +++ b/examples/jms/jms-context/src/main/resources/hornetq/server0/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/examples/jms/jms-context/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/jms-context/src/main/resources/hornetq/server0/hornetq-jms.xml deleted file mode 100644 index c2e9a5c7cb..0000000000 --- a/examples/jms/jms-context/src/main/resources/hornetq/server0/hornetq-jms.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/examples/jms/jms-context/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/jms-context/src/main/resources/hornetq/server0/hornetq-users.xml deleted file mode 100644 index dcaf9800d7..0000000000 --- a/examples/jms/jms-context/src/main/resources/hornetq/server0/hornetq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/jms/jms-shared-consumer/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/jms-shared-consumer/src/main/resources/hornetq/server0/activemq-configuration.xml similarity index 94% rename from examples/jms/jms-shared-consumer/src/main/resources/hornetq/server0/hornetq-configuration.xml rename to examples/jms/jms-shared-consumer/src/main/resources/hornetq/server0/activemq-configuration.xml index 0e757711e8..f6cbf6bcd0 100644 --- a/examples/jms/jms-shared-consumer/src/main/resources/hornetq/server0/hornetq-configuration.xml +++ b/examples/jms/jms-shared-consumer/src/main/resources/hornetq/server0/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> ${build.directory}/server0/data/messaging/bindings diff --git a/examples/jms/jms-shared-consumer/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/jms-shared-consumer/src/main/resources/hornetq/server0/activemq-jms.xml similarity index 88% rename from examples/jms/jms-shared-consumer/src/main/resources/hornetq/server0/hornetq-jms.xml rename to examples/jms/jms-shared-consumer/src/main/resources/hornetq/server0/activemq-jms.xml index 17cc336878..e0173b6bb2 100644 --- a/examples/jms/jms-shared-consumer/src/main/resources/hornetq/server0/hornetq-jms.xml +++ b/examples/jms/jms-shared-consumer/src/main/resources/hornetq/server0/activemq-jms.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd"> diff --git a/examples/jms/jms-shared-consumer/src/main/resources/hornetq/server0/activemq-users.xml b/examples/jms/jms-shared-consumer/src/main/resources/hornetq/server0/activemq-users.xml new file mode 100644 index 0000000000..8187c91683 --- /dev/null +++ b/examples/jms/jms-shared-consumer/src/main/resources/hornetq/server0/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/examples/jms/jms-shared-consumer/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/jms-shared-consumer/src/main/resources/hornetq/server0/hornetq-users.xml deleted file mode 100644 index dcaf9800d7..0000000000 --- a/examples/jms/jms-shared-consumer/src/main/resources/hornetq/server0/hornetq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/jms/jmx/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/jmx/src/main/resources/hornetq/server0/activemq-configuration.xml similarity index 95% rename from examples/jms/jmx/src/main/resources/hornetq/server0/hornetq-configuration.xml rename to examples/jms/jmx/src/main/resources/hornetq/server0/activemq-configuration.xml index d98fc4df4d..05c41c1708 100644 --- a/examples/jms/jmx/src/main/resources/hornetq/server0/hornetq-configuration.xml +++ b/examples/jms/jmx/src/main/resources/hornetq/server0/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> ${build.directory}/server0/data/messaging/bindings diff --git a/examples/jms/jmx/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/jmx/src/main/resources/hornetq/server0/activemq-jms.xml similarity index 88% rename from examples/jms/jmx/src/main/resources/hornetq/server0/hornetq-jms.xml rename to examples/jms/jmx/src/main/resources/hornetq/server0/activemq-jms.xml index 8d0d6d7c15..0f3158e831 100644 --- a/examples/jms/jmx/src/main/resources/hornetq/server0/hornetq-jms.xml +++ b/examples/jms/jmx/src/main/resources/hornetq/server0/activemq-jms.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd"> diff --git a/examples/jms/jmx/src/main/resources/hornetq/server0/activemq-users.xml b/examples/jms/jmx/src/main/resources/hornetq/server0/activemq-users.xml new file mode 100644 index 0000000000..8187c91683 --- /dev/null +++ b/examples/jms/jmx/src/main/resources/hornetq/server0/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/examples/jms/jmx/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/jmx/src/main/resources/hornetq/server0/hornetq-users.xml deleted file mode 100644 index dcaf9800d7..0000000000 --- a/examples/jms/jmx/src/main/resources/hornetq/server0/hornetq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/jms/large-message/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/large-message/src/main/resources/hornetq/server0/activemq-configuration.xml new file mode 100644 index 0000000000..1d2d05cf4f --- /dev/null +++ b/examples/jms/large-message/src/main/resources/hornetq/server0/activemq-configuration.xml @@ -0,0 +1,42 @@ + + + ${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 + + + + + + + + + + + + + + + + + + diff --git a/examples/jms/large-message/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/large-message/src/main/resources/hornetq/server0/activemq-jms.xml similarity index 89% rename from examples/jms/large-message/src/main/resources/hornetq/server0/hornetq-jms.xml rename to examples/jms/large-message/src/main/resources/hornetq/server0/activemq-jms.xml index 8bf378d18f..48880d6a42 100644 --- a/examples/jms/large-message/src/main/resources/hornetq/server0/hornetq-jms.xml +++ b/examples/jms/large-message/src/main/resources/hornetq/server0/activemq-jms.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd"> diff --git a/examples/jms/large-message/src/main/resources/hornetq/server0/activemq-users.xml b/examples/jms/large-message/src/main/resources/hornetq/server0/activemq-users.xml new file mode 100644 index 0000000000..8187c91683 --- /dev/null +++ b/examples/jms/large-message/src/main/resources/hornetq/server0/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/examples/jms/large-message/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/large-message/src/main/resources/hornetq/server0/hornetq-configuration.xml deleted file mode 100644 index 1031cd8434..0000000000 --- a/examples/jms/large-message/src/main/resources/hornetq/server0/hornetq-configuration.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - ${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 - - - - - - - - - - - - - - - - - - diff --git a/examples/jms/large-message/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/large-message/src/main/resources/hornetq/server0/hornetq-users.xml deleted file mode 100644 index dcaf9800d7..0000000000 --- a/examples/jms/large-message/src/main/resources/hornetq/server0/hornetq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/jms/last-value-queue/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/last-value-queue/src/main/resources/hornetq/server0/activemq-configuration.xml similarity index 95% rename from examples/jms/last-value-queue/src/main/resources/hornetq/server0/hornetq-configuration.xml rename to examples/jms/last-value-queue/src/main/resources/hornetq/server0/activemq-configuration.xml index 603965a5ca..695c699e9b 100644 --- a/examples/jms/last-value-queue/src/main/resources/hornetq/server0/hornetq-configuration.xml +++ b/examples/jms/last-value-queue/src/main/resources/hornetq/server0/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> ${build.directory}/server0/data/messaging/bindings diff --git a/examples/jms/last-value-queue/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/last-value-queue/src/main/resources/hornetq/server0/activemq-jms.xml similarity index 88% rename from examples/jms/last-value-queue/src/main/resources/hornetq/server0/hornetq-jms.xml rename to examples/jms/last-value-queue/src/main/resources/hornetq/server0/activemq-jms.xml index 0ee1ba99ec..e58f7c7a88 100644 --- a/examples/jms/last-value-queue/src/main/resources/hornetq/server0/hornetq-jms.xml +++ b/examples/jms/last-value-queue/src/main/resources/hornetq/server0/activemq-jms.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd"> diff --git a/examples/jms/last-value-queue/src/main/resources/hornetq/server0/activemq-users.xml b/examples/jms/last-value-queue/src/main/resources/hornetq/server0/activemq-users.xml new file mode 100644 index 0000000000..8187c91683 --- /dev/null +++ b/examples/jms/last-value-queue/src/main/resources/hornetq/server0/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/examples/jms/last-value-queue/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/last-value-queue/src/main/resources/hornetq/server0/hornetq-users.xml deleted file mode 100644 index dcaf9800d7..0000000000 --- a/examples/jms/last-value-queue/src/main/resources/hornetq/server0/hornetq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/jms/management-notifications/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/management-notifications/src/main/resources/hornetq/server0/activemq-configuration.xml similarity index 98% rename from examples/jms/management-notifications/src/main/resources/hornetq/server0/hornetq-configuration.xml rename to examples/jms/management-notifications/src/main/resources/hornetq/server0/activemq-configuration.xml index 501d8356ba..5bef45cadb 100644 --- a/examples/jms/management-notifications/src/main/resources/hornetq/server0/hornetq-configuration.xml +++ b/examples/jms/management-notifications/src/main/resources/hornetq/server0/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq ../../../../src/schema/activemq-configuration.xsd"> ${build.directory}/server0/data/messaging/bindings diff --git a/examples/jms/management-notifications/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/management-notifications/src/main/resources/hornetq/server0/activemq-jms.xml similarity index 90% rename from examples/jms/management-notifications/src/main/resources/hornetq/server0/hornetq-jms.xml rename to examples/jms/management-notifications/src/main/resources/hornetq/server0/activemq-jms.xml index ef6a40f52b..2fb131150c 100644 --- a/examples/jms/management-notifications/src/main/resources/hornetq/server0/hornetq-jms.xml +++ b/examples/jms/management-notifications/src/main/resources/hornetq/server0/activemq-jms.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd"> diff --git a/examples/jms/management-notifications/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/management-notifications/src/main/resources/hornetq/server0/activemq-users.xml similarity index 100% rename from examples/jms/management-notifications/src/main/resources/hornetq/server0/hornetq-users.xml rename to examples/jms/management-notifications/src/main/resources/hornetq/server0/activemq-users.xml diff --git a/examples/jms/management/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/management/src/main/resources/hornetq/server0/activemq-configuration.xml similarity index 96% rename from examples/jms/management/src/main/resources/hornetq/server0/hornetq-configuration.xml rename to examples/jms/management/src/main/resources/hornetq/server0/activemq-configuration.xml index 10b6e54387..57527428d3 100644 --- a/examples/jms/management/src/main/resources/hornetq/server0/hornetq-configuration.xml +++ b/examples/jms/management/src/main/resources/hornetq/server0/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> ${build.directory}/server0/data/messaging/bindings diff --git a/examples/jms/management/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/management/src/main/resources/hornetq/server0/activemq-jms.xml similarity index 88% rename from examples/jms/management/src/main/resources/hornetq/server0/hornetq-jms.xml rename to examples/jms/management/src/main/resources/hornetq/server0/activemq-jms.xml index 3b13994072..6b575ad0f9 100644 --- a/examples/jms/management/src/main/resources/hornetq/server0/hornetq-jms.xml +++ b/examples/jms/management/src/main/resources/hornetq/server0/activemq-jms.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd"> diff --git a/examples/jms/management/src/main/resources/hornetq/server0/activemq-users.xml b/examples/jms/management/src/main/resources/hornetq/server0/activemq-users.xml new file mode 100644 index 0000000000..8187c91683 --- /dev/null +++ b/examples/jms/management/src/main/resources/hornetq/server0/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/examples/jms/management/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/management/src/main/resources/hornetq/server0/hornetq-users.xml deleted file mode 100644 index dcaf9800d7..0000000000 --- a/examples/jms/management/src/main/resources/hornetq/server0/hornetq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/jms/message-counters/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/message-counters/src/main/resources/hornetq/server0/activemq-configuration.xml similarity index 98% rename from examples/jms/message-counters/src/main/resources/hornetq/server0/hornetq-configuration.xml rename to examples/jms/message-counters/src/main/resources/hornetq/server0/activemq-configuration.xml index 1806169f41..0e66fc44bd 100644 --- a/examples/jms/message-counters/src/main/resources/hornetq/server0/hornetq-configuration.xml +++ b/examples/jms/message-counters/src/main/resources/hornetq/server0/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq ../../../../src/schema/activemq-configuration.xsd"> ${build.directory}/server0/data/messaging/bindings diff --git a/examples/jms/message-counters/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/message-counters/src/main/resources/hornetq/server0/activemq-jms.xml similarity index 90% rename from examples/jms/message-counters/src/main/resources/hornetq/server0/hornetq-jms.xml rename to examples/jms/message-counters/src/main/resources/hornetq/server0/activemq-jms.xml index 07dcf79915..a42e643100 100644 --- a/examples/jms/message-counters/src/main/resources/hornetq/server0/hornetq-jms.xml +++ b/examples/jms/message-counters/src/main/resources/hornetq/server0/activemq-jms.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd"> diff --git a/examples/jms/message-counters/src/main/resources/hornetq/server0/activemq-users.xml b/examples/jms/message-counters/src/main/resources/hornetq/server0/activemq-users.xml new file mode 100644 index 0000000000..8187c91683 --- /dev/null +++ b/examples/jms/message-counters/src/main/resources/hornetq/server0/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/examples/jms/message-counters/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/message-counters/src/main/resources/hornetq/server0/hornetq-users.xml deleted file mode 100644 index dcaf9800d7..0000000000 --- a/examples/jms/message-counters/src/main/resources/hornetq/server0/hornetq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/jms/message-group/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/message-group/src/main/resources/hornetq/server0/activemq-configuration.xml new file mode 100644 index 0000000000..1d2d05cf4f --- /dev/null +++ b/examples/jms/message-group/src/main/resources/hornetq/server0/activemq-configuration.xml @@ -0,0 +1,42 @@ + + + ${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 + + + + + + + + + + + + + + + + + + diff --git a/examples/jms/message-group/src/main/resources/hornetq/server0/activemq-users.xml b/examples/jms/message-group/src/main/resources/hornetq/server0/activemq-users.xml new file mode 100644 index 0000000000..8187c91683 --- /dev/null +++ b/examples/jms/message-group/src/main/resources/hornetq/server0/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/examples/jms/message-group/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/message-group/src/main/resources/hornetq/server0/hornetq-configuration.xml deleted file mode 100644 index 1031cd8434..0000000000 --- a/examples/jms/message-group/src/main/resources/hornetq/server0/hornetq-configuration.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - ${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 - - - - - - - - - - - - - - - - - - diff --git a/examples/jms/message-group/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/message-group/src/main/resources/hornetq/server0/hornetq-jms.xml index 86a4c75659..112fefcc97 100644 --- a/examples/jms/message-group/src/main/resources/hornetq/server0/hornetq-jms.xml +++ b/examples/jms/message-group/src/main/resources/hornetq/server0/hornetq-jms.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd"> diff --git a/examples/jms/message-group/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/message-group/src/main/resources/hornetq/server0/hornetq-users.xml deleted file mode 100644 index dcaf9800d7..0000000000 --- a/examples/jms/message-group/src/main/resources/hornetq/server0/hornetq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/jms/message-group2/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/message-group2/src/main/resources/hornetq/server0/activemq-configuration.xml new file mode 100644 index 0000000000..1d2d05cf4f --- /dev/null +++ b/examples/jms/message-group2/src/main/resources/hornetq/server0/activemq-configuration.xml @@ -0,0 +1,42 @@ + + + ${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 + + + + + + + + + + + + + + + + + + diff --git a/examples/jms/message-group2/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/message-group2/src/main/resources/hornetq/server0/activemq-jms.xml similarity index 89% rename from examples/jms/message-group2/src/main/resources/hornetq/server0/hornetq-jms.xml rename to examples/jms/message-group2/src/main/resources/hornetq/server0/activemq-jms.xml index 0b14ff0981..671d601634 100644 --- a/examples/jms/message-group2/src/main/resources/hornetq/server0/hornetq-jms.xml +++ b/examples/jms/message-group2/src/main/resources/hornetq/server0/activemq-jms.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd"> diff --git a/examples/jms/message-group2/src/main/resources/hornetq/server0/activemq-users.xml b/examples/jms/message-group2/src/main/resources/hornetq/server0/activemq-users.xml new file mode 100644 index 0000000000..8187c91683 --- /dev/null +++ b/examples/jms/message-group2/src/main/resources/hornetq/server0/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/examples/jms/message-group2/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/message-group2/src/main/resources/hornetq/server0/hornetq-configuration.xml deleted file mode 100644 index 1031cd8434..0000000000 --- a/examples/jms/message-group2/src/main/resources/hornetq/server0/hornetq-configuration.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - ${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 - - - - - - - - - - - - - - - - - - diff --git a/examples/jms/message-group2/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/message-group2/src/main/resources/hornetq/server0/hornetq-users.xml deleted file mode 100644 index dcaf9800d7..0000000000 --- a/examples/jms/message-group2/src/main/resources/hornetq/server0/hornetq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/jms/message-priority/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/message-priority/src/main/resources/hornetq/server0/activemq-configuration.xml new file mode 100644 index 0000000000..1d2d05cf4f --- /dev/null +++ b/examples/jms/message-priority/src/main/resources/hornetq/server0/activemq-configuration.xml @@ -0,0 +1,42 @@ + + + ${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 + + + + + + + + + + + + + + + + + + diff --git a/examples/jms/message-priority/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/message-priority/src/main/resources/hornetq/server0/activemq-jms.xml new file mode 100644 index 0000000000..112fefcc97 --- /dev/null +++ b/examples/jms/message-priority/src/main/resources/hornetq/server0/activemq-jms.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/examples/jms/message-priority/src/main/resources/hornetq/server0/activemq-users.xml b/examples/jms/message-priority/src/main/resources/hornetq/server0/activemq-users.xml new file mode 100644 index 0000000000..8187c91683 --- /dev/null +++ b/examples/jms/message-priority/src/main/resources/hornetq/server0/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/examples/jms/message-priority/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/message-priority/src/main/resources/hornetq/server0/hornetq-configuration.xml deleted file mode 100644 index 1031cd8434..0000000000 --- a/examples/jms/message-priority/src/main/resources/hornetq/server0/hornetq-configuration.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - ${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 - - - - - - - - - - - - - - - - - - diff --git a/examples/jms/message-priority/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/message-priority/src/main/resources/hornetq/server0/hornetq-jms.xml deleted file mode 100644 index 86a4c75659..0000000000 --- a/examples/jms/message-priority/src/main/resources/hornetq/server0/hornetq-jms.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/examples/jms/message-priority/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/message-priority/src/main/resources/hornetq/server0/hornetq-users.xml deleted file mode 100644 index dcaf9800d7..0000000000 --- a/examples/jms/message-priority/src/main/resources/hornetq/server0/hornetq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server0/activemq-configuration.xml similarity index 97% rename from examples/jms/multiple-failover-failback/src/main/resources/hornetq/server0/hornetq-configuration.xml rename to examples/jms/multiple-failover-failback/src/main/resources/hornetq/server0/activemq-configuration.xml index d63e0b7e85..6bc1876063 100644 --- a/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server0/hornetq-configuration.xml +++ b/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server0/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq ../../../../../../../../hornetq-server/src/main/resources/schema/activemq-configuration.xsd"> ${build.directory}/server0/data/messaging/bindings diff --git a/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server0/activemq-jms.xml similarity index 93% rename from examples/jms/multiple-failover-failback/src/main/resources/hornetq/server0/hornetq-jms.xml rename to examples/jms/multiple-failover-failback/src/main/resources/hornetq/server0/activemq-jms.xml index feff6bfb46..13222eb9cb 100644 --- a/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server0/hornetq-jms.xml +++ b/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server0/activemq-jms.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd"> diff --git a/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server0/activemq-users.xml b/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server0/activemq-users.xml new file mode 100644 index 0000000000..8187c91683 --- /dev/null +++ b/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server0/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server0/hornetq-users.xml deleted file mode 100644 index dcaf9800d7..0000000000 --- a/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server0/hornetq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server1/hornetq-configuration.xml b/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server1/activemq-configuration.xml similarity index 97% rename from examples/jms/multiple-failover-failback/src/main/resources/hornetq/server1/hornetq-configuration.xml rename to examples/jms/multiple-failover-failback/src/main/resources/hornetq/server1/activemq-configuration.xml index 4a04f8e9cc..48e22ad67b 100644 --- a/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server1/hornetq-configuration.xml +++ b/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server1/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq ../../../../../../../../hornetq-server/src/main/resources/schema/activemq-configuration.xsd"> ${build.directory}/server0/data/messaging/bindings diff --git a/examples/jms/non-transaction-failover/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server1/activemq-jms.xml similarity index 93% rename from examples/jms/non-transaction-failover/src/main/resources/hornetq/server0/hornetq-jms.xml rename to examples/jms/multiple-failover-failback/src/main/resources/hornetq/server1/activemq-jms.xml index b10c99e6ee..e9e4f9d850 100644 --- a/examples/jms/non-transaction-failover/src/main/resources/hornetq/server0/hornetq-jms.xml +++ b/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server1/activemq-jms.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd"> diff --git a/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server1/activemq-users.xml b/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server1/activemq-users.xml new file mode 100644 index 0000000000..8187c91683 --- /dev/null +++ b/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server1/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server1/hornetq-users.xml b/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server1/hornetq-users.xml deleted file mode 100644 index dcaf9800d7..0000000000 --- a/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server1/hornetq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server2/hornetq-configuration.xml b/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server2/activemq-configuration.xml similarity index 97% rename from examples/jms/multiple-failover-failback/src/main/resources/hornetq/server2/hornetq-configuration.xml rename to examples/jms/multiple-failover-failback/src/main/resources/hornetq/server2/activemq-configuration.xml index 78c8af25fe..7cd662e943 100644 --- a/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server2/hornetq-configuration.xml +++ b/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server2/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq ../../../../../../../../hornetq-server/src/main/resources/schema/activemq-configuration.xsd"> ${build.directory}/server0/data/messaging/bindings diff --git a/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server2/hornetq-jms.xml b/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server2/activemq-jms.xml similarity index 93% rename from examples/jms/multiple-failover-failback/src/main/resources/hornetq/server2/hornetq-jms.xml rename to examples/jms/multiple-failover-failback/src/main/resources/hornetq/server2/activemq-jms.xml index 6f124f5d91..4f2ea0f833 100644 --- a/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server2/hornetq-jms.xml +++ b/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server2/activemq-jms.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd"> diff --git a/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server2/activemq-users.xml b/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server2/activemq-users.xml new file mode 100644 index 0000000000..8187c91683 --- /dev/null +++ b/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server2/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server2/hornetq-users.xml b/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server2/hornetq-users.xml deleted file mode 100644 index dcaf9800d7..0000000000 --- a/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server2/hornetq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/jms/multiple-failover/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/multiple-failover/src/main/resources/hornetq/server0/activemq-configuration.xml similarity index 97% rename from examples/jms/multiple-failover/src/main/resources/hornetq/server0/hornetq-configuration.xml rename to examples/jms/multiple-failover/src/main/resources/hornetq/server0/activemq-configuration.xml index 1e9ad3274b..b2eb971236 100644 --- a/examples/jms/multiple-failover/src/main/resources/hornetq/server0/hornetq-configuration.xml +++ b/examples/jms/multiple-failover/src/main/resources/hornetq/server0/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq ../../../../../../../../hornetq-server/src/main/resources/schema/activemq-configuration.xsd"> ${build.directory}/server0/data/messaging/bindings diff --git a/examples/jms/multiple-failover/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/multiple-failover/src/main/resources/hornetq/server0/activemq-jms.xml similarity index 93% rename from examples/jms/multiple-failover/src/main/resources/hornetq/server0/hornetq-jms.xml rename to examples/jms/multiple-failover/src/main/resources/hornetq/server0/activemq-jms.xml index feff6bfb46..13222eb9cb 100644 --- a/examples/jms/multiple-failover/src/main/resources/hornetq/server0/hornetq-jms.xml +++ b/examples/jms/multiple-failover/src/main/resources/hornetq/server0/activemq-jms.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd"> diff --git a/examples/jms/multiple-failover/src/main/resources/hornetq/server0/activemq-users.xml b/examples/jms/multiple-failover/src/main/resources/hornetq/server0/activemq-users.xml new file mode 100644 index 0000000000..8187c91683 --- /dev/null +++ b/examples/jms/multiple-failover/src/main/resources/hornetq/server0/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/examples/jms/multiple-failover/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/multiple-failover/src/main/resources/hornetq/server0/hornetq-users.xml deleted file mode 100644 index dcaf9800d7..0000000000 --- a/examples/jms/multiple-failover/src/main/resources/hornetq/server0/hornetq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/jms/multiple-failover/src/main/resources/hornetq/server1/hornetq-configuration.xml b/examples/jms/multiple-failover/src/main/resources/hornetq/server1/activemq-configuration.xml similarity index 97% rename from examples/jms/multiple-failover/src/main/resources/hornetq/server1/hornetq-configuration.xml rename to examples/jms/multiple-failover/src/main/resources/hornetq/server1/activemq-configuration.xml index 23e89f0291..b309bbb2cd 100644 --- a/examples/jms/multiple-failover/src/main/resources/hornetq/server1/hornetq-configuration.xml +++ b/examples/jms/multiple-failover/src/main/resources/hornetq/server1/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq ../../../../../../../../hornetq-server/src/main/resources/schema/activemq-configuration.xsd"> ${build.directory}/server0/data/messaging/bindings diff --git a/examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server1/hornetq-jms.xml b/examples/jms/multiple-failover/src/main/resources/hornetq/server1/activemq-jms.xml similarity index 93% rename from examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server1/hornetq-jms.xml rename to examples/jms/multiple-failover/src/main/resources/hornetq/server1/activemq-jms.xml index b10c99e6ee..e9e4f9d850 100644 --- a/examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server1/hornetq-jms.xml +++ b/examples/jms/multiple-failover/src/main/resources/hornetq/server1/activemq-jms.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd"> diff --git a/examples/jms/multiple-failover/src/main/resources/hornetq/server1/activemq-users.xml b/examples/jms/multiple-failover/src/main/resources/hornetq/server1/activemq-users.xml new file mode 100644 index 0000000000..8187c91683 --- /dev/null +++ b/examples/jms/multiple-failover/src/main/resources/hornetq/server1/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/examples/jms/multiple-failover/src/main/resources/hornetq/server1/hornetq-users.xml b/examples/jms/multiple-failover/src/main/resources/hornetq/server1/hornetq-users.xml deleted file mode 100644 index dcaf9800d7..0000000000 --- a/examples/jms/multiple-failover/src/main/resources/hornetq/server1/hornetq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/jms/multiple-failover/src/main/resources/hornetq/server2/hornetq-configuration.xml b/examples/jms/multiple-failover/src/main/resources/hornetq/server2/activemq-configuration.xml similarity index 97% rename from examples/jms/multiple-failover/src/main/resources/hornetq/server2/hornetq-configuration.xml rename to examples/jms/multiple-failover/src/main/resources/hornetq/server2/activemq-configuration.xml index 2e79beb8c5..ef8090ec45 100644 --- a/examples/jms/multiple-failover/src/main/resources/hornetq/server2/hornetq-configuration.xml +++ b/examples/jms/multiple-failover/src/main/resources/hornetq/server2/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq ../../../../../../../../hornetq-server/src/main/resources/schema/activemq-configuration.xsd"> ${build.directory}/server0/data/messaging/bindings diff --git a/examples/jms/multiple-failover/src/main/resources/hornetq/server2/hornetq-jms.xml b/examples/jms/multiple-failover/src/main/resources/hornetq/server2/activemq-jms.xml similarity index 93% rename from examples/jms/multiple-failover/src/main/resources/hornetq/server2/hornetq-jms.xml rename to examples/jms/multiple-failover/src/main/resources/hornetq/server2/activemq-jms.xml index 6f124f5d91..4f2ea0f833 100644 --- a/examples/jms/multiple-failover/src/main/resources/hornetq/server2/hornetq-jms.xml +++ b/examples/jms/multiple-failover/src/main/resources/hornetq/server2/activemq-jms.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd"> diff --git a/examples/jms/multiple-failover/src/main/resources/hornetq/server2/activemq-users.xml b/examples/jms/multiple-failover/src/main/resources/hornetq/server2/activemq-users.xml new file mode 100644 index 0000000000..8187c91683 --- /dev/null +++ b/examples/jms/multiple-failover/src/main/resources/hornetq/server2/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/examples/jms/multiple-failover/src/main/resources/hornetq/server2/hornetq-users.xml b/examples/jms/multiple-failover/src/main/resources/hornetq/server2/hornetq-users.xml deleted file mode 100644 index dcaf9800d7..0000000000 --- a/examples/jms/multiple-failover/src/main/resources/hornetq/server2/hornetq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/jms/jaas/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/no-consumer-buffering/src/main/resources/hornetq/server0/activemq-configuration.xml similarity index 94% rename from examples/jms/jaas/src/main/resources/hornetq/server0/hornetq-configuration.xml rename to examples/jms/no-consumer-buffering/src/main/resources/hornetq/server0/activemq-configuration.xml index 62eedebfa6..c2dc3004d5 100644 --- a/examples/jms/jaas/src/main/resources/hornetq/server0/hornetq-configuration.xml +++ b/examples/jms/no-consumer-buffering/src/main/resources/hornetq/server0/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> ${build.directory}/server0/data/messaging/bindings diff --git a/examples/jms/no-consumer-buffering/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/no-consumer-buffering/src/main/resources/hornetq/server0/activemq-jms.xml similarity index 91% rename from examples/jms/no-consumer-buffering/src/main/resources/hornetq/server0/hornetq-jms.xml rename to examples/jms/no-consumer-buffering/src/main/resources/hornetq/server0/activemq-jms.xml index bf453f3adf..b42254f70c 100644 --- a/examples/jms/no-consumer-buffering/src/main/resources/hornetq/server0/hornetq-jms.xml +++ b/examples/jms/no-consumer-buffering/src/main/resources/hornetq/server0/activemq-jms.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd"> diff --git a/examples/jms/no-consumer-buffering/src/main/resources/hornetq/server0/activemq-users.xml b/examples/jms/no-consumer-buffering/src/main/resources/hornetq/server0/activemq-users.xml new file mode 100644 index 0000000000..8187c91683 --- /dev/null +++ b/examples/jms/no-consumer-buffering/src/main/resources/hornetq/server0/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/examples/jms/no-consumer-buffering/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/no-consumer-buffering/src/main/resources/hornetq/server0/hornetq-users.xml deleted file mode 100644 index dcaf9800d7..0000000000 --- a/examples/jms/no-consumer-buffering/src/main/resources/hornetq/server0/hornetq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/jms/non-transaction-failover/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/non-transaction-failover/src/main/resources/hornetq/server0/activemq-configuration.xml similarity index 96% rename from examples/jms/non-transaction-failover/src/main/resources/hornetq/server0/hornetq-configuration.xml rename to examples/jms/non-transaction-failover/src/main/resources/hornetq/server0/activemq-configuration.xml index 975b30cbb3..a147f10ad4 100644 --- a/examples/jms/non-transaction-failover/src/main/resources/hornetq/server0/hornetq-configuration.xml +++ b/examples/jms/non-transaction-failover/src/main/resources/hornetq/server0/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> diff --git a/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server1/hornetq-jms.xml b/examples/jms/non-transaction-failover/src/main/resources/hornetq/server0/activemq-jms.xml similarity index 93% rename from examples/jms/multiple-failover-failback/src/main/resources/hornetq/server1/hornetq-jms.xml rename to examples/jms/non-transaction-failover/src/main/resources/hornetq/server0/activemq-jms.xml index b10c99e6ee..e9e4f9d850 100644 --- a/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server1/hornetq-jms.xml +++ b/examples/jms/non-transaction-failover/src/main/resources/hornetq/server0/activemq-jms.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd"> diff --git a/examples/jms/non-transaction-failover/src/main/resources/hornetq/server0/activemq-users.xml b/examples/jms/non-transaction-failover/src/main/resources/hornetq/server0/activemq-users.xml new file mode 100644 index 0000000000..8187c91683 --- /dev/null +++ b/examples/jms/non-transaction-failover/src/main/resources/hornetq/server0/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/examples/jms/non-transaction-failover/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/non-transaction-failover/src/main/resources/hornetq/server0/hornetq-users.xml deleted file mode 100644 index dcaf9800d7..0000000000 --- a/examples/jms/non-transaction-failover/src/main/resources/hornetq/server0/hornetq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/jms/non-transaction-failover/src/main/resources/hornetq/server1/hornetq-configuration.xml b/examples/jms/non-transaction-failover/src/main/resources/hornetq/server1/activemq-configuration.xml similarity index 96% rename from examples/jms/non-transaction-failover/src/main/resources/hornetq/server1/hornetq-configuration.xml rename to examples/jms/non-transaction-failover/src/main/resources/hornetq/server1/activemq-configuration.xml index 728efdf9c0..f9d8ccdc65 100644 --- a/examples/jms/non-transaction-failover/src/main/resources/hornetq/server1/hornetq-configuration.xml +++ b/examples/jms/non-transaction-failover/src/main/resources/hornetq/server1/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> diff --git a/examples/jms/non-transaction-failover/src/main/resources/hornetq/server1/hornetq-jms.xml b/examples/jms/non-transaction-failover/src/main/resources/hornetq/server1/activemq-jms.xml similarity index 93% rename from examples/jms/non-transaction-failover/src/main/resources/hornetq/server1/hornetq-jms.xml rename to examples/jms/non-transaction-failover/src/main/resources/hornetq/server1/activemq-jms.xml index 4af3aa3e4b..8dc8b2a2a9 100644 --- a/examples/jms/non-transaction-failover/src/main/resources/hornetq/server1/hornetq-jms.xml +++ b/examples/jms/non-transaction-failover/src/main/resources/hornetq/server1/activemq-jms.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd"> diff --git a/examples/jms/non-transaction-failover/src/main/resources/hornetq/server1/activemq-users.xml b/examples/jms/non-transaction-failover/src/main/resources/hornetq/server1/activemq-users.xml new file mode 100644 index 0000000000..8187c91683 --- /dev/null +++ b/examples/jms/non-transaction-failover/src/main/resources/hornetq/server1/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/examples/jms/non-transaction-failover/src/main/resources/hornetq/server1/hornetq-users.xml b/examples/jms/non-transaction-failover/src/main/resources/hornetq/server1/hornetq-users.xml deleted file mode 100644 index dcaf9800d7..0000000000 --- a/examples/jms/non-transaction-failover/src/main/resources/hornetq/server1/hornetq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/jms/openwire/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/openwire/src/main/resources/hornetq/server0/activemq-configuration.xml similarity index 96% rename from examples/jms/openwire/src/main/resources/hornetq/server0/hornetq-configuration.xml rename to examples/jms/openwire/src/main/resources/hornetq/server0/activemq-configuration.xml index d22da2a2a9..3d2a7087c7 100644 --- a/examples/jms/openwire/src/main/resources/hornetq/server0/hornetq-configuration.xml +++ b/examples/jms/openwire/src/main/resources/hornetq/server0/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> ${build.directory}/server0/data/messaging/bindings diff --git a/examples/jms/openwire/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/openwire/src/main/resources/hornetq/server0/activemq-jms.xml new file mode 100644 index 0000000000..9a03836ef0 --- /dev/null +++ b/examples/jms/openwire/src/main/resources/hornetq/server0/activemq-jms.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + diff --git a/examples/jms/openwire/src/main/resources/hornetq/server0/activemq-users.xml b/examples/jms/openwire/src/main/resources/hornetq/server0/activemq-users.xml new file mode 100644 index 0000000000..8187c91683 --- /dev/null +++ b/examples/jms/openwire/src/main/resources/hornetq/server0/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/examples/jms/openwire/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/openwire/src/main/resources/hornetq/server0/hornetq-jms.xml deleted file mode 100644 index c2e9a5c7cb..0000000000 --- a/examples/jms/openwire/src/main/resources/hornetq/server0/hornetq-jms.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/examples/jms/openwire/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/openwire/src/main/resources/hornetq/server0/hornetq-users.xml deleted file mode 100644 index dcaf9800d7..0000000000 --- a/examples/jms/openwire/src/main/resources/hornetq/server0/hornetq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/jms/paging/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/paging/src/main/resources/hornetq/server0/activemq-configuration.xml similarity index 96% rename from examples/jms/paging/src/main/resources/hornetq/server0/hornetq-configuration.xml rename to examples/jms/paging/src/main/resources/hornetq/server0/activemq-configuration.xml index 2dfe99776b..b4046d2093 100644 --- a/examples/jms/paging/src/main/resources/hornetq/server0/hornetq-configuration.xml +++ b/examples/jms/paging/src/main/resources/hornetq/server0/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> ${build.directory}/server0/data/messaging/bindings diff --git a/examples/jms/paging/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/paging/src/main/resources/hornetq/server0/activemq-jms.xml similarity index 89% rename from examples/jms/paging/src/main/resources/hornetq/server0/hornetq-jms.xml rename to examples/jms/paging/src/main/resources/hornetq/server0/activemq-jms.xml index 9eff93a3f3..2c0f19270d 100644 --- a/examples/jms/paging/src/main/resources/hornetq/server0/hornetq-jms.xml +++ b/examples/jms/paging/src/main/resources/hornetq/server0/activemq-jms.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd"> diff --git a/examples/jms/paging/src/main/resources/hornetq/server0/activemq-users.xml b/examples/jms/paging/src/main/resources/hornetq/server0/activemq-users.xml new file mode 100644 index 0000000000..8187c91683 --- /dev/null +++ b/examples/jms/paging/src/main/resources/hornetq/server0/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/examples/jms/paging/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/paging/src/main/resources/hornetq/server0/hornetq-users.xml deleted file mode 100644 index dcaf9800d7..0000000000 --- a/examples/jms/paging/src/main/resources/hornetq/server0/hornetq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/jms/perf/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/perf/src/main/resources/hornetq/server0/activemq-configuration.xml similarity index 94% rename from examples/jms/perf/src/main/resources/hornetq/server0/hornetq-configuration.xml rename to examples/jms/perf/src/main/resources/hornetq/server0/activemq-configuration.xml index e10a75a547..64396b6976 100644 --- a/examples/jms/perf/src/main/resources/hornetq/server0/hornetq-configuration.xml +++ b/examples/jms/perf/src/main/resources/hornetq/server0/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq ../../../../../../../../hornetq-server/src/main/resources/schema/activemq-configuration.xsd"> diff --git a/examples/jms/perf/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/perf/src/main/resources/hornetq/server0/activemq-jms.xml similarity index 87% rename from examples/jms/perf/src/main/resources/hornetq/server0/hornetq-jms.xml rename to examples/jms/perf/src/main/resources/hornetq/server0/activemq-jms.xml index 9a747e8082..3e609e93da 100644 --- a/examples/jms/perf/src/main/resources/hornetq/server0/hornetq-jms.xml +++ b/examples/jms/perf/src/main/resources/hornetq/server0/activemq-jms.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd"> diff --git a/examples/jms/perf/src/main/resources/hornetq/server0/hornetq-configuration-messaging-lab.xml b/examples/jms/perf/src/main/resources/hornetq/server0/hornetq-configuration-messaging-lab.xml index 7aeded24a2..f377ba104e 100644 --- a/examples/jms/perf/src/main/resources/hornetq/server0/hornetq-configuration-messaging-lab.xml +++ b/examples/jms/perf/src/main/resources/hornetq/server0/hornetq-configuration-messaging-lab.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> diff --git a/examples/jms/pre-acknowledge/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/pre-acknowledge/src/main/resources/hornetq/server0/activemq-configuration.xml similarity index 95% rename from examples/jms/pre-acknowledge/src/main/resources/hornetq/server0/hornetq-configuration.xml rename to examples/jms/pre-acknowledge/src/main/resources/hornetq/server0/activemq-configuration.xml index c790d44a3d..20b9ea9205 100644 --- a/examples/jms/pre-acknowledge/src/main/resources/hornetq/server0/hornetq-configuration.xml +++ b/examples/jms/pre-acknowledge/src/main/resources/hornetq/server0/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> ${build.directory}/server0/data/messaging/bindings diff --git a/examples/jms/pre-acknowledge/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/pre-acknowledge/src/main/resources/hornetq/server0/activemq-jms.xml new file mode 100644 index 0000000000..9a03836ef0 --- /dev/null +++ b/examples/jms/pre-acknowledge/src/main/resources/hornetq/server0/activemq-jms.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + diff --git a/examples/jms/pre-acknowledge/src/main/resources/hornetq/server0/activemq-users.xml b/examples/jms/pre-acknowledge/src/main/resources/hornetq/server0/activemq-users.xml new file mode 100644 index 0000000000..8187c91683 --- /dev/null +++ b/examples/jms/pre-acknowledge/src/main/resources/hornetq/server0/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/examples/jms/pre-acknowledge/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/pre-acknowledge/src/main/resources/hornetq/server0/hornetq-jms.xml deleted file mode 100644 index c2e9a5c7cb..0000000000 --- a/examples/jms/pre-acknowledge/src/main/resources/hornetq/server0/hornetq-jms.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/examples/jms/pre-acknowledge/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/pre-acknowledge/src/main/resources/hornetq/server0/hornetq-users.xml deleted file mode 100644 index dcaf9800d7..0000000000 --- a/examples/jms/pre-acknowledge/src/main/resources/hornetq/server0/hornetq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/jms/producer-rate-limit/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/producer-rate-limit/src/main/resources/hornetq/server0/activemq-configuration.xml similarity index 95% rename from examples/jms/producer-rate-limit/src/main/resources/hornetq/server0/hornetq-configuration.xml rename to examples/jms/producer-rate-limit/src/main/resources/hornetq/server0/activemq-configuration.xml index f1e4a3a95a..570843b442 100644 --- a/examples/jms/producer-rate-limit/src/main/resources/hornetq/server0/hornetq-configuration.xml +++ b/examples/jms/producer-rate-limit/src/main/resources/hornetq/server0/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> ${build.directory}/server0/data/messaging/bindings diff --git a/examples/jms/producer-rate-limit/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/producer-rate-limit/src/main/resources/hornetq/server0/activemq-jms.xml similarity index 91% rename from examples/jms/producer-rate-limit/src/main/resources/hornetq/server0/hornetq-jms.xml rename to examples/jms/producer-rate-limit/src/main/resources/hornetq/server0/activemq-jms.xml index a1ff70c1c9..2b1bd73b8b 100644 --- a/examples/jms/producer-rate-limit/src/main/resources/hornetq/server0/hornetq-jms.xml +++ b/examples/jms/producer-rate-limit/src/main/resources/hornetq/server0/activemq-jms.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd"> diff --git a/examples/jms/producer-rate-limit/src/main/resources/hornetq/server0/activemq-users.xml b/examples/jms/producer-rate-limit/src/main/resources/hornetq/server0/activemq-users.xml new file mode 100644 index 0000000000..8187c91683 --- /dev/null +++ b/examples/jms/producer-rate-limit/src/main/resources/hornetq/server0/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/examples/jms/producer-rate-limit/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/producer-rate-limit/src/main/resources/hornetq/server0/hornetq-users.xml deleted file mode 100644 index dcaf9800d7..0000000000 --- a/examples/jms/producer-rate-limit/src/main/resources/hornetq/server0/hornetq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/jms/proton-cpp/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/proton-cpp/src/main/resources/hornetq/server0/activemq-configuration.xml similarity index 93% rename from examples/jms/proton-cpp/src/main/resources/hornetq/server0/hornetq-configuration.xml rename to examples/jms/proton-cpp/src/main/resources/hornetq/server0/activemq-configuration.xml index 62b47ec9e5..1807a20f1c 100644 --- a/examples/jms/proton-cpp/src/main/resources/hornetq/server0/hornetq-configuration.xml +++ b/examples/jms/proton-cpp/src/main/resources/hornetq/server0/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> ${build.directory}/server0/data/messaging/bindings diff --git a/examples/jms/proton-cpp/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/proton-cpp/src/main/resources/hornetq/server0/activemq-jms.xml similarity index 77% rename from examples/jms/proton-cpp/src/main/resources/hornetq/server0/hornetq-jms.xml rename to examples/jms/proton-cpp/src/main/resources/hornetq/server0/activemq-jms.xml index b22ed1eca2..74485eed48 100644 --- a/examples/jms/proton-cpp/src/main/resources/hornetq/server0/hornetq-jms.xml +++ b/examples/jms/proton-cpp/src/main/resources/hornetq/server0/activemq-jms.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd"> diff --git a/examples/jms/proton-cpp/src/main/resources/hornetq/server0/activemq-users.xml b/examples/jms/proton-cpp/src/main/resources/hornetq/server0/activemq-users.xml new file mode 100644 index 0000000000..8187c91683 --- /dev/null +++ b/examples/jms/proton-cpp/src/main/resources/hornetq/server0/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/examples/jms/proton-cpp/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/proton-cpp/src/main/resources/hornetq/server0/hornetq-users.xml deleted file mode 100644 index dcaf9800d7..0000000000 --- a/examples/jms/proton-cpp/src/main/resources/hornetq/server0/hornetq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/jms/proton-j/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/proton-j/src/main/resources/hornetq/server0/activemq-configuration.xml similarity index 94% rename from examples/jms/proton-j/src/main/resources/hornetq/server0/hornetq-configuration.xml rename to examples/jms/proton-j/src/main/resources/hornetq/server0/activemq-configuration.xml index 0f09bfcb40..2d66dba170 100644 --- a/examples/jms/proton-j/src/main/resources/hornetq/server0/hornetq-configuration.xml +++ b/examples/jms/proton-j/src/main/resources/hornetq/server0/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> ${build.directory}/server0/data/messaging/bindings diff --git a/examples/jms/proton-j/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/proton-j/src/main/resources/hornetq/server0/activemq-jms.xml similarity index 77% rename from examples/jms/proton-j/src/main/resources/hornetq/server0/hornetq-jms.xml rename to examples/jms/proton-j/src/main/resources/hornetq/server0/activemq-jms.xml index 53bfbb6083..fe421b3ac9 100644 --- a/examples/jms/proton-j/src/main/resources/hornetq/server0/hornetq-jms.xml +++ b/examples/jms/proton-j/src/main/resources/hornetq/server0/activemq-jms.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd"> diff --git a/examples/jms/proton-j/src/main/resources/hornetq/server0/activemq-users.xml b/examples/jms/proton-j/src/main/resources/hornetq/server0/activemq-users.xml new file mode 100644 index 0000000000..8187c91683 --- /dev/null +++ b/examples/jms/proton-j/src/main/resources/hornetq/server0/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/examples/jms/proton-j/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/proton-j/src/main/resources/hornetq/server0/hornetq-users.xml deleted file mode 100644 index dcaf9800d7..0000000000 --- a/examples/jms/proton-j/src/main/resources/hornetq/server0/hornetq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/jms/proton-ruby/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/proton-ruby/src/main/resources/hornetq/server0/activemq-configuration.xml similarity index 94% rename from examples/jms/proton-ruby/src/main/resources/hornetq/server0/hornetq-configuration.xml rename to examples/jms/proton-ruby/src/main/resources/hornetq/server0/activemq-configuration.xml index 4e22823361..b9e679e8a0 100644 --- a/examples/jms/proton-ruby/src/main/resources/hornetq/server0/hornetq-configuration.xml +++ b/examples/jms/proton-ruby/src/main/resources/hornetq/server0/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> ${build.directory}/server0/data/messaging/bindings diff --git a/examples/jms/proton-ruby/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/proton-ruby/src/main/resources/hornetq/server0/activemq-jms.xml similarity index 77% rename from examples/jms/proton-ruby/src/main/resources/hornetq/server0/hornetq-jms.xml rename to examples/jms/proton-ruby/src/main/resources/hornetq/server0/activemq-jms.xml index aa983b1ef8..8b1838c131 100644 --- a/examples/jms/proton-ruby/src/main/resources/hornetq/server0/hornetq-jms.xml +++ b/examples/jms/proton-ruby/src/main/resources/hornetq/server0/activemq-jms.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd"> diff --git a/examples/jms/proton-ruby/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/proton-ruby/src/main/resources/hornetq/server0/activemq-users.xml similarity index 78% rename from examples/jms/proton-ruby/src/main/resources/hornetq/server0/hornetq-users.xml rename to examples/jms/proton-ruby/src/main/resources/hornetq/server0/activemq-users.xml index 9ad99fc89a..07b7455119 100644 --- a/examples/jms/proton-ruby/src/main/resources/hornetq/server0/hornetq-users.xml +++ b/examples/jms/proton-ruby/src/main/resources/hornetq/server0/activemq-users.xml @@ -1,5 +1,5 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-users.xsd"> diff --git a/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server0/activemq-configuration.xml similarity index 97% rename from examples/jms/queue-message-redistribution/src/main/resources/hornetq/server0/hornetq-configuration.xml rename to examples/jms/queue-message-redistribution/src/main/resources/hornetq/server0/activemq-configuration.xml index 50d3f1fc60..7ed345ee6c 100644 --- a/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server0/hornetq-configuration.xml +++ b/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server0/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> diff --git a/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server0/activemq-jms.xml new file mode 100644 index 0000000000..112fefcc97 --- /dev/null +++ b/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server0/activemq-jms.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server0/activemq-users.xml b/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server0/activemq-users.xml new file mode 100644 index 0000000000..8187c91683 --- /dev/null +++ b/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server0/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server0/hornetq-jms.xml deleted file mode 100644 index 86a4c75659..0000000000 --- a/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server0/hornetq-jms.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server0/hornetq-users.xml deleted file mode 100644 index dcaf9800d7..0000000000 --- a/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server0/hornetq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server1/hornetq-configuration.xml b/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server1/activemq-configuration.xml similarity index 97% rename from examples/jms/queue-message-redistribution/src/main/resources/hornetq/server1/hornetq-configuration.xml rename to examples/jms/queue-message-redistribution/src/main/resources/hornetq/server1/activemq-configuration.xml index f429ec3c4d..9c10f9aeaa 100644 --- a/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server1/hornetq-configuration.xml +++ b/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server1/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> diff --git a/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server1/activemq-jms.xml b/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server1/activemq-jms.xml new file mode 100644 index 0000000000..112fefcc97 --- /dev/null +++ b/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server1/activemq-jms.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server1/activemq-users.xml b/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server1/activemq-users.xml new file mode 100644 index 0000000000..8187c91683 --- /dev/null +++ b/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server1/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server1/hornetq-jms.xml b/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server1/hornetq-jms.xml deleted file mode 100644 index 86a4c75659..0000000000 --- a/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server1/hornetq-jms.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server1/hornetq-users.xml b/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server1/hornetq-users.xml deleted file mode 100644 index dcaf9800d7..0000000000 --- a/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server1/hornetq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/jms/temp-queue/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/queue-requestor/src/main/resources/hornetq/server0/activemq-configuration.xml similarity index 95% rename from examples/jms/temp-queue/src/main/resources/hornetq/server0/hornetq-configuration.xml rename to examples/jms/queue-requestor/src/main/resources/hornetq/server0/activemq-configuration.xml index e5e0feee2f..aa51e9bd29 100644 --- a/examples/jms/temp-queue/src/main/resources/hornetq/server0/hornetq-configuration.xml +++ b/examples/jms/queue-requestor/src/main/resources/hornetq/server0/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> ${build.directory}/server0/data/messaging/bindings @@ -12,6 +12,7 @@ + org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory @@ -27,7 +28,6 @@ - diff --git a/examples/jms/queue-requestor/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/queue-requestor/src/main/resources/hornetq/server0/activemq-jms.xml similarity index 88% rename from examples/jms/queue-requestor/src/main/resources/hornetq/server0/hornetq-jms.xml rename to examples/jms/queue-requestor/src/main/resources/hornetq/server0/activemq-jms.xml index 12d60e0a7a..e28ae3dd82 100644 --- a/examples/jms/queue-requestor/src/main/resources/hornetq/server0/hornetq-jms.xml +++ b/examples/jms/queue-requestor/src/main/resources/hornetq/server0/activemq-jms.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd"> diff --git a/examples/jms/queue-requestor/src/main/resources/hornetq/server0/activemq-users.xml b/examples/jms/queue-requestor/src/main/resources/hornetq/server0/activemq-users.xml new file mode 100644 index 0000000000..8187c91683 --- /dev/null +++ b/examples/jms/queue-requestor/src/main/resources/hornetq/server0/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/examples/jms/queue-requestor/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/queue-requestor/src/main/resources/hornetq/server0/hornetq-users.xml deleted file mode 100644 index dcaf9800d7..0000000000 --- a/examples/jms/queue-requestor/src/main/resources/hornetq/server0/hornetq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/jms/queue-selector/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/queue-selector/src/main/resources/hornetq/server0/activemq-configuration.xml similarity index 94% rename from examples/jms/queue-selector/src/main/resources/hornetq/server0/hornetq-configuration.xml rename to examples/jms/queue-selector/src/main/resources/hornetq/server0/activemq-configuration.xml index 0cd2aff02d..172e6e544d 100644 --- a/examples/jms/queue-selector/src/main/resources/hornetq/server0/hornetq-configuration.xml +++ b/examples/jms/queue-selector/src/main/resources/hornetq/server0/activemq-configuration.xml @@ -1,5 +1,5 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> ${build.directory}/server0/data/messaging/bindings diff --git a/examples/jms/queue-selector/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/queue-selector/src/main/resources/hornetq/server0/activemq-jms.xml new file mode 100644 index 0000000000..112fefcc97 --- /dev/null +++ b/examples/jms/queue-selector/src/main/resources/hornetq/server0/activemq-jms.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/examples/jms/queue-selector/src/main/resources/hornetq/server0/activemq-users.xml b/examples/jms/queue-selector/src/main/resources/hornetq/server0/activemq-users.xml new file mode 100644 index 0000000000..8187c91683 --- /dev/null +++ b/examples/jms/queue-selector/src/main/resources/hornetq/server0/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/examples/jms/queue-selector/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/queue-selector/src/main/resources/hornetq/server0/hornetq-jms.xml deleted file mode 100644 index 86a4c75659..0000000000 --- a/examples/jms/queue-selector/src/main/resources/hornetq/server0/hornetq-jms.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/examples/jms/queue-selector/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/queue-selector/src/main/resources/hornetq/server0/hornetq-users.xml deleted file mode 100644 index dcaf9800d7..0000000000 --- a/examples/jms/queue-selector/src/main/resources/hornetq/server0/hornetq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/jms/queue/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/queue/src/main/resources/hornetq/server0/activemq-configuration.xml new file mode 100644 index 0000000000..c2dc3004d5 --- /dev/null +++ b/examples/jms/queue/src/main/resources/hornetq/server0/activemq-configuration.xml @@ -0,0 +1,43 @@ + + + ${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 + + + + + + + + + + + + + + + + + + diff --git a/examples/jms/queue/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/queue/src/main/resources/hornetq/server0/activemq-jms.xml new file mode 100644 index 0000000000..9a03836ef0 --- /dev/null +++ b/examples/jms/queue/src/main/resources/hornetq/server0/activemq-jms.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + diff --git a/examples/jms/queue/src/main/resources/hornetq/server0/activemq-users.xml b/examples/jms/queue/src/main/resources/hornetq/server0/activemq-users.xml new file mode 100644 index 0000000000..8187c91683 --- /dev/null +++ b/examples/jms/queue/src/main/resources/hornetq/server0/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/examples/jms/queue/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/queue/src/main/resources/hornetq/server0/hornetq-configuration.xml deleted file mode 100644 index 62eedebfa6..0000000000 --- a/examples/jms/queue/src/main/resources/hornetq/server0/hornetq-configuration.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - ${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 - - - - - - - - - - - - - - - - - - diff --git a/examples/jms/queue/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/queue/src/main/resources/hornetq/server0/hornetq-jms.xml deleted file mode 100644 index c2e9a5c7cb..0000000000 --- a/examples/jms/queue/src/main/resources/hornetq/server0/hornetq-jms.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/examples/jms/queue/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/queue/src/main/resources/hornetq/server0/hornetq-users.xml deleted file mode 100644 index dcaf9800d7..0000000000 --- a/examples/jms/queue/src/main/resources/hornetq/server0/hornetq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/jms/reattach-node/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/reattach-node/src/main/resources/hornetq/server0/activemq-configuration.xml similarity index 96% rename from examples/jms/reattach-node/src/main/resources/hornetq/server0/hornetq-configuration.xml rename to examples/jms/reattach-node/src/main/resources/hornetq/server0/activemq-configuration.xml index c4b0d47b3b..285bc1d1b8 100644 --- a/examples/jms/reattach-node/src/main/resources/hornetq/server0/hornetq-configuration.xml +++ b/examples/jms/reattach-node/src/main/resources/hornetq/server0/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> ${build.directory}/server0/data/messaging/bindings diff --git a/examples/jms/reattach-node/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/reattach-node/src/main/resources/hornetq/server0/activemq-jms.xml similarity index 96% rename from examples/jms/reattach-node/src/main/resources/hornetq/server0/hornetq-jms.xml rename to examples/jms/reattach-node/src/main/resources/hornetq/server0/activemq-jms.xml index bf79c332fc..0db03be11e 100644 --- a/examples/jms/reattach-node/src/main/resources/hornetq/server0/hornetq-jms.xml +++ b/examples/jms/reattach-node/src/main/resources/hornetq/server0/activemq-jms.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd"> diff --git a/examples/jms/reattach-node/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/reattach-node/src/main/resources/hornetq/server0/activemq-users.xml similarity index 85% rename from examples/jms/reattach-node/src/main/resources/hornetq/server0/hornetq-users.xml rename to examples/jms/reattach-node/src/main/resources/hornetq/server0/activemq-users.xml index 4b8307567c..4c0646bd20 100644 --- a/examples/jms/reattach-node/src/main/resources/hornetq/server0/hornetq-users.xml +++ b/examples/jms/reattach-node/src/main/resources/hornetq/server0/activemq-users.xml @@ -1,5 +1,5 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-users.xsd"> diff --git a/examples/jms/replicated-failback-static/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/replicated-failback-static/src/main/resources/hornetq/server0/activemq-configuration.xml similarity index 97% rename from examples/jms/replicated-failback-static/src/main/resources/hornetq/server0/hornetq-configuration.xml rename to examples/jms/replicated-failback-static/src/main/resources/hornetq/server0/activemq-configuration.xml index 4694b4b797..98c78dfbc0 100644 --- a/examples/jms/replicated-failback-static/src/main/resources/hornetq/server0/hornetq-configuration.xml +++ b/examples/jms/replicated-failback-static/src/main/resources/hornetq/server0/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq ../../../../../../../../hornetq-server/src/main/resources/schema/activemq-configuration.xsd"> ${build.directory}/server0/data/messaging/bindings diff --git a/examples/jms/replicated-failback-static/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/replicated-failback-static/src/main/resources/hornetq/server0/activemq-jms.xml similarity index 93% rename from examples/jms/replicated-failback-static/src/main/resources/hornetq/server0/hornetq-jms.xml rename to examples/jms/replicated-failback-static/src/main/resources/hornetq/server0/activemq-jms.xml index feff6bfb46..13222eb9cb 100644 --- a/examples/jms/replicated-failback-static/src/main/resources/hornetq/server0/hornetq-jms.xml +++ b/examples/jms/replicated-failback-static/src/main/resources/hornetq/server0/activemq-jms.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd"> diff --git a/examples/jms/replicated-failback-static/src/main/resources/hornetq/server0/activemq-users.xml b/examples/jms/replicated-failback-static/src/main/resources/hornetq/server0/activemq-users.xml new file mode 100644 index 0000000000..8187c91683 --- /dev/null +++ b/examples/jms/replicated-failback-static/src/main/resources/hornetq/server0/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/examples/jms/replicated-failback-static/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/replicated-failback-static/src/main/resources/hornetq/server0/hornetq-users.xml deleted file mode 100644 index dcaf9800d7..0000000000 --- a/examples/jms/replicated-failback-static/src/main/resources/hornetq/server0/hornetq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/jms/replicated-failback-static/src/main/resources/hornetq/server1/hornetq-configuration.xml b/examples/jms/replicated-failback-static/src/main/resources/hornetq/server1/activemq-configuration.xml similarity index 97% rename from examples/jms/replicated-failback-static/src/main/resources/hornetq/server1/hornetq-configuration.xml rename to examples/jms/replicated-failback-static/src/main/resources/hornetq/server1/activemq-configuration.xml index 2a1028a138..cb462cf90f 100644 --- a/examples/jms/replicated-failback-static/src/main/resources/hornetq/server1/hornetq-configuration.xml +++ b/examples/jms/replicated-failback-static/src/main/resources/hornetq/server1/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq ../../../../../../../../hornetq-server/src/main/resources/schema/activemq-configuration.xsd"> ${build.directory}/server1/data/messaging/bindings diff --git a/examples/jms/replicated-failback-static/src/main/resources/hornetq/server1/activemq-jms.xml b/examples/jms/replicated-failback-static/src/main/resources/hornetq/server1/activemq-jms.xml new file mode 100644 index 0000000000..e9e4f9d850 --- /dev/null +++ b/examples/jms/replicated-failback-static/src/main/resources/hornetq/server1/activemq-jms.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + true + + 1000 + + + 1.0 + + + -1 + + + + + + + + diff --git a/examples/jms/replicated-failback-static/src/main/resources/hornetq/server1/activemq-users.xml b/examples/jms/replicated-failback-static/src/main/resources/hornetq/server1/activemq-users.xml new file mode 100644 index 0000000000..8187c91683 --- /dev/null +++ b/examples/jms/replicated-failback-static/src/main/resources/hornetq/server1/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/examples/jms/replicated-failback-static/src/main/resources/hornetq/server1/hornetq-jms.xml b/examples/jms/replicated-failback-static/src/main/resources/hornetq/server1/hornetq-jms.xml deleted file mode 100644 index b10c99e6ee..0000000000 --- a/examples/jms/replicated-failback-static/src/main/resources/hornetq/server1/hornetq-jms.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - true - - 1000 - - - 1.0 - - - -1 - - - - - - - - diff --git a/examples/jms/replicated-failback-static/src/main/resources/hornetq/server1/hornetq-users.xml b/examples/jms/replicated-failback-static/src/main/resources/hornetq/server1/hornetq-users.xml deleted file mode 100644 index dcaf9800d7..0000000000 --- a/examples/jms/replicated-failback-static/src/main/resources/hornetq/server1/hornetq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/jms/replicated-failback/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/replicated-failback/src/main/resources/hornetq/server0/activemq-configuration.xml similarity index 97% rename from examples/jms/replicated-failback/src/main/resources/hornetq/server0/hornetq-configuration.xml rename to examples/jms/replicated-failback/src/main/resources/hornetq/server0/activemq-configuration.xml index 9c36da3325..15b539f448 100644 --- a/examples/jms/replicated-failback/src/main/resources/hornetq/server0/hornetq-configuration.xml +++ b/examples/jms/replicated-failback/src/main/resources/hornetq/server0/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq ../../../../../../../../hornetq-server/src/main/resources/schema/activemq-configuration.xsd"> ${build.directory}/server0/data/messaging/bindings diff --git a/examples/jms/replicated-failback/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/replicated-failback/src/main/resources/hornetq/server0/activemq-jms.xml new file mode 100644 index 0000000000..13222eb9cb --- /dev/null +++ b/examples/jms/replicated-failback/src/main/resources/hornetq/server0/activemq-jms.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + true + + 1000 + + + 1.0 + + + -1 + + + + + + + + + diff --git a/examples/jms/replicated-failback/src/main/resources/hornetq/server0/activemq-users.xml b/examples/jms/replicated-failback/src/main/resources/hornetq/server0/activemq-users.xml new file mode 100644 index 0000000000..8187c91683 --- /dev/null +++ b/examples/jms/replicated-failback/src/main/resources/hornetq/server0/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/examples/jms/replicated-failback/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/replicated-failback/src/main/resources/hornetq/server0/hornetq-jms.xml deleted file mode 100644 index feff6bfb46..0000000000 --- a/examples/jms/replicated-failback/src/main/resources/hornetq/server0/hornetq-jms.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - true - - 1000 - - - 1.0 - - - -1 - - - - - - - - - diff --git a/examples/jms/replicated-failback/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/replicated-failback/src/main/resources/hornetq/server0/hornetq-users.xml deleted file mode 100644 index dcaf9800d7..0000000000 --- a/examples/jms/replicated-failback/src/main/resources/hornetq/server0/hornetq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/jms/replicated-failback/src/main/resources/hornetq/server1/hornetq-configuration.xml b/examples/jms/replicated-failback/src/main/resources/hornetq/server1/activemq-configuration.xml similarity index 97% rename from examples/jms/replicated-failback/src/main/resources/hornetq/server1/hornetq-configuration.xml rename to examples/jms/replicated-failback/src/main/resources/hornetq/server1/activemq-configuration.xml index 0c115fd08c..5c8bf43768 100644 --- a/examples/jms/replicated-failback/src/main/resources/hornetq/server1/hornetq-configuration.xml +++ b/examples/jms/replicated-failback/src/main/resources/hornetq/server1/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq ../../../../../../../../hornetq-server/src/main/resources/schema/activemq-configuration.xsd"> ${build.directory}/server1/data/messaging/bindings diff --git a/examples/jms/replicated-failback/src/main/resources/hornetq/server1/activemq-jms.xml b/examples/jms/replicated-failback/src/main/resources/hornetq/server1/activemq-jms.xml new file mode 100644 index 0000000000..e9e4f9d850 --- /dev/null +++ b/examples/jms/replicated-failback/src/main/resources/hornetq/server1/activemq-jms.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + true + + 1000 + + + 1.0 + + + -1 + + + + + + + + diff --git a/examples/jms/replicated-failback/src/main/resources/hornetq/server1/activemq-users.xml b/examples/jms/replicated-failback/src/main/resources/hornetq/server1/activemq-users.xml new file mode 100644 index 0000000000..8187c91683 --- /dev/null +++ b/examples/jms/replicated-failback/src/main/resources/hornetq/server1/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/examples/jms/replicated-failback/src/main/resources/hornetq/server1/hornetq-jms.xml b/examples/jms/replicated-failback/src/main/resources/hornetq/server1/hornetq-jms.xml deleted file mode 100644 index b10c99e6ee..0000000000 --- a/examples/jms/replicated-failback/src/main/resources/hornetq/server1/hornetq-jms.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - true - - 1000 - - - 1.0 - - - -1 - - - - - - - - diff --git a/examples/jms/replicated-failback/src/main/resources/hornetq/server1/hornetq-users.xml b/examples/jms/replicated-failback/src/main/resources/hornetq/server1/hornetq-users.xml deleted file mode 100644 index dcaf9800d7..0000000000 --- a/examples/jms/replicated-failback/src/main/resources/hornetq/server1/hornetq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server0/activemq-configuration.xml similarity index 97% rename from examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server0/hornetq-configuration.xml rename to examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server0/activemq-configuration.xml index dce9a4539a..8657964913 100644 --- a/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server0/hornetq-configuration.xml +++ b/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server0/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq ../../../../../../../../hornetq-server/src/main/resources/schema/activemq-configuration.xsd"> ${build.directory}/server0/data/messaging/bindings diff --git a/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server0/activemq-jms.xml new file mode 100644 index 0000000000..13222eb9cb --- /dev/null +++ b/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server0/activemq-jms.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + true + + 1000 + + + 1.0 + + + -1 + + + + + + + + + diff --git a/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server0/activemq-users.xml b/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server0/activemq-users.xml new file mode 100644 index 0000000000..8187c91683 --- /dev/null +++ b/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server0/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server0/hornetq-jms.xml deleted file mode 100644 index feff6bfb46..0000000000 --- a/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server0/hornetq-jms.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - true - - 1000 - - - 1.0 - - - -1 - - - - - - - - - diff --git a/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server0/hornetq-users.xml deleted file mode 100644 index dcaf9800d7..0000000000 --- a/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server0/hornetq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server1/hornetq-configuration.xml b/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server1/activemq-configuration.xml similarity index 97% rename from examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server1/hornetq-configuration.xml rename to examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server1/activemq-configuration.xml index abd8a24437..ae91fecd86 100644 --- a/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server1/hornetq-configuration.xml +++ b/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server1/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq ../../../../../../../../hornetq-server/src/main/resources/schema/activemq-configuration.xsd"> ${build.directory}/server1/data/messaging/bindings diff --git a/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server1/activemq-jms.xml b/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server1/activemq-jms.xml new file mode 100644 index 0000000000..e9e4f9d850 --- /dev/null +++ b/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server1/activemq-jms.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + true + + 1000 + + + 1.0 + + + -1 + + + + + + + + diff --git a/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server1/activemq-users.xml b/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server1/activemq-users.xml new file mode 100644 index 0000000000..8187c91683 --- /dev/null +++ b/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server1/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server1/hornetq-jms.xml b/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server1/hornetq-jms.xml deleted file mode 100644 index b10c99e6ee..0000000000 --- a/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server1/hornetq-jms.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - true - - 1000 - - - 1.0 - - - -1 - - - - - - - - diff --git a/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server1/hornetq-users.xml b/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server1/hornetq-users.xml deleted file mode 100644 index dcaf9800d7..0000000000 --- a/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server1/hornetq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server2/hornetq-configuration.xml b/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server2/activemq-configuration.xml similarity index 97% rename from examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server2/hornetq-configuration.xml rename to examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server2/activemq-configuration.xml index 5f0a1dae4e..d3e72c9365 100644 --- a/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server2/hornetq-configuration.xml +++ b/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server2/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq ../../../../../../../../hornetq-server/src/main/resources/schema/activemq-configuration.xsd"> ${build.directory}/server2/data/messaging/bindings diff --git a/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server2/hornetq-jms.xml b/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server2/activemq-jms.xml similarity index 93% rename from examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server2/hornetq-jms.xml rename to examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server2/activemq-jms.xml index 6f124f5d91..4f2ea0f833 100644 --- a/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server2/hornetq-jms.xml +++ b/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server2/activemq-jms.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd"> diff --git a/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server2/activemq-users.xml b/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server2/activemq-users.xml new file mode 100644 index 0000000000..8187c91683 --- /dev/null +++ b/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server2/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server2/hornetq-users.xml b/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server2/hornetq-users.xml deleted file mode 100644 index dcaf9800d7..0000000000 --- a/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server2/hornetq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/jms/replicated-transaction-failover/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/replicated-transaction-failover/src/main/resources/hornetq/server0/activemq-configuration.xml similarity index 96% rename from examples/jms/replicated-transaction-failover/src/main/resources/hornetq/server0/hornetq-configuration.xml rename to examples/jms/replicated-transaction-failover/src/main/resources/hornetq/server0/activemq-configuration.xml index 3e35fb6d11..b9c921ca95 100644 --- a/examples/jms/replicated-transaction-failover/src/main/resources/hornetq/server0/hornetq-configuration.xml +++ b/examples/jms/replicated-transaction-failover/src/main/resources/hornetq/server0/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> ${build.directory}/server0/data/messaging/bindings diff --git a/examples/jms/replicated-transaction-failover/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/replicated-transaction-failover/src/main/resources/hornetq/server0/activemq-jms.xml similarity index 93% rename from examples/jms/replicated-transaction-failover/src/main/resources/hornetq/server0/hornetq-jms.xml rename to examples/jms/replicated-transaction-failover/src/main/resources/hornetq/server0/activemq-jms.xml index 391f51c82a..d9203c4a74 100644 --- a/examples/jms/replicated-transaction-failover/src/main/resources/hornetq/server0/hornetq-jms.xml +++ b/examples/jms/replicated-transaction-failover/src/main/resources/hornetq/server0/activemq-jms.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd"> diff --git a/examples/jms/replicated-transaction-failover/src/main/resources/hornetq/server0/activemq-users.xml b/examples/jms/replicated-transaction-failover/src/main/resources/hornetq/server0/activemq-users.xml new file mode 100644 index 0000000000..8187c91683 --- /dev/null +++ b/examples/jms/replicated-transaction-failover/src/main/resources/hornetq/server0/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/examples/jms/replicated-transaction-failover/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/replicated-transaction-failover/src/main/resources/hornetq/server0/hornetq-users.xml deleted file mode 100644 index dcaf9800d7..0000000000 --- a/examples/jms/replicated-transaction-failover/src/main/resources/hornetq/server0/hornetq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/jms/replicated-transaction-failover/src/main/resources/hornetq/server1/hornetq-configuration.xml b/examples/jms/replicated-transaction-failover/src/main/resources/hornetq/server1/activemq-configuration.xml similarity index 97% rename from examples/jms/replicated-transaction-failover/src/main/resources/hornetq/server1/hornetq-configuration.xml rename to examples/jms/replicated-transaction-failover/src/main/resources/hornetq/server1/activemq-configuration.xml index 943ac476f2..582e0a538d 100644 --- a/examples/jms/replicated-transaction-failover/src/main/resources/hornetq/server1/hornetq-configuration.xml +++ b/examples/jms/replicated-transaction-failover/src/main/resources/hornetq/server1/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> ${build.directory}/server1/data/messaging/bindings diff --git a/examples/jms/replicated-transaction-failover/src/main/resources/hornetq/server1/hornetq-jms.xml b/examples/jms/replicated-transaction-failover/src/main/resources/hornetq/server1/activemq-jms.xml similarity index 93% rename from examples/jms/replicated-transaction-failover/src/main/resources/hornetq/server1/hornetq-jms.xml rename to examples/jms/replicated-transaction-failover/src/main/resources/hornetq/server1/activemq-jms.xml index 391f51c82a..d9203c4a74 100644 --- a/examples/jms/replicated-transaction-failover/src/main/resources/hornetq/server1/hornetq-jms.xml +++ b/examples/jms/replicated-transaction-failover/src/main/resources/hornetq/server1/activemq-jms.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd"> diff --git a/examples/jms/replicated-transaction-failover/src/main/resources/hornetq/server1/activemq-users.xml b/examples/jms/replicated-transaction-failover/src/main/resources/hornetq/server1/activemq-users.xml new file mode 100644 index 0000000000..8187c91683 --- /dev/null +++ b/examples/jms/replicated-transaction-failover/src/main/resources/hornetq/server1/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/examples/jms/replicated-transaction-failover/src/main/resources/hornetq/server1/hornetq-users.xml b/examples/jms/replicated-transaction-failover/src/main/resources/hornetq/server1/hornetq-users.xml deleted file mode 100644 index dcaf9800d7..0000000000 --- a/examples/jms/replicated-transaction-failover/src/main/resources/hornetq/server1/hornetq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/jms/request-reply/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/request-reply/src/main/resources/hornetq/server0/activemq-configuration.xml similarity index 95% rename from examples/jms/request-reply/src/main/resources/hornetq/server0/hornetq-configuration.xml rename to examples/jms/request-reply/src/main/resources/hornetq/server0/activemq-configuration.xml index 4b06909e3a..bea0a8fc4f 100644 --- a/examples/jms/request-reply/src/main/resources/hornetq/server0/hornetq-configuration.xml +++ b/examples/jms/request-reply/src/main/resources/hornetq/server0/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> ${build.directory}/server0/data/messaging/bindings diff --git a/examples/jms/request-reply/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/request-reply/src/main/resources/hornetq/server0/activemq-jms.xml new file mode 100644 index 0000000000..112fefcc97 --- /dev/null +++ b/examples/jms/request-reply/src/main/resources/hornetq/server0/activemq-jms.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/examples/jms/request-reply/src/main/resources/hornetq/server0/activemq-users.xml b/examples/jms/request-reply/src/main/resources/hornetq/server0/activemq-users.xml new file mode 100644 index 0000000000..8187c91683 --- /dev/null +++ b/examples/jms/request-reply/src/main/resources/hornetq/server0/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/examples/jms/request-reply/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/request-reply/src/main/resources/hornetq/server0/hornetq-jms.xml deleted file mode 100644 index 86a4c75659..0000000000 --- a/examples/jms/request-reply/src/main/resources/hornetq/server0/hornetq-jms.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/examples/jms/request-reply/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/request-reply/src/main/resources/hornetq/server0/hornetq-users.xml deleted file mode 100644 index dcaf9800d7..0000000000 --- a/examples/jms/request-reply/src/main/resources/hornetq/server0/hornetq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/jms/rest/jms-to-rest/src/main/resources/hornetq-configuration.xml b/examples/jms/rest/dup-send/src/main/resources/activemq-configuration.xml similarity index 94% rename from examples/jms/rest/jms-to-rest/src/main/resources/hornetq-configuration.xml rename to examples/jms/rest/dup-send/src/main/resources/activemq-configuration.xml index 7f6d6c4f13..a927515369 100644 --- a/examples/jms/rest/jms-to-rest/src/main/resources/hornetq-configuration.xml +++ b/examples/jms/rest/dup-send/src/main/resources/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> false diff --git a/examples/jms/rest/dup-send/src/main/resources/hornetq-jms.xml b/examples/jms/rest/dup-send/src/main/resources/activemq-jms.xml similarity index 88% rename from examples/jms/rest/dup-send/src/main/resources/hornetq-jms.xml rename to examples/jms/rest/dup-send/src/main/resources/activemq-jms.xml index 7b8d950d70..c4961f3e5f 100644 --- a/examples/jms/rest/dup-send/src/main/resources/hornetq-jms.xml +++ b/examples/jms/rest/dup-send/src/main/resources/activemq-jms.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd"> diff --git a/activemq-rest/src/test/resources/hornetq-users.xml b/examples/jms/rest/dup-send/src/main/resources/activemq-users.xml similarity index 77% rename from activemq-rest/src/test/resources/hornetq-users.xml rename to examples/jms/rest/dup-send/src/main/resources/activemq-users.xml index 4a9e49ae8d..11c115af70 100644 --- a/activemq-rest/src/test/resources/hornetq-users.xml +++ b/examples/jms/rest/dup-send/src/main/resources/activemq-users.xml @@ -1,5 +1,5 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-users.xsd"> diff --git a/examples/jms/rest/dup-send/src/main/resources/hornetq-client.xml b/examples/jms/rest/dup-send/src/main/resources/hornetq-client.xml index 2b5ebf7c97..f19ede156c 100644 --- a/examples/jms/rest/dup-send/src/main/resources/hornetq-client.xml +++ b/examples/jms/rest/dup-send/src/main/resources/hornetq-client.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> diff --git a/examples/jms/embedded-simple/src/main/resources/hornetq-configuration.xml b/examples/jms/rest/javascript-chat/src/main/resources/activemq-configuration.xml similarity index 93% rename from examples/jms/embedded-simple/src/main/resources/hornetq-configuration.xml rename to examples/jms/rest/javascript-chat/src/main/resources/activemq-configuration.xml index 9e5ab97698..e0fc1184d2 100644 --- a/examples/jms/embedded-simple/src/main/resources/hornetq-configuration.xml +++ b/examples/jms/rest/javascript-chat/src/main/resources/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> false diff --git a/examples/jms/rest/javascript-chat/src/main/resources/hornetq-jms.xml b/examples/jms/rest/javascript-chat/src/main/resources/activemq-jms.xml similarity index 88% rename from examples/jms/rest/javascript-chat/src/main/resources/hornetq-jms.xml rename to examples/jms/rest/javascript-chat/src/main/resources/activemq-jms.xml index 66e696436e..1766dff8ae 100644 --- a/examples/jms/rest/javascript-chat/src/main/resources/hornetq-jms.xml +++ b/examples/jms/rest/javascript-chat/src/main/resources/activemq-jms.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd"> diff --git a/examples/jms/rest/javascript-chat/src/main/resources/hornetq-users.xml b/examples/jms/rest/javascript-chat/src/main/resources/activemq-users.xml similarity index 77% rename from examples/jms/rest/javascript-chat/src/main/resources/hornetq-users.xml rename to examples/jms/rest/javascript-chat/src/main/resources/activemq-users.xml index 4a9e49ae8d..11c115af70 100644 --- a/examples/jms/rest/javascript-chat/src/main/resources/hornetq-users.xml +++ b/examples/jms/rest/javascript-chat/src/main/resources/activemq-users.xml @@ -1,5 +1,5 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-users.xsd"> diff --git a/examples/jms/rest/push/src/main/resources/hornetq-configuration.xml b/examples/jms/rest/jms-to-rest/src/main/resources/activemq-configuration.xml similarity index 94% rename from examples/jms/rest/push/src/main/resources/hornetq-configuration.xml rename to examples/jms/rest/jms-to-rest/src/main/resources/activemq-configuration.xml index 7f6d6c4f13..a927515369 100644 --- a/examples/jms/rest/push/src/main/resources/hornetq-configuration.xml +++ b/examples/jms/rest/jms-to-rest/src/main/resources/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> false diff --git a/examples/jms/rest/jms-to-rest/src/main/resources/hornetq-jms.xml b/examples/jms/rest/jms-to-rest/src/main/resources/activemq-jms.xml similarity index 88% rename from examples/jms/rest/jms-to-rest/src/main/resources/hornetq-jms.xml rename to examples/jms/rest/jms-to-rest/src/main/resources/activemq-jms.xml index 7b8d950d70..c4961f3e5f 100644 --- a/examples/jms/rest/jms-to-rest/src/main/resources/hornetq-jms.xml +++ b/examples/jms/rest/jms-to-rest/src/main/resources/activemq-jms.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd"> 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 new file mode 100644 index 0000000000..11c115af70 --- /dev/null +++ b/examples/jms/rest/jms-to-rest/src/main/resources/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/examples/jms/rest/jms-to-rest/src/main/resources/hornetq-client.xml b/examples/jms/rest/jms-to-rest/src/main/resources/hornetq-client.xml index 2b5ebf7c97..f19ede156c 100644 --- a/examples/jms/rest/jms-to-rest/src/main/resources/hornetq-client.xml +++ b/examples/jms/rest/jms-to-rest/src/main/resources/hornetq-client.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> diff --git a/examples/jms/rest/jms-to-rest/src/main/resources/hornetq-users.xml b/examples/jms/rest/jms-to-rest/src/main/resources/hornetq-users.xml deleted file mode 100644 index 4a9e49ae8d..0000000000 --- a/examples/jms/rest/jms-to-rest/src/main/resources/hornetq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/jms/rest/dup-send/src/main/resources/hornetq-configuration.xml b/examples/jms/rest/push/src/main/resources/activemq-configuration.xml similarity index 94% rename from examples/jms/rest/dup-send/src/main/resources/hornetq-configuration.xml rename to examples/jms/rest/push/src/main/resources/activemq-configuration.xml index 7f6d6c4f13..a927515369 100644 --- a/examples/jms/rest/dup-send/src/main/resources/hornetq-configuration.xml +++ b/examples/jms/rest/push/src/main/resources/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> false diff --git a/examples/jms/rest/push/src/main/resources/hornetq-jms.xml b/examples/jms/rest/push/src/main/resources/activemq-jms.xml similarity index 89% rename from examples/jms/rest/push/src/main/resources/hornetq-jms.xml rename to examples/jms/rest/push/src/main/resources/activemq-jms.xml index 2c0f5e85e4..fbf02428d8 100644 --- a/examples/jms/rest/push/src/main/resources/hornetq-jms.xml +++ b/examples/jms/rest/push/src/main/resources/activemq-jms.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd"> diff --git a/examples/jms/rest/push/src/main/resources/activemq-users.xml b/examples/jms/rest/push/src/main/resources/activemq-users.xml new file mode 100644 index 0000000000..11c115af70 --- /dev/null +++ b/examples/jms/rest/push/src/main/resources/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/examples/jms/rest/push/src/main/resources/hornetq-client.xml b/examples/jms/rest/push/src/main/resources/hornetq-client.xml index 2b5ebf7c97..f19ede156c 100644 --- a/examples/jms/rest/push/src/main/resources/hornetq-client.xml +++ b/examples/jms/rest/push/src/main/resources/hornetq-client.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> diff --git a/examples/jms/rest/push/src/main/resources/hornetq-users.xml b/examples/jms/rest/push/src/main/resources/hornetq-users.xml deleted file mode 100644 index 4a9e49ae8d..0000000000 --- a/examples/jms/rest/push/src/main/resources/hornetq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/jms/scale-down/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/scale-down/src/main/resources/hornetq/server0/activemq-configuration.xml similarity index 98% rename from examples/jms/scale-down/src/main/resources/hornetq/server0/hornetq-configuration.xml rename to examples/jms/scale-down/src/main/resources/hornetq/server0/activemq-configuration.xml index 01bfc7622c..b12d6eb05d 100644 --- a/examples/jms/scale-down/src/main/resources/hornetq/server0/hornetq-configuration.xml +++ b/examples/jms/scale-down/src/main/resources/hornetq/server0/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> target/server0/data/messaging/bindings diff --git a/examples/jms/scale-down/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/scale-down/src/main/resources/hornetq/server0/activemq-jms.xml new file mode 100644 index 0000000000..128aff29cb --- /dev/null +++ b/examples/jms/scale-down/src/main/resources/hornetq/server0/activemq-jms.xml @@ -0,0 +1,30 @@ + + + + + + + + + + true + + 1000 + + + 1.0 + + + -1 + + + + + + + + \ No newline at end of file diff --git a/examples/jms/scale-down/src/main/resources/hornetq/server0/activemq-users.xml b/examples/jms/scale-down/src/main/resources/hornetq/server0/activemq-users.xml new file mode 100644 index 0000000000..8187c91683 --- /dev/null +++ b/examples/jms/scale-down/src/main/resources/hornetq/server0/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/examples/jms/scale-down/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/scale-down/src/main/resources/hornetq/server0/hornetq-jms.xml deleted file mode 100644 index b4aff7882c..0000000000 --- a/examples/jms/scale-down/src/main/resources/hornetq/server0/hornetq-jms.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - true - - 1000 - - - 1.0 - - - -1 - - - - - - - - \ No newline at end of file diff --git a/examples/jms/scale-down/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/scale-down/src/main/resources/hornetq/server0/hornetq-users.xml deleted file mode 100644 index dcaf9800d7..0000000000 --- a/examples/jms/scale-down/src/main/resources/hornetq/server0/hornetq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/jms/scale-down/src/main/resources/hornetq/server1/hornetq-configuration.xml b/examples/jms/scale-down/src/main/resources/hornetq/server1/activemq-configuration.xml similarity index 97% rename from examples/jms/scale-down/src/main/resources/hornetq/server1/hornetq-configuration.xml rename to examples/jms/scale-down/src/main/resources/hornetq/server1/activemq-configuration.xml index f6a7e65254..a56dd6fefa 100644 --- a/examples/jms/scale-down/src/main/resources/hornetq/server1/hornetq-configuration.xml +++ b/examples/jms/scale-down/src/main/resources/hornetq/server1/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> diff --git a/examples/jms/scale-down/src/main/resources/hornetq/server1/activemq-jms.xml b/examples/jms/scale-down/src/main/resources/hornetq/server1/activemq-jms.xml new file mode 100644 index 0000000000..128aff29cb --- /dev/null +++ b/examples/jms/scale-down/src/main/resources/hornetq/server1/activemq-jms.xml @@ -0,0 +1,30 @@ + + + + + + + + + + true + + 1000 + + + 1.0 + + + -1 + + + + + + + + \ No newline at end of file diff --git a/examples/jms/scale-down/src/main/resources/hornetq/server1/activemq-users.xml b/examples/jms/scale-down/src/main/resources/hornetq/server1/activemq-users.xml new file mode 100644 index 0000000000..8187c91683 --- /dev/null +++ b/examples/jms/scale-down/src/main/resources/hornetq/server1/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/examples/jms/scale-down/src/main/resources/hornetq/server1/hornetq-jms.xml b/examples/jms/scale-down/src/main/resources/hornetq/server1/hornetq-jms.xml deleted file mode 100644 index b4aff7882c..0000000000 --- a/examples/jms/scale-down/src/main/resources/hornetq/server1/hornetq-jms.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - true - - 1000 - - - 1.0 - - - -1 - - - - - - - - \ No newline at end of file diff --git a/examples/jms/scale-down/src/main/resources/hornetq/server1/hornetq-users.xml b/examples/jms/scale-down/src/main/resources/hornetq/server1/hornetq-users.xml deleted file mode 100644 index dcaf9800d7..0000000000 --- a/examples/jms/scale-down/src/main/resources/hornetq/server1/hornetq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/jms/scheduled-message/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/scheduled-message/src/main/resources/hornetq/server0/activemq-configuration.xml similarity index 94% rename from examples/jms/scheduled-message/src/main/resources/hornetq/server0/hornetq-configuration.xml rename to examples/jms/scheduled-message/src/main/resources/hornetq/server0/activemq-configuration.xml index 758c863cdf..49e37cfed1 100644 --- a/examples/jms/scheduled-message/src/main/resources/hornetq/server0/hornetq-configuration.xml +++ b/examples/jms/scheduled-message/src/main/resources/hornetq/server0/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> ${build.directory}/server0/data/messaging/bindings diff --git a/examples/jms/scheduled-message/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/scheduled-message/src/main/resources/hornetq/server0/activemq-jms.xml new file mode 100644 index 0000000000..112fefcc97 --- /dev/null +++ b/examples/jms/scheduled-message/src/main/resources/hornetq/server0/activemq-jms.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/examples/jms/scheduled-message/src/main/resources/hornetq/server0/activemq-users.xml b/examples/jms/scheduled-message/src/main/resources/hornetq/server0/activemq-users.xml new file mode 100644 index 0000000000..8187c91683 --- /dev/null +++ b/examples/jms/scheduled-message/src/main/resources/hornetq/server0/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/examples/jms/scheduled-message/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/scheduled-message/src/main/resources/hornetq/server0/hornetq-jms.xml deleted file mode 100644 index 86a4c75659..0000000000 --- a/examples/jms/scheduled-message/src/main/resources/hornetq/server0/hornetq-jms.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/examples/jms/scheduled-message/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/scheduled-message/src/main/resources/hornetq/server0/hornetq-users.xml deleted file mode 100644 index dcaf9800d7..0000000000 --- a/examples/jms/scheduled-message/src/main/resources/hornetq/server0/hornetq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/jms/security/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/security/src/main/resources/hornetq/server0/activemq-configuration.xml similarity index 96% rename from examples/jms/security/src/main/resources/hornetq/server0/hornetq-configuration.xml rename to examples/jms/security/src/main/resources/hornetq/server0/activemq-configuration.xml index 0c4224a9c8..7cdc00b1b3 100644 --- a/examples/jms/security/src/main/resources/hornetq/server0/hornetq-configuration.xml +++ b/examples/jms/security/src/main/resources/hornetq/server0/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> ${build.directory}/server0/data/messaging/bindings diff --git a/examples/jms/security/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/security/src/main/resources/hornetq/server0/activemq-jms.xml similarity index 91% rename from examples/jms/security/src/main/resources/hornetq/server0/hornetq-jms.xml rename to examples/jms/security/src/main/resources/hornetq/server0/activemq-jms.xml index 93cbf26b65..2cb0343130 100644 --- a/examples/jms/security/src/main/resources/hornetq/server0/hornetq-jms.xml +++ b/examples/jms/security/src/main/resources/hornetq/server0/activemq-jms.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd"> diff --git a/examples/jms/security/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/security/src/main/resources/hornetq/server0/activemq-users.xml similarity index 88% rename from examples/jms/security/src/main/resources/hornetq/server0/hornetq-users.xml rename to examples/jms/security/src/main/resources/hornetq/server0/activemq-users.xml index a7f66f14e9..7751d97464 100644 --- a/examples/jms/security/src/main/resources/hornetq/server0/hornetq-users.xml +++ b/examples/jms/security/src/main/resources/hornetq/server0/activemq-users.xml @@ -1,5 +1,5 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-users.xsd"> diff --git a/examples/jms/send-acknowledgements/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/send-acknowledgements/src/main/resources/hornetq/server0/activemq-configuration.xml new file mode 100644 index 0000000000..c2dc3004d5 --- /dev/null +++ b/examples/jms/send-acknowledgements/src/main/resources/hornetq/server0/activemq-configuration.xml @@ -0,0 +1,43 @@ + + + ${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 + + + + + + + + + + + + + + + + + + diff --git a/examples/jms/send-acknowledgements/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/send-acknowledgements/src/main/resources/hornetq/server0/activemq-jms.xml similarity index 89% rename from examples/jms/send-acknowledgements/src/main/resources/hornetq/server0/hornetq-jms.xml rename to examples/jms/send-acknowledgements/src/main/resources/hornetq/server0/activemq-jms.xml index 839e31f62d..a46a147df2 100644 --- a/examples/jms/send-acknowledgements/src/main/resources/hornetq/server0/hornetq-jms.xml +++ b/examples/jms/send-acknowledgements/src/main/resources/hornetq/server0/activemq-jms.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd"> diff --git a/examples/jms/send-acknowledgements/src/main/resources/hornetq/server0/activemq-users.xml b/examples/jms/send-acknowledgements/src/main/resources/hornetq/server0/activemq-users.xml new file mode 100644 index 0000000000..8187c91683 --- /dev/null +++ b/examples/jms/send-acknowledgements/src/main/resources/hornetq/server0/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/examples/jms/send-acknowledgements/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/send-acknowledgements/src/main/resources/hornetq/server0/hornetq-configuration.xml deleted file mode 100644 index 62eedebfa6..0000000000 --- a/examples/jms/send-acknowledgements/src/main/resources/hornetq/server0/hornetq-configuration.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - ${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 - - - - - - - - - - - - - - - - - - diff --git a/examples/jms/send-acknowledgements/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/send-acknowledgements/src/main/resources/hornetq/server0/hornetq-users.xml deleted file mode 100644 index dcaf9800d7..0000000000 --- a/examples/jms/send-acknowledgements/src/main/resources/hornetq/server0/hornetq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/jms/spring-integration/src/main/resources/hornetq-configuration.xml b/examples/jms/spring-integration/src/main/resources/activemq-configuration.xml similarity index 93% rename from examples/jms/spring-integration/src/main/resources/hornetq-configuration.xml rename to examples/jms/spring-integration/src/main/resources/activemq-configuration.xml index 9e5ab97698..e0fc1184d2 100644 --- a/examples/jms/spring-integration/src/main/resources/hornetq-configuration.xml +++ b/examples/jms/spring-integration/src/main/resources/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> false diff --git a/examples/jms/embedded-simple/src/main/resources/hornetq-jms.xml b/examples/jms/spring-integration/src/main/resources/activemq-jms.xml similarity index 88% rename from examples/jms/embedded-simple/src/main/resources/hornetq-jms.xml rename to examples/jms/spring-integration/src/main/resources/activemq-jms.xml index 3461588092..cc3fde7c68 100644 --- a/examples/jms/embedded-simple/src/main/resources/hornetq-jms.xml +++ b/examples/jms/spring-integration/src/main/resources/activemq-jms.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd"> diff --git a/examples/jms/spring-integration/src/main/resources/activemq-users.xml b/examples/jms/spring-integration/src/main/resources/activemq-users.xml new file mode 100644 index 0000000000..11c115af70 --- /dev/null +++ b/examples/jms/spring-integration/src/main/resources/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/examples/jms/spring-integration/src/main/resources/hornetq-users.xml b/examples/jms/spring-integration/src/main/resources/hornetq-users.xml deleted file mode 100644 index 4a9e49ae8d..0000000000 --- a/examples/jms/spring-integration/src/main/resources/hornetq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/jms/ssl-enabled/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/ssl-enabled/src/main/resources/hornetq/server0/activemq-configuration.xml similarity index 96% rename from examples/jms/ssl-enabled/src/main/resources/hornetq/server0/hornetq-configuration.xml rename to examples/jms/ssl-enabled/src/main/resources/hornetq/server0/activemq-configuration.xml index b395781b70..e1a3755f1c 100644 --- a/examples/jms/ssl-enabled/src/main/resources/hornetq/server0/hornetq-configuration.xml +++ b/examples/jms/ssl-enabled/src/main/resources/hornetq/server0/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> ${build.directory}/server0/data/messaging/bindings diff --git a/examples/jms/ssl-enabled/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/ssl-enabled/src/main/resources/hornetq/server0/activemq-jms.xml similarity index 88% rename from examples/jms/ssl-enabled/src/main/resources/hornetq/server0/hornetq-jms.xml rename to examples/jms/ssl-enabled/src/main/resources/hornetq/server0/activemq-jms.xml index 256ac23dff..3b39abf87a 100644 --- a/examples/jms/ssl-enabled/src/main/resources/hornetq/server0/hornetq-jms.xml +++ b/examples/jms/ssl-enabled/src/main/resources/hornetq/server0/activemq-jms.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd"> diff --git a/examples/jms/ssl-enabled/src/main/resources/hornetq/server0/activemq-users.xml b/examples/jms/ssl-enabled/src/main/resources/hornetq/server0/activemq-users.xml new file mode 100644 index 0000000000..8187c91683 --- /dev/null +++ b/examples/jms/ssl-enabled/src/main/resources/hornetq/server0/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/examples/jms/ssl-enabled/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/ssl-enabled/src/main/resources/hornetq/server0/hornetq-users.xml deleted file mode 100644 index dcaf9800d7..0000000000 --- a/examples/jms/ssl-enabled/src/main/resources/hornetq/server0/hornetq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/jms/static-selector-jms/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/static-selector-jms/src/main/resources/hornetq/server0/activemq-configuration.xml similarity index 94% rename from examples/jms/static-selector-jms/src/main/resources/hornetq/server0/hornetq-configuration.xml rename to examples/jms/static-selector-jms/src/main/resources/hornetq/server0/activemq-configuration.xml index 4ddb1943b1..20f313e820 100644 --- a/examples/jms/static-selector-jms/src/main/resources/hornetq/server0/hornetq-configuration.xml +++ b/examples/jms/static-selector-jms/src/main/resources/hornetq/server0/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> ${build.directory}/server0/data/messaging/bindings diff --git a/examples/jms/static-selector-jms/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/static-selector-jms/src/main/resources/hornetq/server0/activemq-jms.xml similarity index 89% rename from examples/jms/static-selector-jms/src/main/resources/hornetq/server0/hornetq-jms.xml rename to examples/jms/static-selector-jms/src/main/resources/hornetq/server0/activemq-jms.xml index d79dc9eab1..8867bae7e0 100644 --- a/examples/jms/static-selector-jms/src/main/resources/hornetq/server0/hornetq-jms.xml +++ b/examples/jms/static-selector-jms/src/main/resources/hornetq/server0/activemq-jms.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd"> diff --git a/examples/jms/static-selector-jms/src/main/resources/hornetq/server0/activemq-users.xml b/examples/jms/static-selector-jms/src/main/resources/hornetq/server0/activemq-users.xml new file mode 100644 index 0000000000..8187c91683 --- /dev/null +++ b/examples/jms/static-selector-jms/src/main/resources/hornetq/server0/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/examples/jms/static-selector-jms/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/static-selector-jms/src/main/resources/hornetq/server0/hornetq-users.xml deleted file mode 100644 index dcaf9800d7..0000000000 --- a/examples/jms/static-selector-jms/src/main/resources/hornetq/server0/hornetq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/jms/static-selector/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/static-selector/src/main/resources/hornetq/server0/activemq-configuration.xml similarity index 95% rename from examples/jms/static-selector/src/main/resources/hornetq/server0/hornetq-configuration.xml rename to examples/jms/static-selector/src/main/resources/hornetq/server0/activemq-configuration.xml index 6593a5f164..d01fa0b750 100644 --- a/examples/jms/static-selector/src/main/resources/hornetq/server0/hornetq-configuration.xml +++ b/examples/jms/static-selector/src/main/resources/hornetq/server0/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> ${build.directory}/server0/data/messaging/bindings diff --git a/examples/jms/static-selector/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/static-selector/src/main/resources/hornetq/server0/activemq-jms.xml similarity index 88% rename from examples/jms/static-selector/src/main/resources/hornetq/server0/hornetq-jms.xml rename to examples/jms/static-selector/src/main/resources/hornetq/server0/activemq-jms.xml index 469199cc33..e4f0a64238 100644 --- a/examples/jms/static-selector/src/main/resources/hornetq/server0/hornetq-jms.xml +++ b/examples/jms/static-selector/src/main/resources/hornetq/server0/activemq-jms.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd"> diff --git a/examples/jms/static-selector/src/main/resources/hornetq/server0/activemq-users.xml b/examples/jms/static-selector/src/main/resources/hornetq/server0/activemq-users.xml new file mode 100644 index 0000000000..8187c91683 --- /dev/null +++ b/examples/jms/static-selector/src/main/resources/hornetq/server0/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/examples/jms/static-selector/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/static-selector/src/main/resources/hornetq/server0/hornetq-users.xml deleted file mode 100644 index dcaf9800d7..0000000000 --- a/examples/jms/static-selector/src/main/resources/hornetq/server0/hornetq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/jms/stomp-websockets/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/stomp-websockets/src/main/resources/hornetq/server0/activemq-configuration.xml similarity index 95% rename from examples/jms/stomp-websockets/src/main/resources/hornetq/server0/hornetq-configuration.xml rename to examples/jms/stomp-websockets/src/main/resources/hornetq/server0/activemq-configuration.xml index 64c0299075..e45345e7e7 100644 --- a/examples/jms/stomp-websockets/src/main/resources/hornetq/server0/hornetq-configuration.xml +++ b/examples/jms/stomp-websockets/src/main/resources/hornetq/server0/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> ${build.directory}/server0/data/messaging/bindings diff --git a/examples/jms/stomp-websockets/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/stomp-websockets/src/main/resources/hornetq/server0/activemq-jms.xml similarity index 88% rename from examples/jms/stomp-websockets/src/main/resources/hornetq/server0/hornetq-jms.xml rename to examples/jms/stomp-websockets/src/main/resources/hornetq/server0/activemq-jms.xml index e8541d48ab..4b794c07dc 100644 --- a/examples/jms/stomp-websockets/src/main/resources/hornetq/server0/hornetq-jms.xml +++ b/examples/jms/stomp-websockets/src/main/resources/hornetq/server0/activemq-jms.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd"> diff --git a/examples/jms/stomp-websockets/src/main/resources/hornetq/server0/activemq-users.xml b/examples/jms/stomp-websockets/src/main/resources/hornetq/server0/activemq-users.xml new file mode 100644 index 0000000000..8187c91683 --- /dev/null +++ b/examples/jms/stomp-websockets/src/main/resources/hornetq/server0/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/examples/jms/stomp-websockets/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/stomp-websockets/src/main/resources/hornetq/server0/hornetq-users.xml deleted file mode 100644 index dcaf9800d7..0000000000 --- a/examples/jms/stomp-websockets/src/main/resources/hornetq/server0/hornetq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/jms/stomp1.2/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/stomp/src/main/resources/hornetq/server0/activemq-configuration.xml similarity index 96% rename from examples/jms/stomp1.2/src/main/resources/hornetq/server0/hornetq-configuration.xml rename to examples/jms/stomp/src/main/resources/hornetq/server0/activemq-configuration.xml index 9c63a4a376..e31ffdd9df 100644 --- a/examples/jms/stomp1.2/src/main/resources/hornetq/server0/hornetq-configuration.xml +++ b/examples/jms/stomp/src/main/resources/hornetq/server0/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> ${build.directory}/server0/data/messaging/bindings diff --git a/examples/jms/stomp/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/stomp/src/main/resources/hornetq/server0/activemq-jms.xml new file mode 100644 index 0000000000..9a03836ef0 --- /dev/null +++ b/examples/jms/stomp/src/main/resources/hornetq/server0/activemq-jms.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + diff --git a/examples/jms/stomp/src/main/resources/hornetq/server0/activemq-users.xml b/examples/jms/stomp/src/main/resources/hornetq/server0/activemq-users.xml new file mode 100644 index 0000000000..8187c91683 --- /dev/null +++ b/examples/jms/stomp/src/main/resources/hornetq/server0/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/examples/jms/stomp/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/stomp/src/main/resources/hornetq/server0/hornetq-jms.xml deleted file mode 100644 index c2e9a5c7cb..0000000000 --- a/examples/jms/stomp/src/main/resources/hornetq/server0/hornetq-jms.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/examples/jms/stomp/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/stomp/src/main/resources/hornetq/server0/hornetq-users.xml deleted file mode 100644 index dcaf9800d7..0000000000 --- a/examples/jms/stomp/src/main/resources/hornetq/server0/hornetq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/jms/stomp/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/stomp1.1/src/main/resources/hornetq/server0/activemq-configuration.xml similarity index 96% rename from examples/jms/stomp/src/main/resources/hornetq/server0/hornetq-configuration.xml rename to examples/jms/stomp1.1/src/main/resources/hornetq/server0/activemq-configuration.xml index 9c63a4a376..e31ffdd9df 100644 --- a/examples/jms/stomp/src/main/resources/hornetq/server0/hornetq-configuration.xml +++ b/examples/jms/stomp1.1/src/main/resources/hornetq/server0/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> ${build.directory}/server0/data/messaging/bindings diff --git a/examples/jms/stomp1.1/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/stomp1.1/src/main/resources/hornetq/server0/activemq-jms.xml new file mode 100644 index 0000000000..9a03836ef0 --- /dev/null +++ b/examples/jms/stomp1.1/src/main/resources/hornetq/server0/activemq-jms.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + diff --git a/examples/jms/stomp1.1/src/main/resources/hornetq/server0/activemq-users.xml b/examples/jms/stomp1.1/src/main/resources/hornetq/server0/activemq-users.xml new file mode 100644 index 0000000000..8187c91683 --- /dev/null +++ b/examples/jms/stomp1.1/src/main/resources/hornetq/server0/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/examples/jms/stomp1.1/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/stomp1.1/src/main/resources/hornetq/server0/hornetq-jms.xml deleted file mode 100644 index c2e9a5c7cb..0000000000 --- a/examples/jms/stomp1.1/src/main/resources/hornetq/server0/hornetq-jms.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/examples/jms/stomp1.1/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/stomp1.1/src/main/resources/hornetq/server0/hornetq-users.xml deleted file mode 100644 index dcaf9800d7..0000000000 --- a/examples/jms/stomp1.1/src/main/resources/hornetq/server0/hornetq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/jms/stomp1.1/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/stomp1.2/src/main/resources/hornetq/server0/activemq-configuration.xml similarity index 96% rename from examples/jms/stomp1.1/src/main/resources/hornetq/server0/hornetq-configuration.xml rename to examples/jms/stomp1.2/src/main/resources/hornetq/server0/activemq-configuration.xml index 9c63a4a376..e31ffdd9df 100644 --- a/examples/jms/stomp1.1/src/main/resources/hornetq/server0/hornetq-configuration.xml +++ b/examples/jms/stomp1.2/src/main/resources/hornetq/server0/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> ${build.directory}/server0/data/messaging/bindings diff --git a/examples/jms/stomp1.2/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/stomp1.2/src/main/resources/hornetq/server0/activemq-jms.xml new file mode 100644 index 0000000000..9a03836ef0 --- /dev/null +++ b/examples/jms/stomp1.2/src/main/resources/hornetq/server0/activemq-jms.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + diff --git a/examples/jms/stomp1.2/src/main/resources/hornetq/server0/activemq-users.xml b/examples/jms/stomp1.2/src/main/resources/hornetq/server0/activemq-users.xml new file mode 100644 index 0000000000..8187c91683 --- /dev/null +++ b/examples/jms/stomp1.2/src/main/resources/hornetq/server0/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/examples/jms/stomp1.2/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/stomp1.2/src/main/resources/hornetq/server0/hornetq-jms.xml deleted file mode 100644 index c2e9a5c7cb..0000000000 --- a/examples/jms/stomp1.2/src/main/resources/hornetq/server0/hornetq-jms.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/examples/jms/stomp1.2/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/stomp1.2/src/main/resources/hornetq/server0/hornetq-users.xml deleted file mode 100644 index dcaf9800d7..0000000000 --- a/examples/jms/stomp1.2/src/main/resources/hornetq/server0/hornetq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/jms/stop-server-failover/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/stop-server-failover/src/main/resources/hornetq/server0/activemq-configuration.xml similarity index 97% rename from examples/jms/stop-server-failover/src/main/resources/hornetq/server0/hornetq-configuration.xml rename to examples/jms/stop-server-failover/src/main/resources/hornetq/server0/activemq-configuration.xml index f36ff6852b..037a9b4491 100644 --- a/examples/jms/stop-server-failover/src/main/resources/hornetq/server0/hornetq-configuration.xml +++ b/examples/jms/stop-server-failover/src/main/resources/hornetq/server0/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq ../../../../../../../../hornetq-server/src/main/resources/schema/activemq-configuration.xsd"> ${build.directory}/server0/data/messaging/bindings diff --git a/examples/jms/stop-server-failover/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/stop-server-failover/src/main/resources/hornetq/server0/activemq-jms.xml new file mode 100644 index 0000000000..e9e4f9d850 --- /dev/null +++ b/examples/jms/stop-server-failover/src/main/resources/hornetq/server0/activemq-jms.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + true + + 1000 + + + 1.0 + + + -1 + + + + + + + + diff --git a/examples/jms/stop-server-failover/src/main/resources/hornetq/server0/activemq-users.xml b/examples/jms/stop-server-failover/src/main/resources/hornetq/server0/activemq-users.xml new file mode 100644 index 0000000000..8187c91683 --- /dev/null +++ b/examples/jms/stop-server-failover/src/main/resources/hornetq/server0/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/examples/jms/stop-server-failover/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/stop-server-failover/src/main/resources/hornetq/server0/hornetq-jms.xml deleted file mode 100644 index b10c99e6ee..0000000000 --- a/examples/jms/stop-server-failover/src/main/resources/hornetq/server0/hornetq-jms.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - true - - 1000 - - - 1.0 - - - -1 - - - - - - - - diff --git a/examples/jms/stop-server-failover/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/stop-server-failover/src/main/resources/hornetq/server0/hornetq-users.xml deleted file mode 100644 index dcaf9800d7..0000000000 --- a/examples/jms/stop-server-failover/src/main/resources/hornetq/server0/hornetq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/jms/stop-server-failover/src/main/resources/hornetq/server1/hornetq-configuration.xml b/examples/jms/stop-server-failover/src/main/resources/hornetq/server1/activemq-configuration.xml similarity index 97% rename from examples/jms/stop-server-failover/src/main/resources/hornetq/server1/hornetq-configuration.xml rename to examples/jms/stop-server-failover/src/main/resources/hornetq/server1/activemq-configuration.xml index 60817e3239..0b7f5bfc73 100644 --- a/examples/jms/stop-server-failover/src/main/resources/hornetq/server1/hornetq-configuration.xml +++ b/examples/jms/stop-server-failover/src/main/resources/hornetq/server1/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq ../../../../../../../../hornetq-server/src/main/resources/schema/activemq-configuration.xsd"> ${build.directory}/server0/data/messaging/bindings diff --git a/examples/jms/stop-server-failover/src/main/resources/hornetq/server1/hornetq-jms.xml b/examples/jms/stop-server-failover/src/main/resources/hornetq/server1/activemq-jms.xml similarity index 93% rename from examples/jms/stop-server-failover/src/main/resources/hornetq/server1/hornetq-jms.xml rename to examples/jms/stop-server-failover/src/main/resources/hornetq/server1/activemq-jms.xml index 4af3aa3e4b..8dc8b2a2a9 100644 --- a/examples/jms/stop-server-failover/src/main/resources/hornetq/server1/hornetq-jms.xml +++ b/examples/jms/stop-server-failover/src/main/resources/hornetq/server1/activemq-jms.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd"> diff --git a/examples/jms/stop-server-failover/src/main/resources/hornetq/server1/activemq-users.xml b/examples/jms/stop-server-failover/src/main/resources/hornetq/server1/activemq-users.xml new file mode 100644 index 0000000000..8187c91683 --- /dev/null +++ b/examples/jms/stop-server-failover/src/main/resources/hornetq/server1/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/examples/jms/stop-server-failover/src/main/resources/hornetq/server1/hornetq-users.xml b/examples/jms/stop-server-failover/src/main/resources/hornetq/server1/hornetq-users.xml deleted file mode 100644 index dcaf9800d7..0000000000 --- a/examples/jms/stop-server-failover/src/main/resources/hornetq/server1/hornetq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/symmetric-cluster/src/main/resources/hornetq/server0/activemq-configuration.xml similarity index 97% rename from examples/jms/symmetric-cluster/src/main/resources/hornetq/server0/hornetq-configuration.xml rename to examples/jms/symmetric-cluster/src/main/resources/hornetq/server0/activemq-configuration.xml index fc60a3685f..10ff1c09b4 100644 --- a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server0/hornetq-configuration.xml +++ b/examples/jms/symmetric-cluster/src/main/resources/hornetq/server0/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> diff --git a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/symmetric-cluster/src/main/resources/hornetq/server0/activemq-jms.xml similarity index 90% rename from examples/jms/symmetric-cluster/src/main/resources/hornetq/server0/hornetq-jms.xml rename to examples/jms/symmetric-cluster/src/main/resources/hornetq/server0/activemq-jms.xml index 85cecc34a9..892aa07d6d 100644 --- a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server0/hornetq-jms.xml +++ b/examples/jms/symmetric-cluster/src/main/resources/hornetq/server0/activemq-jms.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd"> diff --git a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server0/activemq-users.xml b/examples/jms/symmetric-cluster/src/main/resources/hornetq/server0/activemq-users.xml new file mode 100644 index 0000000000..8187c91683 --- /dev/null +++ b/examples/jms/symmetric-cluster/src/main/resources/hornetq/server0/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/symmetric-cluster/src/main/resources/hornetq/server0/hornetq-users.xml deleted file mode 100644 index dcaf9800d7..0000000000 --- a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server0/hornetq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server1/hornetq-configuration.xml b/examples/jms/symmetric-cluster/src/main/resources/hornetq/server1/activemq-configuration.xml similarity index 97% rename from examples/jms/symmetric-cluster/src/main/resources/hornetq/server1/hornetq-configuration.xml rename to examples/jms/symmetric-cluster/src/main/resources/hornetq/server1/activemq-configuration.xml index 656b148086..041f7e3565 100644 --- a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server1/hornetq-configuration.xml +++ b/examples/jms/symmetric-cluster/src/main/resources/hornetq/server1/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> diff --git a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server1/hornetq-jms.xml b/examples/jms/symmetric-cluster/src/main/resources/hornetq/server1/activemq-jms.xml similarity index 90% rename from examples/jms/symmetric-cluster/src/main/resources/hornetq/server1/hornetq-jms.xml rename to examples/jms/symmetric-cluster/src/main/resources/hornetq/server1/activemq-jms.xml index b021ef15c0..b6023ccbd1 100644 --- a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server1/hornetq-jms.xml +++ b/examples/jms/symmetric-cluster/src/main/resources/hornetq/server1/activemq-jms.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd"> diff --git a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server1/activemq-users.xml b/examples/jms/symmetric-cluster/src/main/resources/hornetq/server1/activemq-users.xml new file mode 100644 index 0000000000..8187c91683 --- /dev/null +++ b/examples/jms/symmetric-cluster/src/main/resources/hornetq/server1/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server1/hornetq-users.xml b/examples/jms/symmetric-cluster/src/main/resources/hornetq/server1/hornetq-users.xml deleted file mode 100644 index dcaf9800d7..0000000000 --- a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server1/hornetq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server2/hornetq-configuration.xml b/examples/jms/symmetric-cluster/src/main/resources/hornetq/server2/activemq-configuration.xml similarity index 97% rename from examples/jms/symmetric-cluster/src/main/resources/hornetq/server2/hornetq-configuration.xml rename to examples/jms/symmetric-cluster/src/main/resources/hornetq/server2/activemq-configuration.xml index 2b97a8f418..cea18db7b0 100644 --- a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server2/hornetq-configuration.xml +++ b/examples/jms/symmetric-cluster/src/main/resources/hornetq/server2/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> diff --git a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server2/hornetq-jms.xml b/examples/jms/symmetric-cluster/src/main/resources/hornetq/server2/activemq-jms.xml similarity index 89% rename from examples/jms/symmetric-cluster/src/main/resources/hornetq/server2/hornetq-jms.xml rename to examples/jms/symmetric-cluster/src/main/resources/hornetq/server2/activemq-jms.xml index af72290583..97e6ea9639 100644 --- a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server2/hornetq-jms.xml +++ b/examples/jms/symmetric-cluster/src/main/resources/hornetq/server2/activemq-jms.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd"> diff --git a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server2/activemq-users.xml b/examples/jms/symmetric-cluster/src/main/resources/hornetq/server2/activemq-users.xml new file mode 100644 index 0000000000..8187c91683 --- /dev/null +++ b/examples/jms/symmetric-cluster/src/main/resources/hornetq/server2/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server2/hornetq-users.xml b/examples/jms/symmetric-cluster/src/main/resources/hornetq/server2/hornetq-users.xml deleted file mode 100644 index dcaf9800d7..0000000000 --- a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server2/hornetq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server3/hornetq-configuration.xml b/examples/jms/symmetric-cluster/src/main/resources/hornetq/server3/activemq-configuration.xml similarity index 97% rename from examples/jms/symmetric-cluster/src/main/resources/hornetq/server3/hornetq-configuration.xml rename to examples/jms/symmetric-cluster/src/main/resources/hornetq/server3/activemq-configuration.xml index b9c57d56e4..a1556dc8af 100644 --- a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server3/hornetq-configuration.xml +++ b/examples/jms/symmetric-cluster/src/main/resources/hornetq/server3/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> diff --git a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server3/hornetq-jms.xml b/examples/jms/symmetric-cluster/src/main/resources/hornetq/server3/activemq-jms.xml similarity index 90% rename from examples/jms/symmetric-cluster/src/main/resources/hornetq/server3/hornetq-jms.xml rename to examples/jms/symmetric-cluster/src/main/resources/hornetq/server3/activemq-jms.xml index b021ef15c0..b6023ccbd1 100644 --- a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server3/hornetq-jms.xml +++ b/examples/jms/symmetric-cluster/src/main/resources/hornetq/server3/activemq-jms.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd"> diff --git a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server3/activemq-users.xml b/examples/jms/symmetric-cluster/src/main/resources/hornetq/server3/activemq-users.xml new file mode 100644 index 0000000000..8187c91683 --- /dev/null +++ b/examples/jms/symmetric-cluster/src/main/resources/hornetq/server3/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server3/hornetq-users.xml b/examples/jms/symmetric-cluster/src/main/resources/hornetq/server3/hornetq-users.xml deleted file mode 100644 index dcaf9800d7..0000000000 --- a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server3/hornetq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server4/hornetq-configuration.xml b/examples/jms/symmetric-cluster/src/main/resources/hornetq/server4/activemq-configuration.xml similarity index 97% rename from examples/jms/symmetric-cluster/src/main/resources/hornetq/server4/hornetq-configuration.xml rename to examples/jms/symmetric-cluster/src/main/resources/hornetq/server4/activemq-configuration.xml index f802bd74df..0568ff88cc 100644 --- a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server4/hornetq-configuration.xml +++ b/examples/jms/symmetric-cluster/src/main/resources/hornetq/server4/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> diff --git a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server5/hornetq-jms.xml b/examples/jms/symmetric-cluster/src/main/resources/hornetq/server4/activemq-jms.xml similarity index 89% rename from examples/jms/symmetric-cluster/src/main/resources/hornetq/server5/hornetq-jms.xml rename to examples/jms/symmetric-cluster/src/main/resources/hornetq/server4/activemq-jms.xml index 1a16673665..7d3234bdbe 100644 --- a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server5/hornetq-jms.xml +++ b/examples/jms/symmetric-cluster/src/main/resources/hornetq/server4/activemq-jms.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd"> diff --git a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server4/activemq-users.xml b/examples/jms/symmetric-cluster/src/main/resources/hornetq/server4/activemq-users.xml new file mode 100644 index 0000000000..8187c91683 --- /dev/null +++ b/examples/jms/symmetric-cluster/src/main/resources/hornetq/server4/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server4/hornetq-users.xml b/examples/jms/symmetric-cluster/src/main/resources/hornetq/server4/hornetq-users.xml deleted file mode 100644 index dcaf9800d7..0000000000 --- a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server4/hornetq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server5/hornetq-configuration.xml b/examples/jms/symmetric-cluster/src/main/resources/hornetq/server5/activemq-configuration.xml similarity index 97% rename from examples/jms/symmetric-cluster/src/main/resources/hornetq/server5/hornetq-configuration.xml rename to examples/jms/symmetric-cluster/src/main/resources/hornetq/server5/activemq-configuration.xml index 5dfbbdbc59..504fb29f81 100644 --- a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server5/hornetq-configuration.xml +++ b/examples/jms/symmetric-cluster/src/main/resources/hornetq/server5/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> diff --git a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server4/hornetq-jms.xml b/examples/jms/symmetric-cluster/src/main/resources/hornetq/server5/activemq-jms.xml similarity index 89% rename from examples/jms/symmetric-cluster/src/main/resources/hornetq/server4/hornetq-jms.xml rename to examples/jms/symmetric-cluster/src/main/resources/hornetq/server5/activemq-jms.xml index 1a16673665..7d3234bdbe 100644 --- a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server4/hornetq-jms.xml +++ b/examples/jms/symmetric-cluster/src/main/resources/hornetq/server5/activemq-jms.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd"> diff --git a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server5/activemq-users.xml b/examples/jms/symmetric-cluster/src/main/resources/hornetq/server5/activemq-users.xml new file mode 100644 index 0000000000..8187c91683 --- /dev/null +++ b/examples/jms/symmetric-cluster/src/main/resources/hornetq/server5/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server5/hornetq-users.xml b/examples/jms/symmetric-cluster/src/main/resources/hornetq/server5/hornetq-users.xml deleted file mode 100644 index dcaf9800d7..0000000000 --- a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server5/hornetq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/jms/queue-requestor/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/temp-queue/src/main/resources/hornetq/server0/activemq-configuration.xml similarity index 95% rename from examples/jms/queue-requestor/src/main/resources/hornetq/server0/hornetq-configuration.xml rename to examples/jms/temp-queue/src/main/resources/hornetq/server0/activemq-configuration.xml index 9befeed945..9e9a5d03f8 100644 --- a/examples/jms/queue-requestor/src/main/resources/hornetq/server0/hornetq-configuration.xml +++ b/examples/jms/temp-queue/src/main/resources/hornetq/server0/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> ${build.directory}/server0/data/messaging/bindings @@ -12,7 +12,6 @@ - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory @@ -28,6 +27,7 @@ + diff --git a/examples/jms/temp-queue/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/temp-queue/src/main/resources/hornetq/server0/activemq-jms.xml similarity index 88% rename from examples/jms/temp-queue/src/main/resources/hornetq/server0/hornetq-jms.xml rename to examples/jms/temp-queue/src/main/resources/hornetq/server0/activemq-jms.xml index 5b735f1abb..7d2b8c790a 100644 --- a/examples/jms/temp-queue/src/main/resources/hornetq/server0/hornetq-jms.xml +++ b/examples/jms/temp-queue/src/main/resources/hornetq/server0/activemq-jms.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd"> diff --git a/examples/jms/temp-queue/src/main/resources/hornetq/server0/activemq-users.xml b/examples/jms/temp-queue/src/main/resources/hornetq/server0/activemq-users.xml new file mode 100644 index 0000000000..8187c91683 --- /dev/null +++ b/examples/jms/temp-queue/src/main/resources/hornetq/server0/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/examples/jms/temp-queue/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/temp-queue/src/main/resources/hornetq/server0/hornetq-users.xml deleted file mode 100644 index dcaf9800d7..0000000000 --- a/examples/jms/temp-queue/src/main/resources/hornetq/server0/hornetq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/jms/topic-hierarchies/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/topic-hierarchies/src/main/resources/hornetq/server0/activemq-configuration.xml similarity index 94% rename from examples/jms/topic-hierarchies/src/main/resources/hornetq/server0/hornetq-configuration.xml rename to examples/jms/topic-hierarchies/src/main/resources/hornetq/server0/activemq-configuration.xml index 8171700a54..eca1df9ecf 100644 --- a/examples/jms/topic-hierarchies/src/main/resources/hornetq/server0/hornetq-configuration.xml +++ b/examples/jms/topic-hierarchies/src/main/resources/hornetq/server0/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> ${build.directory}/server0/data/messaging/bindings diff --git a/examples/jms/topic-hierarchies/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/topic-hierarchies/src/main/resources/hornetq/server0/activemq-jms.xml similarity index 93% rename from examples/jms/topic-hierarchies/src/main/resources/hornetq/server0/hornetq-jms.xml rename to examples/jms/topic-hierarchies/src/main/resources/hornetq/server0/activemq-jms.xml index 4fb55a2e9b..a20089f99a 100644 --- a/examples/jms/topic-hierarchies/src/main/resources/hornetq/server0/hornetq-jms.xml +++ b/examples/jms/topic-hierarchies/src/main/resources/hornetq/server0/activemq-jms.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd"> diff --git a/examples/jms/topic-hierarchies/src/main/resources/hornetq/server0/activemq-users.xml b/examples/jms/topic-hierarchies/src/main/resources/hornetq/server0/activemq-users.xml new file mode 100644 index 0000000000..8187c91683 --- /dev/null +++ b/examples/jms/topic-hierarchies/src/main/resources/hornetq/server0/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/examples/jms/topic-hierarchies/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/topic-hierarchies/src/main/resources/hornetq/server0/hornetq-users.xml deleted file mode 100644 index dcaf9800d7..0000000000 --- a/examples/jms/topic-hierarchies/src/main/resources/hornetq/server0/hornetq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/jms/topic/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/topic-selector-example1/src/main/resources/hornetq/server0/activemq-configuration.xml similarity index 94% rename from examples/jms/topic/src/main/resources/hornetq/server0/hornetq-configuration.xml rename to examples/jms/topic-selector-example1/src/main/resources/hornetq/server0/activemq-configuration.xml index fd0a600690..8b68ce77fd 100644 --- a/examples/jms/topic/src/main/resources/hornetq/server0/hornetq-configuration.xml +++ b/examples/jms/topic-selector-example1/src/main/resources/hornetq/server0/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> ${build.directory}/server0/data/messaging/bindings diff --git a/examples/jms/topic-selector-example1/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/topic-selector-example1/src/main/resources/hornetq/server0/activemq-jms.xml new file mode 100644 index 0000000000..252edadd5e --- /dev/null +++ b/examples/jms/topic-selector-example1/src/main/resources/hornetq/server0/activemq-jms.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/examples/jms/topic-selector-example1/src/main/resources/hornetq/server0/activemq-users.xml b/examples/jms/topic-selector-example1/src/main/resources/hornetq/server0/activemq-users.xml new file mode 100644 index 0000000000..8187c91683 --- /dev/null +++ b/examples/jms/topic-selector-example1/src/main/resources/hornetq/server0/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/examples/jms/topic-selector-example1/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/topic-selector-example1/src/main/resources/hornetq/server0/hornetq-jms.xml deleted file mode 100644 index 0cf0008cab..0000000000 --- a/examples/jms/topic-selector-example1/src/main/resources/hornetq/server0/hornetq-jms.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/examples/jms/topic-selector-example1/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/topic-selector-example1/src/main/resources/hornetq/server0/hornetq-users.xml deleted file mode 100644 index dcaf9800d7..0000000000 --- a/examples/jms/topic-selector-example1/src/main/resources/hornetq/server0/hornetq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/jms/topic-selector-example2/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/topic-selector-example2/src/main/resources/hornetq/server0/activemq-configuration.xml similarity index 94% rename from examples/jms/topic-selector-example2/src/main/resources/hornetq/server0/hornetq-configuration.xml rename to examples/jms/topic-selector-example2/src/main/resources/hornetq/server0/activemq-configuration.xml index fd0a600690..8b68ce77fd 100644 --- a/examples/jms/topic-selector-example2/src/main/resources/hornetq/server0/hornetq-configuration.xml +++ b/examples/jms/topic-selector-example2/src/main/resources/hornetq/server0/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> ${build.directory}/server0/data/messaging/bindings diff --git a/examples/jms/topic-selector-example2/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/topic-selector-example2/src/main/resources/hornetq/server0/activemq-jms.xml new file mode 100644 index 0000000000..252edadd5e --- /dev/null +++ b/examples/jms/topic-selector-example2/src/main/resources/hornetq/server0/activemq-jms.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/examples/jms/topic-selector-example2/src/main/resources/hornetq/server0/activemq-users.xml b/examples/jms/topic-selector-example2/src/main/resources/hornetq/server0/activemq-users.xml new file mode 100644 index 0000000000..8187c91683 --- /dev/null +++ b/examples/jms/topic-selector-example2/src/main/resources/hornetq/server0/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/examples/jms/topic-selector-example2/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/topic-selector-example2/src/main/resources/hornetq/server0/hornetq-jms.xml deleted file mode 100644 index 0cf0008cab..0000000000 --- a/examples/jms/topic-selector-example2/src/main/resources/hornetq/server0/hornetq-jms.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/examples/jms/topic-selector-example2/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/topic-selector-example2/src/main/resources/hornetq/server0/hornetq-users.xml deleted file mode 100644 index dcaf9800d7..0000000000 --- a/examples/jms/topic-selector-example2/src/main/resources/hornetq/server0/hornetq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/jms/topic-selector-example1/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/topic/src/main/resources/hornetq/server0/activemq-configuration.xml similarity index 94% rename from examples/jms/topic-selector-example1/src/main/resources/hornetq/server0/hornetq-configuration.xml rename to examples/jms/topic/src/main/resources/hornetq/server0/activemq-configuration.xml index fd0a600690..8b68ce77fd 100644 --- a/examples/jms/topic-selector-example1/src/main/resources/hornetq/server0/hornetq-configuration.xml +++ b/examples/jms/topic/src/main/resources/hornetq/server0/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> ${build.directory}/server0/data/messaging/bindings diff --git a/examples/jms/topic/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/topic/src/main/resources/hornetq/server0/activemq-jms.xml new file mode 100644 index 0000000000..252edadd5e --- /dev/null +++ b/examples/jms/topic/src/main/resources/hornetq/server0/activemq-jms.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/examples/jms/topic/src/main/resources/hornetq/server0/activemq-users.xml b/examples/jms/topic/src/main/resources/hornetq/server0/activemq-users.xml new file mode 100644 index 0000000000..8187c91683 --- /dev/null +++ b/examples/jms/topic/src/main/resources/hornetq/server0/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/examples/jms/topic/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/topic/src/main/resources/hornetq/server0/hornetq-jms.xml deleted file mode 100644 index 0cf0008cab..0000000000 --- a/examples/jms/topic/src/main/resources/hornetq/server0/hornetq-jms.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/examples/jms/topic/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/topic/src/main/resources/hornetq/server0/hornetq-users.xml deleted file mode 100644 index dcaf9800d7..0000000000 --- a/examples/jms/topic/src/main/resources/hornetq/server0/hornetq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/jms/transaction-failover/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/transaction-failover/src/main/resources/hornetq/server0/activemq-configuration.xml similarity index 97% rename from examples/jms/transaction-failover/src/main/resources/hornetq/server0/hornetq-configuration.xml rename to examples/jms/transaction-failover/src/main/resources/hornetq/server0/activemq-configuration.xml index 322c3a5df2..3b68661aec 100644 --- a/examples/jms/transaction-failover/src/main/resources/hornetq/server0/hornetq-configuration.xml +++ b/examples/jms/transaction-failover/src/main/resources/hornetq/server0/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq ../../../../../../../../hornetq-server/src/main/resources/schema/activemq-configuration.xsd"> ${build.directory}/server0/data/messaging/bindings diff --git a/examples/jms/transaction-failover/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/transaction-failover/src/main/resources/hornetq/server0/activemq-jms.xml new file mode 100644 index 0000000000..d9203c4a74 --- /dev/null +++ b/examples/jms/transaction-failover/src/main/resources/hornetq/server0/activemq-jms.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + true + + 1000 + + + 1.0 + + + -1 + + + + + + + + diff --git a/examples/jms/transaction-failover/src/main/resources/hornetq/server0/activemq-users.xml b/examples/jms/transaction-failover/src/main/resources/hornetq/server0/activemq-users.xml new file mode 100644 index 0000000000..8187c91683 --- /dev/null +++ b/examples/jms/transaction-failover/src/main/resources/hornetq/server0/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/examples/jms/transaction-failover/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/transaction-failover/src/main/resources/hornetq/server0/hornetq-jms.xml deleted file mode 100644 index 391f51c82a..0000000000 --- a/examples/jms/transaction-failover/src/main/resources/hornetq/server0/hornetq-jms.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - true - - 1000 - - - 1.0 - - - -1 - - - - - - - - diff --git a/examples/jms/transaction-failover/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/transaction-failover/src/main/resources/hornetq/server0/hornetq-users.xml deleted file mode 100644 index dcaf9800d7..0000000000 --- a/examples/jms/transaction-failover/src/main/resources/hornetq/server0/hornetq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/jms/transaction-failover/src/main/resources/hornetq/server1/hornetq-configuration.xml b/examples/jms/transaction-failover/src/main/resources/hornetq/server1/activemq-configuration.xml similarity index 97% rename from examples/jms/transaction-failover/src/main/resources/hornetq/server1/hornetq-configuration.xml rename to examples/jms/transaction-failover/src/main/resources/hornetq/server1/activemq-configuration.xml index 46c7310886..d08b35a470 100644 --- a/examples/jms/transaction-failover/src/main/resources/hornetq/server1/hornetq-configuration.xml +++ b/examples/jms/transaction-failover/src/main/resources/hornetq/server1/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq ../../../../../../../../hornetq-server/src/main/resources/schema/activemq-configuration.xsd"> ${build.directory}/server0/data/messaging/bindings diff --git a/examples/jms/transaction-failover/src/main/resources/hornetq/server1/activemq-jms.xml b/examples/jms/transaction-failover/src/main/resources/hornetq/server1/activemq-jms.xml new file mode 100644 index 0000000000..d9203c4a74 --- /dev/null +++ b/examples/jms/transaction-failover/src/main/resources/hornetq/server1/activemq-jms.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + true + + 1000 + + + 1.0 + + + -1 + + + + + + + + diff --git a/examples/jms/transaction-failover/src/main/resources/hornetq/server1/activemq-users.xml b/examples/jms/transaction-failover/src/main/resources/hornetq/server1/activemq-users.xml new file mode 100644 index 0000000000..8187c91683 --- /dev/null +++ b/examples/jms/transaction-failover/src/main/resources/hornetq/server1/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/examples/jms/transaction-failover/src/main/resources/hornetq/server1/hornetq-jms.xml b/examples/jms/transaction-failover/src/main/resources/hornetq/server1/hornetq-jms.xml deleted file mode 100644 index 391f51c82a..0000000000 --- a/examples/jms/transaction-failover/src/main/resources/hornetq/server1/hornetq-jms.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - true - - 1000 - - - 1.0 - - - -1 - - - - - - - - diff --git a/examples/jms/transaction-failover/src/main/resources/hornetq/server1/hornetq-users.xml b/examples/jms/transaction-failover/src/main/resources/hornetq/server1/hornetq-users.xml deleted file mode 100644 index dcaf9800d7..0000000000 --- a/examples/jms/transaction-failover/src/main/resources/hornetq/server1/hornetq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/jms/transactional/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/transactional/src/main/resources/hornetq/server0/activemq-configuration.xml similarity index 94% rename from examples/jms/transactional/src/main/resources/hornetq/server0/hornetq-configuration.xml rename to examples/jms/transactional/src/main/resources/hornetq/server0/activemq-configuration.xml index 758c863cdf..49e37cfed1 100644 --- a/examples/jms/transactional/src/main/resources/hornetq/server0/hornetq-configuration.xml +++ b/examples/jms/transactional/src/main/resources/hornetq/server0/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> ${build.directory}/server0/data/messaging/bindings diff --git a/examples/jms/transactional/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/transactional/src/main/resources/hornetq/server0/activemq-jms.xml new file mode 100644 index 0000000000..112fefcc97 --- /dev/null +++ b/examples/jms/transactional/src/main/resources/hornetq/server0/activemq-jms.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/examples/jms/transactional/src/main/resources/hornetq/server0/activemq-users.xml b/examples/jms/transactional/src/main/resources/hornetq/server0/activemq-users.xml new file mode 100644 index 0000000000..8187c91683 --- /dev/null +++ b/examples/jms/transactional/src/main/resources/hornetq/server0/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/examples/jms/transactional/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/transactional/src/main/resources/hornetq/server0/hornetq-jms.xml deleted file mode 100644 index 86a4c75659..0000000000 --- a/examples/jms/transactional/src/main/resources/hornetq/server0/hornetq-jms.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/examples/jms/transactional/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/transactional/src/main/resources/hornetq/server0/hornetq-users.xml deleted file mode 100644 index dcaf9800d7..0000000000 --- a/examples/jms/transactional/src/main/resources/hornetq/server0/hornetq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/jms/xa-heuristic/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/xa-heuristic/src/main/resources/hornetq/server0/activemq-configuration.xml similarity index 94% rename from examples/jms/xa-heuristic/src/main/resources/hornetq/server0/hornetq-configuration.xml rename to examples/jms/xa-heuristic/src/main/resources/hornetq/server0/activemq-configuration.xml index 758c863cdf..49e37cfed1 100644 --- a/examples/jms/xa-heuristic/src/main/resources/hornetq/server0/hornetq-configuration.xml +++ b/examples/jms/xa-heuristic/src/main/resources/hornetq/server0/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> ${build.directory}/server0/data/messaging/bindings diff --git a/examples/jms/xa-heuristic/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/xa-heuristic/src/main/resources/hornetq/server0/activemq-jms.xml similarity index 88% rename from examples/jms/xa-heuristic/src/main/resources/hornetq/server0/hornetq-jms.xml rename to examples/jms/xa-heuristic/src/main/resources/hornetq/server0/activemq-jms.xml index 0c4199a6a7..7a6dcdf315 100644 --- a/examples/jms/xa-heuristic/src/main/resources/hornetq/server0/hornetq-jms.xml +++ b/examples/jms/xa-heuristic/src/main/resources/hornetq/server0/activemq-jms.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd"> true diff --git a/examples/jms/xa-heuristic/src/main/resources/hornetq/server0/activemq-users.xml b/examples/jms/xa-heuristic/src/main/resources/hornetq/server0/activemq-users.xml new file mode 100644 index 0000000000..8187c91683 --- /dev/null +++ b/examples/jms/xa-heuristic/src/main/resources/hornetq/server0/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/examples/jms/xa-heuristic/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/xa-heuristic/src/main/resources/hornetq/server0/hornetq-users.xml deleted file mode 100644 index dcaf9800d7..0000000000 --- a/examples/jms/xa-heuristic/src/main/resources/hornetq/server0/hornetq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/jms/xa-receive/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/xa-receive/src/main/resources/hornetq/server0/activemq-configuration.xml similarity index 94% rename from examples/jms/xa-receive/src/main/resources/hornetq/server0/hornetq-configuration.xml rename to examples/jms/xa-receive/src/main/resources/hornetq/server0/activemq-configuration.xml index 758c863cdf..49e37cfed1 100644 --- a/examples/jms/xa-receive/src/main/resources/hornetq/server0/hornetq-configuration.xml +++ b/examples/jms/xa-receive/src/main/resources/hornetq/server0/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> ${build.directory}/server0/data/messaging/bindings diff --git a/examples/jms/xa-receive/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/xa-receive/src/main/resources/hornetq/server0/activemq-jms.xml similarity index 88% rename from examples/jms/xa-receive/src/main/resources/hornetq/server0/hornetq-jms.xml rename to examples/jms/xa-receive/src/main/resources/hornetq/server0/activemq-jms.xml index 0c4199a6a7..7a6dcdf315 100644 --- a/examples/jms/xa-receive/src/main/resources/hornetq/server0/hornetq-jms.xml +++ b/examples/jms/xa-receive/src/main/resources/hornetq/server0/activemq-jms.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd"> true diff --git a/examples/jms/xa-receive/src/main/resources/hornetq/server0/activemq-users.xml b/examples/jms/xa-receive/src/main/resources/hornetq/server0/activemq-users.xml new file mode 100644 index 0000000000..8187c91683 --- /dev/null +++ b/examples/jms/xa-receive/src/main/resources/hornetq/server0/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/examples/jms/xa-receive/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/xa-receive/src/main/resources/hornetq/server0/hornetq-users.xml deleted file mode 100644 index dcaf9800d7..0000000000 --- a/examples/jms/xa-receive/src/main/resources/hornetq/server0/hornetq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/jms/xa-send/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/xa-send/src/main/resources/hornetq/server0/activemq-configuration.xml new file mode 100644 index 0000000000..49e37cfed1 --- /dev/null +++ b/examples/jms/xa-send/src/main/resources/hornetq/server0/activemq-configuration.xml @@ -0,0 +1,42 @@ + + + ${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 + + + + + + + + + + + + + + + + + + diff --git a/examples/jms/xa-send/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/xa-send/src/main/resources/hornetq/server0/activemq-jms.xml similarity index 88% rename from examples/jms/xa-send/src/main/resources/hornetq/server0/hornetq-jms.xml rename to examples/jms/xa-send/src/main/resources/hornetq/server0/activemq-jms.xml index 0c4199a6a7..7a6dcdf315 100644 --- a/examples/jms/xa-send/src/main/resources/hornetq/server0/hornetq-jms.xml +++ b/examples/jms/xa-send/src/main/resources/hornetq/server0/activemq-jms.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd"> true diff --git a/examples/jms/xa-send/src/main/resources/hornetq/server0/activemq-users.xml b/examples/jms/xa-send/src/main/resources/hornetq/server0/activemq-users.xml new file mode 100644 index 0000000000..8187c91683 --- /dev/null +++ b/examples/jms/xa-send/src/main/resources/hornetq/server0/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/examples/jms/xa-send/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/xa-send/src/main/resources/hornetq/server0/hornetq-configuration.xml deleted file mode 100644 index 758c863cdf..0000000000 --- a/examples/jms/xa-send/src/main/resources/hornetq/server0/hornetq-configuration.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - ${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 - - - - - - - - - - - - - - - - - - diff --git a/examples/jms/xa-send/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/xa-send/src/main/resources/hornetq/server0/hornetq-users.xml deleted file mode 100644 index dcaf9800d7..0000000000 --- a/examples/jms/xa-send/src/main/resources/hornetq/server0/hornetq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/jms/xa-with-jta/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/xa-with-jta/src/main/resources/hornetq/server0/activemq-configuration.xml new file mode 100644 index 0000000000..49e37cfed1 --- /dev/null +++ b/examples/jms/xa-with-jta/src/main/resources/hornetq/server0/activemq-configuration.xml @@ -0,0 +1,42 @@ + + + ${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 + + + + + + + + + + + + + + + + + + diff --git a/examples/jms/xa-with-jta/src/main/resources/hornetq/server0/hornetq-jms.xml b/examples/jms/xa-with-jta/src/main/resources/hornetq/server0/activemq-jms.xml similarity index 88% rename from examples/jms/xa-with-jta/src/main/resources/hornetq/server0/hornetq-jms.xml rename to examples/jms/xa-with-jta/src/main/resources/hornetq/server0/activemq-jms.xml index 0c4199a6a7..7a6dcdf315 100644 --- a/examples/jms/xa-with-jta/src/main/resources/hornetq/server0/hornetq-jms.xml +++ b/examples/jms/xa-with-jta/src/main/resources/hornetq/server0/activemq-jms.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd"> true diff --git a/examples/jms/xa-with-jta/src/main/resources/hornetq/server0/activemq-users.xml b/examples/jms/xa-with-jta/src/main/resources/hornetq/server0/activemq-users.xml new file mode 100644 index 0000000000..8187c91683 --- /dev/null +++ b/examples/jms/xa-with-jta/src/main/resources/hornetq/server0/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/examples/jms/xa-with-jta/src/main/resources/hornetq/server0/hornetq-configuration.xml b/examples/jms/xa-with-jta/src/main/resources/hornetq/server0/hornetq-configuration.xml deleted file mode 100644 index 758c863cdf..0000000000 --- a/examples/jms/xa-with-jta/src/main/resources/hornetq/server0/hornetq-configuration.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - ${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 - - - - - - - - - - - - - - - - - - diff --git a/examples/jms/xa-with-jta/src/main/resources/hornetq/server0/hornetq-users.xml b/examples/jms/xa-with-jta/src/main/resources/hornetq/server0/hornetq-users.xml deleted file mode 100644 index dcaf9800d7..0000000000 --- a/examples/jms/xa-with-jta/src/main/resources/hornetq/server0/hornetq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/examples/soak/normal/server0/hornetq-configuration.xml b/examples/soak/normal/server0/activemq-configuration.xml similarity index 95% rename from examples/soak/normal/server0/hornetq-configuration.xml rename to examples/soak/normal/server0/activemq-configuration.xml index 383c841772..49b2217117 100644 --- a/examples/soak/normal/server0/hornetq-configuration.xml +++ b/examples/soak/normal/server0/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq ../../../../hornetq-server/src/main/resources/schema/activemq-configuration.xsd"> diff --git a/examples/soak/normal/server0/hornetq-jms.xml b/examples/soak/normal/server0/activemq-jms.xml similarity index 91% rename from examples/soak/normal/server0/hornetq-jms.xml rename to examples/soak/normal/server0/activemq-jms.xml index 050829c546..d727ece86e 100644 --- a/examples/soak/normal/server0/hornetq-jms.xml +++ b/examples/soak/normal/server0/activemq-jms.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd"> diff --git a/tests/config/server-start-stop-backup-config1.xml b/tests/config/server-start-stop-backup-config1.xml index a4619a389a..5dcca84af1 100644 --- a/tests/config/server-start-stop-backup-config1.xml +++ b/tests/config/server-start-stop-backup-config1.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> true diff --git a/tests/config/server-start-stop-backup-jms-config1.xml b/tests/config/server-start-stop-backup-jms-config1.xml index b81e688554..f4bbed1fb7 100644 --- a/tests/config/server-start-stop-backup-jms-config1.xml +++ b/tests/config/server-start-stop-backup-jms-config1.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd"> diff --git a/tests/config/server-start-stop-live-config1.xml b/tests/config/server-start-stop-live-config1.xml index 096a2fa979..c68ebb9660 100644 --- a/tests/config/server-start-stop-live-config1.xml +++ b/tests/config/server-start-stop-live-config1.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq ../../../src/schema/activemq-configuration.xsd"> diff --git a/tests/config/server-start-stop-live-jms-config1.xml b/tests/config/server-start-stop-live-jms-config1.xml index b9281a2312..34148a3ac1 100644 --- a/tests/config/server-start-stop-live-jms-config1.xml +++ b/tests/config/server-start-stop-live-jms-config1.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd"> diff --git a/tests/integration-tests/src/test/resources/colocated-server-start-stop-config1.xml b/tests/integration-tests/src/test/resources/colocated-server-start-stop-config1.xml index ada8eababf..ebc4bc1829 100644 --- a/tests/integration-tests/src/test/resources/colocated-server-start-stop-config1.xml +++ b/tests/integration-tests/src/test/resources/colocated-server-start-stop-config1.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> diff --git a/tests/integration-tests/src/test/resources/colocated-server-start-stop-config2.xml b/tests/integration-tests/src/test/resources/colocated-server-start-stop-config2.xml index 6b1e936709..cde31e7793 100644 --- a/tests/integration-tests/src/test/resources/colocated-server-start-stop-config2.xml +++ b/tests/integration-tests/src/test/resources/colocated-server-start-stop-config2.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq schema/activemq-configuration.xsd"> diff --git a/tests/integration-tests/src/test/resources/colocated-server-start-stop-jms-config1.xml b/tests/integration-tests/src/test/resources/colocated-server-start-stop-jms-config1.xml index 9633928eee..e673504da2 100644 --- a/tests/integration-tests/src/test/resources/colocated-server-start-stop-jms-config1.xml +++ b/tests/integration-tests/src/test/resources/colocated-server-start-stop-jms-config1.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd"> diff --git a/tests/integration-tests/src/test/resources/colocated-server-start-stop-jms-config2.xml b/tests/integration-tests/src/test/resources/colocated-server-start-stop-jms-config2.xml index 9633928eee..e673504da2 100644 --- a/tests/integration-tests/src/test/resources/colocated-server-start-stop-jms-config2.xml +++ b/tests/integration-tests/src/test/resources/colocated-server-start-stop-jms-config2.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd"> diff --git a/tests/integration-tests/src/test/resources/hornetq-jms-for-JMSServerDeployerTest.xml b/tests/integration-tests/src/test/resources/hornetq-jms-for-JMSServerDeployerTest.xml index 3854c084f6..493cfbe847 100644 --- a/tests/integration-tests/src/test/resources/hornetq-jms-for-JMSServerDeployerTest.xml +++ b/tests/integration-tests/src/test/resources/hornetq-jms-for-JMSServerDeployerTest.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq ../../src/schemas/activemq-jms.xsd "> diff --git a/tests/integration-tests/src/test/resources/hornetq-jms-for-JMSServerDeployerTest2.xml b/tests/integration-tests/src/test/resources/hornetq-jms-for-JMSServerDeployerTest2.xml index e449dbc7ae..e8ff393bdc 100644 --- a/tests/integration-tests/src/test/resources/hornetq-jms-for-JMSServerDeployerTest2.xml +++ b/tests/integration-tests/src/test/resources/hornetq-jms-for-JMSServerDeployerTest2.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq ../../src/schemas/activemq-jms.xsd "> 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 5922f99242..d7d384df71 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 @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> 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 index b9281a2312..34148a3ac1 100644 --- 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 @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd"> diff --git a/tests/integration-tests/src/test/resources/spring-hornetq-config.xml b/tests/integration-tests/src/test/resources/spring-hornetq-config.xml index 5412a93111..f704dc7537 100644 --- a/tests/integration-tests/src/test/resources/spring-hornetq-config.xml +++ b/tests/integration-tests/src/test/resources/spring-hornetq-config.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-configuration.xsd"> false false diff --git a/tests/integration-tests/src/test/resources/spring-hornetq-jms.xml b/tests/integration-tests/src/test/resources/spring-hornetq-jms.xml index 3461588092..cc3fde7c68 100644 --- a/tests/integration-tests/src/test/resources/spring-hornetq-jms.xml +++ b/tests/integration-tests/src/test/resources/spring-hornetq-jms.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd"> diff --git a/tests/jms-tests/src/test/resources/hornetq-configuration.xml b/tests/jms-tests/src/test/resources/activemq-configuration.xml similarity index 97% rename from tests/jms-tests/src/test/resources/hornetq-configuration.xml rename to tests/jms-tests/src/test/resources/activemq-configuration.xml index af58701cd3..50833999be 100644 --- a/tests/jms-tests/src/test/resources/hornetq-configuration.xml +++ b/tests/jms-tests/src/test/resources/activemq-configuration.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq ../../../src/schema/activemq-configuration.xsd"> diff --git a/tests/jms-tests/src/test/resources/hornetq-jms.xml b/tests/jms-tests/src/test/resources/activemq-jms.xml similarity index 98% rename from tests/jms-tests/src/test/resources/hornetq-jms.xml rename to tests/jms-tests/src/test/resources/activemq-jms.xml index 244df19c75..d7f5b181d5 100644 --- a/tests/jms-tests/src/test/resources/hornetq-jms.xml +++ b/tests/jms-tests/src/test/resources/activemq-jms.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-jms.xsd"> diff --git a/tests/jms-tests/src/test/resources/hornetq-users.xml b/tests/jms-tests/src/test/resources/activemq-users.xml similarity index 82% rename from tests/jms-tests/src/test/resources/hornetq-users.xml rename to tests/jms-tests/src/test/resources/activemq-users.xml index 775c104f40..a58d65ce1f 100644 --- a/tests/jms-tests/src/test/resources/hornetq-users.xml +++ b/tests/jms-tests/src/test/resources/activemq-users.xml @@ -1,5 +1,5 @@ + xsi:schemaLocation="urn:hornetq /schema/activemq-users.xsd"> diff --git a/tests/jms-tests/src/test/resources/hornetq-queues.xml b/tests/jms-tests/src/test/resources/hornetq-queues.xml index e858db3fb5..7cdda220c7 100644 --- a/tests/jms-tests/src/test/resources/hornetq-queues.xml +++ b/tests/jms-tests/src/test/resources/hornetq-queues.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:hornetq ../../../src/schemas/activemq-configuration.xsd "> 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 28a5a46f68..c91c4725ea 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 @@ -44,7 +44,7 @@ public class ConfigurationValidationTest extends UnitTestCase // Public -------------------------------------------------------- /** - * test does not pass in eclipse (because it can not find hornetq-configuration.xsd). + * test does not pass in eclipse (because it can not find activemq-configuration.xsd). * It runs fine on the CLI with the proper env setting. */ @Test @@ -53,7 +53,7 @@ public class ConfigurationValidationTest extends UnitTestCase String xml = "" + ""; Element element = XMLUtil.stringToElement(xml); Assert.assertNotNull(element); - XMLUtil.validate(element, "schema/hornetq-configuration.xsd"); + XMLUtil.validate(element, "schema/activemq-configuration.xsd"); } @Test