http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/openwire/src/main/resources/hornetq/server0/activemq-configuration.xml ---------------------------------------------------------------------- diff --git a/examples/jms/openwire/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/openwire/src/main/resources/hornetq/server0/activemq-configuration.xml deleted file mode 100644 index 8932ff8..0000000 --- a/examples/jms/openwire/src/main/resources/hornetq/server0/activemq-configuration.xml +++ /dev/null @@ -1,50 +0,0 @@ -<configuration xmlns="urn:activemq" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd"> - - <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory> - - <journal-directory>${build.directory}/server0/data/messaging/journal</journal-directory> - - <large-messages-directory>${build.directory}/server0/data/messaging/largemessages</large-messages-directory> - - <paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory> - - <connectors> - <connector name="netty-connector"> - <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> - </connector> - </connectors> - - <!-- Acceptors --> - <acceptors> - <acceptor name="netty-acceptor"> - <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> - </acceptor> - <acceptor name="openwire-acceptor"> - <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> - <param key="protocols" value="OPENWIRE" /> - <param key="port" value="61616" /> - </acceptor> - </acceptors> - - <!-- Other config --> - - <security-settings> - <security-setting match="jms.topic.ActiveMQ.Advisory.#"> - <permission type="createNonDurableQueue" roles="guest"/> - <permission type="consume" roles="guest"/> - <permission type="send" roles="guest"/> - </security-setting> - <!--security for example queue--> - <security-setting match="jms.queue.exampleQueue"> - <permission type="createDurableQueue" roles="guest"/> - <permission type="deleteDurableQueue" roles="guest"/> - <permission type="createNonDurableQueue" roles="guest"/> - <permission type="deleteNonDurableQueue" roles="guest"/> - <permission type="consume" roles="guest"/> - <permission type="send" roles="guest"/> - </security-setting> - </security-settings> - -</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/openwire/src/main/resources/hornetq/server0/activemq-jms.xml ---------------------------------------------------------------------- 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 deleted file mode 100644 index 0d5c953..0000000 --- a/examples/jms/openwire/src/main/resources/hornetq/server0/activemq-jms.xml +++ /dev/null @@ -1,8 +0,0 @@ -<configuration xmlns="urn:activemq" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:activemq /schema/activemq-jms.xsd"> - - <!--the queue used by the example--> - <queue name="exampleQueue"/> - -</configuration> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/openwire/src/main/resources/hornetq/server0/activemq-users.xml ---------------------------------------------------------------------- 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 deleted file mode 100644 index ae30546..0000000 --- a/examples/jms/openwire/src/main/resources/hornetq/server0/activemq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ -<configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:activemq /schema/activemq-users.xsd"> - <!-- the default user. this is used where username is null--> - <defaultuser name="guest" password="guest"> - <role name="guest"/> - </defaultuser> -</configuration> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/paging/pom.xml ---------------------------------------------------------------------- diff --git a/examples/jms/paging/pom.xml b/examples/jms/paging/pom.xml index 6081b2b..20ba3fa 100644 --- a/examples/jms/paging/pom.xml +++ b/examples/jms/paging/pom.xml @@ -51,9 +51,6 @@ </goals> <configuration> <clientClass>org.apache.activemq.jms.example.PagingExample</clientClass> - <args> - <param>tcp://localhost:5445</param> - </args> </configuration> </execution> <execution> @@ -102,7 +99,7 @@ </dependencies> <configuration> <waitOnStart>false</waitOnStart> - <hornetqConfigurationDir>${basedir}/target/classes/activemq/server0</hornetqConfigurationDir> + <configurationDir>${basedir}/target/classes/activemq/server0</configurationDir> </configuration> </plugin> </plugins> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/paging/src/main/java/org/apache/activemq/jms/example/PagingExample.java ---------------------------------------------------------------------- diff --git a/examples/jms/paging/src/main/java/org/apache/activemq/jms/example/PagingExample.java b/examples/jms/paging/src/main/java/org/apache/activemq/jms/example/PagingExample.java index fe50d82..4754fa7 100644 --- a/examples/jms/paging/src/main/java/org/apache/activemq/jms/example/PagingExample.java +++ b/examples/jms/paging/src/main/java/org/apache/activemq/jms/example/PagingExample.java @@ -49,7 +49,7 @@ public class PagingExample extends ActiveMQExample try { // Step 1. Create an initial context to perform the JNDI lookup. - initialContext = getContext(0); + initialContext = new InitialContext(); // Step 2. Perform a lookup on the Connection Factory ConnectionFactory cf = (ConnectionFactory)initialContext.lookup("ConnectionFactory"); @@ -59,7 +59,7 @@ public class PagingExample extends ActiveMQExample Queue pageQueue = (Queue)initialContext.lookup("queue/pagingQueue"); // Step 4. Lookup for a JMS Queue - Queue queue = (Queue)initialContext.lookup("/queue/exampleQueue"); + Queue queue = (Queue)initialContext.lookup("queue/exampleQueue"); // Step 5. Create a JMS Connection connection = cf.createConnection(); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/paging/src/main/resources/activemq/server0/activemq-configuration.xml ---------------------------------------------------------------------- diff --git a/examples/jms/paging/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/paging/src/main/resources/activemq/server0/activemq-configuration.xml new file mode 100644 index 0000000..5772b45 --- /dev/null +++ b/examples/jms/paging/src/main/resources/activemq/server0/activemq-configuration.xml @@ -0,0 +1,67 @@ +<configuration xmlns="urn:activemq" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd"> + + <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory> + + <journal-directory>${build.directory}/server0/data/messaging/journal</journal-directory> + + <large-messages-directory>${build.directory}/server0/data/messaging/largemessages</large-messages-directory> + + <paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory> + + + <!-- Connectors --> + <connectors> + <connector name="netty-connector"> + <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> + </connector> + </connectors> + + <!-- Acceptors --> + <acceptors> + <acceptor name="netty-acceptor"> + <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> + </acceptor> + </acceptors> + + <!-- Other config --> + + <security-settings> + <!--security for example queue--> + <security-setting match="jms.queue.exampleQueue"> + <permission type="createDurableQueue" roles="guest"/> + <permission type="deleteDurableQueue" roles="guest"/> + <permission type="createNonDurableQueue" roles="guest"/> + <permission type="deleteNonDurableQueue" roles="guest"/> + <permission type="consume" roles="guest"/> + <permission type="send" roles="guest"/> + </security-setting> + + <security-setting match="jms.queue.pagingQueue"> + <permission type="createDurableQueue" roles="guest"/> + <permission type="deleteDurableQueue" roles="guest"/> + <permission type="createNonDurableQueue" roles="guest"/> + <permission type="deleteNonDurableQueue" roles="guest"/> + <permission type="consume" roles="guest"/> + <permission type="send" roles="guest"/> + </security-setting> + </security-settings> + + <address-settings> + <address-setting match="jms.queue.pagingQueue"> + <max-size-bytes>100000</max-size-bytes> + <page-size-bytes>20000</page-size-bytes> + </address-setting> + + <address-setting match="jms.queue.exampleQueue"> + <max-size-bytes>10485760</max-size-bytes> + <page-size-bytes>1048576</page-size-bytes> + </address-setting> + <address-setting match="#"> + <max-size-bytes>10485760</max-size-bytes> + <page-size-bytes>1048576</page-size-bytes> + </address-setting> + </address-settings> + +</configuration> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/paging/src/main/resources/activemq/server0/activemq-jms.xml ---------------------------------------------------------------------- diff --git a/examples/jms/paging/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/paging/src/main/resources/activemq/server0/activemq-jms.xml new file mode 100644 index 0000000..980f889 --- /dev/null +++ b/examples/jms/paging/src/main/resources/activemq/server0/activemq-jms.xml @@ -0,0 +1,10 @@ +<configuration xmlns="urn:activemq" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="urn:activemq /schema/activemq-jms.xsd"> + + <!--the topic used by the example--> + <queue name="exampleQueue"/> + + <queue name="pagingQueue"/> + +</configuration> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/paging/src/main/resources/activemq/server0/activemq-users.xml ---------------------------------------------------------------------- diff --git a/examples/jms/paging/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/paging/src/main/resources/activemq/server0/activemq-users.xml new file mode 100644 index 0000000..ae30546 --- /dev/null +++ b/examples/jms/paging/src/main/resources/activemq/server0/activemq-users.xml @@ -0,0 +1,7 @@ +<configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="urn:activemq /schema/activemq-users.xsd"> + <!-- the default user. this is used where username is null--> + <defaultuser name="guest" password="guest"> + <role name="guest"/> + </defaultuser> +</configuration> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/paging/src/main/resources/hornetq/server0/activemq-configuration.xml ---------------------------------------------------------------------- diff --git a/examples/jms/paging/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/paging/src/main/resources/hornetq/server0/activemq-configuration.xml deleted file mode 100644 index 5772b45..0000000 --- a/examples/jms/paging/src/main/resources/hornetq/server0/activemq-configuration.xml +++ /dev/null @@ -1,67 +0,0 @@ -<configuration xmlns="urn:activemq" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd"> - - <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory> - - <journal-directory>${build.directory}/server0/data/messaging/journal</journal-directory> - - <large-messages-directory>${build.directory}/server0/data/messaging/largemessages</large-messages-directory> - - <paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory> - - - <!-- Connectors --> - <connectors> - <connector name="netty-connector"> - <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> - </connector> - </connectors> - - <!-- Acceptors --> - <acceptors> - <acceptor name="netty-acceptor"> - <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> - </acceptor> - </acceptors> - - <!-- Other config --> - - <security-settings> - <!--security for example queue--> - <security-setting match="jms.queue.exampleQueue"> - <permission type="createDurableQueue" roles="guest"/> - <permission type="deleteDurableQueue" roles="guest"/> - <permission type="createNonDurableQueue" roles="guest"/> - <permission type="deleteNonDurableQueue" roles="guest"/> - <permission type="consume" roles="guest"/> - <permission type="send" roles="guest"/> - </security-setting> - - <security-setting match="jms.queue.pagingQueue"> - <permission type="createDurableQueue" roles="guest"/> - <permission type="deleteDurableQueue" roles="guest"/> - <permission type="createNonDurableQueue" roles="guest"/> - <permission type="deleteNonDurableQueue" roles="guest"/> - <permission type="consume" roles="guest"/> - <permission type="send" roles="guest"/> - </security-setting> - </security-settings> - - <address-settings> - <address-setting match="jms.queue.pagingQueue"> - <max-size-bytes>100000</max-size-bytes> - <page-size-bytes>20000</page-size-bytes> - </address-setting> - - <address-setting match="jms.queue.exampleQueue"> - <max-size-bytes>10485760</max-size-bytes> - <page-size-bytes>1048576</page-size-bytes> - </address-setting> - <address-setting match="#"> - <max-size-bytes>10485760</max-size-bytes> - <page-size-bytes>1048576</page-size-bytes> - </address-setting> - </address-settings> - -</configuration> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/paging/src/main/resources/hornetq/server0/activemq-jms.xml ---------------------------------------------------------------------- diff --git a/examples/jms/paging/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/paging/src/main/resources/hornetq/server0/activemq-jms.xml deleted file mode 100644 index 980f889..0000000 --- a/examples/jms/paging/src/main/resources/hornetq/server0/activemq-jms.xml +++ /dev/null @@ -1,10 +0,0 @@ -<configuration xmlns="urn:activemq" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:activemq /schema/activemq-jms.xsd"> - - <!--the topic used by the example--> - <queue name="exampleQueue"/> - - <queue name="pagingQueue"/> - -</configuration> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/paging/src/main/resources/hornetq/server0/activemq-users.xml ---------------------------------------------------------------------- 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 deleted file mode 100644 index ae30546..0000000 --- a/examples/jms/paging/src/main/resources/hornetq/server0/activemq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ -<configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:activemq /schema/activemq-users.xsd"> - <!-- the default user. this is used where username is null--> - <defaultuser name="guest" password="guest"> - <role name="guest"/> - </defaultuser> -</configuration> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/paging/src/main/resources/jndi.properties ---------------------------------------------------------------------- diff --git a/examples/jms/paging/src/main/resources/jndi.properties b/examples/jms/paging/src/main/resources/jndi.properties new file mode 100644 index 0000000..ab86463 --- /dev/null +++ b/examples/jms/paging/src/main/resources/jndi.properties @@ -0,0 +1,4 @@ +java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory +java.naming.provider.url=tcp://localhost:5445 +queue.queue/exampleQueue=exampleQueue +queue.queue/pagingQueue=pagingQueue \ No newline at end of file http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/perf/pom.xml ---------------------------------------------------------------------- diff --git a/examples/jms/perf/pom.xml b/examples/jms/perf/pom.xml index 6b04923..91b5195 100644 --- a/examples/jms/perf/pom.xml +++ b/examples/jms/perf/pom.xml @@ -63,7 +63,7 @@ </goals> <configuration> <waitOnStart>true</waitOnStart> - <hornetqConfigurationDir>${basedir}/target/classes/activemq/server0</hornetqConfigurationDir> + <configurationDir>${basedir}/target/classes/activemq/server0</configurationDir> <systemProperties> <property> <name>build.directory</name> @@ -75,7 +75,7 @@ </executions> <configuration> <waitOnStart>false</waitOnStart> - <hornetqConfigurationDir>${basedir}/target/classes/activemq/server0</hornetqConfigurationDir> + <configurationDir>${basedir}/target/classes/activemq/server0</configurationDir> </configuration> <dependencies> <dependency> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/perf/src/main/java/org/apache/activemq/jms/example/PerfBase.java ---------------------------------------------------------------------- diff --git a/examples/jms/perf/src/main/java/org/apache/activemq/jms/example/PerfBase.java b/examples/jms/perf/src/main/java/org/apache/activemq/jms/example/PerfBase.java index a2af10f..5ceacf0 100644 --- a/examples/jms/perf/src/main/java/org/apache/activemq/jms/example/PerfBase.java +++ b/examples/jms/perf/src/main/java/org/apache/activemq/jms/example/PerfBase.java @@ -44,8 +44,6 @@ public abstract class PerfBase private static final String DEFAULT_PERF_PROPERTIES_FILE_NAME = "target/classes/perf.properties"; - private static final String DEFAULT_JNDI_PROPERTIES_FILE_NAME = "target/classes/client.jndi.properties"; - private static byte[] randomByteArray(final int length) { byte[] bytes = new byte[length]; @@ -76,45 +74,6 @@ public abstract class PerfBase return fileName; } - protected static String getJndiFileName(final String[] args) - { - String fileName; - - if (args.length > 1) - { - fileName = args[1]; - } - else - { - fileName = PerfBase.DEFAULT_JNDI_PROPERTIES_FILE_NAME; - } - - return fileName; - } - - protected static Properties getJndiProps(final String fileName) throws Exception - { - Properties props = null; - - InputStream is = null; - - try - { - is = new FileInputStream(fileName); - - props = new Properties(); - - props.load(is); - } - finally - { - if (is != null) - { - is.close(); - } - } - return props; - } protected static PerfParams getParams(final String fileName) throws Exception { Properties props = null; @@ -185,12 +144,9 @@ public abstract class PerfBase private final PerfParams perfParams; - private Properties properties; - - protected PerfBase(final PerfParams perfParams, Properties properties) + protected PerfBase(final PerfParams perfParams) { this.perfParams = perfParams; - this.properties = properties; } private ConnectionFactory factory; @@ -205,7 +161,7 @@ public abstract class PerfBase private void init() throws Exception { - InitialContext ic = new InitialContext(properties); + InitialContext ic = new InitialContext(); System.out.println("ic = " + ic); factory = (ConnectionFactory)ic.lookup(perfParams.getConnectionFactoryLookup()); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/perf/src/main/java/org/apache/activemq/jms/example/PerfListener.java ---------------------------------------------------------------------- diff --git a/examples/jms/perf/src/main/java/org/apache/activemq/jms/example/PerfListener.java b/examples/jms/perf/src/main/java/org/apache/activemq/jms/example/PerfListener.java index f17f43d..a6315ed 100644 --- a/examples/jms/perf/src/main/java/org/apache/activemq/jms/example/PerfListener.java +++ b/examples/jms/perf/src/main/java/org/apache/activemq/jms/example/PerfListener.java @@ -39,11 +39,7 @@ public class PerfListener extends PerfBase PerfParams params = PerfBase.getParams(fileName); - fileName = PerfBase.getJndiFileName(args); - - Properties properties = PerfBase.getJndiProps(fileName); - - new PerfListener(params, properties).run(); + new PerfListener(params).run(); } catch (Exception e) { @@ -51,9 +47,9 @@ public class PerfListener extends PerfBase } } - private PerfListener(final PerfParams perfParams, Properties properties) + private PerfListener(final PerfParams perfParams) { - super(perfParams, properties); + super(perfParams); } public void run() throws Exception http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/perf/src/main/java/org/apache/activemq/jms/example/PerfSender.java ---------------------------------------------------------------------- diff --git a/examples/jms/perf/src/main/java/org/apache/activemq/jms/example/PerfSender.java b/examples/jms/perf/src/main/java/org/apache/activemq/jms/example/PerfSender.java index ac6fbfa..55f4583 100644 --- a/examples/jms/perf/src/main/java/org/apache/activemq/jms/example/PerfSender.java +++ b/examples/jms/perf/src/main/java/org/apache/activemq/jms/example/PerfSender.java @@ -39,11 +39,7 @@ public class PerfSender extends PerfBase PerfParams params = PerfBase.getParams(fileName); - fileName = PerfBase.getJndiFileName(args); - - Properties properties = PerfBase.getJndiProps(fileName); - - new PerfSender(params, properties).run(); + new PerfSender(params).run(); } catch (Exception e) { @@ -51,9 +47,9 @@ public class PerfSender extends PerfBase } } - private PerfSender(final PerfParams perfParams, Properties properties) + private PerfSender(final PerfParams perfParams) { - super(perfParams, properties); + super(perfParams); } public void run() throws Exception http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/perf/src/main/resources/activemq/server0/activemq-configuration.xml ---------------------------------------------------------------------- diff --git a/examples/jms/perf/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/perf/src/main/resources/activemq/server0/activemq-configuration.xml new file mode 100644 index 0000000..d30b582 --- /dev/null +++ b/examples/jms/perf/src/main/resources/activemq/server0/activemq-configuration.xml @@ -0,0 +1,24 @@ +<configuration xmlns="urn:activemq" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd"> + + <security-enabled>false</security-enabled> + <persistence-enabled>true</persistence-enabled> + + <!-- Acceptors --> + <acceptors> + <acceptor name="netty-acceptor"> + <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> + <param key="tcp-no-delay" value="false"/> + <param key="tcp-send-buffer-size" value="1048576"/> + <param key="tcp-receive-buffer-size" value="1048576"/> + </acceptor> + </acceptors> + + <queues> + <queue name="perfQueue"> + <address>perfAddress</address> + </queue> + </queues> + +</configuration> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/perf/src/main/resources/activemq/server0/activemq-jms.xml ---------------------------------------------------------------------- diff --git a/examples/jms/perf/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/perf/src/main/resources/activemq/server0/activemq-jms.xml new file mode 100644 index 0000000..613bf94 --- /dev/null +++ b/examples/jms/perf/src/main/resources/activemq/server0/activemq-jms.xml @@ -0,0 +1,7 @@ +<configuration xmlns="urn:activemq" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="urn:activemq /schema/activemq-jms.xsd"> + + <queue name="perfQueue"/> + +</configuration> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/perf/src/main/resources/client.jndi.properties ---------------------------------------------------------------------- diff --git a/examples/jms/perf/src/main/resources/client.jndi.properties b/examples/jms/perf/src/main/resources/client.jndi.properties deleted file mode 100644 index 6940f75..0000000 --- a/examples/jms/perf/src/main/resources/client.jndi.properties +++ /dev/null @@ -1,2 +0,0 @@ -java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory -java.naming.provider.url=tcp://localhost:5445 \ No newline at end of file http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/perf/src/main/resources/hornetq/server0/activemq-configuration.xml ---------------------------------------------------------------------- diff --git a/examples/jms/perf/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/perf/src/main/resources/hornetq/server0/activemq-configuration.xml deleted file mode 100644 index b1ccc9a..0000000 --- a/examples/jms/perf/src/main/resources/hornetq/server0/activemq-configuration.xml +++ /dev/null @@ -1,34 +0,0 @@ -<configuration xmlns="urn:activemq" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd"> - - <connectors> - <connector name="netty-connector"> - <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> - <param key="tcp-no-delay" value="false"/> - <param key="tcp-send-buffer-size" value="1048576"/> - <param key="tcp-receive-buffer-size" value="1048576"/> - </connector> - </connectors> - - <!-- Acceptors --> - <acceptors> - <acceptor name="netty-acceptor"> - <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> - <param key="tcp-no-delay" value="false"/> - <param key="tcp-send-buffer-size" value="1048576"/> - <param key="tcp-receive-buffer-size" value="1048576"/> - </acceptor> - </acceptors> - - <security-enabled>false</security-enabled> - - <persistence-enabled>true</persistence-enabled> - - <queues> - <queue name="perfQueue"> - <address>perfAddress</address> - </queue> - </queues> - -</configuration> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/perf/src/main/resources/hornetq/server0/activemq-jms.xml ---------------------------------------------------------------------- diff --git a/examples/jms/perf/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/perf/src/main/resources/hornetq/server0/activemq-jms.xml deleted file mode 100644 index 613bf94..0000000 --- a/examples/jms/perf/src/main/resources/hornetq/server0/activemq-jms.xml +++ /dev/null @@ -1,7 +0,0 @@ -<configuration xmlns="urn:activemq" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:activemq /schema/activemq-jms.xsd"> - - <queue name="perfQueue"/> - -</configuration> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/perf/src/main/resources/hornetq/server0/hornetq-configuration-messaging-lab.xml ---------------------------------------------------------------------- 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 deleted file mode 100644 index d00ad0a..0000000 --- a/examples/jms/perf/src/main/resources/hornetq/server0/hornetq-configuration-messaging-lab.xml +++ /dev/null @@ -1,32 +0,0 @@ -<configuration xmlns="urn:activemq" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd"> - - - <!-- Acceptors --> - <acceptors> - <acceptor name="netty-acceptor"> - <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> - <param key="tcp-no-delay" value="false"/> - <param key="tcp-send-buffer-size" value="1048576"/> - <param key="tcp-receive-buffer-size" value="1048576"/> - <param key="host" value="172.16.8.10"/> - </acceptor> - </acceptors> - - <security-enabled>false</security-enabled> - - <persistence-enabled>true</persistence-enabled> - - <large-messages-directory>/activemq-data/large-messages</large-messages-directory> - <bindings-directory>/activemq-data/bindings</bindings-directory> - <journal-directory>/activemq-data/journal</journal-directory> - <paging-directory>/activemq-data/paging</paging-directory> - - <queues> - <queue name="perfQueue"> - <address>perfAddress</address> - </queue> - </queues> - -</configuration> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/perf/src/main/resources/jndi.properties ---------------------------------------------------------------------- diff --git a/examples/jms/perf/src/main/resources/jndi.properties b/examples/jms/perf/src/main/resources/jndi.properties new file mode 100644 index 0000000..32fa2c0 --- /dev/null +++ b/examples/jms/perf/src/main/resources/jndi.properties @@ -0,0 +1,3 @@ +java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory +java.naming.provider.url=tcp://localhost:5445?tcp-no-delay=false&tcp-send-buffer-size=1048576&tcp-receive-buffer-size=1048576 +queue.perfQueue=perfQueue \ No newline at end of file http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/perf/src/main/resources/perf.properties ---------------------------------------------------------------------- diff --git a/examples/jms/perf/src/main/resources/perf.properties b/examples/jms/perf/src/main/resources/perf.properties index 3a926e5..f288b8b 100644 --- a/examples/jms/perf/src/main/resources/perf.properties +++ b/examples/jms/perf/src/main/resources/perf.properties @@ -6,7 +6,7 @@ transacted=false batch-size=1000 drain-queue=false destination-lookup=perfQueue -connection-factory-lookup=/ConnectionFactory +connection-factory-lookup=ConnectionFactory throttle-rate=-1 dups-ok-acknowledge=false disable-message-id=true http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/pre-acknowledge/pom.xml ---------------------------------------------------------------------- diff --git a/examples/jms/pre-acknowledge/pom.xml b/examples/jms/pre-acknowledge/pom.xml index 14623b8..1778884 100644 --- a/examples/jms/pre-acknowledge/pom.xml +++ b/examples/jms/pre-acknowledge/pom.xml @@ -102,7 +102,7 @@ </dependencies> <configuration> <waitOnStart>false</waitOnStart> - <hornetqConfigurationDir>${basedir}/target/classes/activemq/server0</hornetqConfigurationDir> + <configurationDir>${basedir}/target/classes/activemq/server0</configurationDir> </configuration> </plugin> </plugins> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/pre-acknowledge/src/main/java/org/apache/activemq/jms/example/PreacknowledgeExample.java ---------------------------------------------------------------------- diff --git a/examples/jms/pre-acknowledge/src/main/java/org/apache/activemq/jms/example/PreacknowledgeExample.java b/examples/jms/pre-acknowledge/src/main/java/org/apache/activemq/jms/example/PreacknowledgeExample.java index e3f2c7a..8c507c4 100644 --- a/examples/jms/pre-acknowledge/src/main/java/org/apache/activemq/jms/example/PreacknowledgeExample.java +++ b/examples/jms/pre-acknowledge/src/main/java/org/apache/activemq/jms/example/PreacknowledgeExample.java @@ -60,7 +60,7 @@ public class PreacknowledgeExample extends ActiveMQExample try { // Step 1. Create an initial context to perform the JNDI lookup. - initialContext = getContext(0); + initialContext = new InitialContext(); // Step 2. Perform the look-ups Queue queue = (Queue)initialContext.lookup("queue/exampleQueue"); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/pre-acknowledge/src/main/resources/activemq/server0/activemq-configuration.xml ---------------------------------------------------------------------- diff --git a/examples/jms/pre-acknowledge/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/pre-acknowledge/src/main/resources/activemq/server0/activemq-configuration.xml new file mode 100644 index 0000000..9fe2fd0 --- /dev/null +++ b/examples/jms/pre-acknowledge/src/main/resources/activemq/server0/activemq-configuration.xml @@ -0,0 +1,37 @@ +<configuration xmlns="urn:activemq" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd"> + + <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory> + + <journal-directory>${build.directory}/server0/data/messaging/journal</journal-directory> + + <large-messages-directory>${build.directory}/server0/data/messaging/largemessages</large-messages-directory> + + <paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory> + + <!-- Acceptors --> + <acceptors> + <acceptor name="netty-acceptor"> + <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> + </acceptor> + </acceptors> + + <!-- Other config --> + + <security-settings> + <security-setting match="jms.#"> + <permission type="createDurableQueue" roles="guest"/> + <permission type="deleteDurableQueue" roles="guest"/> + <permission type="createNonDurableQueue" roles="guest"/> + <permission type="deleteNonDurableQueue" roles="guest"/> + <permission type="consume" roles="guest"/> + <permission type="send" roles="guest"/> + </security-setting> + + <security-setting match="jms.queue.activemq.management"> + <permission type="manage" roles="guest" /> + </security-setting> + </security-settings> + +</configuration> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/pre-acknowledge/src/main/resources/activemq/server0/activemq-jms.xml ---------------------------------------------------------------------- diff --git a/examples/jms/pre-acknowledge/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/pre-acknowledge/src/main/resources/activemq/server0/activemq-jms.xml new file mode 100644 index 0000000..0d5c953 --- /dev/null +++ b/examples/jms/pre-acknowledge/src/main/resources/activemq/server0/activemq-jms.xml @@ -0,0 +1,8 @@ +<configuration xmlns="urn:activemq" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="urn:activemq /schema/activemq-jms.xsd"> + + <!--the queue used by the example--> + <queue name="exampleQueue"/> + +</configuration> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/pre-acknowledge/src/main/resources/activemq/server0/activemq-users.xml ---------------------------------------------------------------------- diff --git a/examples/jms/pre-acknowledge/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/pre-acknowledge/src/main/resources/activemq/server0/activemq-users.xml new file mode 100644 index 0000000..ae30546 --- /dev/null +++ b/examples/jms/pre-acknowledge/src/main/resources/activemq/server0/activemq-users.xml @@ -0,0 +1,7 @@ +<configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="urn:activemq /schema/activemq-users.xsd"> + <!-- the default user. this is used where username is null--> + <defaultuser name="guest" password="guest"> + <role name="guest"/> + </defaultuser> +</configuration> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/pre-acknowledge/src/main/resources/hornetq/server0/activemq-configuration.xml ---------------------------------------------------------------------- diff --git a/examples/jms/pre-acknowledge/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/pre-acknowledge/src/main/resources/hornetq/server0/activemq-configuration.xml deleted file mode 100644 index d661c7c..0000000 --- a/examples/jms/pre-acknowledge/src/main/resources/hornetq/server0/activemq-configuration.xml +++ /dev/null @@ -1,46 +0,0 @@ -<configuration xmlns="urn:activemq" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd"> - - <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory> - - <journal-directory>${build.directory}/server0/data/messaging/journal</journal-directory> - - <large-messages-directory>${build.directory}/server0/data/messaging/largemessages</large-messages-directory> - - <paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory> - - - <!-- Connectors --> - - <connectors> - <connector name="netty-connector"> - <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> - </connector> - </connectors> - - <!-- Acceptors --> - <acceptors> - <acceptor name="netty-acceptor"> - <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> - </acceptor> - </acceptors> - - <!-- Other config --> - - <security-settings> - <security-setting match="jms.#"> - <permission type="createDurableQueue" roles="guest"/> - <permission type="deleteDurableQueue" roles="guest"/> - <permission type="createNonDurableQueue" roles="guest"/> - <permission type="deleteNonDurableQueue" roles="guest"/> - <permission type="consume" roles="guest"/> - <permission type="send" roles="guest"/> - </security-setting> - - <security-setting match="jms.queue.activemq.management"> - <permission type="manage" roles="guest" /> - </security-setting> - </security-settings> - -</configuration> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/pre-acknowledge/src/main/resources/hornetq/server0/activemq-jms.xml ---------------------------------------------------------------------- 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 deleted file mode 100644 index 0d5c953..0000000 --- a/examples/jms/pre-acknowledge/src/main/resources/hornetq/server0/activemq-jms.xml +++ /dev/null @@ -1,8 +0,0 @@ -<configuration xmlns="urn:activemq" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:activemq /schema/activemq-jms.xsd"> - - <!--the queue used by the example--> - <queue name="exampleQueue"/> - -</configuration> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/pre-acknowledge/src/main/resources/hornetq/server0/activemq-users.xml ---------------------------------------------------------------------- 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 deleted file mode 100644 index ae30546..0000000 --- a/examples/jms/pre-acknowledge/src/main/resources/hornetq/server0/activemq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ -<configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:activemq /schema/activemq-users.xsd"> - <!-- the default user. this is used where username is null--> - <defaultuser name="guest" password="guest"> - <role name="guest"/> - </defaultuser> -</configuration> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/pre-acknowledge/src/main/resources/jndi.properties ---------------------------------------------------------------------- diff --git a/examples/jms/pre-acknowledge/src/main/resources/jndi.properties b/examples/jms/pre-acknowledge/src/main/resources/jndi.properties new file mode 100644 index 0000000..d9b5c6a --- /dev/null +++ b/examples/jms/pre-acknowledge/src/main/resources/jndi.properties @@ -0,0 +1,3 @@ +java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory +java.naming.provider.url=tcp://localhost:5445 +queue.queue/exampleQueue=exampleQueue \ No newline at end of file http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/producer-rate-limit/pom.xml ---------------------------------------------------------------------- diff --git a/examples/jms/producer-rate-limit/pom.xml b/examples/jms/producer-rate-limit/pom.xml index 6d4bf66..b8d0680 100644 --- a/examples/jms/producer-rate-limit/pom.xml +++ b/examples/jms/producer-rate-limit/pom.xml @@ -51,9 +51,6 @@ </goals> <configuration> <clientClass>org.apache.activemq.jms.example.ProducerRateLimitExample</clientClass> - <args> - <param>tcp://localhost:5445</param> - </args> </configuration> </execution> <execution> @@ -102,7 +99,7 @@ </dependencies> <configuration> <waitOnStart>false</waitOnStart> - <hornetqConfigurationDir>${basedir}/target/classes/activemq/server0</hornetqConfigurationDir> + <configurationDir>${basedir}/target/classes/activemq/server0</configurationDir> </configuration> </plugin> </plugins> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/producer-rate-limit/src/main/java/org/apache/activemq/jms/example/ProducerRateLimitExample.java ---------------------------------------------------------------------- diff --git a/examples/jms/producer-rate-limit/src/main/java/org/apache/activemq/jms/example/ProducerRateLimitExample.java b/examples/jms/producer-rate-limit/src/main/java/org/apache/activemq/jms/example/ProducerRateLimitExample.java index 1b78bd9..78bdf33 100644 --- a/examples/jms/producer-rate-limit/src/main/java/org/apache/activemq/jms/example/ProducerRateLimitExample.java +++ b/examples/jms/producer-rate-limit/src/main/java/org/apache/activemq/jms/example/ProducerRateLimitExample.java @@ -48,7 +48,7 @@ public class ProducerRateLimitExample extends ActiveMQExample try { // Step 1. Create an initial context to perform the JNDI lookup. - initialContext = getContext(0); + initialContext = new InitialContext(); // Step 2. Perfom a lookup on the queue Queue queue = (Queue)initialContext.lookup("queue/exampleQueue"); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/producer-rate-limit/src/main/resources/activemq/server0/activemq-configuration.xml ---------------------------------------------------------------------- diff --git a/examples/jms/producer-rate-limit/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/producer-rate-limit/src/main/resources/activemq/server0/activemq-configuration.xml new file mode 100644 index 0000000..4b94d90 --- /dev/null +++ b/examples/jms/producer-rate-limit/src/main/resources/activemq/server0/activemq-configuration.xml @@ -0,0 +1,34 @@ +<configuration xmlns="urn:activemq" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd"> + + <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory> + + <journal-directory>${build.directory}/server0/data/messaging/journal</journal-directory> + + <large-messages-directory>${build.directory}/server0/data/messaging/largemessages</large-messages-directory> + + <paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory> + + <!-- Acceptors --> + <acceptors> + <acceptor name="netty-acceptor"> + <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> + </acceptor> + </acceptors> + + <!-- Other config --> + + <security-settings> + <!--security for example queue--> + <security-setting match="jms.queue.exampleQueue"> + <permission type="createDurableQueue" roles="guest"/> + <permission type="deleteDurableQueue" roles="guest"/> + <permission type="createNonDurableQueue" roles="guest"/> + <permission type="deleteNonDurableQueue" roles="guest"/> + <permission type="consume" roles="guest"/> + <permission type="send" roles="guest"/> + </security-setting> + </security-settings> + +</configuration> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/producer-rate-limit/src/main/resources/activemq/server0/activemq-jms.xml ---------------------------------------------------------------------- diff --git a/examples/jms/producer-rate-limit/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/producer-rate-limit/src/main/resources/activemq/server0/activemq-jms.xml new file mode 100644 index 0000000..0d5c953 --- /dev/null +++ b/examples/jms/producer-rate-limit/src/main/resources/activemq/server0/activemq-jms.xml @@ -0,0 +1,8 @@ +<configuration xmlns="urn:activemq" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="urn:activemq /schema/activemq-jms.xsd"> + + <!--the queue used by the example--> + <queue name="exampleQueue"/> + +</configuration> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/producer-rate-limit/src/main/resources/activemq/server0/activemq-users.xml ---------------------------------------------------------------------- diff --git a/examples/jms/producer-rate-limit/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/producer-rate-limit/src/main/resources/activemq/server0/activemq-users.xml new file mode 100644 index 0000000..ae30546 --- /dev/null +++ b/examples/jms/producer-rate-limit/src/main/resources/activemq/server0/activemq-users.xml @@ -0,0 +1,7 @@ +<configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="urn:activemq /schema/activemq-users.xsd"> + <!-- the default user. this is used where username is null--> + <defaultuser name="guest" password="guest"> + <role name="guest"/> + </defaultuser> +</configuration> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/producer-rate-limit/src/main/resources/hornetq/server0/activemq-configuration.xml ---------------------------------------------------------------------- diff --git a/examples/jms/producer-rate-limit/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/producer-rate-limit/src/main/resources/hornetq/server0/activemq-configuration.xml deleted file mode 100644 index 679a17a..0000000 --- a/examples/jms/producer-rate-limit/src/main/resources/hornetq/server0/activemq-configuration.xml +++ /dev/null @@ -1,43 +0,0 @@ -<configuration xmlns="urn:activemq" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd"> - - <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory> - - <journal-directory>${build.directory}/server0/data/messaging/journal</journal-directory> - - <large-messages-directory>${build.directory}/server0/data/messaging/largemessages</large-messages-directory> - - <paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory> - - - <!-- Connectors --> - - <connectors> - <connector name="netty-connector"> - <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> - </connector> - </connectors> - - <!-- Acceptors --> - <acceptors> - <acceptor name="netty-acceptor"> - <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> - </acceptor> - </acceptors> - - <!-- Other config --> - - <security-settings> - <!--security for example queue--> - <security-setting match="jms.queue.exampleQueue"> - <permission type="createDurableQueue" roles="guest"/> - <permission type="deleteDurableQueue" roles="guest"/> - <permission type="createNonDurableQueue" roles="guest"/> - <permission type="deleteNonDurableQueue" roles="guest"/> - <permission type="consume" roles="guest"/> - <permission type="send" roles="guest"/> - </security-setting> - </security-settings> - -</configuration> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/producer-rate-limit/src/main/resources/hornetq/server0/activemq-jms.xml ---------------------------------------------------------------------- diff --git a/examples/jms/producer-rate-limit/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/producer-rate-limit/src/main/resources/hornetq/server0/activemq-jms.xml deleted file mode 100644 index 0d5c953..0000000 --- a/examples/jms/producer-rate-limit/src/main/resources/hornetq/server0/activemq-jms.xml +++ /dev/null @@ -1,8 +0,0 @@ -<configuration xmlns="urn:activemq" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:activemq /schema/activemq-jms.xsd"> - - <!--the queue used by the example--> - <queue name="exampleQueue"/> - -</configuration> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/producer-rate-limit/src/main/resources/hornetq/server0/activemq-users.xml ---------------------------------------------------------------------- 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 deleted file mode 100644 index ae30546..0000000 --- a/examples/jms/producer-rate-limit/src/main/resources/hornetq/server0/activemq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ -<configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:activemq /schema/activemq-users.xsd"> - <!-- the default user. this is used where username is null--> - <defaultuser name="guest" password="guest"> - <role name="guest"/> - </defaultuser> -</configuration> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/producer-rate-limit/src/main/resources/jndi.properties ---------------------------------------------------------------------- diff --git a/examples/jms/producer-rate-limit/src/main/resources/jndi.properties b/examples/jms/producer-rate-limit/src/main/resources/jndi.properties new file mode 100644 index 0000000..e053f64 --- /dev/null +++ b/examples/jms/producer-rate-limit/src/main/resources/jndi.properties @@ -0,0 +1,4 @@ +java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory +java.naming.provider.url=tcp://localhost:5445 +connection.ConnectionFactory.producerMaxRate=50 +queue.queue/exampleQueue=exampleQueue \ No newline at end of file http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/proton-cpp/pom.xml ---------------------------------------------------------------------- diff --git a/examples/jms/proton-cpp/pom.xml b/examples/jms/proton-cpp/pom.xml index 32d30c3..602ddc2 100644 --- a/examples/jms/proton-cpp/pom.xml +++ b/examples/jms/proton-cpp/pom.xml @@ -64,7 +64,7 @@ </goals> <configuration> <waitOnStart>true</waitOnStart> - <hornetqConfigurationDir>${basedir}/target/classes/activemq/server0</hornetqConfigurationDir> + <configurationDir>${basedir}/target/classes/activemq/server0</configurationDir> <systemProperties> <property> <name>build.directory</name> @@ -76,7 +76,7 @@ </executions> <configuration> <waitOnStart>false</waitOnStart> - <hornetqConfigurationDir>${basedir}/target/classes/activemq/server0</hornetqConfigurationDir> + <configurationDir>${basedir}/target/classes/activemq/server0</configurationDir> </configuration> <dependencies> <dependency> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/proton-cpp/src/main/resources/activemq/server0/activemq-configuration.xml ---------------------------------------------------------------------- diff --git a/examples/jms/proton-cpp/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/proton-cpp/src/main/resources/activemq/server0/activemq-configuration.xml new file mode 100644 index 0000000..5f1bf17 --- /dev/null +++ b/examples/jms/proton-cpp/src/main/resources/activemq/server0/activemq-configuration.xml @@ -0,0 +1,35 @@ +<configuration xmlns="urn:activemq" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd"> + + <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory> + + <journal-directory>${build.directory}/server0/data/messaging/journal</journal-directory> + + <large-messages-directory>${build.directory}/server0/data/messaging/largemessages</large-messages-directory> + + <paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory> + + + <!-- Acceptors --> + <acceptors> + <acceptor name="proton-acceptor"> + <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> + </acceptor> + </acceptors> + + <!-- Other config --> + + <security-settings> + <!--security for example queue--> + <security-setting match="jms.queue.exampleQueue"> + <permission type="createDurableQueue" roles="guest"/> + <permission type="deleteDurableQueue" roles="guest"/> + <permission type="createNonDurableQueue" roles="guest"/> + <permission type="deleteNonDurableQueue" roles="guest"/> + <permission type="consume" roles="guest"/> + <permission type="send" roles="guest"/> + </security-setting> + </security-settings> + +</configuration> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/proton-cpp/src/main/resources/activemq/server0/activemq-jms.xml ---------------------------------------------------------------------- diff --git a/examples/jms/proton-cpp/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/proton-cpp/src/main/resources/activemq/server0/activemq-jms.xml new file mode 100644 index 0000000..b96601e --- /dev/null +++ b/examples/jms/proton-cpp/src/main/resources/activemq/server0/activemq-jms.xml @@ -0,0 +1,10 @@ +<configuration xmlns="urn:activemq" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="urn:activemq /schema/activemq-jms.xsd"> + + <!--the queue used by the example--> + <queue name="exampleQueue"> + <entry name="/queue/exampleQueue"/> + </queue> + +</configuration> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/proton-cpp/src/main/resources/activemq/server0/activemq-users.xml ---------------------------------------------------------------------- diff --git a/examples/jms/proton-cpp/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/proton-cpp/src/main/resources/activemq/server0/activemq-users.xml new file mode 100644 index 0000000..ae30546 --- /dev/null +++ b/examples/jms/proton-cpp/src/main/resources/activemq/server0/activemq-users.xml @@ -0,0 +1,7 @@ +<configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="urn:activemq /schema/activemq-users.xsd"> + <!-- the default user. this is used where username is null--> + <defaultuser name="guest" password="guest"> + <role name="guest"/> + </defaultuser> +</configuration> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/proton-cpp/src/main/resources/hornetq/server0/activemq-configuration.xml ---------------------------------------------------------------------- diff --git a/examples/jms/proton-cpp/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/proton-cpp/src/main/resources/hornetq/server0/activemq-configuration.xml deleted file mode 100644 index 5f1bf17..0000000 --- a/examples/jms/proton-cpp/src/main/resources/hornetq/server0/activemq-configuration.xml +++ /dev/null @@ -1,35 +0,0 @@ -<configuration xmlns="urn:activemq" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd"> - - <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory> - - <journal-directory>${build.directory}/server0/data/messaging/journal</journal-directory> - - <large-messages-directory>${build.directory}/server0/data/messaging/largemessages</large-messages-directory> - - <paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory> - - - <!-- Acceptors --> - <acceptors> - <acceptor name="proton-acceptor"> - <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> - </acceptor> - </acceptors> - - <!-- Other config --> - - <security-settings> - <!--security for example queue--> - <security-setting match="jms.queue.exampleQueue"> - <permission type="createDurableQueue" roles="guest"/> - <permission type="deleteDurableQueue" roles="guest"/> - <permission type="createNonDurableQueue" roles="guest"/> - <permission type="deleteNonDurableQueue" roles="guest"/> - <permission type="consume" roles="guest"/> - <permission type="send" roles="guest"/> - </security-setting> - </security-settings> - -</configuration> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/proton-cpp/src/main/resources/hornetq/server0/activemq-jms.xml ---------------------------------------------------------------------- diff --git a/examples/jms/proton-cpp/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/proton-cpp/src/main/resources/hornetq/server0/activemq-jms.xml deleted file mode 100644 index b96601e..0000000 --- a/examples/jms/proton-cpp/src/main/resources/hornetq/server0/activemq-jms.xml +++ /dev/null @@ -1,10 +0,0 @@ -<configuration xmlns="urn:activemq" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:activemq /schema/activemq-jms.xsd"> - - <!--the queue used by the example--> - <queue name="exampleQueue"> - <entry name="/queue/exampleQueue"/> - </queue> - -</configuration> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/proton-cpp/src/main/resources/hornetq/server0/activemq-users.xml ---------------------------------------------------------------------- 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 deleted file mode 100644 index ae30546..0000000 --- a/examples/jms/proton-cpp/src/main/resources/hornetq/server0/activemq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ -<configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:activemq /schema/activemq-users.xsd"> - <!-- the default user. this is used where username is null--> - <defaultuser name="guest" password="guest"> - <role name="guest"/> - </defaultuser> -</configuration> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/proton-j/pom.xml ---------------------------------------------------------------------- diff --git a/examples/jms/proton-j/pom.xml b/examples/jms/proton-j/pom.xml index f530c43..5f1af32 100644 --- a/examples/jms/proton-j/pom.xml +++ b/examples/jms/proton-j/pom.xml @@ -108,7 +108,7 @@ </dependencies> <configuration> <waitOnStart>false</waitOnStart> - <hornetqConfigurationDir>${basedir}/target/classes/activemq/server0</hornetqConfigurationDir> + <configurationDir>${basedir}/target/classes/activemq/server0</configurationDir> </configuration> </plugin> </plugins> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/proton-j/src/main/resources/activemq/server0/activemq-configuration.xml ---------------------------------------------------------------------- diff --git a/examples/jms/proton-j/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/proton-j/src/main/resources/activemq/server0/activemq-configuration.xml new file mode 100644 index 0000000..846d0af --- /dev/null +++ b/examples/jms/proton-j/src/main/resources/activemq/server0/activemq-configuration.xml @@ -0,0 +1,42 @@ +<configuration xmlns="urn:activemq" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd"> + + <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory> + + <journal-directory>${build.directory}/server0/data/messaging/journal</journal-directory> + + <large-messages-directory>${build.directory}/server0/data/messaging/largemessages</large-messages-directory> + + <paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory> + + + <!-- Acceptors --> + <acceptors> + <acceptor name="proton-acceptor"> + <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> + <param key="port" value="5672"/> + </acceptor> + </acceptors> + + <queues> + <queue name="testQueue"> + <address>testQueue</address> + </queue> + </queues> + + <!-- Other config --> + + <security-settings> + <!--security for example queue--> + <security-setting match="jms.queue.exampleQueue"> + <permission type="createDurableQueue" roles="guest"/> + <permission type="deleteDurableQueue" roles="guest"/> + <permission type="createNonDurableQueue" roles="guest"/> + <permission type="deleteNonDurableQueue" roles="guest"/> + <permission type="consume" roles="guest"/> + <permission type="send" roles="guest"/> + </security-setting> + </security-settings> + +</configuration> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/proton-j/src/main/resources/activemq/server0/activemq-jms.xml ---------------------------------------------------------------------- diff --git a/examples/jms/proton-j/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/proton-j/src/main/resources/activemq/server0/activemq-jms.xml new file mode 100644 index 0000000..0fe7509 --- /dev/null +++ b/examples/jms/proton-j/src/main/resources/activemq/server0/activemq-jms.xml @@ -0,0 +1,10 @@ +<configuration xmlns="urn:activemq" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="urn:activemq /schema/activemq-jms.xsd"> + + <!--the queue used by the example--> + <queue name="exampleQueue"> + <entry name="/queue/exampleQueue"/> + </queue> + +</configuration> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/proton-j/src/main/resources/activemq/server0/activemq-users.xml ---------------------------------------------------------------------- diff --git a/examples/jms/proton-j/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/proton-j/src/main/resources/activemq/server0/activemq-users.xml new file mode 100644 index 0000000..ae30546 --- /dev/null +++ b/examples/jms/proton-j/src/main/resources/activemq/server0/activemq-users.xml @@ -0,0 +1,7 @@ +<configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="urn:activemq /schema/activemq-users.xsd"> + <!-- the default user. this is used where username is null--> + <defaultuser name="guest" password="guest"> + <role name="guest"/> + </defaultuser> +</configuration> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/proton-j/src/main/resources/hornetq/server0/activemq-configuration.xml ---------------------------------------------------------------------- diff --git a/examples/jms/proton-j/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/proton-j/src/main/resources/hornetq/server0/activemq-configuration.xml deleted file mode 100644 index 846d0af..0000000 --- a/examples/jms/proton-j/src/main/resources/hornetq/server0/activemq-configuration.xml +++ /dev/null @@ -1,42 +0,0 @@ -<configuration xmlns="urn:activemq" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd"> - - <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory> - - <journal-directory>${build.directory}/server0/data/messaging/journal</journal-directory> - - <large-messages-directory>${build.directory}/server0/data/messaging/largemessages</large-messages-directory> - - <paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory> - - - <!-- Acceptors --> - <acceptors> - <acceptor name="proton-acceptor"> - <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> - <param key="port" value="5672"/> - </acceptor> - </acceptors> - - <queues> - <queue name="testQueue"> - <address>testQueue</address> - </queue> - </queues> - - <!-- Other config --> - - <security-settings> - <!--security for example queue--> - <security-setting match="jms.queue.exampleQueue"> - <permission type="createDurableQueue" roles="guest"/> - <permission type="deleteDurableQueue" roles="guest"/> - <permission type="createNonDurableQueue" roles="guest"/> - <permission type="deleteNonDurableQueue" roles="guest"/> - <permission type="consume" roles="guest"/> - <permission type="send" roles="guest"/> - </security-setting> - </security-settings> - -</configuration> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/proton-j/src/main/resources/hornetq/server0/activemq-jms.xml ---------------------------------------------------------------------- diff --git a/examples/jms/proton-j/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/proton-j/src/main/resources/hornetq/server0/activemq-jms.xml deleted file mode 100644 index 0fe7509..0000000 --- a/examples/jms/proton-j/src/main/resources/hornetq/server0/activemq-jms.xml +++ /dev/null @@ -1,10 +0,0 @@ -<configuration xmlns="urn:activemq" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:activemq /schema/activemq-jms.xsd"> - - <!--the queue used by the example--> - <queue name="exampleQueue"> - <entry name="/queue/exampleQueue"/> - </queue> - -</configuration> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/proton-j/src/main/resources/hornetq/server0/activemq-users.xml ---------------------------------------------------------------------- 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 deleted file mode 100644 index ae30546..0000000 --- a/examples/jms/proton-j/src/main/resources/hornetq/server0/activemq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ -<configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:activemq /schema/activemq-users.xsd"> - <!-- the default user. this is used where username is null--> - <defaultuser name="guest" password="guest"> - <role name="guest"/> - </defaultuser> -</configuration> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/proton-ruby/pom.xml ---------------------------------------------------------------------- diff --git a/examples/jms/proton-ruby/pom.xml b/examples/jms/proton-ruby/pom.xml index 7c6ce21..f4d9faf 100644 --- a/examples/jms/proton-ruby/pom.xml +++ b/examples/jms/proton-ruby/pom.xml @@ -86,7 +86,7 @@ </dependencies> <configuration> <waitOnStart>false</waitOnStart> - <hornetqConfigurationDir>${basedir}/target/classes/activemq/server0</hornetqConfigurationDir> + <configurationDir>${basedir}/target/classes/activemq/server0</configurationDir> </configuration> </plugin> </plugins> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/proton-ruby/src/main/resources/activemq/server0/activemq-configuration.xml ---------------------------------------------------------------------- diff --git a/examples/jms/proton-ruby/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/proton-ruby/src/main/resources/activemq/server0/activemq-configuration.xml new file mode 100644 index 0000000..c05d92c --- /dev/null +++ b/examples/jms/proton-ruby/src/main/resources/activemq/server0/activemq-configuration.xml @@ -0,0 +1,41 @@ +<configuration xmlns="urn:activemq" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd"> + + <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory> + + <journal-directory>${build.directory}/server0/data/messaging/journal</journal-directory> + + <large-messages-directory>${build.directory}/server0/data/messaging/largemessages</large-messages-directory> + + <paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory> + + <!-- Acceptors --> + <acceptors> + <acceptor name="proton-acceptor"> + <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> + <param key="protocol" value="AMQP"/> + <param key="port" value="5672"/> + </acceptor> + </acceptors> + + <queues> + <queue name="testQueue"> + <address>testQueue</address> + </queue> + </queues> + <!-- Other config --> + + <security-settings> + <!--security for example queue--> + <security-setting match="#"> + <permission type="createDurableQueue" roles="guest"/> + <permission type="deleteDurableQueue" roles="guest"/> + <permission type="createNonDurableQueue" roles="guest"/> + <permission type="deleteNonDurableQueue" roles="guest"/> + <permission type="consume" roles="guest"/> + <permission type="send" roles="guest"/> + </security-setting> + </security-settings> + +</configuration> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/proton-ruby/src/main/resources/activemq/server0/activemq-jms.xml ---------------------------------------------------------------------- diff --git a/examples/jms/proton-ruby/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/proton-ruby/src/main/resources/activemq/server0/activemq-jms.xml new file mode 100644 index 0000000..d97607a --- /dev/null +++ b/examples/jms/proton-ruby/src/main/resources/activemq/server0/activemq-jms.xml @@ -0,0 +1,9 @@ +<configuration xmlns="urn:activemq" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="urn:activemq /schema/activemq-jms.xsd"> + <!--the queue used by the example--> + <queue name="exampleQueue"> + <entry name="/queue/exampleQueue"/> + </queue> + +</configuration> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/proton-ruby/src/main/resources/activemq/server0/activemq-users.xml ---------------------------------------------------------------------- diff --git a/examples/jms/proton-ruby/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/proton-ruby/src/main/resources/activemq/server0/activemq-users.xml new file mode 100644 index 0000000..3d0ec8c --- /dev/null +++ b/examples/jms/proton-ruby/src/main/resources/activemq/server0/activemq-users.xml @@ -0,0 +1,7 @@ +<configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="urn:activemq /schema/activemq-users.xsd"> + <!-- the default user. this is used where username is null--> + <defaultuser name="guest" password="guest"> + <role name="guest"/> + </defaultuser> +</configuration> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/proton-ruby/src/main/resources/hornetq/server0/activemq-configuration.xml ---------------------------------------------------------------------- diff --git a/examples/jms/proton-ruby/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/proton-ruby/src/main/resources/hornetq/server0/activemq-configuration.xml deleted file mode 100644 index c05d92c..0000000 --- a/examples/jms/proton-ruby/src/main/resources/hornetq/server0/activemq-configuration.xml +++ /dev/null @@ -1,41 +0,0 @@ -<configuration xmlns="urn:activemq" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd"> - - <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory> - - <journal-directory>${build.directory}/server0/data/messaging/journal</journal-directory> - - <large-messages-directory>${build.directory}/server0/data/messaging/largemessages</large-messages-directory> - - <paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory> - - <!-- Acceptors --> - <acceptors> - <acceptor name="proton-acceptor"> - <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> - <param key="protocol" value="AMQP"/> - <param key="port" value="5672"/> - </acceptor> - </acceptors> - - <queues> - <queue name="testQueue"> - <address>testQueue</address> - </queue> - </queues> - <!-- Other config --> - - <security-settings> - <!--security for example queue--> - <security-setting match="#"> - <permission type="createDurableQueue" roles="guest"/> - <permission type="deleteDurableQueue" roles="guest"/> - <permission type="createNonDurableQueue" roles="guest"/> - <permission type="deleteNonDurableQueue" roles="guest"/> - <permission type="consume" roles="guest"/> - <permission type="send" roles="guest"/> - </security-setting> - </security-settings> - -</configuration> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/proton-ruby/src/main/resources/hornetq/server0/activemq-jms.xml ---------------------------------------------------------------------- diff --git a/examples/jms/proton-ruby/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/proton-ruby/src/main/resources/hornetq/server0/activemq-jms.xml deleted file mode 100644 index d97607a..0000000 --- a/examples/jms/proton-ruby/src/main/resources/hornetq/server0/activemq-jms.xml +++ /dev/null @@ -1,9 +0,0 @@ -<configuration xmlns="urn:activemq" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:activemq /schema/activemq-jms.xsd"> - <!--the queue used by the example--> - <queue name="exampleQueue"> - <entry name="/queue/exampleQueue"/> - </queue> - -</configuration> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/proton-ruby/src/main/resources/hornetq/server0/activemq-users.xml ---------------------------------------------------------------------- diff --git a/examples/jms/proton-ruby/src/main/resources/hornetq/server0/activemq-users.xml b/examples/jms/proton-ruby/src/main/resources/hornetq/server0/activemq-users.xml deleted file mode 100644 index 3d0ec8c..0000000 --- a/examples/jms/proton-ruby/src/main/resources/hornetq/server0/activemq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ -<configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:activemq /schema/activemq-users.xsd"> - <!-- the default user. this is used where username is null--> - <defaultuser name="guest" password="guest"> - <role name="guest"/> - </defaultuser> -</configuration> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/queue-message-redistribution/pom.xml ---------------------------------------------------------------------- diff --git a/examples/jms/queue-message-redistribution/pom.xml b/examples/jms/queue-message-redistribution/pom.xml index d2b79af..35d0e49 100644 --- a/examples/jms/queue-message-redistribution/pom.xml +++ b/examples/jms/queue-message-redistribution/pom.xml @@ -36,7 +36,7 @@ <goal>start</goal> </goals> <configuration> - <hornetqConfigurationDir>${basedir}/target/classes/activemq/server0</hornetqConfigurationDir> + <configurationDir>${basedir}/target/classes/activemq/server0</configurationDir> <systemProperties> <property> <name>build.directory</name> @@ -55,9 +55,7 @@ <goal>start</goal> </goals> <configuration> - <jndiPort>1199</jndiPort> - <jndiRmiPort>1198</jndiRmiPort> - <hornetqConfigurationDir>${basedir}/target/classes/activemq/server1</hornetqConfigurationDir> + <configurationDir>${basedir}/target/classes/activemq/server1</configurationDir> <fork>true</fork> <systemProperties> <property> @@ -96,7 +94,7 @@ <goal>stop</goal> </goals> <configuration> - <hornetqConfigurationDir>${basedir}/target/classes/activemq/server0</hornetqConfigurationDir> + <configurationDir>${basedir}/target/classes/activemq/server0</configurationDir> </configuration> </execution> <execution> @@ -105,7 +103,7 @@ <goal>stop</goal> </goals> <configuration> - <hornetqConfigurationDir>${basedir}/target/classes/activemq/server1</hornetqConfigurationDir> + <configurationDir>${basedir}/target/classes/activemq/server1</configurationDir> </configuration> </execution> </executions> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/queue-message-redistribution/src/main/java/org/apache/activemq/jms/example/QueueMessageRedistributionExample.java ---------------------------------------------------------------------- diff --git a/examples/jms/queue-message-redistribution/src/main/java/org/apache/activemq/jms/example/QueueMessageRedistributionExample.java b/examples/jms/queue-message-redistribution/src/main/java/org/apache/activemq/jms/example/QueueMessageRedistributionExample.java index 732f36d..b2c473c 100644 --- a/examples/jms/queue-message-redistribution/src/main/java/org/apache/activemq/jms/example/QueueMessageRedistributionExample.java +++ b/examples/jms/queue-message-redistribution/src/main/java/org/apache/activemq/jms/example/QueueMessageRedistributionExample.java @@ -16,6 +16,8 @@ */ package org.apache.activemq.jms.example; +import java.util.Hashtable; + import javax.jms.Connection; import javax.jms.ConnectionFactory; import javax.jms.MessageConsumer; @@ -56,7 +58,11 @@ public class QueueMessageRedistributionExample extends ActiveMQExample try { // Step 1. Get an initial context for looking up JNDI from server 0 - ic0 = getContext(0); + Hashtable<String, Object> properties = new Hashtable<String, Object>(); + properties.put("java.naming.factory.initial", "org.apache.activemq.jndi.ActiveMQInitialContextFactory"); + properties.put("java.naming.provider.url", args[0]); + properties.put("queue.queue/exampleQueue", "exampleQueue"); + ic0 = new InitialContext(properties); // Step 2. Look-up the JMS Queue object from JNDI Queue queue = (Queue)ic0.lookup("queue/exampleQueue"); @@ -65,7 +71,10 @@ public class QueueMessageRedistributionExample extends ActiveMQExample ConnectionFactory cf0 = (ConnectionFactory)ic0.lookup("ConnectionFactory"); // Step 4. Get an initial context for looking up JNDI from server 1 - ic1 = getContext(1); + properties = new Hashtable<String, Object>(); + properties.put("java.naming.factory.initial", "org.apache.activemq.jndi.ActiveMQInitialContextFactory"); + properties.put("java.naming.provider.url", args[1]); + ic1 = new InitialContext(properties); // Step 5. Look-up a JMS Connection Factory object from JNDI on server 1 ConnectionFactory cf1 = (ConnectionFactory)ic1.lookup("ConnectionFactory"); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/queue-message-redistribution/src/main/resources/activemq/server0/activemq-configuration.xml ---------------------------------------------------------------------- diff --git a/examples/jms/queue-message-redistribution/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/queue-message-redistribution/src/main/resources/activemq/server0/activemq-configuration.xml new file mode 100644 index 0000000..5884905 --- /dev/null +++ b/examples/jms/queue-message-redistribution/src/main/resources/activemq/server0/activemq-configuration.xml @@ -0,0 +1,86 @@ +<configuration xmlns="urn:activemq" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd"> + + + + <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory> + + <journal-directory>${build.directory}/server0/data/messaging/journal</journal-directory> + + <large-messages-directory>${build.directory}/server0/data/messaging/largemessages</large-messages-directory> + + <paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory> + + <!-- Connectors --> + <connectors> + <connector name="netty-connector"> + <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> + <param key="port" value="5445"/> + </connector> + </connectors> + + <!-- Acceptors --> + <acceptors> + <acceptor name="netty-acceptor"> + <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> + <param key="port" value="5445"/> + </acceptor> + </acceptors> + + <!-- Clustering configuration --> + <broadcast-groups> + <broadcast-group name="my-broadcast-group"> + <group-address>${udp-address:231.7.7.7}</group-address> + <group-port>9876</group-port> + <broadcast-period>100</broadcast-period> + <connector-ref>netty-connector</connector-ref> + </broadcast-group> + </broadcast-groups> + + <discovery-groups> + <discovery-group name="my-discovery-group"> + <group-address>${udp-address:231.7.7.7}</group-address> + <group-port>9876</group-port> + <refresh-timeout>10000</refresh-timeout> + </discovery-group> + </discovery-groups> + + <cluster-connections> + <cluster-connection name="my-cluster"> + <address>jms</address> + <connector-ref>netty-connector</connector-ref> + <retry-interval>500</retry-interval> + <use-duplicate-detection>true</use-duplicate-detection> + <forward-when-no-consumers>false</forward-when-no-consumers> + <max-hops>1</max-hops> + <discovery-group-ref discovery-group-name="my-discovery-group"/> + </cluster-connection> + </cluster-connections> + + <!-- Other config --> + + <security-settings> + <!--security for example queue--> + <security-setting match="jms.queue.exampleQueue"> + <permission type="createDurableQueue" roles="guest"/> + <permission type="deleteDurableQueue" roles="guest"/> + <permission type="createNonDurableQueue" roles="guest"/> + <permission type="deleteNonDurableQueue" roles="guest"/> + <permission type="consume" roles="guest"/> + <permission type="send" roles="guest"/> + </security-setting> + </security-settings> + + <address-settings> + <!-- We set a redistribution delay of zero on all jms queues and topic subscriptions + Default redistribution delay as -1 which means "disable redistribution" + Setting it to a value > 0 means how long to wait before redistributing, if a consumer is closed + then another one quickly recreated you might want to set it thus, to avoid unnecessary + redistribution --> + <address-setting match="jms.#"> + <redistribution-delay>0</redistribution-delay> + </address-setting> + </address-settings> + +</configuration>