You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by jb...@apache.org on 2014/12/10 17:11:27 UTC
[01/37] activemq-6 git commit: Fixing build after XA Test
Repository: activemq-6
Updated Branches:
refs/heads/master 60576a7c5 -> 0eb6ebda2
Fixing build after XA Test
The JMS Testsuite still need the TM for some tests, not having a TM would break compilation on the JMS Test
Project: http://git-wip-us.apache.org/repos/asf/activemq-6/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-6/commit/fecd3764
Tree: http://git-wip-us.apache.org/repos/asf/activemq-6/tree/fecd3764
Diff: http://git-wip-us.apache.org/repos/asf/activemq-6/diff/fecd3764
Branch: refs/heads/master
Commit: fecd376448eaae02419ba7f811f545d813c1cf7c
Parents: 60576a7
Author: Clebert Suconic <cl...@apache.org>
Authored: Wed Dec 10 10:32:37 2014 -0500
Committer: Clebert Suconic <cl...@apache.org>
Committed: Wed Dec 10 10:39:08 2014 -0500
----------------------------------------------------------------------
tests/jms-tests/pom.xml | 13 +++++++++++++
1 file changed, 13 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/fecd3764/tests/jms-tests/pom.xml
----------------------------------------------------------------------
diff --git a/tests/jms-tests/pom.xml b/tests/jms-tests/pom.xml
index 5146df1..03662a6 100644
--- a/tests/jms-tests/pom.xml
+++ b/tests/jms-tests/pom.xml
@@ -87,6 +87,19 @@
<artifactId>geronimo-ejb_3.0_spec</artifactId>
</dependency>
+ <!--this specifically for the XA Tests -->
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-transaction-spi</artifactId>
+ <version>7.0.0.Final</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
<dependency>
<groupId>org.apache.geronimo.components</groupId>
<artifactId>geronimo-jaspi</artifactId>
[05/37] activemq-6 git commit: ACTIVEMQ6-41 Drop Java EE examples
Posted by jb...@apache.org.
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/mdb-remote-failover/server/standalone/configuration/standalone-live.xml
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-remote-failover/server/standalone/configuration/standalone-live.xml b/examples/javaee/mdb-remote-failover/server/standalone/configuration/standalone-live.xml
deleted file mode 100644
index 987f8cb..0000000
--- a/examples/javaee/mdb-remote-failover/server/standalone/configuration/standalone-live.xml
+++ /dev/null
@@ -1,521 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-
-<server xmlns="urn:jboss:domain:2.0">
- <extensions>
- <extension module="org.jboss.as.clustering.infinispan"/>
- <extension module="org.jboss.as.connector"/>
- <extension module="org.jboss.as.deployment-scanner"/>
- <extension module="org.jboss.as.ee"/>
- <extension module="org.jboss.as.ejb3"/>
- <extension module="org.jboss.as.jacorb"/>
- <extension module="org.jboss.as.jaxrs"/>
- <extension module="org.jboss.as.jdr"/>
- <extension module="org.jboss.as.jmx"/>
- <extension module="org.jboss.as.jpa"/>
- <extension module="org.jboss.as.jsf"/>
- <extension module="org.jboss.as.jsr77"/>
- <extension module="org.jboss.as.logging"/>
- <extension module="org.jboss.as.mail"/>
- <extension module="org.jboss.as.messaging"/>
- <extension module="org.jboss.as.naming"/>
- <extension module="org.jboss.as.pojo"/>
- <extension module="org.jboss.as.remoting"/>
- <extension module="org.jboss.as.sar"/>
- <extension module="org.jboss.as.security"/>
- <extension module="org.jboss.as.threads"/>
- <extension module="org.jboss.as.transactions"/>
- <extension module="org.jboss.as.webservices"/>
- <extension module="org.jboss.as.weld"/>
- <extension module="org.wildfly.extension.batch"/>
- <extension module="org.wildfly.extension.io"/>
- <extension module="org.wildfly.extension.undertow"/>
- </extensions>
- <management>
- <security-realms>
- <security-realm name="ManagementRealm">
- <authentication>
- <local default-user="$local"/>
- <properties path="mgmt-users.properties" relative-to="jboss.server.config.dir"/>
- </authentication>
- <authorization map-groups-to-roles="false">
- <properties path="mgmt-groups.properties" relative-to="jboss.server.config.dir"/>
- </authorization>
- </security-realm>
- <security-realm name="ApplicationRealm">
- <authentication>
- <local default-user="$local" allowed-users="*"/>
- <properties path="application-users.properties" relative-to="jboss.server.config.dir"/>
- </authentication>
- <authorization>
- <properties path="application-roles.properties" relative-to="jboss.server.config.dir"/>
- </authorization>
- </security-realm>
- </security-realms>
- <audit-log>
- <formatters>
- <json-formatter name="json-formatter"/>
- </formatters>
- <handlers>
- <file-handler name="file" formatter="json-formatter" relative-to="jboss.server.data.dir" path="audit-log.log"/>
- </handlers>
- <logger log-boot="true" log-read-only="false" enabled="false">
- <handlers>
- <handler name="file"/>
- </handlers>
- </logger>
- </audit-log>
- <management-interfaces>
- <http-interface security-realm="ManagementRealm" http-upgrade-enabled="true">
- <socket-binding http="management-http"/>
- </http-interface>
- </management-interfaces>
- <access-control provider="simple">
- <role-mapping>
- <role name="SuperUser">
- <include>
- <user name="$local"/>
- </include>
- </role>
- </role-mapping>
- </access-control>
- </management>
- <profile>
- <subsystem xmlns="urn:jboss:domain:logging:2.0">
- <console-handler name="CONSOLE">
- <level name="INFO"/>
- <formatter>
- <named-formatter name="COLOR-PATTERN"/>
- </formatter>
- </console-handler>
- <periodic-rotating-file-handler name="FILE" autoflush="true">
- <formatter>
- <named-formatter name="PATTERN"/>
- </formatter>
- <file relative-to="jboss.server.log.dir" path="server.log"/>
- <suffix value=".yyyy-MM-dd"/>
- <append value="true"/>
- </periodic-rotating-file-handler>
- <logger category="com.arjuna">
- <level name="WARN"/>
- </logger>
- <logger category="org.apache.tomcat.util.modeler">
- <level name="WARN"/>
- </logger>
- <logger category="org.jboss.as.config">
- <level name="DEBUG"/>
- </logger>
- <logger category="sun.rmi">
- <level name="WARN"/>
- </logger>
- <logger category="jacorb">
- <level name="WARN"/>
- </logger>
- <logger category="jacorb.config">
- <level name="ERROR"/>
- </logger>
- <root-logger>
- <level name="INFO"/>
- <handlers>
- <handler name="CONSOLE"/>
- <handler name="FILE"/>
- </handlers>
- </root-logger>
- <formatter name="PATTERN">
- <pattern-formatter pattern="%d{yyyy-MM-dd HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/>
- </formatter>
- <formatter name="COLOR-PATTERN">
- <pattern-formatter pattern="%K{level}%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/>
- </formatter>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:batch:1.0">
- <job-repository>
- <in-memory/>
- </job-repository>
- <thread-pool>
- <max-threads count="10"/>
- <keepalive-time time="100" unit="milliseconds"/>
- </thread-pool>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:datasources:2.0">
- <datasources>
- <datasource jndi-name="java:jboss/datasources/ExampleDS" pool-name="ExampleDS" enabled="true" use-java-context="true">
- <connection-url>jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE</connection-url>
- <driver>h2</driver>
- <security>
- <user-name>sa</user-name>
- <password>sa</password>
- </security>
- </datasource>
- <drivers>
- <driver name="h2" module="com.h2database.h2">
- <xa-datasource-class>org.h2.jdbcx.JdbcDataSource</xa-datasource-class>
- </driver>
- </drivers>
- </datasources>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:deployment-scanner:2.0">
- <deployment-scanner path="deployments" relative-to="jboss.server.base.dir" scan-interval="5000" runtime-failure-causes-rollback="${jboss.deployment.scanner.rollback.on.failure:false}"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:ee:2.0">
- <spec-descriptor-property-replacement>false</spec-descriptor-property-replacement>
- <jboss-descriptor-property-replacement>true</jboss-descriptor-property-replacement>
- <annotation-property-replacement>false</annotation-property-replacement>
- <concurrent>
- <context-services>
- <context-service name="default" jndi-name="java:jboss/ee/concurrency/context/default" use-transaction-setup-provider="true"/>
- </context-services>
- <managed-executor-services>
- <managed-executor-service name="default" jndi-name="java:jboss/ee/concurrency/executor/default" context-service="default" hung-task-threshold="60000" core-threads="5" max-threads="25" keepalive-time="5000"/>
- </managed-executor-services>
- <managed-scheduled-executor-services>
- <managed-scheduled-executor-service name="default" jndi-name="java:jboss/ee/concurrency/scheduler/default" context-service="default" hung-task-threshold="60000" core-threads="2" keepalive-time="3000"/>
- </managed-scheduled-executor-services>
- <managed-thread-factories>
- <managed-thread-factory name="default" jndi-name="java:jboss/ee/concurrency/factory/default" context-service="default"/>
- </managed-thread-factories>
- </concurrent>
- <default-bindings context-service="java:jboss/ee/concurrency/context/default" datasource="java:jboss/datasources/ExampleDS" jms-connection-factory="java:jboss/DefaultJMSConnectionFactory" managed-executor-service="java:jboss/ee/concurrency/executor/default" managed-scheduled-executor-service="java:jboss/ee/concurrency/scheduler/default" managed-thread-factory="java:jboss/ee/concurrency/factory/default"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:ejb3:2.0">
- <session-bean>
- <stateful default-access-timeout="5000" cache-ref="simple" passivation-disabled-cache-ref="simple"/>
- <singleton default-access-timeout="5000"/>
- </session-bean>
- <mdb>
- <resource-adapter-ref resource-adapter-name="${ejb.resource-adapter-name:activemq-ra.rar}"/>
- <bean-instance-pool-ref pool-name="mdb-strict-max-pool"/>
- </mdb>
- <pools>
- <bean-instance-pools>
- <!-- A sample strict max pool configuration -->
- <strict-max-pool name="slsb-strict-max-pool" max-pool-size="20" instance-acquisition-timeout="5" instance-acquisition-timeout-unit="MINUTES"/>
- <strict-max-pool name="mdb-strict-max-pool" max-pool-size="20" instance-acquisition-timeout="5" instance-acquisition-timeout-unit="MINUTES"/>
- </bean-instance-pools>
- </pools>
- <caches>
- <cache name="simple"/>
- <cache name="distributable" aliases="passivating clustered" passivation-store-ref="infinispan"/>
- </caches>
- <passivation-stores>
- <passivation-store name="infinispan" cache-container="ejb" max-size="10000"/>
- </passivation-stores>
- <async thread-pool-name="default"/>
- <timer-service thread-pool-name="default" default-data-store="default-file-store">
- <data-stores>
- <file-data-store name="default-file-store" path="timer-service-data" relative-to="jboss.server.data.dir"/>
- </data-stores>
- </timer-service>
- <remote connector-ref="http-remoting-connector" thread-pool-name="default"/>
- <thread-pools>
- <thread-pool name="default">
- <max-threads count="10"/>
- <keepalive-time time="100" unit="milliseconds"/>
- </thread-pool>
- </thread-pools>
- <iiop enable-by-default="false" use-qualified-name="false"/>
- <default-security-domain value="other"/>
- <default-missing-method-permissions-deny-access value="true"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:io:1.0">
- <worker name="default" io-threads="3"/>
- <buffer-pool name="default" buffer-size="16384" buffers-per-slice="128"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:infinispan:2.0">
- <cache-container name="web" default-cache="passivation" module="org.wildfly.clustering.web.infinispan">
- <local-cache name="passivation" batching="true">
- <file-store passivation="true" purge="false"/>
- </local-cache>
- <local-cache name="persistent" batching="true">
- <file-store passivation="false" purge="false"/>
- </local-cache>
- </cache-container>
- <cache-container name="ejb" aliases="sfsb" default-cache="passivation" module="org.wildfly.clustering.ejb.infinispan">
- <local-cache name="passivation" batching="true">
- <file-store passivation="true" purge="false"/>
- </local-cache>
- <local-cache name="persistent" batching="true">
- <file-store passivation="false" purge="false"/>
- </local-cache>
- </cache-container>
- <cache-container name="hibernate" default-cache="local-query" module="org.hibernate">
- <local-cache name="entity">
- <transaction mode="NON_XA"/>
- <eviction strategy="LRU" max-entries="10000"/>
- <expiration max-idle="100000"/>
- </local-cache>
- <local-cache name="local-query">
- <transaction mode="NONE"/>
- <eviction strategy="LRU" max-entries="10000"/>
- <expiration max-idle="100000"/>
- </local-cache>
- <local-cache name="timestamps">
- <transaction mode="NONE"/>
- <eviction strategy="NONE"/>
- </local-cache>
- </cache-container>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:jacorb:1.3">
- <orb socket-binding="jacorb" ssl-socket-binding="jacorb-ssl">
- <initializers transactions="spec" security="identity"/>
- </orb>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:jaxrs:1.0"/>
- <subsystem xmlns="urn:jboss:domain:jca:2.0">
- <archive-validation enabled="true" fail-on-error="true" fail-on-warn="false"/>
- <bean-validation enabled="true"/>
- <default-workmanager>
- <short-running-threads>
- <core-threads count="50"/>
- <queue-length count="50"/>
- <max-threads count="50"/>
- <keepalive-time time="10" unit="seconds"/>
- </short-running-threads>
- <long-running-threads>
- <core-threads count="50"/>
- <queue-length count="50"/>
- <max-threads count="50"/>
- <keepalive-time time="10" unit="seconds"/>
- </long-running-threads>
- </default-workmanager>
- <cached-connection-manager/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:jdr:1.0"/>
- <subsystem xmlns="urn:jboss:domain:jmx:1.3">
- <expose-resolved-model/>
- <expose-expression-model/>
- <remoting-connector/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:jpa:1.1">
- <jpa default-datasource="" default-extended-persistence-inheritance="DEEP"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:jsf:1.0"/>
- <subsystem xmlns="urn:jboss:domain:jsr77:1.0"/>
- <subsystem xmlns="urn:jboss:domain:mail:2.0">
- <mail-session name="default" jndi-name="java:jboss/mail/Default">
- <smtp-server outbound-socket-binding-ref="mail-smtp"/>
- </mail-session>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:messaging:2.0">
- <activemq-server>
- <failover-on-shutdown>true</failover-on-shutdown>
- <shared-store>true</shared-store>
- <persistence-enabled>true</persistence-enabled>
- <journal-file-size>102400</journal-file-size>
- <journal-min-files>2</journal-min-files>
- <journal-directory path="../../../journal"/>
- <bindings-directory path="../../../bindings"/>
- <large-messages-directory path="../../../large-message"/>
- <paging-directory path="../../../paging"/>
- <connectors>
- <http-connector name="http-connector" socket-binding="http">
- <param key="http-upgrade-endpoint" value="http-acceptor"/>
- </http-connector>
- <http-connector name="http-connector-throughput" socket-binding="http">
- <param key="http-upgrade-endpoint" value="http-acceptor-throughput"/>
- <param key="batch-delay" value="50"/>
- </http-connector>
- <in-vm-connector name="in-vm" server-id="0"/>
- </connectors>
- <acceptors>
- <http-acceptor name="http-acceptor" http-listener="default"/>
- <http-acceptor name="http-acceptor-throughput" http-listener="default">
- <param key="batch-delay" value="50"/>
- <param key="direct-deliver" value="false"/>
- </http-acceptor>
- <in-vm-acceptor name="in-vm" server-id="0"/>
- </acceptors>
- <security-settings>
- <security-setting match="#">
- <permission type="send" roles="guest"/>
- <permission type="consume" roles="guest"/>
- <permission type="createNonDurableQueue" roles="guest"/>
- <permission type="deleteNonDurableQueue" roles="guest"/>
- </security-setting>
- </security-settings>
- <address-settings>
- <!--default for catch all-->
- <address-setting match="#">
- <dead-letter-address>jms.queue.DLQ</dead-letter-address>
- <expiry-address>jms.queue.ExpiryQueue</expiry-address>
- <redelivery-delay>0</redelivery-delay>
- <max-size-bytes>10485760</max-size-bytes>
- <address-full-policy>PAGE</address-full-policy>
- <page-size-bytes>2097152</page-size-bytes>
- <message-counter-history-day-limit>10</message-counter-history-day-limit>
- </address-setting>
- </address-settings>
- <broadcast-groups>
- <broadcast-group name="bg-group1">
- <socket-binding>messaging-group</socket-binding>
- <broadcast-period>5000</broadcast-period>
- <connector-ref>http-connector</connector-ref>
- </broadcast-group>
- </broadcast-groups>
- <discovery-groups>
- <discovery-group name="dg-group1">
- <socket-binding>messaging-group</socket-binding>
- <refresh-timeout>10000</refresh-timeout>
- </discovery-group>
- </discovery-groups>
- <cluster-connections>
- <cluster-connection name="my-cluster">
- <address>jms</address>
- <connector-ref>http-connector</connector-ref>
- <discovery-group-ref discovery-group-name="dg-group1"/>
- </cluster-connection>
- </cluster-connections>
- <jms-connection-factories>
- <connection-factory name="InVmConnectionFactory">
- <connectors>
- <connector-ref connector-name="in-vm"/>
- </connectors>
- <entries>
- <entry name="java:/ConnectionFactory"/>
- </entries>
- </connection-factory>
- <connection-factory name="RemoteConnectionFactory">
- <connectors>
- <connector-ref connector-name="http-connector"/>
- </connectors>
- <entries>
- <entry name="java:jboss/exported/jms/RemoteConnectionFactory"/>
- </entries>
- <ha>true</ha>
- <reconnect-attempts>-1</reconnect-attempts>
- </connection-factory>
- <pooled-connection-factory name="activemq-ra">
- <transaction mode="xa"/>
- <connectors>
- <connector-ref connector-name="in-vm"/>
- </connectors>
- <entries>
- <entry name="java:/JmsXA"/>
- <!-- Global JNDI entry used to provide a default JMS Connection factory to EE application -->
- <entry name="java:jboss/DefaultJMSConnectionFactory"/>
- </entries>
- </pooled-connection-factory>
- </jms-connection-factories>
- <jms-destinations>
- <jms-queue name="inQueue">
- <entry name="queue/inQueue"/>
- <entry name="java:jboss/exported/queues/inQueue"/>
- </jms-queue>
- <jms-queue name="outQueue">
- <entry name="queue/outQueue"/>
- <entry name="java:jboss/exported/queues/outQueue"/>
- </jms-queue>
- </jms-destinations>
- </activemq-server>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:naming:2.0">
- <remote-naming/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:pojo:1.0"/>
- <subsystem xmlns="urn:jboss:domain:remoting:2.0">
- <endpoint worker="default"/>
- <http-connector name="http-remoting-connector" connector-ref="default" security-realm="ApplicationRealm"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:resource-adapters:2.0"/>
- <subsystem xmlns="urn:jboss:domain:sar:1.0"/>
- <subsystem xmlns="urn:jboss:domain:security:1.2">
- <security-domains>
- <security-domain name="other" cache-type="default">
- <authentication>
- <login-module code="Remoting" flag="optional">
- <module-option name="password-stacking" value="useFirstPass"/>
- </login-module>
- <login-module code="RealmDirect" flag="required">
- <module-option name="password-stacking" value="useFirstPass"/>
- </login-module>
- </authentication>
- </security-domain>
- <security-domain name="jboss-web-policy" cache-type="default">
- <authorization>
- <policy-module code="Delegating" flag="required"/>
- </authorization>
- </security-domain>
- <security-domain name="jboss-ejb-policy" cache-type="default">
- <authorization>
- <policy-module code="Delegating" flag="required"/>
- </authorization>
- </security-domain>
- </security-domains>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:threads:1.1"/>
- <subsystem xmlns="urn:jboss:domain:transactions:2.0">
- <core-environment>
- <process-id>
- <uuid/>
- </process-id>
- </core-environment>
- <recovery-environment socket-binding="txn-recovery-environment" status-socket-binding="txn-status-manager"/>
- <coordinator-environment default-timeout="300"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:undertow:1.0">
- <buffer-caches>
- <buffer-cache name="default" buffer-size="1024" buffers-per-region="1024" max-regions="10"/>
- </buffer-caches>
- <server name="default-server">
- <http-listener name="default" socket-binding="http"/>
- <host name="default-host" alias="localhost">
- <location name="/" handler="welcome-content"/>
- <filter-ref name="server-header"/>
- <filter-ref name="x-powered-by-header"/>
- </host>
- </server>
- <servlet-container name="default" default-buffer-cache="default" stack-trace-on-error="local-only">
- <jsp-config/>
- </servlet-container>
- <handlers>
- <file name="welcome-content" path="${jboss.home.dir}/welcome-content" directory-listing="true"/>
- </handlers>
- <filters>
- <response-header name="server-header" header-name="Server" header-value="Wildfly 8"/>
- <response-header name="x-powered-by-header" header-name="X-Powered-By" header-value="Undertow 1"/>
- </filters>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:webservices:1.2">
- <modify-wsdl-address>true</modify-wsdl-address>
- <wsdl-host>${jboss.bind.address:127.0.0.1}</wsdl-host>
- <endpoint-config name="Standard-Endpoint-Config"/>
- <endpoint-config name="Recording-Endpoint-Config">
- <pre-handler-chain name="recording-handlers" protocol-bindings="##SOAP11_HTTP ##SOAP11_HTTP_MTOM ##SOAP12_HTTP ##SOAP12_HTTP_MTOM">
- <handler name="RecordingHandler" class="org.jboss.ws.common.invocation.RecordingServerHandler"/>
- </pre-handler-chain>
- </endpoint-config>
- <client-config name="Standard-Client-Config"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:weld:2.0"/>
- </profile>
- <interfaces>
- <interface name="management">
- <inet-address value="${jboss.bind.address.management:127.0.0.1}"/>
- </interface>
- <interface name="public">
- <inet-address value="${jboss.bind.address:127.0.0.1}"/>
- </interface>
- <!-- TODO - only show this if the jacorb subsystem is added -->
- <interface name="unsecure">
- <!--
- ~ Used for IIOP sockets in the standard configuration.
- ~ To secure JacORB you need to setup SSL
- -->
- <inet-address value="${jboss.bind.address.unsecure:127.0.0.1}"/>
- </interface>
- </interfaces>
- <socket-binding-group name="standard-sockets" default-interface="public" port-offset="${jboss.socket.binding.port-offset:0}">
- <socket-binding name="management-http" interface="management" port="${jboss.management.http.port:9990}"/>
- <socket-binding name="management-https" interface="management" port="${jboss.management.https.port:9993}"/>
- <socket-binding name="ajp" port="${jboss.ajp.port:8009}"/>
- <socket-binding name="http" port="${jboss.http.port:8080}"/>
- <socket-binding name="https" port="${jboss.https.port:8443}"/>
- <socket-binding name="jacorb" interface="unsecure" port="3528"/>
- <socket-binding name="jacorb-ssl" interface="unsecure" port="3529"/>
- <socket-binding name="messaging-group" port="0" multicast-address="${jboss.messaging.group.address:231.7.7.7}" multicast-port="${jboss.messaging.group.port:9876}"/>
- <socket-binding name="txn-recovery-environment" port="4712"/>
- <socket-binding name="txn-status-manager" port="4713"/>
- <outbound-socket-binding name="mail-smtp">
- <remote-destination host="localhost" port="25"/>
- </outbound-socket-binding>
- </socket-binding-group>
-</server>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/mdb-remote-failover/src/main/java/org/apache/activemq/javaee/example/MDBRemoteFailoverClientExample.java
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-remote-failover/src/main/java/org/apache/activemq/javaee/example/MDBRemoteFailoverClientExample.java b/examples/javaee/mdb-remote-failover/src/main/java/org/apache/activemq/javaee/example/MDBRemoteFailoverClientExample.java
deleted file mode 100644
index 384bd0d..0000000
--- a/examples/javaee/mdb-remote-failover/src/main/java/org/apache/activemq/javaee/example/MDBRemoteFailoverClientExample.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.activemq.javaee.example;
-
-import org.apache.activemq.javaee.example.server.ServerKiller;
-
-import javax.jms.*;
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import java.util.Properties;
-
-/**
- * @author <a href="mailto:andy.taylor@jboss.com">Andy Taylor</a>
- * @author Justin Bertram
- */
-public class MDBRemoteFailoverClientExample
-{
- private static ServerKiller killer;
-
- public static void main(String[] args) throws Exception
- {
- Connection connection = null;
- InitialContext initialContext = null;
- try
- {
- //Step 1. Create an initial context to perform the JNDI lookup.
- final Properties env = new Properties();
-
- env.put(Context.URL_PKG_PREFIXES, "org.jboss.ejb.client.naming");
-
- env.put(Context.INITIAL_CONTEXT_FACTORY, "org.jboss.naming.remote.client.InitialContextFactory");
-
- env.put(Context.PROVIDER_URL, "http-remoting://localhost:8180");
-
- initialContext = new InitialContext(env);
- //Step 2. Perfom a lookup on the queue
- Queue queue = (Queue) initialContext.lookup("/queues/inQueue");
-
- //Step 3. Perform a lookup on the Connection Factory
- ConnectionFactory cf = (ConnectionFactory) initialContext.lookup("jms/RemoteConnectionFactory");
-
- //Step 4.Create a JMS Connection
- connection = cf.createConnection("guest", "password");
-
- //Step 5. Create a JMS Session
- Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
-
- //Step 6. Create a JMS Message Producer
- MessageProducer producer = session.createProducer(queue);
-
- //Step 7. Create a Text Message
- TextMessage message = session.createTextMessage("This is a text message");
-
- System.out.println("Sent message: " + message.getText());
-
- //Step 8. Send the Message
- producer.send(message);
-
- //Step 15. We lookup the reply queue
- queue = (Queue) initialContext.lookup("/queues/outQueue");
-
- //Step 16. We create a JMS message consumer
- MessageConsumer messageConsumer = session.createConsumer(queue);
-
- //Step 17. We start the connection so we can receive messages
- connection.start();
-
- //Step 18. We receive the message and print it out
- message = (TextMessage) messageConsumer.receive(20000);
-
- System.out.println("message.getText() = " + message.getText());
-
- //Step 19. Kill the live server
- System.out.println("Killing Live Server");
- killer.kill();
-
- //Step 20. Create a Text Message
- message = session.createTextMessage("This is another text message");
-
- System.out.println("Sent message: " + message.getText());
-
- //Step 21. Send the Message
- producer.send(message);
-
- //Step 22. We receive the message and print it out
- message = (TextMessage) messageConsumer.receive(20000);
-
- System.out.println("message.getText() = " + message.getText());
- }
- finally
- {
- //Step 23. Be sure to close our JMS resources!
- if (initialContext != null)
- {
- initialContext.close();
- }
- if(connection != null)
- {
- connection.close();
- }
- }
- }
-
- public static void setKiller(ServerKiller killer)
- {
- MDBRemoteFailoverClientExample.killer = killer;
- }
-}
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/mdb-remote-failover/src/main/java/org/apache/activemq/javaee/example/server/MDBRemoteFailoverExample.java
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-remote-failover/src/main/java/org/apache/activemq/javaee/example/server/MDBRemoteFailoverExample.java b/examples/javaee/mdb-remote-failover/src/main/java/org/apache/activemq/javaee/example/server/MDBRemoteFailoverExample.java
deleted file mode 100644
index ab953ef..0000000
--- a/examples/javaee/mdb-remote-failover/src/main/java/org/apache/activemq/javaee/example/server/MDBRemoteFailoverExample.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.activemq.javaee.example.server;
-
-import org.apache.activemq.api.jms.ActiveMQJMSClient;
-import org.jboss.ejb3.annotation.ResourceAdapter;
-
-import javax.annotation.Resource;
-import javax.ejb.ActivationConfigProperty;
-import javax.ejb.MessageDriven;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
-import javax.ejb.TransactionManagement;
-import javax.ejb.TransactionManagementType;
-import javax.jms.*;
-
-/**
- * @author <a href="mailto:andy.taylor@jboss.com">Andy Taylor</a>
- * @author Justin Bertram
- */
-@MessageDriven(name = "MDBRemoteFailoverExample",
- activationConfig =
- {
- @ActivationConfigProperty(propertyName = "destinationType", propertyValue = "javax.jms.Queue"),
- @ActivationConfigProperty(propertyName = "destination", propertyValue = "inQueue"),
- @ActivationConfigProperty(propertyName = "hA", propertyValue = "true"),
- @ActivationConfigProperty(propertyName = "useJNDI", propertyValue = "false")
- })
-@ResourceAdapter("activemq-remote-ra.rar")
-public class MDBRemoteFailoverExample implements MessageListener
-{
-
- @Resource(mappedName = "java:/RemoteJmsXA")
- ConnectionFactory connectionFactory;
- Queue replyQueue;
-
- public void onMessage(Message message)
- {
- Connection conn = null;
- try
- {
- replyQueue = ActiveMQJMSClient.createQueue("outQueue");
- //Step 9. We know the client is sending a text message so we cast
- TextMessage textMessage = (TextMessage)message;
-
- //Step 10. get the text from the message.
- String text = textMessage.getText();
-
- System.out.println("message " + text);
-
- //Step 11. we create a JMS connection
- conn = connectionFactory.createConnection();
-
- //Step 12. We create a JMS session
- Session sess = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
-
- //Step 13. we create a producer for the reply queue
- MessageProducer producer = sess.createProducer(replyQueue);
-
- //Step 14. we create a message and send it
- producer.send(sess.createTextMessage("this is a reply"));
-
- System.out.println("reply sent");
-
- }
- catch (Exception e)
- {
- e.printStackTrace();
- }
- finally
- {
- if(conn != null)
- {
- try
- {
- conn.close();
- }
- catch (JMSException e)
- {
- }
- }
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/mdb-remote-failover/src/main/java/org/apache/activemq/javaee/example/server/ServerKiller.java
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-remote-failover/src/main/java/org/apache/activemq/javaee/example/server/ServerKiller.java b/examples/javaee/mdb-remote-failover/src/main/java/org/apache/activemq/javaee/example/server/ServerKiller.java
deleted file mode 100644
index 3779911..0000000
--- a/examples/javaee/mdb-remote-failover/src/main/java/org/apache/activemq/javaee/example/server/ServerKiller.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.activemq.javaee.example.server;
-/**
- * @author <a href="mailto:andy.taylor@jboss.com">Andy Taylor</a>
- * Date: 12/06/12
- */
-public interface ServerKiller
-{
- void kill();
-}
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/mdb-remote-failover/src/test/java/org/apache/activemq/javaee/examples/FailoverRunnerTest.java
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-remote-failover/src/test/java/org/apache/activemq/javaee/examples/FailoverRunnerTest.java b/examples/javaee/mdb-remote-failover/src/test/java/org/apache/activemq/javaee/examples/FailoverRunnerTest.java
deleted file mode 100644
index 1267300..0000000
--- a/examples/javaee/mdb-remote-failover/src/test/java/org/apache/activemq/javaee/examples/FailoverRunnerTest.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.activemq.javaee.examples;
-
-import org.apache.activemq.javaee.example.MDBRemoteFailoverClientExample;
-import org.apache.activemq.javaee.example.server.MDBRemoteFailoverExample;
-import org.apache.activemq.javaee.example.server.ServerKiller;
-import org.jboss.arquillian.container.test.api.*;
-import org.jboss.arquillian.junit.Arquillian;
-import org.jboss.arquillian.junit.InSequence;
-import org.jboss.arquillian.test.api.ArquillianResource;
-import org.jboss.shrinkwrap.api.Archive;
-import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.spec.JavaArchive;
-import org.jboss.shrinkwrap.api.spec.WebArchive;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-/**
- * @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a>
- * @author Justin Bertram
- */
-@RunAsClient
-@RunWith(Arquillian.class)
-public class FailoverRunnerTest
-{
- @ArquillianResource
- private ContainerController controller;
- @ArquillianResource
- private Deployer deployer;
-
- @Deployment(name = "deploy-0", managed = false)
- @TargetsContainer("node-0")
- public static Archive getDeployment()
- {
- final JavaArchive ejbJar = ShrinkWrap.create(JavaArchive.class, "mdb.jar");
- ejbJar.addClass(MDBRemoteFailoverExample.class);
-
- final WebArchive war = ShrinkWrap.create(WebArchive.class, "test.war");
- war.addAsManifestResource("jboss-deployment-structure.xml", "jboss-deployment-structure.xml");
- war.addAsLibrary(ejbJar);
- System.out.println(war.toString(true));
- return war;
- }
-
- @Test
- public void runExample() throws Exception
- {
- MDBRemoteFailoverClientExample.setKiller(new ServerKiller()
- {
- @Override
- public void kill()
- {
- controller.kill("node-1");
- }
- });
-
- MDBRemoteFailoverClientExample.main(null);
- }
-
- @Test
- @InSequence(-1)
- public void startServer()
- {
- System.out.println("*****************************************************************************************************************************************************************");
- controller.start("node-1");
- System.out.println("*****************************************************************************************************************************************************************");
- controller.start("node-2");
- System.out.println("*****************************************************************************************************************************************************************");
- controller.start("node-0");
- System.out.println("*****************************************************************************************************************************************************************");
- deployer.deploy("deploy-0");
- }
-
- @Test
- @InSequence(1)
- public void stopServer()
- {
- deployer.undeploy("deploy-0");
- controller.stop("node-0");
- controller.stop("node-2");
- }
-
-}
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/mdb-remote-failover/src/test/resources/arquillian.xml
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-remote-failover/src/test/resources/arquillian.xml b/examples/javaee/mdb-remote-failover/src/test/resources/arquillian.xml
deleted file mode 100644
index c6a1ebb..0000000
--- a/examples/javaee/mdb-remote-failover/src/test/resources/arquillian.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<arquillian xmlns="http://jboss.org/schema/arquillian"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://jboss.org/schema/arquillian http://jboss.org/schema/arquillian/arquillian_1_0.xsd">
-
- <!-- Uncomment to have test archives exported to the file system for inspection.
-This feature can also be controlled using the system property arquillian.deploymentExportPath -->
- <!--
-<engine>
-<property name="deploymentExportPath">target</property>
-</engine>
--->
-
- <defaultProtocol type="Servlet 3.0"/>
-
- <group qualifier="clustering-all">
- <container qualifier="node-0" mode="manual" default="true" managed="false">
- <configuration>
- <property name="jbossHome">${basedir}/target/jbossas-node0</property>
- <property name="javaVmArguments">-Djboss.node.name=node-0</property>
- <property name="serverConfig">standalone-example.xml</property>
- <property name="allowConnectingToRunningServer">true</property>
- <property name="managementAddress">${node0:127.0.0.1}</property>
- </configuration>
- </container>
- <container qualifier="node-1" mode="manual" managed="false">
- <configuration>
- <property name="jbossHome">${basedir}/target/jbossas-node1</property>
- <property name="javaVmArguments">-Djboss.node.name=node-1 -Djboss.socket.binding.port-offset=100</property>
- <property name="serverConfig">standalone-live.xml</property>
- <property name="allowConnectingToRunningServer">true</property>
- <property name="managementAddress">${node0:127.0.0.1}</property>
- <property name="managementPort">${as.managementPort:10090}</property>
- </configuration>
- </container>
- <container qualifier="node-2" mode="manual" managed="false">
- <configuration>
- <property name="jbossHome">${basedir}/target/jbossas-node2</property>
- <property name="javaVmArguments">-Djboss.node.name=node-2 -Djboss.socket.binding.port-offset=200</property>
- <property name="serverConfig">standalone-backup.xml</property>
- <property name="allowConnectingToRunningServer">true</property>
- <property name="managementAddress">${node0:127.0.0.1}</property>
- <property name="managementPort">${as.managementPort:10190}</property>
- </configuration>
- </container>
- </group>
-
- <!-- logThreshold proposed -->
- <!--
-<container qualifier="jbossas-managed">
-<configuration>
-<property name="logThreshold">ERROR</property>
-</configuration>
-</container>
--->
-
-</arquillian>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/mdb-remote-failover/src/test/resources/jboss-deployment-structure.xml
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-remote-failover/src/test/resources/jboss-deployment-structure.xml b/examples/javaee/mdb-remote-failover/src/test/resources/jboss-deployment-structure.xml
deleted file mode 100644
index c49e8cf..0000000
--- a/examples/javaee/mdb-remote-failover/src/test/resources/jboss-deployment-structure.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<jboss-deployment-structure>
- <deployment>
- <dependencies>
- <module name="org.apache.activemq"/>
- </dependencies>
- </deployment>
-</jboss-deployment-structure>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/mdb-tx-send/pom.xml
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-tx-send/pom.xml b/examples/javaee/mdb-tx-send/pom.xml
deleted file mode 100644
index 6ecbf34..0000000
--- a/examples/javaee/mdb-tx-send/pom.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.activemq.example.javaee</groupId>
- <artifactId>javaee-examples</artifactId>
- <version>6.0.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>activemq-javaee-mdb-tx-send-example</artifactId>
- <packaging>jar</packaging>
- <name>ActiveMQ6 Java EE MDB Transactional Send Example</name>
-</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/mdb-tx-send/readme.html
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-tx-send/readme.html b/examples/javaee/mdb-tx-send/readme.html
deleted file mode 100644
index b9ae5c9..0000000
--- a/examples/javaee/mdb-tx-send/readme.html
+++ /dev/null
@@ -1,155 +0,0 @@
-<html>
- <head>
- <title>ActiveMQ Java EE MDB Send Example</title>
- <link rel="stylesheet" type="text/css" href="../../common/common.css" />
- <link rel="stylesheet" type="text/css" href="../../common/prettify.css" />
- <script type="text/javascript" src="../../common/prettify.js"></script>
- </head>
- <body onload="prettyPrint()">
- <h1>Java EE MDB TX Send Example</h1>
-
- <p>This example shows you how to send a message to an MDB that returns a reply using the same XA transaction.</p>
- <p>The example will send deploy a simple MDB and demonstrate sending a message and the MDB consuming it.</p>
-
- <p>The example leverages the JBoss Arquillian framework to run a WildFly instance and deploy the MDB.</p>
-
- <h2>Example step-by-step</h2>
-
- <p><i>download WildFly 8.0.0.Final from <a href="http://wildfly.org/downloads/">here</a> and install.</i></p>
- <p><i>set the JBOSS_HOME property to point to the WildFly install directory</i></p>
- <p><i>type <code>mvn verify</code> from the example directory to run</i></p>
-
- <ol>
- <li>First we need to get an initial context so we can look-up the JMS connection factory and destination objects from JNDI. This initial context will get it's properties from the <code>jndi.properties</code> file in the directory <code>config</code></li>
- <pre class="prettyprint">
- final Properties env = new Properties();
-
- env.put(Context.INITIAL_CONTEXT_FACTORY, "org.jboss.naming.remote.client.InitialContextFactory");
-
- env.put(Context.PROVIDER_URL, "http-remoting://localhost:8080");
-
- initialContext = new InitialContext(env);
- </pre>
-
- <li>We look up the JMS queue object from JNDI</li>
- <pre class="prettyprint">
- Queue queue = (Queue) initialContext.lookup("jms/queues/testQueue");
- </pre>
-
- <li>We look up the JMS connection factory object from JNDI</li>
- <pre class="prettyprint">
- ConnectionFactory cf = (ConnectionFactory)initialContext.lookup("/jms/RemoteConnectionFactory");
- </pre>
-
- <li>We create a JMS connection</li>
- <pre class="prettyprint">
- connection = cf.createConnection("guest", "password");
- </pre>
-
- <li>We create a JMS session. The session is created as non transacted and will auto acknowledge messages.</li>
- <pre class="prettyprint">
- <code>Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);</code>
- </pre>
-
- <li>We create a JMS message producer on the session. This will be used to send the messages.</li>
- <pre class="prettyprint">
- <code>MessageProducer messageProducer = session.createProducer(queue);</code>
- </pre>
-
- <li>We create a JMS text messages that we are going to send.</li>
- <pre class="prettyprint">
- <code> TextMessage message = session.createTextMessage("This is a text message");</code>
- </pre>
-
- <li>We send messages to the queue</li>
- <pre class="prettyprint">
- <code>messageProducer.send(message);</code>
- </pre>
-
- <li>The MDB receives the message<br />
- We know the message is a TextMessage so we cast to it.
- </li>
- <pre class="prettyprint">
- <code>TextMessage tm = (TextMessage)message;</code>
- </pre>
-
- <li>The MDB gets the text and prints it
- </li>
- <pre class="prettyprint">
- <code>String text = tm.getText();
- System.out.println("message " + text + " received");
- </code>
- </pre>
-
- <li>The MDB creates a JMS connection
- </li>
- <pre class="prettyprint">
- <code>conn = connectionFactory.createConnection();
- </code>
- </pre>
-
- <li>The MDB creates a JMS session
- </li>
- <pre class="prettyprint">
- <code>Session sess = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
- </code>
- </pre>
-
- <li>The MDB creates a JMS message producer
- </li>
- <pre class="prettyprint">
- <code>MessageProducer producer = sess.createProducer(replyQueue);
- </code>
- </pre>
-
- <li>The MDB creates a text message and sends it to the reply queue
- </li>
- <pre class="prettyprint">
- <code>producer.send(sess.createTextMessage("this is a reply"));
- </code>
- </pre>
-
- <li>The Client creates a JMS message consumer using the injected reply queue
- </li>
- <pre class="prettyprint">
- <code>MessageConsumer messageConsumer = session.createConsumer(replyQueue);
- </code>
- </pre>
-
- <li>The Client starts the connection so it can receive messages
- </li>
- <pre class="prettyprint">
- <code>connection.start();
- </code>
- </pre>
-
- <li>The Client receives the reply and prints it out
- </li>
- <pre class="prettyprint">
- <code>message = (TextMessage) messageConsumer.receive(5000);
-
- System.out.println("message.getText() = " + message.getText());
- </code>
- </pre>
-
- <li>And finally, <b>always</b> remember to close your JMS connections and resources after use, in a <code>finally</code> block. Closing a JMS connection will automatically close all of its sessions, consumers, producer and browser objects</li>
-
- <pre class="prettyprint">
- <code>finally
- {
- if (initialContext != null)
- {
- initialContext.close();
- }
- if (connection != null)
- {
- connection.close();
- }
- }</code>
- </pre>
-
-
-
- </ol>
- </body>
-</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/mdb-tx-send/server/standalone/configuration/application-roles.properties
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-tx-send/server/standalone/configuration/application-roles.properties b/examples/javaee/mdb-tx-send/server/standalone/configuration/application-roles.properties
deleted file mode 100644
index 0ade8fb..0000000
--- a/examples/javaee/mdb-tx-send/server/standalone/configuration/application-roles.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# Properties declaration of users roles for the realm 'ApplicationRealm'.
-#
-# This includes the following protocols: remote ejb, remote jndi, web, remote jms
-#
-# Users can be added to this properties file at any time, updates after the server has started
-# will be automatically detected.
-#
-# The format of this file is as follows: -
-# username=role1,role2,role3
-#
-# A utility script is provided which can be executed from the bin folder to add the users: -
-# - Linux
-# bin/add-user.sh
-#
-# - Windows
-# bin\add-user.bat
-#
-# The following illustrates how an admin user could be defined.
-#
-#admin=PowerUser,BillingAdmin,
-guest=guest
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/mdb-tx-send/server/standalone/configuration/application-users.properties
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-tx-send/server/standalone/configuration/application-users.properties b/examples/javaee/mdb-tx-send/server/standalone/configuration/application-users.properties
deleted file mode 100644
index c52e923..0000000
--- a/examples/javaee/mdb-tx-send/server/standalone/configuration/application-users.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# Properties declaration of users for the realm 'ApplicationRealm' which is the default realm
-# for application services on a new AS 7.1 installation.
-#
-# This includes the following protocols: remote ejb, remote jndi, web, remote jms
-#
-# Users can be added to this properties file at any time, updates after the server has started
-# will be automatically detected.
-#
-# The format of this realm is as follows: -
-# username=HEX( MD5( username ':' realm ':' password))
-#
-# A utility script is provided which can be executed from the bin folder to add the users: -
-# - Linux
-# bin/add-user.sh
-#
-# - Windows
-# bin\add-user.bat
-#
-# The following illustrates how an admin user could be defined, this
-# is for illustration only and does not correspond to a usable password.
-#
-#admin=2a0923285184943425d1f53ddd58ec7a
-guest=3437456520927d113b17d471d630e0d6
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/mdb-tx-send/server/standalone/configuration/logging.properties
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-tx-send/server/standalone/configuration/logging.properties b/examples/javaee/mdb-tx-send/server/standalone/configuration/logging.properties
deleted file mode 100644
index 3fa31b0..0000000
--- a/examples/javaee/mdb-tx-send/server/standalone/configuration/logging.properties
+++ /dev/null
@@ -1,47 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# Additional logger names to configure (root logger is always configured)
-loggers=org.jboss.as.config
-
-# Dump system environment at boot by default
-logger.org.jboss.as.config.level=DEBUG
-
-# Root logger level
-logger.level=${jboss.boot.server.log.level:INFO}
-# Root logger handlers
-logger.handlers=FILE,CONSOLE
-
-# Console handler configuration
-handler.CONSOLE=org.jboss.logmanager.handlers.ConsoleHandler
-handler.CONSOLE.properties=autoFlush
-handler.CONSOLE.level=${jboss.boot.server.log.console.level:INFO}
-handler.CONSOLE.autoFlush=true
-handler.CONSOLE.formatter=PATTERN
-
-# File handler configuration
-handler.FILE=org.jboss.logmanager.handlers.FileHandler
-handler.FILE.level=DEBUG
-handler.FILE.properties=autoFlush,fileName
-handler.FILE.autoFlush=true
-handler.FILE.fileName=${org.jboss.boot.log.file:boot.log}
-handler.FILE.formatter=PATTERN
-
-# Formatter pattern configuration
-formatter.PATTERN=org.jboss.logmanager.formatters.PatternFormatter
-formatter.PATTERN.properties=pattern
-formatter.PATTERN.pattern=%d{HH:mm:ss,SSS} %-5p [%c] %s%E%n
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/mdb-tx-send/server/standalone/configuration/mgmt-users.properties
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-tx-send/server/standalone/configuration/mgmt-users.properties b/examples/javaee/mdb-tx-send/server/standalone/configuration/mgmt-users.properties
deleted file mode 100644
index 349b004..0000000
--- a/examples/javaee/mdb-tx-send/server/standalone/configuration/mgmt-users.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# Properties declaration of users for the realm 'ManagementRealm' which is the default realm
-# for new AS 7.1 installations. Further authentication mechanism can be configured
-# as part of the <management /> in standalone.xml.
-#
-# Users can be added to this properties file at any time, updates after the server has started
-# will be automatically detected.
-#
-# By default the properties realm expects the entries to be in the format: -
-# username=HEX( MD5( username ':' realm ':' password))
-#
-# A utility script is provided which can be executed from the bin folder to add the users: -
-# - Linux
-# bin/add-user.sh
-#
-# - Windows
-# bin\add-user.bat
-
-# The following illustrates how an admin user could be defined, this
-# is for illustration only and does not correspond to a usable password.
-#
-#admin=2a0923285184943425d1f53ddd58ec7a
-admin=9d71b431e53d99563aa0dfca628c970b
-andy=dfb16391f1be1c454b5bce9822bd9df3
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/mdb-tx-send/server/standalone/configuration/standalone-example.xml
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-tx-send/server/standalone/configuration/standalone-example.xml b/examples/javaee/mdb-tx-send/server/standalone/configuration/standalone-example.xml
deleted file mode 100644
index 64bffce..0000000
--- a/examples/javaee/mdb-tx-send/server/standalone/configuration/standalone-example.xml
+++ /dev/null
@@ -1,493 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-
-<server xmlns="urn:jboss:domain:2.0">
- <extensions>
- <extension module="org.jboss.as.clustering.infinispan"/>
- <extension module="org.jboss.as.connector"/>
- <extension module="org.jboss.as.deployment-scanner"/>
- <extension module="org.jboss.as.ee"/>
- <extension module="org.jboss.as.ejb3"/>
- <extension module="org.jboss.as.jacorb"/>
- <extension module="org.jboss.as.jaxrs"/>
- <extension module="org.jboss.as.jdr"/>
- <extension module="org.jboss.as.jmx"/>
- <extension module="org.jboss.as.jpa"/>
- <extension module="org.jboss.as.jsf"/>
- <extension module="org.jboss.as.jsr77"/>
- <extension module="org.jboss.as.logging"/>
- <extension module="org.jboss.as.mail"/>
- <extension module="org.jboss.as.messaging"/>
- <extension module="org.jboss.as.naming"/>
- <extension module="org.jboss.as.pojo"/>
- <extension module="org.jboss.as.remoting"/>
- <extension module="org.jboss.as.sar"/>
- <extension module="org.jboss.as.security"/>
- <extension module="org.jboss.as.threads"/>
- <extension module="org.jboss.as.transactions"/>
- <extension module="org.jboss.as.webservices"/>
- <extension module="org.jboss.as.weld"/>
- <extension module="org.wildfly.extension.batch"/>
- <extension module="org.wildfly.extension.io"/>
- <extension module="org.wildfly.extension.undertow"/>
- </extensions>
- <management>
- <security-realms>
- <security-realm name="ManagementRealm">
- <authentication>
- <local default-user="$local"/>
- <properties path="mgmt-users.properties" relative-to="jboss.server.config.dir"/>
- </authentication>
- <authorization map-groups-to-roles="false">
- <properties path="mgmt-groups.properties" relative-to="jboss.server.config.dir"/>
- </authorization>
- </security-realm>
- <security-realm name="ApplicationRealm">
- <authentication>
- <local default-user="$local" allowed-users="*"/>
- <properties path="application-users.properties" relative-to="jboss.server.config.dir"/>
- </authentication>
- <authorization>
- <properties path="application-roles.properties" relative-to="jboss.server.config.dir"/>
- </authorization>
- </security-realm>
- </security-realms>
- <audit-log>
- <formatters>
- <json-formatter name="json-formatter"/>
- </formatters>
- <handlers>
- <file-handler name="file" formatter="json-formatter" relative-to="jboss.server.data.dir" path="audit-log.log"/>
- </handlers>
- <logger log-boot="true" log-read-only="false" enabled="false">
- <handlers>
- <handler name="file"/>
- </handlers>
- </logger>
- </audit-log>
- <management-interfaces>
- <http-interface security-realm="ManagementRealm" http-upgrade-enabled="true">
- <socket-binding http="management-http"/>
- </http-interface>
- </management-interfaces>
- <access-control provider="simple">
- <role-mapping>
- <role name="SuperUser">
- <include>
- <user name="$local"/>
- </include>
- </role>
- </role-mapping>
- </access-control>
- </management>
- <profile>
- <subsystem xmlns="urn:jboss:domain:logging:2.0">
- <console-handler name="CONSOLE">
- <level name="INFO"/>
- <formatter>
- <named-formatter name="COLOR-PATTERN"/>
- </formatter>
- </console-handler>
- <periodic-rotating-file-handler name="FILE" autoflush="true">
- <formatter>
- <named-formatter name="PATTERN"/>
- </formatter>
- <file relative-to="jboss.server.log.dir" path="server.log"/>
- <suffix value=".yyyy-MM-dd"/>
- <append value="true"/>
- </periodic-rotating-file-handler>
- <logger category="com.arjuna">
- <level name="WARN"/>
- </logger>
- <logger category="org.apache.tomcat.util.modeler">
- <level name="WARN"/>
- </logger>
- <logger category="org.jboss.as.config">
- <level name="DEBUG"/>
- </logger>
- <logger category="sun.rmi">
- <level name="WARN"/>
- </logger>
- <logger category="jacorb">
- <level name="WARN"/>
- </logger>
- <logger category="jacorb.config">
- <level name="ERROR"/>
- </logger>
- <root-logger>
- <level name="INFO"/>
- <handlers>
- <handler name="CONSOLE"/>
- <handler name="FILE"/>
- </handlers>
- </root-logger>
- <formatter name="PATTERN">
- <pattern-formatter pattern="%d{yyyy-MM-dd HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/>
- </formatter>
- <formatter name="COLOR-PATTERN">
- <pattern-formatter pattern="%K{level}%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/>
- </formatter>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:batch:1.0">
- <job-repository>
- <in-memory/>
- </job-repository>
- <thread-pool>
- <max-threads count="10"/>
- <keepalive-time time="100" unit="milliseconds"/>
- </thread-pool>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:datasources:2.0">
- <datasources>
- <datasource jndi-name="java:jboss/datasources/ExampleDS" pool-name="ExampleDS" enabled="true" use-java-context="true">
- <connection-url>jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE</connection-url>
- <driver>h2</driver>
- <security>
- <user-name>sa</user-name>
- <password>sa</password>
- </security>
- </datasource>
- <drivers>
- <driver name="h2" module="com.h2database.h2">
- <xa-datasource-class>org.h2.jdbcx.JdbcDataSource</xa-datasource-class>
- </driver>
- </drivers>
- </datasources>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:deployment-scanner:2.0">
- <deployment-scanner path="deployments" relative-to="jboss.server.base.dir" scan-interval="5000" runtime-failure-causes-rollback="${jboss.deployment.scanner.rollback.on.failure:false}"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:ee:2.0">
- <spec-descriptor-property-replacement>false</spec-descriptor-property-replacement>
- <jboss-descriptor-property-replacement>true</jboss-descriptor-property-replacement>
- <annotation-property-replacement>false</annotation-property-replacement>
- <concurrent>
- <context-services>
- <context-service name="default" jndi-name="java:jboss/ee/concurrency/context/default" use-transaction-setup-provider="true"/>
- </context-services>
- <managed-executor-services>
- <managed-executor-service name="default" jndi-name="java:jboss/ee/concurrency/executor/default" context-service="default" hung-task-threshold="60000" core-threads="5" max-threads="25" keepalive-time="5000"/>
- </managed-executor-services>
- <managed-scheduled-executor-services>
- <managed-scheduled-executor-service name="default" jndi-name="java:jboss/ee/concurrency/scheduler/default" context-service="default" hung-task-threshold="60000" core-threads="2" keepalive-time="3000"/>
- </managed-scheduled-executor-services>
- <managed-thread-factories>
- <managed-thread-factory name="default" jndi-name="java:jboss/ee/concurrency/factory/default" context-service="default"/>
- </managed-thread-factories>
- </concurrent>
- <default-bindings context-service="java:jboss/ee/concurrency/context/default" datasource="java:jboss/datasources/ExampleDS" jms-connection-factory="java:jboss/DefaultJMSConnectionFactory" managed-executor-service="java:jboss/ee/concurrency/executor/default" managed-scheduled-executor-service="java:jboss/ee/concurrency/scheduler/default" managed-thread-factory="java:jboss/ee/concurrency/factory/default"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:ejb3:2.0">
- <session-bean>
- <stateful default-access-timeout="5000" cache-ref="simple" passivation-disabled-cache-ref="simple"/>
- <singleton default-access-timeout="5000"/>
- </session-bean>
- <mdb>
- <resource-adapter-ref resource-adapter-name="${ejb.resource-adapter-name:activemq-ra.rar}"/>
- <bean-instance-pool-ref pool-name="mdb-strict-max-pool"/>
- </mdb>
- <pools>
- <bean-instance-pools>
- <!-- A sample strict max pool configuration -->
- <strict-max-pool name="slsb-strict-max-pool" max-pool-size="20" instance-acquisition-timeout="5" instance-acquisition-timeout-unit="MINUTES"/>
- <strict-max-pool name="mdb-strict-max-pool" max-pool-size="20" instance-acquisition-timeout="5" instance-acquisition-timeout-unit="MINUTES"/>
- </bean-instance-pools>
- </pools>
- <caches>
- <cache name="simple"/>
- <cache name="distributable" aliases="passivating clustered" passivation-store-ref="infinispan"/>
- </caches>
- <passivation-stores>
- <passivation-store name="infinispan" cache-container="ejb" max-size="10000"/>
- </passivation-stores>
- <async thread-pool-name="default"/>
- <timer-service thread-pool-name="default" default-data-store="default-file-store">
- <data-stores>
- <file-data-store name="default-file-store" path="timer-service-data" relative-to="jboss.server.data.dir"/>
- </data-stores>
- </timer-service>
- <remote connector-ref="http-remoting-connector" thread-pool-name="default"/>
- <thread-pools>
- <thread-pool name="default">
- <max-threads count="10"/>
- <keepalive-time time="100" unit="milliseconds"/>
- </thread-pool>
- </thread-pools>
- <iiop enable-by-default="false" use-qualified-name="false"/>
- <default-security-domain value="other"/>
- <default-missing-method-permissions-deny-access value="true"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:io:1.0">
- <worker name="default" io-threads="3"/>
- <buffer-pool name="default" buffer-size="16384" buffers-per-slice="128"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:infinispan:2.0">
- <cache-container name="web" default-cache="passivation" module="org.wildfly.clustering.web.infinispan">
- <local-cache name="passivation" batching="true">
- <file-store passivation="true" purge="false"/>
- </local-cache>
- <local-cache name="persistent" batching="true">
- <file-store passivation="false" purge="false"/>
- </local-cache>
- </cache-container>
- <cache-container name="ejb" aliases="sfsb" default-cache="passivation" module="org.wildfly.clustering.ejb.infinispan">
- <local-cache name="passivation" batching="true">
- <file-store passivation="true" purge="false"/>
- </local-cache>
- <local-cache name="persistent" batching="true">
- <file-store passivation="false" purge="false"/>
- </local-cache>
- </cache-container>
- <cache-container name="hibernate" default-cache="local-query" module="org.hibernate">
- <local-cache name="entity">
- <transaction mode="NON_XA"/>
- <eviction strategy="LRU" max-entries="10000"/>
- <expiration max-idle="100000"/>
- </local-cache>
- <local-cache name="local-query">
- <transaction mode="NONE"/>
- <eviction strategy="LRU" max-entries="10000"/>
- <expiration max-idle="100000"/>
- </local-cache>
- <local-cache name="timestamps">
- <transaction mode="NONE"/>
- <eviction strategy="NONE"/>
- </local-cache>
- </cache-container>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:jacorb:1.3">
- <orb socket-binding="jacorb" ssl-socket-binding="jacorb-ssl">
- <initializers transactions="spec" security="identity"/>
- </orb>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:jaxrs:1.0"/>
- <subsystem xmlns="urn:jboss:domain:jca:2.0">
- <archive-validation enabled="true" fail-on-error="true" fail-on-warn="false"/>
- <bean-validation enabled="true"/>
- <default-workmanager>
- <short-running-threads>
- <core-threads count="50"/>
- <queue-length count="50"/>
- <max-threads count="50"/>
- <keepalive-time time="10" unit="seconds"/>
- </short-running-threads>
- <long-running-threads>
- <core-threads count="50"/>
- <queue-length count="50"/>
- <max-threads count="50"/>
- <keepalive-time time="10" unit="seconds"/>
- </long-running-threads>
- </default-workmanager>
- <cached-connection-manager/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:jdr:1.0"/>
- <subsystem xmlns="urn:jboss:domain:jmx:1.3">
- <expose-resolved-model/>
- <expose-expression-model/>
- <remoting-connector/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:jpa:1.1">
- <jpa default-datasource="" default-extended-persistence-inheritance="DEEP"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:jsf:1.0"/>
- <subsystem xmlns="urn:jboss:domain:jsr77:1.0"/>
- <subsystem xmlns="urn:jboss:domain:mail:2.0">
- <mail-session name="default" jndi-name="java:jboss/mail/Default">
- <smtp-server outbound-socket-binding-ref="mail-smtp"/>
- </mail-session>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:messaging:2.0">
- <activemq-server>
- <persistence-enabled>true</persistence-enabled>
- <journal-file-size>102400</journal-file-size>
- <journal-min-files>2</journal-min-files>
- <connectors>
- <http-connector name="http-connector" socket-binding="http">
- <param key="http-upgrade-endpoint" value="http-acceptor"/>
- </http-connector>
- <http-connector name="http-connector-throughput" socket-binding="http">
- <param key="http-upgrade-endpoint" value="http-acceptor-throughput"/>
- <param key="batch-delay" value="50"/>
- </http-connector>
- <in-vm-connector name="in-vm" server-id="0"/>
- </connectors>
- <acceptors>
- <http-acceptor name="http-acceptor" http-listener="default"/>
- <http-acceptor name="http-acceptor-throughput" http-listener="default">
- <param key="batch-delay" value="50"/>
- <param key="direct-deliver" value="false"/>
- </http-acceptor>
- <in-vm-acceptor name="in-vm" server-id="0"/>
- </acceptors>
- <security-settings>
- <security-setting match="#">
- <permission type="send" roles="guest"/>
- <permission type="consume" roles="guest"/>
- <permission type="createNonDurableQueue" roles="guest"/>
- <permission type="deleteNonDurableQueue" roles="guest"/>
- </security-setting>
- </security-settings>
- <address-settings>
- <!--default for catch all-->
- <address-setting match="#">
- <dead-letter-address>jms.queue.DLQ</dead-letter-address>
- <expiry-address>jms.queue.ExpiryQueue</expiry-address>
- <redelivery-delay>0</redelivery-delay>
- <max-size-bytes>10485760</max-size-bytes>
- <address-full-policy>PAGE</address-full-policy>
- <page-size-bytes>2097152</page-size-bytes>
- <message-counter-history-day-limit>10</message-counter-history-day-limit>
- </address-setting>
- </address-settings>
- <jms-connection-factories>
- <connection-factory name="InVmConnectionFactory">
- <connectors>
- <connector-ref connector-name="in-vm"/>
- </connectors>
- <entries>
- <entry name="java:/ConnectionFactory"/>
- </entries>
- </connection-factory>
- <connection-factory name="RemoteConnectionFactory">
- <connectors>
- <connector-ref connector-name="http-connector"/>
- </connectors>
- <entries>
- <entry name="java:jboss/exported/jms/RemoteConnectionFactory"/>
- </entries>
- </connection-factory>
- <pooled-connection-factory name="activemq-ra">
- <transaction mode="xa"/>
- <connectors>
- <connector-ref connector-name="in-vm"/>
- </connectors>
- <entries>
- <entry name="java:/JmsXA"/>
- <!-- Global JNDI entry used to provide a default JMS Connection factory to EE application -->
- <entry name="java:jboss/DefaultJMSConnectionFactory"/>
- </entries>
- </pooled-connection-factory>
- </jms-connection-factories>
- <jms-destinations>
- <jms-queue name="testQueue">
- <entry name="queue/testQueue"/>
- <entry name="java:jboss/exported/jms/queues/testQueue"/>
- </jms-queue>
- <jms-queue name="replyQueue">
- <entry name="queue/replyQueue"/>
- <entry name="java:jboss/exported/jms/queues/replyQueue"/>
- </jms-queue>
- </jms-destinations>
- </activemq-server>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:naming:2.0">
- <remote-naming/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:pojo:1.0"/>
- <subsystem xmlns="urn:jboss:domain:remoting:2.0">
- <endpoint worker="default"/>
- <http-connector name="http-remoting-connector" connector-ref="default" security-realm="ApplicationRealm"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:resource-adapters:2.0"/>
- <subsystem xmlns="urn:jboss:domain:sar:1.0"/>
- <subsystem xmlns="urn:jboss:domain:security:1.2">
- <security-domains>
- <security-domain name="other" cache-type="default">
- <authentication>
- <login-module code="Remoting" flag="optional">
- <module-option name="password-stacking" value="useFirstPass"/>
- </login-module>
- <login-module code="RealmDirect" flag="required">
- <module-option name="password-stacking" value="useFirstPass"/>
- </login-module>
- </authentication>
- </security-domain>
- <security-domain name="jboss-web-policy" cache-type="default">
- <authorization>
- <policy-module code="Delegating" flag="required"/>
- </authorization>
- </security-domain>
- <security-domain name="jboss-ejb-policy" cache-type="default">
- <authorization>
- <policy-module code="Delegating" flag="required"/>
- </authorization>
- </security-domain>
- </security-domains>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:threads:1.1"/>
- <subsystem xmlns="urn:jboss:domain:transactions:2.0">
- <core-environment>
- <process-id>
- <uuid/>
- </process-id>
- </core-environment>
- <recovery-environment socket-binding="txn-recovery-environment" status-socket-binding="txn-status-manager"/>
- <coordinator-environment default-timeout="300"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:undertow:1.0">
- <buffer-caches>
- <buffer-cache name="default" buffer-size="1024" buffers-per-region="1024" max-regions="10"/>
- </buffer-caches>
- <server name="default-server">
- <http-listener name="default" socket-binding="http"/>
- <host name="default-host" alias="localhost">
- <location name="/" handler="welcome-content"/>
- <filter-ref name="server-header"/>
- <filter-ref name="x-powered-by-header"/>
- </host>
- </server>
- <servlet-container name="default" default-buffer-cache="default" stack-trace-on-error="local-only">
- <jsp-config/>
- </servlet-container>
- <handlers>
- <file name="welcome-content" path="${jboss.home.dir}/welcome-content" directory-listing="true"/>
- </handlers>
- <filters>
- <response-header name="server-header" header-name="Server" header-value="Wildfly 8"/>
- <response-header name="x-powered-by-header" header-name="X-Powered-By" header-value="Undertow 1"/>
- </filters>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:webservices:1.2">
- <modify-wsdl-address>true</modify-wsdl-address>
- <wsdl-host>${jboss.bind.address:127.0.0.1}</wsdl-host>
- <endpoint-config name="Standard-Endpoint-Config"/>
- <endpoint-config name="Recording-Endpoint-Config">
- <pre-handler-chain name="recording-handlers" protocol-bindings="##SOAP11_HTTP ##SOAP11_HTTP_MTOM ##SOAP12_HTTP ##SOAP12_HTTP_MTOM">
- <handler name="RecordingHandler" class="org.jboss.ws.common.invocation.RecordingServerHandler"/>
- </pre-handler-chain>
- </endpoint-config>
- <client-config name="Standard-Client-Config"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:weld:2.0"/>
- </profile>
- <interfaces>
- <interface name="management">
- <inet-address value="${jboss.bind.address.management:127.0.0.1}"/>
- </interface>
- <interface name="public">
- <inet-address value="${jboss.bind.address:127.0.0.1}"/>
- </interface>
- <!-- TODO - only show this if the jacorb subsystem is added -->
- <interface name="unsecure">
- <!--
- ~ Used for IIOP sockets in the standard configuration.
- ~ To secure JacORB you need to setup SSL
- -->
- <inet-address value="${jboss.bind.address.unsecure:127.0.0.1}"/>
- </interface>
- </interfaces>
- <socket-binding-group name="standard-sockets" default-interface="public" port-offset="${jboss.socket.binding.port-offset:0}">
- <socket-binding name="management-http" interface="management" port="${jboss.management.http.port:9990}"/>
- <socket-binding name="management-https" interface="management" port="${jboss.management.https.port:9993}"/>
- <socket-binding name="ajp" port="${jboss.ajp.port:8009}"/>
- <socket-binding name="http" port="${jboss.http.port:8080}"/>
- <socket-binding name="https" port="${jboss.https.port:8443}"/>
- <socket-binding name="jacorb" interface="unsecure" port="3528"/>
- <socket-binding name="jacorb-ssl" interface="unsecure" port="3529"/>
- <socket-binding name="messaging-group" port="0" multicast-address="${jboss.messaging.group.address:231.7.7.7}" multicast-port="${jboss.messaging.group.port:9876}"/>
- <socket-binding name="txn-recovery-environment" port="4712"/>
- <socket-binding name="txn-status-manager" port="4713"/>
- <outbound-socket-binding name="mail-smtp">
- <remote-destination host="localhost" port="25"/>
- </outbound-socket-binding>
- </socket-binding-group>
-</server>
\ No newline at end of file
[26/37] activemq-6 git commit: ACTIVEMQ6-51 Example server
bootstrapping
Posted by jb...@apache.org.
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/management-notifications/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/management-notifications/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/management-notifications/src/main/resources/hornetq/server0/activemq-configuration.xml
deleted file mode 100644
index 1446182..0000000
--- a/examples/jms/management-notifications/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<configuration xmlns="urn:activemq"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:activemq ../../../../src/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>
-
-
- <management-notification-address>jms.topic.notificationsTopic</management-notification-address>
-
- <connectors>
- <connector name="netty">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
- </connector>
- </connectors>
-
- <!-- Netty standard TCP acceptor -->
- <acceptors>
- <acceptor name="netty">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- </acceptor>
- </acceptors>
-
- <!-- Other configs -->
-
- <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 for notification queue-->
- <security-setting match="jms.topic.notificationsTopic">
- <permission type="consume" roles="guest"/>
- <permission type="createNonDurableQueue" roles="guest"/>
- <permission type="deleteNonDurableQueue" roles="guest"/>
- </security-setting>
-
- <!-- security settings for JMS temporary queue -->
- <security-setting match="queuetempjms.*">
- <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/management-notifications/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/management-notifications/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/management-notifications/src/main/resources/hornetq/server0/activemq-jms.xml
deleted file mode 100644
index 65e5a5c..0000000
--- a/examples/jms/management-notifications/src/main/resources/hornetq/server0/activemq-jms.xml
+++ /dev/null
@@ -1,11 +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"/>
-
- <!--the notifications topic used by the example-->
- <topic name="notificationsTopic"/>
-
-</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/management-notifications/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/management-notifications/src/main/resources/hornetq/server0/activemq-users.xml b/examples/jms/management-notifications/src/main/resources/hornetq/server0/activemq-users.xml
deleted file mode 100644
index 5db43ea..0000000
--- a/examples/jms/management-notifications/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-security.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/management-notifications/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/management-notifications/src/main/resources/jndi.properties b/examples/jms/management-notifications/src/main/resources/jndi.properties
new file mode 100644
index 0000000..66edf97
--- /dev/null
+++ b/examples/jms/management-notifications/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
+topic.topic/notificationsTopic=notificationsTopic
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/management/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/management/pom.xml b/examples/jms/management/pom.xml
index 8fecd6f..2668aaa 100644
--- a/examples/jms/management/pom.xml
+++ b/examples/jms/management/pom.xml
@@ -51,9 +51,6 @@
</goals>
<configuration>
<clientClass>org.apache.activemq.jms.example.ManagementExample</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/management/src/main/java/org/apache/activemq/jms/example/ManagementExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/management/src/main/java/org/apache/activemq/jms/example/ManagementExample.java b/examples/jms/management/src/main/java/org/apache/activemq/jms/example/ManagementExample.java
index 1ab1ac4..fd83ed0 100644
--- a/examples/jms/management/src/main/java/org/apache/activemq/jms/example/ManagementExample.java
+++ b/examples/jms/management/src/main/java/org/apache/activemq/jms/example/ManagementExample.java
@@ -52,7 +52,7 @@ public class ManagementExample 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/management/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/management/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/management/src/main/resources/activemq/server0/activemq-configuration.xml
new file mode 100644
index 0000000..d15ca0c
--- /dev/null
+++ b/examples/jms/management/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -0,0 +1,50 @@
+<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>
+
+
+ <management-address>jms.queue.activemq.management</management-address>
+
+ <!-- Netty standard TCP acceptor -->
+ <acceptors>
+ <acceptor name="netty">
+ <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
+ </acceptor>
+ </acceptors>
+
+ <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 for management queue-->
+ <security-setting match="jms.queue.activemq.management">
+ <permission type="manage" roles="guest" />
+ </security-setting>
+
+ <!-- security settings for JMS temporary queue -->
+ <security-setting match="jms.tempqueue.#">
+ <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/management/src/main/resources/activemq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/management/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/management/src/main/resources/activemq/server0/activemq-jms.xml
new file mode 100644
index 0000000..0d5c953
--- /dev/null
+++ b/examples/jms/management/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/management/src/main/resources/activemq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/management/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/management/src/main/resources/activemq/server0/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/management/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/management/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/management/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/management/src/main/resources/hornetq/server0/activemq-configuration.xml
deleted file mode 100644
index 93d7678..0000000
--- a/examples/jms/management/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ /dev/null
@@ -1,56 +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>
-
-
- <management-address>jms.queue.activemq.management</management-address>
-
- <connectors>
- <connector name="netty">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
- </connector>
- </connectors>
-
- <!-- Netty standard TCP acceptor -->
- <acceptors>
- <acceptor name="netty">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- </acceptor>
- </acceptors>
-
- <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 for management queue-->
- <security-setting match="jms.queue.activemq.management">
- <permission type="manage" roles="guest" />
- </security-setting>
-
- <!-- security settings for JMS temporary queue -->
- <security-setting match="jms.tempqueue.#">
- <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/management/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/management/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/management/src/main/resources/hornetq/server0/activemq-jms.xml
deleted file mode 100644
index 0d5c953..0000000
--- a/examples/jms/management/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/management/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/management/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/management/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/management/src/main/resources/jndi.properties b/examples/jms/management/src/main/resources/jndi.properties
new file mode 100644
index 0000000..d9b5c6a
--- /dev/null
+++ b/examples/jms/management/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/message-counters/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/message-counters/pom.xml b/examples/jms/message-counters/pom.xml
index 2bca2d4..0e4b7cc 100644
--- a/examples/jms/message-counters/pom.xml
+++ b/examples/jms/message-counters/pom.xml
@@ -74,9 +74,6 @@
</goals>
<configuration>
<clientClass>org.apache.activemq.jms.example.MessageCounterExample</clientClass>
- <args>
- <param>tcp://localhost:5445</param>
- </args>
</configuration>
</execution>
<execution>
@@ -125,7 +122,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/message-counters/src/main/java/org/apache/activemq/jms/example/MessageCounterExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/message-counters/src/main/java/org/apache/activemq/jms/example/MessageCounterExample.java b/examples/jms/message-counters/src/main/java/org/apache/activemq/jms/example/MessageCounterExample.java
index a1b697a..92843ca 100644
--- a/examples/jms/message-counters/src/main/java/org/apache/activemq/jms/example/MessageCounterExample.java
+++ b/examples/jms/message-counters/src/main/java/org/apache/activemq/jms/example/MessageCounterExample.java
@@ -62,7 +62,7 @@ public class MessageCounterExample 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/message-counters/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/message-counters/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/message-counters/src/main/resources/activemq/server0/activemq-configuration.xml
new file mode 100644
index 0000000..3b747b8
--- /dev/null
+++ b/examples/jms/message-counters/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -0,0 +1,57 @@
+<configuration xmlns="urn:activemq"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:activemq ../../../../src/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>
+
+
+ <jmx-management-enabled>true</jmx-management-enabled>
+ <message-counter-enabled>true</message-counter-enabled>
+ <message-counter-sample-period>2000</message-counter-sample-period>
+ <message-counter-max-day-history>2</message-counter-max-day-history>
+
+ <!-- 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 for dead letter queue-->
+ <security-setting match="jms.queue.expiryQueue">
+ <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>
+ <!--override the expiry address for the example-->
+ <address-setting match="jms.queue.exampleQueue">
+ <expiry-address>jms.queue.expiryQueue</expiry-address>
+ </address-setting>
+ </address-settings>
+
+</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/message-counters/src/main/resources/activemq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/message-counters/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/message-counters/src/main/resources/activemq/server0/activemq-jms.xml
new file mode 100644
index 0000000..44be37f
--- /dev/null
+++ b/examples/jms/message-counters/src/main/resources/activemq/server0/activemq-jms.xml
@@ -0,0 +1,11 @@
+<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"/>
+
+ <!--the expiry queue where expired messages will be sent-->
+ <queue name="expiryQueue"/>
+
+</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/message-counters/src/main/resources/activemq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/message-counters/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/message-counters/src/main/resources/activemq/server0/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/message-counters/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/message-counters/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/message-counters/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/message-counters/src/main/resources/hornetq/server0/activemq-configuration.xml
deleted file mode 100644
index 14ddbcb..0000000
--- a/examples/jms/message-counters/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<configuration xmlns="urn:activemq"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:activemq ../../../../src/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>
-
-
- <jmx-management-enabled>true</jmx-management-enabled>
- <message-counter-enabled>true</message-counter-enabled>
- <message-counter-sample-period>2000</message-counter-sample-period>
- <message-counter-max-day-history>2</message-counter-max-day-history>
-
- <!-- 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 for dead letter queue-->
- <security-setting match="jms.queue.expiryQueue">
- <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>
- <!--override the expiry address for the example-->
- <address-setting match="jms.queue.exampleQueue">
- <expiry-address>jms.queue.expiryQueue</expiry-address>
- </address-setting>
- </address-settings>
-
-</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/message-counters/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/message-counters/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/message-counters/src/main/resources/hornetq/server0/activemq-jms.xml
deleted file mode 100644
index 44be37f..0000000
--- a/examples/jms/message-counters/src/main/resources/hornetq/server0/activemq-jms.xml
+++ /dev/null
@@ -1,11 +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"/>
-
- <!--the expiry queue where expired messages will be sent-->
- <queue name="expiryQueue"/>
-
-</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/message-counters/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/message-counters/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/message-counters/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/message-counters/src/main/resources/jndi.properties b/examples/jms/message-counters/src/main/resources/jndi.properties
new file mode 100644
index 0000000..bb4fdf6
--- /dev/null
+++ b/examples/jms/message-counters/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/expiryQueue=expiryQueue
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/message-group/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/message-group/pom.xml b/examples/jms/message-group/pom.xml
index 69571d9..63a08ef 100644
--- a/examples/jms/message-group/pom.xml
+++ b/examples/jms/message-group/pom.xml
@@ -51,9 +51,6 @@
</goals>
<configuration>
<clientClass>org.apache.activemq.jms.example.MessageGroupExample</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/message-group/src/main/java/org/apache/activemq/jms/example/MessageGroupExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/message-group/src/main/java/org/apache/activemq/jms/example/MessageGroupExample.java b/examples/jms/message-group/src/main/java/org/apache/activemq/jms/example/MessageGroupExample.java
index 1a2cf49..02b46d6 100644
--- a/examples/jms/message-group/src/main/java/org/apache/activemq/jms/example/MessageGroupExample.java
+++ b/examples/jms/message-group/src/main/java/org/apache/activemq/jms/example/MessageGroupExample.java
@@ -57,7 +57,7 @@ public class MessageGroupExample 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 queue
Queue queue = (Queue)initialContext.lookup("queue/exampleQueue");
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/message-group/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/message-group/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/message-group/src/main/resources/activemq/server0/activemq-configuration.xml
new file mode 100644
index 0000000..52d9570
--- /dev/null
+++ b/examples/jms/message-group/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/message-group/src/main/resources/activemq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/message-group/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/message-group/src/main/resources/activemq/server0/activemq-jms.xml
new file mode 100644
index 0000000..847659f
--- /dev/null
+++ b/examples/jms/message-group/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>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/message-group/src/main/resources/activemq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/message-group/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/message-group/src/main/resources/activemq/server0/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/message-group/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/message-group/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index 9fa4061..0000000
--- a/examples/jms/message-group/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>
-
-
- <!-- 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/message-group/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/message-group/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/message-group/src/main/resources/hornetq/server0/hornetq-jms.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index 847659f..0000000
--- a/examples/jms/message-group/src/main/resources/hornetq/server0/hornetq-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>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/message-group/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/message-group/src/main/resources/jndi.properties b/examples/jms/message-group/src/main/resources/jndi.properties
new file mode 100644
index 0000000..d9b5c6a
--- /dev/null
+++ b/examples/jms/message-group/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/message-group2/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/message-group2/pom.xml b/examples/jms/message-group2/pom.xml
index 866e984..270708b 100644
--- a/examples/jms/message-group2/pom.xml
+++ b/examples/jms/message-group2/pom.xml
@@ -51,9 +51,6 @@
</goals>
<configuration>
<clientClass>org.apache.activemq.jms.example.MessageGroup2Example</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/message-group2/src/main/java/org/apache/activemq/jms/example/MessageGroup2Example.java
----------------------------------------------------------------------
diff --git a/examples/jms/message-group2/src/main/java/org/apache/activemq/jms/example/MessageGroup2Example.java b/examples/jms/message-group2/src/main/java/org/apache/activemq/jms/example/MessageGroup2Example.java
index ce46238..043c2bc 100644
--- a/examples/jms/message-group2/src/main/java/org/apache/activemq/jms/example/MessageGroup2Example.java
+++ b/examples/jms/message-group2/src/main/java/org/apache/activemq/jms/example/MessageGroup2Example.java
@@ -56,7 +56,7 @@ public class MessageGroup2Example 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 queue
Queue queue = (Queue) initialContext.lookup("queue/exampleQueue");
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/message-group2/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/message-group2/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/message-group2/src/main/resources/activemq/server0/activemq-configuration.xml
new file mode 100644
index 0000000..52d9570
--- /dev/null
+++ b/examples/jms/message-group2/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/message-group2/src/main/resources/activemq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/message-group2/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/message-group2/src/main/resources/activemq/server0/activemq-jms.xml
new file mode 100644
index 0000000..847659f
--- /dev/null
+++ b/examples/jms/message-group2/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>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/message-group2/src/main/resources/activemq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/message-group2/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/message-group2/src/main/resources/activemq/server0/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/message-group2/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/message-group2/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index 9fa4061..0000000
--- a/examples/jms/message-group2/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>
-
-
- <!-- 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/message-group2/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/message-group2/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/message-group2/src/main/resources/hornetq/server0/activemq-jms.xml
deleted file mode 100644
index 847659f..0000000
--- a/examples/jms/message-group2/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>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/message-group2/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/message-group2/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/message-group2/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/message-group2/src/main/resources/jndi.properties b/examples/jms/message-group2/src/main/resources/jndi.properties
new file mode 100644
index 0000000..1714190
--- /dev/null
+++ b/examples/jms/message-group2/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.groupID=Group-0
+queue.queue/exampleQueue=exampleQueue
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/message-priority/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/message-priority/pom.xml b/examples/jms/message-priority/pom.xml
index 631f6bd..f3c2fd1 100644
--- a/examples/jms/message-priority/pom.xml
+++ b/examples/jms/message-priority/pom.xml
@@ -51,9 +51,6 @@
</goals>
<configuration>
<clientClass>org.apache.activemq.jms.example.MessagePriorityExample</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/message-priority/src/main/java/org/apache/activemq/jms/example/MessagePriorityExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/message-priority/src/main/java/org/apache/activemq/jms/example/MessagePriorityExample.java b/examples/jms/message-priority/src/main/java/org/apache/activemq/jms/example/MessagePriorityExample.java
index e094b72..ee0e791 100644
--- a/examples/jms/message-priority/src/main/java/org/apache/activemq/jms/example/MessagePriorityExample.java
+++ b/examples/jms/message-priority/src/main/java/org/apache/activemq/jms/example/MessagePriorityExample.java
@@ -57,7 +57,7 @@ public class MessagePriorityExample extends ActiveMQExample
try
{
// Step 1. Create an initial context to perform the JNDI lookup.
- initialContext = getContext(0);
+ initialContext = new InitialContext();
// Step 2. look-up the JMS queue object from JNDI
Queue queue = (Queue)initialContext.lookup("queue/exampleQueue");
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/message-priority/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/message-priority/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/message-priority/src/main/resources/activemq/server0/activemq-configuration.xml
new file mode 100644
index 0000000..52d9570
--- /dev/null
+++ b/examples/jms/message-priority/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/message-priority/src/main/resources/activemq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/message-priority/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/message-priority/src/main/resources/activemq/server0/activemq-jms.xml
new file mode 100644
index 0000000..847659f
--- /dev/null
+++ b/examples/jms/message-priority/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>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/message-priority/src/main/resources/activemq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/message-priority/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/message-priority/src/main/resources/activemq/server0/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/message-priority/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/message-priority/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index 9fa4061..0000000
--- a/examples/jms/message-priority/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>
-
-
- <!-- 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/message-priority/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index 847659f..0000000
--- a/examples/jms/message-priority/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>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/message-priority/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/message-priority/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/message-priority/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/message-priority/src/main/resources/jndi.properties b/examples/jms/message-priority/src/main/resources/jndi.properties
new file mode 100644
index 0000000..d9b5c6a
--- /dev/null
+++ b/examples/jms/message-priority/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/multiple-failover-failback/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/multiple-failover-failback/pom.xml b/examples/jms/multiple-failover-failback/pom.xml
index 8264323..4d641ab 100644
--- a/examples/jms/multiple-failover-failback/pom.xml
+++ b/examples/jms/multiple-failover-failback/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>
@@ -77,9 +75,7 @@
<goal>start</goal>
</goals>
<configuration>
- <jndiPort>1299</jndiPort>
- <jndiRmiPort>1298</jndiRmiPort>
- <hornetqConfigurationDir>${basedir}/target/classes/activemq/server2</hornetqConfigurationDir>
+ <configurationDir>${basedir}/target/classes/activemq/server2</configurationDir>
<fork>true</fork>
<systemProperties>
<property>
@@ -100,11 +96,6 @@
</goals>
<configuration>
<clientClass>org.apache.activemq.jms.example.MultipleFailoverFailbackExample</clientClass>
- <args>
- <param>tcp://localhost:5445</param>
- <param>tcp://localhost:5446</param>
- <param>tcp://localhost:5447</param>
- </args>
<systemProperties>
<property>
<name>exampleConfigDir</name>
@@ -119,7 +110,7 @@
<goal>stop</goal>
</goals>
<configuration>
- <hornetqConfigurationDir>${basedir}/target/classes/activemq/server0</hornetqConfigurationDir>
+ <configurationDir>${basedir}/target/classes/activemq/server0</configurationDir>
</configuration>
</execution>
<execution>
@@ -128,7 +119,7 @@
<goal>stop</goal>
</goals>
<configuration>
- <hornetqConfigurationDir>${basedir}/target/classes/activemq/server1</hornetqConfigurationDir>
+ <configurationDir>${basedir}/target/classes/activemq/server1</configurationDir>
</configuration>
</execution>
<execution>
@@ -137,7 +128,7 @@
<goal>stop</goal>
</goals>
<configuration>
- <hornetqConfigurationDir>${basedir}/target/classes/activemq/server2</hornetqConfigurationDir>
+ <configurationDir>${basedir}/target/classes/activemq/server2</configurationDir>
</configuration>
</execution>
</executions>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/multiple-failover-failback/src/main/java/org/apache/activemq/jms/example/MultipleFailoverFailbackExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/multiple-failover-failback/src/main/java/org/apache/activemq/jms/example/MultipleFailoverFailbackExample.java b/examples/jms/multiple-failover-failback/src/main/java/org/apache/activemq/jms/example/MultipleFailoverFailbackExample.java
index b6af378..a295731 100644
--- a/examples/jms/multiple-failover-failback/src/main/java/org/apache/activemq/jms/example/MultipleFailoverFailbackExample.java
+++ b/examples/jms/multiple-failover-failback/src/main/java/org/apache/activemq/jms/example/MultipleFailoverFailbackExample.java
@@ -52,7 +52,7 @@ public class MultipleFailoverFailbackExample extends ActiveMQExample
try
{
// Step 1. Get an initial context for looking up JNDI from the server #1
- initialContext = getContext(0);
+ initialContext = new InitialContext();
// Step 2. Look up the JMS resources from JNDI
Queue queue = (Queue)initialContext.lookup("queue/exampleQueue");
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/multiple-failover-failback/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/multiple-failover-failback/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/multiple-failover-failback/src/main/resources/activemq/server0/activemq-configuration.xml
new file mode 100644
index 0000000..b42e5aa
--- /dev/null
+++ b/examples/jms/multiple-failover-failback/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -0,0 +1,71 @@
+<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>
+
+ <ha-policy>
+ <shared-store>
+ <master/>
+ </shared-store>
+ </ha-policy>
+
+ <!-- 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>
+
+ <broadcast-groups>
+ <broadcast-group name="bg-group1">
+ <group-address>${udp-address:231.7.7.7}</group-address>
+ <group-port>9876</group-port>
+ <broadcast-period>1000</broadcast-period>
+ <connector-ref>netty-connector</connector-ref>
+ </broadcast-group>
+ </broadcast-groups>
+
+ <discovery-groups>
+ <discovery-group name="dg-group1">
+ <group-address>${udp-address:231.7.7.7}</group-address>
+ <group-port>9876</group-port>
+ <refresh-timeout>60000</refresh-timeout>
+ </discovery-group>
+ </discovery-groups>
+
+ <cluster-connections>
+ <cluster-connection name="my-cluster">
+ <address>jms</address>
+ <connector-ref>netty-connector</connector-ref>
+ <discovery-group-ref discovery-group-name="dg-group1"/>
+ </cluster-connection>
+ </cluster-connections>
+
+ <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/multiple-failover-failback/src/main/resources/activemq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/multiple-failover-failback/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/multiple-failover-failback/src/main/resources/activemq/server0/activemq-jms.xml
new file mode 100644
index 0000000..0d5c953
--- /dev/null
+++ b/examples/jms/multiple-failover-failback/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/multiple-failover-failback/src/main/resources/activemq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/multiple-failover-failback/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/multiple-failover-failback/src/main/resources/activemq/server0/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/multiple-failover-failback/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/multiple-failover-failback/src/main/resources/activemq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/multiple-failover-failback/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/multiple-failover-failback/src/main/resources/activemq/server1/activemq-configuration.xml
new file mode 100644
index 0000000..2094f57
--- /dev/null
+++ b/examples/jms/multiple-failover-failback/src/main/resources/activemq/server1/activemq-configuration.xml
@@ -0,0 +1,71 @@
+<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>
+
+ <ha-policy>
+ <shared-store>
+ <slave/>
+ </shared-store>
+ </ha-policy>
+
+ <!-- Connectors -->
+ <connectors>
+ <connector name="netty-connector">
+ <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
+ <param key="port" value="5446"/>
+ </connector>
+ </connectors>
+
+ <!-- Acceptors -->
+ <acceptors>
+ <acceptor name="netty-acceptor">
+ <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
+ <param key="port" value="5446"/>
+ </acceptor>
+ </acceptors>
+
+ <broadcast-groups>
+ <broadcast-group name="bg-group1">
+ <group-address>${udp-address:231.7.7.7}</group-address>
+ <group-port>9876</group-port>
+ <broadcast-period>1000</broadcast-period>
+ <connector-ref>netty-connector</connector-ref>
+ </broadcast-group>
+ </broadcast-groups>
+
+ <discovery-groups>
+ <discovery-group name="dg-group1">
+ <group-address>${udp-address:231.7.7.7}</group-address>
+ <group-port>9876</group-port>
+ <refresh-timeout>60000</refresh-timeout>
+ </discovery-group>
+ </discovery-groups>
+
+ <cluster-connections>
+ <cluster-connection name="my-cluster">
+ <address>jms</address>
+ <connector-ref>netty-connector</connector-ref>
+ <discovery-group-ref discovery-group-name="dg-group1"/>
+ </cluster-connection>
+ </cluster-connections>
+
+ <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/multiple-failover-failback/src/main/resources/activemq/server1/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/multiple-failover-failback/src/main/resources/activemq/server1/activemq-jms.xml b/examples/jms/multiple-failover-failback/src/main/resources/activemq/server1/activemq-jms.xml
new file mode 100644
index 0000000..0d5c953
--- /dev/null
+++ b/examples/jms/multiple-failover-failback/src/main/resources/activemq/server1/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/multiple-failover-failback/src/main/resources/activemq/server1/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/multiple-failover-failback/src/main/resources/activemq/server1/activemq-users.xml b/examples/jms/multiple-failover-failback/src/main/resources/activemq/server1/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/multiple-failover-failback/src/main/resources/activemq/server1/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/multiple-failover-failback/src/main/resources/activemq/server2/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/multiple-failover-failback/src/main/resources/activemq/server2/activemq-configuration.xml b/examples/jms/multiple-failover-failback/src/main/resources/activemq/server2/activemq-configuration.xml
new file mode 100644
index 0000000..c1d1e84
--- /dev/null
+++ b/examples/jms/multiple-failover-failback/src/main/resources/activemq/server2/activemq-configuration.xml
@@ -0,0 +1,72 @@
+<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>
+
+ <ha-policy>
+ <shared-store>
+ <slave/>
+ </shared-store>
+ </ha-policy>
+
+ <connectors>
+ <connector name="netty-connector">
+ <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
+ <param key="port" value="5447"/>
+ </connector>
+ </connectors>
+
+ <!-- Acceptors -->
+ <acceptors>
+ <acceptor name="netty-acceptor">
+ <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
+ <param key="port" value="5447"/>
+ </acceptor>
+ </acceptors>
+
+ <broadcast-groups>
+ <broadcast-group name="bg-group1">
+ <group-address>${udp-address:231.7.7.7}</group-address>
+ <group-port>9876</group-port>
+ <broadcast-period>1000</broadcast-period>
+ <connector-ref>netty-connector</connector-ref>
+ </broadcast-group>
+ </broadcast-groups>
+
+ <discovery-groups>
+ <discovery-group name="dg-group1">
+ <group-address>${udp-address:231.7.7.7}</group-address>
+ <group-port>9876</group-port>
+ <refresh-timeout>60000</refresh-timeout>
+ </discovery-group>
+ </discovery-groups>
+
+ <cluster-connections>
+ <cluster-connection name="my-cluster">
+ <address>jms</address>
+ <connector-ref>netty-connector</connector-ref>
+ <discovery-group-ref discovery-group-name="dg-group1"/>
+ </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>
+
+</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/multiple-failover-failback/src/main/resources/activemq/server2/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/multiple-failover-failback/src/main/resources/activemq/server2/activemq-jms.xml b/examples/jms/multiple-failover-failback/src/main/resources/activemq/server2/activemq-jms.xml
new file mode 100644
index 0000000..0d5c953
--- /dev/null
+++ b/examples/jms/multiple-failover-failback/src/main/resources/activemq/server2/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/multiple-failover-failback/src/main/resources/activemq/server2/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/multiple-failover-failback/src/main/resources/activemq/server2/activemq-users.xml b/examples/jms/multiple-failover-failback/src/main/resources/activemq/server2/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/multiple-failover-failback/src/main/resources/activemq/server2/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/multiple-failover-failback/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server0/activemq-configuration.xml
deleted file mode 100644
index b42e5aa..0000000
--- a/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ /dev/null
@@ -1,71 +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>
-
- <ha-policy>
- <shared-store>
- <master/>
- </shared-store>
- </ha-policy>
-
- <!-- 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>
-
- <broadcast-groups>
- <broadcast-group name="bg-group1">
- <group-address>${udp-address:231.7.7.7}</group-address>
- <group-port>9876</group-port>
- <broadcast-period>1000</broadcast-period>
- <connector-ref>netty-connector</connector-ref>
- </broadcast-group>
- </broadcast-groups>
-
- <discovery-groups>
- <discovery-group name="dg-group1">
- <group-address>${udp-address:231.7.7.7}</group-address>
- <group-port>9876</group-port>
- <refresh-timeout>60000</refresh-timeout>
- </discovery-group>
- </discovery-groups>
-
- <cluster-connections>
- <cluster-connection name="my-cluster">
- <address>jms</address>
- <connector-ref>netty-connector</connector-ref>
- <discovery-group-ref discovery-group-name="dg-group1"/>
- </cluster-connection>
- </cluster-connections>
-
- <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/multiple-failover-failback/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server0/activemq-jms.xml
deleted file mode 100644
index 0d5c953..0000000
--- a/examples/jms/multiple-failover-failback/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/multiple-failover-failback/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/multiple-failover-failback/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
[35/37] activemq-6 git commit: ACTIVEMQ6-51 Example server
bootstrapping
Posted by jb...@apache.org.
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/activemq-maven-plugin/src/main/java/org/apache/activemq/maven/TestClusterManagerMBean.java
----------------------------------------------------------------------
diff --git a/activemq-maven-plugin/src/main/java/org/apache/activemq/maven/TestClusterManagerMBean.java b/activemq-maven-plugin/src/main/java/org/apache/activemq/maven/TestClusterManagerMBean.java
new file mode 100644
index 0000000..001e7a8
--- /dev/null
+++ b/activemq-maven-plugin/src/main/java/org/apache/activemq/maven/TestClusterManagerMBean.java
@@ -0,0 +1,29 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.maven;
+
+import java.io.IOException;
+
+public interface TestClusterManagerMBean
+{
+ int getNumNodes();
+
+ void registerNode(String nodeId, String workingDir,
+ String hornetqConfigurationDirt);
+
+ void killNode(int i) throws IOException;
+}
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/activemq-maven-plugin/src/main/java/org/apache/activemq/maven/TestNode.java
----------------------------------------------------------------------
diff --git a/activemq-maven-plugin/src/main/java/org/apache/activemq/maven/TestNode.java b/activemq-maven-plugin/src/main/java/org/apache/activemq/maven/TestNode.java
new file mode 100644
index 0000000..ba31c50
--- /dev/null
+++ b/activemq-maven-plugin/src/main/java/org/apache/activemq/maven/TestNode.java
@@ -0,0 +1,49 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.maven;
+
+import java.io.File;
+import java.io.IOException;
+
+public class TestNode
+{
+ String nodeId;
+ String workingDir;
+ String configDir;
+
+ public TestNode(String nodeId, String workingDir,
+ String configDir)
+ {
+ this.nodeId = nodeId;
+ this.workingDir = workingDir;
+ this.configDir = configDir;
+ }
+
+ public void kill() throws IOException
+ {
+ File file = new File(configDir, "KILL_ME");
+ file.createNewFile();
+ try
+ {
+ Thread.sleep(3000);
+ }
+ catch (InterruptedException e)
+ {
+ }
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/activemq-maven-plugin/src/main/java/org/apache/activemq/server/ActiveMQBootstrap.java
----------------------------------------------------------------------
diff --git a/activemq-maven-plugin/src/main/java/org/apache/activemq/server/ActiveMQBootstrap.java b/activemq-maven-plugin/src/main/java/org/apache/activemq/server/ActiveMQBootstrap.java
new file mode 100644
index 0000000..49b16c8
--- /dev/null
+++ b/activemq-maven-plugin/src/main/java/org/apache/activemq/server/ActiveMQBootstrap.java
@@ -0,0 +1,258 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.server;
+
+import java.io.File;
+import java.lang.management.ManagementFactory;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Timer;
+import java.util.TimerTask;
+
+import org.apache.activemq.core.config.Configuration;
+import org.apache.activemq.core.config.HAPolicyConfiguration;
+import org.apache.activemq.core.config.impl.ConfigurationImpl;
+import org.apache.activemq.core.config.impl.FileConfiguration;
+import org.apache.activemq.core.server.ActiveMQServer;
+import org.apache.activemq.core.server.JournalType;
+import org.apache.activemq.core.server.NodeManager;
+import org.apache.activemq.core.server.impl.ActiveMQServerImpl;
+import org.apache.activemq.core.server.impl.InVMNodeManager;
+import org.apache.activemq.jms.server.JMSServerManager;
+import org.apache.activemq.jms.server.impl.JMSServerManagerImpl;
+import org.apache.activemq.maven.InVMNodeManagerServer;
+import org.apache.activemq.spi.core.security.ActiveMQSecurityManager;
+import org.apache.activemq.spi.core.security.ActiveMQSecurityManagerImpl;
+
+/**
+ * This will bootstrap the HornetQ Server and also the naming server if required
+ *
+ * @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a>
+ */
+public class ActiveMQBootstrap
+{
+ private final String configurationDir;
+
+ private final Boolean waitOnStart;
+
+ private final String nodeId;
+
+ private static Map<String, NodeManager> managerMap = new HashMap<String, NodeManager>();
+
+ private boolean spawned = false;
+
+ private ActiveMQServer server;
+
+ private Configuration configuration;
+
+ private JMSServerManager manager;
+
+ private ActiveMQSecurityManager securityManager;
+
+
+ public ActiveMQBootstrap(String configurationDir, Boolean waitOnStart, String nodeId, ActiveMQSecurityManager securityManager)
+ {
+ this.configurationDir = configurationDir;
+ this.waitOnStart = waitOnStart;
+ this.nodeId = nodeId;
+ this.securityManager = securityManager;
+ }
+
+ public ActiveMQBootstrap(String[] args)
+ {
+ this.configurationDir = args[0];
+ this.waitOnStart = Boolean.valueOf(args[1]);
+ this.nodeId = args[2];
+ spawned = true;
+ }
+
+ public void execute() throws Exception
+ {
+ try
+ {
+ if (configurationDir != null)
+ {
+ //extendPluginClasspath(configurationDir);
+ configuration = new FileConfiguration();
+ File file = new File(configurationDir + "/" + "activemq-configuration.xml");
+ ((FileConfiguration) configuration).setConfigurationUrl(file.toURI().toURL().toExternalForm());
+ ((FileConfiguration) configuration).start();
+ }
+ else
+ {
+ configuration = new ConfigurationImpl();
+ configuration.setJournalType(JournalType.NIO);
+ }
+
+ createServer(configuration);
+
+ if (waitOnStart)
+ {
+ String dirName = System.getProperty("activemq.config.dir", ".");
+ final File file = new File(dirName + "/STOP_ME");
+ if (file.exists())
+ {
+ file.delete();
+ }
+
+ while (!file.exists())
+ {
+ Thread.sleep(500);
+ }
+
+ manager.stop();
+ file.delete();
+ }
+ else
+ {
+ String dirName = configurationDir != null ? configurationDir : ".";
+ final File stopFile = new File(dirName + "/STOP_ME");
+ if (stopFile.exists())
+ {
+ stopFile.delete();
+ }
+ final File killFile = new File(dirName + "/KILL_ME");
+ if (killFile.exists())
+ {
+ killFile.delete();
+ }
+ final File restartFile = new File(dirName + "/RESTART_ME");
+ if (restartFile.exists())
+ {
+ restartFile.delete();
+ }
+ final Timer timer = new Timer("ActiveMQ Server Shutdown Timer", true);
+ timer.scheduleAtFixedRate(new ServerStopTimerTask(stopFile, killFile, restartFile, timer), 500, 500);
+ }
+ }
+ catch (Exception e)
+ {
+ e.printStackTrace();
+ throw new Exception(e.getMessage());
+ }
+ }
+
+ private void createServer(Configuration configuration) throws Exception
+ {
+ if (nodeId != null && !nodeId.equals("") && !nodeId.equals("null"))
+ {
+ InVMNodeManager nodeManager = (InVMNodeManager) managerMap.get(nodeId);
+ if (nodeManager == null)
+ {
+ boolean replicatedBackup = configuration.getHAPolicyConfiguration().getType() == HAPolicyConfiguration.TYPE.REPLICA;
+ nodeManager = new InVMNodeManager(replicatedBackup, configuration.getJournalDirectory());
+ managerMap.put(nodeId, nodeManager);
+ }
+ server = new InVMNodeManagerServer(configuration, ManagementFactory.getPlatformMBeanServer(),
+ securityManager != null ? securityManager : new ActiveMQSecurityManagerImpl(), nodeManager);
+ }
+ else
+ {
+ server = new ActiveMQServerImpl(configuration, ManagementFactory.getPlatformMBeanServer(),
+ securityManager != null ? securityManager : new ActiveMQSecurityManagerImpl());
+ }
+
+ manager = new JMSServerManagerImpl(server);
+ manager.start();
+ }
+
+ private class ServerStopTimerTask extends TimerTask
+ {
+ private final File stopFile;
+ private final Timer timer;
+ private final File killFile;
+ private final File restartFile;
+
+ public ServerStopTimerTask(File stopFile, File killFile, File restartFile, Timer timer)
+ {
+ this.stopFile = stopFile;
+ this.killFile = killFile;
+ this.restartFile = restartFile;
+ this.timer = timer;
+ }
+
+ @Override
+ public void run()
+ {
+ if (stopFile.exists())
+ {
+ try
+ {
+ timer.cancel();
+ }
+ finally
+ {
+ try
+ {
+ if (manager != null)
+ {
+ manager.stop();
+ manager = null;
+ }
+ server = null;
+ stopFile.delete();
+ }
+ catch (Exception e)
+ {
+ e.printStackTrace();
+ }
+ }
+ if (spawned)
+ {
+ Runtime.getRuntime()
+ .halt(666);
+ }
+ }
+ else if (killFile.exists())
+ {
+ try
+ {
+ if (!spawned)
+ {
+ manager.getActiveMQServer()
+ .stop(true);
+ manager.stop();
+ manager = null;
+ server = null;
+ killFile.delete();
+ }
+ else
+ {
+ killFile.delete();
+ Runtime.getRuntime().halt(777);
+ }
+ }
+ catch (Exception e)
+ {
+ e.printStackTrace();
+ }
+ }
+ else if (restartFile.exists())
+ {
+ try
+ {
+ createServer(configuration);
+ restartFile.delete();
+ }
+ catch (Exception e)
+ {
+ e.printStackTrace();
+ }
+ }
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/activemq-maven-plugin/src/main/java/org/apache/activemq/server/SpawnedActiveMQBootstrap.java
----------------------------------------------------------------------
diff --git a/activemq-maven-plugin/src/main/java/org/apache/activemq/server/SpawnedActiveMQBootstrap.java b/activemq-maven-plugin/src/main/java/org/apache/activemq/server/SpawnedActiveMQBootstrap.java
new file mode 100644
index 0000000..8ce8505
--- /dev/null
+++ b/activemq-maven-plugin/src/main/java/org/apache/activemq/server/SpawnedActiveMQBootstrap.java
@@ -0,0 +1,41 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.server;
+
+/**
+ * @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a>
+ * 5/14/12
+ *
+ * This class will be spawned in a new vm and will call the bootstrap
+ */
+public class SpawnedActiveMQBootstrap
+{
+ public static void main(final String[] args)
+ {
+ ActiveMQBootstrap bootstrap;
+ try
+ {
+ bootstrap = new ActiveMQBootstrap(args);
+ bootstrap.execute();
+ System.out.println("STARTED::");
+ }
+ catch (Throwable e)
+ {
+ System.out.println("FAILED::" + e.getMessage());
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/activemq-maven-plugin/src/main/java/org/apache/activemq/server/SpawnedVMSupport.java
----------------------------------------------------------------------
diff --git a/activemq-maven-plugin/src/main/java/org/apache/activemq/server/SpawnedVMSupport.java b/activemq-maven-plugin/src/main/java/org/apache/activemq/server/SpawnedVMSupport.java
new file mode 100644
index 0000000..55782d2
--- /dev/null
+++ b/activemq-maven-plugin/src/main/java/org/apache/activemq/server/SpawnedVMSupport.java
@@ -0,0 +1,257 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.server;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+import org.apache.maven.artifact.DefaultArtifact;
+
+/**
+ * @author <a href="mailto:ovidiu@feodorov.com">Ovidiu Feodorov</a>
+ * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a>
+ * @author <a href="mailto:csuconic@redhat.com">Clebert Suconic</a>
+ */
+public class SpawnedVMSupport
+{
+ public static Process spawnVM(List<DefaultArtifact> arts,
+ final String logName,
+ final String className,
+ final Properties properties,
+ final boolean logOutput,
+ final String success,
+ final String failure,
+ final String workDir,
+ final String configDir,
+ boolean debug,
+ final String... args) throws Exception
+ {
+ StringBuffer sb = new StringBuffer();
+
+ sb.append("java")
+ .append(' ');
+ StringBuffer props = new StringBuffer();
+ if (properties != null)
+ {
+ for (Map.Entry<Object, Object> entry : properties.entrySet())
+ {
+ props.append("-D")
+ .append(entry.getKey())
+ .append("=")
+ .append(entry.getValue())
+ .append(" ");
+ }
+ }
+ String vmarg = props.toString();
+ String osName = System.getProperty("os.name");
+ osName = (osName != null) ? osName.toLowerCase() : "";
+ boolean isWindows = osName.contains("win");
+ if (isWindows)
+ {
+ vmarg = vmarg.replaceAll("/", "\\\\");
+ }
+ sb.append(vmarg)
+ .append(" ");
+ String pathSeparater = System.getProperty("path.separator");
+ StringBuilder classpath = new StringBuilder();
+ for (DefaultArtifact artifact : arts)
+ {
+ classpath.append(artifact.getFile()
+ .getAbsolutePath())
+ .append(pathSeparater);
+ }
+ classpath.append(configDir)
+ .append(pathSeparater);
+
+ if (isWindows)
+ {
+ sb.append("-cp")
+ .append(" \"")
+ .append(classpath.toString())
+ .append("\" ");
+ }
+ else
+ {
+ sb.append("-cp")
+ .append(" ")
+ .append(classpath.toString())
+ .append(" ");
+ }
+
+ // FIXME - not good to assume path separator
+ String libPath = "-Djava.library.path=" + System.getProperty("java.library.path", "./native/bin");
+ if (isWindows)
+ {
+ libPath = libPath.replaceAll("/", "\\\\");
+ libPath = "\"" + libPath + "\"";
+ }
+ sb.append("-Djava.library.path=")
+ .append(libPath)
+ .append(" ");
+ if (debug)
+ {
+ sb.append("-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005 ");
+ }
+
+ sb.append(className)
+ .append(' ');
+
+ for (String arg : args)
+ {
+ sb.append(arg)
+ .append(' ');
+ }
+
+ String commandLine = sb.toString();
+
+ //SpawnedVMSupport.log.trace("command line: " + commandLine);
+
+ Process process = Runtime.getRuntime()
+ .exec(commandLine, null, new File(workDir));
+
+ //SpawnedVMSupport.log.trace("process: " + process);
+
+ CountDownLatch latch = new CountDownLatch(1);
+
+ ProcessLogger outputLogger = new ProcessLogger(logOutput,
+ process.getInputStream(),
+ logName,
+ false,
+ success,
+ failure,
+ latch);
+ outputLogger.start();
+
+ // Adding a reader to System.err, so the VM won't hang on a System.err.println as identified on this forum thread:
+ // http://www.jboss.org/index.html?module=bb&op=viewtopic&t=151815
+ ProcessLogger errorLogger = new ProcessLogger(true,
+ process.getErrorStream(),
+ logName,
+ true,
+ success,
+ failure,
+ latch);
+ errorLogger.start();
+
+ if (!latch.await(60, TimeUnit.SECONDS))
+ {
+ process.destroy();
+ throw new RuntimeException("Timed out waiting for server to start");
+ }
+
+ if (outputLogger.failed || errorLogger.failed)
+ {
+ try
+ {
+ process.destroy();
+ }
+ catch (Throwable e)
+ {
+ }
+ throw new RuntimeException("server failed to start");
+ }
+ return process;
+ }
+
+ /**
+ * Redirect the input stream to a logger (as debug logs)
+ */
+ static class ProcessLogger extends Thread
+ {
+ private final InputStream is;
+
+ private final String logName;
+
+ private final boolean print;
+
+ private final boolean sendToErr;
+
+ private final String success;
+
+ private final String failure;
+
+ private final CountDownLatch latch;
+
+ boolean failed = false;
+
+ ProcessLogger(final boolean print,
+ final InputStream is,
+ final String logName,
+ final boolean sendToErr,
+ final String success,
+ final String failure,
+ final CountDownLatch latch) throws ClassNotFoundException
+ {
+ this.is = is;
+ this.print = print;
+ this.logName = logName;
+ this.sendToErr = sendToErr;
+ this.success = success;
+ this.failure = failure;
+ this.latch = latch;
+ setDaemon(false);
+ }
+
+ @Override
+ public void run()
+ {
+ try
+ {
+ InputStreamReader isr = new InputStreamReader(is);
+ BufferedReader br = new BufferedReader(isr);
+ String line;
+ while ((line = br.readLine()) != null)
+ {
+ if (line.startsWith(success))
+ {
+ failed = false;
+ latch.countDown();
+ }
+ else if (line.startsWith(failure))
+ {
+ failed = true;
+ latch.countDown();
+ }
+ if (print)
+ {
+ if (sendToErr)
+ {
+ System.err.println(logName + " err:" + line);
+ }
+ else
+ {
+ System.out.println(logName + " out:" + line);
+ }
+ }
+ }
+ }
+ catch (IOException e)
+ {
+ // ok, stream closed
+ }
+
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/core/perf/pom.xml
----------------------------------------------------------------------
diff --git a/examples/core/perf/pom.xml b/examples/core/perf/pom.xml
index 6db15e9..67c9388 100644
--- a/examples/core/perf/pom.xml
+++ b/examples/core/perf/pom.xml
@@ -63,7 +63,7 @@
</goals>
<configuration>
<waitOnStart>true</waitOnStart>
- <hornetqConfigurationDir>${basedir}/target/classes/server0</hornetqConfigurationDir>
+ <configurationDir>${basedir}/target/classes/server0</configurationDir>
<systemProperties>
<property>
<name>build.directory</name>
@@ -75,7 +75,7 @@
</executions>
<configuration>
<waitOnStart>false</waitOnStart>
- <hornetqConfigurationDir>${basedir}/target/classes/server0</hornetqConfigurationDir>
+ <configurationDir>${basedir}/target/classes/server0</configurationDir>
</configuration>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/core/vertx-connector/pom.xml
----------------------------------------------------------------------
diff --git a/examples/core/vertx-connector/pom.xml b/examples/core/vertx-connector/pom.xml
index c12f66a..937c49a 100644
--- a/examples/core/vertx-connector/pom.xml
+++ b/examples/core/vertx-connector/pom.xml
@@ -161,7 +161,7 @@
</dependencies>
<configuration>
<waitOnStart>false</waitOnStart>
- <hornetqConfigurationDir>${basedir}/target/classes/server0</hornetqConfigurationDir>
+ <configurationDir>${basedir}/target/classes/server0</configurationDir>
</configuration>
</plugin>
</plugins>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/activemq-jms-examples-common/src/main/java/org/apache/activemq/common/example/ActiveMQExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/activemq-jms-examples-common/src/main/java/org/apache/activemq/common/example/ActiveMQExample.java b/examples/jms/activemq-jms-examples-common/src/main/java/org/apache/activemq/common/example/ActiveMQExample.java
index 86059b6..6527893 100644
--- a/examples/jms/activemq-jms-examples-common/src/main/java/org/apache/activemq/common/example/ActiveMQExample.java
+++ b/examples/jms/activemq-jms-examples-common/src/main/java/org/apache/activemq/common/example/ActiveMQExample.java
@@ -43,12 +43,11 @@ import org.apache.activemq.jms.client.ActiveMQConnectionFactory;
*/
public abstract class ActiveMQExample
{
- protected static final Logger log = Logger.getLogger(ActiveMQExample.class
- .getName());
+ protected static final Logger log = Logger.getLogger(ActiveMQExample.class.getName());
protected boolean failure = false;
- private String[] args;
+ protected String[] args;
public abstract boolean runExample() throws Exception;
@@ -176,17 +175,6 @@ public abstract class ActiveMQExample
}
}
- protected InitialContext getContext(final int serverId) throws Exception
- {
- ActiveMQExample.log.info("using " + args[serverId] + " for jndi");
- Properties props = new Properties();
- props.put("java.naming.factory.initial", "org.apache.activemq.jndi.ActiveMQInitialContextFactory");
- props.put("java.naming.provider.url", args[serverId]);
- props.put("queue.queue/exampleQueue", "exampleQueue");
- props.put("topic.topic/exampleTopic", "exampleTopic");
- return new InitialContext(props);
- }
-
protected int getServer(Connection connection)
{
ClientSession session = ((ActiveMQConnection) connection).getInitialSession();
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/aerogear/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/aerogear/pom.xml b/examples/jms/aerogear/pom.xml
index 516d13f..558f395 100644
--- a/examples/jms/aerogear/pom.xml
+++ b/examples/jms/aerogear/pom.xml
@@ -125,7 +125,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/aerogear/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/aerogear/readme.html b/examples/jms/aerogear/readme.html
index cd3c15b..f05abce 100644
--- a/examples/jms/aerogear/readme.html
+++ b/examples/jms/aerogear/readme.html
@@ -65,8 +65,8 @@
<pre class="prettyprint">
<code>
<queues>
- <queue name="jms.queue.aerogearQueue">
- <address>jms.queue.aerogearQueue</address>
+ <queue name="jms.queue.exampleQueue">
+ <address>jms.queue.exampleQueue</address>
</queue>
</queues>
@@ -74,7 +74,7 @@
<connector-service name="aerogear-connector">
<factory-class>org.apache.activemq.integration.aerogear.AeroGearConnectorServiceFactory</factory-class>
<param key="endpoint" value="${endpoint}"/>
- <param key="queue" value="jms.queue.aerogearQueue"/>
+ <param key="queue" value="jms.queue.exampleQueue"/>
<param key="application-id" value="${applicationid}"/>
<param key="master-secret" value="${mastersecret}"/>
</connector-service>
@@ -105,7 +105,7 @@
<p>Now lets look at a snippet of code we used to send the message for our JMS client</p>
<pre class="prettyprint">
<code>
- Queue queue = (Queue)initialContext.lookup("/queue/aerogearQueue");
+ Queue queue = (Queue)initialContext.lookup("queue/exampleQueue");
// Step 3. Perform a lookup on the Connection Factory
ConnectionFactory cf = (ConnectionFactory)initialContext.lookup("/ConnectionFactory");
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/aerogear/src/main/java/org/apache/activemq/jms/example/AerogearExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/aerogear/src/main/java/org/apache/activemq/jms/example/AerogearExample.java b/examples/jms/aerogear/src/main/java/org/apache/activemq/jms/example/AerogearExample.java
index 1c4ec67..2c47863 100644
--- a/examples/jms/aerogear/src/main/java/org/apache/activemq/jms/example/AerogearExample.java
+++ b/examples/jms/aerogear/src/main/java/org/apache/activemq/jms/example/AerogearExample.java
@@ -48,7 +48,7 @@ public class AerogearExample 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/aerogear/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/aerogear/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/aerogear/src/main/resources/activemq/server0/activemq-configuration.xml
new file mode 100644
index 0000000..b891603
--- /dev/null
+++ b/examples/jms/aerogear/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -0,0 +1,52 @@
+<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>
+
+ <!-- We need to create a core queue for the JMS queue explicitly because the connector will be deployed
+ before the JMS queue is deployed, so the first time, it otherwise won't find the queue -->
+ <queues>
+ <queue name="jms.queue.exampleQueue">
+ <address>jms.queue.exampleQueue</address>
+ </queue>
+ </queues>
+
+ <connector-services>
+ <connector-service name="aerogear-connector">
+ <factory-class>org.apache.activemq.integration.aerogear.AeroGearConnectorServiceFactory</factory-class>
+ <param key="endpoint" value="${endpoint}"/>
+ <param key="queue" value="jms.queue.exampleQueue"/>
+ <param key="application-id" value="${applicationid}"/>
+ <param key="master-secret" value="${mastersecret}"/>
+ </connector-service>
+ </connector-services>
+
+ <!-- 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/aerogear/src/main/resources/activemq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/aerogear/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/aerogear/src/main/resources/activemq/server0/activemq-jms.xml
new file mode 100644
index 0000000..0d5c953
--- /dev/null
+++ b/examples/jms/aerogear/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/aerogear/src/main/resources/activemq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/aerogear/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/aerogear/src/main/resources/activemq/server0/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/aerogear/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/aerogear/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/aerogear/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/aerogear/src/main/resources/hornetq/server0/activemq-configuration.xml
deleted file mode 100644
index b3596f3..0000000
--- a/examples/jms/aerogear/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ /dev/null
@@ -1,61 +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>
-
- <!-- We need to create a core queue for the JMS queue explicitly because the connector will be deployed
- before the JMS queue is deployed, so the first time, it otherwise won't find the queue -->
- <queues>
- <queue name="jms.queue.aerogearQueue">
- <address>jms.queue.aerogearQueue</address>
- </queue>
- </queues>
-
- <connector-services>
- <connector-service name="aerogear-connector">
- <factory-class>org.apache.activemq.integration.aerogear.AeroGearConnectorServiceFactory</factory-class>
- <param key="endpoint" value="${endpoint}"/>
- <param key="queue" value="jms.queue.aerogearQueue"/>
- <param key="application-id" value="${applicationid}"/>
- <param key="master-secret" value="${mastersecret}"/>
- </connector-service>
- </connector-services>
-
- <!-- Other config -->
-
- <security-settings>
- <!--security for example queue-->
- <security-setting match="jms.queue.aerogearQueue">
- <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/aerogear/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/aerogear/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/aerogear/src/main/resources/hornetq/server0/activemq-jms.xml
deleted file mode 100644
index 2483255..0000000
--- a/examples/jms/aerogear/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="aerogearQueue"/>
-
-</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/aerogear/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/aerogear/src/main/resources/hornetq/server0/activemq-users.xml b/examples/jms/aerogear/src/main/resources/hornetq/server0/activemq-users.xml
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/aerogear/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/aerogear/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/aerogear/src/main/resources/jndi.properties b/examples/jms/aerogear/src/main/resources/jndi.properties
new file mode 100644
index 0000000..d9b5c6a
--- /dev/null
+++ b/examples/jms/aerogear/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/applet/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/applet/pom.xml b/examples/jms/applet/pom.xml
index 4a2a261..a15d5f9 100644
--- a/examples/jms/applet/pom.xml
+++ b/examples/jms/applet/pom.xml
@@ -40,7 +40,7 @@
<goal>start</goal>
</goals>
<configuration>
- <hornetqConfigurationDir>${basedir}/target/classes/activemq/server0</hornetqConfigurationDir>
+ <configurationDir>${basedir}/target/classes/activemq/server0</configurationDir>
</configuration>
</execution>
<execution>
@@ -67,7 +67,7 @@
<goal>stop</goal>
</goals>
<configuration>
- <hornetqConfigurationDir>${basedir}/target/classes/activemq/server0</hornetqConfigurationDir>
+ <configurationDir>${basedir}/target/classes/activemq/server0</configurationDir>
</configuration>
</execution>
</executions>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/applet/src/main/java/org/apache/activemq/jms/example/HttpStaticFileServer.java
----------------------------------------------------------------------
diff --git a/examples/jms/applet/src/main/java/org/apache/activemq/jms/example/HttpStaticFileServer.java b/examples/jms/applet/src/main/java/org/apache/activemq/jms/example/HttpStaticFileServer.java
index 25c900b..3626819 100644
--- a/examples/jms/applet/src/main/java/org/apache/activemq/jms/example/HttpStaticFileServer.java
+++ b/examples/jms/applet/src/main/java/org/apache/activemq/jms/example/HttpStaticFileServer.java
@@ -20,8 +20,8 @@ import java.net.InetSocketAddress;
import java.util.concurrent.Executors;
import org.apache.activemq.common.example.ActiveMQExample;
-import org.jboss.netty.bootstrap.ServerBootstrap;
-import org.jboss.netty.channel.socket.nio.NioServerSocketChannelFactory;
+import io.netty.bootstrap.ServerBootstrap;
+import io.netty.channel.socket.nio.NioServerSocketChannelFactory;
/**
* A HttpServer
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/applet/src/main/java/org/apache/activemq/jms/example/HttpStaticFileServerHandler.java
----------------------------------------------------------------------
diff --git a/examples/jms/applet/src/main/java/org/apache/activemq/jms/example/HttpStaticFileServerHandler.java b/examples/jms/applet/src/main/java/org/apache/activemq/jms/example/HttpStaticFileServerHandler.java
index 744f423..6443ef9 100644
--- a/examples/jms/applet/src/main/java/org/apache/activemq/jms/example/HttpStaticFileServerHandler.java
+++ b/examples/jms/applet/src/main/java/org/apache/activemq/jms/example/HttpStaticFileServerHandler.java
@@ -22,24 +22,24 @@ import java.io.RandomAccessFile;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
-import org.jboss.netty.buffer.ChannelBuffers;
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelFuture;
-import org.jboss.netty.channel.ChannelFutureListener;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.channel.ChannelPipelineCoverage;
-import org.jboss.netty.channel.ExceptionEvent;
-import org.jboss.netty.channel.MessageEvent;
-import org.jboss.netty.channel.SimpleChannelUpstreamHandler;
-import org.jboss.netty.handler.codec.frame.TooLongFrameException;
-import org.jboss.netty.handler.codec.http.DefaultHttpResponse;
-import org.jboss.netty.handler.codec.http.HttpHeaders;
-import org.jboss.netty.handler.codec.http.HttpMethod;
-import org.jboss.netty.handler.codec.http.HttpRequest;
-import org.jboss.netty.handler.codec.http.HttpResponse;
-import org.jboss.netty.handler.codec.http.HttpResponseStatus;
-import org.jboss.netty.handler.codec.http.HttpVersion;
-import org.jboss.netty.handler.stream.ChunkedFile;
+import io.netty.buffer.ChannelBuffers;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelFutureListener;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelPipelineCoverage;
+import io.netty.channel.ExceptionEvent;
+import io.netty.channel.MessageEvent;
+import io.netty.channel.SimpleChannelUpstreamHandler;
+import io.netty.handler.codec.frame.TooLongFrameException;
+import io.netty.handler.codec.http.DefaultHttpResponse;
+import io.netty.handler.codec.http.HttpHeaders;
+import io.netty.handler.codec.http.HttpMethod;
+import io.netty.handler.codec.http.HttpRequest;
+import io.netty.handler.codec.http.HttpResponse;
+import io.netty.handler.codec.http.HttpResponseStatus;
+import io.netty.handler.codec.http.HttpVersion;
+import io.netty.handler.stream.ChunkedFile;
/**
* A HttpStaticFileServerHandler
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/applet/src/main/java/org/apache/activemq/jms/example/HttpStaticFileServerPipelineFactory.java
----------------------------------------------------------------------
diff --git a/examples/jms/applet/src/main/java/org/apache/activemq/jms/example/HttpStaticFileServerPipelineFactory.java b/examples/jms/applet/src/main/java/org/apache/activemq/jms/example/HttpStaticFileServerPipelineFactory.java
index 22ae149..d4744f3 100644
--- a/examples/jms/applet/src/main/java/org/apache/activemq/jms/example/HttpStaticFileServerPipelineFactory.java
+++ b/examples/jms/applet/src/main/java/org/apache/activemq/jms/example/HttpStaticFileServerPipelineFactory.java
@@ -16,12 +16,12 @@
*/
package org.apache.activemq.jms.example;
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.ChannelPipelineFactory;
-import org.jboss.netty.channel.Channels;
-import org.jboss.netty.handler.codec.http.HttpRequestDecoder;
-import org.jboss.netty.handler.codec.http.HttpResponseEncoder;
-import org.jboss.netty.handler.stream.ChunkedWriteHandler;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelPipelineFactory;
+import io.netty.channel.Channels;
+import io.netty.handler.codec.http.HttpRequestDecoder;
+import io.netty.handler.codec.http.HttpResponseEncoder;
+import io.netty.handler.stream.ChunkedWriteHandler;
/**
* A HttpStaticFileServerPipelineFactory
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/applet/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/applet/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/applet/src/main/resources/activemq/server0/activemq-configuration.xml
new file mode 100644
index 0000000..7e6a27d
--- /dev/null
+++ b/examples/jms/applet/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 topic-->
+ <security-setting match="jms.topic.exampleTopic">
+ <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/applet/src/main/resources/activemq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/applet/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/applet/src/main/resources/activemq/server0/activemq-jms.xml
new file mode 100644
index 0000000..ab4841d
--- /dev/null
+++ b/examples/jms/applet/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 topic used by the example-->
+ <topic name="exampleTopic"/>
+
+</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/applet/src/main/resources/activemq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/applet/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/applet/src/main/resources/activemq/server0/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/applet/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/applet/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/applet/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/applet/src/main/resources/hornetq/server0/activemq-configuration.xml
deleted file mode 100644
index ea0fb02..0000000
--- a/examples/jms/applet/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>
-
- <!-- 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 topic-->
- <security-setting match="jms.topic.exampleTopic">
- <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/applet/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/applet/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/applet/src/main/resources/hornetq/server0/activemq-jms.xml
deleted file mode 100644
index ab4841d..0000000
--- a/examples/jms/applet/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 topic used by the example-->
- <topic name="exampleTopic"/>
-
-</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/applet/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/applet/src/main/resources/hornetq/server0/activemq-users.xml b/examples/jms/applet/src/main/resources/hornetq/server0/activemq-users.xml
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/applet/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/application-layer-failover/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/application-layer-failover/pom.xml b/examples/jms/application-layer-failover/pom.xml
index c9cfb1a..08fe255 100644
--- a/examples/jms/application-layer-failover/pom.xml
+++ b/examples/jms/application-layer-failover/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>
</configuration>
</execution>
<execution>
@@ -45,10 +45,8 @@
<goal>start</goal>
</goals>
<configuration>
- <jndiPort>1199</jndiPort>
- <jndiRmiPort>1198</jndiRmiPort>
- <hornetqConfigurationDir>${basedir}/target/classes/activemq/server1</hornetqConfigurationDir>
- <serverStartString>INFO: HQ221034</serverStartString>
+ <configurationDir>${basedir}/target/classes/activemq/server1</configurationDir>
+ <serverStartString>INFO: AMQ221001</serverStartString>
<fork>true</fork>
</configuration>
</execution>
@@ -77,7 +75,7 @@
<goal>stop</goal>
</goals>
<configuration>
- <hornetqConfigurationDir>${basedir}/target/classes/activemq/server0</hornetqConfigurationDir>
+ <configurationDir>${basedir}/target/classes/activemq/server0</configurationDir>
</configuration>
</execution>
<execution>
@@ -86,7 +84,7 @@
<goal>stop</goal>
</goals>
<configuration>
- <hornetqConfigurationDir>${basedir}/target/classes/activemq/server1</hornetqConfigurationDir>
+ <configurationDir>${basedir}/target/classes/activemq/server1</configurationDir>
</configuration>
</execution>
</executions>
@@ -129,7 +127,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/application-layer-failover/src/main/java/org/apache/activemq/jms/example/ApplicationLayerFailoverExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/application-layer-failover/src/main/java/org/apache/activemq/jms/example/ApplicationLayerFailoverExample.java b/examples/jms/application-layer-failover/src/main/java/org/apache/activemq/jms/example/ApplicationLayerFailoverExample.java
index 2887e4c..0c6e023 100644
--- a/examples/jms/application-layer-failover/src/main/java/org/apache/activemq/jms/example/ApplicationLayerFailoverExample.java
+++ b/examples/jms/application-layer-failover/src/main/java/org/apache/activemq/jms/example/ApplicationLayerFailoverExample.java
@@ -16,6 +16,9 @@
*/
package org.apache.activemq.jms.example;
+import java.lang.Object;
+import java.lang.String;
+import java.util.Hashtable;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
@@ -149,7 +152,11 @@ public class ApplicationLayerFailoverExample extends ActiveMQExample
private void createJMSObjects(final int server) throws Exception
{
// Step 1. Get an initial context for looking up JNDI from the server
- initialContext = getContext(server);
+ 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", "tcp://127.0.0.1:" + (5445 + server));
+ properties.put("queue.queue/exampleQueue", "exampleQueue");
+ initialContext = new InitialContext(properties);
// Step 2. Look-up the JMS Queue object from JNDI
Queue queue = (Queue)initialContext.lookup("queue/exampleQueue");
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/application-layer-failover/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/application-layer-failover/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/application-layer-failover/src/main/resources/activemq/server0/activemq-configuration.xml
new file mode 100644
index 0000000..acd98cb
--- /dev/null
+++ b/examples/jms/application-layer-failover/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -0,0 +1,30 @@
+<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="port" value="5445"/>
+ </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>
+
+ <journal-directory>target/data/journal</journal-directory>
+ <bindings-directory>target/data/bindings</bindings-directory>
+ <large-messages-directory>target/data/large-messages</large-messages-directory>
+</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/application-layer-failover/src/main/resources/activemq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/application-layer-failover/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/application-layer-failover/src/main/resources/activemq/server0/activemq-jms.xml
new file mode 100644
index 0000000..0d5c953
--- /dev/null
+++ b/examples/jms/application-layer-failover/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/application-layer-failover/src/main/resources/activemq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/application-layer-failover/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/application-layer-failover/src/main/resources/activemq/server0/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/application-layer-failover/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/application-layer-failover/src/main/resources/activemq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/application-layer-failover/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/application-layer-failover/src/main/resources/activemq/server1/activemq-configuration.xml
new file mode 100644
index 0000000..74fe0a6
--- /dev/null
+++ b/examples/jms/application-layer-failover/src/main/resources/activemq/server1/activemq-configuration.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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="port" value="5446"/>
+ </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>
+
+ <journal-directory>target/data/journal</journal-directory>
+ <bindings-directory>target/data/bindings</bindings-directory>
+ <large-messages-directory>target/data/large-messages</large-messages-directory>
+</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/application-layer-failover/src/main/resources/activemq/server1/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/application-layer-failover/src/main/resources/activemq/server1/activemq-jms.xml b/examples/jms/application-layer-failover/src/main/resources/activemq/server1/activemq-jms.xml
new file mode 100644
index 0000000..0d5c953
--- /dev/null
+++ b/examples/jms/application-layer-failover/src/main/resources/activemq/server1/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/application-layer-failover/src/main/resources/activemq/server1/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/application-layer-failover/src/main/resources/activemq/server1/activemq-users.xml b/examples/jms/application-layer-failover/src/main/resources/activemq/server1/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/application-layer-failover/src/main/resources/activemq/server1/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/application-layer-failover/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/application-layer-failover/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/application-layer-failover/src/main/resources/hornetq/server0/activemq-configuration.xml
deleted file mode 100644
index a667163..0000000
--- a/examples/jms/application-layer-failover/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<configuration xmlns="urn:activemq"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
-
- <!-- 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>
-
- <!-- 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>
-
- <journal-directory>target/data/journal</journal-directory>
- <bindings-directory>target/data/bindings</bindings-directory>
- <large-messages-directory>target/data/large-messages</large-messages-directory>
-</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/application-layer-failover/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/application-layer-failover/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/application-layer-failover/src/main/resources/hornetq/server0/activemq-jms.xml
deleted file mode 100644
index 0d5c953..0000000
--- a/examples/jms/application-layer-failover/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/application-layer-failover/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/application-layer-failover/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/application-layer-failover/src/main/resources/hornetq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/application-layer-failover/src/main/resources/hornetq/server1/activemq-configuration.xml b/examples/jms/application-layer-failover/src/main/resources/hornetq/server1/activemq-configuration.xml
deleted file mode 100644
index 7845578..0000000
--- a/examples/jms/application-layer-failover/src/main/resources/hornetq/server1/activemq-configuration.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration xmlns="urn:activemq"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
-
- <!-- Connectors -->
-
- <connectors>
- <connector name="netty-connector">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
- <param key="port" value="5446"/>
- </connector>
- </connectors>
-
- <!-- Acceptors -->
- <acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- <param key="port" value="5446"/>
- </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>
-
- <journal-directory>target/data/journal</journal-directory>
- <bindings-directory>target/data/bindings</bindings-directory>
- <large-messages-directory>target/data/large-messages</large-messages-directory>
-</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/application-layer-failover/src/main/resources/hornetq/server1/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/application-layer-failover/src/main/resources/hornetq/server1/activemq-jms.xml b/examples/jms/application-layer-failover/src/main/resources/hornetq/server1/activemq-jms.xml
deleted file mode 100644
index 0d5c953..0000000
--- a/examples/jms/application-layer-failover/src/main/resources/hornetq/server1/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/application-layer-failover/src/main/resources/hornetq/server1/activemq-users.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/application-layer-failover/src/main/resources/hornetq/server1/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/bridge/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/bridge/pom.xml b/examples/jms/bridge/pom.xml
index 0c7b49c..1189fc0 100644
--- a/examples/jms/bridge/pom.xml
+++ b/examples/jms/bridge/pom.xml
@@ -41,7 +41,7 @@
<goal>start</goal>
</goals>
<configuration>
- <hornetqConfigurationDir>${basedir}/target/classes/activemq/server0</hornetqConfigurationDir>
+ <configurationDir>${basedir}/target/classes/activemq/server0</configurationDir>
</configuration>
</execution>
<execution>
@@ -52,7 +52,7 @@
<configuration>
<jndiPort>1199</jndiPort>
<jndiRmiPort>1198</jndiRmiPort>
- <hornetqConfigurationDir>${basedir}/target/classes/activemq/server1</hornetqConfigurationDir>
+ <configurationDir>${basedir}/target/classes/activemq/server1</configurationDir>
<fork>true</fork>
</configuration>
</execution>
@@ -81,7 +81,7 @@
<goal>stop</goal>
</goals>
<configuration>
- <hornetqConfigurationDir>${basedir}/target/classes/activemq/server0</hornetqConfigurationDir>
+ <configurationDir>${basedir}/target/classes/activemq/server0</configurationDir>
</configuration>
</execution>
<execution>
@@ -90,7 +90,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/bridge/src/main/java/org/apache/activemq/jms/example/BridgeExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/bridge/src/main/java/org/apache/activemq/jms/example/BridgeExample.java b/examples/jms/bridge/src/main/java/org/apache/activemq/jms/example/BridgeExample.java
index fcf8719..4f235b3 100644
--- a/examples/jms/bridge/src/main/java/org/apache/activemq/jms/example/BridgeExample.java
+++ b/examples/jms/bridge/src/main/java/org/apache/activemq/jms/example/BridgeExample.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.Message;
@@ -55,11 +57,15 @@ public class BridgeExample extends ActiveMQExample
{
// Step 1 - we create an initial context for looking up JNDI on node 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", "tcp://127.0.0.1:5445");
+ properties.put("queue.queue/sausage-factory", "sausage-factory");
+ ic0 = new InitialContext(properties);
// Step 2 - we look up the sausage-factory queue from node 0
- Queue sausageFactory = (Queue)ic0.lookup("queue/exampleQueue");
+ Queue sausageFactory = (Queue)ic0.lookup("queue/sausage-factory");
// Step 3 - we look up a JMS ConnectionFactory object from node 0
@@ -67,11 +73,15 @@ public class BridgeExample extends ActiveMQExample
// Step 4 - we create an initial context for looking up JNDI on node 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", "tcp://127.0.0.1:5446");
+ properties.put("queue.queue/mincing-machine", "mincing-machine");
+ ic1 = new InitialContext(properties);
// Step 5 - we look up the mincing-machine queue on node 1
- Queue mincingMachine = (Queue)ic1.lookup("queue/exampleQueue1");
+ Queue mincingMachine = (Queue)ic1.lookup("queue/mincing-machine");
// Step 6 - we look up a JMS ConnectionFactory object from node 1
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/bridge/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/bridge/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/bridge/src/main/resources/activemq/server0/activemq-configuration.xml
new file mode 100644
index 0000000..9256360
--- /dev/null
+++ b/examples/jms/bridge/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 to the other node -->
+ <connector name="remote-connector">
+ <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
+ <param key="port" value="5446"/>
+ </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>
+
+ <!-- We need to create a core queue for the JMS queue explicitly because the bridge will be deployed
+ before the JMS queue is deployed, so the first time, it otherwise won't find the queue -->
+ <queues>
+ <queue name="jms.queue.sausage-factory">
+ <address>jms.queue.sausage-factory</address>
+ </queue>
+ </queues>
+
+ <!-- We set-up a bridge that forwards from a queue on this node to an address on another node.
+ We specify a filter with the bridge, and a transformer too. The filter and transformer are optional -->
+ <bridges>
+ <bridge name="my-bridge">
+ <queue-name>jms.queue.sausage-factory</queue-name>
+ <forwarding-address>jms.queue.mincing-machine</forwarding-address>
+ <filter string="name='aardvark'"/>
+ <transformer-class-name>org.apache.activemq.jms.example.HatColourChangeTransformer</transformer-class-name>
+ <reconnect-attempts>-1</reconnect-attempts>
+ <static-connectors>
+ <connector-ref>remote-connector</connector-ref>
+ </static-connectors>
+ </bridge>
+ </bridges>
+
+ <!-- Other config -->
+
+ <security-settings>
+ <!--security for example queue-->
+ <security-setting match="jms.queue.#">
+ <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/bridge/src/main/resources/activemq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/bridge/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/bridge/src/main/resources/activemq/server0/activemq-jms.xml
new file mode 100644
index 0000000..3f96251
--- /dev/null
+++ b/examples/jms/bridge/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="sausage-factory"/>
+
+</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/bridge/src/main/resources/activemq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/bridge/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/bridge/src/main/resources/activemq/server0/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/bridge/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/bridge/src/main/resources/activemq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/bridge/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/bridge/src/main/resources/activemq/server1/activemq-configuration.xml
new file mode 100644
index 0000000..91b6131
--- /dev/null
+++ b/examples/jms/bridge/src/main/resources/activemq/server1/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}/server1/data/messaging/bindings</bindings-directory>
+
+ <journal-directory>${build.directory}/server1/data/messaging/journal</journal-directory>
+
+ <large-messages-directory>${build.directory}/server1/data/messaging/largemessages</large-messages-directory>
+
+ <paging-directory>${build.directory}/server1/data/messaging/paging</paging-directory>
+
+ <!-- Acceptors -->
+ <acceptors>
+ <acceptor name="netty-acceptor">
+ <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
+ <param key="port" value="5446"/>
+ </acceptor>
+ </acceptors>
+
+ <!-- Other config -->
+
+ <security-settings>
+ <!--security for example queue-->
+ <security-setting match="jms.queue.#">
+ <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>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/bridge/src/main/resources/activemq/server1/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/bridge/src/main/resources/activemq/server1/activemq-jms.xml b/examples/jms/bridge/src/main/resources/activemq/server1/activemq-jms.xml
new file mode 100644
index 0000000..e4fe85a
--- /dev/null
+++ b/examples/jms/bridge/src/main/resources/activemq/server1/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="mincing-machine"/>
+
+</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/bridge/src/main/resources/activemq/server1/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/bridge/src/main/resources/activemq/server1/activemq-users.xml b/examples/jms/bridge/src/main/resources/activemq/server1/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/bridge/src/main/resources/activemq/server1/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
[14/37] activemq-6 git commit: ACTIVEMQ6-41 Drop Java EE examples
Posted by jb...@apache.org.
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/jca-remote/server/standalone/configuration/application-users.properties
----------------------------------------------------------------------
diff --git a/examples/javaee/jca-remote/server/standalone/configuration/application-users.properties b/examples/javaee/jca-remote/server/standalone/configuration/application-users.properties
deleted file mode 100644
index c52e923..0000000
--- a/examples/javaee/jca-remote/server/standalone/configuration/application-users.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# Properties declaration of users for the realm 'ApplicationRealm' which is the default realm
-# for application services on a new AS 7.1 installation.
-#
-# This includes the following protocols: remote ejb, remote jndi, web, remote jms
-#
-# Users can be added to this properties file at any time, updates after the server has started
-# will be automatically detected.
-#
-# The format of this realm is as follows: -
-# username=HEX( MD5( username ':' realm ':' password))
-#
-# A utility script is provided which can be executed from the bin folder to add the users: -
-# - Linux
-# bin/add-user.sh
-#
-# - Windows
-# bin\add-user.bat
-#
-# The following illustrates how an admin user could be defined, this
-# is for illustration only and does not correspond to a usable password.
-#
-#admin=2a0923285184943425d1f53ddd58ec7a
-guest=3437456520927d113b17d471d630e0d6
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/jca-remote/server/standalone/configuration/logging.properties
----------------------------------------------------------------------
diff --git a/examples/javaee/jca-remote/server/standalone/configuration/logging.properties b/examples/javaee/jca-remote/server/standalone/configuration/logging.properties
deleted file mode 100644
index 3fa31b0..0000000
--- a/examples/javaee/jca-remote/server/standalone/configuration/logging.properties
+++ /dev/null
@@ -1,47 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# Additional logger names to configure (root logger is always configured)
-loggers=org.jboss.as.config
-
-# Dump system environment at boot by default
-logger.org.jboss.as.config.level=DEBUG
-
-# Root logger level
-logger.level=${jboss.boot.server.log.level:INFO}
-# Root logger handlers
-logger.handlers=FILE,CONSOLE
-
-# Console handler configuration
-handler.CONSOLE=org.jboss.logmanager.handlers.ConsoleHandler
-handler.CONSOLE.properties=autoFlush
-handler.CONSOLE.level=${jboss.boot.server.log.console.level:INFO}
-handler.CONSOLE.autoFlush=true
-handler.CONSOLE.formatter=PATTERN
-
-# File handler configuration
-handler.FILE=org.jboss.logmanager.handlers.FileHandler
-handler.FILE.level=DEBUG
-handler.FILE.properties=autoFlush,fileName
-handler.FILE.autoFlush=true
-handler.FILE.fileName=${org.jboss.boot.log.file:boot.log}
-handler.FILE.formatter=PATTERN
-
-# Formatter pattern configuration
-formatter.PATTERN=org.jboss.logmanager.formatters.PatternFormatter
-formatter.PATTERN.properties=pattern
-formatter.PATTERN.pattern=%d{HH:mm:ss,SSS} %-5p [%c] %s%E%n
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/jca-remote/server/standalone/configuration/mgmt-users.properties
----------------------------------------------------------------------
diff --git a/examples/javaee/jca-remote/server/standalone/configuration/mgmt-users.properties b/examples/javaee/jca-remote/server/standalone/configuration/mgmt-users.properties
deleted file mode 100644
index 309305a..0000000
--- a/examples/javaee/jca-remote/server/standalone/configuration/mgmt-users.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# Properties declaration of users for the realm 'ManagementRealm' which is the default realm
-# for new AS 7.1 installations. Further authentication mechanism can be configured
-# as part of the <management /> in standalone.xml.
-#
-# Users can be added to this properties file at any time, updates after the server has started
-# will be automatically detected.
-#
-# By default the properties realm expects the entries to be in the format: -
-# username=HEX( MD5( username ':' realm ':' password))
-#
-# A utility script is provided which can be executed from the bin folder to add the users: -
-# - Linux
-# bin/add-user.sh
-#
-# - Windows
-# bin\add-user.bat
-
-# The following illustrates how an admin user could be defined, this
-# is for illustration only and does not correspond to a usable password.
-#
-#admin=2a0923285184943425d1f53ddd58ec7a
-admin=ffd6e94a09c5a9ea5e216737dd45b99d
-andy=dfb16391f1be1c454b5bce9822bd9df3
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/jca-remote/server/standalone/configuration/standalone-example.xml
----------------------------------------------------------------------
diff --git a/examples/javaee/jca-remote/server/standalone/configuration/standalone-example.xml b/examples/javaee/jca-remote/server/standalone/configuration/standalone-example.xml
deleted file mode 100644
index 8ed7aee..0000000
--- a/examples/javaee/jca-remote/server/standalone/configuration/standalone-example.xml
+++ /dev/null
@@ -1,496 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-
-<server xmlns="urn:jboss:domain:2.0">
- <extensions>
- <extension module="org.jboss.as.clustering.infinispan"/>
- <extension module="org.jboss.as.connector"/>
- <extension module="org.jboss.as.deployment-scanner"/>
- <extension module="org.jboss.as.ee"/>
- <extension module="org.jboss.as.ejb3"/>
- <extension module="org.jboss.as.jacorb"/>
- <extension module="org.jboss.as.jaxrs"/>
- <extension module="org.jboss.as.jdr"/>
- <extension module="org.jboss.as.jmx"/>
- <extension module="org.jboss.as.jpa"/>
- <extension module="org.jboss.as.jsf"/>
- <extension module="org.jboss.as.jsr77"/>
- <extension module="org.jboss.as.logging"/>
- <extension module="org.jboss.as.mail"/>
- <extension module="org.jboss.as.messaging"/>
- <extension module="org.jboss.as.naming"/>
- <extension module="org.jboss.as.pojo"/>
- <extension module="org.jboss.as.remoting"/>
- <extension module="org.jboss.as.sar"/>
- <extension module="org.jboss.as.security"/>
- <extension module="org.jboss.as.threads"/>
- <extension module="org.jboss.as.transactions"/>
- <extension module="org.jboss.as.webservices"/>
- <extension module="org.jboss.as.weld"/>
- <extension module="org.wildfly.extension.batch"/>
- <extension module="org.wildfly.extension.io"/>
- <extension module="org.wildfly.extension.undertow"/>
- </extensions>
- <management>
- <security-realms>
- <security-realm name="ManagementRealm">
- <authentication>
- <local default-user="$local"/>
- <properties path="mgmt-users.properties" relative-to="jboss.server.config.dir"/>
- </authentication>
- <authorization map-groups-to-roles="false">
- <properties path="mgmt-groups.properties" relative-to="jboss.server.config.dir"/>
- </authorization>
- </security-realm>
- <security-realm name="ApplicationRealm">
- <authentication>
- <local default-user="$local" allowed-users="*"/>
- <properties path="application-users.properties" relative-to="jboss.server.config.dir"/>
- </authentication>
- <authorization>
- <properties path="application-roles.properties" relative-to="jboss.server.config.dir"/>
- </authorization>
- </security-realm>
- </security-realms>
- <audit-log>
- <formatters>
- <json-formatter name="json-formatter"/>
- </formatters>
- <handlers>
- <file-handler name="file" formatter="json-formatter" relative-to="jboss.server.data.dir" path="audit-log.log"/>
- </handlers>
- <logger log-boot="true" log-read-only="false" enabled="false">
- <handlers>
- <handler name="file"/>
- </handlers>
- </logger>
- </audit-log>
- <management-interfaces>
- <http-interface security-realm="ManagementRealm" http-upgrade-enabled="true">
- <socket-binding http="management-http"/>
- </http-interface>
- </management-interfaces>
- <access-control provider="simple">
- <role-mapping>
- <role name="SuperUser">
- <include>
- <user name="$local"/>
- </include>
- </role>
- </role-mapping>
- </access-control>
- </management>
- <profile>
- <subsystem xmlns="urn:jboss:domain:logging:2.0">
- <console-handler name="CONSOLE">
- <level name="INFO"/>
- <formatter>
- <named-formatter name="COLOR-PATTERN"/>
- </formatter>
- </console-handler>
- <periodic-rotating-file-handler name="FILE" autoflush="true">
- <formatter>
- <named-formatter name="PATTERN"/>
- </formatter>
- <file relative-to="jboss.server.log.dir" path="server.log"/>
- <suffix value=".yyyy-MM-dd"/>
- <append value="true"/>
- </periodic-rotating-file-handler>
- <logger category="com.arjuna">
- <level name="WARN"/>
- </logger>
- <logger category="org.apache.tomcat.util.modeler">
- <level name="WARN"/>
- </logger>
- <logger category="org.jboss.as.config">
- <level name="DEBUG"/>
- </logger>
- <logger category="sun.rmi">
- <level name="WARN"/>
- </logger>
- <logger category="jacorb">
- <level name="WARN"/>
- </logger>
- <logger category="jacorb.config">
- <level name="ERROR"/>
- </logger>
- <root-logger>
- <level name="INFO"/>
- <handlers>
- <handler name="CONSOLE"/>
- <handler name="FILE"/>
- </handlers>
- </root-logger>
- <formatter name="PATTERN">
- <pattern-formatter pattern="%d{yyyy-MM-dd HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/>
- </formatter>
- <formatter name="COLOR-PATTERN">
- <pattern-formatter pattern="%K{level}%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/>
- </formatter>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:batch:1.0">
- <job-repository>
- <in-memory/>
- </job-repository>
- <thread-pool>
- <max-threads count="10"/>
- <keepalive-time time="100" unit="milliseconds"/>
- </thread-pool>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:datasources:2.0">
- <datasources>
- <datasource jndi-name="java:jboss/datasources/ExampleDS" pool-name="ExampleDS" enabled="true" use-java-context="true">
- <connection-url>jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE</connection-url>
- <driver>h2</driver>
- <security>
- <user-name>sa</user-name>
- <password>sa</password>
- </security>
- </datasource>
- <drivers>
- <driver name="h2" module="com.h2database.h2">
- <xa-datasource-class>org.h2.jdbcx.JdbcDataSource</xa-datasource-class>
- </driver>
- </drivers>
- </datasources>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:deployment-scanner:2.0">
- <deployment-scanner path="deployments" relative-to="jboss.server.base.dir" scan-interval="5000" runtime-failure-causes-rollback="${jboss.deployment.scanner.rollback.on.failure:false}"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:ee:2.0">
- <spec-descriptor-property-replacement>false</spec-descriptor-property-replacement>
- <jboss-descriptor-property-replacement>true</jboss-descriptor-property-replacement>
- <annotation-property-replacement>false</annotation-property-replacement>
- <concurrent>
- <context-services>
- <context-service name="default" jndi-name="java:jboss/ee/concurrency/context/default" use-transaction-setup-provider="true"/>
- </context-services>
- <managed-executor-services>
- <managed-executor-service name="default" jndi-name="java:jboss/ee/concurrency/executor/default" context-service="default" hung-task-threshold="60000" core-threads="5" max-threads="25" keepalive-time="5000"/>
- </managed-executor-services>
- <managed-scheduled-executor-services>
- <managed-scheduled-executor-service name="default" jndi-name="java:jboss/ee/concurrency/scheduler/default" context-service="default" hung-task-threshold="60000" core-threads="2" keepalive-time="3000"/>
- </managed-scheduled-executor-services>
- <managed-thread-factories>
- <managed-thread-factory name="default" jndi-name="java:jboss/ee/concurrency/factory/default" context-service="default"/>
- </managed-thread-factories>
- </concurrent>
- <default-bindings context-service="java:jboss/ee/concurrency/context/default" datasource="java:jboss/datasources/ExampleDS" jms-connection-factory="java:jboss/DefaultJMSConnectionFactory" managed-executor-service="java:jboss/ee/concurrency/executor/default" managed-scheduled-executor-service="java:jboss/ee/concurrency/scheduler/default" managed-thread-factory="java:jboss/ee/concurrency/factory/default"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:ejb3:2.0">
- <session-bean>
- <stateful default-access-timeout="5000" cache-ref="simple" passivation-disabled-cache-ref="simple"/>
- <singleton default-access-timeout="5000"/>
- </session-bean>
- <mdb>
- <resource-adapter-ref resource-adapter-name="${ejb.resource-adapter-name:activemq-ra.rar}"/>
- <bean-instance-pool-ref pool-name="mdb-strict-max-pool"/>
- </mdb>
- <pools>
- <bean-instance-pools>
- <!-- A sample strict max pool configuration -->
- <strict-max-pool name="slsb-strict-max-pool" max-pool-size="20" instance-acquisition-timeout="5" instance-acquisition-timeout-unit="MINUTES"/>
- <strict-max-pool name="mdb-strict-max-pool" max-pool-size="20" instance-acquisition-timeout="5" instance-acquisition-timeout-unit="MINUTES"/>
- </bean-instance-pools>
- </pools>
- <caches>
- <cache name="simple"/>
- <cache name="distributable" aliases="passivating clustered" passivation-store-ref="infinispan"/>
- </caches>
- <passivation-stores>
- <passivation-store name="infinispan" cache-container="ejb" max-size="10000"/>
- </passivation-stores>
- <async thread-pool-name="default"/>
- <timer-service thread-pool-name="default" default-data-store="default-file-store">
- <data-stores>
- <file-data-store name="default-file-store" path="timer-service-data" relative-to="jboss.server.data.dir"/>
- </data-stores>
- </timer-service>
- <remote connector-ref="http-remoting-connector" thread-pool-name="default"/>
- <thread-pools>
- <thread-pool name="default">
- <max-threads count="10"/>
- <keepalive-time time="100" unit="milliseconds"/>
- </thread-pool>
- </thread-pools>
- <iiop enable-by-default="false" use-qualified-name="false"/>
- <default-security-domain value="other"/>
- <default-missing-method-permissions-deny-access value="true"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:io:1.0">
- <worker name="default" io-threads="3"/>
- <buffer-pool name="default" buffer-size="16384" buffers-per-slice="128"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:infinispan:2.0">
- <cache-container name="web" default-cache="passivation" module="org.wildfly.clustering.web.infinispan">
- <local-cache name="passivation" batching="true">
- <file-store passivation="true" purge="false"/>
- </local-cache>
- <local-cache name="persistent" batching="true">
- <file-store passivation="false" purge="false"/>
- </local-cache>
- </cache-container>
- <cache-container name="ejb" aliases="sfsb" default-cache="passivation" module="org.wildfly.clustering.ejb.infinispan">
- <local-cache name="passivation" batching="true">
- <file-store passivation="true" purge="false"/>
- </local-cache>
- <local-cache name="persistent" batching="true">
- <file-store passivation="false" purge="false"/>
- </local-cache>
- </cache-container>
- <cache-container name="hibernate" default-cache="local-query" module="org.hibernate">
- <local-cache name="entity">
- <transaction mode="NON_XA"/>
- <eviction strategy="LRU" max-entries="10000"/>
- <expiration max-idle="100000"/>
- </local-cache>
- <local-cache name="local-query">
- <transaction mode="NONE"/>
- <eviction strategy="LRU" max-entries="10000"/>
- <expiration max-idle="100000"/>
- </local-cache>
- <local-cache name="timestamps">
- <transaction mode="NONE"/>
- <eviction strategy="NONE"/>
- </local-cache>
- </cache-container>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:jacorb:1.3">
- <orb socket-binding="jacorb" ssl-socket-binding="jacorb-ssl">
- <initializers transactions="spec" security="identity"/>
- </orb>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:jaxrs:1.0"/>
- <subsystem xmlns="urn:jboss:domain:jca:2.0">
- <archive-validation enabled="true" fail-on-error="true" fail-on-warn="false"/>
- <bean-validation enabled="true"/>
- <default-workmanager>
- <short-running-threads>
- <core-threads count="50"/>
- <queue-length count="50"/>
- <max-threads count="50"/>
- <keepalive-time time="10" unit="seconds"/>
- </short-running-threads>
- <long-running-threads>
- <core-threads count="50"/>
- <queue-length count="50"/>
- <max-threads count="50"/>
- <keepalive-time time="10" unit="seconds"/>
- </long-running-threads>
- </default-workmanager>
- <cached-connection-manager/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:jdr:1.0"/>
- <subsystem xmlns="urn:jboss:domain:jmx:1.3">
- <expose-resolved-model/>
- <expose-expression-model/>
- <remoting-connector/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:jpa:1.1">
- <jpa default-datasource="" default-extended-persistence-inheritance="DEEP"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:jsf:1.0"/>
- <subsystem xmlns="urn:jboss:domain:jsr77:1.0"/>
- <subsystem xmlns="urn:jboss:domain:mail:2.0">
- <mail-session name="default" jndi-name="java:jboss/mail/Default">
- <smtp-server outbound-socket-binding-ref="mail-smtp"/>
- </mail-session>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:messaging:2.0">
- <activemq-server>
- <persistence-enabled>true</persistence-enabled>
- <journal-file-size>102400</journal-file-size>
- <journal-min-files>2</journal-min-files>
- <connectors>
- <http-connector name="http-connector" socket-binding="http">
- <param key="http-upgrade-endpoint" value="http-acceptor"/>
- </http-connector>
- <http-connector name="http-connector-throughput" socket-binding="http">
- <param key="http-upgrade-endpoint" value="http-acceptor-throughput"/>
- <param key="batch-delay" value="50"/>
- </http-connector>
- <in-vm-connector name="in-vm" server-id="0"/>
- <http-connector name="remote-http-connector" socket-binding="remote-messaging"/>
- </connectors>
- <acceptors>
- <http-acceptor name="http-acceptor" http-listener="default"/>
- <http-acceptor name="http-acceptor-throughput" http-listener="default">
- <param key="batch-delay" value="50"/>
- <param key="direct-deliver" value="false"/>
- </http-acceptor>
- <in-vm-acceptor name="in-vm" server-id="0"/>
- </acceptors>
- <security-settings>
- <security-setting match="#">
- <permission type="send" roles="guest"/>
- <permission type="consume" roles="guest"/>
- <permission type="createNonDurableQueue" roles="guest"/>
- <permission type="deleteNonDurableQueue" roles="guest"/>
- </security-setting>
- </security-settings>
- <address-settings>
- <!--default for catch all-->
- <address-setting match="#">
- <dead-letter-address>jms.queue.DLQ</dead-letter-address>
- <expiry-address>jms.queue.ExpiryQueue</expiry-address>
- <redelivery-delay>0</redelivery-delay>
- <max-size-bytes>10485760</max-size-bytes>
- <address-full-policy>PAGE</address-full-policy>
- <page-size-bytes>2097152</page-size-bytes>
- <message-counter-history-day-limit>10</message-counter-history-day-limit>
- </address-setting>
- </address-settings>
- <jms-connection-factories>
- <connection-factory name="InVmConnectionFactory">
- <connectors>
- <connector-ref connector-name="in-vm"/>
- </connectors>
- <entries>
- <entry name="java:/ConnectionFactory"/>
- </entries>
- </connection-factory>
- <connection-factory name="RemoteConnectionFactory">
- <connectors>
- <connector-ref connector-name="http-connector"/>
- </connectors>
- <entries>
- <entry name="java:jboss/exported/jms/RemoteConnectionFactory"/>
- </entries>
- </connection-factory>
- <pooled-connection-factory name="activemq-ra">
- <transaction mode="xa"/>
- <connectors>
- <connector-ref connector-name="in-vm"/>
- </connectors>
- <entries>
- <entry name="java:/JmsXA"/>
- <!-- Global JNDI entry used to provide a default JMS Connection factory to EE application -->
- <entry name="java:jboss/DefaultJMSConnectionFactory"/>
- </entries>
- </pooled-connection-factory>
- <pooled-connection-factory name="activemq-ra-remote">
- <transaction mode="xa"/>
- <user>guest</user>
- <password>password</password>
- <connectors>
- <connector-ref connector-name="remote-http-connector"/>
- </connectors>
- <entries>
- <entry name="java:/RemoteJmsXA"/>
- </entries>
- </pooled-connection-factory>
- </jms-connection-factories>
- </activemq-server>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:naming:2.0">
- <remote-naming/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:pojo:1.0"/>
- <subsystem xmlns="urn:jboss:domain:remoting:2.0">
- <endpoint worker="default"/>
- <http-connector name="http-remoting-connector" connector-ref="default" security-realm="ApplicationRealm"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:resource-adapters:2.0"/>
- <subsystem xmlns="urn:jboss:domain:sar:1.0"/>
- <subsystem xmlns="urn:jboss:domain:security:1.2">
- <security-domains>
- <security-domain name="other" cache-type="default">
- <authentication>
- <login-module code="Remoting" flag="optional">
- <module-option name="password-stacking" value="useFirstPass"/>
- </login-module>
- <login-module code="RealmDirect" flag="required">
- <module-option name="password-stacking" value="useFirstPass"/>
- </login-module>
- </authentication>
- </security-domain>
- <security-domain name="jboss-web-policy" cache-type="default">
- <authorization>
- <policy-module code="Delegating" flag="required"/>
- </authorization>
- </security-domain>
- <security-domain name="jboss-ejb-policy" cache-type="default">
- <authorization>
- <policy-module code="Delegating" flag="required"/>
- </authorization>
- </security-domain>
- </security-domains>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:threads:1.1"/>
- <subsystem xmlns="urn:jboss:domain:transactions:2.0">
- <core-environment>
- <process-id>
- <uuid/>
- </process-id>
- </core-environment>
- <recovery-environment socket-binding="txn-recovery-environment" status-socket-binding="txn-status-manager"/>
- <coordinator-environment default-timeout="300"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:undertow:1.0">
- <buffer-caches>
- <buffer-cache name="default" buffer-size="1024" buffers-per-region="1024" max-regions="10"/>
- </buffer-caches>
- <server name="default-server">
- <http-listener name="default" socket-binding="http"/>
- <host name="default-host" alias="localhost">
- <location name="/" handler="welcome-content"/>
- <filter-ref name="server-header"/>
- <filter-ref name="x-powered-by-header"/>
- </host>
- </server>
- <servlet-container name="default" default-buffer-cache="default" stack-trace-on-error="local-only">
- <jsp-config/>
- </servlet-container>
- <handlers>
- <file name="welcome-content" path="${jboss.home.dir}/welcome-content" directory-listing="true"/>
- </handlers>
- <filters>
- <response-header name="server-header" header-name="Server" header-value="Wildfly 8"/>
- <response-header name="x-powered-by-header" header-name="X-Powered-By" header-value="Undertow 1"/>
- </filters>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:webservices:1.2">
- <modify-wsdl-address>true</modify-wsdl-address>
- <wsdl-host>${jboss.bind.address:127.0.0.1}</wsdl-host>
- <endpoint-config name="Standard-Endpoint-Config"/>
- <endpoint-config name="Recording-Endpoint-Config">
- <pre-handler-chain name="recording-handlers" protocol-bindings="##SOAP11_HTTP ##SOAP11_HTTP_MTOM ##SOAP12_HTTP ##SOAP12_HTTP_MTOM">
- <handler name="RecordingHandler" class="org.jboss.ws.common.invocation.RecordingServerHandler"/>
- </pre-handler-chain>
- </endpoint-config>
- <client-config name="Standard-Client-Config"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:weld:2.0"/>
- </profile>
- <interfaces>
- <interface name="management">
- <inet-address value="${jboss.bind.address.management:127.0.0.1}"/>
- </interface>
- <interface name="public">
- <inet-address value="${jboss.bind.address:127.0.0.1}"/>
- </interface>
- <!-- TODO - only show this if the jacorb subsystem is added -->
- <interface name="unsecure">
- <!--
- ~ Used for IIOP sockets in the standard configuration.
- ~ To secure JacORB you need to setup SSL
- -->
- <inet-address value="${jboss.bind.address.unsecure:127.0.0.1}"/>
- </interface>
- </interfaces>
- <socket-binding-group name="standard-sockets" default-interface="public" port-offset="${jboss.socket.binding.port-offset:0}">
- <socket-binding name="management-http" interface="management" port="${jboss.management.http.port:9990}"/>
- <socket-binding name="management-https" interface="management" port="${jboss.management.https.port:9993}"/>
- <socket-binding name="ajp" port="${jboss.ajp.port:8009}"/>
- <socket-binding name="http" port="${jboss.http.port:8080}"/>
- <socket-binding name="https" port="${jboss.https.port:8443}"/>
- <socket-binding name="jacorb" interface="unsecure" port="3528"/>
- <socket-binding name="jacorb-ssl" interface="unsecure" port="3529"/>
- <socket-binding name="messaging-group" port="0" multicast-address="${jboss.messaging.group.address:231.7.7.7}" multicast-port="${jboss.messaging.group.port:9876}"/>
- <socket-binding name="remote-messaging" port="8180" fixed-port="true"/>
- <socket-binding name="txn-recovery-environment" port="4712"/>
- <socket-binding name="txn-status-manager" port="4713"/>
- <outbound-socket-binding name="mail-smtp">
- <remote-destination host="localhost" port="25"/>
- </outbound-socket-binding>
- </socket-binding-group>
-</server>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/jca-remote/server/standalone/configuration/standalone-example2.xml
----------------------------------------------------------------------
diff --git a/examples/javaee/jca-remote/server/standalone/configuration/standalone-example2.xml b/examples/javaee/jca-remote/server/standalone/configuration/standalone-example2.xml
deleted file mode 100644
index e53a16b..0000000
--- a/examples/javaee/jca-remote/server/standalone/configuration/standalone-example2.xml
+++ /dev/null
@@ -1,493 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-
-<server xmlns="urn:jboss:domain:2.0">
- <extensions>
- <extension module="org.jboss.as.clustering.infinispan"/>
- <extension module="org.jboss.as.connector"/>
- <extension module="org.jboss.as.deployment-scanner"/>
- <extension module="org.jboss.as.ee"/>
- <extension module="org.jboss.as.ejb3"/>
- <extension module="org.jboss.as.jacorb"/>
- <extension module="org.jboss.as.jaxrs"/>
- <extension module="org.jboss.as.jdr"/>
- <extension module="org.jboss.as.jmx"/>
- <extension module="org.jboss.as.jpa"/>
- <extension module="org.jboss.as.jsf"/>
- <extension module="org.jboss.as.jsr77"/>
- <extension module="org.jboss.as.logging"/>
- <extension module="org.jboss.as.mail"/>
- <extension module="org.jboss.as.messaging"/>
- <extension module="org.jboss.as.naming"/>
- <extension module="org.jboss.as.pojo"/>
- <extension module="org.jboss.as.remoting"/>
- <extension module="org.jboss.as.sar"/>
- <extension module="org.jboss.as.security"/>
- <extension module="org.jboss.as.threads"/>
- <extension module="org.jboss.as.transactions"/>
- <extension module="org.jboss.as.webservices"/>
- <extension module="org.jboss.as.weld"/>
- <extension module="org.wildfly.extension.batch"/>
- <extension module="org.wildfly.extension.io"/>
- <extension module="org.wildfly.extension.undertow"/>
- </extensions>
- <management>
- <security-realms>
- <security-realm name="ManagementRealm">
- <authentication>
- <local default-user="$local"/>
- <properties path="mgmt-users.properties" relative-to="jboss.server.config.dir"/>
- </authentication>
- <authorization map-groups-to-roles="false">
- <properties path="mgmt-groups.properties" relative-to="jboss.server.config.dir"/>
- </authorization>
- </security-realm>
- <security-realm name="ApplicationRealm">
- <authentication>
- <local default-user="$local" allowed-users="*"/>
- <properties path="application-users.properties" relative-to="jboss.server.config.dir"/>
- </authentication>
- <authorization>
- <properties path="application-roles.properties" relative-to="jboss.server.config.dir"/>
- </authorization>
- </security-realm>
- </security-realms>
- <audit-log>
- <formatters>
- <json-formatter name="json-formatter"/>
- </formatters>
- <handlers>
- <file-handler name="file" formatter="json-formatter" relative-to="jboss.server.data.dir" path="audit-log.log"/>
- </handlers>
- <logger log-boot="true" log-read-only="false" enabled="false">
- <handlers>
- <handler name="file"/>
- </handlers>
- </logger>
- </audit-log>
- <management-interfaces>
- <http-interface security-realm="ManagementRealm" http-upgrade-enabled="true">
- <socket-binding http="management-http"/>
- </http-interface>
- </management-interfaces>
- <access-control provider="simple">
- <role-mapping>
- <role name="SuperUser">
- <include>
- <user name="$local"/>
- </include>
- </role>
- </role-mapping>
- </access-control>
- </management>
- <profile>
- <subsystem xmlns="urn:jboss:domain:logging:2.0">
- <console-handler name="CONSOLE">
- <level name="INFO"/>
- <formatter>
- <named-formatter name="COLOR-PATTERN"/>
- </formatter>
- </console-handler>
- <periodic-rotating-file-handler name="FILE" autoflush="true">
- <formatter>
- <named-formatter name="PATTERN"/>
- </formatter>
- <file relative-to="jboss.server.log.dir" path="server.log"/>
- <suffix value=".yyyy-MM-dd"/>
- <append value="true"/>
- </periodic-rotating-file-handler>
- <logger category="com.arjuna">
- <level name="WARN"/>
- </logger>
- <logger category="org.apache.tomcat.util.modeler">
- <level name="WARN"/>
- </logger>
- <logger category="org.jboss.as.config">
- <level name="DEBUG"/>
- </logger>
- <logger category="sun.rmi">
- <level name="WARN"/>
- </logger>
- <logger category="jacorb">
- <level name="WARN"/>
- </logger>
- <logger category="jacorb.config">
- <level name="ERROR"/>
- </logger>
- <root-logger>
- <level name="INFO"/>
- <handlers>
- <handler name="CONSOLE"/>
- <handler name="FILE"/>
- </handlers>
- </root-logger>
- <formatter name="PATTERN">
- <pattern-formatter pattern="%d{yyyy-MM-dd HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/>
- </formatter>
- <formatter name="COLOR-PATTERN">
- <pattern-formatter pattern="%K{level}%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/>
- </formatter>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:batch:1.0">
- <job-repository>
- <in-memory/>
- </job-repository>
- <thread-pool>
- <max-threads count="10"/>
- <keepalive-time time="100" unit="milliseconds"/>
- </thread-pool>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:datasources:2.0">
- <datasources>
- <datasource jndi-name="java:jboss/datasources/ExampleDS" pool-name="ExampleDS" enabled="true" use-java-context="true">
- <connection-url>jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE</connection-url>
- <driver>h2</driver>
- <security>
- <user-name>sa</user-name>
- <password>sa</password>
- </security>
- </datasource>
- <drivers>
- <driver name="h2" module="com.h2database.h2">
- <xa-datasource-class>org.h2.jdbcx.JdbcDataSource</xa-datasource-class>
- </driver>
- </drivers>
- </datasources>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:deployment-scanner:2.0">
- <deployment-scanner path="deployments" relative-to="jboss.server.base.dir" scan-interval="5000" runtime-failure-causes-rollback="${jboss.deployment.scanner.rollback.on.failure:false}"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:ee:2.0">
- <spec-descriptor-property-replacement>false</spec-descriptor-property-replacement>
- <jboss-descriptor-property-replacement>true</jboss-descriptor-property-replacement>
- <annotation-property-replacement>false</annotation-property-replacement>
- <concurrent>
- <context-services>
- <context-service name="default" jndi-name="java:jboss/ee/concurrency/context/default" use-transaction-setup-provider="true"/>
- </context-services>
- <managed-executor-services>
- <managed-executor-service name="default" jndi-name="java:jboss/ee/concurrency/executor/default" context-service="default" hung-task-threshold="60000" core-threads="5" max-threads="25" keepalive-time="5000"/>
- </managed-executor-services>
- <managed-scheduled-executor-services>
- <managed-scheduled-executor-service name="default" jndi-name="java:jboss/ee/concurrency/scheduler/default" context-service="default" hung-task-threshold="60000" core-threads="2" keepalive-time="3000"/>
- </managed-scheduled-executor-services>
- <managed-thread-factories>
- <managed-thread-factory name="default" jndi-name="java:jboss/ee/concurrency/factory/default" context-service="default"/>
- </managed-thread-factories>
- </concurrent>
- <default-bindings context-service="java:jboss/ee/concurrency/context/default" datasource="java:jboss/datasources/ExampleDS" jms-connection-factory="java:jboss/DefaultJMSConnectionFactory" managed-executor-service="java:jboss/ee/concurrency/executor/default" managed-scheduled-executor-service="java:jboss/ee/concurrency/scheduler/default" managed-thread-factory="java:jboss/ee/concurrency/factory/default"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:ejb3:2.0">
- <session-bean>
- <stateful default-access-timeout="5000" cache-ref="simple" passivation-disabled-cache-ref="simple"/>
- <singleton default-access-timeout="5000"/>
- </session-bean>
- <mdb>
- <resource-adapter-ref resource-adapter-name="${ejb.resource-adapter-name:activemq-ra.rar}"/>
- <bean-instance-pool-ref pool-name="mdb-strict-max-pool"/>
- </mdb>
- <pools>
- <bean-instance-pools>
- <!-- A sample strict max pool configuration -->
- <strict-max-pool name="slsb-strict-max-pool" max-pool-size="20" instance-acquisition-timeout="5" instance-acquisition-timeout-unit="MINUTES"/>
- <strict-max-pool name="mdb-strict-max-pool" max-pool-size="20" instance-acquisition-timeout="5" instance-acquisition-timeout-unit="MINUTES"/>
- </bean-instance-pools>
- </pools>
- <caches>
- <cache name="simple"/>
- <cache name="distributable" aliases="passivating clustered" passivation-store-ref="infinispan"/>
- </caches>
- <passivation-stores>
- <passivation-store name="infinispan" cache-container="ejb" max-size="10000"/>
- </passivation-stores>
- <async thread-pool-name="default"/>
- <timer-service thread-pool-name="default" default-data-store="default-file-store">
- <data-stores>
- <file-data-store name="default-file-store" path="timer-service-data" relative-to="jboss.server.data.dir"/>
- </data-stores>
- </timer-service>
- <remote connector-ref="http-remoting-connector" thread-pool-name="default"/>
- <thread-pools>
- <thread-pool name="default">
- <max-threads count="10"/>
- <keepalive-time time="100" unit="milliseconds"/>
- </thread-pool>
- </thread-pools>
- <iiop enable-by-default="false" use-qualified-name="false"/>
- <default-security-domain value="other"/>
- <default-missing-method-permissions-deny-access value="true"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:io:1.0">
- <worker name="default" io-threads="3"/>
- <buffer-pool name="default" buffer-size="16384" buffers-per-slice="128"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:infinispan:2.0">
- <cache-container name="web" default-cache="passivation" module="org.wildfly.clustering.web.infinispan">
- <local-cache name="passivation" batching="true">
- <file-store passivation="true" purge="false"/>
- </local-cache>
- <local-cache name="persistent" batching="true">
- <file-store passivation="false" purge="false"/>
- </local-cache>
- </cache-container>
- <cache-container name="ejb" aliases="sfsb" default-cache="passivation" module="org.wildfly.clustering.ejb.infinispan">
- <local-cache name="passivation" batching="true">
- <file-store passivation="true" purge="false"/>
- </local-cache>
- <local-cache name="persistent" batching="true">
- <file-store passivation="false" purge="false"/>
- </local-cache>
- </cache-container>
- <cache-container name="hibernate" default-cache="local-query" module="org.hibernate">
- <local-cache name="entity">
- <transaction mode="NON_XA"/>
- <eviction strategy="LRU" max-entries="10000"/>
- <expiration max-idle="100000"/>
- </local-cache>
- <local-cache name="local-query">
- <transaction mode="NONE"/>
- <eviction strategy="LRU" max-entries="10000"/>
- <expiration max-idle="100000"/>
- </local-cache>
- <local-cache name="timestamps">
- <transaction mode="NONE"/>
- <eviction strategy="NONE"/>
- </local-cache>
- </cache-container>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:jacorb:1.3">
- <orb socket-binding="jacorb" ssl-socket-binding="jacorb-ssl">
- <initializers transactions="spec" security="identity"/>
- </orb>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:jaxrs:1.0"/>
- <subsystem xmlns="urn:jboss:domain:jca:2.0">
- <archive-validation enabled="true" fail-on-error="true" fail-on-warn="false"/>
- <bean-validation enabled="true"/>
- <default-workmanager>
- <short-running-threads>
- <core-threads count="50"/>
- <queue-length count="50"/>
- <max-threads count="50"/>
- <keepalive-time time="10" unit="seconds"/>
- </short-running-threads>
- <long-running-threads>
- <core-threads count="50"/>
- <queue-length count="50"/>
- <max-threads count="50"/>
- <keepalive-time time="10" unit="seconds"/>
- </long-running-threads>
- </default-workmanager>
- <cached-connection-manager/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:jdr:1.0"/>
- <subsystem xmlns="urn:jboss:domain:jmx:1.3">
- <expose-resolved-model/>
- <expose-expression-model/>
- <remoting-connector/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:jpa:1.1">
- <jpa default-datasource="" default-extended-persistence-inheritance="DEEP"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:jsf:1.0"/>
- <subsystem xmlns="urn:jboss:domain:jsr77:1.0"/>
- <subsystem xmlns="urn:jboss:domain:mail:2.0">
- <mail-session name="default" jndi-name="java:jboss/mail/Default">
- <smtp-server outbound-socket-binding-ref="mail-smtp"/>
- </mail-session>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:messaging:2.0">
- <activemq-server>
- <persistence-enabled>true</persistence-enabled>
- <journal-file-size>102400</journal-file-size>
- <journal-min-files>2</journal-min-files>
- <connectors>
- <http-connector name="http-connector" socket-binding="http">
- <param key="http-upgrade-endpoint" value="http-acceptor"/>
- </http-connector>
- <http-connector name="http-connector-throughput" socket-binding="http">
- <param key="http-upgrade-endpoint" value="http-acceptor-throughput"/>
- <param key="batch-delay" value="50"/>
- </http-connector>
- <in-vm-connector name="in-vm" server-id="0"/>
- </connectors>
- <acceptors>
- <http-acceptor name="http-acceptor" http-listener="default"/>
- <http-acceptor name="http-acceptor-throughput" http-listener="default">
- <param key="batch-delay" value="50"/>
- <param key="direct-deliver" value="false"/>
- </http-acceptor>
- <in-vm-acceptor name="in-vm" server-id="0"/>
- </acceptors>
- <security-settings>
- <security-setting match="#">
- <permission type="send" roles="guest"/>
- <permission type="consume" roles="guest"/>
- <permission type="createNonDurableQueue" roles="guest"/>
- <permission type="deleteNonDurableQueue" roles="guest"/>
- </security-setting>
- </security-settings>
- <address-settings>
- <!--default for catch all-->
- <address-setting match="#">
- <dead-letter-address>jms.queue.DLQ</dead-letter-address>
- <expiry-address>jms.queue.ExpiryQueue</expiry-address>
- <redelivery-delay>0</redelivery-delay>
- <max-size-bytes>10485760</max-size-bytes>
- <address-full-policy>PAGE</address-full-policy>
- <page-size-bytes>2097152</page-size-bytes>
- <message-counter-history-day-limit>10</message-counter-history-day-limit>
- </address-setting>
- </address-settings>
- <jms-connection-factories>
- <connection-factory name="InVmConnectionFactory">
- <connectors>
- <connector-ref connector-name="in-vm"/>
- </connectors>
- <entries>
- <entry name="java:/ConnectionFactory"/>
- </entries>
- </connection-factory>
- <connection-factory name="RemoteConnectionFactory">
- <connectors>
- <connector-ref connector-name="http-connector"/>
- </connectors>
- <entries>
- <entry name="java:jboss/exported/jms/RemoteConnectionFactory"/>
- </entries>
- </connection-factory>
- <pooled-connection-factory name="activemq-ra">
- <transaction mode="xa"/>
- <connectors>
- <connector-ref connector-name="in-vm"/>
- </connectors>
- <entries>
- <entry name="java:/JmsXA"/>
- <!-- Global JNDI entry used to provide a default JMS Connection factory to EE application -->
- <entry name="java:jboss/DefaultJMSConnectionFactory"/>
- </entries>
- </pooled-connection-factory>
- </jms-connection-factories>
- <jms-destinations>
- <jms-queue name="mdbQueue">
- <entry name="queue/mdbQueue"/>
- <entry name="java:jboss/exported/queues/mdbQueue"/>
- </jms-queue>
- <jms-queue name="mdbReplyQueue">
- <entry name="queue/mdbReplyQueue"/>
- <entry name="java:jboss/exported/queues/mdbReplyQueue"/>
- </jms-queue>
- </jms-destinations>
- </activemq-server>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:naming:2.0">
- <remote-naming/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:pojo:1.0"/>
- <subsystem xmlns="urn:jboss:domain:remoting:2.0">
- <endpoint worker="default"/>
- <http-connector name="http-remoting-connector" connector-ref="default" security-realm="ApplicationRealm"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:resource-adapters:2.0"/>
- <subsystem xmlns="urn:jboss:domain:sar:1.0"/>
- <subsystem xmlns="urn:jboss:domain:security:1.2">
- <security-domains>
- <security-domain name="other" cache-type="default">
- <authentication>
- <login-module code="Remoting" flag="optional">
- <module-option name="password-stacking" value="useFirstPass"/>
- </login-module>
- <login-module code="RealmDirect" flag="required">
- <module-option name="password-stacking" value="useFirstPass"/>
- </login-module>
- </authentication>
- </security-domain>
- <security-domain name="jboss-web-policy" cache-type="default">
- <authorization>
- <policy-module code="Delegating" flag="required"/>
- </authorization>
- </security-domain>
- <security-domain name="jboss-ejb-policy" cache-type="default">
- <authorization>
- <policy-module code="Delegating" flag="required"/>
- </authorization>
- </security-domain>
- </security-domains>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:threads:1.1"/>
- <subsystem xmlns="urn:jboss:domain:transactions:2.0">
- <core-environment>
- <process-id>
- <uuid/>
- </process-id>
- </core-environment>
- <recovery-environment socket-binding="txn-recovery-environment" status-socket-binding="txn-status-manager"/>
- <coordinator-environment default-timeout="300"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:undertow:1.0">
- <buffer-caches>
- <buffer-cache name="default" buffer-size="1024" buffers-per-region="1024" max-regions="10"/>
- </buffer-caches>
- <server name="default-server">
- <http-listener name="default" socket-binding="http"/>
- <host name="default-host" alias="localhost">
- <location name="/" handler="welcome-content"/>
- <filter-ref name="server-header"/>
- <filter-ref name="x-powered-by-header"/>
- </host>
- </server>
- <servlet-container name="default" default-buffer-cache="default" stack-trace-on-error="local-only">
- <jsp-config/>
- </servlet-container>
- <handlers>
- <file name="welcome-content" path="${jboss.home.dir}/welcome-content" directory-listing="true"/>
- </handlers>
- <filters>
- <response-header name="server-header" header-name="Server" header-value="Wildfly 8"/>
- <response-header name="x-powered-by-header" header-name="X-Powered-By" header-value="Undertow 1"/>
- </filters>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:webservices:1.2">
- <modify-wsdl-address>true</modify-wsdl-address>
- <wsdl-host>${jboss.bind.address:127.0.0.1}</wsdl-host>
- <endpoint-config name="Standard-Endpoint-Config"/>
- <endpoint-config name="Recording-Endpoint-Config">
- <pre-handler-chain name="recording-handlers" protocol-bindings="##SOAP11_HTTP ##SOAP11_HTTP_MTOM ##SOAP12_HTTP ##SOAP12_HTTP_MTOM">
- <handler name="RecordingHandler" class="org.jboss.ws.common.invocation.RecordingServerHandler"/>
- </pre-handler-chain>
- </endpoint-config>
- <client-config name="Standard-Client-Config"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:weld:2.0"/>
- </profile>
- <interfaces>
- <interface name="management">
- <inet-address value="${jboss.bind.address.management:127.0.0.1}"/>
- </interface>
- <interface name="public">
- <inet-address value="${jboss.bind.address:127.0.0.1}"/>
- </interface>
- <!-- TODO - only show this if the jacorb subsystem is added -->
- <interface name="unsecure">
- <!--
- ~ Used for IIOP sockets in the standard configuration.
- ~ To secure JacORB you need to setup SSL
- -->
- <inet-address value="${jboss.bind.address.unsecure:127.0.0.1}"/>
- </interface>
- </interfaces>
- <socket-binding-group name="standard-sockets" default-interface="public" port-offset="${jboss.socket.binding.port-offset:0}">
- <socket-binding name="management-http" interface="management" port="${jboss.management.http.port:9990}"/>
- <socket-binding name="management-https" interface="management" port="${jboss.management.https.port:9993}"/>
- <socket-binding name="ajp" port="${jboss.ajp.port:8009}"/>
- <socket-binding name="http" port="${jboss.http.port:8080}"/>
- <socket-binding name="https" port="${jboss.https.port:8443}"/>
- <socket-binding name="jacorb" interface="unsecure" port="3528"/>
- <socket-binding name="jacorb-ssl" interface="unsecure" port="3529"/>
- <socket-binding name="messaging-group" port="0" multicast-address="${jboss.messaging.group.address:231.7.7.7}" multicast-port="${jboss.messaging.group.port:9876}"/>
- <socket-binding name="txn-recovery-environment" port="4712"/>
- <socket-binding name="txn-status-manager" port="4713"/>
- <outbound-socket-binding name="mail-smtp">
- <remote-destination host="localhost" port="25"/>
- </outbound-socket-binding>
- </socket-binding-group>
-</server>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/jca-remote/src/main/java/org/apache/activemq/javaee/example/MDBRemoteServerClientExample.java
----------------------------------------------------------------------
diff --git a/examples/javaee/jca-remote/src/main/java/org/apache/activemq/javaee/example/MDBRemoteServerClientExample.java b/examples/javaee/jca-remote/src/main/java/org/apache/activemq/javaee/example/MDBRemoteServerClientExample.java
deleted file mode 100644
index b872dd0..0000000
--- a/examples/javaee/jca-remote/src/main/java/org/apache/activemq/javaee/example/MDBRemoteServerClientExample.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.activemq.javaee.example;
-
-
-
-import javax.jms.Connection;
-import javax.jms.ConnectionFactory;
-import javax.jms.MessageConsumer;
-import javax.jms.MessageProducer;
-import javax.jms.Queue;
-import javax.jms.Session;
-import javax.jms.TextMessage;
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import java.util.Properties;
-
-/**
- *
- * MDB Remote & JCA Configuration Example.
- *
- * @author <a href="mailto:clebert.suconic@jboss.org">Clebert Suconic</a>
- */
-public class MDBRemoteServerClientExample
-{
- public static void main(String[] args) throws Exception
- {
- InitialContext initialContext = null;
- Connection connection = null;
- try
- {
- //Step 1. Create an initial context to perform the JNDI lookup.
- final Properties env = new Properties();
-
- env.put(Context.URL_PKG_PREFIXES, "org.jboss.ejb.client.naming");
-
- env.put(Context.INITIAL_CONTEXT_FACTORY, "org.jboss.naming.remote.client.InitialContextFactory");
-
- env.put(Context.PROVIDER_URL, "http-remoting://localhost:8180");
-
- initialContext = new InitialContext(env);
-
- // Step 2. Look up the MDB's queue
- Queue queue = (Queue) initialContext.lookup("queues/mdbQueue");
-
- // Step 3. Look up a Connection Factory
- ConnectionFactory cf = (ConnectionFactory) initialContext.lookup("jms/RemoteConnectionFactory");
-
- //Step 4. Create a connection
- connection = cf.createConnection("guest", "password");
-
- //Step 5. Create a Session
- Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
-
- // Step 6. Create a message producer to send the message
- MessageProducer producer = session.createProducer(queue);
-
- // Step 7. Create and send a message
- producer.send(session.createTextMessage("a message"));
-
- // Step 15. Look up the reply queue
- Queue replyQueue = (Queue) initialContext.lookup("queues/mdbReplyQueue");
-
- // Step 16. Create a message consumer to receive the message
- MessageConsumer consumer = session.createConsumer(replyQueue);
-
- // Step 17. Start the connection so delivery starts
- connection.start();
-
- // Step 18. Receive the text message
- TextMessage textMessage = (TextMessage) consumer.receive(5000);
-
- System.out.println("Message received from reply queue. Message = \"" + textMessage.getText() + "\"" );
-
- }
- finally
- {
- // Step 19. Be sure to close our JMS resources!
- if (initialContext != null)
- {
- initialContext.close();
- }
- if (connection != null)
- {
- connection.close();
- }
- }
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/jca-remote/src/main/java/org/apache/activemq/javaee/example/server/MDBQueue.java
----------------------------------------------------------------------
diff --git a/examples/javaee/jca-remote/src/main/java/org/apache/activemq/javaee/example/server/MDBQueue.java b/examples/javaee/jca-remote/src/main/java/org/apache/activemq/javaee/example/server/MDBQueue.java
deleted file mode 100644
index 92270a3..0000000
--- a/examples/javaee/jca-remote/src/main/java/org/apache/activemq/javaee/example/server/MDBQueue.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.activemq.javaee.example.server;
-
-import org.apache.activemq.api.jms.ActiveMQJMSClient;
-import org.jboss.ejb3.annotation.ResourceAdapter;
-
-import javax.annotation.Resource;
-import javax.ejb.ActivationConfigProperty;
-import javax.ejb.MessageDriven;
-import javax.jms.*;
-
-/**
- * MDB that is connected to the remote queue.
- * @author <a href="mailto:clebert.suconic@jboss.org">Clebert Suconic</a>
- * @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a>
- * @author Justin Bertram
- */
-@MessageDriven(name = "MDB_Queue",
- activationConfig =
- {
- @ActivationConfigProperty(propertyName = "destinationType", propertyValue = "javax.jms.Queue"),
- @ActivationConfigProperty(propertyName = "destination", propertyValue = "mdbQueue"),
- @ActivationConfigProperty(propertyName = "useJNDI", propertyValue = "false")
- })
-@ResourceAdapter("activemq-ra-remote.rar")
-public class MDBQueue implements MessageListener
-{
- @Resource(mappedName="java:/RemoteJmsXA")
- private ConnectionFactory connectionFactory;
-
- public void onMessage(Message message)
- {
- try
- {
- // Step 8. Receive the text message
- TextMessage tm = (TextMessage)message;
-
- String text = tm.getText();
-
- // Step 9. look up the reply queue
- Queue destQueue = ActiveMQJMSClient.createQueue("mdbReplyQueue");
-
- // Step 10. Create a connection
- Connection connection = connectionFactory.createConnection();
-
- // Step 11. Create a session
- Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
-
- // Step 12. Create a message producer to send the message
- MessageProducer producer = session.createProducer(destQueue);
-
- // Step 13. Create and send a reply text message
- producer.send(session.createTextMessage("A reply message"));
-
- // Step 14. Return the connection back to the pool
- connection.close();
-
- }
- catch (Exception e)
- {
- e.printStackTrace();
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/jca-remote/src/test/java/org/apache/activemq/javaee/examples/JCARemoteRunnerTest.java
----------------------------------------------------------------------
diff --git a/examples/javaee/jca-remote/src/test/java/org/apache/activemq/javaee/examples/JCARemoteRunnerTest.java b/examples/javaee/jca-remote/src/test/java/org/apache/activemq/javaee/examples/JCARemoteRunnerTest.java
deleted file mode 100644
index 138c987..0000000
--- a/examples/javaee/jca-remote/src/test/java/org/apache/activemq/javaee/examples/JCARemoteRunnerTest.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.activemq.javaee.examples;
-
-import org.apache.activemq.javaee.example.MDBRemoteServerClientExample;
-import org.apache.activemq.javaee.example.server.MDBQueue;
-import org.jboss.arquillian.container.test.api.ContainerController;
-import org.jboss.arquillian.container.test.api.Deployer;
-import org.jboss.arquillian.container.test.api.Deployment;
-import org.jboss.arquillian.container.test.api.RunAsClient;
-import org.jboss.arquillian.container.test.api.TargetsContainer;
-import org.jboss.arquillian.junit.Arquillian;
-import org.jboss.arquillian.junit.InSequence;
-import org.jboss.arquillian.test.api.ArquillianResource;
-import org.jboss.shrinkwrap.api.Archive;
-import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.spec.JavaArchive;
-import org.jboss.shrinkwrap.api.spec.WebArchive;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-/**
- * @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a>
- */
-@RunAsClient
-@RunWith(Arquillian.class)
-public class JCARemoteRunnerTest
-{
- @ArquillianResource
- private ContainerController controller;
- @ArquillianResource
- private Deployer deployer;
-
- @Deployment(name = "deploy-0", managed = false)
- @TargetsContainer("node-0")
- public static Archive getDeployment()
- {
- final JavaArchive ejbJar = ShrinkWrap.create(JavaArchive.class, "mdb.jar");
- ejbJar.addClass(MDBQueue.class);
-
- final WebArchive war = ShrinkWrap.create(WebArchive.class, "test.war");
- war.addAsManifestResource("jboss-deployment-structure.xml", "jboss-deployment-structure.xml");
- war.addAsLibrary(ejbJar);
- System.out.println(war.toString(true));
- return war;
- }
-
- @Test
- public void runExample() throws Exception
- {
- MDBRemoteServerClientExample.main(null);
- }
-
- @Test
- @InSequence(-1)
- public void startServer()
- {
- System.out.println("*****************************************************************************************************************************************************************");
- controller.start("node-1");
- System.out.println("*****************************************************************************************************************************************************************");
- controller.start("node-0");
- System.out.println("*****************************************************************************************************************************************************************");
- deployer.deploy("deploy-0");
- }
-
- @Test
- @InSequence(1)
- public void stopServer()
- {
- deployer.undeploy("deploy-0");
- controller.stop("node-0");
- controller.stop("node-1");
- }
-
-}
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/jca-remote/src/test/resources/arquillian.xml
----------------------------------------------------------------------
diff --git a/examples/javaee/jca-remote/src/test/resources/arquillian.xml b/examples/javaee/jca-remote/src/test/resources/arquillian.xml
deleted file mode 100644
index 4fbd8f2..0000000
--- a/examples/javaee/jca-remote/src/test/resources/arquillian.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<arquillian xmlns="http://jboss.org/schema/arquillian"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://jboss.org/schema/arquillian http://jboss.org/schema/arquillian/arquillian_1_0.xsd">
-
- <!-- Uncomment to have test archives exported to the file system for inspection.
-This feature can also be controlled using the system property arquillian.deploymentExportPath -->
- <!--
-<engine>
-<property name="deploymentExportPath">target</property>
-</engine>
--->
-
- <defaultProtocol type="Servlet 3.0"/>
-
- <group qualifier="clustering-all">
- <container qualifier="node-0" mode="manual" default="true" managed="false">
- <configuration>
- <property name="jbossHome">${basedir}/target/jbossas-node0</property>
- <property name="javaVmArguments">-Djboss.node.name=node-0</property>
- <property name="serverConfig">standalone-example.xml</property>
- <property name="allowConnectingToRunningServer">true</property>
- <property name="managementAddress">${node0:127.0.0.1}</property>
- </configuration>
- </container>
- <container qualifier="node-1" mode="manual" managed="false">
- <configuration>
- <property name="jbossHome">${basedir}/target/jbossas-node1</property>
- <property name="javaVmArguments">-Djboss.node.name=node-1 -Djboss.socket.binding.port-offset=100</property>
- <property name="serverConfig">standalone-example2.xml</property>
- <property name="allowConnectingToRunningServer">true</property>
- <property name="managementAddress">${node0:127.0.0.1}</property>
- <property name="managementPort">${as.managementPort:10090}</property>
- </configuration>
- </container>
- </group>
-
- <!-- logThreshold proposed -->
- <!--
-<container qualifier="jbossas-managed">
-<configuration>
-<property name="logThreshold">ERROR</property>
-</configuration>
-</container>
--->
-
-</arquillian>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/jca-remote/src/test/resources/jboss-deployment-structure.xml
----------------------------------------------------------------------
diff --git a/examples/javaee/jca-remote/src/test/resources/jboss-deployment-structure.xml b/examples/javaee/jca-remote/src/test/resources/jboss-deployment-structure.xml
deleted file mode 100644
index c49e8cf..0000000
--- a/examples/javaee/jca-remote/src/test/resources/jboss-deployment-structure.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<jboss-deployment-structure>
- <deployment>
- <dependencies>
- <module name="org.apache.activemq"/>
- </dependencies>
- </deployment>
-</jboss-deployment-structure>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/jms-bridge/pom.xml
----------------------------------------------------------------------
diff --git a/examples/javaee/jms-bridge/pom.xml b/examples/javaee/jms-bridge/pom.xml
deleted file mode 100644
index 4660eca..0000000
--- a/examples/javaee/jms-bridge/pom.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.activemq.example.javaee</groupId>
- <artifactId>javaee-examples</artifactId>
- <version>6.0.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>activemq-jms-bridge-example</artifactId>
- <packaging>jar</packaging>
- <name>ActiveMQ6 JMS Bridge Example</name>
-</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/jms-bridge/readme.html
----------------------------------------------------------------------
diff --git a/examples/javaee/jms-bridge/readme.html b/examples/javaee/jms-bridge/readme.html
deleted file mode 100644
index 5da08f1..0000000
--- a/examples/javaee/jms-bridge/readme.html
+++ /dev/null
@@ -1,168 +0,0 @@
-<html>
- <head>
- <title>ActiveMQ JMS Bridge Example</title>
- <link rel="stylesheet" type="text/css" href="../../common/common.css" />
- <link rel="stylesheet" type="text/css" href="../../common/prettify.css" />
- <script type="text/javascript" src="../../common/prettify.js"></script>
- </head>
- <body onload="prettyPrint()">
- <h1>JMS Bridge Example</h1>
-
- <p>This example shows how to configure and run a JMS Bridge in WildFly.<br />
- A bridge receives messages from a <em>source</em> JMS destination and forwards them to a <em>target</em> destination.</p>
- <p>The source and target destinations can be on different servers, even from different JMS providers. For example, you can use this
- JMS Bridge to bridge a legacy JMS provider to ActiveMQ during migration.</p>
-
- <p>This example will show how to configure and run the simplest bridge:</p>
- <ul>
- <li>the source and target destinations are hosted by a single WildFly instance</li>
- <li>the bridge is run on the same WildFly instance</li>
- <li>every time a message is consumed by the bridge from the source, it is forward to the target</li>
- <li>The application client will send a message to the source and consume the "same" message from the target to
- show that the two destinations were indeed bridged.</li>
- </ul>
-
- <h3>JMS Bridge configuration</h3>
-
- <p>The JMS Bridge is configured in the "messaging" subsystem.<br />
- <p>The Bridge is deployed in the application server when you simply type <code>./build.sh deploy</code> (or <code>build.bat deploy</code> on windows) (it is copied to <code>${JBOSS_HOME}/server/default-with-activemq/deploy/</code>).</p>
-
- <h2>Example step-by-step</h2>
-
- <p><i>download WildFly 8.0.0.Final from <a href="http://wildfly.org/downloads/">here</a> and install.</i></p>
- <p><i>set the JBOSS_HOME property to point to the WildFly install directory</i></p>
- <p><i>type <code>mvn verify</code> from the example directory to run</i></p>
-
- <p>The example is simple: the application will send a message to the <em>source</em> queue and consume the same message
- from the <em>target</em> queue.</p>
- <p>The bridge is configured in the messaging subsystem:</p>
-
- <pre class="prettyprint">
- <jms-bridge name="myBridge">
- <source>
- <connection-factory name="ConnectionFactory" />
- <destination name="queue/sourceQueue" />
- </source>
- <target>
- <connection-factory name="ConnectionFactory" />
- <destination name="queue/targetQueue" />
- </target>
- <quality-of-service>AT_MOST_ONCE</quality-of-service>
- <failure-retry-interval>1000</failure-retry-interval>
- <max-retries>7890</max-retries>
- <max-batch-size>1</max-batch-size>
- <max-batch-time>1000</max-batch-time>
- </jms-bridge>
- </pre>
-
- <ol>
- <li>First we need to get an initial context so we can look up the JMS resources
- </li>
- <pre class="prettyprint">
- final Properties env = new Properties();
-
- env.put(Context.INITIAL_CONTEXT_FACTORY, "org.jboss.naming.remote.client.InitialContextFactory");
-
- env.put(Context.PROVIDER_URL, "http-remoting://localhost:8080");
-
- initialContext = new InitialContext(env);
- </pre>
-
- <li>We look up the JMS ConnectionFactory</li>
- <pre class="prettyprint">
- ConnectionFactory cf = (ConnectionFactory)initialContext.lookup("/jms/RemoteConnectionFactory");
- </pre>
-
- <p><em>First, we will send a message to the <em>source</em> queue</em>.</p>
-
- <li>We look up the JMS <em>source</em> queue</li>
- <pre class="prettyprint">
- Queue sourceQueue = (Queue)initialContext.lookup("jms/queues/sourceQueue");
- </pre>
-
- <li>We create a JMS connection, a session and a message producer for the <em>source</em> queue</li>
- <pre class="prettyprint">
- sourceConnection = cf.createConnection("guest", "password");
- Session sourceSession = sourceConnection.createSession(false, Session.AUTO_ACKNOWLEDGE);
- MessageProducer sourceProducer = sourceSession.createProducer(sourceQueue);
- </pre>
-
- <li>We create and send a message to the <em>source</em> queue. We also display its Message ID.</li>
- <pre class="prettyprint">
- TextMessage message = sourceSession.createTextMessage("this is a text message");
- sourceProducer.send(message);
- System.out.format("Sent message to %s: %s\n",
- ((Queue)message.getJMSDestination()).getQueueName(),
- message.getText());
- System.out.format("Message ID : %s\n", message.getJMSMessageID());
- </pre>
-
- <li>We close the <em>source</em> connection</li>
- <pre class="prettyprint">
- sourceConnection.close();
- </pre>
-
- <p><em>Now that a message has been sent to the <em>source</em> queue, we will consume a message
- from the <em>target</em> queue.<br />
- If the bridge runs correctly, it will have consumed the message from the <em>source</em> and
- resent it to the <em>target</em> so that we can consume a message from it.</em></p>
-
- <li>We look up the JMS <em>target</em> queue</li>
- <pre class="prettyprint">
- Queue targetQueue = (Queue)initialContext.lookup("jms/queues/targetQueue");
- </pre>
-
- <li>We create a connection, a session and a message consumer for the <em>target</em> queue</li>
- <pre class="prettyprint">
- targetConnection = cf.createConnection();
- Session targetSession = targetConnection.createSession(false, Session.AUTO_ACKNOWLEDGE);
- MessageConsumer targetConsumer = targetSession.createConsumer(targetQueue);
- </pre>
-
- <li>We start the JMS connection to receive messages from the <em>target</em></li>
- <pre class="prettyprint">
- targetConnection.start();
- </pre>
-
- <li>We receive a message from the <em>target</em> queue. It has the same content than the message sent to the <em>source</em> queue</li>
- <pre class="prettyprint">
- TextMessage messageReceived = (TextMessage)targetConsumer.receive(15000);
- System.out.format("\nReceived from %s: %s\n",
- ((Queue)messageReceived.getJMSDestination()).getQueueName(),
- messageReceived.getText());
-
- </pre>
-
- <li>We now display the received message ID. It is not the same than the ID of the message sent to the <em>source</em> queue.
- The message received from the <em>target</em> queue was sent by the bridge, not by the <em>source</em> message producer</li>
- <pre class="prettyprint">
- System.out.format("Message ID : %s\n", messageReceived.getJMSMessageID());
- </pre>
-
- <li>If you need to retrieve the message ID of the message <em>sent to the source</em>, you can use the property <code>HQ_BRIDGE_MSG_ID_LIST</code></li>
- <pre class="prettyprint">
- System.out.format("Bridged Message ID : %s\n", messageReceived.getStringProperty("HQ_BRIDGE_MSG_ID_LIST"));
- </pre>
-
- <li>And finally, <b>always</b> remember to close the JMS connections and resources after use, in a <code>finally</code> block. Closing a JMS connection will automatically close all of its sessions, consumers, producer and browser objects</li>
-
- <pre class="prettyprint">
- finally
- {
- if (initialContext != null)
- {
- initialContext.close();
- }
- if (sourceConnection != null)
- {
- sourceConnection.close();
- }
- if (targetConnection != null)
- {
- targetConnection.close();
- }
- }
- </pre>
- </ol>
- </body>
-</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/jms-bridge/server/standalone/configuration/application-roles.properties
----------------------------------------------------------------------
diff --git a/examples/javaee/jms-bridge/server/standalone/configuration/application-roles.properties b/examples/javaee/jms-bridge/server/standalone/configuration/application-roles.properties
deleted file mode 100644
index 0ade8fb..0000000
--- a/examples/javaee/jms-bridge/server/standalone/configuration/application-roles.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# Properties declaration of users roles for the realm 'ApplicationRealm'.
-#
-# This includes the following protocols: remote ejb, remote jndi, web, remote jms
-#
-# Users can be added to this properties file at any time, updates after the server has started
-# will be automatically detected.
-#
-# The format of this file is as follows: -
-# username=role1,role2,role3
-#
-# A utility script is provided which can be executed from the bin folder to add the users: -
-# - Linux
-# bin/add-user.sh
-#
-# - Windows
-# bin\add-user.bat
-#
-# The following illustrates how an admin user could be defined.
-#
-#admin=PowerUser,BillingAdmin,
-guest=guest
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/jms-bridge/server/standalone/configuration/application-users.properties
----------------------------------------------------------------------
diff --git a/examples/javaee/jms-bridge/server/standalone/configuration/application-users.properties b/examples/javaee/jms-bridge/server/standalone/configuration/application-users.properties
deleted file mode 100644
index c52e923..0000000
--- a/examples/javaee/jms-bridge/server/standalone/configuration/application-users.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# Properties declaration of users for the realm 'ApplicationRealm' which is the default realm
-# for application services on a new AS 7.1 installation.
-#
-# This includes the following protocols: remote ejb, remote jndi, web, remote jms
-#
-# Users can be added to this properties file at any time, updates after the server has started
-# will be automatically detected.
-#
-# The format of this realm is as follows: -
-# username=HEX( MD5( username ':' realm ':' password))
-#
-# A utility script is provided which can be executed from the bin folder to add the users: -
-# - Linux
-# bin/add-user.sh
-#
-# - Windows
-# bin\add-user.bat
-#
-# The following illustrates how an admin user could be defined, this
-# is for illustration only and does not correspond to a usable password.
-#
-#admin=2a0923285184943425d1f53ddd58ec7a
-guest=3437456520927d113b17d471d630e0d6
[30/37] activemq-6 git commit: ACTIVEMQ6-51 Example server
bootstrapping
Posted by jb...@apache.org.
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server2/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server2/activemq-configuration.xml b/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server2/activemq-configuration.xml
deleted file mode 100644
index 374d1de..0000000
--- a/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server2/activemq-configuration.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to You under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<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}/server2/data/messaging/bindings</bindings-directory>
-
- <journal-directory>${build.directory}/server2/data/messaging/journal</journal-directory>
-
- <large-messages-directory>${build.directory}/server2/data/messaging/largemessages</large-messages-directory>
-
- <paging-directory>${build.directory}/server2/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="5447"/>
- </connector>
- </connectors>
-
- <!-- Acceptors -->
- <acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- <param key="port" value="5447"/>
- </acceptor>
- </acceptors>
-
- <!-- Clustering configuration -->
- <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>true</forward-when-no-consumers>
- <max-hops>2</max-hops>
- </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>
-
-</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server2/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server2/activemq-jms.xml b/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server2/activemq-jms.xml
deleted file mode 100644
index e254e36..0000000
--- a/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server2/activemq-jms.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to You under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<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>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server2/activemq-users.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server2/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/clustered-topic/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-topic/pom.xml b/examples/jms/clustered-topic/pom.xml
index 18d9fb5..e5a31fb 100644
--- a/examples/jms/clustered-topic/pom.xml
+++ b/examples/jms/clustered-topic/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/clustered-topic/src/main/java/org/apache/activemq/jms/example/ClusteredTopicExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-topic/src/main/java/org/apache/activemq/jms/example/ClusteredTopicExample.java b/examples/jms/clustered-topic/src/main/java/org/apache/activemq/jms/example/ClusteredTopicExample.java
index eb51603..ca98789 100644
--- a/examples/jms/clustered-topic/src/main/java/org/apache/activemq/jms/example/ClusteredTopicExample.java
+++ b/examples/jms/clustered-topic/src/main/java/org/apache/activemq/jms/example/ClusteredTopicExample.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;
@@ -54,7 +56,11 @@ public class ClusteredTopicExample 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("topic.topic/exampleTopic", "exampleTopic");
+ ic0 = new InitialContext(properties);
// Step 2. Look-up the JMS Topic object from JNDI
Topic topic = (Topic)ic0.lookup("topic/exampleTopic");
@@ -63,7 +69,10 @@ public class ClusteredTopicExample 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/clustered-topic/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-topic/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/clustered-topic/src/main/resources/activemq/server0/activemq-configuration.xml
new file mode 100644
index 0000000..825a610
--- /dev/null
+++ b/examples/jms/clustered-topic/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -0,0 +1,76 @@
+<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>true</forward-when-no-consumers>
+ <max-hops>1</max-hops>
+ <discovery-group-ref discovery-group-name="my-discovery-group"/>
+ </cluster-connection>
+ </cluster-connections>
+
+ <!-- other configuration -->
+
+ <security-settings>
+ <!--security for example queue-->
+ <security-setting match="jms.topic.exampleTopic">
+ <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/clustered-topic/src/main/resources/activemq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-topic/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/clustered-topic/src/main/resources/activemq/server0/activemq-jms.xml
new file mode 100644
index 0000000..ab4841d
--- /dev/null
+++ b/examples/jms/clustered-topic/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 topic used by the example-->
+ <topic name="exampleTopic"/>
+
+</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-topic/src/main/resources/activemq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-topic/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/clustered-topic/src/main/resources/activemq/server0/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/clustered-topic/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/clustered-topic/src/main/resources/activemq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-topic/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/clustered-topic/src/main/resources/activemq/server1/activemq-configuration.xml
new file mode 100644
index 0000000..002e448
--- /dev/null
+++ b/examples/jms/clustered-topic/src/main/resources/activemq/server1/activemq-configuration.xml
@@ -0,0 +1,74 @@
+<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}/server1/data/messaging/bindings</bindings-directory>
+
+ <journal-directory>${build.directory}/server1/data/messaging/journal</journal-directory>
+
+ <large-messages-directory>${build.directory}/server1/data/messaging/largemessages</large-messages-directory>
+
+ <paging-directory>${build.directory}/server1/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="5446"/>
+ </connector>
+ </connectors>
+
+ <!-- Acceptors -->
+ <acceptors>
+ <acceptor name="netty-acceptor">
+ <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
+ <param key="port" value="5446"/>
+ </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>true</forward-when-no-consumers>
+ <max-hops>1</max-hops>
+ <discovery-group-ref discovery-group-name="my-discovery-group"/>
+ </cluster-connection>
+ </cluster-connections>
+
+ <!-- other configuration -->
+
+ <security-settings>
+ <!--security for example queue-->
+ <security-setting match="jms.topic.exampleTopic">
+ <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>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-topic/src/main/resources/activemq/server1/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-topic/src/main/resources/activemq/server1/activemq-jms.xml b/examples/jms/clustered-topic/src/main/resources/activemq/server1/activemq-jms.xml
new file mode 100644
index 0000000..ab4841d
--- /dev/null
+++ b/examples/jms/clustered-topic/src/main/resources/activemq/server1/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 topic used by the example-->
+ <topic name="exampleTopic"/>
+
+</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-topic/src/main/resources/activemq/server1/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-topic/src/main/resources/activemq/server1/activemq-users.xml b/examples/jms/clustered-topic/src/main/resources/activemq/server1/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/clustered-topic/src/main/resources/activemq/server1/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/clustered-topic/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-topic/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/clustered-topic/src/main/resources/hornetq/server0/activemq-configuration.xml
deleted file mode 100644
index 825a610..0000000
--- a/examples/jms/clustered-topic/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ /dev/null
@@ -1,76 +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>
- <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>true</forward-when-no-consumers>
- <max-hops>1</max-hops>
- <discovery-group-ref discovery-group-name="my-discovery-group"/>
- </cluster-connection>
- </cluster-connections>
-
- <!-- other configuration -->
-
- <security-settings>
- <!--security for example queue-->
- <security-setting match="jms.topic.exampleTopic">
- <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/clustered-topic/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-topic/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/clustered-topic/src/main/resources/hornetq/server0/activemq-jms.xml
deleted file mode 100644
index ab4841d..0000000
--- a/examples/jms/clustered-topic/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 topic used by the example-->
- <topic name="exampleTopic"/>
-
-</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-topic/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/clustered-topic/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/clustered-topic/src/main/resources/hornetq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-topic/src/main/resources/hornetq/server1/activemq-configuration.xml b/examples/jms/clustered-topic/src/main/resources/hornetq/server1/activemq-configuration.xml
deleted file mode 100644
index 002e448..0000000
--- a/examples/jms/clustered-topic/src/main/resources/hornetq/server1/activemq-configuration.xml
+++ /dev/null
@@ -1,74 +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}/server1/data/messaging/bindings</bindings-directory>
-
- <journal-directory>${build.directory}/server1/data/messaging/journal</journal-directory>
-
- <large-messages-directory>${build.directory}/server1/data/messaging/largemessages</large-messages-directory>
-
- <paging-directory>${build.directory}/server1/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="5446"/>
- </connector>
- </connectors>
-
- <!-- Acceptors -->
- <acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- <param key="port" value="5446"/>
- </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>true</forward-when-no-consumers>
- <max-hops>1</max-hops>
- <discovery-group-ref discovery-group-name="my-discovery-group"/>
- </cluster-connection>
- </cluster-connections>
-
- <!-- other configuration -->
-
- <security-settings>
- <!--security for example queue-->
- <security-setting match="jms.topic.exampleTopic">
- <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>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-topic/src/main/resources/hornetq/server1/activemq-jms.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index ab4841d..0000000
--- a/examples/jms/clustered-topic/src/main/resources/hornetq/server1/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 topic used by the example-->
- <topic name="exampleTopic"/>
-
-</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-topic/src/main/resources/hornetq/server1/activemq-users.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/clustered-topic/src/main/resources/hornetq/server1/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/colocated-failover-scale-down/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/colocated-failover-scale-down/pom.xml b/examples/jms/colocated-failover-scale-down/pom.xml
index f128ea7..51e45e1 100644
--- a/examples/jms/colocated-failover-scale-down/pom.xml
+++ b/examples/jms/colocated-failover-scale-down/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>udp-address</name>
@@ -51,9 +51,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>
@@ -88,7 +86,7 @@
<goal>stop</goal>
</goals>
<configuration>
- <hornetqConfigurationDir>${basedir}/target/classes/activemq/server0</hornetqConfigurationDir>
+ <configurationDir>${basedir}/target/classes/activemq/server0</configurationDir>
</configuration>
</execution>
<execution>
@@ -97,7 +95,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/colocated-failover-scale-down/src/main/java/org/apache/activemq/jms/example/ColocatedFailoverScaleDownExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/colocated-failover-scale-down/src/main/java/org/apache/activemq/jms/example/ColocatedFailoverScaleDownExample.java b/examples/jms/colocated-failover-scale-down/src/main/java/org/apache/activemq/jms/example/ColocatedFailoverScaleDownExample.java
index b65279b..f5e5a29 100644
--- a/examples/jms/colocated-failover-scale-down/src/main/java/org/apache/activemq/jms/example/ColocatedFailoverScaleDownExample.java
+++ b/examples/jms/colocated-failover-scale-down/src/main/java/org/apache/activemq/jms/example/ColocatedFailoverScaleDownExample.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;
@@ -54,8 +56,20 @@ public class ColocatedFailoverScaleDownExample extends ActiveMQExample
try
{
// Step 1. Get an initial context for looking up JNDI for both servers
- initialContext1 = getContext(1);
- initialContext = 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[1]);
+ initialContext1 = new InitialContext(properties);
+
+ 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");
+ properties.put("connection.ConnectionFactory.ha", true);
+ properties.put("connection.ConnectionFactory.retryInterval", 1000);
+ properties.put("connection.ConnectionFactory.retryIntervalMultiplier", 1.0);
+ properties.put("connection.ConnectionFactory.reconnectAttempts", -1);
+ initialContext = new InitialContext(properties);
// Step 2. Look up the JMS resources from JNDI
Queue queue = (Queue)initialContext.lookup("queue/exampleQueue");
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server0/activemq-configuration.xml
new file mode 100644
index 0000000..0c32a5e
--- /dev/null
+++ b/examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -0,0 +1,110 @@
+<configuration xmlns="urn:activemq"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
+
+
+ <bindings-directory>target/server0/data/messaging/bindings</bindings-directory>
+
+ <journal-directory>target/server0/data/messaging/journal</journal-directory>
+
+ <large-messages-directory>target/server0/data/messaging/largemessages</large-messages-directory>
+
+ <paging-directory>target/server0/data/messaging/paging</paging-directory>
+ <!-- Connectors -->
+
+ <connectors>
+ <connector name="invm-connector">
+ <factory-class>org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory</factory-class>
+ </connector>
+ <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="invm-acceptor">
+ <factory-class>org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory</factory-class>
+ </acceptor>
+ <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>
+ <!-- since the backup servers scale down we need a sensible setting here so the bridge will stop -->
+ <reconnect-attempts>5</reconnect-attempts>
+ <use-duplicate-detection>true</use-duplicate-detection>
+ <forward-when-no-consumers>true</forward-when-no-consumers>
+ <max-hops>1</max-hops>
+ <discovery-group-ref discovery-group-name="my-discovery-group"/>
+ </cluster-connection>
+ </cluster-connections>
+
+ <!-- a colocated server that will allow shared store backups to be requested, the default for this template is to scale down-->
+ <ha-policy>
+ <shared-store>
+ <colocated>
+ <backup-port-offset>100</backup-port-offset>
+ <backup-request-retries>-1</backup-request-retries>
+ <backup-request-retry-interval>2000</backup-request-retry-interval>
+ <max-backups>1</max-backups>
+ <request-backup>true</request-backup>
+ <master/>
+ <slave>
+ <scale-down/>
+ </slave>
+ </colocated>
+ </shared-store>
+ </ha-policy>
+
+ <!-- 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.activemq.management.#">
+ <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>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server0/activemq-jms.xml
new file mode 100644
index 0000000..847659f
--- /dev/null
+++ b/examples/jms/colocated-failover-scale-down/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>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server0/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/colocated-failover-scale-down/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/colocated-failover-scale-down/src/main/resources/activemq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server1/activemq-configuration.xml
new file mode 100644
index 0000000..e83e68c
--- /dev/null
+++ b/examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server1/activemq-configuration.xml
@@ -0,0 +1,111 @@
+<configuration xmlns="urn:activemq"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
+
+
+
+ <bindings-directory>target/server1/data/messaging/bindings</bindings-directory>
+
+ <journal-directory>target/server1/data/messaging/journal</journal-directory>
+
+ <large-messages-directory>target/server1/data/messaging/largemessages</large-messages-directory>
+
+ <paging-directory>target/server1/data/messaging/paging</paging-directory>
+
+ <!-- Connectors -->
+ <connectors>
+ <connector name="invm-connector">
+ <factory-class>org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory</factory-class>
+ </connector>
+ <connector name="netty-connector">
+ <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
+ <param key="port" value="5446"/>
+ </connector>
+ </connectors>
+
+ <!-- Acceptors -->
+ <acceptors>
+ <acceptor name="invm-acceptor">
+ <factory-class>org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory</factory-class>
+ </acceptor>
+ <acceptor name="netty-acceptor">
+ <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
+ <param key="port" value="5446"/>
+ </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>
+ <!-- since the backup servers scale down we need a sensible setting here so the bridge will stop -->
+ <reconnect-attempts>5</reconnect-attempts>
+ <use-duplicate-detection>true</use-duplicate-detection>
+ <forward-when-no-consumers>true</forward-when-no-consumers>
+ <max-hops>1</max-hops>
+ <discovery-group-ref discovery-group-name="my-discovery-group"/>
+ </cluster-connection>
+ </cluster-connections>
+
+ <!-- a colocated server that will allow shared store backups to be requested, the default for this template is to scale down-->
+ <ha-policy>
+ <shared-store>
+ <colocated>
+ <backup-port-offset>100</backup-port-offset>
+ <backup-request-retries>-1</backup-request-retries>
+ <backup-request-retry-interval>2000</backup-request-retry-interval>
+ <max-backups>1</max-backups>
+ <request-backup>true</request-backup>
+ <master/>
+ <slave>
+ <scale-down/>
+ </slave>
+ </colocated>
+ </shared-store>
+ </ha-policy>
+
+ <!-- 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.activemq.management.#">
+ <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/colocated-failover-scale-down/src/main/resources/activemq/server1/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server1/activemq-jms.xml b/examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server1/activemq-jms.xml
new file mode 100644
index 0000000..847659f
--- /dev/null
+++ b/examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server1/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>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server1/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server1/activemq-users.xml b/examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server1/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server1/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/colocated-failover-scale-down/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/colocated-failover-scale-down/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/colocated-failover-scale-down/src/main/resources/hornetq/server0/activemq-configuration.xml
deleted file mode 100644
index ce79e01..0000000
--- a/examples/jms/colocated-failover-scale-down/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ /dev/null
@@ -1,99 +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>target/server0/data/messaging/bindings</bindings-directory>
-
- <journal-directory>target/server0/data/messaging/journal</journal-directory>
-
- <large-messages-directory>target/server0/data/messaging/largemessages</large-messages-directory>
-
- <paging-directory>target/server0/data/messaging/paging</paging-directory>
- <!-- Connectors -->
-
- <connectors>
- <connector name="invm-connector">
- <factory-class>org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory</factory-class>
- </connector>
- <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="invm-acceptor">
- <factory-class>org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory</factory-class>
- </acceptor>
- <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>
- <!-- since the backup servers scale down we need a sensible setting here so the bridge will stop -->
- <reconnect-attempts>5</reconnect-attempts>
- <use-duplicate-detection>true</use-duplicate-detection>
- <forward-when-no-consumers>true</forward-when-no-consumers>
- <max-hops>1</max-hops>
- <discovery-group-ref discovery-group-name="my-discovery-group"/>
- </cluster-connection>
- </cluster-connections>
-
- <!-- a colocated server that will allow shared store backups to be requested, the default for this template is to scale down-->
- <ha-policy>
- <shared-store>
- <colocated>
- <backup-port-offset>100</backup-port-offset>
- <backup-request-retries>-1</backup-request-retries>
- <backup-request-retry-interval>2000</backup-request-retry-interval>
- <max-backups>1</max-backups>
- <request-backup>true</request-backup>
- <master/>
- <slave>
- <scale-down/>
- </slave>
- </colocated>
- </shared-store>
- </ha-policy>
-
- <!-- 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>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/colocated-failover-scale-down/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/colocated-failover-scale-down/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/colocated-failover-scale-down/src/main/resources/hornetq/server0/activemq-jms.xml
deleted file mode 100644
index 847659f..0000000
--- a/examples/jms/colocated-failover-scale-down/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>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/colocated-failover-scale-down/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/colocated-failover-scale-down/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/colocated-failover-scale-down/src/main/resources/hornetq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/colocated-failover-scale-down/src/main/resources/hornetq/server1/activemq-configuration.xml b/examples/jms/colocated-failover-scale-down/src/main/resources/hornetq/server1/activemq-configuration.xml
deleted file mode 100644
index 0ee6388..0000000
--- a/examples/jms/colocated-failover-scale-down/src/main/resources/hornetq/server1/activemq-configuration.xml
+++ /dev/null
@@ -1,100 +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>target/server1/data/messaging/bindings</bindings-directory>
-
- <journal-directory>target/server1/data/messaging/journal</journal-directory>
-
- <large-messages-directory>target/server1/data/messaging/largemessages</large-messages-directory>
-
- <paging-directory>target/server1/data/messaging/paging</paging-directory>
-
- <!-- Connectors -->
- <connectors>
- <connector name="invm-connector">
- <factory-class>org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory</factory-class>
- </connector>
- <connector name="netty-connector">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
- <param key="port" value="5446"/>
- </connector>
- </connectors>
-
- <!-- Acceptors -->
- <acceptors>
- <acceptor name="invm-acceptor">
- <factory-class>org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory</factory-class>
- </acceptor>
- <acceptor name="netty-acceptor">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- <param key="port" value="5446"/>
- </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>
- <!-- since the backup servers scale down we need a sensible setting here so the bridge will stop -->
- <reconnect-attempts>5</reconnect-attempts>
- <use-duplicate-detection>true</use-duplicate-detection>
- <forward-when-no-consumers>true</forward-when-no-consumers>
- <max-hops>1</max-hops>
- <discovery-group-ref discovery-group-name="my-discovery-group"/>
- </cluster-connection>
- </cluster-connections>
-
- <!-- a colocated server that will allow shared store backups to be requested, the default for this template is to scale down-->
- <ha-policy>
- <shared-store>
- <colocated>
- <backup-port-offset>100</backup-port-offset>
- <backup-request-retries>-1</backup-request-retries>
- <backup-request-retry-interval>2000</backup-request-retry-interval>
- <max-backups>1</max-backups>
- <request-backup>true</request-backup>
- <master/>
- <slave>
- <scale-down/>
- </slave>
- </colocated>
- </shared-store>
- </ha-policy>
-
- <!-- 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/colocated-failover-scale-down/src/main/resources/hornetq/server1/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/colocated-failover-scale-down/src/main/resources/hornetq/server1/activemq-jms.xml b/examples/jms/colocated-failover-scale-down/src/main/resources/hornetq/server1/activemq-jms.xml
deleted file mode 100644
index 847659f..0000000
--- a/examples/jms/colocated-failover-scale-down/src/main/resources/hornetq/server1/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>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/colocated-failover-scale-down/src/main/resources/hornetq/server1/activemq-users.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/colocated-failover-scale-down/src/main/resources/hornetq/server1/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/colocated-failover/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/colocated-failover/pom.xml b/examples/jms/colocated-failover/pom.xml
index 290ed90..cec3330 100644
--- a/examples/jms/colocated-failover/pom.xml
+++ b/examples/jms/colocated-failover/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>udp-address</name>
@@ -51,9 +51,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>
@@ -71,8 +69,8 @@
<configuration>
<clientClass>org.apache.activemq.jms.example.ColocatedFailoverExample</clientClass>
<args>
- <param>tcp://localhost:1099</param>
- <param>tcp://localhost:1199</param>
+ <param>tcp://localhost:5445</param>
+ <param>tcp://localhost:5446</param>
</args>
<systemProperties>
<property>
@@ -88,7 +86,7 @@
<goal>stop</goal>
</goals>
<configuration>
- <hornetqConfigurationDir>${basedir}/target/classes/activemq/server0</hornetqConfigurationDir>
+ <configurationDir>${basedir}/target/classes/activemq/server0</configurationDir>
</configuration>
</execution>
<execution>
@@ -97,7 +95,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/colocated-failover/src/main/java/org/apache/activemq/jms/example/ColocatedFailoverExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/colocated-failover/src/main/java/org/apache/activemq/jms/example/ColocatedFailoverExample.java b/examples/jms/colocated-failover/src/main/java/org/apache/activemq/jms/example/ColocatedFailoverExample.java
index 29d57a6..1e912e0 100644
--- a/examples/jms/colocated-failover/src/main/java/org/apache/activemq/jms/example/ColocatedFailoverExample.java
+++ b/examples/jms/colocated-failover/src/main/java/org/apache/activemq/jms/example/ColocatedFailoverExample.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;
@@ -52,8 +54,20 @@ public class ColocatedFailoverExample extends ActiveMQExample
try
{
// Step 1. Get an initial context for looking up JNDI for both servers
- initialContext1 = getContext(1);
- initialContext = 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[1]);
+ initialContext1 = new InitialContext(properties);
+
+ 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");
+ properties.put("connection.ConnectionFactory.ha", true);
+ properties.put("connection.ConnectionFactory.retryInterval", 1000);
+ properties.put("connection.ConnectionFactory.retryIntervalMultiplier", 1.0);
+ properties.put("connection.ConnectionFactory.reconnectAttempts", -1);
+ initialContext = new InitialContext(properties);
// Step 2. Look up the JMS resources from JNDI
Queue queue = (Queue)initialContext.lookup("queue/exampleQueue");
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/colocated-failover/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/colocated-failover/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/colocated-failover/src/main/resources/activemq/server0/activemq-configuration.xml
new file mode 100644
index 0000000..82e9a29
--- /dev/null
+++ b/examples/jms/colocated-failover/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -0,0 +1,90 @@
+<configuration xmlns="urn:activemq"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
+
+
+ <bindings-directory>target/server0/data/messaging/bindings</bindings-directory>
+
+ <journal-directory>target/server0/data/messaging/journal</journal-directory>
+
+ <large-messages-directory>target/server0/data/messaging/largemessages</large-messages-directory>
+
+ <paging-directory>target/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>true</forward-when-no-consumers>
+ <max-hops>1</max-hops>
+ <discovery-group-ref discovery-group-name="my-discovery-group"/>
+ </cluster-connection>
+ </cluster-connections>
+
+ <!-- a colocated server that will allow shared store full backups to be requested-->
+ <ha-policy>
+ <shared-store>
+ <colocated>
+ <backup-port-offset>100</backup-port-offset>
+ <backup-request-retries>-1</backup-request-retries>
+ <backup-request-retry-interval>2000</backup-request-retry-interval>
+ <max-backups>1</max-backups>
+ <request-backup>true</request-backup>
+ <master/>
+ <slave/>
+ </colocated>
+ </shared-store>
+ </ha-policy>
+
+ <!-- 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>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/colocated-failover/src/main/resources/activemq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/colocated-failover/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/colocated-failover/src/main/resources/activemq/server0/activemq-jms.xml
new file mode 100644
index 0000000..847659f
--- /dev/null
+++ b/examples/jms/colocated-failover/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>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/colocated-failover/src/main/resources/activemq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/colocated-failover/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/colocated-failover/src/main/resources/activemq/server0/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/colocated-failover/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/colocated-failover/src/main/resources/activemq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/colocated-failover/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/colocated-failover/src/main/resources/activemq/server1/activemq-configuration.xml
new file mode 100644
index 0000000..2c19b91
--- /dev/null
+++ b/examples/jms/colocated-failover/src/main/resources/activemq/server1/activemq-configuration.xml
@@ -0,0 +1,90 @@
+<configuration xmlns="urn:activemq"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
+
+
+
+ <bindings-directory>target/server1/data/messaging/bindings</bindings-directory>
+
+ <journal-directory>target/server1/data/messaging/journal</journal-directory>
+
+ <large-messages-directory>target/server1/data/messaging/largemessages</large-messages-directory>
+
+ <paging-directory>target/server1/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="5446"/>
+ </connector>
+ </connectors>
+
+ <!-- Acceptors -->
+ <acceptors>
+ <acceptor name="netty-acceptor">
+ <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
+ <param key="port" value="5446"/>
+ </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>true</forward-when-no-consumers>
+ <max-hops>1</max-hops>
+ <discovery-group-ref discovery-group-name="my-discovery-group"/>
+ </cluster-connection>
+ </cluster-connections>
+
+ <!-- a colocated server that will allow shared store full backups to be requested-->
+ <ha-policy>
+ <shared-store>
+ <colocated>
+ <backup-port-offset>100</backup-port-offset>
+ <backup-request-retries>-1</backup-request-retries>
+ <backup-request-retry-interval>2000</backup-request-retry-interval>
+ <max-backups>1</max-backups>
+ <request-backup>true</request-backup>
+ <master/>
+ <slave/>
+ </colocated>
+ </shared-store>
+ </ha-policy>
+
+ <!-- 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/colocated-failover/src/main/resources/activemq/server1/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/colocated-failover/src/main/resources/activemq/server1/activemq-jms.xml b/examples/jms/colocated-failover/src/main/resources/activemq/server1/activemq-jms.xml
new file mode 100644
index 0000000..0a77a3f
--- /dev/null
+++ b/examples/jms/colocated-failover/src/main/resources/activemq/server1/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">
+ <!--the queue used by the example-->
+ <queue name="exampleQueue"/>
+
+</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/colocated-failover/src/main/resources/activemq/server1/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/colocated-failover/src/main/resources/activemq/server1/activemq-users.xml b/examples/jms/colocated-failover/src/main/resources/activemq/server1/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/colocated-failover/src/main/resources/activemq/server1/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/colocated-failover/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/colocated-failover/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/colocated-failover/src/main/resources/hornetq/server0/activemq-configuration.xml
deleted file mode 100644
index 82e9a29..0000000
--- a/examples/jms/colocated-failover/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ /dev/null
@@ -1,90 +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>target/server0/data/messaging/bindings</bindings-directory>
-
- <journal-directory>target/server0/data/messaging/journal</journal-directory>
-
- <large-messages-directory>target/server0/data/messaging/largemessages</large-messages-directory>
-
- <paging-directory>target/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>true</forward-when-no-consumers>
- <max-hops>1</max-hops>
- <discovery-group-ref discovery-group-name="my-discovery-group"/>
- </cluster-connection>
- </cluster-connections>
-
- <!-- a colocated server that will allow shared store full backups to be requested-->
- <ha-policy>
- <shared-store>
- <colocated>
- <backup-port-offset>100</backup-port-offset>
- <backup-request-retries>-1</backup-request-retries>
- <backup-request-retry-interval>2000</backup-request-retry-interval>
- <max-backups>1</max-backups>
- <request-backup>true</request-backup>
- <master/>
- <slave/>
- </colocated>
- </shared-store>
- </ha-policy>
-
- <!-- 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>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/colocated-failover/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/colocated-failover/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/colocated-failover/src/main/resources/hornetq/server0/activemq-jms.xml
deleted file mode 100644
index 847659f..0000000
--- a/examples/jms/colocated-failover/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>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/colocated-failover/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/colocated-failover/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
[11/37] activemq-6 git commit: ACTIVEMQ6-41 Drop Java EE examples
Posted by jb...@apache.org.
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/mdb-cmt-setrollbackonly-with-dlq/server/standalone/configuration/standalone-example.xml
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-cmt-setrollbackonly-with-dlq/server/standalone/configuration/standalone-example.xml b/examples/javaee/mdb-cmt-setrollbackonly-with-dlq/server/standalone/configuration/standalone-example.xml
deleted file mode 100644
index 02c2dae..0000000
--- a/examples/javaee/mdb-cmt-setrollbackonly-with-dlq/server/standalone/configuration/standalone-example.xml
+++ /dev/null
@@ -1,494 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-
-<server xmlns="urn:jboss:domain:2.0">
- <extensions>
- <extension module="org.jboss.as.clustering.infinispan"/>
- <extension module="org.jboss.as.connector"/>
- <extension module="org.jboss.as.deployment-scanner"/>
- <extension module="org.jboss.as.ee"/>
- <extension module="org.jboss.as.ejb3"/>
- <extension module="org.jboss.as.jacorb"/>
- <extension module="org.jboss.as.jaxrs"/>
- <extension module="org.jboss.as.jdr"/>
- <extension module="org.jboss.as.jmx"/>
- <extension module="org.jboss.as.jpa"/>
- <extension module="org.jboss.as.jsf"/>
- <extension module="org.jboss.as.jsr77"/>
- <extension module="org.jboss.as.logging"/>
- <extension module="org.jboss.as.mail"/>
- <extension module="org.jboss.as.messaging"/>
- <extension module="org.jboss.as.naming"/>
- <extension module="org.jboss.as.pojo"/>
- <extension module="org.jboss.as.remoting"/>
- <extension module="org.jboss.as.sar"/>
- <extension module="org.jboss.as.security"/>
- <extension module="org.jboss.as.threads"/>
- <extension module="org.jboss.as.transactions"/>
- <extension module="org.jboss.as.webservices"/>
- <extension module="org.jboss.as.weld"/>
- <extension module="org.wildfly.extension.batch"/>
- <extension module="org.wildfly.extension.io"/>
- <extension module="org.wildfly.extension.undertow"/>
- </extensions>
- <management>
- <security-realms>
- <security-realm name="ManagementRealm">
- <authentication>
- <local default-user="$local"/>
- <properties path="mgmt-users.properties" relative-to="jboss.server.config.dir"/>
- </authentication>
- <authorization map-groups-to-roles="false">
- <properties path="mgmt-groups.properties" relative-to="jboss.server.config.dir"/>
- </authorization>
- </security-realm>
- <security-realm name="ApplicationRealm">
- <authentication>
- <local default-user="$local" allowed-users="*"/>
- <properties path="application-users.properties" relative-to="jboss.server.config.dir"/>
- </authentication>
- <authorization>
- <properties path="application-roles.properties" relative-to="jboss.server.config.dir"/>
- </authorization>
- </security-realm>
- </security-realms>
- <audit-log>
- <formatters>
- <json-formatter name="json-formatter"/>
- </formatters>
- <handlers>
- <file-handler name="file" formatter="json-formatter" relative-to="jboss.server.data.dir" path="audit-log.log"/>
- </handlers>
- <logger log-boot="true" log-read-only="false" enabled="false">
- <handlers>
- <handler name="file"/>
- </handlers>
- </logger>
- </audit-log>
- <management-interfaces>
- <http-interface security-realm="ManagementRealm" http-upgrade-enabled="true">
- <socket-binding http="management-http"/>
- </http-interface>
- </management-interfaces>
- <access-control provider="simple">
- <role-mapping>
- <role name="SuperUser">
- <include>
- <user name="$local"/>
- </include>
- </role>
- </role-mapping>
- </access-control>
- </management>
- <profile>
- <subsystem xmlns="urn:jboss:domain:logging:2.0">
- <console-handler name="CONSOLE">
- <level name="INFO"/>
- <formatter>
- <named-formatter name="COLOR-PATTERN"/>
- </formatter>
- </console-handler>
- <periodic-rotating-file-handler name="FILE" autoflush="true">
- <formatter>
- <named-formatter name="PATTERN"/>
- </formatter>
- <file relative-to="jboss.server.log.dir" path="server.log"/>
- <suffix value=".yyyy-MM-dd"/>
- <append value="true"/>
- </periodic-rotating-file-handler>
- <logger category="com.arjuna">
- <level name="WARN"/>
- </logger>
- <logger category="org.apache.tomcat.util.modeler">
- <level name="WARN"/>
- </logger>
- <logger category="org.jboss.as.config">
- <level name="DEBUG"/>
- </logger>
- <logger category="sun.rmi">
- <level name="WARN"/>
- </logger>
- <logger category="jacorb">
- <level name="WARN"/>
- </logger>
- <logger category="jacorb.config">
- <level name="ERROR"/>
- </logger>
- <root-logger>
- <level name="INFO"/>
- <handlers>
- <handler name="CONSOLE"/>
- <handler name="FILE"/>
- </handlers>
- </root-logger>
- <formatter name="PATTERN">
- <pattern-formatter pattern="%d{yyyy-MM-dd HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/>
- </formatter>
- <formatter name="COLOR-PATTERN">
- <pattern-formatter pattern="%K{level}%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/>
- </formatter>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:batch:1.0">
- <job-repository>
- <in-memory/>
- </job-repository>
- <thread-pool>
- <max-threads count="10"/>
- <keepalive-time time="100" unit="milliseconds"/>
- </thread-pool>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:datasources:2.0">
- <datasources>
- <datasource jndi-name="java:jboss/datasources/ExampleDS" pool-name="ExampleDS" enabled="true" use-java-context="true">
- <connection-url>jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE</connection-url>
- <driver>h2</driver>
- <security>
- <user-name>sa</user-name>
- <password>sa</password>
- </security>
- </datasource>
- <drivers>
- <driver name="h2" module="com.h2database.h2">
- <xa-datasource-class>org.h2.jdbcx.JdbcDataSource</xa-datasource-class>
- </driver>
- </drivers>
- </datasources>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:deployment-scanner:2.0">
- <deployment-scanner path="deployments" relative-to="jboss.server.base.dir" scan-interval="5000" runtime-failure-causes-rollback="${jboss.deployment.scanner.rollback.on.failure:false}"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:ee:2.0">
- <spec-descriptor-property-replacement>false</spec-descriptor-property-replacement>
- <jboss-descriptor-property-replacement>true</jboss-descriptor-property-replacement>
- <annotation-property-replacement>false</annotation-property-replacement>
- <concurrent>
- <context-services>
- <context-service name="default" jndi-name="java:jboss/ee/concurrency/context/default" use-transaction-setup-provider="true"/>
- </context-services>
- <managed-executor-services>
- <managed-executor-service name="default" jndi-name="java:jboss/ee/concurrency/executor/default" context-service="default" hung-task-threshold="60000" core-threads="5" max-threads="25" keepalive-time="5000"/>
- </managed-executor-services>
- <managed-scheduled-executor-services>
- <managed-scheduled-executor-service name="default" jndi-name="java:jboss/ee/concurrency/scheduler/default" context-service="default" hung-task-threshold="60000" core-threads="2" keepalive-time="3000"/>
- </managed-scheduled-executor-services>
- <managed-thread-factories>
- <managed-thread-factory name="default" jndi-name="java:jboss/ee/concurrency/factory/default" context-service="default"/>
- </managed-thread-factories>
- </concurrent>
- <default-bindings context-service="java:jboss/ee/concurrency/context/default" datasource="java:jboss/datasources/ExampleDS" jms-connection-factory="java:jboss/DefaultJMSConnectionFactory" managed-executor-service="java:jboss/ee/concurrency/executor/default" managed-scheduled-executor-service="java:jboss/ee/concurrency/scheduler/default" managed-thread-factory="java:jboss/ee/concurrency/factory/default"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:ejb3:2.0">
- <session-bean>
- <stateful default-access-timeout="5000" cache-ref="simple" passivation-disabled-cache-ref="simple"/>
- <singleton default-access-timeout="5000"/>
- </session-bean>
- <mdb>
- <resource-adapter-ref resource-adapter-name="${ejb.resource-adapter-name:activemq-ra.rar}"/>
- <bean-instance-pool-ref pool-name="mdb-strict-max-pool"/>
- </mdb>
- <pools>
- <bean-instance-pools>
- <!-- A sample strict max pool configuration -->
- <strict-max-pool name="slsb-strict-max-pool" max-pool-size="20" instance-acquisition-timeout="5" instance-acquisition-timeout-unit="MINUTES"/>
- <strict-max-pool name="mdb-strict-max-pool" max-pool-size="20" instance-acquisition-timeout="5" instance-acquisition-timeout-unit="MINUTES"/>
- </bean-instance-pools>
- </pools>
- <caches>
- <cache name="simple"/>
- <cache name="distributable" aliases="passivating clustered" passivation-store-ref="infinispan"/>
- </caches>
- <passivation-stores>
- <passivation-store name="infinispan" cache-container="ejb" max-size="10000"/>
- </passivation-stores>
- <async thread-pool-name="default"/>
- <timer-service thread-pool-name="default" default-data-store="default-file-store">
- <data-stores>
- <file-data-store name="default-file-store" path="timer-service-data" relative-to="jboss.server.data.dir"/>
- </data-stores>
- </timer-service>
- <remote connector-ref="http-remoting-connector" thread-pool-name="default"/>
- <thread-pools>
- <thread-pool name="default">
- <max-threads count="10"/>
- <keepalive-time time="100" unit="milliseconds"/>
- </thread-pool>
- </thread-pools>
- <iiop enable-by-default="false" use-qualified-name="false"/>
- <default-security-domain value="other"/>
- <default-missing-method-permissions-deny-access value="true"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:io:1.0">
- <worker name="default" io-threads="3"/>
- <buffer-pool name="default" buffer-size="16384" buffers-per-slice="128"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:infinispan:2.0">
- <cache-container name="web" default-cache="passivation" module="org.wildfly.clustering.web.infinispan">
- <local-cache name="passivation" batching="true">
- <file-store passivation="true" purge="false"/>
- </local-cache>
- <local-cache name="persistent" batching="true">
- <file-store passivation="false" purge="false"/>
- </local-cache>
- </cache-container>
- <cache-container name="ejb" aliases="sfsb" default-cache="passivation" module="org.wildfly.clustering.ejb.infinispan">
- <local-cache name="passivation" batching="true">
- <file-store passivation="true" purge="false"/>
- </local-cache>
- <local-cache name="persistent" batching="true">
- <file-store passivation="false" purge="false"/>
- </local-cache>
- </cache-container>
- <cache-container name="hibernate" default-cache="local-query" module="org.hibernate">
- <local-cache name="entity">
- <transaction mode="NON_XA"/>
- <eviction strategy="LRU" max-entries="10000"/>
- <expiration max-idle="100000"/>
- </local-cache>
- <local-cache name="local-query">
- <transaction mode="NONE"/>
- <eviction strategy="LRU" max-entries="10000"/>
- <expiration max-idle="100000"/>
- </local-cache>
- <local-cache name="timestamps">
- <transaction mode="NONE"/>
- <eviction strategy="NONE"/>
- </local-cache>
- </cache-container>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:jacorb:1.3">
- <orb socket-binding="jacorb" ssl-socket-binding="jacorb-ssl">
- <initializers transactions="spec" security="identity"/>
- </orb>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:jaxrs:1.0"/>
- <subsystem xmlns="urn:jboss:domain:jca:2.0">
- <archive-validation enabled="true" fail-on-error="true" fail-on-warn="false"/>
- <bean-validation enabled="true"/>
- <default-workmanager>
- <short-running-threads>
- <core-threads count="50"/>
- <queue-length count="50"/>
- <max-threads count="50"/>
- <keepalive-time time="10" unit="seconds"/>
- </short-running-threads>
- <long-running-threads>
- <core-threads count="50"/>
- <queue-length count="50"/>
- <max-threads count="50"/>
- <keepalive-time time="10" unit="seconds"/>
- </long-running-threads>
- </default-workmanager>
- <cached-connection-manager/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:jdr:1.0"/>
- <subsystem xmlns="urn:jboss:domain:jmx:1.3">
- <expose-resolved-model/>
- <expose-expression-model/>
- <remoting-connector/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:jpa:1.1">
- <jpa default-datasource="" default-extended-persistence-inheritance="DEEP"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:jsf:1.0"/>
- <subsystem xmlns="urn:jboss:domain:jsr77:1.0"/>
- <subsystem xmlns="urn:jboss:domain:mail:2.0">
- <mail-session name="default" jndi-name="java:jboss/mail/Default">
- <smtp-server outbound-socket-binding-ref="mail-smtp"/>
- </mail-session>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:messaging:2.0">
- <activemq-server>
- <persistence-enabled>true</persistence-enabled>
- <journal-file-size>102400</journal-file-size>
- <journal-min-files>2</journal-min-files>
- <connectors>
- <http-connector name="http-connector" socket-binding="http">
- <param key="http-upgrade-endpoint" value="http-acceptor"/>
- </http-connector>
- <http-connector name="http-connector-throughput" socket-binding="http">
- <param key="http-upgrade-endpoint" value="http-acceptor-throughput"/>
- <param key="batch-delay" value="50"/>
- </http-connector>
- <in-vm-connector name="in-vm" server-id="0"/>
- </connectors>
- <acceptors>
- <http-acceptor name="http-acceptor" http-listener="default"/>
- <http-acceptor name="http-acceptor-throughput" http-listener="default">
- <param key="batch-delay" value="50"/>
- <param key="direct-deliver" value="false"/>
- </http-acceptor>
- <in-vm-acceptor name="in-vm" server-id="0"/>
- </acceptors>
- <security-settings>
- <security-setting match="#">
- <permission type="send" roles="guest"/>
- <permission type="consume" roles="guest"/>
- <permission type="createNonDurableQueue" roles="guest"/>
- <permission type="deleteNonDurableQueue" roles="guest"/>
- </security-setting>
- </security-settings>
- <address-settings>
- <!--default for catch all-->
- <address-setting match="#">
- <dead-letter-address>jms.queue.dlq</dead-letter-address>
- <expiry-address>jms.queue.ExpiryQueue</expiry-address>
- <redelivery-delay>0</redelivery-delay>
- <max-delivery-attempts>1</max-delivery-attempts>
- <max-size-bytes>10485760</max-size-bytes>
- <address-full-policy>PAGE</address-full-policy>
- <page-size-bytes>2097152</page-size-bytes>
- <message-counter-history-day-limit>10</message-counter-history-day-limit>
- </address-setting>
- </address-settings>
- <jms-connection-factories>
- <connection-factory name="InVmConnectionFactory">
- <connectors>
- <connector-ref connector-name="in-vm"/>
- </connectors>
- <entries>
- <entry name="java:/ConnectionFactory"/>
- </entries>
- </connection-factory>
- <connection-factory name="RemoteConnectionFactory">
- <connectors>
- <connector-ref connector-name="http-connector"/>
- </connectors>
- <entries>
- <entry name="java:jboss/exported/jms/RemoteConnectionFactory"/>
- </entries>
- </connection-factory>
- <pooled-connection-factory name="activemq-ra">
- <transaction mode="xa"/>
- <connectors>
- <connector-ref connector-name="in-vm"/>
- </connectors>
- <entries>
- <entry name="java:/JmsXA"/>
- <!-- Global JNDI entry used to provide a default JMS Connection factory to EE application -->
- <entry name="java:jboss/DefaultJMSConnectionFactory"/>
- </entries>
- </pooled-connection-factory>
- </jms-connection-factories>
- <jms-destinations>
- <jms-queue name="dlq">
- <entry name="queue/dlq"/>
- <entry name="java:jboss/exported/jms/queues/dlq"/>
- </jms-queue>
- <jms-topic name="testTopic">
- <entry name="topic/testTopic"/>
- <entry name="java:jboss/exported/jms/topics/testTopic"/>
- </jms-topic>
- </jms-destinations>
- </activemq-server>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:naming:2.0">
- <remote-naming/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:pojo:1.0"/>
- <subsystem xmlns="urn:jboss:domain:remoting:2.0">
- <endpoint worker="default"/>
- <http-connector name="http-remoting-connector" connector-ref="default" security-realm="ApplicationRealm"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:resource-adapters:2.0"/>
- <subsystem xmlns="urn:jboss:domain:sar:1.0"/>
- <subsystem xmlns="urn:jboss:domain:security:1.2">
- <security-domains>
- <security-domain name="other" cache-type="default">
- <authentication>
- <login-module code="Remoting" flag="optional">
- <module-option name="password-stacking" value="useFirstPass"/>
- </login-module>
- <login-module code="RealmDirect" flag="required">
- <module-option name="password-stacking" value="useFirstPass"/>
- </login-module>
- </authentication>
- </security-domain>
- <security-domain name="jboss-web-policy" cache-type="default">
- <authorization>
- <policy-module code="Delegating" flag="required"/>
- </authorization>
- </security-domain>
- <security-domain name="jboss-ejb-policy" cache-type="default">
- <authorization>
- <policy-module code="Delegating" flag="required"/>
- </authorization>
- </security-domain>
- </security-domains>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:threads:1.1"/>
- <subsystem xmlns="urn:jboss:domain:transactions:2.0">
- <core-environment>
- <process-id>
- <uuid/>
- </process-id>
- </core-environment>
- <recovery-environment socket-binding="txn-recovery-environment" status-socket-binding="txn-status-manager"/>
- <coordinator-environment default-timeout="300"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:undertow:1.0">
- <buffer-caches>
- <buffer-cache name="default" buffer-size="1024" buffers-per-region="1024" max-regions="10"/>
- </buffer-caches>
- <server name="default-server">
- <http-listener name="default" socket-binding="http"/>
- <host name="default-host" alias="localhost">
- <location name="/" handler="welcome-content"/>
- <filter-ref name="server-header"/>
- <filter-ref name="x-powered-by-header"/>
- </host>
- </server>
- <servlet-container name="default" default-buffer-cache="default" stack-trace-on-error="local-only">
- <jsp-config/>
- </servlet-container>
- <handlers>
- <file name="welcome-content" path="${jboss.home.dir}/welcome-content" directory-listing="true"/>
- </handlers>
- <filters>
- <response-header name="server-header" header-name="Server" header-value="Wildfly 8"/>
- <response-header name="x-powered-by-header" header-name="X-Powered-By" header-value="Undertow 1"/>
- </filters>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:webservices:1.2">
- <modify-wsdl-address>true</modify-wsdl-address>
- <wsdl-host>${jboss.bind.address:127.0.0.1}</wsdl-host>
- <endpoint-config name="Standard-Endpoint-Config"/>
- <endpoint-config name="Recording-Endpoint-Config">
- <pre-handler-chain name="recording-handlers" protocol-bindings="##SOAP11_HTTP ##SOAP11_HTTP_MTOM ##SOAP12_HTTP ##SOAP12_HTTP_MTOM">
- <handler name="RecordingHandler" class="org.jboss.ws.common.invocation.RecordingServerHandler"/>
- </pre-handler-chain>
- </endpoint-config>
- <client-config name="Standard-Client-Config"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:weld:2.0"/>
- </profile>
- <interfaces>
- <interface name="management">
- <inet-address value="${jboss.bind.address.management:127.0.0.1}"/>
- </interface>
- <interface name="public">
- <inet-address value="${jboss.bind.address:127.0.0.1}"/>
- </interface>
- <!-- TODO - only show this if the jacorb subsystem is added -->
- <interface name="unsecure">
- <!--
- ~ Used for IIOP sockets in the standard configuration.
- ~ To secure JacORB you need to setup SSL
- -->
- <inet-address value="${jboss.bind.address.unsecure:127.0.0.1}"/>
- </interface>
- </interfaces>
- <socket-binding-group name="standard-sockets" default-interface="public" port-offset="${jboss.socket.binding.port-offset:0}">
- <socket-binding name="management-http" interface="management" port="${jboss.management.http.port:9990}"/>
- <socket-binding name="management-https" interface="management" port="${jboss.management.https.port:9993}"/>
- <socket-binding name="ajp" port="${jboss.ajp.port:8009}"/>
- <socket-binding name="http" port="${jboss.http.port:8080}"/>
- <socket-binding name="https" port="${jboss.https.port:8443}"/>
- <socket-binding name="jacorb" interface="unsecure" port="3528"/>
- <socket-binding name="jacorb-ssl" interface="unsecure" port="3529"/>
- <socket-binding name="messaging-group" port="0" multicast-address="${jboss.messaging.group.address:231.7.7.7}" multicast-port="${jboss.messaging.group.port:9876}"/>
- <socket-binding name="txn-recovery-environment" port="4712"/>
- <socket-binding name="txn-status-manager" port="4713"/>
- <outbound-socket-binding name="mail-smtp">
- <remote-destination host="localhost" port="25"/>
- </outbound-socket-binding>
- </socket-binding-group>
-</server>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/mdb-cmt-setrollbackonly-with-dlq/src/main/java/org/apache/activemq/javaee/example/MDB_CMT_SetRollbackOnlyWithDLQClientExample.java
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-cmt-setrollbackonly-with-dlq/src/main/java/org/apache/activemq/javaee/example/MDB_CMT_SetRollbackOnlyWithDLQClientExample.java b/examples/javaee/mdb-cmt-setrollbackonly-with-dlq/src/main/java/org/apache/activemq/javaee/example/MDB_CMT_SetRollbackOnlyWithDLQClientExample.java
deleted file mode 100644
index cd021f3..0000000
--- a/examples/javaee/mdb-cmt-setrollbackonly-with-dlq/src/main/java/org/apache/activemq/javaee/example/MDB_CMT_SetRollbackOnlyWithDLQClientExample.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.activemq.javaee.example;
-
-import javax.jms.Connection;
-import javax.jms.ConnectionFactory;
-import javax.jms.Destination;
-import javax.jms.MessageConsumer;
-import javax.jms.MessageProducer;
-import javax.jms.Queue;
-import javax.jms.Session;
-import javax.jms.TextMessage;
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import java.util.Properties;
-
-/**
- * @author Justin Bertram
- */
-public class MDB_CMT_SetRollbackOnlyWithDLQClientExample
-{
- public static void main(final String[] args) throws Exception
- {
- Connection connection = null;
- InitialContext initialContext = null;
- try
- {
- // Step 1. Create an initial context to perform the JNDI lookup.
- final Properties env = new Properties();
-
- env.put(Context.INITIAL_CONTEXT_FACTORY, "org.jboss.naming.remote.client.InitialContextFactory");
-
- env.put(Context.PROVIDER_URL, "http-remoting://localhost:8080");
-
- initialContext = new InitialContext(env);
-
- // Step 2. Perfom a lookup on the destination
- Destination destination = (Destination) initialContext.lookup("jms/topics/testTopic");
-
- // Step 3. Perform a lookup on the Connection Factory
- ConnectionFactory cf = (ConnectionFactory)initialContext.lookup("/jms/RemoteConnectionFactory");
-
- // Step 4.Create a JMS Connection
- connection = cf.createConnection("guest", "password");
-
- // Step 5. Create a JMS Session
- Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
-
- // Step 6. Create a JMS Message Producer
- MessageProducer producer = session.createProducer(destination);
-
- // Step 7. Create a Text Message
- TextMessage message = session.createTextMessage("This is a text message");
-
- // Step 8. Send the Message
- producer.send(message);
-
- System.out.println("Sent message: " + message.getText());
-
- // Step 9, 10, and 11 in MDB_CMT_SetRollbackOnlyWithDLQExample
-
- // Step 12. Perform a lookup on the DLQ
- destination = (Destination) initialContext.lookup("jms/queues/dlq");
-
- // Step 13. Create the consumer and start the connection
- MessageConsumer consumer = session.createConsumer(destination);
- connection.start();
-
- // Step 14. Receive the message.
- message = (TextMessage) consumer.receive(3000);
-
- // Step 15. Print the special DLQ properties
- System.out.println("Original address: " + message.getStringProperty("_HQ_ORIG_ADDRESS"));
- System.out.println("Original queue: " + message.getStringProperty("_HQ_ORIG_QUEUE"));
- }
- finally
- {
- // Step 16. Be sure to close our JMS resources!
- if (initialContext != null)
- {
- initialContext.close();
- }
- if (connection != null)
- {
- connection.close();
- }
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/mdb-cmt-setrollbackonly-with-dlq/src/main/java/org/apache/activemq/javaee/example/server/MDB_CMT_SetRollbackOnlyWithDLQExample.java
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-cmt-setrollbackonly-with-dlq/src/main/java/org/apache/activemq/javaee/example/server/MDB_CMT_SetRollbackOnlyWithDLQExample.java b/examples/javaee/mdb-cmt-setrollbackonly-with-dlq/src/main/java/org/apache/activemq/javaee/example/server/MDB_CMT_SetRollbackOnlyWithDLQExample.java
deleted file mode 100644
index 0958fae..0000000
--- a/examples/javaee/mdb-cmt-setrollbackonly-with-dlq/src/main/java/org/apache/activemq/javaee/example/server/MDB_CMT_SetRollbackOnlyWithDLQExample.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.activemq.javaee.example.server;
-
-import javax.annotation.Resource;
-import javax.ejb.ActivationConfigProperty;
-import javax.ejb.MessageDriven;
-import javax.ejb.MessageDrivenContext;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
-import javax.ejb.TransactionManagement;
-import javax.ejb.TransactionManagementType;
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.MessageListener;
-import javax.jms.TextMessage;
-
-import org.jboss.ejb3.annotation.ResourceAdapter;
-
-/**
- * @author Justin Bertram
- */
-@MessageDriven(name = "MDB_CMT_SetRollbackOnlyWithDLQExample",
- activationConfig =
- {
- @ActivationConfigProperty(propertyName = "destinationType", propertyValue = "javax.jms.Topic"),
- @ActivationConfigProperty(propertyName = "destination", propertyValue = "topic/testTopic"),
- @ActivationConfigProperty(propertyName = "subscriptionDurability", propertyValue = "Durable"),
- @ActivationConfigProperty(propertyName = "clientID", propertyValue = "myClientID"),
- @ActivationConfigProperty(propertyName = "subscriptionName",propertyValue = "mySubscriptionName")
- })
-public class MDB_CMT_SetRollbackOnlyWithDLQExample implements MessageListener
-{
- @Resource
- MessageDrivenContext ctx;
-
- public void onMessage(final Message message)
- {
- try
- {
- // Step 9. We know the client is sending a text message so we cast
- TextMessage textMessage = (TextMessage)message;
-
- // Step 10. get the text from the message.
- String text = textMessage.getText();
- System.out.println("message " + text + " received");
-
- // Step 11. rollback delivery of message to send to DLQ
- ctx.setRollbackOnly();
- }
- catch (JMSException e)
- {
- e.printStackTrace();
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/mdb-cmt-setrollbackonly-with-dlq/src/test/java/org/apache/activemq/javaee/example/MDBCMTSetRollbackOnlyWithDLQRunnerTest.java
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-cmt-setrollbackonly-with-dlq/src/test/java/org/apache/activemq/javaee/example/MDBCMTSetRollbackOnlyWithDLQRunnerTest.java b/examples/javaee/mdb-cmt-setrollbackonly-with-dlq/src/test/java/org/apache/activemq/javaee/example/MDBCMTSetRollbackOnlyWithDLQRunnerTest.java
deleted file mode 100644
index 48e8346..0000000
--- a/examples/javaee/mdb-cmt-setrollbackonly-with-dlq/src/test/java/org/apache/activemq/javaee/example/MDBCMTSetRollbackOnlyWithDLQRunnerTest.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.activemq.javaee.example;
-
-import org.apache.activemq.javaee.example.server.MDB_CMT_SetRollbackOnlyWithDLQExample;
-import org.jboss.arquillian.container.test.api.Deployment;
-import org.jboss.arquillian.container.test.api.RunAsClient;
-import org.jboss.arquillian.junit.Arquillian;
-import org.jboss.shrinkwrap.api.Archive;
-import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.spec.JavaArchive;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-/**
- * @author Justin Bertram
- */
-@RunAsClient
-@RunWith(Arquillian.class)
-public class MDBCMTSetRollbackOnlyWithDLQRunnerTest
-{
- @Deployment
- public static Archive getDeployment()
- {
- final JavaArchive ejbJar = ShrinkWrap.create(JavaArchive.class, "mdb.jar");
- ejbJar.addClass(MDB_CMT_SetRollbackOnlyWithDLQExample.class);
- System.out.println(ejbJar.toString(true));
- return ejbJar;
- }
-
- @Test
- public void runExample() throws Exception
- {
- MDB_CMT_SetRollbackOnlyWithDLQClientExample.main(null);
- //give the example time to run
- Thread.sleep(1000);
- }
-}
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/mdb-cmt-setrollbackonly-with-dlq/src/test/resources/arquillian.xml
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-cmt-setrollbackonly-with-dlq/src/test/resources/arquillian.xml b/examples/javaee/mdb-cmt-setrollbackonly-with-dlq/src/test/resources/arquillian.xml
deleted file mode 100644
index 9090137..0000000
--- a/examples/javaee/mdb-cmt-setrollbackonly-with-dlq/src/test/resources/arquillian.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<arquillian xmlns="http://jboss.org/schema/arquillian"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://jboss.org/schema/arquillian http://jboss.org/schema/arquillian/arquillian_1_0.xsd">
-
- <!-- Uncomment to have test archives exported to the file system for inspection.
-This feature can also be controlled using the system property arquillian.deploymentExportPath -->
- <!--
-<engine>
-<property name="deploymentExportPath">target</property>
-</engine>
--->
-
- <defaultProtocol type="Servlet 3.0" />
-
- <container qualifier="jboss" default="true">
- <configuration>
- <property name="jbossHome">${basedir}/target/jbossas-node0</property>
- <property name="serverConfig">standalone-example.xml</property>
- <property name="allowConnectingToRunningServer">true</property>
- <property name="managementAddress">${node0:127.0.0.1}</property>
- </configuration>
- </container>
-
- <!-- logThreshold proposed -->
- <!--
-<container qualifier="jbossas-managed">
-<configuration>
-<property name="logThreshold">ERROR</property>
-</configuration>
-</container>
--->
-
-</arquillian>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/mdb-cmt-setrollbackonly/pom.xml
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-cmt-setrollbackonly/pom.xml b/examples/javaee/mdb-cmt-setrollbackonly/pom.xml
deleted file mode 100644
index 77bed01..0000000
--- a/examples/javaee/mdb-cmt-setrollbackonly/pom.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.activemq.example.javaee</groupId>
- <artifactId>javaee-examples</artifactId>
- <version>6.0.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>activemq-javaee-mdb-cmt-setrollbackonly-example</artifactId>
- <packaging>jar</packaging>
- <name>ActiveMQ6 Java EE MDB CMT set rollback only Example</name>
-</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/mdb-cmt-setrollbackonly/readme.html
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-cmt-setrollbackonly/readme.html b/examples/javaee/mdb-cmt-setrollbackonly/readme.html
deleted file mode 100644
index fce48e4..0000000
--- a/examples/javaee/mdb-cmt-setrollbackonly/readme.html
+++ /dev/null
@@ -1,112 +0,0 @@
-<html>
- <head>
- <title>ActiveMQ Java EE MDB SetRollbackOnly Example</title>
- <link rel="stylesheet" type="text/css" href="../../common/common.css" />
- <link rel="stylesheet" type="text/css" href="../../common/prettify.css" />
- <script type="text/javascript" src="../../common/prettify.js"></script>
- </head>
- <body onload="prettyPrint()">
- <h1>Java EE MDB SetRollbackOnly Example</h1>
-
- <p>This example shows you how to send a message to an MDB and then roll back the transaction forcing re delivery</p>
- <p>The example will send deploy a simple MDB and demonstrate sending a message and the MDB consuming it twice.</p>
-
- <p>The example leverages the JBoss Arquillian framework to run a WildFly instance and deploy the MDB.</p>
-
- <h2>Example step-by-step</h2>
-
- <p><i>download WildFly 8.0.0.Final from <a href="http://wildfly.org/downloads/">here</a> and install.</i></p>
- <p><i>set the JBOSS_HOME property to point to the WildFly install directory</i></p>
- <p><i>type <code>mvn verify</code> from the example directory to run</i></p>
-
- <ol>
- <li>First we need to get an initial context so we can look-up the JMS connection factory and destination objects from JNDI. This initial context will get it's properties from the <code>jndi.properties</code> file in the directory <code>config</code></li>
- <pre class="prettyprint">
- final Properties env = new Properties();
-
- env.put(Context.INITIAL_CONTEXT_FACTORY, "org.jboss.naming.remote.client.InitialContextFactory");
-
- env.put(Context.PROVIDER_URL, "http-remoting://localhost:8080");
-
- initialContext = new InitialContext(env);
- </pre>
-
- <li>We look up the JMS queue object from JNDI</li>
- <pre class="prettyprint">
- Queue queue = (Queue)initialContext.lookup("jms/queues/testQueue");
- </pre>
-
- <li>We look up the JMS connection factory object from JNDI</li>
- <pre class="prettyprint">
- ConnectionFactory cf = (ConnectionFactory)initialContext.lookup("/jms/RemoteConnectionFactory");
- </pre>
-
- <li>We create a JMS connection</li>
- <pre class="prettyprint">
- connection = cf.createConnection("guest", "password");
- </pre>
-
- <li>We create a JMS session. The session is created as non transacted and will auto acknowledge messages.</li>
- <pre class="prettyprint">
- Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
- </pre>
-
- <li>We create a JMS message producer on the session. This will be used to send the messages.</li>
- <pre class="prettyprint">
- MessageProducer messageProducer = session.createProducer(queue);
- </pre>
-
- <li>We create a JMS text messages that we are going to send.</li>
- <pre class="prettyprint">
- TextMessage message = session.createTextMessage("This is a text message");
- </pre>
-
- <li>We send messages to the queue</li>
- <pre class="prettyprint">
- messageProducer.send(message);
- </pre>
-
- <li>The MDB receives the message<br />
- We know the message is a TextMessage so we cast to it.
- </li>
- <pre class="prettyprint">
- TextMessage tm = (TextMessage)message;
- </pre>
-
- <li>The MDB gets the text and prints it, if its the first time we roll back
- </li>
- <pre class="prettyprint">
- String text = textMessage.getText();
-
- if(!textMessage.getJMSRedelivered())
- {
- //Step 11. rollback delivery of message if the first time
- System.out.println("message " + text + " received for the first time");
- ctx.setRollbackOnly();
- }
- </pre>
-
- <li>The message is received again but this time we just print the text
- </li>
- <pre class="prettyprint">
- System.out.println("message " + text + " received for the second time");
- </pre>
-
- <li>And finally, <b>always</b> remember to close your JMS connections and resources after use, in a <code>finally</code> block. Closing a JMS connection will automatically close all of its sessions, consumers, producer and browser objects</li>
-
- <pre class="prettyprint">
- finally
- {
- if (initialContext != null)
- {
- initialContext.close();
- }
- if (connection != null)
- {
- connection.close();
- }
- }
- </pre>
- </ol>
- </body>
-</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/mdb-cmt-setrollbackonly/server/standalone/configuration/application-roles.properties
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-cmt-setrollbackonly/server/standalone/configuration/application-roles.properties b/examples/javaee/mdb-cmt-setrollbackonly/server/standalone/configuration/application-roles.properties
deleted file mode 100644
index 0ade8fb..0000000
--- a/examples/javaee/mdb-cmt-setrollbackonly/server/standalone/configuration/application-roles.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# Properties declaration of users roles for the realm 'ApplicationRealm'.
-#
-# This includes the following protocols: remote ejb, remote jndi, web, remote jms
-#
-# Users can be added to this properties file at any time, updates after the server has started
-# will be automatically detected.
-#
-# The format of this file is as follows: -
-# username=role1,role2,role3
-#
-# A utility script is provided which can be executed from the bin folder to add the users: -
-# - Linux
-# bin/add-user.sh
-#
-# - Windows
-# bin\add-user.bat
-#
-# The following illustrates how an admin user could be defined.
-#
-#admin=PowerUser,BillingAdmin,
-guest=guest
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/mdb-cmt-setrollbackonly/server/standalone/configuration/application-users.properties
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-cmt-setrollbackonly/server/standalone/configuration/application-users.properties b/examples/javaee/mdb-cmt-setrollbackonly/server/standalone/configuration/application-users.properties
deleted file mode 100644
index c52e923..0000000
--- a/examples/javaee/mdb-cmt-setrollbackonly/server/standalone/configuration/application-users.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# Properties declaration of users for the realm 'ApplicationRealm' which is the default realm
-# for application services on a new AS 7.1 installation.
-#
-# This includes the following protocols: remote ejb, remote jndi, web, remote jms
-#
-# Users can be added to this properties file at any time, updates after the server has started
-# will be automatically detected.
-#
-# The format of this realm is as follows: -
-# username=HEX( MD5( username ':' realm ':' password))
-#
-# A utility script is provided which can be executed from the bin folder to add the users: -
-# - Linux
-# bin/add-user.sh
-#
-# - Windows
-# bin\add-user.bat
-#
-# The following illustrates how an admin user could be defined, this
-# is for illustration only and does not correspond to a usable password.
-#
-#admin=2a0923285184943425d1f53ddd58ec7a
-guest=3437456520927d113b17d471d630e0d6
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/mdb-cmt-setrollbackonly/server/standalone/configuration/logging.properties
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-cmt-setrollbackonly/server/standalone/configuration/logging.properties b/examples/javaee/mdb-cmt-setrollbackonly/server/standalone/configuration/logging.properties
deleted file mode 100644
index 3fa31b0..0000000
--- a/examples/javaee/mdb-cmt-setrollbackonly/server/standalone/configuration/logging.properties
+++ /dev/null
@@ -1,47 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# Additional logger names to configure (root logger is always configured)
-loggers=org.jboss.as.config
-
-# Dump system environment at boot by default
-logger.org.jboss.as.config.level=DEBUG
-
-# Root logger level
-logger.level=${jboss.boot.server.log.level:INFO}
-# Root logger handlers
-logger.handlers=FILE,CONSOLE
-
-# Console handler configuration
-handler.CONSOLE=org.jboss.logmanager.handlers.ConsoleHandler
-handler.CONSOLE.properties=autoFlush
-handler.CONSOLE.level=${jboss.boot.server.log.console.level:INFO}
-handler.CONSOLE.autoFlush=true
-handler.CONSOLE.formatter=PATTERN
-
-# File handler configuration
-handler.FILE=org.jboss.logmanager.handlers.FileHandler
-handler.FILE.level=DEBUG
-handler.FILE.properties=autoFlush,fileName
-handler.FILE.autoFlush=true
-handler.FILE.fileName=${org.jboss.boot.log.file:boot.log}
-handler.FILE.formatter=PATTERN
-
-# Formatter pattern configuration
-formatter.PATTERN=org.jboss.logmanager.formatters.PatternFormatter
-formatter.PATTERN.properties=pattern
-formatter.PATTERN.pattern=%d{HH:mm:ss,SSS} %-5p [%c] %s%E%n
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/mdb-cmt-setrollbackonly/server/standalone/configuration/mgmt-users.properties
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-cmt-setrollbackonly/server/standalone/configuration/mgmt-users.properties b/examples/javaee/mdb-cmt-setrollbackonly/server/standalone/configuration/mgmt-users.properties
deleted file mode 100644
index 349b004..0000000
--- a/examples/javaee/mdb-cmt-setrollbackonly/server/standalone/configuration/mgmt-users.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# Properties declaration of users for the realm 'ManagementRealm' which is the default realm
-# for new AS 7.1 installations. Further authentication mechanism can be configured
-# as part of the <management /> in standalone.xml.
-#
-# Users can be added to this properties file at any time, updates after the server has started
-# will be automatically detected.
-#
-# By default the properties realm expects the entries to be in the format: -
-# username=HEX( MD5( username ':' realm ':' password))
-#
-# A utility script is provided which can be executed from the bin folder to add the users: -
-# - Linux
-# bin/add-user.sh
-#
-# - Windows
-# bin\add-user.bat
-
-# The following illustrates how an admin user could be defined, this
-# is for illustration only and does not correspond to a usable password.
-#
-#admin=2a0923285184943425d1f53ddd58ec7a
-admin=9d71b431e53d99563aa0dfca628c970b
-andy=dfb16391f1be1c454b5bce9822bd9df3
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/mdb-cmt-setrollbackonly/server/standalone/configuration/standalone-example.xml
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-cmt-setrollbackonly/server/standalone/configuration/standalone-example.xml b/examples/javaee/mdb-cmt-setrollbackonly/server/standalone/configuration/standalone-example.xml
deleted file mode 100644
index be39676..0000000
--- a/examples/javaee/mdb-cmt-setrollbackonly/server/standalone/configuration/standalone-example.xml
+++ /dev/null
@@ -1,489 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-
-<server xmlns="urn:jboss:domain:2.0">
- <extensions>
- <extension module="org.jboss.as.clustering.infinispan"/>
- <extension module="org.jboss.as.connector"/>
- <extension module="org.jboss.as.deployment-scanner"/>
- <extension module="org.jboss.as.ee"/>
- <extension module="org.jboss.as.ejb3"/>
- <extension module="org.jboss.as.jacorb"/>
- <extension module="org.jboss.as.jaxrs"/>
- <extension module="org.jboss.as.jdr"/>
- <extension module="org.jboss.as.jmx"/>
- <extension module="org.jboss.as.jpa"/>
- <extension module="org.jboss.as.jsf"/>
- <extension module="org.jboss.as.jsr77"/>
- <extension module="org.jboss.as.logging"/>
- <extension module="org.jboss.as.mail"/>
- <extension module="org.jboss.as.messaging"/>
- <extension module="org.jboss.as.naming"/>
- <extension module="org.jboss.as.pojo"/>
- <extension module="org.jboss.as.remoting"/>
- <extension module="org.jboss.as.sar"/>
- <extension module="org.jboss.as.security"/>
- <extension module="org.jboss.as.threads"/>
- <extension module="org.jboss.as.transactions"/>
- <extension module="org.jboss.as.webservices"/>
- <extension module="org.jboss.as.weld"/>
- <extension module="org.wildfly.extension.batch"/>
- <extension module="org.wildfly.extension.io"/>
- <extension module="org.wildfly.extension.undertow"/>
- </extensions>
- <management>
- <security-realms>
- <security-realm name="ManagementRealm">
- <authentication>
- <local default-user="$local"/>
- <properties path="mgmt-users.properties" relative-to="jboss.server.config.dir"/>
- </authentication>
- <authorization map-groups-to-roles="false">
- <properties path="mgmt-groups.properties" relative-to="jboss.server.config.dir"/>
- </authorization>
- </security-realm>
- <security-realm name="ApplicationRealm">
- <authentication>
- <local default-user="$local" allowed-users="*"/>
- <properties path="application-users.properties" relative-to="jboss.server.config.dir"/>
- </authentication>
- <authorization>
- <properties path="application-roles.properties" relative-to="jboss.server.config.dir"/>
- </authorization>
- </security-realm>
- </security-realms>
- <audit-log>
- <formatters>
- <json-formatter name="json-formatter"/>
- </formatters>
- <handlers>
- <file-handler name="file" formatter="json-formatter" relative-to="jboss.server.data.dir" path="audit-log.log"/>
- </handlers>
- <logger log-boot="true" log-read-only="false" enabled="false">
- <handlers>
- <handler name="file"/>
- </handlers>
- </logger>
- </audit-log>
- <management-interfaces>
- <http-interface security-realm="ManagementRealm" http-upgrade-enabled="true">
- <socket-binding http="management-http"/>
- </http-interface>
- </management-interfaces>
- <access-control provider="simple">
- <role-mapping>
- <role name="SuperUser">
- <include>
- <user name="$local"/>
- </include>
- </role>
- </role-mapping>
- </access-control>
- </management>
- <profile>
- <subsystem xmlns="urn:jboss:domain:logging:2.0">
- <console-handler name="CONSOLE">
- <level name="INFO"/>
- <formatter>
- <named-formatter name="COLOR-PATTERN"/>
- </formatter>
- </console-handler>
- <periodic-rotating-file-handler name="FILE" autoflush="true">
- <formatter>
- <named-formatter name="PATTERN"/>
- </formatter>
- <file relative-to="jboss.server.log.dir" path="server.log"/>
- <suffix value=".yyyy-MM-dd"/>
- <append value="true"/>
- </periodic-rotating-file-handler>
- <logger category="com.arjuna">
- <level name="WARN"/>
- </logger>
- <logger category="org.apache.tomcat.util.modeler">
- <level name="WARN"/>
- </logger>
- <logger category="org.jboss.as.config">
- <level name="DEBUG"/>
- </logger>
- <logger category="sun.rmi">
- <level name="WARN"/>
- </logger>
- <logger category="jacorb">
- <level name="WARN"/>
- </logger>
- <logger category="jacorb.config">
- <level name="ERROR"/>
- </logger>
- <root-logger>
- <level name="INFO"/>
- <handlers>
- <handler name="CONSOLE"/>
- <handler name="FILE"/>
- </handlers>
- </root-logger>
- <formatter name="PATTERN">
- <pattern-formatter pattern="%d{yyyy-MM-dd HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/>
- </formatter>
- <formatter name="COLOR-PATTERN">
- <pattern-formatter pattern="%K{level}%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/>
- </formatter>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:batch:1.0">
- <job-repository>
- <in-memory/>
- </job-repository>
- <thread-pool>
- <max-threads count="10"/>
- <keepalive-time time="100" unit="milliseconds"/>
- </thread-pool>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:datasources:2.0">
- <datasources>
- <datasource jndi-name="java:jboss/datasources/ExampleDS" pool-name="ExampleDS" enabled="true" use-java-context="true">
- <connection-url>jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE</connection-url>
- <driver>h2</driver>
- <security>
- <user-name>sa</user-name>
- <password>sa</password>
- </security>
- </datasource>
- <drivers>
- <driver name="h2" module="com.h2database.h2">
- <xa-datasource-class>org.h2.jdbcx.JdbcDataSource</xa-datasource-class>
- </driver>
- </drivers>
- </datasources>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:deployment-scanner:2.0">
- <deployment-scanner path="deployments" relative-to="jboss.server.base.dir" scan-interval="5000" runtime-failure-causes-rollback="${jboss.deployment.scanner.rollback.on.failure:false}"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:ee:2.0">
- <spec-descriptor-property-replacement>false</spec-descriptor-property-replacement>
- <jboss-descriptor-property-replacement>true</jboss-descriptor-property-replacement>
- <annotation-property-replacement>false</annotation-property-replacement>
- <concurrent>
- <context-services>
- <context-service name="default" jndi-name="java:jboss/ee/concurrency/context/default" use-transaction-setup-provider="true"/>
- </context-services>
- <managed-executor-services>
- <managed-executor-service name="default" jndi-name="java:jboss/ee/concurrency/executor/default" context-service="default" hung-task-threshold="60000" core-threads="5" max-threads="25" keepalive-time="5000"/>
- </managed-executor-services>
- <managed-scheduled-executor-services>
- <managed-scheduled-executor-service name="default" jndi-name="java:jboss/ee/concurrency/scheduler/default" context-service="default" hung-task-threshold="60000" core-threads="2" keepalive-time="3000"/>
- </managed-scheduled-executor-services>
- <managed-thread-factories>
- <managed-thread-factory name="default" jndi-name="java:jboss/ee/concurrency/factory/default" context-service="default"/>
- </managed-thread-factories>
- </concurrent>
- <default-bindings context-service="java:jboss/ee/concurrency/context/default" datasource="java:jboss/datasources/ExampleDS" jms-connection-factory="java:jboss/DefaultJMSConnectionFactory" managed-executor-service="java:jboss/ee/concurrency/executor/default" managed-scheduled-executor-service="java:jboss/ee/concurrency/scheduler/default" managed-thread-factory="java:jboss/ee/concurrency/factory/default"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:ejb3:2.0">
- <session-bean>
- <stateful default-access-timeout="5000" cache-ref="simple" passivation-disabled-cache-ref="simple"/>
- <singleton default-access-timeout="5000"/>
- </session-bean>
- <mdb>
- <resource-adapter-ref resource-adapter-name="${ejb.resource-adapter-name:activemq-ra.rar}"/>
- <bean-instance-pool-ref pool-name="mdb-strict-max-pool"/>
- </mdb>
- <pools>
- <bean-instance-pools>
- <!-- A sample strict max pool configuration -->
- <strict-max-pool name="slsb-strict-max-pool" max-pool-size="20" instance-acquisition-timeout="5" instance-acquisition-timeout-unit="MINUTES"/>
- <strict-max-pool name="mdb-strict-max-pool" max-pool-size="20" instance-acquisition-timeout="5" instance-acquisition-timeout-unit="MINUTES"/>
- </bean-instance-pools>
- </pools>
- <caches>
- <cache name="simple"/>
- <cache name="distributable" aliases="passivating clustered" passivation-store-ref="infinispan"/>
- </caches>
- <passivation-stores>
- <passivation-store name="infinispan" cache-container="ejb" max-size="10000"/>
- </passivation-stores>
- <async thread-pool-name="default"/>
- <timer-service thread-pool-name="default" default-data-store="default-file-store">
- <data-stores>
- <file-data-store name="default-file-store" path="timer-service-data" relative-to="jboss.server.data.dir"/>
- </data-stores>
- </timer-service>
- <remote connector-ref="http-remoting-connector" thread-pool-name="default"/>
- <thread-pools>
- <thread-pool name="default">
- <max-threads count="10"/>
- <keepalive-time time="100" unit="milliseconds"/>
- </thread-pool>
- </thread-pools>
- <iiop enable-by-default="false" use-qualified-name="false"/>
- <default-security-domain value="other"/>
- <default-missing-method-permissions-deny-access value="true"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:io:1.0">
- <worker name="default" io-threads="3"/>
- <buffer-pool name="default" buffer-size="16384" buffers-per-slice="128"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:infinispan:2.0">
- <cache-container name="web" default-cache="passivation" module="org.wildfly.clustering.web.infinispan">
- <local-cache name="passivation" batching="true">
- <file-store passivation="true" purge="false"/>
- </local-cache>
- <local-cache name="persistent" batching="true">
- <file-store passivation="false" purge="false"/>
- </local-cache>
- </cache-container>
- <cache-container name="ejb" aliases="sfsb" default-cache="passivation" module="org.wildfly.clustering.ejb.infinispan">
- <local-cache name="passivation" batching="true">
- <file-store passivation="true" purge="false"/>
- </local-cache>
- <local-cache name="persistent" batching="true">
- <file-store passivation="false" purge="false"/>
- </local-cache>
- </cache-container>
- <cache-container name="hibernate" default-cache="local-query" module="org.hibernate">
- <local-cache name="entity">
- <transaction mode="NON_XA"/>
- <eviction strategy="LRU" max-entries="10000"/>
- <expiration max-idle="100000"/>
- </local-cache>
- <local-cache name="local-query">
- <transaction mode="NONE"/>
- <eviction strategy="LRU" max-entries="10000"/>
- <expiration max-idle="100000"/>
- </local-cache>
- <local-cache name="timestamps">
- <transaction mode="NONE"/>
- <eviction strategy="NONE"/>
- </local-cache>
- </cache-container>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:jacorb:1.3">
- <orb socket-binding="jacorb" ssl-socket-binding="jacorb-ssl">
- <initializers transactions="spec" security="identity"/>
- </orb>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:jaxrs:1.0"/>
- <subsystem xmlns="urn:jboss:domain:jca:2.0">
- <archive-validation enabled="true" fail-on-error="true" fail-on-warn="false"/>
- <bean-validation enabled="true"/>
- <default-workmanager>
- <short-running-threads>
- <core-threads count="50"/>
- <queue-length count="50"/>
- <max-threads count="50"/>
- <keepalive-time time="10" unit="seconds"/>
- </short-running-threads>
- <long-running-threads>
- <core-threads count="50"/>
- <queue-length count="50"/>
- <max-threads count="50"/>
- <keepalive-time time="10" unit="seconds"/>
- </long-running-threads>
- </default-workmanager>
- <cached-connection-manager/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:jdr:1.0"/>
- <subsystem xmlns="urn:jboss:domain:jmx:1.3">
- <expose-resolved-model/>
- <expose-expression-model/>
- <remoting-connector/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:jpa:1.1">
- <jpa default-datasource="" default-extended-persistence-inheritance="DEEP"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:jsf:1.0"/>
- <subsystem xmlns="urn:jboss:domain:jsr77:1.0"/>
- <subsystem xmlns="urn:jboss:domain:mail:2.0">
- <mail-session name="default" jndi-name="java:jboss/mail/Default">
- <smtp-server outbound-socket-binding-ref="mail-smtp"/>
- </mail-session>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:messaging:2.0">
- <activemq-server>
- <persistence-enabled>true</persistence-enabled>
- <journal-file-size>102400</journal-file-size>
- <journal-min-files>2</journal-min-files>
- <connectors>
- <http-connector name="http-connector" socket-binding="http">
- <param key="http-upgrade-endpoint" value="http-acceptor"/>
- </http-connector>
- <http-connector name="http-connector-throughput" socket-binding="http">
- <param key="http-upgrade-endpoint" value="http-acceptor-throughput"/>
- <param key="batch-delay" value="50"/>
- </http-connector>
- <in-vm-connector name="in-vm" server-id="0"/>
- </connectors>
- <acceptors>
- <http-acceptor name="http-acceptor" http-listener="default"/>
- <http-acceptor name="http-acceptor-throughput" http-listener="default">
- <param key="batch-delay" value="50"/>
- <param key="direct-deliver" value="false"/>
- </http-acceptor>
- <in-vm-acceptor name="in-vm" server-id="0"/>
- </acceptors>
- <security-settings>
- <security-setting match="#">
- <permission type="send" roles="guest"/>
- <permission type="consume" roles="guest"/>
- <permission type="createNonDurableQueue" roles="guest"/>
- <permission type="deleteNonDurableQueue" roles="guest"/>
- </security-setting>
- </security-settings>
- <address-settings>
- <!--default for catch all-->
- <address-setting match="#">
- <dead-letter-address>jms.queue.DLQ</dead-letter-address>
- <expiry-address>jms.queue.ExpiryQueue</expiry-address>
- <redelivery-delay>0</redelivery-delay>
- <max-size-bytes>10485760</max-size-bytes>
- <address-full-policy>PAGE</address-full-policy>
- <page-size-bytes>2097152</page-size-bytes>
- <message-counter-history-day-limit>10</message-counter-history-day-limit>
- </address-setting>
- </address-settings>
- <jms-connection-factories>
- <connection-factory name="InVmConnectionFactory">
- <connectors>
- <connector-ref connector-name="in-vm"/>
- </connectors>
- <entries>
- <entry name="java:/ConnectionFactory"/>
- </entries>
- </connection-factory>
- <connection-factory name="RemoteConnectionFactory">
- <connectors>
- <connector-ref connector-name="http-connector"/>
- </connectors>
- <entries>
- <entry name="java:jboss/exported/jms/RemoteConnectionFactory"/>
- </entries>
- </connection-factory>
- <pooled-connection-factory name="activemq-ra">
- <transaction mode="xa"/>
- <connectors>
- <connector-ref connector-name="in-vm"/>
- </connectors>
- <entries>
- <entry name="java:/JmsXA"/>
- <!-- Global JNDI entry used to provide a default JMS Connection factory to EE application -->
- <entry name="java:jboss/DefaultJMSConnectionFactory"/>
- </entries>
- </pooled-connection-factory>
- </jms-connection-factories>
- <jms-destinations>
- <jms-queue name="testQueue">
- <entry name="queue/test"/>
- <entry name="java:jboss/exported/jms/queues/testQueue"/>
- </jms-queue>
- </jms-destinations>
- </activemq-server>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:naming:2.0">
- <remote-naming/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:pojo:1.0"/>
- <subsystem xmlns="urn:jboss:domain:remoting:2.0">
- <endpoint worker="default"/>
- <http-connector name="http-remoting-connector" connector-ref="default" security-realm="ApplicationRealm"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:resource-adapters:2.0"/>
- <subsystem xmlns="urn:jboss:domain:sar:1.0"/>
- <subsystem xmlns="urn:jboss:domain:security:1.2">
- <security-domains>
- <security-domain name="other" cache-type="default">
- <authentication>
- <login-module code="Remoting" flag="optional">
- <module-option name="password-stacking" value="useFirstPass"/>
- </login-module>
- <login-module code="RealmDirect" flag="required">
- <module-option name="password-stacking" value="useFirstPass"/>
- </login-module>
- </authentication>
- </security-domain>
- <security-domain name="jboss-web-policy" cache-type="default">
- <authorization>
- <policy-module code="Delegating" flag="required"/>
- </authorization>
- </security-domain>
- <security-domain name="jboss-ejb-policy" cache-type="default">
- <authorization>
- <policy-module code="Delegating" flag="required"/>
- </authorization>
- </security-domain>
- </security-domains>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:threads:1.1"/>
- <subsystem xmlns="urn:jboss:domain:transactions:2.0">
- <core-environment>
- <process-id>
- <uuid/>
- </process-id>
- </core-environment>
- <recovery-environment socket-binding="txn-recovery-environment" status-socket-binding="txn-status-manager"/>
- <coordinator-environment default-timeout="300"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:undertow:1.0">
- <buffer-caches>
- <buffer-cache name="default" buffer-size="1024" buffers-per-region="1024" max-regions="10"/>
- </buffer-caches>
- <server name="default-server">
- <http-listener name="default" socket-binding="http"/>
- <host name="default-host" alias="localhost">
- <location name="/" handler="welcome-content"/>
- <filter-ref name="server-header"/>
- <filter-ref name="x-powered-by-header"/>
- </host>
- </server>
- <servlet-container name="default" default-buffer-cache="default" stack-trace-on-error="local-only">
- <jsp-config/>
- </servlet-container>
- <handlers>
- <file name="welcome-content" path="${jboss.home.dir}/welcome-content" directory-listing="true"/>
- </handlers>
- <filters>
- <response-header name="server-header" header-name="Server" header-value="Wildfly 8"/>
- <response-header name="x-powered-by-header" header-name="X-Powered-By" header-value="Undertow 1"/>
- </filters>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:webservices:1.2">
- <modify-wsdl-address>true</modify-wsdl-address>
- <wsdl-host>${jboss.bind.address:127.0.0.1}</wsdl-host>
- <endpoint-config name="Standard-Endpoint-Config"/>
- <endpoint-config name="Recording-Endpoint-Config">
- <pre-handler-chain name="recording-handlers" protocol-bindings="##SOAP11_HTTP ##SOAP11_HTTP_MTOM ##SOAP12_HTTP ##SOAP12_HTTP_MTOM">
- <handler name="RecordingHandler" class="org.jboss.ws.common.invocation.RecordingServerHandler"/>
- </pre-handler-chain>
- </endpoint-config>
- <client-config name="Standard-Client-Config"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:weld:2.0"/>
- </profile>
- <interfaces>
- <interface name="management">
- <inet-address value="${jboss.bind.address.management:127.0.0.1}"/>
- </interface>
- <interface name="public">
- <inet-address value="${jboss.bind.address:127.0.0.1}"/>
- </interface>
- <!-- TODO - only show this if the jacorb subsystem is added -->
- <interface name="unsecure">
- <!--
- ~ Used for IIOP sockets in the standard configuration.
- ~ To secure JacORB you need to setup SSL
- -->
- <inet-address value="${jboss.bind.address.unsecure:127.0.0.1}"/>
- </interface>
- </interfaces>
- <socket-binding-group name="standard-sockets" default-interface="public" port-offset="${jboss.socket.binding.port-offset:0}">
- <socket-binding name="management-http" interface="management" port="${jboss.management.http.port:9990}"/>
- <socket-binding name="management-https" interface="management" port="${jboss.management.https.port:9993}"/>
- <socket-binding name="ajp" port="${jboss.ajp.port:8009}"/>
- <socket-binding name="http" port="${jboss.http.port:8080}"/>
- <socket-binding name="https" port="${jboss.https.port:8443}"/>
- <socket-binding name="jacorb" interface="unsecure" port="3528"/>
- <socket-binding name="jacorb-ssl" interface="unsecure" port="3529"/>
- <socket-binding name="messaging-group" port="0" multicast-address="${jboss.messaging.group.address:231.7.7.7}" multicast-port="${jboss.messaging.group.port:9876}"/>
- <socket-binding name="txn-recovery-environment" port="4712"/>
- <socket-binding name="txn-status-manager" port="4713"/>
- <outbound-socket-binding name="mail-smtp">
- <remote-destination host="localhost" port="25"/>
- </outbound-socket-binding>
- </socket-binding-group>
-</server>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/mdb-cmt-setrollbackonly/src/main/java/org/apache/activemq/javaee/example/MDB_CMT_SetRollbackOnlyClientExample.java
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-cmt-setrollbackonly/src/main/java/org/apache/activemq/javaee/example/MDB_CMT_SetRollbackOnlyClientExample.java b/examples/javaee/mdb-cmt-setrollbackonly/src/main/java/org/apache/activemq/javaee/example/MDB_CMT_SetRollbackOnlyClientExample.java
deleted file mode 100644
index c0de253..0000000
--- a/examples/javaee/mdb-cmt-setrollbackonly/src/main/java/org/apache/activemq/javaee/example/MDB_CMT_SetRollbackOnlyClientExample.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.activemq.javaee.example;
-
-import javax.jms.Connection;
-import javax.jms.ConnectionFactory;
-import javax.jms.MessageProducer;
-import javax.jms.Queue;
-import javax.jms.Session;
-import javax.jms.TextMessage;
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import java.util.Properties;
-
-/**
- * @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a>
- */
-public class MDB_CMT_SetRollbackOnlyClientExample
-{
- public static void main(final String[] args) throws Exception
- {
- Connection connection = null;
- InitialContext initialContext = null;
- try
- {
- // Step 1. Create an initial context to perform the JNDI lookup.
- final Properties env = new Properties();
-
- env.put(Context.INITIAL_CONTEXT_FACTORY, "org.jboss.naming.remote.client.InitialContextFactory");
-
- env.put(Context.PROVIDER_URL, "http-remoting://localhost:8080");
-
- initialContext = new InitialContext(env);
-
- // Step 2. Perfom a lookup on the queue
- Queue queue = (Queue)initialContext.lookup("jms/queues/testQueue");
-
- // Step 3. Perform a lookup on the Connection Factory
- ConnectionFactory cf = (ConnectionFactory)initialContext.lookup("/jms/RemoteConnectionFactory");
-
- // Step 4.Create a JMS Connection
- connection = cf.createConnection("guest", "password");
-
- // Step 5. Create a JMS Session
- Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
-
- // Step 6. Create a JMS Message Producer
- MessageProducer producer = session.createProducer(queue);
-
- // Step 7. Create a Text Message
- TextMessage message = session.createTextMessage("This is a text message");
-
- System.out.println("Sent message: " + message.getText());
-
- // Step 8. Send the Message
- producer.send(message);
-
- // Step 9, 10, 11 and 12 in MDB_CMP_SetRollbackOnlyExample
- }
- finally
- {
- // Step 13. Be sure to close our JMS resources!
- if (initialContext != null)
- {
- initialContext.close();
- }
- if (connection != null)
- {
- connection.close();
- }
- }
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/mdb-cmt-setrollbackonly/src/main/java/org/apache/activemq/javaee/example/server/MDB_CMT_SetRollbackOnlyExample.java
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-cmt-setrollbackonly/src/main/java/org/apache/activemq/javaee/example/server/MDB_CMT_SetRollbackOnlyExample.java b/examples/javaee/mdb-cmt-setrollbackonly/src/main/java/org/apache/activemq/javaee/example/server/MDB_CMT_SetRollbackOnlyExample.java
deleted file mode 100644
index d083024..0000000
--- a/examples/javaee/mdb-cmt-setrollbackonly/src/main/java/org/apache/activemq/javaee/example/server/MDB_CMT_SetRollbackOnlyExample.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.activemq.javaee.example.server;
-
-import javax.annotation.Resource;
-import javax.ejb.ActivationConfigProperty;
-import javax.ejb.MessageDriven;
-import javax.ejb.MessageDrivenContext;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
-import javax.ejb.TransactionManagement;
-import javax.ejb.TransactionManagementType;
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.MessageListener;
-import javax.jms.TextMessage;
-
-import org.jboss.ejb3.annotation.ResourceAdapter;
-
-/**
- * @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a>
- */
-@MessageDriven(name = "MDB_CMT_SetRollbackOnlyExample",
- activationConfig =
- {
- @ActivationConfigProperty(propertyName = "destinationType", propertyValue = "javax.jms.Queue"),
- @ActivationConfigProperty(propertyName = "destination", propertyValue = "queue/testQueue")
- })
-public class MDB_CMT_SetRollbackOnlyExample implements MessageListener
-{
- @Resource
- MessageDrivenContext ctx;
-
- public void onMessage(final Message message)
- {
- try
- {
- // Step 9. We know the client is sending a text message so we cast
- TextMessage textMessage = (TextMessage)message;
-
- // Step 10. get the text from the message.
- String text = textMessage.getText();
-
- if (!textMessage.getJMSRedelivered())
- {
- // Step 11. rollback delivery of message if the first time
- System.out.println("message " + text + " received for the first time");
- ctx.setRollbackOnly();
- }
- else
- {
- // Step 12. read the message
- System.out.println("message " + text + " received for the second time");
- }
-
- }
- catch (JMSException e)
- {
- e.printStackTrace();
- }
- }
-}
\ No newline at end of file
[10/37] activemq-6 git commit: ACTIVEMQ6-41 Drop Java EE examples
Posted by jb...@apache.org.
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/mdb-cmt-setrollbackonly/src/test/java/org/apache/activemq/javaee/example/MDBCMTSetRollbackOnlyRunnerTest.java
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-cmt-setrollbackonly/src/test/java/org/apache/activemq/javaee/example/MDBCMTSetRollbackOnlyRunnerTest.java b/examples/javaee/mdb-cmt-setrollbackonly/src/test/java/org/apache/activemq/javaee/example/MDBCMTSetRollbackOnlyRunnerTest.java
deleted file mode 100644
index 604b156..0000000
--- a/examples/javaee/mdb-cmt-setrollbackonly/src/test/java/org/apache/activemq/javaee/example/MDBCMTSetRollbackOnlyRunnerTest.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.activemq.javaee.example;
-
-import org.apache.activemq.javaee.example.server.MDB_CMT_SetRollbackOnlyExample;
-import org.jboss.arquillian.container.test.api.Deployment;
-import org.jboss.arquillian.container.test.api.RunAsClient;
-import org.jboss.arquillian.junit.Arquillian;
-import org.jboss.shrinkwrap.api.Archive;
-import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.spec.JavaArchive;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-/**
- * @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a>
- * 5/21/12
- */
-@RunAsClient
-@RunWith(Arquillian.class)
-public class MDBCMTSetRollbackOnlyRunnerTest
-{
- @Deployment
- public static Archive getDeployment()
- {
-
- final JavaArchive ejbJar = ShrinkWrap.create(JavaArchive.class, "mdb.jar");
- ejbJar.addClass(MDB_CMT_SetRollbackOnlyExample.class);
- System.out.println(ejbJar.toString(true));
- return ejbJar;
- }
-
- @Test
- public void runExample() throws Exception
- {
- MDB_CMT_SetRollbackOnlyClientExample.main(null);
- //give the example time to run
- Thread.sleep(1000);
- }
-}
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/mdb-cmt-setrollbackonly/src/test/resources/arquillian.xml
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-cmt-setrollbackonly/src/test/resources/arquillian.xml b/examples/javaee/mdb-cmt-setrollbackonly/src/test/resources/arquillian.xml
deleted file mode 100644
index 9090137..0000000
--- a/examples/javaee/mdb-cmt-setrollbackonly/src/test/resources/arquillian.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<arquillian xmlns="http://jboss.org/schema/arquillian"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://jboss.org/schema/arquillian http://jboss.org/schema/arquillian/arquillian_1_0.xsd">
-
- <!-- Uncomment to have test archives exported to the file system for inspection.
-This feature can also be controlled using the system property arquillian.deploymentExportPath -->
- <!--
-<engine>
-<property name="deploymentExportPath">target</property>
-</engine>
--->
-
- <defaultProtocol type="Servlet 3.0" />
-
- <container qualifier="jboss" default="true">
- <configuration>
- <property name="jbossHome">${basedir}/target/jbossas-node0</property>
- <property name="serverConfig">standalone-example.xml</property>
- <property name="allowConnectingToRunningServer">true</property>
- <property name="managementAddress">${node0:127.0.0.1}</property>
- </configuration>
- </container>
-
- <!-- logThreshold proposed -->
- <!--
-<container qualifier="jbossas-managed">
-<configuration>
-<property name="logThreshold">ERROR</property>
-</configuration>
-</container>
--->
-
-</arquillian>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/mdb-cmt-tx-local/pom.xml
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-cmt-tx-local/pom.xml b/examples/javaee/mdb-cmt-tx-local/pom.xml
deleted file mode 100644
index 00ed392..0000000
--- a/examples/javaee/mdb-cmt-tx-local/pom.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.activemq.example.javaee</groupId>
- <artifactId>javaee-examples</artifactId>
- <version>6.0.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>activemq-javaee-mdb-cmt-tx-local-example</artifactId>
- <packaging>jar</packaging>
- <name>ActiveMQ6 Java EE MDB CMT Local Transaction Example</name>
-</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/mdb-cmt-tx-local/readme.html
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-cmt-tx-local/readme.html b/examples/javaee/mdb-cmt-tx-local/readme.html
deleted file mode 100644
index 57b185a..0000000
--- a/examples/javaee/mdb-cmt-tx-local/readme.html
+++ /dev/null
@@ -1,125 +0,0 @@
-<html>
- <head>
- <title>ActiveMQ Java EE MDB using a local transaction Example</title>
- <link rel="stylesheet" type="text/css" href="../../common/common.css" />
- <link rel="stylesheet" type="text/css" href="../../common/prettify.css" />
- <script type="text/javascript" src="../../common/prettify.js"></script>
- </head>
- <body onload="prettyPrint()">
- <h1>Java EE MDB using a local transaction Example</h1>
-
- <p>This example shows you how to send a message to an MDB and deliver it within a local transaction</p>
- <p>The example will send deploy a simple MDB and demonstrate sending a message and the MDB consuming it, throwing an exception and the message being re delivered.</p>
-
- <p>The example leverages the JBoss Arquillian framework to run a WildFly instance and deploy the MDB.</p>
-
- <h2>Example step-by-step</h2>
-
- <p><i>download WildFly 8.0.0.Final from <a href="http://wildfly.org/downloads/">here</a> and install.</i></p>
- <p><i>set the JBOSS_HOME property to point to the WildFly install directory</i></p>
- <p><i>type <code>mvn verify</code> from the example directory to run</i></p>
-
- <ol>
- <li>First we need to get an initial context so we can look-up the JMS connection factory and destination objects from JNDI. This initial context will get it's properties from the <code>jndi.properties</code> file in the directory <code>config</code></li>
- <pre class="prettyprint">
- final Properties env = new Properties();
-
- env.put(Context.INITIAL_CONTEXT_FACTORY, "org.jboss.naming.remote.client.InitialContextFactory");
-
- env.put(Context.PROVIDER_URL, "http-remoting://localhost:8080");
-
- initialContext = new InitialContext(env);
- </pre>
-
- <li>We look up the JMS queue object from JNDI</li>
- <pre class="prettyprint">
- Queue queue = (Queue)initialContext.lookup("jms/queues/testQueue");
- </pre>
-
- <li>We look up the JMS connection factory object from JNDI</li>
- <pre class="prettyprint">
- ConnectionFactory cf = (ConnectionFactory)initialContext.lookup("/jms/RemoteConnectionFactory");
- </pre>
-
- <li>We create a JMS connection</li>
- <pre class="prettyprint">
- connection = cf.createConnection("guest", "password");
- </pre>
-
- <li>We create a JMS session. The session is created as non transacted and will auto acknowledge messages.</li>
- <pre class="prettyprint">
- Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
- </pre>
-
- <li>We create a JMS message producer on the session. This will be used to send the messages.</li>
- <pre class="prettyprint">
- MessageProducer messageProducer = session.createProducer(queue);
- </pre>
-
- <li>We create a JMS text messages that we are going to send.</li>
- <pre class="prettyprint">
- TextMessage message = session.createTextMessage("This is a text message");
- </pre>
-
- <li>We send messages to the queue</li>
- <pre class="prettyprint">
- messageProducer.send(message);
- </pre>
-
- <li>The MDB receives the message<br />
- We know the message is a TextMessage so we cast to it.
- </li>
- <pre class="prettyprint">
- TextMessage tm = (TextMessage)message;
- </pre>
-
- <li>The MDB gets the text and prints it, we take a quick look at the transaction and throw an exception.
- </li>
- <pre class="prettyprint">
- System.out.println("message " + text + " received");
-
- if (!textMessage.getJMSRedelivered())
- {
- //Step 11. On first delivery get the transaction, take a look, and throw an exception
- Transaction tx = tm.getTransaction();
-
- if (tx != null)
- {
- System.out.println("something is wrong, there should be no global transaction: " + tx);
- }
- else
- {
- System.out.println("there is no global transaction, although the message delivery is using a local transaction");
- System.out.println("let's throw an exception and see what happens");
- throw new RuntimeException("DOH!");
- }
- }
- </pre>
-
- <li>The MDB receives the message again and we print a message.
- </li>
- <pre class="prettyprint">
- System.out.println("The message was redelivered since the message delivery used a local transaction");
- </pre>
-
- <li>And finally, <b>always</b> remember to close your JMS connections and resources after use, in a <code>finally</code> block. Closing a JMS connection will automatically close all of its sessions, consumers, producer and browser objects</li>
-
- <pre class="prettyprint">
- finally
- {
- if (initialContext != null)
- {
- initialContext.close();
- }
- if (connection != null)
- {
- connection.close();
- }
- }
- </pre>
-
-
-
- </ol>
- </body>
-</html>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/mdb-cmt-tx-local/server/standalone/configuration/application-roles.properties
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-cmt-tx-local/server/standalone/configuration/application-roles.properties b/examples/javaee/mdb-cmt-tx-local/server/standalone/configuration/application-roles.properties
deleted file mode 100644
index 0ade8fb..0000000
--- a/examples/javaee/mdb-cmt-tx-local/server/standalone/configuration/application-roles.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# Properties declaration of users roles for the realm 'ApplicationRealm'.
-#
-# This includes the following protocols: remote ejb, remote jndi, web, remote jms
-#
-# Users can be added to this properties file at any time, updates after the server has started
-# will be automatically detected.
-#
-# The format of this file is as follows: -
-# username=role1,role2,role3
-#
-# A utility script is provided which can be executed from the bin folder to add the users: -
-# - Linux
-# bin/add-user.sh
-#
-# - Windows
-# bin\add-user.bat
-#
-# The following illustrates how an admin user could be defined.
-#
-#admin=PowerUser,BillingAdmin,
-guest=guest
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/mdb-cmt-tx-local/server/standalone/configuration/application-users.properties
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-cmt-tx-local/server/standalone/configuration/application-users.properties b/examples/javaee/mdb-cmt-tx-local/server/standalone/configuration/application-users.properties
deleted file mode 100644
index c52e923..0000000
--- a/examples/javaee/mdb-cmt-tx-local/server/standalone/configuration/application-users.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# Properties declaration of users for the realm 'ApplicationRealm' which is the default realm
-# for application services on a new AS 7.1 installation.
-#
-# This includes the following protocols: remote ejb, remote jndi, web, remote jms
-#
-# Users can be added to this properties file at any time, updates after the server has started
-# will be automatically detected.
-#
-# The format of this realm is as follows: -
-# username=HEX( MD5( username ':' realm ':' password))
-#
-# A utility script is provided which can be executed from the bin folder to add the users: -
-# - Linux
-# bin/add-user.sh
-#
-# - Windows
-# bin\add-user.bat
-#
-# The following illustrates how an admin user could be defined, this
-# is for illustration only and does not correspond to a usable password.
-#
-#admin=2a0923285184943425d1f53ddd58ec7a
-guest=3437456520927d113b17d471d630e0d6
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/mdb-cmt-tx-local/server/standalone/configuration/logging.properties
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-cmt-tx-local/server/standalone/configuration/logging.properties b/examples/javaee/mdb-cmt-tx-local/server/standalone/configuration/logging.properties
deleted file mode 100644
index 3fa31b0..0000000
--- a/examples/javaee/mdb-cmt-tx-local/server/standalone/configuration/logging.properties
+++ /dev/null
@@ -1,47 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# Additional logger names to configure (root logger is always configured)
-loggers=org.jboss.as.config
-
-# Dump system environment at boot by default
-logger.org.jboss.as.config.level=DEBUG
-
-# Root logger level
-logger.level=${jboss.boot.server.log.level:INFO}
-# Root logger handlers
-logger.handlers=FILE,CONSOLE
-
-# Console handler configuration
-handler.CONSOLE=org.jboss.logmanager.handlers.ConsoleHandler
-handler.CONSOLE.properties=autoFlush
-handler.CONSOLE.level=${jboss.boot.server.log.console.level:INFO}
-handler.CONSOLE.autoFlush=true
-handler.CONSOLE.formatter=PATTERN
-
-# File handler configuration
-handler.FILE=org.jboss.logmanager.handlers.FileHandler
-handler.FILE.level=DEBUG
-handler.FILE.properties=autoFlush,fileName
-handler.FILE.autoFlush=true
-handler.FILE.fileName=${org.jboss.boot.log.file:boot.log}
-handler.FILE.formatter=PATTERN
-
-# Formatter pattern configuration
-formatter.PATTERN=org.jboss.logmanager.formatters.PatternFormatter
-formatter.PATTERN.properties=pattern
-formatter.PATTERN.pattern=%d{HH:mm:ss,SSS} %-5p [%c] %s%E%n
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/mdb-cmt-tx-local/server/standalone/configuration/mgmt-users.properties
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-cmt-tx-local/server/standalone/configuration/mgmt-users.properties b/examples/javaee/mdb-cmt-tx-local/server/standalone/configuration/mgmt-users.properties
deleted file mode 100644
index 349b004..0000000
--- a/examples/javaee/mdb-cmt-tx-local/server/standalone/configuration/mgmt-users.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# Properties declaration of users for the realm 'ManagementRealm' which is the default realm
-# for new AS 7.1 installations. Further authentication mechanism can be configured
-# as part of the <management /> in standalone.xml.
-#
-# Users can be added to this properties file at any time, updates after the server has started
-# will be automatically detected.
-#
-# By default the properties realm expects the entries to be in the format: -
-# username=HEX( MD5( username ':' realm ':' password))
-#
-# A utility script is provided which can be executed from the bin folder to add the users: -
-# - Linux
-# bin/add-user.sh
-#
-# - Windows
-# bin\add-user.bat
-
-# The following illustrates how an admin user could be defined, this
-# is for illustration only and does not correspond to a usable password.
-#
-#admin=2a0923285184943425d1f53ddd58ec7a
-admin=9d71b431e53d99563aa0dfca628c970b
-andy=dfb16391f1be1c454b5bce9822bd9df3
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/mdb-cmt-tx-local/server/standalone/configuration/standalone-example.xml
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-cmt-tx-local/server/standalone/configuration/standalone-example.xml b/examples/javaee/mdb-cmt-tx-local/server/standalone/configuration/standalone-example.xml
deleted file mode 100644
index be39676..0000000
--- a/examples/javaee/mdb-cmt-tx-local/server/standalone/configuration/standalone-example.xml
+++ /dev/null
@@ -1,489 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-
-<server xmlns="urn:jboss:domain:2.0">
- <extensions>
- <extension module="org.jboss.as.clustering.infinispan"/>
- <extension module="org.jboss.as.connector"/>
- <extension module="org.jboss.as.deployment-scanner"/>
- <extension module="org.jboss.as.ee"/>
- <extension module="org.jboss.as.ejb3"/>
- <extension module="org.jboss.as.jacorb"/>
- <extension module="org.jboss.as.jaxrs"/>
- <extension module="org.jboss.as.jdr"/>
- <extension module="org.jboss.as.jmx"/>
- <extension module="org.jboss.as.jpa"/>
- <extension module="org.jboss.as.jsf"/>
- <extension module="org.jboss.as.jsr77"/>
- <extension module="org.jboss.as.logging"/>
- <extension module="org.jboss.as.mail"/>
- <extension module="org.jboss.as.messaging"/>
- <extension module="org.jboss.as.naming"/>
- <extension module="org.jboss.as.pojo"/>
- <extension module="org.jboss.as.remoting"/>
- <extension module="org.jboss.as.sar"/>
- <extension module="org.jboss.as.security"/>
- <extension module="org.jboss.as.threads"/>
- <extension module="org.jboss.as.transactions"/>
- <extension module="org.jboss.as.webservices"/>
- <extension module="org.jboss.as.weld"/>
- <extension module="org.wildfly.extension.batch"/>
- <extension module="org.wildfly.extension.io"/>
- <extension module="org.wildfly.extension.undertow"/>
- </extensions>
- <management>
- <security-realms>
- <security-realm name="ManagementRealm">
- <authentication>
- <local default-user="$local"/>
- <properties path="mgmt-users.properties" relative-to="jboss.server.config.dir"/>
- </authentication>
- <authorization map-groups-to-roles="false">
- <properties path="mgmt-groups.properties" relative-to="jboss.server.config.dir"/>
- </authorization>
- </security-realm>
- <security-realm name="ApplicationRealm">
- <authentication>
- <local default-user="$local" allowed-users="*"/>
- <properties path="application-users.properties" relative-to="jboss.server.config.dir"/>
- </authentication>
- <authorization>
- <properties path="application-roles.properties" relative-to="jboss.server.config.dir"/>
- </authorization>
- </security-realm>
- </security-realms>
- <audit-log>
- <formatters>
- <json-formatter name="json-formatter"/>
- </formatters>
- <handlers>
- <file-handler name="file" formatter="json-formatter" relative-to="jboss.server.data.dir" path="audit-log.log"/>
- </handlers>
- <logger log-boot="true" log-read-only="false" enabled="false">
- <handlers>
- <handler name="file"/>
- </handlers>
- </logger>
- </audit-log>
- <management-interfaces>
- <http-interface security-realm="ManagementRealm" http-upgrade-enabled="true">
- <socket-binding http="management-http"/>
- </http-interface>
- </management-interfaces>
- <access-control provider="simple">
- <role-mapping>
- <role name="SuperUser">
- <include>
- <user name="$local"/>
- </include>
- </role>
- </role-mapping>
- </access-control>
- </management>
- <profile>
- <subsystem xmlns="urn:jboss:domain:logging:2.0">
- <console-handler name="CONSOLE">
- <level name="INFO"/>
- <formatter>
- <named-formatter name="COLOR-PATTERN"/>
- </formatter>
- </console-handler>
- <periodic-rotating-file-handler name="FILE" autoflush="true">
- <formatter>
- <named-formatter name="PATTERN"/>
- </formatter>
- <file relative-to="jboss.server.log.dir" path="server.log"/>
- <suffix value=".yyyy-MM-dd"/>
- <append value="true"/>
- </periodic-rotating-file-handler>
- <logger category="com.arjuna">
- <level name="WARN"/>
- </logger>
- <logger category="org.apache.tomcat.util.modeler">
- <level name="WARN"/>
- </logger>
- <logger category="org.jboss.as.config">
- <level name="DEBUG"/>
- </logger>
- <logger category="sun.rmi">
- <level name="WARN"/>
- </logger>
- <logger category="jacorb">
- <level name="WARN"/>
- </logger>
- <logger category="jacorb.config">
- <level name="ERROR"/>
- </logger>
- <root-logger>
- <level name="INFO"/>
- <handlers>
- <handler name="CONSOLE"/>
- <handler name="FILE"/>
- </handlers>
- </root-logger>
- <formatter name="PATTERN">
- <pattern-formatter pattern="%d{yyyy-MM-dd HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/>
- </formatter>
- <formatter name="COLOR-PATTERN">
- <pattern-formatter pattern="%K{level}%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/>
- </formatter>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:batch:1.0">
- <job-repository>
- <in-memory/>
- </job-repository>
- <thread-pool>
- <max-threads count="10"/>
- <keepalive-time time="100" unit="milliseconds"/>
- </thread-pool>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:datasources:2.0">
- <datasources>
- <datasource jndi-name="java:jboss/datasources/ExampleDS" pool-name="ExampleDS" enabled="true" use-java-context="true">
- <connection-url>jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE</connection-url>
- <driver>h2</driver>
- <security>
- <user-name>sa</user-name>
- <password>sa</password>
- </security>
- </datasource>
- <drivers>
- <driver name="h2" module="com.h2database.h2">
- <xa-datasource-class>org.h2.jdbcx.JdbcDataSource</xa-datasource-class>
- </driver>
- </drivers>
- </datasources>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:deployment-scanner:2.0">
- <deployment-scanner path="deployments" relative-to="jboss.server.base.dir" scan-interval="5000" runtime-failure-causes-rollback="${jboss.deployment.scanner.rollback.on.failure:false}"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:ee:2.0">
- <spec-descriptor-property-replacement>false</spec-descriptor-property-replacement>
- <jboss-descriptor-property-replacement>true</jboss-descriptor-property-replacement>
- <annotation-property-replacement>false</annotation-property-replacement>
- <concurrent>
- <context-services>
- <context-service name="default" jndi-name="java:jboss/ee/concurrency/context/default" use-transaction-setup-provider="true"/>
- </context-services>
- <managed-executor-services>
- <managed-executor-service name="default" jndi-name="java:jboss/ee/concurrency/executor/default" context-service="default" hung-task-threshold="60000" core-threads="5" max-threads="25" keepalive-time="5000"/>
- </managed-executor-services>
- <managed-scheduled-executor-services>
- <managed-scheduled-executor-service name="default" jndi-name="java:jboss/ee/concurrency/scheduler/default" context-service="default" hung-task-threshold="60000" core-threads="2" keepalive-time="3000"/>
- </managed-scheduled-executor-services>
- <managed-thread-factories>
- <managed-thread-factory name="default" jndi-name="java:jboss/ee/concurrency/factory/default" context-service="default"/>
- </managed-thread-factories>
- </concurrent>
- <default-bindings context-service="java:jboss/ee/concurrency/context/default" datasource="java:jboss/datasources/ExampleDS" jms-connection-factory="java:jboss/DefaultJMSConnectionFactory" managed-executor-service="java:jboss/ee/concurrency/executor/default" managed-scheduled-executor-service="java:jboss/ee/concurrency/scheduler/default" managed-thread-factory="java:jboss/ee/concurrency/factory/default"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:ejb3:2.0">
- <session-bean>
- <stateful default-access-timeout="5000" cache-ref="simple" passivation-disabled-cache-ref="simple"/>
- <singleton default-access-timeout="5000"/>
- </session-bean>
- <mdb>
- <resource-adapter-ref resource-adapter-name="${ejb.resource-adapter-name:activemq-ra.rar}"/>
- <bean-instance-pool-ref pool-name="mdb-strict-max-pool"/>
- </mdb>
- <pools>
- <bean-instance-pools>
- <!-- A sample strict max pool configuration -->
- <strict-max-pool name="slsb-strict-max-pool" max-pool-size="20" instance-acquisition-timeout="5" instance-acquisition-timeout-unit="MINUTES"/>
- <strict-max-pool name="mdb-strict-max-pool" max-pool-size="20" instance-acquisition-timeout="5" instance-acquisition-timeout-unit="MINUTES"/>
- </bean-instance-pools>
- </pools>
- <caches>
- <cache name="simple"/>
- <cache name="distributable" aliases="passivating clustered" passivation-store-ref="infinispan"/>
- </caches>
- <passivation-stores>
- <passivation-store name="infinispan" cache-container="ejb" max-size="10000"/>
- </passivation-stores>
- <async thread-pool-name="default"/>
- <timer-service thread-pool-name="default" default-data-store="default-file-store">
- <data-stores>
- <file-data-store name="default-file-store" path="timer-service-data" relative-to="jboss.server.data.dir"/>
- </data-stores>
- </timer-service>
- <remote connector-ref="http-remoting-connector" thread-pool-name="default"/>
- <thread-pools>
- <thread-pool name="default">
- <max-threads count="10"/>
- <keepalive-time time="100" unit="milliseconds"/>
- </thread-pool>
- </thread-pools>
- <iiop enable-by-default="false" use-qualified-name="false"/>
- <default-security-domain value="other"/>
- <default-missing-method-permissions-deny-access value="true"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:io:1.0">
- <worker name="default" io-threads="3"/>
- <buffer-pool name="default" buffer-size="16384" buffers-per-slice="128"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:infinispan:2.0">
- <cache-container name="web" default-cache="passivation" module="org.wildfly.clustering.web.infinispan">
- <local-cache name="passivation" batching="true">
- <file-store passivation="true" purge="false"/>
- </local-cache>
- <local-cache name="persistent" batching="true">
- <file-store passivation="false" purge="false"/>
- </local-cache>
- </cache-container>
- <cache-container name="ejb" aliases="sfsb" default-cache="passivation" module="org.wildfly.clustering.ejb.infinispan">
- <local-cache name="passivation" batching="true">
- <file-store passivation="true" purge="false"/>
- </local-cache>
- <local-cache name="persistent" batching="true">
- <file-store passivation="false" purge="false"/>
- </local-cache>
- </cache-container>
- <cache-container name="hibernate" default-cache="local-query" module="org.hibernate">
- <local-cache name="entity">
- <transaction mode="NON_XA"/>
- <eviction strategy="LRU" max-entries="10000"/>
- <expiration max-idle="100000"/>
- </local-cache>
- <local-cache name="local-query">
- <transaction mode="NONE"/>
- <eviction strategy="LRU" max-entries="10000"/>
- <expiration max-idle="100000"/>
- </local-cache>
- <local-cache name="timestamps">
- <transaction mode="NONE"/>
- <eviction strategy="NONE"/>
- </local-cache>
- </cache-container>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:jacorb:1.3">
- <orb socket-binding="jacorb" ssl-socket-binding="jacorb-ssl">
- <initializers transactions="spec" security="identity"/>
- </orb>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:jaxrs:1.0"/>
- <subsystem xmlns="urn:jboss:domain:jca:2.0">
- <archive-validation enabled="true" fail-on-error="true" fail-on-warn="false"/>
- <bean-validation enabled="true"/>
- <default-workmanager>
- <short-running-threads>
- <core-threads count="50"/>
- <queue-length count="50"/>
- <max-threads count="50"/>
- <keepalive-time time="10" unit="seconds"/>
- </short-running-threads>
- <long-running-threads>
- <core-threads count="50"/>
- <queue-length count="50"/>
- <max-threads count="50"/>
- <keepalive-time time="10" unit="seconds"/>
- </long-running-threads>
- </default-workmanager>
- <cached-connection-manager/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:jdr:1.0"/>
- <subsystem xmlns="urn:jboss:domain:jmx:1.3">
- <expose-resolved-model/>
- <expose-expression-model/>
- <remoting-connector/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:jpa:1.1">
- <jpa default-datasource="" default-extended-persistence-inheritance="DEEP"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:jsf:1.0"/>
- <subsystem xmlns="urn:jboss:domain:jsr77:1.0"/>
- <subsystem xmlns="urn:jboss:domain:mail:2.0">
- <mail-session name="default" jndi-name="java:jboss/mail/Default">
- <smtp-server outbound-socket-binding-ref="mail-smtp"/>
- </mail-session>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:messaging:2.0">
- <activemq-server>
- <persistence-enabled>true</persistence-enabled>
- <journal-file-size>102400</journal-file-size>
- <journal-min-files>2</journal-min-files>
- <connectors>
- <http-connector name="http-connector" socket-binding="http">
- <param key="http-upgrade-endpoint" value="http-acceptor"/>
- </http-connector>
- <http-connector name="http-connector-throughput" socket-binding="http">
- <param key="http-upgrade-endpoint" value="http-acceptor-throughput"/>
- <param key="batch-delay" value="50"/>
- </http-connector>
- <in-vm-connector name="in-vm" server-id="0"/>
- </connectors>
- <acceptors>
- <http-acceptor name="http-acceptor" http-listener="default"/>
- <http-acceptor name="http-acceptor-throughput" http-listener="default">
- <param key="batch-delay" value="50"/>
- <param key="direct-deliver" value="false"/>
- </http-acceptor>
- <in-vm-acceptor name="in-vm" server-id="0"/>
- </acceptors>
- <security-settings>
- <security-setting match="#">
- <permission type="send" roles="guest"/>
- <permission type="consume" roles="guest"/>
- <permission type="createNonDurableQueue" roles="guest"/>
- <permission type="deleteNonDurableQueue" roles="guest"/>
- </security-setting>
- </security-settings>
- <address-settings>
- <!--default for catch all-->
- <address-setting match="#">
- <dead-letter-address>jms.queue.DLQ</dead-letter-address>
- <expiry-address>jms.queue.ExpiryQueue</expiry-address>
- <redelivery-delay>0</redelivery-delay>
- <max-size-bytes>10485760</max-size-bytes>
- <address-full-policy>PAGE</address-full-policy>
- <page-size-bytes>2097152</page-size-bytes>
- <message-counter-history-day-limit>10</message-counter-history-day-limit>
- </address-setting>
- </address-settings>
- <jms-connection-factories>
- <connection-factory name="InVmConnectionFactory">
- <connectors>
- <connector-ref connector-name="in-vm"/>
- </connectors>
- <entries>
- <entry name="java:/ConnectionFactory"/>
- </entries>
- </connection-factory>
- <connection-factory name="RemoteConnectionFactory">
- <connectors>
- <connector-ref connector-name="http-connector"/>
- </connectors>
- <entries>
- <entry name="java:jboss/exported/jms/RemoteConnectionFactory"/>
- </entries>
- </connection-factory>
- <pooled-connection-factory name="activemq-ra">
- <transaction mode="xa"/>
- <connectors>
- <connector-ref connector-name="in-vm"/>
- </connectors>
- <entries>
- <entry name="java:/JmsXA"/>
- <!-- Global JNDI entry used to provide a default JMS Connection factory to EE application -->
- <entry name="java:jboss/DefaultJMSConnectionFactory"/>
- </entries>
- </pooled-connection-factory>
- </jms-connection-factories>
- <jms-destinations>
- <jms-queue name="testQueue">
- <entry name="queue/test"/>
- <entry name="java:jboss/exported/jms/queues/testQueue"/>
- </jms-queue>
- </jms-destinations>
- </activemq-server>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:naming:2.0">
- <remote-naming/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:pojo:1.0"/>
- <subsystem xmlns="urn:jboss:domain:remoting:2.0">
- <endpoint worker="default"/>
- <http-connector name="http-remoting-connector" connector-ref="default" security-realm="ApplicationRealm"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:resource-adapters:2.0"/>
- <subsystem xmlns="urn:jboss:domain:sar:1.0"/>
- <subsystem xmlns="urn:jboss:domain:security:1.2">
- <security-domains>
- <security-domain name="other" cache-type="default">
- <authentication>
- <login-module code="Remoting" flag="optional">
- <module-option name="password-stacking" value="useFirstPass"/>
- </login-module>
- <login-module code="RealmDirect" flag="required">
- <module-option name="password-stacking" value="useFirstPass"/>
- </login-module>
- </authentication>
- </security-domain>
- <security-domain name="jboss-web-policy" cache-type="default">
- <authorization>
- <policy-module code="Delegating" flag="required"/>
- </authorization>
- </security-domain>
- <security-domain name="jboss-ejb-policy" cache-type="default">
- <authorization>
- <policy-module code="Delegating" flag="required"/>
- </authorization>
- </security-domain>
- </security-domains>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:threads:1.1"/>
- <subsystem xmlns="urn:jboss:domain:transactions:2.0">
- <core-environment>
- <process-id>
- <uuid/>
- </process-id>
- </core-environment>
- <recovery-environment socket-binding="txn-recovery-environment" status-socket-binding="txn-status-manager"/>
- <coordinator-environment default-timeout="300"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:undertow:1.0">
- <buffer-caches>
- <buffer-cache name="default" buffer-size="1024" buffers-per-region="1024" max-regions="10"/>
- </buffer-caches>
- <server name="default-server">
- <http-listener name="default" socket-binding="http"/>
- <host name="default-host" alias="localhost">
- <location name="/" handler="welcome-content"/>
- <filter-ref name="server-header"/>
- <filter-ref name="x-powered-by-header"/>
- </host>
- </server>
- <servlet-container name="default" default-buffer-cache="default" stack-trace-on-error="local-only">
- <jsp-config/>
- </servlet-container>
- <handlers>
- <file name="welcome-content" path="${jboss.home.dir}/welcome-content" directory-listing="true"/>
- </handlers>
- <filters>
- <response-header name="server-header" header-name="Server" header-value="Wildfly 8"/>
- <response-header name="x-powered-by-header" header-name="X-Powered-By" header-value="Undertow 1"/>
- </filters>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:webservices:1.2">
- <modify-wsdl-address>true</modify-wsdl-address>
- <wsdl-host>${jboss.bind.address:127.0.0.1}</wsdl-host>
- <endpoint-config name="Standard-Endpoint-Config"/>
- <endpoint-config name="Recording-Endpoint-Config">
- <pre-handler-chain name="recording-handlers" protocol-bindings="##SOAP11_HTTP ##SOAP11_HTTP_MTOM ##SOAP12_HTTP ##SOAP12_HTTP_MTOM">
- <handler name="RecordingHandler" class="org.jboss.ws.common.invocation.RecordingServerHandler"/>
- </pre-handler-chain>
- </endpoint-config>
- <client-config name="Standard-Client-Config"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:weld:2.0"/>
- </profile>
- <interfaces>
- <interface name="management">
- <inet-address value="${jboss.bind.address.management:127.0.0.1}"/>
- </interface>
- <interface name="public">
- <inet-address value="${jboss.bind.address:127.0.0.1}"/>
- </interface>
- <!-- TODO - only show this if the jacorb subsystem is added -->
- <interface name="unsecure">
- <!--
- ~ Used for IIOP sockets in the standard configuration.
- ~ To secure JacORB you need to setup SSL
- -->
- <inet-address value="${jboss.bind.address.unsecure:127.0.0.1}"/>
- </interface>
- </interfaces>
- <socket-binding-group name="standard-sockets" default-interface="public" port-offset="${jboss.socket.binding.port-offset:0}">
- <socket-binding name="management-http" interface="management" port="${jboss.management.http.port:9990}"/>
- <socket-binding name="management-https" interface="management" port="${jboss.management.https.port:9993}"/>
- <socket-binding name="ajp" port="${jboss.ajp.port:8009}"/>
- <socket-binding name="http" port="${jboss.http.port:8080}"/>
- <socket-binding name="https" port="${jboss.https.port:8443}"/>
- <socket-binding name="jacorb" interface="unsecure" port="3528"/>
- <socket-binding name="jacorb-ssl" interface="unsecure" port="3529"/>
- <socket-binding name="messaging-group" port="0" multicast-address="${jboss.messaging.group.address:231.7.7.7}" multicast-port="${jboss.messaging.group.port:9876}"/>
- <socket-binding name="txn-recovery-environment" port="4712"/>
- <socket-binding name="txn-status-manager" port="4713"/>
- <outbound-socket-binding name="mail-smtp">
- <remote-destination host="localhost" port="25"/>
- </outbound-socket-binding>
- </socket-binding-group>
-</server>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/mdb-cmt-tx-local/src/main/java/org/apache/activemq/javaee/example/MDB_CMT_TxLocalClientExample.java
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-cmt-tx-local/src/main/java/org/apache/activemq/javaee/example/MDB_CMT_TxLocalClientExample.java b/examples/javaee/mdb-cmt-tx-local/src/main/java/org/apache/activemq/javaee/example/MDB_CMT_TxLocalClientExample.java
deleted file mode 100644
index 57e603b..0000000
--- a/examples/javaee/mdb-cmt-tx-local/src/main/java/org/apache/activemq/javaee/example/MDB_CMT_TxLocalClientExample.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.activemq.javaee.example;
-
-import javax.jms.Connection;
-import javax.jms.ConnectionFactory;
-import javax.jms.MessageProducer;
-import javax.jms.Queue;
-import javax.jms.Session;
-import javax.jms.TextMessage;
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import java.util.Properties;
-
-/**
- * @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a>
- */
-public class MDB_CMT_TxLocalClientExample
-{
- public static void main(final String[] args) throws Exception
- {
- Connection connection = null;
- InitialContext initialContext = null;
- try
- {
- // Step 1. Create an initial context to perform the JNDI lookup.
- final Properties env = new Properties();
-
- env.put(Context.INITIAL_CONTEXT_FACTORY, "org.jboss.naming.remote.client.InitialContextFactory");
-
- env.put(Context.PROVIDER_URL, "http-remoting://localhost:8080");
-
- initialContext = new InitialContext(env);
-
- // Step 2. Perfom a lookup on the queue
- Queue queue = (Queue)initialContext.lookup("jms/queues/testQueue");
-
- // Step 3. Perform a lookup on the Connection Factory
- ConnectionFactory cf = (ConnectionFactory)initialContext.lookup("/jms/RemoteConnectionFactory");
-
- // Step 4.Create a JMS Connection
- connection = cf.createConnection("guest", "password");
-
- // Step 5. Create a JMS Session
- Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
-
- // Step 6. Create a JMS Message Producer
- MessageProducer producer = session.createProducer(queue);
-
- // Step 7. Create a Text Message
- TextMessage message = session.createTextMessage("This is a text message");
-
- System.out.println("Sent message: " + message.getText());
-
- // Step 8. Send the Message
- producer.send(message);
-
- // Step 9,,10, 11 and 12 in MDB_CMP_TxLocalExample
- }
- finally
- {
- // Step 13. Be sure to close our JMS resources!
- if (initialContext != null)
- {
- initialContext.close();
- }
- if (connection != null)
- {
- connection.close();
- }
- }
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/mdb-cmt-tx-local/src/main/java/org/apache/activemq/javaee/example/server/MDB_CMT_TxLocalExample.java
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-cmt-tx-local/src/main/java/org/apache/activemq/javaee/example/server/MDB_CMT_TxLocalExample.java b/examples/javaee/mdb-cmt-tx-local/src/main/java/org/apache/activemq/javaee/example/server/MDB_CMT_TxLocalExample.java
deleted file mode 100644
index 9372a45..0000000
--- a/examples/javaee/mdb-cmt-tx-local/src/main/java/org/apache/activemq/javaee/example/server/MDB_CMT_TxLocalExample.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.activemq.javaee.example.server;
-
-import javax.annotation.Resource;
-import javax.ejb.ActivationConfigProperty;
-import javax.ejb.MessageDriven;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
-import javax.ejb.TransactionManagement;
-import javax.ejb.TransactionManagementType;
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.MessageListener;
-import javax.jms.TextMessage;
-import javax.transaction.SystemException;
-import javax.transaction.Transaction;
-import javax.transaction.TransactionManager;
-
-import org.jboss.ejb3.annotation.ResourceAdapter;
-
-/**
- * @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a>
- */
-@MessageDriven(name = "MDB_CMT_TxLocalExample",
- activationConfig =
- {
- @ActivationConfigProperty(propertyName = "destinationType", propertyValue = "javax.jms.Queue"),
- @ActivationConfigProperty(propertyName = "destination", propertyValue = "queue/testQueue"),
- @ActivationConfigProperty(propertyName = "useLocalTx", propertyValue = "true")
- })
-@TransactionAttribute(value = TransactionAttributeType.NOT_SUPPORTED)
-public class MDB_CMT_TxLocalExample implements MessageListener
-{
- @Resource(mappedName = "java:/TransactionManager")
- private TransactionManager tm;
-
- public void onMessage(final Message message)
- {
- try
- {
- // Step 9. We know the client is sending a text message so we cast
- TextMessage textMessage = (TextMessage)message;
-
- // Step 10. get the text from the message.
- String text = textMessage.getText();
-
- System.out.println("message " + text + " received");
-
- if (!textMessage.getJMSRedelivered())
- {
- // Step 11. On first delivery get the transaction, take a look, and throw an exception
- Transaction tx = tm.getTransaction();
-
- if (tx != null)
- {
- System.out.println("something is wrong, there should be no global transaction: " + tx);
- }
- else
- {
- System.out.println("there is no global transaction, although the message delivery is using a local transaction");
- System.out.println("let's throw an exception and see what happens");
- throw new RuntimeException("DOH!");
- }
- }
- else
- {
- // Step 12. Print the message
- System.out.println("The message was redelivered since the message delivery used a local transaction");
- }
-
- }
- catch (JMSException e)
- {
- e.printStackTrace();
- }
- catch (SystemException e)
- {
- e.printStackTrace();
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/mdb-cmt-tx-local/src/test/java/org/apache/activemq/javaee/example/MDBCMTSetLocalTXRunnerTest.java
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-cmt-tx-local/src/test/java/org/apache/activemq/javaee/example/MDBCMTSetLocalTXRunnerTest.java b/examples/javaee/mdb-cmt-tx-local/src/test/java/org/apache/activemq/javaee/example/MDBCMTSetLocalTXRunnerTest.java
deleted file mode 100644
index a8e6e6c..0000000
--- a/examples/javaee/mdb-cmt-tx-local/src/test/java/org/apache/activemq/javaee/example/MDBCMTSetLocalTXRunnerTest.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.activemq.javaee.example;
-
-import org.apache.activemq.javaee.example.server.MDB_CMT_TxLocalExample;
-import org.jboss.arquillian.container.test.api.Deployment;
-import org.jboss.arquillian.container.test.api.RunAsClient;
-import org.jboss.arquillian.junit.Arquillian;
-import org.jboss.shrinkwrap.api.Archive;
-import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.spec.JavaArchive;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-/**
- * @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a>
- * 5/21/12
- */
-@RunAsClient
-@RunWith(Arquillian.class)
-public class MDBCMTSetLocalTXRunnerTest
-{
- @Deployment
- public static Archive getDeployment()
- {
-
- final JavaArchive ejbJar = ShrinkWrap.create(JavaArchive.class, "mdb.jar");
- ejbJar.addClass(MDB_CMT_TxLocalExample.class);
- System.out.println(ejbJar.toString(true));
- return ejbJar;
- }
-
- @Test
- public void runExample() throws Exception
- {
- MDB_CMT_TxLocalClientExample.main(null);
- //give the example time to run
- Thread.sleep(1000);
- }
-}
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/mdb-cmt-tx-local/src/test/resources/arquillian.xml
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-cmt-tx-local/src/test/resources/arquillian.xml b/examples/javaee/mdb-cmt-tx-local/src/test/resources/arquillian.xml
deleted file mode 100644
index 9090137..0000000
--- a/examples/javaee/mdb-cmt-tx-local/src/test/resources/arquillian.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<arquillian xmlns="http://jboss.org/schema/arquillian"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://jboss.org/schema/arquillian http://jboss.org/schema/arquillian/arquillian_1_0.xsd">
-
- <!-- Uncomment to have test archives exported to the file system for inspection.
-This feature can also be controlled using the system property arquillian.deploymentExportPath -->
- <!--
-<engine>
-<property name="deploymentExportPath">target</property>
-</engine>
--->
-
- <defaultProtocol type="Servlet 3.0" />
-
- <container qualifier="jboss" default="true">
- <configuration>
- <property name="jbossHome">${basedir}/target/jbossas-node0</property>
- <property name="serverConfig">standalone-example.xml</property>
- <property name="allowConnectingToRunningServer">true</property>
- <property name="managementAddress">${node0:127.0.0.1}</property>
- </configuration>
- </container>
-
- <!-- logThreshold proposed -->
- <!--
-<container qualifier="jbossas-managed">
-<configuration>
-<property name="logThreshold">ERROR</property>
-</configuration>
-</container>
--->
-
-</arquillian>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/mdb-cmt-tx-not-supported/pom.xml
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-cmt-tx-not-supported/pom.xml b/examples/javaee/mdb-cmt-tx-not-supported/pom.xml
deleted file mode 100644
index cc557fb..0000000
--- a/examples/javaee/mdb-cmt-tx-not-supported/pom.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.activemq.example.javaee</groupId>
- <artifactId>javaee-examples</artifactId>
- <version>6.0.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>activemq-javaee-mdb-cmt-no-tx-example</artifactId>
- <packaging>jar</packaging>
- <name>ActiveMQ6 Java EE MDB CMT Transaction Not Supported Example</name>
-</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/mdb-cmt-tx-not-supported/readme.html
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-cmt-tx-not-supported/readme.html b/examples/javaee/mdb-cmt-tx-not-supported/readme.html
deleted file mode 100644
index e125d26..0000000
--- a/examples/javaee/mdb-cmt-tx-not-supported/readme.html
+++ /dev/null
@@ -1,116 +0,0 @@
-<html>
- <head>
- <title>ActiveMQ Java EE MDB Container Managed Transaction with NOT_SUPPORTED transaction Example</title>
- <link rel="stylesheet" type="text/css" href="../../common/common.css" />
- <link rel="stylesheet" type="text/css" href="../../common/prettify.css" />
- <script type="text/javascript" src="../../common/prettify.js"></script>
- </head>
- <body onload="prettyPrint()">
- <h1>Java EE MDB Container Managed Transaction with NOT_SUPPORTED transaction Example</h1>
-
- <p>This example shows you how to send a message to an MDB</p>
- <p>The example will deploy a simple MDB and send a message. The MDB consuming it will not use a transaction.</p>
-
- <p>The example leverages the JBoss Arquillian framework to run a WildFly instance and deploy the MDB.</p>
-
- <h2>Example step-by-step</h2>
-
- <p><i>download WildFly 8.0.0.Final from <a href="http://wildfly.org/downloads/">here</a> and install.</i></p>
- <p><i>set the JBOSS_HOME property to point to the WildFly install directory</i></p>
- <p><i>type <code>mvn verify</code> from the example directory to run</i></p>
-
- <ol>
- <li>First we need to get an initial context so we can look-up the JMS connection factory and destination objects from JNDI. This initial context will get it's properties from the <code>jndi.properties</code> file in the directory <code>config</code></li>
- <pre class="prettyprint">
- final Properties env = new Properties();
-
- env.put(Context.INITIAL_CONTEXT_FACTORY, "org.jboss.naming.remote.client.InitialContextFactory");
-
- env.put(Context.PROVIDER_URL, "http-remoting://localhost:8080");
-
- initialContext = new InitialContext(env);
- </pre>
-
- <li>We look up the JMS queue object from JNDI</li>
- <pre class="prettyprint">
- Queue queue = (Queue)initialContext.lookup("jms/queues/testQueue");
- </pre>
-
- <li>We look up the JMS connection factory object from JNDI</li>
- <pre class="prettyprint">
- ConnectionFactory cf = (ConnectionFactory)initialContext.lookup("/jms/RemoteConnectionFactory");
- </pre>
-
- <li>We create a JMS connection</li>
- <pre class="prettyprint">
- connection = cf.createConnection("guest", "password");
- </pre>
-
- <li>We create a JMS session. The session is created as non transacted and will auto acknowledge messages.</li>
- <pre class="prettyprint">
- <code>Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);</code>
- </pre>
-
- <li>We create a JMS message producer on the session. This will be used to send the messages.</li>
- <pre class="prettyprint">
- <code>MessageProducer messageProducer = session.createProducer(queue);</code>
- </pre>
-
- <li>We create a JMS text messages that we are going to send.</li>
- <pre class="prettyprint">
- <code> TextMessage message = session.createTextMessage("This is a text message");</code>
- </pre>
-
- <li>We send messages to the queue</li>
- <pre class="prettyprint">
- <code>messageProducer.send(message);</code>
- </pre>
-
- <li>The MDB receives the message<br />
- We know the message is a TextMessage so we cast to it.
- </li>
- <pre class="prettyprint">
- <code>TextMessage tm = (TextMessage)message;</code>
- </pre>
-
- <li>The MDB gets the text and prints it
- </li>
- <pre class="prettyprint">
- <code>String text = tm.getText();
- System.out.println("message " + text + " received");
- </code>
- </pre>
-
- <li>We look at the transaction to make sure there isn't one
- </li>
- <pre class="prettyprint">
- <code>Transaction tx = tm.getTransaction();
-
- if(tx == null)
- {
- System.out.println("tx is null, just as expected");
- }
- </code>
- </pre>
-
- <li>And finally, <b>always</b> remember to close your JMS connections and resources after use, in a <code>finally</code> block. Closing a JMS connection will automatically close all of its sessions, consumers, producer and browser objects</li>
-
- <pre class="prettyprint">
- <code>finally
- {
- if (initialContext != null)
- {
- initialContext.close();
- }
- if (connection != null)
- {
- connection.close();
- }
- }</code>
- </pre>
-
-
-
- </ol>
- </body>
-</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/mdb-cmt-tx-not-supported/server/standalone/configuration/application-roles.properties
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-cmt-tx-not-supported/server/standalone/configuration/application-roles.properties b/examples/javaee/mdb-cmt-tx-not-supported/server/standalone/configuration/application-roles.properties
deleted file mode 100644
index 0ade8fb..0000000
--- a/examples/javaee/mdb-cmt-tx-not-supported/server/standalone/configuration/application-roles.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# Properties declaration of users roles for the realm 'ApplicationRealm'.
-#
-# This includes the following protocols: remote ejb, remote jndi, web, remote jms
-#
-# Users can be added to this properties file at any time, updates after the server has started
-# will be automatically detected.
-#
-# The format of this file is as follows: -
-# username=role1,role2,role3
-#
-# A utility script is provided which can be executed from the bin folder to add the users: -
-# - Linux
-# bin/add-user.sh
-#
-# - Windows
-# bin\add-user.bat
-#
-# The following illustrates how an admin user could be defined.
-#
-#admin=PowerUser,BillingAdmin,
-guest=guest
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/mdb-cmt-tx-not-supported/server/standalone/configuration/application-users.properties
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-cmt-tx-not-supported/server/standalone/configuration/application-users.properties b/examples/javaee/mdb-cmt-tx-not-supported/server/standalone/configuration/application-users.properties
deleted file mode 100644
index c52e923..0000000
--- a/examples/javaee/mdb-cmt-tx-not-supported/server/standalone/configuration/application-users.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# Properties declaration of users for the realm 'ApplicationRealm' which is the default realm
-# for application services on a new AS 7.1 installation.
-#
-# This includes the following protocols: remote ejb, remote jndi, web, remote jms
-#
-# Users can be added to this properties file at any time, updates after the server has started
-# will be automatically detected.
-#
-# The format of this realm is as follows: -
-# username=HEX( MD5( username ':' realm ':' password))
-#
-# A utility script is provided which can be executed from the bin folder to add the users: -
-# - Linux
-# bin/add-user.sh
-#
-# - Windows
-# bin\add-user.bat
-#
-# The following illustrates how an admin user could be defined, this
-# is for illustration only and does not correspond to a usable password.
-#
-#admin=2a0923285184943425d1f53ddd58ec7a
-guest=3437456520927d113b17d471d630e0d6
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/mdb-cmt-tx-not-supported/server/standalone/configuration/logging.properties
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-cmt-tx-not-supported/server/standalone/configuration/logging.properties b/examples/javaee/mdb-cmt-tx-not-supported/server/standalone/configuration/logging.properties
deleted file mode 100644
index 3fa31b0..0000000
--- a/examples/javaee/mdb-cmt-tx-not-supported/server/standalone/configuration/logging.properties
+++ /dev/null
@@ -1,47 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# Additional logger names to configure (root logger is always configured)
-loggers=org.jboss.as.config
-
-# Dump system environment at boot by default
-logger.org.jboss.as.config.level=DEBUG
-
-# Root logger level
-logger.level=${jboss.boot.server.log.level:INFO}
-# Root logger handlers
-logger.handlers=FILE,CONSOLE
-
-# Console handler configuration
-handler.CONSOLE=org.jboss.logmanager.handlers.ConsoleHandler
-handler.CONSOLE.properties=autoFlush
-handler.CONSOLE.level=${jboss.boot.server.log.console.level:INFO}
-handler.CONSOLE.autoFlush=true
-handler.CONSOLE.formatter=PATTERN
-
-# File handler configuration
-handler.FILE=org.jboss.logmanager.handlers.FileHandler
-handler.FILE.level=DEBUG
-handler.FILE.properties=autoFlush,fileName
-handler.FILE.autoFlush=true
-handler.FILE.fileName=${org.jboss.boot.log.file:boot.log}
-handler.FILE.formatter=PATTERN
-
-# Formatter pattern configuration
-formatter.PATTERN=org.jboss.logmanager.formatters.PatternFormatter
-formatter.PATTERN.properties=pattern
-formatter.PATTERN.pattern=%d{HH:mm:ss,SSS} %-5p [%c] %s%E%n
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/mdb-cmt-tx-not-supported/server/standalone/configuration/mgmt-users.properties
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-cmt-tx-not-supported/server/standalone/configuration/mgmt-users.properties b/examples/javaee/mdb-cmt-tx-not-supported/server/standalone/configuration/mgmt-users.properties
deleted file mode 100644
index 349b004..0000000
--- a/examples/javaee/mdb-cmt-tx-not-supported/server/standalone/configuration/mgmt-users.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# Properties declaration of users for the realm 'ManagementRealm' which is the default realm
-# for new AS 7.1 installations. Further authentication mechanism can be configured
-# as part of the <management /> in standalone.xml.
-#
-# Users can be added to this properties file at any time, updates after the server has started
-# will be automatically detected.
-#
-# By default the properties realm expects the entries to be in the format: -
-# username=HEX( MD5( username ':' realm ':' password))
-#
-# A utility script is provided which can be executed from the bin folder to add the users: -
-# - Linux
-# bin/add-user.sh
-#
-# - Windows
-# bin\add-user.bat
-
-# The following illustrates how an admin user could be defined, this
-# is for illustration only and does not correspond to a usable password.
-#
-#admin=2a0923285184943425d1f53ddd58ec7a
-admin=9d71b431e53d99563aa0dfca628c970b
-andy=dfb16391f1be1c454b5bce9822bd9df3
[08/37] activemq-6 git commit: ACTIVEMQ6-41 Drop Java EE examples
Posted by jb...@apache.org.
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/mdb-cmt-tx-required/src/test/resources/arquillian.xml
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-cmt-tx-required/src/test/resources/arquillian.xml b/examples/javaee/mdb-cmt-tx-required/src/test/resources/arquillian.xml
deleted file mode 100644
index 9090137..0000000
--- a/examples/javaee/mdb-cmt-tx-required/src/test/resources/arquillian.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<arquillian xmlns="http://jboss.org/schema/arquillian"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://jboss.org/schema/arquillian http://jboss.org/schema/arquillian/arquillian_1_0.xsd">
-
- <!-- Uncomment to have test archives exported to the file system for inspection.
-This feature can also be controlled using the system property arquillian.deploymentExportPath -->
- <!--
-<engine>
-<property name="deploymentExportPath">target</property>
-</engine>
--->
-
- <defaultProtocol type="Servlet 3.0" />
-
- <container qualifier="jboss" default="true">
- <configuration>
- <property name="jbossHome">${basedir}/target/jbossas-node0</property>
- <property name="serverConfig">standalone-example.xml</property>
- <property name="allowConnectingToRunningServer">true</property>
- <property name="managementAddress">${node0:127.0.0.1}</property>
- </configuration>
- </container>
-
- <!-- logThreshold proposed -->
- <!--
-<container qualifier="jbossas-managed">
-<configuration>
-<property name="logThreshold">ERROR</property>
-</configuration>
-</container>
--->
-
-</arquillian>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/mdb-message-selector/pom.xml
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-message-selector/pom.xml b/examples/javaee/mdb-message-selector/pom.xml
deleted file mode 100644
index 61268d2..0000000
--- a/examples/javaee/mdb-message-selector/pom.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.activemq.example.javaee</groupId>
- <artifactId>javaee-examples</artifactId>
- <version>6.0.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>activemq-javaee-mdb-message-selector-example</artifactId>
- <packaging>jar</packaging>
- <name>ActiveMQ6 Java EE MDB Message Selector Example</name>
-</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/mdb-message-selector/readme.html
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-message-selector/readme.html b/examples/javaee/mdb-message-selector/readme.html
deleted file mode 100644
index 19aa38f..0000000
--- a/examples/javaee/mdb-message-selector/readme.html
+++ /dev/null
@@ -1,127 +0,0 @@
-<html>
- <head>
- <title>ActiveMQ Java EE MDB Message Selector Example</title>
- <link rel="stylesheet" type="text/css" href="../../common/common.css" />
- <link rel="stylesheet" type="text/css" href="../../common/prettify.css" />
- <script type="text/javascript" src="../../common/prettify.js"></script>
- </head>
- <body onload="prettyPrint()">
- <h1>Java EE MDB Message Selector Example</h1>
-
- <p>This example shows you how to send a message to an MDB that is configured to use a message selector</p>
- <p>The example will send deploy a simple MDB and demonstrate sending a message and the MDB consuming only the message that matches the message selector.</p>
-
- <p>The example leverages the JBoss Arquillian framework to run a WildFly instance and deploy the MDB.</p>
-
- <h2>Example step-by-step</h2>
-
- <p><i>download WildFly 8.0.0.Final from <a href="http://wildfly.org/downloads/">here</a> and install.</i></p>
- <p><i>set the JBOSS_HOME property to point to the WildFly install directory</i></p>
- <p><i>type <code>mvn verify</code> from the example directory to run</i></p>
-
- <ol>
- <li>First we need to get an initial context so we can look-up the JMS connection factory and destination objects from JNDI. This initial context will get it's properties from the <code>jndi.properties</code> file in the directory <code>config</code></li>
- <pre class="prettyprint">
- final Properties env = new Properties();
-
- env.put(Context.INITIAL_CONTEXT_FACTORY, "org.jboss.naming.remote.client.InitialContextFactory");
-
- env.put(Context.PROVIDER_URL, "http-remoting://localhost:8080");
-
- initialContext = new InitialContext(env);
- </pre>
-
- <li>We look up the JMS queue object from JNDI</li>
- <pre class="prettyprint">
- Queue queue = (Queue)initialContext.lookup("jms/queues/testQueue");
- </pre>
-
- <li>We look up the JMS connection factory object from JNDI</li>
- <pre class="prettyprint">
- ConnectionFactory cf = (ConnectionFactory)initialContext.lookup("/jms/RemoteConnectionFactory");
- </pre>
-
- <li>We create a JMS connection</li>
- <pre class="prettyprint">
- connection = cf.createConnection("guest", "password");
- </pre>
-
- <li>We create a JMS session. The session is created as non transacted and will auto acknowledge messages.</li>
- <pre class="prettyprint">
- <code>Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);</code>
- </pre>
-
- <li>We create a JMS message producer on the session. This will be used to send the messages.</li>
- <pre class="prettyprint">
- <code>MessageProducer messageProducer = session.createProducer(queue);</code>
- </pre>
-
- <li>We create a JMS text messages that we are going to send.</li>
- <pre class="prettyprint">
- <code> TextMessage blueMessage = session.createTextMessage("This is a text message");</code>
- </pre>
-
- <li>Set the color property on the message to 'BLUE'.</li>
- <pre class="prettyprint">
- <code> blueMessage.setStringProperty("color", "BLUE");</code>
- </pre>
-
- <li>We send messages to the queue</li>
- <pre class="prettyprint">
- <code>messageProducer.send(blueMessage);</code>
- </pre>
-
- <li>We create a second JMS text message that we are going to send.</li>
- <pre class="prettyprint">
- <code> TextMessage redMessage = session.createTextMessage("This is a text message");</code>
- </pre>
-
- <li>Set the color property on the message to 'RED'.</li>
- <pre class="prettyprint">
- <code> redMessage.setStringProperty("color", "RED");</code>
- </pre>
-
- <li>We send messages to the queue</li>
- <pre class="prettyprint">
- <code>messageProducer.send(redMessage);</code>
- </pre>
-
- <li>The MDB receives the message<br />
- We know the message is a TextMessage so we cast to it.
- </li>
- <pre class="prettyprint">
- <code>TextMessage tm = (TextMessage)message;</code>
- </pre>
-
- <li>We get the color property to check it
- </li>
- <pre class="prettyprint">
- <code>String color = textMessage.getStringProperty("color");</code>
- </pre>
-
- <li>The MDB gets the text and color and print it
- </li>
- <pre class="prettyprint">
- <code>String text = tm.getText();
- System.out.println("message " + text + " received color=" + color);
- </code>
- </pre>
-
- <li>And finally, <b>always</b> remember to close your JMS connections and resources after use, in a <code>finally</code> block. Closing a JMS connection will automatically close all of its sessions, consumers, producer and browser objects</li>
-
- <pre class="prettyprint">
- <code>finally
- {
- if (initialContext != null)
- {
- initialContext.close();
- }
- if (connection != null)
- {
- connection.close();
- }
- }</code>
- </pre>
- </ol>
- </body>
-</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/mdb-message-selector/server/standalone/configuration/application-roles.properties
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-message-selector/server/standalone/configuration/application-roles.properties b/examples/javaee/mdb-message-selector/server/standalone/configuration/application-roles.properties
deleted file mode 100644
index 0ade8fb..0000000
--- a/examples/javaee/mdb-message-selector/server/standalone/configuration/application-roles.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# Properties declaration of users roles for the realm 'ApplicationRealm'.
-#
-# This includes the following protocols: remote ejb, remote jndi, web, remote jms
-#
-# Users can be added to this properties file at any time, updates after the server has started
-# will be automatically detected.
-#
-# The format of this file is as follows: -
-# username=role1,role2,role3
-#
-# A utility script is provided which can be executed from the bin folder to add the users: -
-# - Linux
-# bin/add-user.sh
-#
-# - Windows
-# bin\add-user.bat
-#
-# The following illustrates how an admin user could be defined.
-#
-#admin=PowerUser,BillingAdmin,
-guest=guest
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/mdb-message-selector/server/standalone/configuration/application-users.properties
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-message-selector/server/standalone/configuration/application-users.properties b/examples/javaee/mdb-message-selector/server/standalone/configuration/application-users.properties
deleted file mode 100644
index c52e923..0000000
--- a/examples/javaee/mdb-message-selector/server/standalone/configuration/application-users.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# Properties declaration of users for the realm 'ApplicationRealm' which is the default realm
-# for application services on a new AS 7.1 installation.
-#
-# This includes the following protocols: remote ejb, remote jndi, web, remote jms
-#
-# Users can be added to this properties file at any time, updates after the server has started
-# will be automatically detected.
-#
-# The format of this realm is as follows: -
-# username=HEX( MD5( username ':' realm ':' password))
-#
-# A utility script is provided which can be executed from the bin folder to add the users: -
-# - Linux
-# bin/add-user.sh
-#
-# - Windows
-# bin\add-user.bat
-#
-# The following illustrates how an admin user could be defined, this
-# is for illustration only and does not correspond to a usable password.
-#
-#admin=2a0923285184943425d1f53ddd58ec7a
-guest=3437456520927d113b17d471d630e0d6
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/mdb-message-selector/server/standalone/configuration/logging.properties
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-message-selector/server/standalone/configuration/logging.properties b/examples/javaee/mdb-message-selector/server/standalone/configuration/logging.properties
deleted file mode 100644
index 3fa31b0..0000000
--- a/examples/javaee/mdb-message-selector/server/standalone/configuration/logging.properties
+++ /dev/null
@@ -1,47 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# Additional logger names to configure (root logger is always configured)
-loggers=org.jboss.as.config
-
-# Dump system environment at boot by default
-logger.org.jboss.as.config.level=DEBUG
-
-# Root logger level
-logger.level=${jboss.boot.server.log.level:INFO}
-# Root logger handlers
-logger.handlers=FILE,CONSOLE
-
-# Console handler configuration
-handler.CONSOLE=org.jboss.logmanager.handlers.ConsoleHandler
-handler.CONSOLE.properties=autoFlush
-handler.CONSOLE.level=${jboss.boot.server.log.console.level:INFO}
-handler.CONSOLE.autoFlush=true
-handler.CONSOLE.formatter=PATTERN
-
-# File handler configuration
-handler.FILE=org.jboss.logmanager.handlers.FileHandler
-handler.FILE.level=DEBUG
-handler.FILE.properties=autoFlush,fileName
-handler.FILE.autoFlush=true
-handler.FILE.fileName=${org.jboss.boot.log.file:boot.log}
-handler.FILE.formatter=PATTERN
-
-# Formatter pattern configuration
-formatter.PATTERN=org.jboss.logmanager.formatters.PatternFormatter
-formatter.PATTERN.properties=pattern
-formatter.PATTERN.pattern=%d{HH:mm:ss,SSS} %-5p [%c] %s%E%n
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/mdb-message-selector/server/standalone/configuration/mgmt-users.properties
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-message-selector/server/standalone/configuration/mgmt-users.properties b/examples/javaee/mdb-message-selector/server/standalone/configuration/mgmt-users.properties
deleted file mode 100644
index 349b004..0000000
--- a/examples/javaee/mdb-message-selector/server/standalone/configuration/mgmt-users.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# Properties declaration of users for the realm 'ManagementRealm' which is the default realm
-# for new AS 7.1 installations. Further authentication mechanism can be configured
-# as part of the <management /> in standalone.xml.
-#
-# Users can be added to this properties file at any time, updates after the server has started
-# will be automatically detected.
-#
-# By default the properties realm expects the entries to be in the format: -
-# username=HEX( MD5( username ':' realm ':' password))
-#
-# A utility script is provided which can be executed from the bin folder to add the users: -
-# - Linux
-# bin/add-user.sh
-#
-# - Windows
-# bin\add-user.bat
-
-# The following illustrates how an admin user could be defined, this
-# is for illustration only and does not correspond to a usable password.
-#
-#admin=2a0923285184943425d1f53ddd58ec7a
-admin=9d71b431e53d99563aa0dfca628c970b
-andy=dfb16391f1be1c454b5bce9822bd9df3
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/mdb-message-selector/server/standalone/configuration/standalone-example.xml
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-message-selector/server/standalone/configuration/standalone-example.xml b/examples/javaee/mdb-message-selector/server/standalone/configuration/standalone-example.xml
deleted file mode 100644
index 58f07a7..0000000
--- a/examples/javaee/mdb-message-selector/server/standalone/configuration/standalone-example.xml
+++ /dev/null
@@ -1,489 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-
-<server xmlns="urn:jboss:domain:2.0">
- <extensions>
- <extension module="org.jboss.as.clustering.infinispan"/>
- <extension module="org.jboss.as.connector"/>
- <extension module="org.jboss.as.deployment-scanner"/>
- <extension module="org.jboss.as.ee"/>
- <extension module="org.jboss.as.ejb3"/>
- <extension module="org.jboss.as.jacorb"/>
- <extension module="org.jboss.as.jaxrs"/>
- <extension module="org.jboss.as.jdr"/>
- <extension module="org.jboss.as.jmx"/>
- <extension module="org.jboss.as.jpa"/>
- <extension module="org.jboss.as.jsf"/>
- <extension module="org.jboss.as.jsr77"/>
- <extension module="org.jboss.as.logging"/>
- <extension module="org.jboss.as.mail"/>
- <extension module="org.jboss.as.messaging"/>
- <extension module="org.jboss.as.naming"/>
- <extension module="org.jboss.as.pojo"/>
- <extension module="org.jboss.as.remoting"/>
- <extension module="org.jboss.as.sar"/>
- <extension module="org.jboss.as.security"/>
- <extension module="org.jboss.as.threads"/>
- <extension module="org.jboss.as.transactions"/>
- <extension module="org.jboss.as.webservices"/>
- <extension module="org.jboss.as.weld"/>
- <extension module="org.wildfly.extension.batch"/>
- <extension module="org.wildfly.extension.io"/>
- <extension module="org.wildfly.extension.undertow"/>
- </extensions>
- <management>
- <security-realms>
- <security-realm name="ManagementRealm">
- <authentication>
- <local default-user="$local"/>
- <properties path="mgmt-users.properties" relative-to="jboss.server.config.dir"/>
- </authentication>
- <authorization map-groups-to-roles="false">
- <properties path="mgmt-groups.properties" relative-to="jboss.server.config.dir"/>
- </authorization>
- </security-realm>
- <security-realm name="ApplicationRealm">
- <authentication>
- <local default-user="$local" allowed-users="*"/>
- <properties path="application-users.properties" relative-to="jboss.server.config.dir"/>
- </authentication>
- <authorization>
- <properties path="application-roles.properties" relative-to="jboss.server.config.dir"/>
- </authorization>
- </security-realm>
- </security-realms>
- <audit-log>
- <formatters>
- <json-formatter name="json-formatter"/>
- </formatters>
- <handlers>
- <file-handler name="file" formatter="json-formatter" relative-to="jboss.server.data.dir" path="audit-log.log"/>
- </handlers>
- <logger log-boot="true" log-read-only="false" enabled="false">
- <handlers>
- <handler name="file"/>
- </handlers>
- </logger>
- </audit-log>
- <management-interfaces>
- <http-interface security-realm="ManagementRealm" http-upgrade-enabled="true">
- <socket-binding http="management-http"/>
- </http-interface>
- </management-interfaces>
- <access-control provider="simple">
- <role-mapping>
- <role name="SuperUser">
- <include>
- <user name="$local"/>
- </include>
- </role>
- </role-mapping>
- </access-control>
- </management>
- <profile>
- <subsystem xmlns="urn:jboss:domain:logging:2.0">
- <console-handler name="CONSOLE">
- <level name="INFO"/>
- <formatter>
- <named-formatter name="COLOR-PATTERN"/>
- </formatter>
- </console-handler>
- <periodic-rotating-file-handler name="FILE" autoflush="true">
- <formatter>
- <named-formatter name="PATTERN"/>
- </formatter>
- <file relative-to="jboss.server.log.dir" path="server.log"/>
- <suffix value=".yyyy-MM-dd"/>
- <append value="true"/>
- </periodic-rotating-file-handler>
- <logger category="com.arjuna">
- <level name="WARN"/>
- </logger>
- <logger category="org.apache.tomcat.util.modeler">
- <level name="WARN"/>
- </logger>
- <logger category="org.jboss.as.config">
- <level name="DEBUG"/>
- </logger>
- <logger category="sun.rmi">
- <level name="WARN"/>
- </logger>
- <logger category="jacorb">
- <level name="WARN"/>
- </logger>
- <logger category="jacorb.config">
- <level name="ERROR"/>
- </logger>
- <root-logger>
- <level name="INFO"/>
- <handlers>
- <handler name="CONSOLE"/>
- <handler name="FILE"/>
- </handlers>
- </root-logger>
- <formatter name="PATTERN">
- <pattern-formatter pattern="%d{yyyy-MM-dd HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/>
- </formatter>
- <formatter name="COLOR-PATTERN">
- <pattern-formatter pattern="%K{level}%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/>
- </formatter>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:batch:1.0">
- <job-repository>
- <in-memory/>
- </job-repository>
- <thread-pool>
- <max-threads count="10"/>
- <keepalive-time time="100" unit="milliseconds"/>
- </thread-pool>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:datasources:2.0">
- <datasources>
- <datasource jndi-name="java:jboss/datasources/ExampleDS" pool-name="ExampleDS" enabled="true" use-java-context="true">
- <connection-url>jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE</connection-url>
- <driver>h2</driver>
- <security>
- <user-name>sa</user-name>
- <password>sa</password>
- </security>
- </datasource>
- <drivers>
- <driver name="h2" module="com.h2database.h2">
- <xa-datasource-class>org.h2.jdbcx.JdbcDataSource</xa-datasource-class>
- </driver>
- </drivers>
- </datasources>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:deployment-scanner:2.0">
- <deployment-scanner path="deployments" relative-to="jboss.server.base.dir" scan-interval="5000" runtime-failure-causes-rollback="${jboss.deployment.scanner.rollback.on.failure:false}"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:ee:2.0">
- <spec-descriptor-property-replacement>false</spec-descriptor-property-replacement>
- <jboss-descriptor-property-replacement>true</jboss-descriptor-property-replacement>
- <annotation-property-replacement>false</annotation-property-replacement>
- <concurrent>
- <context-services>
- <context-service name="default" jndi-name="java:jboss/ee/concurrency/context/default" use-transaction-setup-provider="true"/>
- </context-services>
- <managed-executor-services>
- <managed-executor-service name="default" jndi-name="java:jboss/ee/concurrency/executor/default" context-service="default" hung-task-threshold="60000" core-threads="5" max-threads="25" keepalive-time="5000"/>
- </managed-executor-services>
- <managed-scheduled-executor-services>
- <managed-scheduled-executor-service name="default" jndi-name="java:jboss/ee/concurrency/scheduler/default" context-service="default" hung-task-threshold="60000" core-threads="2" keepalive-time="3000"/>
- </managed-scheduled-executor-services>
- <managed-thread-factories>
- <managed-thread-factory name="default" jndi-name="java:jboss/ee/concurrency/factory/default" context-service="default"/>
- </managed-thread-factories>
- </concurrent>
- <default-bindings context-service="java:jboss/ee/concurrency/context/default" datasource="java:jboss/datasources/ExampleDS" jms-connection-factory="java:jboss/DefaultJMSConnectionFactory" managed-executor-service="java:jboss/ee/concurrency/executor/default" managed-scheduled-executor-service="java:jboss/ee/concurrency/scheduler/default" managed-thread-factory="java:jboss/ee/concurrency/factory/default"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:ejb3:2.0">
- <session-bean>
- <stateful default-access-timeout="5000" cache-ref="simple" passivation-disabled-cache-ref="simple"/>
- <singleton default-access-timeout="5000"/>
- </session-bean>
- <mdb>
- <resource-adapter-ref resource-adapter-name="${ejb.resource-adapter-name:activemq-ra.rar}"/>
- <bean-instance-pool-ref pool-name="mdb-strict-max-pool"/>
- </mdb>
- <pools>
- <bean-instance-pools>
- <!-- A sample strict max pool configuration -->
- <strict-max-pool name="slsb-strict-max-pool" max-pool-size="20" instance-acquisition-timeout="5" instance-acquisition-timeout-unit="MINUTES"/>
- <strict-max-pool name="mdb-strict-max-pool" max-pool-size="20" instance-acquisition-timeout="5" instance-acquisition-timeout-unit="MINUTES"/>
- </bean-instance-pools>
- </pools>
- <caches>
- <cache name="simple"/>
- <cache name="distributable" aliases="passivating clustered" passivation-store-ref="infinispan"/>
- </caches>
- <passivation-stores>
- <passivation-store name="infinispan" cache-container="ejb" max-size="10000"/>
- </passivation-stores>
- <async thread-pool-name="default"/>
- <timer-service thread-pool-name="default" default-data-store="default-file-store">
- <data-stores>
- <file-data-store name="default-file-store" path="timer-service-data" relative-to="jboss.server.data.dir"/>
- </data-stores>
- </timer-service>
- <remote connector-ref="http-remoting-connector" thread-pool-name="default"/>
- <thread-pools>
- <thread-pool name="default">
- <max-threads count="10"/>
- <keepalive-time time="100" unit="milliseconds"/>
- </thread-pool>
- </thread-pools>
- <iiop enable-by-default="false" use-qualified-name="false"/>
- <default-security-domain value="other"/>
- <default-missing-method-permissions-deny-access value="true"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:io:1.0">
- <worker name="default" io-threads="3"/>
- <buffer-pool name="default" buffer-size="16384" buffers-per-slice="128"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:infinispan:2.0">
- <cache-container name="web" default-cache="passivation" module="org.wildfly.clustering.web.infinispan">
- <local-cache name="passivation" batching="true">
- <file-store passivation="true" purge="false"/>
- </local-cache>
- <local-cache name="persistent" batching="true">
- <file-store passivation="false" purge="false"/>
- </local-cache>
- </cache-container>
- <cache-container name="ejb" aliases="sfsb" default-cache="passivation" module="org.wildfly.clustering.ejb.infinispan">
- <local-cache name="passivation" batching="true">
- <file-store passivation="true" purge="false"/>
- </local-cache>
- <local-cache name="persistent" batching="true">
- <file-store passivation="false" purge="false"/>
- </local-cache>
- </cache-container>
- <cache-container name="hibernate" default-cache="local-query" module="org.hibernate">
- <local-cache name="entity">
- <transaction mode="NON_XA"/>
- <eviction strategy="LRU" max-entries="10000"/>
- <expiration max-idle="100000"/>
- </local-cache>
- <local-cache name="local-query">
- <transaction mode="NONE"/>
- <eviction strategy="LRU" max-entries="10000"/>
- <expiration max-idle="100000"/>
- </local-cache>
- <local-cache name="timestamps">
- <transaction mode="NONE"/>
- <eviction strategy="NONE"/>
- </local-cache>
- </cache-container>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:jacorb:1.3">
- <orb socket-binding="jacorb" ssl-socket-binding="jacorb-ssl">
- <initializers transactions="spec" security="identity"/>
- </orb>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:jaxrs:1.0"/>
- <subsystem xmlns="urn:jboss:domain:jca:2.0">
- <archive-validation enabled="true" fail-on-error="true" fail-on-warn="false"/>
- <bean-validation enabled="true"/>
- <default-workmanager>
- <short-running-threads>
- <core-threads count="50"/>
- <queue-length count="50"/>
- <max-threads count="50"/>
- <keepalive-time time="10" unit="seconds"/>
- </short-running-threads>
- <long-running-threads>
- <core-threads count="50"/>
- <queue-length count="50"/>
- <max-threads count="50"/>
- <keepalive-time time="10" unit="seconds"/>
- </long-running-threads>
- </default-workmanager>
- <cached-connection-manager/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:jdr:1.0"/>
- <subsystem xmlns="urn:jboss:domain:jmx:1.3">
- <expose-resolved-model/>
- <expose-expression-model/>
- <remoting-connector/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:jpa:1.1">
- <jpa default-datasource="" default-extended-persistence-inheritance="DEEP"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:jsf:1.0"/>
- <subsystem xmlns="urn:jboss:domain:jsr77:1.0"/>
- <subsystem xmlns="urn:jboss:domain:mail:2.0">
- <mail-session name="default" jndi-name="java:jboss/mail/Default">
- <smtp-server outbound-socket-binding-ref="mail-smtp"/>
- </mail-session>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:messaging:2.0">
- <activemq-server>
- <persistence-enabled>true</persistence-enabled>
- <journal-file-size>102400</journal-file-size>
- <journal-min-files>2</journal-min-files>
- <connectors>
- <http-connector name="http-connector" socket-binding="http">
- <param key="http-upgrade-endpoint" value="http-acceptor"/>
- </http-connector>
- <http-connector name="http-connector-throughput" socket-binding="http">
- <param key="http-upgrade-endpoint" value="http-acceptor-throughput"/>
- <param key="batch-delay" value="50"/>
- </http-connector>
- <in-vm-connector name="in-vm" server-id="0"/>
- </connectors>
- <acceptors>
- <http-acceptor name="http-acceptor" http-listener="default"/>
- <http-acceptor name="http-acceptor-throughput" http-listener="default">
- <param key="batch-delay" value="50"/>
- <param key="direct-deliver" value="false"/>
- </http-acceptor>
- <in-vm-acceptor name="in-vm" server-id="0"/>
- </acceptors>
- <security-settings>
- <security-setting match="#">
- <permission type="send" roles="guest"/>
- <permission type="consume" roles="guest"/>
- <permission type="createNonDurableQueue" roles="guest"/>
- <permission type="deleteNonDurableQueue" roles="guest"/>
- </security-setting>
- </security-settings>
- <address-settings>
- <!--default for catch all-->
- <address-setting match="#">
- <dead-letter-address>jms.queue.DLQ</dead-letter-address>
- <expiry-address>jms.queue.ExpiryQueue</expiry-address>
- <redelivery-delay>0</redelivery-delay>
- <max-size-bytes>10485760</max-size-bytes>
- <address-full-policy>PAGE</address-full-policy>
- <page-size-bytes>2097152</page-size-bytes>
- <message-counter-history-day-limit>10</message-counter-history-day-limit>
- </address-setting>
- </address-settings>
- <jms-connection-factories>
- <connection-factory name="InVmConnectionFactory">
- <connectors>
- <connector-ref connector-name="in-vm"/>
- </connectors>
- <entries>
- <entry name="java:/ConnectionFactory"/>
- </entries>
- </connection-factory>
- <connection-factory name="RemoteConnectionFactory">
- <connectors>
- <connector-ref connector-name="http-connector"/>
- </connectors>
- <entries>
- <entry name="java:jboss/exported/jms/RemoteConnectionFactory"/>
- </entries>
- </connection-factory>
- <pooled-connection-factory name="activemq-ra">
- <transaction mode="xa"/>
- <connectors>
- <connector-ref connector-name="in-vm"/>
- </connectors>
- <entries>
- <entry name="java:/JmsXA"/>
- <!-- Global JNDI entry used to provide a default JMS Connection factory to EE application -->
- <entry name="java:jboss/DefaultJMSConnectionFactory"/>
- </entries>
- </pooled-connection-factory>
- </jms-connection-factories>
- <jms-destinations>
- <jms-queue name="testQueue">
- <entry name="queue/test"/>
- <entry name="java:jboss/exported/jms/queues/testQueue"/>
- </jms-queue>
- </jms-destinations>
- </activemq-server>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:naming:2.0">
- <remote-naming/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:pojo:1.0"/>
- <subsystem xmlns="urn:jboss:domain:remoting:2.0">
- <endpoint worker="default"/>
- <http-connector name="http-remoting-connector" connector-ref="default" security-realm="ApplicationRealm"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:resource-adapters:2.0"/>
- <subsystem xmlns="urn:jboss:domain:sar:1.0"/>
- <subsystem xmlns="urn:jboss:domain:security:1.2">
- <security-domains>
- <security-domain name="other" cache-type="default">
- <authentication>
- <login-module code="Remoting" flag="optional">
- <module-option name="password-stacking" value="useFirstPass"/>
- </login-module>
- <login-module code="RealmDirect" flag="required">
- <module-option name="password-stacking" value="useFirstPass"/>
- </login-module>
- </authentication>
- </security-domain>
- <security-domain name="jboss-web-policy" cache-type="default">
- <authorization>
- <policy-module code="Delegating" flag="required"/>
- </authorization>
- </security-domain>
- <security-domain name="jboss-ejb-policy" cache-type="default">
- <authorization>
- <policy-module code="Delegating" flag="required"/>
- </authorization>
- </security-domain>
- </security-domains>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:threads:1.1"/>
- <subsystem xmlns="urn:jboss:domain:transactions:2.0">
- <core-environment>
- <process-id>
- <uuid/>
- </process-id>
- </core-environment>
- <recovery-environment socket-binding="txn-recovery-environment" status-socket-binding="txn-status-manager"/>
- <coordinator-environment default-timeout="300"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:undertow:1.0">
- <buffer-caches>
- <buffer-cache name="default" buffer-size="1024" buffers-per-region="1024" max-regions="10"/>
- </buffer-caches>
- <server name="default-server">
- <http-listener name="default" socket-binding="http"/>
- <host name="default-host" alias="localhost">
- <location name="/" handler="welcome-content"/>
- <filter-ref name="server-header"/>
- <filter-ref name="x-powered-by-header"/>
- </host>
- </server>
- <servlet-container name="default" default-buffer-cache="default" stack-trace-on-error="local-only">
- <jsp-config/>
- </servlet-container>
- <handlers>
- <file name="welcome-content" path="${jboss.home.dir}/welcome-content" directory-listing="true"/>
- </handlers>
- <filters>
- <response-header name="server-header" header-name="Server" header-value="Wildfly 8"/>
- <response-header name="x-powered-by-header" header-name="X-Powered-By" header-value="Undertow 1"/>
- </filters>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:webservices:1.2">
- <modify-wsdl-address>true</modify-wsdl-address>
- <wsdl-host>${jboss.bind.address:127.0.0.1}</wsdl-host>
- <endpoint-config name="Standard-Endpoint-Config"/>
- <endpoint-config name="Recording-Endpoint-Config">
- <pre-handler-chain name="recording-handlers" protocol-bindings="##SOAP11_HTTP ##SOAP11_HTTP_MTOM ##SOAP12_HTTP ##SOAP12_HTTP_MTOM">
- <handler name="RecordingHandler" class="org.jboss.ws.common.invocation.RecordingServerHandler"/>
- </pre-handler-chain>
- </endpoint-config>
- <client-config name="Standard-Client-Config"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:weld:2.0"/>
- </profile>
- <interfaces>
- <interface name="management">
- <inet-address value="${jboss.bind.address.management:127.0.0.1}"/>
- </interface>
- <interface name="public">
- <inet-address value="${jboss.bind.address:127.0.0.1}"/>
- </interface>
- <!-- TODO - only show this if the jacorb subsystem is added -->
- <interface name="unsecure">
- <!--
- ~ Used for IIOP sockets in the standard configuration.
- ~ To secure JacORB you need to setup SSL
- -->
- <inet-address value="${jboss.bind.address.unsecure:127.0.0.1}"/>
- </interface>
- </interfaces>
- <socket-binding-group name="standard-sockets" default-interface="public" port-offset="${jboss.socket.binding.port-offset:0}">
- <socket-binding name="management-http" interface="management" port="${jboss.management.http.port:9990}"/>
- <socket-binding name="management-https" interface="management" port="${jboss.management.https.port:9993}"/>
- <socket-binding name="ajp" port="${jboss.ajp.port:8009}"/>
- <socket-binding name="http" port="${jboss.http.port:8080}"/>
- <socket-binding name="https" port="${jboss.https.port:8443}"/>
- <socket-binding name="jacorb" interface="unsecure" port="3528"/>
- <socket-binding name="jacorb-ssl" interface="unsecure" port="3529"/>
- <socket-binding name="messaging-group" port="0" multicast-address="${jboss.messaging.group.address:231.7.7.7}" multicast-port="${jboss.messaging.group.port:9876}"/>
- <socket-binding name="txn-recovery-environment" port="4712"/>
- <socket-binding name="txn-status-manager" port="4713"/>
- <outbound-socket-binding name="mail-smtp">
- <remote-destination host="localhost" port="25"/>
- </outbound-socket-binding>
- </socket-binding-group>
-</server>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/mdb-message-selector/src/main/java/org/apache/activemq/javaee/example/MDBMessageSelectorClientExample.java
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-message-selector/src/main/java/org/apache/activemq/javaee/example/MDBMessageSelectorClientExample.java b/examples/javaee/mdb-message-selector/src/main/java/org/apache/activemq/javaee/example/MDBMessageSelectorClientExample.java
deleted file mode 100644
index 62be9c3..0000000
--- a/examples/javaee/mdb-message-selector/src/main/java/org/apache/activemq/javaee/example/MDBMessageSelectorClientExample.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.activemq.javaee.example;
-
-import javax.jms.Connection;
-import javax.jms.ConnectionFactory;
-import javax.jms.MessageProducer;
-import javax.jms.Queue;
-import javax.jms.Session;
-import javax.jms.TextMessage;
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import java.util.Properties;
-
-/**
- * @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a>
- */
-public class MDBMessageSelectorClientExample
-{
- public static void main(String[] args) throws Exception
- {
- Connection connection = null;
- InitialContext initialContext = null;
- try
- {
- //Step 1. Create an initial context to perform the JNDI lookup.
- final Properties env = new Properties();
-
- env.put(Context.INITIAL_CONTEXT_FACTORY, "org.jboss.naming.remote.client.InitialContextFactory");
-
- env.put(Context.PROVIDER_URL, "http-remoting://localhost:8080");
-
- initialContext = new InitialContext(env);
-
- //Step 2. Perfom a lookup on the queue
- Queue queue = (Queue) initialContext.lookup("jms/queues/testQueue");
-
- //Step 3. Perform a lookup on the Connection Factory
- ConnectionFactory cf = (ConnectionFactory) initialContext.lookup("jms/RemoteConnectionFactory");
-
- //Step 4.Create a JMS Connection
- connection = cf.createConnection("guest", "password");
-
- //Step 5. Create a JMS Session
- Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
-
- //Step 6. Create a JMS Message Producer
- MessageProducer producer = session.createProducer(queue);
-
- //Step 7. Create a Text Message and set the color property to blue
- TextMessage blueMessage = session.createTextMessage("This is a text message");
-
- blueMessage.setStringProperty("color", "BLUE");
-
- System.out.println("Sent message: " + blueMessage.getText() + " color=BLUE");
-
- //Step 8. Send the Message
- producer.send(blueMessage);
-
- //Step 9. create another message and set the color property to red
- TextMessage redMessage = session.createTextMessage("This is a text message");
-
- redMessage.setStringProperty("color", "RED");
-
- System.out.println("Sent message: " + redMessage.getText() + " color=RED");
-
- //Step 10. Send the Message
- producer.send(redMessage);
- //Step 10,11 and 12 in MDBMessageSelectorExample
- }
- finally
- {
- //Step 13. Be sure to close our JMS resources!
- if (initialContext != null)
- {
- initialContext.close();
- }
- if(connection != null)
- {
- connection.close();
- }
- }
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/mdb-message-selector/src/main/java/org/apache/activemq/javaee/example/server/MDBMessageSelectorExample.java
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-message-selector/src/main/java/org/apache/activemq/javaee/example/server/MDBMessageSelectorExample.java b/examples/javaee/mdb-message-selector/src/main/java/org/apache/activemq/javaee/example/server/MDBMessageSelectorExample.java
deleted file mode 100644
index 27f5340..0000000
--- a/examples/javaee/mdb-message-selector/src/main/java/org/apache/activemq/javaee/example/server/MDBMessageSelectorExample.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.activemq.javaee.example.server;
-
-import org.jboss.ejb3.annotation.ResourceAdapter;
-
-import javax.ejb.ActivationConfigProperty;
-import javax.ejb.MessageDriven;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
-import javax.ejb.TransactionManagement;
-import javax.ejb.TransactionManagementType;
-import javax.jms.Message;
-import javax.jms.MessageListener;
-import javax.jms.TextMessage;
-
-/**
- * @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a>
- */
-@MessageDriven(name = "MDBMessageSelectorExample",
- activationConfig =
- {
- @ActivationConfigProperty(propertyName = "destinationType", propertyValue = "javax.jms.Queue"),
- @ActivationConfigProperty(propertyName = "destination", propertyValue = "queue/testQueue"),
- @ActivationConfigProperty(propertyName = "messageSelector", propertyValue = "color = 'RED'")
- })
-public class MDBMessageSelectorExample implements MessageListener
-{
- public void onMessage(Message message)
- {
- try
- {
- //Step 11. We know the client is sending a text message so we cast
- TextMessage textMessage = (TextMessage)message;
-
- //Step 12. get the text from the message.
- String text = textMessage.getText();
-
- //Step 13. We check we received the right color of message
- String color = textMessage.getStringProperty("color");
-
- System.out.println("message " + text + " received color=" + color);
-
- }
- catch (Exception e)
- {
- e.printStackTrace();
- }
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/mdb-message-selector/src/test/java/org/apache/activemq/javaee/examples/MDBCMTSetMessageSelectorRunnerTest.java
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-message-selector/src/test/java/org/apache/activemq/javaee/examples/MDBCMTSetMessageSelectorRunnerTest.java b/examples/javaee/mdb-message-selector/src/test/java/org/apache/activemq/javaee/examples/MDBCMTSetMessageSelectorRunnerTest.java
deleted file mode 100644
index 5359df1..0000000
--- a/examples/javaee/mdb-message-selector/src/test/java/org/apache/activemq/javaee/examples/MDBCMTSetMessageSelectorRunnerTest.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.activemq.javaee.examples;
-
-import org.apache.activemq.javaee.example.MDBMessageSelectorClientExample;
-import org.apache.activemq.javaee.example.server.MDBMessageSelectorExample;
-import org.jboss.arquillian.container.test.api.Deployment;
-import org.jboss.arquillian.container.test.api.RunAsClient;
-import org.jboss.arquillian.junit.Arquillian;
-import org.jboss.shrinkwrap.api.Archive;
-import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.spec.JavaArchive;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-/**
- * @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a>
- * 5/21/12
- */
-@RunAsClient
-@RunWith(Arquillian.class)
-public class MDBCMTSetMessageSelectorRunnerTest
-{
- @Deployment
- public static Archive getDeployment()
- {
- final JavaArchive ejbJar = ShrinkWrap.create(JavaArchive.class, "mdb.jar");
- ejbJar.addClass(MDBMessageSelectorExample.class);
- System.out.println(ejbJar.toString(true));
- return ejbJar;
- }
-
- @Test
- public void runExample() throws Exception
- {
- MDBMessageSelectorClientExample.main(null);
- //give the example time to run
- Thread.sleep(1000);
- }
-}
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/mdb-message-selector/src/test/resources/arquillian.xml
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-message-selector/src/test/resources/arquillian.xml b/examples/javaee/mdb-message-selector/src/test/resources/arquillian.xml
deleted file mode 100644
index 9090137..0000000
--- a/examples/javaee/mdb-message-selector/src/test/resources/arquillian.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<arquillian xmlns="http://jboss.org/schema/arquillian"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://jboss.org/schema/arquillian http://jboss.org/schema/arquillian/arquillian_1_0.xsd">
-
- <!-- Uncomment to have test archives exported to the file system for inspection.
-This feature can also be controlled using the system property arquillian.deploymentExportPath -->
- <!--
-<engine>
-<property name="deploymentExportPath">target</property>
-</engine>
--->
-
- <defaultProtocol type="Servlet 3.0" />
-
- <container qualifier="jboss" default="true">
- <configuration>
- <property name="jbossHome">${basedir}/target/jbossas-node0</property>
- <property name="serverConfig">standalone-example.xml</property>
- <property name="allowConnectingToRunningServer">true</property>
- <property name="managementAddress">${node0:127.0.0.1}</property>
- </configuration>
- </container>
-
- <!-- logThreshold proposed -->
- <!--
-<container qualifier="jbossas-managed">
-<configuration>
-<property name="logThreshold">ERROR</property>
-</configuration>
-</container>
--->
-
-</arquillian>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/mdb-remote-failover-static/pom.xml
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-remote-failover-static/pom.xml b/examples/javaee/mdb-remote-failover-static/pom.xml
deleted file mode 100644
index c370437..0000000
--- a/examples/javaee/mdb-remote-failover-static/pom.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.activemq.example.javaee</groupId>
- <artifactId>javaee-examples</artifactId>
- <version>6.0.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>activemq-javaee-mdb-remote-failover-static-example</artifactId>
- <packaging>jar</packaging>
- <name>ActiveMQ6 Java EE MDB Remote Failover Static Example</name>
-
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <executions>
- <!-- Copy the AS for the second node into current_submodule/target/as-node1.-->
- <execution>
- <id>as-node1</id>
- <inherited>true</inherited>
- <phase>generate-test-resources</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <outputDirectory>${basedir}/target/jbossas-node1</outputDirectory>
- <overwrite>true</overwrite>
- <resources>
- <resource>
- <directory>${jboss.home}</directory>
- <excludes>
- <exclude>standalone/data</exclude>
- <exclude>standalone/log</exclude>
- <exclude>standalone/tmp</exclude>
- </excludes>
- </resource>
- <resource>
- <directory>${basedir}/server</directory>
- </resource>
- </resources>
- </configuration>
- </execution>
- <!-- Copy the AS for the second node into current_submodule/target/as-node2.-->
- <execution>
- <id>as-node2</id>
- <inherited>true</inherited>
- <phase>generate-test-resources</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <outputDirectory>${basedir}/target/jbossas-node2</outputDirectory>
- <overwrite>true</overwrite>
- <resources>
- <resource>
- <directory>${jboss.home}</directory>
- <excludes>
- <exclude>standalone/data</exclude>
- <exclude>standalone/log</exclude>
- <exclude>standalone/tmp</exclude>
- </excludes>
- </resource>
- <resource>
- <directory>${basedir}/server</directory>
- </resource>
- </resources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.12</version>
- <configuration>
- <argLine>-Dlogging.configuration=file:///${user.dir}/test/config/logging.properties</argLine>
- <!-- Parameters to test cases. -->
- <systemPropertyVariables>
- <arquillian.launch>clustering-all</arquillian.launch>
- </systemPropertyVariables>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/mdb-remote-failover-static/readme.html
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-remote-failover-static/readme.html b/examples/javaee/mdb-remote-failover-static/readme.html
deleted file mode 100644
index 6bbb8a6..0000000
--- a/examples/javaee/mdb-remote-failover-static/readme.html
+++ /dev/null
@@ -1,165 +0,0 @@
-<html>
- <head>
- <title>ActiveMQ Java EE MDB Message Selector Example</title>
- <link rel="stylesheet" type="text/css" href="../../common/common.css" />
- <link rel="stylesheet" type="text/css" href="../../common/prettify.css" />
- <script type="text/javascript" src="../../common/prettify.js"></script>
- </head>
- <body onload="prettyPrint()">
- <h1>Java EE MDB Remote Failover Static Example</h1>
-
- <p>This example shows you how to send a message to an MDB that is configured to consume from a live/backup pair.</p>
- <p>The example will send deploy a simple MDB to one Wildfly instance. Then it will send a message to the live server of the live/backup pair
- which will be consumed by the MDB after which the MDB will send a reply message which will be consumed by the example program. Then the live
- server will be stopped so that the backup takes over and the process will be repeated.</p>
-
- <p>Unlike the "Java EE MDB Remote Failover Example," this example uses a "static" configuration for finding all the nodes. In other words
- it doesn't use UDP multicast for server discovery.</p>
-
- <p>The example leverages the JBoss Arquillian framework to run a WildFly instance and deploy the MDB.</p>
-
- <h2>Example step-by-step</h2>
-
- <p><i>download WildFly 8.0.0.Final from <a href="http://wildfly.org/downloads/">here</a> and install.</i></p>
- <p><i>set the JBOSS_HOME property to point to the WildFly install directory</i></p>
- <p><i>type <code>mvn verify</code> from the example directory to run</i></p>
-
- <ol>
- <li>First we need to get an initial context so we can look-up the JMS connection factory and destination objects from JNDI. This initial context will get it's properties from the <code>jndi.properties</code> file in the directory <code>config</code></li>
- <pre class="prettyprint">
- final Properties env = new Properties();
-
- env.put(Context.INITIAL_CONTEXT_FACTORY, "org.jboss.naming.remote.client.InitialContextFactory");
-
- env.put(Context.PROVIDER_URL, "http-remoting://localhost:8080");
-
- initialContext = new InitialContext(env);
- </pre>
-
- <li>We look up the JMS queue object from JNDI</li>
- <pre class="prettyprint">
- Queue queue = (Queue) initialContext.lookup("/queues/inQueue");
- </pre>
-
- <li>We look up the JMS connection factory object from JNDI</li>
- <pre class="prettyprint">
- ConnectionFactory cf = (ConnectionFactory)initialContext.lookup("/jms/RemoteConnectionFactory");
- </pre>
-
- <li>We create a JMS connection</li>
- <pre class="prettyprint">
- connection = cf.createConnection("guest", "password");
- </pre>
-
- <li>We create a JMS session. The session is created as non transacted and will auto acknowledge messages.</li>
- <pre class="prettyprint">
- <code>Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);</code>
- </pre>
-
- <li>We create a JMS message producer on the session. This will be used to send the messages.</li>
- <pre class="prettyprint">
- <code>MessageProducer messageProducer = session.createProducer(queue);</code>
- </pre>
-
- <li>We create a JMS text messages that we are going to send.</li>
- <pre class="prettyprint">
- <code>TextMessage message = session.createTextMessage("This is a text message");</code>
- </pre>
-
- <li>We send the message to the queue</li>
- <pre class="prettyprint">
- <code>messageProducer.send(message);</code>
- </pre>
-
- <li>MDB receives the message</li>
- <pre class="prettyprint">
- <code>TextMessage textMessage = (TextMessage)message;</code>
- </pre>
-
- <li>Get and print the text</li>
- <pre class="prettyprint">
- <code>String text = textMessage.getText();
-
- System.out.println("message " + text);</code>
- </pre>
-
- <li>Create a JMS connection using the injected connection factory</li>
- <pre class="prettyprint">
- <code>conn = connectionFactory.createConnection();</code>
- </pre>
-
- <li>Create a JMS session</li>
- <pre class="prettyprint">
- <code>Session sess = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);</code>
- </pre>
-
- <li>Create a producer</li>
- <pre class="prettyprint">
- <code>MessageProducer producer = sess.createProducer(replyQueue);</code>
- </pre>
-
- <li>Create a message and send it to the reply queue</li>
- <pre class="prettyprint">
- <code>producer.send(sess.createTextMessage("this is a reply"));</code>
- </pre>
-
- <li>Client looks up the reply queue</li>
- <pre class="prettyprint">
- <code>queue = (Queue) initialContext.lookup("/queues/outQueue");</code>
- </pre>
-
- <li>Create a consumer</li>
- <pre class="prettyprint">
- <code>MessageConsumer messageConsumer = session.createConsumer(queue);</code>
- </pre>
-
- <li>Start the connection</li>
- <pre class="prettyprint">
- <code>connection.start();</code>
- </pre>
-
- <li>Receive the message and print it out</li>
- <pre class="prettyprint">
- <code>message = (TextMessage) messageConsumer.receive(20000);
-
- System.out.println("message.getText() = " + message.getText());</code>
- </pre>
-
- <li>Kill the live server. At this point both the standalone client and the MDB will fail-over to the backup.</li>
- <pre class="prettyprint">
- <code>killer.kill();</code>
- </pre>
-
- <li>Create another message</li>
- <pre class="prettyprint">
- <code>message = session.createTextMessage("This is another text message");</code>
- </pre>
-
- <li>Send the message</li>
- <pre class="prettyprint">
- <code>producer.send(message);</code>
- </pre>
-
- <li>The MDB will receive the message and send another message to the reply queue which the client then receives</li>
- <pre class="prettyprint">
- <code>message = (TextMessage) messageConsumer.receive(20000);</code>
- </pre>
-
- <li>And finally, <b>always</b> remember to close your JMS connections and resources after use, in a <code>finally</code> block. Closing a JMS connection will automatically close all of its sessions, consumers, producer and browser objects</li>
-
- <pre class="prettyprint">
- <code>finally
- {
- if (initialContext != null)
- {
- initialContext.close();
- }
- if (connection != null)
- {
- connection.close();
- }
- }</code>
- </pre>
- </ol>
- </body>
-</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/mdb-remote-failover-static/server/standalone/configuration/application-roles.properties
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-remote-failover-static/server/standalone/configuration/application-roles.properties b/examples/javaee/mdb-remote-failover-static/server/standalone/configuration/application-roles.properties
deleted file mode 100644
index 0ade8fb..0000000
--- a/examples/javaee/mdb-remote-failover-static/server/standalone/configuration/application-roles.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# Properties declaration of users roles for the realm 'ApplicationRealm'.
-#
-# This includes the following protocols: remote ejb, remote jndi, web, remote jms
-#
-# Users can be added to this properties file at any time, updates after the server has started
-# will be automatically detected.
-#
-# The format of this file is as follows: -
-# username=role1,role2,role3
-#
-# A utility script is provided which can be executed from the bin folder to add the users: -
-# - Linux
-# bin/add-user.sh
-#
-# - Windows
-# bin\add-user.bat
-#
-# The following illustrates how an admin user could be defined.
-#
-#admin=PowerUser,BillingAdmin,
-guest=guest
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/mdb-remote-failover-static/server/standalone/configuration/application-users.properties
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-remote-failover-static/server/standalone/configuration/application-users.properties b/examples/javaee/mdb-remote-failover-static/server/standalone/configuration/application-users.properties
deleted file mode 100644
index c52e923..0000000
--- a/examples/javaee/mdb-remote-failover-static/server/standalone/configuration/application-users.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# Properties declaration of users for the realm 'ApplicationRealm' which is the default realm
-# for application services on a new AS 7.1 installation.
-#
-# This includes the following protocols: remote ejb, remote jndi, web, remote jms
-#
-# Users can be added to this properties file at any time, updates after the server has started
-# will be automatically detected.
-#
-# The format of this realm is as follows: -
-# username=HEX( MD5( username ':' realm ':' password))
-#
-# A utility script is provided which can be executed from the bin folder to add the users: -
-# - Linux
-# bin/add-user.sh
-#
-# - Windows
-# bin\add-user.bat
-#
-# The following illustrates how an admin user could be defined, this
-# is for illustration only and does not correspond to a usable password.
-#
-#admin=2a0923285184943425d1f53ddd58ec7a
-guest=3437456520927d113b17d471d630e0d6
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/mdb-remote-failover-static/server/standalone/configuration/logging.properties
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-remote-failover-static/server/standalone/configuration/logging.properties b/examples/javaee/mdb-remote-failover-static/server/standalone/configuration/logging.properties
deleted file mode 100644
index 3fa31b0..0000000
--- a/examples/javaee/mdb-remote-failover-static/server/standalone/configuration/logging.properties
+++ /dev/null
@@ -1,47 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# Additional logger names to configure (root logger is always configured)
-loggers=org.jboss.as.config
-
-# Dump system environment at boot by default
-logger.org.jboss.as.config.level=DEBUG
-
-# Root logger level
-logger.level=${jboss.boot.server.log.level:INFO}
-# Root logger handlers
-logger.handlers=FILE,CONSOLE
-
-# Console handler configuration
-handler.CONSOLE=org.jboss.logmanager.handlers.ConsoleHandler
-handler.CONSOLE.properties=autoFlush
-handler.CONSOLE.level=${jboss.boot.server.log.console.level:INFO}
-handler.CONSOLE.autoFlush=true
-handler.CONSOLE.formatter=PATTERN
-
-# File handler configuration
-handler.FILE=org.jboss.logmanager.handlers.FileHandler
-handler.FILE.level=DEBUG
-handler.FILE.properties=autoFlush,fileName
-handler.FILE.autoFlush=true
-handler.FILE.fileName=${org.jboss.boot.log.file:boot.log}
-handler.FILE.formatter=PATTERN
-
-# Formatter pattern configuration
-formatter.PATTERN=org.jboss.logmanager.formatters.PatternFormatter
-formatter.PATTERN.properties=pattern
-formatter.PATTERN.pattern=%d{HH:mm:ss,SSS} %-5p [%c] %s%E%n
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/mdb-remote-failover-static/server/standalone/configuration/mgmt-users.properties
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-remote-failover-static/server/standalone/configuration/mgmt-users.properties b/examples/javaee/mdb-remote-failover-static/server/standalone/configuration/mgmt-users.properties
deleted file mode 100644
index 309305a..0000000
--- a/examples/javaee/mdb-remote-failover-static/server/standalone/configuration/mgmt-users.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# Properties declaration of users for the realm 'ManagementRealm' which is the default realm
-# for new AS 7.1 installations. Further authentication mechanism can be configured
-# as part of the <management /> in standalone.xml.
-#
-# Users can be added to this properties file at any time, updates after the server has started
-# will be automatically detected.
-#
-# By default the properties realm expects the entries to be in the format: -
-# username=HEX( MD5( username ':' realm ':' password))
-#
-# A utility script is provided which can be executed from the bin folder to add the users: -
-# - Linux
-# bin/add-user.sh
-#
-# - Windows
-# bin\add-user.bat
-
-# The following illustrates how an admin user could be defined, this
-# is for illustration only and does not correspond to a usable password.
-#
-#admin=2a0923285184943425d1f53ddd58ec7a
-admin=ffd6e94a09c5a9ea5e216737dd45b99d
-andy=dfb16391f1be1c454b5bce9822bd9df3
[21/37] activemq-6 git commit: ACTIVEMQ6-51 Example server
bootstrapping
Posted by jb...@apache.org.
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/replicated-transaction-failover/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/replicated-transaction-failover/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/replicated-transaction-failover/src/main/resources/hornetq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-transaction-failover/src/main/resources/hornetq/server1/activemq-configuration.xml b/examples/jms/replicated-transaction-failover/src/main/resources/hornetq/server1/activemq-configuration.xml
deleted file mode 100644
index f95ed77..0000000
--- a/examples/jms/replicated-transaction-failover/src/main/resources/hornetq/server1/activemq-configuration.xml
+++ /dev/null
@@ -1,79 +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}/server1/data/messaging/bindings</bindings-directory>
-
- <journal-directory>${build.directory}/server1/data/messaging/journal</journal-directory>
-
- <large-messages-directory>${build.directory}/server1/data/messaging/largemessages</large-messages-directory>
-
- <paging-directory>${build.directory}/server1/data/messaging/paging</paging-directory>
-
- <ha-policy>
- <replication>
- <slave/>
- </replication>
- </ha-policy>
-
- <!-- Connectors -->
-
- <connectors>
- <connector name="netty-live-connector">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
- <param key="port" value="5445"/>
- </connector>
- <connector name="netty-connector">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
- <param key="port" value="5446"/>
- </connector>
- </connectors>
-
- <!-- Acceptors -->
- <acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- <param key="port" value="5446"/>
- </acceptor>
- </acceptors>
-
- <broadcast-groups>
- <broadcast-group name="bg-group1">
- <group-address>${udp-address:231.7.7.7}</group-address>
- <group-port>9876</group-port>
- <broadcast-period>1000</broadcast-period>
- <connector-ref>netty-connector</connector-ref>
- </broadcast-group>
- </broadcast-groups>
-
- <discovery-groups>
- <discovery-group name="dg-group1">
- <group-address>${udp-address:231.7.7.7}</group-address>
- <group-port>9876</group-port>
- <refresh-timeout>60000</refresh-timeout>
- </discovery-group>
- </discovery-groups>
-
- <cluster-connections>
- <cluster-connection name="my-cluster">
- <address>jms</address>
- <connector-ref>netty-connector</connector-ref>
- <discovery-group-ref discovery-group-name="dg-group1"/>
- </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>
-
-</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/replicated-transaction-failover/src/main/resources/hornetq/server1/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-transaction-failover/src/main/resources/hornetq/server1/activemq-jms.xml b/examples/jms/replicated-transaction-failover/src/main/resources/hornetq/server1/activemq-jms.xml
deleted file mode 100644
index 0d5c953..0000000
--- a/examples/jms/replicated-transaction-failover/src/main/resources/hornetq/server1/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/replicated-transaction-failover/src/main/resources/hornetq/server1/activemq-users.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/replicated-transaction-failover/src/main/resources/hornetq/server1/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/replicated-transaction-failover/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-transaction-failover/src/main/resources/jndi.properties b/examples/jms/replicated-transaction-failover/src/main/resources/jndi.properties
new file mode 100644
index 0000000..8fda7c0
--- /dev/null
+++ b/examples/jms/replicated-transaction-failover/src/main/resources/jndi.properties
@@ -0,0 +1,7 @@
+java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
+java.naming.provider.url=tcp://localhost:5445
+connection.ConnectionFactory.ha=true
+connection.ConnectionFactory.retryInterval=1000
+connection.ConnectionFactory.retryIntervalMultiplier=1.0
+connection.ConnectionFactory.reconnectAttempts=-1
+queue.queue/exampleQueue=exampleQueue
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/request-reply/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/request-reply/pom.xml b/examples/jms/request-reply/pom.xml
index 72fcd0a..377f2b2 100644
--- a/examples/jms/request-reply/pom.xml
+++ b/examples/jms/request-reply/pom.xml
@@ -51,9 +51,6 @@
</goals>
<configuration>
<clientClass>org.apache.activemq.jms.example.RequestReplyExample</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/request-reply/src/main/java/org/apache/activemq/jms/example/RequestReplyExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/request-reply/src/main/java/org/apache/activemq/jms/example/RequestReplyExample.java b/examples/jms/request-reply/src/main/java/org/apache/activemq/jms/example/RequestReplyExample.java
index cd73411..651dc2a 100644
--- a/examples/jms/request-reply/src/main/java/org/apache/activemq/jms/example/RequestReplyExample.java
+++ b/examples/jms/request-reply/src/main/java/org/apache/activemq/jms/example/RequestReplyExample.java
@@ -67,7 +67,7 @@ public class RequestReplyExample extends ActiveMQExample
server.start();
// Step 2. Create an initial context to perform the JNDI lookup.
- initialContext = getContext(0);
+ initialContext = new InitialContext();
// Step 3. Lookup the queue for sending the request message
Queue requestQueue = (Queue)initialContext.lookup("queue/exampleQueue");
@@ -162,7 +162,7 @@ public class RequestReplyExample extends ActiveMQExample
public void start() throws Exception
{
// Get an initial context to perform the JNDI lookup.
- InitialContext initialContext = getContext(0);
+ InitialContext initialContext = new InitialContext();
// Lookup the queue to receive the request message
Queue requestQueue = (Queue)initialContext.lookup("queue/exampleQueue");
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/request-reply/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/request-reply/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/request-reply/src/main/resources/activemq/server0/activemq-configuration.xml
new file mode 100644
index 0000000..9d3a1bb
--- /dev/null
+++ b/examples/jms/request-reply/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="netty-acceptor">
+ <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
+ </acceptor>
+ </acceptors>
+
+ <!-- Other config -->
+
+ <security-settings>
+ <!--security for example queues -->
+ <security-setting match="jms.queue.#">
+ <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 for JMS temporary queue -->
+ <security-setting match="jms.tempqueue.#">
+ <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/request-reply/src/main/resources/activemq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/request-reply/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/request-reply/src/main/resources/activemq/server0/activemq-jms.xml
new file mode 100644
index 0000000..847659f
--- /dev/null
+++ b/examples/jms/request-reply/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>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/request-reply/src/main/resources/activemq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/request-reply/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/request-reply/src/main/resources/activemq/server0/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/request-reply/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/request-reply/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/request-reply/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/request-reply/src/main/resources/hornetq/server0/activemq-configuration.xml
deleted file mode 100644
index 25e8fc2..0000000
--- a/examples/jms/request-reply/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ /dev/null
@@ -1,49 +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 queues -->
- <security-setting match="jms.queue.#">
- <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 for JMS temporary queue -->
- <security-setting match="jms.tempqueue.#">
- <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/request-reply/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index 847659f..0000000
--- a/examples/jms/request-reply/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>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/request-reply/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/request-reply/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/request-reply/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/request-reply/src/main/resources/jndi.properties b/examples/jms/request-reply/src/main/resources/jndi.properties
new file mode 100644
index 0000000..8fda7c0
--- /dev/null
+++ b/examples/jms/request-reply/src/main/resources/jndi.properties
@@ -0,0 +1,7 @@
+java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
+java.naming.provider.url=tcp://localhost:5445
+connection.ConnectionFactory.ha=true
+connection.ConnectionFactory.retryInterval=1000
+connection.ConnectionFactory.retryIntervalMultiplier=1.0
+connection.ConnectionFactory.reconnectAttempts=-1
+queue.queue/exampleQueue=exampleQueue
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/rest/dup-send/src/main/resources/activemq-client.xml
----------------------------------------------------------------------
diff --git a/examples/jms/rest/dup-send/src/main/resources/activemq-client.xml b/examples/jms/rest/dup-send/src/main/resources/activemq-client.xml
new file mode 100644
index 0000000..ad54b11
--- /dev/null
+++ b/examples/jms/rest/dup-send/src/main/resources/activemq-client.xml
@@ -0,0 +1,12 @@
+<configuration xmlns="urn:activemq"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
+
+ <!-- Connectors -->
+ <connectors>
+ <connector name="netty-connector">
+ <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
+ </connector>
+ </connectors>
+
+</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/rest/dup-send/src/main/resources/activemq-rest.xml
----------------------------------------------------------------------
diff --git a/examples/jms/rest/dup-send/src/main/resources/activemq-rest.xml b/examples/jms/rest/dup-send/src/main/resources/activemq-rest.xml
new file mode 100644
index 0000000..706a5a4
--- /dev/null
+++ b/examples/jms/rest/dup-send/src/main/resources/activemq-rest.xml
@@ -0,0 +1,3 @@
+<rest-messaging>
+ <dups-ok>false</dups-ok>
+</rest-messaging>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/rest/dup-send/src/main/resources/hornetq-client.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index ad54b11..0000000
--- a/examples/jms/rest/dup-send/src/main/resources/hornetq-client.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<configuration xmlns="urn:activemq"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
-
- <!-- Connectors -->
- <connectors>
- <connector name="netty-connector">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
- </connector>
- </connectors>
-
-</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/rest/dup-send/src/main/resources/hornetq-rest.xml
----------------------------------------------------------------------
diff --git a/examples/jms/rest/dup-send/src/main/resources/hornetq-rest.xml b/examples/jms/rest/dup-send/src/main/resources/hornetq-rest.xml
deleted file mode 100644
index 706a5a4..0000000
--- a/examples/jms/rest/dup-send/src/main/resources/hornetq-rest.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<rest-messaging>
- <dups-ok>false</dups-ok>
-</rest-messaging>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/rest/jms-to-rest/src/main/resources/activemq-client.xml
----------------------------------------------------------------------
diff --git a/examples/jms/rest/jms-to-rest/src/main/resources/activemq-client.xml b/examples/jms/rest/jms-to-rest/src/main/resources/activemq-client.xml
new file mode 100644
index 0000000..ad54b11
--- /dev/null
+++ b/examples/jms/rest/jms-to-rest/src/main/resources/activemq-client.xml
@@ -0,0 +1,12 @@
+<configuration xmlns="urn:activemq"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
+
+ <!-- Connectors -->
+ <connectors>
+ <connector name="netty-connector">
+ <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
+ </connector>
+ </connectors>
+
+</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/rest/jms-to-rest/src/main/resources/hornetq-client.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index ad54b11..0000000
--- a/examples/jms/rest/jms-to-rest/src/main/resources/hornetq-client.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<configuration xmlns="urn:activemq"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
-
- <!-- Connectors -->
- <connectors>
- <connector name="netty-connector">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
- </connector>
- </connectors>
-
-</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/rest/push/src/main/resources/activemq-client.xml
----------------------------------------------------------------------
diff --git a/examples/jms/rest/push/src/main/resources/activemq-client.xml b/examples/jms/rest/push/src/main/resources/activemq-client.xml
new file mode 100644
index 0000000..ad54b11
--- /dev/null
+++ b/examples/jms/rest/push/src/main/resources/activemq-client.xml
@@ -0,0 +1,12 @@
+<configuration xmlns="urn:activemq"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
+
+ <!-- Connectors -->
+ <connectors>
+ <connector name="netty-connector">
+ <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
+ </connector>
+ </connectors>
+
+</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/rest/push/src/main/resources/hornetq-client.xml
----------------------------------------------------------------------
diff --git a/examples/jms/rest/push/src/main/resources/hornetq-client.xml b/examples/jms/rest/push/src/main/resources/hornetq-client.xml
deleted file mode 100644
index ad54b11..0000000
--- a/examples/jms/rest/push/src/main/resources/hornetq-client.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<configuration xmlns="urn:activemq"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
-
- <!-- Connectors -->
- <connectors>
- <connector name="netty-connector">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
- </connector>
- </connectors>
-
-</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/scale-down/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/scale-down/pom.xml b/examples/jms/scale-down/pom.xml
index f9a23af..33924a6 100644
--- a/examples/jms/scale-down/pom.xml
+++ b/examples/jms/scale-down/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>udp-address</name>
@@ -51,9 +51,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>
@@ -70,10 +68,6 @@
</goals>
<configuration>
<clientClass>org.apache.activemq.jms.example.ScaleDownExample</clientClass>
- <args>
- <param>tcp://localhost:5445</param>
- <param>tcp://localhost:5446</param>
- </args>
<systemProperties>
<property>
<name>exampleConfigDir</name>
@@ -88,7 +82,7 @@
<goal>stop</goal>
</goals>
<configuration>
- <hornetqConfigurationDir>${basedir}/target/classes/activemq/server0</hornetqConfigurationDir>
+ <configurationDir>${basedir}/target/classes/activemq/server0</configurationDir>
</configuration>
</execution>
<execution>
@@ -97,7 +91,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/scale-down/src/main/java/org/apache/activemq/jms/example/ScaleDownExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/scale-down/src/main/java/org/apache/activemq/jms/example/ScaleDownExample.java b/examples/jms/scale-down/src/main/java/org/apache/activemq/jms/example/ScaleDownExample.java
index d942b79..3d29180 100644
--- a/examples/jms/scale-down/src/main/java/org/apache/activemq/jms/example/ScaleDownExample.java
+++ b/examples/jms/scale-down/src/main/java/org/apache/activemq/jms/example/ScaleDownExample.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;
@@ -52,8 +54,24 @@ public class ScaleDownExample extends ActiveMQExample
try
{
// Step 1. Get an initial context for looking up JNDI for both servers
- initialContext1 = getContext(1);
- initialContext = 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("connection.ConnectionFactory.ha", true);
+ properties.put("connection.ConnectionFactory.retryInterval", 1000);
+ properties.put("connection.ConnectionFactory.retryIntervalMultiplier", 1.0);
+ properties.put("connection.ConnectionFactory.reconnectAttempts", -1);
+ properties.put("queue.queue/exampleQueue", "exampleQueue");
+ initialContext = new InitialContext(properties);
+
+ properties = new Hashtable<String, Object>();
+ properties.put("java.naming.factory.initial", "org.apache.activemq.jndi.ActiveMQInitialContextFactory");
+ properties.put("java.naming.provider.url", args[1]);
+ properties.put("connection.ConnectionFactory.ha", true);
+ properties.put("connection.ConnectionFactory.retryInterval", 1000);
+ properties.put("connection.ConnectionFactory.retryIntervalMultiplier", 1.0);
+ properties.put("connection.ConnectionFactory.reconnectAttempts", -1);
+ initialContext1 = new InitialContext(properties);
// Step 2. Look up the JMS resources from JNDI
Queue queue = (Queue)initialContext.lookup("queue/exampleQueue");
@@ -83,9 +101,9 @@ public class ScaleDownExample extends ActiveMQExample
System.out.println("Sent message: " + message.getText());
}
- // Step 7. Crash server #0, the live server, and wait a little while to make sure
+ // Step 7. Crash server #1, the live server, and wait a little while to make sure
// it has really crashed
- Thread.sleep(2000);
+ Thread.sleep(5000);
killServer(1);
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/scale-down/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/scale-down/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/scale-down/src/main/resources/activemq/server0/activemq-configuration.xml
new file mode 100644
index 0000000..b9a9938
--- /dev/null
+++ b/examples/jms/scale-down/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -0,0 +1,96 @@
+<configuration xmlns="urn:activemq"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
+
+
+ <bindings-directory>target/server0/data/messaging/bindings</bindings-directory>
+
+ <journal-directory>target/server0/data/messaging/journal</journal-directory>
+
+ <large-messages-directory>target/server0/data/messaging/largemessages</large-messages-directory>
+
+ <paging-directory>target/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>
+ <reconnect-attempts>5</reconnect-attempts>
+ <use-duplicate-detection>true</use-duplicate-detection>
+ <forward-when-no-consumers>true</forward-when-no-consumers>
+ <max-hops>1</max-hops>
+ <discovery-group-ref discovery-group-name="my-discovery-group"/>
+ </cluster-connection>
+ </cluster-connections>
+
+ <ha-policy/>
+
+ <!-- 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.activemq.management">
+ <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"/>
+ <permission type="manage" roles="guest"/>
+ </security-setting>
+ <security-setting match="jms.queue.activemq.management.*">
+ <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"/>
+ <permission type="manage" roles="guest"/>
+ </security-setting>
+ </security-settings>
+
+
+</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/scale-down/src/main/resources/activemq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/scale-down/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/scale-down/src/main/resources/activemq/server0/activemq-jms.xml
new file mode 100644
index 0000000..847659f
--- /dev/null
+++ b/examples/jms/scale-down/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>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/scale-down/src/main/resources/activemq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/scale-down/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/scale-down/src/main/resources/activemq/server0/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/scale-down/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/scale-down/src/main/resources/activemq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/scale-down/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/scale-down/src/main/resources/activemq/server1/activemq-configuration.xml
new file mode 100644
index 0000000..71e9863
--- /dev/null
+++ b/examples/jms/scale-down/src/main/resources/activemq/server1/activemq-configuration.xml
@@ -0,0 +1,91 @@
+<configuration xmlns="urn:activemq"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
+
+
+
+ <bindings-directory>target/server1/data/messaging/bindings</bindings-directory>
+
+ <journal-directory>target/server1/data/messaging/journal</journal-directory>
+
+ <large-messages-directory>target/server1/data/messaging/largemessages</large-messages-directory>
+
+ <paging-directory>target/server1/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="5446"/>
+ </connector>
+ <connector name="server0-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="5446"/>
+ </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>
+ <reconnect-attempts>5</reconnect-attempts>
+ <use-duplicate-detection>true</use-duplicate-detection>
+ <forward-when-no-consumers>true</forward-when-no-consumers>
+ <max-hops>1</max-hops>
+ <discovery-group-ref discovery-group-name="my-discovery-group"/>
+ </cluster-connection>
+ </cluster-connections>
+
+ <!--a live server that will scale down on server shutdown-->
+ <ha-policy>
+ <live-only>
+ <scale-down>
+ <connectors>
+ <connector-ref>server0-connector</connector-ref>
+ </connectors>
+ </scale-down>
+ </live-only>
+ </ha-policy>
+
+ <!-- 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/scale-down/src/main/resources/activemq/server1/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/scale-down/src/main/resources/activemq/server1/activemq-jms.xml b/examples/jms/scale-down/src/main/resources/activemq/server1/activemq-jms.xml
new file mode 100644
index 0000000..847659f
--- /dev/null
+++ b/examples/jms/scale-down/src/main/resources/activemq/server1/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>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/scale-down/src/main/resources/activemq/server1/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/scale-down/src/main/resources/activemq/server1/activemq-users.xml b/examples/jms/scale-down/src/main/resources/activemq/server1/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/scale-down/src/main/resources/activemq/server1/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/scale-down/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/scale-down/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/scale-down/src/main/resources/hornetq/server0/activemq-configuration.xml
deleted file mode 100644
index 784a5bf..0000000
--- a/examples/jms/scale-down/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ /dev/null
@@ -1,100 +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>target/server0/data/messaging/bindings</bindings-directory>
-
- <journal-directory>target/server0/data/messaging/journal</journal-directory>
-
- <large-messages-directory>target/server0/data/messaging/largemessages</large-messages-directory>
-
- <paging-directory>target/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>
- <connector name="server1-connector">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
- <param key="port" value="5446"/>
- </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>
- <reconnect-attempts>5</reconnect-attempts>
- <use-duplicate-detection>true</use-duplicate-detection>
- <forward-when-no-consumers>true</forward-when-no-consumers>
- <max-hops>1</max-hops>
- <discovery-group-ref discovery-group-name="my-discovery-group"/>
- </cluster-connection>
- </cluster-connections>
-
- <ha-policy/>
-
- <!-- 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.activemq.management">
- <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"/>
- <permission type="manage" roles="guest"/>
- </security-setting>
- <security-setting match="jms.queue.activemq.management.*">
- <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"/>
- <permission type="manage" roles="guest"/>
- </security-setting>
- </security-settings>
-
-
-</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/scale-down/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index 847659f..0000000
--- a/examples/jms/scale-down/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>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/scale-down/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/scale-down/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/scale-down/src/main/resources/hornetq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/scale-down/src/main/resources/hornetq/server1/activemq-configuration.xml b/examples/jms/scale-down/src/main/resources/hornetq/server1/activemq-configuration.xml
deleted file mode 100644
index 71e9863..0000000
--- a/examples/jms/scale-down/src/main/resources/hornetq/server1/activemq-configuration.xml
+++ /dev/null
@@ -1,91 +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>target/server1/data/messaging/bindings</bindings-directory>
-
- <journal-directory>target/server1/data/messaging/journal</journal-directory>
-
- <large-messages-directory>target/server1/data/messaging/largemessages</large-messages-directory>
-
- <paging-directory>target/server1/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="5446"/>
- </connector>
- <connector name="server0-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="5446"/>
- </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>
- <reconnect-attempts>5</reconnect-attempts>
- <use-duplicate-detection>true</use-duplicate-detection>
- <forward-when-no-consumers>true</forward-when-no-consumers>
- <max-hops>1</max-hops>
- <discovery-group-ref discovery-group-name="my-discovery-group"/>
- </cluster-connection>
- </cluster-connections>
-
- <!--a live server that will scale down on server shutdown-->
- <ha-policy>
- <live-only>
- <scale-down>
- <connectors>
- <connector-ref>server0-connector</connector-ref>
- </connectors>
- </scale-down>
- </live-only>
- </ha-policy>
-
- <!-- 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/scale-down/src/main/resources/hornetq/server1/activemq-jms.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index 847659f..0000000
--- a/examples/jms/scale-down/src/main/resources/hornetq/server1/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>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/scale-down/src/main/resources/hornetq/server1/activemq-users.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/scale-down/src/main/resources/hornetq/server1/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/scheduled-message/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/scheduled-message/pom.xml b/examples/jms/scheduled-message/pom.xml
index 83f1a67..ca365bc 100644
--- a/examples/jms/scheduled-message/pom.xml
+++ b/examples/jms/scheduled-message/pom.xml
@@ -51,9 +51,6 @@
</goals>
<configuration>
<clientClass>org.apache.activemq.jms.example.ScheduledMessageExample</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/scheduled-message/src/main/java/org/apache/activemq/jms/example/ScheduledMessageExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/scheduled-message/src/main/java/org/apache/activemq/jms/example/ScheduledMessageExample.java b/examples/jms/scheduled-message/src/main/java/org/apache/activemq/jms/example/ScheduledMessageExample.java
index 92ece47..563d48f 100644
--- a/examples/jms/scheduled-message/src/main/java/org/apache/activemq/jms/example/ScheduledMessageExample.java
+++ b/examples/jms/scheduled-message/src/main/java/org/apache/activemq/jms/example/ScheduledMessageExample.java
@@ -51,7 +51,7 @@ public class ScheduledMessageExample 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/scheduled-message/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/scheduled-message/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/scheduled-message/src/main/resources/activemq/server0/activemq-configuration.xml
new file mode 100644
index 0000000..5d9a671
--- /dev/null
+++ b/examples/jms/scheduled-message/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/scheduled-message/src/main/resources/activemq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/scheduled-message/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/scheduled-message/src/main/resources/activemq/server0/activemq-jms.xml
new file mode 100644
index 0000000..847659f
--- /dev/null
+++ b/examples/jms/scheduled-message/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>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/scheduled-message/src/main/resources/activemq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/scheduled-message/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/scheduled-message/src/main/resources/activemq/server0/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/scheduled-message/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/scheduled-message/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/scheduled-message/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/scheduled-message/src/main/resources/hornetq/server0/activemq-configuration.xml
deleted file mode 100644
index 8ef5e46..0000000
--- a/examples/jms/scheduled-message/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>
-
-
- <!-- 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/scheduled-message/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index 847659f..0000000
--- a/examples/jms/scheduled-message/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>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/scheduled-message/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/scheduled-message/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/scheduled-message/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/scheduled-message/src/main/resources/jndi.properties b/examples/jms/scheduled-message/src/main/resources/jndi.properties
new file mode 100644
index 0000000..d9b5c6a
--- /dev/null
+++ b/examples/jms/scheduled-message/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/security/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/security/pom.xml b/examples/jms/security/pom.xml
index 8eb47f8..35dafb6 100644
--- a/examples/jms/security/pom.xml
+++ b/examples/jms/security/pom.xml
@@ -51,9 +51,6 @@
</goals>
<configuration>
<clientClass>org.apache.activemq.jms.example.SecurityExample</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/security/src/main/java/org/apache/activemq/jms/example/SecurityExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/security/src/main/java/org/apache/activemq/jms/example/SecurityExample.java b/examples/jms/security/src/main/java/org/apache/activemq/jms/example/SecurityExample.java
index 9a699fb..301c261 100644
--- a/examples/jms/security/src/main/java/org/apache/activemq/jms/example/SecurityExample.java
+++ b/examples/jms/security/src/main/java/org/apache/activemq/jms/example/SecurityExample.java
@@ -55,7 +55,7 @@ public class SecurityExample extends ActiveMQExample
try
{
// /Step 1. Create an initial context to perform the JNDI lookup.
- initialContext = getContext(0);
+ initialContext = new InitialContext();
// Step 2. perform lookup on the topics
Topic genericTopic = (Topic)initialContext.lookup("topic/genericTopic");
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/security/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/security/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/security/src/main/resources/activemq/server0/activemq-configuration.xml
new file mode 100644
index 0000000..7b85a97
--- /dev/null
+++ b/examples/jms/security/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -0,0 +1,52 @@
+<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>
+ <!-- any user can have full control of generic topics -->
+ <security-setting match="jms.topic.#">
+ <permission type="createDurableQueue" roles="user"/>
+ <permission type="deleteDurableQueue" roles="user"/>
+ <permission type="createNonDurableQueue" roles="user"/>
+ <permission type="deleteNonDurableQueue" roles="user"/>
+ <permission type="send" roles="user"/>
+ <permission type="consume" roles="user"/>
+ </security-setting>
+
+ <security-setting match="jms.topic.news.europe.#">
+ <permission type="createDurableQueue" roles="user"/>
+ <permission type="deleteDurableQueue" roles="user"/>
+ <permission type="createNonDurableQueue" roles="user"/>
+ <permission type="deleteNonDurableQueue" roles="user"/>
+ <permission type="send" roles="europe-user"/>
+ <permission type="consume" roles="news-user"/>
+ </security-setting>
+
+ <security-setting match="jms.topic.news.us.#">
+ <permission type="createDurableQueue" roles="user"/>
+ <permission type="deleteDurableQueue" roles="user"/>
+ <permission type="createNonDurableQueue" roles="user"/>
+ <permission type="deleteNonDurableQueue" roles="user"/>
+ <permission type="send" roles="us-user"/>
+ <permission type="consume" roles="news-user"/>
+ </security-setting>
+ </security-settings>
+
+</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/security/src/main/resources/activemq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/security/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/security/src/main/resources/activemq/server0/activemq-jms.xml
new file mode 100644
index 0000000..74a9f79
--- /dev/null
+++ b/examples/jms/security/src/main/resources/activemq/server0/activemq-jms.xml
@@ -0,0 +1,11 @@
+<configuration xmlns="urn:activemq"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:activemq /schema/activemq-jms.xsd">
+
+ <topic name="genericTopic"/>
+
+ <topic name="news.europe.europeTopic"/>
+
+ <topic name="news.us.usTopic"/>
+
+</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/security/src/main/resources/activemq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/security/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/security/src/main/resources/activemq/server0/activemq-users.xml
new file mode 100644
index 0000000..92b0328
--- /dev/null
+++ b/examples/jms/security/src/main/resources/activemq/server0/activemq-users.xml
@@ -0,0 +1,25 @@
+<configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:activemq /schema/activemq-users.xsd">
+
+ <user name="bill" password="activemq">
+ <role name="user"/>
+ </user>
+
+ <user name="andrew" password="activemq1">
+ <role name="europe-user"/>
+ <role name="user"/>
+ </user>
+
+ <user name="frank" password="activemq2">
+ <role name="us-user"/>
+ <role name="news-user"/>
+ <role name="user"/>
+ </user>
+
+ <user name="sam" password="activemq3">
+ <role name="news-user"/>
+ <role name="user"/>
+ </user>
+
+</configuration>
+
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/security/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/security/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/security/src/main/resources/hornetq/server0/activemq-configuration.xml
deleted file mode 100644
index 80a5f2c..0000000
--- a/examples/jms/security/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ /dev/null
@@ -1,60 +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>
- <!-- any user can have full control of generic topics -->
- <security-setting match="jms.topic.#">
- <permission type="createDurableQueue" roles="user"/>
- <permission type="deleteDurableQueue" roles="user"/>
- <permission type="createNonDurableQueue" roles="user"/>
- <permission type="deleteNonDurableQueue" roles="user"/>
- <permission type="send" roles="user"/>
- <permission type="consume" roles="user"/>
- </security-setting>
-
- <security-setting match="jms.topic.news.europe.#">
- <permission type="createDurableQueue" roles="user"/>
- <permission type="deleteDurableQueue" roles="user"/>
- <permission type="createNonDurableQueue" roles="user"/>
- <permission type="deleteNonDurableQueue" roles="user"/>
- <permission type="send" roles="europe-user"/>
- <permission type="consume" roles="news-user"/>
- </security-setting>
-
- <security-setting match="jms.topic.news.us.#">
- <permission type="createDurableQueue" roles="user"/>
- <permission type="deleteDurableQueue" roles="user"/>
- <permission type="createNonDurableQueue" roles="user"/>
- <permission type="deleteNonDurableQueue" roles="user"/>
- <permission type="send" roles="us-user"/>
- <permission type="consume" roles="news-user"/>
- </security-setting>
- </security-settings>
-
-</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/security/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/security/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/security/src/main/resources/hornetq/server0/activemq-jms.xml
deleted file mode 100644
index 74a9f79..0000000
--- a/examples/jms/security/src/main/resources/hornetq/server0/activemq-jms.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<configuration xmlns="urn:activemq"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:activemq /schema/activemq-jms.xsd">
-
- <topic name="genericTopic"/>
-
- <topic name="news.europe.europeTopic"/>
-
- <topic name="news.us.usTopic"/>
-
-</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/security/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/security/src/main/resources/hornetq/server0/activemq-users.xml b/examples/jms/security/src/main/resources/hornetq/server0/activemq-users.xml
deleted file mode 100644
index 92b0328..0000000
--- a/examples/jms/security/src/main/resources/hornetq/server0/activemq-users.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:activemq /schema/activemq-users.xsd">
-
- <user name="bill" password="activemq">
- <role name="user"/>
- </user>
-
- <user name="andrew" password="activemq1">
- <role name="europe-user"/>
- <role name="user"/>
- </user>
-
- <user name="frank" password="activemq2">
- <role name="us-user"/>
- <role name="news-user"/>
- <role name="user"/>
- </user>
-
- <user name="sam" password="activemq3">
- <role name="news-user"/>
- <role name="user"/>
- </user>
-
-</configuration>
-
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/security/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/security/src/main/resources/jndi.properties b/examples/jms/security/src/main/resources/jndi.properties
new file mode 100644
index 0000000..3afad0c
--- /dev/null
+++ b/examples/jms/security/src/main/resources/jndi.properties
@@ -0,0 +1,5 @@
+java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
+java.naming.provider.url=tcp://localhost:5445
+topic.topic/genericTopic=genericTopic
+topic.topic/europeTopic=news.europe.europeTopic
+topic.topic/usTopic=news.us.usTopic
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/send-acknowledgements/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/send-acknowledgements/pom.xml b/examples/jms/send-acknowledgements/pom.xml
index 9a766ca..30f436a 100644
--- a/examples/jms/send-acknowledgements/pom.xml
+++ b/examples/jms/send-acknowledgements/pom.xml
@@ -51,9 +51,6 @@
</goals>
<configuration>
<clientClass>org.apache.activemq.jms.example.SendAcknowledgementsExample</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/send-acknowledgements/src/main/java/org/apache/activemq/jms/example/SendAcknowledgementsExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/send-acknowledgements/src/main/java/org/apache/activemq/jms/example/SendAcknowledgementsExample.java b/examples/jms/send-acknowledgements/src/main/java/org/apache/activemq/jms/example/SendAcknowledgementsExample.java
index 31c284e..4e2cf53 100644
--- a/examples/jms/send-acknowledgements/src/main/java/org/apache/activemq/jms/example/SendAcknowledgementsExample.java
+++ b/examples/jms/send-acknowledgements/src/main/java/org/apache/activemq/jms/example/SendAcknowledgementsExample.java
@@ -55,7 +55,7 @@ public class SendAcknowledgementsExample 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/send-acknowledgements/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/send-acknowledgements/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/send-acknowledgements/src/main/resources/activemq/server0/activemq-configuration.xml
new file mode 100644
index 0000000..52d9570
--- /dev/null
+++ b/examples/jms/send-acknowledgements/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/send-acknowledgements/src/main/resources/activemq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/send-acknowledgements/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/send-acknowledgements/src/main/resources/activemq/server0/activemq-jms.xml
new file mode 100644
index 0000000..0d5c953
--- /dev/null
+++ b/examples/jms/send-acknowledgements/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/send-acknowledgements/src/main/resources/activemq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/send-acknowledgements/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/send-acknowledgements/src/main/resources/activemq/server0/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/send-acknowledgements/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/send-acknowledgements/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index e0acd1d..0000000
--- a/examples/jms/send-acknowledgements/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/send-acknowledgements/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/send-acknowledgements/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/send-acknowledgements/src/main/resources/hornetq/server0/activemq-jms.xml
deleted file mode 100644
index 0d5c953..0000000
--- a/examples/jms/send-acknowledgements/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>
[13/37] activemq-6 git commit: ACTIVEMQ6-41 Drop Java EE examples
Posted by jb...@apache.org.
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/jms-bridge/server/standalone/configuration/logging.properties
----------------------------------------------------------------------
diff --git a/examples/javaee/jms-bridge/server/standalone/configuration/logging.properties b/examples/javaee/jms-bridge/server/standalone/configuration/logging.properties
deleted file mode 100644
index 3fa31b0..0000000
--- a/examples/javaee/jms-bridge/server/standalone/configuration/logging.properties
+++ /dev/null
@@ -1,47 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# Additional logger names to configure (root logger is always configured)
-loggers=org.jboss.as.config
-
-# Dump system environment at boot by default
-logger.org.jboss.as.config.level=DEBUG
-
-# Root logger level
-logger.level=${jboss.boot.server.log.level:INFO}
-# Root logger handlers
-logger.handlers=FILE,CONSOLE
-
-# Console handler configuration
-handler.CONSOLE=org.jboss.logmanager.handlers.ConsoleHandler
-handler.CONSOLE.properties=autoFlush
-handler.CONSOLE.level=${jboss.boot.server.log.console.level:INFO}
-handler.CONSOLE.autoFlush=true
-handler.CONSOLE.formatter=PATTERN
-
-# File handler configuration
-handler.FILE=org.jboss.logmanager.handlers.FileHandler
-handler.FILE.level=DEBUG
-handler.FILE.properties=autoFlush,fileName
-handler.FILE.autoFlush=true
-handler.FILE.fileName=${org.jboss.boot.log.file:boot.log}
-handler.FILE.formatter=PATTERN
-
-# Formatter pattern configuration
-formatter.PATTERN=org.jboss.logmanager.formatters.PatternFormatter
-formatter.PATTERN.properties=pattern
-formatter.PATTERN.pattern=%d{HH:mm:ss,SSS} %-5p [%c] %s%E%n
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/jms-bridge/server/standalone/configuration/mgmt-users.properties
----------------------------------------------------------------------
diff --git a/examples/javaee/jms-bridge/server/standalone/configuration/mgmt-users.properties b/examples/javaee/jms-bridge/server/standalone/configuration/mgmt-users.properties
deleted file mode 100644
index 349b004..0000000
--- a/examples/javaee/jms-bridge/server/standalone/configuration/mgmt-users.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# Properties declaration of users for the realm 'ManagementRealm' which is the default realm
-# for new AS 7.1 installations. Further authentication mechanism can be configured
-# as part of the <management /> in standalone.xml.
-#
-# Users can be added to this properties file at any time, updates after the server has started
-# will be automatically detected.
-#
-# By default the properties realm expects the entries to be in the format: -
-# username=HEX( MD5( username ':' realm ':' password))
-#
-# A utility script is provided which can be executed from the bin folder to add the users: -
-# - Linux
-# bin/add-user.sh
-#
-# - Windows
-# bin\add-user.bat
-
-# The following illustrates how an admin user could be defined, this
-# is for illustration only and does not correspond to a usable password.
-#
-#admin=2a0923285184943425d1f53ddd58ec7a
-admin=9d71b431e53d99563aa0dfca628c970b
-andy=dfb16391f1be1c454b5bce9822bd9df3
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/jms-bridge/server/standalone/configuration/standalone-example.xml
----------------------------------------------------------------------
diff --git a/examples/javaee/jms-bridge/server/standalone/configuration/standalone-example.xml b/examples/javaee/jms-bridge/server/standalone/configuration/standalone-example.xml
deleted file mode 100644
index 9d8432d..0000000
--- a/examples/javaee/jms-bridge/server/standalone/configuration/standalone-example.xml
+++ /dev/null
@@ -1,508 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-
-<server xmlns="urn:jboss:domain:2.0">
- <extensions>
- <extension module="org.jboss.as.clustering.infinispan"/>
- <extension module="org.jboss.as.connector"/>
- <extension module="org.jboss.as.deployment-scanner"/>
- <extension module="org.jboss.as.ee"/>
- <extension module="org.jboss.as.ejb3"/>
- <extension module="org.jboss.as.jacorb"/>
- <extension module="org.jboss.as.jaxrs"/>
- <extension module="org.jboss.as.jdr"/>
- <extension module="org.jboss.as.jmx"/>
- <extension module="org.jboss.as.jpa"/>
- <extension module="org.jboss.as.jsf"/>
- <extension module="org.jboss.as.jsr77"/>
- <extension module="org.jboss.as.logging"/>
- <extension module="org.jboss.as.mail"/>
- <extension module="org.jboss.as.messaging"/>
- <extension module="org.jboss.as.naming"/>
- <extension module="org.jboss.as.pojo"/>
- <extension module="org.jboss.as.remoting"/>
- <extension module="org.jboss.as.sar"/>
- <extension module="org.jboss.as.security"/>
- <extension module="org.jboss.as.threads"/>
- <extension module="org.jboss.as.transactions"/>
- <extension module="org.jboss.as.webservices"/>
- <extension module="org.jboss.as.weld"/>
- <extension module="org.wildfly.extension.batch"/>
- <extension module="org.wildfly.extension.io"/>
- <extension module="org.wildfly.extension.undertow"/>
- </extensions>
- <management>
- <security-realms>
- <security-realm name="ManagementRealm">
- <authentication>
- <local default-user="$local"/>
- <properties path="mgmt-users.properties" relative-to="jboss.server.config.dir"/>
- </authentication>
- <authorization map-groups-to-roles="false">
- <properties path="mgmt-groups.properties" relative-to="jboss.server.config.dir"/>
- </authorization>
- </security-realm>
- <security-realm name="ApplicationRealm">
- <authentication>
- <local default-user="$local" allowed-users="*"/>
- <properties path="application-users.properties" relative-to="jboss.server.config.dir"/>
- </authentication>
- <authorization>
- <properties path="application-roles.properties" relative-to="jboss.server.config.dir"/>
- </authorization>
- </security-realm>
- </security-realms>
- <audit-log>
- <formatters>
- <json-formatter name="json-formatter"/>
- </formatters>
- <handlers>
- <file-handler name="file" formatter="json-formatter" relative-to="jboss.server.data.dir" path="audit-log.log"/>
- </handlers>
- <logger log-boot="true" log-read-only="false" enabled="false">
- <handlers>
- <handler name="file"/>
- </handlers>
- </logger>
- </audit-log>
- <management-interfaces>
- <http-interface security-realm="ManagementRealm" http-upgrade-enabled="true">
- <socket-binding http="management-http"/>
- </http-interface>
- </management-interfaces>
- <access-control provider="simple">
- <role-mapping>
- <role name="SuperUser">
- <include>
- <user name="$local"/>
- </include>
- </role>
- </role-mapping>
- </access-control>
- </management>
- <profile>
- <subsystem xmlns="urn:jboss:domain:logging:2.0">
- <console-handler name="CONSOLE">
- <level name="INFO"/>
- <formatter>
- <named-formatter name="COLOR-PATTERN"/>
- </formatter>
- </console-handler>
- <periodic-rotating-file-handler name="FILE" autoflush="true">
- <formatter>
- <named-formatter name="PATTERN"/>
- </formatter>
- <file relative-to="jboss.server.log.dir" path="server.log"/>
- <suffix value=".yyyy-MM-dd"/>
- <append value="true"/>
- </periodic-rotating-file-handler>
- <logger category="com.arjuna">
- <level name="WARN"/>
- </logger>
- <logger category="org.apache.tomcat.util.modeler">
- <level name="WARN"/>
- </logger>
- <logger category="org.jboss.as.config">
- <level name="DEBUG"/>
- </logger>
- <logger category="sun.rmi">
- <level name="WARN"/>
- </logger>
- <logger category="jacorb">
- <level name="WARN"/>
- </logger>
- <logger category="jacorb.config">
- <level name="ERROR"/>
- </logger>
- <root-logger>
- <level name="INFO"/>
- <handlers>
- <handler name="CONSOLE"/>
- <handler name="FILE"/>
- </handlers>
- </root-logger>
- <formatter name="PATTERN">
- <pattern-formatter pattern="%d{yyyy-MM-dd HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/>
- </formatter>
- <formatter name="COLOR-PATTERN">
- <pattern-formatter pattern="%K{level}%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/>
- </formatter>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:batch:1.0">
- <job-repository>
- <in-memory/>
- </job-repository>
- <thread-pool>
- <max-threads count="10"/>
- <keepalive-time time="100" unit="milliseconds"/>
- </thread-pool>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:datasources:2.0">
- <datasources>
- <datasource jndi-name="java:jboss/datasources/ExampleDS" pool-name="ExampleDS" enabled="true" use-java-context="true">
- <connection-url>jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE</connection-url>
- <driver>h2</driver>
- <security>
- <user-name>sa</user-name>
- <password>sa</password>
- </security>
- </datasource>
- <drivers>
- <driver name="h2" module="com.h2database.h2">
- <xa-datasource-class>org.h2.jdbcx.JdbcDataSource</xa-datasource-class>
- </driver>
- </drivers>
- </datasources>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:deployment-scanner:2.0">
- <deployment-scanner path="deployments" relative-to="jboss.server.base.dir" scan-interval="5000" runtime-failure-causes-rollback="${jboss.deployment.scanner.rollback.on.failure:false}"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:ee:2.0">
- <spec-descriptor-property-replacement>false</spec-descriptor-property-replacement>
- <jboss-descriptor-property-replacement>true</jboss-descriptor-property-replacement>
- <annotation-property-replacement>false</annotation-property-replacement>
- <concurrent>
- <context-services>
- <context-service name="default" jndi-name="java:jboss/ee/concurrency/context/default" use-transaction-setup-provider="true"/>
- </context-services>
- <managed-executor-services>
- <managed-executor-service name="default" jndi-name="java:jboss/ee/concurrency/executor/default" context-service="default" hung-task-threshold="60000" core-threads="5" max-threads="25" keepalive-time="5000"/>
- </managed-executor-services>
- <managed-scheduled-executor-services>
- <managed-scheduled-executor-service name="default" jndi-name="java:jboss/ee/concurrency/scheduler/default" context-service="default" hung-task-threshold="60000" core-threads="2" keepalive-time="3000"/>
- </managed-scheduled-executor-services>
- <managed-thread-factories>
- <managed-thread-factory name="default" jndi-name="java:jboss/ee/concurrency/factory/default" context-service="default"/>
- </managed-thread-factories>
- </concurrent>
- <default-bindings context-service="java:jboss/ee/concurrency/context/default" datasource="java:jboss/datasources/ExampleDS" jms-connection-factory="java:jboss/DefaultJMSConnectionFactory" managed-executor-service="java:jboss/ee/concurrency/executor/default" managed-scheduled-executor-service="java:jboss/ee/concurrency/scheduler/default" managed-thread-factory="java:jboss/ee/concurrency/factory/default"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:ejb3:2.0">
- <session-bean>
- <stateful default-access-timeout="5000" cache-ref="simple" passivation-disabled-cache-ref="simple"/>
- <singleton default-access-timeout="5000"/>
- </session-bean>
- <mdb>
- <resource-adapter-ref resource-adapter-name="${ejb.resource-adapter-name:activemq-ra.rar}"/>
- <bean-instance-pool-ref pool-name="mdb-strict-max-pool"/>
- </mdb>
- <pools>
- <bean-instance-pools>
- <!-- A sample strict max pool configuration -->
- <strict-max-pool name="slsb-strict-max-pool" max-pool-size="20" instance-acquisition-timeout="5" instance-acquisition-timeout-unit="MINUTES"/>
- <strict-max-pool name="mdb-strict-max-pool" max-pool-size="20" instance-acquisition-timeout="5" instance-acquisition-timeout-unit="MINUTES"/>
- </bean-instance-pools>
- </pools>
- <caches>
- <cache name="simple"/>
- <cache name="distributable" aliases="passivating clustered" passivation-store-ref="infinispan"/>
- </caches>
- <passivation-stores>
- <passivation-store name="infinispan" cache-container="ejb" max-size="10000"/>
- </passivation-stores>
- <async thread-pool-name="default"/>
- <timer-service thread-pool-name="default" default-data-store="default-file-store">
- <data-stores>
- <file-data-store name="default-file-store" path="timer-service-data" relative-to="jboss.server.data.dir"/>
- </data-stores>
- </timer-service>
- <remote connector-ref="http-remoting-connector" thread-pool-name="default"/>
- <thread-pools>
- <thread-pool name="default">
- <max-threads count="10"/>
- <keepalive-time time="100" unit="milliseconds"/>
- </thread-pool>
- </thread-pools>
- <iiop enable-by-default="false" use-qualified-name="false"/>
- <default-security-domain value="other"/>
- <default-missing-method-permissions-deny-access value="true"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:io:1.0">
- <worker name="default" io-threads="3"/>
- <buffer-pool name="default" buffer-size="16384" buffers-per-slice="128"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:infinispan:2.0">
- <cache-container name="web" default-cache="passivation" module="org.wildfly.clustering.web.infinispan">
- <local-cache name="passivation" batching="true">
- <file-store passivation="true" purge="false"/>
- </local-cache>
- <local-cache name="persistent" batching="true">
- <file-store passivation="false" purge="false"/>
- </local-cache>
- </cache-container>
- <cache-container name="ejb" aliases="sfsb" default-cache="passivation" module="org.wildfly.clustering.ejb.infinispan">
- <local-cache name="passivation" batching="true">
- <file-store passivation="true" purge="false"/>
- </local-cache>
- <local-cache name="persistent" batching="true">
- <file-store passivation="false" purge="false"/>
- </local-cache>
- </cache-container>
- <cache-container name="hibernate" default-cache="local-query" module="org.hibernate">
- <local-cache name="entity">
- <transaction mode="NON_XA"/>
- <eviction strategy="LRU" max-entries="10000"/>
- <expiration max-idle="100000"/>
- </local-cache>
- <local-cache name="local-query">
- <transaction mode="NONE"/>
- <eviction strategy="LRU" max-entries="10000"/>
- <expiration max-idle="100000"/>
- </local-cache>
- <local-cache name="timestamps">
- <transaction mode="NONE"/>
- <eviction strategy="NONE"/>
- </local-cache>
- </cache-container>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:jacorb:1.3">
- <orb socket-binding="jacorb" ssl-socket-binding="jacorb-ssl">
- <initializers transactions="spec" security="identity"/>
- </orb>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:jaxrs:1.0"/>
- <subsystem xmlns="urn:jboss:domain:jca:2.0">
- <archive-validation enabled="true" fail-on-error="true" fail-on-warn="false"/>
- <bean-validation enabled="true"/>
- <default-workmanager>
- <short-running-threads>
- <core-threads count="50"/>
- <queue-length count="50"/>
- <max-threads count="50"/>
- <keepalive-time time="10" unit="seconds"/>
- </short-running-threads>
- <long-running-threads>
- <core-threads count="50"/>
- <queue-length count="50"/>
- <max-threads count="50"/>
- <keepalive-time time="10" unit="seconds"/>
- </long-running-threads>
- </default-workmanager>
- <cached-connection-manager/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:jdr:1.0"/>
- <subsystem xmlns="urn:jboss:domain:jmx:1.3">
- <expose-resolved-model/>
- <expose-expression-model/>
- <remoting-connector/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:jpa:1.1">
- <jpa default-datasource="" default-extended-persistence-inheritance="DEEP"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:jsf:1.0"/>
- <subsystem xmlns="urn:jboss:domain:jsr77:1.0"/>
- <subsystem xmlns="urn:jboss:domain:mail:2.0">
- <mail-session name="default" jndi-name="java:jboss/mail/Default">
- <smtp-server outbound-socket-binding-ref="mail-smtp"/>
- </mail-session>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:messaging:2.0">
- <activemq-server>
- <persistence-enabled>true</persistence-enabled>
- <journal-file-size>102400</journal-file-size>
- <journal-min-files>2</journal-min-files>
- <connectors>
- <http-connector name="http-connector" socket-binding="http">
- <param key="http-upgrade-endpoint" value="http-acceptor"/>
- </http-connector>
- <http-connector name="http-connector-throughput" socket-binding="http">
- <param key="http-upgrade-endpoint" value="http-acceptor-throughput"/>
- <param key="batch-delay" value="50"/>
- </http-connector>
- <in-vm-connector name="in-vm" server-id="0"/>
- </connectors>
- <acceptors>
- <http-acceptor name="http-acceptor" http-listener="default"/>
- <http-acceptor name="http-acceptor-throughput" http-listener="default">
- <param key="batch-delay" value="50"/>
- <param key="direct-deliver" value="false"/>
- </http-acceptor>
- <in-vm-acceptor name="in-vm" server-id="0"/>
- </acceptors>
- <security-settings>
- <security-setting match="#">
- <permission type="send" roles="guest"/>
- <permission type="consume" roles="guest"/>
- <permission type="createNonDurableQueue" roles="guest"/>
- <permission type="deleteNonDurableQueue" roles="guest"/>
- </security-setting>
- </security-settings>
- <address-settings>
- <!--default for catch all-->
- <address-setting match="#">
- <dead-letter-address>jms.queue.DLQ</dead-letter-address>
- <expiry-address>jms.queue.ExpiryQueue</expiry-address>
- <redelivery-delay>0</redelivery-delay>
- <max-size-bytes>10485760</max-size-bytes>
- <address-full-policy>PAGE</address-full-policy>
- <page-size-bytes>2097152</page-size-bytes>
- <message-counter-history-day-limit>10</message-counter-history-day-limit>
- </address-setting>
- </address-settings>
- <jms-connection-factories>
- <connection-factory name="InVmConnectionFactory">
- <connectors>
- <connector-ref connector-name="in-vm"/>
- </connectors>
- <entries>
- <entry name="java:/ConnectionFactory"/>
- </entries>
- </connection-factory>
- <connection-factory name="RemoteConnectionFactory">
- <connectors>
- <connector-ref connector-name="http-connector"/>
- </connectors>
- <entries>
- <entry name="java:jboss/exported/jms/RemoteConnectionFactory"/>
- </entries>
- </connection-factory>
- <pooled-connection-factory name="activemq-ra">
- <transaction mode="xa"/>
- <connectors>
- <connector-ref connector-name="in-vm"/>
- </connectors>
- <entries>
- <entry name="java:/JmsXA"/>
- <!-- Global JNDI entry used to provide a default JMS Connection factory to EE application -->
- <entry name="java:jboss/DefaultJMSConnectionFactory"/>
- </entries>
- </pooled-connection-factory>
- </jms-connection-factories>
- <jms-destinations>
- <jms-queue name="sourceQueue">
- <entry name="queue/sourceQueue"/>
- <entry name="java:jboss/exported/jms/queues/sourceQueue"/>
- </jms-queue>
- <jms-queue name="targetQueue">
- <entry name="java:/queue/targetQueue"/>
- <entry name="java:jboss/exported/jms/queues/targetQueue"/>
- </jms-queue>
- </jms-destinations>
- </activemq-server>
- <jms-bridge name="myBridge">
- <source>
- <connection-factory name="ConnectionFactory" />
- <destination name="queue/sourceQueue" />
- </source>
- <target>
- <connection-factory name="ConnectionFactory" />
- <destination name="queue/targetQueue" />
- </target>
- <quality-of-service>AT_MOST_ONCE</quality-of-service>
- <failure-retry-interval>1000</failure-retry-interval>
- <max-retries>7890</max-retries>
- <max-batch-size>1</max-batch-size>
- <max-batch-time>1000</max-batch-time>
- </jms-bridge>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:naming:2.0">
- <remote-naming/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:pojo:1.0"/>
- <subsystem xmlns="urn:jboss:domain:remoting:2.0">
- <endpoint worker="default"/>
- <http-connector name="http-remoting-connector" connector-ref="default" security-realm="ApplicationRealm"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:resource-adapters:2.0"/>
- <subsystem xmlns="urn:jboss:domain:sar:1.0"/>
- <subsystem xmlns="urn:jboss:domain:security:1.2">
- <security-domains>
- <security-domain name="other" cache-type="default">
- <authentication>
- <login-module code="Remoting" flag="optional">
- <module-option name="password-stacking" value="useFirstPass"/>
- </login-module>
- <login-module code="RealmDirect" flag="required">
- <module-option name="password-stacking" value="useFirstPass"/>
- </login-module>
- </authentication>
- </security-domain>
- <security-domain name="jboss-web-policy" cache-type="default">
- <authorization>
- <policy-module code="Delegating" flag="required"/>
- </authorization>
- </security-domain>
- <security-domain name="jboss-ejb-policy" cache-type="default">
- <authorization>
- <policy-module code="Delegating" flag="required"/>
- </authorization>
- </security-domain>
- </security-domains>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:threads:1.1"/>
- <subsystem xmlns="urn:jboss:domain:transactions:2.0">
- <core-environment>
- <process-id>
- <uuid/>
- </process-id>
- </core-environment>
- <recovery-environment socket-binding="txn-recovery-environment" status-socket-binding="txn-status-manager"/>
- <coordinator-environment default-timeout="300"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:undertow:1.0">
- <buffer-caches>
- <buffer-cache name="default" buffer-size="1024" buffers-per-region="1024" max-regions="10"/>
- </buffer-caches>
- <server name="default-server">
- <http-listener name="default" socket-binding="http"/>
- <host name="default-host" alias="localhost">
- <location name="/" handler="welcome-content"/>
- <filter-ref name="server-header"/>
- <filter-ref name="x-powered-by-header"/>
- </host>
- </server>
- <servlet-container name="default" default-buffer-cache="default" stack-trace-on-error="local-only">
- <jsp-config/>
- </servlet-container>
- <handlers>
- <file name="welcome-content" path="${jboss.home.dir}/welcome-content" directory-listing="true"/>
- </handlers>
- <filters>
- <response-header name="server-header" header-name="Server" header-value="Wildfly 8"/>
- <response-header name="x-powered-by-header" header-name="X-Powered-By" header-value="Undertow 1"/>
- </filters>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:webservices:1.2">
- <modify-wsdl-address>true</modify-wsdl-address>
- <wsdl-host>${jboss.bind.address:127.0.0.1}</wsdl-host>
- <endpoint-config name="Standard-Endpoint-Config"/>
- <endpoint-config name="Recording-Endpoint-Config">
- <pre-handler-chain name="recording-handlers" protocol-bindings="##SOAP11_HTTP ##SOAP11_HTTP_MTOM ##SOAP12_HTTP ##SOAP12_HTTP_MTOM">
- <handler name="RecordingHandler" class="org.jboss.ws.common.invocation.RecordingServerHandler"/>
- </pre-handler-chain>
- </endpoint-config>
- <client-config name="Standard-Client-Config"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:weld:2.0"/>
- </profile>
- <interfaces>
- <interface name="management">
- <inet-address value="${jboss.bind.address.management:127.0.0.1}"/>
- </interface>
- <interface name="public">
- <inet-address value="${jboss.bind.address:127.0.0.1}"/>
- </interface>
- <!-- TODO - only show this if the jacorb subsystem is added -->
- <interface name="unsecure">
- <!--
- ~ Used for IIOP sockets in the standard configuration.
- ~ To secure JacORB you need to setup SSL
- -->
- <inet-address value="${jboss.bind.address.unsecure:127.0.0.1}"/>
- </interface>
- </interfaces>
- <socket-binding-group name="standard-sockets" default-interface="public" port-offset="${jboss.socket.binding.port-offset:0}">
- <socket-binding name="management-http" interface="management" port="${jboss.management.http.port:9990}"/>
- <socket-binding name="management-https" interface="management" port="${jboss.management.https.port:9993}"/>
- <socket-binding name="ajp" port="${jboss.ajp.port:8009}"/>
- <socket-binding name="http" port="${jboss.http.port:8080}"/>
- <socket-binding name="https" port="${jboss.https.port:8443}"/>
- <socket-binding name="jacorb" interface="unsecure" port="3528"/>
- <socket-binding name="jacorb-ssl" interface="unsecure" port="3529"/>
- <socket-binding name="messaging-group" port="0" multicast-address="${jboss.messaging.group.address:231.7.7.7}" multicast-port="${jboss.messaging.group.port:9876}"/>
- <socket-binding name="txn-recovery-environment" port="4712"/>
- <socket-binding name="txn-status-manager" port="4713"/>
- <outbound-socket-binding name="mail-smtp">
- <remote-destination host="localhost" port="25"/>
- </outbound-socket-binding>
- </socket-binding-group>
-</server>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/jms-bridge/src/main/java/org/apache/activemq/javaee/example/JMSBridgeExample.java
----------------------------------------------------------------------
diff --git a/examples/javaee/jms-bridge/src/main/java/org/apache/activemq/javaee/example/JMSBridgeExample.java b/examples/javaee/jms-bridge/src/main/java/org/apache/activemq/javaee/example/JMSBridgeExample.java
deleted file mode 100644
index c24a188..0000000
--- a/examples/javaee/jms-bridge/src/main/java/org/apache/activemq/javaee/example/JMSBridgeExample.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.activemq.javaee.example;
-
-import javax.jms.Connection;
-import javax.jms.ConnectionFactory;
-import javax.jms.MessageConsumer;
-import javax.jms.MessageProducer;
-import javax.jms.Queue;
-import javax.jms.Session;
-import javax.jms.TextMessage;
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import java.util.Properties;
-
-/**
- * An example which sends a message to a source queue and consume from a target queue.
- * The source and target queues are bridged by a JMS Bridge configured and running in WildFly.
- *
- * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a>
- */
-public class JMSBridgeExample
-{
- public static void main(final String[] args) throws Exception
- {
- InitialContext initialContext = null;
- Connection sourceConnection = null;
- Connection targetConnection = null;
- try
- {
- // Step 1. Obtain an Initial Context
- final Properties env = new Properties();
-
- env.put(Context.INITIAL_CONTEXT_FACTORY, "org.jboss.naming.remote.client.InitialContextFactory");
-
- env.put(Context.PROVIDER_URL, "http-remoting://localhost:8080");
-
- initialContext = new InitialContext(env);
-
- // Step 2. Lookup the JMS connection factory
- ConnectionFactory cf = (ConnectionFactory)initialContext.lookup("/jms/RemoteConnectionFactory");
-
- // Step 3. Lookup the source queue
- Queue sourceQueue = (Queue)initialContext.lookup("jms/queues/sourceQueue");
-
- // Step 4. Create a connection, a session and a message producer for the *source* queue
- sourceConnection = cf.createConnection("guest", "password");
- Session sourceSession = sourceConnection.createSession(false, Session.AUTO_ACKNOWLEDGE);
- MessageProducer sourceProducer = sourceSession.createProducer(sourceQueue);
-
- // Step 5. Create and send a text message to the *source* queue
- TextMessage message = sourceSession.createTextMessage("this is a text message");
- sourceProducer.send(message);
- System.out.format("Sent message to %s: %s\n",
- ((Queue)message.getJMSDestination()).getQueueName(),
- message.getText());
- System.out.format("Message ID : %s\n", message.getJMSMessageID());
-
- // Step 6. Close the *source* connection
- sourceConnection.close();
-
- // Step 7. Lookup the *target* queue
- Queue targetQueue = (Queue)initialContext.lookup("jms/queues/targetQueue");
-
- // Step 8. Create a connection, a session and a message consumer for the *target* queue
- targetConnection = cf.createConnection("guest", "password");
- Session targetSession = targetConnection.createSession(false, Session.AUTO_ACKNOWLEDGE);
- MessageConsumer targetConsumer = targetSession.createConsumer(targetQueue);
-
- // Step 9. Start the connection to receive messages from the *targe* queue
- targetConnection.start();
-
- // Step 10. Receive a message from the *target* queue
- TextMessage messageReceived = (TextMessage)targetConsumer.receive(15000);
- System.out.format("\nReceived from %s: %s\n",
- ((Queue)messageReceived.getJMSDestination()).getQueueName(),
- messageReceived.getText());
-
- // Step 11. Display the received message's ID
- System.out.format("Message ID : %s\n", messageReceived.getJMSMessageID());
-
- // Step 12. Display the message ID of the message received by the *bridge*
- System.out.format("Bridged Message ID : %s\n", messageReceived.getStringProperty("HQ_BRIDGE_MSG_ID_LIST"));
- }
- finally
- {
- // Step 13. Be sure to close the resources!
- if (initialContext != null)
- {
- initialContext.close();
- }
- if (sourceConnection != null)
- {
- sourceConnection.close();
- }
- if (targetConnection != null)
- {
- targetConnection.close();
- }
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/jms-bridge/src/test/java/org/apache/activemq/javaee/examples/JMSBridgeRunnerTest.java
----------------------------------------------------------------------
diff --git a/examples/javaee/jms-bridge/src/test/java/org/apache/activemq/javaee/examples/JMSBridgeRunnerTest.java b/examples/javaee/jms-bridge/src/test/java/org/apache/activemq/javaee/examples/JMSBridgeRunnerTest.java
deleted file mode 100644
index 7f2f57f..0000000
--- a/examples/javaee/jms-bridge/src/test/java/org/apache/activemq/javaee/examples/JMSBridgeRunnerTest.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.activemq.javaee.examples;
-
-import org.apache.activemq.javaee.example.JMSBridgeExample;
-import org.jboss.arquillian.container.test.api.RunAsClient;
-import org.jboss.arquillian.junit.Arquillian;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-/**
- * @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a>
- * 5/21/12
- */
-@RunAsClient
-@RunWith(Arquillian.class)
-public class JMSBridgeRunnerTest
-{
- @Test
- public void runExample() throws Exception
- {
- JMSBridgeExample.main(null);
- }
-}
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/jms-bridge/src/test/resources/arquillian.xml
----------------------------------------------------------------------
diff --git a/examples/javaee/jms-bridge/src/test/resources/arquillian.xml b/examples/javaee/jms-bridge/src/test/resources/arquillian.xml
deleted file mode 100644
index 1aada30..0000000
--- a/examples/javaee/jms-bridge/src/test/resources/arquillian.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<arquillian xmlns="http://jboss.org/schema/arquillian"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://jboss.org/schema/arquillian http://jboss.org/schema/arquillian/arquillian_1_0.xsd">
-
- <!-- Uncomment to have test archives exported to the file system for inspection.
-This feature can also be controlled using the system property arquillian.deploymentExportPath -->
- <!--
-<engine>
-<property name="deploymentExportPath">target</property>
-</engine>
--->
-
- <defaultProtocol type="Servlet 3.0" />
-
- <container qualifier="jboss" default="true">
- <configuration>
- <property name="jbossHome">${basedir}/target/jbossas-node0</property>
- <property name="serverConfig">standalone-example.xml</property>
- <property name="allowConnectingToRunningServer">true</property>
- <property name="managementAddress">${node0:127.0.0.1}</property>
- </configuration>
- </container>
-
- <!-- logThreshold proposed -->
- <!--
-<container qualifier="jbossas-managed">
-<configuration>
-<property name="logThreshold">ERROR</property>
-</configuration>
-</container>
--->
-
-</arquillian>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/jms-context-injection/pom.xml
----------------------------------------------------------------------
diff --git a/examples/javaee/jms-context-injection/pom.xml b/examples/javaee/jms-context-injection/pom.xml
deleted file mode 100644
index 29a2813..0000000
--- a/examples/javaee/jms-context-injection/pom.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.activemq.example.javaee</groupId>
- <artifactId>javaee-examples</artifactId>
- <version>6.0.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>activemq-javaee-mdb-jms-context-example</artifactId>
- <packaging>jar</packaging>
- <name>ActiveMQ6 Java EE MDB JMS Context Example</name>
-</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/jms-context-injection/readme.html
----------------------------------------------------------------------
diff --git a/examples/javaee/jms-context-injection/readme.html b/examples/javaee/jms-context-injection/readme.html
deleted file mode 100644
index 557257d..0000000
--- a/examples/javaee/jms-context-injection/readme.html
+++ /dev/null
@@ -1,108 +0,0 @@
-<html>
- <head>
- <title>ActiveMQ Java EE Injected JMSContext Example</title>
- <link rel="stylesheet" type="text/css" href="../../common/common.css" />
- <link rel="stylesheet" type="text/css" href="../../common/prettify.css" />
- <script type="text/javascript" src="../../common/prettify.js"></script>
- </head>
- <body onload="prettyPrint()">
- <h1>Java EE Injected JMSContext Example</h1>
-
- <p>This example shows you how to inject a JMSContext into an MDB and use it to send a reply to a JMS Client</p>
-
- <h2>Wildfly configuration</h2>
-
- <p>The example leverages the JBoss Arquillian framework to run an Wildfly 8 instance and deploy the MDB.</p>
-
- <h2>Example step-by-step</h2>
- <p><i>download The latest Wildfly 8 from <a href="http://www.wildfly.org/download/">here</a> and install.</i></p>
- <p><i>set the JBOSS_HOME property to point to the WildFly install directory</i></p>
- <p><i>To run the example simply type <code>mvn test</code>from the example directory</i></p>
-
- <ol>
- <li> Firstly in the MDB we inject the JMSContext. This will use the Default Connection Factory configured.
- </li>
- <pre class="prettyprint">
- <code>
- @Inject
- javax.jms.JMSContext context;</code>
-
- <li>We then map the reply queue as a resource.
- </li>
- <pre class="prettyprint">
- <code>
- @Resource(mappedName = "java:/queue/replyQueue")
- Queue replyQueue;</code>
- </pre>
- <li>First we need to get an initial context so we can look-up the JMS connection factory and destination objects from JNDI.</li>
- <pre class="prettyprint">
- <code>
- final Properties env = new Properties();
-
- env.put(Context.INITIAL_CONTEXT_FACTORY, "org.jboss.naming.remote.client.InitialContextFactory");
-
- env.put(Context.PROVIDER_URL, "http-remoting://localhost:8080");
-
- initialContext = new InitialContext(env);
-
- </code>
- </pre>
-
- <li>We look up the JMS queue object from JNDI</li>
- <pre class="prettyprint">
- <code>Queue queue = (Queue)initialContext.lookup("jms/queues/testQueue");</code>
- </pre>
-
- <li>We look up the JMS connection factory object from JNDI</li>
- <pre class="prettyprint">
- <code>ConnectionFactory cf = (ConnectionFactory)initialContext.lookup("jms/RemoteConnectionFactory");</code>
- </pre>
-
- <li>We create a JMSContext inside the try-with-resource block so it auto closes</li>
- <pre class="prettyprint">
- <code>
- try
- (
- // Step 6.Create a JMS Connection inside the try-with-resource block so it will auto close
- JMSContext context = cf.createContext("guest", "password")
- )
- </code>
- </pre>
-
- <li>We create a JMS Producer and send a String as a message.</li>
- <pre class="prettyprint">
- <code>context.createProducer().send(queue, "This is a text message");</code>
- </pre>
-
- <li>We start the context so we can receive messages.</li>
- <pre class="prettyprint">
- <code>context.start();</code>
- </pre>
-
- <li>We look up the reply queue.</li>
- <pre class="prettyprint">
- <code>Queue replyQueue = (Queue)initialContext.lookup("jms/queues/replyQueue");</code>
- </pre>
-
- <li>We receive the body, as a String, of the reply message.</li>
- <pre class="prettyprint">
- <code> String text = context.createConsumer(replyQueue).receiveBody(String.class);</code>
- </pre>
-
- <li>And finally, close the initial context.</li>
-
- <pre class="prettyprint">
- <code>finally
- {
- if (initialContext != null)
- {
- initialContext.close();
- }
- }</code>
- </pre>
-
-
-
- </ol>
- </body>
-</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/jms-context-injection/server/standalone/configuration/application-roles.properties
----------------------------------------------------------------------
diff --git a/examples/javaee/jms-context-injection/server/standalone/configuration/application-roles.properties b/examples/javaee/jms-context-injection/server/standalone/configuration/application-roles.properties
deleted file mode 100644
index 0ade8fb..0000000
--- a/examples/javaee/jms-context-injection/server/standalone/configuration/application-roles.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# Properties declaration of users roles for the realm 'ApplicationRealm'.
-#
-# This includes the following protocols: remote ejb, remote jndi, web, remote jms
-#
-# Users can be added to this properties file at any time, updates after the server has started
-# will be automatically detected.
-#
-# The format of this file is as follows: -
-# username=role1,role2,role3
-#
-# A utility script is provided which can be executed from the bin folder to add the users: -
-# - Linux
-# bin/add-user.sh
-#
-# - Windows
-# bin\add-user.bat
-#
-# The following illustrates how an admin user could be defined.
-#
-#admin=PowerUser,BillingAdmin,
-guest=guest
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/jms-context-injection/server/standalone/configuration/application-users.properties
----------------------------------------------------------------------
diff --git a/examples/javaee/jms-context-injection/server/standalone/configuration/application-users.properties b/examples/javaee/jms-context-injection/server/standalone/configuration/application-users.properties
deleted file mode 100644
index c52e923..0000000
--- a/examples/javaee/jms-context-injection/server/standalone/configuration/application-users.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# Properties declaration of users for the realm 'ApplicationRealm' which is the default realm
-# for application services on a new AS 7.1 installation.
-#
-# This includes the following protocols: remote ejb, remote jndi, web, remote jms
-#
-# Users can be added to this properties file at any time, updates after the server has started
-# will be automatically detected.
-#
-# The format of this realm is as follows: -
-# username=HEX( MD5( username ':' realm ':' password))
-#
-# A utility script is provided which can be executed from the bin folder to add the users: -
-# - Linux
-# bin/add-user.sh
-#
-# - Windows
-# bin\add-user.bat
-#
-# The following illustrates how an admin user could be defined, this
-# is for illustration only and does not correspond to a usable password.
-#
-#admin=2a0923285184943425d1f53ddd58ec7a
-guest=3437456520927d113b17d471d630e0d6
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/jms-context-injection/server/standalone/configuration/logging.properties
----------------------------------------------------------------------
diff --git a/examples/javaee/jms-context-injection/server/standalone/configuration/logging.properties b/examples/javaee/jms-context-injection/server/standalone/configuration/logging.properties
deleted file mode 100644
index 3fa31b0..0000000
--- a/examples/javaee/jms-context-injection/server/standalone/configuration/logging.properties
+++ /dev/null
@@ -1,47 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# Additional logger names to configure (root logger is always configured)
-loggers=org.jboss.as.config
-
-# Dump system environment at boot by default
-logger.org.jboss.as.config.level=DEBUG
-
-# Root logger level
-logger.level=${jboss.boot.server.log.level:INFO}
-# Root logger handlers
-logger.handlers=FILE,CONSOLE
-
-# Console handler configuration
-handler.CONSOLE=org.jboss.logmanager.handlers.ConsoleHandler
-handler.CONSOLE.properties=autoFlush
-handler.CONSOLE.level=${jboss.boot.server.log.console.level:INFO}
-handler.CONSOLE.autoFlush=true
-handler.CONSOLE.formatter=PATTERN
-
-# File handler configuration
-handler.FILE=org.jboss.logmanager.handlers.FileHandler
-handler.FILE.level=DEBUG
-handler.FILE.properties=autoFlush,fileName
-handler.FILE.autoFlush=true
-handler.FILE.fileName=${org.jboss.boot.log.file:boot.log}
-handler.FILE.formatter=PATTERN
-
-# Formatter pattern configuration
-formatter.PATTERN=org.jboss.logmanager.formatters.PatternFormatter
-formatter.PATTERN.properties=pattern
-formatter.PATTERN.pattern=%d{HH:mm:ss,SSS} %-5p [%c] %s%E%n
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/jms-context-injection/server/standalone/configuration/mgmt-users.properties
----------------------------------------------------------------------
diff --git a/examples/javaee/jms-context-injection/server/standalone/configuration/mgmt-users.properties b/examples/javaee/jms-context-injection/server/standalone/configuration/mgmt-users.properties
deleted file mode 100644
index 349b004..0000000
--- a/examples/javaee/jms-context-injection/server/standalone/configuration/mgmt-users.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# Properties declaration of users for the realm 'ManagementRealm' which is the default realm
-# for new AS 7.1 installations. Further authentication mechanism can be configured
-# as part of the <management /> in standalone.xml.
-#
-# Users can be added to this properties file at any time, updates after the server has started
-# will be automatically detected.
-#
-# By default the properties realm expects the entries to be in the format: -
-# username=HEX( MD5( username ':' realm ':' password))
-#
-# A utility script is provided which can be executed from the bin folder to add the users: -
-# - Linux
-# bin/add-user.sh
-#
-# - Windows
-# bin\add-user.bat
-
-# The following illustrates how an admin user could be defined, this
-# is for illustration only and does not correspond to a usable password.
-#
-#admin=2a0923285184943425d1f53ddd58ec7a
-admin=9d71b431e53d99563aa0dfca628c970b
-andy=dfb16391f1be1c454b5bce9822bd9df3
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/jms-context-injection/server/standalone/configuration/standalone-example.xml
----------------------------------------------------------------------
diff --git a/examples/javaee/jms-context-injection/server/standalone/configuration/standalone-example.xml b/examples/javaee/jms-context-injection/server/standalone/configuration/standalone-example.xml
deleted file mode 100644
index 437418e..0000000
--- a/examples/javaee/jms-context-injection/server/standalone/configuration/standalone-example.xml
+++ /dev/null
@@ -1,493 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-
-<server xmlns="urn:jboss:domain:2.0">
- <extensions>
- <extension module="org.jboss.as.clustering.infinispan"/>
- <extension module="org.jboss.as.connector"/>
- <extension module="org.jboss.as.deployment-scanner"/>
- <extension module="org.jboss.as.ee"/>
- <extension module="org.jboss.as.ejb3"/>
- <extension module="org.jboss.as.jacorb"/>
- <extension module="org.jboss.as.jaxrs"/>
- <extension module="org.jboss.as.jdr"/>
- <extension module="org.jboss.as.jmx"/>
- <extension module="org.jboss.as.jpa"/>
- <extension module="org.jboss.as.jsf"/>
- <extension module="org.jboss.as.jsr77"/>
- <extension module="org.jboss.as.logging"/>
- <extension module="org.jboss.as.mail"/>
- <extension module="org.jboss.as.messaging"/>
- <extension module="org.jboss.as.naming"/>
- <extension module="org.jboss.as.pojo"/>
- <extension module="org.jboss.as.remoting"/>
- <extension module="org.jboss.as.sar"/>
- <extension module="org.jboss.as.security"/>
- <extension module="org.jboss.as.threads"/>
- <extension module="org.jboss.as.transactions"/>
- <extension module="org.jboss.as.webservices"/>
- <extension module="org.jboss.as.weld"/>
- <extension module="org.wildfly.extension.batch"/>
- <extension module="org.wildfly.extension.io"/>
- <extension module="org.wildfly.extension.undertow"/>
- </extensions>
- <management>
- <security-realms>
- <security-realm name="ManagementRealm">
- <authentication>
- <local default-user="$local"/>
- <properties path="mgmt-users.properties" relative-to="jboss.server.config.dir"/>
- </authentication>
- <authorization map-groups-to-roles="false">
- <properties path="mgmt-groups.properties" relative-to="jboss.server.config.dir"/>
- </authorization>
- </security-realm>
- <security-realm name="ApplicationRealm">
- <authentication>
- <local default-user="$local" allowed-users="*"/>
- <properties path="application-users.properties" relative-to="jboss.server.config.dir"/>
- </authentication>
- <authorization>
- <properties path="application-roles.properties" relative-to="jboss.server.config.dir"/>
- </authorization>
- </security-realm>
- </security-realms>
- <audit-log>
- <formatters>
- <json-formatter name="json-formatter"/>
- </formatters>
- <handlers>
- <file-handler name="file" formatter="json-formatter" relative-to="jboss.server.data.dir" path="audit-log.log"/>
- </handlers>
- <logger log-boot="true" log-read-only="false" enabled="false">
- <handlers>
- <handler name="file"/>
- </handlers>
- </logger>
- </audit-log>
- <management-interfaces>
- <http-interface security-realm="ManagementRealm" http-upgrade-enabled="true">
- <socket-binding http="management-http"/>
- </http-interface>
- </management-interfaces>
- <access-control provider="simple">
- <role-mapping>
- <role name="SuperUser">
- <include>
- <user name="$local"/>
- </include>
- </role>
- </role-mapping>
- </access-control>
- </management>
- <profile>
- <subsystem xmlns="urn:jboss:domain:logging:2.0">
- <console-handler name="CONSOLE">
- <level name="INFO"/>
- <formatter>
- <named-formatter name="COLOR-PATTERN"/>
- </formatter>
- </console-handler>
- <periodic-rotating-file-handler name="FILE" autoflush="true">
- <formatter>
- <named-formatter name="PATTERN"/>
- </formatter>
- <file relative-to="jboss.server.log.dir" path="server.log"/>
- <suffix value=".yyyy-MM-dd"/>
- <append value="true"/>
- </periodic-rotating-file-handler>
- <logger category="com.arjuna">
- <level name="WARN"/>
- </logger>
- <logger category="org.apache.tomcat.util.modeler">
- <level name="WARN"/>
- </logger>
- <logger category="org.jboss.as.config">
- <level name="DEBUG"/>
- </logger>
- <logger category="sun.rmi">
- <level name="WARN"/>
- </logger>
- <logger category="jacorb">
- <level name="WARN"/>
- </logger>
- <logger category="jacorb.config">
- <level name="ERROR"/>
- </logger>
- <root-logger>
- <level name="INFO"/>
- <handlers>
- <handler name="CONSOLE"/>
- <handler name="FILE"/>
- </handlers>
- </root-logger>
- <formatter name="PATTERN">
- <pattern-formatter pattern="%d{yyyy-MM-dd HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/>
- </formatter>
- <formatter name="COLOR-PATTERN">
- <pattern-formatter pattern="%K{level}%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/>
- </formatter>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:batch:1.0">
- <job-repository>
- <in-memory/>
- </job-repository>
- <thread-pool>
- <max-threads count="10"/>
- <keepalive-time time="100" unit="milliseconds"/>
- </thread-pool>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:datasources:2.0">
- <datasources>
- <datasource jndi-name="java:jboss/datasources/ExampleDS" pool-name="ExampleDS" enabled="true" use-java-context="true">
- <connection-url>jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE</connection-url>
- <driver>h2</driver>
- <security>
- <user-name>sa</user-name>
- <password>sa</password>
- </security>
- </datasource>
- <drivers>
- <driver name="h2" module="com.h2database.h2">
- <xa-datasource-class>org.h2.jdbcx.JdbcDataSource</xa-datasource-class>
- </driver>
- </drivers>
- </datasources>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:deployment-scanner:2.0">
- <deployment-scanner path="deployments" relative-to="jboss.server.base.dir" scan-interval="5000" runtime-failure-causes-rollback="${jboss.deployment.scanner.rollback.on.failure:false}"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:ee:2.0">
- <spec-descriptor-property-replacement>false</spec-descriptor-property-replacement>
- <jboss-descriptor-property-replacement>true</jboss-descriptor-property-replacement>
- <annotation-property-replacement>false</annotation-property-replacement>
- <concurrent>
- <context-services>
- <context-service name="default" jndi-name="java:jboss/ee/concurrency/context/default" use-transaction-setup-provider="true"/>
- </context-services>
- <managed-executor-services>
- <managed-executor-service name="default" jndi-name="java:jboss/ee/concurrency/executor/default" context-service="default" hung-task-threshold="60000" core-threads="5" max-threads="25" keepalive-time="5000"/>
- </managed-executor-services>
- <managed-scheduled-executor-services>
- <managed-scheduled-executor-service name="default" jndi-name="java:jboss/ee/concurrency/scheduler/default" context-service="default" hung-task-threshold="60000" core-threads="2" keepalive-time="3000"/>
- </managed-scheduled-executor-services>
- <managed-thread-factories>
- <managed-thread-factory name="default" jndi-name="java:jboss/ee/concurrency/factory/default" context-service="default"/>
- </managed-thread-factories>
- </concurrent>
- <default-bindings context-service="java:jboss/ee/concurrency/context/default" datasource="java:jboss/datasources/ExampleDS" jms-connection-factory="java:jboss/DefaultJMSConnectionFactory" managed-executor-service="java:jboss/ee/concurrency/executor/default" managed-scheduled-executor-service="java:jboss/ee/concurrency/scheduler/default" managed-thread-factory="java:jboss/ee/concurrency/factory/default"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:ejb3:2.0">
- <session-bean>
- <stateful default-access-timeout="5000" cache-ref="simple" passivation-disabled-cache-ref="simple"/>
- <singleton default-access-timeout="5000"/>
- </session-bean>
- <mdb>
- <resource-adapter-ref resource-adapter-name="${ejb.resource-adapter-name:activemq-ra.rar}"/>
- <bean-instance-pool-ref pool-name="mdb-strict-max-pool"/>
- </mdb>
- <pools>
- <bean-instance-pools>
- <!-- A sample strict max pool configuration -->
- <strict-max-pool name="slsb-strict-max-pool" max-pool-size="20" instance-acquisition-timeout="5" instance-acquisition-timeout-unit="MINUTES"/>
- <strict-max-pool name="mdb-strict-max-pool" max-pool-size="20" instance-acquisition-timeout="5" instance-acquisition-timeout-unit="MINUTES"/>
- </bean-instance-pools>
- </pools>
- <caches>
- <cache name="simple"/>
- <cache name="distributable" aliases="passivating clustered" passivation-store-ref="infinispan"/>
- </caches>
- <passivation-stores>
- <passivation-store name="infinispan" cache-container="ejb" max-size="10000"/>
- </passivation-stores>
- <async thread-pool-name="default"/>
- <timer-service thread-pool-name="default" default-data-store="default-file-store">
- <data-stores>
- <file-data-store name="default-file-store" path="timer-service-data" relative-to="jboss.server.data.dir"/>
- </data-stores>
- </timer-service>
- <remote connector-ref="http-remoting-connector" thread-pool-name="default"/>
- <thread-pools>
- <thread-pool name="default">
- <max-threads count="10"/>
- <keepalive-time time="100" unit="milliseconds"/>
- </thread-pool>
- </thread-pools>
- <iiop enable-by-default="false" use-qualified-name="false"/>
- <default-security-domain value="other"/>
- <default-missing-method-permissions-deny-access value="true"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:io:1.0">
- <worker name="default" io-threads="3"/>
- <buffer-pool name="default" buffer-size="16384" buffers-per-slice="128"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:infinispan:2.0">
- <cache-container name="web" default-cache="passivation" module="org.wildfly.clustering.web.infinispan">
- <local-cache name="passivation" batching="true">
- <file-store passivation="true" purge="false"/>
- </local-cache>
- <local-cache name="persistent" batching="true">
- <file-store passivation="false" purge="false"/>
- </local-cache>
- </cache-container>
- <cache-container name="ejb" aliases="sfsb" default-cache="passivation" module="org.wildfly.clustering.ejb.infinispan">
- <local-cache name="passivation" batching="true">
- <file-store passivation="true" purge="false"/>
- </local-cache>
- <local-cache name="persistent" batching="true">
- <file-store passivation="false" purge="false"/>
- </local-cache>
- </cache-container>
- <cache-container name="hibernate" default-cache="local-query" module="org.hibernate">
- <local-cache name="entity">
- <transaction mode="NON_XA"/>
- <eviction strategy="LRU" max-entries="10000"/>
- <expiration max-idle="100000"/>
- </local-cache>
- <local-cache name="local-query">
- <transaction mode="NONE"/>
- <eviction strategy="LRU" max-entries="10000"/>
- <expiration max-idle="100000"/>
- </local-cache>
- <local-cache name="timestamps">
- <transaction mode="NONE"/>
- <eviction strategy="NONE"/>
- </local-cache>
- </cache-container>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:jacorb:1.3">
- <orb socket-binding="jacorb" ssl-socket-binding="jacorb-ssl">
- <initializers transactions="spec" security="identity"/>
- </orb>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:jaxrs:1.0"/>
- <subsystem xmlns="urn:jboss:domain:jca:2.0">
- <archive-validation enabled="true" fail-on-error="true" fail-on-warn="false"/>
- <bean-validation enabled="true"/>
- <default-workmanager>
- <short-running-threads>
- <core-threads count="50"/>
- <queue-length count="50"/>
- <max-threads count="50"/>
- <keepalive-time time="10" unit="seconds"/>
- </short-running-threads>
- <long-running-threads>
- <core-threads count="50"/>
- <queue-length count="50"/>
- <max-threads count="50"/>
- <keepalive-time time="10" unit="seconds"/>
- </long-running-threads>
- </default-workmanager>
- <cached-connection-manager/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:jdr:1.0"/>
- <subsystem xmlns="urn:jboss:domain:jmx:1.3">
- <expose-resolved-model/>
- <expose-expression-model/>
- <remoting-connector/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:jpa:1.1">
- <jpa default-datasource="" default-extended-persistence-inheritance="DEEP"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:jsf:1.0"/>
- <subsystem xmlns="urn:jboss:domain:jsr77:1.0"/>
- <subsystem xmlns="urn:jboss:domain:mail:2.0">
- <mail-session name="default" jndi-name="java:jboss/mail/Default">
- <smtp-server outbound-socket-binding-ref="mail-smtp"/>
- </mail-session>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:messaging:2.0">
- <activemq-server>
- <persistence-enabled>true</persistence-enabled>
- <journal-file-size>102400</journal-file-size>
- <journal-min-files>2</journal-min-files>
- <connectors>
- <http-connector name="http-connector" socket-binding="http">
- <param key="http-upgrade-endpoint" value="http-acceptor"/>
- </http-connector>
- <http-connector name="http-connector-throughput" socket-binding="http">
- <param key="http-upgrade-endpoint" value="http-acceptor-throughput"/>
- <param key="batch-delay" value="50"/>
- </http-connector>
- <in-vm-connector name="in-vm" server-id="0"/>
- </connectors>
- <acceptors>
- <http-acceptor name="http-acceptor" http-listener="default"/>
- <http-acceptor name="http-acceptor-throughput" http-listener="default">
- <param key="batch-delay" value="50"/>
- <param key="direct-deliver" value="false"/>
- </http-acceptor>
- <in-vm-acceptor name="in-vm" server-id="0"/>
- </acceptors>
- <security-settings>
- <security-setting match="#">
- <permission type="send" roles="guest"/>
- <permission type="consume" roles="guest"/>
- <permission type="createNonDurableQueue" roles="guest"/>
- <permission type="deleteNonDurableQueue" roles="guest"/>
- </security-setting>
- </security-settings>
- <address-settings>
- <!--default for catch all-->
- <address-setting match="#">
- <dead-letter-address>jms.queue.DLQ</dead-letter-address>
- <expiry-address>jms.queue.ExpiryQueue</expiry-address>
- <redelivery-delay>0</redelivery-delay>
- <max-size-bytes>10485760</max-size-bytes>
- <address-full-policy>PAGE</address-full-policy>
- <page-size-bytes>2097152</page-size-bytes>
- <message-counter-history-day-limit>10</message-counter-history-day-limit>
- </address-setting>
- </address-settings>
- <jms-connection-factories>
- <connection-factory name="InVmConnectionFactory">
- <connectors>
- <connector-ref connector-name="in-vm"/>
- </connectors>
- <entries>
- <entry name="java:/ConnectionFactory"/>
- </entries>
- </connection-factory>
- <connection-factory name="RemoteConnectionFactory">
- <connectors>
- <connector-ref connector-name="http-connector"/>
- </connectors>
- <entries>
- <entry name="java:jboss/exported/jms/RemoteConnectionFactory"/>
- </entries>
- </connection-factory>
- <pooled-connection-factory name="activemq-ra">
- <transaction mode="xa"/>
- <connectors>
- <connector-ref connector-name="in-vm"/>
- </connectors>
- <entries>
- <entry name="java:/JmsXA"/>
- <!-- Global JNDI entry used to provide a default JMS Connection factory to EE application -->
- <entry name="java:jboss/DefaultJMSConnectionFactory"/>
- </entries>
- </pooled-connection-factory>
- </jms-connection-factories>
- <jms-destinations>
- <jms-queue name="testQueue">
- <entry name="queue/test"/>
- <entry name="java:jboss/exported/jms/queues/testQueue"/>
- </jms-queue>
- <jms-queue name="replyQueue">
- <entry name="queue/replyQueue"/>
- <entry name="java:jboss/exported/jms/queues/replyQueue"/>
- </jms-queue>
- </jms-destinations>
- </activemq-server>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:naming:2.0">
- <remote-naming/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:pojo:1.0"/>
- <subsystem xmlns="urn:jboss:domain:remoting:2.0">
- <endpoint worker="default"/>
- <http-connector name="http-remoting-connector" connector-ref="default" security-realm="ApplicationRealm"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:resource-adapters:2.0"/>
- <subsystem xmlns="urn:jboss:domain:sar:1.0"/>
- <subsystem xmlns="urn:jboss:domain:security:1.2">
- <security-domains>
- <security-domain name="other" cache-type="default">
- <authentication>
- <login-module code="Remoting" flag="optional">
- <module-option name="password-stacking" value="useFirstPass"/>
- </login-module>
- <login-module code="RealmDirect" flag="required">
- <module-option name="password-stacking" value="useFirstPass"/>
- </login-module>
- </authentication>
- </security-domain>
- <security-domain name="jboss-web-policy" cache-type="default">
- <authorization>
- <policy-module code="Delegating" flag="required"/>
- </authorization>
- </security-domain>
- <security-domain name="jboss-ejb-policy" cache-type="default">
- <authorization>
- <policy-module code="Delegating" flag="required"/>
- </authorization>
- </security-domain>
- </security-domains>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:threads:1.1"/>
- <subsystem xmlns="urn:jboss:domain:transactions:2.0">
- <core-environment>
- <process-id>
- <uuid/>
- </process-id>
- </core-environment>
- <recovery-environment socket-binding="txn-recovery-environment" status-socket-binding="txn-status-manager"/>
- <coordinator-environment default-timeout="300"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:undertow:1.0">
- <buffer-caches>
- <buffer-cache name="default" buffer-size="1024" buffers-per-region="1024" max-regions="10"/>
- </buffer-caches>
- <server name="default-server">
- <http-listener name="default" socket-binding="http"/>
- <host name="default-host" alias="localhost">
- <location name="/" handler="welcome-content"/>
- <filter-ref name="server-header"/>
- <filter-ref name="x-powered-by-header"/>
- </host>
- </server>
- <servlet-container name="default" default-buffer-cache="default" stack-trace-on-error="local-only">
- <jsp-config/>
- </servlet-container>
- <handlers>
- <file name="welcome-content" path="${jboss.home.dir}/welcome-content" directory-listing="true"/>
- </handlers>
- <filters>
- <response-header name="server-header" header-name="Server" header-value="Wildfly 8"/>
- <response-header name="x-powered-by-header" header-name="X-Powered-By" header-value="Undertow 1"/>
- </filters>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:webservices:1.2">
- <modify-wsdl-address>true</modify-wsdl-address>
- <wsdl-host>${jboss.bind.address:127.0.0.1}</wsdl-host>
- <endpoint-config name="Standard-Endpoint-Config"/>
- <endpoint-config name="Recording-Endpoint-Config">
- <pre-handler-chain name="recording-handlers" protocol-bindings="##SOAP11_HTTP ##SOAP11_HTTP_MTOM ##SOAP12_HTTP ##SOAP12_HTTP_MTOM">
- <handler name="RecordingHandler" class="org.jboss.ws.common.invocation.RecordingServerHandler"/>
- </pre-handler-chain>
- </endpoint-config>
- <client-config name="Standard-Client-Config"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:weld:2.0"/>
- </profile>
- <interfaces>
- <interface name="management">
- <inet-address value="${jboss.bind.address.management:127.0.0.1}"/>
- </interface>
- <interface name="public">
- <inet-address value="${jboss.bind.address:127.0.0.1}"/>
- </interface>
- <!-- TODO - only show this if the jacorb subsystem is added -->
- <interface name="unsecure">
- <!--
- ~ Used for IIOP sockets in the standard configuration.
- ~ To secure JacORB you need to setup SSL
- -->
- <inet-address value="${jboss.bind.address.unsecure:127.0.0.1}"/>
- </interface>
- </interfaces>
- <socket-binding-group name="standard-sockets" default-interface="public" port-offset="${jboss.socket.binding.port-offset:0}">
- <socket-binding name="management-http" interface="management" port="${jboss.management.http.port:9990}"/>
- <socket-binding name="management-https" interface="management" port="${jboss.management.https.port:9993}"/>
- <socket-binding name="ajp" port="${jboss.ajp.port:8009}"/>
- <socket-binding name="http" port="${jboss.http.port:8080}"/>
- <socket-binding name="https" port="${jboss.https.port:8443}"/>
- <socket-binding name="jacorb" interface="unsecure" port="3528"/>
- <socket-binding name="jacorb-ssl" interface="unsecure" port="3529"/>
- <socket-binding name="messaging-group" port="0" multicast-address="${jboss.messaging.group.address:231.7.7.7}" multicast-port="${jboss.messaging.group.port:9876}"/>
- <socket-binding name="txn-recovery-environment" port="4712"/>
- <socket-binding name="txn-status-manager" port="4713"/>
- <outbound-socket-binding name="mail-smtp">
- <remote-destination host="localhost" port="25"/>
- </outbound-socket-binding>
- </socket-binding-group>
-</server>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/jms-context-injection/src/main/java/org/apache/activemq/javaee/example/JmsContextInjectionClientExample.java
----------------------------------------------------------------------
diff --git a/examples/javaee/jms-context-injection/src/main/java/org/apache/activemq/javaee/example/JmsContextInjectionClientExample.java b/examples/javaee/jms-context-injection/src/main/java/org/apache/activemq/javaee/example/JmsContextInjectionClientExample.java
deleted file mode 100644
index 67484d3..0000000
--- a/examples/javaee/jms-context-injection/src/main/java/org/apache/activemq/javaee/example/JmsContextInjectionClientExample.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.activemq.javaee.example;
-
-import javax.jms.Connection;
-import javax.jms.ConnectionFactory;
-import javax.jms.JMSContext;
-import javax.jms.Message;
-import javax.jms.MessageConsumer;
-import javax.jms.MessageProducer;
-import javax.jms.Queue;
-import javax.jms.Session;
-import javax.jms.TextMessage;
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-import java.util.Properties;
-
-/**
- * @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a>
- */
-public class JmsContextInjectionClientExample
-{
- public static void main(final String[] args) throws Exception
- {
- Thread.sleep(5000);
- InitialContext initialContext = null;
- try
- {
- // Step 3. Create an initial context to perform the JNDI lookup.
- final Properties env = new Properties();
-
- env.put(Context.INITIAL_CONTEXT_FACTORY, "org.jboss.naming.remote.client.InitialContextFactory");
-
- env.put(Context.PROVIDER_URL, "http-remoting://localhost:8080");
-
- initialContext = new InitialContext(env);
-
- // Step 4. Perfom a lookup on the queue
- Queue queue = (Queue)initialContext.lookup("jms/queues/testQueue");
-
- // Step 5. Perform a lookup on the Connection Factory
- ConnectionFactory cf = (ConnectionFactory)initialContext.lookup("jms/RemoteConnectionFactory");
-
- try
- (
- // Step 6.Create a JMS Connection inside the try-with-resource block so it will auto close
- JMSContext context = cf.createContext("guest", "password")
- )
- {
- // Step 6. create a JMSProducer and send the message
- context.createProducer().send(queue, "This is a text message");
-
- // Step 7 start the context
- context.start();
-
- // Step 8. look up the reply queue
- Queue replyQueue = (Queue)initialContext.lookup("jms/queues/replyQueue");
-
- // Step 9. receive the body of the message as a String
- String text = context.createConsumer(replyQueue).receiveBody(String.class);
- }
- }
- finally
- {
- // Step 10. Be sure to close our Initial Context!
- if (initialContext != null)
- {
- initialContext.close();
- }
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/jms-context-injection/src/main/java/org/apache/activemq/javaee/example/server/JmsContextInjectionExample.java
----------------------------------------------------------------------
diff --git a/examples/javaee/jms-context-injection/src/main/java/org/apache/activemq/javaee/example/server/JmsContextInjectionExample.java b/examples/javaee/jms-context-injection/src/main/java/org/apache/activemq/javaee/example/server/JmsContextInjectionExample.java
deleted file mode 100644
index 20b574a..0000000
--- a/examples/javaee/jms-context-injection/src/main/java/org/apache/activemq/javaee/example/server/JmsContextInjectionExample.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.activemq.javaee.example.server;
-
-import javax.annotation.Resource;
-import javax.ejb.ActivationConfigProperty;
-import javax.ejb.MessageDriven;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
-import javax.ejb.TransactionManagement;
-import javax.ejb.TransactionManagementType;
-import javax.inject.Inject;
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.MessageListener;
-import javax.jms.Queue;
-import javax.jms.TextMessage;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-import javax.transaction.SystemException;
-import javax.transaction.Transaction;
-import javax.transaction.TransactionManager;
-
-import org.jboss.ejb3.annotation.ResourceAdapter;
-
-import java.util.Calendar;
-
-/**
- * @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a>
- */
-@MessageDriven(name = "MDB_JMS_CONTEXT",
- activationConfig =
- {
- @ActivationConfigProperty(propertyName = "destinationType", propertyValue = "javax.jms.Queue"),
- @ActivationConfigProperty(propertyName = "destination", propertyValue = "queue/testQueue"),
- @ActivationConfigProperty(propertyName = "consumerMaxRate", propertyValue = "1")
- })
-public class JmsContextInjectionExample implements MessageListener
-{
- // 1. Inject the JMSContext
- @Inject
- javax.jms.JMSContext context;
-
- // 2. Map the reply queue
- @Resource(mappedName = "java:/queue/replyQueue")
- Queue replyQueue;
-
- public void onMessage(final Message message)
- {
- try
- {
- // Step 9. We know the client is sending a text message so we cast
- TextMessage textMessage = (TextMessage)message;
-
- // Step 10. we print out the message text
- System.out.println("message " + textMessage.getText() + " received");
-
- // Step 11. we create a JMSProducer and send a message
- context.createProducer().send(replyQueue, "this is a reply");
- }
- catch (JMSException e)
- {
- e.printStackTrace();
- }
- }
-}
[12/37] activemq-6 git commit: ACTIVEMQ6-41 Drop Java EE examples
Posted by jb...@apache.org.
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/jms-context-injection/src/test/java/org/apache/activemq/javaee/examples/JmsContextInjectionRunnerTest.java
----------------------------------------------------------------------
diff --git a/examples/javaee/jms-context-injection/src/test/java/org/apache/activemq/javaee/examples/JmsContextInjectionRunnerTest.java b/examples/javaee/jms-context-injection/src/test/java/org/apache/activemq/javaee/examples/JmsContextInjectionRunnerTest.java
deleted file mode 100644
index 505116a..0000000
--- a/examples/javaee/jms-context-injection/src/test/java/org/apache/activemq/javaee/examples/JmsContextInjectionRunnerTest.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.activemq.javaee.examples;
-
-import org.apache.activemq.javaee.example.JmsContextInjectionClientExample;
-import org.apache.activemq.javaee.example.server.JmsContextInjectionExample;
-import org.jboss.arquillian.container.test.api.Deployment;
-import org.jboss.arquillian.container.test.api.RunAsClient;
-import org.jboss.arquillian.junit.Arquillian;
-import org.jboss.shrinkwrap.api.Archive;
-import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.asset.EmptyAsset;
-import org.jboss.shrinkwrap.api.asset.StringAsset;
-import org.jboss.shrinkwrap.api.spec.JavaArchive;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-/**
- * @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a>
- * 5/21/12
- */
-@RunAsClient
-@RunWith(Arquillian.class)
-public class JmsContextInjectionRunnerTest
-{
- @Deployment
- public static Archive getDeployment()
- {
- final JavaArchive ejbJar = ShrinkWrap.create(JavaArchive.class, "mdb.jar");
- ejbJar.addClass(JmsContextInjectionExample.class).
- addAsManifestResource(EmptyAsset.INSTANCE,
- "beans.xml")
- .addAsManifestResource(new StringAsset("Dependencies: org.jboss.as.controller-client,org.jboss.dmr,org.jboss.as.cli\n"),
- "MANIFEST.MF");
- System.out.println(ejbJar.toString(true));
- return ejbJar;
- }
-
- @Test
- public void runExample() throws Exception
- {
- JmsContextInjectionClientExample.main(null);
- //give the example time to run
- Thread.sleep(10000);
- }
-
-
-}
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/jms-context-injection/src/test/resources/arquillian.xml
----------------------------------------------------------------------
diff --git a/examples/javaee/jms-context-injection/src/test/resources/arquillian.xml b/examples/javaee/jms-context-injection/src/test/resources/arquillian.xml
deleted file mode 100644
index 9090137..0000000
--- a/examples/javaee/jms-context-injection/src/test/resources/arquillian.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<arquillian xmlns="http://jboss.org/schema/arquillian"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://jboss.org/schema/arquillian http://jboss.org/schema/arquillian/arquillian_1_0.xsd">
-
- <!-- Uncomment to have test archives exported to the file system for inspection.
-This feature can also be controlled using the system property arquillian.deploymentExportPath -->
- <!--
-<engine>
-<property name="deploymentExportPath">target</property>
-</engine>
--->
-
- <defaultProtocol type="Servlet 3.0" />
-
- <container qualifier="jboss" default="true">
- <configuration>
- <property name="jbossHome">${basedir}/target/jbossas-node0</property>
- <property name="serverConfig">standalone-example.xml</property>
- <property name="allowConnectingToRunningServer">true</property>
- <property name="managementAddress">${node0:127.0.0.1}</property>
- </configuration>
- </container>
-
- <!-- logThreshold proposed -->
- <!--
-<container qualifier="jbossas-managed">
-<configuration>
-<property name="logThreshold">ERROR</property>
-</configuration>
-</container>
--->
-
-</arquillian>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/mdb-bmt/pom.xml
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-bmt/pom.xml b/examples/javaee/mdb-bmt/pom.xml
deleted file mode 100644
index 50af030..0000000
--- a/examples/javaee/mdb-bmt/pom.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.activemq.example.javaee</groupId>
- <artifactId>javaee-examples</artifactId>
- <version>6.0.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>activemq-javaee-mdb-bmt-example</artifactId>
- <packaging>jar</packaging>
- <name>ActiveMQ6 Java EE MDB Example</name>
-</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/mdb-bmt/readme.html
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-bmt/readme.html b/examples/javaee/mdb-bmt/readme.html
deleted file mode 100644
index bfc0c10..0000000
--- a/examples/javaee/mdb-bmt/readme.html
+++ /dev/null
@@ -1,113 +0,0 @@
-<html>
- <head>
- <title>ActiveMQ Java EE MDB Bean Managed Transaction Example</title>
- <link rel="stylesheet" type="text/css" href="../../common/common.css" />
- <link rel="stylesheet" type="text/css" href="../../common/prettify.css" />
- <script type="text/javascript" src="../../common/prettify.js"></script>
- </head>
- <body onload="prettyPrint()">
- <h1>Java EE MDB Bean Managed Transaction Example</h1>
-
- <p>This example shows you how to send a message to an MDB configured to use Bean Managed Transactions</p>
- <p>The example will send deploy a simple MDB and demonstrate sending a message and the MDB consuming it.</p>
-
- <p>The example leverages the JBoss Arquillian framework to run a WildFly instance and deploy the MDB.</p>
-
- <h2>Example step-by-step</h2>
-
- <p><i>download WildFly 8.0.0.Final from <a href="http://wildfly.org/downloads/">here</a> and install.</i></p>
- <p><i>set the JBOSS_HOME property to point to the WildFly install directory</i></p>
- <p><i>type <code>mvn verify</code> from the example directory to run</i></p>
-
- <ol>
- <li>First we need to get an initial context so we can look-up the JMS connection factory and destination objects from JNDI. This initial context will get it's properties from the <code>jndi.properties</code> file in the directory <code>config</code></li>
- <pre class="prettyprint">
- final Properties env = new Properties();
-
- env.put(Context.INITIAL_CONTEXT_FACTORY, "org.jboss.naming.remote.client.InitialContextFactory");
-
- env.put(Context.PROVIDER_URL, "http-remoting://localhost:8080");
-
- initialContext = new InitialContext(env);
- </pre>
-
- <li>We look up the JMS queue object from JNDI</li>
- <pre class="prettyprint">
- Queue queue = (Queue)initialContext.lookup("jms/queues/testQueue");
- </pre>
-
- <li>We look up the JMS connection factory object from JNDI</li>
- <pre class="prettyprint">
- ConnectionFactory cf = (ConnectionFactory)initialContext.lookup("/jms/RemoteConnectionFactory");
- </pre>
-
- <li>We create a JMS connection</li>
- <pre class="prettyprint">
- connection = cf.createConnection("guest", "password");
- </pre>
-
- <li>We create a JMS session. The session is created as non transacted and will auto acknowledge messages.</li>
- <pre class="prettyprint">
- Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
- </pre>
-
- <li>We create a JMS message producer on the session. This will be used to send the messages.</li>
- <pre class="prettyprint">
- MessageProducer messageProducer = session.createProducer(queue);
- </pre>
-
- <li>We create a JMS text messages that we are going to send.</li>
- <pre class="prettyprint">
- TextMessage message = session.createTextMessage("This is a text message");
- </pre>
-
- <li>We send messages to the queue</li>
- <pre class="prettyprint">
- messageProducer.send(message);
- </pre>
-
- <li>The MDB receives the message<br />
- We know the message is a TextMessage so we cast to it.
- </li>
- <pre class="prettyprint">
- TextMessage tm = (TextMessage)message;
- </pre>
-
- <li>The MDB gets the text and prints it
- </li>
- <pre class="prettyprint">
- String text = tm.getText();
- System.out.println("message " + text + " received");
- </pre>
-
- <li>Now we can do something within a user transaction, let's just start and commit it
- </li>
- <pre class="prettyprint">
- UserTransaction tx = ctx.getUserTransaction();
-
- if(tx != null)
- {
- tx.begin();
- System.out.println("we're in the middle of a transaction: " + tx);
- tx.commit();
- }
- </pre>
-
- <li>And finally, <b>always</b> remember to close your JMS connections and resources after use, in a <code>finally</code> block. Closing a JMS connection will automatically close all of its sessions, consumers, producer and browser objects</li>
-
- <pre class="prettyprint">
- <code>finally
- {
- if (initialContext != null)
- {
- initialContext.close();
- }
- if (connection != null)
- {
- connection.close();
- }
- }
- </pre>
- </ol>
- </body>
-</html>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/mdb-bmt/server/standalone/configuration/application-roles.properties
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-bmt/server/standalone/configuration/application-roles.properties b/examples/javaee/mdb-bmt/server/standalone/configuration/application-roles.properties
deleted file mode 100644
index 0ade8fb..0000000
--- a/examples/javaee/mdb-bmt/server/standalone/configuration/application-roles.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# Properties declaration of users roles for the realm 'ApplicationRealm'.
-#
-# This includes the following protocols: remote ejb, remote jndi, web, remote jms
-#
-# Users can be added to this properties file at any time, updates after the server has started
-# will be automatically detected.
-#
-# The format of this file is as follows: -
-# username=role1,role2,role3
-#
-# A utility script is provided which can be executed from the bin folder to add the users: -
-# - Linux
-# bin/add-user.sh
-#
-# - Windows
-# bin\add-user.bat
-#
-# The following illustrates how an admin user could be defined.
-#
-#admin=PowerUser,BillingAdmin,
-guest=guest
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/mdb-bmt/server/standalone/configuration/application-users.properties
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-bmt/server/standalone/configuration/application-users.properties b/examples/javaee/mdb-bmt/server/standalone/configuration/application-users.properties
deleted file mode 100644
index c52e923..0000000
--- a/examples/javaee/mdb-bmt/server/standalone/configuration/application-users.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# Properties declaration of users for the realm 'ApplicationRealm' which is the default realm
-# for application services on a new AS 7.1 installation.
-#
-# This includes the following protocols: remote ejb, remote jndi, web, remote jms
-#
-# Users can be added to this properties file at any time, updates after the server has started
-# will be automatically detected.
-#
-# The format of this realm is as follows: -
-# username=HEX( MD5( username ':' realm ':' password))
-#
-# A utility script is provided which can be executed from the bin folder to add the users: -
-# - Linux
-# bin/add-user.sh
-#
-# - Windows
-# bin\add-user.bat
-#
-# The following illustrates how an admin user could be defined, this
-# is for illustration only and does not correspond to a usable password.
-#
-#admin=2a0923285184943425d1f53ddd58ec7a
-guest=3437456520927d113b17d471d630e0d6
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/mdb-bmt/server/standalone/configuration/logging.properties
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-bmt/server/standalone/configuration/logging.properties b/examples/javaee/mdb-bmt/server/standalone/configuration/logging.properties
deleted file mode 100644
index 3fa31b0..0000000
--- a/examples/javaee/mdb-bmt/server/standalone/configuration/logging.properties
+++ /dev/null
@@ -1,47 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# Additional logger names to configure (root logger is always configured)
-loggers=org.jboss.as.config
-
-# Dump system environment at boot by default
-logger.org.jboss.as.config.level=DEBUG
-
-# Root logger level
-logger.level=${jboss.boot.server.log.level:INFO}
-# Root logger handlers
-logger.handlers=FILE,CONSOLE
-
-# Console handler configuration
-handler.CONSOLE=org.jboss.logmanager.handlers.ConsoleHandler
-handler.CONSOLE.properties=autoFlush
-handler.CONSOLE.level=${jboss.boot.server.log.console.level:INFO}
-handler.CONSOLE.autoFlush=true
-handler.CONSOLE.formatter=PATTERN
-
-# File handler configuration
-handler.FILE=org.jboss.logmanager.handlers.FileHandler
-handler.FILE.level=DEBUG
-handler.FILE.properties=autoFlush,fileName
-handler.FILE.autoFlush=true
-handler.FILE.fileName=${org.jboss.boot.log.file:boot.log}
-handler.FILE.formatter=PATTERN
-
-# Formatter pattern configuration
-formatter.PATTERN=org.jboss.logmanager.formatters.PatternFormatter
-formatter.PATTERN.properties=pattern
-formatter.PATTERN.pattern=%d{HH:mm:ss,SSS} %-5p [%c] %s%E%n
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/mdb-bmt/server/standalone/configuration/mgmt-users.properties
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-bmt/server/standalone/configuration/mgmt-users.properties b/examples/javaee/mdb-bmt/server/standalone/configuration/mgmt-users.properties
deleted file mode 100644
index 349b004..0000000
--- a/examples/javaee/mdb-bmt/server/standalone/configuration/mgmt-users.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# Properties declaration of users for the realm 'ManagementRealm' which is the default realm
-# for new AS 7.1 installations. Further authentication mechanism can be configured
-# as part of the <management /> in standalone.xml.
-#
-# Users can be added to this properties file at any time, updates after the server has started
-# will be automatically detected.
-#
-# By default the properties realm expects the entries to be in the format: -
-# username=HEX( MD5( username ':' realm ':' password))
-#
-# A utility script is provided which can be executed from the bin folder to add the users: -
-# - Linux
-# bin/add-user.sh
-#
-# - Windows
-# bin\add-user.bat
-
-# The following illustrates how an admin user could be defined, this
-# is for illustration only and does not correspond to a usable password.
-#
-#admin=2a0923285184943425d1f53ddd58ec7a
-admin=9d71b431e53d99563aa0dfca628c970b
-andy=dfb16391f1be1c454b5bce9822bd9df3
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/mdb-bmt/server/standalone/configuration/standalone-example.xml
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-bmt/server/standalone/configuration/standalone-example.xml b/examples/javaee/mdb-bmt/server/standalone/configuration/standalone-example.xml
deleted file mode 100644
index be39676..0000000
--- a/examples/javaee/mdb-bmt/server/standalone/configuration/standalone-example.xml
+++ /dev/null
@@ -1,489 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-
-<server xmlns="urn:jboss:domain:2.0">
- <extensions>
- <extension module="org.jboss.as.clustering.infinispan"/>
- <extension module="org.jboss.as.connector"/>
- <extension module="org.jboss.as.deployment-scanner"/>
- <extension module="org.jboss.as.ee"/>
- <extension module="org.jboss.as.ejb3"/>
- <extension module="org.jboss.as.jacorb"/>
- <extension module="org.jboss.as.jaxrs"/>
- <extension module="org.jboss.as.jdr"/>
- <extension module="org.jboss.as.jmx"/>
- <extension module="org.jboss.as.jpa"/>
- <extension module="org.jboss.as.jsf"/>
- <extension module="org.jboss.as.jsr77"/>
- <extension module="org.jboss.as.logging"/>
- <extension module="org.jboss.as.mail"/>
- <extension module="org.jboss.as.messaging"/>
- <extension module="org.jboss.as.naming"/>
- <extension module="org.jboss.as.pojo"/>
- <extension module="org.jboss.as.remoting"/>
- <extension module="org.jboss.as.sar"/>
- <extension module="org.jboss.as.security"/>
- <extension module="org.jboss.as.threads"/>
- <extension module="org.jboss.as.transactions"/>
- <extension module="org.jboss.as.webservices"/>
- <extension module="org.jboss.as.weld"/>
- <extension module="org.wildfly.extension.batch"/>
- <extension module="org.wildfly.extension.io"/>
- <extension module="org.wildfly.extension.undertow"/>
- </extensions>
- <management>
- <security-realms>
- <security-realm name="ManagementRealm">
- <authentication>
- <local default-user="$local"/>
- <properties path="mgmt-users.properties" relative-to="jboss.server.config.dir"/>
- </authentication>
- <authorization map-groups-to-roles="false">
- <properties path="mgmt-groups.properties" relative-to="jboss.server.config.dir"/>
- </authorization>
- </security-realm>
- <security-realm name="ApplicationRealm">
- <authentication>
- <local default-user="$local" allowed-users="*"/>
- <properties path="application-users.properties" relative-to="jboss.server.config.dir"/>
- </authentication>
- <authorization>
- <properties path="application-roles.properties" relative-to="jboss.server.config.dir"/>
- </authorization>
- </security-realm>
- </security-realms>
- <audit-log>
- <formatters>
- <json-formatter name="json-formatter"/>
- </formatters>
- <handlers>
- <file-handler name="file" formatter="json-formatter" relative-to="jboss.server.data.dir" path="audit-log.log"/>
- </handlers>
- <logger log-boot="true" log-read-only="false" enabled="false">
- <handlers>
- <handler name="file"/>
- </handlers>
- </logger>
- </audit-log>
- <management-interfaces>
- <http-interface security-realm="ManagementRealm" http-upgrade-enabled="true">
- <socket-binding http="management-http"/>
- </http-interface>
- </management-interfaces>
- <access-control provider="simple">
- <role-mapping>
- <role name="SuperUser">
- <include>
- <user name="$local"/>
- </include>
- </role>
- </role-mapping>
- </access-control>
- </management>
- <profile>
- <subsystem xmlns="urn:jboss:domain:logging:2.0">
- <console-handler name="CONSOLE">
- <level name="INFO"/>
- <formatter>
- <named-formatter name="COLOR-PATTERN"/>
- </formatter>
- </console-handler>
- <periodic-rotating-file-handler name="FILE" autoflush="true">
- <formatter>
- <named-formatter name="PATTERN"/>
- </formatter>
- <file relative-to="jboss.server.log.dir" path="server.log"/>
- <suffix value=".yyyy-MM-dd"/>
- <append value="true"/>
- </periodic-rotating-file-handler>
- <logger category="com.arjuna">
- <level name="WARN"/>
- </logger>
- <logger category="org.apache.tomcat.util.modeler">
- <level name="WARN"/>
- </logger>
- <logger category="org.jboss.as.config">
- <level name="DEBUG"/>
- </logger>
- <logger category="sun.rmi">
- <level name="WARN"/>
- </logger>
- <logger category="jacorb">
- <level name="WARN"/>
- </logger>
- <logger category="jacorb.config">
- <level name="ERROR"/>
- </logger>
- <root-logger>
- <level name="INFO"/>
- <handlers>
- <handler name="CONSOLE"/>
- <handler name="FILE"/>
- </handlers>
- </root-logger>
- <formatter name="PATTERN">
- <pattern-formatter pattern="%d{yyyy-MM-dd HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/>
- </formatter>
- <formatter name="COLOR-PATTERN">
- <pattern-formatter pattern="%K{level}%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/>
- </formatter>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:batch:1.0">
- <job-repository>
- <in-memory/>
- </job-repository>
- <thread-pool>
- <max-threads count="10"/>
- <keepalive-time time="100" unit="milliseconds"/>
- </thread-pool>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:datasources:2.0">
- <datasources>
- <datasource jndi-name="java:jboss/datasources/ExampleDS" pool-name="ExampleDS" enabled="true" use-java-context="true">
- <connection-url>jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE</connection-url>
- <driver>h2</driver>
- <security>
- <user-name>sa</user-name>
- <password>sa</password>
- </security>
- </datasource>
- <drivers>
- <driver name="h2" module="com.h2database.h2">
- <xa-datasource-class>org.h2.jdbcx.JdbcDataSource</xa-datasource-class>
- </driver>
- </drivers>
- </datasources>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:deployment-scanner:2.0">
- <deployment-scanner path="deployments" relative-to="jboss.server.base.dir" scan-interval="5000" runtime-failure-causes-rollback="${jboss.deployment.scanner.rollback.on.failure:false}"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:ee:2.0">
- <spec-descriptor-property-replacement>false</spec-descriptor-property-replacement>
- <jboss-descriptor-property-replacement>true</jboss-descriptor-property-replacement>
- <annotation-property-replacement>false</annotation-property-replacement>
- <concurrent>
- <context-services>
- <context-service name="default" jndi-name="java:jboss/ee/concurrency/context/default" use-transaction-setup-provider="true"/>
- </context-services>
- <managed-executor-services>
- <managed-executor-service name="default" jndi-name="java:jboss/ee/concurrency/executor/default" context-service="default" hung-task-threshold="60000" core-threads="5" max-threads="25" keepalive-time="5000"/>
- </managed-executor-services>
- <managed-scheduled-executor-services>
- <managed-scheduled-executor-service name="default" jndi-name="java:jboss/ee/concurrency/scheduler/default" context-service="default" hung-task-threshold="60000" core-threads="2" keepalive-time="3000"/>
- </managed-scheduled-executor-services>
- <managed-thread-factories>
- <managed-thread-factory name="default" jndi-name="java:jboss/ee/concurrency/factory/default" context-service="default"/>
- </managed-thread-factories>
- </concurrent>
- <default-bindings context-service="java:jboss/ee/concurrency/context/default" datasource="java:jboss/datasources/ExampleDS" jms-connection-factory="java:jboss/DefaultJMSConnectionFactory" managed-executor-service="java:jboss/ee/concurrency/executor/default" managed-scheduled-executor-service="java:jboss/ee/concurrency/scheduler/default" managed-thread-factory="java:jboss/ee/concurrency/factory/default"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:ejb3:2.0">
- <session-bean>
- <stateful default-access-timeout="5000" cache-ref="simple" passivation-disabled-cache-ref="simple"/>
- <singleton default-access-timeout="5000"/>
- </session-bean>
- <mdb>
- <resource-adapter-ref resource-adapter-name="${ejb.resource-adapter-name:activemq-ra.rar}"/>
- <bean-instance-pool-ref pool-name="mdb-strict-max-pool"/>
- </mdb>
- <pools>
- <bean-instance-pools>
- <!-- A sample strict max pool configuration -->
- <strict-max-pool name="slsb-strict-max-pool" max-pool-size="20" instance-acquisition-timeout="5" instance-acquisition-timeout-unit="MINUTES"/>
- <strict-max-pool name="mdb-strict-max-pool" max-pool-size="20" instance-acquisition-timeout="5" instance-acquisition-timeout-unit="MINUTES"/>
- </bean-instance-pools>
- </pools>
- <caches>
- <cache name="simple"/>
- <cache name="distributable" aliases="passivating clustered" passivation-store-ref="infinispan"/>
- </caches>
- <passivation-stores>
- <passivation-store name="infinispan" cache-container="ejb" max-size="10000"/>
- </passivation-stores>
- <async thread-pool-name="default"/>
- <timer-service thread-pool-name="default" default-data-store="default-file-store">
- <data-stores>
- <file-data-store name="default-file-store" path="timer-service-data" relative-to="jboss.server.data.dir"/>
- </data-stores>
- </timer-service>
- <remote connector-ref="http-remoting-connector" thread-pool-name="default"/>
- <thread-pools>
- <thread-pool name="default">
- <max-threads count="10"/>
- <keepalive-time time="100" unit="milliseconds"/>
- </thread-pool>
- </thread-pools>
- <iiop enable-by-default="false" use-qualified-name="false"/>
- <default-security-domain value="other"/>
- <default-missing-method-permissions-deny-access value="true"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:io:1.0">
- <worker name="default" io-threads="3"/>
- <buffer-pool name="default" buffer-size="16384" buffers-per-slice="128"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:infinispan:2.0">
- <cache-container name="web" default-cache="passivation" module="org.wildfly.clustering.web.infinispan">
- <local-cache name="passivation" batching="true">
- <file-store passivation="true" purge="false"/>
- </local-cache>
- <local-cache name="persistent" batching="true">
- <file-store passivation="false" purge="false"/>
- </local-cache>
- </cache-container>
- <cache-container name="ejb" aliases="sfsb" default-cache="passivation" module="org.wildfly.clustering.ejb.infinispan">
- <local-cache name="passivation" batching="true">
- <file-store passivation="true" purge="false"/>
- </local-cache>
- <local-cache name="persistent" batching="true">
- <file-store passivation="false" purge="false"/>
- </local-cache>
- </cache-container>
- <cache-container name="hibernate" default-cache="local-query" module="org.hibernate">
- <local-cache name="entity">
- <transaction mode="NON_XA"/>
- <eviction strategy="LRU" max-entries="10000"/>
- <expiration max-idle="100000"/>
- </local-cache>
- <local-cache name="local-query">
- <transaction mode="NONE"/>
- <eviction strategy="LRU" max-entries="10000"/>
- <expiration max-idle="100000"/>
- </local-cache>
- <local-cache name="timestamps">
- <transaction mode="NONE"/>
- <eviction strategy="NONE"/>
- </local-cache>
- </cache-container>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:jacorb:1.3">
- <orb socket-binding="jacorb" ssl-socket-binding="jacorb-ssl">
- <initializers transactions="spec" security="identity"/>
- </orb>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:jaxrs:1.0"/>
- <subsystem xmlns="urn:jboss:domain:jca:2.0">
- <archive-validation enabled="true" fail-on-error="true" fail-on-warn="false"/>
- <bean-validation enabled="true"/>
- <default-workmanager>
- <short-running-threads>
- <core-threads count="50"/>
- <queue-length count="50"/>
- <max-threads count="50"/>
- <keepalive-time time="10" unit="seconds"/>
- </short-running-threads>
- <long-running-threads>
- <core-threads count="50"/>
- <queue-length count="50"/>
- <max-threads count="50"/>
- <keepalive-time time="10" unit="seconds"/>
- </long-running-threads>
- </default-workmanager>
- <cached-connection-manager/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:jdr:1.0"/>
- <subsystem xmlns="urn:jboss:domain:jmx:1.3">
- <expose-resolved-model/>
- <expose-expression-model/>
- <remoting-connector/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:jpa:1.1">
- <jpa default-datasource="" default-extended-persistence-inheritance="DEEP"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:jsf:1.0"/>
- <subsystem xmlns="urn:jboss:domain:jsr77:1.0"/>
- <subsystem xmlns="urn:jboss:domain:mail:2.0">
- <mail-session name="default" jndi-name="java:jboss/mail/Default">
- <smtp-server outbound-socket-binding-ref="mail-smtp"/>
- </mail-session>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:messaging:2.0">
- <activemq-server>
- <persistence-enabled>true</persistence-enabled>
- <journal-file-size>102400</journal-file-size>
- <journal-min-files>2</journal-min-files>
- <connectors>
- <http-connector name="http-connector" socket-binding="http">
- <param key="http-upgrade-endpoint" value="http-acceptor"/>
- </http-connector>
- <http-connector name="http-connector-throughput" socket-binding="http">
- <param key="http-upgrade-endpoint" value="http-acceptor-throughput"/>
- <param key="batch-delay" value="50"/>
- </http-connector>
- <in-vm-connector name="in-vm" server-id="0"/>
- </connectors>
- <acceptors>
- <http-acceptor name="http-acceptor" http-listener="default"/>
- <http-acceptor name="http-acceptor-throughput" http-listener="default">
- <param key="batch-delay" value="50"/>
- <param key="direct-deliver" value="false"/>
- </http-acceptor>
- <in-vm-acceptor name="in-vm" server-id="0"/>
- </acceptors>
- <security-settings>
- <security-setting match="#">
- <permission type="send" roles="guest"/>
- <permission type="consume" roles="guest"/>
- <permission type="createNonDurableQueue" roles="guest"/>
- <permission type="deleteNonDurableQueue" roles="guest"/>
- </security-setting>
- </security-settings>
- <address-settings>
- <!--default for catch all-->
- <address-setting match="#">
- <dead-letter-address>jms.queue.DLQ</dead-letter-address>
- <expiry-address>jms.queue.ExpiryQueue</expiry-address>
- <redelivery-delay>0</redelivery-delay>
- <max-size-bytes>10485760</max-size-bytes>
- <address-full-policy>PAGE</address-full-policy>
- <page-size-bytes>2097152</page-size-bytes>
- <message-counter-history-day-limit>10</message-counter-history-day-limit>
- </address-setting>
- </address-settings>
- <jms-connection-factories>
- <connection-factory name="InVmConnectionFactory">
- <connectors>
- <connector-ref connector-name="in-vm"/>
- </connectors>
- <entries>
- <entry name="java:/ConnectionFactory"/>
- </entries>
- </connection-factory>
- <connection-factory name="RemoteConnectionFactory">
- <connectors>
- <connector-ref connector-name="http-connector"/>
- </connectors>
- <entries>
- <entry name="java:jboss/exported/jms/RemoteConnectionFactory"/>
- </entries>
- </connection-factory>
- <pooled-connection-factory name="activemq-ra">
- <transaction mode="xa"/>
- <connectors>
- <connector-ref connector-name="in-vm"/>
- </connectors>
- <entries>
- <entry name="java:/JmsXA"/>
- <!-- Global JNDI entry used to provide a default JMS Connection factory to EE application -->
- <entry name="java:jboss/DefaultJMSConnectionFactory"/>
- </entries>
- </pooled-connection-factory>
- </jms-connection-factories>
- <jms-destinations>
- <jms-queue name="testQueue">
- <entry name="queue/test"/>
- <entry name="java:jboss/exported/jms/queues/testQueue"/>
- </jms-queue>
- </jms-destinations>
- </activemq-server>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:naming:2.0">
- <remote-naming/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:pojo:1.0"/>
- <subsystem xmlns="urn:jboss:domain:remoting:2.0">
- <endpoint worker="default"/>
- <http-connector name="http-remoting-connector" connector-ref="default" security-realm="ApplicationRealm"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:resource-adapters:2.0"/>
- <subsystem xmlns="urn:jboss:domain:sar:1.0"/>
- <subsystem xmlns="urn:jboss:domain:security:1.2">
- <security-domains>
- <security-domain name="other" cache-type="default">
- <authentication>
- <login-module code="Remoting" flag="optional">
- <module-option name="password-stacking" value="useFirstPass"/>
- </login-module>
- <login-module code="RealmDirect" flag="required">
- <module-option name="password-stacking" value="useFirstPass"/>
- </login-module>
- </authentication>
- </security-domain>
- <security-domain name="jboss-web-policy" cache-type="default">
- <authorization>
- <policy-module code="Delegating" flag="required"/>
- </authorization>
- </security-domain>
- <security-domain name="jboss-ejb-policy" cache-type="default">
- <authorization>
- <policy-module code="Delegating" flag="required"/>
- </authorization>
- </security-domain>
- </security-domains>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:threads:1.1"/>
- <subsystem xmlns="urn:jboss:domain:transactions:2.0">
- <core-environment>
- <process-id>
- <uuid/>
- </process-id>
- </core-environment>
- <recovery-environment socket-binding="txn-recovery-environment" status-socket-binding="txn-status-manager"/>
- <coordinator-environment default-timeout="300"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:undertow:1.0">
- <buffer-caches>
- <buffer-cache name="default" buffer-size="1024" buffers-per-region="1024" max-regions="10"/>
- </buffer-caches>
- <server name="default-server">
- <http-listener name="default" socket-binding="http"/>
- <host name="default-host" alias="localhost">
- <location name="/" handler="welcome-content"/>
- <filter-ref name="server-header"/>
- <filter-ref name="x-powered-by-header"/>
- </host>
- </server>
- <servlet-container name="default" default-buffer-cache="default" stack-trace-on-error="local-only">
- <jsp-config/>
- </servlet-container>
- <handlers>
- <file name="welcome-content" path="${jboss.home.dir}/welcome-content" directory-listing="true"/>
- </handlers>
- <filters>
- <response-header name="server-header" header-name="Server" header-value="Wildfly 8"/>
- <response-header name="x-powered-by-header" header-name="X-Powered-By" header-value="Undertow 1"/>
- </filters>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:webservices:1.2">
- <modify-wsdl-address>true</modify-wsdl-address>
- <wsdl-host>${jboss.bind.address:127.0.0.1}</wsdl-host>
- <endpoint-config name="Standard-Endpoint-Config"/>
- <endpoint-config name="Recording-Endpoint-Config">
- <pre-handler-chain name="recording-handlers" protocol-bindings="##SOAP11_HTTP ##SOAP11_HTTP_MTOM ##SOAP12_HTTP ##SOAP12_HTTP_MTOM">
- <handler name="RecordingHandler" class="org.jboss.ws.common.invocation.RecordingServerHandler"/>
- </pre-handler-chain>
- </endpoint-config>
- <client-config name="Standard-Client-Config"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:weld:2.0"/>
- </profile>
- <interfaces>
- <interface name="management">
- <inet-address value="${jboss.bind.address.management:127.0.0.1}"/>
- </interface>
- <interface name="public">
- <inet-address value="${jboss.bind.address:127.0.0.1}"/>
- </interface>
- <!-- TODO - only show this if the jacorb subsystem is added -->
- <interface name="unsecure">
- <!--
- ~ Used for IIOP sockets in the standard configuration.
- ~ To secure JacORB you need to setup SSL
- -->
- <inet-address value="${jboss.bind.address.unsecure:127.0.0.1}"/>
- </interface>
- </interfaces>
- <socket-binding-group name="standard-sockets" default-interface="public" port-offset="${jboss.socket.binding.port-offset:0}">
- <socket-binding name="management-http" interface="management" port="${jboss.management.http.port:9990}"/>
- <socket-binding name="management-https" interface="management" port="${jboss.management.https.port:9993}"/>
- <socket-binding name="ajp" port="${jboss.ajp.port:8009}"/>
- <socket-binding name="http" port="${jboss.http.port:8080}"/>
- <socket-binding name="https" port="${jboss.https.port:8443}"/>
- <socket-binding name="jacorb" interface="unsecure" port="3528"/>
- <socket-binding name="jacorb-ssl" interface="unsecure" port="3529"/>
- <socket-binding name="messaging-group" port="0" multicast-address="${jboss.messaging.group.address:231.7.7.7}" multicast-port="${jboss.messaging.group.port:9876}"/>
- <socket-binding name="txn-recovery-environment" port="4712"/>
- <socket-binding name="txn-status-manager" port="4713"/>
- <outbound-socket-binding name="mail-smtp">
- <remote-destination host="localhost" port="25"/>
- </outbound-socket-binding>
- </socket-binding-group>
-</server>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/mdb-bmt/src/main/java/org/apache/activemq/javaee/example/MDB_BMTClientExample.java
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-bmt/src/main/java/org/apache/activemq/javaee/example/MDB_BMTClientExample.java b/examples/javaee/mdb-bmt/src/main/java/org/apache/activemq/javaee/example/MDB_BMTClientExample.java
deleted file mode 100644
index 926b2fd..0000000
--- a/examples/javaee/mdb-bmt/src/main/java/org/apache/activemq/javaee/example/MDB_BMTClientExample.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.activemq.javaee.example;
-
-import javax.jms.Connection;
-import javax.jms.ConnectionFactory;
-import javax.jms.MessageProducer;
-import javax.jms.Queue;
-import javax.jms.Session;
-import javax.jms.TextMessage;
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import java.util.Properties;
-
-/**
- * @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a>
- */
-public class MDB_BMTClientExample
-{
- public static void main(final String[] args) throws Exception
- {
- Connection connection = null;
- InitialContext initialContext = null;
- try
- {
- final Properties env = new Properties();
-
- env.put(Context.INITIAL_CONTEXT_FACTORY, "org.jboss.naming.remote.client.InitialContextFactory");
-
- env.put(Context.PROVIDER_URL, "http-remoting://localhost:8080");
-
- initialContext = new InitialContext(env);
-
- // Step 2. Perfom a lookup on the queue
- Queue queue = (Queue)initialContext.lookup("jms/queues/testQueue");
-
- // Step 3. Perform a lookup on the Connection Factory
- ConnectionFactory cf = (ConnectionFactory)initialContext.lookup("/jms/RemoteConnectionFactory");
-
- // Step 4.Create a JMS Connection
- connection = cf.createConnection("guest", "password");
-
- // Step 5. Create a JMS Session
- Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
-
- // Step 6. Create a JMS Message Producer
- MessageProducer producer = session.createProducer(queue);
-
- // Step 7. Create a Text Message
- TextMessage message = session.createTextMessage("This is a text message");
-
- System.out.println("Sent message: " + message.getText());
-
- // Step 8. Send the Message
- producer.send(message);
-
- // Step 9, 10 and 11 in MDB_BMTExample
- }
- finally
- {
- // Step 12. Be sure to close our JMS resources!
- if (initialContext != null)
- {
- initialContext.close();
- }
- if (connection != null)
- {
- connection.close();
- }
- }
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/mdb-bmt/src/main/java/org/apache/activemq/javaee/example/server/MDB_BMTExample.java
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-bmt/src/main/java/org/apache/activemq/javaee/example/server/MDB_BMTExample.java b/examples/javaee/mdb-bmt/src/main/java/org/apache/activemq/javaee/example/server/MDB_BMTExample.java
deleted file mode 100644
index 3709354..0000000
--- a/examples/javaee/mdb-bmt/src/main/java/org/apache/activemq/javaee/example/server/MDB_BMTExample.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.activemq.javaee.example.server;
-
-import javax.annotation.Resource;
-import javax.ejb.ActivationConfigProperty;
-import javax.ejb.MessageDriven;
-import javax.ejb.MessageDrivenContext;
-import javax.ejb.TransactionManagement;
-import javax.ejb.TransactionManagementType;
-import javax.jms.Message;
-import javax.jms.MessageListener;
-import javax.jms.TextMessage;
-import javax.transaction.UserTransaction;
-
-/**
- * @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a>
- */
-@MessageDriven(name = "MDB_BMTExample",
- activationConfig =
- {
- @ActivationConfigProperty(propertyName = "destinationType", propertyValue = "javax.jms.Queue"),
- @ActivationConfigProperty(propertyName = "destination", propertyValue = "queue/testQueue"),
- @ActivationConfigProperty(propertyName = "acknowledgeMode", propertyValue = "Dups-ok-acknowledge")
- })
-@TransactionManagement(value = TransactionManagementType.BEAN)
-public class MDB_BMTExample implements MessageListener
-{
- @Resource
- MessageDrivenContext ctx;
-
- public void onMessage(final Message message)
- {
- try
- {
- // Step 9. We know the client is sending a text message so we cast
- TextMessage textMessage = (TextMessage)message;
-
- // Step 10. get the text from the message.
- String text = textMessage.getText();
-
- System.out.println("message " + text + " received");
-
- // Step 11. let's look at the user transaction to make sure there isn't one.
- UserTransaction tx = ctx.getUserTransaction();
-
- if (tx != null)
- {
- tx.begin();
- System.out.println("we're in the middle of a transaction: " + tx);
- tx.commit();
- }
- else
- {
- System.out.println("something is wrong, I wasn't expecting a transaction");
- }
- }
- catch (Exception e)
- {
- e.printStackTrace();
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/mdb-bmt/src/test/java/org/apache/activemq/javaee/example/server/ExampleRunnerTest.java
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-bmt/src/test/java/org/apache/activemq/javaee/example/server/ExampleRunnerTest.java b/examples/javaee/mdb-bmt/src/test/java/org/apache/activemq/javaee/example/server/ExampleRunnerTest.java
deleted file mode 100644
index ae1855a..0000000
--- a/examples/javaee/mdb-bmt/src/test/java/org/apache/activemq/javaee/example/server/ExampleRunnerTest.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.activemq.javaee.example.server;
-
-import org.apache.activemq.javaee.example.MDB_BMTClientExample;
-import org.jboss.arquillian.container.test.api.Deployment;
-import org.jboss.arquillian.container.test.api.RunAsClient;
-import org.jboss.arquillian.junit.Arquillian;
-import org.jboss.shrinkwrap.api.Archive;
-import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.spec.JavaArchive;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-/**
- * @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a>
- * 5/21/12
- */
-@RunAsClient
-@RunWith(Arquillian.class)
-public class ExampleRunnerTest
-{
- @Deployment
- public static Archive getDeployment()
- {
-
- final JavaArchive ejbJar = ShrinkWrap.create(JavaArchive.class, "mdb.jar");
- ejbJar.addClass(MDB_BMTExample.class);
- System.out.println(ejbJar.toString(true));
- return ejbJar;
- }
-
- @Test
- public void runExample() throws Exception
- {
- MDB_BMTClientExample.main(null);
- //give the example time to run
- Thread.sleep(1000);
- }
-}
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/mdb-bmt/src/test/resources/arquillian.xml
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-bmt/src/test/resources/arquillian.xml b/examples/javaee/mdb-bmt/src/test/resources/arquillian.xml
deleted file mode 100644
index 9090137..0000000
--- a/examples/javaee/mdb-bmt/src/test/resources/arquillian.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<arquillian xmlns="http://jboss.org/schema/arquillian"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://jboss.org/schema/arquillian http://jboss.org/schema/arquillian/arquillian_1_0.xsd">
-
- <!-- Uncomment to have test archives exported to the file system for inspection.
-This feature can also be controlled using the system property arquillian.deploymentExportPath -->
- <!--
-<engine>
-<property name="deploymentExportPath">target</property>
-</engine>
--->
-
- <defaultProtocol type="Servlet 3.0" />
-
- <container qualifier="jboss" default="true">
- <configuration>
- <property name="jbossHome">${basedir}/target/jbossas-node0</property>
- <property name="serverConfig">standalone-example.xml</property>
- <property name="allowConnectingToRunningServer">true</property>
- <property name="managementAddress">${node0:127.0.0.1}</property>
- </configuration>
- </container>
-
- <!-- logThreshold proposed -->
- <!--
-<container qualifier="jbossas-managed">
-<configuration>
-<property name="logThreshold">ERROR</property>
-</configuration>
-</container>
--->
-
-</arquillian>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/mdb-cmt-setrollbackonly-with-dlq/pom.xml
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-cmt-setrollbackonly-with-dlq/pom.xml b/examples/javaee/mdb-cmt-setrollbackonly-with-dlq/pom.xml
deleted file mode 100644
index a884e5e..0000000
--- a/examples/javaee/mdb-cmt-setrollbackonly-with-dlq/pom.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.activemq.example.javaee</groupId>
- <artifactId>javaee-examples</artifactId>
- <version>6.0.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>activemq-javaee-mdb-cmt-setrollbackonly-with-dlq-example</artifactId>
- <packaging>jar</packaging>
- <name>ActiveMQ6 Java EE MDB CMT set rollback only with DLQ Example</name>
-</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/mdb-cmt-setrollbackonly-with-dlq/readme.html
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-cmt-setrollbackonly-with-dlq/readme.html b/examples/javaee/mdb-cmt-setrollbackonly-with-dlq/readme.html
deleted file mode 100644
index 0853c0c..0000000
--- a/examples/javaee/mdb-cmt-setrollbackonly-with-dlq/readme.html
+++ /dev/null
@@ -1,127 +0,0 @@
-<html>
- <head>
- <title>ActiveMQ Java EE MDB SetRollbackOnly Example</title>
- <link rel="stylesheet" type="text/css" href="../../common/common.css" />
- <link rel="stylesheet" type="text/css" href="../../common/prettify.css" />
- <script type="text/javascript" src="../../common/prettify.js"></script>
- </head>
- <body onload="prettyPrint()">
- <h1>Java EE MDB SetRollbackOnly with DLQ Example</h1>
-
- <p>This example shows you how to send a message to an MDB and then roll back the transaction forcing delivery of the message to a DLQ.</p>
- <p>The example will send deploy a simple MDB and demonstrate sending a message, MDB consuming it, and then the
- standalone client consuming it from the DLQ and printing out the special DLQ properties "_HQ_ORIG_ADDRESS"
- and "_HQ_ORIG_QUEUE".</p>
-
- <p>The example leverages the JBoss Arquillian framework to run a WildFly instance and deploy the MDB.</p>
-
- <h2>Example step-by-step</h2>
-
- <p><i>download WildFly 8.0.0.Final from <a href="http://wildfly.org/downloads/">here</a> and install.</i></p>
- <p><i>set the JBOSS_HOME property to point to the WildFly install directory</i></p>
- <p><i>type <code>mvn verify</code> from the example directory to run</i></p>
-
- <ol>
- <li>First we need to get an initial context so we can look-up the JMS connection factory and destination objects from JNDI. This initial context will get it's properties from the <code>jndi.properties</code> file in the directory <code>config</code></li>
- <pre class="prettyprint">
- final Properties env = new Properties();
-
- env.put(Context.INITIAL_CONTEXT_FACTORY, "org.jboss.naming.remote.client.InitialContextFactory");
-
- env.put(Context.PROVIDER_URL, "http-remoting://localhost:8080");
-
- initialContext = new InitialContext(env);
- </pre>
-
- <li>We look up the JMS queue object from JNDI</li>
- <pre class="prettyprint">
- Queue queue = (Queue)initialContext.lookup("jms/queues/testQueue");
- </pre>
-
- <li>We look up the JMS connection factory object from JNDI</li>
- <pre class="prettyprint">
- ConnectionFactory cf = (ConnectionFactory)initialContext.lookup("/jms/RemoteConnectionFactory");
- </pre>
-
- <li>We create a JMS connection</li>
- <pre class="prettyprint">
- connection = cf.createConnection("guest", "password");
- </pre>
-
- <li>We create a JMS session. The session is created as non transacted and will auto acknowledge messages.</li>
- <pre class="prettyprint">
- Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
- </pre>
-
- <li>We create a JMS message producer on the session. This will be used to send the messages.</li>
- <pre class="prettyprint">
- MessageProducer messageProducer = session.createProducer(queue);
- </pre>
-
- <li>We create a JMS text messages that we are going to send.</li>
- <pre class="prettyprint">
- TextMessage message = session.createTextMessage("This is a text message");
- </pre>
-
- <li>We send messages to the queue</li>
- <pre class="prettyprint">
- producer.send(message);
- </pre>
-
- <li>The MDB receives the message<br />
- We know the message is a TextMessage so we cast to it.</li>
- <pre class="prettyprint">
- TextMessage tm = (TextMessage)message;
- </pre>
-
- <li>The MDB gets the text and prints it</li>
- <pre class="prettyprint">
- String text = textMessage.getText();
- System.out.println("message " + text + " received");
- </pre>
-
- <li>The MDB rolls back the container-managed transaction to send the message to the DLQ</li>
- <pre class="prettyprint">
- ctx.setRollbackOnly();
- </pre>
-
- <li>Perform a lookup on the DLQ</li>
- <pre class="prettyprint">
- destination = (Destination) initialContext.lookup("jms/queues/dlq");
- </pre>
-
- <li>Create the consumer and start the connection</li>
- <pre class="prettyprint">
- MessageConsumer consumer = session.createConsumer(destination);
- connection.start();
- </pre>
-
- <li>Receive the message.</li>
- <pre class="prettyprint">
- message = (TextMessage) consumer.receive(3000);
- </pre>
-
- <li>Print the special DLQ properties</li>
- <pre class="prettyprint">
- System.out.println("Original address: " + message.getStringProperty("_HQ_ORIG_ADDRESS"));
- System.out.println("Original queue: " + message.getStringProperty("_HQ_ORIG_QUEUE"));
- </pre>
-
- <li>And finally, <b>always</b> remember to close your JMS connections and resources after use, in a <code>finally</code> block. Closing a JMS connection will automatically close all of its sessions, consumers, producer and browser objects</li>
-
- <pre class="prettyprint">
- finally
- {
- if (initialContext != null)
- {
- initialContext.close();
- }
- if (connection != null)
- {
- connection.close();
- }
- }
- </pre>
- </ol>
- </body>
-</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/mdb-cmt-setrollbackonly-with-dlq/server/standalone/configuration/application-roles.properties
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-cmt-setrollbackonly-with-dlq/server/standalone/configuration/application-roles.properties b/examples/javaee/mdb-cmt-setrollbackonly-with-dlq/server/standalone/configuration/application-roles.properties
deleted file mode 100644
index 0ade8fb..0000000
--- a/examples/javaee/mdb-cmt-setrollbackonly-with-dlq/server/standalone/configuration/application-roles.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# Properties declaration of users roles for the realm 'ApplicationRealm'.
-#
-# This includes the following protocols: remote ejb, remote jndi, web, remote jms
-#
-# Users can be added to this properties file at any time, updates after the server has started
-# will be automatically detected.
-#
-# The format of this file is as follows: -
-# username=role1,role2,role3
-#
-# A utility script is provided which can be executed from the bin folder to add the users: -
-# - Linux
-# bin/add-user.sh
-#
-# - Windows
-# bin\add-user.bat
-#
-# The following illustrates how an admin user could be defined.
-#
-#admin=PowerUser,BillingAdmin,
-guest=guest
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/mdb-cmt-setrollbackonly-with-dlq/server/standalone/configuration/application-users.properties
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-cmt-setrollbackonly-with-dlq/server/standalone/configuration/application-users.properties b/examples/javaee/mdb-cmt-setrollbackonly-with-dlq/server/standalone/configuration/application-users.properties
deleted file mode 100644
index c52e923..0000000
--- a/examples/javaee/mdb-cmt-setrollbackonly-with-dlq/server/standalone/configuration/application-users.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# Properties declaration of users for the realm 'ApplicationRealm' which is the default realm
-# for application services on a new AS 7.1 installation.
-#
-# This includes the following protocols: remote ejb, remote jndi, web, remote jms
-#
-# Users can be added to this properties file at any time, updates after the server has started
-# will be automatically detected.
-#
-# The format of this realm is as follows: -
-# username=HEX( MD5( username ':' realm ':' password))
-#
-# A utility script is provided which can be executed from the bin folder to add the users: -
-# - Linux
-# bin/add-user.sh
-#
-# - Windows
-# bin\add-user.bat
-#
-# The following illustrates how an admin user could be defined, this
-# is for illustration only and does not correspond to a usable password.
-#
-#admin=2a0923285184943425d1f53ddd58ec7a
-guest=3437456520927d113b17d471d630e0d6
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/mdb-cmt-setrollbackonly-with-dlq/server/standalone/configuration/logging.properties
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-cmt-setrollbackonly-with-dlq/server/standalone/configuration/logging.properties b/examples/javaee/mdb-cmt-setrollbackonly-with-dlq/server/standalone/configuration/logging.properties
deleted file mode 100644
index 3fa31b0..0000000
--- a/examples/javaee/mdb-cmt-setrollbackonly-with-dlq/server/standalone/configuration/logging.properties
+++ /dev/null
@@ -1,47 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# Additional logger names to configure (root logger is always configured)
-loggers=org.jboss.as.config
-
-# Dump system environment at boot by default
-logger.org.jboss.as.config.level=DEBUG
-
-# Root logger level
-logger.level=${jboss.boot.server.log.level:INFO}
-# Root logger handlers
-logger.handlers=FILE,CONSOLE
-
-# Console handler configuration
-handler.CONSOLE=org.jboss.logmanager.handlers.ConsoleHandler
-handler.CONSOLE.properties=autoFlush
-handler.CONSOLE.level=${jboss.boot.server.log.console.level:INFO}
-handler.CONSOLE.autoFlush=true
-handler.CONSOLE.formatter=PATTERN
-
-# File handler configuration
-handler.FILE=org.jboss.logmanager.handlers.FileHandler
-handler.FILE.level=DEBUG
-handler.FILE.properties=autoFlush,fileName
-handler.FILE.autoFlush=true
-handler.FILE.fileName=${org.jboss.boot.log.file:boot.log}
-handler.FILE.formatter=PATTERN
-
-# Formatter pattern configuration
-formatter.PATTERN=org.jboss.logmanager.formatters.PatternFormatter
-formatter.PATTERN.properties=pattern
-formatter.PATTERN.pattern=%d{HH:mm:ss,SSS} %-5p [%c] %s%E%n
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/mdb-cmt-setrollbackonly-with-dlq/server/standalone/configuration/mgmt-users.properties
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-cmt-setrollbackonly-with-dlq/server/standalone/configuration/mgmt-users.properties b/examples/javaee/mdb-cmt-setrollbackonly-with-dlq/server/standalone/configuration/mgmt-users.properties
deleted file mode 100644
index 349b004..0000000
--- a/examples/javaee/mdb-cmt-setrollbackonly-with-dlq/server/standalone/configuration/mgmt-users.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# Properties declaration of users for the realm 'ManagementRealm' which is the default realm
-# for new AS 7.1 installations. Further authentication mechanism can be configured
-# as part of the <management /> in standalone.xml.
-#
-# Users can be added to this properties file at any time, updates after the server has started
-# will be automatically detected.
-#
-# By default the properties realm expects the entries to be in the format: -
-# username=HEX( MD5( username ':' realm ':' password))
-#
-# A utility script is provided which can be executed from the bin folder to add the users: -
-# - Linux
-# bin/add-user.sh
-#
-# - Windows
-# bin\add-user.bat
-
-# The following illustrates how an admin user could be defined, this
-# is for illustration only and does not correspond to a usable password.
-#
-#admin=2a0923285184943425d1f53ddd58ec7a
-admin=9d71b431e53d99563aa0dfca628c970b
-andy=dfb16391f1be1c454b5bce9822bd9df3
[07/37] activemq-6 git commit: ACTIVEMQ6-41 Drop Java EE examples
Posted by jb...@apache.org.
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/mdb-remote-failover-static/server/standalone/configuration/standalone-backup.xml
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-remote-failover-static/server/standalone/configuration/standalone-backup.xml b/examples/javaee/mdb-remote-failover-static/server/standalone/configuration/standalone-backup.xml
deleted file mode 100644
index feee7da..0000000
--- a/examples/javaee/mdb-remote-failover-static/server/standalone/configuration/standalone-backup.xml
+++ /dev/null
@@ -1,511 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-
-<server xmlns="urn:jboss:domain:2.0">
- <extensions>
- <extension module="org.jboss.as.clustering.infinispan"/>
- <extension module="org.jboss.as.connector"/>
- <extension module="org.jboss.as.deployment-scanner"/>
- <extension module="org.jboss.as.ee"/>
- <extension module="org.jboss.as.ejb3"/>
- <extension module="org.jboss.as.jacorb"/>
- <extension module="org.jboss.as.jaxrs"/>
- <extension module="org.jboss.as.jdr"/>
- <extension module="org.jboss.as.jmx"/>
- <extension module="org.jboss.as.jpa"/>
- <extension module="org.jboss.as.jsf"/>
- <extension module="org.jboss.as.jsr77"/>
- <extension module="org.jboss.as.logging"/>
- <extension module="org.jboss.as.mail"/>
- <extension module="org.jboss.as.messaging"/>
- <extension module="org.jboss.as.naming"/>
- <extension module="org.jboss.as.pojo"/>
- <extension module="org.jboss.as.remoting"/>
- <extension module="org.jboss.as.sar"/>
- <extension module="org.jboss.as.security"/>
- <extension module="org.jboss.as.threads"/>
- <extension module="org.jboss.as.transactions"/>
- <extension module="org.jboss.as.webservices"/>
- <extension module="org.jboss.as.weld"/>
- <extension module="org.wildfly.extension.batch"/>
- <extension module="org.wildfly.extension.io"/>
- <extension module="org.wildfly.extension.undertow"/>
- </extensions>
- <management>
- <security-realms>
- <security-realm name="ManagementRealm">
- <authentication>
- <local default-user="$local"/>
- <properties path="mgmt-users.properties" relative-to="jboss.server.config.dir"/>
- </authentication>
- <authorization map-groups-to-roles="false">
- <properties path="mgmt-groups.properties" relative-to="jboss.server.config.dir"/>
- </authorization>
- </security-realm>
- <security-realm name="ApplicationRealm">
- <authentication>
- <local default-user="$local" allowed-users="*"/>
- <properties path="application-users.properties" relative-to="jboss.server.config.dir"/>
- </authentication>
- <authorization>
- <properties path="application-roles.properties" relative-to="jboss.server.config.dir"/>
- </authorization>
- </security-realm>
- </security-realms>
- <audit-log>
- <formatters>
- <json-formatter name="json-formatter"/>
- </formatters>
- <handlers>
- <file-handler name="file" formatter="json-formatter" relative-to="jboss.server.data.dir" path="audit-log.log"/>
- </handlers>
- <logger log-boot="true" log-read-only="false" enabled="false">
- <handlers>
- <handler name="file"/>
- </handlers>
- </logger>
- </audit-log>
- <management-interfaces>
- <http-interface security-realm="ManagementRealm" http-upgrade-enabled="true">
- <socket-binding http="management-http"/>
- </http-interface>
- </management-interfaces>
- <access-control provider="simple">
- <role-mapping>
- <role name="SuperUser">
- <include>
- <user name="$local"/>
- </include>
- </role>
- </role-mapping>
- </access-control>
- </management>
- <profile>
- <subsystem xmlns="urn:jboss:domain:logging:2.0">
- <console-handler name="CONSOLE">
- <level name="INFO"/>
- <formatter>
- <named-formatter name="COLOR-PATTERN"/>
- </formatter>
- </console-handler>
- <periodic-rotating-file-handler name="FILE" autoflush="true">
- <formatter>
- <named-formatter name="PATTERN"/>
- </formatter>
- <file relative-to="jboss.server.log.dir" path="server.log"/>
- <suffix value=".yyyy-MM-dd"/>
- <append value="true"/>
- </periodic-rotating-file-handler>
- <logger category="com.arjuna">
- <level name="WARN"/>
- </logger>
- <logger category="org.apache.tomcat.util.modeler">
- <level name="WARN"/>
- </logger>
- <logger category="org.jboss.as.config">
- <level name="DEBUG"/>
- </logger>
- <logger category="sun.rmi">
- <level name="WARN"/>
- </logger>
- <logger category="jacorb">
- <level name="WARN"/>
- </logger>
- <logger category="jacorb.config">
- <level name="ERROR"/>
- </logger>
- <root-logger>
- <level name="INFO"/>
- <handlers>
- <handler name="CONSOLE"/>
- <handler name="FILE"/>
- </handlers>
- </root-logger>
- <formatter name="PATTERN">
- <pattern-formatter pattern="%d{yyyy-MM-dd HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/>
- </formatter>
- <formatter name="COLOR-PATTERN">
- <pattern-formatter pattern="%K{level}%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/>
- </formatter>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:batch:1.0">
- <job-repository>
- <in-memory/>
- </job-repository>
- <thread-pool>
- <max-threads count="10"/>
- <keepalive-time time="100" unit="milliseconds"/>
- </thread-pool>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:datasources:2.0">
- <datasources>
- <datasource jndi-name="java:jboss/datasources/ExampleDS" pool-name="ExampleDS" enabled="true" use-java-context="true">
- <connection-url>jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE</connection-url>
- <driver>h2</driver>
- <security>
- <user-name>sa</user-name>
- <password>sa</password>
- </security>
- </datasource>
- <drivers>
- <driver name="h2" module="com.h2database.h2">
- <xa-datasource-class>org.h2.jdbcx.JdbcDataSource</xa-datasource-class>
- </driver>
- </drivers>
- </datasources>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:deployment-scanner:2.0">
- <deployment-scanner path="deployments" relative-to="jboss.server.base.dir" scan-interval="5000" runtime-failure-causes-rollback="${jboss.deployment.scanner.rollback.on.failure:false}"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:ee:2.0">
- <spec-descriptor-property-replacement>false</spec-descriptor-property-replacement>
- <jboss-descriptor-property-replacement>true</jboss-descriptor-property-replacement>
- <annotation-property-replacement>false</annotation-property-replacement>
- <concurrent>
- <context-services>
- <context-service name="default" jndi-name="java:jboss/ee/concurrency/context/default" use-transaction-setup-provider="true"/>
- </context-services>
- <managed-executor-services>
- <managed-executor-service name="default" jndi-name="java:jboss/ee/concurrency/executor/default" context-service="default" hung-task-threshold="60000" core-threads="5" max-threads="25" keepalive-time="5000"/>
- </managed-executor-services>
- <managed-scheduled-executor-services>
- <managed-scheduled-executor-service name="default" jndi-name="java:jboss/ee/concurrency/scheduler/default" context-service="default" hung-task-threshold="60000" core-threads="2" keepalive-time="3000"/>
- </managed-scheduled-executor-services>
- <managed-thread-factories>
- <managed-thread-factory name="default" jndi-name="java:jboss/ee/concurrency/factory/default" context-service="default"/>
- </managed-thread-factories>
- </concurrent>
- <default-bindings context-service="java:jboss/ee/concurrency/context/default" datasource="java:jboss/datasources/ExampleDS" jms-connection-factory="java:jboss/DefaultJMSConnectionFactory" managed-executor-service="java:jboss/ee/concurrency/executor/default" managed-scheduled-executor-service="java:jboss/ee/concurrency/scheduler/default" managed-thread-factory="java:jboss/ee/concurrency/factory/default"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:ejb3:2.0">
- <session-bean>
- <stateful default-access-timeout="5000" cache-ref="simple" passivation-disabled-cache-ref="simple"/>
- <singleton default-access-timeout="5000"/>
- </session-bean>
- <mdb>
- <resource-adapter-ref resource-adapter-name="${ejb.resource-adapter-name:activemq-ra.rar}"/>
- <bean-instance-pool-ref pool-name="mdb-strict-max-pool"/>
- </mdb>
- <pools>
- <bean-instance-pools>
- <!-- A sample strict max pool configuration -->
- <strict-max-pool name="slsb-strict-max-pool" max-pool-size="20" instance-acquisition-timeout="5" instance-acquisition-timeout-unit="MINUTES"/>
- <strict-max-pool name="mdb-strict-max-pool" max-pool-size="20" instance-acquisition-timeout="5" instance-acquisition-timeout-unit="MINUTES"/>
- </bean-instance-pools>
- </pools>
- <caches>
- <cache name="simple"/>
- <cache name="distributable" aliases="passivating clustered" passivation-store-ref="infinispan"/>
- </caches>
- <passivation-stores>
- <passivation-store name="infinispan" cache-container="ejb" max-size="10000"/>
- </passivation-stores>
- <async thread-pool-name="default"/>
- <timer-service thread-pool-name="default" default-data-store="default-file-store">
- <data-stores>
- <file-data-store name="default-file-store" path="timer-service-data" relative-to="jboss.server.data.dir"/>
- </data-stores>
- </timer-service>
- <remote connector-ref="http-remoting-connector" thread-pool-name="default"/>
- <thread-pools>
- <thread-pool name="default">
- <max-threads count="10"/>
- <keepalive-time time="100" unit="milliseconds"/>
- </thread-pool>
- </thread-pools>
- <iiop enable-by-default="false" use-qualified-name="false"/>
- <default-security-domain value="other"/>
- <default-missing-method-permissions-deny-access value="true"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:io:1.0">
- <worker name="default" io-threads="3"/>
- <buffer-pool name="default" buffer-size="16384" buffers-per-slice="128"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:infinispan:2.0">
- <cache-container name="web" default-cache="passivation" module="org.wildfly.clustering.web.infinispan">
- <local-cache name="passivation" batching="true">
- <file-store passivation="true" purge="false"/>
- </local-cache>
- <local-cache name="persistent" batching="true">
- <file-store passivation="false" purge="false"/>
- </local-cache>
- </cache-container>
- <cache-container name="ejb" aliases="sfsb" default-cache="passivation" module="org.wildfly.clustering.ejb.infinispan">
- <local-cache name="passivation" batching="true">
- <file-store passivation="true" purge="false"/>
- </local-cache>
- <local-cache name="persistent" batching="true">
- <file-store passivation="false" purge="false"/>
- </local-cache>
- </cache-container>
- <cache-container name="hibernate" default-cache="local-query" module="org.hibernate">
- <local-cache name="entity">
- <transaction mode="NON_XA"/>
- <eviction strategy="LRU" max-entries="10000"/>
- <expiration max-idle="100000"/>
- </local-cache>
- <local-cache name="local-query">
- <transaction mode="NONE"/>
- <eviction strategy="LRU" max-entries="10000"/>
- <expiration max-idle="100000"/>
- </local-cache>
- <local-cache name="timestamps">
- <transaction mode="NONE"/>
- <eviction strategy="NONE"/>
- </local-cache>
- </cache-container>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:jacorb:1.3">
- <orb socket-binding="jacorb" ssl-socket-binding="jacorb-ssl">
- <initializers transactions="spec" security="identity"/>
- </orb>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:jaxrs:1.0"/>
- <subsystem xmlns="urn:jboss:domain:jca:2.0">
- <archive-validation enabled="true" fail-on-error="true" fail-on-warn="false"/>
- <bean-validation enabled="true"/>
- <default-workmanager>
- <short-running-threads>
- <core-threads count="50"/>
- <queue-length count="50"/>
- <max-threads count="50"/>
- <keepalive-time time="10" unit="seconds"/>
- </short-running-threads>
- <long-running-threads>
- <core-threads count="50"/>
- <queue-length count="50"/>
- <max-threads count="50"/>
- <keepalive-time time="10" unit="seconds"/>
- </long-running-threads>
- </default-workmanager>
- <cached-connection-manager/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:jdr:1.0"/>
- <subsystem xmlns="urn:jboss:domain:jmx:1.3">
- <expose-resolved-model/>
- <expose-expression-model/>
- <remoting-connector/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:jpa:1.1">
- <jpa default-datasource="" default-extended-persistence-inheritance="DEEP"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:jsf:1.0"/>
- <subsystem xmlns="urn:jboss:domain:jsr77:1.0"/>
- <subsystem xmlns="urn:jboss:domain:mail:2.0">
- <mail-session name="default" jndi-name="java:jboss/mail/Default">
- <smtp-server outbound-socket-binding-ref="mail-smtp"/>
- </mail-session>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:messaging:2.0">
- <activemq-server>
- <backup>true</backup>
- <shared-store>true</shared-store>
- <persistence-enabled>true</persistence-enabled>
- <journal-file-size>102400</journal-file-size>
- <journal-min-files>2</journal-min-files>
- <journal-directory path="../../../journal"/>
- <bindings-directory path="../../../bindings"/>
- <large-messages-directory path="../../../large-message"/>
- <paging-directory path="../../../paging"/>
- <connectors>
- <http-connector name="http-connector" socket-binding="http">
- <param key="http-upgrade-endpoint" value="http-acceptor"/>
- </http-connector>
- <http-connector name="http-connector-throughput" socket-binding="http">
- <param key="http-upgrade-endpoint" value="http-acceptor-throughput"/>
- <param key="batch-delay" value="50"/>
- </http-connector>
- <http-connector name="remote-http" socket-binding="remote-http">
- <param key="http-upgrade-endpoint" value="http-acceptor"/>
- </http-connector>
- <in-vm-connector name="in-vm" server-id="0"/>
- </connectors>
- <acceptors>
- <http-acceptor name="http-acceptor" http-listener="default"/>
- <http-acceptor name="http-acceptor-throughput" http-listener="default">
- <param key="batch-delay" value="50"/>
- <param key="direct-deliver" value="false"/>
- </http-acceptor>
- <in-vm-acceptor name="in-vm" server-id="0"/>
- </acceptors>
- <security-settings>
- <security-setting match="#">
- <permission type="send" roles="guest"/>
- <permission type="consume" roles="guest"/>
- <permission type="createNonDurableQueue" roles="guest"/>
- <permission type="deleteNonDurableQueue" roles="guest"/>
- </security-setting>
- </security-settings>
- <address-settings>
- <!--default for catch all-->
- <address-setting match="#">
- <dead-letter-address>jms.queue.DLQ</dead-letter-address>
- <expiry-address>jms.queue.ExpiryQueue</expiry-address>
- <redelivery-delay>0</redelivery-delay>
- <max-size-bytes>10485760</max-size-bytes>
- <address-full-policy>PAGE</address-full-policy>
- <page-size-bytes>2097152</page-size-bytes>
- <message-counter-history-day-limit>10</message-counter-history-day-limit>
- </address-setting>
- </address-settings>
- <cluster-connections>
- <cluster-connection name="my-cluster">
- <address>jms</address>
- <connector-ref>http-connector</connector-ref>
- <static-connectors>
- <connector-ref>remote-http</connector-ref>
- </static-connectors>
- </cluster-connection>
- </cluster-connections>
- <jms-connection-factories>
- <connection-factory name="InVmConnectionFactory">
- <connectors>
- <connector-ref connector-name="in-vm"/>
- </connectors>
- <entries>
- <entry name="java:/ConnectionFactory"/>
- </entries>
- </connection-factory>
- <connection-factory name="RemoteConnectionFactory">
- <connectors>
- <connector-ref connector-name="http-connector"/>
- </connectors>
- <entries>
- <entry name="java:jboss/exported/jms/RemoteConnectionFactory"/>
- </entries>
- </connection-factory>
- <pooled-connection-factory name="activemq-ra">
- <transaction mode="xa"/>
- <connectors>
- <connector-ref connector-name="in-vm"/>
- </connectors>
- <entries>
- <entry name="java:/JmsXA"/>
- <!-- Global JNDI entry used to provide a default JMS Connection factory to EE application -->
- <entry name="java:jboss/DefaultJMSConnectionFactory"/>
- </entries>
- </pooled-connection-factory>
- </jms-connection-factories>
- <jms-destinations>
- <jms-queue name="outQueue">
- <entry name="queue/outQueue"/>
- <entry name="java:jboss/exported/queues/outQueue"/>
- </jms-queue>
- <jms-queue name="inQueue">
- <entry name="queue/inQueue"/>
- <entry name="java:jboss/exported/queues/inQueue"/>
- </jms-queue>
- </jms-destinations>
- </activemq-server>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:naming:2.0">
- <remote-naming/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:pojo:1.0"/>
- <subsystem xmlns="urn:jboss:domain:remoting:2.0">
- <endpoint worker="default"/>
- <http-connector name="http-remoting-connector" connector-ref="default" security-realm="ApplicationRealm"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:resource-adapters:2.0"/>
- <subsystem xmlns="urn:jboss:domain:sar:1.0"/>
- <subsystem xmlns="urn:jboss:domain:security:1.2">
- <security-domains>
- <security-domain name="other" cache-type="default">
- <authentication>
- <login-module code="Remoting" flag="optional">
- <module-option name="password-stacking" value="useFirstPass"/>
- </login-module>
- <login-module code="RealmDirect" flag="required">
- <module-option name="password-stacking" value="useFirstPass"/>
- </login-module>
- </authentication>
- </security-domain>
- <security-domain name="jboss-web-policy" cache-type="default">
- <authorization>
- <policy-module code="Delegating" flag="required"/>
- </authorization>
- </security-domain>
- <security-domain name="jboss-ejb-policy" cache-type="default">
- <authorization>
- <policy-module code="Delegating" flag="required"/>
- </authorization>
- </security-domain>
- </security-domains>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:threads:1.1"/>
- <subsystem xmlns="urn:jboss:domain:transactions:2.0">
- <core-environment>
- <process-id>
- <uuid/>
- </process-id>
- </core-environment>
- <recovery-environment socket-binding="txn-recovery-environment" status-socket-binding="txn-status-manager"/>
- <coordinator-environment default-timeout="300"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:undertow:1.0">
- <buffer-caches>
- <buffer-cache name="default" buffer-size="1024" buffers-per-region="1024" max-regions="10"/>
- </buffer-caches>
- <server name="default-server">
- <http-listener name="default" socket-binding="http"/>
- <host name="default-host" alias="localhost">
- <location name="/" handler="welcome-content"/>
- <filter-ref name="server-header"/>
- <filter-ref name="x-powered-by-header"/>
- </host>
- </server>
- <servlet-container name="default" default-buffer-cache="default" stack-trace-on-error="local-only">
- <jsp-config/>
- </servlet-container>
- <handlers>
- <file name="welcome-content" path="${jboss.home.dir}/welcome-content" directory-listing="true"/>
- </handlers>
- <filters>
- <response-header name="server-header" header-name="Server" header-value="Wildfly 8"/>
- <response-header name="x-powered-by-header" header-name="X-Powered-By" header-value="Undertow 1"/>
- </filters>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:webservices:1.2">
- <modify-wsdl-address>true</modify-wsdl-address>
- <wsdl-host>${jboss.bind.address:127.0.0.1}</wsdl-host>
- <endpoint-config name="Standard-Endpoint-Config"/>
- <endpoint-config name="Recording-Endpoint-Config">
- <pre-handler-chain name="recording-handlers" protocol-bindings="##SOAP11_HTTP ##SOAP11_HTTP_MTOM ##SOAP12_HTTP ##SOAP12_HTTP_MTOM">
- <handler name="RecordingHandler" class="org.jboss.ws.common.invocation.RecordingServerHandler"/>
- </pre-handler-chain>
- </endpoint-config>
- <client-config name="Standard-Client-Config"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:weld:2.0"/>
- </profile>
- <interfaces>
- <interface name="management">
- <inet-address value="${jboss.bind.address.management:127.0.0.1}"/>
- </interface>
- <interface name="public">
- <inet-address value="${jboss.bind.address:127.0.0.1}"/>
- </interface>
- <!-- TODO - only show this if the jacorb subsystem is added -->
- <interface name="unsecure">
- <!--
- ~ Used for IIOP sockets in the standard configuration.
- ~ To secure JacORB you need to setup SSL
- -->
- <inet-address value="${jboss.bind.address.unsecure:127.0.0.1}"/>
- </interface>
- </interfaces>
- <socket-binding-group name="standard-sockets" default-interface="public" port-offset="${jboss.socket.binding.port-offset:0}">
- <socket-binding name="management-http" interface="management" port="${jboss.management.http.port:9990}"/>
- <socket-binding name="management-https" interface="management" port="${jboss.management.https.port:9993}"/>
- <socket-binding name="ajp" port="${jboss.ajp.port:8009}"/>
- <socket-binding name="http" port="${jboss.http.port:8080}"/>
- <socket-binding name="https" port="${jboss.https.port:8443}"/>
- <socket-binding name="jacorb" interface="unsecure" port="3528"/>
- <socket-binding name="jacorb-ssl" interface="unsecure" port="3529"/>
- <socket-binding name="remote-http" port="8180" fixed-port="true"/>
- <socket-binding name="txn-recovery-environment" port="4712"/>
- <socket-binding name="txn-status-manager" port="4713"/>
- <outbound-socket-binding name="mail-smtp">
- <remote-destination host="localhost" port="25"/>
- </outbound-socket-binding>
- </socket-binding-group>
-</server>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/mdb-remote-failover-static/server/standalone/configuration/standalone-example.xml
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-remote-failover-static/server/standalone/configuration/standalone-example.xml b/examples/javaee/mdb-remote-failover-static/server/standalone/configuration/standalone-example.xml
deleted file mode 100644
index 5a27ce6..0000000
--- a/examples/javaee/mdb-remote-failover-static/server/standalone/configuration/standalone-example.xml
+++ /dev/null
@@ -1,508 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-
-<server xmlns="urn:jboss:domain:2.0">
- <extensions>
- <extension module="org.jboss.as.clustering.infinispan"/>
- <extension module="org.jboss.as.connector"/>
- <extension module="org.jboss.as.deployment-scanner"/>
- <extension module="org.jboss.as.ee"/>
- <extension module="org.jboss.as.ejb3"/>
- <extension module="org.jboss.as.jacorb"/>
- <extension module="org.jboss.as.jaxrs"/>
- <extension module="org.jboss.as.jdr"/>
- <extension module="org.jboss.as.jmx"/>
- <extension module="org.jboss.as.jpa"/>
- <extension module="org.jboss.as.jsf"/>
- <extension module="org.jboss.as.jsr77"/>
- <extension module="org.jboss.as.logging"/>
- <extension module="org.jboss.as.mail"/>
- <extension module="org.jboss.as.messaging"/>
- <extension module="org.jboss.as.naming"/>
- <extension module="org.jboss.as.pojo"/>
- <extension module="org.jboss.as.remoting"/>
- <extension module="org.jboss.as.sar"/>
- <extension module="org.jboss.as.security"/>
- <extension module="org.jboss.as.threads"/>
- <extension module="org.jboss.as.transactions"/>
- <extension module="org.jboss.as.webservices"/>
- <extension module="org.jboss.as.weld"/>
- <extension module="org.wildfly.extension.batch"/>
- <extension module="org.wildfly.extension.io"/>
- <extension module="org.wildfly.extension.undertow"/>
- </extensions>
- <management>
- <security-realms>
- <security-realm name="ManagementRealm">
- <authentication>
- <local default-user="$local"/>
- <properties path="mgmt-users.properties" relative-to="jboss.server.config.dir"/>
- </authentication>
- <authorization map-groups-to-roles="false">
- <properties path="mgmt-groups.properties" relative-to="jboss.server.config.dir"/>
- </authorization>
- </security-realm>
- <security-realm name="ApplicationRealm">
- <authentication>
- <local default-user="$local" allowed-users="*"/>
- <properties path="application-users.properties" relative-to="jboss.server.config.dir"/>
- </authentication>
- <authorization>
- <properties path="application-roles.properties" relative-to="jboss.server.config.dir"/>
- </authorization>
- </security-realm>
- </security-realms>
- <audit-log>
- <formatters>
- <json-formatter name="json-formatter"/>
- </formatters>
- <handlers>
- <file-handler name="file" formatter="json-formatter" relative-to="jboss.server.data.dir" path="audit-log.log"/>
- </handlers>
- <logger log-boot="true" log-read-only="false" enabled="false">
- <handlers>
- <handler name="file"/>
- </handlers>
- </logger>
- </audit-log>
- <management-interfaces>
- <http-interface security-realm="ManagementRealm" http-upgrade-enabled="true">
- <socket-binding http="management-http"/>
- </http-interface>
- </management-interfaces>
- <access-control provider="simple">
- <role-mapping>
- <role name="SuperUser">
- <include>
- <user name="$local"/>
- </include>
- </role>
- </role-mapping>
- </access-control>
- </management>
- <profile>
- <subsystem xmlns="urn:jboss:domain:logging:2.0">
- <console-handler name="CONSOLE">
- <level name="INFO"/>
- <formatter>
- <named-formatter name="COLOR-PATTERN"/>
- </formatter>
- </console-handler>
- <periodic-rotating-file-handler name="FILE" autoflush="true">
- <formatter>
- <named-formatter name="PATTERN"/>
- </formatter>
- <file relative-to="jboss.server.log.dir" path="server.log"/>
- <suffix value=".yyyy-MM-dd"/>
- <append value="true"/>
- </periodic-rotating-file-handler>
- <logger category="com.arjuna">
- <level name="WARN"/>
- </logger>
- <logger category="org.apache.tomcat.util.modeler">
- <level name="WARN"/>
- </logger>
- <logger category="org.jboss.as.config">
- <level name="DEBUG"/>
- </logger>
- <logger category="sun.rmi">
- <level name="WARN"/>
- </logger>
- <logger category="jacorb">
- <level name="WARN"/>
- </logger>
- <logger category="jacorb.config">
- <level name="ERROR"/>
- </logger>
- <root-logger>
- <level name="INFO"/>
- <handlers>
- <handler name="CONSOLE"/>
- <handler name="FILE"/>
- </handlers>
- </root-logger>
- <formatter name="PATTERN">
- <pattern-formatter pattern="%d{yyyy-MM-dd HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/>
- </formatter>
- <formatter name="COLOR-PATTERN">
- <pattern-formatter pattern="%K{level}%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/>
- </formatter>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:batch:1.0">
- <job-repository>
- <in-memory/>
- </job-repository>
- <thread-pool>
- <max-threads count="10"/>
- <keepalive-time time="100" unit="milliseconds"/>
- </thread-pool>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:datasources:2.0">
- <datasources>
- <datasource jndi-name="java:jboss/datasources/ExampleDS" pool-name="ExampleDS" enabled="true" use-java-context="true">
- <connection-url>jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE</connection-url>
- <driver>h2</driver>
- <security>
- <user-name>sa</user-name>
- <password>sa</password>
- </security>
- </datasource>
- <drivers>
- <driver name="h2" module="com.h2database.h2">
- <xa-datasource-class>org.h2.jdbcx.JdbcDataSource</xa-datasource-class>
- </driver>
- </drivers>
- </datasources>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:deployment-scanner:2.0">
- <deployment-scanner path="deployments" relative-to="jboss.server.base.dir" scan-interval="5000" runtime-failure-causes-rollback="${jboss.deployment.scanner.rollback.on.failure:false}"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:ee:2.0">
- <spec-descriptor-property-replacement>false</spec-descriptor-property-replacement>
- <jboss-descriptor-property-replacement>true</jboss-descriptor-property-replacement>
- <annotation-property-replacement>false</annotation-property-replacement>
- <concurrent>
- <context-services>
- <context-service name="default" jndi-name="java:jboss/ee/concurrency/context/default" use-transaction-setup-provider="true"/>
- </context-services>
- <managed-executor-services>
- <managed-executor-service name="default" jndi-name="java:jboss/ee/concurrency/executor/default" context-service="default" hung-task-threshold="60000" core-threads="5" max-threads="25" keepalive-time="5000"/>
- </managed-executor-services>
- <managed-scheduled-executor-services>
- <managed-scheduled-executor-service name="default" jndi-name="java:jboss/ee/concurrency/scheduler/default" context-service="default" hung-task-threshold="60000" core-threads="2" keepalive-time="3000"/>
- </managed-scheduled-executor-services>
- <managed-thread-factories>
- <managed-thread-factory name="default" jndi-name="java:jboss/ee/concurrency/factory/default" context-service="default"/>
- </managed-thread-factories>
- </concurrent>
- <default-bindings context-service="java:jboss/ee/concurrency/context/default" datasource="java:jboss/datasources/ExampleDS" jms-connection-factory="java:jboss/DefaultJMSConnectionFactory" managed-executor-service="java:jboss/ee/concurrency/executor/default" managed-scheduled-executor-service="java:jboss/ee/concurrency/scheduler/default" managed-thread-factory="java:jboss/ee/concurrency/factory/default"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:ejb3:2.0">
- <session-bean>
- <stateful default-access-timeout="5000" cache-ref="simple" passivation-disabled-cache-ref="simple"/>
- <singleton default-access-timeout="5000"/>
- </session-bean>
- <mdb>
- <resource-adapter-ref resource-adapter-name="${ejb.resource-adapter-name:activemq-ra.rar}"/>
- <bean-instance-pool-ref pool-name="mdb-strict-max-pool"/>
- </mdb>
- <pools>
- <bean-instance-pools>
- <!-- A sample strict max pool configuration -->
- <strict-max-pool name="slsb-strict-max-pool" max-pool-size="20" instance-acquisition-timeout="5" instance-acquisition-timeout-unit="MINUTES"/>
- <strict-max-pool name="mdb-strict-max-pool" max-pool-size="20" instance-acquisition-timeout="5" instance-acquisition-timeout-unit="MINUTES"/>
- </bean-instance-pools>
- </pools>
- <caches>
- <cache name="simple"/>
- <cache name="distributable" aliases="passivating clustered" passivation-store-ref="infinispan"/>
- </caches>
- <passivation-stores>
- <passivation-store name="infinispan" cache-container="ejb" max-size="10000"/>
- </passivation-stores>
- <async thread-pool-name="default"/>
- <timer-service thread-pool-name="default" default-data-store="default-file-store">
- <data-stores>
- <file-data-store name="default-file-store" path="timer-service-data" relative-to="jboss.server.data.dir"/>
- </data-stores>
- </timer-service>
- <remote connector-ref="http-remoting-connector" thread-pool-name="default"/>
- <thread-pools>
- <thread-pool name="default">
- <max-threads count="10"/>
- <keepalive-time time="100" unit="milliseconds"/>
- </thread-pool>
- </thread-pools>
- <iiop enable-by-default="false" use-qualified-name="false"/>
- <default-security-domain value="other"/>
- <default-missing-method-permissions-deny-access value="true"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:io:1.0">
- <worker name="default" io-threads="3"/>
- <buffer-pool name="default" buffer-size="16384" buffers-per-slice="128"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:infinispan:2.0">
- <cache-container name="web" default-cache="passivation" module="org.wildfly.clustering.web.infinispan">
- <local-cache name="passivation" batching="true">
- <file-store passivation="true" purge="false"/>
- </local-cache>
- <local-cache name="persistent" batching="true">
- <file-store passivation="false" purge="false"/>
- </local-cache>
- </cache-container>
- <cache-container name="ejb" aliases="sfsb" default-cache="passivation" module="org.wildfly.clustering.ejb.infinispan">
- <local-cache name="passivation" batching="true">
- <file-store passivation="true" purge="false"/>
- </local-cache>
- <local-cache name="persistent" batching="true">
- <file-store passivation="false" purge="false"/>
- </local-cache>
- </cache-container>
- <cache-container name="hibernate" default-cache="local-query" module="org.hibernate">
- <local-cache name="entity">
- <transaction mode="NON_XA"/>
- <eviction strategy="LRU" max-entries="10000"/>
- <expiration max-idle="100000"/>
- </local-cache>
- <local-cache name="local-query">
- <transaction mode="NONE"/>
- <eviction strategy="LRU" max-entries="10000"/>
- <expiration max-idle="100000"/>
- </local-cache>
- <local-cache name="timestamps">
- <transaction mode="NONE"/>
- <eviction strategy="NONE"/>
- </local-cache>
- </cache-container>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:jacorb:1.3">
- <orb socket-binding="jacorb" ssl-socket-binding="jacorb-ssl">
- <initializers transactions="spec" security="identity"/>
- </orb>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:jaxrs:1.0"/>
- <subsystem xmlns="urn:jboss:domain:jca:2.0">
- <archive-validation enabled="true" fail-on-error="true" fail-on-warn="false"/>
- <bean-validation enabled="true"/>
- <default-workmanager>
- <short-running-threads>
- <core-threads count="50"/>
- <queue-length count="50"/>
- <max-threads count="50"/>
- <keepalive-time time="10" unit="seconds"/>
- </short-running-threads>
- <long-running-threads>
- <core-threads count="50"/>
- <queue-length count="50"/>
- <max-threads count="50"/>
- <keepalive-time time="10" unit="seconds"/>
- </long-running-threads>
- </default-workmanager>
- <cached-connection-manager/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:jdr:1.0"/>
- <subsystem xmlns="urn:jboss:domain:jmx:1.3">
- <expose-resolved-model/>
- <expose-expression-model/>
- <remoting-connector/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:jpa:1.1">
- <jpa default-datasource="" default-extended-persistence-inheritance="DEEP"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:jsf:1.0"/>
- <subsystem xmlns="urn:jboss:domain:jsr77:1.0"/>
- <subsystem xmlns="urn:jboss:domain:mail:2.0">
- <mail-session name="default" jndi-name="java:jboss/mail/Default">
- <smtp-server outbound-socket-binding-ref="mail-smtp"/>
- </mail-session>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:messaging:2.0">
- <activemq-server>
- <persistence-enabled>true</persistence-enabled>
- <journal-file-size>102400</journal-file-size>
- <journal-min-files>2</journal-min-files>
- <journal-directory path="../../../journal2"/>
- <bindings-directory path="../../../bindings2"/>
- <large-messages-directory path="../../../large-message2"/>
- <paging-directory path="../../../paging2"/>
- <connectors>
- <http-connector name="http-connector" socket-binding="http">
- <param key="http-upgrade-endpoint" value="http-acceptor"/>
- </http-connector>
- <http-connector name="remote-http" socket-binding="remote-http">
- <param key="http-upgrade-endpoint" value="http-acceptor"/>
- </http-connector>
- <http-connector name="remote-http-backup" socket-binding="remote-http-backup">
- <param key="http-upgrade-endpoint" value="http-acceptor"/>
- </http-connector>
- <http-connector name="http-connector-throughput" socket-binding="http">
- <param key="http-upgrade-endpoint" value="http-acceptor-throughput"/>
- <param key="batch-delay" value="50"/>
- </http-connector>
- <in-vm-connector name="in-vm" server-id="0"/>
- </connectors>
- <acceptors>
- <http-acceptor name="http-acceptor" http-listener="default"/>
- <http-acceptor name="http-acceptor-throughput" http-listener="default">
- <param key="batch-delay" value="50"/>
- <param key="direct-deliver" value="false"/>
- </http-acceptor>
- <in-vm-acceptor name="in-vm" server-id="0"/>
- </acceptors>
- <security-settings>
- <security-setting match="#">
- <permission type="send" roles="guest"/>
- <permission type="consume" roles="guest"/>
- <permission type="createNonDurableQueue" roles="guest"/>
- <permission type="deleteNonDurableQueue" roles="guest"/>
- </security-setting>
- </security-settings>
- <address-settings>
- <!--default for catch all-->
- <address-setting match="#">
- <dead-letter-address>jms.queue.DLQ</dead-letter-address>
- <expiry-address>jms.queue.ExpiryQueue</expiry-address>
- <redelivery-delay>0</redelivery-delay>
- <max-size-bytes>10485760</max-size-bytes>
- <address-full-policy>PAGE</address-full-policy>
- <page-size-bytes>2097152</page-size-bytes>
- <message-counter-history-day-limit>10</message-counter-history-day-limit>
- </address-setting>
- </address-settings>
- <jms-connection-factories>
- <connection-factory name="InVmConnectionFactory">
- <connectors>
- <connector-ref connector-name="in-vm"/>
- </connectors>
- <entries>
- <entry name="java:/ConnectionFactory"/>
- </entries>
- </connection-factory>
- <connection-factory name="RemoteConnectionFactory">
- <connectors>
- <connector-ref connector-name="http-connector"/>
- </connectors>
- <entries>
- <entry name="java:jboss/exported/jms/RemoteConnectionFactory"/>
- </entries>
- </connection-factory>
- <pooled-connection-factory name="activemq-ra">
- <transaction mode="xa"/>
- <connectors>
- <connector-ref connector-name="in-vm"/>
- </connectors>
- <entries>
- <entry name="java:/JmsXA"/>
- <!-- Global JNDI entry used to provide a default JMS Connection factory to EE application -->
- <entry name="java:jboss/DefaultJMSConnectionFactory"/>
- </entries>
- </pooled-connection-factory>
- <pooled-connection-factory name="activemq-remote-ra">
- <transaction mode="xa"/>
- <user>guest</user>
- <password>password</password>
- <ha>true</ha>
- <reconnect-attempts>-1</reconnect-attempts>
- <connectors>
- <connector-ref connector-name="remote-http"/>
- <connector-ref connector-name="remote-http-backup"/>
- </connectors>
- <entries>
- <entry name="java:/RemoteJmsXA"/>
- </entries>
- </pooled-connection-factory>
- </jms-connection-factories>
- </activemq-server>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:naming:2.0">
- <remote-naming/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:pojo:1.0"/>
- <subsystem xmlns="urn:jboss:domain:remoting:2.0">
- <endpoint worker="default"/>
- <http-connector name="http-remoting-connector" connector-ref="default" security-realm="ApplicationRealm"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:resource-adapters:2.0"/>
- <subsystem xmlns="urn:jboss:domain:sar:1.0"/>
- <subsystem xmlns="urn:jboss:domain:security:1.2">
- <security-domains>
- <security-domain name="other" cache-type="default">
- <authentication>
- <login-module code="Remoting" flag="optional">
- <module-option name="password-stacking" value="useFirstPass"/>
- </login-module>
- <login-module code="RealmDirect" flag="required">
- <module-option name="password-stacking" value="useFirstPass"/>
- </login-module>
- </authentication>
- </security-domain>
- <security-domain name="jboss-web-policy" cache-type="default">
- <authorization>
- <policy-module code="Delegating" flag="required"/>
- </authorization>
- </security-domain>
- <security-domain name="jboss-ejb-policy" cache-type="default">
- <authorization>
- <policy-module code="Delegating" flag="required"/>
- </authorization>
- </security-domain>
- </security-domains>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:threads:1.1"/>
- <subsystem xmlns="urn:jboss:domain:transactions:2.0">
- <core-environment>
- <process-id>
- <uuid/>
- </process-id>
- </core-environment>
- <recovery-environment socket-binding="txn-recovery-environment" status-socket-binding="txn-status-manager"/>
- <coordinator-environment default-timeout="300"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:undertow:1.0">
- <buffer-caches>
- <buffer-cache name="default" buffer-size="1024" buffers-per-region="1024" max-regions="10"/>
- </buffer-caches>
- <server name="default-server">
- <http-listener name="default" socket-binding="http"/>
- <host name="default-host" alias="localhost">
- <location name="/" handler="welcome-content"/>
- <filter-ref name="server-header"/>
- <filter-ref name="x-powered-by-header"/>
- </host>
- </server>
- <servlet-container name="default" default-buffer-cache="default" stack-trace-on-error="local-only">
- <jsp-config/>
- </servlet-container>
- <handlers>
- <file name="welcome-content" path="${jboss.home.dir}/welcome-content" directory-listing="true"/>
- </handlers>
- <filters>
- <response-header name="server-header" header-name="Server" header-value="Wildfly 8"/>
- <response-header name="x-powered-by-header" header-name="X-Powered-By" header-value="Undertow 1"/>
- </filters>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:webservices:1.2">
- <modify-wsdl-address>true</modify-wsdl-address>
- <wsdl-host>${jboss.bind.address:127.0.0.1}</wsdl-host>
- <endpoint-config name="Standard-Endpoint-Config"/>
- <endpoint-config name="Recording-Endpoint-Config">
- <pre-handler-chain name="recording-handlers" protocol-bindings="##SOAP11_HTTP ##SOAP11_HTTP_MTOM ##SOAP12_HTTP ##SOAP12_HTTP_MTOM">
- <handler name="RecordingHandler" class="org.jboss.ws.common.invocation.RecordingServerHandler"/>
- </pre-handler-chain>
- </endpoint-config>
- <client-config name="Standard-Client-Config"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:weld:2.0"/>
- </profile>
- <interfaces>
- <interface name="management">
- <inet-address value="${jboss.bind.address.management:127.0.0.1}"/>
- </interface>
- <interface name="public">
- <inet-address value="${jboss.bind.address:127.0.0.1}"/>
- </interface>
- <!-- TODO - only show this if the jacorb subsystem is added -->
- <interface name="unsecure">
- <!--
- ~ Used for IIOP sockets in the standard configuration.
- ~ To secure JacORB you need to setup SSL
- -->
- <inet-address value="${jboss.bind.address.unsecure:127.0.0.1}"/>
- </interface>
- </interfaces>
- <socket-binding-group name="standard-sockets" default-interface="public" port-offset="${jboss.socket.binding.port-offset:0}">
- <socket-binding name="management-http" interface="management" port="${jboss.management.http.port:9990}"/>
- <socket-binding name="management-https" interface="management" port="${jboss.management.https.port:9993}"/>
- <socket-binding name="ajp" port="${jboss.ajp.port:8009}"/>
- <socket-binding name="http" port="${jboss.http.port:8080}"/>
- <socket-binding name="https" port="${jboss.https.port:8443}"/>
- <socket-binding name="jacorb" interface="unsecure" port="3528"/>
- <socket-binding name="jacorb-ssl" interface="unsecure" port="3529"/>
- <socket-binding name="remote-http" port="8180" fixed-port="true"/>
- <socket-binding name="remote-http-backup" port="8280" fixed-port="true"/>
- <socket-binding name="txn-recovery-environment" port="4712"/>
- <socket-binding name="txn-status-manager" port="4713"/>
- <outbound-socket-binding name="mail-smtp">
- <remote-destination host="localhost" port="25"/>
- </outbound-socket-binding>
- </socket-binding-group>
-</server>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/mdb-remote-failover-static/server/standalone/configuration/standalone-live.xml
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-remote-failover-static/server/standalone/configuration/standalone-live.xml b/examples/javaee/mdb-remote-failover-static/server/standalone/configuration/standalone-live.xml
deleted file mode 100644
index 9d068f8..0000000
--- a/examples/javaee/mdb-remote-failover-static/server/standalone/configuration/standalone-live.xml
+++ /dev/null
@@ -1,513 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-
-<server xmlns="urn:jboss:domain:2.0">
- <extensions>
- <extension module="org.jboss.as.clustering.infinispan"/>
- <extension module="org.jboss.as.connector"/>
- <extension module="org.jboss.as.deployment-scanner"/>
- <extension module="org.jboss.as.ee"/>
- <extension module="org.jboss.as.ejb3"/>
- <extension module="org.jboss.as.jacorb"/>
- <extension module="org.jboss.as.jaxrs"/>
- <extension module="org.jboss.as.jdr"/>
- <extension module="org.jboss.as.jmx"/>
- <extension module="org.jboss.as.jpa"/>
- <extension module="org.jboss.as.jsf"/>
- <extension module="org.jboss.as.jsr77"/>
- <extension module="org.jboss.as.logging"/>
- <extension module="org.jboss.as.mail"/>
- <extension module="org.jboss.as.messaging"/>
- <extension module="org.jboss.as.naming"/>
- <extension module="org.jboss.as.pojo"/>
- <extension module="org.jboss.as.remoting"/>
- <extension module="org.jboss.as.sar"/>
- <extension module="org.jboss.as.security"/>
- <extension module="org.jboss.as.threads"/>
- <extension module="org.jboss.as.transactions"/>
- <extension module="org.jboss.as.webservices"/>
- <extension module="org.jboss.as.weld"/>
- <extension module="org.wildfly.extension.batch"/>
- <extension module="org.wildfly.extension.io"/>
- <extension module="org.wildfly.extension.undertow"/>
- </extensions>
- <management>
- <security-realms>
- <security-realm name="ManagementRealm">
- <authentication>
- <local default-user="$local"/>
- <properties path="mgmt-users.properties" relative-to="jboss.server.config.dir"/>
- </authentication>
- <authorization map-groups-to-roles="false">
- <properties path="mgmt-groups.properties" relative-to="jboss.server.config.dir"/>
- </authorization>
- </security-realm>
- <security-realm name="ApplicationRealm">
- <authentication>
- <local default-user="$local" allowed-users="*"/>
- <properties path="application-users.properties" relative-to="jboss.server.config.dir"/>
- </authentication>
- <authorization>
- <properties path="application-roles.properties" relative-to="jboss.server.config.dir"/>
- </authorization>
- </security-realm>
- </security-realms>
- <audit-log>
- <formatters>
- <json-formatter name="json-formatter"/>
- </formatters>
- <handlers>
- <file-handler name="file" formatter="json-formatter" relative-to="jboss.server.data.dir" path="audit-log.log"/>
- </handlers>
- <logger log-boot="true" log-read-only="false" enabled="false">
- <handlers>
- <handler name="file"/>
- </handlers>
- </logger>
- </audit-log>
- <management-interfaces>
- <http-interface security-realm="ManagementRealm" http-upgrade-enabled="true">
- <socket-binding http="management-http"/>
- </http-interface>
- </management-interfaces>
- <access-control provider="simple">
- <role-mapping>
- <role name="SuperUser">
- <include>
- <user name="$local"/>
- </include>
- </role>
- </role-mapping>
- </access-control>
- </management>
- <profile>
- <subsystem xmlns="urn:jboss:domain:logging:2.0">
- <console-handler name="CONSOLE">
- <level name="INFO"/>
- <formatter>
- <named-formatter name="COLOR-PATTERN"/>
- </formatter>
- </console-handler>
- <periodic-rotating-file-handler name="FILE" autoflush="true">
- <formatter>
- <named-formatter name="PATTERN"/>
- </formatter>
- <file relative-to="jboss.server.log.dir" path="server.log"/>
- <suffix value=".yyyy-MM-dd"/>
- <append value="true"/>
- </periodic-rotating-file-handler>
- <logger category="com.arjuna">
- <level name="WARN"/>
- </logger>
- <logger category="org.apache.tomcat.util.modeler">
- <level name="WARN"/>
- </logger>
- <logger category="org.jboss.as.config">
- <level name="DEBUG"/>
- </logger>
- <logger category="sun.rmi">
- <level name="WARN"/>
- </logger>
- <logger category="jacorb">
- <level name="WARN"/>
- </logger>
- <logger category="jacorb.config">
- <level name="ERROR"/>
- </logger>
- <root-logger>
- <level name="INFO"/>
- <handlers>
- <handler name="CONSOLE"/>
- <handler name="FILE"/>
- </handlers>
- </root-logger>
- <formatter name="PATTERN">
- <pattern-formatter pattern="%d{yyyy-MM-dd HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/>
- </formatter>
- <formatter name="COLOR-PATTERN">
- <pattern-formatter pattern="%K{level}%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/>
- </formatter>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:batch:1.0">
- <job-repository>
- <in-memory/>
- </job-repository>
- <thread-pool>
- <max-threads count="10"/>
- <keepalive-time time="100" unit="milliseconds"/>
- </thread-pool>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:datasources:2.0">
- <datasources>
- <datasource jndi-name="java:jboss/datasources/ExampleDS" pool-name="ExampleDS" enabled="true" use-java-context="true">
- <connection-url>jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE</connection-url>
- <driver>h2</driver>
- <security>
- <user-name>sa</user-name>
- <password>sa</password>
- </security>
- </datasource>
- <drivers>
- <driver name="h2" module="com.h2database.h2">
- <xa-datasource-class>org.h2.jdbcx.JdbcDataSource</xa-datasource-class>
- </driver>
- </drivers>
- </datasources>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:deployment-scanner:2.0">
- <deployment-scanner path="deployments" relative-to="jboss.server.base.dir" scan-interval="5000" runtime-failure-causes-rollback="${jboss.deployment.scanner.rollback.on.failure:false}"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:ee:2.0">
- <spec-descriptor-property-replacement>false</spec-descriptor-property-replacement>
- <jboss-descriptor-property-replacement>true</jboss-descriptor-property-replacement>
- <annotation-property-replacement>false</annotation-property-replacement>
- <concurrent>
- <context-services>
- <context-service name="default" jndi-name="java:jboss/ee/concurrency/context/default" use-transaction-setup-provider="true"/>
- </context-services>
- <managed-executor-services>
- <managed-executor-service name="default" jndi-name="java:jboss/ee/concurrency/executor/default" context-service="default" hung-task-threshold="60000" core-threads="5" max-threads="25" keepalive-time="5000"/>
- </managed-executor-services>
- <managed-scheduled-executor-services>
- <managed-scheduled-executor-service name="default" jndi-name="java:jboss/ee/concurrency/scheduler/default" context-service="default" hung-task-threshold="60000" core-threads="2" keepalive-time="3000"/>
- </managed-scheduled-executor-services>
- <managed-thread-factories>
- <managed-thread-factory name="default" jndi-name="java:jboss/ee/concurrency/factory/default" context-service="default"/>
- </managed-thread-factories>
- </concurrent>
- <default-bindings context-service="java:jboss/ee/concurrency/context/default" datasource="java:jboss/datasources/ExampleDS" jms-connection-factory="java:jboss/DefaultJMSConnectionFactory" managed-executor-service="java:jboss/ee/concurrency/executor/default" managed-scheduled-executor-service="java:jboss/ee/concurrency/scheduler/default" managed-thread-factory="java:jboss/ee/concurrency/factory/default"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:ejb3:2.0">
- <session-bean>
- <stateful default-access-timeout="5000" cache-ref="simple" passivation-disabled-cache-ref="simple"/>
- <singleton default-access-timeout="5000"/>
- </session-bean>
- <mdb>
- <resource-adapter-ref resource-adapter-name="${ejb.resource-adapter-name:activemq-ra.rar}"/>
- <bean-instance-pool-ref pool-name="mdb-strict-max-pool"/>
- </mdb>
- <pools>
- <bean-instance-pools>
- <!-- A sample strict max pool configuration -->
- <strict-max-pool name="slsb-strict-max-pool" max-pool-size="20" instance-acquisition-timeout="5" instance-acquisition-timeout-unit="MINUTES"/>
- <strict-max-pool name="mdb-strict-max-pool" max-pool-size="20" instance-acquisition-timeout="5" instance-acquisition-timeout-unit="MINUTES"/>
- </bean-instance-pools>
- </pools>
- <caches>
- <cache name="simple"/>
- <cache name="distributable" aliases="passivating clustered" passivation-store-ref="infinispan"/>
- </caches>
- <passivation-stores>
- <passivation-store name="infinispan" cache-container="ejb" max-size="10000"/>
- </passivation-stores>
- <async thread-pool-name="default"/>
- <timer-service thread-pool-name="default" default-data-store="default-file-store">
- <data-stores>
- <file-data-store name="default-file-store" path="timer-service-data" relative-to="jboss.server.data.dir"/>
- </data-stores>
- </timer-service>
- <remote connector-ref="http-remoting-connector" thread-pool-name="default"/>
- <thread-pools>
- <thread-pool name="default">
- <max-threads count="10"/>
- <keepalive-time time="100" unit="milliseconds"/>
- </thread-pool>
- </thread-pools>
- <iiop enable-by-default="false" use-qualified-name="false"/>
- <default-security-domain value="other"/>
- <default-missing-method-permissions-deny-access value="true"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:io:1.0">
- <worker name="default" io-threads="3"/>
- <buffer-pool name="default" buffer-size="16384" buffers-per-slice="128"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:infinispan:2.0">
- <cache-container name="web" default-cache="passivation" module="org.wildfly.clustering.web.infinispan">
- <local-cache name="passivation" batching="true">
- <file-store passivation="true" purge="false"/>
- </local-cache>
- <local-cache name="persistent" batching="true">
- <file-store passivation="false" purge="false"/>
- </local-cache>
- </cache-container>
- <cache-container name="ejb" aliases="sfsb" default-cache="passivation" module="org.wildfly.clustering.ejb.infinispan">
- <local-cache name="passivation" batching="true">
- <file-store passivation="true" purge="false"/>
- </local-cache>
- <local-cache name="persistent" batching="true">
- <file-store passivation="false" purge="false"/>
- </local-cache>
- </cache-container>
- <cache-container name="hibernate" default-cache="local-query" module="org.hibernate">
- <local-cache name="entity">
- <transaction mode="NON_XA"/>
- <eviction strategy="LRU" max-entries="10000"/>
- <expiration max-idle="100000"/>
- </local-cache>
- <local-cache name="local-query">
- <transaction mode="NONE"/>
- <eviction strategy="LRU" max-entries="10000"/>
- <expiration max-idle="100000"/>
- </local-cache>
- <local-cache name="timestamps">
- <transaction mode="NONE"/>
- <eviction strategy="NONE"/>
- </local-cache>
- </cache-container>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:jacorb:1.3">
- <orb socket-binding="jacorb" ssl-socket-binding="jacorb-ssl">
- <initializers transactions="spec" security="identity"/>
- </orb>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:jaxrs:1.0"/>
- <subsystem xmlns="urn:jboss:domain:jca:2.0">
- <archive-validation enabled="true" fail-on-error="true" fail-on-warn="false"/>
- <bean-validation enabled="true"/>
- <default-workmanager>
- <short-running-threads>
- <core-threads count="50"/>
- <queue-length count="50"/>
- <max-threads count="50"/>
- <keepalive-time time="10" unit="seconds"/>
- </short-running-threads>
- <long-running-threads>
- <core-threads count="50"/>
- <queue-length count="50"/>
- <max-threads count="50"/>
- <keepalive-time time="10" unit="seconds"/>
- </long-running-threads>
- </default-workmanager>
- <cached-connection-manager/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:jdr:1.0"/>
- <subsystem xmlns="urn:jboss:domain:jmx:1.3">
- <expose-resolved-model/>
- <expose-expression-model/>
- <remoting-connector/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:jpa:1.1">
- <jpa default-datasource="" default-extended-persistence-inheritance="DEEP"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:jsf:1.0"/>
- <subsystem xmlns="urn:jboss:domain:jsr77:1.0"/>
- <subsystem xmlns="urn:jboss:domain:mail:2.0">
- <mail-session name="default" jndi-name="java:jboss/mail/Default">
- <smtp-server outbound-socket-binding-ref="mail-smtp"/>
- </mail-session>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:messaging:2.0">
- <activemq-server>
- <failover-on-shutdown>true</failover-on-shutdown>
- <shared-store>true</shared-store>
- <persistence-enabled>true</persistence-enabled>
- <journal-file-size>102400</journal-file-size>
- <journal-min-files>2</journal-min-files>
- <journal-directory path="../../../journal"/>
- <bindings-directory path="../../../bindings"/>
- <large-messages-directory path="../../../large-message"/>
- <paging-directory path="../../../paging"/>
- <connectors>
- <http-connector name="http-connector" socket-binding="http">
- <param key="http-upgrade-endpoint" value="http-acceptor"/>
- </http-connector>
- <http-connector name="http-connector-throughput" socket-binding="http">
- <param key="http-upgrade-endpoint" value="http-acceptor-throughput"/>
- <param key="batch-delay" value="50"/>
- </http-connector>
- <http-connector name="remote-http" socket-binding="remote-http">
- <param key="http-upgrade-endpoint" value="http-acceptor"/>
- </http-connector>
- <in-vm-connector name="in-vm" server-id="0"/>
- </connectors>
- <acceptors>
- <http-acceptor name="http-acceptor" http-listener="default"/>
- <http-acceptor name="http-acceptor-throughput" http-listener="default">
- <param key="batch-delay" value="50"/>
- <param key="direct-deliver" value="false"/>
- </http-acceptor>
- <in-vm-acceptor name="in-vm" server-id="0"/>
- </acceptors>
- <security-settings>
- <security-setting match="#">
- <permission type="send" roles="guest"/>
- <permission type="consume" roles="guest"/>
- <permission type="createNonDurableQueue" roles="guest"/>
- <permission type="deleteNonDurableQueue" roles="guest"/>
- </security-setting>
- </security-settings>
- <address-settings>
- <!--default for catch all-->
- <address-setting match="#">
- <dead-letter-address>jms.queue.DLQ</dead-letter-address>
- <expiry-address>jms.queue.ExpiryQueue</expiry-address>
- <redelivery-delay>0</redelivery-delay>
- <max-size-bytes>10485760</max-size-bytes>
- <address-full-policy>PAGE</address-full-policy>
- <page-size-bytes>2097152</page-size-bytes>
- <message-counter-history-day-limit>10</message-counter-history-day-limit>
- </address-setting>
- </address-settings>
- <cluster-connections>
- <cluster-connection name="my-cluster">
- <address>jms</address>
- <connector-ref>http-connector</connector-ref>
- <static-connectors>
- <connector-ref>remote-http</connector-ref>
- </static-connectors>
- </cluster-connection>
- </cluster-connections>
- <jms-connection-factories>
- <connection-factory name="InVmConnectionFactory">
- <connectors>
- <connector-ref connector-name="in-vm"/>
- </connectors>
- <entries>
- <entry name="java:/ConnectionFactory"/>
- </entries>
- </connection-factory>
- <connection-factory name="RemoteConnectionFactory">
- <connectors>
- <connector-ref connector-name="http-connector"/>
- </connectors>
- <entries>
- <entry name="java:jboss/exported/jms/RemoteConnectionFactory"/>
- </entries>
- <ha>true</ha>
- <reconnect-attempts>-1</reconnect-attempts>
- </connection-factory>
- <pooled-connection-factory name="activemq-ra">
- <transaction mode="xa"/>
- <connectors>
- <connector-ref connector-name="in-vm"/>
- </connectors>
- <entries>
- <entry name="java:/JmsXA"/>
- <!-- Global JNDI entry used to provide a default JMS Connection factory to EE application -->
- <entry name="java:jboss/DefaultJMSConnectionFactory"/>
- </entries>
- </pooled-connection-factory>
- </jms-connection-factories>
- <jms-destinations>
- <jms-queue name="inQueue">
- <entry name="queue/inQueue"/>
- <entry name="java:jboss/exported/queues/inQueue"/>
- </jms-queue>
- <jms-queue name="outQueue">
- <entry name="queue/outQueue"/>
- <entry name="java:jboss/exported/queues/outQueue"/>
- </jms-queue>
- </jms-destinations>
- </activemq-server>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:naming:2.0">
- <remote-naming/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:pojo:1.0"/>
- <subsystem xmlns="urn:jboss:domain:remoting:2.0">
- <endpoint worker="default"/>
- <http-connector name="http-remoting-connector" connector-ref="default" security-realm="ApplicationRealm"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:resource-adapters:2.0"/>
- <subsystem xmlns="urn:jboss:domain:sar:1.0"/>
- <subsystem xmlns="urn:jboss:domain:security:1.2">
- <security-domains>
- <security-domain name="other" cache-type="default">
- <authentication>
- <login-module code="Remoting" flag="optional">
- <module-option name="password-stacking" value="useFirstPass"/>
- </login-module>
- <login-module code="RealmDirect" flag="required">
- <module-option name="password-stacking" value="useFirstPass"/>
- </login-module>
- </authentication>
- </security-domain>
- <security-domain name="jboss-web-policy" cache-type="default">
- <authorization>
- <policy-module code="Delegating" flag="required"/>
- </authorization>
- </security-domain>
- <security-domain name="jboss-ejb-policy" cache-type="default">
- <authorization>
- <policy-module code="Delegating" flag="required"/>
- </authorization>
- </security-domain>
- </security-domains>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:threads:1.1"/>
- <subsystem xmlns="urn:jboss:domain:transactions:2.0">
- <core-environment>
- <process-id>
- <uuid/>
- </process-id>
- </core-environment>
- <recovery-environment socket-binding="txn-recovery-environment" status-socket-binding="txn-status-manager"/>
- <coordinator-environment default-timeout="300"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:undertow:1.0">
- <buffer-caches>
- <buffer-cache name="default" buffer-size="1024" buffers-per-region="1024" max-regions="10"/>
- </buffer-caches>
- <server name="default-server">
- <http-listener name="default" socket-binding="http"/>
- <host name="default-host" alias="localhost">
- <location name="/" handler="welcome-content"/>
- <filter-ref name="server-header"/>
- <filter-ref name="x-powered-by-header"/>
- </host>
- </server>
- <servlet-container name="default" default-buffer-cache="default" stack-trace-on-error="local-only">
- <jsp-config/>
- </servlet-container>
- <handlers>
- <file name="welcome-content" path="${jboss.home.dir}/welcome-content" directory-listing="true"/>
- </handlers>
- <filters>
- <response-header name="server-header" header-name="Server" header-value="Wildfly 8"/>
- <response-header name="x-powered-by-header" header-name="X-Powered-By" header-value="Undertow 1"/>
- </filters>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:webservices:1.2">
- <modify-wsdl-address>true</modify-wsdl-address>
- <wsdl-host>${jboss.bind.address:127.0.0.1}</wsdl-host>
- <endpoint-config name="Standard-Endpoint-Config"/>
- <endpoint-config name="Recording-Endpoint-Config">
- <pre-handler-chain name="recording-handlers" protocol-bindings="##SOAP11_HTTP ##SOAP11_HTTP_MTOM ##SOAP12_HTTP ##SOAP12_HTTP_MTOM">
- <handler name="RecordingHandler" class="org.jboss.ws.common.invocation.RecordingServerHandler"/>
- </pre-handler-chain>
- </endpoint-config>
- <client-config name="Standard-Client-Config"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:weld:2.0"/>
- </profile>
- <interfaces>
- <interface name="management">
- <inet-address value="${jboss.bind.address.management:127.0.0.1}"/>
- </interface>
- <interface name="public">
- <inet-address value="${jboss.bind.address:127.0.0.1}"/>
- </interface>
- <!-- TODO - only show this if the jacorb subsystem is added -->
- <interface name="unsecure">
- <!--
- ~ Used for IIOP sockets in the standard configuration.
- ~ To secure JacORB you need to setup SSL
- -->
- <inet-address value="${jboss.bind.address.unsecure:127.0.0.1}"/>
- </interface>
- </interfaces>
- <socket-binding-group name="standard-sockets" default-interface="public" port-offset="${jboss.socket.binding.port-offset:0}">
- <socket-binding name="management-http" interface="management" port="${jboss.management.http.port:9990}"/>
- <socket-binding name="management-https" interface="management" port="${jboss.management.https.port:9993}"/>
- <socket-binding name="ajp" port="${jboss.ajp.port:8009}"/>
- <socket-binding name="http" port="${jboss.http.port:8080}"/>
- <socket-binding name="https" port="${jboss.https.port:8443}"/>
- <socket-binding name="jacorb" interface="unsecure" port="3528"/>
- <socket-binding name="jacorb-ssl" interface="unsecure" port="3529"/>
- <socket-binding name="remote-http" port="8280" fixed-port="true"/>
- <socket-binding name="txn-recovery-environment" port="4712"/>
- <socket-binding name="txn-status-manager" port="4713"/>
- <outbound-socket-binding name="mail-smtp">
- <remote-destination host="localhost" port="25"/>
- </outbound-socket-binding>
- </socket-binding-group>
-</server>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/mdb-remote-failover-static/src/main/java/org/apache/activemq/javaee/example/MDBRemoteFailoverStaticClientExample.java
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-remote-failover-static/src/main/java/org/apache/activemq/javaee/example/MDBRemoteFailoverStaticClientExample.java b/examples/javaee/mdb-remote-failover-static/src/main/java/org/apache/activemq/javaee/example/MDBRemoteFailoverStaticClientExample.java
deleted file mode 100644
index 7d2fe8e..0000000
--- a/examples/javaee/mdb-remote-failover-static/src/main/java/org/apache/activemq/javaee/example/MDBRemoteFailoverStaticClientExample.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.activemq.javaee.example;
-
-import org.apache.activemq.javaee.example.server.ServerKiller;
-
-import javax.jms.*;
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-import java.util.Properties;
-
-/**
- * @author <a href="mailto:andy.taylor@jboss.com">Andy Taylor</a>
- * @author Justin Bertram
- */
-public class MDBRemoteFailoverStaticClientExample
-{
- private static ServerKiller killer;
-
- public static void main(String[] args) throws Exception
- {
- Connection connection = null;
- InitialContext initialContext = null;
- try
- {
- //Step 1. Create an initial context to perform the JNDI lookup.
- final Properties env = new Properties();
-
- env.put(Context.URL_PKG_PREFIXES, "org.jboss.ejb.client.naming");
-
- env.put(Context.INITIAL_CONTEXT_FACTORY, "org.jboss.naming.remote.client.InitialContextFactory");
-
- env.put(Context.PROVIDER_URL, "http-remoting://localhost:8180");
-
- env.put(Context.SECURITY_PRINCIPAL, "guest");
-
- env.put(Context.SECURITY_CREDENTIALS, "password");
-
- initialContext = new InitialContext(env);
-
- //Step 2. Perfom a lookup on the queue
- Queue queue = (Queue) initialContext.lookup("/queues/inQueue");
-
- //Step 3. Perform a lookup on the Connection Factory
- ConnectionFactory cf = (ConnectionFactory) initialContext.lookup("jms/RemoteConnectionFactory");
-
- //Step 4.Create a JMS Connection
- connection = cf.createConnection("guest", "password");
-
- //Step 5. Create a JMS Session
- Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
-
- //Step 6. Create a JMS Message Producer
- MessageProducer producer = session.createProducer(queue);
-
- //Step 7. Create a Text Message
- TextMessage message = session.createTextMessage("This is a text message");
-
- System.out.println("Sent message: " + message.getText());
-
- //Step 8. Send the Message
- producer.send(message);
-
- //Step 15. We lookup the reply queue
- queue = (Queue) initialContext.lookup("/queues/outQueue");
-
- //Step 16. We create a JMS message consumer
- MessageConsumer messageConsumer = session.createConsumer(queue);
-
- //Step 17. We start the connedction so we can receive messages
- connection.start();
-
- //Step 18. We receive the message and print it out
- message = (TextMessage) messageConsumer.receive(5000);
-
- System.out.println("message.getText() = " + message.getText());
-
- System.out.println("Killing Live Server");
-
- killer.kill();
-
- //Step 7. Create a Text Message
- message = session.createTextMessage("This is another text message");
-
- System.out.println("Sent message: " + message.getText());
-
- //Step 8. Send the Message
- producer.send(message);
-
- //Step 18. We receive the message and print it out
- message = (TextMessage) messageConsumer.receive(5000);
-
- System.out.println("message.getText() = " + message.getText());
-
- }
- finally
- {
- //Step 19. Be sure to close our JMS resources!
- if (initialContext != null)
- {
- initialContext.close();
- }
- if(connection != null)
- {
- connection.close();
- }
- }
- }
-
- public static void setKiller(ServerKiller killer)
- {
- MDBRemoteFailoverStaticClientExample.killer = killer;
- }
-
-}
[25/37] activemq-6 git commit: ACTIVEMQ6-51 Example server
bootstrapping
Posted by jb...@apache.org.
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server1/activemq-configuration.xml b/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server1/activemq-configuration.xml
deleted file mode 100644
index 2094f57..0000000
--- a/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server1/activemq-configuration.xml
+++ /dev/null
@@ -1,71 +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>
-
- <ha-policy>
- <shared-store>
- <slave/>
- </shared-store>
- </ha-policy>
-
- <!-- Connectors -->
- <connectors>
- <connector name="netty-connector">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
- <param key="port" value="5446"/>
- </connector>
- </connectors>
-
- <!-- Acceptors -->
- <acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- <param key="port" value="5446"/>
- </acceptor>
- </acceptors>
-
- <broadcast-groups>
- <broadcast-group name="bg-group1">
- <group-address>${udp-address:231.7.7.7}</group-address>
- <group-port>9876</group-port>
- <broadcast-period>1000</broadcast-period>
- <connector-ref>netty-connector</connector-ref>
- </broadcast-group>
- </broadcast-groups>
-
- <discovery-groups>
- <discovery-group name="dg-group1">
- <group-address>${udp-address:231.7.7.7}</group-address>
- <group-port>9876</group-port>
- <refresh-timeout>60000</refresh-timeout>
- </discovery-group>
- </discovery-groups>
-
- <cluster-connections>
- <cluster-connection name="my-cluster">
- <address>jms</address>
- <connector-ref>netty-connector</connector-ref>
- <discovery-group-ref discovery-group-name="dg-group1"/>
- </cluster-connection>
- </cluster-connections>
-
- <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/multiple-failover-failback/src/main/resources/hornetq/server1/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server1/activemq-jms.xml b/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server1/activemq-jms.xml
deleted file mode 100644
index 0d5c953..0000000
--- a/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server1/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/multiple-failover-failback/src/main/resources/hornetq/server1/activemq-users.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server1/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/multiple-failover-failback/src/main/resources/hornetq/server2/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server2/activemq-configuration.xml b/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server2/activemq-configuration.xml
deleted file mode 100644
index c1d1e84..0000000
--- a/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server2/activemq-configuration.xml
+++ /dev/null
@@ -1,72 +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>
-
- <ha-policy>
- <shared-store>
- <slave/>
- </shared-store>
- </ha-policy>
-
- <connectors>
- <connector name="netty-connector">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
- <param key="port" value="5447"/>
- </connector>
- </connectors>
-
- <!-- Acceptors -->
- <acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- <param key="port" value="5447"/>
- </acceptor>
- </acceptors>
-
- <broadcast-groups>
- <broadcast-group name="bg-group1">
- <group-address>${udp-address:231.7.7.7}</group-address>
- <group-port>9876</group-port>
- <broadcast-period>1000</broadcast-period>
- <connector-ref>netty-connector</connector-ref>
- </broadcast-group>
- </broadcast-groups>
-
- <discovery-groups>
- <discovery-group name="dg-group1">
- <group-address>${udp-address:231.7.7.7}</group-address>
- <group-port>9876</group-port>
- <refresh-timeout>60000</refresh-timeout>
- </discovery-group>
- </discovery-groups>
-
- <cluster-connections>
- <cluster-connection name="my-cluster">
- <address>jms</address>
- <connector-ref>netty-connector</connector-ref>
- <discovery-group-ref discovery-group-name="dg-group1"/>
- </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>
-
-</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server2/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server2/activemq-jms.xml b/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server2/activemq-jms.xml
deleted file mode 100644
index 0d5c953..0000000
--- a/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server2/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/multiple-failover-failback/src/main/resources/hornetq/server2/activemq-users.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server2/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/multiple-failover-failback/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/multiple-failover-failback/src/main/resources/jndi.properties b/examples/jms/multiple-failover-failback/src/main/resources/jndi.properties
new file mode 100644
index 0000000..8fda7c0
--- /dev/null
+++ b/examples/jms/multiple-failover-failback/src/main/resources/jndi.properties
@@ -0,0 +1,7 @@
+java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
+java.naming.provider.url=tcp://localhost:5445
+connection.ConnectionFactory.ha=true
+connection.ConnectionFactory.retryInterval=1000
+connection.ConnectionFactory.retryIntervalMultiplier=1.0
+connection.ConnectionFactory.reconnectAttempts=-1
+queue.queue/exampleQueue=exampleQueue
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/multiple-failover/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/multiple-failover/pom.xml b/examples/jms/multiple-failover/pom.xml
index 844f22c..dd5057e 100644
--- a/examples/jms/multiple-failover/pom.xml
+++ b/examples/jms/multiple-failover/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>
@@ -77,9 +75,7 @@
<goal>start</goal>
</goals>
<configuration>
- <jndiPort>1299</jndiPort>
- <jndiRmiPort>1298</jndiRmiPort>
- <hornetqConfigurationDir>${basedir}/target/classes/activemq/server2</hornetqConfigurationDir>
+ <configurationDir>${basedir}/target/classes/activemq/server2</configurationDir>
<fork>true</fork>
<systemProperties>
<property>
@@ -100,11 +96,6 @@
</goals>
<configuration>
<clientClass>org.apache.activemq.jms.example.MultipleFailoverExample</clientClass>
- <args>
- <param>tcp://localhost:5445</param>
- <param>tcp://localhost:5446</param>
- <param>tcp://localhost:5447</param>
- </args>
<systemProperties>
<property>
<name>exampleConfigDir</name>
@@ -119,7 +110,7 @@
<goal>stop</goal>
</goals>
<configuration>
- <hornetqConfigurationDir>${basedir}/target/classes/activemq/server0</hornetqConfigurationDir>
+ <configurationDir>${basedir}/target/classes/activemq/server0</configurationDir>
</configuration>
</execution>
<execution>
@@ -128,7 +119,7 @@
<goal>stop</goal>
</goals>
<configuration>
- <hornetqConfigurationDir>${basedir}/target/classes/activemq/server1</hornetqConfigurationDir>
+ <configurationDir>${basedir}/target/classes/activemq/server1</configurationDir>
</configuration>
</execution>
<execution>
@@ -137,7 +128,7 @@
<goal>stop</goal>
</goals>
<configuration>
- <hornetqConfigurationDir>${basedir}/target/classes/activemq/server2</hornetqConfigurationDir>
+ <configurationDir>${basedir}/target/classes/activemq/server2</configurationDir>
</configuration>
</execution>
</executions>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/multiple-failover/src/main/java/org/apache/activemq/jms/example/MultipleFailoverExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/multiple-failover/src/main/java/org/apache/activemq/jms/example/MultipleFailoverExample.java b/examples/jms/multiple-failover/src/main/java/org/apache/activemq/jms/example/MultipleFailoverExample.java
index 8f430a3..768868f 100644
--- a/examples/jms/multiple-failover/src/main/java/org/apache/activemq/jms/example/MultipleFailoverExample.java
+++ b/examples/jms/multiple-failover/src/main/java/org/apache/activemq/jms/example/MultipleFailoverExample.java
@@ -52,7 +52,7 @@ public class MultipleFailoverExample extends ActiveMQExample
try
{
// Step 1. Get an initial context for looking up JNDI from the server #1
- initialContext = getContext(0);
+ initialContext = new InitialContext();
// Step 2. Look up the JMS resources from JNDI
Queue queue = (Queue)initialContext.lookup("queue/exampleQueue");
@@ -158,5 +158,4 @@ public class MultipleFailoverExample extends ActiveMQExample
}
}
}
-
}
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/multiple-failover/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/multiple-failover/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/multiple-failover/src/main/resources/activemq/server0/activemq-configuration.xml
new file mode 100644
index 0000000..5dce0cd
--- /dev/null
+++ b/examples/jms/multiple-failover/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -0,0 +1,73 @@
+<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>
+
+ <ha-policy>
+ <shared-store>
+ <master/>
+ </shared-store>
+ </ha-policy>
+
+ <!-- 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>
+
+ <broadcast-groups>
+ <broadcast-group name="bg-group1">
+ <group-address>${udp-address:231.7.7.7}</group-address>
+ <group-port>9876</group-port>
+ <broadcast-period>1000</broadcast-period>
+ <connector-ref>netty-connector</connector-ref>
+ </broadcast-group>
+ </broadcast-groups>
+
+ <discovery-groups>
+ <discovery-group name="dg-group1">
+ <group-address>${udp-address:231.7.7.7}</group-address>
+ <group-port>9876</group-port>
+ <refresh-timeout>60000</refresh-timeout>
+ </discovery-group>
+ </discovery-groups>
+
+ <cluster-connections>
+ <cluster-connection name="my-cluster">
+ <address>jms</address>
+ <connector-ref>netty-connector</connector-ref>
+ <discovery-group-ref discovery-group-name="dg-group1"/>
+ </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>
+
+</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/multiple-failover/src/main/resources/activemq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/multiple-failover/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/multiple-failover/src/main/resources/activemq/server0/activemq-jms.xml
new file mode 100644
index 0000000..0d5c953
--- /dev/null
+++ b/examples/jms/multiple-failover/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/multiple-failover/src/main/resources/activemq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/multiple-failover/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/multiple-failover/src/main/resources/activemq/server0/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/multiple-failover/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/multiple-failover/src/main/resources/activemq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/multiple-failover/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/multiple-failover/src/main/resources/activemq/server1/activemq-configuration.xml
new file mode 100644
index 0000000..c930120
--- /dev/null
+++ b/examples/jms/multiple-failover/src/main/resources/activemq/server1/activemq-configuration.xml
@@ -0,0 +1,71 @@
+<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>
+
+ <ha-policy>
+ <shared-store>
+ <slave/>
+ </shared-store>
+ </ha-policy>
+
+ <!-- Connectors -->
+ <connectors>
+ <connector name="netty-connector">
+ <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
+ <param key="port" value="5446"/>
+ </connector>
+ </connectors>
+
+ <!-- Acceptors -->
+ <acceptors>
+ <acceptor name="netty-acceptor">
+ <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
+ <param key="port" value="5446"/>
+ </acceptor>
+ </acceptors>
+
+ <broadcast-groups>
+ <broadcast-group name="bg-group1">
+ <group-address>${udp-address:231.7.7.7}</group-address>
+ <group-port>9876</group-port>
+ <broadcast-period>1000</broadcast-period>
+ <connector-ref>netty-connector</connector-ref>
+ </broadcast-group>
+ </broadcast-groups>
+
+ <discovery-groups>
+ <discovery-group name="dg-group1">
+ <group-address>${udp-address:231.7.7.7}</group-address>
+ <group-port>9876</group-port>
+ <refresh-timeout>60000</refresh-timeout>
+ </discovery-group>
+ </discovery-groups>
+
+ <cluster-connections>
+ <cluster-connection name="my-cluster">
+ <address>jms</address>
+ <connector-ref>netty-connector</connector-ref>
+ <discovery-group-ref discovery-group-name="dg-group1"/>
+ </cluster-connection>
+ </cluster-connections>
+
+ <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/multiple-failover/src/main/resources/activemq/server1/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/multiple-failover/src/main/resources/activemq/server1/activemq-jms.xml b/examples/jms/multiple-failover/src/main/resources/activemq/server1/activemq-jms.xml
new file mode 100644
index 0000000..0d5c953
--- /dev/null
+++ b/examples/jms/multiple-failover/src/main/resources/activemq/server1/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/multiple-failover/src/main/resources/activemq/server1/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/multiple-failover/src/main/resources/activemq/server1/activemq-users.xml b/examples/jms/multiple-failover/src/main/resources/activemq/server1/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/multiple-failover/src/main/resources/activemq/server1/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/multiple-failover/src/main/resources/activemq/server2/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/multiple-failover/src/main/resources/activemq/server2/activemq-configuration.xml b/examples/jms/multiple-failover/src/main/resources/activemq/server2/activemq-configuration.xml
new file mode 100644
index 0000000..27bbe99
--- /dev/null
+++ b/examples/jms/multiple-failover/src/main/resources/activemq/server2/activemq-configuration.xml
@@ -0,0 +1,71 @@
+<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>
+
+ <ha-policy>
+ <shared-store>
+ <slave/>
+ </shared-store>
+ </ha-policy>
+
+ <!-- Connectors -->
+ <connectors>
+ <connector name="netty-connector">
+ <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
+ <param key="port" value="5447"/>
+ </connector>
+ </connectors>
+
+ <!-- Acceptors -->
+ <acceptors>
+ <acceptor name="netty-acceptor">
+ <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
+ <param key="port" value="5447"/>
+ </acceptor>
+ </acceptors>
+
+ <broadcast-groups>
+ <broadcast-group name="bg-group1">
+ <group-address>${udp-address:231.7.7.7}</group-address>
+ <group-port>9876</group-port>
+ <broadcast-period>1000</broadcast-period>
+ <connector-ref>netty-connector</connector-ref>
+ </broadcast-group>
+ </broadcast-groups>
+
+ <discovery-groups>
+ <discovery-group name="dg-group1">
+ <group-address>${udp-address:231.7.7.7}</group-address>
+ <group-port>9876</group-port>
+ <refresh-timeout>60000</refresh-timeout>
+ </discovery-group>
+ </discovery-groups>
+
+ <cluster-connections>
+ <cluster-connection name="my-cluster">
+ <address>jms</address>
+ <connector-ref>netty-connector</connector-ref>
+ <discovery-group-ref discovery-group-name="dg-group1"/>
+ </cluster-connection>
+ </cluster-connections>
+
+ <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/multiple-failover/src/main/resources/activemq/server2/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/multiple-failover/src/main/resources/activemq/server2/activemq-jms.xml b/examples/jms/multiple-failover/src/main/resources/activemq/server2/activemq-jms.xml
new file mode 100644
index 0000000..0d5c953
--- /dev/null
+++ b/examples/jms/multiple-failover/src/main/resources/activemq/server2/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/multiple-failover/src/main/resources/activemq/server2/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/multiple-failover/src/main/resources/activemq/server2/activemq-users.xml b/examples/jms/multiple-failover/src/main/resources/activemq/server2/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/multiple-failover/src/main/resources/activemq/server2/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/multiple-failover/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/multiple-failover/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/multiple-failover/src/main/resources/hornetq/server0/activemq-configuration.xml
deleted file mode 100644
index 5dce0cd..0000000
--- a/examples/jms/multiple-failover/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ /dev/null
@@ -1,73 +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>
-
- <ha-policy>
- <shared-store>
- <master/>
- </shared-store>
- </ha-policy>
-
- <!-- 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>
-
- <broadcast-groups>
- <broadcast-group name="bg-group1">
- <group-address>${udp-address:231.7.7.7}</group-address>
- <group-port>9876</group-port>
- <broadcast-period>1000</broadcast-period>
- <connector-ref>netty-connector</connector-ref>
- </broadcast-group>
- </broadcast-groups>
-
- <discovery-groups>
- <discovery-group name="dg-group1">
- <group-address>${udp-address:231.7.7.7}</group-address>
- <group-port>9876</group-port>
- <refresh-timeout>60000</refresh-timeout>
- </discovery-group>
- </discovery-groups>
-
- <cluster-connections>
- <cluster-connection name="my-cluster">
- <address>jms</address>
- <connector-ref>netty-connector</connector-ref>
- <discovery-group-ref discovery-group-name="dg-group1"/>
- </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>
-
-</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/multiple-failover/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/multiple-failover/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/multiple-failover/src/main/resources/hornetq/server0/activemq-jms.xml
deleted file mode 100644
index 0d5c953..0000000
--- a/examples/jms/multiple-failover/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/multiple-failover/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/multiple-failover/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/multiple-failover/src/main/resources/hornetq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/multiple-failover/src/main/resources/hornetq/server1/activemq-configuration.xml b/examples/jms/multiple-failover/src/main/resources/hornetq/server1/activemq-configuration.xml
deleted file mode 100644
index c930120..0000000
--- a/examples/jms/multiple-failover/src/main/resources/hornetq/server1/activemq-configuration.xml
+++ /dev/null
@@ -1,71 +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>
-
- <ha-policy>
- <shared-store>
- <slave/>
- </shared-store>
- </ha-policy>
-
- <!-- Connectors -->
- <connectors>
- <connector name="netty-connector">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
- <param key="port" value="5446"/>
- </connector>
- </connectors>
-
- <!-- Acceptors -->
- <acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- <param key="port" value="5446"/>
- </acceptor>
- </acceptors>
-
- <broadcast-groups>
- <broadcast-group name="bg-group1">
- <group-address>${udp-address:231.7.7.7}</group-address>
- <group-port>9876</group-port>
- <broadcast-period>1000</broadcast-period>
- <connector-ref>netty-connector</connector-ref>
- </broadcast-group>
- </broadcast-groups>
-
- <discovery-groups>
- <discovery-group name="dg-group1">
- <group-address>${udp-address:231.7.7.7}</group-address>
- <group-port>9876</group-port>
- <refresh-timeout>60000</refresh-timeout>
- </discovery-group>
- </discovery-groups>
-
- <cluster-connections>
- <cluster-connection name="my-cluster">
- <address>jms</address>
- <connector-ref>netty-connector</connector-ref>
- <discovery-group-ref discovery-group-name="dg-group1"/>
- </cluster-connection>
- </cluster-connections>
-
- <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/multiple-failover/src/main/resources/hornetq/server1/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/multiple-failover/src/main/resources/hornetq/server1/activemq-jms.xml b/examples/jms/multiple-failover/src/main/resources/hornetq/server1/activemq-jms.xml
deleted file mode 100644
index 0d5c953..0000000
--- a/examples/jms/multiple-failover/src/main/resources/hornetq/server1/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/multiple-failover/src/main/resources/hornetq/server1/activemq-users.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/multiple-failover/src/main/resources/hornetq/server1/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/multiple-failover/src/main/resources/hornetq/server2/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/multiple-failover/src/main/resources/hornetq/server2/activemq-configuration.xml b/examples/jms/multiple-failover/src/main/resources/hornetq/server2/activemq-configuration.xml
deleted file mode 100644
index 27bbe99..0000000
--- a/examples/jms/multiple-failover/src/main/resources/hornetq/server2/activemq-configuration.xml
+++ /dev/null
@@ -1,71 +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>
-
- <ha-policy>
- <shared-store>
- <slave/>
- </shared-store>
- </ha-policy>
-
- <!-- Connectors -->
- <connectors>
- <connector name="netty-connector">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
- <param key="port" value="5447"/>
- </connector>
- </connectors>
-
- <!-- Acceptors -->
- <acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- <param key="port" value="5447"/>
- </acceptor>
- </acceptors>
-
- <broadcast-groups>
- <broadcast-group name="bg-group1">
- <group-address>${udp-address:231.7.7.7}</group-address>
- <group-port>9876</group-port>
- <broadcast-period>1000</broadcast-period>
- <connector-ref>netty-connector</connector-ref>
- </broadcast-group>
- </broadcast-groups>
-
- <discovery-groups>
- <discovery-group name="dg-group1">
- <group-address>${udp-address:231.7.7.7}</group-address>
- <group-port>9876</group-port>
- <refresh-timeout>60000</refresh-timeout>
- </discovery-group>
- </discovery-groups>
-
- <cluster-connections>
- <cluster-connection name="my-cluster">
- <address>jms</address>
- <connector-ref>netty-connector</connector-ref>
- <discovery-group-ref discovery-group-name="dg-group1"/>
- </cluster-connection>
- </cluster-connections>
-
- <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/multiple-failover/src/main/resources/hornetq/server2/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/multiple-failover/src/main/resources/hornetq/server2/activemq-jms.xml b/examples/jms/multiple-failover/src/main/resources/hornetq/server2/activemq-jms.xml
deleted file mode 100644
index 0d5c953..0000000
--- a/examples/jms/multiple-failover/src/main/resources/hornetq/server2/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/multiple-failover/src/main/resources/hornetq/server2/activemq-users.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/multiple-failover/src/main/resources/hornetq/server2/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/multiple-failover/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/multiple-failover/src/main/resources/jndi.properties b/examples/jms/multiple-failover/src/main/resources/jndi.properties
new file mode 100644
index 0000000..8fda7c0
--- /dev/null
+++ b/examples/jms/multiple-failover/src/main/resources/jndi.properties
@@ -0,0 +1,7 @@
+java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
+java.naming.provider.url=tcp://localhost:5445
+connection.ConnectionFactory.ha=true
+connection.ConnectionFactory.retryInterval=1000
+connection.ConnectionFactory.retryIntervalMultiplier=1.0
+connection.ConnectionFactory.reconnectAttempts=-1
+queue.queue/exampleQueue=exampleQueue
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/no-consumer-buffering/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/no-consumer-buffering/pom.xml b/examples/jms/no-consumer-buffering/pom.xml
index b205475..cfca702 100644
--- a/examples/jms/no-consumer-buffering/pom.xml
+++ b/examples/jms/no-consumer-buffering/pom.xml
@@ -51,9 +51,6 @@
</goals>
<configuration>
<clientClass>org.apache.activemq.jms.example.NoConsumerBufferingExample</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/no-consumer-buffering/src/main/java/org/apache/activemq/jms/example/NoConsumerBufferingExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/no-consumer-buffering/src/main/java/org/apache/activemq/jms/example/NoConsumerBufferingExample.java b/examples/jms/no-consumer-buffering/src/main/java/org/apache/activemq/jms/example/NoConsumerBufferingExample.java
index 98af21d..4fa4f83 100644
--- a/examples/jms/no-consumer-buffering/src/main/java/org/apache/activemq/jms/example/NoConsumerBufferingExample.java
+++ b/examples/jms/no-consumer-buffering/src/main/java/org/apache/activemq/jms/example/NoConsumerBufferingExample.java
@@ -48,7 +48,7 @@ public class NoConsumerBufferingExample 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/no-consumer-buffering/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/no-consumer-buffering/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/no-consumer-buffering/src/main/resources/activemq/server0/activemq-configuration.xml
new file mode 100644
index 0000000..52d9570
--- /dev/null
+++ b/examples/jms/no-consumer-buffering/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/no-consumer-buffering/src/main/resources/activemq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/no-consumer-buffering/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/no-consumer-buffering/src/main/resources/activemq/server0/activemq-jms.xml
new file mode 100644
index 0000000..0d5c953
--- /dev/null
+++ b/examples/jms/no-consumer-buffering/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/no-consumer-buffering/src/main/resources/activemq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/no-consumer-buffering/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/no-consumer-buffering/src/main/resources/activemq/server0/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/no-consumer-buffering/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/no-consumer-buffering/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/no-consumer-buffering/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/no-consumer-buffering/src/main/resources/hornetq/server0/activemq-configuration.xml
deleted file mode 100644
index e0acd1d..0000000
--- a/examples/jms/no-consumer-buffering/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/no-consumer-buffering/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/no-consumer-buffering/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/no-consumer-buffering/src/main/resources/hornetq/server0/activemq-jms.xml
deleted file mode 100644
index 0d5c953..0000000
--- a/examples/jms/no-consumer-buffering/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/no-consumer-buffering/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/no-consumer-buffering/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/no-consumer-buffering/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/no-consumer-buffering/src/main/resources/jndi.properties b/examples/jms/no-consumer-buffering/src/main/resources/jndi.properties
new file mode 100644
index 0000000..d69b1bf
--- /dev/null
+++ b/examples/jms/no-consumer-buffering/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.consumerWindowSize=0
+queue.queue/exampleQueue=exampleQueue
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/non-transaction-failover/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/non-transaction-failover/pom.xml b/examples/jms/non-transaction-failover/pom.xml
index 0bd9fa5..4ca1716 100644
--- a/examples/jms/non-transaction-failover/pom.xml
+++ b/examples/jms/non-transaction-failover/pom.xml
@@ -41,18 +41,12 @@
<name>build.directory</name>
<value>${basedir}/target/</value>
</property>
- </systemProperties>
- <hornetqConfigurationDir>${basedir}/target/classes/activemq/server0</hornetqConfigurationDir>
- <systemProperties>
- <property>
- <name>build.directory</name>
- <value>${basedir}/target/</value>
- </property>
<property>
<name>udp-address</name>
<value>${udp-address}</value>
</property>
</systemProperties>
+ <configurationDir>${basedir}/target/classes/activemq/server0</configurationDir>
</configuration>
</execution>
<execution>
@@ -61,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>
@@ -84,10 +76,6 @@
</goals>
<configuration>
<clientClass>org.apache.activemq.jms.example.NonTransactionFailoverExample</clientClass>
- <args>
- <param>tcp://localhost:5445</param>
- <param>tcp://localhost:5446</param>
- </args>
<systemProperties>
<property>
<name>exampleConfigDir</name>
@@ -102,7 +90,7 @@
<goal>stop</goal>
</goals>
<configuration>
- <hornetqConfigurationDir>${basedir}/target/classes/activemq/server0</hornetqConfigurationDir>
+ <configurationDir>${basedir}/target/classes/activemq/server0</configurationDir>
</configuration>
</execution>
<execution>
@@ -111,7 +99,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/non-transaction-failover/src/main/java/org/apache/activemq/jms/example/NonTransactionFailoverExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/non-transaction-failover/src/main/java/org/apache/activemq/jms/example/NonTransactionFailoverExample.java b/examples/jms/non-transaction-failover/src/main/java/org/apache/activemq/jms/example/NonTransactionFailoverExample.java
index fc37097..2b346a5 100644
--- a/examples/jms/non-transaction-failover/src/main/java/org/apache/activemq/jms/example/NonTransactionFailoverExample.java
+++ b/examples/jms/non-transaction-failover/src/main/java/org/apache/activemq/jms/example/NonTransactionFailoverExample.java
@@ -53,7 +53,7 @@ public class NonTransactionFailoverExample extends ActiveMQExample
try
{
// Step 1. Get an initial context for looking up JNDI from the server #1
- initialContext = getContext(0);
+ initialContext = new InitialContext();
// Step 2. Look up the JMS resources from JNDI
Queue queue = (Queue)initialContext.lookup("queue/exampleQueue");
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/non-transaction-failover/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/non-transaction-failover/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/non-transaction-failover/src/main/resources/activemq/server0/activemq-configuration.xml
new file mode 100644
index 0000000..461bff8
--- /dev/null
+++ b/examples/jms/non-transaction-failover/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -0,0 +1,71 @@
+<configuration xmlns="urn:activemq"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
+
+ <ha-policy>
+ <shared-store>
+ <master/>
+ </shared-store>
+ </ha-policy>
+
+ <!-- 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>
+
+ <broadcast-groups>
+ <broadcast-group name="bg-group1">
+ <group-address>${udp-address:231.7.7.7}</group-address>
+ <group-port>9876</group-port>
+ <broadcast-period>1000</broadcast-period>
+ <connector-ref>netty-connector</connector-ref>
+ </broadcast-group>
+ </broadcast-groups>
+
+ <discovery-groups>
+ <discovery-group name="dg-group1">
+ <group-address>${udp-address:231.7.7.7}</group-address>
+ <group-port>9876</group-port>
+ <refresh-timeout>60000</refresh-timeout>
+ </discovery-group>
+ </discovery-groups>
+
+ <cluster-connections>
+ <cluster-connection name="my-cluster">
+ <address>jms</address>
+ <connector-ref>netty-connector</connector-ref>
+ <discovery-group-ref discovery-group-name="dg-group1"/>
+ </cluster-connection>
+ </cluster-connections>
+
+ <large-messages-directory>target/server0/data/large-messages</large-messages-directory>
+ <bindings-directory>target/server0/data/bindings</bindings-directory>
+ <journal-directory>target/server0/data/journal</journal-directory>
+ <paging-directory>target/server0/data/paging</paging-directory>
+ <!-- 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/non-transaction-failover/src/main/resources/activemq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/non-transaction-failover/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/non-transaction-failover/src/main/resources/activemq/server0/activemq-jms.xml
new file mode 100644
index 0000000..0d5c953
--- /dev/null
+++ b/examples/jms/non-transaction-failover/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/non-transaction-failover/src/main/resources/activemq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/non-transaction-failover/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/non-transaction-failover/src/main/resources/activemq/server0/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/non-transaction-failover/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/non-transaction-failover/src/main/resources/activemq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/non-transaction-failover/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/non-transaction-failover/src/main/resources/activemq/server1/activemq-configuration.xml
new file mode 100644
index 0000000..4419628
--- /dev/null
+++ b/examples/jms/non-transaction-failover/src/main/resources/activemq/server1/activemq-configuration.xml
@@ -0,0 +1,72 @@
+<configuration xmlns="urn:activemq"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
+
+ <ha-policy>
+ <shared-store>
+ <slave/>
+ </shared-store>
+ </ha-policy>
+
+ <!-- Connectors -->
+
+ <connectors>
+ <connector name="netty-connector">
+ <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
+ <param key="port" value="5446"/>
+ </connector>
+ </connectors>
+
+ <!-- Acceptors -->
+ <acceptors>
+ <acceptor name="netty-acceptor">
+ <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
+ <param key="port" value="5446"/>
+ </acceptor>
+ </acceptors>
+
+ <broadcast-groups>
+ <broadcast-group name="bg-group1">
+ <group-address>${udp-address:231.7.7.7}</group-address>
+ <group-port>9876</group-port>
+ <broadcast-period>1000</broadcast-period>
+ <connector-ref>netty-connector</connector-ref>
+ </broadcast-group>
+ </broadcast-groups>
+
+ <discovery-groups>
+ <discovery-group name="dg-group1">
+ <group-address>${udp-address:231.7.7.7}</group-address>
+ <group-port>9876</group-port>
+ <refresh-timeout>60000</refresh-timeout>
+ </discovery-group>
+ </discovery-groups>
+
+ <cluster-connections>
+ <cluster-connection name="my-cluster">
+ <address>jms</address>
+ <connector-ref>netty-connector</connector-ref>
+ <discovery-group-ref discovery-group-name="dg-group1"/>
+ </cluster-connection>
+ </cluster-connections>
+
+ <large-messages-directory>target/server0/data/large-messages</large-messages-directory>
+ <bindings-directory>target/server0/data/bindings</bindings-directory>
+ <journal-directory>target/server0/data/journal</journal-directory>
+ <paging-directory>target/server0/data/paging</paging-directory>
+
+ <!-- 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/non-transaction-failover/src/main/resources/activemq/server1/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/non-transaction-failover/src/main/resources/activemq/server1/activemq-jms.xml b/examples/jms/non-transaction-failover/src/main/resources/activemq/server1/activemq-jms.xml
new file mode 100644
index 0000000..0d5c953
--- /dev/null
+++ b/examples/jms/non-transaction-failover/src/main/resources/activemq/server1/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/non-transaction-failover/src/main/resources/activemq/server1/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/non-transaction-failover/src/main/resources/activemq/server1/activemq-users.xml b/examples/jms/non-transaction-failover/src/main/resources/activemq/server1/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/non-transaction-failover/src/main/resources/activemq/server1/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/non-transaction-failover/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/non-transaction-failover/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/non-transaction-failover/src/main/resources/hornetq/server0/activemq-configuration.xml
deleted file mode 100644
index 461bff8..0000000
--- a/examples/jms/non-transaction-failover/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<configuration xmlns="urn:activemq"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
-
- <ha-policy>
- <shared-store>
- <master/>
- </shared-store>
- </ha-policy>
-
- <!-- 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>
-
- <broadcast-groups>
- <broadcast-group name="bg-group1">
- <group-address>${udp-address:231.7.7.7}</group-address>
- <group-port>9876</group-port>
- <broadcast-period>1000</broadcast-period>
- <connector-ref>netty-connector</connector-ref>
- </broadcast-group>
- </broadcast-groups>
-
- <discovery-groups>
- <discovery-group name="dg-group1">
- <group-address>${udp-address:231.7.7.7}</group-address>
- <group-port>9876</group-port>
- <refresh-timeout>60000</refresh-timeout>
- </discovery-group>
- </discovery-groups>
-
- <cluster-connections>
- <cluster-connection name="my-cluster">
- <address>jms</address>
- <connector-ref>netty-connector</connector-ref>
- <discovery-group-ref discovery-group-name="dg-group1"/>
- </cluster-connection>
- </cluster-connections>
-
- <large-messages-directory>target/server0/data/large-messages</large-messages-directory>
- <bindings-directory>target/server0/data/bindings</bindings-directory>
- <journal-directory>target/server0/data/journal</journal-directory>
- <paging-directory>target/server0/data/paging</paging-directory>
- <!-- 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/non-transaction-failover/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/non-transaction-failover/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/non-transaction-failover/src/main/resources/hornetq/server0/activemq-jms.xml
deleted file mode 100644
index 0d5c953..0000000
--- a/examples/jms/non-transaction-failover/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/non-transaction-failover/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/non-transaction-failover/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/non-transaction-failover/src/main/resources/hornetq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/non-transaction-failover/src/main/resources/hornetq/server1/activemq-configuration.xml b/examples/jms/non-transaction-failover/src/main/resources/hornetq/server1/activemq-configuration.xml
deleted file mode 100644
index 4419628..0000000
--- a/examples/jms/non-transaction-failover/src/main/resources/hornetq/server1/activemq-configuration.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<configuration xmlns="urn:activemq"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
-
- <ha-policy>
- <shared-store>
- <slave/>
- </shared-store>
- </ha-policy>
-
- <!-- Connectors -->
-
- <connectors>
- <connector name="netty-connector">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
- <param key="port" value="5446"/>
- </connector>
- </connectors>
-
- <!-- Acceptors -->
- <acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- <param key="port" value="5446"/>
- </acceptor>
- </acceptors>
-
- <broadcast-groups>
- <broadcast-group name="bg-group1">
- <group-address>${udp-address:231.7.7.7}</group-address>
- <group-port>9876</group-port>
- <broadcast-period>1000</broadcast-period>
- <connector-ref>netty-connector</connector-ref>
- </broadcast-group>
- </broadcast-groups>
-
- <discovery-groups>
- <discovery-group name="dg-group1">
- <group-address>${udp-address:231.7.7.7}</group-address>
- <group-port>9876</group-port>
- <refresh-timeout>60000</refresh-timeout>
- </discovery-group>
- </discovery-groups>
-
- <cluster-connections>
- <cluster-connection name="my-cluster">
- <address>jms</address>
- <connector-ref>netty-connector</connector-ref>
- <discovery-group-ref discovery-group-name="dg-group1"/>
- </cluster-connection>
- </cluster-connections>
-
- <large-messages-directory>target/server0/data/large-messages</large-messages-directory>
- <bindings-directory>target/server0/data/bindings</bindings-directory>
- <journal-directory>target/server0/data/journal</journal-directory>
- <paging-directory>target/server0/data/paging</paging-directory>
-
- <!-- 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/non-transaction-failover/src/main/resources/hornetq/server1/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/non-transaction-failover/src/main/resources/hornetq/server1/activemq-jms.xml b/examples/jms/non-transaction-failover/src/main/resources/hornetq/server1/activemq-jms.xml
deleted file mode 100644
index 0d5c953..0000000
--- a/examples/jms/non-transaction-failover/src/main/resources/hornetq/server1/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/non-transaction-failover/src/main/resources/hornetq/server1/activemq-users.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/non-transaction-failover/src/main/resources/hornetq/server1/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/non-transaction-failover/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/non-transaction-failover/src/main/resources/jndi.properties b/examples/jms/non-transaction-failover/src/main/resources/jndi.properties
new file mode 100644
index 0000000..8fda7c0
--- /dev/null
+++ b/examples/jms/non-transaction-failover/src/main/resources/jndi.properties
@@ -0,0 +1,7 @@
+java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
+java.naming.provider.url=tcp://localhost:5445
+connection.ConnectionFactory.ha=true
+connection.ConnectionFactory.retryInterval=1000
+connection.ConnectionFactory.retryIntervalMultiplier=1.0
+connection.ConnectionFactory.reconnectAttempts=-1
+queue.queue/exampleQueue=exampleQueue
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/openwire/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/openwire/pom.xml b/examples/jms/openwire/pom.xml
index b129d99..d6ff7a7 100644
--- a/examples/jms/openwire/pom.xml
+++ b/examples/jms/openwire/pom.xml
@@ -55,9 +55,6 @@
</goals>
<configuration>
<clientClass>org.apache.activemq.jms.example.OpenWireExample</clientClass>
- <args>
- <param>tcp://localhost:5445</param>
- </args>
</configuration>
</execution>
<execution>
@@ -111,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/openwire/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/openwire/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/openwire/src/main/resources/activemq/server0/activemq-configuration.xml
new file mode 100644
index 0000000..8932ff8
--- /dev/null
+++ b/examples/jms/openwire/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -0,0 +1,50 @@
+<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/activemq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/openwire/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/openwire/src/main/resources/activemq/server0/activemq-jms.xml
new file mode 100644
index 0000000..0d5c953
--- /dev/null
+++ b/examples/jms/openwire/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/openwire/src/main/resources/activemq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/openwire/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/openwire/src/main/resources/activemq/server0/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/openwire/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
[16/37] activemq-6 git commit: ACTIVEMQ6-41 Drop Java EE examples
Posted by jb...@apache.org.
ACTIVEMQ6-41 Drop Java EE examples
Project: http://git-wip-us.apache.org/repos/asf/activemq-6/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-6/commit/76d0cee5
Tree: http://git-wip-us.apache.org/repos/asf/activemq-6/tree/76d0cee5
Diff: http://git-wip-us.apache.org/repos/asf/activemq-6/diff/76d0cee5
Branch: refs/heads/master
Commit: 76d0cee5f5462e29b1d739a038b5fff899fd8a35
Parents: 60576a7
Author: jbertram <jb...@redhat.com>
Authored: Fri Dec 5 13:44:14 2014 -0600
Committer: jbertram <jb...@redhat.com>
Committed: Wed Dec 10 09:49:12 2014 -0600
----------------------------------------------------------------------
examples/javaee/README.md | 12 -
examples/javaee/ejb-jms-transaction/pom.xml | 14 -
examples/javaee/ejb-jms-transaction/readme.html | 203 --------
.../configuration/application-roles.properties | 22 -
.../configuration/application-users.properties | 24 -
.../standalone/configuration/logging.properties | 47 --
.../configuration/mgmt-users.properties | 24 -
.../configuration/standalone-example.xml | 502 ------------------
.../javaee/example/EJBClientExample.java | 98 ----
.../javaee/example/server/SendMessageBean.java | 146 ------
.../example/server/SendMessageService.java | 30 --
.../main/resources/jboss-ejb-client.properties | 7 -
.../examples/MDBEJBTXRequiredRunnerTest.java | 56 --
.../src/test/resources/arquillian.xml | 34 --
examples/javaee/jca-config/pom.xml | 64 ---
examples/javaee/jca-config/readme.html | 109 ----
.../configuration/application-roles.properties | 22 -
.../configuration/application-users.properties | 24 -
.../standalone/configuration/logging.properties | 47 --
.../configuration/mgmt-users.properties | 24 -
.../configuration/standalone-example.xml | 493 ------------------
.../configuration/standalone-example2.xml | 496 ------------------
.../javaee/example/MDBRemoteClientExample.java | 68 ---
.../javaee/example/server/MDBQueueA.java | 55 --
.../javaee/example/server2/MDBQueueB.java | 59 ---
.../javaee/example/server2/StatelessSender.java | 59 ---
.../example/server2/StatelessSenderService.java | 31 --
.../main/resources/jboss-ejb-client.properties | 7 -
.../example/server/ExampleRunner2Test.java | 107 ----
.../src/test/resources/arquillian.xml | 48 --
.../resources/jboss-deployment-structure.xml | 7 -
examples/javaee/jca-remote/pom.xml | 64 ---
examples/javaee/jca-remote/readme.html | 160 ------
.../configuration/application-roles.properties | 22 -
.../configuration/application-users.properties | 24 -
.../standalone/configuration/logging.properties | 47 --
.../configuration/mgmt-users.properties | 24 -
.../configuration/standalone-example.xml | 496 ------------------
.../configuration/standalone-example2.xml | 493 ------------------
.../example/MDBRemoteServerClientExample.java | 103 ----
.../javaee/example/server/MDBQueue.java | 79 ---
.../javaee/examples/JCARemoteRunnerTest.java | 89 ----
.../src/test/resources/arquillian.xml | 47 --
.../resources/jboss-deployment-structure.xml | 7 -
examples/javaee/jms-bridge/pom.xml | 14 -
examples/javaee/jms-bridge/readme.html | 168 ------
.../configuration/application-roles.properties | 22 -
.../configuration/application-users.properties | 24 -
.../standalone/configuration/logging.properties | 47 --
.../configuration/mgmt-users.properties | 24 -
.../configuration/standalone-example.xml | 508 ------------------
.../javaee/example/JMSBridgeExample.java | 116 -----
.../javaee/examples/JMSBridgeRunnerTest.java | 38 --
.../src/test/resources/arquillian.xml | 34 --
examples/javaee/jms-context-injection/pom.xml | 14 -
.../javaee/jms-context-injection/readme.html | 108 ----
.../configuration/application-roles.properties | 22 -
.../configuration/application-users.properties | 24 -
.../standalone/configuration/logging.properties | 47 --
.../configuration/mgmt-users.properties | 24 -
.../configuration/standalone-example.xml | 493 ------------------
.../JmsContextInjectionClientExample.java | 87 ----
.../server/JmsContextInjectionExample.java | 80 ---
.../examples/JmsContextInjectionRunnerTest.java | 62 ---
.../src/test/resources/arquillian.xml | 34 --
examples/javaee/mdb-bmt/pom.xml | 14 -
examples/javaee/mdb-bmt/readme.html | 113 ----
.../configuration/application-roles.properties | 22 -
.../configuration/application-users.properties | 24 -
.../standalone/configuration/logging.properties | 47 --
.../configuration/mgmt-users.properties | 24 -
.../configuration/standalone-example.xml | 489 -----------------
.../javaee/example/MDB_BMTClientExample.java | 86 ---
.../javaee/example/server/MDB_BMTExample.java | 77 ---
.../example/server/ExampleRunnerTest.java | 54 --
.../mdb-bmt/src/test/resources/arquillian.xml | 34 --
.../mdb-cmt-setrollbackonly-with-dlq/pom.xml | 14 -
.../readme.html | 127 -----
.../configuration/application-roles.properties | 22 -
.../configuration/application-users.properties | 24 -
.../standalone/configuration/logging.properties | 47 --
.../configuration/mgmt-users.properties | 24 -
.../configuration/standalone-example.xml | 494 ------------------
...CMT_SetRollbackOnlyWithDLQClientExample.java | 103 ----
.../MDB_CMT_SetRollbackOnlyWithDLQExample.java | 70 ---
.../MDBCMTSetRollbackOnlyWithDLQRunnerTest.java | 52 --
.../src/test/resources/arquillian.xml | 34 --
examples/javaee/mdb-cmt-setrollbackonly/pom.xml | 14 -
.../javaee/mdb-cmt-setrollbackonly/readme.html | 112 ----
.../configuration/application-roles.properties | 22 -
.../configuration/application-users.properties | 24 -
.../standalone/configuration/logging.properties | 47 --
.../configuration/mgmt-users.properties | 24 -
.../configuration/standalone-example.xml | 489 -----------------
.../MDB_CMT_SetRollbackOnlyClientExample.java | 87 ----
.../server/MDB_CMT_SetRollbackOnlyExample.java | 76 ---
.../MDBCMTSetRollbackOnlyRunnerTest.java | 54 --
.../src/test/resources/arquillian.xml | 34 --
examples/javaee/mdb-cmt-tx-local/pom.xml | 14 -
examples/javaee/mdb-cmt-tx-local/readme.html | 125 -----
.../configuration/application-roles.properties | 22 -
.../configuration/application-users.properties | 24 -
.../standalone/configuration/logging.properties | 47 --
.../configuration/mgmt-users.properties | 24 -
.../configuration/standalone-example.xml | 489 -----------------
.../example/MDB_CMT_TxLocalClientExample.java | 87 ----
.../example/server/MDB_CMT_TxLocalExample.java | 96 ----
.../example/MDBCMTSetLocalTXRunnerTest.java | 54 --
.../src/test/resources/arquillian.xml | 34 --
.../javaee/mdb-cmt-tx-not-supported/pom.xml | 14 -
.../javaee/mdb-cmt-tx-not-supported/readme.html | 116 -----
.../configuration/application-roles.properties | 22 -
.../configuration/application-users.properties | 24 -
.../standalone/configuration/logging.properties | 47 --
.../configuration/mgmt-users.properties | 24 -
.../configuration/standalone-example.xml | 489 -----------------
.../MDB_CMT_TxNotSupportedClientExample.java | 86 ---
.../example/server/MDB_CMT_TxNotSupported.java | 79 ---
.../MDBCMTSetTXNotSupportedRunnerTest.java | 54 --
.../src/test/resources/arquillian.xml | 34 --
examples/javaee/mdb-cmt-tx-required/pom.xml | 14 -
examples/javaee/mdb-cmt-tx-required/readme.html | 115 ----
.../configuration/application-roles.properties | 22 -
.../configuration/application-users.properties | 24 -
.../standalone/configuration/logging.properties | 47 --
.../configuration/mgmt-users.properties | 24 -
.../configuration/standalone-example.xml | 489 -----------------
.../MDB_CMT_TxRequiredClientExample.java | 92 ----
.../server/MDB_CMT_TxRequiredExample.java | 60 ---
.../examples/MDBCMTSetTXRequiredRunnerTest.java | 57 --
.../src/test/resources/arquillian.xml | 34 --
examples/javaee/mdb-message-selector/pom.xml | 14 -
.../javaee/mdb-message-selector/readme.html | 127 -----
.../configuration/application-roles.properties | 22 -
.../configuration/application-users.properties | 24 -
.../standalone/configuration/logging.properties | 47 --
.../configuration/mgmt-users.properties | 24 -
.../configuration/standalone-example.xml | 489 -----------------
.../MDBMessageSelectorClientExample.java | 98 ----
.../server/MDBMessageSelectorExample.java | 64 ---
.../MDBCMTSetMessageSelectorRunnerTest.java | 54 --
.../src/test/resources/arquillian.xml | 34 --
.../javaee/mdb-remote-failover-static/pom.xml | 90 ----
.../mdb-remote-failover-static/readme.html | 165 ------
.../configuration/application-roles.properties | 22 -
.../configuration/application-users.properties | 24 -
.../standalone/configuration/logging.properties | 47 --
.../configuration/mgmt-users.properties | 24 -
.../configuration/standalone-backup.xml | 511 ------------------
.../configuration/standalone-example.xml | 508 ------------------
.../configuration/standalone-live.xml | 513 ------------------
.../MDBRemoteFailoverStaticClientExample.java | 130 -----
.../server/MDBRemoteFailoverStaticExample.java | 90 ----
.../javaee/example/server/ServerKiller.java | 25 -
.../examples/FailoverStaticRunnerTest.java | 101 ----
.../src/test/resources/arquillian.xml | 57 --
.../resources/jboss-deployment-structure.xml | 7 -
examples/javaee/mdb-remote-failover/pom.xml | 90 ----
examples/javaee/mdb-remote-failover/readme.html | 165 ------
.../configuration/application-roles.properties | 22 -
.../configuration/application-users.properties | 24 -
.../standalone/configuration/logging.properties | 47 --
.../configuration/mgmt-users.properties | 24 -
.../configuration/standalone-backup.xml | 519 ------------------
.../configuration/standalone-example.xml | 504 ------------------
.../configuration/standalone-live.xml | 521 -------------------
.../example/MDBRemoteFailoverClientExample.java | 122 -----
.../server/MDBRemoteFailoverExample.java | 98 ----
.../javaee/example/server/ServerKiller.java | 25 -
.../javaee/examples/FailoverRunnerTest.java | 98 ----
.../src/test/resources/arquillian.xml | 57 --
.../resources/jboss-deployment-structure.xml | 7 -
examples/javaee/mdb-tx-send/pom.xml | 14 -
examples/javaee/mdb-tx-send/readme.html | 155 ------
.../configuration/application-roles.properties | 22 -
.../configuration/application-users.properties | 24 -
.../standalone/configuration/logging.properties | 47 --
.../configuration/mgmt-users.properties | 24 -
.../configuration/standalone-example.xml | 493 ------------------
.../example/MDBMessageSendTxClientExample.java | 101 ----
.../example/server/MDBMessageSendTxExample.java | 99 ----
.../javaee/examples/MDBCMTTxSendRunnerTest.java | 57 --
.../src/test/resources/arquillian.xml | 34 --
.../resources/jboss-deployment-structure.xml | 7 -
examples/javaee/pom.xml | 181 -------
examples/javaee/xarecovery/pom.xml | 14 -
examples/javaee/xarecovery/readme.html | 201 -------
.../configuration/application-roles.properties | 22 -
.../configuration/application-users.properties | 24 -
.../standalone/configuration/logging.properties | 47 --
.../configuration/mgmt-users.properties | 24 -
.../configuration/standalone-example.xml | 489 -----------------
.../example/XARecoveryExampleStepOne.java | 81 ---
.../example/XARecoveryExampleStepTwo.java | 105 ----
.../example/server/XARecoveryExampleBean.java | 175 -------
.../server/XARecoveryExampleService.java | 27 -
.../main/resources/jboss-ejb-client.properties | 7 -
.../javaee/examples/XARecoveryRunnerTest.java | 100 ----
.../src/test/resources/arquillian.xml | 34 --
199 files changed, 20787 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/README.md
----------------------------------------------------------------------
diff --git a/examples/javaee/README.md b/examples/javaee/README.md
deleted file mode 100644
index faa5a5a..0000000
--- a/examples/javaee/README.md
+++ /dev/null
@@ -1,12 +0,0 @@
-Running the Java EE examples
-========================
-
-To run a javaee example first make sure you have WildFly installed, the examples were tested against against [8.0.0.Final](http://wildfly.org/downloads/).
-
-Then set the JBOSS_HOME property to your installation, something like:
-
-export JBOSS_HOME=/home/user/wildfly-8.0.0.Final
-
-Then simply cd into the directory of the example you want to run and 'mvn test'.
-
-The examples use [Arquillian](http://www.jboss.org/arquillian.html) to start the JBoss server and to run the example itself.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/ejb-jms-transaction/pom.xml
----------------------------------------------------------------------
diff --git a/examples/javaee/ejb-jms-transaction/pom.xml b/examples/javaee/ejb-jms-transaction/pom.xml
deleted file mode 100644
index f63207a..0000000
--- a/examples/javaee/ejb-jms-transaction/pom.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.activemq.example.javaee</groupId>
- <artifactId>javaee-examples</artifactId>
- <version>6.0.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>activemq-javaee-ejb-jms-example</artifactId>
- <packaging>jar</packaging>
- <name>ActiveMQ6 Java EE MDB EJB Transaction Example</name>
-</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/ejb-jms-transaction/readme.html
----------------------------------------------------------------------
diff --git a/examples/javaee/ejb-jms-transaction/readme.html b/examples/javaee/ejb-jms-transaction/readme.html
deleted file mode 100644
index 7c950ce..0000000
--- a/examples/javaee/ejb-jms-transaction/readme.html
+++ /dev/null
@@ -1,203 +0,0 @@
-<html>
- <head>
- <title>ActiveMQ EJB/JMS Transaction Example</title>
- <link rel="stylesheet" type="text/css" href="../../common/common.css" />
- <link rel="stylesheet" type="text/css" href="../../common/prettify.css" />
- <script type="text/javascript" src="../../common/prettify.js"></script>
- </head>
- <body onload="prettyPrint()">
- <h1>EJB/JMS Transaction Example</h1>
-
- <p>The example application will invoke an EJB which is deployed within WildFly which will:</p>
- <ol>
- <li>start an XA transaction</li>
- <li>send a JMS message</li>
- <li>update an in-memory database</li>
- <li>commit the transaction</li>
- </ol>
- <p>The example application will then receive the message sent by the EJB.</p>
-
- <h2>WildFly configuration</h2>
-
- <p>The example leverages the Arquillian framework to run a WildFly instance and deploy the MDB.</p>
-
- <h2>Example step-by-step</h2>
-
- <p><i>download WildFly 8.0.0.Final from <a href="http://wildfly.org/downloads/">here</a> and install.</i></p>
- <p><i>set the JBOSS_HOME property to point to the WildFly install directory</i></p>
- <p><i>type <code>mvn verify</code> from the example directory to run</i></p>
-
- <p>The example code is composed of two main classes:</p>
- <ul>
- <li><code>EJBClientExample</code></li> - the example application
- <li><code>SendMessageBean</code></li> - a Stateless EJB with a remote interface
- </ul>
-
- <h3>Example Application</h3>
-
- <p>Let's take a look at EJBClientExample first.</p>
-
- <ol>
- <li>First we need to get an initial context so we can look-up the EJB. This initial context will get it's properties from the jboss-ejb-client.properties.</li>
- <pre class="prettyprint">
- Properties env = new Properties();
- env.put(Context.URL_PKG_PREFIXES, "org.jboss.ejb.client.naming");
- InitialContext initialContext = new InitialContext();
- </pre>
-
- <li>We look up the EJB</li>
- <pre class="prettyprint">
- SendMessageService service = (SendMessageService) initialContext.lookup("ejb:/test//SendMessageBean!org.apache.activemq.javaee.example.server.SendMessageService");
- </pre>
-
- <li>We create the DB table which will be updated if it does not already exist</li>
- <pre class="prettyprint">
- service.createTable();
- </pre>
-
- <li>We invoke the EJB's <code>sendAndUpdate</code> method. This method will send a JMS text message (with the text passed in parameter)
- and insert a row in the database table with the text and the message's JMS Message ID</li>
- <pre class="prettyprint">
- service.sendAndUpdate("This is a text message");
- </pre>
-
- <p><em>We will now consume the JMS message which was sent by the EJB at step 4.</em></p>
-
- <li>We need to get a new initial context so we can look-up the JMS connection factory and destination objects from JNDI.</li>
- <pre class="prettyprint">
- env = new Properties();
- env.put(Context.INITIAL_CONTEXT_FACTORY, "org.jboss.naming.remote.client.InitialContextFactory");
- env.put(Context.PROVIDER_URL, "http-remoting://localhost:8080");
- initialContext = new InitialContext(env);
- </pre>
-
- <li>We look up the JMS connection factory</li>
- <pre class="prettyprint">
- ConnectionFactory cf = (ConnectionFactory)initialContext.lookup("jms/RemoteConnectionFactory");
- </pre>
-
- <li>We lookup the JMS queue</li>
- <pre class="prettyprint">
- Queue queue = (Queue)initialContext.lookup("jms/queues/testQueue");
- </pre>
-
- <li>We create a connection, a session and a message consumer for the queue</li>
- <pre class="prettyprint">
- connection = cf.createConnection("guest", "password");
- Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
- MessageConsumer consumer = session.createConsumer(queue);
- </pre>
-
- <li>We start the JMS connection</li>
- <pre class="prettyprint">
- connection.start();
- </pre>
-
- <li>We receive a message from the queue. It corresponds to the message sent by the EJB</li>
- <pre class="prettyprint">
- TextMessage messageReceived = (TextMessage)consumer.receive(5000);
- System.out.println("Received message: " + messageReceived.getText() + " (" + messageReceived.getJMSMessageID() + ")");
- </pre>
-
- <li>And finally, <b>always</b> remember to close your JMS connections and resources after use, in a <code>finally</code> block. Closing a JMS connection will automatically close all of its sessions, consumers, producer and browser objects</li>
-
- <pre class="prettyprint">
- finally
- {
- if (initialContext != null)
- {
- initialContext.close();
- }
- if (connection != null)
- {
- connection.close();
- }
- }
- </pre>
- </ol>
-
- <h3>EJB Example</h3>
-
- <p>Let's now take a look at the EJB example</p>
-
- <ol>
- <li>First, we create a new initial context</li>
- <pre class="prettyprint">
- ic = new InitialContext();
- </pre>
-
- <li>We look up the JMS <em>XA</em> Connection Factory (which is bound to <code>java:/JmsXA</code>)</li>
- <pre class="prettyprint">
- ConnectionFactory cf = (ConnectionFactory)ic.lookup("java:/JmsXA");
- </pre>
-
- <li>We look up the JMS Queue</li>
- <pre class="prettyprint">
- Queue queue = (Queue)ic.lookup("queue/testQueue");
- </pre>
-
- <li>We create a JMS connection, a session and a message producer for the queue</li>
- <pre class="prettyprint">
- jmsConnection = cf.createConnection();
- Session session = jmsConnection.createSession(false, Session.AUTO_ACKNOWLEDGE);
- MessageProducer messageProducer = session.createProducer(queue);
- </pre>
-
- <li>We create a text message with the text passed in parameter of the EJB method</li>
- <pre class="prettyprint">
- TextMessage message = session.createTextMessage(text);
- </pre>
-
- <li>We send the message to the queue</li>
- <pre class="prettyprint">
- messageProducer.send(message);
- System.out.println("Sent message: " + message.getText() + "(" + message.getJMSMessageID() + ")");
- </pre>
-
- <li>We now lookup the JDBC <em>XA</em> DataSource</li>
- <pre class="prettyprint">
- DataSource ds = (DataSource)ic.lookup("java:/XADS");
- </pre>
-
- <li>We retrieve a JDBC connection</li>
- <pre class="prettyprint">
- jdbcConnection = ds.getConnection();
- </pre>
-
- <li>We create a prepared statement to insert the text and message's ID in the DB table</li>
- <pre class="prettyprint">
- PreparedStatement pr = jdbcConnection.prepareStatement("INSERT INTO " + TABLE
- + " (id, text) VALUES ('" + message.getJMSMessageID() + "', '" + text + "');");
- </pre>
-
- <li>We execute the prepared statement</li>
- <pre class="prettyprint">
- pr.execute();
- </pre>
-
- <li>We close the prepared statement</li>
- <pre class="prettyprint">
- pr.close();
- </pre>
-
- <li>And finally, <b>always</b> remember to close all your connections and resources (for both JMS and JDBC) after use, in a <code>finally</code> block.</li>
- <pre class="prettyprint">
- finally
- {
- if (ic != null)
- {
- ic.close();
- }
- if (jmsConnection != null)
- {
- jmsConnection.close();
- }
- if (jdbcConnection != null)
- {
- jdbcConnection.close();
- }
- }
- </pre>
- </ol>
- </body>
-</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/ejb-jms-transaction/server/standalone/configuration/application-roles.properties
----------------------------------------------------------------------
diff --git a/examples/javaee/ejb-jms-transaction/server/standalone/configuration/application-roles.properties b/examples/javaee/ejb-jms-transaction/server/standalone/configuration/application-roles.properties
deleted file mode 100644
index 0ade8fb..0000000
--- a/examples/javaee/ejb-jms-transaction/server/standalone/configuration/application-roles.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# Properties declaration of users roles for the realm 'ApplicationRealm'.
-#
-# This includes the following protocols: remote ejb, remote jndi, web, remote jms
-#
-# Users can be added to this properties file at any time, updates after the server has started
-# will be automatically detected.
-#
-# The format of this file is as follows: -
-# username=role1,role2,role3
-#
-# A utility script is provided which can be executed from the bin folder to add the users: -
-# - Linux
-# bin/add-user.sh
-#
-# - Windows
-# bin\add-user.bat
-#
-# The following illustrates how an admin user could be defined.
-#
-#admin=PowerUser,BillingAdmin,
-guest=guest
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/ejb-jms-transaction/server/standalone/configuration/application-users.properties
----------------------------------------------------------------------
diff --git a/examples/javaee/ejb-jms-transaction/server/standalone/configuration/application-users.properties b/examples/javaee/ejb-jms-transaction/server/standalone/configuration/application-users.properties
deleted file mode 100644
index c52e923..0000000
--- a/examples/javaee/ejb-jms-transaction/server/standalone/configuration/application-users.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# Properties declaration of users for the realm 'ApplicationRealm' which is the default realm
-# for application services on a new AS 7.1 installation.
-#
-# This includes the following protocols: remote ejb, remote jndi, web, remote jms
-#
-# Users can be added to this properties file at any time, updates after the server has started
-# will be automatically detected.
-#
-# The format of this realm is as follows: -
-# username=HEX( MD5( username ':' realm ':' password))
-#
-# A utility script is provided which can be executed from the bin folder to add the users: -
-# - Linux
-# bin/add-user.sh
-#
-# - Windows
-# bin\add-user.bat
-#
-# The following illustrates how an admin user could be defined, this
-# is for illustration only and does not correspond to a usable password.
-#
-#admin=2a0923285184943425d1f53ddd58ec7a
-guest=3437456520927d113b17d471d630e0d6
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/ejb-jms-transaction/server/standalone/configuration/logging.properties
----------------------------------------------------------------------
diff --git a/examples/javaee/ejb-jms-transaction/server/standalone/configuration/logging.properties b/examples/javaee/ejb-jms-transaction/server/standalone/configuration/logging.properties
deleted file mode 100644
index 3fa31b0..0000000
--- a/examples/javaee/ejb-jms-transaction/server/standalone/configuration/logging.properties
+++ /dev/null
@@ -1,47 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# Additional logger names to configure (root logger is always configured)
-loggers=org.jboss.as.config
-
-# Dump system environment at boot by default
-logger.org.jboss.as.config.level=DEBUG
-
-# Root logger level
-logger.level=${jboss.boot.server.log.level:INFO}
-# Root logger handlers
-logger.handlers=FILE,CONSOLE
-
-# Console handler configuration
-handler.CONSOLE=org.jboss.logmanager.handlers.ConsoleHandler
-handler.CONSOLE.properties=autoFlush
-handler.CONSOLE.level=${jboss.boot.server.log.console.level:INFO}
-handler.CONSOLE.autoFlush=true
-handler.CONSOLE.formatter=PATTERN
-
-# File handler configuration
-handler.FILE=org.jboss.logmanager.handlers.FileHandler
-handler.FILE.level=DEBUG
-handler.FILE.properties=autoFlush,fileName
-handler.FILE.autoFlush=true
-handler.FILE.fileName=${org.jboss.boot.log.file:boot.log}
-handler.FILE.formatter=PATTERN
-
-# Formatter pattern configuration
-formatter.PATTERN=org.jboss.logmanager.formatters.PatternFormatter
-formatter.PATTERN.properties=pattern
-formatter.PATTERN.pattern=%d{HH:mm:ss,SSS} %-5p [%c] %s%E%n
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/ejb-jms-transaction/server/standalone/configuration/mgmt-users.properties
----------------------------------------------------------------------
diff --git a/examples/javaee/ejb-jms-transaction/server/standalone/configuration/mgmt-users.properties b/examples/javaee/ejb-jms-transaction/server/standalone/configuration/mgmt-users.properties
deleted file mode 100644
index 349b004..0000000
--- a/examples/javaee/ejb-jms-transaction/server/standalone/configuration/mgmt-users.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# Properties declaration of users for the realm 'ManagementRealm' which is the default realm
-# for new AS 7.1 installations. Further authentication mechanism can be configured
-# as part of the <management /> in standalone.xml.
-#
-# Users can be added to this properties file at any time, updates after the server has started
-# will be automatically detected.
-#
-# By default the properties realm expects the entries to be in the format: -
-# username=HEX( MD5( username ':' realm ':' password))
-#
-# A utility script is provided which can be executed from the bin folder to add the users: -
-# - Linux
-# bin/add-user.sh
-#
-# - Windows
-# bin\add-user.bat
-
-# The following illustrates how an admin user could be defined, this
-# is for illustration only and does not correspond to a usable password.
-#
-#admin=2a0923285184943425d1f53ddd58ec7a
-admin=9d71b431e53d99563aa0dfca628c970b
-andy=dfb16391f1be1c454b5bce9822bd9df3
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/ejb-jms-transaction/server/standalone/configuration/standalone-example.xml
----------------------------------------------------------------------
diff --git a/examples/javaee/ejb-jms-transaction/server/standalone/configuration/standalone-example.xml b/examples/javaee/ejb-jms-transaction/server/standalone/configuration/standalone-example.xml
deleted file mode 100644
index 2bab47d..0000000
--- a/examples/javaee/ejb-jms-transaction/server/standalone/configuration/standalone-example.xml
+++ /dev/null
@@ -1,502 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-
-<server xmlns="urn:jboss:domain:2.0">
- <extensions>
- <extension module="org.jboss.as.clustering.infinispan"/>
- <extension module="org.jboss.as.connector"/>
- <extension module="org.jboss.as.deployment-scanner"/>
- <extension module="org.jboss.as.ee"/>
- <extension module="org.jboss.as.ejb3"/>
- <extension module="org.jboss.as.jacorb"/>
- <extension module="org.jboss.as.jaxrs"/>
- <extension module="org.jboss.as.jdr"/>
- <extension module="org.jboss.as.jmx"/>
- <extension module="org.jboss.as.jpa"/>
- <extension module="org.jboss.as.jsf"/>
- <extension module="org.jboss.as.jsr77"/>
- <extension module="org.jboss.as.logging"/>
- <extension module="org.jboss.as.mail"/>
- <extension module="org.jboss.as.messaging"/>
- <extension module="org.jboss.as.naming"/>
- <extension module="org.jboss.as.pojo"/>
- <extension module="org.jboss.as.remoting"/>
- <extension module="org.jboss.as.sar"/>
- <extension module="org.jboss.as.security"/>
- <extension module="org.jboss.as.threads"/>
- <extension module="org.jboss.as.transactions"/>
- <extension module="org.jboss.as.webservices"/>
- <extension module="org.jboss.as.weld"/>
- <extension module="org.wildfly.extension.batch"/>
- <extension module="org.wildfly.extension.io"/>
- <extension module="org.wildfly.extension.undertow"/>
- </extensions>
- <management>
- <security-realms>
- <security-realm name="ManagementRealm">
- <authentication>
- <local default-user="$local"/>
- <properties path="mgmt-users.properties" relative-to="jboss.server.config.dir"/>
- </authentication>
- <authorization map-groups-to-roles="false">
- <properties path="mgmt-groups.properties" relative-to="jboss.server.config.dir"/>
- </authorization>
- </security-realm>
- <security-realm name="ApplicationRealm">
- <authentication>
- <local default-user="$local" allowed-users="*"/>
- <properties path="application-users.properties" relative-to="jboss.server.config.dir"/>
- </authentication>
- <authorization>
- <properties path="application-roles.properties" relative-to="jboss.server.config.dir"/>
- </authorization>
- </security-realm>
- </security-realms>
- <audit-log>
- <formatters>
- <json-formatter name="json-formatter"/>
- </formatters>
- <handlers>
- <file-handler name="file" formatter="json-formatter" relative-to="jboss.server.data.dir" path="audit-log.log"/>
- </handlers>
- <logger log-boot="true" log-read-only="false" enabled="false">
- <handlers>
- <handler name="file"/>
- </handlers>
- </logger>
- </audit-log>
- <management-interfaces>
- <http-interface security-realm="ManagementRealm" http-upgrade-enabled="true">
- <socket-binding http="management-http"/>
- </http-interface>
- </management-interfaces>
- <access-control provider="simple">
- <role-mapping>
- <role name="SuperUser">
- <include>
- <user name="$local"/>
- </include>
- </role>
- </role-mapping>
- </access-control>
- </management>
- <profile>
- <subsystem xmlns="urn:jboss:domain:logging:2.0">
- <console-handler name="CONSOLE">
- <level name="INFO"/>
- <formatter>
- <named-formatter name="COLOR-PATTERN"/>
- </formatter>
- </console-handler>
- <periodic-rotating-file-handler name="FILE" autoflush="true">
- <formatter>
- <named-formatter name="PATTERN"/>
- </formatter>
- <file relative-to="jboss.server.log.dir" path="server.log"/>
- <suffix value=".yyyy-MM-dd"/>
- <append value="true"/>
- </periodic-rotating-file-handler>
- <logger category="com.arjuna">
- <level name="WARN"/>
- </logger>
- <logger category="org.apache.tomcat.util.modeler">
- <level name="WARN"/>
- </logger>
- <logger category="org.jboss.as.config">
- <level name="DEBUG"/>
- </logger>
- <logger category="sun.rmi">
- <level name="WARN"/>
- </logger>
- <logger category="jacorb">
- <level name="WARN"/>
- </logger>
- <logger category="jacorb.config">
- <level name="ERROR"/>
- </logger>
- <root-logger>
- <level name="INFO"/>
- <handlers>
- <handler name="CONSOLE"/>
- <handler name="FILE"/>
- </handlers>
- </root-logger>
- <formatter name="PATTERN">
- <pattern-formatter pattern="%d{yyyy-MM-dd HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/>
- </formatter>
- <formatter name="COLOR-PATTERN">
- <pattern-formatter pattern="%K{level}%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/>
- </formatter>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:batch:1.0">
- <job-repository>
- <in-memory/>
- </job-repository>
- <thread-pool>
- <max-threads count="10"/>
- <keepalive-time time="100" unit="milliseconds"/>
- </thread-pool>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:datasources:2.0">
- <datasources>
- <datasource jndi-name="java:jboss/datasources/ExampleDS" pool-name="ExampleDS" enabled="true" use-java-context="true">
- <connection-url>jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE</connection-url>
- <driver>h2</driver>
- <security>
- <user-name>sa</user-name>
- <password>sa</password>
- </security>
- </datasource>
- <xa-datasource jndi-name="java:jboss/datasources/XADS" pool-name="ExampleXADS" enabled="true" use-java-context="true">
- <driver>h2</driver>
- <xa-datasource-property name="URL">jdbc:h2:mem:test</xa-datasource-property>
- <xa-pool>
- <min-pool-size>10</min-pool-size>
- <max-pool-size>20</max-pool-size>
- <prefill>true</prefill>
- </xa-pool>
- <security>
- <user-name>sa</user-name>
- <password>sa</password>
- </security>
- </xa-datasource>
- <drivers>
- <driver name="h2" module="com.h2database.h2">
- <xa-datasource-class>org.h2.jdbcx.JdbcDataSource</xa-datasource-class>
- </driver>
- </drivers>
- </datasources>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:deployment-scanner:2.0">
- <deployment-scanner path="deployments" relative-to="jboss.server.base.dir" scan-interval="5000" runtime-failure-causes-rollback="${jboss.deployment.scanner.rollback.on.failure:false}"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:ee:2.0">
- <spec-descriptor-property-replacement>false</spec-descriptor-property-replacement>
- <jboss-descriptor-property-replacement>true</jboss-descriptor-property-replacement>
- <annotation-property-replacement>false</annotation-property-replacement>
- <concurrent>
- <context-services>
- <context-service name="default" jndi-name="java:jboss/ee/concurrency/context/default" use-transaction-setup-provider="true"/>
- </context-services>
- <managed-executor-services>
- <managed-executor-service name="default" jndi-name="java:jboss/ee/concurrency/executor/default" context-service="default" hung-task-threshold="60000" core-threads="5" max-threads="25" keepalive-time="5000"/>
- </managed-executor-services>
- <managed-scheduled-executor-services>
- <managed-scheduled-executor-service name="default" jndi-name="java:jboss/ee/concurrency/scheduler/default" context-service="default" hung-task-threshold="60000" core-threads="2" keepalive-time="3000"/>
- </managed-scheduled-executor-services>
- <managed-thread-factories>
- <managed-thread-factory name="default" jndi-name="java:jboss/ee/concurrency/factory/default" context-service="default"/>
- </managed-thread-factories>
- </concurrent>
- <default-bindings context-service="java:jboss/ee/concurrency/context/default" datasource="java:jboss/datasources/ExampleDS" jms-connection-factory="java:jboss/DefaultJMSConnectionFactory" managed-executor-service="java:jboss/ee/concurrency/executor/default" managed-scheduled-executor-service="java:jboss/ee/concurrency/scheduler/default" managed-thread-factory="java:jboss/ee/concurrency/factory/default"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:ejb3:2.0">
- <session-bean>
- <stateful default-access-timeout="5000" cache-ref="simple" passivation-disabled-cache-ref="simple"/>
- <singleton default-access-timeout="5000"/>
- </session-bean>
- <mdb>
- <resource-adapter-ref resource-adapter-name="${ejb.resource-adapter-name:activemq-ra.rar}"/>
- <bean-instance-pool-ref pool-name="mdb-strict-max-pool"/>
- </mdb>
- <pools>
- <bean-instance-pools>
- <!-- A sample strict max pool configuration -->
- <strict-max-pool name="slsb-strict-max-pool" max-pool-size="20" instance-acquisition-timeout="5" instance-acquisition-timeout-unit="MINUTES"/>
- <strict-max-pool name="mdb-strict-max-pool" max-pool-size="20" instance-acquisition-timeout="5" instance-acquisition-timeout-unit="MINUTES"/>
- </bean-instance-pools>
- </pools>
- <caches>
- <cache name="simple"/>
- <cache name="distributable" aliases="passivating clustered" passivation-store-ref="infinispan"/>
- </caches>
- <passivation-stores>
- <passivation-store name="infinispan" cache-container="ejb" max-size="10000"/>
- </passivation-stores>
- <async thread-pool-name="default"/>
- <timer-service thread-pool-name="default" default-data-store="default-file-store">
- <data-stores>
- <file-data-store name="default-file-store" path="timer-service-data" relative-to="jboss.server.data.dir"/>
- </data-stores>
- </timer-service>
- <remote connector-ref="http-remoting-connector" thread-pool-name="default"/>
- <thread-pools>
- <thread-pool name="default">
- <max-threads count="10"/>
- <keepalive-time time="100" unit="milliseconds"/>
- </thread-pool>
- </thread-pools>
- <iiop enable-by-default="false" use-qualified-name="false"/>
- <default-security-domain value="other"/>
- <default-missing-method-permissions-deny-access value="true"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:io:1.0">
- <worker name="default" io-threads="3"/>
- <buffer-pool name="default" buffer-size="16384" buffers-per-slice="128"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:infinispan:2.0">
- <cache-container name="web" default-cache="passivation" module="org.wildfly.clustering.web.infinispan">
- <local-cache name="passivation" batching="true">
- <file-store passivation="true" purge="false"/>
- </local-cache>
- <local-cache name="persistent" batching="true">
- <file-store passivation="false" purge="false"/>
- </local-cache>
- </cache-container>
- <cache-container name="ejb" aliases="sfsb" default-cache="passivation" module="org.wildfly.clustering.ejb.infinispan">
- <local-cache name="passivation" batching="true">
- <file-store passivation="true" purge="false"/>
- </local-cache>
- <local-cache name="persistent" batching="true">
- <file-store passivation="false" purge="false"/>
- </local-cache>
- </cache-container>
- <cache-container name="hibernate" default-cache="local-query" module="org.hibernate">
- <local-cache name="entity">
- <transaction mode="NON_XA"/>
- <eviction strategy="LRU" max-entries="10000"/>
- <expiration max-idle="100000"/>
- </local-cache>
- <local-cache name="local-query">
- <transaction mode="NONE"/>
- <eviction strategy="LRU" max-entries="10000"/>
- <expiration max-idle="100000"/>
- </local-cache>
- <local-cache name="timestamps">
- <transaction mode="NONE"/>
- <eviction strategy="NONE"/>
- </local-cache>
- </cache-container>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:jacorb:1.3">
- <orb socket-binding="jacorb" ssl-socket-binding="jacorb-ssl">
- <initializers transactions="spec" security="identity"/>
- </orb>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:jaxrs:1.0"/>
- <subsystem xmlns="urn:jboss:domain:jca:2.0">
- <archive-validation enabled="true" fail-on-error="true" fail-on-warn="false"/>
- <bean-validation enabled="true"/>
- <default-workmanager>
- <short-running-threads>
- <core-threads count="50"/>
- <queue-length count="50"/>
- <max-threads count="50"/>
- <keepalive-time time="10" unit="seconds"/>
- </short-running-threads>
- <long-running-threads>
- <core-threads count="50"/>
- <queue-length count="50"/>
- <max-threads count="50"/>
- <keepalive-time time="10" unit="seconds"/>
- </long-running-threads>
- </default-workmanager>
- <cached-connection-manager/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:jdr:1.0"/>
- <subsystem xmlns="urn:jboss:domain:jmx:1.3">
- <expose-resolved-model/>
- <expose-expression-model/>
- <remoting-connector/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:jpa:1.1">
- <jpa default-datasource="" default-extended-persistence-inheritance="DEEP"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:jsf:1.0"/>
- <subsystem xmlns="urn:jboss:domain:jsr77:1.0"/>
- <subsystem xmlns="urn:jboss:domain:mail:2.0">
- <mail-session name="default" jndi-name="java:jboss/mail/Default">
- <smtp-server outbound-socket-binding-ref="mail-smtp"/>
- </mail-session>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:messaging:2.0">
- <activemq-server>
- <persistence-enabled>true</persistence-enabled>
- <journal-file-size>102400</journal-file-size>
- <journal-min-files>2</journal-min-files>
- <connectors>
- <http-connector name="http-connector" socket-binding="http">
- <param key="http-upgrade-endpoint" value="http-acceptor"/>
- </http-connector>
- <http-connector name="http-connector-throughput" socket-binding="http">
- <param key="http-upgrade-endpoint" value="http-acceptor-throughput"/>
- <param key="batch-delay" value="50"/>
- </http-connector>
- <in-vm-connector name="in-vm" server-id="0"/>
- </connectors>
- <acceptors>
- <http-acceptor name="http-acceptor" http-listener="default"/>
- <http-acceptor name="http-acceptor-throughput" http-listener="default">
- <param key="batch-delay" value="50"/>
- <param key="direct-deliver" value="false"/>
- </http-acceptor>
- <in-vm-acceptor name="in-vm" server-id="0"/>
- </acceptors>
- <security-settings>
- <security-setting match="#">
- <permission type="send" roles="guest"/>
- <permission type="consume" roles="guest"/>
- <permission type="createNonDurableQueue" roles="guest"/>
- <permission type="deleteNonDurableQueue" roles="guest"/>
- </security-setting>
- </security-settings>
- <address-settings>
- <!--default for catch all-->
- <address-setting match="#">
- <dead-letter-address>jms.queue.DLQ</dead-letter-address>
- <expiry-address>jms.queue.ExpiryQueue</expiry-address>
- <redelivery-delay>0</redelivery-delay>
- <max-size-bytes>10485760</max-size-bytes>
- <address-full-policy>PAGE</address-full-policy>
- <page-size-bytes>2097152</page-size-bytes>
- <message-counter-history-day-limit>10</message-counter-history-day-limit>
- </address-setting>
- </address-settings>
- <jms-connection-factories>
- <connection-factory name="InVmConnectionFactory">
- <connectors>
- <connector-ref connector-name="in-vm"/>
- </connectors>
- <entries>
- <entry name="java:/ConnectionFactory"/>
- </entries>
- </connection-factory>
- <connection-factory name="RemoteConnectionFactory">
- <connectors>
- <connector-ref connector-name="http-connector"/>
- </connectors>
- <entries>
- <entry name="java:jboss/exported/jms/RemoteConnectionFactory"/>
- </entries>
- </connection-factory>
- <pooled-connection-factory name="activemq-ra">
- <transaction mode="xa"/>
- <connectors>
- <connector-ref connector-name="in-vm"/>
- </connectors>
- <entries>
- <entry name="java:/JmsXA"/>
- <!-- Global JNDI entry used to provide a default JMS Connection factory to EE application -->
- <entry name="java:jboss/DefaultJMSConnectionFactory"/>
- </entries>
- </pooled-connection-factory>
- </jms-connection-factories>
- <jms-destinations>
- <jms-queue name="testQueue">
- <entry name="queue/testQueue"/>
- <entry name="java:jboss/exported/jms/queues/testQueue"/>
- </jms-queue>
- </jms-destinations>
- </activemq-server>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:naming:2.0">
- <remote-naming/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:pojo:1.0"/>
- <subsystem xmlns="urn:jboss:domain:remoting:2.0">
- <endpoint worker="default"/>
- <http-connector name="http-remoting-connector" connector-ref="default" security-realm="ApplicationRealm"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:resource-adapters:2.0"/>
- <subsystem xmlns="urn:jboss:domain:sar:1.0"/>
- <subsystem xmlns="urn:jboss:domain:security:1.2">
- <security-domains>
- <security-domain name="other" cache-type="default">
- <authentication>
- <login-module code="Remoting" flag="optional">
- <module-option name="password-stacking" value="useFirstPass"/>
- </login-module>
- <login-module code="RealmDirect" flag="required">
- <module-option name="password-stacking" value="useFirstPass"/>
- </login-module>
- </authentication>
- </security-domain>
- <security-domain name="jboss-web-policy" cache-type="default">
- <authorization>
- <policy-module code="Delegating" flag="required"/>
- </authorization>
- </security-domain>
- <security-domain name="jboss-ejb-policy" cache-type="default">
- <authorization>
- <policy-module code="Delegating" flag="required"/>
- </authorization>
- </security-domain>
- </security-domains>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:threads:1.1"/>
- <subsystem xmlns="urn:jboss:domain:transactions:2.0">
- <core-environment>
- <process-id>
- <uuid/>
- </process-id>
- </core-environment>
- <recovery-environment socket-binding="txn-recovery-environment" status-socket-binding="txn-status-manager"/>
- <coordinator-environment default-timeout="300"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:undertow:1.0">
- <buffer-caches>
- <buffer-cache name="default" buffer-size="1024" buffers-per-region="1024" max-regions="10"/>
- </buffer-caches>
- <server name="default-server">
- <http-listener name="default" socket-binding="http"/>
- <host name="default-host" alias="localhost">
- <location name="/" handler="welcome-content"/>
- <filter-ref name="server-header"/>
- <filter-ref name="x-powered-by-header"/>
- </host>
- </server>
- <servlet-container name="default" default-buffer-cache="default" stack-trace-on-error="local-only">
- <jsp-config/>
- </servlet-container>
- <handlers>
- <file name="welcome-content" path="${jboss.home.dir}/welcome-content" directory-listing="true"/>
- </handlers>
- <filters>
- <response-header name="server-header" header-name="Server" header-value="Wildfly 8"/>
- <response-header name="x-powered-by-header" header-name="X-Powered-By" header-value="Undertow 1"/>
- </filters>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:webservices:1.2">
- <modify-wsdl-address>true</modify-wsdl-address>
- <wsdl-host>${jboss.bind.address:127.0.0.1}</wsdl-host>
- <endpoint-config name="Standard-Endpoint-Config"/>
- <endpoint-config name="Recording-Endpoint-Config">
- <pre-handler-chain name="recording-handlers" protocol-bindings="##SOAP11_HTTP ##SOAP11_HTTP_MTOM ##SOAP12_HTTP ##SOAP12_HTTP_MTOM">
- <handler name="RecordingHandler" class="org.jboss.ws.common.invocation.RecordingServerHandler"/>
- </pre-handler-chain>
- </endpoint-config>
- <client-config name="Standard-Client-Config"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:weld:2.0"/>
- </profile>
- <interfaces>
- <interface name="management">
- <inet-address value="${jboss.bind.address.management:127.0.0.1}"/>
- </interface>
- <interface name="public">
- <inet-address value="${jboss.bind.address:127.0.0.1}"/>
- </interface>
- <!-- TODO - only show this if the jacorb subsystem is added -->
- <interface name="unsecure">
- <!--
- ~ Used for IIOP sockets in the standard configuration.
- ~ To secure JacORB you need to setup SSL
- -->
- <inet-address value="${jboss.bind.address.unsecure:127.0.0.1}"/>
- </interface>
- </interfaces>
- <socket-binding-group name="standard-sockets" default-interface="public" port-offset="${jboss.socket.binding.port-offset:0}">
- <socket-binding name="management-http" interface="management" port="${jboss.management.http.port:9990}"/>
- <socket-binding name="management-https" interface="management" port="${jboss.management.https.port:9993}"/>
- <socket-binding name="ajp" port="${jboss.ajp.port:8009}"/>
- <socket-binding name="http" port="${jboss.http.port:8080}"/>
- <socket-binding name="https" port="${jboss.https.port:8443}"/>
- <socket-binding name="jacorb" interface="unsecure" port="3528"/>
- <socket-binding name="jacorb-ssl" interface="unsecure" port="3529"/>
- <socket-binding name="messaging-group" port="0" multicast-address="${jboss.messaging.group.address:231.7.7.7}" multicast-port="${jboss.messaging.group.port:9876}"/>
- <socket-binding name="txn-recovery-environment" port="4712"/>
- <socket-binding name="txn-status-manager" port="4713"/>
- <outbound-socket-binding name="mail-smtp">
- <remote-destination host="localhost" port="25"/>
- </outbound-socket-binding>
- </socket-binding-group>
-</server>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/ejb-jms-transaction/src/main/java/org/apache/activemq/javaee/example/EJBClientExample.java
----------------------------------------------------------------------
diff --git a/examples/javaee/ejb-jms-transaction/src/main/java/org/apache/activemq/javaee/example/EJBClientExample.java b/examples/javaee/ejb-jms-transaction/src/main/java/org/apache/activemq/javaee/example/EJBClientExample.java
deleted file mode 100644
index a02e6b0..0000000
--- a/examples/javaee/ejb-jms-transaction/src/main/java/org/apache/activemq/javaee/example/EJBClientExample.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.activemq.javaee.example;
-
-import javax.jms.Connection;
-import javax.jms.ConnectionFactory;
-import javax.jms.MessageConsumer;
-import javax.jms.Queue;
-import javax.jms.Session;
-import javax.jms.TextMessage;
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import java.util.Properties;
-
-import org.apache.activemq.javaee.example.server.SendMessageService;
-
-/**
- * An example showing how to invoke a EJB which sends a JMS message and update a JDBC table in the same transaction.
- *
- * @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a>
- * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a>
- * @author Justin Bertram
- */
-public class EJBClientExample
-{
- public static void main(final String[] args) throws Exception
- {
- InitialContext initialContext = null;
- Connection connection = null;
- try
- {
- // Step 1. Create an initial context to perform the EJB lookup.
- Properties env = new Properties();
- env.put(Context.URL_PKG_PREFIXES, "org.jboss.ejb.client.naming");
- initialContext = new InitialContext(env);
-
- // Step 2. Lookup the EJB
- SendMessageService service = (SendMessageService) initialContext.lookup("ejb:/test//SendMessageBean!org.apache.activemq.javaee.example.server.SendMessageService");
-
- // Step 3. Create the DB table which will be updated
- service.createTable();
-
- // Step 4. Invoke the sendAndUpdate method
- service.sendAndUpdate("This is a text message");
- System.out.println("invoked the EJB service");
-
- // Step 5. Create a new initial context for the JMS JNDI look-ups.
- env = new Properties();
- env.put(Context.INITIAL_CONTEXT_FACTORY, "org.jboss.naming.remote.client.InitialContextFactory");
- env.put(Context.PROVIDER_URL, "http-remoting://localhost:8080");
- initialContext = new InitialContext(env);
-
- // Step 6. Lookup the JMS connection factory
- ConnectionFactory cf = (ConnectionFactory) initialContext.lookup("jms/RemoteConnectionFactory");
-
- // Step 7. Lookup the queue
- Queue queue = (Queue) initialContext.lookup("jms/queues/testQueue");
-
- // Step 8. Create a connection, a session and a message consumer for the queue
- connection = cf.createConnection("guest", "password");
- Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
- MessageConsumer consumer = session.createConsumer(queue);
-
- // Step 9. Start the connection
- connection.start();
-
- // Step 10. Receive the message sent by the EJB
- TextMessage messageReceived = (TextMessage) consumer.receive(5000);
- System.out.println("Received message: " + messageReceived.getText() + " (" + messageReceived.getJMSMessageID() + ")");
- }
- finally
- {
- // Step 11. Be sure to close the resources!
- if (initialContext != null)
- {
- initialContext.close();
- }
- if (connection != null)
- {
- connection.close();
- }
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/ejb-jms-transaction/src/main/java/org/apache/activemq/javaee/example/server/SendMessageBean.java
----------------------------------------------------------------------
diff --git a/examples/javaee/ejb-jms-transaction/src/main/java/org/apache/activemq/javaee/example/server/SendMessageBean.java b/examples/javaee/ejb-jms-transaction/src/main/java/org/apache/activemq/javaee/example/server/SendMessageBean.java
deleted file mode 100644
index 432a90b..0000000
--- a/examples/javaee/ejb-jms-transaction/src/main/java/org/apache/activemq/javaee/example/server/SendMessageBean.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.activemq.javaee.example.server;
-
-import java.sql.PreparedStatement;
-
-import javax.ejb.Remote;
-import javax.ejb.Stateless;
-import javax.jms.Connection;
-import javax.jms.ConnectionFactory;
-import javax.jms.MessageProducer;
-import javax.jms.Queue;
-import javax.jms.Session;
-import javax.jms.TextMessage;
-import javax.naming.InitialContext;
-import javax.sql.DataSource;
-
-/**
- * An EJB which sends a JMS message and update a JDBC table in the same transaction.
- *
- * @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a>
- * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a>
- */
-@Stateless
-@Remote(SendMessageService.class)
-public class SendMessageBean implements SendMessageService
-{
-
- private static final String TABLE = "activemq_example";
-
- public void createTable() throws Exception
- {
- InitialContext ic = new InitialContext();
- DataSource ds = (DataSource)ic.lookup("java:jboss/datasources/ExampleDS");
- java.sql.Connection con = ds.getConnection();
-
- // check if the table exists:
- boolean createTable = false;
- try
- {
- PreparedStatement pr = con.prepareStatement("SELECT * FROM " + SendMessageBean.TABLE + ";");
- pr.executeQuery();
- pr.close();
- }
- catch (Exception e)
- {
- createTable = true;
- }
-
- if (createTable)
- {
- PreparedStatement pr = con.prepareStatement("CREATE TABLE " + SendMessageBean.TABLE +
- "(id VARCHAR(100), text VARCHAR(100));");
- pr.execute();
- pr.close();
- System.out.println("Table " + SendMessageBean.TABLE + " created");
- }
-
- con.close();
- }
-
- public void sendAndUpdate(final String text) throws Exception
- {
- InitialContext ic = null;
- Connection jmsConnection = null;
- java.sql.Connection jdbcConnection = null;
-
- try
- {
- // Step 1. Lookup the initial context
- ic = new InitialContext();
-
- // JMS operations
-
- // Step 2. Look up the XA Connection Factory
- ConnectionFactory cf = (ConnectionFactory)ic.lookup("java:/JmsXA");
-
- // Step 3. Look up the Queue
- Queue queue = (Queue)ic.lookup("queue/testQueue");
-
- // Step 4. Create a connection, a session and a message producer for the queue
- jmsConnection = cf.createConnection();
- Session session = jmsConnection.createSession(false, Session.AUTO_ACKNOWLEDGE);
- MessageProducer messageProducer = session.createProducer(queue);
-
- // Step 5. Create a Text Message
- TextMessage message = session.createTextMessage(text);
-
- // Step 6. Send The Text Message
- messageProducer.send(message);
- System.out.println("Sent message: " + message.getText() + "(" + message.getJMSMessageID() + ")");
-
- // DB operations
-
- // Step 7. Look up the XA Data Source
- DataSource ds = (DataSource)ic.lookup("java:jboss/datasources/XADS");
-
- // Step 8. Retrieve the JDBC connection
- jdbcConnection = ds.getConnection();
-
- // Step 9. Create the prepared statement to insert the text and the message's ID in the table
- PreparedStatement pr = jdbcConnection.prepareStatement("INSERT INTO " + SendMessageBean.TABLE +
- " (id, text) VALUES ('" +
- message.getJMSMessageID() +
- "', '" +
- text +
- "');");
-
- // Step 10. execute the prepared statement
- pr.execute();
-
- // Step 11. close the prepared statement
- pr.close();
- }
- finally
- {
- // Step 12. Be sure to close all resources!
- if (ic != null)
- {
- ic.close();
- }
- if (jmsConnection != null)
- {
- jmsConnection.close();
- }
- if (jdbcConnection != null)
- {
- jdbcConnection.close();
- }
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/ejb-jms-transaction/src/main/java/org/apache/activemq/javaee/example/server/SendMessageService.java
----------------------------------------------------------------------
diff --git a/examples/javaee/ejb-jms-transaction/src/main/java/org/apache/activemq/javaee/example/server/SendMessageService.java b/examples/javaee/ejb-jms-transaction/src/main/java/org/apache/activemq/javaee/example/server/SendMessageService.java
deleted file mode 100644
index d24f006..0000000
--- a/examples/javaee/ejb-jms-transaction/src/main/java/org/apache/activemq/javaee/example/server/SendMessageService.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.activemq.javaee.example.server;
-
-/**
- * The interface of an EJB which sends a JMS message and updates a JDBC table in the same transaction.
- *
- * @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a>
- */
-public interface SendMessageService
-{
- void sendAndUpdate(String text) throws Exception;
-
- void createTable() throws Exception;
-
-}
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/ejb-jms-transaction/src/main/resources/jboss-ejb-client.properties
----------------------------------------------------------------------
diff --git a/examples/javaee/ejb-jms-transaction/src/main/resources/jboss-ejb-client.properties b/examples/javaee/ejb-jms-transaction/src/main/resources/jboss-ejb-client.properties
deleted file mode 100644
index fcf57ba..0000000
--- a/examples/javaee/ejb-jms-transaction/src/main/resources/jboss-ejb-client.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-remote.connectionprovider.create.options.org.xnio.Options.SSL_ENABLED=false
-
-remote.connections=default
-
-remote.connection.default.host=localhost
-remote.connection.default.port = 8080
-remote.connection.default.connect.options.org.xnio.Options.SASL_POLICY_NOANONYMOUS=false
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/ejb-jms-transaction/src/test/java/org/apache/activemq/javaee/examples/MDBEJBTXRequiredRunnerTest.java
----------------------------------------------------------------------
diff --git a/examples/javaee/ejb-jms-transaction/src/test/java/org/apache/activemq/javaee/examples/MDBEJBTXRequiredRunnerTest.java b/examples/javaee/ejb-jms-transaction/src/test/java/org/apache/activemq/javaee/examples/MDBEJBTXRequiredRunnerTest.java
deleted file mode 100644
index 7c85474..0000000
--- a/examples/javaee/ejb-jms-transaction/src/test/java/org/apache/activemq/javaee/examples/MDBEJBTXRequiredRunnerTest.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.activemq.javaee.examples;
-
-import org.apache.activemq.javaee.example.EJBClientExample;
-import org.apache.activemq.javaee.example.server.SendMessageBean;
-import org.apache.activemq.javaee.example.server.SendMessageService;
-import org.jboss.arquillian.container.test.api.Deployment;
-import org.jboss.arquillian.container.test.api.RunAsClient;
-import org.jboss.arquillian.junit.Arquillian;
-import org.jboss.shrinkwrap.api.Archive;
-import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.spec.JavaArchive;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-/**
- * @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a>
- * 5/21/12
- */
-@RunAsClient
-@RunWith(Arquillian.class)
-public class MDBEJBTXRequiredRunnerTest
-{
- @Deployment
- public static Archive getDeployment()
- {
- final JavaArchive ejbJar = ShrinkWrap.create(JavaArchive.class, "ejb.jar");
- ejbJar.addClass(SendMessageBean.class);
- ejbJar.addClass(SendMessageService.class);
- System.out.println(ejbJar.toString(true));
- return ejbJar;
- }
-
- @Test
- public void runExample() throws Exception
- {
- EJBClientExample.main(null);
- //give the example time to run
- Thread.sleep(10000);
- }
-}
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/ejb-jms-transaction/src/test/resources/arquillian.xml
----------------------------------------------------------------------
diff --git a/examples/javaee/ejb-jms-transaction/src/test/resources/arquillian.xml b/examples/javaee/ejb-jms-transaction/src/test/resources/arquillian.xml
deleted file mode 100644
index 1aada30..0000000
--- a/examples/javaee/ejb-jms-transaction/src/test/resources/arquillian.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<arquillian xmlns="http://jboss.org/schema/arquillian"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://jboss.org/schema/arquillian http://jboss.org/schema/arquillian/arquillian_1_0.xsd">
-
- <!-- Uncomment to have test archives exported to the file system for inspection.
-This feature can also be controlled using the system property arquillian.deploymentExportPath -->
- <!--
-<engine>
-<property name="deploymentExportPath">target</property>
-</engine>
--->
-
- <defaultProtocol type="Servlet 3.0" />
-
- <container qualifier="jboss" default="true">
- <configuration>
- <property name="jbossHome">${basedir}/target/jbossas-node0</property>
- <property name="serverConfig">standalone-example.xml</property>
- <property name="allowConnectingToRunningServer">true</property>
- <property name="managementAddress">${node0:127.0.0.1}</property>
- </configuration>
- </container>
-
- <!-- logThreshold proposed -->
- <!--
-<container qualifier="jbossas-managed">
-<configuration>
-<property name="logThreshold">ERROR</property>
-</configuration>
-</container>
--->
-
-</arquillian>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/jca-config/pom.xml
----------------------------------------------------------------------
diff --git a/examples/javaee/jca-config/pom.xml b/examples/javaee/jca-config/pom.xml
deleted file mode 100644
index 71982c4..0000000
--- a/examples/javaee/jca-config/pom.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.activemq.example.javaee</groupId>
- <artifactId>javaee-examples</artifactId>
- <version>6.0.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>activemq-javaee-jca-config-example</artifactId>
- <packaging>jar</packaging>
- <name>ActiveMQ6 Java EE JCA Config Example</name>
-
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <executions>
- <!-- Copy the AS for the second node into current_submodule/target/as-node1.-->
- <execution>
- <id>as-node1</id>
- <inherited>true</inherited>
- <phase>generate-test-resources</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <outputDirectory>${basedir}/target/jbossas-node1</outputDirectory>
- <overwrite>true</overwrite>
- <resources>
- <resource>
- <directory>${jboss.home}</directory>
- <excludes>
- <exclude>standalone/data</exclude>
- <exclude>standalone/log</exclude>
- <exclude>standalone/tmp</exclude>
- </excludes>
- </resource>
- <resource>
- <directory>${basedir}/server</directory>
- </resource>
- </resources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.12</version>
- <configuration>
- <argLine>-Dlogging.configuration=file:///${user.dir}/test/config/logging.properties</argLine>
- <!-- Parameters to test cases. -->
- <systemPropertyVariables>
- <arquillian.launch>clustering-all</arquillian.launch>
- </systemPropertyVariables>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/jca-config/readme.html
----------------------------------------------------------------------
diff --git a/examples/javaee/jca-config/readme.html b/examples/javaee/jca-config/readme.html
deleted file mode 100644
index f303af3..0000000
--- a/examples/javaee/jca-config/readme.html
+++ /dev/null
@@ -1,109 +0,0 @@
-<html>
- <head>
- <title>ActiveMQ Java EE JCA Configuration Example</title>
- <link rel="stylesheet" type="text/css" href="../../common/common.css" />
- <link rel="stylesheet" type="text/css" href="../../common/prettify.css" />
- <script type="text/javascript" src="../../common/prettify.js"></script>
- </head>
- <body onload="prettyPrint()">
- <h1>Java EE Resource Adapter Configuration Example</h1>
-
- <p>This example demonstrates how to configure several properties on the ActiveMQ Resource Adapter. We setup two
- WildFly. The enterprise application is being deployed in one application server while the MDBs and JMS
- Connections are pointing to a remote server</p>
- <p>This example is composed of two message-driven beans (MDB), MDBQueueA and MDBQueueB, and a stateless session
- bean StatelessSender, and a main class MDBRemoteClientExample.<p>
- <p>MDBRemoteClientExample will invoke the StatelessSender bean on the second server which will in turn send a
- message to 2 queues on the first server which will then be consumed by each MDB.</p>
- <p>MDBQueueA consumes the message locally.</p>
- <p>MDBQueueB is on the second server who's JCA Adapter is configured to consume remotely from the first server</p>
-
- <h2>WildFly configuration</h2>
-
- <p>The example leverages the Arquillian framework to run multiple WildFly instances and deploy the MDBs and SLSB.</p>
-
- <h2>Example step-by-step</h2>
-
- <p><i>download WildFly 8.0.0.Final from <a href="http://wildfly.org/downloads/">here</a> and install.</i></p>
- <p><i>set the JBOSS_HOME property to point to the WildFly install directory</i></p>
- <p><i>type <code>mvn verify</code> from the example directory to run</i></p>
-
- <ol>
- <li>First we need to get an initial context so we can look-up the EJB. This initial context will get it's properties from the jboss-ejb-client.properties.</li>
- <pre class="prettyprint">
- Properties env = new Properties();
- env.put(Context.URL_PKG_PREFIXES, "org.jboss.ejb.client.naming");
- initialContext = new InitialContext(env);
- </pre>
-
- <li>Getting a reference to the Stateless Bean</li>
- <pre class="prettyprint">
- StatelessSenderService sender = (StatelessSenderService)initialContext.lookup("ejb:/test//StatelessSender!org.apache.activemq.javaee.example.server2.StatelessSenderService");
- </pre>
-
- <li>Calling the Stateless Bean</li>
- <pre class="prettyprint">
- sender.sendHello("Hello there MDB!");
- </pre>
-
- <li>On the second server we invoke the EJB StatelessSender: This will send 2 messages to server 1 using the configured outbound adapter</li>
- <pre class="prettyprint">
- Queue destQueueA = ActiveMQJMSClient.createQueue("A");
- Queue destQueueB = ActiveMQJMSClient.createQueue("B");
- </pre>
-
- <li>Create a connection to a remote server using a connection-factory we injected. JCA will actually manage this through a <i>connection pool</i></li>
- <pre class="prettyprint">
- Connection conn = connectionFactory.createConnection("guest", "password");
- </pre>
-
- <li>Send a message to a QueueA on server1, which will be received by MDBQueueA on server1</li>
- <pre class="prettyprint">
- Session sess = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
- MessageProducer prodA = sess.createProducer(destQueueA);
- prod.send(sess.createTextMessage(message));
- </pre>
-
- <li>Send a message to a QueueB on the remote server1, which will be received by MDBQueueA on server2</li>
- <pre class="prettyprint">
- MessageProducer prodB = sess.createProducer(destQueueB);
- prodB.send(sess.createTextMessage(message));
- </pre>
-
- <li>Close the connection. (Since this is a JCA connection, this close will return the connection back to the connection pool)</li>
- <pre class="prettyprint">
- conn.close();
- </pre>
-
- <li>The message is received by MDBQueueA on server1 which consumed from a local queue</li>
-
- <pre class="prettyprint">
-@MessageDriven(name = "MDB_QueueA",
- activationConfig =
- {
- @ActivationConfigProperty(propertyName = "destinationType", propertyValue = "javax.jms.Queue"),
- @ActivationConfigProperty(propertyName = "destination", propertyValue = "queue/A")
- })
-public class MDBQueueA implements MessageListener
-{
- public void onMessage(Message message)...
- </pre>
-
- <li>Another message is received on MDBQueueB on server2 which consumed from a remote queue on server1.
-
- <pre class="prettyprint">
-@MessageDriven(name = "MDB_QueueB",
- activationConfig =
- {
- @ActivationConfigProperty(propertyName = "destinationType", propertyValue = "javax.jms.Queue"),
- @ActivationConfigProperty(propertyName = "destination", propertyValue = "B"),
- @ActivationConfigProperty(propertyName = "useJNDI", propertyValue = "false")
- })
-@ResourceAdapter("activemq-ra-remote.rar")
-public class MDBQueueB implements MessageListener
-{
- public void onMessage(Message message)...
- </pre>
- </ol>
- </body>
-</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/jca-config/server/standalone/configuration/application-roles.properties
----------------------------------------------------------------------
diff --git a/examples/javaee/jca-config/server/standalone/configuration/application-roles.properties b/examples/javaee/jca-config/server/standalone/configuration/application-roles.properties
deleted file mode 100644
index 0ade8fb..0000000
--- a/examples/javaee/jca-config/server/standalone/configuration/application-roles.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# Properties declaration of users roles for the realm 'ApplicationRealm'.
-#
-# This includes the following protocols: remote ejb, remote jndi, web, remote jms
-#
-# Users can be added to this properties file at any time, updates after the server has started
-# will be automatically detected.
-#
-# The format of this file is as follows: -
-# username=role1,role2,role3
-#
-# A utility script is provided which can be executed from the bin folder to add the users: -
-# - Linux
-# bin/add-user.sh
-#
-# - Windows
-# bin\add-user.bat
-#
-# The following illustrates how an admin user could be defined.
-#
-#admin=PowerUser,BillingAdmin,
-guest=guest
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/jca-config/server/standalone/configuration/application-users.properties
----------------------------------------------------------------------
diff --git a/examples/javaee/jca-config/server/standalone/configuration/application-users.properties b/examples/javaee/jca-config/server/standalone/configuration/application-users.properties
deleted file mode 100644
index c52e923..0000000
--- a/examples/javaee/jca-config/server/standalone/configuration/application-users.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# Properties declaration of users for the realm 'ApplicationRealm' which is the default realm
-# for application services on a new AS 7.1 installation.
-#
-# This includes the following protocols: remote ejb, remote jndi, web, remote jms
-#
-# Users can be added to this properties file at any time, updates after the server has started
-# will be automatically detected.
-#
-# The format of this realm is as follows: -
-# username=HEX( MD5( username ':' realm ':' password))
-#
-# A utility script is provided which can be executed from the bin folder to add the users: -
-# - Linux
-# bin/add-user.sh
-#
-# - Windows
-# bin\add-user.bat
-#
-# The following illustrates how an admin user could be defined, this
-# is for illustration only and does not correspond to a usable password.
-#
-#admin=2a0923285184943425d1f53ddd58ec7a
-guest=3437456520927d113b17d471d630e0d6
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/jca-config/server/standalone/configuration/logging.properties
----------------------------------------------------------------------
diff --git a/examples/javaee/jca-config/server/standalone/configuration/logging.properties b/examples/javaee/jca-config/server/standalone/configuration/logging.properties
deleted file mode 100644
index 3fa31b0..0000000
--- a/examples/javaee/jca-config/server/standalone/configuration/logging.properties
+++ /dev/null
@@ -1,47 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# Additional logger names to configure (root logger is always configured)
-loggers=org.jboss.as.config
-
-# Dump system environment at boot by default
-logger.org.jboss.as.config.level=DEBUG
-
-# Root logger level
-logger.level=${jboss.boot.server.log.level:INFO}
-# Root logger handlers
-logger.handlers=FILE,CONSOLE
-
-# Console handler configuration
-handler.CONSOLE=org.jboss.logmanager.handlers.ConsoleHandler
-handler.CONSOLE.properties=autoFlush
-handler.CONSOLE.level=${jboss.boot.server.log.console.level:INFO}
-handler.CONSOLE.autoFlush=true
-handler.CONSOLE.formatter=PATTERN
-
-# File handler configuration
-handler.FILE=org.jboss.logmanager.handlers.FileHandler
-handler.FILE.level=DEBUG
-handler.FILE.properties=autoFlush,fileName
-handler.FILE.autoFlush=true
-handler.FILE.fileName=${org.jboss.boot.log.file:boot.log}
-handler.FILE.formatter=PATTERN
-
-# Formatter pattern configuration
-formatter.PATTERN=org.jboss.logmanager.formatters.PatternFormatter
-formatter.PATTERN.properties=pattern
-formatter.PATTERN.pattern=%d{HH:mm:ss,SSS} %-5p [%c] %s%E%n
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/jca-config/server/standalone/configuration/mgmt-users.properties
----------------------------------------------------------------------
diff --git a/examples/javaee/jca-config/server/standalone/configuration/mgmt-users.properties b/examples/javaee/jca-config/server/standalone/configuration/mgmt-users.properties
deleted file mode 100644
index 349b004..0000000
--- a/examples/javaee/jca-config/server/standalone/configuration/mgmt-users.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# Properties declaration of users for the realm 'ManagementRealm' which is the default realm
-# for new AS 7.1 installations. Further authentication mechanism can be configured
-# as part of the <management /> in standalone.xml.
-#
-# Users can be added to this properties file at any time, updates after the server has started
-# will be automatically detected.
-#
-# By default the properties realm expects the entries to be in the format: -
-# username=HEX( MD5( username ':' realm ':' password))
-#
-# A utility script is provided which can be executed from the bin folder to add the users: -
-# - Linux
-# bin/add-user.sh
-#
-# - Windows
-# bin\add-user.bat
-
-# The following illustrates how an admin user could be defined, this
-# is for illustration only and does not correspond to a usable password.
-#
-#admin=2a0923285184943425d1f53ddd58ec7a
-admin=9d71b431e53d99563aa0dfca628c970b
-andy=dfb16391f1be1c454b5bce9822bd9df3
[32/37] activemq-6 git commit: ACTIVEMQ6-51 Example server
bootstrapping
Posted by jb...@apache.org.
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-jgroups/src/main/resources/activemq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-jgroups/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/clustered-jgroups/src/main/resources/activemq/server1/activemq-configuration.xml
new file mode 100644
index 0000000..b19c11f
--- /dev/null
+++ b/examples/jms/clustered-jgroups/src/main/resources/activemq/server1/activemq-configuration.xml
@@ -0,0 +1,75 @@
+<configuration xmlns="urn:activemq"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
+
+
+ <paging-directory>server1/paging</paging-directory>
+
+ <bindings-directory>server1/bindings</bindings-directory>
+
+ <journal-directory>server1/journal</journal-directory>
+
+ <large-messages-directory>server1/large-messages</large-messages-directory>
+
+ <!-- Connectors -->
+ <connectors>
+ <connector name="netty-connector">
+ <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
+ <param key="port" value="5446"/>
+ </connector>
+ </connectors>
+
+ <!-- Acceptors -->
+ <acceptors>
+ <acceptor name="netty-acceptor">
+ <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
+ <param key="port" value="5446"/>
+ </acceptor>
+ </acceptors>
+
+ <!-- Clustering configuration -->
+
+ <broadcast-groups>
+ <broadcast-group name="my-broadcast-group">
+ <broadcast-period>5000</broadcast-period>
+ <jgroups-file>test-jgroups-file_ping.xml</jgroups-file>
+ <jgroups-channel>active_broadcast_channel</jgroups-channel>
+ <connector-ref>netty-connector</connector-ref>
+ </broadcast-group>
+ </broadcast-groups>
+
+ <discovery-groups>
+ <discovery-group name="my-discovery-group">
+ <jgroups-file>test-jgroups-file_ping.xml</jgroups-file>
+ <jgroups-channel>active_broadcast_channel</jgroups-channel>
+ <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>true</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>
+
+</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-jgroups/src/main/resources/activemq/server1/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-jgroups/src/main/resources/activemq/server1/activemq-jms.xml b/examples/jms/clustered-jgroups/src/main/resources/activemq/server1/activemq-jms.xml
new file mode 100644
index 0000000..847659f
--- /dev/null
+++ b/examples/jms/clustered-jgroups/src/main/resources/activemq/server1/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>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-jgroups/src/main/resources/activemq/server1/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-jgroups/src/main/resources/activemq/server1/activemq-users.xml b/examples/jms/clustered-jgroups/src/main/resources/activemq/server1/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/clustered-jgroups/src/main/resources/activemq/server1/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/clustered-jgroups/src/main/resources/activemq/server1/client-jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-jgroups/src/main/resources/activemq/server1/client-jndi.properties b/examples/jms/clustered-jgroups/src/main/resources/activemq/server1/client-jndi.properties
new file mode 100644
index 0000000..7905109
--- /dev/null
+++ b/examples/jms/clustered-jgroups/src/main/resources/activemq/server1/client-jndi.properties
@@ -0,0 +1,2 @@
+java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
+java.naming.provider.url=tcp://localhost:5446
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-jgroups/src/main/resources/activemq/server1/test-jgroups-file_ping.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-jgroups/src/main/resources/activemq/server1/test-jgroups-file_ping.xml b/examples/jms/clustered-jgroups/src/main/resources/activemq/server1/test-jgroups-file_ping.xml
new file mode 100644
index 0000000..38ad144
--- /dev/null
+++ b/examples/jms/clustered-jgroups/src/main/resources/activemq/server1/test-jgroups-file_ping.xml
@@ -0,0 +1,52 @@
+<config xmlns="urn:org:jgroups"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:org:jgroups http://www.jgroups.org/schema/JGroups-3.0.xsd">
+ <TCP loopback="true"
+ recv_buf_size="20000000"
+ send_buf_size="640000"
+ discard_incompatible_packets="true"
+ max_bundle_size="64000"
+ max_bundle_timeout="30"
+ enable_bundling="true"
+ use_send_queues="false"
+ sock_conn_timeout="300"
+
+ thread_pool.enabled="true"
+ thread_pool.min_threads="1"
+ thread_pool.max_threads="10"
+ thread_pool.keep_alive_time="5000"
+ thread_pool.queue_enabled="false"
+ thread_pool.queue_max_size="100"
+ thread_pool.rejection_policy="run"
+
+ oob_thread_pool.enabled="true"
+ oob_thread_pool.min_threads="1"
+ oob_thread_pool.max_threads="8"
+ oob_thread_pool.keep_alive_time="5000"
+ oob_thread_pool.queue_enabled="false"
+ oob_thread_pool.queue_max_size="100"
+ oob_thread_pool.rejection_policy="run"/>
+
+ <FILE_PING location="../file.ping.dir"/>
+ <MERGE2 max_interval="30000"
+ min_interval="10000"/>
+ <FD_SOCK/>
+ <FD timeout="10000" max_tries="5" />
+ <VERIFY_SUSPECT timeout="1500" />
+ <BARRIER />
+ <pbcast.NAKACK
+ use_mcast_xmit="false"
+ retransmit_timeout="300,600,1200,2400,4800"
+ discard_delivered_msgs="true"/>
+ <UNICAST timeout="300,600,1200" />
+ <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
+ max_bytes="400000"/>
+ <pbcast.GMS print_local_addr="true" join_timeout="3000"
+
+ view_bundling="true"/>
+ <FC max_credits="2000000"
+ min_threshold="0.10"/>
+ <FRAG2 frag_size="60000" />
+ <pbcast.STATE_TRANSFER/>
+ <pbcast.FLUSH timeout="0"/>
+</config>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-jgroups/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-jgroups/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/clustered-jgroups/src/main/resources/hornetq/server0/activemq-configuration.xml
deleted file mode 100644
index 43692a4..0000000
--- a/examples/jms/clustered-jgroups/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<configuration xmlns="urn:activemq"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
-
-
- <paging-directory>server0/paging</paging-directory>
-
- <bindings-directory>server0/bindings</bindings-directory>
-
- <journal-directory>server0/journal</journal-directory>
-
- <large-messages-directory>server0/large-messages</large-messages-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">
- <broadcast-period>5000</broadcast-period>
- <jgroups-file>test-jgroups-file_ping.xml</jgroups-file>
- <jgroups-channel>active_broadcast_channel</jgroups-channel>
- <connector-ref>netty-connector</connector-ref>
- </broadcast-group>
- </broadcast-groups>
-
- <discovery-groups>
- <discovery-group name="my-discovery-group">
- <jgroups-file>test-jgroups-file_ping.xml</jgroups-file>
- <jgroups-channel>active_broadcast_channel</jgroups-channel>
- <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>true</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>
-
-</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-jgroups/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index 847659f..0000000
--- a/examples/jms/clustered-jgroups/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>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-jgroups/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/clustered-jgroups/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/clustered-jgroups/src/main/resources/hornetq/server0/client-jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-jgroups/src/main/resources/hornetq/server0/client-jndi.properties b/examples/jms/clustered-jgroups/src/main/resources/hornetq/server0/client-jndi.properties
deleted file mode 100644
index 6940f75..0000000
--- a/examples/jms/clustered-jgroups/src/main/resources/hornetq/server0/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/clustered-jgroups/src/main/resources/hornetq/server0/test-jgroups-file_ping.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-jgroups/src/main/resources/hornetq/server0/test-jgroups-file_ping.xml b/examples/jms/clustered-jgroups/src/main/resources/hornetq/server0/test-jgroups-file_ping.xml
deleted file mode 100644
index 269e06e..0000000
--- a/examples/jms/clustered-jgroups/src/main/resources/hornetq/server0/test-jgroups-file_ping.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<config xmlns="urn:org:jgroups"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:org:jgroups file:schema/JGroups-2.8.xsd">
- <TCP loopback="true"
- recv_buf_size="20000000"
- send_buf_size="640000"
- discard_incompatible_packets="true"
- max_bundle_size="64000"
- max_bundle_timeout="30"
- enable_bundling="true"
- use_send_queues="false"
- sock_conn_timeout="300"
-
- thread_pool.enabled="true"
- thread_pool.min_threads="1"
- thread_pool.max_threads="10"
- thread_pool.keep_alive_time="5000"
- thread_pool.queue_enabled="false"
- thread_pool.queue_max_size="100"
- thread_pool.rejection_policy="run"
-
- oob_thread_pool.enabled="true"
- oob_thread_pool.min_threads="1"
- oob_thread_pool.max_threads="8"
- oob_thread_pool.keep_alive_time="5000"
- oob_thread_pool.queue_enabled="false"
- oob_thread_pool.queue_max_size="100"
- oob_thread_pool.rejection_policy="run"/>
-
- <FILE_PING location="../file.ping.dir"/>
- <MERGE2 max_interval="30000"
- min_interval="10000"/>
- <FD_SOCK/>
- <FD timeout="10000" max_tries="5" />
- <VERIFY_SUSPECT timeout="1500" />
- <BARRIER />
- <pbcast.NAKACK
- use_mcast_xmit="false"
- retransmit_timeout="300,600,1200,2400,4800"
- discard_delivered_msgs="true"/>
- <UNICAST timeout="300,600,1200" />
- <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
- max_bytes="400000"/>
- <pbcast.GMS print_local_addr="true" join_timeout="3000"
-
- view_bundling="true"/>
- <FC max_credits="2000000"
- min_threshold="0.10"/>
- <FRAG2 frag_size="60000" />
- <pbcast.STATE_TRANSFER/>
- <pbcast.FLUSH timeout="0"/>
-</config>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-jgroups/src/main/resources/hornetq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-jgroups/src/main/resources/hornetq/server1/activemq-configuration.xml b/examples/jms/clustered-jgroups/src/main/resources/hornetq/server1/activemq-configuration.xml
deleted file mode 100644
index b19c11f..0000000
--- a/examples/jms/clustered-jgroups/src/main/resources/hornetq/server1/activemq-configuration.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<configuration xmlns="urn:activemq"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
-
-
- <paging-directory>server1/paging</paging-directory>
-
- <bindings-directory>server1/bindings</bindings-directory>
-
- <journal-directory>server1/journal</journal-directory>
-
- <large-messages-directory>server1/large-messages</large-messages-directory>
-
- <!-- Connectors -->
- <connectors>
- <connector name="netty-connector">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
- <param key="port" value="5446"/>
- </connector>
- </connectors>
-
- <!-- Acceptors -->
- <acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- <param key="port" value="5446"/>
- </acceptor>
- </acceptors>
-
- <!-- Clustering configuration -->
-
- <broadcast-groups>
- <broadcast-group name="my-broadcast-group">
- <broadcast-period>5000</broadcast-period>
- <jgroups-file>test-jgroups-file_ping.xml</jgroups-file>
- <jgroups-channel>active_broadcast_channel</jgroups-channel>
- <connector-ref>netty-connector</connector-ref>
- </broadcast-group>
- </broadcast-groups>
-
- <discovery-groups>
- <discovery-group name="my-discovery-group">
- <jgroups-file>test-jgroups-file_ping.xml</jgroups-file>
- <jgroups-channel>active_broadcast_channel</jgroups-channel>
- <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>true</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>
-
-</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-jgroups/src/main/resources/hornetq/server1/activemq-jms.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index 847659f..0000000
--- a/examples/jms/clustered-jgroups/src/main/resources/hornetq/server1/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>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-jgroups/src/main/resources/hornetq/server1/activemq-users.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/clustered-jgroups/src/main/resources/hornetq/server1/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/clustered-jgroups/src/main/resources/hornetq/server1/client-jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-jgroups/src/main/resources/hornetq/server1/client-jndi.properties b/examples/jms/clustered-jgroups/src/main/resources/hornetq/server1/client-jndi.properties
deleted file mode 100644
index 7905109..0000000
--- a/examples/jms/clustered-jgroups/src/main/resources/hornetq/server1/client-jndi.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
-java.naming.provider.url=tcp://localhost:5446
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-jgroups/src/main/resources/hornetq/server1/test-jgroups-file_ping.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-jgroups/src/main/resources/hornetq/server1/test-jgroups-file_ping.xml b/examples/jms/clustered-jgroups/src/main/resources/hornetq/server1/test-jgroups-file_ping.xml
deleted file mode 100644
index 38ad144..0000000
--- a/examples/jms/clustered-jgroups/src/main/resources/hornetq/server1/test-jgroups-file_ping.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<config xmlns="urn:org:jgroups"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:org:jgroups http://www.jgroups.org/schema/JGroups-3.0.xsd">
- <TCP loopback="true"
- recv_buf_size="20000000"
- send_buf_size="640000"
- discard_incompatible_packets="true"
- max_bundle_size="64000"
- max_bundle_timeout="30"
- enable_bundling="true"
- use_send_queues="false"
- sock_conn_timeout="300"
-
- thread_pool.enabled="true"
- thread_pool.min_threads="1"
- thread_pool.max_threads="10"
- thread_pool.keep_alive_time="5000"
- thread_pool.queue_enabled="false"
- thread_pool.queue_max_size="100"
- thread_pool.rejection_policy="run"
-
- oob_thread_pool.enabled="true"
- oob_thread_pool.min_threads="1"
- oob_thread_pool.max_threads="8"
- oob_thread_pool.keep_alive_time="5000"
- oob_thread_pool.queue_enabled="false"
- oob_thread_pool.queue_max_size="100"
- oob_thread_pool.rejection_policy="run"/>
-
- <FILE_PING location="../file.ping.dir"/>
- <MERGE2 max_interval="30000"
- min_interval="10000"/>
- <FD_SOCK/>
- <FD timeout="10000" max_tries="5" />
- <VERIFY_SUSPECT timeout="1500" />
- <BARRIER />
- <pbcast.NAKACK
- use_mcast_xmit="false"
- retransmit_timeout="300,600,1200,2400,4800"
- discard_delivered_msgs="true"/>
- <UNICAST timeout="300,600,1200" />
- <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
- max_bytes="400000"/>
- <pbcast.GMS print_local_addr="true" join_timeout="3000"
-
- view_bundling="true"/>
- <FC max_credits="2000000"
- min_threshold="0.10"/>
- <FRAG2 frag_size="60000" />
- <pbcast.STATE_TRANSFER/>
- <pbcast.FLUSH timeout="0"/>
-</config>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-queue/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-queue/pom.xml b/examples/jms/clustered-queue/pom.xml
index dfb3c5a..c2e912c 100644
--- a/examples/jms/clustered-queue/pom.xml
+++ b/examples/jms/clustered-queue/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>udp-address</name>
@@ -51,9 +51,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>
@@ -82,7 +80,7 @@
<goal>stop</goal>
</goals>
<configuration>
- <hornetqConfigurationDir>${basedir}/target/classes/activemq/server0</hornetqConfigurationDir>
+ <configurationDir>${basedir}/target/classes/activemq/server0</configurationDir>
</configuration>
</execution>
<execution>
@@ -91,7 +89,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/clustered-queue/src/main/java/org/apache/activemq/jms/example/ClusteredQueueExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-queue/src/main/java/org/apache/activemq/jms/example/ClusteredQueueExample.java b/examples/jms/clustered-queue/src/main/java/org/apache/activemq/jms/example/ClusteredQueueExample.java
index 5c1874d..2da1881 100644
--- a/examples/jms/clustered-queue/src/main/java/org/apache/activemq/jms/example/ClusteredQueueExample.java
+++ b/examples/jms/clustered-queue/src/main/java/org/apache/activemq/jms/example/ClusteredQueueExample.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;
@@ -54,7 +56,11 @@ public class ClusteredQueueExample 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");
@@ -63,7 +69,10 @@ public class ClusteredQueueExample 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/clustered-queue/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-queue/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/clustered-queue/src/main/resources/activemq/server0/activemq-configuration.xml
new file mode 100644
index 0000000..8ddc2c8
--- /dev/null
+++ b/examples/jms/clustered-queue/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -0,0 +1,74 @@
+<configuration xmlns="urn:activemq"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
+
+
+ <bindings-directory>target/server0/data/messaging/bindings</bindings-directory>
+
+ <journal-directory>target/server0/data/messaging/journal</journal-directory>
+
+ <large-messages-directory>target/server0/data/messaging/largemessages</large-messages-directory>
+
+ <paging-directory>target/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>true</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>
+
+</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-queue/src/main/resources/activemq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-queue/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/clustered-queue/src/main/resources/activemq/server0/activemq-jms.xml
new file mode 100644
index 0000000..847659f
--- /dev/null
+++ b/examples/jms/clustered-queue/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>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-queue/src/main/resources/activemq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-queue/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/clustered-queue/src/main/resources/activemq/server0/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/clustered-queue/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/clustered-queue/src/main/resources/activemq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-queue/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/clustered-queue/src/main/resources/activemq/server1/activemq-configuration.xml
new file mode 100644
index 0000000..8455252
--- /dev/null
+++ b/examples/jms/clustered-queue/src/main/resources/activemq/server1/activemq-configuration.xml
@@ -0,0 +1,75 @@
+<configuration xmlns="urn:activemq"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
+
+
+
+ <bindings-directory>target/server1/data/messaging/bindings</bindings-directory>
+
+ <journal-directory>target/server1/data/messaging/journal</journal-directory>
+
+ <large-messages-directory>target/server1/data/messaging/largemessages</large-messages-directory>
+
+ <paging-directory>target/server1/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="5446"/>
+ </connector>
+ </connectors>
+
+ <!-- Acceptors -->
+ <acceptors>
+ <acceptor name="netty-acceptor">
+ <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
+ <param key="port" value="5446"/>
+ </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>true</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>
+
+</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-queue/src/main/resources/activemq/server1/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-queue/src/main/resources/activemq/server1/activemq-jms.xml b/examples/jms/clustered-queue/src/main/resources/activemq/server1/activemq-jms.xml
new file mode 100644
index 0000000..847659f
--- /dev/null
+++ b/examples/jms/clustered-queue/src/main/resources/activemq/server1/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>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-queue/src/main/resources/activemq/server1/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-queue/src/main/resources/activemq/server1/activemq-users.xml b/examples/jms/clustered-queue/src/main/resources/activemq/server1/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/clustered-queue/src/main/resources/activemq/server1/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/clustered-queue/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-queue/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/clustered-queue/src/main/resources/hornetq/server0/activemq-configuration.xml
deleted file mode 100644
index 8ddc2c8..0000000
--- a/examples/jms/clustered-queue/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ /dev/null
@@ -1,74 +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>target/server0/data/messaging/bindings</bindings-directory>
-
- <journal-directory>target/server0/data/messaging/journal</journal-directory>
-
- <large-messages-directory>target/server0/data/messaging/largemessages</large-messages-directory>
-
- <paging-directory>target/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>true</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>
-
-</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-queue/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index 847659f..0000000
--- a/examples/jms/clustered-queue/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>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-queue/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/clustered-queue/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/clustered-queue/src/main/resources/hornetq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-queue/src/main/resources/hornetq/server1/activemq-configuration.xml b/examples/jms/clustered-queue/src/main/resources/hornetq/server1/activemq-configuration.xml
deleted file mode 100644
index 8455252..0000000
--- a/examples/jms/clustered-queue/src/main/resources/hornetq/server1/activemq-configuration.xml
+++ /dev/null
@@ -1,75 +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>target/server1/data/messaging/bindings</bindings-directory>
-
- <journal-directory>target/server1/data/messaging/journal</journal-directory>
-
- <large-messages-directory>target/server1/data/messaging/largemessages</large-messages-directory>
-
- <paging-directory>target/server1/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="5446"/>
- </connector>
- </connectors>
-
- <!-- Acceptors -->
- <acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- <param key="port" value="5446"/>
- </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>true</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>
-
-</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-queue/src/main/resources/hornetq/server1/activemq-jms.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index 847659f..0000000
--- a/examples/jms/clustered-queue/src/main/resources/hornetq/server1/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>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-queue/src/main/resources/hornetq/server1/activemq-users.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/clustered-queue/src/main/resources/hornetq/server1/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/clustered-standalone/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-standalone/pom.xml b/examples/jms/clustered-standalone/pom.xml
index 427ec71..fe99c7c 100644
--- a/examples/jms/clustered-standalone/pom.xml
+++ b/examples/jms/clustered-standalone/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>udp-address</name>
@@ -51,9 +51,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>
@@ -69,9 +67,7 @@
<goal>start</goal>
</goals>
<configuration>
- <jndiPort>1299</jndiPort>
- <jndiRmiPort>1298</jndiRmiPort>
- <hornetqConfigurationDir>${basedir}/target/classes/activemq/server2</hornetqConfigurationDir>
+ <configurationDir>${basedir}/target/classes/activemq/server2</configurationDir>
<fork>true</fork>
<systemProperties>
<property>
@@ -107,7 +103,7 @@
<goal>stop</goal>
</goals>
<configuration>
- <hornetqConfigurationDir>${basedir}/target/classes/activemq/server0</hornetqConfigurationDir>
+ <configurationDir>${basedir}/target/classes/activemq/server0</configurationDir>
</configuration>
</execution>
<execution>
@@ -116,7 +112,7 @@
<goal>stop</goal>
</goals>
<configuration>
- <hornetqConfigurationDir>${basedir}/target/classes/activemq/server1</hornetqConfigurationDir>
+ <configurationDir>${basedir}/target/classes/activemq/server1</configurationDir>
</configuration>
</execution>
<execution>
@@ -125,7 +121,7 @@
<goal>stop</goal>
</goals>
<configuration>
- <hornetqConfigurationDir>${basedir}/target/classes/activemq/server2</hornetqConfigurationDir>
+ <configurationDir>${basedir}/target/classes/activemq/server2</configurationDir>
</configuration>
</execution>
</executions>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-standalone/src/main/java/org/apache/activemq/jms/example/ClusteredStandaloneExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-standalone/src/main/java/org/apache/activemq/jms/example/ClusteredStandaloneExample.java b/examples/jms/clustered-standalone/src/main/java/org/apache/activemq/jms/example/ClusteredStandaloneExample.java
index 28704ce..e516469 100644
--- a/examples/jms/clustered-standalone/src/main/java/org/apache/activemq/jms/example/ClusteredStandaloneExample.java
+++ b/examples/jms/clustered-standalone/src/main/java/org/apache/activemq/jms/example/ClusteredStandaloneExample.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;
@@ -28,24 +30,7 @@ import javax.naming.InitialContext;
import org.apache.activemq.common.example.ActiveMQExample;
/**
- *
- * This example demonstrates a distributed topic, and needs three servers to be started before the example is run.
- *
- * The example will not spawn the servers itself.
- *
- * The servers should be started using ./run.sh ../config/stand-alone/clustered
- *
- * If running on the same physical box, make sure that each server:
- *
- * a) uses a different data directory
- * b) uses different ports for the netty acceptor
- * c) uses different ports for JNDI
- *
- * Update server[0|1|2]/client-jndi.properties to the correct ports and hosts for the 3 servers
- *
* @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a>
- *
- *
*/
public class ClusteredStandaloneExample extends ActiveMQExample
{
@@ -69,11 +54,21 @@ public class ClusteredStandaloneExample extends ActiveMQExample
try
{
- initialContext0 = getContext(0);
-
- initialContext1 = getContext(1);
-
- initialContext2 = getContext(2);
+ 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("topic.topic/exampleTopic", "exampleTopic");
+ initialContext0 = new InitialContext(properties);
+
+ properties = new Hashtable<String, Object>();
+ properties.put("java.naming.factory.initial", "org.apache.activemq.jndi.ActiveMQInitialContextFactory");
+ properties.put("java.naming.provider.url", args[1]);
+ initialContext1 = new InitialContext(properties);
+
+ properties = new Hashtable<String, Object>();
+ properties.put("java.naming.factory.initial", "org.apache.activemq.jndi.ActiveMQInitialContextFactory");
+ properties.put("java.naming.provider.url", args[2]);
+ initialContext2 = new InitialContext(properties);
// First we demonstrate a distributed topic.
// We create a connection on each node, create a consumer on each connection and send some
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-standalone/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-standalone/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/clustered-standalone/src/main/resources/activemq/server0/activemq-configuration.xml
new file mode 100644
index 0000000..f57cc35
--- /dev/null
+++ b/examples/jms/clustered-standalone/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -0,0 +1,74 @@
+<configuration xmlns="urn:activemq"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
+
+
+ <bindings-directory>target/server0/data/messaging/bindings</bindings-directory>
+
+ <journal-directory>target/server0/data/messaging/journal</journal-directory>
+
+ <large-messages-directory>target/server0/data/messaging/largemessages</large-messages-directory>
+
+ <paging-directory>target/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>true</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.topic.exampleTopic">
+ <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/clustered-standalone/src/main/resources/activemq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-standalone/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/clustered-standalone/src/main/resources/activemq/server0/activemq-jms.xml
new file mode 100644
index 0000000..845dfe1
--- /dev/null
+++ b/examples/jms/clustered-standalone/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 topic used by the example-->
+ <topic name="exampleTopic"/>
+
+</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-standalone/src/main/resources/activemq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-standalone/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/clustered-standalone/src/main/resources/activemq/server0/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/clustered-standalone/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/clustered-standalone/src/main/resources/activemq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-standalone/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/clustered-standalone/src/main/resources/activemq/server1/activemq-configuration.xml
new file mode 100644
index 0000000..22efe1d
--- /dev/null
+++ b/examples/jms/clustered-standalone/src/main/resources/activemq/server1/activemq-configuration.xml
@@ -0,0 +1,75 @@
+<configuration xmlns="urn:activemq"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
+
+
+
+ <bindings-directory>target/server1/data/messaging/bindings</bindings-directory>
+
+ <journal-directory>target/server1/data/messaging/journal</journal-directory>
+
+ <large-messages-directory>target/server1/data/messaging/largemessages</large-messages-directory>
+
+ <paging-directory>target/server1/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="5446"/>
+ </connector>
+ </connectors>
+
+ <!-- Acceptors -->
+ <acceptors>
+ <acceptor name="netty-acceptor">
+ <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
+ <param key="port" value="5446"/>
+ </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>true</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.topic.exampleTopic">
+ <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/clustered-standalone/src/main/resources/activemq/server1/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-standalone/src/main/resources/activemq/server1/activemq-jms.xml b/examples/jms/clustered-standalone/src/main/resources/activemq/server1/activemq-jms.xml
new file mode 100644
index 0000000..845dfe1
--- /dev/null
+++ b/examples/jms/clustered-standalone/src/main/resources/activemq/server1/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 topic used by the example-->
+ <topic name="exampleTopic"/>
+
+</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-standalone/src/main/resources/activemq/server1/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-standalone/src/main/resources/activemq/server1/activemq-users.xml b/examples/jms/clustered-standalone/src/main/resources/activemq/server1/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/clustered-standalone/src/main/resources/activemq/server1/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/clustered-standalone/src/main/resources/activemq/server2/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-standalone/src/main/resources/activemq/server2/activemq-configuration.xml b/examples/jms/clustered-standalone/src/main/resources/activemq/server2/activemq-configuration.xml
new file mode 100644
index 0000000..b186ea2
--- /dev/null
+++ b/examples/jms/clustered-standalone/src/main/resources/activemq/server2/activemq-configuration.xml
@@ -0,0 +1,75 @@
+<configuration xmlns="urn:activemq"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
+
+
+
+ <bindings-directory>target/server2/data/messaging/bindings</bindings-directory>
+
+ <journal-directory>target/server2/data/messaging/journal</journal-directory>
+
+ <large-messages-directory>target/server2/data/messaging/largemessages</large-messages-directory>
+
+ <paging-directory>target/server2/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="5447"/>
+ </connector>
+ </connectors>
+
+ <!-- Acceptors -->
+ <acceptors>
+ <acceptor name="netty-acceptor">
+ <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
+ <param key="port" value="5447"/>
+ </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>true</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.topic.exampleTopic">
+ <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/clustered-standalone/src/main/resources/activemq/server2/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-standalone/src/main/resources/activemq/server2/activemq-jms.xml b/examples/jms/clustered-standalone/src/main/resources/activemq/server2/activemq-jms.xml
new file mode 100644
index 0000000..845dfe1
--- /dev/null
+++ b/examples/jms/clustered-standalone/src/main/resources/activemq/server2/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 topic used by the example-->
+ <topic name="exampleTopic"/>
+
+</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-standalone/src/main/resources/activemq/server2/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-standalone/src/main/resources/activemq/server2/activemq-users.xml b/examples/jms/clustered-standalone/src/main/resources/activemq/server2/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/clustered-standalone/src/main/resources/activemq/server2/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/clustered-standalone/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-standalone/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/clustered-standalone/src/main/resources/hornetq/server0/activemq-configuration.xml
deleted file mode 100644
index f57cc35..0000000
--- a/examples/jms/clustered-standalone/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ /dev/null
@@ -1,74 +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>target/server0/data/messaging/bindings</bindings-directory>
-
- <journal-directory>target/server0/data/messaging/journal</journal-directory>
-
- <large-messages-directory>target/server0/data/messaging/largemessages</large-messages-directory>
-
- <paging-directory>target/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>true</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.topic.exampleTopic">
- <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/clustered-standalone/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-standalone/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/clustered-standalone/src/main/resources/hornetq/server0/activemq-jms.xml
deleted file mode 100644
index 845dfe1..0000000
--- a/examples/jms/clustered-standalone/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 topic used by the example-->
- <topic name="exampleTopic"/>
-
-</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-standalone/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/clustered-standalone/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/clustered-standalone/src/main/resources/hornetq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-standalone/src/main/resources/hornetq/server1/activemq-configuration.xml b/examples/jms/clustered-standalone/src/main/resources/hornetq/server1/activemq-configuration.xml
deleted file mode 100644
index 22efe1d..0000000
--- a/examples/jms/clustered-standalone/src/main/resources/hornetq/server1/activemq-configuration.xml
+++ /dev/null
@@ -1,75 +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>target/server1/data/messaging/bindings</bindings-directory>
-
- <journal-directory>target/server1/data/messaging/journal</journal-directory>
-
- <large-messages-directory>target/server1/data/messaging/largemessages</large-messages-directory>
-
- <paging-directory>target/server1/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="5446"/>
- </connector>
- </connectors>
-
- <!-- Acceptors -->
- <acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- <param key="port" value="5446"/>
- </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>true</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.topic.exampleTopic">
- <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/clustered-standalone/src/main/resources/hornetq/server1/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-standalone/src/main/resources/hornetq/server1/activemq-jms.xml b/examples/jms/clustered-standalone/src/main/resources/hornetq/server1/activemq-jms.xml
deleted file mode 100644
index 212fbd1..0000000
--- a/examples/jms/clustered-standalone/src/main/resources/hornetq/server1/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 topic used by the example-->
- <topic name="exampleTopic"/>
- </topic>
-
-</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-standalone/src/main/resources/hornetq/server1/activemq-users.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/clustered-standalone/src/main/resources/hornetq/server1/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/clustered-standalone/src/main/resources/hornetq/server2/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-standalone/src/main/resources/hornetq/server2/activemq-configuration.xml b/examples/jms/clustered-standalone/src/main/resources/hornetq/server2/activemq-configuration.xml
deleted file mode 100644
index b186ea2..0000000
--- a/examples/jms/clustered-standalone/src/main/resources/hornetq/server2/activemq-configuration.xml
+++ /dev/null
@@ -1,75 +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>target/server2/data/messaging/bindings</bindings-directory>
-
- <journal-directory>target/server2/data/messaging/journal</journal-directory>
-
- <large-messages-directory>target/server2/data/messaging/largemessages</large-messages-directory>
-
- <paging-directory>target/server2/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="5447"/>
- </connector>
- </connectors>
-
- <!-- Acceptors -->
- <acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- <param key="port" value="5447"/>
- </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>true</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.topic.exampleTopic">
- <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/clustered-standalone/src/main/resources/hornetq/server2/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-standalone/src/main/resources/hornetq/server2/activemq-jms.xml b/examples/jms/clustered-standalone/src/main/resources/hornetq/server2/activemq-jms.xml
deleted file mode 100644
index 845dfe1..0000000
--- a/examples/jms/clustered-standalone/src/main/resources/hornetq/server2/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 topic used by the example-->
- <topic name="exampleTopic"/>
-
-</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-standalone/src/main/resources/hornetq/server2/activemq-users.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/clustered-standalone/src/main/resources/hornetq/server2/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
[27/37] activemq-6 git commit: ACTIVEMQ6-51 Example server
bootstrapping
Posted by jb...@apache.org.
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/jms-bridge/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/jms-bridge/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/jms-bridge/src/main/resources/activemq/server0/activemq-configuration.xml
new file mode 100644
index 0000000..b1a240c
--- /dev/null
+++ b/examples/jms/jms-bridge/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -0,0 +1,28 @@
+ <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>
+ <acceptor name="netty">
+ <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
+ </acceptor>
+ </acceptors>
+
+ <security-settings>
+ <security-setting match="jms.#">
+ <permission type="consume" roles="guest"/>
+ <permission type="send" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
+ </security-setting>
+ </security-settings>
+</configuration>
+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/jms-bridge/src/main/resources/activemq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/jms-bridge/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/jms-bridge/src/main/resources/activemq/server0/activemq-jms.xml
new file mode 100644
index 0000000..e2bb478
--- /dev/null
+++ b/examples/jms/jms-bridge/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">
+
+ <topic name="topic"/>
+
+</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/jms-bridge/src/main/resources/activemq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/jms-bridge/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/jms-bridge/src/main/resources/activemq/server0/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/jms-bridge/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/jms-bridge/src/main/resources/activemq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/jms-bridge/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/jms-bridge/src/main/resources/activemq/server1/activemq-configuration.xml
new file mode 100644
index 0000000..6240fb1
--- /dev/null
+++ b/examples/jms/jms-bridge/src/main/resources/activemq/server1/activemq-configuration.xml
@@ -0,0 +1,31 @@
+ <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}/server1/data/messaging/bindings</bindings-directory>
+
+ <journal-directory>${build.directory}/server1/data/messaging/journal</journal-directory>
+
+ <large-messages-directory>${build.directory}/server1/data/messaging/largemessages</large-messages-directory>
+
+ <paging-directory>${build.directory}/server1/data/messaging/paging</paging-directory>
+
+ <acceptors>
+ <acceptor name="netty">
+ <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
+ <!-- the server accepts connections on all the server addresses -->
+ <param key="host" value="localhost"/>
+ <param key="port" value="5455"/>
+ </acceptor>
+ </acceptors>
+
+ <security-settings>
+ <security-setting match="jms.#">
+ <permission type="consume" roles="guest"/>
+ <permission type="send" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
+ </security-setting>
+ </security-settings>
+</configuration>
+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/jms-bridge/src/main/resources/activemq/server1/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/jms-bridge/src/main/resources/activemq/server1/activemq-jms.xml b/examples/jms/jms-bridge/src/main/resources/activemq/server1/activemq-jms.xml
new file mode 100644
index 0000000..0f89939
--- /dev/null
+++ b/examples/jms/jms-bridge/src/main/resources/activemq/server1/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="target"/>
+
+</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/jms-bridge/src/main/resources/activemq/server1/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/jms-bridge/src/main/resources/activemq/server1/activemq-users.xml b/examples/jms/jms-bridge/src/main/resources/activemq/server1/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/jms-bridge/src/main/resources/activemq/server1/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/jms-bridge/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/jms-bridge/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/jms-bridge/src/main/resources/hornetq/server0/activemq-configuration.xml
deleted file mode 100644
index 44d57f7..0000000
--- a/examples/jms/jms-bridge/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>
-
- <connectors>
- <connector name="netty">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
- <param key="host" value="localhost"/>
- </connector>
- </connectors>
-
- <acceptors>
- <acceptor name="netty">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- </acceptor>
- </acceptors>
-
- <security-settings>
- <security-setting match="jms.#">
- <permission type="consume" roles="guest"/>
- <permission type="send" roles="guest"/>
- <permission type="createNonDurableQueue" roles="guest"/>
- <permission type="deleteNonDurableQueue" roles="guest"/>
- </security-setting>
- </security-settings>
-</configuration>
-
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/jms-bridge/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/jms-bridge/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/jms-bridge/src/main/resources/hornetq/server0/activemq-jms.xml
deleted file mode 100644
index e2bb478..0000000
--- a/examples/jms/jms-bridge/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">
-
- <topic name="topic"/>
-
-</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/jms-bridge/src/main/resources/hornetq/server0/hornetq-users.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/jms-bridge/src/main/resources/hornetq/server0/hornetq-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/jms-bridge/src/main/resources/hornetq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/jms-bridge/src/main/resources/hornetq/server1/activemq-configuration.xml b/examples/jms/jms-bridge/src/main/resources/hornetq/server1/activemq-configuration.xml
deleted file mode 100644
index 47e2d2f..0000000
--- a/examples/jms/jms-bridge/src/main/resources/hornetq/server1/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}/server1/data/messaging/bindings</bindings-directory>
-
- <journal-directory>${build.directory}/server1/data/messaging/journal</journal-directory>
-
- <large-messages-directory>${build.directory}/server1/data/messaging/largemessages</large-messages-directory>
-
- <paging-directory>${build.directory}/server1/data/messaging/paging</paging-directory>
-
- <connectors>
- <connector name="netty">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
- <!-- **************************************** -->
- <!-- Replace with the *target* server address -->
- <!-- **************************************** -->
- <param key="host" value="localhost"/>
- <param key="port" value="5455"/>
- </connector>
- </connectors>
-
- <acceptors>
- <acceptor name="netty">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- <!-- the server accepts connections on all the server addresses -->
- <param key="host" value="localhost"/>
- <param key="port" value="5455"/>
- </acceptor>
- </acceptors>
-
- <security-settings>
- <security-setting match="jms.#">
- <permission type="consume" roles="guest"/>
- <permission type="send" roles="guest"/>
- <permission type="createNonDurableQueue" roles="guest"/>
- <permission type="deleteNonDurableQueue" roles="guest"/>
- </security-setting>
- </security-settings>
-</configuration>
-
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/jms-bridge/src/main/resources/hornetq/server1/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/jms-bridge/src/main/resources/hornetq/server1/activemq-jms.xml b/examples/jms/jms-bridge/src/main/resources/hornetq/server1/activemq-jms.xml
deleted file mode 100644
index 0f89939..0000000
--- a/examples/jms/jms-bridge/src/main/resources/hornetq/server1/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="target"/>
-
-</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/jms-bridge/src/main/resources/hornetq/server1/activemq-users.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/jms-bridge/src/main/resources/hornetq/server1/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/jms-completion-listener/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/jms-completion-listener/pom.xml b/examples/jms/jms-completion-listener/pom.xml
index c7909ab..beb47d2 100644
--- a/examples/jms/jms-completion-listener/pom.xml
+++ b/examples/jms/jms-completion-listener/pom.xml
@@ -51,9 +51,6 @@
</goals>
<configuration>
<clientClass>org.apache.activemq.jms.example.JMSCompletionListenerExample</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/jms-completion-listener/src/main/java/org/apache/activemq/jms/example/JMSCompletionListenerExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/jms-completion-listener/src/main/java/org/apache/activemq/jms/example/JMSCompletionListenerExample.java b/examples/jms/jms-completion-listener/src/main/java/org/apache/activemq/jms/example/JMSCompletionListenerExample.java
index fdb66fe..af5b13d 100644
--- a/examples/jms/jms-completion-listener/src/main/java/org/apache/activemq/jms/example/JMSCompletionListenerExample.java
+++ b/examples/jms/jms-completion-listener/src/main/java/org/apache/activemq/jms/example/JMSCompletionListenerExample.java
@@ -49,7 +49,7 @@ public class JMSCompletionListenerExample 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/jms-completion-listener/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/jms-completion-listener/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/jms-completion-listener/src/main/resources/activemq/server0/activemq-configuration.xml
new file mode 100644
index 0000000..52d9570
--- /dev/null
+++ b/examples/jms/jms-completion-listener/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/jms-completion-listener/src/main/resources/activemq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/jms-completion-listener/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/jms-completion-listener/src/main/resources/activemq/server0/activemq-jms.xml
new file mode 100644
index 0000000..0d5c953
--- /dev/null
+++ b/examples/jms/jms-completion-listener/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/jms-completion-listener/src/main/resources/activemq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/jms-completion-listener/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/jms-completion-listener/src/main/resources/activemq/server0/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/jms-completion-listener/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/jms-completion-listener/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/jms-completion-listener/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/jms-completion-listener/src/main/resources/hornetq/server0/activemq-configuration.xml
deleted file mode 100644
index e0acd1d..0000000
--- a/examples/jms/jms-completion-listener/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/jms-completion-listener/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index 0d5c953..0000000
--- a/examples/jms/jms-completion-listener/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/jms-completion-listener/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/jms-completion-listener/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/jms-completion-listener/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/jms-completion-listener/src/main/resources/jndi.properties b/examples/jms/jms-completion-listener/src/main/resources/jndi.properties
new file mode 100644
index 0000000..d9b5c6a
--- /dev/null
+++ b/examples/jms/jms-completion-listener/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/jms-context/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/jms-context/pom.xml b/examples/jms/jms-context/pom.xml
index 8371058..1283603 100644
--- a/examples/jms/jms-context/pom.xml
+++ b/examples/jms/jms-context/pom.xml
@@ -51,9 +51,6 @@
</goals>
<configuration>
<clientClass>org.apache.activemq.jms.example.JMSContextExample</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/jms-context/src/main/java/org/apache/activemq/jms/example/JMSContextExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/jms-context/src/main/java/org/apache/activemq/jms/example/JMSContextExample.java b/examples/jms/jms-context/src/main/java/org/apache/activemq/jms/example/JMSContextExample.java
index 9a78e7c..616574b 100644
--- a/examples/jms/jms-context/src/main/java/org/apache/activemq/jms/example/JMSContextExample.java
+++ b/examples/jms/jms-context/src/main/java/org/apache/activemq/jms/example/JMSContextExample.java
@@ -44,7 +44,7 @@ public class JMSContextExample 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/jms-context/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/jms-context/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/jms-context/src/main/resources/activemq/server0/activemq-configuration.xml
new file mode 100644
index 0000000..52d9570
--- /dev/null
+++ b/examples/jms/jms-context/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/jms-context/src/main/resources/activemq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/jms-context/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/jms-context/src/main/resources/activemq/server0/activemq-jms.xml
new file mode 100644
index 0000000..0d5c953
--- /dev/null
+++ b/examples/jms/jms-context/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/jms-context/src/main/resources/activemq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/jms-context/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/jms-context/src/main/resources/activemq/server0/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/jms-context/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/jms-context/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/jms-context/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/jms-context/src/main/resources/hornetq/server0/activemq-configuration.xml
deleted file mode 100644
index e0acd1d..0000000
--- a/examples/jms/jms-context/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/jms-context/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/jms-context/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/jms-context/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/jms-context/src/main/resources/jndi.properties b/examples/jms/jms-context/src/main/resources/jndi.properties
new file mode 100644
index 0000000..d9b5c6a
--- /dev/null
+++ b/examples/jms/jms-context/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/jms-shared-consumer/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/jms-shared-consumer/pom.xml b/examples/jms/jms-shared-consumer/pom.xml
index c59597a..9e9bcee 100644
--- a/examples/jms/jms-shared-consumer/pom.xml
+++ b/examples/jms/jms-shared-consumer/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/jms-shared-consumer/src/main/java/org/apache/activemq/jms/example/JMSSharedConsumerExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/jms-shared-consumer/src/main/java/org/apache/activemq/jms/example/JMSSharedConsumerExample.java b/examples/jms/jms-shared-consumer/src/main/java/org/apache/activemq/jms/example/JMSSharedConsumerExample.java
index 70c8ec5..23d72ca 100644
--- a/examples/jms/jms-shared-consumer/src/main/java/org/apache/activemq/jms/example/JMSSharedConsumerExample.java
+++ b/examples/jms/jms-shared-consumer/src/main/java/org/apache/activemq/jms/example/JMSSharedConsumerExample.java
@@ -52,7 +52,7 @@ public class JMSSharedConsumerExample 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
Topic topic = (Topic) initialContext.lookup("topic/exampleTopic");
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/jms-shared-consumer/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/jms-shared-consumer/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/jms-shared-consumer/src/main/resources/activemq/server0/activemq-configuration.xml
new file mode 100644
index 0000000..b3db2a6
--- /dev/null
+++ b/examples/jms/jms-shared-consumer/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.topic.exampleTopic">
+ <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/jms-shared-consumer/src/main/resources/activemq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/jms-shared-consumer/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/jms-shared-consumer/src/main/resources/activemq/server0/activemq-jms.xml
new file mode 100644
index 0000000..a053116
--- /dev/null
+++ b/examples/jms/jms-shared-consumer/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 topic used by the example-->
+ <topic name="exampleTopic"/>
+
+</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/jms-shared-consumer/src/main/resources/activemq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/jms-shared-consumer/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/jms-shared-consumer/src/main/resources/activemq/server0/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/jms-shared-consumer/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/jms-shared-consumer/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/jms-shared-consumer/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/jms-shared-consumer/src/main/resources/hornetq/server0/activemq-configuration.xml
deleted file mode 100644
index e83d7a4..0000000
--- a/examples/jms/jms-shared-consumer/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.topic.exampleTopic">
- <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/jms-shared-consumer/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/jms-shared-consumer/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/jms-shared-consumer/src/main/resources/hornetq/server0/activemq-jms.xml
deleted file mode 100644
index a053116..0000000
--- a/examples/jms/jms-shared-consumer/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 topic used by the example-->
- <topic name="exampleTopic"/>
-
-</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/jms-shared-consumer/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/jms-shared-consumer/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/jms-shared-consumer/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/jms-shared-consumer/src/main/resources/jndi.properties b/examples/jms/jms-shared-consumer/src/main/resources/jndi.properties
new file mode 100644
index 0000000..4faa790
--- /dev/null
+++ b/examples/jms/jms-shared-consumer/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
+topic.topic/exampleTopic=exampleTopic
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/jmx/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/jmx/pom.xml b/examples/jms/jmx/pom.xml
index 88d0ae6..2fd219f 100644
--- a/examples/jms/jmx/pom.xml
+++ b/examples/jms/jmx/pom.xml
@@ -79,9 +79,6 @@
</goals>
<configuration>
<clientClass>org.apache.activemq.jms.example.JMXExample</clientClass>
- <args>
- <param>tcp://localhost:5445</param>
- </args>
</configuration>
</execution>
<execution>
@@ -130,7 +127,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/jmx/src/main/java/org/apache/activemq/jms/example/JMXExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/jmx/src/main/java/org/apache/activemq/jms/example/JMXExample.java b/examples/jms/jmx/src/main/java/org/apache/activemq/jms/example/JMXExample.java
index af7e21f..6027479 100644
--- a/examples/jms/jmx/src/main/java/org/apache/activemq/jms/example/JMXExample.java
+++ b/examples/jms/jmx/src/main/java/org/apache/activemq/jms/example/JMXExample.java
@@ -60,7 +60,7 @@ public class JMXExample 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/jmx/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/jmx/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/jmx/src/main/resources/activemq/server0/activemq-configuration.xml
new file mode 100644
index 0000000..b698b1c
--- /dev/null
+++ b/examples/jms/jmx/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -0,0 +1,38 @@
+<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>
+
+
+ <!-- true to expose ActiveMQ resources through JMX -->
+ <jmx-management-enabled>true</jmx-management-enabled>
+
+ <!-- Acceptors -->
+ <acceptors>
+ <acceptor name="netty">
+ <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/jmx/src/main/resources/activemq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/jmx/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/jmx/src/main/resources/activemq/server0/activemq-jms.xml
new file mode 100644
index 0000000..0d5c953
--- /dev/null
+++ b/examples/jms/jmx/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/jmx/src/main/resources/activemq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/jmx/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/jmx/src/main/resources/activemq/server0/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/jmx/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/jmx/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/jmx/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/jmx/src/main/resources/hornetq/server0/activemq-configuration.xml
deleted file mode 100644
index f21d154..0000000
--- a/examples/jms/jmx/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ /dev/null
@@ -1,45 +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>
-
-
- <!-- true to expose ActiveMQ resources through JMX -->
- <jmx-management-enabled>true</jmx-management-enabled>
-
- <!-- Connectors -->
- <connectors>
- <connector name="netty">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
- </connector>
- </connectors>
-
- <!-- Acceptors -->
- <acceptors>
- <acceptor name="netty">
- <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/jmx/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/jmx/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/jmx/src/main/resources/hornetq/server0/activemq-jms.xml
deleted file mode 100644
index b53cafe..0000000
--- a/examples/jms/jmx/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"/>
- </queue>
-
-</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/jmx/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/jmx/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/jmx/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/jmx/src/main/resources/jndi.properties b/examples/jms/jmx/src/main/resources/jndi.properties
new file mode 100644
index 0000000..d9b5c6a
--- /dev/null
+++ b/examples/jms/jmx/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/large-message/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/large-message/pom.xml b/examples/jms/large-message/pom.xml
index 312ca1a..33fd123 100644
--- a/examples/jms/large-message/pom.xml
+++ b/examples/jms/large-message/pom.xml
@@ -51,9 +51,6 @@
</goals>
<configuration>
<clientClass>org.apache.activemq.jms.example.LargeMessageExample</clientClass>
- <args>
- <param>tcp://localhost:5445</param>
- </args>
<systemProperties>
<property>
<name>exampleConfigDir</name>
@@ -108,7 +105,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/large-message/src/main/java/org/apache/activemq/jms/example/LargeMessageExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/large-message/src/main/java/org/apache/activemq/jms/example/LargeMessageExample.java b/examples/jms/large-message/src/main/java/org/apache/activemq/jms/example/LargeMessageExample.java
index 7ffc7b9..2b9bf0e 100644
--- a/examples/jms/large-message/src/main/java/org/apache/activemq/jms/example/LargeMessageExample.java
+++ b/examples/jms/large-message/src/main/java/org/apache/activemq/jms/example/LargeMessageExample.java
@@ -50,13 +50,13 @@ public class LargeMessageExample extends ActiveMQExample
}
/**
- * The message we will send is size 10GiB, even though we are only running in 50MB of RAM on both
+ * The message we will send is size 2GiB, even though we are only running in 50MB of RAM on both
* client and server.
* <p>
* This may take some considerable time to create, send and consume - if it takes too long or you
* don't have enough disk space just reduce the file size here
*/
- private static final long FILE_SIZE = 2L * 1024 * 1024 * 1024; // 10 GiB message
+ private static final long FILE_SIZE = 2L * 1024 * 1024 * 1024; // 2 GiB message
@Override
public boolean runExample() throws Exception
@@ -67,7 +67,7 @@ public class LargeMessageExample 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");
@@ -137,7 +137,7 @@ public class LargeMessageExample extends ActiveMQExample
// Step 11. Now the server is restarted we can recreate the JMS Objects, and start the new connection
- initialContext = getContext(0);
+ initialContext = new InitialContext();
queue = (Queue)initialContext.lookup("queue/exampleQueue");
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/large-message/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/large-message/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/large-message/src/main/resources/activemq/server0/activemq-configuration.xml
new file mode 100644
index 0000000..52d9570
--- /dev/null
+++ b/examples/jms/large-message/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/large-message/src/main/resources/activemq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/large-message/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/large-message/src/main/resources/activemq/server0/activemq-jms.xml
new file mode 100644
index 0000000..0d5c953
--- /dev/null
+++ b/examples/jms/large-message/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/large-message/src/main/resources/activemq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/large-message/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/large-message/src/main/resources/activemq/server0/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/large-message/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/large-message/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index 9fa4061..0000000
--- a/examples/jms/large-message/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>
-
-
- <!-- 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/large-message/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/large-message/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/large-message/src/main/resources/hornetq/server0/activemq-jms.xml
deleted file mode 100644
index 0d5c953..0000000
--- a/examples/jms/large-message/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/large-message/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/large-message/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/large-message/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/large-message/src/main/resources/jndi.properties b/examples/jms/large-message/src/main/resources/jndi.properties
new file mode 100644
index 0000000..d9b5c6a
--- /dev/null
+++ b/examples/jms/large-message/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/last-value-queue/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/last-value-queue/pom.xml b/examples/jms/last-value-queue/pom.xml
index bfefd5f..2bcc97e 100644
--- a/examples/jms/last-value-queue/pom.xml
+++ b/examples/jms/last-value-queue/pom.xml
@@ -51,9 +51,6 @@
</goals>
<configuration>
<clientClass>org.apache.activemq.jms.example.LastValueQueueExample</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/last-value-queue/src/main/java/org/apache/activemq/jms/example/LastValueQueueExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/last-value-queue/src/main/java/org/apache/activemq/jms/example/LastValueQueueExample.java b/examples/jms/last-value-queue/src/main/java/org/apache/activemq/jms/example/LastValueQueueExample.java
index d62ea0b..be7992a 100644
--- a/examples/jms/last-value-queue/src/main/java/org/apache/activemq/jms/example/LastValueQueueExample.java
+++ b/examples/jms/last-value-queue/src/main/java/org/apache/activemq/jms/example/LastValueQueueExample.java
@@ -52,7 +52,7 @@ public class LastValueQueueExample 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/last-value-queue/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/last-value-queue/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/last-value-queue/src/main/resources/activemq/server0/activemq-configuration.xml
new file mode 100644
index 0000000..7cc74d7
--- /dev/null
+++ b/examples/jms/last-value-queue/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="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>
+
+ <address-settings>
+ <!--override the expiry address for the example-->
+ <address-setting match="jms.queue.lastValueQueue">
+ <last-value-queue>true</last-value-queue>
+ </address-setting>
+ </address-settings>
+
+</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/last-value-queue/src/main/resources/activemq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/last-value-queue/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/last-value-queue/src/main/resources/activemq/server0/activemq-jms.xml
new file mode 100644
index 0000000..847659f
--- /dev/null
+++ b/examples/jms/last-value-queue/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>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/last-value-queue/src/main/resources/activemq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/last-value-queue/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/last-value-queue/src/main/resources/activemq/server0/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/last-value-queue/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/last-value-queue/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/last-value-queue/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/last-value-queue/src/main/resources/hornetq/server0/activemq-configuration.xml
deleted file mode 100644
index 7e8ce42..0000000
--- a/examples/jms/last-value-queue/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 -->
-
- <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.lastValueQueue">
- <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>
- <!--override the expiry address for the example-->
- <address-setting match="jms.queue.lastValueQueue">
- <last-value-queue>true</last-value-queue>
- </address-setting>
- </address-settings>
-
-</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/last-value-queue/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/last-value-queue/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/last-value-queue/src/main/resources/hornetq/server0/activemq-jms.xml
deleted file mode 100644
index 847659f..0000000
--- a/examples/jms/last-value-queue/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>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/last-value-queue/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/last-value-queue/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/last-value-queue/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/last-value-queue/src/main/resources/jndi.properties b/examples/jms/last-value-queue/src/main/resources/jndi.properties
new file mode 100644
index 0000000..d9b5c6a
--- /dev/null
+++ b/examples/jms/last-value-queue/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/management-notifications/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/management-notifications/pom.xml b/examples/jms/management-notifications/pom.xml
index 4afe1d4..dd70dc0 100644
--- a/examples/jms/management-notifications/pom.xml
+++ b/examples/jms/management-notifications/pom.xml
@@ -51,9 +51,6 @@
</goals>
<configuration>
<clientClass>org.apache.activemq.jms.example.ManagementNotificationExample</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/management-notifications/src/main/java/org/apache/activemq/jms/example/ManagementNotificationExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/management-notifications/src/main/java/org/apache/activemq/jms/example/ManagementNotificationExample.java b/examples/jms/management-notifications/src/main/java/org/apache/activemq/jms/example/ManagementNotificationExample.java
index b98f825..de631dc 100644
--- a/examples/jms/management-notifications/src/main/java/org/apache/activemq/jms/example/ManagementNotificationExample.java
+++ b/examples/jms/management-notifications/src/main/java/org/apache/activemq/jms/example/ManagementNotificationExample.java
@@ -52,7 +52,7 @@ public class ManagementNotificationExample 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 queue
Queue queue = (Queue)initialContext.lookup("queue/exampleQueue");
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/management-notifications/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/management-notifications/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/management-notifications/src/main/resources/activemq/server0/activemq-configuration.xml
new file mode 100644
index 0000000..64680fb
--- /dev/null
+++ b/examples/jms/management-notifications/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -0,0 +1,52 @@
+<configuration xmlns="urn:activemq"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:activemq ../../../../src/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>
+
+
+ <management-notification-address>jms.topic.notificationsTopic</management-notification-address>
+
+ <!-- Netty standard TCP acceptor -->
+ <acceptors>
+ <acceptor name="netty">
+ <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
+ </acceptor>
+ </acceptors>
+
+ <!-- Other configs -->
+
+ <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 for notification queue-->
+ <security-setting match="jms.topic.notificationsTopic">
+ <permission type="consume" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
+ </security-setting>
+
+ <!-- security settings for JMS temporary queue -->
+ <security-setting match="queuetempjms.*">
+ <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/management-notifications/src/main/resources/activemq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/management-notifications/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/management-notifications/src/main/resources/activemq/server0/activemq-jms.xml
new file mode 100644
index 0000000..65e5a5c
--- /dev/null
+++ b/examples/jms/management-notifications/src/main/resources/activemq/server0/activemq-jms.xml
@@ -0,0 +1,11 @@
+<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"/>
+
+ <!--the notifications topic used by the example-->
+ <topic name="notificationsTopic"/>
+
+</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/management-notifications/src/main/resources/activemq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/management-notifications/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/management-notifications/src/main/resources/activemq/server0/activemq-users.xml
new file mode 100644
index 0000000..5db43ea
--- /dev/null
+++ b/examples/jms/management-notifications/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-security.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
[24/37] activemq-6 git commit: ACTIVEMQ6-51 Example server
bootstrapping
Posted by jb...@apache.org.
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>
[04/37] activemq-6 git commit: ACTIVEMQ6-41 Drop Java EE examples
Posted by jb...@apache.org.
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/mdb-tx-send/src/main/java/org/apache/activemq/javaee/example/MDBMessageSendTxClientExample.java
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-tx-send/src/main/java/org/apache/activemq/javaee/example/MDBMessageSendTxClientExample.java b/examples/javaee/mdb-tx-send/src/main/java/org/apache/activemq/javaee/example/MDBMessageSendTxClientExample.java
deleted file mode 100644
index 0288b62..0000000
--- a/examples/javaee/mdb-tx-send/src/main/java/org/apache/activemq/javaee/example/MDBMessageSendTxClientExample.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.activemq.javaee.example;
-
-import javax.jms.Connection;
-import javax.jms.ConnectionFactory;
-import javax.jms.MessageConsumer;
-import javax.jms.MessageProducer;
-import javax.jms.Queue;
-import javax.jms.Session;
-import javax.jms.TextMessage;
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import java.util.Properties;
-
-/**
- * @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a>
- */
-public class MDBMessageSendTxClientExample
-{
- public static void main(String[] args) throws Exception
- {
- Connection connection = null;
- InitialContext initialContext = null;
- try
- {
- //Step 1. Create an initial context to perform the JNDI lookup.
- final Properties env = new Properties();
-
- env.put(Context.INITIAL_CONTEXT_FACTORY, "org.jboss.naming.remote.client.InitialContextFactory");
-
- env.put(Context.PROVIDER_URL, "http-remoting://localhost:8080");
-
- initialContext = new InitialContext(env);
-
- //Step 2. Perfom a lookup on the queue
- Queue queue = (Queue) initialContext.lookup("jms/queues/testQueue");
-
- //Step 3. Perform a lookup on the Connection Factory
- ConnectionFactory cf = (ConnectionFactory) initialContext.lookup("jms/RemoteConnectionFactory");
-
- //Step 4.Create a JMS Connection
- connection = cf.createConnection("guest", "password");
-
- //Step 5. Create a JMS Session
- Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
-
- //Step 6. Create a JMS Message Producer
- MessageProducer producer = session.createProducer(queue);
-
- //Step 7. Create a Text Message
- TextMessage message = session.createTextMessage("This is a text message");
-
- System.out.println("Sent message: " + message.getText());
-
- //Step 8. Send the Message
- producer.send(message);
-
- //Step 15. We lookup the reply queue
- queue = (Queue) initialContext.lookup("jms/queues/replyQueue");
-
- //Step 16. We create a JMS message consumer
- MessageConsumer messageConsumer = session.createConsumer(queue);
-
- //Step 17. We start the connedction so we can receive messages
- connection.start();
-
- //Step 18. We receive the message and print it out
- message = (TextMessage) messageConsumer.receive(5000);
-
- System.out.println("message.getText() = " + message.getText());
-
- }
- finally
- {
- //Step 19. Be sure to close our JMS resources!
- if (initialContext != null)
- {
- initialContext.close();
- }
- if(connection != null)
- {
- connection.close();
- }
- }
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/mdb-tx-send/src/main/java/org/apache/activemq/javaee/example/server/MDBMessageSendTxExample.java
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-tx-send/src/main/java/org/apache/activemq/javaee/example/server/MDBMessageSendTxExample.java b/examples/javaee/mdb-tx-send/src/main/java/org/apache/activemq/javaee/example/server/MDBMessageSendTxExample.java
deleted file mode 100644
index b5ba45a..0000000
--- a/examples/javaee/mdb-tx-send/src/main/java/org/apache/activemq/javaee/example/server/MDBMessageSendTxExample.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.activemq.javaee.example.server;
-
-import org.jboss.ejb3.annotation.ResourceAdapter;
-
-import javax.annotation.Resource;
-import javax.ejb.ActivationConfigProperty;
-import javax.ejb.MessageDriven;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
-import javax.ejb.TransactionManagement;
-import javax.ejb.TransactionManagementType;
-import javax.jms.Connection;
-import javax.jms.ConnectionFactory;
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.MessageListener;
-import javax.jms.MessageProducer;
-import javax.jms.Queue;
-import javax.jms.Session;
-import javax.jms.TextMessage;
-
-/**
- * @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a>
- */
-@MessageDriven(name = "MDBMessageSendTxExample",
- activationConfig =
- {
- @ActivationConfigProperty(propertyName = "destinationType", propertyValue = "javax.jms.Queue"),
- @ActivationConfigProperty(propertyName = "destination", propertyValue = "queue/testQueue")
- })
-public class MDBMessageSendTxExample implements MessageListener
-{
- @Resource(mappedName = "java:/JmsXA")
- ConnectionFactory connectionFactory;
-
- @Resource(mappedName = "java:/queue/replyQueue")
- Queue replyQueue;
-
- public void onMessage(Message message)
- {
- Connection conn = null;
- try
- {
- //Step 9. We know the client is sending a text message so we cast
- TextMessage textMessage = (TextMessage)message;
-
- //Step 10. get the text from the message.
- String text = textMessage.getText();
-
- System.out.println("message " + text);
-
- //Step 11. we create a JMS connection
- conn = connectionFactory.createConnection();
-
- //Step 12. We create a JMS session
- Session sess = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
-
- //Step 13. we create a producer for the reply queue
- MessageProducer producer = sess.createProducer(replyQueue);
-
- //Step 14. we create a message and send it
- producer.send(sess.createTextMessage("this is a reply"));
-
- }
- catch (Exception e)
- {
- e.printStackTrace();
- }
- finally
- {
- if(conn != null)
- {
- try
- {
- conn.close();
- }
- catch (JMSException e)
- {
- }
- }
- }
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/mdb-tx-send/src/test/java/org/apache/activemq/javaee/examples/MDBCMTTxSendRunnerTest.java
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-tx-send/src/test/java/org/apache/activemq/javaee/examples/MDBCMTTxSendRunnerTest.java b/examples/javaee/mdb-tx-send/src/test/java/org/apache/activemq/javaee/examples/MDBCMTTxSendRunnerTest.java
deleted file mode 100644
index d930712..0000000
--- a/examples/javaee/mdb-tx-send/src/test/java/org/apache/activemq/javaee/examples/MDBCMTTxSendRunnerTest.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.activemq.javaee.examples;
-
-import org.apache.activemq.javaee.example.MDBMessageSendTxClientExample;
-import org.apache.activemq.javaee.example.server.MDBMessageSendTxExample;
-import org.jboss.arquillian.container.test.api.Deployment;
-import org.jboss.arquillian.container.test.api.RunAsClient;
-import org.jboss.arquillian.junit.Arquillian;
-import org.jboss.shrinkwrap.api.Archive;
-import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.spec.JavaArchive;
-import org.jboss.shrinkwrap.api.spec.WebArchive;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-/**
- * @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a>
- * @author Justin Bertram
- */
-@RunAsClient
-@RunWith(Arquillian.class)
-public class MDBCMTTxSendRunnerTest
-{
- @Deployment
- public static Archive getDeployment()
- {
- final JavaArchive ejbJar = ShrinkWrap.create(JavaArchive.class, "mdb.jar");
- ejbJar.addClass(MDBMessageSendTxExample.class);
-
- final WebArchive war = ShrinkWrap.create(WebArchive.class, "test.war");
- war.addAsManifestResource("jboss-deployment-structure.xml", "jboss-deployment-structure.xml");
- war.addAsLibrary(ejbJar);
- System.out.println(war.toString(true));
- return war;
- }
-
- @Test
- public void runExample() throws Exception
- {
- MDBMessageSendTxClientExample.main(null);
- }
-}
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/mdb-tx-send/src/test/resources/arquillian.xml
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-tx-send/src/test/resources/arquillian.xml b/examples/javaee/mdb-tx-send/src/test/resources/arquillian.xml
deleted file mode 100644
index 9090137..0000000
--- a/examples/javaee/mdb-tx-send/src/test/resources/arquillian.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<arquillian xmlns="http://jboss.org/schema/arquillian"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://jboss.org/schema/arquillian http://jboss.org/schema/arquillian/arquillian_1_0.xsd">
-
- <!-- Uncomment to have test archives exported to the file system for inspection.
-This feature can also be controlled using the system property arquillian.deploymentExportPath -->
- <!--
-<engine>
-<property name="deploymentExportPath">target</property>
-</engine>
--->
-
- <defaultProtocol type="Servlet 3.0" />
-
- <container qualifier="jboss" default="true">
- <configuration>
- <property name="jbossHome">${basedir}/target/jbossas-node0</property>
- <property name="serverConfig">standalone-example.xml</property>
- <property name="allowConnectingToRunningServer">true</property>
- <property name="managementAddress">${node0:127.0.0.1}</property>
- </configuration>
- </container>
-
- <!-- logThreshold proposed -->
- <!--
-<container qualifier="jbossas-managed">
-<configuration>
-<property name="logThreshold">ERROR</property>
-</configuration>
-</container>
--->
-
-</arquillian>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/mdb-tx-send/src/test/resources/jboss-deployment-structure.xml
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-tx-send/src/test/resources/jboss-deployment-structure.xml b/examples/javaee/mdb-tx-send/src/test/resources/jboss-deployment-structure.xml
deleted file mode 100644
index c49e8cf..0000000
--- a/examples/javaee/mdb-tx-send/src/test/resources/jboss-deployment-structure.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<jboss-deployment-structure>
- <deployment>
- <dependencies>
- <module name="org.apache.activemq"/>
- </dependencies>
- </deployment>
-</jboss-deployment-structure>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/pom.xml
----------------------------------------------------------------------
diff --git a/examples/javaee/pom.xml b/examples/javaee/pom.xml
deleted file mode 100644
index 36acf34..0000000
--- a/examples/javaee/pom.xml
+++ /dev/null
@@ -1,181 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.activemq.examples</groupId>
- <artifactId>activemq-examples</artifactId>
- <version>6.0.0-SNAPSHOT</version>
- </parent>
-
- <groupId>org.apache.activemq.example.javaee</groupId>
- <artifactId>javaee-examples</artifactId>
- <packaging>pom</packaging>
- <name>ActiveMQ6 Java EE Examples</name>
- <!-- Properties -->
- <properties>
- <!--
- Explicitly declaring the source encoding eliminates the following
- message: [WARNING] Using platform encoding (UTF-8 actually) to copy
- filtered resources, i.e. build is platform dependent!
- -->
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-
- <jboss.home>${env.JBOSS_HOME}</jboss.home>
-
- <!-- Note this must be consistent with the version in AS7 -->
- <activemq.client.version>6.0.0-SNAPSHOT</activemq.client.version>
-
- </properties>
-
- <profiles>
- <profile>
- <id>cluster-examples</id>
- <modules>
- <module>mdb-remote-failover-static</module>
- </modules>
- </profile>
- </profiles>
-
- <modules>
- <module>jca-config</module>
- <module>mdb-bmt</module>
- <module>mdb-cmt-setrollbackonly</module>
- <module>mdb-cmt-setrollbackonly-with-dlq</module>
- <module>mdb-cmt-tx-local</module>
- <module>mdb-cmt-tx-not-supported</module>
- <module>mdb-cmt-tx-required</module>
- <module>jms-context-injection</module>
- <module>mdb-message-selector</module>
- <module>mdb-tx-send</module>
- </modules>
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.jboss.arquillian</groupId>
- <artifactId>arquillian-bom</artifactId>
- <version>1.1.3.Final</version>
- <scope>import</scope>
- <type>pom</type>
- </dependency>
- </dependencies>
- </dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.jboss.spec.javax.jms</groupId>
- <artifactId>jboss-jms-api_2.0_spec</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.spec</groupId>
- <artifactId>jboss-javaee-6.0</artifactId>
- <version>1.0.0.Final</version>
- <type>pom</type>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.8.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.arquillian.junit</groupId>
- <artifactId>arquillian-junit-container</artifactId>
- <version>1.1.3.Final</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.wildfly</groupId>
- <artifactId>wildfly-arquillian-container-managed</artifactId>
- <version>8.0.0.Final</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core-client</artifactId>
- <version>${activemq.client.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-jms-client</artifactId>
- <version>${activemq.client.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-ra</artifactId>
- <version>${activemq.client.version}</version>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-all</artifactId>
- <version>${netty.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.ejb3</groupId>
- <artifactId>jboss-ejb3-ext-api</artifactId>
- <version>2.1.0</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.arquillian.protocol</groupId>
- <artifactId>arquillian-protocol-osgi</artifactId>
- <version>1.0.3.Final</version>
- </dependency>
- </dependencies>
-
-
- <build>
-
- <plugins>
-
- <!--
- A build of target/jbossas which is shared by all modules.
- Modules and bundles are not copied as they are read-only (see surefire props).
- -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <executions>
- <!-- Copy the AS into current_submodule/target/wildfly . This is executed recursively in submodules. -->
- <execution>
- <id>as-node-0</id>
- <inherited>true</inherited>
- <phase>generate-test-resources</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <outputDirectory>${basedir}/target/jbossas-node0</outputDirectory>
- <overwrite>true</overwrite>
- <resources>
- <resource>
- <directory>${jboss.home}</directory>
- <excludes>
- <exclude>standalone/data</exclude>
- <exclude>standalone/log</exclude>
- <exclude>standalone/tmp</exclude>
- </excludes>
- </resource>
- <resource>
- <directory>${basedir}/server</directory>
- </resource>
- </resources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.12</version>
- <configuration>
- <argLine>-Dlogging.configuration=file:///${user.dir}/test/config/logging.properties</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/xarecovery/pom.xml
----------------------------------------------------------------------
diff --git a/examples/javaee/xarecovery/pom.xml b/examples/javaee/xarecovery/pom.xml
deleted file mode 100644
index 73b04cb..0000000
--- a/examples/javaee/xarecovery/pom.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.activemq.example.javaee</groupId>
- <artifactId>javaee-examples</artifactId>
- <version>6.0.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>activemq-javaee-xarecovery-example</artifactId>
- <packaging>jar</packaging>
- <name>ActiveMQ6 Java EE XA Recovery Example</name>
-</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/xarecovery/readme.html
----------------------------------------------------------------------
diff --git a/examples/javaee/xarecovery/readme.html b/examples/javaee/xarecovery/readme.html
deleted file mode 100644
index b618ecc..0000000
--- a/examples/javaee/xarecovery/readme.html
+++ /dev/null
@@ -1,201 +0,0 @@
-<html>
- <head>
- <title>ActiveMQ XA Recovery Example</title>
- <link rel="stylesheet" type="text/css" href="../../common/common.css" />
- <link rel="stylesheet" type="text/css" href="../../common/prettify.css" />
- <script type="text/javascript" src="../../common/prettify.js"></script>
- </head>
- <body onload="prettyPrint()">
- <h1>Java EE XA Recovery Example</h1>
-
- <p>This example will demonstrate XA recovery in WildFly with a ActiveMQ XA resource and a "buggy" XA resource.</p>
-
- <p>The example application will invoke an EJB which will send a JMS message in a transaction.
- The server will crash while the transaction has not been committed (it is in the prepared state).<br />
- On server restart, the transaction will be recovered and the JMS message will finally be sent.<br />
- The example application will then receive the message.<br />
-
- <p>The example leverages the JBoss Arquillian framework to run a WildFly instance and deploy the MDB.</p>
-
- <h3>XA Recovery configuration</h3>
-
- <p>In previous versions of JBoss Application Server (the precursor to WildFly) the XA recovery configuration was manual.
- However, in WildFly the XA recovery configuration is completely automated.</p>
-
- <h2>Example step-by-step</h2>
-
- <p><i>download WildFly 8.0.0.Final from <a href="http://wildfly.org/downloads/">here</a> and install.</i></p>
- <p><i>set the JBOSS_HOME property to point to the WildFly install directory</i></p>
- <p><i>type <code>mvn verify</code> from the example directory to run</i></p>
-
- <p>The example code is composed of 3 main classes:</p>
- <dl>
- <dt><code>XARecoveryExampleStepOne</code> and <code>XARecoveryExampleStepTwo</code></dt>
- <dd>the client application to invoke the EJB and receive the message</dd>
- <dt><code>XARecoveryExampleBean</code></dt>
- <dd>a Stateless EJB3 which performs all the XA logic</dd>
- </dl>
-
- <h3>Example Application</h3>
-
- <p>Let's take a look at XARecoveryExampleStepOne first.</p>
-
- <ol>
- <li>First we need to get an initial context so we can look-up the JMS connection factory and destination objects from JNDI. This initial context will get it's properties from the <a href="config/jndi.properties">jndi.properties</a></li>
- </li>
- <pre class="prettyprint">
- <code>
- Properties env = new Properties();
- env.put(Context.URL_PKG_PREFIXES, "org.jboss.ejb.client.naming");
- initialContext = new InitialContext(env);
- </code>
- </pre>
-
- <li>We look up the EJB</li>
- <pre class="prettyprint">
- <code>XARecoveryExampleService service = (XARecoveryExampleService) initialContext.lookup("ejb:/test//XARecoveryExampleBean!org.apache.activemq.javaee.example.server.XARecoveryExampleService");</code>
- </pre>
-
- <li>We invoke the EJB's <code>send</code> method. This method will send a JMS text message (with the text passed in parameter)
- and crash the server when committing the transaction</li>
- <pre class="prettyprint">
- <code>String message = "This is a text message sent at " + new Date();
- System.out.println("invoking the EJB service with text: " + message);
- try
- {
- service.send(message);
- }
- catch (Exception e)
- {
- System.out.println("#########################");
- System.out.println("The server crashed: " + e.getMessage());
- System.out.println("#########################");
- }</code>
- </pre>
-
- <p><em>At that time, the server is crashed and is automatically restarted by the test runner (i.e. XARecoveryRunnerTest).</em></p>
- </ol>
-
- <p>Let's take a look at XARecoveryExampleStepTwo now.</p>
-
- <ol>
- <li>We will try to receive a message. Once the server is restarted, the message will be recovered and the consumer will receive it.</li>
- <pre class="prettyprint">
- <code>boolean received = false;
- while (!received)
- {
- try
- {
- Thread.sleep(15000);
- receiveMessage();
- received = true;
- }
- catch (Exception e)
- {
- System.out.println(".");
- }
- }</code>
- </pre>
- <p>The <code>receiveMessage()</code> method contains code to receive a text message from the
- JMS Queue and display it.</p>
-
- <li>And finally, <b>always</b> remember to close your resources after use, in a <code>finally</code> block.</li>
-
- <pre class="prettyprint">
- <code>finally
- {
- if (initialContext != null)
- {
- initialContext.close();
- }
- }</code>
- </pre>
- </ol>
-
- <p>Let's now take a look at the EJB example</p>
-
- <p>In order to crash the server while a transaction is prepared, we will use a <em>failing</em> <code>XAResource</code>
- which will crash the server (calling <code>Runtime.halt()</code>) in its commit phase.</p>
- <p>We will manage ourselves the transaction and its resources enlistment/delistment to be sure that the failing XAResource
- will crash the server <em>after</em> the JMS XA resources is prepared but <em>before</em> it is committed.</p>
-
- <ol>
- <li>First, we create a new initial context</li>
- <pre class="prettyprint">
- <code>ic = new InitialContext();</code>
- </pre>
-
- <li>We look up the Transaction Manager</li>
- <pre class="prettyprint">
- <code>TransactionManager tm = (TransactionManager)ic.lookup("java:/TransactionManager");</code>
- </pre>
-
- <li>We look up the JMS <em>XA</em> Connection Factory (which is bound to <code>java:/JmsXA</code>)</li>
- <pre class="prettyprint">
- <code>XAConnectionFactory cf = (XAConnectionFactory)ic.lookup("java:/JmsXA");</code>
- </pre>
-
- <li>We look up the JMS Queue</li>
- <pre class="prettyprint">
- <code>Queue queue = (Queue)ic.lookup("queue/testQueue");</code>
- </pre>
-
- <li>We create a JMS XA connection, a XA session and a message producer for the queue</li>
- <pre class="prettyprint">
- <code>xaConnection = xacf.createXAConnection();
- XASession session = xaConnection.createXASession();
- MessageProducer messageProducer = session.createProducer(queue);</code>
- </pre>
-
- <li>We create a <code>FailingXAResource</code>. For this example purpose, this XAResource implementation will
- call <code>Runtime.halt()</code> from its <code>commit()</code> method</li>
- <pre class="prettyprint">
- <code>XAResource failingXAResource = new FailingXAResource();</code>
- </pre>
-
- <li>We begin the transaction and retrieve it from the transaction manager</li>
- <pre class="prettyprint">
- <code>tm.begin();
- Transaction tx = tm.getTransaction();</code>
- </pre>
-
- <li>We enlist the failing XAResource</li>
- <pre class="prettyprint">
- <code>tx.enlistResource(failingXAResource);</code>
- </pre>
-
- <li>We enlist the <em>JMS</em> XA Resource</li>
- <pre class="prettyprint">
- <code>tx.enlistResource(session.getXAResource());</code>
- </pre>
-
- <li>We create a text message with the text passed in parameter of the EJB method and send it</li>
- <pre class="prettyprint">
- <code>TextMessage message = session.createTextMessage(text);
- messageProducer.send(message);
- System.out.format("Sent message: %s (%s)\n", message.getText(), message.getJMSMessageID());</code>
- </pre>
-
- <li>We delist the failing XAResource</li>
- <pre class="prettyprint">
- <code>tx.delistResource(failingXAResource);</code>
- </pre>
-
- <li>We delist the <em>JMS</em> XA Resource</li>
- <pre class="prettyprint">
- <code>tx.delistResource(session.getXAResource());</code>
- </pre>
-
- <li>We commit the transaction</li>
- <pre class="prettyprint">
- <code>System.out.println("committing the tx");
- tx.commit();</code>
- </pre>
-
- <p>When the transaction is committed, it will prepare both XAResources and then commit them.<br />
- <p>The failing resources will crash the server leaving the JMS XA Resource <em>prepared</em> but not <em>committed</em></p>
-
- <p>When WildFly is restarted, it will automatically trigger a recovery phase. During that phase, ActiveMQ resources will be
- scanned and the <em>prepared</em> transaction will be recovered and committed. It is then possible to consume this message</p>
- </body>
-</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/xarecovery/server/standalone/configuration/application-roles.properties
----------------------------------------------------------------------
diff --git a/examples/javaee/xarecovery/server/standalone/configuration/application-roles.properties b/examples/javaee/xarecovery/server/standalone/configuration/application-roles.properties
deleted file mode 100644
index 0ade8fb..0000000
--- a/examples/javaee/xarecovery/server/standalone/configuration/application-roles.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# Properties declaration of users roles for the realm 'ApplicationRealm'.
-#
-# This includes the following protocols: remote ejb, remote jndi, web, remote jms
-#
-# Users can be added to this properties file at any time, updates after the server has started
-# will be automatically detected.
-#
-# The format of this file is as follows: -
-# username=role1,role2,role3
-#
-# A utility script is provided which can be executed from the bin folder to add the users: -
-# - Linux
-# bin/add-user.sh
-#
-# - Windows
-# bin\add-user.bat
-#
-# The following illustrates how an admin user could be defined.
-#
-#admin=PowerUser,BillingAdmin,
-guest=guest
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/xarecovery/server/standalone/configuration/application-users.properties
----------------------------------------------------------------------
diff --git a/examples/javaee/xarecovery/server/standalone/configuration/application-users.properties b/examples/javaee/xarecovery/server/standalone/configuration/application-users.properties
deleted file mode 100644
index c52e923..0000000
--- a/examples/javaee/xarecovery/server/standalone/configuration/application-users.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# Properties declaration of users for the realm 'ApplicationRealm' which is the default realm
-# for application services on a new AS 7.1 installation.
-#
-# This includes the following protocols: remote ejb, remote jndi, web, remote jms
-#
-# Users can be added to this properties file at any time, updates after the server has started
-# will be automatically detected.
-#
-# The format of this realm is as follows: -
-# username=HEX( MD5( username ':' realm ':' password))
-#
-# A utility script is provided which can be executed from the bin folder to add the users: -
-# - Linux
-# bin/add-user.sh
-#
-# - Windows
-# bin\add-user.bat
-#
-# The following illustrates how an admin user could be defined, this
-# is for illustration only and does not correspond to a usable password.
-#
-#admin=2a0923285184943425d1f53ddd58ec7a
-guest=3437456520927d113b17d471d630e0d6
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/xarecovery/server/standalone/configuration/logging.properties
----------------------------------------------------------------------
diff --git a/examples/javaee/xarecovery/server/standalone/configuration/logging.properties b/examples/javaee/xarecovery/server/standalone/configuration/logging.properties
deleted file mode 100644
index 3fa31b0..0000000
--- a/examples/javaee/xarecovery/server/standalone/configuration/logging.properties
+++ /dev/null
@@ -1,47 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# Additional logger names to configure (root logger is always configured)
-loggers=org.jboss.as.config
-
-# Dump system environment at boot by default
-logger.org.jboss.as.config.level=DEBUG
-
-# Root logger level
-logger.level=${jboss.boot.server.log.level:INFO}
-# Root logger handlers
-logger.handlers=FILE,CONSOLE
-
-# Console handler configuration
-handler.CONSOLE=org.jboss.logmanager.handlers.ConsoleHandler
-handler.CONSOLE.properties=autoFlush
-handler.CONSOLE.level=${jboss.boot.server.log.console.level:INFO}
-handler.CONSOLE.autoFlush=true
-handler.CONSOLE.formatter=PATTERN
-
-# File handler configuration
-handler.FILE=org.jboss.logmanager.handlers.FileHandler
-handler.FILE.level=DEBUG
-handler.FILE.properties=autoFlush,fileName
-handler.FILE.autoFlush=true
-handler.FILE.fileName=${org.jboss.boot.log.file:boot.log}
-handler.FILE.formatter=PATTERN
-
-# Formatter pattern configuration
-formatter.PATTERN=org.jboss.logmanager.formatters.PatternFormatter
-formatter.PATTERN.properties=pattern
-formatter.PATTERN.pattern=%d{HH:mm:ss,SSS} %-5p [%c] %s%E%n
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/xarecovery/server/standalone/configuration/mgmt-users.properties
----------------------------------------------------------------------
diff --git a/examples/javaee/xarecovery/server/standalone/configuration/mgmt-users.properties b/examples/javaee/xarecovery/server/standalone/configuration/mgmt-users.properties
deleted file mode 100644
index 349b004..0000000
--- a/examples/javaee/xarecovery/server/standalone/configuration/mgmt-users.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# Properties declaration of users for the realm 'ManagementRealm' which is the default realm
-# for new AS 7.1 installations. Further authentication mechanism can be configured
-# as part of the <management /> in standalone.xml.
-#
-# Users can be added to this properties file at any time, updates after the server has started
-# will be automatically detected.
-#
-# By default the properties realm expects the entries to be in the format: -
-# username=HEX( MD5( username ':' realm ':' password))
-#
-# A utility script is provided which can be executed from the bin folder to add the users: -
-# - Linux
-# bin/add-user.sh
-#
-# - Windows
-# bin\add-user.bat
-
-# The following illustrates how an admin user could be defined, this
-# is for illustration only and does not correspond to a usable password.
-#
-#admin=2a0923285184943425d1f53ddd58ec7a
-admin=9d71b431e53d99563aa0dfca628c970b
-andy=dfb16391f1be1c454b5bce9822bd9df3
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/xarecovery/server/standalone/configuration/standalone-example.xml
----------------------------------------------------------------------
diff --git a/examples/javaee/xarecovery/server/standalone/configuration/standalone-example.xml b/examples/javaee/xarecovery/server/standalone/configuration/standalone-example.xml
deleted file mode 100644
index 7b3e84c..0000000
--- a/examples/javaee/xarecovery/server/standalone/configuration/standalone-example.xml
+++ /dev/null
@@ -1,489 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-
-<server xmlns="urn:jboss:domain:2.0">
- <extensions>
- <extension module="org.jboss.as.clustering.infinispan"/>
- <extension module="org.jboss.as.connector"/>
- <extension module="org.jboss.as.deployment-scanner"/>
- <extension module="org.jboss.as.ee"/>
- <extension module="org.jboss.as.ejb3"/>
- <extension module="org.jboss.as.jacorb"/>
- <extension module="org.jboss.as.jaxrs"/>
- <extension module="org.jboss.as.jdr"/>
- <extension module="org.jboss.as.jmx"/>
- <extension module="org.jboss.as.jpa"/>
- <extension module="org.jboss.as.jsf"/>
- <extension module="org.jboss.as.jsr77"/>
- <extension module="org.jboss.as.logging"/>
- <extension module="org.jboss.as.mail"/>
- <extension module="org.jboss.as.messaging"/>
- <extension module="org.jboss.as.naming"/>
- <extension module="org.jboss.as.pojo"/>
- <extension module="org.jboss.as.remoting"/>
- <extension module="org.jboss.as.sar"/>
- <extension module="org.jboss.as.security"/>
- <extension module="org.jboss.as.threads"/>
- <extension module="org.jboss.as.transactions"/>
- <extension module="org.jboss.as.webservices"/>
- <extension module="org.jboss.as.weld"/>
- <extension module="org.wildfly.extension.batch"/>
- <extension module="org.wildfly.extension.io"/>
- <extension module="org.wildfly.extension.undertow"/>
- </extensions>
- <management>
- <security-realms>
- <security-realm name="ManagementRealm">
- <authentication>
- <local default-user="$local"/>
- <properties path="mgmt-users.properties" relative-to="jboss.server.config.dir"/>
- </authentication>
- <authorization map-groups-to-roles="false">
- <properties path="mgmt-groups.properties" relative-to="jboss.server.config.dir"/>
- </authorization>
- </security-realm>
- <security-realm name="ApplicationRealm">
- <authentication>
- <local default-user="$local" allowed-users="*"/>
- <properties path="application-users.properties" relative-to="jboss.server.config.dir"/>
- </authentication>
- <authorization>
- <properties path="application-roles.properties" relative-to="jboss.server.config.dir"/>
- </authorization>
- </security-realm>
- </security-realms>
- <audit-log>
- <formatters>
- <json-formatter name="json-formatter"/>
- </formatters>
- <handlers>
- <file-handler name="file" formatter="json-formatter" relative-to="jboss.server.data.dir" path="audit-log.log"/>
- </handlers>
- <logger log-boot="true" log-read-only="false" enabled="false">
- <handlers>
- <handler name="file"/>
- </handlers>
- </logger>
- </audit-log>
- <management-interfaces>
- <http-interface security-realm="ManagementRealm" http-upgrade-enabled="true">
- <socket-binding http="management-http"/>
- </http-interface>
- </management-interfaces>
- <access-control provider="simple">
- <role-mapping>
- <role name="SuperUser">
- <include>
- <user name="$local"/>
- </include>
- </role>
- </role-mapping>
- </access-control>
- </management>
- <profile>
- <subsystem xmlns="urn:jboss:domain:logging:2.0">
- <console-handler name="CONSOLE">
- <level name="INFO"/>
- <formatter>
- <named-formatter name="COLOR-PATTERN"/>
- </formatter>
- </console-handler>
- <periodic-rotating-file-handler name="FILE" autoflush="true">
- <formatter>
- <named-formatter name="PATTERN"/>
- </formatter>
- <file relative-to="jboss.server.log.dir" path="server.log"/>
- <suffix value=".yyyy-MM-dd"/>
- <append value="true"/>
- </periodic-rotating-file-handler>
- <logger category="com.arjuna">
- <level name="WARN"/>
- </logger>
- <logger category="org.apache.tomcat.util.modeler">
- <level name="WARN"/>
- </logger>
- <logger category="org.jboss.as.config">
- <level name="DEBUG"/>
- </logger>
- <logger category="sun.rmi">
- <level name="WARN"/>
- </logger>
- <logger category="jacorb">
- <level name="WARN"/>
- </logger>
- <logger category="jacorb.config">
- <level name="ERROR"/>
- </logger>
- <root-logger>
- <level name="INFO"/>
- <handlers>
- <handler name="CONSOLE"/>
- <handler name="FILE"/>
- </handlers>
- </root-logger>
- <formatter name="PATTERN">
- <pattern-formatter pattern="%d{yyyy-MM-dd HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/>
- </formatter>
- <formatter name="COLOR-PATTERN">
- <pattern-formatter pattern="%K{level}%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/>
- </formatter>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:batch:1.0">
- <job-repository>
- <in-memory/>
- </job-repository>
- <thread-pool>
- <max-threads count="10"/>
- <keepalive-time time="100" unit="milliseconds"/>
- </thread-pool>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:datasources:2.0">
- <datasources>
- <datasource jndi-name="java:jboss/datasources/ExampleDS" pool-name="ExampleDS" enabled="true" use-java-context="true">
- <connection-url>jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE</connection-url>
- <driver>h2</driver>
- <security>
- <user-name>sa</user-name>
- <password>sa</password>
- </security>
- </datasource>
- <drivers>
- <driver name="h2" module="com.h2database.h2">
- <xa-datasource-class>org.h2.jdbcx.JdbcDataSource</xa-datasource-class>
- </driver>
- </drivers>
- </datasources>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:deployment-scanner:2.0">
- <deployment-scanner path="deployments" relative-to="jboss.server.base.dir" scan-interval="5000" runtime-failure-causes-rollback="${jboss.deployment.scanner.rollback.on.failure:false}"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:ee:2.0">
- <spec-descriptor-property-replacement>false</spec-descriptor-property-replacement>
- <jboss-descriptor-property-replacement>true</jboss-descriptor-property-replacement>
- <annotation-property-replacement>false</annotation-property-replacement>
- <concurrent>
- <context-services>
- <context-service name="default" jndi-name="java:jboss/ee/concurrency/context/default" use-transaction-setup-provider="true"/>
- </context-services>
- <managed-executor-services>
- <managed-executor-service name="default" jndi-name="java:jboss/ee/concurrency/executor/default" context-service="default" hung-task-threshold="60000" core-threads="5" max-threads="25" keepalive-time="5000"/>
- </managed-executor-services>
- <managed-scheduled-executor-services>
- <managed-scheduled-executor-service name="default" jndi-name="java:jboss/ee/concurrency/scheduler/default" context-service="default" hung-task-threshold="60000" core-threads="2" keepalive-time="3000"/>
- </managed-scheduled-executor-services>
- <managed-thread-factories>
- <managed-thread-factory name="default" jndi-name="java:jboss/ee/concurrency/factory/default" context-service="default"/>
- </managed-thread-factories>
- </concurrent>
- <default-bindings context-service="java:jboss/ee/concurrency/context/default" datasource="java:jboss/datasources/ExampleDS" jms-connection-factory="java:jboss/DefaultJMSConnectionFactory" managed-executor-service="java:jboss/ee/concurrency/executor/default" managed-scheduled-executor-service="java:jboss/ee/concurrency/scheduler/default" managed-thread-factory="java:jboss/ee/concurrency/factory/default"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:ejb3:2.0">
- <session-bean>
- <stateful default-access-timeout="5000" cache-ref="simple" passivation-disabled-cache-ref="simple"/>
- <singleton default-access-timeout="5000"/>
- </session-bean>
- <mdb>
- <resource-adapter-ref resource-adapter-name="${ejb.resource-adapter-name:activemq-ra.rar}"/>
- <bean-instance-pool-ref pool-name="mdb-strict-max-pool"/>
- </mdb>
- <pools>
- <bean-instance-pools>
- <!-- A sample strict max pool configuration -->
- <strict-max-pool name="slsb-strict-max-pool" max-pool-size="20" instance-acquisition-timeout="5" instance-acquisition-timeout-unit="MINUTES"/>
- <strict-max-pool name="mdb-strict-max-pool" max-pool-size="20" instance-acquisition-timeout="5" instance-acquisition-timeout-unit="MINUTES"/>
- </bean-instance-pools>
- </pools>
- <caches>
- <cache name="simple"/>
- <cache name="distributable" aliases="passivating clustered" passivation-store-ref="infinispan"/>
- </caches>
- <passivation-stores>
- <passivation-store name="infinispan" cache-container="ejb" max-size="10000"/>
- </passivation-stores>
- <async thread-pool-name="default"/>
- <timer-service thread-pool-name="default" default-data-store="default-file-store">
- <data-stores>
- <file-data-store name="default-file-store" path="timer-service-data" relative-to="jboss.server.data.dir"/>
- </data-stores>
- </timer-service>
- <remote connector-ref="http-remoting-connector" thread-pool-name="default"/>
- <thread-pools>
- <thread-pool name="default">
- <max-threads count="10"/>
- <keepalive-time time="100" unit="milliseconds"/>
- </thread-pool>
- </thread-pools>
- <iiop enable-by-default="false" use-qualified-name="false"/>
- <default-security-domain value="other"/>
- <default-missing-method-permissions-deny-access value="true"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:io:1.0">
- <worker name="default" io-threads="3"/>
- <buffer-pool name="default" buffer-size="16384" buffers-per-slice="128"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:infinispan:2.0">
- <cache-container name="web" default-cache="passivation" module="org.wildfly.clustering.web.infinispan">
- <local-cache name="passivation" batching="true">
- <file-store passivation="true" purge="false"/>
- </local-cache>
- <local-cache name="persistent" batching="true">
- <file-store passivation="false" purge="false"/>
- </local-cache>
- </cache-container>
- <cache-container name="ejb" aliases="sfsb" default-cache="passivation" module="org.wildfly.clustering.ejb.infinispan">
- <local-cache name="passivation" batching="true">
- <file-store passivation="true" purge="false"/>
- </local-cache>
- <local-cache name="persistent" batching="true">
- <file-store passivation="false" purge="false"/>
- </local-cache>
- </cache-container>
- <cache-container name="hibernate" default-cache="local-query" module="org.hibernate">
- <local-cache name="entity">
- <transaction mode="NON_XA"/>
- <eviction strategy="LRU" max-entries="10000"/>
- <expiration max-idle="100000"/>
- </local-cache>
- <local-cache name="local-query">
- <transaction mode="NONE"/>
- <eviction strategy="LRU" max-entries="10000"/>
- <expiration max-idle="100000"/>
- </local-cache>
- <local-cache name="timestamps">
- <transaction mode="NONE"/>
- <eviction strategy="NONE"/>
- </local-cache>
- </cache-container>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:jacorb:1.3">
- <orb socket-binding="jacorb" ssl-socket-binding="jacorb-ssl">
- <initializers transactions="spec" security="identity"/>
- </orb>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:jaxrs:1.0"/>
- <subsystem xmlns="urn:jboss:domain:jca:2.0">
- <archive-validation enabled="true" fail-on-error="true" fail-on-warn="false"/>
- <bean-validation enabled="true"/>
- <default-workmanager>
- <short-running-threads>
- <core-threads count="50"/>
- <queue-length count="50"/>
- <max-threads count="50"/>
- <keepalive-time time="10" unit="seconds"/>
- </short-running-threads>
- <long-running-threads>
- <core-threads count="50"/>
- <queue-length count="50"/>
- <max-threads count="50"/>
- <keepalive-time time="10" unit="seconds"/>
- </long-running-threads>
- </default-workmanager>
- <cached-connection-manager/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:jdr:1.0"/>
- <subsystem xmlns="urn:jboss:domain:jmx:1.3">
- <expose-resolved-model/>
- <expose-expression-model/>
- <remoting-connector/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:jpa:1.1">
- <jpa default-datasource="" default-extended-persistence-inheritance="DEEP"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:jsf:1.0"/>
- <subsystem xmlns="urn:jboss:domain:jsr77:1.0"/>
- <subsystem xmlns="urn:jboss:domain:mail:2.0">
- <mail-session name="default" jndi-name="java:jboss/mail/Default">
- <smtp-server outbound-socket-binding-ref="mail-smtp"/>
- </mail-session>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:messaging:2.0">
- <activemq-server>
- <persistence-enabled>true</persistence-enabled>
- <journal-file-size>102400</journal-file-size>
- <journal-min-files>2</journal-min-files>
- <connectors>
- <http-connector name="http-connector" socket-binding="http">
- <param key="http-upgrade-endpoint" value="http-acceptor"/>
- </http-connector>
- <http-connector name="http-connector-throughput" socket-binding="http">
- <param key="http-upgrade-endpoint" value="http-acceptor-throughput"/>
- <param key="batch-delay" value="50"/>
- </http-connector>
- <in-vm-connector name="in-vm" server-id="0"/>
- </connectors>
- <acceptors>
- <http-acceptor name="http-acceptor" http-listener="default"/>
- <http-acceptor name="http-acceptor-throughput" http-listener="default">
- <param key="batch-delay" value="50"/>
- <param key="direct-deliver" value="false"/>
- </http-acceptor>
- <in-vm-acceptor name="in-vm" server-id="0"/>
- </acceptors>
- <security-settings>
- <security-setting match="#">
- <permission type="send" roles="guest"/>
- <permission type="consume" roles="guest"/>
- <permission type="createNonDurableQueue" roles="guest"/>
- <permission type="deleteNonDurableQueue" roles="guest"/>
- </security-setting>
- </security-settings>
- <address-settings>
- <!--default for catch all-->
- <address-setting match="#">
- <dead-letter-address>jms.queue.DLQ</dead-letter-address>
- <expiry-address>jms.queue.ExpiryQueue</expiry-address>
- <redelivery-delay>0</redelivery-delay>
- <max-size-bytes>10485760</max-size-bytes>
- <address-full-policy>PAGE</address-full-policy>
- <page-size-bytes>2097152</page-size-bytes>
- <message-counter-history-day-limit>10</message-counter-history-day-limit>
- </address-setting>
- </address-settings>
- <jms-connection-factories>
- <connection-factory name="InVmConnectionFactory">
- <connectors>
- <connector-ref connector-name="in-vm"/>
- </connectors>
- <entries>
- <entry name="java:/ConnectionFactory"/>
- </entries>
- </connection-factory>
- <connection-factory name="RemoteConnectionFactory">
- <connectors>
- <connector-ref connector-name="http-connector"/>
- </connectors>
- <entries>
- <entry name="java:jboss/exported/jms/RemoteConnectionFactory"/>
- </entries>
- </connection-factory>
- <pooled-connection-factory name="activemq-ra">
- <transaction mode="xa"/>
- <connectors>
- <connector-ref connector-name="in-vm"/>
- </connectors>
- <entries>
- <entry name="java:/JmsXA"/>
- <!-- Global JNDI entry used to provide a default JMS Connection factory to EE application -->
- <entry name="java:jboss/DefaultJMSConnectionFactory"/>
- </entries>
- </pooled-connection-factory>
- </jms-connection-factories>
- <jms-destinations>
- <jms-queue name="testQueue">
- <entry name="queue/testQueue"/>
- <entry name="java:jboss/exported/jms/queues/testQueue"/>
- </jms-queue>
- </jms-destinations>
- </activemq-server>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:naming:2.0">
- <remote-naming/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:pojo:1.0"/>
- <subsystem xmlns="urn:jboss:domain:remoting:2.0">
- <endpoint worker="default"/>
- <http-connector name="http-remoting-connector" connector-ref="default" security-realm="ApplicationRealm"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:resource-adapters:2.0"/>
- <subsystem xmlns="urn:jboss:domain:sar:1.0"/>
- <subsystem xmlns="urn:jboss:domain:security:1.2">
- <security-domains>
- <security-domain name="other" cache-type="default">
- <authentication>
- <login-module code="Remoting" flag="optional">
- <module-option name="password-stacking" value="useFirstPass"/>
- </login-module>
- <login-module code="RealmDirect" flag="required">
- <module-option name="password-stacking" value="useFirstPass"/>
- </login-module>
- </authentication>
- </security-domain>
- <security-domain name="jboss-web-policy" cache-type="default">
- <authorization>
- <policy-module code="Delegating" flag="required"/>
- </authorization>
- </security-domain>
- <security-domain name="jboss-ejb-policy" cache-type="default">
- <authorization>
- <policy-module code="Delegating" flag="required"/>
- </authorization>
- </security-domain>
- </security-domains>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:threads:1.1"/>
- <subsystem xmlns="urn:jboss:domain:transactions:2.0">
- <core-environment>
- <process-id>
- <uuid/>
- </process-id>
- </core-environment>
- <recovery-environment socket-binding="txn-recovery-environment" status-socket-binding="txn-status-manager"/>
- <coordinator-environment default-timeout="300"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:undertow:1.0">
- <buffer-caches>
- <buffer-cache name="default" buffer-size="1024" buffers-per-region="1024" max-regions="10"/>
- </buffer-caches>
- <server name="default-server">
- <http-listener name="default" socket-binding="http"/>
- <host name="default-host" alias="localhost">
- <location name="/" handler="welcome-content"/>
- <filter-ref name="server-header"/>
- <filter-ref name="x-powered-by-header"/>
- </host>
- </server>
- <servlet-container name="default" default-buffer-cache="default" stack-trace-on-error="local-only">
- <jsp-config/>
- </servlet-container>
- <handlers>
- <file name="welcome-content" path="${jboss.home.dir}/welcome-content" directory-listing="true"/>
- </handlers>
- <filters>
- <response-header name="server-header" header-name="Server" header-value="Wildfly 8"/>
- <response-header name="x-powered-by-header" header-name="X-Powered-By" header-value="Undertow 1"/>
- </filters>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:webservices:1.2">
- <modify-wsdl-address>true</modify-wsdl-address>
- <wsdl-host>${jboss.bind.address:127.0.0.1}</wsdl-host>
- <endpoint-config name="Standard-Endpoint-Config"/>
- <endpoint-config name="Recording-Endpoint-Config">
- <pre-handler-chain name="recording-handlers" protocol-bindings="##SOAP11_HTTP ##SOAP11_HTTP_MTOM ##SOAP12_HTTP ##SOAP12_HTTP_MTOM">
- <handler name="RecordingHandler" class="org.jboss.ws.common.invocation.RecordingServerHandler"/>
- </pre-handler-chain>
- </endpoint-config>
- <client-config name="Standard-Client-Config"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:weld:2.0"/>
- </profile>
- <interfaces>
- <interface name="management">
- <inet-address value="${jboss.bind.address.management:127.0.0.1}"/>
- </interface>
- <interface name="public">
- <inet-address value="${jboss.bind.address:127.0.0.1}"/>
- </interface>
- <!-- TODO - only show this if the jacorb subsystem is added -->
- <interface name="unsecure">
- <!--
- ~ Used for IIOP sockets in the standard configuration.
- ~ To secure JacORB you need to setup SSL
- -->
- <inet-address value="${jboss.bind.address.unsecure:127.0.0.1}"/>
- </interface>
- </interfaces>
- <socket-binding-group name="standard-sockets" default-interface="public" port-offset="${jboss.socket.binding.port-offset:0}">
- <socket-binding name="management-http" interface="management" port="${jboss.management.http.port:9990}"/>
- <socket-binding name="management-https" interface="management" port="${jboss.management.https.port:9993}"/>
- <socket-binding name="ajp" port="${jboss.ajp.port:8009}"/>
- <socket-binding name="http" port="${jboss.http.port:8080}"/>
- <socket-binding name="https" port="${jboss.https.port:8443}"/>
- <socket-binding name="jacorb" interface="unsecure" port="3528"/>
- <socket-binding name="jacorb-ssl" interface="unsecure" port="3529"/>
- <socket-binding name="messaging-group" port="0" multicast-address="${jboss.messaging.group.address:231.7.7.7}" multicast-port="${jboss.messaging.group.port:9876}"/>
- <socket-binding name="txn-recovery-environment" port="4712"/>
- <socket-binding name="txn-status-manager" port="4713"/>
- <outbound-socket-binding name="mail-smtp">
- <remote-destination host="localhost" port="25"/>
- </outbound-socket-binding>
- </socket-binding-group>
-</server>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/xarecovery/src/main/java/org/apache/activemq/javaee/example/XARecoveryExampleStepOne.java
----------------------------------------------------------------------
diff --git a/examples/javaee/xarecovery/src/main/java/org/apache/activemq/javaee/example/XARecoveryExampleStepOne.java b/examples/javaee/xarecovery/src/main/java/org/apache/activemq/javaee/example/XARecoveryExampleStepOne.java
deleted file mode 100644
index e51aaa8..0000000
--- a/examples/javaee/xarecovery/src/main/java/org/apache/activemq/javaee/example/XARecoveryExampleStepOne.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.activemq.javaee.example;
-
-import javax.jms.Connection;
-import javax.jms.ConnectionFactory;
-import javax.jms.MessageConsumer;
-import javax.jms.Queue;
-import javax.jms.Session;
-import javax.jms.TextMessage;
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import java.util.Date;
-import java.util.Properties;
-
-import org.apache.activemq.javaee.example.server.XARecoveryExampleService;
-
-/**
- * An example which invokes an EJB. The EJB will be involved in a
- * transaction with a "buggy" XAResource to crash the server.
- * When the server is restarted, the recovery manager will recover the message
- * so that the consumer can receive it.
- *
- * @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a>
- * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a>
- */
-public class XARecoveryExampleStepOne
-{
- public static void main(final String[] args) throws Exception
- {
- InitialContext initialContext = null;
- try
- {
- // Step 1. Obtain an Initial Context
- Properties env = new Properties();
- env.put(Context.URL_PKG_PREFIXES, "org.jboss.ejb.client.naming");
- initialContext = new InitialContext(env);
-
- // Step 2. Lookup the EJB
- XARecoveryExampleService service = (XARecoveryExampleService) initialContext.lookup("ejb:/test//XARecoveryExampleBean!org.apache.activemq.javaee.example.server.XARecoveryExampleService");
-
- // Step 3. Invoke the send method. This will crash the server
- String message = "This is a text message sent at " + new Date();
- System.out.println("invoking the EJB service with text: " + message);
- try
- {
- service.send(message);
- }
- catch (Exception e)
- {
- System.out.println("#########################");
- System.out.println("The server crashed: " + e.getMessage());
- System.out.println("#########################");
- }
-
- // We will try to receive a message. Once the server is restarted, the message will be recovered and the consumer will receive it
- }
- finally
- {
- // Step 4. Be sure to close the resources!
- if (initialContext != null)
- {
- initialContext.close();
- }
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/xarecovery/src/main/java/org/apache/activemq/javaee/example/XARecoveryExampleStepTwo.java
----------------------------------------------------------------------
diff --git a/examples/javaee/xarecovery/src/main/java/org/apache/activemq/javaee/example/XARecoveryExampleStepTwo.java b/examples/javaee/xarecovery/src/main/java/org/apache/activemq/javaee/example/XARecoveryExampleStepTwo.java
deleted file mode 100644
index bab634c..0000000
--- a/examples/javaee/xarecovery/src/main/java/org/apache/activemq/javaee/example/XARecoveryExampleStepTwo.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.activemq.javaee.example;
-
-import javax.jms.Connection;
-import javax.jms.ConnectionFactory;
-import javax.jms.MessageConsumer;
-import javax.jms.Queue;
-import javax.jms.Session;
-import javax.jms.TextMessage;
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import java.util.Date;
-import java.util.Properties;
-
-import org.apache.activemq.javaee.example.server.XARecoveryExampleService;
-
-/**
- * An example which invokes an EJB. The EJB will be involved in a
- * transaction with a "buggy" XAResource to crash the server.
- * When the server is restarted, the recovery manager will recover the message
- * so that the consumer can receive it.
- *
- * @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a>
- * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a>
- */
-public class XARecoveryExampleStepTwo
-{
- public static void main(final String[] args) throws Exception
- {
- // Step 1. We will try to receive a message. Once the server is restarted, the message will be recovered and the consumer will receive it.
- boolean received = false;
- while (!received)
- {
- try
- {
- Thread.sleep(15000);
- XARecoveryExampleStepTwo.receiveMessage();
- received = true;
- }
- catch (Exception e)
- {
- System.out.println(".");
- }
- }
- }
-
- private static void receiveMessage() throws Exception
- {
- InitialContext initialContext = null;
- Connection connection = null;
- try
- {
- final Properties env = new Properties();
-
- env.put(Context.INITIAL_CONTEXT_FACTORY, "org.jboss.naming.remote.client.InitialContextFactory");
-
- env.put(Context.PROVIDER_URL, "http-remoting://localhost:8080");
-
- initialContext = new InitialContext(env);
-
- ConnectionFactory cf = (ConnectionFactory) initialContext.lookup("jms/RemoteConnectionFactory");
-
- Queue queue = (Queue) initialContext.lookup("jms/queues/testQueue");
-
- connection = cf.createConnection("guest", "password");
- Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
- MessageConsumer consumer = session.createConsumer(queue);
-
- connection.start();
-
- System.out.println("\nwaiting to receive a message...");
- TextMessage messageReceived = (TextMessage) consumer.receive(3600 * 1000);
- System.out.format("Received message: %s \n\t(JMS MessageID: %s)\n",
- messageReceived.getText(),
- messageReceived.getJMSMessageID());
- }
- finally
- {
- // Step 7. Be sure to close the resources!
- if (initialContext != null)
- {
- initialContext.close();
- }
- if (connection != null)
- {
- connection.close();
- }
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/xarecovery/src/main/java/org/apache/activemq/javaee/example/server/XARecoveryExampleBean.java
----------------------------------------------------------------------
diff --git a/examples/javaee/xarecovery/src/main/java/org/apache/activemq/javaee/example/server/XARecoveryExampleBean.java b/examples/javaee/xarecovery/src/main/java/org/apache/activemq/javaee/example/server/XARecoveryExampleBean.java
deleted file mode 100644
index 3f1600a..0000000
--- a/examples/javaee/xarecovery/src/main/java/org/apache/activemq/javaee/example/server/XARecoveryExampleBean.java
+++ /dev/null
@@ -1,175 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.activemq.javaee.example.server;
-
-import javax.ejb.Remote;
-import javax.ejb.Stateless;
-import javax.ejb.TransactionManagement;
-import javax.ejb.TransactionManagementType;
-import javax.jms.MessageProducer;
-import javax.jms.Queue;
-import javax.jms.TextMessage;
-import javax.jms.XAConnection;
-import javax.jms.XAConnectionFactory;
-import javax.jms.XASession;
-import javax.naming.InitialContext;
-import javax.transaction.Transaction;
-import javax.transaction.TransactionManager;
-import javax.transaction.xa.XAException;
-import javax.transaction.xa.XAResource;
-import javax.transaction.xa.Xid;
-
-/**
- * An EJB which sends a JMS message in the transaction and "pauses" while the transaction
- * is prepared so that the server can be crashed in this state.
- * The JMS message will be recovered when the server is restarted.
- *
- * @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a>
- * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a>
- */
-@Stateless
-@Remote(XARecoveryExampleService.class)
-@TransactionManagement(TransactionManagementType.BEAN)
-public class XARecoveryExampleBean implements XARecoveryExampleService
-{
- public void send(final String text) throws Exception
- {
- InitialContext ic = null;
- XAConnection xaConnection = null;
- try
- {
- // Step 1. Create the initial context
- ic = new InitialContext();
-
- // Step 2. Lookup the Transaction Manager
- TransactionManager tm = (TransactionManager)ic.lookup("java:/TransactionManager");
-
- // Step 3. Look up the XA Connection Factory
- XAConnectionFactory xacf = (XAConnectionFactory)ic.lookup("java:/JmsXA");
-
- // Step 4. Look up the Queue
- Queue queue = (Queue)ic.lookup("queue/testQueue");
-
- // Step 5. Create a XA connection, a XA session and a message producer for the queue
- xaConnection = xacf.createXAConnection();
- XASession session = xaConnection.createXASession();
- MessageProducer messageProducer = session.createProducer(queue);
-
- // Step 6. Create a "fake" XAResource which will crash the server in its commit phase
- XAResource failingXAResource = new FailingXAResource();
-
- // Step 7. Begin the transaction
- tm.begin();
- Transaction tx = tm.getTransaction();
-
- // Step 8. Enlist the failing XAResource
- tx.enlistResource(failingXAResource);
-
- // Step 9. Enlist the JMS XAResource
- tx.enlistResource(session.getXAResource());
-
- // Step 10. Send The Text Message
- TextMessage message = session.createTextMessage(text);
- messageProducer.send(message);
- System.out.format("Sent message: %s\n\t(JMS MessageID: %s)\n", message.getText(), message.getJMSMessageID());
-
- // Step 12. Delist the failing XAResource
- tx.delistResource(failingXAResource, XAResource.TMSUCCESS);
-
- // Step 13. Delist the JMS XAResource
- tx.delistResource(session.getXAResource(), XAResource.TMSUCCESS);
-
- // Step 14. Commit the transaction
- // Both XA Resources will be prepared.
- // then the failingXAResource will crash the server in its commit phase
- // and the commit method will never be called on the JMS XA Resource: it will
- // be in the prepared state when the server crashes
- System.out.println("committing the tx");
- tx.commit();
- }
- finally
- {
- // Step 15. Be sure to close all resources!
- if (ic != null)
- {
- ic.close();
- }
- if (xaConnection != null)
- {
- xaConnection.close();
- }
- }
- }
-
- /**
- * A XAResource which crashes the server in its commit phase
- */
- private static class FailingXAResource implements XAResource
- {
-
- public void commit(final Xid arg0, final boolean arg1) throws XAException
- {
- System.out.println("########################");
- System.out.println("# Crashing the server! #");
- System.out.println("########################");
- Runtime.getRuntime().halt(1);
- }
-
- public void end(final Xid arg0, final int arg1) throws XAException
- {
- }
-
- public void forget(final Xid arg0) throws XAException
- {
- }
-
- public int getTransactionTimeout() throws XAException
- {
- return 0;
- }
-
- public boolean isSameRM(final XAResource arg0) throws XAException
- {
- return false;
- }
-
- public int prepare(final Xid arg0) throws XAException
- {
-
- return XAResource.XA_OK;
- }
-
- public Xid[] recover(final int arg0) throws XAException
- {
- return null;
- }
-
- public void rollback(final Xid arg0) throws XAException
- {
- }
-
- public boolean setTransactionTimeout(final int arg0) throws XAException
- {
- return false;
- }
-
- public void start(final Xid arg0, final int arg1) throws XAException
- {
- }
-
- }
-}
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/xarecovery/src/main/java/org/apache/activemq/javaee/example/server/XARecoveryExampleService.java
----------------------------------------------------------------------
diff --git a/examples/javaee/xarecovery/src/main/java/org/apache/activemq/javaee/example/server/XARecoveryExampleService.java b/examples/javaee/xarecovery/src/main/java/org/apache/activemq/javaee/example/server/XARecoveryExampleService.java
deleted file mode 100644
index 7259e63..0000000
--- a/examples/javaee/xarecovery/src/main/java/org/apache/activemq/javaee/example/server/XARecoveryExampleService.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.activemq.javaee.example.server;
-
-/**
- * An interface for the XARecoveryExampleBean EJB.
- *
- * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a>
- */
-public interface XARecoveryExampleService
-{
- void send(String text) throws Exception;
-}
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/xarecovery/src/main/resources/jboss-ejb-client.properties
----------------------------------------------------------------------
diff --git a/examples/javaee/xarecovery/src/main/resources/jboss-ejb-client.properties b/examples/javaee/xarecovery/src/main/resources/jboss-ejb-client.properties
deleted file mode 100644
index fcf57ba..0000000
--- a/examples/javaee/xarecovery/src/main/resources/jboss-ejb-client.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-remote.connectionprovider.create.options.org.xnio.Options.SSL_ENABLED=false
-
-remote.connections=default
-
-remote.connection.default.host=localhost
-remote.connection.default.port = 8080
-remote.connection.default.connect.options.org.xnio.Options.SASL_POLICY_NOANONYMOUS=false
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/xarecovery/src/test/java/org/apache/activemq/javaee/examples/XARecoveryRunnerTest.java
----------------------------------------------------------------------
diff --git a/examples/javaee/xarecovery/src/test/java/org/apache/activemq/javaee/examples/XARecoveryRunnerTest.java b/examples/javaee/xarecovery/src/test/java/org/apache/activemq/javaee/examples/XARecoveryRunnerTest.java
deleted file mode 100644
index 3ef9ece..0000000
--- a/examples/javaee/xarecovery/src/test/java/org/apache/activemq/javaee/examples/XARecoveryRunnerTest.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.activemq.javaee.examples;
-
-import org.apache.activemq.javaee.example.XARecoveryExampleStepOne;
-import org.apache.activemq.javaee.example.XARecoveryExampleStepTwo;
-import org.apache.activemq.javaee.example.server.XARecoveryExampleBean;
-import org.apache.activemq.javaee.example.server.XARecoveryExampleService;
-import org.jboss.arquillian.container.test.api.*;
-import org.jboss.arquillian.junit.Arquillian;
-import org.jboss.arquillian.junit.InSequence;
-import org.jboss.arquillian.test.api.ArquillianResource;
-import org.jboss.shrinkwrap.api.Archive;
-import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.spec.JavaArchive;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-/**
- * @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a>
- * @author Justin Bertram
- */
-@RunAsClient
-@RunWith(Arquillian.class)
-public class XARecoveryRunnerTest
-{
- @ArquillianResource
- private ContainerController controller;
- @ArquillianResource
- private Deployer deployer;
-
- @Deployment(name = "deploy", managed = false)
- @TargetsContainer("jboss")
- public static Archive getDeployment()
- {
- final JavaArchive ejbJar = ShrinkWrap.create(JavaArchive.class, "ejb.jar");
- ejbJar.addClass(XARecoveryExampleBean.class);
- ejbJar.addClass(XARecoveryExampleService.class);
- System.out.println(ejbJar.toString(true));
- return ejbJar;
- }
-
- @Test
- @InSequence(0)
- public void runExample() throws Exception
- {
- XARecoveryExampleStepOne.main(null);
- try
- {
- controller.stop("jboss");
- }
- catch (Exception e)
- {
- //ignore
- }
- }
-
- @Test
- @InSequence(1)
- public void stepTwo() throws Exception
- {
- System.out.println("*****************************************************************************************************************************************************************");
- controller.start("jboss");
- XARecoveryExampleStepTwo.main(null);
- //give the example time to run
- Thread.sleep(10000);
- }
-
- @Test
- @InSequence(-1)
- public void startServer()
- {
- System.out.println("*****************************************************************************************************************************************************************");
- controller.start("jboss");
- System.out.println("*****************************************************************************************************************************************************************");
- deployer.deploy("deploy");
- }
-
- @Test
- @InSequence(2)
- public void stopServer()
- {
- deployer.undeploy("deploy");
- controller.stop("jboss");
- }
-}
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/xarecovery/src/test/resources/arquillian.xml
----------------------------------------------------------------------
diff --git a/examples/javaee/xarecovery/src/test/resources/arquillian.xml b/examples/javaee/xarecovery/src/test/resources/arquillian.xml
deleted file mode 100644
index dc23f77..0000000
--- a/examples/javaee/xarecovery/src/test/resources/arquillian.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<arquillian xmlns="http://jboss.org/schema/arquillian"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://jboss.org/schema/arquillian http://jboss.org/schema/arquillian/arquillian_1_0.xsd">
-
- <!-- Uncomment to have test archives exported to the file system for inspection.
-This feature can also be controlled using the system property arquillian.deploymentExportPath -->
- <!--
-<engine>
-<property name="deploymentExportPath">target</property>
-</engine>
--->
-
- <defaultProtocol type="Servlet 3.0" />
-
- <container qualifier="jboss" default="true" mode="manual" managed="false">
- <configuration>
- <property name="jbossHome">${basedir}/target/jbossas-node0</property>
- <property name="serverConfig">standalone-example.xml</property>
- <property name="allowConnectingToRunningServer">true</property>
- <property name="managementAddress">${node0:127.0.0.1}</property>
- </configuration>
- </container>
-
- <!-- logThreshold proposed -->
- <!--
-<container qualifier="jbossas-managed">
-<configuration>
-<property name="logThreshold">ERROR</property>
-</configuration>
-</container>
--->
-
-</arquillian>
\ No newline at end of file
[37/37] activemq-6 git commit: Merge #41
Posted by jb...@apache.org.
Merge #41
Project: http://git-wip-us.apache.org/repos/asf/activemq-6/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-6/commit/0eb6ebda
Tree: http://git-wip-us.apache.org/repos/asf/activemq-6/tree/0eb6ebda
Diff: http://git-wip-us.apache.org/repos/asf/activemq-6/diff/0eb6ebda
Branch: refs/heads/master
Commit: 0eb6ebda22c241a0a937b20fee6133573f35e45b
Parents: a102983 fecd376
Author: jbertram <jb...@redhat.com>
Authored: Wed Dec 10 10:10:08 2014 -0600
Committer: jbertram <jb...@redhat.com>
Committed: Wed Dec 10 10:10:08 2014 -0600
----------------------------------------------------------------------
tests/jms-tests/pom.xml | 13 +++++++++++++
1 file changed, 13 insertions(+)
----------------------------------------------------------------------
[23/37] activemq-6 git commit: ACTIVEMQ6-51 Example server
bootstrapping
Posted by jb...@apache.org.
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/queue-message-redistribution/src/main/resources/activemq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/queue-message-redistribution/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/queue-message-redistribution/src/main/resources/activemq/server0/activemq-jms.xml
new file mode 100644
index 0000000..847659f
--- /dev/null
+++ b/examples/jms/queue-message-redistribution/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>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/queue-message-redistribution/src/main/resources/activemq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/queue-message-redistribution/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/queue-message-redistribution/src/main/resources/activemq/server0/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/queue-message-redistribution/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/queue-message-redistribution/src/main/resources/activemq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/queue-message-redistribution/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/queue-message-redistribution/src/main/resources/activemq/server1/activemq-configuration.xml
new file mode 100644
index 0000000..70b8a58
--- /dev/null
+++ b/examples/jms/queue-message-redistribution/src/main/resources/activemq/server1/activemq-configuration.xml
@@ -0,0 +1,87 @@
+<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}/server1/data/messaging/bindings</bindings-directory>
+
+ <journal-directory>${build.directory}/server1/data/messaging/journal</journal-directory>
+
+ <large-messages-directory>${build.directory}/server1/data/messaging/largemessages</large-messages-directory>
+
+ <paging-directory>${build.directory}/server1/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="5446"/>
+ </connector>
+ </connectors>
+
+ <!-- Acceptors -->
+ <acceptors>
+ <acceptor name="netty-acceptor">
+ <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
+ <param key="port" value="5446"/>
+ </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>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/queue-message-redistribution/src/main/resources/activemq/server1/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/queue-message-redistribution/src/main/resources/activemq/server1/activemq-jms.xml b/examples/jms/queue-message-redistribution/src/main/resources/activemq/server1/activemq-jms.xml
new file mode 100644
index 0000000..847659f
--- /dev/null
+++ b/examples/jms/queue-message-redistribution/src/main/resources/activemq/server1/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>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/queue-message-redistribution/src/main/resources/activemq/server1/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/queue-message-redistribution/src/main/resources/activemq/server1/activemq-users.xml b/examples/jms/queue-message-redistribution/src/main/resources/activemq/server1/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/queue-message-redistribution/src/main/resources/activemq/server1/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/queue-message-redistribution/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server0/activemq-configuration.xml
deleted file mode 100644
index 5884905..0000000
--- a/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ /dev/null
@@ -1,86 +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>
- <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>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index 847659f..0000000
--- a/examples/jms/queue-message-redistribution/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>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/queue-message-redistribution/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/queue-message-redistribution/src/main/resources/hornetq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server1/activemq-configuration.xml b/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server1/activemq-configuration.xml
deleted file mode 100644
index 70b8a58..0000000
--- a/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server1/activemq-configuration.xml
+++ /dev/null
@@ -1,87 +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}/server1/data/messaging/bindings</bindings-directory>
-
- <journal-directory>${build.directory}/server1/data/messaging/journal</journal-directory>
-
- <large-messages-directory>${build.directory}/server1/data/messaging/largemessages</large-messages-directory>
-
- <paging-directory>${build.directory}/server1/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="5446"/>
- </connector>
- </connectors>
-
- <!-- Acceptors -->
- <acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- <param key="port" value="5446"/>
- </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>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server1/activemq-jms.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index 847659f..0000000
--- a/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server1/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>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server1/activemq-users.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/queue-message-redistribution/src/main/resources/hornetq/server1/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/queue-requestor/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/queue-requestor/pom.xml b/examples/jms/queue-requestor/pom.xml
index 1c644d9..4cf4351 100644
--- a/examples/jms/queue-requestor/pom.xml
+++ b/examples/jms/queue-requestor/pom.xml
@@ -51,9 +51,6 @@
</goals>
<configuration>
<clientClass>org.apache.activemq.jms.example.QueueRequestorExample</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/queue-requestor/src/main/java/org/apache/activemq/jms/example/QueueRequestorExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/queue-requestor/src/main/java/org/apache/activemq/jms/example/QueueRequestorExample.java b/examples/jms/queue-requestor/src/main/java/org/apache/activemq/jms/example/QueueRequestorExample.java
index b2f3d5b..a6fc186 100644
--- a/examples/jms/queue-requestor/src/main/java/org/apache/activemq/jms/example/QueueRequestorExample.java
+++ b/examples/jms/queue-requestor/src/main/java/org/apache/activemq/jms/example/QueueRequestorExample.java
@@ -48,7 +48,7 @@ public class QueueRequestorExample 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/queue-requestor/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/queue-requestor/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/queue-requestor/src/main/resources/activemq/server0/activemq-configuration.xml
new file mode 100644
index 0000000..9d3a1bb
--- /dev/null
+++ b/examples/jms/queue-requestor/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="netty-acceptor">
+ <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
+ </acceptor>
+ </acceptors>
+
+ <!-- Other config -->
+
+ <security-settings>
+ <!--security for example queues -->
+ <security-setting match="jms.queue.#">
+ <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 for JMS temporary queue -->
+ <security-setting match="jms.tempqueue.#">
+ <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/queue-requestor/src/main/resources/activemq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/queue-requestor/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/queue-requestor/src/main/resources/activemq/server0/activemq-jms.xml
new file mode 100644
index 0000000..0d5c953
--- /dev/null
+++ b/examples/jms/queue-requestor/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/queue-requestor/src/main/resources/activemq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/queue-requestor/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/queue-requestor/src/main/resources/activemq/server0/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/queue-requestor/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/queue-requestor/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/queue-requestor/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/queue-requestor/src/main/resources/hornetq/server0/activemq-configuration.xml
deleted file mode 100644
index e1af71e..0000000
--- a/examples/jms/queue-requestor/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 -->
-
- <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 queues -->
- <security-setting match="jms.queue.#">
- <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 for JMS temporary queue -->
- <security-setting match="jms.tempqueue.#">
- <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/queue-requestor/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/queue-requestor/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/queue-requestor/src/main/resources/hornetq/server0/activemq-jms.xml
deleted file mode 100644
index 0d5c953..0000000
--- a/examples/jms/queue-requestor/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/queue-requestor/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/queue-requestor/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/queue-requestor/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/queue-requestor/src/main/resources/jndi.properties b/examples/jms/queue-requestor/src/main/resources/jndi.properties
new file mode 100644
index 0000000..d9b5c6a
--- /dev/null
+++ b/examples/jms/queue-requestor/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/queue-selector/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/queue-selector/pom.xml b/examples/jms/queue-selector/pom.xml
index cb7024a..693bc6a 100644
--- a/examples/jms/queue-selector/pom.xml
+++ b/examples/jms/queue-selector/pom.xml
@@ -51,9 +51,6 @@
</goals>
<configuration>
<clientClass>org.apache.activemq.jms.example.QueueSelectorExample</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/queue-selector/src/main/java/org/apache/activemq/jms/example/QueueSelectorExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/queue-selector/src/main/java/org/apache/activemq/jms/example/QueueSelectorExample.java b/examples/jms/queue-selector/src/main/java/org/apache/activemq/jms/example/QueueSelectorExample.java
index ccb5250..de2d9db 100644
--- a/examples/jms/queue-selector/src/main/java/org/apache/activemq/jms/example/QueueSelectorExample.java
+++ b/examples/jms/queue-selector/src/main/java/org/apache/activemq/jms/example/QueueSelectorExample.java
@@ -52,7 +52,7 @@ public class QueueSelectorExample extends ActiveMQExample
try
{
// Step 1. Create an initial context to perform the JNDI lookup.
- initialContext = getContext(0);
+ initialContext = new InitialContext();
// Step 2. look-up the JMS queue object from JNDI
Queue queue = (Queue)initialContext.lookup("queue/exampleQueue");
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/queue-selector/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/queue-selector/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/queue-selector/src/main/resources/activemq/server0/activemq-configuration.xml
new file mode 100644
index 0000000..27874f9
--- /dev/null
+++ b/examples/jms/queue-selector/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -0,0 +1,33 @@
+<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/queue-selector/src/main/resources/activemq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/queue-selector/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/queue-selector/src/main/resources/activemq/server0/activemq-jms.xml
new file mode 100644
index 0000000..847659f
--- /dev/null
+++ b/examples/jms/queue-selector/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>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/queue-selector/src/main/resources/activemq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/queue-selector/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/queue-selector/src/main/resources/activemq/server0/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/queue-selector/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/queue-selector/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/queue-selector/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/queue-selector/src/main/resources/hornetq/server0/activemq-configuration.xml
deleted file mode 100644
index 676ebfc..0000000
--- a/examples/jms/queue-selector/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>
-
-
- <!-- 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/queue-selector/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index 847659f..0000000
--- a/examples/jms/queue-selector/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>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/queue-selector/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/queue-selector/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/queue-selector/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/queue-selector/src/main/resources/jndi.properties b/examples/jms/queue-selector/src/main/resources/jndi.properties
new file mode 100644
index 0000000..d9b5c6a
--- /dev/null
+++ b/examples/jms/queue-selector/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/queue/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/queue/pom.xml b/examples/jms/queue/pom.xml
index 307d2f8..1bbeac3 100644
--- a/examples/jms/queue/pom.xml
+++ b/examples/jms/queue/pom.xml
@@ -29,6 +29,7 @@
<plugin>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-maven-plugin</artifactId>
+ <version>${project.version}</version>
<executions>
<execution>
<id>start</id>
@@ -51,9 +52,6 @@
</goals>
<configuration>
<clientClass>org.apache.activemq.jms.example.QueueExample</clientClass>
- <args>
- <param>tcp://localhost:5445</param>
- </args>
</configuration>
</execution>
<execution>
@@ -102,7 +100,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/queue/src/main/java/org/apache/activemq/jms/example/QueueExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/queue/src/main/java/org/apache/activemq/jms/example/QueueExample.java b/examples/jms/queue/src/main/java/org/apache/activemq/jms/example/QueueExample.java
index a838c73..2e38514 100644
--- a/examples/jms/queue/src/main/java/org/apache/activemq/jms/example/QueueExample.java
+++ b/examples/jms/queue/src/main/java/org/apache/activemq/jms/example/QueueExample.java
@@ -47,7 +47,7 @@ public class QueueExample 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/queue/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/queue/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/queue/src/main/resources/activemq/server0/activemq-configuration.xml
new file mode 100644
index 0000000..52d9570
--- /dev/null
+++ b/examples/jms/queue/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/queue/src/main/resources/activemq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/queue/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/queue/src/main/resources/activemq/server0/activemq-jms.xml
new file mode 100644
index 0000000..0d5c953
--- /dev/null
+++ b/examples/jms/queue/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/queue/src/main/resources/activemq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/queue/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/queue/src/main/resources/activemq/server0/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/queue/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/queue/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index e0acd1d..0000000
--- a/examples/jms/queue/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/queue/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index 0d5c953..0000000
--- a/examples/jms/queue/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/queue/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/queue/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/queue/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/queue/src/main/resources/jndi.properties b/examples/jms/queue/src/main/resources/jndi.properties
new file mode 100644
index 0000000..d9b5c6a
--- /dev/null
+++ b/examples/jms/queue/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/reattach-node/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/reattach-node/pom.xml b/examples/jms/reattach-node/pom.xml
index 97fee3c..9498e03 100644
--- a/examples/jms/reattach-node/pom.xml
+++ b/examples/jms/reattach-node/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>
</configuration>
</execution>
<execution>
@@ -46,9 +46,6 @@
</goals>
<configuration>
<clientClass>org.apache.activemq.jms.example.ReattachExample</clientClass>
- <args>
- <param>tcp://localhost:5445</param>
- </args>
<systemProperties>
<property>
<name>exampleConfigDir</name>
@@ -63,7 +60,7 @@
<goal>stop</goal>
</goals>
<configuration>
- <hornetqConfigurationDir>${basedir}/target/classes/activemq/server0</hornetqConfigurationDir>
+ <configurationDir>${basedir}/target/classes/activemq/server0</configurationDir>
</configuration>
</execution>
</executions>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/reattach-node/src/main/java/org/apache/activemq/jms/example/ReattachExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/reattach-node/src/main/java/org/apache/activemq/jms/example/ReattachExample.java b/examples/jms/reattach-node/src/main/java/org/apache/activemq/jms/example/ReattachExample.java
index 65d40fe..9a9d58f 100644
--- a/examples/jms/reattach-node/src/main/java/org/apache/activemq/jms/example/ReattachExample.java
+++ b/examples/jms/reattach-node/src/main/java/org/apache/activemq/jms/example/ReattachExample.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.Message;
@@ -53,7 +55,7 @@ public class ReattachExample 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 queue
Queue queue = (Queue)initialContext.lookup("queue/exampleQueue");
@@ -86,7 +88,7 @@ public class ReattachExample extends ActiveMQExample
// Step 11. To simulate a temporary problem on the network, we stop the remoting acceptor on the
// server which will close all connections
- stopAcceptor(initialContext);
+ stopAcceptor();
System.out.println("Acceptor now stopped, will wait for 10 seconds. This simulates the network connection failing for a while");
@@ -95,7 +97,7 @@ public class ReattachExample extends ActiveMQExample
System.out.println("Re-starting acceptor");
- startAcceptor(initialContext);
+ startAcceptor();
System.out.println("Restarted acceptor. The client will now reconnect.");
@@ -121,22 +123,26 @@ public class ReattachExample extends ActiveMQExample
}
}
- private void stopAcceptor(final InitialContext ic) throws Exception
+ private void stopAcceptor() throws Exception
{
- stopStartAcceptor(ic, true);
+ stopStartAcceptor(true);
}
- private void startAcceptor(final InitialContext ic) throws Exception
+ private void startAcceptor() throws Exception
{
- stopStartAcceptor(ic, false);
+ stopStartAcceptor(false);
}
// To do this we send a management message to close the acceptor, we do this on a different
// connection factory which uses a different remoting connection so we can still send messages
// when the main connection has been stopped
- private void stopStartAcceptor(final InitialContext initialContext, final boolean stop) throws Exception
+ private void stopStartAcceptor(final boolean stop) throws Exception
{
- ConnectionFactory cf = (ConnectionFactory)initialContext.lookup("ConnectionFactory2");
+ 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", "tcp://localhost:5446");
+ InitialContext initialContext = new InitialContext(properties);
+ ConnectionFactory cf = (ConnectionFactory)initialContext.lookup("ConnectionFactory");
Connection connection = null;
try
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/reattach-node/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/reattach-node/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/reattach-node/src/main/resources/activemq/server0/activemq-configuration.xml
new file mode 100644
index 0000000..a090748
--- /dev/null
+++ b/examples/jms/reattach-node/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -0,0 +1,66 @@
+<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>
+
+ <!-- We just use this connector so we can send management operations while the other acceptor
+ is stopped -->
+ <connector name="netty-connector2">
+ <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
+ <param key="port" value="5446"/>
+ </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>
+
+ <!-- We just use this acceptor so we can send management operations while the other acceptor
+ is stopped -->
+ <acceptor name="netty-acceptor2">
+ <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
+ <param key="port" value="5446"/>
+ </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.activemq.management">
+ <!-- only the admin role can interact with the management address -->
+ <permission type="consume" roles="admin"/>
+ <permission type="send" roles="admin"/>
+ <permission type="manage" roles="admin"/>
+ </security-setting>
+ </security-settings>
+
+</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/reattach-node/src/main/resources/activemq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/reattach-node/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/reattach-node/src/main/resources/activemq/server0/activemq-jms.xml
new file mode 100644
index 0000000..847659f
--- /dev/null
+++ b/examples/jms/reattach-node/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>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/reattach-node/src/main/resources/activemq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/reattach-node/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/reattach-node/src/main/resources/activemq/server0/activemq-users.xml
new file mode 100644
index 0000000..58ecc13
--- /dev/null
+++ b/examples/jms/reattach-node/src/main/resources/activemq/server0/activemq-users.xml
@@ -0,0 +1,11 @@
+<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"/>
+
+ <!-- We give guest the admin role so it can do management operations for the example -
+ you don't want to do this in real life -->
+ <role name="admin"/>
+ </defaultuser>
+</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/reattach-node/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/reattach-node/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/reattach-node/src/main/resources/hornetq/server0/activemq-configuration.xml
deleted file mode 100644
index a090748..0000000
--- a/examples/jms/reattach-node/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ /dev/null
@@ -1,66 +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>
- <param key="port" value="5445"/>
- </connector>
-
- <!-- We just use this connector so we can send management operations while the other acceptor
- is stopped -->
- <connector name="netty-connector2">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
- <param key="port" value="5446"/>
- </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>
-
- <!-- We just use this acceptor so we can send management operations while the other acceptor
- is stopped -->
- <acceptor name="netty-acceptor2">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- <param key="port" value="5446"/>
- </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.activemq.management">
- <!-- only the admin role can interact with the management address -->
- <permission type="consume" roles="admin"/>
- <permission type="send" roles="admin"/>
- <permission type="manage" roles="admin"/>
- </security-setting>
- </security-settings>
-
-</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/reattach-node/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/reattach-node/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/reattach-node/src/main/resources/hornetq/server0/activemq-jms.xml
deleted file mode 100644
index 847659f..0000000
--- a/examples/jms/reattach-node/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>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/reattach-node/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/reattach-node/src/main/resources/hornetq/server0/activemq-users.xml b/examples/jms/reattach-node/src/main/resources/hornetq/server0/activemq-users.xml
deleted file mode 100644
index 58ecc13..0000000
--- a/examples/jms/reattach-node/src/main/resources/hornetq/server0/activemq-users.xml
+++ /dev/null
@@ -1,11 +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"/>
-
- <!-- We give guest the admin role so it can do management operations for the example -
- you don't want to do this in real life -->
- <role name="admin"/>
- </defaultuser>
-</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/reattach-node/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/reattach-node/src/main/resources/jndi.properties b/examples/jms/reattach-node/src/main/resources/jndi.properties
new file mode 100644
index 0000000..c801182
--- /dev/null
+++ b/examples/jms/reattach-node/src/main/resources/jndi.properties
@@ -0,0 +1,8 @@
+java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
+java.naming.provider.url=tcp://localhost:5445
+connection.ConnectionFactory.retryInterval=1000
+connection.ConnectionFactory.retryIntervalMultiplier=1.0
+connection.ConnectionFactory.reconnectAttempts=-1
+connection.ConnectionFactory.failoverOnServerShutdown=true
+connection.ConnectionFactory.confirmationWindowSize=1048576
+queue.queue/exampleQueue=exampleQueue
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/replicated-failback-static/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-failback-static/pom.xml b/examples/jms/replicated-failback-static/pom.xml
index 631b40f..7358cae 100644
--- a/examples/jms/replicated-failback-static/pom.xml
+++ b/examples/jms/replicated-failback-static/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>
@@ -78,10 +76,6 @@
</goals>
<configuration>
<clientClass>org.apache.activemq.jms.example.ReplicatedFailbackStaticExample</clientClass>
- <args>
- <param>tcp://localhost:5445</param>
- <param>tcp://localhost:5446</param>
- </args>
<systemProperties>
<property>
<name>exampleConfigDir</name>
@@ -96,7 +90,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 +99,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/replicated-failback-static/src/main/java/org/apache/activemq/jms/example/ReplicatedFailbackStaticExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-failback-static/src/main/java/org/apache/activemq/jms/example/ReplicatedFailbackStaticExample.java b/examples/jms/replicated-failback-static/src/main/java/org/apache/activemq/jms/example/ReplicatedFailbackStaticExample.java
index 73edb7e..dde65bb 100644
--- a/examples/jms/replicated-failback-static/src/main/java/org/apache/activemq/jms/example/ReplicatedFailbackStaticExample.java
+++ b/examples/jms/replicated-failback-static/src/main/java/org/apache/activemq/jms/example/ReplicatedFailbackStaticExample.java
@@ -55,7 +55,7 @@ public class ReplicatedFailbackStaticExample extends ActiveMQExample
try
{
// Step 1. Get an initial context for looking up JNDI from the server #1
- initialContext = getContext(0);
+ initialContext = new InitialContext();
// Step 2. Look up the JMS resources from JNDI
Queue queue = (Queue)initialContext.lookup("queue/exampleQueue");
@@ -100,7 +100,7 @@ public class ReplicatedFailbackStaticExample extends ActiveMQExample
// Step 10. Crash server #1, the live server, and wait a little while to make sure
// it has really crashed
- Thread.sleep(2000);
+ Thread.sleep(5000);
killServer(0);
// Step 11. Acknowledging the 2nd half of the sent messages will fail as failover to the
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/replicated-failback-static/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-failback-static/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/replicated-failback-static/src/main/resources/activemq/server0/activemq-configuration.xml
new file mode 100644
index 0000000..684bd36
--- /dev/null
+++ b/examples/jms/replicated-failback-static/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -0,0 +1,68 @@
+<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>
+
+ <cluster-user>exampleUser</cluster-user>
+
+ <cluster-password>secret</cluster-password>
+
+ <ha-policy>
+ <replication>
+ <master>
+ <!--we need this for auto failback-->
+ <check-for-live-server>true</check-for-live-server>
+ </master>
+ </replication>
+ </ha-policy>
+
+ <connectors>
+ <connector name="netty-connector">
+ <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
+ <param key="port" value="5445"/>
+ </connector>
+ <connector name="netty-backup-connector">
+ <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
+ <param key="port" value="5446"/>
+ </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>
+
+ <cluster-connections>
+ <cluster-connection name="my-cluster">
+ <address>jms</address>
+ <connector-ref>netty-connector</connector-ref>
+ <static-connectors>
+ <connector-ref>netty-backup-connector</connector-ref>
+ </static-connectors>
+ </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>
+
+</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/replicated-failback-static/src/main/resources/activemq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-failback-static/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/replicated-failback-static/src/main/resources/activemq/server0/activemq-jms.xml
new file mode 100644
index 0000000..0d5c953
--- /dev/null
+++ b/examples/jms/replicated-failback-static/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/replicated-failback-static/src/main/resources/activemq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-failback-static/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/replicated-failback-static/src/main/resources/activemq/server0/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/replicated-failback-static/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/replicated-failback-static/src/main/resources/activemq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-failback-static/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/replicated-failback-static/src/main/resources/activemq/server1/activemq-configuration.xml
new file mode 100644
index 0000000..b6e3935
--- /dev/null
+++ b/examples/jms/replicated-failback-static/src/main/resources/activemq/server1/activemq-configuration.xml
@@ -0,0 +1,70 @@
+<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}/server1/data/messaging/bindings</bindings-directory>
+
+ <journal-directory>${build.directory}/server1/data/messaging/journal</journal-directory>
+
+ <large-messages-directory>${build.directory}/server1/data/messaging/largemessages</large-messages-directory>
+
+ <paging-directory>${build.directory}/server1/data/messaging/paging</paging-directory>
+
+ <cluster-user>exampleUser</cluster-user>
+
+ <cluster-password>secret</cluster-password>
+
+ <ha-policy>
+ <replication>
+ <slave>
+ <allow-failback>true</allow-failback>
+ <!-- not needed but tells the backup not to restart after failback as there will be > 0 backups saved -->
+ <max-saved-replicated-journals-size>0</max-saved-replicated-journals-size>
+ </slave>
+ </replication>
+ </ha-policy>
+
+ <!-- Connectors -->
+ <connectors>
+ <connector name="netty-live-connector">
+ <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
+ <param key="port" value="5445"/>
+ </connector>
+ <connector name="netty-connector">
+ <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
+ <param key="port" value="5446"/>
+ </connector>
+ </connectors>
+
+ <!-- Acceptors -->
+ <acceptors>
+ <acceptor name="netty-acceptor">
+ <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
+ <param key="port" value="5446"/>
+ </acceptor>
+ </acceptors>
+
+ <cluster-connections>
+ <cluster-connection name="my-cluster">
+ <address>jms</address>
+ <connector-ref>netty-connector</connector-ref>
+ <static-connectors>
+ <connector-ref>netty-live-connector</connector-ref>
+ </static-connectors>
+ </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>
+
+</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/replicated-failback-static/src/main/resources/activemq/server1/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-failback-static/src/main/resources/activemq/server1/activemq-jms.xml b/examples/jms/replicated-failback-static/src/main/resources/activemq/server1/activemq-jms.xml
new file mode 100644
index 0000000..0d5c953
--- /dev/null
+++ b/examples/jms/replicated-failback-static/src/main/resources/activemq/server1/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/replicated-failback-static/src/main/resources/activemq/server1/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-failback-static/src/main/resources/activemq/server1/activemq-users.xml b/examples/jms/replicated-failback-static/src/main/resources/activemq/server1/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/replicated-failback-static/src/main/resources/activemq/server1/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/replicated-failback-static/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-failback-static/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/replicated-failback-static/src/main/resources/hornetq/server0/activemq-configuration.xml
deleted file mode 100644
index 3854f19..0000000
--- a/examples/jms/replicated-failback-static/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ /dev/null
@@ -1,69 +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>
-
- <cluster-user>exampleUser</cluster-user>
-
- <cluster-password>secret</cluster-password>
-
- <ha-policy>
- <replication>
- <master>
- <!--we need this for auto failback-->
- <check-for-live-server>true</check-for-live-server>
- <allow-failback>true</allow-failback>
- </master>
- </replication>
- </ha-policy>
-
- <connectors>
- <connector name="netty-connector">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
- <param key="port" value="5445"/>
- </connector>
- <connector name="netty-backup-connector">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
- <param key="port" value="5446"/>
- </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>
-
- <cluster-connections>
- <cluster-connection name="my-cluster">
- <address>jms</address>
- <connector-ref>netty-connector</connector-ref>
- <static-connectors>
- <connector-ref>netty-backup-connector</connector-ref>
- </static-connectors>
- </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>
-
-</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/replicated-failback-static/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-failback-static/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/replicated-failback-static/src/main/resources/hornetq/server0/activemq-jms.xml
deleted file mode 100644
index 0d5c953..0000000
--- a/examples/jms/replicated-failback-static/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/replicated-failback-static/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/replicated-failback-static/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
[06/37] activemq-6 git commit: ACTIVEMQ6-41 Drop Java EE examples
Posted by jb...@apache.org.
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/mdb-remote-failover-static/src/main/java/org/apache/activemq/javaee/example/server/MDBRemoteFailoverStaticExample.java
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-remote-failover-static/src/main/java/org/apache/activemq/javaee/example/server/MDBRemoteFailoverStaticExample.java b/examples/javaee/mdb-remote-failover-static/src/main/java/org/apache/activemq/javaee/example/server/MDBRemoteFailoverStaticExample.java
deleted file mode 100644
index 6ab6ecd..0000000
--- a/examples/javaee/mdb-remote-failover-static/src/main/java/org/apache/activemq/javaee/example/server/MDBRemoteFailoverStaticExample.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.activemq.javaee.example.server;
-
-import org.apache.activemq.api.jms.ActiveMQJMSClient;
-import org.jboss.ejb3.annotation.ResourceAdapter;
-
-import javax.annotation.Resource;
-import javax.ejb.*;
-import javax.jms.*;
-
-/**
- * @author <a href="mailto:andy.taylor@jboss.com">Andy Taylor</a>
- * @author Justin Bertram
- */
-@MessageDriven(name = "MDBRemoteFailoverStaticExample",
- activationConfig =
- {
- @ActivationConfigProperty(propertyName = "destinationType", propertyValue = "javax.jms.Queue"),
- @ActivationConfigProperty(propertyName = "destination", propertyValue = "inQueue"),
- @ActivationConfigProperty(propertyName = "hA", propertyValue = "true"),
- @ActivationConfigProperty(propertyName = "useJNDI", propertyValue = "false")
- })
-@ResourceAdapter("activemq-remote-ra.rar")
-public class MDBRemoteFailoverStaticExample implements MessageListener
-{
- @Resource(mappedName = "java:/RemoteJmsXA")
- ConnectionFactory connectionFactory;
- Queue replyQueue;
-
- public void onMessage(Message message)
- {
- Connection conn = null;
- try
- {
- replyQueue = ActiveMQJMSClient.createQueue("outQueue");
- //Step 9. We know the client is sending a text message so we cast
- TextMessage textMessage = (TextMessage)message;
-
- //Step 10. get the text from the message.
- String text = textMessage.getText();
-
- System.out.println("message " + text);
-
- //Step 11. we create a JMS connection
- conn = connectionFactory.createConnection("guest", "password");
-
- //Step 12. We create a JMS session
- Session sess = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
-
- //Step 13. we create a producer for the reply queue
- MessageProducer producer = sess.createProducer(replyQueue);
-
- //Step 14. we create a message and send it
- producer.send(sess.createTextMessage("this is a reply"));
-
- }
- catch (Exception e)
- {
- e.printStackTrace();
- }
- finally
- {
- if(conn != null)
- {
- try
- {
- conn.close();
- }
- catch (JMSException e)
- {
- }
- }
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/mdb-remote-failover-static/src/main/java/org/apache/activemq/javaee/example/server/ServerKiller.java
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-remote-failover-static/src/main/java/org/apache/activemq/javaee/example/server/ServerKiller.java b/examples/javaee/mdb-remote-failover-static/src/main/java/org/apache/activemq/javaee/example/server/ServerKiller.java
deleted file mode 100644
index 415367f..0000000
--- a/examples/javaee/mdb-remote-failover-static/src/main/java/org/apache/activemq/javaee/example/server/ServerKiller.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.activemq.javaee.example.server;
-/**
- * @author <a href="mailto:andy.taylor@jboss.com">Andy Taylor</a>
- * Date: 12/06/12
- */
-public interface ServerKiller
-{
- void kill();
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/mdb-remote-failover-static/src/test/java/org/apache/activemq/javaee/examples/FailoverStaticRunnerTest.java
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-remote-failover-static/src/test/java/org/apache/activemq/javaee/examples/FailoverStaticRunnerTest.java b/examples/javaee/mdb-remote-failover-static/src/test/java/org/apache/activemq/javaee/examples/FailoverStaticRunnerTest.java
deleted file mode 100644
index 25601c6..0000000
--- a/examples/javaee/mdb-remote-failover-static/src/test/java/org/apache/activemq/javaee/examples/FailoverStaticRunnerTest.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.activemq.javaee.examples;
-
-import org.apache.activemq.javaee.example.MDBRemoteFailoverStaticClientExample;
-import org.apache.activemq.javaee.example.server.MDBRemoteFailoverStaticExample;
-import org.apache.activemq.javaee.example.server.ServerKiller;
-import org.jboss.arquillian.container.test.api.ContainerController;
-import org.jboss.arquillian.container.test.api.Deployer;
-import org.jboss.arquillian.container.test.api.Deployment;
-import org.jboss.arquillian.container.test.api.RunAsClient;
-import org.jboss.arquillian.container.test.api.TargetsContainer;
-import org.jboss.arquillian.junit.Arquillian;
-import org.jboss.arquillian.junit.InSequence;
-import org.jboss.arquillian.test.api.ArquillianResource;
-import org.jboss.shrinkwrap.api.Archive;
-import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.spec.JavaArchive;
-import org.jboss.shrinkwrap.api.spec.WebArchive;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-/**
- * @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a>
- * 5/21/12
- */
-@RunAsClient
-@RunWith(Arquillian.class)
-public class FailoverStaticRunnerTest
-{
- @ArquillianResource
- private ContainerController controller;
- @ArquillianResource
- private Deployer deployer;
-
- @Deployment(name = "deploy-0", managed = false)
- @TargetsContainer("node-0")
- public static Archive getDeployment()
- {
- final JavaArchive ejbJar = ShrinkWrap.create(JavaArchive.class, "mdb.jar");
- ejbJar.addClass(MDBRemoteFailoverStaticExample.class);
-
- final WebArchive war = ShrinkWrap.create(WebArchive.class, "test.war");
- war.addAsManifestResource("jboss-deployment-structure.xml", "jboss-deployment-structure.xml");
- war.addAsLibrary(ejbJar);
- System.out.println(war.toString(true));
- return war;
- }
-
- @Test
- public void runExample() throws Exception
- {
- MDBRemoteFailoverStaticClientExample.setKiller(new ServerKiller()
- {
- @Override
- public void kill()
- {
- controller.kill("node-1");
- }
- });
-
- MDBRemoteFailoverStaticClientExample.main(null);
- }
-
- @Test
- @InSequence(-1)
- public void startServer()
- {
- System.out.println("*****************************************************************************************************************************************************************");
- controller.start("node-1");
- System.out.println("*****************************************************************************************************************************************************************");
- controller.start("node-2");
- System.out.println("*****************************************************************************************************************************************************************");
- controller.start("node-0");
- System.out.println("*****************************************************************************************************************************************************************");
- deployer.deploy("deploy-0");
- }
-
- @Test
- @InSequence(1)
- public void stopServer()
- {
- deployer.undeploy("deploy-0");
- controller.stop("node-0");
- controller.stop("node-2");
- }
-}
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/mdb-remote-failover-static/src/test/resources/arquillian.xml
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-remote-failover-static/src/test/resources/arquillian.xml b/examples/javaee/mdb-remote-failover-static/src/test/resources/arquillian.xml
deleted file mode 100644
index d457ec7..0000000
--- a/examples/javaee/mdb-remote-failover-static/src/test/resources/arquillian.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<arquillian xmlns="http://jboss.org/schema/arquillian"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://jboss.org/schema/arquillian http://jboss.org/schema/arquillian/arquillian_1_0.xsd">
-
- <!-- Uncomment to have test archives exported to the file system for inspection.
-This feature can also be controlled using the system property arquillian.deploymentExportPath -->
- <!--
-<engine>
-<property name="deploymentExportPath">target</property>
-</engine>
--->
-
- <defaultProtocol type="Servlet 3.0"/>
-
- <group qualifier="clustering-all">
- <container qualifier="node-0" mode="manual" default="true" managed="false" >
- <configuration>
- <property name="jbossHome">${basedir}/target/jbossas-node0</property>
- <property name="javaVmArguments">-Djboss.node.name=node-0</property>
- <property name="serverConfig">standalone-example.xml</property>
- <property name="allowConnectingToRunningServer">true</property>
- <property name="managementAddress">${node0:127.0.0.1}</property>
- </configuration>
- </container>
- <container qualifier="node-1" mode="manual" managed="false">
- <configuration>
- <property name="jbossHome">${basedir}/target/jbossas-node1</property>
- <property name="javaVmArguments">-Djboss.node.name=node-1 -Djboss.socket.binding.port-offset=100</property>
- <property name="serverConfig">standalone-live.xml</property>
- <property name="allowConnectingToRunningServer">true</property>
- <property name="managementAddress">${node0:127.0.0.1}</property>
- <property name="managementPort">${as.managementPort:10090}</property>
- </configuration>
- </container>
- <container qualifier="node-2" mode="manual" managed="false">
- <configuration>
- <property name="jbossHome">${basedir}/target/jbossas-node2</property>
- <property name="javaVmArguments">-Djboss.node.name=node-2 -Djboss.socket.binding.port-offset=200</property>
- <property name="serverConfig">standalone-backup.xml</property>
- <property name="allowConnectingToRunningServer">true</property>
- <property name="managementAddress">${node0:127.0.0.1}</property>
- <property name="managementPort">${as.managementPort:10190}</property>
- </configuration>
- </container>
- </group>
-
- <!-- logThreshold proposed -->
- <!--
-<container qualifier="jbossas-managed">
-<configuration>
-<property name="logThreshold">ERROR</property>
-</configuration>
-</container>
--->
-
-</arquillian>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/mdb-remote-failover-static/src/test/resources/jboss-deployment-structure.xml
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-remote-failover-static/src/test/resources/jboss-deployment-structure.xml b/examples/javaee/mdb-remote-failover-static/src/test/resources/jboss-deployment-structure.xml
deleted file mode 100644
index c49e8cf..0000000
--- a/examples/javaee/mdb-remote-failover-static/src/test/resources/jboss-deployment-structure.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<jboss-deployment-structure>
- <deployment>
- <dependencies>
- <module name="org.apache.activemq"/>
- </dependencies>
- </deployment>
-</jboss-deployment-structure>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/mdb-remote-failover/pom.xml
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-remote-failover/pom.xml b/examples/javaee/mdb-remote-failover/pom.xml
deleted file mode 100644
index 861d794..0000000
--- a/examples/javaee/mdb-remote-failover/pom.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.activemq.example.javaee</groupId>
- <artifactId>javaee-examples</artifactId>
- <version>6.0.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>activemq-javaee-mdb-remote-failover-example</artifactId>
- <packaging>jar</packaging>
- <name>ActiveMQ6 Java EE MDB Remote Failover Example</name>
-
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <executions>
- <!-- Copy the AS for the second node into current_submodule/target/as-node1.-->
- <execution>
- <id>as-node1</id>
- <inherited>true</inherited>
- <phase>generate-test-resources</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <outputDirectory>${basedir}/target/jbossas-node1</outputDirectory>
- <overwrite>true</overwrite>
- <resources>
- <resource>
- <directory>${jboss.home}</directory>
- <excludes>
- <exclude>standalone/data</exclude>
- <exclude>standalone/log</exclude>
- <exclude>standalone/tmp</exclude>
- </excludes>
- </resource>
- <resource>
- <directory>${basedir}/server</directory>
- </resource>
- </resources>
- </configuration>
- </execution>
- <!-- Copy the AS for the second node into current_submodule/target/as-node2.-->
- <execution>
- <id>as-node2</id>
- <inherited>true</inherited>
- <phase>generate-test-resources</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <outputDirectory>${basedir}/target/jbossas-node2</outputDirectory>
- <overwrite>true</overwrite>
- <resources>
- <resource>
- <directory>${jboss.home}</directory>
- <excludes>
- <exclude>standalone/data</exclude>
- <exclude>standalone/log</exclude>
- <exclude>standalone/tmp</exclude>
- </excludes>
- </resource>
- <resource>
- <directory>${basedir}/server</directory>
- </resource>
- </resources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.12</version>
- <configuration>
- <argLine>-Dlogging.configuration=file:///${user.dir}/test/config/logging.properties</argLine>
- <!-- Parameters to test cases. -->
- <systemPropertyVariables>
- <arquillian.launch>clustering-all</arquillian.launch>
- </systemPropertyVariables>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/mdb-remote-failover/readme.html
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-remote-failover/readme.html b/examples/javaee/mdb-remote-failover/readme.html
deleted file mode 100644
index 6701669..0000000
--- a/examples/javaee/mdb-remote-failover/readme.html
+++ /dev/null
@@ -1,165 +0,0 @@
-<html>
- <head>
- <title>ActiveMQ Java EE MDB Message Selector Example</title>
- <link rel="stylesheet" type="text/css" href="../../common/common.css" />
- <link rel="stylesheet" type="text/css" href="../../common/prettify.css" />
- <script type="text/javascript" src="../../common/prettify.js"></script>
- </head>
- <body onload="prettyPrint()">
- <h1>Java EE MDB Remote Failover Example</h1>
-
- <p>This example shows you how to send a message to an MDB that is configured to consume from a live/backup pair.</p>
- <p>The example will send deploy a simple MDB to one Wildfly instance. Then it will send a message to the live server of the live/backup pair
- which will be consumed by the MDB after which the MDB will send a reply message which will be consumed by the example program. Then the live
- server will be stopped so that the backup takes over and the process will be repeated.</p>
-
- <p>Unlike the "Java EE MDB Remote Failover Static Example," this example uses a "dynamic" configuration for finding all the nodes. In other words
- it uses UDP multicast for server discovery.</p>
-
- <p>The example leverages the JBoss Arquillian framework to run a WildFly instance and deploy the MDB.</p>
-
- <h2>Example step-by-step</h2>
-
- <p><i>download WildFly 8.0.0.Final from <a href="http://wildfly.org/downloads/">here</a> and install.</i></p>
- <p><i>set the JBOSS_HOME property to point to the WildFly install directory</i></p>
- <p><i>type <code>mvn verify</code> from the example directory to run</i></p>
-
- <ol>
- <li>First we need to get an initial context so we can look-up the JMS connection factory and destination objects from JNDI. This initial context will get it's properties from the <code>jndi.properties</code> file in the directory <code>config</code></li>
- <pre class="prettyprint">
- final Properties env = new Properties();
-
- env.put(Context.INITIAL_CONTEXT_FACTORY, "org.jboss.naming.remote.client.InitialContextFactory");
-
- env.put(Context.PROVIDER_URL, "http-remoting://localhost:8080");
-
- initialContext = new InitialContext(env);
- </pre>
-
- <li>We look up the JMS queue object from JNDI</li>
- <pre class="prettyprint">
- Queue queue = (Queue) initialContext.lookup("/queues/inQueue");
- </pre>
-
- <li>We look up the JMS connection factory object from JNDI</li>
- <pre class="prettyprint">
- ConnectionFactory cf = (ConnectionFactory)initialContext.lookup("/jms/RemoteConnectionFactory");
- </pre>
-
- <li>We create a JMS connection</li>
- <pre class="prettyprint">
- connection = cf.createConnection("guest", "password");
- </pre>
-
- <li>We create a JMS session. The session is created as non transacted and will auto acknowledge messages.</li>
- <pre class="prettyprint">
- <code>Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);</code>
- </pre>
-
- <li>We create a JMS message producer on the session. This will be used to send the messages.</li>
- <pre class="prettyprint">
- <code>MessageProducer messageProducer = session.createProducer(queue);</code>
- </pre>
-
- <li>We create a JMS text messages that we are going to send.</li>
- <pre class="prettyprint">
- <code>TextMessage message = session.createTextMessage("This is a text message");</code>
- </pre>
-
- <li>We send the message to the queue</li>
- <pre class="prettyprint">
- <code>messageProducer.send(message);</code>
- </pre>
-
- <li>MDB receives the message</li>
- <pre class="prettyprint">
- <code>TextMessage textMessage = (TextMessage)message;</code>
- </pre>
-
- <li>Get and print the text</li>
- <pre class="prettyprint">
- <code>String text = textMessage.getText();
-
- System.out.println("message " + text);</code>
- </pre>
-
- <li>Create a JMS connection using the injected connection factory</li>
- <pre class="prettyprint">
- <code>conn = connectionFactory.createConnection();</code>
- </pre>
-
- <li>Create a JMS session</li>
- <pre class="prettyprint">
- <code>Session sess = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);</code>
- </pre>
-
- <li>Create a producer</li>
- <pre class="prettyprint">
- <code>MessageProducer producer = sess.createProducer(replyQueue);</code>
- </pre>
-
- <li>Create a message and send it to the reply queue</li>
- <pre class="prettyprint">
- <code>producer.send(sess.createTextMessage("this is a reply"));</code>
- </pre>
-
- <li>Client looks up the reply queue</li>
- <pre class="prettyprint">
- <code>queue = (Queue) initialContext.lookup("/queues/outQueue");</code>
- </pre>
-
- <li>Create a consumer</li>
- <pre class="prettyprint">
- <code>MessageConsumer messageConsumer = session.createConsumer(queue);</code>
- </pre>
-
- <li>Start the connection</li>
- <pre class="prettyprint">
- <code>connection.start();</code>
- </pre>
-
- <li>Receive the message and print it out</li>
- <pre class="prettyprint">
- <code>message = (TextMessage) messageConsumer.receive(20000);
-
- System.out.println("message.getText() = " + message.getText());</code>
- </pre>
-
- <li>Kill the live server. At this point both the standalone client and the MDB will fail-over to the backup.</li>
- <pre class="prettyprint">
- <code>killer.kill();</code>
- </pre>
-
- <li>Create another message</li>
- <pre class="prettyprint">
- <code>message = session.createTextMessage("This is another text message");</code>
- </pre>
-
- <li>Send the message</li>
- <pre class="prettyprint">
- <code>producer.send(message);</code>
- </pre>
-
- <li>The MDB will receive the message and send another message to the reply queue which the client then receives</li>
- <pre class="prettyprint">
- <code>message = (TextMessage) messageConsumer.receive(20000);</code>
- </pre>
-
- <li>And finally, <b>always</b> remember to close your JMS connections and resources after use, in a <code>finally</code> block. Closing a JMS connection will automatically close all of its sessions, consumers, producer and browser objects</li>
-
- <pre class="prettyprint">
- <code>finally
- {
- if (initialContext != null)
- {
- initialContext.close();
- }
- if (connection != null)
- {
- connection.close();
- }
- }</code>
- </pre>
- </ol>
- </body>
-</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/mdb-remote-failover/server/standalone/configuration/application-roles.properties
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-remote-failover/server/standalone/configuration/application-roles.properties b/examples/javaee/mdb-remote-failover/server/standalone/configuration/application-roles.properties
deleted file mode 100644
index 0ade8fb..0000000
--- a/examples/javaee/mdb-remote-failover/server/standalone/configuration/application-roles.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# Properties declaration of users roles for the realm 'ApplicationRealm'.
-#
-# This includes the following protocols: remote ejb, remote jndi, web, remote jms
-#
-# Users can be added to this properties file at any time, updates after the server has started
-# will be automatically detected.
-#
-# The format of this file is as follows: -
-# username=role1,role2,role3
-#
-# A utility script is provided which can be executed from the bin folder to add the users: -
-# - Linux
-# bin/add-user.sh
-#
-# - Windows
-# bin\add-user.bat
-#
-# The following illustrates how an admin user could be defined.
-#
-#admin=PowerUser,BillingAdmin,
-guest=guest
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/mdb-remote-failover/server/standalone/configuration/application-users.properties
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-remote-failover/server/standalone/configuration/application-users.properties b/examples/javaee/mdb-remote-failover/server/standalone/configuration/application-users.properties
deleted file mode 100644
index c52e923..0000000
--- a/examples/javaee/mdb-remote-failover/server/standalone/configuration/application-users.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# Properties declaration of users for the realm 'ApplicationRealm' which is the default realm
-# for application services on a new AS 7.1 installation.
-#
-# This includes the following protocols: remote ejb, remote jndi, web, remote jms
-#
-# Users can be added to this properties file at any time, updates after the server has started
-# will be automatically detected.
-#
-# The format of this realm is as follows: -
-# username=HEX( MD5( username ':' realm ':' password))
-#
-# A utility script is provided which can be executed from the bin folder to add the users: -
-# - Linux
-# bin/add-user.sh
-#
-# - Windows
-# bin\add-user.bat
-#
-# The following illustrates how an admin user could be defined, this
-# is for illustration only and does not correspond to a usable password.
-#
-#admin=2a0923285184943425d1f53ddd58ec7a
-guest=3437456520927d113b17d471d630e0d6
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/mdb-remote-failover/server/standalone/configuration/logging.properties
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-remote-failover/server/standalone/configuration/logging.properties b/examples/javaee/mdb-remote-failover/server/standalone/configuration/logging.properties
deleted file mode 100644
index 3fa31b0..0000000
--- a/examples/javaee/mdb-remote-failover/server/standalone/configuration/logging.properties
+++ /dev/null
@@ -1,47 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# Additional logger names to configure (root logger is always configured)
-loggers=org.jboss.as.config
-
-# Dump system environment at boot by default
-logger.org.jboss.as.config.level=DEBUG
-
-# Root logger level
-logger.level=${jboss.boot.server.log.level:INFO}
-# Root logger handlers
-logger.handlers=FILE,CONSOLE
-
-# Console handler configuration
-handler.CONSOLE=org.jboss.logmanager.handlers.ConsoleHandler
-handler.CONSOLE.properties=autoFlush
-handler.CONSOLE.level=${jboss.boot.server.log.console.level:INFO}
-handler.CONSOLE.autoFlush=true
-handler.CONSOLE.formatter=PATTERN
-
-# File handler configuration
-handler.FILE=org.jboss.logmanager.handlers.FileHandler
-handler.FILE.level=DEBUG
-handler.FILE.properties=autoFlush,fileName
-handler.FILE.autoFlush=true
-handler.FILE.fileName=${org.jboss.boot.log.file:boot.log}
-handler.FILE.formatter=PATTERN
-
-# Formatter pattern configuration
-formatter.PATTERN=org.jboss.logmanager.formatters.PatternFormatter
-formatter.PATTERN.properties=pattern
-formatter.PATTERN.pattern=%d{HH:mm:ss,SSS} %-5p [%c] %s%E%n
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/mdb-remote-failover/server/standalone/configuration/mgmt-users.properties
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-remote-failover/server/standalone/configuration/mgmt-users.properties b/examples/javaee/mdb-remote-failover/server/standalone/configuration/mgmt-users.properties
deleted file mode 100644
index 309305a..0000000
--- a/examples/javaee/mdb-remote-failover/server/standalone/configuration/mgmt-users.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# Properties declaration of users for the realm 'ManagementRealm' which is the default realm
-# for new AS 7.1 installations. Further authentication mechanism can be configured
-# as part of the <management /> in standalone.xml.
-#
-# Users can be added to this properties file at any time, updates after the server has started
-# will be automatically detected.
-#
-# By default the properties realm expects the entries to be in the format: -
-# username=HEX( MD5( username ':' realm ':' password))
-#
-# A utility script is provided which can be executed from the bin folder to add the users: -
-# - Linux
-# bin/add-user.sh
-#
-# - Windows
-# bin\add-user.bat
-
-# The following illustrates how an admin user could be defined, this
-# is for illustration only and does not correspond to a usable password.
-#
-#admin=2a0923285184943425d1f53ddd58ec7a
-admin=ffd6e94a09c5a9ea5e216737dd45b99d
-andy=dfb16391f1be1c454b5bce9822bd9df3
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/mdb-remote-failover/server/standalone/configuration/standalone-backup.xml
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-remote-failover/server/standalone/configuration/standalone-backup.xml b/examples/javaee/mdb-remote-failover/server/standalone/configuration/standalone-backup.xml
deleted file mode 100644
index 4e784d1..0000000
--- a/examples/javaee/mdb-remote-failover/server/standalone/configuration/standalone-backup.xml
+++ /dev/null
@@ -1,519 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-
-<server xmlns="urn:jboss:domain:2.0">
- <extensions>
- <extension module="org.jboss.as.clustering.infinispan"/>
- <extension module="org.jboss.as.connector"/>
- <extension module="org.jboss.as.deployment-scanner"/>
- <extension module="org.jboss.as.ee"/>
- <extension module="org.jboss.as.ejb3"/>
- <extension module="org.jboss.as.jacorb"/>
- <extension module="org.jboss.as.jaxrs"/>
- <extension module="org.jboss.as.jdr"/>
- <extension module="org.jboss.as.jmx"/>
- <extension module="org.jboss.as.jpa"/>
- <extension module="org.jboss.as.jsf"/>
- <extension module="org.jboss.as.jsr77"/>
- <extension module="org.jboss.as.logging"/>
- <extension module="org.jboss.as.mail"/>
- <extension module="org.jboss.as.messaging"/>
- <extension module="org.jboss.as.naming"/>
- <extension module="org.jboss.as.pojo"/>
- <extension module="org.jboss.as.remoting"/>
- <extension module="org.jboss.as.sar"/>
- <extension module="org.jboss.as.security"/>
- <extension module="org.jboss.as.threads"/>
- <extension module="org.jboss.as.transactions"/>
- <extension module="org.jboss.as.webservices"/>
- <extension module="org.jboss.as.weld"/>
- <extension module="org.wildfly.extension.batch"/>
- <extension module="org.wildfly.extension.io"/>
- <extension module="org.wildfly.extension.undertow"/>
- </extensions>
- <management>
- <security-realms>
- <security-realm name="ManagementRealm">
- <authentication>
- <local default-user="$local"/>
- <properties path="mgmt-users.properties" relative-to="jboss.server.config.dir"/>
- </authentication>
- <authorization map-groups-to-roles="false">
- <properties path="mgmt-groups.properties" relative-to="jboss.server.config.dir"/>
- </authorization>
- </security-realm>
- <security-realm name="ApplicationRealm">
- <authentication>
- <local default-user="$local" allowed-users="*"/>
- <properties path="application-users.properties" relative-to="jboss.server.config.dir"/>
- </authentication>
- <authorization>
- <properties path="application-roles.properties" relative-to="jboss.server.config.dir"/>
- </authorization>
- </security-realm>
- </security-realms>
- <audit-log>
- <formatters>
- <json-formatter name="json-formatter"/>
- </formatters>
- <handlers>
- <file-handler name="file" formatter="json-formatter" relative-to="jboss.server.data.dir" path="audit-log.log"/>
- </handlers>
- <logger log-boot="true" log-read-only="false" enabled="false">
- <handlers>
- <handler name="file"/>
- </handlers>
- </logger>
- </audit-log>
- <management-interfaces>
- <http-interface security-realm="ManagementRealm" http-upgrade-enabled="true">
- <socket-binding http="management-http"/>
- </http-interface>
- </management-interfaces>
- <access-control provider="simple">
- <role-mapping>
- <role name="SuperUser">
- <include>
- <user name="$local"/>
- </include>
- </role>
- </role-mapping>
- </access-control>
- </management>
- <profile>
- <subsystem xmlns="urn:jboss:domain:logging:2.0">
- <console-handler name="CONSOLE">
- <level name="INFO"/>
- <formatter>
- <named-formatter name="COLOR-PATTERN"/>
- </formatter>
- </console-handler>
- <periodic-rotating-file-handler name="FILE" autoflush="true">
- <formatter>
- <named-formatter name="PATTERN"/>
- </formatter>
- <file relative-to="jboss.server.log.dir" path="server.log"/>
- <suffix value=".yyyy-MM-dd"/>
- <append value="true"/>
- </periodic-rotating-file-handler>
- <logger category="com.arjuna">
- <level name="WARN"/>
- </logger>
- <logger category="org.apache.tomcat.util.modeler">
- <level name="WARN"/>
- </logger>
- <logger category="org.jboss.as.config">
- <level name="DEBUG"/>
- </logger>
- <logger category="sun.rmi">
- <level name="WARN"/>
- </logger>
- <logger category="jacorb">
- <level name="WARN"/>
- </logger>
- <logger category="jacorb.config">
- <level name="ERROR"/>
- </logger>
- <root-logger>
- <level name="INFO"/>
- <handlers>
- <handler name="CONSOLE"/>
- <handler name="FILE"/>
- </handlers>
- </root-logger>
- <formatter name="PATTERN">
- <pattern-formatter pattern="%d{yyyy-MM-dd HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/>
- </formatter>
- <formatter name="COLOR-PATTERN">
- <pattern-formatter pattern="%K{level}%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/>
- </formatter>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:batch:1.0">
- <job-repository>
- <in-memory/>
- </job-repository>
- <thread-pool>
- <max-threads count="10"/>
- <keepalive-time time="100" unit="milliseconds"/>
- </thread-pool>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:datasources:2.0">
- <datasources>
- <datasource jndi-name="java:jboss/datasources/ExampleDS" pool-name="ExampleDS" enabled="true" use-java-context="true">
- <connection-url>jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE</connection-url>
- <driver>h2</driver>
- <security>
- <user-name>sa</user-name>
- <password>sa</password>
- </security>
- </datasource>
- <drivers>
- <driver name="h2" module="com.h2database.h2">
- <xa-datasource-class>org.h2.jdbcx.JdbcDataSource</xa-datasource-class>
- </driver>
- </drivers>
- </datasources>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:deployment-scanner:2.0">
- <deployment-scanner path="deployments" relative-to="jboss.server.base.dir" scan-interval="5000" runtime-failure-causes-rollback="${jboss.deployment.scanner.rollback.on.failure:false}"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:ee:2.0">
- <spec-descriptor-property-replacement>false</spec-descriptor-property-replacement>
- <jboss-descriptor-property-replacement>true</jboss-descriptor-property-replacement>
- <annotation-property-replacement>false</annotation-property-replacement>
- <concurrent>
- <context-services>
- <context-service name="default" jndi-name="java:jboss/ee/concurrency/context/default" use-transaction-setup-provider="true"/>
- </context-services>
- <managed-executor-services>
- <managed-executor-service name="default" jndi-name="java:jboss/ee/concurrency/executor/default" context-service="default" hung-task-threshold="60000" core-threads="5" max-threads="25" keepalive-time="5000"/>
- </managed-executor-services>
- <managed-scheduled-executor-services>
- <managed-scheduled-executor-service name="default" jndi-name="java:jboss/ee/concurrency/scheduler/default" context-service="default" hung-task-threshold="60000" core-threads="2" keepalive-time="3000"/>
- </managed-scheduled-executor-services>
- <managed-thread-factories>
- <managed-thread-factory name="default" jndi-name="java:jboss/ee/concurrency/factory/default" context-service="default"/>
- </managed-thread-factories>
- </concurrent>
- <default-bindings context-service="java:jboss/ee/concurrency/context/default" datasource="java:jboss/datasources/ExampleDS" jms-connection-factory="java:jboss/DefaultJMSConnectionFactory" managed-executor-service="java:jboss/ee/concurrency/executor/default" managed-scheduled-executor-service="java:jboss/ee/concurrency/scheduler/default" managed-thread-factory="java:jboss/ee/concurrency/factory/default"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:ejb3:2.0">
- <session-bean>
- <stateful default-access-timeout="5000" cache-ref="simple" passivation-disabled-cache-ref="simple"/>
- <singleton default-access-timeout="5000"/>
- </session-bean>
- <mdb>
- <resource-adapter-ref resource-adapter-name="${ejb.resource-adapter-name:activemq-ra.rar}"/>
- <bean-instance-pool-ref pool-name="mdb-strict-max-pool"/>
- </mdb>
- <pools>
- <bean-instance-pools>
- <!-- A sample strict max pool configuration -->
- <strict-max-pool name="slsb-strict-max-pool" max-pool-size="20" instance-acquisition-timeout="5" instance-acquisition-timeout-unit="MINUTES"/>
- <strict-max-pool name="mdb-strict-max-pool" max-pool-size="20" instance-acquisition-timeout="5" instance-acquisition-timeout-unit="MINUTES"/>
- </bean-instance-pools>
- </pools>
- <caches>
- <cache name="simple"/>
- <cache name="distributable" aliases="passivating clustered" passivation-store-ref="infinispan"/>
- </caches>
- <passivation-stores>
- <passivation-store name="infinispan" cache-container="ejb" max-size="10000"/>
- </passivation-stores>
- <async thread-pool-name="default"/>
- <timer-service thread-pool-name="default" default-data-store="default-file-store">
- <data-stores>
- <file-data-store name="default-file-store" path="timer-service-data" relative-to="jboss.server.data.dir"/>
- </data-stores>
- </timer-service>
- <remote connector-ref="http-remoting-connector" thread-pool-name="default"/>
- <thread-pools>
- <thread-pool name="default">
- <max-threads count="10"/>
- <keepalive-time time="100" unit="milliseconds"/>
- </thread-pool>
- </thread-pools>
- <iiop enable-by-default="false" use-qualified-name="false"/>
- <default-security-domain value="other"/>
- <default-missing-method-permissions-deny-access value="true"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:io:1.0">
- <worker name="default" io-threads="3"/>
- <buffer-pool name="default" buffer-size="16384" buffers-per-slice="128"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:infinispan:2.0">
- <cache-container name="web" default-cache="passivation" module="org.wildfly.clustering.web.infinispan">
- <local-cache name="passivation" batching="true">
- <file-store passivation="true" purge="false"/>
- </local-cache>
- <local-cache name="persistent" batching="true">
- <file-store passivation="false" purge="false"/>
- </local-cache>
- </cache-container>
- <cache-container name="ejb" aliases="sfsb" default-cache="passivation" module="org.wildfly.clustering.ejb.infinispan">
- <local-cache name="passivation" batching="true">
- <file-store passivation="true" purge="false"/>
- </local-cache>
- <local-cache name="persistent" batching="true">
- <file-store passivation="false" purge="false"/>
- </local-cache>
- </cache-container>
- <cache-container name="hibernate" default-cache="local-query" module="org.hibernate">
- <local-cache name="entity">
- <transaction mode="NON_XA"/>
- <eviction strategy="LRU" max-entries="10000"/>
- <expiration max-idle="100000"/>
- </local-cache>
- <local-cache name="local-query">
- <transaction mode="NONE"/>
- <eviction strategy="LRU" max-entries="10000"/>
- <expiration max-idle="100000"/>
- </local-cache>
- <local-cache name="timestamps">
- <transaction mode="NONE"/>
- <eviction strategy="NONE"/>
- </local-cache>
- </cache-container>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:jacorb:1.3">
- <orb socket-binding="jacorb" ssl-socket-binding="jacorb-ssl">
- <initializers transactions="spec" security="identity"/>
- </orb>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:jaxrs:1.0"/>
- <subsystem xmlns="urn:jboss:domain:jca:2.0">
- <archive-validation enabled="true" fail-on-error="true" fail-on-warn="false"/>
- <bean-validation enabled="true"/>
- <default-workmanager>
- <short-running-threads>
- <core-threads count="50"/>
- <queue-length count="50"/>
- <max-threads count="50"/>
- <keepalive-time time="10" unit="seconds"/>
- </short-running-threads>
- <long-running-threads>
- <core-threads count="50"/>
- <queue-length count="50"/>
- <max-threads count="50"/>
- <keepalive-time time="10" unit="seconds"/>
- </long-running-threads>
- </default-workmanager>
- <cached-connection-manager/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:jdr:1.0"/>
- <subsystem xmlns="urn:jboss:domain:jmx:1.3">
- <expose-resolved-model/>
- <expose-expression-model/>
- <remoting-connector/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:jpa:1.1">
- <jpa default-datasource="" default-extended-persistence-inheritance="DEEP"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:jsf:1.0"/>
- <subsystem xmlns="urn:jboss:domain:jsr77:1.0"/>
- <subsystem xmlns="urn:jboss:domain:mail:2.0">
- <mail-session name="default" jndi-name="java:jboss/mail/Default">
- <smtp-server outbound-socket-binding-ref="mail-smtp"/>
- </mail-session>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:messaging:2.0">
- <activemq-server>
- <backup>true</backup>
- <shared-store>true</shared-store>
- <persistence-enabled>true</persistence-enabled>
- <journal-file-size>102400</journal-file-size>
- <journal-min-files>2</journal-min-files>
- <journal-directory path="../../../journal"/>
- <bindings-directory path="../../../bindings"/>
- <large-messages-directory path="../../../large-message"/>
- <paging-directory path="../../../paging"/>
- <connectors>
- <http-connector name="http-connector" socket-binding="http">
- <param key="http-upgrade-endpoint" value="http-acceptor"/>
- </http-connector>
- <http-connector name="http-connector-throughput" socket-binding="http">
- <param key="http-upgrade-endpoint" value="http-acceptor-throughput"/>
- <param key="batch-delay" value="50"/>
- </http-connector>
- <in-vm-connector name="in-vm" server-id="0"/>
- </connectors>
- <acceptors>
- <http-acceptor name="http-acceptor" http-listener="default"/>
- <http-acceptor name="http-acceptor-throughput" http-listener="default">
- <param key="batch-delay" value="50"/>
- <param key="direct-deliver" value="false"/>
- </http-acceptor>
- <in-vm-acceptor name="in-vm" server-id="0"/>
- </acceptors>
- <security-settings>
- <security-setting match="#">
- <permission type="send" roles="guest"/>
- <permission type="consume" roles="guest"/>
- <permission type="createNonDurableQueue" roles="guest"/>
- <permission type="deleteNonDurableQueue" roles="guest"/>
- </security-setting>
- </security-settings>
- <address-settings>
- <!--default for catch all-->
- <address-setting match="#">
- <dead-letter-address>jms.queue.DLQ</dead-letter-address>
- <expiry-address>jms.queue.ExpiryQueue</expiry-address>
- <redelivery-delay>0</redelivery-delay>
- <max-size-bytes>10485760</max-size-bytes>
- <address-full-policy>PAGE</address-full-policy>
- <page-size-bytes>2097152</page-size-bytes>
- <message-counter-history-day-limit>10</message-counter-history-day-limit>
- </address-setting>
- </address-settings>
- <broadcast-groups>
- <broadcast-group name="bg-group1">
- <socket-binding>messaging-group</socket-binding>
- <broadcast-period>5000</broadcast-period>
- <connector-ref>http-connector</connector-ref>
- </broadcast-group>
- </broadcast-groups>
- <discovery-groups>
- <discovery-group name="dg-group1">
- <socket-binding>messaging-group</socket-binding>
- <refresh-timeout>10000</refresh-timeout>
- </discovery-group>
- </discovery-groups>
- <cluster-connections>
- <cluster-connection name="my-cluster">
- <address>jms</address>
- <connector-ref>http-connector</connector-ref>
- <discovery-group-ref discovery-group-name="dg-group1"/>
- </cluster-connection>
- </cluster-connections>
- <jms-connection-factories>
- <connection-factory name="InVmConnectionFactory">
- <connectors>
- <connector-ref connector-name="in-vm"/>
- </connectors>
- <entries>
- <entry name="java:/ConnectionFactory"/>
- </entries>
- </connection-factory>
- <connection-factory name="RemoteConnectionFactory">
- <connectors>
- <connector-ref connector-name="http-connector"/>
- </connectors>
- <entries>
- <entry name="java:jboss/exported/jms/RemoteConnectionFactory"/>
- </entries>
- </connection-factory>
- <pooled-connection-factory name="activemq-ra">
- <transaction mode="xa"/>
- <connectors>
- <connector-ref connector-name="in-vm"/>
- </connectors>
- <entries>
- <entry name="java:/JmsXA"/>
- <!-- Global JNDI entry used to provide a default JMS Connection factory to EE application -->
- <entry name="java:jboss/DefaultJMSConnectionFactory"/>
- </entries>
- </pooled-connection-factory>
- </jms-connection-factories>
- <jms-destinations>
- <jms-queue name="outQueue">
- <entry name="queue/outQueue"/>
- <entry name="java:jboss/exported/queues/outQueue"/>
- </jms-queue>
- <jms-queue name="inQueue">
- <entry name="queue/inQueue"/>
- <entry name="java:jboss/exported/queues/inQueue"/>
- </jms-queue>
- </jms-destinations>
- </activemq-server>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:naming:2.0">
- <remote-naming/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:pojo:1.0"/>
- <subsystem xmlns="urn:jboss:domain:remoting:2.0">
- <endpoint worker="default"/>
- <http-connector name="http-remoting-connector" connector-ref="default" security-realm="ApplicationRealm"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:resource-adapters:2.0"/>
- <subsystem xmlns="urn:jboss:domain:sar:1.0"/>
- <subsystem xmlns="urn:jboss:domain:security:1.2">
- <security-domains>
- <security-domain name="other" cache-type="default">
- <authentication>
- <login-module code="Remoting" flag="optional">
- <module-option name="password-stacking" value="useFirstPass"/>
- </login-module>
- <login-module code="RealmDirect" flag="required">
- <module-option name="password-stacking" value="useFirstPass"/>
- </login-module>
- </authentication>
- </security-domain>
- <security-domain name="jboss-web-policy" cache-type="default">
- <authorization>
- <policy-module code="Delegating" flag="required"/>
- </authorization>
- </security-domain>
- <security-domain name="jboss-ejb-policy" cache-type="default">
- <authorization>
- <policy-module code="Delegating" flag="required"/>
- </authorization>
- </security-domain>
- </security-domains>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:threads:1.1"/>
- <subsystem xmlns="urn:jboss:domain:transactions:2.0">
- <core-environment>
- <process-id>
- <uuid/>
- </process-id>
- </core-environment>
- <recovery-environment socket-binding="txn-recovery-environment" status-socket-binding="txn-status-manager"/>
- <coordinator-environment default-timeout="300"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:undertow:1.0">
- <buffer-caches>
- <buffer-cache name="default" buffer-size="1024" buffers-per-region="1024" max-regions="10"/>
- </buffer-caches>
- <server name="default-server">
- <http-listener name="default" socket-binding="http"/>
- <host name="default-host" alias="localhost">
- <location name="/" handler="welcome-content"/>
- <filter-ref name="server-header"/>
- <filter-ref name="x-powered-by-header"/>
- </host>
- </server>
- <servlet-container name="default" default-buffer-cache="default" stack-trace-on-error="local-only">
- <jsp-config/>
- </servlet-container>
- <handlers>
- <file name="welcome-content" path="${jboss.home.dir}/welcome-content" directory-listing="true"/>
- </handlers>
- <filters>
- <response-header name="server-header" header-name="Server" header-value="Wildfly 8"/>
- <response-header name="x-powered-by-header" header-name="X-Powered-By" header-value="Undertow 1"/>
- </filters>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:webservices:1.2">
- <modify-wsdl-address>true</modify-wsdl-address>
- <wsdl-host>${jboss.bind.address:127.0.0.1}</wsdl-host>
- <endpoint-config name="Standard-Endpoint-Config"/>
- <endpoint-config name="Recording-Endpoint-Config">
- <pre-handler-chain name="recording-handlers" protocol-bindings="##SOAP11_HTTP ##SOAP11_HTTP_MTOM ##SOAP12_HTTP ##SOAP12_HTTP_MTOM">
- <handler name="RecordingHandler" class="org.jboss.ws.common.invocation.RecordingServerHandler"/>
- </pre-handler-chain>
- </endpoint-config>
- <client-config name="Standard-Client-Config"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:weld:2.0"/>
- </profile>
- <interfaces>
- <interface name="management">
- <inet-address value="${jboss.bind.address.management:127.0.0.1}"/>
- </interface>
- <interface name="public">
- <inet-address value="${jboss.bind.address:127.0.0.1}"/>
- </interface>
- <!-- TODO - only show this if the jacorb subsystem is added -->
- <interface name="unsecure">
- <!--
- ~ Used for IIOP sockets in the standard configuration.
- ~ To secure JacORB you need to setup SSL
- -->
- <inet-address value="${jboss.bind.address.unsecure:127.0.0.1}"/>
- </interface>
- </interfaces>
- <socket-binding-group name="standard-sockets" default-interface="public" port-offset="${jboss.socket.binding.port-offset:0}">
- <socket-binding name="management-http" interface="management" port="${jboss.management.http.port:9990}"/>
- <socket-binding name="management-https" interface="management" port="${jboss.management.https.port:9993}"/>
- <socket-binding name="ajp" port="${jboss.ajp.port:8009}"/>
- <socket-binding name="http" port="${jboss.http.port:8080}"/>
- <socket-binding name="https" port="${jboss.https.port:8443}"/>
- <socket-binding name="jacorb" interface="unsecure" port="3528"/>
- <socket-binding name="jacorb-ssl" interface="unsecure" port="3529"/>
- <socket-binding name="messaging-group" port="0" multicast-address="${jboss.messaging.group.address:231.7.7.7}" multicast-port="${jboss.messaging.group.port:9876}"/>
- <socket-binding name="txn-recovery-environment" port="4712"/>
- <socket-binding name="txn-status-manager" port="4713"/>
- <outbound-socket-binding name="mail-smtp">
- <remote-destination host="localhost" port="25"/>
- </outbound-socket-binding>
- </socket-binding-group>
-</server>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/mdb-remote-failover/server/standalone/configuration/standalone-example.xml
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-remote-failover/server/standalone/configuration/standalone-example.xml b/examples/javaee/mdb-remote-failover/server/standalone/configuration/standalone-example.xml
deleted file mode 100644
index c08945d..0000000
--- a/examples/javaee/mdb-remote-failover/server/standalone/configuration/standalone-example.xml
+++ /dev/null
@@ -1,504 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-
-<server xmlns="urn:jboss:domain:2.0">
- <extensions>
- <extension module="org.jboss.as.clustering.infinispan"/>
- <extension module="org.jboss.as.connector"/>
- <extension module="org.jboss.as.deployment-scanner"/>
- <extension module="org.jboss.as.ee"/>
- <extension module="org.jboss.as.ejb3"/>
- <extension module="org.jboss.as.jacorb"/>
- <extension module="org.jboss.as.jaxrs"/>
- <extension module="org.jboss.as.jdr"/>
- <extension module="org.jboss.as.jmx"/>
- <extension module="org.jboss.as.jpa"/>
- <extension module="org.jboss.as.jsf"/>
- <extension module="org.jboss.as.jsr77"/>
- <extension module="org.jboss.as.logging"/>
- <extension module="org.jboss.as.mail"/>
- <extension module="org.jboss.as.messaging"/>
- <extension module="org.jboss.as.naming"/>
- <extension module="org.jboss.as.pojo"/>
- <extension module="org.jboss.as.remoting"/>
- <extension module="org.jboss.as.sar"/>
- <extension module="org.jboss.as.security"/>
- <extension module="org.jboss.as.threads"/>
- <extension module="org.jboss.as.transactions"/>
- <extension module="org.jboss.as.webservices"/>
- <extension module="org.jboss.as.weld"/>
- <extension module="org.wildfly.extension.batch"/>
- <extension module="org.wildfly.extension.io"/>
- <extension module="org.wildfly.extension.undertow"/>
- </extensions>
- <management>
- <security-realms>
- <security-realm name="ManagementRealm">
- <authentication>
- <local default-user="$local"/>
- <properties path="mgmt-users.properties" relative-to="jboss.server.config.dir"/>
- </authentication>
- <authorization map-groups-to-roles="false">
- <properties path="mgmt-groups.properties" relative-to="jboss.server.config.dir"/>
- </authorization>
- </security-realm>
- <security-realm name="ApplicationRealm">
- <authentication>
- <local default-user="$local" allowed-users="*"/>
- <properties path="application-users.properties" relative-to="jboss.server.config.dir"/>
- </authentication>
- <authorization>
- <properties path="application-roles.properties" relative-to="jboss.server.config.dir"/>
- </authorization>
- </security-realm>
- </security-realms>
- <audit-log>
- <formatters>
- <json-formatter name="json-formatter"/>
- </formatters>
- <handlers>
- <file-handler name="file" formatter="json-formatter" relative-to="jboss.server.data.dir" path="audit-log.log"/>
- </handlers>
- <logger log-boot="true" log-read-only="false" enabled="false">
- <handlers>
- <handler name="file"/>
- </handlers>
- </logger>
- </audit-log>
- <management-interfaces>
- <http-interface security-realm="ManagementRealm" http-upgrade-enabled="true">
- <socket-binding http="management-http"/>
- </http-interface>
- </management-interfaces>
- <access-control provider="simple">
- <role-mapping>
- <role name="SuperUser">
- <include>
- <user name="$local"/>
- </include>
- </role>
- </role-mapping>
- </access-control>
- </management>
- <profile>
- <subsystem xmlns="urn:jboss:domain:logging:2.0">
- <console-handler name="CONSOLE">
- <level name="INFO"/>
- <formatter>
- <named-formatter name="COLOR-PATTERN"/>
- </formatter>
- </console-handler>
- <periodic-rotating-file-handler name="FILE" autoflush="true">
- <formatter>
- <named-formatter name="PATTERN"/>
- </formatter>
- <file relative-to="jboss.server.log.dir" path="server.log"/>
- <suffix value=".yyyy-MM-dd"/>
- <append value="true"/>
- </periodic-rotating-file-handler>
- <logger category="com.arjuna">
- <level name="WARN"/>
- </logger>
- <logger category="org.apache.tomcat.util.modeler">
- <level name="WARN"/>
- </logger>
- <logger category="org.jboss.as.config">
- <level name="DEBUG"/>
- </logger>
- <logger category="sun.rmi">
- <level name="WARN"/>
- </logger>
- <logger category="jacorb">
- <level name="WARN"/>
- </logger>
- <logger category="jacorb.config">
- <level name="ERROR"/>
- </logger>
- <root-logger>
- <level name="INFO"/>
- <handlers>
- <handler name="CONSOLE"/>
- <handler name="FILE"/>
- </handlers>
- </root-logger>
- <formatter name="PATTERN">
- <pattern-formatter pattern="%d{yyyy-MM-dd HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/>
- </formatter>
- <formatter name="COLOR-PATTERN">
- <pattern-formatter pattern="%K{level}%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/>
- </formatter>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:batch:1.0">
- <job-repository>
- <in-memory/>
- </job-repository>
- <thread-pool>
- <max-threads count="10"/>
- <keepalive-time time="100" unit="milliseconds"/>
- </thread-pool>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:datasources:2.0">
- <datasources>
- <datasource jndi-name="java:jboss/datasources/ExampleDS" pool-name="ExampleDS" enabled="true" use-java-context="true">
- <connection-url>jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE</connection-url>
- <driver>h2</driver>
- <security>
- <user-name>sa</user-name>
- <password>sa</password>
- </security>
- </datasource>
- <drivers>
- <driver name="h2" module="com.h2database.h2">
- <xa-datasource-class>org.h2.jdbcx.JdbcDataSource</xa-datasource-class>
- </driver>
- </drivers>
- </datasources>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:deployment-scanner:2.0">
- <deployment-scanner path="deployments" relative-to="jboss.server.base.dir" scan-interval="5000" runtime-failure-causes-rollback="${jboss.deployment.scanner.rollback.on.failure:false}"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:ee:2.0">
- <spec-descriptor-property-replacement>false</spec-descriptor-property-replacement>
- <jboss-descriptor-property-replacement>true</jboss-descriptor-property-replacement>
- <annotation-property-replacement>false</annotation-property-replacement>
- <concurrent>
- <context-services>
- <context-service name="default" jndi-name="java:jboss/ee/concurrency/context/default" use-transaction-setup-provider="true"/>
- </context-services>
- <managed-executor-services>
- <managed-executor-service name="default" jndi-name="java:jboss/ee/concurrency/executor/default" context-service="default" hung-task-threshold="60000" core-threads="5" max-threads="25" keepalive-time="5000"/>
- </managed-executor-services>
- <managed-scheduled-executor-services>
- <managed-scheduled-executor-service name="default" jndi-name="java:jboss/ee/concurrency/scheduler/default" context-service="default" hung-task-threshold="60000" core-threads="2" keepalive-time="3000"/>
- </managed-scheduled-executor-services>
- <managed-thread-factories>
- <managed-thread-factory name="default" jndi-name="java:jboss/ee/concurrency/factory/default" context-service="default"/>
- </managed-thread-factories>
- </concurrent>
- <default-bindings context-service="java:jboss/ee/concurrency/context/default" datasource="java:jboss/datasources/ExampleDS" jms-connection-factory="java:jboss/DefaultJMSConnectionFactory" managed-executor-service="java:jboss/ee/concurrency/executor/default" managed-scheduled-executor-service="java:jboss/ee/concurrency/scheduler/default" managed-thread-factory="java:jboss/ee/concurrency/factory/default"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:ejb3:2.0">
- <session-bean>
- <stateful default-access-timeout="5000" cache-ref="simple" passivation-disabled-cache-ref="simple"/>
- <singleton default-access-timeout="5000"/>
- </session-bean>
- <mdb>
- <resource-adapter-ref resource-adapter-name="${ejb.resource-adapter-name:activemq-ra.rar}"/>
- <bean-instance-pool-ref pool-name="mdb-strict-max-pool"/>
- </mdb>
- <pools>
- <bean-instance-pools>
- <!-- A sample strict max pool configuration -->
- <strict-max-pool name="slsb-strict-max-pool" max-pool-size="20" instance-acquisition-timeout="5" instance-acquisition-timeout-unit="MINUTES"/>
- <strict-max-pool name="mdb-strict-max-pool" max-pool-size="20" instance-acquisition-timeout="5" instance-acquisition-timeout-unit="MINUTES"/>
- </bean-instance-pools>
- </pools>
- <caches>
- <cache name="simple"/>
- <cache name="distributable" aliases="passivating clustered" passivation-store-ref="infinispan"/>
- </caches>
- <passivation-stores>
- <passivation-store name="infinispan" cache-container="ejb" max-size="10000"/>
- </passivation-stores>
- <async thread-pool-name="default"/>
- <timer-service thread-pool-name="default" default-data-store="default-file-store">
- <data-stores>
- <file-data-store name="default-file-store" path="timer-service-data" relative-to="jboss.server.data.dir"/>
- </data-stores>
- </timer-service>
- <remote connector-ref="http-remoting-connector" thread-pool-name="default"/>
- <thread-pools>
- <thread-pool name="default">
- <max-threads count="10"/>
- <keepalive-time time="100" unit="milliseconds"/>
- </thread-pool>
- </thread-pools>
- <iiop enable-by-default="false" use-qualified-name="false"/>
- <default-security-domain value="other"/>
- <default-missing-method-permissions-deny-access value="true"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:io:1.0">
- <worker name="default" io-threads="3"/>
- <buffer-pool name="default" buffer-size="16384" buffers-per-slice="128"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:infinispan:2.0">
- <cache-container name="web" default-cache="passivation" module="org.wildfly.clustering.web.infinispan">
- <local-cache name="passivation" batching="true">
- <file-store passivation="true" purge="false"/>
- </local-cache>
- <local-cache name="persistent" batching="true">
- <file-store passivation="false" purge="false"/>
- </local-cache>
- </cache-container>
- <cache-container name="ejb" aliases="sfsb" default-cache="passivation" module="org.wildfly.clustering.ejb.infinispan">
- <local-cache name="passivation" batching="true">
- <file-store passivation="true" purge="false"/>
- </local-cache>
- <local-cache name="persistent" batching="true">
- <file-store passivation="false" purge="false"/>
- </local-cache>
- </cache-container>
- <cache-container name="hibernate" default-cache="local-query" module="org.hibernate">
- <local-cache name="entity">
- <transaction mode="NON_XA"/>
- <eviction strategy="LRU" max-entries="10000"/>
- <expiration max-idle="100000"/>
- </local-cache>
- <local-cache name="local-query">
- <transaction mode="NONE"/>
- <eviction strategy="LRU" max-entries="10000"/>
- <expiration max-idle="100000"/>
- </local-cache>
- <local-cache name="timestamps">
- <transaction mode="NONE"/>
- <eviction strategy="NONE"/>
- </local-cache>
- </cache-container>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:jacorb:1.3">
- <orb socket-binding="jacorb" ssl-socket-binding="jacorb-ssl">
- <initializers transactions="spec" security="identity"/>
- </orb>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:jaxrs:1.0"/>
- <subsystem xmlns="urn:jboss:domain:jca:2.0">
- <archive-validation enabled="true" fail-on-error="true" fail-on-warn="false"/>
- <bean-validation enabled="true"/>
- <default-workmanager>
- <short-running-threads>
- <core-threads count="50"/>
- <queue-length count="50"/>
- <max-threads count="50"/>
- <keepalive-time time="10" unit="seconds"/>
- </short-running-threads>
- <long-running-threads>
- <core-threads count="50"/>
- <queue-length count="50"/>
- <max-threads count="50"/>
- <keepalive-time time="10" unit="seconds"/>
- </long-running-threads>
- </default-workmanager>
- <cached-connection-manager/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:jdr:1.0"/>
- <subsystem xmlns="urn:jboss:domain:jmx:1.3">
- <expose-resolved-model/>
- <expose-expression-model/>
- <remoting-connector/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:jpa:1.1">
- <jpa default-datasource="" default-extended-persistence-inheritance="DEEP"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:jsf:1.0"/>
- <subsystem xmlns="urn:jboss:domain:jsr77:1.0"/>
- <subsystem xmlns="urn:jboss:domain:mail:2.0">
- <mail-session name="default" jndi-name="java:jboss/mail/Default">
- <smtp-server outbound-socket-binding-ref="mail-smtp"/>
- </mail-session>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:messaging:2.0">
- <activemq-server>
- <persistence-enabled>true</persistence-enabled>
- <journal-file-size>102400</journal-file-size>
- <journal-min-files>2</journal-min-files>
- <journal-directory path="../../../journal2"/>
- <bindings-directory path="../../../bindings2"/>
- <large-messages-directory path="../../../large-message2"/>
- <paging-directory path="../../../paging2"/>
- <connectors>
- <http-connector name="http-connector" socket-binding="http">
- <param key="http-upgrade-endpoint" value="http-acceptor"/>
- </http-connector>
- <http-connector name="http-connector-throughput" socket-binding="http">
- <param key="http-upgrade-endpoint" value="http-acceptor-throughput"/>
- <param key="batch-delay" value="50"/>
- </http-connector>
- <in-vm-connector name="in-vm" server-id="0"/>
- </connectors>
- <acceptors>
- <http-acceptor name="http-acceptor" http-listener="default"/>
- <http-acceptor name="http-acceptor-throughput" http-listener="default">
- <param key="batch-delay" value="50"/>
- <param key="direct-deliver" value="false"/>
- </http-acceptor>
- <in-vm-acceptor name="in-vm" server-id="0"/>
- </acceptors>
- <security-settings>
- <security-setting match="#">
- <permission type="send" roles="guest"/>
- <permission type="consume" roles="guest"/>
- <permission type="createNonDurableQueue" roles="guest"/>
- <permission type="deleteNonDurableQueue" roles="guest"/>
- </security-setting>
- </security-settings>
- <discovery-groups>
- <discovery-group name="dg-group1">
- <socket-binding>messaging-group</socket-binding>
- <refresh-timeout>10000</refresh-timeout>
- </discovery-group>
- </discovery-groups>
- <address-settings>
- <!--default for catch all-->
- <address-setting match="#">
- <dead-letter-address>jms.queue.DLQ</dead-letter-address>
- <expiry-address>jms.queue.ExpiryQueue</expiry-address>
- <redelivery-delay>0</redelivery-delay>
- <max-size-bytes>10485760</max-size-bytes>
- <address-full-policy>PAGE</address-full-policy>
- <page-size-bytes>2097152</page-size-bytes>
- <message-counter-history-day-limit>10</message-counter-history-day-limit>
- </address-setting>
- </address-settings>
- <jms-connection-factories>
- <connection-factory name="InVmConnectionFactory">
- <connectors>
- <connector-ref connector-name="in-vm"/>
- </connectors>
- <entries>
- <entry name="java:/ConnectionFactory"/>
- </entries>
- </connection-factory>
- <connection-factory name="RemoteConnectionFactory">
- <connectors>
- <connector-ref connector-name="http-connector"/>
- </connectors>
- <entries>
- <entry name="java:jboss/exported/jms/RemoteConnectionFactory"/>
- </entries>
- </connection-factory>
- <pooled-connection-factory name="activemq-ra">
- <transaction mode="xa"/>
- <connectors>
- <connector-ref connector-name="in-vm"/>
- </connectors>
- <entries>
- <entry name="java:/JmsXA"/>
- <!-- Global JNDI entry used to provide a default JMS Connection factory to EE application -->
- <entry name="java:jboss/DefaultJMSConnectionFactory"/>
- </entries>
- </pooled-connection-factory>
- <pooled-connection-factory name="activemq-remote-ra">
- <transaction mode="xa"/>
- <user>guest</user>
- <password>password</password>
- <ha>true</ha>
- <reconnect-attempts>-1</reconnect-attempts>
- <discovery-group-ref discovery-group-name="dg-group1"/>
- <entries>
- <entry name="java:/RemoteJmsXA"/>
- </entries>
- </pooled-connection-factory>
- </jms-connection-factories>
- </activemq-server>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:naming:2.0">
- <remote-naming/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:pojo:1.0"/>
- <subsystem xmlns="urn:jboss:domain:remoting:2.0">
- <endpoint worker="default"/>
- <http-connector name="http-remoting-connector" connector-ref="default" security-realm="ApplicationRealm"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:resource-adapters:2.0"/>
- <subsystem xmlns="urn:jboss:domain:sar:1.0"/>
- <subsystem xmlns="urn:jboss:domain:security:1.2">
- <security-domains>
- <security-domain name="other" cache-type="default">
- <authentication>
- <login-module code="Remoting" flag="optional">
- <module-option name="password-stacking" value="useFirstPass"/>
- </login-module>
- <login-module code="RealmDirect" flag="required">
- <module-option name="password-stacking" value="useFirstPass"/>
- </login-module>
- </authentication>
- </security-domain>
- <security-domain name="jboss-web-policy" cache-type="default">
- <authorization>
- <policy-module code="Delegating" flag="required"/>
- </authorization>
- </security-domain>
- <security-domain name="jboss-ejb-policy" cache-type="default">
- <authorization>
- <policy-module code="Delegating" flag="required"/>
- </authorization>
- </security-domain>
- </security-domains>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:threads:1.1"/>
- <subsystem xmlns="urn:jboss:domain:transactions:2.0">
- <core-environment>
- <process-id>
- <uuid/>
- </process-id>
- </core-environment>
- <recovery-environment socket-binding="txn-recovery-environment" status-socket-binding="txn-status-manager"/>
- <coordinator-environment default-timeout="300"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:undertow:1.0">
- <buffer-caches>
- <buffer-cache name="default" buffer-size="1024" buffers-per-region="1024" max-regions="10"/>
- </buffer-caches>
- <server name="default-server">
- <http-listener name="default" socket-binding="http"/>
- <host name="default-host" alias="localhost">
- <location name="/" handler="welcome-content"/>
- <filter-ref name="server-header"/>
- <filter-ref name="x-powered-by-header"/>
- </host>
- </server>
- <servlet-container name="default" default-buffer-cache="default" stack-trace-on-error="local-only">
- <jsp-config/>
- </servlet-container>
- <handlers>
- <file name="welcome-content" path="${jboss.home.dir}/welcome-content" directory-listing="true"/>
- </handlers>
- <filters>
- <response-header name="server-header" header-name="Server" header-value="Wildfly 8"/>
- <response-header name="x-powered-by-header" header-name="X-Powered-By" header-value="Undertow 1"/>
- </filters>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:webservices:1.2">
- <modify-wsdl-address>true</modify-wsdl-address>
- <wsdl-host>${jboss.bind.address:127.0.0.1}</wsdl-host>
- <endpoint-config name="Standard-Endpoint-Config"/>
- <endpoint-config name="Recording-Endpoint-Config">
- <pre-handler-chain name="recording-handlers" protocol-bindings="##SOAP11_HTTP ##SOAP11_HTTP_MTOM ##SOAP12_HTTP ##SOAP12_HTTP_MTOM">
- <handler name="RecordingHandler" class="org.jboss.ws.common.invocation.RecordingServerHandler"/>
- </pre-handler-chain>
- </endpoint-config>
- <client-config name="Standard-Client-Config"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:weld:2.0"/>
- </profile>
- <interfaces>
- <interface name="management">
- <inet-address value="${jboss.bind.address.management:127.0.0.1}"/>
- </interface>
- <interface name="public">
- <inet-address value="${jboss.bind.address:127.0.0.1}"/>
- </interface>
- <!-- TODO - only show this if the jacorb subsystem is added -->
- <interface name="unsecure">
- <!--
- ~ Used for IIOP sockets in the standard configuration.
- ~ To secure JacORB you need to setup SSL
- -->
- <inet-address value="${jboss.bind.address.unsecure:127.0.0.1}"/>
- </interface>
- </interfaces>
- <socket-binding-group name="standard-sockets" default-interface="public" port-offset="${jboss.socket.binding.port-offset:0}">
- <socket-binding name="management-http" interface="management" port="${jboss.management.http.port:9990}"/>
- <socket-binding name="management-https" interface="management" port="${jboss.management.https.port:9993}"/>
- <socket-binding name="ajp" port="${jboss.ajp.port:8009}"/>
- <socket-binding name="http" port="${jboss.http.port:8080}"/>
- <socket-binding name="https" port="${jboss.https.port:8443}"/>
- <socket-binding name="jacorb" interface="unsecure" port="3528"/>
- <socket-binding name="jacorb-ssl" interface="unsecure" port="3529"/>
- <socket-binding name="messaging-group" port="0" multicast-address="${jboss.messaging.group.address:231.7.7.7}" multicast-port="${jboss.messaging.group.port:9876}"/>
- <socket-binding name="txn-recovery-environment" port="4712"/>
- <socket-binding name="txn-status-manager" port="4713"/>
- <outbound-socket-binding name="mail-smtp">
- <remote-destination host="localhost" port="25"/>
- </outbound-socket-binding>
- </socket-binding-group>
-</server>
[31/37] activemq-6 git commit: ACTIVEMQ6-51 Example server
bootstrapping
Posted by jb...@apache.org.
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-static-discovery/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-static-discovery/pom.xml b/examples/jms/clustered-static-discovery/pom.xml
index 5245a17..b1dd847 100644
--- a/examples/jms/clustered-static-discovery/pom.xml
+++ b/examples/jms/clustered-static-discovery/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>
</configuration>
</execution>
<execution>
@@ -45,9 +45,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>
</configuration>
</execution>
@@ -57,9 +55,7 @@
<goal>start</goal>
</goals>
<configuration>
- <jndiPort>1299</jndiPort>
- <jndiRmiPort>1298</jndiRmiPort>
- <hornetqConfigurationDir>${basedir}/target/classes/activemq/server2</hornetqConfigurationDir>
+ <configurationDir>${basedir}/target/classes/activemq/server2</configurationDir>
<fork>true</fork>
</configuration>
</execution>
@@ -69,9 +65,7 @@
<goal>start</goal>
</goals>
<configuration>
- <jndiPort>1399</jndiPort>
- <jndiRmiPort>1398</jndiRmiPort>
- <hornetqConfigurationDir>${basedir}/target/classes/activemq/server3</hornetqConfigurationDir>
+ <configurationDir>${basedir}/target/classes/activemq/server3</configurationDir>
<fork>true</fork>
</configuration>
</execution>
@@ -102,7 +96,7 @@
<goal>stop</goal>
</goals>
<configuration>
- <hornetqConfigurationDir>${basedir}/target/classes/activemq/server0</hornetqConfigurationDir>
+ <configurationDir>${basedir}/target/classes/activemq/server0</configurationDir>
</configuration>
</execution>
<execution>
@@ -111,7 +105,7 @@
<goal>stop</goal>
</goals>
<configuration>
- <hornetqConfigurationDir>${basedir}/target/classes/activemq/server1</hornetqConfigurationDir>
+ <configurationDir>${basedir}/target/classes/activemq/server1</configurationDir>
</configuration>
</execution>
<execution>
@@ -120,7 +114,7 @@
<goal>stop</goal>
</goals>
<configuration>
- <hornetqConfigurationDir>${basedir}/target/classes/activemq/server2</hornetqConfigurationDir>
+ <configurationDir>${basedir}/target/classes/activemq/server2</configurationDir>
</configuration>
</execution>
<execution>
@@ -129,7 +123,7 @@
<goal>stop</goal>
</goals>
<configuration>
- <hornetqConfigurationDir>${basedir}/target/classes/activemq/server3</hornetqConfigurationDir>
+ <configurationDir>${basedir}/target/classes/activemq/server3</configurationDir>
</configuration>
</execution>
</executions>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-static-discovery/src/main/java/org/apache/activemq/jms/example/StaticClusteredQueueExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-static-discovery/src/main/java/org/apache/activemq/jms/example/StaticClusteredQueueExample.java b/examples/jms/clustered-static-discovery/src/main/java/org/apache/activemq/jms/example/StaticClusteredQueueExample.java
index 868d611..f724c92 100644
--- a/examples/jms/clustered-static-discovery/src/main/java/org/apache/activemq/jms/example/StaticClusteredQueueExample.java
+++ b/examples/jms/clustered-static-discovery/src/main/java/org/apache/activemq/jms/example/StaticClusteredQueueExample.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;
@@ -57,8 +59,12 @@ public class StaticClusteredQueueExample extends ActiveMQExample
try
{
- // Step 1. Get an initial context for looking up JNDI from server 0
- ic0 = getContext(3);
+ // Step 1. Get an initial context for looking up JNDI from server 3
+ 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[3]);
+ 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");
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-static-discovery/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-static-discovery/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/clustered-static-discovery/src/main/resources/activemq/server0/activemq-configuration.xml
new file mode 100644
index 0000000..69a3a0e
--- /dev/null
+++ b/examples/jms/clustered-static-discovery/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -0,0 +1,64 @@
+<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>
+ <!-- connector to the server1 -->
+ <connector name="server1-connector">
+ <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
+ <param key="port" value="5446"/>
+ </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>
+
+ <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>true</forward-when-no-consumers>
+ <max-hops>1</max-hops>
+ <static-connectors>
+ <connector-ref>server1-connector</connector-ref>
+ </static-connectors>
+ </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>
+
+</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-static-discovery/src/main/resources/activemq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-static-discovery/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/clustered-static-discovery/src/main/resources/activemq/server0/activemq-jms.xml
new file mode 100644
index 0000000..847659f
--- /dev/null
+++ b/examples/jms/clustered-static-discovery/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>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-static-discovery/src/main/resources/activemq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-static-discovery/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/clustered-static-discovery/src/main/resources/activemq/server0/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/clustered-static-discovery/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/clustered-static-discovery/src/main/resources/activemq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-static-discovery/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/clustered-static-discovery/src/main/resources/activemq/server1/activemq-configuration.xml
new file mode 100644
index 0000000..a2cb037
--- /dev/null
+++ b/examples/jms/clustered-static-discovery/src/main/resources/activemq/server1/activemq-configuration.xml
@@ -0,0 +1,64 @@
+<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}/server1/data/messaging/bindings</bindings-directory>
+
+ <journal-directory>${build.directory}/server1/data/messaging/journal</journal-directory>
+
+ <large-messages-directory>${build.directory}/server1/data/messaging/largemessages</large-messages-directory>
+
+ <paging-directory>${build.directory}/server1/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="5446"/>
+ </connector>
+ <!-- connector to the server0 -->
+ <connector name="server0-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="5446"/>
+ </acceptor>
+ </acceptors>
+
+ <!-- Clustering configuration -->
+ <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>true</forward-when-no-consumers>
+ <max-hops>1</max-hops>
+ <static-connectors>
+ <connector-ref>server0-connector</connector-ref>
+ </static-connectors>
+ </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>
+
+</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-static-discovery/src/main/resources/activemq/server1/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-static-discovery/src/main/resources/activemq/server1/activemq-jms.xml b/examples/jms/clustered-static-discovery/src/main/resources/activemq/server1/activemq-jms.xml
new file mode 100644
index 0000000..847659f
--- /dev/null
+++ b/examples/jms/clustered-static-discovery/src/main/resources/activemq/server1/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>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-static-discovery/src/main/resources/activemq/server1/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-static-discovery/src/main/resources/activemq/server1/activemq-users.xml b/examples/jms/clustered-static-discovery/src/main/resources/activemq/server1/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/clustered-static-discovery/src/main/resources/activemq/server1/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/clustered-static-discovery/src/main/resources/activemq/server2/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-static-discovery/src/main/resources/activemq/server2/activemq-configuration.xml b/examples/jms/clustered-static-discovery/src/main/resources/activemq/server2/activemq-configuration.xml
new file mode 100644
index 0000000..3eafb06
--- /dev/null
+++ b/examples/jms/clustered-static-discovery/src/main/resources/activemq/server2/activemq-configuration.xml
@@ -0,0 +1,81 @@
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one or more
+ ~ contributor license agreements. See the NOTICE file distributed with
+ ~ this work for additional information regarding copyright ownership.
+ ~ The ASF licenses this file to You under the Apache License, Version 2.0
+ ~ (the "License"); you may not use this file except in compliance with
+ ~ the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<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}/server2/data/messaging/bindings</bindings-directory>
+
+ <journal-directory>${build.directory}/server2/data/messaging/journal</journal-directory>
+
+ <large-messages-directory>${build.directory}/server2/data/messaging/largemessages</large-messages-directory>
+
+ <paging-directory>${build.directory}/server2/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="5447"/>
+ </connector>
+ <!-- connector to the server0 -->
+ <connector name="server0-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="5447"/>
+ </acceptor>
+ </acceptors>
+
+ <!-- Clustering configuration -->
+ <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>true</forward-when-no-consumers>
+ <max-hops>1</max-hops>
+ <static-connectors>
+ <connector-ref>server0-connector</connector-ref>
+ </static-connectors>
+ </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>
+
+</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-static-discovery/src/main/resources/activemq/server2/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-static-discovery/src/main/resources/activemq/server2/activemq-jms.xml b/examples/jms/clustered-static-discovery/src/main/resources/activemq/server2/activemq-jms.xml
new file mode 100644
index 0000000..e254e36
--- /dev/null
+++ b/examples/jms/clustered-static-discovery/src/main/resources/activemq/server2/activemq-jms.xml
@@ -0,0 +1,25 @@
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one or more
+ ~ contributor license agreements. See the NOTICE file distributed with
+ ~ this work for additional information regarding copyright ownership.
+ ~ The ASF licenses this file to You under the Apache License, Version 2.0
+ ~ (the "License"); you may not use this file except in compliance with
+ ~ the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<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>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-static-discovery/src/main/resources/activemq/server2/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-static-discovery/src/main/resources/activemq/server2/activemq-users.xml b/examples/jms/clustered-static-discovery/src/main/resources/activemq/server2/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/clustered-static-discovery/src/main/resources/activemq/server2/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/clustered-static-discovery/src/main/resources/activemq/server3/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-static-discovery/src/main/resources/activemq/server3/activemq-configuration.xml b/examples/jms/clustered-static-discovery/src/main/resources/activemq/server3/activemq-configuration.xml
new file mode 100644
index 0000000..63a382e
--- /dev/null
+++ b/examples/jms/clustered-static-discovery/src/main/resources/activemq/server3/activemq-configuration.xml
@@ -0,0 +1,81 @@
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one or more
+ ~ contributor license agreements. See the NOTICE file distributed with
+ ~ this work for additional information regarding copyright ownership.
+ ~ The ASF licenses this file to You under the Apache License, Version 2.0
+ ~ (the "License"); you may not use this file except in compliance with
+ ~ the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<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}/server3/data/messaging/bindings</bindings-directory>
+
+ <journal-directory>${build.directory}/server3/data/messaging/journal</journal-directory>
+
+ <large-messages-directory>${build.directory}/server3/data/messaging/largemessages</large-messages-directory>
+
+ <paging-directory>${build.directory}/server3/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="5448"/>
+ </connector>
+ <!-- connector to the server0 -->
+ <connector name="server0-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="5448"/>
+ </acceptor>
+ </acceptors>
+
+ <!-- Clustering configuration -->
+ <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>true</forward-when-no-consumers>
+ <max-hops>1</max-hops>
+ <static-connectors>
+ <connector-ref>server0-connector</connector-ref>
+ </static-connectors>
+ </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>
+
+</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-static-discovery/src/main/resources/activemq/server3/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-static-discovery/src/main/resources/activemq/server3/activemq-jms.xml b/examples/jms/clustered-static-discovery/src/main/resources/activemq/server3/activemq-jms.xml
new file mode 100644
index 0000000..e254e36
--- /dev/null
+++ b/examples/jms/clustered-static-discovery/src/main/resources/activemq/server3/activemq-jms.xml
@@ -0,0 +1,25 @@
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one or more
+ ~ contributor license agreements. See the NOTICE file distributed with
+ ~ this work for additional information regarding copyright ownership.
+ ~ The ASF licenses this file to You under the Apache License, Version 2.0
+ ~ (the "License"); you may not use this file except in compliance with
+ ~ the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<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>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-static-discovery/src/main/resources/activemq/server3/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-static-discovery/src/main/resources/activemq/server3/activemq-users.xml b/examples/jms/clustered-static-discovery/src/main/resources/activemq/server3/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/clustered-static-discovery/src/main/resources/activemq/server3/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/clustered-static-discovery/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server0/activemq-configuration.xml
deleted file mode 100644
index 69a3a0e..0000000
--- a/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ /dev/null
@@ -1,64 +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>
- <param key="port" value="5445"/>
- </connector>
- <!-- connector to the server1 -->
- <connector name="server1-connector">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
- <param key="port" value="5446"/>
- </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>
-
- <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>true</forward-when-no-consumers>
- <max-hops>1</max-hops>
- <static-connectors>
- <connector-ref>server1-connector</connector-ref>
- </static-connectors>
- </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>
-
-</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server0/activemq-jms.xml
deleted file mode 100644
index 847659f..0000000
--- a/examples/jms/clustered-static-discovery/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>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/clustered-static-discovery/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/clustered-static-discovery/src/main/resources/hornetq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server1/activemq-configuration.xml b/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server1/activemq-configuration.xml
deleted file mode 100644
index a2cb037..0000000
--- a/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server1/activemq-configuration.xml
+++ /dev/null
@@ -1,64 +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}/server1/data/messaging/bindings</bindings-directory>
-
- <journal-directory>${build.directory}/server1/data/messaging/journal</journal-directory>
-
- <large-messages-directory>${build.directory}/server1/data/messaging/largemessages</large-messages-directory>
-
- <paging-directory>${build.directory}/server1/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="5446"/>
- </connector>
- <!-- connector to the server0 -->
- <connector name="server0-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="5446"/>
- </acceptor>
- </acceptors>
-
- <!-- Clustering configuration -->
- <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>true</forward-when-no-consumers>
- <max-hops>1</max-hops>
- <static-connectors>
- <connector-ref>server0-connector</connector-ref>
- </static-connectors>
- </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>
-
-</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server1/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server1/activemq-jms.xml b/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server1/activemq-jms.xml
deleted file mode 100644
index 847659f..0000000
--- a/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server1/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>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server1/activemq-users.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server1/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/clustered-static-discovery/src/main/resources/hornetq/server2/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server2/activemq-configuration.xml b/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server2/activemq-configuration.xml
deleted file mode 100644
index 3eafb06..0000000
--- a/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server2/activemq-configuration.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to You under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<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}/server2/data/messaging/bindings</bindings-directory>
-
- <journal-directory>${build.directory}/server2/data/messaging/journal</journal-directory>
-
- <large-messages-directory>${build.directory}/server2/data/messaging/largemessages</large-messages-directory>
-
- <paging-directory>${build.directory}/server2/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="5447"/>
- </connector>
- <!-- connector to the server0 -->
- <connector name="server0-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="5447"/>
- </acceptor>
- </acceptors>
-
- <!-- Clustering configuration -->
- <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>true</forward-when-no-consumers>
- <max-hops>1</max-hops>
- <static-connectors>
- <connector-ref>server0-connector</connector-ref>
- </static-connectors>
- </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>
-
-</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server2/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server2/activemq-jms.xml b/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server2/activemq-jms.xml
deleted file mode 100644
index e254e36..0000000
--- a/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server2/activemq-jms.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to You under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<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>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server2/activemq-users.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server2/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/clustered-static-discovery/src/main/resources/hornetq/server3/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server3/activemq-configuration.xml b/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server3/activemq-configuration.xml
deleted file mode 100644
index 63a382e..0000000
--- a/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server3/activemq-configuration.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to You under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<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}/server3/data/messaging/bindings</bindings-directory>
-
- <journal-directory>${build.directory}/server3/data/messaging/journal</journal-directory>
-
- <large-messages-directory>${build.directory}/server3/data/messaging/largemessages</large-messages-directory>
-
- <paging-directory>${build.directory}/server3/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="5448"/>
- </connector>
- <!-- connector to the server0 -->
- <connector name="server0-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="5448"/>
- </acceptor>
- </acceptors>
-
- <!-- Clustering configuration -->
- <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>true</forward-when-no-consumers>
- <max-hops>1</max-hops>
- <static-connectors>
- <connector-ref>server0-connector</connector-ref>
- </static-connectors>
- </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>
-
-</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server3/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server3/activemq-jms.xml b/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server3/activemq-jms.xml
deleted file mode 100644
index e254e36..0000000
--- a/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server3/activemq-jms.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to You under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<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>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server3/activemq-users.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/clustered-static-discovery/src/main/resources/hornetq/server3/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/clustered-static-oneway/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-static-oneway/pom.xml b/examples/jms/clustered-static-oneway/pom.xml
index 0722ddf..fc672cb 100644
--- a/examples/jms/clustered-static-oneway/pom.xml
+++ b/examples/jms/clustered-static-oneway/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>
</configuration>
</execution>
<execution>
@@ -45,9 +45,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>
</configuration>
</execution>
@@ -57,9 +55,7 @@
<goal>start</goal>
</goals>
<configuration>
- <jndiPort>1299</jndiPort>
- <jndiRmiPort>1298</jndiRmiPort>
- <hornetqConfigurationDir>${basedir}/target/classes/activemq/server2</hornetqConfigurationDir>
+ <configurationDir>${basedir}/target/classes/activemq/server2</configurationDir>
<fork>true</fork>
</configuration>
</execution>
@@ -89,7 +85,7 @@
<goal>stop</goal>
</goals>
<configuration>
- <hornetqConfigurationDir>${basedir}/target/classes/activemq/server0</hornetqConfigurationDir>
+ <configurationDir>${basedir}/target/classes/activemq/server0</configurationDir>
</configuration>
</execution>
<execution>
@@ -98,7 +94,7 @@
<goal>stop</goal>
</goals>
<configuration>
- <hornetqConfigurationDir>${basedir}/target/classes/activemq/server1</hornetqConfigurationDir>
+ <configurationDir>${basedir}/target/classes/activemq/server1</configurationDir>
</configuration>
</execution>
<execution>
@@ -107,7 +103,7 @@
<goal>stop</goal>
</goals>
<configuration>
- <hornetqConfigurationDir>${basedir}/target/classes/activemq/server2</hornetqConfigurationDir>
+ <configurationDir>${basedir}/target/classes/activemq/server2</configurationDir>
</configuration>
</execution>
</executions>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-static-oneway/src/main/java/org/apache/activemq/jms/example/ClusterStaticOnewayExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-static-oneway/src/main/java/org/apache/activemq/jms/example/ClusterStaticOnewayExample.java b/examples/jms/clustered-static-oneway/src/main/java/org/apache/activemq/jms/example/ClusterStaticOnewayExample.java
index 2eab7ae..c88d2e4 100644
--- a/examples/jms/clustered-static-oneway/src/main/java/org/apache/activemq/jms/example/ClusterStaticOnewayExample.java
+++ b/examples/jms/clustered-static-oneway/src/main/java/org/apache/activemq/jms/example/ClusterStaticOnewayExample.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 ClusterStaticOnewayExample 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");
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-static-oneway/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-static-oneway/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/clustered-static-oneway/src/main/resources/activemq/server0/activemq-configuration.xml
new file mode 100644
index 0000000..c1eb5cb
--- /dev/null
+++ b/examples/jms/clustered-static-oneway/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -0,0 +1,81 @@
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one or more
+ ~ contributor license agreements. See the NOTICE file distributed with
+ ~ this work for additional information regarding copyright ownership.
+ ~ The ASF licenses this file to You under the Apache License, Version 2.0
+ ~ (the "License"); you may not use this file except in compliance with
+ ~ the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<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>
+ <!-- connector to the server1 -->
+ <connector name="server1-connector">
+ <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
+ <param key="port" value="5446"/>
+ </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>
+
+ <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>true</forward-when-no-consumers>
+ <max-hops>2</max-hops>
+ <static-connectors allow-direct-connections-only="true">
+ <connector-ref>server1-connector</connector-ref>
+ </static-connectors>
+ </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>
+
+</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-static-oneway/src/main/resources/activemq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-static-oneway/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/clustered-static-oneway/src/main/resources/activemq/server0/activemq-jms.xml
new file mode 100644
index 0000000..847659f
--- /dev/null
+++ b/examples/jms/clustered-static-oneway/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>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-static-oneway/src/main/resources/activemq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-static-oneway/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/clustered-static-oneway/src/main/resources/activemq/server0/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/clustered-static-oneway/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/clustered-static-oneway/src/main/resources/activemq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-static-oneway/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/clustered-static-oneway/src/main/resources/activemq/server1/activemq-configuration.xml
new file mode 100644
index 0000000..c4e5060
--- /dev/null
+++ b/examples/jms/clustered-static-oneway/src/main/resources/activemq/server1/activemq-configuration.xml
@@ -0,0 +1,81 @@
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one or more
+ ~ contributor license agreements. See the NOTICE file distributed with
+ ~ this work for additional information regarding copyright ownership.
+ ~ The ASF licenses this file to You under the Apache License, Version 2.0
+ ~ (the "License"); you may not use this file except in compliance with
+ ~ the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<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}/server1/data/messaging/bindings</bindings-directory>
+
+ <journal-directory>${build.directory}/server1/data/messaging/journal</journal-directory>
+
+ <large-messages-directory>${build.directory}/server1/data/messaging/largemessages</large-messages-directory>
+
+ <paging-directory>${build.directory}/server1/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="5446"/>
+ </connector>
+ <!-- connector to the server0 -->
+ <connector name="server2-connector">
+ <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
+ <param key="port" value="5447"/>
+ </connector>
+ </connectors>
+
+ <!-- Acceptors -->
+ <acceptors>
+ <acceptor name="netty-acceptor">
+ <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
+ <param key="port" value="5446"/>
+ </acceptor>
+ </acceptors>
+
+ <!-- Clustering configuration -->
+ <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>true</forward-when-no-consumers>
+ <max-hops>2</max-hops>
+ <static-connectors allow-direct-connections-only="true">
+ <connector-ref>server2-connector</connector-ref>
+ </static-connectors>
+ </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>
+
+</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-static-oneway/src/main/resources/activemq/server1/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-static-oneway/src/main/resources/activemq/server1/activemq-jms.xml b/examples/jms/clustered-static-oneway/src/main/resources/activemq/server1/activemq-jms.xml
new file mode 100644
index 0000000..847659f
--- /dev/null
+++ b/examples/jms/clustered-static-oneway/src/main/resources/activemq/server1/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>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-static-oneway/src/main/resources/activemq/server1/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-static-oneway/src/main/resources/activemq/server1/activemq-users.xml b/examples/jms/clustered-static-oneway/src/main/resources/activemq/server1/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/clustered-static-oneway/src/main/resources/activemq/server1/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/clustered-static-oneway/src/main/resources/activemq/server2/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-static-oneway/src/main/resources/activemq/server2/activemq-configuration.xml b/examples/jms/clustered-static-oneway/src/main/resources/activemq/server2/activemq-configuration.xml
new file mode 100644
index 0000000..374d1de
--- /dev/null
+++ b/examples/jms/clustered-static-oneway/src/main/resources/activemq/server2/activemq-configuration.xml
@@ -0,0 +1,73 @@
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one or more
+ ~ contributor license agreements. See the NOTICE file distributed with
+ ~ this work for additional information regarding copyright ownership.
+ ~ The ASF licenses this file to You under the Apache License, Version 2.0
+ ~ (the "License"); you may not use this file except in compliance with
+ ~ the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<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}/server2/data/messaging/bindings</bindings-directory>
+
+ <journal-directory>${build.directory}/server2/data/messaging/journal</journal-directory>
+
+ <large-messages-directory>${build.directory}/server2/data/messaging/largemessages</large-messages-directory>
+
+ <paging-directory>${build.directory}/server2/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="5447"/>
+ </connector>
+ </connectors>
+
+ <!-- Acceptors -->
+ <acceptors>
+ <acceptor name="netty-acceptor">
+ <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
+ <param key="port" value="5447"/>
+ </acceptor>
+ </acceptors>
+
+ <!-- Clustering configuration -->
+ <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>true</forward-when-no-consumers>
+ <max-hops>2</max-hops>
+ </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>
+
+</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-static-oneway/src/main/resources/activemq/server2/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-static-oneway/src/main/resources/activemq/server2/activemq-jms.xml b/examples/jms/clustered-static-oneway/src/main/resources/activemq/server2/activemq-jms.xml
new file mode 100644
index 0000000..e254e36
--- /dev/null
+++ b/examples/jms/clustered-static-oneway/src/main/resources/activemq/server2/activemq-jms.xml
@@ -0,0 +1,25 @@
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one or more
+ ~ contributor license agreements. See the NOTICE file distributed with
+ ~ this work for additional information regarding copyright ownership.
+ ~ The ASF licenses this file to You under the Apache License, Version 2.0
+ ~ (the "License"); you may not use this file except in compliance with
+ ~ the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<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>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-static-oneway/src/main/resources/activemq/server2/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-static-oneway/src/main/resources/activemq/server2/activemq-users.xml b/examples/jms/clustered-static-oneway/src/main/resources/activemq/server2/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/clustered-static-oneway/src/main/resources/activemq/server2/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/clustered-static-oneway/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server0/activemq-configuration.xml
deleted file mode 100644
index c1eb5cb..0000000
--- a/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to You under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<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>
- <!-- connector to the server1 -->
- <connector name="server1-connector">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
- <param key="port" value="5446"/>
- </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>
-
- <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>true</forward-when-no-consumers>
- <max-hops>2</max-hops>
- <static-connectors allow-direct-connections-only="true">
- <connector-ref>server1-connector</connector-ref>
- </static-connectors>
- </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>
-
-</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server0/activemq-jms.xml
deleted file mode 100644
index 847659f..0000000
--- a/examples/jms/clustered-static-oneway/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>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/clustered-static-oneway/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/clustered-static-oneway/src/main/resources/hornetq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server1/activemq-configuration.xml b/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server1/activemq-configuration.xml
deleted file mode 100644
index c4e5060..0000000
--- a/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server1/activemq-configuration.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to You under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<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}/server1/data/messaging/bindings</bindings-directory>
-
- <journal-directory>${build.directory}/server1/data/messaging/journal</journal-directory>
-
- <large-messages-directory>${build.directory}/server1/data/messaging/largemessages</large-messages-directory>
-
- <paging-directory>${build.directory}/server1/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="5446"/>
- </connector>
- <!-- connector to the server0 -->
- <connector name="server2-connector">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
- <param key="port" value="5447"/>
- </connector>
- </connectors>
-
- <!-- Acceptors -->
- <acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- <param key="port" value="5446"/>
- </acceptor>
- </acceptors>
-
- <!-- Clustering configuration -->
- <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>true</forward-when-no-consumers>
- <max-hops>2</max-hops>
- <static-connectors allow-direct-connections-only="true">
- <connector-ref>server2-connector</connector-ref>
- </static-connectors>
- </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>
-
-</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server1/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server1/activemq-jms.xml b/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server1/activemq-jms.xml
deleted file mode 100644
index 847659f..0000000
--- a/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server1/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>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server1/activemq-users.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/clustered-static-oneway/src/main/resources/hornetq/server1/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
[09/37] activemq-6 git commit: ACTIVEMQ6-41 Drop Java EE examples
Posted by jb...@apache.org.
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/mdb-cmt-tx-not-supported/server/standalone/configuration/standalone-example.xml
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-cmt-tx-not-supported/server/standalone/configuration/standalone-example.xml b/examples/javaee/mdb-cmt-tx-not-supported/server/standalone/configuration/standalone-example.xml
deleted file mode 100644
index be39676..0000000
--- a/examples/javaee/mdb-cmt-tx-not-supported/server/standalone/configuration/standalone-example.xml
+++ /dev/null
@@ -1,489 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-
-<server xmlns="urn:jboss:domain:2.0">
- <extensions>
- <extension module="org.jboss.as.clustering.infinispan"/>
- <extension module="org.jboss.as.connector"/>
- <extension module="org.jboss.as.deployment-scanner"/>
- <extension module="org.jboss.as.ee"/>
- <extension module="org.jboss.as.ejb3"/>
- <extension module="org.jboss.as.jacorb"/>
- <extension module="org.jboss.as.jaxrs"/>
- <extension module="org.jboss.as.jdr"/>
- <extension module="org.jboss.as.jmx"/>
- <extension module="org.jboss.as.jpa"/>
- <extension module="org.jboss.as.jsf"/>
- <extension module="org.jboss.as.jsr77"/>
- <extension module="org.jboss.as.logging"/>
- <extension module="org.jboss.as.mail"/>
- <extension module="org.jboss.as.messaging"/>
- <extension module="org.jboss.as.naming"/>
- <extension module="org.jboss.as.pojo"/>
- <extension module="org.jboss.as.remoting"/>
- <extension module="org.jboss.as.sar"/>
- <extension module="org.jboss.as.security"/>
- <extension module="org.jboss.as.threads"/>
- <extension module="org.jboss.as.transactions"/>
- <extension module="org.jboss.as.webservices"/>
- <extension module="org.jboss.as.weld"/>
- <extension module="org.wildfly.extension.batch"/>
- <extension module="org.wildfly.extension.io"/>
- <extension module="org.wildfly.extension.undertow"/>
- </extensions>
- <management>
- <security-realms>
- <security-realm name="ManagementRealm">
- <authentication>
- <local default-user="$local"/>
- <properties path="mgmt-users.properties" relative-to="jboss.server.config.dir"/>
- </authentication>
- <authorization map-groups-to-roles="false">
- <properties path="mgmt-groups.properties" relative-to="jboss.server.config.dir"/>
- </authorization>
- </security-realm>
- <security-realm name="ApplicationRealm">
- <authentication>
- <local default-user="$local" allowed-users="*"/>
- <properties path="application-users.properties" relative-to="jboss.server.config.dir"/>
- </authentication>
- <authorization>
- <properties path="application-roles.properties" relative-to="jboss.server.config.dir"/>
- </authorization>
- </security-realm>
- </security-realms>
- <audit-log>
- <formatters>
- <json-formatter name="json-formatter"/>
- </formatters>
- <handlers>
- <file-handler name="file" formatter="json-formatter" relative-to="jboss.server.data.dir" path="audit-log.log"/>
- </handlers>
- <logger log-boot="true" log-read-only="false" enabled="false">
- <handlers>
- <handler name="file"/>
- </handlers>
- </logger>
- </audit-log>
- <management-interfaces>
- <http-interface security-realm="ManagementRealm" http-upgrade-enabled="true">
- <socket-binding http="management-http"/>
- </http-interface>
- </management-interfaces>
- <access-control provider="simple">
- <role-mapping>
- <role name="SuperUser">
- <include>
- <user name="$local"/>
- </include>
- </role>
- </role-mapping>
- </access-control>
- </management>
- <profile>
- <subsystem xmlns="urn:jboss:domain:logging:2.0">
- <console-handler name="CONSOLE">
- <level name="INFO"/>
- <formatter>
- <named-formatter name="COLOR-PATTERN"/>
- </formatter>
- </console-handler>
- <periodic-rotating-file-handler name="FILE" autoflush="true">
- <formatter>
- <named-formatter name="PATTERN"/>
- </formatter>
- <file relative-to="jboss.server.log.dir" path="server.log"/>
- <suffix value=".yyyy-MM-dd"/>
- <append value="true"/>
- </periodic-rotating-file-handler>
- <logger category="com.arjuna">
- <level name="WARN"/>
- </logger>
- <logger category="org.apache.tomcat.util.modeler">
- <level name="WARN"/>
- </logger>
- <logger category="org.jboss.as.config">
- <level name="DEBUG"/>
- </logger>
- <logger category="sun.rmi">
- <level name="WARN"/>
- </logger>
- <logger category="jacorb">
- <level name="WARN"/>
- </logger>
- <logger category="jacorb.config">
- <level name="ERROR"/>
- </logger>
- <root-logger>
- <level name="INFO"/>
- <handlers>
- <handler name="CONSOLE"/>
- <handler name="FILE"/>
- </handlers>
- </root-logger>
- <formatter name="PATTERN">
- <pattern-formatter pattern="%d{yyyy-MM-dd HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/>
- </formatter>
- <formatter name="COLOR-PATTERN">
- <pattern-formatter pattern="%K{level}%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/>
- </formatter>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:batch:1.0">
- <job-repository>
- <in-memory/>
- </job-repository>
- <thread-pool>
- <max-threads count="10"/>
- <keepalive-time time="100" unit="milliseconds"/>
- </thread-pool>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:datasources:2.0">
- <datasources>
- <datasource jndi-name="java:jboss/datasources/ExampleDS" pool-name="ExampleDS" enabled="true" use-java-context="true">
- <connection-url>jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE</connection-url>
- <driver>h2</driver>
- <security>
- <user-name>sa</user-name>
- <password>sa</password>
- </security>
- </datasource>
- <drivers>
- <driver name="h2" module="com.h2database.h2">
- <xa-datasource-class>org.h2.jdbcx.JdbcDataSource</xa-datasource-class>
- </driver>
- </drivers>
- </datasources>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:deployment-scanner:2.0">
- <deployment-scanner path="deployments" relative-to="jboss.server.base.dir" scan-interval="5000" runtime-failure-causes-rollback="${jboss.deployment.scanner.rollback.on.failure:false}"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:ee:2.0">
- <spec-descriptor-property-replacement>false</spec-descriptor-property-replacement>
- <jboss-descriptor-property-replacement>true</jboss-descriptor-property-replacement>
- <annotation-property-replacement>false</annotation-property-replacement>
- <concurrent>
- <context-services>
- <context-service name="default" jndi-name="java:jboss/ee/concurrency/context/default" use-transaction-setup-provider="true"/>
- </context-services>
- <managed-executor-services>
- <managed-executor-service name="default" jndi-name="java:jboss/ee/concurrency/executor/default" context-service="default" hung-task-threshold="60000" core-threads="5" max-threads="25" keepalive-time="5000"/>
- </managed-executor-services>
- <managed-scheduled-executor-services>
- <managed-scheduled-executor-service name="default" jndi-name="java:jboss/ee/concurrency/scheduler/default" context-service="default" hung-task-threshold="60000" core-threads="2" keepalive-time="3000"/>
- </managed-scheduled-executor-services>
- <managed-thread-factories>
- <managed-thread-factory name="default" jndi-name="java:jboss/ee/concurrency/factory/default" context-service="default"/>
- </managed-thread-factories>
- </concurrent>
- <default-bindings context-service="java:jboss/ee/concurrency/context/default" datasource="java:jboss/datasources/ExampleDS" jms-connection-factory="java:jboss/DefaultJMSConnectionFactory" managed-executor-service="java:jboss/ee/concurrency/executor/default" managed-scheduled-executor-service="java:jboss/ee/concurrency/scheduler/default" managed-thread-factory="java:jboss/ee/concurrency/factory/default"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:ejb3:2.0">
- <session-bean>
- <stateful default-access-timeout="5000" cache-ref="simple" passivation-disabled-cache-ref="simple"/>
- <singleton default-access-timeout="5000"/>
- </session-bean>
- <mdb>
- <resource-adapter-ref resource-adapter-name="${ejb.resource-adapter-name:activemq-ra.rar}"/>
- <bean-instance-pool-ref pool-name="mdb-strict-max-pool"/>
- </mdb>
- <pools>
- <bean-instance-pools>
- <!-- A sample strict max pool configuration -->
- <strict-max-pool name="slsb-strict-max-pool" max-pool-size="20" instance-acquisition-timeout="5" instance-acquisition-timeout-unit="MINUTES"/>
- <strict-max-pool name="mdb-strict-max-pool" max-pool-size="20" instance-acquisition-timeout="5" instance-acquisition-timeout-unit="MINUTES"/>
- </bean-instance-pools>
- </pools>
- <caches>
- <cache name="simple"/>
- <cache name="distributable" aliases="passivating clustered" passivation-store-ref="infinispan"/>
- </caches>
- <passivation-stores>
- <passivation-store name="infinispan" cache-container="ejb" max-size="10000"/>
- </passivation-stores>
- <async thread-pool-name="default"/>
- <timer-service thread-pool-name="default" default-data-store="default-file-store">
- <data-stores>
- <file-data-store name="default-file-store" path="timer-service-data" relative-to="jboss.server.data.dir"/>
- </data-stores>
- </timer-service>
- <remote connector-ref="http-remoting-connector" thread-pool-name="default"/>
- <thread-pools>
- <thread-pool name="default">
- <max-threads count="10"/>
- <keepalive-time time="100" unit="milliseconds"/>
- </thread-pool>
- </thread-pools>
- <iiop enable-by-default="false" use-qualified-name="false"/>
- <default-security-domain value="other"/>
- <default-missing-method-permissions-deny-access value="true"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:io:1.0">
- <worker name="default" io-threads="3"/>
- <buffer-pool name="default" buffer-size="16384" buffers-per-slice="128"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:infinispan:2.0">
- <cache-container name="web" default-cache="passivation" module="org.wildfly.clustering.web.infinispan">
- <local-cache name="passivation" batching="true">
- <file-store passivation="true" purge="false"/>
- </local-cache>
- <local-cache name="persistent" batching="true">
- <file-store passivation="false" purge="false"/>
- </local-cache>
- </cache-container>
- <cache-container name="ejb" aliases="sfsb" default-cache="passivation" module="org.wildfly.clustering.ejb.infinispan">
- <local-cache name="passivation" batching="true">
- <file-store passivation="true" purge="false"/>
- </local-cache>
- <local-cache name="persistent" batching="true">
- <file-store passivation="false" purge="false"/>
- </local-cache>
- </cache-container>
- <cache-container name="hibernate" default-cache="local-query" module="org.hibernate">
- <local-cache name="entity">
- <transaction mode="NON_XA"/>
- <eviction strategy="LRU" max-entries="10000"/>
- <expiration max-idle="100000"/>
- </local-cache>
- <local-cache name="local-query">
- <transaction mode="NONE"/>
- <eviction strategy="LRU" max-entries="10000"/>
- <expiration max-idle="100000"/>
- </local-cache>
- <local-cache name="timestamps">
- <transaction mode="NONE"/>
- <eviction strategy="NONE"/>
- </local-cache>
- </cache-container>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:jacorb:1.3">
- <orb socket-binding="jacorb" ssl-socket-binding="jacorb-ssl">
- <initializers transactions="spec" security="identity"/>
- </orb>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:jaxrs:1.0"/>
- <subsystem xmlns="urn:jboss:domain:jca:2.0">
- <archive-validation enabled="true" fail-on-error="true" fail-on-warn="false"/>
- <bean-validation enabled="true"/>
- <default-workmanager>
- <short-running-threads>
- <core-threads count="50"/>
- <queue-length count="50"/>
- <max-threads count="50"/>
- <keepalive-time time="10" unit="seconds"/>
- </short-running-threads>
- <long-running-threads>
- <core-threads count="50"/>
- <queue-length count="50"/>
- <max-threads count="50"/>
- <keepalive-time time="10" unit="seconds"/>
- </long-running-threads>
- </default-workmanager>
- <cached-connection-manager/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:jdr:1.0"/>
- <subsystem xmlns="urn:jboss:domain:jmx:1.3">
- <expose-resolved-model/>
- <expose-expression-model/>
- <remoting-connector/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:jpa:1.1">
- <jpa default-datasource="" default-extended-persistence-inheritance="DEEP"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:jsf:1.0"/>
- <subsystem xmlns="urn:jboss:domain:jsr77:1.0"/>
- <subsystem xmlns="urn:jboss:domain:mail:2.0">
- <mail-session name="default" jndi-name="java:jboss/mail/Default">
- <smtp-server outbound-socket-binding-ref="mail-smtp"/>
- </mail-session>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:messaging:2.0">
- <activemq-server>
- <persistence-enabled>true</persistence-enabled>
- <journal-file-size>102400</journal-file-size>
- <journal-min-files>2</journal-min-files>
- <connectors>
- <http-connector name="http-connector" socket-binding="http">
- <param key="http-upgrade-endpoint" value="http-acceptor"/>
- </http-connector>
- <http-connector name="http-connector-throughput" socket-binding="http">
- <param key="http-upgrade-endpoint" value="http-acceptor-throughput"/>
- <param key="batch-delay" value="50"/>
- </http-connector>
- <in-vm-connector name="in-vm" server-id="0"/>
- </connectors>
- <acceptors>
- <http-acceptor name="http-acceptor" http-listener="default"/>
- <http-acceptor name="http-acceptor-throughput" http-listener="default">
- <param key="batch-delay" value="50"/>
- <param key="direct-deliver" value="false"/>
- </http-acceptor>
- <in-vm-acceptor name="in-vm" server-id="0"/>
- </acceptors>
- <security-settings>
- <security-setting match="#">
- <permission type="send" roles="guest"/>
- <permission type="consume" roles="guest"/>
- <permission type="createNonDurableQueue" roles="guest"/>
- <permission type="deleteNonDurableQueue" roles="guest"/>
- </security-setting>
- </security-settings>
- <address-settings>
- <!--default for catch all-->
- <address-setting match="#">
- <dead-letter-address>jms.queue.DLQ</dead-letter-address>
- <expiry-address>jms.queue.ExpiryQueue</expiry-address>
- <redelivery-delay>0</redelivery-delay>
- <max-size-bytes>10485760</max-size-bytes>
- <address-full-policy>PAGE</address-full-policy>
- <page-size-bytes>2097152</page-size-bytes>
- <message-counter-history-day-limit>10</message-counter-history-day-limit>
- </address-setting>
- </address-settings>
- <jms-connection-factories>
- <connection-factory name="InVmConnectionFactory">
- <connectors>
- <connector-ref connector-name="in-vm"/>
- </connectors>
- <entries>
- <entry name="java:/ConnectionFactory"/>
- </entries>
- </connection-factory>
- <connection-factory name="RemoteConnectionFactory">
- <connectors>
- <connector-ref connector-name="http-connector"/>
- </connectors>
- <entries>
- <entry name="java:jboss/exported/jms/RemoteConnectionFactory"/>
- </entries>
- </connection-factory>
- <pooled-connection-factory name="activemq-ra">
- <transaction mode="xa"/>
- <connectors>
- <connector-ref connector-name="in-vm"/>
- </connectors>
- <entries>
- <entry name="java:/JmsXA"/>
- <!-- Global JNDI entry used to provide a default JMS Connection factory to EE application -->
- <entry name="java:jboss/DefaultJMSConnectionFactory"/>
- </entries>
- </pooled-connection-factory>
- </jms-connection-factories>
- <jms-destinations>
- <jms-queue name="testQueue">
- <entry name="queue/test"/>
- <entry name="java:jboss/exported/jms/queues/testQueue"/>
- </jms-queue>
- </jms-destinations>
- </activemq-server>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:naming:2.0">
- <remote-naming/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:pojo:1.0"/>
- <subsystem xmlns="urn:jboss:domain:remoting:2.0">
- <endpoint worker="default"/>
- <http-connector name="http-remoting-connector" connector-ref="default" security-realm="ApplicationRealm"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:resource-adapters:2.0"/>
- <subsystem xmlns="urn:jboss:domain:sar:1.0"/>
- <subsystem xmlns="urn:jboss:domain:security:1.2">
- <security-domains>
- <security-domain name="other" cache-type="default">
- <authentication>
- <login-module code="Remoting" flag="optional">
- <module-option name="password-stacking" value="useFirstPass"/>
- </login-module>
- <login-module code="RealmDirect" flag="required">
- <module-option name="password-stacking" value="useFirstPass"/>
- </login-module>
- </authentication>
- </security-domain>
- <security-domain name="jboss-web-policy" cache-type="default">
- <authorization>
- <policy-module code="Delegating" flag="required"/>
- </authorization>
- </security-domain>
- <security-domain name="jboss-ejb-policy" cache-type="default">
- <authorization>
- <policy-module code="Delegating" flag="required"/>
- </authorization>
- </security-domain>
- </security-domains>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:threads:1.1"/>
- <subsystem xmlns="urn:jboss:domain:transactions:2.0">
- <core-environment>
- <process-id>
- <uuid/>
- </process-id>
- </core-environment>
- <recovery-environment socket-binding="txn-recovery-environment" status-socket-binding="txn-status-manager"/>
- <coordinator-environment default-timeout="300"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:undertow:1.0">
- <buffer-caches>
- <buffer-cache name="default" buffer-size="1024" buffers-per-region="1024" max-regions="10"/>
- </buffer-caches>
- <server name="default-server">
- <http-listener name="default" socket-binding="http"/>
- <host name="default-host" alias="localhost">
- <location name="/" handler="welcome-content"/>
- <filter-ref name="server-header"/>
- <filter-ref name="x-powered-by-header"/>
- </host>
- </server>
- <servlet-container name="default" default-buffer-cache="default" stack-trace-on-error="local-only">
- <jsp-config/>
- </servlet-container>
- <handlers>
- <file name="welcome-content" path="${jboss.home.dir}/welcome-content" directory-listing="true"/>
- </handlers>
- <filters>
- <response-header name="server-header" header-name="Server" header-value="Wildfly 8"/>
- <response-header name="x-powered-by-header" header-name="X-Powered-By" header-value="Undertow 1"/>
- </filters>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:webservices:1.2">
- <modify-wsdl-address>true</modify-wsdl-address>
- <wsdl-host>${jboss.bind.address:127.0.0.1}</wsdl-host>
- <endpoint-config name="Standard-Endpoint-Config"/>
- <endpoint-config name="Recording-Endpoint-Config">
- <pre-handler-chain name="recording-handlers" protocol-bindings="##SOAP11_HTTP ##SOAP11_HTTP_MTOM ##SOAP12_HTTP ##SOAP12_HTTP_MTOM">
- <handler name="RecordingHandler" class="org.jboss.ws.common.invocation.RecordingServerHandler"/>
- </pre-handler-chain>
- </endpoint-config>
- <client-config name="Standard-Client-Config"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:weld:2.0"/>
- </profile>
- <interfaces>
- <interface name="management">
- <inet-address value="${jboss.bind.address.management:127.0.0.1}"/>
- </interface>
- <interface name="public">
- <inet-address value="${jboss.bind.address:127.0.0.1}"/>
- </interface>
- <!-- TODO - only show this if the jacorb subsystem is added -->
- <interface name="unsecure">
- <!--
- ~ Used for IIOP sockets in the standard configuration.
- ~ To secure JacORB you need to setup SSL
- -->
- <inet-address value="${jboss.bind.address.unsecure:127.0.0.1}"/>
- </interface>
- </interfaces>
- <socket-binding-group name="standard-sockets" default-interface="public" port-offset="${jboss.socket.binding.port-offset:0}">
- <socket-binding name="management-http" interface="management" port="${jboss.management.http.port:9990}"/>
- <socket-binding name="management-https" interface="management" port="${jboss.management.https.port:9993}"/>
- <socket-binding name="ajp" port="${jboss.ajp.port:8009}"/>
- <socket-binding name="http" port="${jboss.http.port:8080}"/>
- <socket-binding name="https" port="${jboss.https.port:8443}"/>
- <socket-binding name="jacorb" interface="unsecure" port="3528"/>
- <socket-binding name="jacorb-ssl" interface="unsecure" port="3529"/>
- <socket-binding name="messaging-group" port="0" multicast-address="${jboss.messaging.group.address:231.7.7.7}" multicast-port="${jboss.messaging.group.port:9876}"/>
- <socket-binding name="txn-recovery-environment" port="4712"/>
- <socket-binding name="txn-status-manager" port="4713"/>
- <outbound-socket-binding name="mail-smtp">
- <remote-destination host="localhost" port="25"/>
- </outbound-socket-binding>
- </socket-binding-group>
-</server>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/mdb-cmt-tx-not-supported/src/main/java/org/apache/activemq/javaee/example/MDB_CMT_TxNotSupportedClientExample.java
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-cmt-tx-not-supported/src/main/java/org/apache/activemq/javaee/example/MDB_CMT_TxNotSupportedClientExample.java b/examples/javaee/mdb-cmt-tx-not-supported/src/main/java/org/apache/activemq/javaee/example/MDB_CMT_TxNotSupportedClientExample.java
deleted file mode 100644
index 72efc1d..0000000
--- a/examples/javaee/mdb-cmt-tx-not-supported/src/main/java/org/apache/activemq/javaee/example/MDB_CMT_TxNotSupportedClientExample.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.activemq.javaee.example;
-
-import javax.jms.Connection;
-import javax.jms.ConnectionFactory;
-import javax.jms.MessageProducer;
-import javax.jms.Queue;
-import javax.jms.Session;
-import javax.jms.TextMessage;
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import java.util.Properties;
-
-/**
- * @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a>
- */
-public class MDB_CMT_TxNotSupportedClientExample
-{
- public static void main(final String[] args) throws Exception
- {
- Connection connection = null;
- InitialContext initialContext = null;
- try
- {
- // Step 1. Create an initial context to perform the JNDI lookup.
- final Properties env = new Properties();
-
- env.put(Context.INITIAL_CONTEXT_FACTORY, "org.jboss.naming.remote.client.InitialContextFactory");
-
- env.put(Context.PROVIDER_URL, "http-remoting://localhost:8080");
- initialContext = new InitialContext(env);
-
- // Step 2. Perfom a lookup on the queue
- Queue queue = (Queue)initialContext.lookup("jms/queues/testQueue");
-
- // Step 3. Perform a lookup on the Connection Factory
- ConnectionFactory cf = (ConnectionFactory)initialContext.lookup("jms/RemoteConnectionFactory");
-
- // Step 4.Create a JMS Connection
- connection = cf.createConnection("guest", "password");
-
- // Step 5. Create a JMS Session
- Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
-
- // Step 6. Create a JMS Message Producer
- MessageProducer producer = session.createProducer(queue);
-
- // Step 7. Create a Text Message
- TextMessage message = session.createTextMessage("This is a text message");
-
- System.out.println("Sent message: " + message.getText());
-
- // Step 8. Send the Message
- producer.send(message);
-
- // Step 9,10 and 11 in MDB_CMP_TxNotSupported
- }
- finally
- {
- // Step 12. Be sure to close our JMS resources!
- if (initialContext != null)
- {
- initialContext.close();
- }
- if (connection != null)
- {
- connection.close();
- }
- }
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/mdb-cmt-tx-not-supported/src/main/java/org/apache/activemq/javaee/example/server/MDB_CMT_TxNotSupported.java
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-cmt-tx-not-supported/src/main/java/org/apache/activemq/javaee/example/server/MDB_CMT_TxNotSupported.java b/examples/javaee/mdb-cmt-tx-not-supported/src/main/java/org/apache/activemq/javaee/example/server/MDB_CMT_TxNotSupported.java
deleted file mode 100644
index 77d3a64..0000000
--- a/examples/javaee/mdb-cmt-tx-not-supported/src/main/java/org/apache/activemq/javaee/example/server/MDB_CMT_TxNotSupported.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.activemq.javaee.example.server;
-
-import javax.annotation.Resource;
-import javax.ejb.ActivationConfigProperty;
-import javax.ejb.MessageDriven;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
-import javax.ejb.TransactionManagement;
-import javax.ejb.TransactionManagementType;
-import javax.jms.Message;
-import javax.jms.MessageListener;
-import javax.jms.TextMessage;
-import javax.transaction.Transaction;
-import javax.transaction.TransactionManager;
-
-import org.jboss.ejb3.annotation.ResourceAdapter;
-
-/**
- * @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a>
- */
-@MessageDriven(name = "MDB_CMT_TxNotSupported",
- activationConfig =
- {
- @ActivationConfigProperty(propertyName = "destinationType", propertyValue = "javax.jms.Queue"),
- @ActivationConfigProperty(propertyName = "destination", propertyValue = "queue/testQueue"),
- @ActivationConfigProperty(propertyName = "acknowledgeMode", propertyValue = "Auto-acknowledge")
- })
-@TransactionAttribute(value = TransactionAttributeType.NOT_SUPPORTED)
-public class MDB_CMT_TxNotSupported implements MessageListener
-{
- @Resource(mappedName = "java:/TransactionManager")
- private TransactionManager tm;
-
- public void onMessage(final Message message)
- {
- try
- {
- // Step 9. We know the client is sending a text message so we cast
- TextMessage textMessage = (TextMessage)message;
-
- // Step 10. get the text from the message.
- String text = textMessage.getText();
-
- System.out.println("message " + text + " received");
-
- // Step 11. let's look at the transaction to make sure there isn't one.
- Transaction tx = tm.getTransaction();
-
- if (tx == null)
- {
- System.out.println("tx is null, just as expected");
- }
- else
- {
- System.out.println("something is wrong, I wasn't expecting a transaction");
- }
- }
- catch (Exception e)
- {
- e.printStackTrace();
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/mdb-cmt-tx-not-supported/src/test/java/org/apache/activemq/javaee/example/MDBCMTSetTXNotSupportedRunnerTest.java
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-cmt-tx-not-supported/src/test/java/org/apache/activemq/javaee/example/MDBCMTSetTXNotSupportedRunnerTest.java b/examples/javaee/mdb-cmt-tx-not-supported/src/test/java/org/apache/activemq/javaee/example/MDBCMTSetTXNotSupportedRunnerTest.java
deleted file mode 100644
index e8ca00f..0000000
--- a/examples/javaee/mdb-cmt-tx-not-supported/src/test/java/org/apache/activemq/javaee/example/MDBCMTSetTXNotSupportedRunnerTest.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.activemq.javaee.example;
-
-import org.apache.activemq.javaee.example.server.MDB_CMT_TxNotSupported;
-import org.jboss.arquillian.container.test.api.Deployment;
-import org.jboss.arquillian.container.test.api.RunAsClient;
-import org.jboss.arquillian.junit.Arquillian;
-import org.jboss.shrinkwrap.api.Archive;
-import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.spec.JavaArchive;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-/**
- * @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a>
- * 5/21/12
- */
-@RunAsClient
-@RunWith(Arquillian.class)
-public class MDBCMTSetTXNotSupportedRunnerTest
-{
- @Deployment
- public static Archive getDeployment()
- {
-
- final JavaArchive ejbJar = ShrinkWrap.create(JavaArchive.class, "mdb.jar");
- ejbJar.addClass(MDB_CMT_TxNotSupported.class);
- System.out.println(ejbJar.toString(true));
- return ejbJar;
- }
-
- @Test
- public void runExample() throws Exception
- {
- MDB_CMT_TxNotSupportedClientExample.main(null);
- //give the example time to run
- Thread.sleep(1000);
- }
-}
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/mdb-cmt-tx-not-supported/src/test/resources/arquillian.xml
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-cmt-tx-not-supported/src/test/resources/arquillian.xml b/examples/javaee/mdb-cmt-tx-not-supported/src/test/resources/arquillian.xml
deleted file mode 100644
index 9090137..0000000
--- a/examples/javaee/mdb-cmt-tx-not-supported/src/test/resources/arquillian.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<arquillian xmlns="http://jboss.org/schema/arquillian"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://jboss.org/schema/arquillian http://jboss.org/schema/arquillian/arquillian_1_0.xsd">
-
- <!-- Uncomment to have test archives exported to the file system for inspection.
-This feature can also be controlled using the system property arquillian.deploymentExportPath -->
- <!--
-<engine>
-<property name="deploymentExportPath">target</property>
-</engine>
--->
-
- <defaultProtocol type="Servlet 3.0" />
-
- <container qualifier="jboss" default="true">
- <configuration>
- <property name="jbossHome">${basedir}/target/jbossas-node0</property>
- <property name="serverConfig">standalone-example.xml</property>
- <property name="allowConnectingToRunningServer">true</property>
- <property name="managementAddress">${node0:127.0.0.1}</property>
- </configuration>
- </container>
-
- <!-- logThreshold proposed -->
- <!--
-<container qualifier="jbossas-managed">
-<configuration>
-<property name="logThreshold">ERROR</property>
-</configuration>
-</container>
--->
-
-</arquillian>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/mdb-cmt-tx-required/pom.xml
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-cmt-tx-required/pom.xml b/examples/javaee/mdb-cmt-tx-required/pom.xml
deleted file mode 100644
index 0783bbb..0000000
--- a/examples/javaee/mdb-cmt-tx-required/pom.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.activemq.example.javaee</groupId>
- <artifactId>javaee-examples</artifactId>
- <version>6.0.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>activemq-javaee-mdb-cmt-tx-example</artifactId>
- <packaging>jar</packaging>
- <name>ActiveMQ6 Java EE MDB CMT Transaction Example</name>
-</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/mdb-cmt-tx-required/readme.html
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-cmt-tx-required/readme.html b/examples/javaee/mdb-cmt-tx-required/readme.html
deleted file mode 100644
index 469b03c..0000000
--- a/examples/javaee/mdb-cmt-tx-required/readme.html
+++ /dev/null
@@ -1,115 +0,0 @@
-<html>
- <head>
- <title>ActiveMQ Java EE MDB Container Managed Transactions Example</title>
- <link rel="stylesheet" type="text/css" href="../../common/common.css" />
- <link rel="stylesheet" type="text/css" href="../../common/prettify.css" />
- <script type="text/javascript" src="../../common/prettify.js"></script>
- </head>
- <body onload="prettyPrint()">
- <h1>Java EE MDB Container Managed Transactions Example</h1>
-
- <p>This example shows you how to send a message to an MDB that is delivered within a transaction controlled by the container</p>
- <p>The example will send deploy a simple MDB and demonstrate sending a message and the MDB consuming it</p>
-
- <p>The example leverages the JBoss Arquillian framework to run a WildFly instance and deploy the MDB.</p>
-
- <h2>Example step-by-step</h2>
-
- <p><i>download WildFly 8.0.0.Final from <a href="http://wildfly.org/downloads/">here</a> and install.</i></p>
- <p><i>set the JBOSS_HOME property to point to the WildFly install directory</i></p>
- <p><i>type <code>mvn verify</code> from the example directory to run</i></p>
-
- <ol>
- <li>First we need to get an initial context so we can look-up the JMS connection factory and destination objects from JNDI. This initial context will get it's properties from the <code>jndi.properties</code> file in the directory <code>config</code></li>
- <pre class="prettyprint">
- final Properties env = new Properties();
-
- env.put(Context.INITIAL_CONTEXT_FACTORY, "org.jboss.naming.remote.client.InitialContextFactory");
-
- env.put(Context.PROVIDER_URL, "http-remoting://localhost:8080");
-
- initialContext = new InitialContext(env);
- </pre>
-
- <li>We look up the JMS queue object from JNDI</li>
- <pre class="prettyprint">
- Queue queue = (Queue)initialContext.lookup("jms/queues/testQueue");
- </pre>
-
- <li>We look up the JMS connection factory object from JNDI</li>
- <pre class="prettyprint">
- ConnectionFactory cf = (ConnectionFactory)initialContext.lookup("/jms/RemoteConnectionFactory");
- </pre>
-
- <li>We create a JMS connection</li>
- <pre class="prettyprint">
- connection = cf.createConnection("guest", "password");
- </pre>
-
- <li>We create a JMS session. The session is created as non transacted and will auto acknowledge messages.</li>
- <pre class="prettyprint">
- <code>Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);</code>
- </pre>
-
- <li>We create a JMS message producer on the session. This will be used to send the messages.</li>
- <pre class="prettyprint">
- <code>MessageProducer messageProducer = session.createProducer(queue);</code>
- </pre>
-
- <li>We create a JMS text messages that we are going to send.</li>
- <pre class="prettyprint">
- <code> TextMessage message = session.createTextMessage("This is a text message");</code>
- </pre>
-
- <li>We send messages to the queue</li>
- <pre class="prettyprint">
- <code>messageProducer.send(message);</code>
- </pre>
-
- <li>The MDB receives the message<br />
- We know the message is a TextMessage so we cast to it.
- </li>
- <pre class="prettyprint">
- <code>TextMessage tm = (TextMessage)message;</code>
- </pre>
-
- <li>We take alook at the transaction and see that it is running.
- </li>
- <pre class="prettyprint">
- <code>Transaction tx = tm.getTransaction();
-
- if(tx != null)
- {
- System.out.println("we're in the middle of a transaction: " + tx);
- }</code>
- </pre>
-
- <li>The MDB gets the text and prints it
- </li>
- <pre class="prettyprint">
- <code>String text = tm.getText();
- System.out.println("message " + text + " received");
- </code>
- </pre>
-
- <li>And finally, <b>always</b> remember to close your JMS connections and resources after use, in a <code>finally</code> block. Closing a JMS connection will automatically close all of its sessions, consumers, producer and browser objects</li>
-
- <pre class="prettyprint">
- <code>finally
- {
- if (initialContext != null)
- {
- initialContext.close();
- }
- if (connection != null)
- {
- connection.close();
- }
- }</code>
- </pre>
-
-
-
- </ol>
- </body>
-</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/mdb-cmt-tx-required/server/standalone/configuration/application-roles.properties
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-cmt-tx-required/server/standalone/configuration/application-roles.properties b/examples/javaee/mdb-cmt-tx-required/server/standalone/configuration/application-roles.properties
deleted file mode 100644
index 0ade8fb..0000000
--- a/examples/javaee/mdb-cmt-tx-required/server/standalone/configuration/application-roles.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# Properties declaration of users roles for the realm 'ApplicationRealm'.
-#
-# This includes the following protocols: remote ejb, remote jndi, web, remote jms
-#
-# Users can be added to this properties file at any time, updates after the server has started
-# will be automatically detected.
-#
-# The format of this file is as follows: -
-# username=role1,role2,role3
-#
-# A utility script is provided which can be executed from the bin folder to add the users: -
-# - Linux
-# bin/add-user.sh
-#
-# - Windows
-# bin\add-user.bat
-#
-# The following illustrates how an admin user could be defined.
-#
-#admin=PowerUser,BillingAdmin,
-guest=guest
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/mdb-cmt-tx-required/server/standalone/configuration/application-users.properties
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-cmt-tx-required/server/standalone/configuration/application-users.properties b/examples/javaee/mdb-cmt-tx-required/server/standalone/configuration/application-users.properties
deleted file mode 100644
index c52e923..0000000
--- a/examples/javaee/mdb-cmt-tx-required/server/standalone/configuration/application-users.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# Properties declaration of users for the realm 'ApplicationRealm' which is the default realm
-# for application services on a new AS 7.1 installation.
-#
-# This includes the following protocols: remote ejb, remote jndi, web, remote jms
-#
-# Users can be added to this properties file at any time, updates after the server has started
-# will be automatically detected.
-#
-# The format of this realm is as follows: -
-# username=HEX( MD5( username ':' realm ':' password))
-#
-# A utility script is provided which can be executed from the bin folder to add the users: -
-# - Linux
-# bin/add-user.sh
-#
-# - Windows
-# bin\add-user.bat
-#
-# The following illustrates how an admin user could be defined, this
-# is for illustration only and does not correspond to a usable password.
-#
-#admin=2a0923285184943425d1f53ddd58ec7a
-guest=3437456520927d113b17d471d630e0d6
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/mdb-cmt-tx-required/server/standalone/configuration/logging.properties
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-cmt-tx-required/server/standalone/configuration/logging.properties b/examples/javaee/mdb-cmt-tx-required/server/standalone/configuration/logging.properties
deleted file mode 100644
index 3fa31b0..0000000
--- a/examples/javaee/mdb-cmt-tx-required/server/standalone/configuration/logging.properties
+++ /dev/null
@@ -1,47 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# Additional logger names to configure (root logger is always configured)
-loggers=org.jboss.as.config
-
-# Dump system environment at boot by default
-logger.org.jboss.as.config.level=DEBUG
-
-# Root logger level
-logger.level=${jboss.boot.server.log.level:INFO}
-# Root logger handlers
-logger.handlers=FILE,CONSOLE
-
-# Console handler configuration
-handler.CONSOLE=org.jboss.logmanager.handlers.ConsoleHandler
-handler.CONSOLE.properties=autoFlush
-handler.CONSOLE.level=${jboss.boot.server.log.console.level:INFO}
-handler.CONSOLE.autoFlush=true
-handler.CONSOLE.formatter=PATTERN
-
-# File handler configuration
-handler.FILE=org.jboss.logmanager.handlers.FileHandler
-handler.FILE.level=DEBUG
-handler.FILE.properties=autoFlush,fileName
-handler.FILE.autoFlush=true
-handler.FILE.fileName=${org.jboss.boot.log.file:boot.log}
-handler.FILE.formatter=PATTERN
-
-# Formatter pattern configuration
-formatter.PATTERN=org.jboss.logmanager.formatters.PatternFormatter
-formatter.PATTERN.properties=pattern
-formatter.PATTERN.pattern=%d{HH:mm:ss,SSS} %-5p [%c] %s%E%n
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/mdb-cmt-tx-required/server/standalone/configuration/mgmt-users.properties
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-cmt-tx-required/server/standalone/configuration/mgmt-users.properties b/examples/javaee/mdb-cmt-tx-required/server/standalone/configuration/mgmt-users.properties
deleted file mode 100644
index 349b004..0000000
--- a/examples/javaee/mdb-cmt-tx-required/server/standalone/configuration/mgmt-users.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# Properties declaration of users for the realm 'ManagementRealm' which is the default realm
-# for new AS 7.1 installations. Further authentication mechanism can be configured
-# as part of the <management /> in standalone.xml.
-#
-# Users can be added to this properties file at any time, updates after the server has started
-# will be automatically detected.
-#
-# By default the properties realm expects the entries to be in the format: -
-# username=HEX( MD5( username ':' realm ':' password))
-#
-# A utility script is provided which can be executed from the bin folder to add the users: -
-# - Linux
-# bin/add-user.sh
-#
-# - Windows
-# bin\add-user.bat
-
-# The following illustrates how an admin user could be defined, this
-# is for illustration only and does not correspond to a usable password.
-#
-#admin=2a0923285184943425d1f53ddd58ec7a
-admin=9d71b431e53d99563aa0dfca628c970b
-andy=dfb16391f1be1c454b5bce9822bd9df3
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/mdb-cmt-tx-required/server/standalone/configuration/standalone-example.xml
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-cmt-tx-required/server/standalone/configuration/standalone-example.xml b/examples/javaee/mdb-cmt-tx-required/server/standalone/configuration/standalone-example.xml
deleted file mode 100644
index 58f07a7..0000000
--- a/examples/javaee/mdb-cmt-tx-required/server/standalone/configuration/standalone-example.xml
+++ /dev/null
@@ -1,489 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-
-<server xmlns="urn:jboss:domain:2.0">
- <extensions>
- <extension module="org.jboss.as.clustering.infinispan"/>
- <extension module="org.jboss.as.connector"/>
- <extension module="org.jboss.as.deployment-scanner"/>
- <extension module="org.jboss.as.ee"/>
- <extension module="org.jboss.as.ejb3"/>
- <extension module="org.jboss.as.jacorb"/>
- <extension module="org.jboss.as.jaxrs"/>
- <extension module="org.jboss.as.jdr"/>
- <extension module="org.jboss.as.jmx"/>
- <extension module="org.jboss.as.jpa"/>
- <extension module="org.jboss.as.jsf"/>
- <extension module="org.jboss.as.jsr77"/>
- <extension module="org.jboss.as.logging"/>
- <extension module="org.jboss.as.mail"/>
- <extension module="org.jboss.as.messaging"/>
- <extension module="org.jboss.as.naming"/>
- <extension module="org.jboss.as.pojo"/>
- <extension module="org.jboss.as.remoting"/>
- <extension module="org.jboss.as.sar"/>
- <extension module="org.jboss.as.security"/>
- <extension module="org.jboss.as.threads"/>
- <extension module="org.jboss.as.transactions"/>
- <extension module="org.jboss.as.webservices"/>
- <extension module="org.jboss.as.weld"/>
- <extension module="org.wildfly.extension.batch"/>
- <extension module="org.wildfly.extension.io"/>
- <extension module="org.wildfly.extension.undertow"/>
- </extensions>
- <management>
- <security-realms>
- <security-realm name="ManagementRealm">
- <authentication>
- <local default-user="$local"/>
- <properties path="mgmt-users.properties" relative-to="jboss.server.config.dir"/>
- </authentication>
- <authorization map-groups-to-roles="false">
- <properties path="mgmt-groups.properties" relative-to="jboss.server.config.dir"/>
- </authorization>
- </security-realm>
- <security-realm name="ApplicationRealm">
- <authentication>
- <local default-user="$local" allowed-users="*"/>
- <properties path="application-users.properties" relative-to="jboss.server.config.dir"/>
- </authentication>
- <authorization>
- <properties path="application-roles.properties" relative-to="jboss.server.config.dir"/>
- </authorization>
- </security-realm>
- </security-realms>
- <audit-log>
- <formatters>
- <json-formatter name="json-formatter"/>
- </formatters>
- <handlers>
- <file-handler name="file" formatter="json-formatter" relative-to="jboss.server.data.dir" path="audit-log.log"/>
- </handlers>
- <logger log-boot="true" log-read-only="false" enabled="false">
- <handlers>
- <handler name="file"/>
- </handlers>
- </logger>
- </audit-log>
- <management-interfaces>
- <http-interface security-realm="ManagementRealm" http-upgrade-enabled="true">
- <socket-binding http="management-http"/>
- </http-interface>
- </management-interfaces>
- <access-control provider="simple">
- <role-mapping>
- <role name="SuperUser">
- <include>
- <user name="$local"/>
- </include>
- </role>
- </role-mapping>
- </access-control>
- </management>
- <profile>
- <subsystem xmlns="urn:jboss:domain:logging:2.0">
- <console-handler name="CONSOLE">
- <level name="INFO"/>
- <formatter>
- <named-formatter name="COLOR-PATTERN"/>
- </formatter>
- </console-handler>
- <periodic-rotating-file-handler name="FILE" autoflush="true">
- <formatter>
- <named-formatter name="PATTERN"/>
- </formatter>
- <file relative-to="jboss.server.log.dir" path="server.log"/>
- <suffix value=".yyyy-MM-dd"/>
- <append value="true"/>
- </periodic-rotating-file-handler>
- <logger category="com.arjuna">
- <level name="WARN"/>
- </logger>
- <logger category="org.apache.tomcat.util.modeler">
- <level name="WARN"/>
- </logger>
- <logger category="org.jboss.as.config">
- <level name="DEBUG"/>
- </logger>
- <logger category="sun.rmi">
- <level name="WARN"/>
- </logger>
- <logger category="jacorb">
- <level name="WARN"/>
- </logger>
- <logger category="jacorb.config">
- <level name="ERROR"/>
- </logger>
- <root-logger>
- <level name="INFO"/>
- <handlers>
- <handler name="CONSOLE"/>
- <handler name="FILE"/>
- </handlers>
- </root-logger>
- <formatter name="PATTERN">
- <pattern-formatter pattern="%d{yyyy-MM-dd HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/>
- </formatter>
- <formatter name="COLOR-PATTERN">
- <pattern-formatter pattern="%K{level}%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/>
- </formatter>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:batch:1.0">
- <job-repository>
- <in-memory/>
- </job-repository>
- <thread-pool>
- <max-threads count="10"/>
- <keepalive-time time="100" unit="milliseconds"/>
- </thread-pool>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:datasources:2.0">
- <datasources>
- <datasource jndi-name="java:jboss/datasources/ExampleDS" pool-name="ExampleDS" enabled="true" use-java-context="true">
- <connection-url>jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE</connection-url>
- <driver>h2</driver>
- <security>
- <user-name>sa</user-name>
- <password>sa</password>
- </security>
- </datasource>
- <drivers>
- <driver name="h2" module="com.h2database.h2">
- <xa-datasource-class>org.h2.jdbcx.JdbcDataSource</xa-datasource-class>
- </driver>
- </drivers>
- </datasources>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:deployment-scanner:2.0">
- <deployment-scanner path="deployments" relative-to="jboss.server.base.dir" scan-interval="5000" runtime-failure-causes-rollback="${jboss.deployment.scanner.rollback.on.failure:false}"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:ee:2.0">
- <spec-descriptor-property-replacement>false</spec-descriptor-property-replacement>
- <jboss-descriptor-property-replacement>true</jboss-descriptor-property-replacement>
- <annotation-property-replacement>false</annotation-property-replacement>
- <concurrent>
- <context-services>
- <context-service name="default" jndi-name="java:jboss/ee/concurrency/context/default" use-transaction-setup-provider="true"/>
- </context-services>
- <managed-executor-services>
- <managed-executor-service name="default" jndi-name="java:jboss/ee/concurrency/executor/default" context-service="default" hung-task-threshold="60000" core-threads="5" max-threads="25" keepalive-time="5000"/>
- </managed-executor-services>
- <managed-scheduled-executor-services>
- <managed-scheduled-executor-service name="default" jndi-name="java:jboss/ee/concurrency/scheduler/default" context-service="default" hung-task-threshold="60000" core-threads="2" keepalive-time="3000"/>
- </managed-scheduled-executor-services>
- <managed-thread-factories>
- <managed-thread-factory name="default" jndi-name="java:jboss/ee/concurrency/factory/default" context-service="default"/>
- </managed-thread-factories>
- </concurrent>
- <default-bindings context-service="java:jboss/ee/concurrency/context/default" datasource="java:jboss/datasources/ExampleDS" jms-connection-factory="java:jboss/DefaultJMSConnectionFactory" managed-executor-service="java:jboss/ee/concurrency/executor/default" managed-scheduled-executor-service="java:jboss/ee/concurrency/scheduler/default" managed-thread-factory="java:jboss/ee/concurrency/factory/default"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:ejb3:2.0">
- <session-bean>
- <stateful default-access-timeout="5000" cache-ref="simple" passivation-disabled-cache-ref="simple"/>
- <singleton default-access-timeout="5000"/>
- </session-bean>
- <mdb>
- <resource-adapter-ref resource-adapter-name="${ejb.resource-adapter-name:activemq-ra.rar}"/>
- <bean-instance-pool-ref pool-name="mdb-strict-max-pool"/>
- </mdb>
- <pools>
- <bean-instance-pools>
- <!-- A sample strict max pool configuration -->
- <strict-max-pool name="slsb-strict-max-pool" max-pool-size="20" instance-acquisition-timeout="5" instance-acquisition-timeout-unit="MINUTES"/>
- <strict-max-pool name="mdb-strict-max-pool" max-pool-size="20" instance-acquisition-timeout="5" instance-acquisition-timeout-unit="MINUTES"/>
- </bean-instance-pools>
- </pools>
- <caches>
- <cache name="simple"/>
- <cache name="distributable" aliases="passivating clustered" passivation-store-ref="infinispan"/>
- </caches>
- <passivation-stores>
- <passivation-store name="infinispan" cache-container="ejb" max-size="10000"/>
- </passivation-stores>
- <async thread-pool-name="default"/>
- <timer-service thread-pool-name="default" default-data-store="default-file-store">
- <data-stores>
- <file-data-store name="default-file-store" path="timer-service-data" relative-to="jboss.server.data.dir"/>
- </data-stores>
- </timer-service>
- <remote connector-ref="http-remoting-connector" thread-pool-name="default"/>
- <thread-pools>
- <thread-pool name="default">
- <max-threads count="10"/>
- <keepalive-time time="100" unit="milliseconds"/>
- </thread-pool>
- </thread-pools>
- <iiop enable-by-default="false" use-qualified-name="false"/>
- <default-security-domain value="other"/>
- <default-missing-method-permissions-deny-access value="true"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:io:1.0">
- <worker name="default" io-threads="3"/>
- <buffer-pool name="default" buffer-size="16384" buffers-per-slice="128"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:infinispan:2.0">
- <cache-container name="web" default-cache="passivation" module="org.wildfly.clustering.web.infinispan">
- <local-cache name="passivation" batching="true">
- <file-store passivation="true" purge="false"/>
- </local-cache>
- <local-cache name="persistent" batching="true">
- <file-store passivation="false" purge="false"/>
- </local-cache>
- </cache-container>
- <cache-container name="ejb" aliases="sfsb" default-cache="passivation" module="org.wildfly.clustering.ejb.infinispan">
- <local-cache name="passivation" batching="true">
- <file-store passivation="true" purge="false"/>
- </local-cache>
- <local-cache name="persistent" batching="true">
- <file-store passivation="false" purge="false"/>
- </local-cache>
- </cache-container>
- <cache-container name="hibernate" default-cache="local-query" module="org.hibernate">
- <local-cache name="entity">
- <transaction mode="NON_XA"/>
- <eviction strategy="LRU" max-entries="10000"/>
- <expiration max-idle="100000"/>
- </local-cache>
- <local-cache name="local-query">
- <transaction mode="NONE"/>
- <eviction strategy="LRU" max-entries="10000"/>
- <expiration max-idle="100000"/>
- </local-cache>
- <local-cache name="timestamps">
- <transaction mode="NONE"/>
- <eviction strategy="NONE"/>
- </local-cache>
- </cache-container>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:jacorb:1.3">
- <orb socket-binding="jacorb" ssl-socket-binding="jacorb-ssl">
- <initializers transactions="spec" security="identity"/>
- </orb>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:jaxrs:1.0"/>
- <subsystem xmlns="urn:jboss:domain:jca:2.0">
- <archive-validation enabled="true" fail-on-error="true" fail-on-warn="false"/>
- <bean-validation enabled="true"/>
- <default-workmanager>
- <short-running-threads>
- <core-threads count="50"/>
- <queue-length count="50"/>
- <max-threads count="50"/>
- <keepalive-time time="10" unit="seconds"/>
- </short-running-threads>
- <long-running-threads>
- <core-threads count="50"/>
- <queue-length count="50"/>
- <max-threads count="50"/>
- <keepalive-time time="10" unit="seconds"/>
- </long-running-threads>
- </default-workmanager>
- <cached-connection-manager/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:jdr:1.0"/>
- <subsystem xmlns="urn:jboss:domain:jmx:1.3">
- <expose-resolved-model/>
- <expose-expression-model/>
- <remoting-connector/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:jpa:1.1">
- <jpa default-datasource="" default-extended-persistence-inheritance="DEEP"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:jsf:1.0"/>
- <subsystem xmlns="urn:jboss:domain:jsr77:1.0"/>
- <subsystem xmlns="urn:jboss:domain:mail:2.0">
- <mail-session name="default" jndi-name="java:jboss/mail/Default">
- <smtp-server outbound-socket-binding-ref="mail-smtp"/>
- </mail-session>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:messaging:2.0">
- <activemq-server>
- <persistence-enabled>true</persistence-enabled>
- <journal-file-size>102400</journal-file-size>
- <journal-min-files>2</journal-min-files>
- <connectors>
- <http-connector name="http-connector" socket-binding="http">
- <param key="http-upgrade-endpoint" value="http-acceptor"/>
- </http-connector>
- <http-connector name="http-connector-throughput" socket-binding="http">
- <param key="http-upgrade-endpoint" value="http-acceptor-throughput"/>
- <param key="batch-delay" value="50"/>
- </http-connector>
- <in-vm-connector name="in-vm" server-id="0"/>
- </connectors>
- <acceptors>
- <http-acceptor name="http-acceptor" http-listener="default"/>
- <http-acceptor name="http-acceptor-throughput" http-listener="default">
- <param key="batch-delay" value="50"/>
- <param key="direct-deliver" value="false"/>
- </http-acceptor>
- <in-vm-acceptor name="in-vm" server-id="0"/>
- </acceptors>
- <security-settings>
- <security-setting match="#">
- <permission type="send" roles="guest"/>
- <permission type="consume" roles="guest"/>
- <permission type="createNonDurableQueue" roles="guest"/>
- <permission type="deleteNonDurableQueue" roles="guest"/>
- </security-setting>
- </security-settings>
- <address-settings>
- <!--default for catch all-->
- <address-setting match="#">
- <dead-letter-address>jms.queue.DLQ</dead-letter-address>
- <expiry-address>jms.queue.ExpiryQueue</expiry-address>
- <redelivery-delay>0</redelivery-delay>
- <max-size-bytes>10485760</max-size-bytes>
- <address-full-policy>PAGE</address-full-policy>
- <page-size-bytes>2097152</page-size-bytes>
- <message-counter-history-day-limit>10</message-counter-history-day-limit>
- </address-setting>
- </address-settings>
- <jms-connection-factories>
- <connection-factory name="InVmConnectionFactory">
- <connectors>
- <connector-ref connector-name="in-vm"/>
- </connectors>
- <entries>
- <entry name="java:/ConnectionFactory"/>
- </entries>
- </connection-factory>
- <connection-factory name="RemoteConnectionFactory">
- <connectors>
- <connector-ref connector-name="http-connector"/>
- </connectors>
- <entries>
- <entry name="java:jboss/exported/jms/RemoteConnectionFactory"/>
- </entries>
- </connection-factory>
- <pooled-connection-factory name="activemq-ra">
- <transaction mode="xa"/>
- <connectors>
- <connector-ref connector-name="in-vm"/>
- </connectors>
- <entries>
- <entry name="java:/JmsXA"/>
- <!-- Global JNDI entry used to provide a default JMS Connection factory to EE application -->
- <entry name="java:jboss/DefaultJMSConnectionFactory"/>
- </entries>
- </pooled-connection-factory>
- </jms-connection-factories>
- <jms-destinations>
- <jms-queue name="testQueue">
- <entry name="queue/test"/>
- <entry name="java:jboss/exported/jms/queues/testQueue"/>
- </jms-queue>
- </jms-destinations>
- </activemq-server>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:naming:2.0">
- <remote-naming/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:pojo:1.0"/>
- <subsystem xmlns="urn:jboss:domain:remoting:2.0">
- <endpoint worker="default"/>
- <http-connector name="http-remoting-connector" connector-ref="default" security-realm="ApplicationRealm"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:resource-adapters:2.0"/>
- <subsystem xmlns="urn:jboss:domain:sar:1.0"/>
- <subsystem xmlns="urn:jboss:domain:security:1.2">
- <security-domains>
- <security-domain name="other" cache-type="default">
- <authentication>
- <login-module code="Remoting" flag="optional">
- <module-option name="password-stacking" value="useFirstPass"/>
- </login-module>
- <login-module code="RealmDirect" flag="required">
- <module-option name="password-stacking" value="useFirstPass"/>
- </login-module>
- </authentication>
- </security-domain>
- <security-domain name="jboss-web-policy" cache-type="default">
- <authorization>
- <policy-module code="Delegating" flag="required"/>
- </authorization>
- </security-domain>
- <security-domain name="jboss-ejb-policy" cache-type="default">
- <authorization>
- <policy-module code="Delegating" flag="required"/>
- </authorization>
- </security-domain>
- </security-domains>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:threads:1.1"/>
- <subsystem xmlns="urn:jboss:domain:transactions:2.0">
- <core-environment>
- <process-id>
- <uuid/>
- </process-id>
- </core-environment>
- <recovery-environment socket-binding="txn-recovery-environment" status-socket-binding="txn-status-manager"/>
- <coordinator-environment default-timeout="300"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:undertow:1.0">
- <buffer-caches>
- <buffer-cache name="default" buffer-size="1024" buffers-per-region="1024" max-regions="10"/>
- </buffer-caches>
- <server name="default-server">
- <http-listener name="default" socket-binding="http"/>
- <host name="default-host" alias="localhost">
- <location name="/" handler="welcome-content"/>
- <filter-ref name="server-header"/>
- <filter-ref name="x-powered-by-header"/>
- </host>
- </server>
- <servlet-container name="default" default-buffer-cache="default" stack-trace-on-error="local-only">
- <jsp-config/>
- </servlet-container>
- <handlers>
- <file name="welcome-content" path="${jboss.home.dir}/welcome-content" directory-listing="true"/>
- </handlers>
- <filters>
- <response-header name="server-header" header-name="Server" header-value="Wildfly 8"/>
- <response-header name="x-powered-by-header" header-name="X-Powered-By" header-value="Undertow 1"/>
- </filters>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:webservices:1.2">
- <modify-wsdl-address>true</modify-wsdl-address>
- <wsdl-host>${jboss.bind.address:127.0.0.1}</wsdl-host>
- <endpoint-config name="Standard-Endpoint-Config"/>
- <endpoint-config name="Recording-Endpoint-Config">
- <pre-handler-chain name="recording-handlers" protocol-bindings="##SOAP11_HTTP ##SOAP11_HTTP_MTOM ##SOAP12_HTTP ##SOAP12_HTTP_MTOM">
- <handler name="RecordingHandler" class="org.jboss.ws.common.invocation.RecordingServerHandler"/>
- </pre-handler-chain>
- </endpoint-config>
- <client-config name="Standard-Client-Config"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:weld:2.0"/>
- </profile>
- <interfaces>
- <interface name="management">
- <inet-address value="${jboss.bind.address.management:127.0.0.1}"/>
- </interface>
- <interface name="public">
- <inet-address value="${jboss.bind.address:127.0.0.1}"/>
- </interface>
- <!-- TODO - only show this if the jacorb subsystem is added -->
- <interface name="unsecure">
- <!--
- ~ Used for IIOP sockets in the standard configuration.
- ~ To secure JacORB you need to setup SSL
- -->
- <inet-address value="${jboss.bind.address.unsecure:127.0.0.1}"/>
- </interface>
- </interfaces>
- <socket-binding-group name="standard-sockets" default-interface="public" port-offset="${jboss.socket.binding.port-offset:0}">
- <socket-binding name="management-http" interface="management" port="${jboss.management.http.port:9990}"/>
- <socket-binding name="management-https" interface="management" port="${jboss.management.https.port:9993}"/>
- <socket-binding name="ajp" port="${jboss.ajp.port:8009}"/>
- <socket-binding name="http" port="${jboss.http.port:8080}"/>
- <socket-binding name="https" port="${jboss.https.port:8443}"/>
- <socket-binding name="jacorb" interface="unsecure" port="3528"/>
- <socket-binding name="jacorb-ssl" interface="unsecure" port="3529"/>
- <socket-binding name="messaging-group" port="0" multicast-address="${jboss.messaging.group.address:231.7.7.7}" multicast-port="${jboss.messaging.group.port:9876}"/>
- <socket-binding name="txn-recovery-environment" port="4712"/>
- <socket-binding name="txn-status-manager" port="4713"/>
- <outbound-socket-binding name="mail-smtp">
- <remote-destination host="localhost" port="25"/>
- </outbound-socket-binding>
- </socket-binding-group>
-</server>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/mdb-cmt-tx-required/src/main/java/org/apache/activemq/javaee/example/MDB_CMT_TxRequiredClientExample.java
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-cmt-tx-required/src/main/java/org/apache/activemq/javaee/example/MDB_CMT_TxRequiredClientExample.java b/examples/javaee/mdb-cmt-tx-required/src/main/java/org/apache/activemq/javaee/example/MDB_CMT_TxRequiredClientExample.java
deleted file mode 100644
index c2ffa27..0000000
--- a/examples/javaee/mdb-cmt-tx-required/src/main/java/org/apache/activemq/javaee/example/MDB_CMT_TxRequiredClientExample.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.activemq.javaee.example;
-
-import javax.jms.Connection;
-import javax.jms.ConnectionFactory;
-import javax.jms.MessageProducer;
-import javax.jms.Queue;
-import javax.jms.Session;
-import javax.jms.TextMessage;
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import java.util.Properties;
-
-/**
- * @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a>
- */
-public class MDB_CMT_TxRequiredClientExample
-{
- public static void main(final String[] args) throws Exception
- {
- Thread.sleep(5000);
- Connection connection = null;
- InitialContext initialContext = null;
- try
- {
- // Step 1. Create an initial context to perform the JNDI lookup.
- final Properties env = new Properties();
-
- env.put(Context.INITIAL_CONTEXT_FACTORY, "org.jboss.naming.remote.client.InitialContextFactory");
-
- env.put(Context.PROVIDER_URL, "http-remoting://localhost:8080");
-
- initialContext = new InitialContext(env);
-
- // Step 2. Perfom a lookup on the queue
- Queue queue = (Queue)initialContext.lookup("jms/queues/testQueue");
-
- // Step 3. Perform a lookup on the Connection Factory
- ConnectionFactory cf = (ConnectionFactory)initialContext.lookup("jms/RemoteConnectionFactory");
-
- // Step 4.Create a JMS Connection
- connection = cf.createConnection("guest", "password");
-
- // Step 5. Create a JMS Session
- Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
-
- // Step 6. Create a JMS Message Producer
- MessageProducer producer = session.createProducer(queue);
- TextMessage message = null;
-
- for (int i = 0; i < 100; i++)
- {
- // Step 7. Create a Text Message
- message = session.createTextMessage("This is a text message");
-
- System.out.println("Sent message: " + message.getText());
- // Step 8. Send the Message
- producer.send(message);
- }
-
-
- // Step 9,10 and 11 in MDBExample
- }
- finally
- {
- // Step 12. Be sure to close our JMS resources!
- if (initialContext != null)
- {
- initialContext.close();
- }
- if (connection != null)
- {
- connection.close();
- }
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/mdb-cmt-tx-required/src/main/java/org/apache/activemq/javaee/example/server/MDB_CMT_TxRequiredExample.java
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-cmt-tx-required/src/main/java/org/apache/activemq/javaee/example/server/MDB_CMT_TxRequiredExample.java b/examples/javaee/mdb-cmt-tx-required/src/main/java/org/apache/activemq/javaee/example/server/MDB_CMT_TxRequiredExample.java
deleted file mode 100644
index 1fc2a87..0000000
--- a/examples/javaee/mdb-cmt-tx-required/src/main/java/org/apache/activemq/javaee/example/server/MDB_CMT_TxRequiredExample.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.activemq.javaee.example.server;
-
-import javax.ejb.ActivationConfigProperty;
-import javax.ejb.MessageDriven;
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.MessageListener;
-import javax.jms.TextMessage;
-import java.util.Calendar;
-
-/**
- * @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a>
- */
-@MessageDriven(name = "MDB_CMT_TxRequiredExample",
- activationConfig =
- {
- @ActivationConfigProperty(propertyName = "destinationType", propertyValue = "javax.jms.Queue"),
- @ActivationConfigProperty(propertyName = "destination", propertyValue = "queue/testQueue"),
- @ActivationConfigProperty(propertyName = "consumerMaxRate", propertyValue = "1")
- })
-public class MDB_CMT_TxRequiredExample implements MessageListener
-{
-
- public void onMessage(final Message message)
- {
- try
- {
- // Step 9. We know the client is sending a text message so we cast
- TextMessage textMessage = (TextMessage) message;
-
- // Step 10. get the text from the message.
- String text = textMessage.getText();
-
- Calendar c = Calendar.getInstance();
-
- System.out.println("message " + text + " received at " + c.getTime());
-
- }
- catch (JMSException e)
- {
- e.printStackTrace();
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/mdb-cmt-tx-required/src/test/java/org/apache/activemq/javaee/examples/MDBCMTSetTXRequiredRunnerTest.java
----------------------------------------------------------------------
diff --git a/examples/javaee/mdb-cmt-tx-required/src/test/java/org/apache/activemq/javaee/examples/MDBCMTSetTXRequiredRunnerTest.java b/examples/javaee/mdb-cmt-tx-required/src/test/java/org/apache/activemq/javaee/examples/MDBCMTSetTXRequiredRunnerTest.java
deleted file mode 100644
index 1d9abb9..0000000
--- a/examples/javaee/mdb-cmt-tx-required/src/test/java/org/apache/activemq/javaee/examples/MDBCMTSetTXRequiredRunnerTest.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.activemq.javaee.examples;
-
-import org.apache.activemq.javaee.example.MDB_CMT_TxRequiredClientExample;
-import org.apache.activemq.javaee.example.server.MDB_CMT_TxRequiredExample;
-import org.jboss.arquillian.container.test.api.Deployment;
-import org.jboss.arquillian.container.test.api.RunAsClient;
-import org.jboss.arquillian.junit.Arquillian;
-import org.jboss.shrinkwrap.api.Archive;
-import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.spec.JavaArchive;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-/**
- * @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a>
- * 5/21/12
- */
-@RunAsClient
-@RunWith(Arquillian.class)
-public class MDBCMTSetTXRequiredRunnerTest
-{
- @Deployment
- public static Archive getDeployment()
- {
-
- final JavaArchive ejbJar = ShrinkWrap.create(JavaArchive.class, "mdb.jar");
- ejbJar.addClass(MDB_CMT_TxRequiredExample.class);
- System.out.println(ejbJar.toString(true));
- return ejbJar;
- }
-
- @Test
- public void runExample() throws Exception
- {
- MDB_CMT_TxRequiredClientExample.main(null);
- //give the example time to run
- Thread.sleep(10000);
- }
-
-
-}
[22/37] activemq-6 git commit: ACTIVEMQ6-51 Example server
bootstrapping
Posted by jb...@apache.org.
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/replicated-failback-static/src/main/resources/hornetq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-failback-static/src/main/resources/hornetq/server1/activemq-configuration.xml b/examples/jms/replicated-failback-static/src/main/resources/hornetq/server1/activemq-configuration.xml
deleted file mode 100644
index b6e3935..0000000
--- a/examples/jms/replicated-failback-static/src/main/resources/hornetq/server1/activemq-configuration.xml
+++ /dev/null
@@ -1,70 +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}/server1/data/messaging/bindings</bindings-directory>
-
- <journal-directory>${build.directory}/server1/data/messaging/journal</journal-directory>
-
- <large-messages-directory>${build.directory}/server1/data/messaging/largemessages</large-messages-directory>
-
- <paging-directory>${build.directory}/server1/data/messaging/paging</paging-directory>
-
- <cluster-user>exampleUser</cluster-user>
-
- <cluster-password>secret</cluster-password>
-
- <ha-policy>
- <replication>
- <slave>
- <allow-failback>true</allow-failback>
- <!-- not needed but tells the backup not to restart after failback as there will be > 0 backups saved -->
- <max-saved-replicated-journals-size>0</max-saved-replicated-journals-size>
- </slave>
- </replication>
- </ha-policy>
-
- <!-- Connectors -->
- <connectors>
- <connector name="netty-live-connector">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
- <param key="port" value="5445"/>
- </connector>
- <connector name="netty-connector">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
- <param key="port" value="5446"/>
- </connector>
- </connectors>
-
- <!-- Acceptors -->
- <acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- <param key="port" value="5446"/>
- </acceptor>
- </acceptors>
-
- <cluster-connections>
- <cluster-connection name="my-cluster">
- <address>jms</address>
- <connector-ref>netty-connector</connector-ref>
- <static-connectors>
- <connector-ref>netty-live-connector</connector-ref>
- </static-connectors>
- </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>
-
-</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/replicated-failback-static/src/main/resources/hornetq/server1/activemq-jms.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index 0d5c953..0000000
--- a/examples/jms/replicated-failback-static/src/main/resources/hornetq/server1/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/replicated-failback-static/src/main/resources/hornetq/server1/activemq-users.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/replicated-failback-static/src/main/resources/hornetq/server1/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/replicated-failback-static/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-failback-static/src/main/resources/jndi.properties b/examples/jms/replicated-failback-static/src/main/resources/jndi.properties
new file mode 100644
index 0000000..8fda7c0
--- /dev/null
+++ b/examples/jms/replicated-failback-static/src/main/resources/jndi.properties
@@ -0,0 +1,7 @@
+java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
+java.naming.provider.url=tcp://localhost:5445
+connection.ConnectionFactory.ha=true
+connection.ConnectionFactory.retryInterval=1000
+connection.ConnectionFactory.retryIntervalMultiplier=1.0
+connection.ConnectionFactory.reconnectAttempts=-1
+queue.queue/exampleQueue=exampleQueue
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/replicated-failback/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-failback/pom.xml b/examples/jms/replicated-failback/pom.xml
index 1aa611d..c2846e2 100644
--- a/examples/jms/replicated-failback/pom.xml
+++ b/examples/jms/replicated-failback/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>
@@ -78,10 +76,6 @@
</goals>
<configuration>
<clientClass>org.apache.activemq.jms.example.ReplicatedFailbackExample</clientClass>
- <args>
- <param>tcp://localhost:5445</param>
- <param>tcp://localhost:5446</param>
- </args>
<systemProperties>
<property>
<name>exampleConfigDir</name>
@@ -96,7 +90,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 +99,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/replicated-failback/src/main/java/org/apache/activemq/jms/example/ReplicatedFailbackExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-failback/src/main/java/org/apache/activemq/jms/example/ReplicatedFailbackExample.java b/examples/jms/replicated-failback/src/main/java/org/apache/activemq/jms/example/ReplicatedFailbackExample.java
index d216f0f..0810ccb 100644
--- a/examples/jms/replicated-failback/src/main/java/org/apache/activemq/jms/example/ReplicatedFailbackExample.java
+++ b/examples/jms/replicated-failback/src/main/java/org/apache/activemq/jms/example/ReplicatedFailbackExample.java
@@ -55,7 +55,7 @@ public class ReplicatedFailbackExample extends ActiveMQExample
try
{
// Step 1. Get an initial context for looking up JNDI from the server #1
- initialContext = getContext(0);
+ initialContext = new InitialContext();
// Step 2. Look up the JMS resources from JNDI
Queue queue = (Queue)initialContext.lookup("queue/exampleQueue");
@@ -100,7 +100,7 @@ public class ReplicatedFailbackExample extends ActiveMQExample
// Step 10. Crash server #1, the live server, and wait a little while to make sure
// it has really crashed
- Thread.sleep(2000);
+ Thread.sleep(5000);
killServer(0);
// Step 11. Acknowledging the 2nd half of the sent messages will fail as failover to the
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/replicated-failback/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-failback/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/replicated-failback/src/main/resources/activemq/server0/activemq-configuration.xml
new file mode 100644
index 0000000..fcec902
--- /dev/null
+++ b/examples/jms/replicated-failback/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -0,0 +1,79 @@
+<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>
+
+ <cluster-user>exampleUser</cluster-user>
+
+ <cluster-password>secret</cluster-password>
+
+ <ha-policy>
+ <replication>
+ <master>
+ <!--we need this for auto failback-->
+ <check-for-live-server>true</check-for-live-server>
+ </master>
+ </replication>
+ </ha-policy>
+
+ <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>
+
+ <broadcast-groups>
+ <broadcast-group name="bg-group1">
+ <group-address>${udp-address:231.7.7.7}</group-address>
+ <group-port>9876</group-port>
+ <broadcast-period>1000</broadcast-period>
+ <connector-ref>netty-connector</connector-ref>
+ </broadcast-group>
+ </broadcast-groups>
+
+ <discovery-groups>
+ <discovery-group name="dg-group1">
+ <group-address>${udp-address:231.7.7.7}</group-address>
+ <group-port>9876</group-port>
+ <refresh-timeout>60000</refresh-timeout>
+ </discovery-group>
+ </discovery-groups>
+
+ <cluster-connections>
+ <cluster-connection name="my-cluster">
+ <address>jms</address>
+ <connector-ref>netty-connector</connector-ref>
+ <discovery-group-ref discovery-group-name="dg-group1"/>
+ </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>
+
+</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/replicated-failback/src/main/resources/activemq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-failback/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/replicated-failback/src/main/resources/activemq/server0/activemq-jms.xml
new file mode 100644
index 0000000..0d5c953
--- /dev/null
+++ b/examples/jms/replicated-failback/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/replicated-failback/src/main/resources/activemq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-failback/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/replicated-failback/src/main/resources/activemq/server0/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/replicated-failback/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/replicated-failback/src/main/resources/activemq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-failback/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/replicated-failback/src/main/resources/activemq/server1/activemq-configuration.xml
new file mode 100644
index 0000000..95c5596
--- /dev/null
+++ b/examples/jms/replicated-failback/src/main/resources/activemq/server1/activemq-configuration.xml
@@ -0,0 +1,83 @@
+<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}/server1/data/messaging/bindings</bindings-directory>
+
+ <journal-directory>${build.directory}/server1/data/messaging/journal</journal-directory>
+
+ <large-messages-directory>${build.directory}/server1/data/messaging/largemessages</large-messages-directory>
+
+ <paging-directory>${build.directory}/server1/data/messaging/paging</paging-directory>
+
+ <cluster-user>exampleUser</cluster-user>
+
+ <cluster-password>secret</cluster-password>
+
+ <ha-policy>
+ <replication>
+ <slave>
+ <allow-failback>true</allow-failback>
+ </slave>
+ </replication>
+ </ha-policy>
+
+ <!-- Connectors -->
+ <connectors>
+ <connector name="netty-live-connector">
+ <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
+ <param key="port" value="5445"/>
+ </connector>
+ <connector name="netty-connector">
+ <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
+ <param key="port" value="5446"/>
+ </connector>
+ </connectors>
+
+ <!-- Acceptors -->
+ <acceptors>
+ <acceptor name="netty-acceptor">
+ <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
+ <param key="port" value="5446"/>
+ </acceptor>
+ </acceptors>
+
+ <broadcast-groups>
+ <broadcast-group name="bg-group1">
+ <group-address>${udp-address:231.7.7.7}</group-address>
+ <group-port>9876</group-port>
+ <broadcast-period>1000</broadcast-period>
+ <connector-ref>netty-connector</connector-ref>
+ </broadcast-group>
+ </broadcast-groups>
+
+ <discovery-groups>
+ <discovery-group name="dg-group1">
+ <group-address>${udp-address:231.7.7.7}</group-address>
+ <group-port>9876</group-port>
+ <refresh-timeout>60000</refresh-timeout>
+ </discovery-group>
+ </discovery-groups>
+
+ <cluster-connections>
+ <cluster-connection name="my-cluster">
+ <address>jms</address>
+ <connector-ref>netty-connector</connector-ref>
+ <discovery-group-ref discovery-group-name="dg-group1"/>
+ </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>
+
+</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/replicated-failback/src/main/resources/activemq/server1/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-failback/src/main/resources/activemq/server1/activemq-jms.xml b/examples/jms/replicated-failback/src/main/resources/activemq/server1/activemq-jms.xml
new file mode 100644
index 0000000..0d5c953
--- /dev/null
+++ b/examples/jms/replicated-failback/src/main/resources/activemq/server1/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/replicated-failback/src/main/resources/activemq/server1/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-failback/src/main/resources/activemq/server1/activemq-users.xml b/examples/jms/replicated-failback/src/main/resources/activemq/server1/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/replicated-failback/src/main/resources/activemq/server1/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/replicated-failback/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-failback/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/replicated-failback/src/main/resources/hornetq/server0/activemq-configuration.xml
deleted file mode 100644
index 7e9f424..0000000
--- a/examples/jms/replicated-failback/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ /dev/null
@@ -1,80 +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>
-
- <cluster-user>exampleUser</cluster-user>
-
- <cluster-password>secret</cluster-password>
-
- <ha-policy>
- <replication>
- <master>
- <!--we need this for auto failback-->
- <check-for-live-server>true</check-for-live-server>
- <allow-failback>true</allow-failback>
- </master>
- </replication>
- </ha-policy>
-
- <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>
-
- <broadcast-groups>
- <broadcast-group name="bg-group1">
- <group-address>${udp-address:231.7.7.7}</group-address>
- <group-port>9876</group-port>
- <broadcast-period>1000</broadcast-period>
- <connector-ref>netty-connector</connector-ref>
- </broadcast-group>
- </broadcast-groups>
-
- <discovery-groups>
- <discovery-group name="dg-group1">
- <group-address>${udp-address:231.7.7.7}</group-address>
- <group-port>9876</group-port>
- <refresh-timeout>60000</refresh-timeout>
- </discovery-group>
- </discovery-groups>
-
- <cluster-connections>
- <cluster-connection name="my-cluster">
- <address>jms</address>
- <connector-ref>netty-connector</connector-ref>
- <discovery-group-ref discovery-group-name="dg-group1"/>
- </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>
-
-</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/replicated-failback/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index 0d5c953..0000000
--- a/examples/jms/replicated-failback/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/replicated-failback/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/replicated-failback/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/replicated-failback/src/main/resources/hornetq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-failback/src/main/resources/hornetq/server1/activemq-configuration.xml b/examples/jms/replicated-failback/src/main/resources/hornetq/server1/activemq-configuration.xml
deleted file mode 100644
index 95c5596..0000000
--- a/examples/jms/replicated-failback/src/main/resources/hornetq/server1/activemq-configuration.xml
+++ /dev/null
@@ -1,83 +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}/server1/data/messaging/bindings</bindings-directory>
-
- <journal-directory>${build.directory}/server1/data/messaging/journal</journal-directory>
-
- <large-messages-directory>${build.directory}/server1/data/messaging/largemessages</large-messages-directory>
-
- <paging-directory>${build.directory}/server1/data/messaging/paging</paging-directory>
-
- <cluster-user>exampleUser</cluster-user>
-
- <cluster-password>secret</cluster-password>
-
- <ha-policy>
- <replication>
- <slave>
- <allow-failback>true</allow-failback>
- </slave>
- </replication>
- </ha-policy>
-
- <!-- Connectors -->
- <connectors>
- <connector name="netty-live-connector">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
- <param key="port" value="5445"/>
- </connector>
- <connector name="netty-connector">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
- <param key="port" value="5446"/>
- </connector>
- </connectors>
-
- <!-- Acceptors -->
- <acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- <param key="port" value="5446"/>
- </acceptor>
- </acceptors>
-
- <broadcast-groups>
- <broadcast-group name="bg-group1">
- <group-address>${udp-address:231.7.7.7}</group-address>
- <group-port>9876</group-port>
- <broadcast-period>1000</broadcast-period>
- <connector-ref>netty-connector</connector-ref>
- </broadcast-group>
- </broadcast-groups>
-
- <discovery-groups>
- <discovery-group name="dg-group1">
- <group-address>${udp-address:231.7.7.7}</group-address>
- <group-port>9876</group-port>
- <refresh-timeout>60000</refresh-timeout>
- </discovery-group>
- </discovery-groups>
-
- <cluster-connections>
- <cluster-connection name="my-cluster">
- <address>jms</address>
- <connector-ref>netty-connector</connector-ref>
- <discovery-group-ref discovery-group-name="dg-group1"/>
- </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>
-
-</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/replicated-failback/src/main/resources/hornetq/server1/activemq-jms.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index 0d5c953..0000000
--- a/examples/jms/replicated-failback/src/main/resources/hornetq/server1/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/replicated-failback/src/main/resources/hornetq/server1/activemq-users.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/replicated-failback/src/main/resources/hornetq/server1/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/replicated-failback/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-failback/src/main/resources/jndi.properties b/examples/jms/replicated-failback/src/main/resources/jndi.properties
new file mode 100644
index 0000000..8fda7c0
--- /dev/null
+++ b/examples/jms/replicated-failback/src/main/resources/jndi.properties
@@ -0,0 +1,7 @@
+java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
+java.naming.provider.url=tcp://localhost:5445
+connection.ConnectionFactory.ha=true
+connection.ConnectionFactory.retryInterval=1000
+connection.ConnectionFactory.retryIntervalMultiplier=1.0
+connection.ConnectionFactory.reconnectAttempts=-1
+queue.queue/exampleQueue=exampleQueue
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/replicated-multiple-failover/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-multiple-failover/pom.xml b/examples/jms/replicated-multiple-failover/pom.xml
index 1afd8ab..45ef67b 100644
--- a/examples/jms/replicated-multiple-failover/pom.xml
+++ b/examples/jms/replicated-multiple-failover/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>
@@ -77,9 +75,7 @@
<goal>start</goal>
</goals>
<configuration>
- <jndiPort>1299</jndiPort>
- <jndiRmiPort>1298</jndiRmiPort>
- <hornetqConfigurationDir>${basedir}/target/classes/activemq/server2</hornetqConfigurationDir>
+ <configurationDir>${basedir}/target/classes/activemq/server2</configurationDir>
<fork>true</fork>
<systemProperties>
<property>
@@ -100,11 +96,6 @@
</goals>
<configuration>
<clientClass>org.apache.activemq.jms.example.ReplicatedMultipleFailoverExample</clientClass>
- <args>
- <param>tcp://localhost:5445</param>
- <param>tcp://localhost:5446</param>
- <param>tcp://localhost:5447</param>
- </args>
<systemProperties>
<property>
<name>exampleConfigDir</name>
@@ -119,7 +110,7 @@
<goal>stop</goal>
</goals>
<configuration>
- <hornetqConfigurationDir>${basedir}/target/classes/activemq/server0</hornetqConfigurationDir>
+ <configurationDir>${basedir}/target/classes/activemq/server0</configurationDir>
</configuration>
</execution>
<execution>
@@ -128,7 +119,7 @@
<goal>stop</goal>
</goals>
<configuration>
- <hornetqConfigurationDir>${basedir}/target/classes/activemq/server1</hornetqConfigurationDir>
+ <configurationDir>${basedir}/target/classes/activemq/server1</configurationDir>
</configuration>
</execution>
<execution>
@@ -137,7 +128,7 @@
<goal>stop</goal>
</goals>
<configuration>
- <hornetqConfigurationDir>${basedir}/target/classes/activemq/server2</hornetqConfigurationDir>
+ <configurationDir>${basedir}/target/classes/activemq/server2</configurationDir>
</configuration>
</execution>
</executions>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/replicated-multiple-failover/src/main/java/org/apache/activemq/jms/example/ReplicatedMultipleFailoverExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-multiple-failover/src/main/java/org/apache/activemq/jms/example/ReplicatedMultipleFailoverExample.java b/examples/jms/replicated-multiple-failover/src/main/java/org/apache/activemq/jms/example/ReplicatedMultipleFailoverExample.java
index 5ca8ffb..6b88fad 100644
--- a/examples/jms/replicated-multiple-failover/src/main/java/org/apache/activemq/jms/example/ReplicatedMultipleFailoverExample.java
+++ b/examples/jms/replicated-multiple-failover/src/main/java/org/apache/activemq/jms/example/ReplicatedMultipleFailoverExample.java
@@ -52,7 +52,7 @@ public class ReplicatedMultipleFailoverExample extends ActiveMQExample
try
{
// Step 1. Get an initial context for looking up JNDI from the server #1
- initialContext = getContext(0);
+ initialContext = new InitialContext();
// Step 2. Look up the JMS resources from JNDI
Queue queue = (Queue)initialContext.lookup("queue/exampleQueue");
@@ -97,7 +97,7 @@ public class ReplicatedMultipleFailoverExample extends ActiveMQExample
// Step 10. Crash server #1, the live server, and wait a little while to make sure
// it has really crashed
- Thread.sleep(2000);
+ Thread.sleep(5000);
killServer(0);
// Step 11. Acknowledging the 2nd half of the sent messages will fail as failover to the
@@ -119,7 +119,7 @@ public class ReplicatedMultipleFailoverExample extends ActiveMQExample
}
message0.acknowledge();
- Thread.sleep(2000);
+ Thread.sleep(5000);
killServer(getServer(connection));
// Step 11. Acknowledging the 2nd half of the sent messages will fail as failover to the
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server0/activemq-configuration.xml
new file mode 100644
index 0000000..1b19ccf
--- /dev/null
+++ b/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -0,0 +1,73 @@
+<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>
+
+ <ha-policy>
+ <replication>
+ <master/>
+ </replication>
+ </ha-policy>
+
+ <!-- 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>
+
+ <broadcast-groups>
+ <broadcast-group name="bg-group1">
+ <group-address>${udp-address:231.7.7.7}</group-address>
+ <group-port>9876</group-port>
+ <broadcast-period>1000</broadcast-period>
+ <connector-ref>netty-connector</connector-ref>
+ </broadcast-group>
+ </broadcast-groups>
+
+ <discovery-groups>
+ <discovery-group name="dg-group1">
+ <group-address>${udp-address:231.7.7.7}</group-address>
+ <group-port>9876</group-port>
+ <refresh-timeout>60000</refresh-timeout>
+ </discovery-group>
+ </discovery-groups>
+
+ <cluster-connections>
+ <cluster-connection name="my-cluster">
+ <address>jms</address>
+ <connector-ref>netty-connector</connector-ref>
+ <discovery-group-ref discovery-group-name="dg-group1"/>
+ </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>
+
+</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server0/activemq-jms.xml
new file mode 100644
index 0000000..0d5c953
--- /dev/null
+++ b/examples/jms/replicated-multiple-failover/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/replicated-multiple-failover/src/main/resources/activemq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server0/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/replicated-multiple-failover/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/replicated-multiple-failover/src/main/resources/activemq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server1/activemq-configuration.xml
new file mode 100644
index 0000000..a518181
--- /dev/null
+++ b/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server1/activemq-configuration.xml
@@ -0,0 +1,73 @@
+<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}/server1/data/messaging/bindings</bindings-directory>
+
+ <journal-directory>${build.directory}/server1/data/messaging/journal</journal-directory>
+
+ <large-messages-directory>${build.directory}/server1/data/messaging/largemessages</large-messages-directory>
+
+ <paging-directory>${build.directory}/server1/data/messaging/paging</paging-directory>
+
+ <ha-policy>
+ <replication>
+ <slave/>
+ </replication>
+ </ha-policy>
+
+ <!-- Connectors -->
+ <connectors>
+ <connector name="netty-connector">
+ <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
+ <param key="port" value="5446"/>
+ </connector>
+ </connectors>
+
+ <!-- Acceptors -->
+ <acceptors>
+ <acceptor name="netty-acceptor">
+ <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
+ <param key="port" value="5446"/>
+ </acceptor>
+ </acceptors>
+
+ <broadcast-groups>
+ <broadcast-group name="bg-group1">
+ <group-address>${udp-address:231.7.7.7}</group-address>
+ <group-port>9876</group-port>
+ <broadcast-period>1000</broadcast-period>
+ <connector-ref>netty-connector</connector-ref>
+ </broadcast-group>
+ </broadcast-groups>
+
+ <discovery-groups>
+ <discovery-group name="dg-group1">
+ <group-address>${udp-address:231.7.7.7}</group-address>
+ <group-port>9876</group-port>
+ <refresh-timeout>60000</refresh-timeout>
+ </discovery-group>
+ </discovery-groups>
+
+ <cluster-connections>
+ <cluster-connection name="my-cluster">
+ <address>jms</address>
+ <connector-ref>netty-connector</connector-ref>
+ <discovery-group-ref discovery-group-name="dg-group1"/>
+ </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>
+
+</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server1/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server1/activemq-jms.xml b/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server1/activemq-jms.xml
new file mode 100644
index 0000000..0d5c953
--- /dev/null
+++ b/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server1/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/replicated-multiple-failover/src/main/resources/activemq/server1/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server1/activemq-users.xml b/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server1/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server1/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/replicated-multiple-failover/src/main/resources/activemq/server2/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server2/activemq-configuration.xml b/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server2/activemq-configuration.xml
new file mode 100644
index 0000000..6787b3c
--- /dev/null
+++ b/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server2/activemq-configuration.xml
@@ -0,0 +1,72 @@
+<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}/server2/data/messaging/bindings</bindings-directory>
+
+ <journal-directory>${build.directory}/server2/data/messaging/journal</journal-directory>
+
+ <large-messages-directory>${build.directory}/server2/data/messaging/largemessages</large-messages-directory>
+
+ <paging-directory>${build.directory}/server2/data/messaging/paging</paging-directory>
+
+ <ha-policy>
+ <replication>
+ <slave/>
+ </replication>
+ </ha-policy>
+
+ <connectors>
+ <connector name="netty-connector">
+ <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
+ <param key="port" value="5447"/>
+ </connector>
+ </connectors>
+
+ <!-- Acceptors -->
+ <acceptors>
+ <acceptor name="netty-acceptor">
+ <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
+ <param key="port" value="5447"/>
+ </acceptor>
+ </acceptors>
+
+ <broadcast-groups>
+ <broadcast-group name="bg-group1">
+ <group-address>${udp-address:231.7.7.7}</group-address>
+ <group-port>9876</group-port>
+ <broadcast-period>1000</broadcast-period>
+ <connector-ref>netty-connector</connector-ref>
+ </broadcast-group>
+ </broadcast-groups>
+
+ <discovery-groups>
+ <discovery-group name="dg-group1">
+ <group-address>${udp-address:231.7.7.7}</group-address>
+ <group-port>9876</group-port>
+ <refresh-timeout>60000</refresh-timeout>
+ </discovery-group>
+ </discovery-groups>
+
+ <cluster-connections>
+ <cluster-connection name="my-cluster">
+ <address>jms</address>
+ <connector-ref>netty-connector</connector-ref>
+ <discovery-group-ref discovery-group-name="dg-group1"/>
+ </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>
+
+</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server2/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server2/activemq-jms.xml b/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server2/activemq-jms.xml
new file mode 100644
index 0000000..0d5c953
--- /dev/null
+++ b/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server2/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/replicated-multiple-failover/src/main/resources/activemq/server2/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server2/activemq-users.xml b/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server2/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server2/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/replicated-multiple-failover/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server0/activemq-configuration.xml
deleted file mode 100644
index 1b19ccf..0000000
--- a/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ /dev/null
@@ -1,73 +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>
-
- <ha-policy>
- <replication>
- <master/>
- </replication>
- </ha-policy>
-
- <!-- 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>
-
- <broadcast-groups>
- <broadcast-group name="bg-group1">
- <group-address>${udp-address:231.7.7.7}</group-address>
- <group-port>9876</group-port>
- <broadcast-period>1000</broadcast-period>
- <connector-ref>netty-connector</connector-ref>
- </broadcast-group>
- </broadcast-groups>
-
- <discovery-groups>
- <discovery-group name="dg-group1">
- <group-address>${udp-address:231.7.7.7}</group-address>
- <group-port>9876</group-port>
- <refresh-timeout>60000</refresh-timeout>
- </discovery-group>
- </discovery-groups>
-
- <cluster-connections>
- <cluster-connection name="my-cluster">
- <address>jms</address>
- <connector-ref>netty-connector</connector-ref>
- <discovery-group-ref discovery-group-name="dg-group1"/>
- </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>
-
-</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index 0d5c953..0000000
--- a/examples/jms/replicated-multiple-failover/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/replicated-multiple-failover/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/replicated-multiple-failover/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/replicated-multiple-failover/src/main/resources/hornetq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server1/activemq-configuration.xml b/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server1/activemq-configuration.xml
deleted file mode 100644
index 0be89a7..0000000
--- a/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server1/activemq-configuration.xml
+++ /dev/null
@@ -1,77 +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}/server1/data/messaging/bindings</bindings-directory>
-
- <journal-directory>${build.directory}/server1/data/messaging/journal</journal-directory>
-
- <large-messages-directory>${build.directory}/server1/data/messaging/largemessages</large-messages-directory>
-
- <paging-directory>${build.directory}/server1/data/messaging/paging</paging-directory>
-
- <ha-policy>
- <replication>
- <slave/>
- </replication>
- </ha-policy>
-
- <!-- Connectors -->
- <connectors>
- <connector name="netty-live-connector">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
- <param key="port" value="5445"/>
- </connector>
- <connector name="netty-connector">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
- <param key="port" value="5446"/>
- </connector>
- </connectors>
-
- <!-- Acceptors -->
- <acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- <param key="port" value="5446"/>
- </acceptor>
- </acceptors>
-
- <broadcast-groups>
- <broadcast-group name="bg-group1">
- <group-address>${udp-address:231.7.7.7}</group-address>
- <group-port>9876</group-port>
- <broadcast-period>1000</broadcast-period>
- <connector-ref>netty-connector</connector-ref>
- </broadcast-group>
- </broadcast-groups>
-
- <discovery-groups>
- <discovery-group name="dg-group1">
- <group-address>${udp-address:231.7.7.7}</group-address>
- <group-port>9876</group-port>
- <refresh-timeout>60000</refresh-timeout>
- </discovery-group>
- </discovery-groups>
-
- <cluster-connections>
- <cluster-connection name="my-cluster">
- <address>jms</address>
- <connector-ref>netty-connector</connector-ref>
- <discovery-group-ref discovery-group-name="dg-group1"/>
- </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>
-
-</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server1/activemq-jms.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index 0d5c953..0000000
--- a/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server1/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/replicated-multiple-failover/src/main/resources/hornetq/server1/activemq-users.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server1/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/replicated-multiple-failover/src/main/resources/hornetq/server2/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server2/activemq-configuration.xml b/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server2/activemq-configuration.xml
deleted file mode 100644
index e1e6d9e..0000000
--- a/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server2/activemq-configuration.xml
+++ /dev/null
@@ -1,76 +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}/server2/data/messaging/bindings</bindings-directory>
-
- <journal-directory>${build.directory}/server2/data/messaging/journal</journal-directory>
-
- <large-messages-directory>${build.directory}/server2/data/messaging/largemessages</large-messages-directory>
-
- <paging-directory>${build.directory}/server2/data/messaging/paging</paging-directory>
-
- <ha-policy>
- <replication>
- <slave/>
- </replication>
- </ha-policy>
-
- <connectors>
- <connector name="netty-live-connector">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
- <param key="port" value="5446"/>
- </connector>
- <connector name="netty-connector">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
- <param key="port" value="5447"/>
- </connector>
- </connectors>
-
- <!-- Acceptors -->
- <acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- <param key="port" value="5447"/>
- </acceptor>
- </acceptors>
-
- <broadcast-groups>
- <broadcast-group name="bg-group1">
- <group-address>${udp-address:231.7.7.7}</group-address>
- <group-port>9876</group-port>
- <broadcast-period>1000</broadcast-period>
- <connector-ref>netty-connector</connector-ref>
- </broadcast-group>
- </broadcast-groups>
-
- <discovery-groups>
- <discovery-group name="dg-group1">
- <group-address>${udp-address:231.7.7.7}</group-address>
- <group-port>9876</group-port>
- <refresh-timeout>60000</refresh-timeout>
- </discovery-group>
- </discovery-groups>
-
- <cluster-connections>
- <cluster-connection name="my-cluster">
- <address>jms</address>
- <connector-ref>netty-connector</connector-ref>
- <discovery-group-ref discovery-group-name="dg-group1"/>
- </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>
-
-</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server2/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server2/activemq-jms.xml b/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server2/activemq-jms.xml
deleted file mode 100644
index 0d5c953..0000000
--- a/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server2/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/replicated-multiple-failover/src/main/resources/hornetq/server2/activemq-users.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server2/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/replicated-multiple-failover/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-multiple-failover/src/main/resources/jndi.properties b/examples/jms/replicated-multiple-failover/src/main/resources/jndi.properties
new file mode 100644
index 0000000..8fda7c0
--- /dev/null
+++ b/examples/jms/replicated-multiple-failover/src/main/resources/jndi.properties
@@ -0,0 +1,7 @@
+java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
+java.naming.provider.url=tcp://localhost:5445
+connection.ConnectionFactory.ha=true
+connection.ConnectionFactory.retryInterval=1000
+connection.ConnectionFactory.retryIntervalMultiplier=1.0
+connection.ConnectionFactory.reconnectAttempts=-1
+queue.queue/exampleQueue=exampleQueue
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/replicated-transaction-failover/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-transaction-failover/pom.xml b/examples/jms/replicated-transaction-failover/pom.xml
index 5d1dc03..64f6c36 100644
--- a/examples/jms/replicated-transaction-failover/pom.xml
+++ b/examples/jms/replicated-transaction-failover/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>
<systemProperties>
<property>
<name>build.directory</name>
@@ -78,10 +76,6 @@
</goals>
<configuration>
<clientClass>org.apache.activemq.jms.example.ReplicatedTransactionFailoverExample</clientClass>
- <args>
- <param>tcp://localhost:5445</param>
- <param>tcp://localhost:5446</param>
- </args>
<systemProperties>
<property>
<name>exampleConfigDir</name>
@@ -96,7 +90,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 +99,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/replicated-transaction-failover/src/main/java/org/apache/activemq/jms/example/ReplicatedTransactionFailoverExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-transaction-failover/src/main/java/org/apache/activemq/jms/example/ReplicatedTransactionFailoverExample.java b/examples/jms/replicated-transaction-failover/src/main/java/org/apache/activemq/jms/example/ReplicatedTransactionFailoverExample.java
index fe0e9d1..80f8ed6 100644
--- a/examples/jms/replicated-transaction-failover/src/main/java/org/apache/activemq/jms/example/ReplicatedTransactionFailoverExample.java
+++ b/examples/jms/replicated-transaction-failover/src/main/java/org/apache/activemq/jms/example/ReplicatedTransactionFailoverExample.java
@@ -54,7 +54,7 @@ public class ReplicatedTransactionFailoverExample extends ActiveMQExample
try
{
// Step 1. Get an initial context for looking up JNDI from the server #1
- initialContext = getContext(0);
+ initialContext = new InitialContext();
// Step 2. Look-up the JMS resources from JNDI
Queue queue = (Queue)initialContext.lookup("queue/exampleQueue");
@@ -155,7 +155,7 @@ public class ReplicatedTransactionFailoverExample extends ActiveMQExample
if (killServer)
{
- Thread.sleep(2000);
+ Thread.sleep(5000);
killServer(0);
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/replicated-transaction-failover/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-transaction-failover/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/replicated-transaction-failover/src/main/resources/activemq/server0/activemq-configuration.xml
new file mode 100644
index 0000000..9ed557f
--- /dev/null
+++ b/examples/jms/replicated-transaction-failover/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -0,0 +1,74 @@
+<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>
+
+ <ha-policy>
+ <replication>
+ <master/>
+ </replication>
+ </ha-policy>
+
+ <!-- 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>
+
+ <broadcast-groups>
+ <broadcast-group name="bg-group1">
+ <group-address>${udp-address:231.7.7.7}</group-address>
+ <group-port>9876</group-port>
+ <broadcast-period>1000</broadcast-period>
+ <connector-ref>netty-connector</connector-ref>
+ </broadcast-group>
+ </broadcast-groups>
+
+ <discovery-groups>
+ <discovery-group name="dg-group1">
+ <group-address>${udp-address:231.7.7.7}</group-address>
+ <group-port>9876</group-port>
+ <refresh-timeout>60000</refresh-timeout>
+ </discovery-group>
+ </discovery-groups>
+
+ <cluster-connections>
+ <cluster-connection name="my-cluster">
+ <address>jms</address>
+ <connector-ref>netty-connector</connector-ref>
+ <discovery-group-ref discovery-group-name="dg-group1"/>
+ </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>
+
+</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/replicated-transaction-failover/src/main/resources/activemq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-transaction-failover/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/replicated-transaction-failover/src/main/resources/activemq/server0/activemq-jms.xml
new file mode 100644
index 0000000..0d5c953
--- /dev/null
+++ b/examples/jms/replicated-transaction-failover/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/replicated-transaction-failover/src/main/resources/activemq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-transaction-failover/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/replicated-transaction-failover/src/main/resources/activemq/server0/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/replicated-transaction-failover/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/replicated-transaction-failover/src/main/resources/activemq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-transaction-failover/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/replicated-transaction-failover/src/main/resources/activemq/server1/activemq-configuration.xml
new file mode 100644
index 0000000..3cb1302
--- /dev/null
+++ b/examples/jms/replicated-transaction-failover/src/main/resources/activemq/server1/activemq-configuration.xml
@@ -0,0 +1,75 @@
+<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}/server1/data/messaging/bindings</bindings-directory>
+
+ <journal-directory>${build.directory}/server1/data/messaging/journal</journal-directory>
+
+ <large-messages-directory>${build.directory}/server1/data/messaging/largemessages</large-messages-directory>
+
+ <paging-directory>${build.directory}/server1/data/messaging/paging</paging-directory>
+
+ <ha-policy>
+ <replication>
+ <slave/>
+ </replication>
+ </ha-policy>
+
+ <!-- Connectors -->
+
+ <connectors>
+ <connector name="netty-connector">
+ <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
+ <param key="port" value="5446"/>
+ </connector>
+ </connectors>
+
+ <!-- Acceptors -->
+ <acceptors>
+ <acceptor name="netty-acceptor">
+ <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
+ <param key="port" value="5446"/>
+ </acceptor>
+ </acceptors>
+
+ <broadcast-groups>
+ <broadcast-group name="bg-group1">
+ <group-address>${udp-address:231.7.7.7}</group-address>
+ <group-port>9876</group-port>
+ <broadcast-period>1000</broadcast-period>
+ <connector-ref>netty-connector</connector-ref>
+ </broadcast-group>
+ </broadcast-groups>
+
+ <discovery-groups>
+ <discovery-group name="dg-group1">
+ <group-address>${udp-address:231.7.7.7}</group-address>
+ <group-port>9876</group-port>
+ <refresh-timeout>60000</refresh-timeout>
+ </discovery-group>
+ </discovery-groups>
+
+ <cluster-connections>
+ <cluster-connection name="my-cluster">
+ <address>jms</address>
+ <connector-ref>netty-connector</connector-ref>
+ <discovery-group-ref discovery-group-name="dg-group1"/>
+ </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>
+
+</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/replicated-transaction-failover/src/main/resources/activemq/server1/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-transaction-failover/src/main/resources/activemq/server1/activemq-jms.xml b/examples/jms/replicated-transaction-failover/src/main/resources/activemq/server1/activemq-jms.xml
new file mode 100644
index 0000000..0d5c953
--- /dev/null
+++ b/examples/jms/replicated-transaction-failover/src/main/resources/activemq/server1/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/replicated-transaction-failover/src/main/resources/activemq/server1/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-transaction-failover/src/main/resources/activemq/server1/activemq-users.xml b/examples/jms/replicated-transaction-failover/src/main/resources/activemq/server1/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/replicated-transaction-failover/src/main/resources/activemq/server1/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/replicated-transaction-failover/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-transaction-failover/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/replicated-transaction-failover/src/main/resources/hornetq/server0/activemq-configuration.xml
deleted file mode 100644
index 9ed557f..0000000
--- a/examples/jms/replicated-transaction-failover/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ /dev/null
@@ -1,74 +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>
-
- <ha-policy>
- <replication>
- <master/>
- </replication>
- </ha-policy>
-
- <!-- 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>
-
- <broadcast-groups>
- <broadcast-group name="bg-group1">
- <group-address>${udp-address:231.7.7.7}</group-address>
- <group-port>9876</group-port>
- <broadcast-period>1000</broadcast-period>
- <connector-ref>netty-connector</connector-ref>
- </broadcast-group>
- </broadcast-groups>
-
- <discovery-groups>
- <discovery-group name="dg-group1">
- <group-address>${udp-address:231.7.7.7}</group-address>
- <group-port>9876</group-port>
- <refresh-timeout>60000</refresh-timeout>
- </discovery-group>
- </discovery-groups>
-
- <cluster-connections>
- <cluster-connection name="my-cluster">
- <address>jms</address>
- <connector-ref>netty-connector</connector-ref>
- <discovery-group-ref discovery-group-name="dg-group1"/>
- </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>
-
-</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/replicated-transaction-failover/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-transaction-failover/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/replicated-transaction-failover/src/main/resources/hornetq/server0/activemq-jms.xml
deleted file mode 100644
index 0d5c953..0000000
--- a/examples/jms/replicated-transaction-failover/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>
[29/37] activemq-6 git commit: ACTIVEMQ6-51 Example server
bootstrapping
Posted by jb...@apache.org.
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/colocated-failover/src/main/resources/hornetq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/colocated-failover/src/main/resources/hornetq/server1/activemq-configuration.xml b/examples/jms/colocated-failover/src/main/resources/hornetq/server1/activemq-configuration.xml
deleted file mode 100644
index 2c19b91..0000000
--- a/examples/jms/colocated-failover/src/main/resources/hornetq/server1/activemq-configuration.xml
+++ /dev/null
@@ -1,90 +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>target/server1/data/messaging/bindings</bindings-directory>
-
- <journal-directory>target/server1/data/messaging/journal</journal-directory>
-
- <large-messages-directory>target/server1/data/messaging/largemessages</large-messages-directory>
-
- <paging-directory>target/server1/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="5446"/>
- </connector>
- </connectors>
-
- <!-- Acceptors -->
- <acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- <param key="port" value="5446"/>
- </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>true</forward-when-no-consumers>
- <max-hops>1</max-hops>
- <discovery-group-ref discovery-group-name="my-discovery-group"/>
- </cluster-connection>
- </cluster-connections>
-
- <!-- a colocated server that will allow shared store full backups to be requested-->
- <ha-policy>
- <shared-store>
- <colocated>
- <backup-port-offset>100</backup-port-offset>
- <backup-request-retries>-1</backup-request-retries>
- <backup-request-retry-interval>2000</backup-request-retry-interval>
- <max-backups>1</max-backups>
- <request-backup>true</request-backup>
- <master/>
- <slave/>
- </colocated>
- </shared-store>
- </ha-policy>
-
- <!-- 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/colocated-failover/src/main/resources/hornetq/server1/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/colocated-failover/src/main/resources/hornetq/server1/activemq-jms.xml b/examples/jms/colocated-failover/src/main/resources/hornetq/server1/activemq-jms.xml
deleted file mode 100644
index 0a77a3f..0000000
--- a/examples/jms/colocated-failover/src/main/resources/hornetq/server1/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">
- <!--the queue used by the example-->
- <queue name="exampleQueue"/>
-
-</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/colocated-failover/src/main/resources/hornetq/server1/activemq-users.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/colocated-failover/src/main/resources/hornetq/server1/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/consumer-rate-limit/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/consumer-rate-limit/pom.xml b/examples/jms/consumer-rate-limit/pom.xml
index 2b95571..5d62a14 100644
--- a/examples/jms/consumer-rate-limit/pom.xml
+++ b/examples/jms/consumer-rate-limit/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/consumer-rate-limit/src/main/java/org/apache/activemq/jms/example/ConsumerRateLimitExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/consumer-rate-limit/src/main/java/org/apache/activemq/jms/example/ConsumerRateLimitExample.java b/examples/jms/consumer-rate-limit/src/main/java/org/apache/activemq/jms/example/ConsumerRateLimitExample.java
index 5bb9da8..4121685 100644
--- a/examples/jms/consumer-rate-limit/src/main/java/org/apache/activemq/jms/example/ConsumerRateLimitExample.java
+++ b/examples/jms/consumer-rate-limit/src/main/java/org/apache/activemq/jms/example/ConsumerRateLimitExample.java
@@ -48,7 +48,7 @@ public class ConsumerRateLimitExample 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/consumer-rate-limit/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/consumer-rate-limit/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/consumer-rate-limit/src/main/resources/activemq/server0/activemq-configuration.xml
new file mode 100644
index 0000000..52d9570
--- /dev/null
+++ b/examples/jms/consumer-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/consumer-rate-limit/src/main/resources/activemq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/consumer-rate-limit/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/consumer-rate-limit/src/main/resources/activemq/server0/activemq-jms.xml
new file mode 100644
index 0000000..0d5c953
--- /dev/null
+++ b/examples/jms/consumer-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/consumer-rate-limit/src/main/resources/activemq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/consumer-rate-limit/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/consumer-rate-limit/src/main/resources/activemq/server0/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/consumer-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/consumer-rate-limit/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/consumer-rate-limit/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/consumer-rate-limit/src/main/resources/hornetq/server0/activemq-configuration.xml
deleted file mode 100644
index daab0a3..0000000
--- a/examples/jms/consumer-rate-limit/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>
-
- <!-- 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/consumer-rate-limit/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/consumer-rate-limit/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/consumer-rate-limit/src/main/resources/hornetq/server0/activemq-jms.xml
deleted file mode 100644
index 0d5c953..0000000
--- a/examples/jms/consumer-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/consumer-rate-limit/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/consumer-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/consumer-rate-limit/src/main/resources/hornetq/server0/client-jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/consumer-rate-limit/src/main/resources/hornetq/server0/client-jndi.properties b/examples/jms/consumer-rate-limit/src/main/resources/hornetq/server0/client-jndi.properties
deleted file mode 100644
index 6940f75..0000000
--- a/examples/jms/consumer-rate-limit/src/main/resources/hornetq/server0/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/consumer-rate-limit/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/consumer-rate-limit/src/main/resources/jndi.properties b/examples/jms/consumer-rate-limit/src/main/resources/jndi.properties
new file mode 100644
index 0000000..21f36b2
--- /dev/null
+++ b/examples/jms/consumer-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.consumerMaxRate=10
+queue.queue/exampleQueue=exampleQueue
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/dead-letter/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/dead-letter/pom.xml b/examples/jms/dead-letter/pom.xml
index 6f7ebc8..5035c89 100644
--- a/examples/jms/dead-letter/pom.xml
+++ b/examples/jms/dead-letter/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/dead-letter/src/main/java/org/apache/activemq/jms/example/DeadLetterExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/dead-letter/src/main/java/org/apache/activemq/jms/example/DeadLetterExample.java b/examples/jms/dead-letter/src/main/java/org/apache/activemq/jms/example/DeadLetterExample.java
index 1768955..d38cebe 100644
--- a/examples/jms/dead-letter/src/main/java/org/apache/activemq/jms/example/DeadLetterExample.java
+++ b/examples/jms/dead-letter/src/main/java/org/apache/activemq/jms/example/DeadLetterExample.java
@@ -49,7 +49,7 @@ public class DeadLetterExample 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/dead-letter/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/dead-letter/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/dead-letter/src/main/resources/activemq/server0/activemq-configuration.xml
new file mode 100644
index 0000000..19c89b5
--- /dev/null
+++ b/examples/jms/dead-letter/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="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.#">
+ <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>
+ <!--override the max-delivery-attempts and dead letter address for the example queue-->
+ <address-setting match="jms.queue.exampleQueue">
+ <dead-letter-address>jms.queue.deadLetterQueue</dead-letter-address>
+ <max-delivery-attempts>3</max-delivery-attempts>
+ </address-setting>
+ </address-settings>
+
+</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/dead-letter/src/main/resources/activemq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/dead-letter/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/dead-letter/src/main/resources/activemq/server0/activemq-jms.xml
new file mode 100644
index 0000000..8fa2fbb
--- /dev/null
+++ b/examples/jms/dead-letter/src/main/resources/activemq/server0/activemq-jms.xml
@@ -0,0 +1,11 @@
+<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"/>
+
+ <!-- the dead letter queue where dead messages will be sent-->
+ <queue name="deadLetterQueue"/>
+
+</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/dead-letter/src/main/resources/activemq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/dead-letter/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/dead-letter/src/main/resources/activemq/server0/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/dead-letter/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/dead-letter/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/dead-letter/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/dead-letter/src/main/resources/hornetq/server0/activemq-configuration.xml
deleted file mode 100644
index a2fd289..0000000
--- a/examples/jms/dead-letter/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 -->
-
- <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.#">
- <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>
- <!--override the max-delivery-attempts and dead letter address for the example queue-->
- <address-setting match="jms.queue.exampleQueue">
- <dead-letter-address>jms.queue.deadLetterQueue</dead-letter-address>
- <max-delivery-attempts>3</max-delivery-attempts>
- </address-setting>
- </address-settings>
-
-</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/dead-letter/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/dead-letter/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/dead-letter/src/main/resources/hornetq/server0/activemq-jms.xml
deleted file mode 100644
index 8fa2fbb..0000000
--- a/examples/jms/dead-letter/src/main/resources/hornetq/server0/activemq-jms.xml
+++ /dev/null
@@ -1,11 +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"/>
-
- <!-- the dead letter queue where dead messages will be sent-->
- <queue name="deadLetterQueue"/>
-
-</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/dead-letter/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/dead-letter/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/dead-letter/src/main/resources/hornetq/server0/client-jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/dead-letter/src/main/resources/hornetq/server0/client-jndi.properties b/examples/jms/dead-letter/src/main/resources/hornetq/server0/client-jndi.properties
deleted file mode 100644
index 6940f75..0000000
--- a/examples/jms/dead-letter/src/main/resources/hornetq/server0/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/dead-letter/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/dead-letter/src/main/resources/jndi.properties b/examples/jms/dead-letter/src/main/resources/jndi.properties
new file mode 100644
index 0000000..d83e731
--- /dev/null
+++ b/examples/jms/dead-letter/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/deadLetterQueue=deadLetterQueue
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/delayed-redelivery/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/delayed-redelivery/pom.xml b/examples/jms/delayed-redelivery/pom.xml
index db25002..ba28d9f 100644
--- a/examples/jms/delayed-redelivery/pom.xml
+++ b/examples/jms/delayed-redelivery/pom.xml
@@ -94,7 +94,7 @@
</dependencies>
<configuration>
<waitOnStart>false</waitOnStart>
- <hornetqConfigurationDir>${basedir}/target/classes/activemq/server0</hornetqConfigurationDir>
+ <configurationDir>${basedir}/target/classes/activemq/server0</configurationDir>
<systemProperties>
<property>
<name>build.directory</name>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/delayed-redelivery/src/main/java/org/apache/activemq/jms/example/DelayedRedeliveryExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/delayed-redelivery/src/main/java/org/apache/activemq/jms/example/DelayedRedeliveryExample.java b/examples/jms/delayed-redelivery/src/main/java/org/apache/activemq/jms/example/DelayedRedeliveryExample.java
index 4bfc1ca..886dcff 100644
--- a/examples/jms/delayed-redelivery/src/main/java/org/apache/activemq/jms/example/DelayedRedeliveryExample.java
+++ b/examples/jms/delayed-redelivery/src/main/java/org/apache/activemq/jms/example/DelayedRedeliveryExample.java
@@ -52,7 +52,7 @@ public class DelayedRedeliveryExample 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 queue
Queue queue = (Queue)initialContext.lookup("queue/exampleQueue");
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/delayed-redelivery/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/delayed-redelivery/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/delayed-redelivery/src/main/resources/activemq/server0/activemq-configuration.xml
new file mode 100644
index 0000000..1b1e55c
--- /dev/null
+++ b/examples/jms/delayed-redelivery/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="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.#">
+ <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>
+ <!--override the redelivery-delay for the example queue-->
+ <address-setting match="jms.queue.exampleQueue">
+ <redelivery-delay>5000</redelivery-delay>
+ </address-setting>
+ </address-settings>
+
+</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/delayed-redelivery/src/main/resources/activemq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/delayed-redelivery/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/delayed-redelivery/src/main/resources/activemq/server0/activemq-jms.xml
new file mode 100644
index 0000000..8fa2fbb
--- /dev/null
+++ b/examples/jms/delayed-redelivery/src/main/resources/activemq/server0/activemq-jms.xml
@@ -0,0 +1,11 @@
+<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"/>
+
+ <!-- the dead letter queue where dead messages will be sent-->
+ <queue name="deadLetterQueue"/>
+
+</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/delayed-redelivery/src/main/resources/activemq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/delayed-redelivery/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/delayed-redelivery/src/main/resources/activemq/server0/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/delayed-redelivery/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/delayed-redelivery/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/delayed-redelivery/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/delayed-redelivery/src/main/resources/hornetq/server0/activemq-configuration.xml
deleted file mode 100644
index 5998306..0000000
--- a/examples/jms/delayed-redelivery/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ /dev/null
@@ -1,49 +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.#">
- <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>
- <!--override the redelivery-delay for the example queue-->
- <address-setting match="jms.queue.exampleQueue">
- <redelivery-delay>5000</redelivery-delay>
- </address-setting>
- </address-settings>
-
-</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/delayed-redelivery/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/delayed-redelivery/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/delayed-redelivery/src/main/resources/hornetq/server0/activemq-jms.xml
deleted file mode 100644
index 8fa2fbb..0000000
--- a/examples/jms/delayed-redelivery/src/main/resources/hornetq/server0/activemq-jms.xml
+++ /dev/null
@@ -1,11 +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"/>
-
- <!-- the dead letter queue where dead messages will be sent-->
- <queue name="deadLetterQueue"/>
-
-</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/delayed-redelivery/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/delayed-redelivery/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/delayed-redelivery/src/main/resources/hornetq/server0/client-jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/delayed-redelivery/src/main/resources/hornetq/server0/client-jndi.properties b/examples/jms/delayed-redelivery/src/main/resources/hornetq/server0/client-jndi.properties
deleted file mode 100644
index 6940f75..0000000
--- a/examples/jms/delayed-redelivery/src/main/resources/hornetq/server0/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/delayed-redelivery/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/delayed-redelivery/src/main/resources/jndi.properties b/examples/jms/delayed-redelivery/src/main/resources/jndi.properties
new file mode 100644
index 0000000..d9b5c6a
--- /dev/null
+++ b/examples/jms/delayed-redelivery/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/divert/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/divert/pom.xml b/examples/jms/divert/pom.xml
index d987365..8f12f9f 100644
--- a/examples/jms/divert/pom.xml
+++ b/examples/jms/divert/pom.xml
@@ -41,7 +41,7 @@
<goal>start</goal>
</goals>
<configuration>
- <hornetqConfigurationDir>${basedir}/target/classes/activemq/server0</hornetqConfigurationDir>
+ <configurationDir>${basedir}/target/classes/activemq/server0</configurationDir>
</configuration>
</execution>
<execution>
@@ -50,9 +50,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>
</configuration>
</execution>
@@ -81,7 +79,7 @@
<goal>stop</goal>
</goals>
<configuration>
- <hornetqConfigurationDir>${basedir}/target/classes/activemq/server0</hornetqConfigurationDir>
+ <configurationDir>${basedir}/target/classes/activemq/server0</configurationDir>
</configuration>
</execution>
<execution>
@@ -90,7 +88,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/divert/src/main/java/org/apache/activemq/jms/example/DivertExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/divert/src/main/java/org/apache/activemq/jms/example/DivertExample.java b/examples/jms/divert/src/main/java/org/apache/activemq/jms/example/DivertExample.java
index 94d69ef..57e4327 100644
--- a/examples/jms/divert/src/main/java/org/apache/activemq/jms/example/DivertExample.java
+++ b/examples/jms/divert/src/main/java/org/apache/activemq/jms/example/DivertExample.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.Message;
@@ -57,7 +59,13 @@ public class DivertExample extends ActiveMQExample
try
{
// Step 1. Create an initial context to perform the JNDI lookup on the London server
- initialContextLondon = 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/orders", "orders");
+ properties.put("topic.topic/priceUpdates", "priceUpdates");
+ properties.put("topic.topic/spyTopic", "spyTopic");
+ initialContextLondon = new InitialContext(properties);
// Step 2. Look-up the queue orderQueue on the London server - this is the queue any orders are sent to
Queue orderQueue = (Queue)initialContextLondon.lookup("queue/orders");
@@ -70,7 +78,11 @@ public class DivertExample extends ActiveMQExample
Topic spyTopic = (Topic)initialContextLondon.lookup("topic/spyTopic");
// Step 6. Create an initial context to perform the JNDI lookup on the New York server
- initialContextNewYork = 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]);
+ properties.put("topic.topic/newYorkPriceUpdates", "newYorkPriceUpdates");
+ initialContextNewYork = new InitialContext(properties);
// Step 7. Look-up the topic newYorkPriceUpdates on the New York server - any price updates sent to
// priceUpdates on the London server will
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/divert/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/divert/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/divert/src/main/resources/activemq/server0/activemq-configuration.xml
new file mode 100644
index 0000000..3d7b7b1
--- /dev/null
+++ b/examples/jms/divert/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -0,0 +1,90 @@
+<configuration xmlns="urn:activemq"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
+
+ <!-- We need to make it clustered otherwise the bridge won't deploy -->
+
+
+ <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>
+ <!-- This connector corresponds to the New York server -->
+ <connector name="newyork-connector">
+ <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
+ <param key="port" value="5446"/>
+ </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>
+
+ <!-- Divert configuration -->
+
+ <!-- We need to create a core queue for the JMS queue explicitly because the bridge will be deployed
+ before the JMS queue is deployed, so the first time, it otherwise won't find the queue -->
+ <queues>
+ <queue name="jms.queue.priceForwarding">
+ <address>jms.queue.priceForwarding</address>
+ </queue>
+ </queues>
+
+ <diverts>
+ <divert name="order-divert">
+ <routing-name>order-divert</routing-name>
+ <address>jms.queue.orders</address>
+ <forwarding-address>jms.topic.spyTopic</forwarding-address>
+ <exclusive>false</exclusive>
+ </divert>
+
+ <divert name="prices-divert">
+ <routing-name>prices-divert</routing-name>
+ <address>jms.topic.priceUpdates</address>
+ <forwarding-address>jms.queue.priceForwarding</forwarding-address>
+ <filter string="office='New York'"/>
+ <transformer-class-name>org.apache.activemq.jms.example.AddForwardingTimeTransformer</transformer-class-name>
+ <exclusive>true</exclusive>
+ </divert>
+ </diverts>
+
+ <!-- Bridge configuration -->
+
+ <bridges>
+ <bridge name="price-forward-bridge">
+ <queue-name>jms.queue.priceForwarding</queue-name>
+ <forwarding-address>jms.topic.newYorkPriceUpdates</forwarding-address>
+ <reconnect-attempts>-1</reconnect-attempts>
+ <static-connectors>
+ <connector-ref>newyork-connector</connector-ref>
+ </static-connectors>
+ </bridge>
+ </bridges>
+
+ <!-- Other config -->
+
+ <security-settings>
+ <!--security for example -->
+ <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-settings>
+
+</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/divert/src/main/resources/activemq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/divert/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/divert/src/main/resources/activemq/server0/activemq-jms.xml
new file mode 100644
index 0000000..d82f40c
--- /dev/null
+++ b/examples/jms/divert/src/main/resources/activemq/server0/activemq-jms.xml
@@ -0,0 +1,18 @@
+<configuration xmlns="urn:activemq"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:activemq /schema/activemq-jms.xsd">
+ <!-- Destinations used by the example -->
+
+ <!-- The order queue -->
+ <queue name="orders"/>
+
+ <!-- The queue that prices are forwarded to before being bridged to the New York server -->
+ <queue name="priceForwarding"/>
+
+ <!-- The topic for price updates -->
+ <topic name="priceUpdates"/>
+
+ <!-- The spy topic for snooping on orders -->
+ <topic name="spyTopic"/>
+
+</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/divert/src/main/resources/activemq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/divert/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/divert/src/main/resources/activemq/server0/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/divert/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/divert/src/main/resources/activemq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/divert/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/divert/src/main/resources/activemq/server1/activemq-configuration.xml
new file mode 100644
index 0000000..1ea7a50
--- /dev/null
+++ b/examples/jms/divert/src/main/resources/activemq/server1/activemq-configuration.xml
@@ -0,0 +1,36 @@
+<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}/server1/data/messaging/bindings</bindings-directory>
+
+ <journal-directory>${build.directory}/server1/data/messaging/journal</journal-directory>
+
+ <large-messages-directory>${build.directory}/server1/data/messaging/largemessages</large-messages-directory>
+
+ <paging-directory>${build.directory}/server1/data/messaging/paging</paging-directory>
+
+ <!-- Acceptors -->
+
+ <acceptors>
+ <acceptor name="netty-acceptor">
+ <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
+ <param key="port" value="5446"/>
+ </acceptor>
+ </acceptors>
+
+ <!-- Other config -->
+
+ <security-settings>
+ <!--security for example queue-->
+ <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-settings>
+
+</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/divert/src/main/resources/activemq/server1/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/divert/src/main/resources/activemq/server1/activemq-jms.xml b/examples/jms/divert/src/main/resources/activemq/server1/activemq-jms.xml
new file mode 100644
index 0000000..8cb753a
--- /dev/null
+++ b/examples/jms/divert/src/main/resources/activemq/server1/activemq-jms.xml
@@ -0,0 +1,11 @@
+<configuration xmlns="urn:activemq"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:activemq /schema/activemq-jms.xsd">
+
+ <!-- Destinations used by the example -->
+
+ <!-- The topic for New York price updates -->
+
+ <topic name="newYorkPriceUpdates"/>
+
+</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/divert/src/main/resources/activemq/server1/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/divert/src/main/resources/activemq/server1/activemq-users.xml b/examples/jms/divert/src/main/resources/activemq/server1/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/divert/src/main/resources/activemq/server1/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/divert/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/divert/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/divert/src/main/resources/hornetq/server0/activemq-configuration.xml
deleted file mode 100644
index da10d0e..0000000
--- a/examples/jms/divert/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<configuration xmlns="urn:activemq"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
-
- <!-- We need to make it clustered otherwise the bridge won't deploy -->
-
-
- <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>
-
- <!-- This connector corresponds to the New York server -->
-
- <connector name="newyork-connector">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
- <param key="port" value="5446"/>
- </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>
-
- <!-- Divert configuration -->
-
- <!-- We need to create a core queue for the JMS queue explicitly because the bridge will be deployed
- before the JMS queue is deployed, so the first time, it otherwise won't find the queue -->
- <queues>
- <queue name="jms.queue.priceForwarding">
- <address>jms.queue.priceForwarding</address>
- </queue>
- </queues>
-
- <diverts>
- <divert name="order-divert">
- <routing-name>order-divert</routing-name>
- <address>jms.queue.orders</address>
- <forwarding-address>jms.topic.spyTopic</forwarding-address>
- <exclusive>false</exclusive>
- </divert>
-
- <divert name="prices-divert">
- <routing-name>prices-divert</routing-name>
- <address>jms.topic.priceUpdates</address>
- <forwarding-address>jms.queue.priceForwarding</forwarding-address>
- <filter string="office='New York'"/>
- <transformer-class-name>org.apache.activemq.jms.example.AddForwardingTimeTransformer</transformer-class-name>
- <exclusive>true</exclusive>
- </divert>
- </diverts>
-
- <!-- Bridge configuration -->
-
- <bridges>
- <bridge name="price-forward-bridge">
- <queue-name>jms.queue.priceForwarding</queue-name>
- <forwarding-address>jms.topic.newYorkPriceUpdates</forwarding-address>
- <reconnect-attempts>-1</reconnect-attempts>
- <static-connectors>
- <connector-ref>newyork-connector</connector-ref>
- </static-connectors>
- </bridge>
- </bridges>
-
- <!-- Other config -->
-
- <security-settings>
- <!--security for example -->
- <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-settings>
-
-</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/divert/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/divert/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/divert/src/main/resources/hornetq/server0/activemq-jms.xml
deleted file mode 100644
index d82f40c..0000000
--- a/examples/jms/divert/src/main/resources/hornetq/server0/activemq-jms.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<configuration xmlns="urn:activemq"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:activemq /schema/activemq-jms.xsd">
- <!-- Destinations used by the example -->
-
- <!-- The order queue -->
- <queue name="orders"/>
-
- <!-- The queue that prices are forwarded to before being bridged to the New York server -->
- <queue name="priceForwarding"/>
-
- <!-- The topic for price updates -->
- <topic name="priceUpdates"/>
-
- <!-- The spy topic for snooping on orders -->
- <topic name="spyTopic"/>
-
-</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/divert/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/divert/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/divert/src/main/resources/hornetq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/divert/src/main/resources/hornetq/server1/activemq-configuration.xml b/examples/jms/divert/src/main/resources/hornetq/server1/activemq-configuration.xml
deleted file mode 100644
index 661288f..0000000
--- a/examples/jms/divert/src/main/resources/hornetq/server1/activemq-configuration.xml
+++ /dev/null
@@ -1,45 +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}/server1/data/messaging/bindings</bindings-directory>
-
- <journal-directory>${build.directory}/server1/data/messaging/journal</journal-directory>
-
- <large-messages-directory>${build.directory}/server1/data/messaging/largemessages</large-messages-directory>
-
- <paging-directory>${build.directory}/server1/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="5446"/>
- </connector>
- </connectors>
-
- <!-- Acceptors -->
-
- <acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- <param key="port" value="5446"/>
- </acceptor>
- </acceptors>
-
- <!-- Other config -->
-
- <security-settings>
- <!--security for example queue-->
- <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-settings>
-
-</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/divert/src/main/resources/hornetq/server1/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/divert/src/main/resources/hornetq/server1/activemq-jms.xml b/examples/jms/divert/src/main/resources/hornetq/server1/activemq-jms.xml
deleted file mode 100644
index 8cb753a..0000000
--- a/examples/jms/divert/src/main/resources/hornetq/server1/activemq-jms.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<configuration xmlns="urn:activemq"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:activemq /schema/activemq-jms.xsd">
-
- <!-- Destinations used by the example -->
-
- <!-- The topic for New York price updates -->
-
- <topic name="newYorkPriceUpdates"/>
-
-</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/divert/src/main/resources/hornetq/server1/activemq-users.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/divert/src/main/resources/hornetq/server1/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/durable-subscription/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/durable-subscription/pom.xml b/examples/jms/durable-subscription/pom.xml
index 2149c87..542a799 100644
--- a/examples/jms/durable-subscription/pom.xml
+++ b/examples/jms/durable-subscription/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/durable-subscription/src/main/java/org/apache/activemq/jms/example/DurableSubscriptionExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/durable-subscription/src/main/java/org/apache/activemq/jms/example/DurableSubscriptionExample.java b/examples/jms/durable-subscription/src/main/java/org/apache/activemq/jms/example/DurableSubscriptionExample.java
index 792e82e..5c88b01 100644
--- a/examples/jms/durable-subscription/src/main/java/org/apache/activemq/jms/example/DurableSubscriptionExample.java
+++ b/examples/jms/durable-subscription/src/main/java/org/apache/activemq/jms/example/DurableSubscriptionExample.java
@@ -47,7 +47,7 @@ public class DurableSubscriptionExample extends ActiveMQExample
try
{
// Step 1. Create an initial context to perform the JNDI lookup.
- initialContext = getContext(0);
+ initialContext = new InitialContext();
// Step 2. Look-up the JMS topic
Topic topic = (Topic)initialContext.lookup("topic/exampleTopic");
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/durable-subscription/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/durable-subscription/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/durable-subscription/src/main/resources/activemq/server0/activemq-configuration.xml
new file mode 100644
index 0000000..b00c317
--- /dev/null
+++ b/examples/jms/durable-subscription/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -0,0 +1,36 @@
+<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>
+ <param key="port" value="5445"/>
+ </acceptor>
+ </acceptors>
+
+ <!-- Other config -->
+
+ <security-settings>
+ <!--security for example topic-->
+ <security-setting match="jms.topic.exampleTopic">
+ <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/durable-subscription/src/main/resources/activemq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/durable-subscription/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/durable-subscription/src/main/resources/activemq/server0/activemq-jms.xml
new file mode 100644
index 0000000..ab4841d
--- /dev/null
+++ b/examples/jms/durable-subscription/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 topic used by the example-->
+ <topic name="exampleTopic"/>
+
+</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/durable-subscription/src/main/resources/activemq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/durable-subscription/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/durable-subscription/src/main/resources/activemq/server0/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/durable-subscription/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/durable-subscription/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/durable-subscription/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/durable-subscription/src/main/resources/hornetq/server0/activemq-configuration.xml
deleted file mode 100644
index 017fcc0..0000000
--- a/examples/jms/durable-subscription/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ /dev/null
@@ -1,44 +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>
- <param key="port" value="5445"/>
- </acceptor>
- </acceptors>
-
- <!-- Other config -->
-
- <security-settings>
- <!--security for example topic-->
- <security-setting match="jms.topic.exampleTopic">
- <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/durable-subscription/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index ab4841d..0000000
--- a/examples/jms/durable-subscription/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 topic used by the example-->
- <topic name="exampleTopic"/>
-
-</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/durable-subscription/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/durable-subscription/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/durable-subscription/src/main/resources/hornetq/server0/client-jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/durable-subscription/src/main/resources/hornetq/server0/client-jndi.properties b/examples/jms/durable-subscription/src/main/resources/hornetq/server0/client-jndi.properties
deleted file mode 100644
index f68e7f7..0000000
--- a/examples/jms/durable-subscription/src/main/resources/hornetq/server0/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
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/durable-subscription/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/durable-subscription/src/main/resources/jndi.properties b/examples/jms/durable-subscription/src/main/resources/jndi.properties
new file mode 100644
index 0000000..0468620
--- /dev/null
+++ b/examples/jms/durable-subscription/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
+topic.topic/exampleTopic=exampleTopic
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/embedded-simple/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/embedded-simple/pom.xml b/examples/jms/embedded-simple/pom.xml
index 1b01307..df7be67 100644
--- a/examples/jms/embedded-simple/pom.xml
+++ b/examples/jms/embedded-simple/pom.xml
@@ -99,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/embedded-simple/src/main/java/org/apache/activemq/jms/example/EmbeddedExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/embedded-simple/src/main/java/org/apache/activemq/jms/example/EmbeddedExample.java b/examples/jms/embedded-simple/src/main/java/org/apache/activemq/jms/example/EmbeddedExample.java
index e41a025..05f227c 100644
--- a/examples/jms/embedded-simple/src/main/java/org/apache/activemq/jms/example/EmbeddedExample.java
+++ b/examples/jms/embedded-simple/src/main/java/org/apache/activemq/jms/example/EmbeddedExample.java
@@ -16,7 +16,9 @@
*/
package org.apache.activemq.jms.example;
+import java.util.ArrayList;
import java.util.Date;
+import java.util.List;
import javax.jms.Connection;
import javax.jms.ConnectionFactory;
@@ -28,6 +30,8 @@ import javax.jms.TextMessage;
import org.apache.activemq.common.example.ActiveMQExample;
import org.apache.activemq.jms.server.embedded.EmbeddedJMS;
+import org.apache.activemq.jms.server.JMSServerManager;
+import org.apache.activemq.api.jms.JMSFactoryType;
/**
* This example demonstrates how to run a ActiveMQ embedded with JMS
@@ -52,6 +56,11 @@ public class EmbeddedExample extends ActiveMQExample
jmsServer.start();
System.out.println("Started Embedded JMS Server");
+ JMSServerManager jmsServerManager = jmsServer.getJMSServerManager();
+ jmsServerManager.addQueueToJndi("exampleQueue", "queue/exampleQueue");
+ List<String> connectors = new ArrayList<String>();
+ connectors.add("in-vm");
+ jmsServerManager.createConnectionFactory("ConnectionFactory", false, JMSFactoryType.CF, connectors, "ConnectionFactory");
ConnectionFactory cf = (ConnectionFactory)jmsServer.lookup("ConnectionFactory");
Queue queue = (Queue)jmsServer.lookup("queue/exampleQueue");
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/embedded-simple/src/main/resources/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/embedded-simple/src/main/resources/activemq-configuration.xml b/examples/jms/embedded-simple/src/main/resources/activemq-configuration.xml
index 7e86c38..2db2db3 100644
--- a/examples/jms/embedded-simple/src/main/resources/activemq-configuration.xml
+++ b/examples/jms/embedded-simple/src/main/resources/activemq-configuration.xml
@@ -3,13 +3,6 @@
xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
<persistence-enabled>false</persistence-enabled>
- <!-- Connectors -->
-
- <connectors>
- <connector name="in-vm">
- <factory-class>org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory</factory-class>
- </connector>
- </connectors>
<acceptors>
<acceptor name="in-vm">
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/embedded/src/main/java/org/apache/activemq/jms/example/EmbeddedExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/embedded/src/main/java/org/apache/activemq/jms/example/EmbeddedExample.java b/examples/jms/embedded/src/main/java/org/apache/activemq/jms/example/EmbeddedExample.java
index 06fdb14..a89c7b4 100644
--- a/examples/jms/embedded/src/main/java/org/apache/activemq/jms/example/EmbeddedExample.java
+++ b/examples/jms/embedded/src/main/java/org/apache/activemq/jms/example/EmbeddedExample.java
@@ -81,11 +81,17 @@ public final class EmbeddedExample extends ActiveMQExample
// Step 3. Configure the JMS ConnectionFactory
ArrayList<String> connectorNames = new ArrayList<String>();
connectorNames.add("connector");
- ConnectionFactoryConfiguration cfConfig = new ConnectionFactoryConfigurationImpl("cf", false, connectorNames, "/cf");
+ ConnectionFactoryConfiguration cfConfig = new ConnectionFactoryConfigurationImpl()
+ .setName("cf")
+ .setConnectorNames(connectorNames)
+ .setBindings("cf");
jmsConfig.getConnectionFactoryConfigurations().add(cfConfig);
// Step 4. Configure the JMS Queue
- JMSQueueConfiguration queueConfig = new JMSQueueConfigurationImpl("queue1", null, false, "queue/queue1");
+ JMSQueueConfiguration queueConfig = new JMSQueueConfigurationImpl()
+ .setName("queue1")
+ .setDurable(false)
+ .setBindings("queue/queue1");
jmsConfig.getQueueConfigurations().add(queueConfig);
// Step 5. Start the JMS Server using the ActiveMQ core server and the JMS configuration
@@ -96,7 +102,7 @@ public final class EmbeddedExample extends ActiveMQExample
System.out.println("Started Embedded JMS Server");
// Step 6. Lookup JMS resources defined in the configuration
- ConnectionFactory cf = (ConnectionFactory)jmsServer.lookup("/cf");
+ ConnectionFactory cf = (ConnectionFactory)jmsServer.lookup("cf");
Queue queue = (Queue)jmsServer.lookup("queue/queue1");
// Step 7. Send and receive a message using JMS API
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/expiry/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/expiry/pom.xml b/examples/jms/expiry/pom.xml
index 70fc1ad..a437a31 100644
--- a/examples/jms/expiry/pom.xml
+++ b/examples/jms/expiry/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/expiry/src/main/java/org/apache/activemq/jms/example/ExpiryExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/expiry/src/main/java/org/apache/activemq/jms/example/ExpiryExample.java b/examples/jms/expiry/src/main/java/org/apache/activemq/jms/example/ExpiryExample.java
index a74467c..02e3963 100644
--- a/examples/jms/expiry/src/main/java/org/apache/activemq/jms/example/ExpiryExample.java
+++ b/examples/jms/expiry/src/main/java/org/apache/activemq/jms/example/ExpiryExample.java
@@ -48,7 +48,7 @@ public class ExpiryExample 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/expiry/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/expiry/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/expiry/src/main/resources/activemq/server0/activemq-configuration.xml
new file mode 100644
index 0000000..7c2c527
--- /dev/null
+++ b/examples/jms/expiry/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="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.#">
+ <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>
+ <!--override the expiry address for the example-->
+ <address-setting match="jms.queue.exampleQueue">
+ <expiry-address>jms.queue.expiryQueue</expiry-address>
+ </address-setting>
+ </address-settings>
+
+</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/expiry/src/main/resources/activemq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/expiry/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/expiry/src/main/resources/activemq/server0/activemq-jms.xml
new file mode 100644
index 0000000..d41da70
--- /dev/null
+++ b/examples/jms/expiry/src/main/resources/activemq/server0/activemq-jms.xml
@@ -0,0 +1,11 @@
+<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"/>
+
+ <!--the expiry queue where expired messages will be sent-->
+ <queue name="expiryQueue"/>
+
+</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/expiry/src/main/resources/activemq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/expiry/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/expiry/src/main/resources/activemq/server0/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/expiry/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
[17/37] activemq-6 git commit: ACTIVEMQ6-51 Example server
bootstrapping
Posted by jb...@apache.org.
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/transactional/src/main/java/org/apache/activemq/jms/example/TransactionalExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/transactional/src/main/java/org/apache/activemq/jms/example/TransactionalExample.java b/examples/jms/transactional/src/main/java/org/apache/activemq/jms/example/TransactionalExample.java
index d23f6b1..06defdd 100644
--- a/examples/jms/transactional/src/main/java/org/apache/activemq/jms/example/TransactionalExample.java
+++ b/examples/jms/transactional/src/main/java/org/apache/activemq/jms/example/TransactionalExample.java
@@ -47,7 +47,7 @@ public class TransactionalExample extends ActiveMQExample
try
{
// Step 1. Create an initial context to perform the JNDI lookup.
- initialContext = getContext(0);
+ initialContext = new InitialContext();
// Step 2. Look-up the JMS topic
Queue queue = (Queue)initialContext.lookup("queue/exampleQueue");
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/transactional/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/transactional/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/transactional/src/main/resources/activemq/server0/activemq-configuration.xml
new file mode 100644
index 0000000..5d9a671
--- /dev/null
+++ b/examples/jms/transactional/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/transactional/src/main/resources/activemq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/transactional/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/transactional/src/main/resources/activemq/server0/activemq-jms.xml
new file mode 100644
index 0000000..847659f
--- /dev/null
+++ b/examples/jms/transactional/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>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/transactional/src/main/resources/activemq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/transactional/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/transactional/src/main/resources/activemq/server0/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/transactional/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/transactional/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/transactional/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/transactional/src/main/resources/hornetq/server0/activemq-configuration.xml
deleted file mode 100644
index 8ef5e46..0000000
--- a/examples/jms/transactional/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>
-
-
- <!-- 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/transactional/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index 847659f..0000000
--- a/examples/jms/transactional/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>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/transactional/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/transactional/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/transactional/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/transactional/src/main/resources/jndi.properties b/examples/jms/transactional/src/main/resources/jndi.properties
new file mode 100644
index 0000000..d9b5c6a
--- /dev/null
+++ b/examples/jms/transactional/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/xa-heuristic/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/xa-heuristic/pom.xml b/examples/jms/xa-heuristic/pom.xml
index 38e545e..8f7bc60 100644
--- a/examples/jms/xa-heuristic/pom.xml
+++ b/examples/jms/xa-heuristic/pom.xml
@@ -74,9 +74,6 @@
</goals>
<configuration>
<clientClass>org.apache.activemq.jms.example.XAHeuristicExample</clientClass>
- <args>
- <param>tcp://localhost:5445</param>
- </args>
</configuration>
</execution>
<execution>
@@ -125,7 +122,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/xa-heuristic/src/main/java/org/apache/activemq/jms/example/XAHeuristicExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/xa-heuristic/src/main/java/org/apache/activemq/jms/example/XAHeuristicExample.java b/examples/jms/xa-heuristic/src/main/java/org/apache/activemq/jms/example/XAHeuristicExample.java
index 3a70346..071f63f 100644
--- a/examples/jms/xa-heuristic/src/main/java/org/apache/activemq/jms/example/XAHeuristicExample.java
+++ b/examples/jms/xa-heuristic/src/main/java/org/apache/activemq/jms/example/XAHeuristicExample.java
@@ -71,7 +71,7 @@ public class XAHeuristicExample extends ActiveMQExample
try
{
// Step 1. Create an initial context to perform the JNDI lookup.
- initialContext = getContext(0);
+ initialContext = new InitialContext();
// Step 2. 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/xa-heuristic/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/xa-heuristic/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/xa-heuristic/src/main/resources/activemq/server0/activemq-configuration.xml
new file mode 100644
index 0000000..5d9a671
--- /dev/null
+++ b/examples/jms/xa-heuristic/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/xa-heuristic/src/main/resources/activemq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/xa-heuristic/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/xa-heuristic/src/main/resources/activemq/server0/activemq-jms.xml
new file mode 100644
index 0000000..0d5c953
--- /dev/null
+++ b/examples/jms/xa-heuristic/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/xa-heuristic/src/main/resources/activemq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/xa-heuristic/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/xa-heuristic/src/main/resources/activemq/server0/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/xa-heuristic/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/xa-heuristic/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/xa-heuristic/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/xa-heuristic/src/main/resources/hornetq/server0/activemq-configuration.xml
deleted file mode 100644
index 8ef5e46..0000000
--- a/examples/jms/xa-heuristic/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>
-
-
- <!-- 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/xa-heuristic/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/xa-heuristic/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/xa-heuristic/src/main/resources/hornetq/server0/activemq-jms.xml
deleted file mode 100644
index 0d5c953..0000000
--- a/examples/jms/xa-heuristic/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/xa-heuristic/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/xa-heuristic/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/xa-heuristic/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/xa-heuristic/src/main/resources/jndi.properties b/examples/jms/xa-heuristic/src/main/resources/jndi.properties
new file mode 100644
index 0000000..d9b5c6a
--- /dev/null
+++ b/examples/jms/xa-heuristic/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/xa-receive/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/xa-receive/pom.xml b/examples/jms/xa-receive/pom.xml
index 0fddd12..08b7b55 100644
--- a/examples/jms/xa-receive/pom.xml
+++ b/examples/jms/xa-receive/pom.xml
@@ -51,9 +51,6 @@
</goals>
<configuration>
<clientClass>org.apache.activemq.jms.example.XAReceiveExample</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/xa-receive/src/main/java/org/apache/activemq/jms/example/XAReceiveExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/xa-receive/src/main/java/org/apache/activemq/jms/example/XAReceiveExample.java b/examples/jms/xa-receive/src/main/java/org/apache/activemq/jms/example/XAReceiveExample.java
index 87e92f5..11894cc 100644
--- a/examples/jms/xa-receive/src/main/java/org/apache/activemq/jms/example/XAReceiveExample.java
+++ b/examples/jms/xa-receive/src/main/java/org/apache/activemq/jms/example/XAReceiveExample.java
@@ -56,7 +56,7 @@ public class XAReceiveExample extends ActiveMQExample
try
{
// Step 1. Create an initial context to perform the JNDI lookup.
- initialContext = getContext(0);
+ initialContext = new InitialContext();
// Step 2. 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/xa-receive/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/xa-receive/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/xa-receive/src/main/resources/activemq/server0/activemq-configuration.xml
new file mode 100644
index 0000000..5d9a671
--- /dev/null
+++ b/examples/jms/xa-receive/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/xa-receive/src/main/resources/activemq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/xa-receive/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/xa-receive/src/main/resources/activemq/server0/activemq-jms.xml
new file mode 100644
index 0000000..0d5c953
--- /dev/null
+++ b/examples/jms/xa-receive/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/xa-receive/src/main/resources/activemq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/xa-receive/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/xa-receive/src/main/resources/activemq/server0/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/xa-receive/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/xa-receive/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/xa-receive/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/xa-receive/src/main/resources/hornetq/server0/activemq-configuration.xml
deleted file mode 100644
index 8ef5e46..0000000
--- a/examples/jms/xa-receive/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>
-
-
- <!-- 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/xa-receive/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/xa-receive/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/xa-receive/src/main/resources/hornetq/server0/activemq-jms.xml
deleted file mode 100644
index 0d5c953..0000000
--- a/examples/jms/xa-receive/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/xa-receive/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/xa-receive/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/xa-receive/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/xa-receive/src/main/resources/jndi.properties b/examples/jms/xa-receive/src/main/resources/jndi.properties
new file mode 100644
index 0000000..d9b5c6a
--- /dev/null
+++ b/examples/jms/xa-receive/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/xa-send/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/xa-send/pom.xml b/examples/jms/xa-send/pom.xml
index 2e4fadb..a6df573 100644
--- a/examples/jms/xa-send/pom.xml
+++ b/examples/jms/xa-send/pom.xml
@@ -51,9 +51,6 @@
</goals>
<configuration>
<clientClass>org.apache.activemq.jms.example.XASendExample</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/xa-send/src/main/java/org/apache/activemq/jms/example/XASendExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/xa-send/src/main/java/org/apache/activemq/jms/example/XASendExample.java b/examples/jms/xa-send/src/main/java/org/apache/activemq/jms/example/XASendExample.java
index b592826..923db20 100644
--- a/examples/jms/xa-send/src/main/java/org/apache/activemq/jms/example/XASendExample.java
+++ b/examples/jms/xa-send/src/main/java/org/apache/activemq/jms/example/XASendExample.java
@@ -62,7 +62,7 @@ public class XASendExample extends ActiveMQExample
try
{
// Step 1. Create an initial context to perform the JNDI lookup.
- initialContext = getContext(0);
+ initialContext = new InitialContext();
// Step 2. 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/xa-send/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/xa-send/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/xa-send/src/main/resources/activemq/server0/activemq-configuration.xml
new file mode 100644
index 0000000..5d9a671
--- /dev/null
+++ b/examples/jms/xa-send/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/xa-send/src/main/resources/activemq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/xa-send/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/xa-send/src/main/resources/activemq/server0/activemq-jms.xml
new file mode 100644
index 0000000..0d5c953
--- /dev/null
+++ b/examples/jms/xa-send/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/xa-send/src/main/resources/activemq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/xa-send/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/xa-send/src/main/resources/activemq/server0/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/xa-send/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/xa-send/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index 8ef5e46..0000000
--- a/examples/jms/xa-send/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>
-
-
- <!-- 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/xa-send/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/xa-send/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/xa-send/src/main/resources/hornetq/server0/activemq-jms.xml
deleted file mode 100644
index 0d5c953..0000000
--- a/examples/jms/xa-send/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/xa-send/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/xa-send/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/xa-send/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/xa-send/src/main/resources/jndi.properties b/examples/jms/xa-send/src/main/resources/jndi.properties
new file mode 100644
index 0000000..d9b5c6a
--- /dev/null
+++ b/examples/jms/xa-send/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/xa-with-jta/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/xa-with-jta/pom.xml b/examples/jms/xa-with-jta/pom.xml
index 9410de3..4533189 100644
--- a/examples/jms/xa-with-jta/pom.xml
+++ b/examples/jms/xa-with-jta/pom.xml
@@ -31,6 +31,11 @@
<artifactId>jbossjta</artifactId>
<version>4.16.4.Final</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jta_1.1_spec</artifactId>
+ <version>1.1.1</version>
+ </dependency>
</dependencies>
<build>
@@ -60,9 +65,6 @@
</goals>
<configuration>
<clientClass>org.apache.activemq.jms.example.XAwithJTAExample</clientClass>
- <args>
- <param>tcp://localhost:5445</param>
- </args>
</configuration>
</execution>
<execution>
@@ -111,7 +113,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/xa-with-jta/src/main/java/org/apache/activemq/jms/example/XAwithJTAExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/xa-with-jta/src/main/java/org/apache/activemq/jms/example/XAwithJTAExample.java b/examples/jms/xa-with-jta/src/main/java/org/apache/activemq/jms/example/XAwithJTAExample.java
index 1ec8b40..ed181ca 100644
--- a/examples/jms/xa-with-jta/src/main/java/org/apache/activemq/jms/example/XAwithJTAExample.java
+++ b/examples/jms/xa-with-jta/src/main/java/org/apache/activemq/jms/example/XAwithJTAExample.java
@@ -56,7 +56,7 @@ public class XAwithJTAExample extends ActiveMQExample
try
{
// Step 1. Create an initial context to perform the JNDI lookup.
- initialContext = getContext(0);
+ initialContext = new InitialContext();
// Step 2. 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/xa-with-jta/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/xa-with-jta/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/xa-with-jta/src/main/resources/activemq/server0/activemq-configuration.xml
new file mode 100644
index 0000000..5d9a671
--- /dev/null
+++ b/examples/jms/xa-with-jta/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/xa-with-jta/src/main/resources/activemq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/xa-with-jta/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/xa-with-jta/src/main/resources/activemq/server0/activemq-jms.xml
new file mode 100644
index 0000000..0d5c953
--- /dev/null
+++ b/examples/jms/xa-with-jta/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/xa-with-jta/src/main/resources/activemq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/xa-with-jta/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/xa-with-jta/src/main/resources/activemq/server0/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/xa-with-jta/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/xa-with-jta/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index 8ef5e46..0000000
--- a/examples/jms/xa-with-jta/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>
-
-
- <!-- 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/xa-with-jta/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/xa-with-jta/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/xa-with-jta/src/main/resources/hornetq/server0/activemq-jms.xml
deleted file mode 100644
index 0d5c953..0000000
--- a/examples/jms/xa-with-jta/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/xa-with-jta/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/xa-with-jta/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/xa-with-jta/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/xa-with-jta/src/main/resources/jndi.properties b/examples/jms/xa-with-jta/src/main/resources/jndi.properties
new file mode 100644
index 0000000..d9b5c6a
--- /dev/null
+++ b/examples/jms/xa-with-jta/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/soak/normal/pom.xml
----------------------------------------------------------------------
diff --git a/examples/soak/normal/pom.xml b/examples/soak/normal/pom.xml
index a33fdfe..2c0a133 100644
--- a/examples/soak/normal/pom.xml
+++ b/examples/soak/normal/pom.xml
@@ -83,7 +83,7 @@
</goals>
<configuration>
<fork>true</fork>
- <hornetqConfigurationDir>${server.dir}</hornetqConfigurationDir>
+ <configurationDir>${server.dir}</configurationDir>
</configuration>
</execution>
<execution>
@@ -116,7 +116,7 @@
<goal>stop</goal>
</goals>
<configuration>
- <hornetqConfigurationDir>${server.dir}</hornetqConfigurationDir>
+ <configurationDir>${server.dir}</configurationDir>
</configuration>
</execution>
</executions>
@@ -175,7 +175,7 @@
<goal>start</goal>
</goals>
<configuration>
- <hornetqConfigurationDir>${server.dir}</hornetqConfigurationDir>
+ <configurationDir>${server.dir}</configurationDir>
<fork>true</fork>
<waitOnStart>true</waitOnStart>
</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 315865f..1e2ba33 100644
--- a/pom.xml
+++ b/pom.xml
@@ -455,6 +455,7 @@
<module>activemq-rest</module>
<module>activemq-tools</module>
<module>activemq-service-extensions</module>
+ <module>activemq-maven-plugin</module>
<!-- <module>integration/activemq-jboss-as-integration</module> -->
<module>integration/activemq-spring-integration</module>
<module>integration/activemq-aerogear-integration</module>
@@ -506,6 +507,7 @@
<module>activemq-rest</module>
<module>activemq-tools</module>
<module>activemq-service-extensions</module>
+ <module>activemq-maven-plugin</module>
<module>integration/activemq-spring-integration</module>
<module>integration/activemq-aerogear-integration</module>
<module>integration/activemq-vertx-integration</module>
@@ -532,6 +534,7 @@
<module>activemq-rest</module>
<module>activemq-tools</module>
<module>activemq-service-extensions</module>
+ <module>activemq-maven-plugin</module>
<module>integration/activemq-spring-integration</module>
<module>integration/activemq-aerogear-integration</module>
<module>integration/activemq-vertx-integration</module>
@@ -569,6 +572,7 @@
<module>activemq-rest</module>
<module>activemq-tools</module>
<module>activemq-service-extensions</module>
+ <module>activemq-maven-plugin</module>
<module>integration/activemq-spring-integration</module>
<module>integration/activemq-aerogear-integration</module>
<module>integration/activemq-vertx-integration</module>
@@ -602,6 +606,7 @@
<module>activemq-rest</module>
<module>activemq-tools</module>
<module>activemq-service-extensions</module>
+ <module>activemq-maven-plugin</module>
<module>integration/activemq-spring-integration</module>
<module>integration/activemq-aerogear-integration</module>
<module>integration/activemq-vertx-integration</module>
@@ -762,7 +767,7 @@
<plugin>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-maven-plugin</artifactId>
- <version>1.2.0</version>
+ <version>6.0.0-SNAPSHOT</version>
</plugin>
</plugins>
</pluginManagement>
[33/37] activemq-6 git commit: ACTIVEMQ6-51 Example server
bootstrapping
Posted by jb...@apache.org.
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server2/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server2/activemq-configuration.xml b/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server2/activemq-configuration.xml
deleted file mode 100644
index 8e056d5..0000000
--- a/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server2/activemq-configuration.xml
+++ /dev/null
@@ -1,72 +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}/server2/data/messaging/bindings</bindings-directory>
-
- <journal-directory>${build.directory}/server2/data/messaging/journal</journal-directory>
-
- <large-messages-directory>${build.directory}/server2/data/messaging/largemessages</large-messages-directory>
-
- <paging-directory>${build.directory}/server2/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="5447"/>
- </connector>
- </connectors>
-
- <!-- Acceptors -->
- <acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- <param key="port" value="5447"/>
- </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>
- <max-hops>0</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>
-
-</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server2/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server2/activemq-jms.xml b/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server2/activemq-jms.xml
deleted file mode 100644
index 847659f..0000000
--- a/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server2/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>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server2/activemq-users.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server2/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/client-side-load-balancing/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/client-side-load-balancing/src/main/resources/jndi.properties b/examples/jms/client-side-load-balancing/src/main/resources/jndi.properties
new file mode 100644
index 0000000..3bc732f
--- /dev/null
+++ b/examples/jms/client-side-load-balancing/src/main/resources/jndi.properties
@@ -0,0 +1,3 @@
+java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
+java.naming.provider.url=udp://231.7.7.7:9876
+queue.queue/exampleQueue=exampleQueue
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-durable-subscription/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-durable-subscription/pom.xml b/examples/jms/clustered-durable-subscription/pom.xml
index 73d6727..72290b8 100644
--- a/examples/jms/clustered-durable-subscription/pom.xml
+++ b/examples/jms/clustered-durable-subscription/pom.xml
@@ -36,16 +36,12 @@
<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>
<value>${basedir}/target/</value>
</property>
- <property>
- <name>udp-address</name>
- <value>${udp-address}</value>
- </property>
</systemProperties>
</configuration>
</execution>
@@ -55,19 +51,13 @@
<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>
<name>build.directory</name>
<value>${basedir}/target/</value>
</property>
- <property>
- <name>udp-address</name>
- <value>${udp-address}</value>
- </property>
</systemProperties>
</configuration>
</execution>
@@ -96,7 +86,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 +95,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/clustered-durable-subscription/src/main/java/org/apache/activemq/jms/example/ClusteredDurableSubscriptionExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-durable-subscription/src/main/java/org/apache/activemq/jms/example/ClusteredDurableSubscriptionExample.java b/examples/jms/clustered-durable-subscription/src/main/java/org/apache/activemq/jms/example/ClusteredDurableSubscriptionExample.java
index 01d1c47..4b39f6c 100644
--- a/examples/jms/clustered-durable-subscription/src/main/java/org/apache/activemq/jms/example/ClusteredDurableSubscriptionExample.java
+++ b/examples/jms/clustered-durable-subscription/src/main/java/org/apache/activemq/jms/example/ClusteredDurableSubscriptionExample.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 ClusteredDurableSubscriptionExample 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("topic.topic/exampleTopic", "exampleTopic");
+ ic0 = new InitialContext(properties);
// Step 2. Look-up the JMS Topic object from JNDI
Topic topic = (Topic)ic0.lookup("topic/exampleTopic");
@@ -65,7 +71,11 @@ public class ClusteredDurableSubscriptionExample 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/clustered-durable-subscription/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-durable-subscription/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/clustered-durable-subscription/src/main/resources/activemq/server0/activemq-configuration.xml
new file mode 100644
index 0000000..93cfee3
--- /dev/null
+++ b/examples/jms/clustered-durable-subscription/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -0,0 +1,75 @@
+<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>true</forward-when-no-consumers>
+ <max-hops>1</max-hops>
+ <discovery-group-ref discovery-group-name="my-discovery-group"/>
+ </cluster-connection>
+ </cluster-connections>
+
+ <!-- other configuration -->
+
+ <security-settings>
+ <!--security for example queue-->
+ <security-setting match="jms.topic.exampleTopic">
+ <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/clustered-durable-subscription/src/main/resources/activemq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-durable-subscription/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/clustered-durable-subscription/src/main/resources/activemq/server0/activemq-jms.xml
new file mode 100644
index 0000000..ab4841d
--- /dev/null
+++ b/examples/jms/clustered-durable-subscription/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 topic used by the example-->
+ <topic name="exampleTopic"/>
+
+</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-durable-subscription/src/main/resources/activemq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-durable-subscription/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/clustered-durable-subscription/src/main/resources/activemq/server0/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/clustered-durable-subscription/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/clustered-durable-subscription/src/main/resources/activemq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-durable-subscription/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/clustered-durable-subscription/src/main/resources/activemq/server1/activemq-configuration.xml
new file mode 100644
index 0000000..e72545a
--- /dev/null
+++ b/examples/jms/clustered-durable-subscription/src/main/resources/activemq/server1/activemq-configuration.xml
@@ -0,0 +1,76 @@
+<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}/server1/data/messaging/bindings</bindings-directory>
+
+ <journal-directory>${build.directory}/server1/data/messaging/journal</journal-directory>
+
+ <large-messages-directory>${build.directory}/server1/data/messaging/largemessages</large-messages-directory>
+
+ <paging-directory>${build.directory}/server1/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="5446"/>
+ </connector>
+ </connectors>
+
+ <!-- Acceptors -->
+ <acceptors>
+ <acceptor name="netty-acceptor">
+ <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
+ <param key="port" value="5446"/>
+ </acceptor>
+ </acceptors>
+
+ <!-- Clustering configuration -->
+ <broadcast-groups>
+ <broadcast-group name="my-broacast-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>true</forward-when-no-consumers>
+ <max-hops>1</max-hops>
+ <discovery-group-ref discovery-group-name="my-discovery-group"/>
+ </cluster-connection>
+ </cluster-connections>
+
+ <!-- other configuration -->
+
+ <security-settings>
+ <!--security for example queue-->
+ <security-setting match="jms.topic.exampleTopic">
+ <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/clustered-durable-subscription/src/main/resources/activemq/server1/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-durable-subscription/src/main/resources/activemq/server1/activemq-jms.xml b/examples/jms/clustered-durable-subscription/src/main/resources/activemq/server1/activemq-jms.xml
new file mode 100644
index 0000000..ab4841d
--- /dev/null
+++ b/examples/jms/clustered-durable-subscription/src/main/resources/activemq/server1/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 topic used by the example-->
+ <topic name="exampleTopic"/>
+
+</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-durable-subscription/src/main/resources/activemq/server1/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-durable-subscription/src/main/resources/activemq/server1/activemq-users.xml b/examples/jms/clustered-durable-subscription/src/main/resources/activemq/server1/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/clustered-durable-subscription/src/main/resources/activemq/server1/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/clustered-durable-subscription/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-durable-subscription/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/clustered-durable-subscription/src/main/resources/hornetq/server0/activemq-configuration.xml
deleted file mode 100644
index 93cfee3..0000000
--- a/examples/jms/clustered-durable-subscription/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ /dev/null
@@ -1,75 +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>
- <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>true</forward-when-no-consumers>
- <max-hops>1</max-hops>
- <discovery-group-ref discovery-group-name="my-discovery-group"/>
- </cluster-connection>
- </cluster-connections>
-
- <!-- other configuration -->
-
- <security-settings>
- <!--security for example queue-->
- <security-setting match="jms.topic.exampleTopic">
- <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/clustered-durable-subscription/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-durable-subscription/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/clustered-durable-subscription/src/main/resources/hornetq/server0/activemq-jms.xml
deleted file mode 100644
index ab4841d..0000000
--- a/examples/jms/clustered-durable-subscription/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 topic used by the example-->
- <topic name="exampleTopic"/>
-
-</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-durable-subscription/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/clustered-durable-subscription/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/clustered-durable-subscription/src/main/resources/hornetq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-durable-subscription/src/main/resources/hornetq/server1/activemq-configuration.xml b/examples/jms/clustered-durable-subscription/src/main/resources/hornetq/server1/activemq-configuration.xml
deleted file mode 100644
index e72545a..0000000
--- a/examples/jms/clustered-durable-subscription/src/main/resources/hornetq/server1/activemq-configuration.xml
+++ /dev/null
@@ -1,76 +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}/server1/data/messaging/bindings</bindings-directory>
-
- <journal-directory>${build.directory}/server1/data/messaging/journal</journal-directory>
-
- <large-messages-directory>${build.directory}/server1/data/messaging/largemessages</large-messages-directory>
-
- <paging-directory>${build.directory}/server1/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="5446"/>
- </connector>
- </connectors>
-
- <!-- Acceptors -->
- <acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- <param key="port" value="5446"/>
- </acceptor>
- </acceptors>
-
- <!-- Clustering configuration -->
- <broadcast-groups>
- <broadcast-group name="my-broacast-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>true</forward-when-no-consumers>
- <max-hops>1</max-hops>
- <discovery-group-ref discovery-group-name="my-discovery-group"/>
- </cluster-connection>
- </cluster-connections>
-
- <!-- other configuration -->
-
- <security-settings>
- <!--security for example queue-->
- <security-setting match="jms.topic.exampleTopic">
- <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/clustered-durable-subscription/src/main/resources/hornetq/server1/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-durable-subscription/src/main/resources/hornetq/server1/activemq-jms.xml b/examples/jms/clustered-durable-subscription/src/main/resources/hornetq/server1/activemq-jms.xml
deleted file mode 100644
index ab4841d..0000000
--- a/examples/jms/clustered-durable-subscription/src/main/resources/hornetq/server1/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 topic used by the example-->
- <topic name="exampleTopic"/>
-
-</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-durable-subscription/src/main/resources/hornetq/server1/activemq-users.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/clustered-durable-subscription/src/main/resources/hornetq/server1/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/clustered-grouping/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-grouping/pom.xml b/examples/jms/clustered-grouping/pom.xml
index f3a3fa6..6448dae 100644
--- a/examples/jms/clustered-grouping/pom.xml
+++ b/examples/jms/clustered-grouping/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>
@@ -77,9 +75,7 @@
<goal>start</goal>
</goals>
<configuration>
- <jndiPort>1299</jndiPort>
- <jndiRmiPort>1298</jndiRmiPort>
- <hornetqConfigurationDir>${basedir}/target/classes/activemq/server2</hornetqConfigurationDir>
+ <configurationDir>${basedir}/target/classes/activemq/server2</configurationDir>
<fork>true</fork>
<systemProperties>
<property>
@@ -119,7 +115,7 @@
<goal>stop</goal>
</goals>
<configuration>
- <hornetqConfigurationDir>${basedir}/target/classes/activemq/server0</hornetqConfigurationDir>
+ <configurationDir>${basedir}/target/classes/activemq/server0</configurationDir>
</configuration>
</execution>
<execution>
@@ -128,7 +124,7 @@
<goal>stop</goal>
</goals>
<configuration>
- <hornetqConfigurationDir>${basedir}/target/classes/activemq/server1</hornetqConfigurationDir>
+ <configurationDir>${basedir}/target/classes/activemq/server1</configurationDir>
</configuration>
</execution>
<execution>
@@ -137,7 +133,7 @@
<goal>stop</goal>
</goals>
<configuration>
- <hornetqConfigurationDir>${basedir}/target/classes/activemq/server2</hornetqConfigurationDir>
+ <configurationDir>${basedir}/target/classes/activemq/server2</configurationDir>
</configuration>
</execution>
</executions>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-grouping/src/main/java/org/apache/activemq/jms/example/ClusteredGroupingExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-grouping/src/main/java/org/apache/activemq/jms/example/ClusteredGroupingExample.java b/examples/jms/clustered-grouping/src/main/java/org/apache/activemq/jms/example/ClusteredGroupingExample.java
index 91421cf..e5ead04 100644
--- a/examples/jms/clustered-grouping/src/main/java/org/apache/activemq/jms/example/ClusteredGroupingExample.java
+++ b/examples/jms/clustered-grouping/src/main/java/org/apache/activemq/jms/example/ClusteredGroupingExample.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;
@@ -58,7 +60,11 @@ public class ClusteredGroupingExample 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");
@@ -67,15 +73,21 @@ public class ClusteredGroupingExample 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");
- // Step 4. Get an initial context for looking up JNDI from server 1
- ic2 = getContext(2);
+ // Step 4. Get an initial context for looking up JNDI from server 2
+ properties = new Hashtable<String, Object>();
+ properties.put("java.naming.factory.initial", "org.apache.activemq.jndi.ActiveMQInitialContextFactory");
+ properties.put("java.naming.provider.url", args[2]);
+ ic2 = new InitialContext(properties);
- // Step 5. Look-up a JMS Connection Factory object from JNDI on server 1
+ // Step 5. Look-up a JMS Connection Factory object from JNDI on server 2
ConnectionFactory cf2 = (ConnectionFactory)ic2.lookup("ConnectionFactory");
// Step 6. We create a JMS Connection connection0 which is a connection to server 0
@@ -93,7 +105,7 @@ public class ClusteredGroupingExample extends ActiveMQExample
// Step 10. We create a JMS Session on server 1
Session session1 = connection1.createSession(false, Session.AUTO_ACKNOWLEDGE);
- // Step 11. We create a JMS Session on server 1
+ // Step 11. We create a JMS Session on server 2
Session session2 = connection1.createSession(false, Session.AUTO_ACKNOWLEDGE);
// Step 12. We start the connections to ensure delivery occurs on them
@@ -200,5 +212,4 @@ public class ClusteredGroupingExample extends ActiveMQExample
}
}
}
-
}
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-grouping/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-grouping/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/clustered-grouping/src/main/resources/activemq/server0/activemq-configuration.xml
new file mode 100644
index 0000000..41e9a2c
--- /dev/null
+++ b/examples/jms/clustered-grouping/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -0,0 +1,83 @@
+<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>true</forward-when-no-consumers>
+ <max-hops>1</max-hops>
+ <discovery-group-ref discovery-group-name="my-discovery-group"/>
+ </cluster-connection>
+ </cluster-connections>
+
+ <grouping-handler name="my-grouping-handler">
+ <type>LOCAL</type>
+ <address>jms</address>
+ <timeout>5000</timeout>
+ <group-timeout>-1</group-timeout>
+ <reaper-period>30000</reaper-period>
+ </grouping-handler>
+
+ <!-- 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>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-grouping/src/main/resources/activemq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-grouping/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/clustered-grouping/src/main/resources/activemq/server0/activemq-jms.xml
new file mode 100644
index 0000000..847659f
--- /dev/null
+++ b/examples/jms/clustered-grouping/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>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-grouping/src/main/resources/activemq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-grouping/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/clustered-grouping/src/main/resources/activemq/server0/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/clustered-grouping/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/clustered-grouping/src/main/resources/activemq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-grouping/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/clustered-grouping/src/main/resources/activemq/server1/activemq-configuration.xml
new file mode 100644
index 0000000..482efb9
--- /dev/null
+++ b/examples/jms/clustered-grouping/src/main/resources/activemq/server1/activemq-configuration.xml
@@ -0,0 +1,80 @@
+<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}/server1/data/messaging/bindings</bindings-directory>
+
+ <journal-directory>${build.directory}/server1/data/messaging/journal</journal-directory>
+
+ <large-messages-directory>${build.directory}/server1/data/messaging/largemessages</large-messages-directory>
+
+ <paging-directory>${build.directory}/server1/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="5446"/>
+ </connector>
+ </connectors>
+
+ <!-- Acceptors -->
+ <acceptors>
+ <acceptor name="netty-acceptor">
+ <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
+ <param key="port" value="5446"/>
+ </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>true</forward-when-no-consumers>
+ <max-hops>1</max-hops>
+ <discovery-group-ref discovery-group-name="my-discovery-group"/>
+ </cluster-connection>
+ </cluster-connections>
+
+ <grouping-handler name="my-grouping-handler">
+ <type>REMOTE</type>
+ <address>jms</address>
+ <timeout>5000</timeout>
+ </grouping-handler>
+
+ <!-- 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/clustered-grouping/src/main/resources/activemq/server1/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-grouping/src/main/resources/activemq/server1/activemq-jms.xml b/examples/jms/clustered-grouping/src/main/resources/activemq/server1/activemq-jms.xml
new file mode 100644
index 0000000..847659f
--- /dev/null
+++ b/examples/jms/clustered-grouping/src/main/resources/activemq/server1/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>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-grouping/src/main/resources/activemq/server1/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-grouping/src/main/resources/activemq/server1/activemq-users.xml b/examples/jms/clustered-grouping/src/main/resources/activemq/server1/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/clustered-grouping/src/main/resources/activemq/server1/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/clustered-grouping/src/main/resources/activemq/server2/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-grouping/src/main/resources/activemq/server2/activemq-configuration.xml b/examples/jms/clustered-grouping/src/main/resources/activemq/server2/activemq-configuration.xml
new file mode 100644
index 0000000..45d5dab
--- /dev/null
+++ b/examples/jms/clustered-grouping/src/main/resources/activemq/server2/activemq-configuration.xml
@@ -0,0 +1,80 @@
+<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}/server2/data/messaging/bindings</bindings-directory>
+
+ <journal-directory>${build.directory}/server2/data/messaging/journal</journal-directory>
+
+ <large-messages-directory>${build.directory}/server2/data/messaging/largemessages</large-messages-directory>
+
+ <paging-directory>${build.directory}/server2/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="5447"/>
+ </connector>
+ </connectors>
+
+ <!-- Acceptors -->
+ <acceptors>
+ <acceptor name="netty-acceptor">
+ <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
+ <param key="port" value="5447"/>
+ </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>true</forward-when-no-consumers>
+ <max-hops>1</max-hops>
+ <discovery-group-ref discovery-group-name="my-discovery-group"/>
+ </cluster-connection>
+ </cluster-connections>
+
+ <grouping-handler name="my-grouping-handler">
+ <type>REMOTE</type>
+ <address>jms</address>
+ <timeout>5000</timeout>
+ </grouping-handler>
+
+ <!-- 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/clustered-grouping/src/main/resources/activemq/server2/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-grouping/src/main/resources/activemq/server2/activemq-jms.xml b/examples/jms/clustered-grouping/src/main/resources/activemq/server2/activemq-jms.xml
new file mode 100644
index 0000000..847659f
--- /dev/null
+++ b/examples/jms/clustered-grouping/src/main/resources/activemq/server2/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>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-grouping/src/main/resources/activemq/server2/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-grouping/src/main/resources/activemq/server2/activemq-users.xml b/examples/jms/clustered-grouping/src/main/resources/activemq/server2/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/clustered-grouping/src/main/resources/activemq/server2/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/clustered-grouping/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-grouping/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/clustered-grouping/src/main/resources/hornetq/server0/activemq-configuration.xml
deleted file mode 100644
index 41e9a2c..0000000
--- a/examples/jms/clustered-grouping/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ /dev/null
@@ -1,83 +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>
- <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>true</forward-when-no-consumers>
- <max-hops>1</max-hops>
- <discovery-group-ref discovery-group-name="my-discovery-group"/>
- </cluster-connection>
- </cluster-connections>
-
- <grouping-handler name="my-grouping-handler">
- <type>LOCAL</type>
- <address>jms</address>
- <timeout>5000</timeout>
- <group-timeout>-1</group-timeout>
- <reaper-period>30000</reaper-period>
- </grouping-handler>
-
- <!-- 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>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-grouping/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-grouping/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/clustered-grouping/src/main/resources/hornetq/server0/activemq-jms.xml
deleted file mode 100644
index 847659f..0000000
--- a/examples/jms/clustered-grouping/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>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-grouping/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/clustered-grouping/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/clustered-grouping/src/main/resources/hornetq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-grouping/src/main/resources/hornetq/server1/activemq-configuration.xml b/examples/jms/clustered-grouping/src/main/resources/hornetq/server1/activemq-configuration.xml
deleted file mode 100644
index 482efb9..0000000
--- a/examples/jms/clustered-grouping/src/main/resources/hornetq/server1/activemq-configuration.xml
+++ /dev/null
@@ -1,80 +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}/server1/data/messaging/bindings</bindings-directory>
-
- <journal-directory>${build.directory}/server1/data/messaging/journal</journal-directory>
-
- <large-messages-directory>${build.directory}/server1/data/messaging/largemessages</large-messages-directory>
-
- <paging-directory>${build.directory}/server1/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="5446"/>
- </connector>
- </connectors>
-
- <!-- Acceptors -->
- <acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- <param key="port" value="5446"/>
- </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>true</forward-when-no-consumers>
- <max-hops>1</max-hops>
- <discovery-group-ref discovery-group-name="my-discovery-group"/>
- </cluster-connection>
- </cluster-connections>
-
- <grouping-handler name="my-grouping-handler">
- <type>REMOTE</type>
- <address>jms</address>
- <timeout>5000</timeout>
- </grouping-handler>
-
- <!-- 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/clustered-grouping/src/main/resources/hornetq/server1/activemq-jms.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index 847659f..0000000
--- a/examples/jms/clustered-grouping/src/main/resources/hornetq/server1/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>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-grouping/src/main/resources/hornetq/server1/activemq-users.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/clustered-grouping/src/main/resources/hornetq/server1/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/clustered-grouping/src/main/resources/hornetq/server2/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-grouping/src/main/resources/hornetq/server2/activemq-configuration.xml b/examples/jms/clustered-grouping/src/main/resources/hornetq/server2/activemq-configuration.xml
deleted file mode 100644
index 45d5dab..0000000
--- a/examples/jms/clustered-grouping/src/main/resources/hornetq/server2/activemq-configuration.xml
+++ /dev/null
@@ -1,80 +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}/server2/data/messaging/bindings</bindings-directory>
-
- <journal-directory>${build.directory}/server2/data/messaging/journal</journal-directory>
-
- <large-messages-directory>${build.directory}/server2/data/messaging/largemessages</large-messages-directory>
-
- <paging-directory>${build.directory}/server2/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="5447"/>
- </connector>
- </connectors>
-
- <!-- Acceptors -->
- <acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- <param key="port" value="5447"/>
- </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>true</forward-when-no-consumers>
- <max-hops>1</max-hops>
- <discovery-group-ref discovery-group-name="my-discovery-group"/>
- </cluster-connection>
- </cluster-connections>
-
- <grouping-handler name="my-grouping-handler">
- <type>REMOTE</type>
- <address>jms</address>
- <timeout>5000</timeout>
- </grouping-handler>
-
- <!-- 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/clustered-grouping/src/main/resources/hornetq/server2/activemq-jms.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index 847659f..0000000
--- a/examples/jms/clustered-grouping/src/main/resources/hornetq/server2/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>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-grouping/src/main/resources/hornetq/server2/activemq-users.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/clustered-grouping/src/main/resources/hornetq/server2/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/clustered-jgroups/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-jgroups/pom.xml b/examples/jms/clustered-jgroups/pom.xml
index aca8a25..c4dc5bb 100644
--- a/examples/jms/clustered-jgroups/pom.xml
+++ b/examples/jms/clustered-jgroups/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>
<!-- this is to make sure the example will run fine on any box.
you may tweak this to any property you like. More information on the JGroups docs -->
@@ -53,9 +53,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>
<!-- this is to make sure the example will run fine on any box.
@@ -86,7 +84,7 @@
<goal>stop</goal>
</goals>
<configuration>
- <hornetqConfigurationDir>${basedir}/target/classes/activemq/server0</hornetqConfigurationDir>
+ <configurationDir>${basedir}/target/classes/activemq/server0</configurationDir>
</configuration>
</execution>
<execution>
@@ -95,7 +93,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/clustered-jgroups/src/main/java/org/apache/activemq/jms/example/ClusteredJgroupsExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-jgroups/src/main/java/org/apache/activemq/jms/example/ClusteredJgroupsExample.java b/examples/jms/clustered-jgroups/src/main/java/org/apache/activemq/jms/example/ClusteredJgroupsExample.java
index 24ae554..87e38d7 100644
--- a/examples/jms/clustered-jgroups/src/main/java/org/apache/activemq/jms/example/ClusteredJgroupsExample.java
+++ b/examples/jms/clustered-jgroups/src/main/java/org/apache/activemq/jms/example/ClusteredJgroupsExample.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;
@@ -54,7 +56,11 @@ public class ClusteredJgroupsExample 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");
@@ -63,7 +69,10 @@ public class ClusteredJgroupsExample 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/clustered-jgroups/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-jgroups/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/clustered-jgroups/src/main/resources/activemq/server0/activemq-configuration.xml
new file mode 100644
index 0000000..43692a4
--- /dev/null
+++ b/examples/jms/clustered-jgroups/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -0,0 +1,76 @@
+<configuration xmlns="urn:activemq"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
+
+
+ <paging-directory>server0/paging</paging-directory>
+
+ <bindings-directory>server0/bindings</bindings-directory>
+
+ <journal-directory>server0/journal</journal-directory>
+
+ <large-messages-directory>server0/large-messages</large-messages-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">
+ <broadcast-period>5000</broadcast-period>
+ <jgroups-file>test-jgroups-file_ping.xml</jgroups-file>
+ <jgroups-channel>active_broadcast_channel</jgroups-channel>
+ <connector-ref>netty-connector</connector-ref>
+ </broadcast-group>
+ </broadcast-groups>
+
+ <discovery-groups>
+ <discovery-group name="my-discovery-group">
+ <jgroups-file>test-jgroups-file_ping.xml</jgroups-file>
+ <jgroups-channel>active_broadcast_channel</jgroups-channel>
+ <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>true</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>
+
+</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-jgroups/src/main/resources/activemq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-jgroups/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/clustered-jgroups/src/main/resources/activemq/server0/activemq-jms.xml
new file mode 100644
index 0000000..847659f
--- /dev/null
+++ b/examples/jms/clustered-jgroups/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>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-jgroups/src/main/resources/activemq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-jgroups/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/clustered-jgroups/src/main/resources/activemq/server0/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/clustered-jgroups/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/clustered-jgroups/src/main/resources/activemq/server0/client-jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-jgroups/src/main/resources/activemq/server0/client-jndi.properties b/examples/jms/clustered-jgroups/src/main/resources/activemq/server0/client-jndi.properties
new file mode 100644
index 0000000..6940f75
--- /dev/null
+++ b/examples/jms/clustered-jgroups/src/main/resources/activemq/server0/client-jndi.properties
@@ -0,0 +1,2 @@
+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/clustered-jgroups/src/main/resources/activemq/server0/test-jgroups-file_ping.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-jgroups/src/main/resources/activemq/server0/test-jgroups-file_ping.xml b/examples/jms/clustered-jgroups/src/main/resources/activemq/server0/test-jgroups-file_ping.xml
new file mode 100644
index 0000000..269e06e
--- /dev/null
+++ b/examples/jms/clustered-jgroups/src/main/resources/activemq/server0/test-jgroups-file_ping.xml
@@ -0,0 +1,52 @@
+<config xmlns="urn:org:jgroups"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:org:jgroups file:schema/JGroups-2.8.xsd">
+ <TCP loopback="true"
+ recv_buf_size="20000000"
+ send_buf_size="640000"
+ discard_incompatible_packets="true"
+ max_bundle_size="64000"
+ max_bundle_timeout="30"
+ enable_bundling="true"
+ use_send_queues="false"
+ sock_conn_timeout="300"
+
+ thread_pool.enabled="true"
+ thread_pool.min_threads="1"
+ thread_pool.max_threads="10"
+ thread_pool.keep_alive_time="5000"
+ thread_pool.queue_enabled="false"
+ thread_pool.queue_max_size="100"
+ thread_pool.rejection_policy="run"
+
+ oob_thread_pool.enabled="true"
+ oob_thread_pool.min_threads="1"
+ oob_thread_pool.max_threads="8"
+ oob_thread_pool.keep_alive_time="5000"
+ oob_thread_pool.queue_enabled="false"
+ oob_thread_pool.queue_max_size="100"
+ oob_thread_pool.rejection_policy="run"/>
+
+ <FILE_PING location="../file.ping.dir"/>
+ <MERGE2 max_interval="30000"
+ min_interval="10000"/>
+ <FD_SOCK/>
+ <FD timeout="10000" max_tries="5" />
+ <VERIFY_SUSPECT timeout="1500" />
+ <BARRIER />
+ <pbcast.NAKACK
+ use_mcast_xmit="false"
+ retransmit_timeout="300,600,1200,2400,4800"
+ discard_delivered_msgs="true"/>
+ <UNICAST timeout="300,600,1200" />
+ <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
+ max_bytes="400000"/>
+ <pbcast.GMS print_local_addr="true" join_timeout="3000"
+
+ view_bundling="true"/>
+ <FC max_credits="2000000"
+ min_threshold="0.10"/>
+ <FRAG2 frag_size="60000" />
+ <pbcast.STATE_TRANSFER/>
+ <pbcast.FLUSH timeout="0"/>
+</config>
[20/37] activemq-6 git commit: ACTIVEMQ6-51 Example server
bootstrapping
Posted by jb...@apache.org.
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/send-acknowledgements/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/send-acknowledgements/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/send-acknowledgements/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/send-acknowledgements/src/main/resources/jndi.properties b/examples/jms/send-acknowledgements/src/main/resources/jndi.properties
new file mode 100644
index 0000000..5361f83
--- /dev/null
+++ b/examples/jms/send-acknowledgements/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.confirmationWindowSize=1048576
+queue.queue/exampleQueue=exampleQueue
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/spring-integration/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/spring-integration/pom.xml b/examples/jms/spring-integration/pom.xml
index 22db0f2..c57dc67 100644
--- a/examples/jms/spring-integration/pom.xml
+++ b/examples/jms/spring-integration/pom.xml
@@ -46,9 +46,6 @@
</goals>
<configuration>
<clientClass>org.apache.activemq.jms.example.SpringExample</clientClass>
- <args>
- <param>tcp://localhost:5445</param>
- </args>
</configuration>
</execution>
</executions>
@@ -91,7 +88,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/spring-integration/src/main/resources/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/spring-integration/src/main/resources/activemq-configuration.xml b/examples/jms/spring-integration/src/main/resources/activemq-configuration.xml
index 7e86c38..2db2db3 100644
--- a/examples/jms/spring-integration/src/main/resources/activemq-configuration.xml
+++ b/examples/jms/spring-integration/src/main/resources/activemq-configuration.xml
@@ -3,13 +3,6 @@
xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
<persistence-enabled>false</persistence-enabled>
- <!-- Connectors -->
-
- <connectors>
- <connector name="in-vm">
- <factory-class>org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory</factory-class>
- </connector>
- </connectors>
<acceptors>
<acceptor name="in-vm">
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/spring-integration/src/main/resources/spring-jms-beans.xml
----------------------------------------------------------------------
diff --git a/examples/jms/spring-integration/src/main/resources/spring-jms-beans.xml b/examples/jms/spring-integration/src/main/resources/spring-jms-beans.xml
index c9eccea..9378efb 100644
--- a/examples/jms/spring-integration/src/main/resources/spring-jms-beans.xml
+++ b/examples/jms/spring-integration/src/main/resources/spring-jms-beans.xml
@@ -4,22 +4,34 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
- <bean id="EmbeddedJms" class="org.apache.activemq.integration.spring.SpringJmsBootstrap" init-method="start" destroy-method="stop">
+ <bean id="EmbeddedJms" class="org.apache.activemq.integration.spring.SpringJmsBootstrap" init-method="start"
+ destroy-method="stop">
</bean>
- <bean id="listener" class="org.apache.activemq.jms.example.ExampleListener"/>
-
- <bean id="MessageSender" class="org.apache.activemq.jms.example.MessageSender">
- <property name="connectionFactory" ref="ConnectionFactory"/>
- <property name="destination" ref="/queue/exampleQueue"/>
- </bean>
+ <bean id="connectionFactory" class="org.apache.activemq.jms.client.ActiveMQJMSConnectionFactory">
+ <constructor-arg value="false"/>
+ <constructor-arg>
+ <bean class="org.apache.activemq.api.core.TransportConfiguration">
+ <constructor-arg value="org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory"/>
+ </bean>
+ </constructor-arg>
+ </bean>
+
+ <bean id="exampleQueue" class="org.apache.activemq.jms.client.ActiveMQQueue">
+ <constructor-arg index="0" value="exampleQueue"/>
+ </bean>
- <bean id="listenerContainer" class="org.springframework.jms.listener.DefaultMessageListenerContainer">
- <property name="connectionFactory" ref="ConnectionFactory"/>
- <property name="destination" ref="/queue/exampleQueue"/>
- <property name="messageListener" ref="listener"/>
- </bean>
-
+ <bean id="listener" class="org.apache.activemq.jms.example.ExampleListener"/>
+ <bean id="MessageSender" class="org.apache.activemq.jms.example.MessageSender">
+ <property name="connectionFactory" ref="connectionFactory"/>
+ <property name="destination" ref="exampleQueue"/>
+ </bean>
+
+ <bean id="listenerContainer" class="org.springframework.jms.listener.DefaultMessageListenerContainer">
+ <property name="connectionFactory" ref="connectionFactory"/>
+ <property name="destination" ref="exampleQueue"/>
+ <property name="messageListener" ref="listener"/>
+ </bean>
</beans>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/ssl-enabled/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/ssl-enabled/pom.xml b/examples/jms/ssl-enabled/pom.xml
index 8fe2534..9220b13 100644
--- a/examples/jms/ssl-enabled/pom.xml
+++ b/examples/jms/ssl-enabled/pom.xml
@@ -51,9 +51,6 @@
</goals>
<configuration>
<clientClass>org.apache.activemq.jms.example.SSLExample</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/ssl-enabled/src/main/java/org/apache/activemq/jms/example/SSLExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/ssl-enabled/src/main/java/org/apache/activemq/jms/example/SSLExample.java b/examples/jms/ssl-enabled/src/main/java/org/apache/activemq/jms/example/SSLExample.java
index e025afd..7483506 100644
--- a/examples/jms/ssl-enabled/src/main/java/org/apache/activemq/jms/example/SSLExample.java
+++ b/examples/jms/ssl-enabled/src/main/java/org/apache/activemq/jms/example/SSLExample.java
@@ -47,7 +47,7 @@ public class SSLExample 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/ssl-enabled/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/ssl-enabled/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/ssl-enabled/src/main/resources/activemq/server0/activemq-configuration.xml
new file mode 100644
index 0000000..ce77b71
--- /dev/null
+++ b/examples/jms/ssl-enabled/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -0,0 +1,39 @@
+<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-ssl-acceptor">
+ <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
+ <param key="host" value="localhost"/>
+ <param key="port" value="5500"/>
+ <param key="ssl-enabled" value="true"/>
+ <param key="key-store-path" value="activemq/server0/activemq.example.keystore"/>
+ <param key="key-store-password" value="activemqexample"/>
+ </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/ssl-enabled/src/main/resources/activemq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/ssl-enabled/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/ssl-enabled/src/main/resources/activemq/server0/activemq-jms.xml
new file mode 100644
index 0000000..0d5c953
--- /dev/null
+++ b/examples/jms/ssl-enabled/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/ssl-enabled/src/main/resources/activemq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/ssl-enabled/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/ssl-enabled/src/main/resources/activemq/server0/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/ssl-enabled/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/ssl-enabled/src/main/resources/activemq/server0/activemq.example.keystore
----------------------------------------------------------------------
diff --git a/examples/jms/ssl-enabled/src/main/resources/activemq/server0/activemq.example.keystore b/examples/jms/ssl-enabled/src/main/resources/activemq/server0/activemq.example.keystore
new file mode 100644
index 0000000..50de681
Binary files /dev/null and b/examples/jms/ssl-enabled/src/main/resources/activemq/server0/activemq.example.keystore differ
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/ssl-enabled/src/main/resources/activemq/server0/activemq.example.truststore
----------------------------------------------------------------------
diff --git a/examples/jms/ssl-enabled/src/main/resources/activemq/server0/activemq.example.truststore b/examples/jms/ssl-enabled/src/main/resources/activemq/server0/activemq.example.truststore
new file mode 100644
index 0000000..129391a
Binary files /dev/null and b/examples/jms/ssl-enabled/src/main/resources/activemq/server0/activemq.example.truststore differ
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/ssl-enabled/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/ssl-enabled/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/ssl-enabled/src/main/resources/hornetq/server0/activemq-configuration.xml
deleted file mode 100644
index 8bba089..0000000
--- a/examples/jms/ssl-enabled/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ /dev/null
@@ -1,53 +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-ssl-connector">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
- <param key="host" value="localhost"/>
- <param key="port" value="5500"/>
- <param key="ssl-enabled" value="true"/>
- <param key="trust-store-path" value="activemq/server0/activemq.example.truststore"/>
- <param key="trust-store-password" value="activemqexample"/>
- </connector>
- </connectors>
-
- <!-- Acceptors -->
- <acceptors>
- <acceptor name="netty-ssl-acceptor">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- <param key="host" value="localhost"/>
- <param key="port" value="5500"/>
- <param key="ssl-enabled" value="true"/>
- <param key="key-store-path" value="activemq/server0/activemq.example.keystore"/>
- <param key="key-store-password" value="activemqexample"/>
- </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/ssl-enabled/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/ssl-enabled/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/ssl-enabled/src/main/resources/hornetq/server0/activemq-jms.xml
deleted file mode 100644
index 0d5c953..0000000
--- a/examples/jms/ssl-enabled/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/ssl-enabled/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/ssl-enabled/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/ssl-enabled/src/main/resources/hornetq/server0/hornetq.example.keystore
----------------------------------------------------------------------
diff --git a/examples/jms/ssl-enabled/src/main/resources/hornetq/server0/hornetq.example.keystore b/examples/jms/ssl-enabled/src/main/resources/hornetq/server0/hornetq.example.keystore
deleted file mode 100644
index 8ca2ea4..0000000
Binary files a/examples/jms/ssl-enabled/src/main/resources/hornetq/server0/hornetq.example.keystore and /dev/null differ
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/ssl-enabled/src/main/resources/hornetq/server0/hornetq.example.truststore
----------------------------------------------------------------------
diff --git a/examples/jms/ssl-enabled/src/main/resources/hornetq/server0/hornetq.example.truststore b/examples/jms/ssl-enabled/src/main/resources/hornetq/server0/hornetq.example.truststore
deleted file mode 100644
index 49dd088..0000000
Binary files a/examples/jms/ssl-enabled/src/main/resources/hornetq/server0/hornetq.example.truststore and /dev/null differ
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/ssl-enabled/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/ssl-enabled/src/main/resources/jndi.properties b/examples/jms/ssl-enabled/src/main/resources/jndi.properties
new file mode 100644
index 0000000..948b4bd
--- /dev/null
+++ b/examples/jms/ssl-enabled/src/main/resources/jndi.properties
@@ -0,0 +1,3 @@
+java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
+java.naming.provider.url=tcp://localhost:5500?ssl-enabled=true&trust-store-path=activemq/server0/activemq.example.truststore&trust-store-password=activemqexample
+queue.queue/exampleQueue=exampleQueue
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/static-selector-jms/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/static-selector-jms/pom.xml b/examples/jms/static-selector-jms/pom.xml
index ba5cd8a..4bac000 100644
--- a/examples/jms/static-selector-jms/pom.xml
+++ b/examples/jms/static-selector-jms/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/static-selector-jms/src/main/java/org/apache/activemq/jms/example/StaticSelectorJMSExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/static-selector-jms/src/main/java/org/apache/activemq/jms/example/StaticSelectorJMSExample.java b/examples/jms/static-selector-jms/src/main/java/org/apache/activemq/jms/example/StaticSelectorJMSExample.java
index 7b976e4..267384d 100644
--- a/examples/jms/static-selector-jms/src/main/java/org/apache/activemq/jms/example/StaticSelectorJMSExample.java
+++ b/examples/jms/static-selector-jms/src/main/java/org/apache/activemq/jms/example/StaticSelectorJMSExample.java
@@ -52,7 +52,7 @@ public class StaticSelectorJMSExample extends ActiveMQExample
try
{
// Step 1. Create an initial context to perform the JNDI lookup.
- initialContext = getContext(0);
+ initialContext = new InitialContext();
// Step 2. look-up the JMS queue object from JNDI, this is the queue that has filter configured with it.
Queue queue = (Queue)initialContext.lookup("queue/exampleQueue");
@@ -68,9 +68,10 @@ public class StaticSelectorJMSExample extends ActiveMQExample
// Step 6. Create a JMS Session
Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+ Session producerSession = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
// Step 7. Create a JMS Message Producer
- MessageProducer producer = session.createProducer(queue);
+ MessageProducer producer = producerSession.createProducer(queue);
// Step 8. Create a JMS Message Consumer that receives 'red' messages
MessageConsumer redConsumer = session.createConsumer(queue);
@@ -138,7 +139,7 @@ public class StaticSelectorJMSExample extends ActiveMQExample
textMessage.getText() +
"] with color property: " +
colorProp);
- if (!colorProp.equals(name))
+ if (colorProp != null && !colorProp.equals(name))
{
result = false;
}
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/static-selector-jms/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/static-selector-jms/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/static-selector-jms/src/main/resources/activemq/server0/activemq-configuration.xml
new file mode 100644
index 0000000..5d9a671
--- /dev/null
+++ b/examples/jms/static-selector-jms/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/static-selector-jms/src/main/resources/activemq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/static-selector-jms/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/static-selector-jms/src/main/resources/activemq/server0/activemq-jms.xml
new file mode 100644
index 0000000..c618cfb
--- /dev/null
+++ b/examples/jms/static-selector-jms/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">
+ <selector string="color='red'"/>
+ </queue>
+
+</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/static-selector-jms/src/main/resources/activemq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/static-selector-jms/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/static-selector-jms/src/main/resources/activemq/server0/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/static-selector-jms/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/static-selector-jms/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/static-selector-jms/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/static-selector-jms/src/main/resources/hornetq/server0/activemq-configuration.xml
deleted file mode 100644
index d098c40..0000000
--- a/examples/jms/static-selector-jms/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>
-
-
- <!-- 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.selectorQueue">
- <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/static-selector-jms/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/static-selector-jms/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/static-selector-jms/src/main/resources/hornetq/server0/activemq-jms.xml
deleted file mode 100644
index c618cfb..0000000
--- a/examples/jms/static-selector-jms/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">
- <selector string="color='red'"/>
- </queue>
-
-</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/static-selector-jms/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/static-selector-jms/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/static-selector-jms/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/static-selector-jms/src/main/resources/jndi.properties b/examples/jms/static-selector-jms/src/main/resources/jndi.properties
new file mode 100644
index 0000000..d9b5c6a
--- /dev/null
+++ b/examples/jms/static-selector-jms/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/static-selector/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/static-selector/pom.xml b/examples/jms/static-selector/pom.xml
index a8a3f37..2a695ea 100644
--- a/examples/jms/static-selector/pom.xml
+++ b/examples/jms/static-selector/pom.xml
@@ -51,9 +51,6 @@
</goals>
<configuration>
<clientClass>org.apache.activemq.jms.example.StaticSelectorExample</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/static-selector/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/static-selector/readme.html b/examples/jms/static-selector/readme.html
index bf65656..6f73b53 100644
--- a/examples/jms/static-selector/readme.html
+++ b/examples/jms/static-selector/readme.html
@@ -32,7 +32,7 @@
<p>In the example code, five messages with different 'color' property values are sent to queue 'selectorQueue'. One consumer
is created to receive messages from the queue. Of the five sent messages, two are of 'red' color properties, one is 'blue',
- one is 'green' and one has not the 'color' propery at all. The result is that the consumer only gets the two 'red' messages.</p>
+ one is 'green' and one has not the 'color' property at all. The result is that the consumer only gets the two 'red' messages.</p>
<h2>Example step-by-step</h2>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/static-selector/src/main/java/org/apache/activemq/jms/example/StaticSelectorExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/static-selector/src/main/java/org/apache/activemq/jms/example/StaticSelectorExample.java b/examples/jms/static-selector/src/main/java/org/apache/activemq/jms/example/StaticSelectorExample.java
index 11cc7b3..346134d 100644
--- a/examples/jms/static-selector/src/main/java/org/apache/activemq/jms/example/StaticSelectorExample.java
+++ b/examples/jms/static-selector/src/main/java/org/apache/activemq/jms/example/StaticSelectorExample.java
@@ -52,7 +52,7 @@ public class StaticSelectorExample extends ActiveMQExample
try
{
// Step 1. Create an initial context to perform the JNDI lookup.
- initialContext = getContext(0);
+ initialContext = new InitialContext();
// Step 2. look-up the JMS queue object from JNDI, this is the queue that has filter configured with it.
Queue queue = (Queue)initialContext.lookup("queue/exampleQueue");
@@ -68,9 +68,10 @@ public class StaticSelectorExample extends ActiveMQExample
// Step 6. Create a JMS Session
Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+ Session producerSession = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
// Step 7. Create a JMS Message Producer
- MessageProducer producer = session.createProducer(queue);
+ MessageProducer producer = producerSession.createProducer(queue);
// Step 8. Create a JMS Message Consumer that receives 'red' messages
MessageConsumer redConsumer = session.createConsumer(queue);
@@ -138,7 +139,7 @@ public class StaticSelectorExample extends ActiveMQExample
textMessage.getText() +
"] with color property: " +
colorProp);
- if (!colorProp.equals(name))
+ if (colorProp != null && !colorProp.equals(name))
{
result = false;
}
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/static-selector/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/static-selector/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/static-selector/src/main/resources/activemq/server0/activemq-configuration.xml
new file mode 100644
index 0000000..d150bc4
--- /dev/null
+++ b/examples/jms/static-selector/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="netty-acceptor">
+ <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
+ </acceptor>
+ </acceptors>
+
+ <queues>
+ <queue name="jms.queue.exampleQueue">
+ <address>jms.queue.exampleQueue</address>
+ <filter string="color='red'"/>
+ </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/static-selector/src/main/resources/activemq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/static-selector/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/static-selector/src/main/resources/activemq/server0/activemq-jms.xml
new file mode 100644
index 0000000..847659f
--- /dev/null
+++ b/examples/jms/static-selector/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>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/static-selector/src/main/resources/activemq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/static-selector/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/static-selector/src/main/resources/activemq/server0/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/static-selector/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/static-selector/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/static-selector/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/static-selector/src/main/resources/hornetq/server0/activemq-configuration.xml
deleted file mode 100644
index 930c70c..0000000
--- a/examples/jms/static-selector/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ /dev/null
@@ -1,49 +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>
-
- <queues>
- <queue name="jms.queue.selectorQueue">
- <address>jms.queue.selectorQueue</address>
- <filter string="color='red'"/>
- </queue>
- </queues>
-
- <!-- Other config -->
-
- <security-settings>
- <!--security for example queue-->
- <security-setting match="jms.queue.selectorQueue">
- <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/static-selector/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/static-selector/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/static-selector/src/main/resources/hornetq/server0/activemq-jms.xml
deleted file mode 100644
index 847659f..0000000
--- a/examples/jms/static-selector/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>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/static-selector/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/static-selector/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/static-selector/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/static-selector/src/main/resources/jndi.properties b/examples/jms/static-selector/src/main/resources/jndi.properties
new file mode 100644
index 0000000..d9b5c6a
--- /dev/null
+++ b/examples/jms/static-selector/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/stomp-websockets/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/stomp-websockets/pom.xml b/examples/jms/stomp-websockets/pom.xml
index 3d56027..390e3f5 100644
--- a/examples/jms/stomp-websockets/pom.xml
+++ b/examples/jms/stomp-websockets/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>
</configuration>
</execution>
<execution>
@@ -63,7 +63,7 @@
<goal>stop</goal>
</goals>
<configuration>
- <hornetqConfigurationDir>${basedir}/target/classes/activemq/server0</hornetqConfigurationDir>
+ <configurationDir>${basedir}/target/classes/activemq/server0</configurationDir>
</configuration>
</execution>
</executions>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/stomp-websockets/src/main/java/org/apache/activemq/jms/example/StompWebSocketExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/stomp-websockets/src/main/java/org/apache/activemq/jms/example/StompWebSocketExample.java b/examples/jms/stomp-websockets/src/main/java/org/apache/activemq/jms/example/StompWebSocketExample.java
index dac21d9..323dc02 100644
--- a/examples/jms/stomp-websockets/src/main/java/org/apache/activemq/jms/example/StompWebSocketExample.java
+++ b/examples/jms/stomp-websockets/src/main/java/org/apache/activemq/jms/example/StompWebSocketExample.java
@@ -49,7 +49,7 @@ public class StompWebSocketExample extends ActiveMQExample
InitialContext initialContext = null;
try
{
- initialContext = getContext(0);
+ initialContext = new InitialContext();
Topic topic = (Topic)initialContext.lookup("topic/chat");
ConnectionFactory cf = (ConnectionFactory)initialContext.lookup("ConnectionFactory");
connection = cf.createConnection();
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/stomp-websockets/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/stomp-websockets/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/stomp-websockets/src/main/resources/activemq/server0/activemq-configuration.xml
new file mode 100644
index 0000000..60985df
--- /dev/null
+++ b/examples/jms/stomp-websockets/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>
+ <!-- a regular Netty acceptor used by the JMS client -->
+ <acceptor name="netty-acceptor">
+ <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
+ </acceptor>
+ <!-- the stomp-acceptor is configured for the Stomp over Web Sockets and -->
+ <!-- will listen on port 61614) -->
+ <acceptor name="stomp-websocket">
+ <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
+ <param key="port" value="61614" />
+ </acceptor>
+ </acceptors>
+
+ <!-- Other config -->
+
+ <security-settings>
+ <!--security for example queue-->
+ <security-setting match="jms.topic.chat">
+ <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/stomp-websockets/src/main/resources/activemq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/stomp-websockets/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/stomp-websockets/src/main/resources/activemq/server0/activemq-jms.xml
new file mode 100644
index 0000000..048f5d2
--- /dev/null
+++ b/examples/jms/stomp-websockets/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 topic used by the example-->
+ <topic name="chat"/>
+
+</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/stomp-websockets/src/main/resources/activemq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/stomp-websockets/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/stomp-websockets/src/main/resources/activemq/server0/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/stomp-websockets/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/stomp-websockets/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/stomp-websockets/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/stomp-websockets/src/main/resources/hornetq/server0/activemq-configuration.xml
deleted file mode 100644
index c74f54a..0000000
--- a/examples/jms/stomp-websockets/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ /dev/null
@@ -1,49 +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>
- <!-- a regular Netty acceptor used by the JMS client -->
- <acceptor name="netty-acceptor">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- </acceptor>
- <!-- the stomp-acceptor is configured for the Stomp over Web Sockets and -->
- <!-- will listen on port 61614) -->
- <acceptor name="stomp-websocket">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- <param key="port" value="61614" />
- </acceptor>
- </acceptors>
-
- <!-- Other config -->
-
- <security-settings>
- <!--security for example queue-->
- <security-setting match="jms.topic.chat">
- <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/stomp-websockets/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/stomp-websockets/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/stomp-websockets/src/main/resources/hornetq/server0/activemq-jms.xml
deleted file mode 100644
index 048f5d2..0000000
--- a/examples/jms/stomp-websockets/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 topic used by the example-->
- <topic name="chat"/>
-
-</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/stomp-websockets/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/stomp-websockets/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/stomp-websockets/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/stomp-websockets/src/main/resources/jndi.properties b/examples/jms/stomp-websockets/src/main/resources/jndi.properties
new file mode 100644
index 0000000..754c087
--- /dev/null
+++ b/examples/jms/stomp-websockets/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
+topic.topic/chat=chat
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/stomp/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/stomp/pom.xml b/examples/jms/stomp/pom.xml
index ebf7049..627b7c0 100644
--- a/examples/jms/stomp/pom.xml
+++ b/examples/jms/stomp/pom.xml
@@ -51,9 +51,6 @@
</goals>
<configuration>
<clientClass>org.apache.activemq.jms.example.StompExample</clientClass>
- <args>
- <param>tcp://localhost:5445</param>
- </args>
</configuration>
</execution>
<execution>
@@ -107,7 +104,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/stomp/src/main/java/org/apache/activemq/jms/example/StompExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/stomp/src/main/java/org/apache/activemq/jms/example/StompExample.java b/examples/jms/stomp/src/main/java/org/apache/activemq/jms/example/StompExample.java
index a27ae30..bd3f84a 100644
--- a/examples/jms/stomp/src/main/java/org/apache/activemq/jms/example/StompExample.java
+++ b/examples/jms/stomp/src/main/java/org/apache/activemq/jms/example/StompExample.java
@@ -88,7 +88,7 @@ public class StompExample extends ActiveMQExample
// We will now consume from JMS the message sent with Stomp.
// Step 6. Create an initial context to perform the JNDI lookup.
- initialContext = getContext(0);
+ initialContext = new InitialContext();
// Step 7. Perform a lookup on the queue and the connection factory
Queue queue = (Queue)initialContext.lookup("queue/exampleQueue");
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/stomp/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/stomp/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/stomp/src/main/resources/activemq/server0/activemq-configuration.xml
new file mode 100644
index 0000000..1b68cd8
--- /dev/null
+++ b/examples/jms/stomp/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>
+ <!-- a regular Netty acceptor used by the JMS client -->
+ <acceptor name="netty-acceptor">
+ <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
+ </acceptor>
+ <!-- the stomp-acceptor is configured for the Stomp protocol only and -->
+ <!-- will listen on port 61613 (default Stomp port) -->
+ <acceptor name="stomp-acceptor">
+ <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
+ <param key="protocols" value="STOMP" />
+ <param key="port" value="61613" />
+ </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/stomp/src/main/resources/activemq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/stomp/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/stomp/src/main/resources/activemq/server0/activemq-jms.xml
new file mode 100644
index 0000000..0d5c953
--- /dev/null
+++ b/examples/jms/stomp/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/stomp/src/main/resources/activemq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/stomp/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/stomp/src/main/resources/activemq/server0/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/stomp/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/stomp/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/stomp/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/stomp/src/main/resources/hornetq/server0/activemq-configuration.xml
deleted file mode 100644
index 0188165..0000000
--- a/examples/jms/stomp/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ /dev/null
@@ -1,51 +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>
- <!-- a regular Netty acceptor used by the JMS client -->
- <acceptor name="netty-acceptor">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- </acceptor>
- <!-- the stomp-acceptor is configured for the Stomp protocol only and -->
- <!-- will listen on port 61613 (default Stomp port) -->
- <acceptor name="stomp-acceptor">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- <param key="protocols" value="STOMP" />
- <param key="port" value="61613" />
- </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/stomp/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index 0d5c953..0000000
--- a/examples/jms/stomp/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/stomp/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/stomp/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/stomp/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/stomp/src/main/resources/jndi.properties b/examples/jms/stomp/src/main/resources/jndi.properties
new file mode 100644
index 0000000..d9b5c6a
--- /dev/null
+++ b/examples/jms/stomp/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/stomp1.1/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/stomp1.1/pom.xml b/examples/jms/stomp1.1/pom.xml
index 251f5c8..f7db8c0 100644
--- a/examples/jms/stomp1.1/pom.xml
+++ b/examples/jms/stomp1.1/pom.xml
@@ -51,9 +51,6 @@
</goals>
<configuration>
<clientClass>org.apache.activemq.jms.example.StompExample</clientClass>
- <args>
- <param>tcp://localhost:5445</param>
- </args>
</configuration>
</execution>
<execution>
@@ -107,7 +104,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/stomp1.1/src/main/java/org/apache/activemq/jms/example/StompExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/stomp1.1/src/main/java/org/apache/activemq/jms/example/StompExample.java b/examples/jms/stomp1.1/src/main/java/org/apache/activemq/jms/example/StompExample.java
index 35309c0..17220f9 100644
--- a/examples/jms/stomp1.1/src/main/java/org/apache/activemq/jms/example/StompExample.java
+++ b/examples/jms/stomp1.1/src/main/java/org/apache/activemq/jms/example/StompExample.java
@@ -95,7 +95,7 @@ public class StompExample extends ActiveMQExample
// We will now consume from JMS the message sent with Stomp.
// Step 6. Create an initial context to perform the JNDI lookup.
- initialContext = getContext(0);
+ initialContext = new InitialContext();
// Step 7. Perform a lookup on the queue and the connection factory
Queue queue = (Queue)initialContext.lookup("queue/exampleQueue");
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/stomp1.1/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/stomp1.1/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/stomp1.1/src/main/resources/activemq/server0/activemq-configuration.xml
new file mode 100644
index 0000000..1b68cd8
--- /dev/null
+++ b/examples/jms/stomp1.1/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>
+ <!-- a regular Netty acceptor used by the JMS client -->
+ <acceptor name="netty-acceptor">
+ <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
+ </acceptor>
+ <!-- the stomp-acceptor is configured for the Stomp protocol only and -->
+ <!-- will listen on port 61613 (default Stomp port) -->
+ <acceptor name="stomp-acceptor">
+ <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
+ <param key="protocols" value="STOMP" />
+ <param key="port" value="61613" />
+ </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/stomp1.1/src/main/resources/activemq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/stomp1.1/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/stomp1.1/src/main/resources/activemq/server0/activemq-jms.xml
new file mode 100644
index 0000000..0d5c953
--- /dev/null
+++ b/examples/jms/stomp1.1/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/stomp1.1/src/main/resources/activemq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/stomp1.1/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/stomp1.1/src/main/resources/activemq/server0/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/stomp1.1/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/stomp1.1/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/stomp1.1/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/stomp1.1/src/main/resources/hornetq/server0/activemq-configuration.xml
deleted file mode 100644
index 0188165..0000000
--- a/examples/jms/stomp1.1/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ /dev/null
@@ -1,51 +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>
- <!-- a regular Netty acceptor used by the JMS client -->
- <acceptor name="netty-acceptor">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- </acceptor>
- <!-- the stomp-acceptor is configured for the Stomp protocol only and -->
- <!-- will listen on port 61613 (default Stomp port) -->
- <acceptor name="stomp-acceptor">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- <param key="protocols" value="STOMP" />
- <param key="port" value="61613" />
- </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/stomp1.1/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index 0d5c953..0000000
--- a/examples/jms/stomp1.1/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/stomp1.1/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/stomp1.1/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/stomp1.1/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/stomp1.1/src/main/resources/jndi.properties b/examples/jms/stomp1.1/src/main/resources/jndi.properties
new file mode 100644
index 0000000..d9b5c6a
--- /dev/null
+++ b/examples/jms/stomp1.1/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/stomp1.2/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/stomp1.2/pom.xml b/examples/jms/stomp1.2/pom.xml
index 1876e38..2c52fb6 100644
--- a/examples/jms/stomp1.2/pom.xml
+++ b/examples/jms/stomp1.2/pom.xml
@@ -51,9 +51,6 @@
</goals>
<configuration>
<clientClass>org.apache.activemq.jms.example.StompExample</clientClass>
- <args>
- <param>tcp://localhost:5445</param>
- </args>
</configuration>
</execution>
<execution>
@@ -107,7 +104,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/stomp1.2/src/main/java/org/apache/activemq/jms/example/StompExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/stomp1.2/src/main/java/org/apache/activemq/jms/example/StompExample.java b/examples/jms/stomp1.2/src/main/java/org/apache/activemq/jms/example/StompExample.java
index 7b21107..f9faf72 100644
--- a/examples/jms/stomp1.2/src/main/java/org/apache/activemq/jms/example/StompExample.java
+++ b/examples/jms/stomp1.2/src/main/java/org/apache/activemq/jms/example/StompExample.java
@@ -94,7 +94,7 @@ public class StompExample extends ActiveMQExample
// We will now consume from JMS the message sent with Stomp.
// Step 6. Create an initial context to perform the JNDI lookup.
- initialContext = getContext(0);
+ initialContext = new InitialContext();
// Step 7. Perform a lookup on the queue and the connection factory
Queue queue = (Queue)initialContext.lookup("queue/exampleQueue");
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/stomp1.2/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/stomp1.2/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/stomp1.2/src/main/resources/activemq/server0/activemq-configuration.xml
new file mode 100644
index 0000000..1b68cd8
--- /dev/null
+++ b/examples/jms/stomp1.2/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>
+ <!-- a regular Netty acceptor used by the JMS client -->
+ <acceptor name="netty-acceptor">
+ <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
+ </acceptor>
+ <!-- the stomp-acceptor is configured for the Stomp protocol only and -->
+ <!-- will listen on port 61613 (default Stomp port) -->
+ <acceptor name="stomp-acceptor">
+ <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
+ <param key="protocols" value="STOMP" />
+ <param key="port" value="61613" />
+ </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/stomp1.2/src/main/resources/activemq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/stomp1.2/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/stomp1.2/src/main/resources/activemq/server0/activemq-jms.xml
new file mode 100644
index 0000000..0d5c953
--- /dev/null
+++ b/examples/jms/stomp1.2/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/stomp1.2/src/main/resources/activemq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/stomp1.2/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/stomp1.2/src/main/resources/activemq/server0/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/stomp1.2/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/stomp1.2/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/stomp1.2/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/stomp1.2/src/main/resources/hornetq/server0/activemq-configuration.xml
deleted file mode 100644
index 0188165..0000000
--- a/examples/jms/stomp1.2/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ /dev/null
@@ -1,51 +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>
- <!-- a regular Netty acceptor used by the JMS client -->
- <acceptor name="netty-acceptor">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- </acceptor>
- <!-- the stomp-acceptor is configured for the Stomp protocol only and -->
- <!-- will listen on port 61613 (default Stomp port) -->
- <acceptor name="stomp-acceptor">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- <param key="protocols" value="STOMP" />
- <param key="port" value="61613" />
- </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>
[19/37] activemq-6 git commit: ACTIVEMQ6-51 Example server
bootstrapping
Posted by jb...@apache.org.
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/stomp1.2/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index 0d5c953..0000000
--- a/examples/jms/stomp1.2/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/stomp1.2/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/stomp1.2/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/stomp1.2/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/stomp1.2/src/main/resources/jndi.properties b/examples/jms/stomp1.2/src/main/resources/jndi.properties
new file mode 100644
index 0000000..d9b5c6a
--- /dev/null
+++ b/examples/jms/stomp1.2/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/stop-server-failover/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/stop-server-failover/pom.xml b/examples/jms/stop-server-failover/pom.xml
index 366ebfc..60ae76b 100644
--- a/examples/jms/stop-server-failover/pom.xml
+++ b/examples/jms/stop-server-failover/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>
@@ -57,7 +57,7 @@
<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 +96,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 +105,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/stop-server-failover/src/main/java/org/apache/activemq/jms/example/StopServerFailoverExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/stop-server-failover/src/main/java/org/apache/activemq/jms/example/StopServerFailoverExample.java b/examples/jms/stop-server-failover/src/main/java/org/apache/activemq/jms/example/StopServerFailoverExample.java
index e5e6691..a5e9eb4 100644
--- a/examples/jms/stop-server-failover/src/main/java/org/apache/activemq/jms/example/StopServerFailoverExample.java
+++ b/examples/jms/stop-server-failover/src/main/java/org/apache/activemq/jms/example/StopServerFailoverExample.java
@@ -53,7 +53,7 @@ public class StopServerFailoverExample extends ActiveMQExample
try
{
// Step 1. Get an initial context for looking up JNDI from the server #1
- initialContext = getContext(0);
+ initialContext = new InitialContext();
// Step 2. Look up the JMS resources from JNDI
Queue queue = (Queue)initialContext.lookup("queue/exampleQueue");
@@ -98,7 +98,7 @@ public class StopServerFailoverExample extends ActiveMQExample
// Step 10. Crash server #1, the live server, and wait a little while to make sure
// it has really crashed
- Thread.sleep(2000);
+ Thread.sleep(5000);
System.out.println("stop the server by logging into jconsole");
System.in.read();
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/stop-server-failover/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/stop-server-failover/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/stop-server-failover/src/main/resources/activemq/server0/activemq-configuration.xml
new file mode 100644
index 0000000..a586414
--- /dev/null
+++ b/examples/jms/stop-server-failover/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -0,0 +1,72 @@
+<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>
+
+ <ha-policy>
+ <shared-store>
+ <master/>
+ </shared-store>
+ </ha-policy>
+
+ <!-- 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>
+
+ <broadcast-groups>
+ <broadcast-group name="bg-group1">
+ <group-address>${udp-address:231.7.7.7}</group-address>
+ <group-port>9876</group-port>
+ <broadcast-period>1000</broadcast-period>
+ <connector-ref>netty-connector</connector-ref>
+ </broadcast-group>
+ </broadcast-groups>
+
+ <discovery-groups>
+ <discovery-group name="dg-group1">
+ <group-address>${udp-address:231.7.7.7}</group-address>
+ <group-port>9876</group-port>
+ <refresh-timeout>60000</refresh-timeout>
+ </discovery-group>
+ </discovery-groups>
+
+ <cluster-connections>
+ <cluster-connection name="my-cluster">
+ <address>jms</address>
+ <connector-ref>netty-connector</connector-ref>
+ <discovery-group-ref discovery-group-name="dg-group1"/>
+ </cluster-connection>
+ </cluster-connections>
+
+ <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/stop-server-failover/src/main/resources/activemq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/stop-server-failover/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/stop-server-failover/src/main/resources/activemq/server0/activemq-jms.xml
new file mode 100644
index 0000000..0d5c953
--- /dev/null
+++ b/examples/jms/stop-server-failover/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/stop-server-failover/src/main/resources/activemq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/stop-server-failover/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/stop-server-failover/src/main/resources/activemq/server0/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/stop-server-failover/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/stop-server-failover/src/main/resources/activemq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/stop-server-failover/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/stop-server-failover/src/main/resources/activemq/server1/activemq-configuration.xml
new file mode 100644
index 0000000..f545a18
--- /dev/null
+++ b/examples/jms/stop-server-failover/src/main/resources/activemq/server1/activemq-configuration.xml
@@ -0,0 +1,72 @@
+<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>
+
+ <ha-policy>
+ <shared-store>
+ <slave/>
+ </shared-store>
+ </ha-policy>
+
+ <!-- Connectors -->
+ <connectors>
+ <connector name="netty-connector">
+ <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
+ <param key="port" value="5446"/>
+ </connector>
+ </connectors>
+
+ <!-- Acceptors -->
+ <acceptors>
+ <acceptor name="netty-acceptor">
+ <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
+ <param key="port" value="5446"/>
+ </acceptor>
+ </acceptors>
+
+ <broadcast-groups>
+ <broadcast-group name="bg-group1">
+ <group-address>${udp-address:231.7.7.7}</group-address>
+ <group-port>9876</group-port>
+ <broadcast-period>1000</broadcast-period>
+ <connector-ref>netty-connector</connector-ref>
+ </broadcast-group>
+ </broadcast-groups>
+
+ <discovery-groups>
+ <discovery-group name="dg-group1">
+ <group-address>${udp-address:231.7.7.7}</group-address>
+ <group-port>9876</group-port>
+ <refresh-timeout>60000</refresh-timeout>
+ </discovery-group>
+ </discovery-groups>
+
+ <cluster-connections>
+ <cluster-connection name="my-cluster">
+ <address>jms</address>
+ <connector-ref>netty-connector</connector-ref>
+ <discovery-group-ref discovery-group-name="dg-group1"/>
+ </cluster-connection>
+ </cluster-connections>
+
+ <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/stop-server-failover/src/main/resources/activemq/server1/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/stop-server-failover/src/main/resources/activemq/server1/activemq-jms.xml b/examples/jms/stop-server-failover/src/main/resources/activemq/server1/activemq-jms.xml
new file mode 100644
index 0000000..0d5c953
--- /dev/null
+++ b/examples/jms/stop-server-failover/src/main/resources/activemq/server1/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/stop-server-failover/src/main/resources/activemq/server1/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/stop-server-failover/src/main/resources/activemq/server1/activemq-users.xml b/examples/jms/stop-server-failover/src/main/resources/activemq/server1/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/stop-server-failover/src/main/resources/activemq/server1/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/stop-server-failover/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/stop-server-failover/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/stop-server-failover/src/main/resources/hornetq/server0/activemq-configuration.xml
deleted file mode 100644
index a586414..0000000
--- a/examples/jms/stop-server-failover/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ /dev/null
@@ -1,72 +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>
-
- <ha-policy>
- <shared-store>
- <master/>
- </shared-store>
- </ha-policy>
-
- <!-- 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>
-
- <broadcast-groups>
- <broadcast-group name="bg-group1">
- <group-address>${udp-address:231.7.7.7}</group-address>
- <group-port>9876</group-port>
- <broadcast-period>1000</broadcast-period>
- <connector-ref>netty-connector</connector-ref>
- </broadcast-group>
- </broadcast-groups>
-
- <discovery-groups>
- <discovery-group name="dg-group1">
- <group-address>${udp-address:231.7.7.7}</group-address>
- <group-port>9876</group-port>
- <refresh-timeout>60000</refresh-timeout>
- </discovery-group>
- </discovery-groups>
-
- <cluster-connections>
- <cluster-connection name="my-cluster">
- <address>jms</address>
- <connector-ref>netty-connector</connector-ref>
- <discovery-group-ref discovery-group-name="dg-group1"/>
- </cluster-connection>
- </cluster-connections>
-
- <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/stop-server-failover/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index 0d5c953..0000000
--- a/examples/jms/stop-server-failover/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/stop-server-failover/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/stop-server-failover/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/stop-server-failover/src/main/resources/hornetq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/stop-server-failover/src/main/resources/hornetq/server1/activemq-configuration.xml b/examples/jms/stop-server-failover/src/main/resources/hornetq/server1/activemq-configuration.xml
deleted file mode 100644
index f545a18..0000000
--- a/examples/jms/stop-server-failover/src/main/resources/hornetq/server1/activemq-configuration.xml
+++ /dev/null
@@ -1,72 +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>
-
- <ha-policy>
- <shared-store>
- <slave/>
- </shared-store>
- </ha-policy>
-
- <!-- Connectors -->
- <connectors>
- <connector name="netty-connector">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
- <param key="port" value="5446"/>
- </connector>
- </connectors>
-
- <!-- Acceptors -->
- <acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- <param key="port" value="5446"/>
- </acceptor>
- </acceptors>
-
- <broadcast-groups>
- <broadcast-group name="bg-group1">
- <group-address>${udp-address:231.7.7.7}</group-address>
- <group-port>9876</group-port>
- <broadcast-period>1000</broadcast-period>
- <connector-ref>netty-connector</connector-ref>
- </broadcast-group>
- </broadcast-groups>
-
- <discovery-groups>
- <discovery-group name="dg-group1">
- <group-address>${udp-address:231.7.7.7}</group-address>
- <group-port>9876</group-port>
- <refresh-timeout>60000</refresh-timeout>
- </discovery-group>
- </discovery-groups>
-
- <cluster-connections>
- <cluster-connection name="my-cluster">
- <address>jms</address>
- <connector-ref>netty-connector</connector-ref>
- <discovery-group-ref discovery-group-name="dg-group1"/>
- </cluster-connection>
- </cluster-connections>
-
- <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/stop-server-failover/src/main/resources/hornetq/server1/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/stop-server-failover/src/main/resources/hornetq/server1/activemq-jms.xml b/examples/jms/stop-server-failover/src/main/resources/hornetq/server1/activemq-jms.xml
deleted file mode 100644
index 0d5c953..0000000
--- a/examples/jms/stop-server-failover/src/main/resources/hornetq/server1/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/stop-server-failover/src/main/resources/hornetq/server1/activemq-users.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/stop-server-failover/src/main/resources/hornetq/server1/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/stop-server-failover/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/stop-server-failover/src/main/resources/jndi.properties b/examples/jms/stop-server-failover/src/main/resources/jndi.properties
new file mode 100644
index 0000000..8fda7c0
--- /dev/null
+++ b/examples/jms/stop-server-failover/src/main/resources/jndi.properties
@@ -0,0 +1,7 @@
+java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
+java.naming.provider.url=tcp://localhost:5445
+connection.ConnectionFactory.ha=true
+connection.ConnectionFactory.retryInterval=1000
+connection.ConnectionFactory.retryIntervalMultiplier=1.0
+connection.ConnectionFactory.reconnectAttempts=-1
+queue.queue/exampleQueue=exampleQueue
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/symmetric-cluster/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/symmetric-cluster/pom.xml b/examples/jms/symmetric-cluster/pom.xml
index 585c5c4..c23df88 100644
--- a/examples/jms/symmetric-cluster/pom.xml
+++ b/examples/jms/symmetric-cluster/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>
@@ -57,7 +57,7 @@
<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>
@@ -79,7 +79,7 @@
<configuration>
<jndiPort>1299</jndiPort>
<jndiRmiPort>1298</jndiRmiPort>
- <hornetqConfigurationDir>${basedir}/target/classes/activemq/server2</hornetqConfigurationDir>
+ <configurationDir>${basedir}/target/classes/activemq/server2</configurationDir>
<fork>true</fork>
<systemProperties>
<property>
@@ -101,7 +101,7 @@
<configuration>
<jndiPort>1399</jndiPort>
<jndiRmiPort>1398</jndiRmiPort>
- <hornetqConfigurationDir>${basedir}/target/classes/activemq/server3</hornetqConfigurationDir>
+ <configurationDir>${basedir}/target/classes/activemq/server3</configurationDir>
<fork>true</fork>
<systemProperties>
<property>
@@ -123,7 +123,7 @@
<configuration>
<jndiPort>1499</jndiPort>
<jndiRmiPort>1498</jndiRmiPort>
- <hornetqConfigurationDir>${basedir}/target/classes/activemq/server4</hornetqConfigurationDir>
+ <configurationDir>${basedir}/target/classes/activemq/server4</configurationDir>
<fork>true</fork>
<systemProperties>
<property>
@@ -145,7 +145,7 @@
<configuration>
<jndiPort>1599</jndiPort>
<jndiRmiPort>1598</jndiRmiPort>
- <hornetqConfigurationDir>${basedir}/target/classes/activemq/server5</hornetqConfigurationDir>
+ <configurationDir>${basedir}/target/classes/activemq/server5</configurationDir>
<fork>true</fork>
<systemProperties>
<property>
@@ -188,7 +188,7 @@
<goal>stop</goal>
</goals>
<configuration>
- <hornetqConfigurationDir>${basedir}/target/classes/activemq/server0</hornetqConfigurationDir>
+ <configurationDir>${basedir}/target/classes/activemq/server0</configurationDir>
</configuration>
</execution>
<execution>
@@ -197,7 +197,7 @@
<goal>stop</goal>
</goals>
<configuration>
- <hornetqConfigurationDir>${basedir}/target/classes/activemq/server1</hornetqConfigurationDir>
+ <configurationDir>${basedir}/target/classes/activemq/server1</configurationDir>
</configuration>
</execution>
<execution>
@@ -206,7 +206,7 @@
<goal>stop</goal>
</goals>
<configuration>
- <hornetqConfigurationDir>${basedir}/target/classes/activemq/server2</hornetqConfigurationDir>
+ <configurationDir>${basedir}/target/classes/activemq/server2</configurationDir>
</configuration>
</execution>
<execution>
@@ -215,7 +215,7 @@
<goal>stop</goal>
</goals>
<configuration>
- <hornetqConfigurationDir>${basedir}/target/classes/activemq/server3</hornetqConfigurationDir>
+ <configurationDir>${basedir}/target/classes/activemq/server3</configurationDir>
</configuration>
</execution>
<execution>
@@ -224,7 +224,7 @@
<goal>stop</goal>
</goals>
<configuration>
- <hornetqConfigurationDir>${basedir}/target/classes/activemq/server4</hornetqConfigurationDir>
+ <configurationDir>${basedir}/target/classes/activemq/server4</configurationDir>
</configuration>
</execution>
<execution>
@@ -233,7 +233,7 @@
<goal>stop</goal>
</goals>
<configuration>
- <hornetqConfigurationDir>${basedir}/target/classes/activemq/server5</hornetqConfigurationDir>
+ <configurationDir>${basedir}/target/classes/activemq/server5</configurationDir>
</configuration>
</execution>
</executions>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/symmetric-cluster/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/symmetric-cluster/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/symmetric-cluster/src/main/resources/activemq/server0/activemq-configuration.xml
new file mode 100644
index 0000000..744282a
--- /dev/null
+++ b/examples/jms/symmetric-cluster/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -0,0 +1,78 @@
+<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>
+ <!-- Default JMS security -->
+ <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-settings>
+
+</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/symmetric-cluster/src/main/resources/activemq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/symmetric-cluster/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/symmetric-cluster/src/main/resources/activemq/server0/activemq-jms.xml
new file mode 100644
index 0000000..6e79642
--- /dev/null
+++ b/examples/jms/symmetric-cluster/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">
+
+ <queue name="exampleQueue"/>
+
+ <topic name="exampleTopic"/>
+
+</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/symmetric-cluster/src/main/resources/activemq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/symmetric-cluster/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/symmetric-cluster/src/main/resources/activemq/server0/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/symmetric-cluster/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/symmetric-cluster/src/main/resources/activemq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/symmetric-cluster/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/symmetric-cluster/src/main/resources/activemq/server1/activemq-configuration.xml
new file mode 100644
index 0000000..bacb6c3
--- /dev/null
+++ b/examples/jms/symmetric-cluster/src/main/resources/activemq/server1/activemq-configuration.xml
@@ -0,0 +1,76 @@
+<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}/server1/data/messaging/bindings</bindings-directory>
+
+ <journal-directory>${build.directory}/server1/data/messaging/journal</journal-directory>
+
+ <large-messages-directory>${build.directory}/server1/data/messaging/largemessages</large-messages-directory>
+
+ <paging-directory>${build.directory}/server1/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="5446"/>
+ </connector>
+ </connectors>
+
+ <!-- Acceptors -->
+ <acceptors>
+ <acceptor name="netty-acceptor">
+ <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
+ <param key="port" value="5446"/>
+ </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>
+ <!-- Default JMS security -->
+ <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-settings>
+
+</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/symmetric-cluster/src/main/resources/activemq/server1/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/symmetric-cluster/src/main/resources/activemq/server1/activemq-jms.xml b/examples/jms/symmetric-cluster/src/main/resources/activemq/server1/activemq-jms.xml
new file mode 100644
index 0000000..7b26f36
--- /dev/null
+++ b/examples/jms/symmetric-cluster/src/main/resources/activemq/server1/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">
+
+ <queue name="exampleQueue"/>
+
+ <topic name="exampleTopic"/>
+
+</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/symmetric-cluster/src/main/resources/activemq/server1/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/symmetric-cluster/src/main/resources/activemq/server1/activemq-users.xml b/examples/jms/symmetric-cluster/src/main/resources/activemq/server1/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/symmetric-cluster/src/main/resources/activemq/server1/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/symmetric-cluster/src/main/resources/activemq/server2/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/symmetric-cluster/src/main/resources/activemq/server2/activemq-configuration.xml b/examples/jms/symmetric-cluster/src/main/resources/activemq/server2/activemq-configuration.xml
new file mode 100644
index 0000000..680597c
--- /dev/null
+++ b/examples/jms/symmetric-cluster/src/main/resources/activemq/server2/activemq-configuration.xml
@@ -0,0 +1,76 @@
+<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}/server2/data/messaging/bindings</bindings-directory>
+
+ <journal-directory>${build.directory}/server2/data/messaging/journal</journal-directory>
+
+ <large-messages-directory>${build.directory}/server2/data/messaging/largemessages</large-messages-directory>
+
+ <paging-directory>${build.directory}/server2/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="5447"/>
+ </connector>
+ </connectors>
+
+ <!-- Acceptors -->
+ <acceptors>
+ <acceptor name="netty-acceptor">
+ <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
+ <param key="port" value="5447"/>
+ </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>
+ <!-- Default JMS security -->
+ <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-settings>
+
+</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/symmetric-cluster/src/main/resources/activemq/server2/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/symmetric-cluster/src/main/resources/activemq/server2/activemq-jms.xml b/examples/jms/symmetric-cluster/src/main/resources/activemq/server2/activemq-jms.xml
new file mode 100644
index 0000000..7b26f36
--- /dev/null
+++ b/examples/jms/symmetric-cluster/src/main/resources/activemq/server2/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">
+
+ <queue name="exampleQueue"/>
+
+ <topic name="exampleTopic"/>
+
+</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/symmetric-cluster/src/main/resources/activemq/server2/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/symmetric-cluster/src/main/resources/activemq/server2/activemq-users.xml b/examples/jms/symmetric-cluster/src/main/resources/activemq/server2/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/symmetric-cluster/src/main/resources/activemq/server2/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/symmetric-cluster/src/main/resources/activemq/server3/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/symmetric-cluster/src/main/resources/activemq/server3/activemq-configuration.xml b/examples/jms/symmetric-cluster/src/main/resources/activemq/server3/activemq-configuration.xml
new file mode 100644
index 0000000..fad3768
--- /dev/null
+++ b/examples/jms/symmetric-cluster/src/main/resources/activemq/server3/activemq-configuration.xml
@@ -0,0 +1,76 @@
+<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}/server3/data/messaging/bindings</bindings-directory>
+
+ <journal-directory>${build.directory}/server3/data/messaging/journal</journal-directory>
+
+ <large-messages-directory>${build.directory}/server3/data/messaging/largemessages</large-messages-directory>
+
+ <paging-directory>${build.directory}/server3/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="5448"/>
+ </connector>
+ </connectors>
+
+ <!-- Acceptors -->
+ <acceptors>
+ <acceptor name="netty-acceptor">
+ <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
+ <param key="port" value="5448"/>
+ </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>
+ <!-- Default JMS security -->
+ <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-settings>
+
+</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/symmetric-cluster/src/main/resources/activemq/server3/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/symmetric-cluster/src/main/resources/activemq/server3/activemq-jms.xml b/examples/jms/symmetric-cluster/src/main/resources/activemq/server3/activemq-jms.xml
new file mode 100644
index 0000000..7b26f36
--- /dev/null
+++ b/examples/jms/symmetric-cluster/src/main/resources/activemq/server3/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">
+
+ <queue name="exampleQueue"/>
+
+ <topic name="exampleTopic"/>
+
+</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/symmetric-cluster/src/main/resources/activemq/server3/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/symmetric-cluster/src/main/resources/activemq/server3/activemq-users.xml b/examples/jms/symmetric-cluster/src/main/resources/activemq/server3/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/symmetric-cluster/src/main/resources/activemq/server3/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/symmetric-cluster/src/main/resources/activemq/server4/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/symmetric-cluster/src/main/resources/activemq/server4/activemq-configuration.xml b/examples/jms/symmetric-cluster/src/main/resources/activemq/server4/activemq-configuration.xml
new file mode 100644
index 0000000..fb2138b
--- /dev/null
+++ b/examples/jms/symmetric-cluster/src/main/resources/activemq/server4/activemq-configuration.xml
@@ -0,0 +1,75 @@
+<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}/server4/data/messaging/bindings</bindings-directory>
+
+ <journal-directory>${build.directory}/server4/data/messaging/journal</journal-directory>
+
+ <large-messages-directory>${build.directory}/server4/data/messaging/largemessages</large-messages-directory>
+
+ <paging-directory>${build.directory}/server4/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="5449"/>
+ </connector>
+ </connectors>
+
+ <!-- Acceptors -->
+ <acceptors>
+ <acceptor name="netty-acceptor">
+ <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
+ <param key="port" value="5449"/>
+ </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>
+ <!-- Default JMS security -->
+ <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-settings>
+
+</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/symmetric-cluster/src/main/resources/activemq/server4/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/symmetric-cluster/src/main/resources/activemq/server4/activemq-jms.xml b/examples/jms/symmetric-cluster/src/main/resources/activemq/server4/activemq-jms.xml
new file mode 100644
index 0000000..7b26f36
--- /dev/null
+++ b/examples/jms/symmetric-cluster/src/main/resources/activemq/server4/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">
+
+ <queue name="exampleQueue"/>
+
+ <topic name="exampleTopic"/>
+
+</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/symmetric-cluster/src/main/resources/activemq/server4/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/symmetric-cluster/src/main/resources/activemq/server4/activemq-users.xml b/examples/jms/symmetric-cluster/src/main/resources/activemq/server4/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/symmetric-cluster/src/main/resources/activemq/server4/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/symmetric-cluster/src/main/resources/activemq/server5/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/symmetric-cluster/src/main/resources/activemq/server5/activemq-configuration.xml b/examples/jms/symmetric-cluster/src/main/resources/activemq/server5/activemq-configuration.xml
new file mode 100644
index 0000000..f8ec355
--- /dev/null
+++ b/examples/jms/symmetric-cluster/src/main/resources/activemq/server5/activemq-configuration.xml
@@ -0,0 +1,75 @@
+<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}/server5/data/messaging/bindings</bindings-directory>
+
+ <journal-directory>${build.directory}/server5/data/messaging/journal</journal-directory>
+
+ <large-messages-directory>${build.directory}/server5/data/messaging/largemessages</large-messages-directory>
+
+ <paging-directory>${build.directory}/server5/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="5450"/>
+ </connector>
+ </connectors>
+
+ <!-- Acceptors -->
+ <acceptors>
+ <acceptor name="netty-acceptor">
+ <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
+ <param key="port" value="5450"/>
+ </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>
+ <!-- Default JMS security -->
+ <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-settings>
+
+</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/symmetric-cluster/src/main/resources/activemq/server5/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/symmetric-cluster/src/main/resources/activemq/server5/activemq-jms.xml b/examples/jms/symmetric-cluster/src/main/resources/activemq/server5/activemq-jms.xml
new file mode 100644
index 0000000..7b26f36
--- /dev/null
+++ b/examples/jms/symmetric-cluster/src/main/resources/activemq/server5/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">
+
+ <queue name="exampleQueue"/>
+
+ <topic name="exampleTopic"/>
+
+</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/symmetric-cluster/src/main/resources/activemq/server5/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/symmetric-cluster/src/main/resources/activemq/server5/activemq-users.xml b/examples/jms/symmetric-cluster/src/main/resources/activemq/server5/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/symmetric-cluster/src/main/resources/activemq/server5/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/symmetric-cluster/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/symmetric-cluster/src/main/resources/hornetq/server0/activemq-configuration.xml
deleted file mode 100644
index 744282a..0000000
--- a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ /dev/null
@@ -1,78 +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>
- <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>
- <!-- Default JMS security -->
- <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-settings>
-
-</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/symmetric-cluster/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/symmetric-cluster/src/main/resources/hornetq/server0/activemq-jms.xml
deleted file mode 100644
index 6e79642..0000000
--- a/examples/jms/symmetric-cluster/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">
-
- <queue name="exampleQueue"/>
-
- <topic name="exampleTopic"/>
-
-</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/symmetric-cluster/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/symmetric-cluster/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/symmetric-cluster/src/main/resources/hornetq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server1/activemq-configuration.xml b/examples/jms/symmetric-cluster/src/main/resources/hornetq/server1/activemq-configuration.xml
deleted file mode 100644
index bacb6c3..0000000
--- a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server1/activemq-configuration.xml
+++ /dev/null
@@ -1,76 +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}/server1/data/messaging/bindings</bindings-directory>
-
- <journal-directory>${build.directory}/server1/data/messaging/journal</journal-directory>
-
- <large-messages-directory>${build.directory}/server1/data/messaging/largemessages</large-messages-directory>
-
- <paging-directory>${build.directory}/server1/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="5446"/>
- </connector>
- </connectors>
-
- <!-- Acceptors -->
- <acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- <param key="port" value="5446"/>
- </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>
- <!-- Default JMS security -->
- <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-settings>
-
-</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/symmetric-cluster/src/main/resources/hornetq/server1/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server1/activemq-jms.xml b/examples/jms/symmetric-cluster/src/main/resources/hornetq/server1/activemq-jms.xml
deleted file mode 100644
index 7b26f36..0000000
--- a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server1/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">
-
- <queue name="exampleQueue"/>
-
- <topic name="exampleTopic"/>
-
-</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/symmetric-cluster/src/main/resources/hornetq/server1/activemq-users.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server1/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/symmetric-cluster/src/main/resources/hornetq/server2/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server2/activemq-configuration.xml b/examples/jms/symmetric-cluster/src/main/resources/hornetq/server2/activemq-configuration.xml
deleted file mode 100644
index 680597c..0000000
--- a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server2/activemq-configuration.xml
+++ /dev/null
@@ -1,76 +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}/server2/data/messaging/bindings</bindings-directory>
-
- <journal-directory>${build.directory}/server2/data/messaging/journal</journal-directory>
-
- <large-messages-directory>${build.directory}/server2/data/messaging/largemessages</large-messages-directory>
-
- <paging-directory>${build.directory}/server2/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="5447"/>
- </connector>
- </connectors>
-
- <!-- Acceptors -->
- <acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- <param key="port" value="5447"/>
- </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>
- <!-- Default JMS security -->
- <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-settings>
-
-</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/symmetric-cluster/src/main/resources/hornetq/server2/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server2/activemq-jms.xml b/examples/jms/symmetric-cluster/src/main/resources/hornetq/server2/activemq-jms.xml
deleted file mode 100644
index 7b26f36..0000000
--- a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server2/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">
-
- <queue name="exampleQueue"/>
-
- <topic name="exampleTopic"/>
-
-</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/symmetric-cluster/src/main/resources/hornetq/server2/activemq-users.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server2/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/symmetric-cluster/src/main/resources/hornetq/server3/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server3/activemq-configuration.xml b/examples/jms/symmetric-cluster/src/main/resources/hornetq/server3/activemq-configuration.xml
deleted file mode 100644
index fad3768..0000000
--- a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server3/activemq-configuration.xml
+++ /dev/null
@@ -1,76 +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}/server3/data/messaging/bindings</bindings-directory>
-
- <journal-directory>${build.directory}/server3/data/messaging/journal</journal-directory>
-
- <large-messages-directory>${build.directory}/server3/data/messaging/largemessages</large-messages-directory>
-
- <paging-directory>${build.directory}/server3/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="5448"/>
- </connector>
- </connectors>
-
- <!-- Acceptors -->
- <acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- <param key="port" value="5448"/>
- </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>
- <!-- Default JMS security -->
- <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-settings>
-
-</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/symmetric-cluster/src/main/resources/hornetq/server3/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server3/activemq-jms.xml b/examples/jms/symmetric-cluster/src/main/resources/hornetq/server3/activemq-jms.xml
deleted file mode 100644
index 7b26f36..0000000
--- a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server3/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">
-
- <queue name="exampleQueue"/>
-
- <topic name="exampleTopic"/>
-
-</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/symmetric-cluster/src/main/resources/hornetq/server3/activemq-users.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server3/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/symmetric-cluster/src/main/resources/hornetq/server4/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server4/activemq-configuration.xml b/examples/jms/symmetric-cluster/src/main/resources/hornetq/server4/activemq-configuration.xml
deleted file mode 100644
index fb2138b..0000000
--- a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server4/activemq-configuration.xml
+++ /dev/null
@@ -1,75 +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}/server4/data/messaging/bindings</bindings-directory>
-
- <journal-directory>${build.directory}/server4/data/messaging/journal</journal-directory>
-
- <large-messages-directory>${build.directory}/server4/data/messaging/largemessages</large-messages-directory>
-
- <paging-directory>${build.directory}/server4/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="5449"/>
- </connector>
- </connectors>
-
- <!-- Acceptors -->
- <acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- <param key="port" value="5449"/>
- </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>
- <!-- Default JMS security -->
- <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-settings>
-
-</configuration>
[34/37] activemq-6 git commit: ACTIVEMQ6-51 Example server
bootstrapping
Posted by jb...@apache.org.
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/bridge/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/bridge/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/bridge/src/main/resources/hornetq/server0/activemq-configuration.xml
deleted file mode 100644
index 0611367..0000000
--- a/examples/jms/bridge/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ /dev/null
@@ -1,72 +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>
- <param key="port" value="5445"/>
- </connector>
-
- <!-- Connector to the other node -->
- <connector name="remote-connector">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
- <param key="port" value="5446"/>
- </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>
-
- <!-- We need to create a core queue for the JMS queue explicitly because the bridge will be deployed
- before the JMS queue is deployed, so the first time, it otherwise won't find the queue -->
- <queues>
- <queue name="jms.queue.sausage-factory">
- <address>jms.queue.sausage-factory</address>
- </queue>
- </queues>
-
- <!-- We set-up a bridge that forwards from a queue on this node to an address on another node.
- We specify a filter with the bridge, and a transformer too. The filter and transformer are optional -->
- <bridges>
- <bridge name="my-bridge">
- <queue-name>jms.queue.sausage-factory</queue-name>
- <forwarding-address>jms.queue.mincing-machine</forwarding-address>
- <filter string="name='aardvark'"/>
- <transformer-class-name>org.apache.activemq.jms.example.HatColourChangeTransformer</transformer-class-name>
- <reconnect-attempts>-1</reconnect-attempts>
- <static-connectors>
- <connector-ref>remote-connector</connector-ref>
- </static-connectors>
- </bridge>
- </bridges>
-
- <!-- Other config -->
-
- <security-settings>
- <!--security for example queue-->
- <security-setting match="jms.queue.#">
- <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/bridge/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/bridge/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/bridge/src/main/resources/hornetq/server0/activemq-jms.xml
deleted file mode 100644
index 3f96251..0000000
--- a/examples/jms/bridge/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="sausage-factory"/>
-
-</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/bridge/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/bridge/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/bridge/src/main/resources/hornetq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/bridge/src/main/resources/hornetq/server1/activemq-configuration.xml b/examples/jms/bridge/src/main/resources/hornetq/server1/activemq-configuration.xml
deleted file mode 100644
index 58ab92e..0000000
--- a/examples/jms/bridge/src/main/resources/hornetq/server1/activemq-configuration.xml
+++ /dev/null
@@ -1,44 +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}/server1/data/messaging/bindings</bindings-directory>
-
- <journal-directory>${build.directory}/server1/data/messaging/journal</journal-directory>
-
- <large-messages-directory>${build.directory}/server1/data/messaging/largemessages</large-messages-directory>
-
- <paging-directory>${build.directory}/server1/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="5446"/>
- </connector>
- </connectors>
-
- <!-- Acceptors -->
- <acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- <param key="port" value="5446"/>
- </acceptor>
- </acceptors>
-
- <!-- Other config -->
-
- <security-settings>
- <!--security for example queue-->
- <security-setting match="jms.queue.#">
- <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>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/bridge/src/main/resources/hornetq/server1/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/bridge/src/main/resources/hornetq/server1/activemq-jms.xml b/examples/jms/bridge/src/main/resources/hornetq/server1/activemq-jms.xml
deleted file mode 100644
index e4fe85a..0000000
--- a/examples/jms/bridge/src/main/resources/hornetq/server1/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="mincing-machine"/>
-
-</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/bridge/src/main/resources/hornetq/server1/activemq-users.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/bridge/src/main/resources/hornetq/server1/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/browser/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/browser/pom.xml b/examples/jms/browser/pom.xml
index ffcd947..5056aaa 100644
--- a/examples/jms/browser/pom.xml
+++ b/examples/jms/browser/pom.xml
@@ -94,7 +94,7 @@
</dependencies>
<configuration>
<waitOnStart>false</waitOnStart>
- <hornetqConfigurationDir>${basedir}/target/classes/activemq/server0</hornetqConfigurationDir>
+ <configurationDir>${basedir}/target/classes/activemq/server0</configurationDir>
<systemProperties>
<property>
<name>build.directory</name>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/browser/src/main/java/org/apache/activemq/jms/example/QueueBrowserExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/browser/src/main/java/org/apache/activemq/jms/example/QueueBrowserExample.java b/examples/jms/browser/src/main/java/org/apache/activemq/jms/example/QueueBrowserExample.java
index 52e7fe1..729ea8d 100644
--- a/examples/jms/browser/src/main/java/org/apache/activemq/jms/example/QueueBrowserExample.java
+++ b/examples/jms/browser/src/main/java/org/apache/activemq/jms/example/QueueBrowserExample.java
@@ -52,7 +52,7 @@ public class QueueBrowserExample 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/browser/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/browser/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/browser/src/main/resources/activemq/server0/activemq-configuration.xml
new file mode 100644
index 0000000..7939deb
--- /dev/null
+++ b/examples/jms/browser/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>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/browser/src/main/resources/activemq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/browser/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/browser/src/main/resources/activemq/server0/activemq-jms.xml
new file mode 100644
index 0000000..847659f
--- /dev/null
+++ b/examples/jms/browser/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>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/browser/src/main/resources/activemq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/browser/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/browser/src/main/resources/activemq/server0/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/browser/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/browser/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/browser/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/browser/src/main/resources/hornetq/server0/activemq-configuration.xml
deleted file mode 100644
index aee59c8..0000000
--- a/examples/jms/browser/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>
-
- <!-- 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>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/browser/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/browser/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/browser/src/main/resources/hornetq/server0/activemq-jms.xml
deleted file mode 100644
index 847659f..0000000
--- a/examples/jms/browser/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>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/browser/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/browser/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/browser/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/browser/src/main/resources/jndi.properties b/examples/jms/browser/src/main/resources/jndi.properties
new file mode 100644
index 0000000..d9b5c6a
--- /dev/null
+++ b/examples/jms/browser/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/client-kickoff/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/client-kickoff/pom.xml b/examples/jms/client-kickoff/pom.xml
index 3e0a2ed..fb79158 100644
--- a/examples/jms/client-kickoff/pom.xml
+++ b/examples/jms/client-kickoff/pom.xml
@@ -125,7 +125,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/client-kickoff/src/main/java/org/apache/activemq/jms/example/ClientKickoffExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/client-kickoff/src/main/java/org/apache/activemq/jms/example/ClientKickoffExample.java b/examples/jms/client-kickoff/src/main/java/org/apache/activemq/jms/example/ClientKickoffExample.java
index 80957f7..c9864c3 100644
--- a/examples/jms/client-kickoff/src/main/java/org/apache/activemq/jms/example/ClientKickoffExample.java
+++ b/examples/jms/client-kickoff/src/main/java/org/apache/activemq/jms/example/ClientKickoffExample.java
@@ -57,7 +57,7 @@ public class ClientKickoffExample 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
QueueConnectionFactory cf = (QueueConnectionFactory)initialContext.lookup("ConnectionFactory");
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/client-kickoff/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/client-kickoff/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/client-kickoff/src/main/resources/activemq/server0/activemq-configuration.xml
new file mode 100644
index 0000000..b2cbb37
--- /dev/null
+++ b/examples/jms/client-kickoff/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -0,0 +1,23 @@
+<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>
+
+ <!-- true to expose ActiveMQ resources through JMX -->
+ <jmx-management-enabled>true</jmx-management-enabled>
+
+ <!-- Acceptors -->
+ <acceptors>
+ <acceptor name="netty">
+ <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
+ </acceptor>
+ </acceptors>
+
+</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/client-kickoff/src/main/resources/activemq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/client-kickoff/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/client-kickoff/src/main/resources/activemq/server0/activemq-jms.xml
new file mode 100644
index 0000000..10a6dba
--- /dev/null
+++ b/examples/jms/client-kickoff/src/main/resources/activemq/server0/activemq-jms.xml
@@ -0,0 +1,5 @@
+<configuration xmlns="urn:activemq"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:activemq /schema/activemq-jms.xsd">
+
+</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/client-kickoff/src/main/resources/activemq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/client-kickoff/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/client-kickoff/src/main/resources/activemq/server0/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/client-kickoff/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/client-kickoff/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/client-kickoff/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/client-kickoff/src/main/resources/hornetq/server0/activemq-configuration.xml
deleted file mode 100644
index df1ebc8..0000000
--- a/examples/jms/client-kickoff/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ /dev/null
@@ -1,30 +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>
-
- <!-- true to expose ActiveMQ resources through JMX -->
- <jmx-management-enabled>true</jmx-management-enabled>
-
- <!-- Connectors -->
- <connectors>
- <connector name="netty">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
- </connector>
- </connectors>
-
- <!-- Acceptors -->
- <acceptors>
- <acceptor name="netty">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- </acceptor>
- </acceptors>
-
-</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/client-kickoff/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/client-kickoff/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/client-kickoff/src/main/resources/hornetq/server0/activemq-jms.xml
deleted file mode 100644
index 10a6dba..0000000
--- a/examples/jms/client-kickoff/src/main/resources/hornetq/server0/activemq-jms.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<configuration xmlns="urn:activemq"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:activemq /schema/activemq-jms.xsd">
-
-</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/client-kickoff/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/client-kickoff/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/client-kickoff/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/client-kickoff/src/main/resources/jndi.properties b/examples/jms/client-kickoff/src/main/resources/jndi.properties
new file mode 100644
index 0000000..6940f75
--- /dev/null
+++ b/examples/jms/client-kickoff/src/main/resources/jndi.properties
@@ -0,0 +1,2 @@
+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/client-side-failoverlistener/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/client-side-failoverlistener/pom.xml b/examples/jms/client-side-failoverlistener/pom.xml
index 402cced..bbc4b68 100644
--- a/examples/jms/client-side-failoverlistener/pom.xml
+++ b/examples/jms/client-side-failoverlistener/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>
@@ -79,10 +77,6 @@
</goals>
<configuration>
<clientClass>org.apache.activemq.jms.example.ClientSideFailoverListerExample</clientClass>
- <args>
- <param>tcp://localhost:5445</param>
- <param>tcp://localhost:5446</param>
- </args>
<systemProperties>
<property>
<name>exampleConfigDir</name>
@@ -97,7 +91,7 @@
<goal>stop</goal>
</goals>
<configuration>
- <hornetqConfigurationDir>${basedir}/target/classes/activemq/server0</hornetqConfigurationDir>
+ <configurationDir>${basedir}/target/classes/activemq/server0</configurationDir>
</configuration>
</execution>
<execution>
@@ -106,7 +100,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/client-side-failoverlistener/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/client-side-failoverlistener/readme.html b/examples/jms/client-side-failoverlistener/readme.html
index 6f8f073..eee1da4 100644
--- a/examples/jms/client-side-failoverlistener/readme.html
+++ b/examples/jms/client-side-failoverlistener/readme.html
@@ -11,7 +11,7 @@
<p>This example demonstrates how you can listen on failover event on the client side.</p>
<p>In this example there are two nodes running in a cluster, both server will be running for start,
- but after a while the first server will crash. This will trigger an fail oever event.</p>
+ but after a while the first server will crash. This will trigger an fail-over event.</p>
<h2>Example step-by-step</h2>
<p><em>To run the example, simply type <code>mvn verify</code> from this directory</em></p>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/client-side-failoverlistener/src/main/java/org/apache/activemq/jms/example/ClientSideFailoverListerExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/client-side-failoverlistener/src/main/java/org/apache/activemq/jms/example/ClientSideFailoverListerExample.java b/examples/jms/client-side-failoverlistener/src/main/java/org/apache/activemq/jms/example/ClientSideFailoverListerExample.java
index 46b7b63..07f2fe8 100644
--- a/examples/jms/client-side-failoverlistener/src/main/java/org/apache/activemq/jms/example/ClientSideFailoverListerExample.java
+++ b/examples/jms/client-side-failoverlistener/src/main/java/org/apache/activemq/jms/example/ClientSideFailoverListerExample.java
@@ -55,7 +55,7 @@ public class ClientSideFailoverListerExample extends ActiveMQExample
try
{
// Step 1. Get an initial context for looking up JNDI from server 0
- initialContext = getContext(0);
+ initialContext = new InitialContext();
// Step 2. Look-up the JMS Queue object from JNDI
Queue queue = (Queue)initialContext.lookup("queue/exampleQueue");
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server0/activemq-configuration.xml
new file mode 100644
index 0000000..b42e5aa
--- /dev/null
+++ b/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -0,0 +1,71 @@
+<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>
+
+ <ha-policy>
+ <shared-store>
+ <master/>
+ </shared-store>
+ </ha-policy>
+
+ <!-- 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>
+
+ <broadcast-groups>
+ <broadcast-group name="bg-group1">
+ <group-address>${udp-address:231.7.7.7}</group-address>
+ <group-port>9876</group-port>
+ <broadcast-period>1000</broadcast-period>
+ <connector-ref>netty-connector</connector-ref>
+ </broadcast-group>
+ </broadcast-groups>
+
+ <discovery-groups>
+ <discovery-group name="dg-group1">
+ <group-address>${udp-address:231.7.7.7}</group-address>
+ <group-port>9876</group-port>
+ <refresh-timeout>60000</refresh-timeout>
+ </discovery-group>
+ </discovery-groups>
+
+ <cluster-connections>
+ <cluster-connection name="my-cluster">
+ <address>jms</address>
+ <connector-ref>netty-connector</connector-ref>
+ <discovery-group-ref discovery-group-name="dg-group1"/>
+ </cluster-connection>
+ </cluster-connections>
+
+ <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/client-side-failoverlistener/src/main/resources/activemq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server0/activemq-jms.xml
new file mode 100644
index 0000000..0d5c953
--- /dev/null
+++ b/examples/jms/client-side-failoverlistener/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/client-side-failoverlistener/src/main/resources/activemq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server0/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/client-side-failoverlistener/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/client-side-failoverlistener/src/main/resources/activemq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server1/activemq-configuration.xml
new file mode 100644
index 0000000..00f88be
--- /dev/null
+++ b/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server1/activemq-configuration.xml
@@ -0,0 +1,71 @@
+<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>
+
+ <ha-policy>
+ <shared-store>
+ <slave/>
+ </shared-store>
+ </ha-policy>
+
+ <!-- Connectors -->
+ <connectors>
+ <connector name="netty-connector">
+ <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
+ <param key="port" value="5446"/>
+ </connector>
+ </connectors>
+
+ <!-- Acceptors -->
+ <acceptors>
+ <acceptor name="netty-acceptor">
+ <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
+ <param key="port" value="5446"/>
+ </acceptor>
+ </acceptors>
+
+ <broadcast-groups>
+ <broadcast-group name="bg-group1">
+ <group-address>${udp-address:231.7.7.7}</group-address>
+ <group-port>9876</group-port>
+ <broadcast-period>1000</broadcast-period>
+ <connector-ref>netty-connector</connector-ref>
+ </broadcast-group>
+ </broadcast-groups>
+
+ <discovery-groups>
+ <discovery-group name="dg-group1">
+ <group-address>${udp-address:231.7.7.7}</group-address>
+ <group-port>9876</group-port>
+ <refresh-timeout>60000</refresh-timeout>
+ </discovery-group>
+ </discovery-groups>
+
+ <cluster-connections>
+ <cluster-connection name="my-cluster">
+ <address>jms</address>
+ <connector-ref>netty-connector</connector-ref>
+ <discovery-group-ref discovery-group-name="dg-group1"/>
+ </cluster-connection>
+ </cluster-connections>
+
+ <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/client-side-failoverlistener/src/main/resources/activemq/server1/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server1/activemq-jms.xml b/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server1/activemq-jms.xml
new file mode 100644
index 0000000..0d5c953
--- /dev/null
+++ b/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server1/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/client-side-failoverlistener/src/main/resources/activemq/server1/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server1/activemq-users.xml b/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server1/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server1/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/client-side-failoverlistener/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server0/activemq-configuration.xml
deleted file mode 100644
index b42e5aa..0000000
--- a/examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ /dev/null
@@ -1,71 +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>
-
- <ha-policy>
- <shared-store>
- <master/>
- </shared-store>
- </ha-policy>
-
- <!-- 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>
-
- <broadcast-groups>
- <broadcast-group name="bg-group1">
- <group-address>${udp-address:231.7.7.7}</group-address>
- <group-port>9876</group-port>
- <broadcast-period>1000</broadcast-period>
- <connector-ref>netty-connector</connector-ref>
- </broadcast-group>
- </broadcast-groups>
-
- <discovery-groups>
- <discovery-group name="dg-group1">
- <group-address>${udp-address:231.7.7.7}</group-address>
- <group-port>9876</group-port>
- <refresh-timeout>60000</refresh-timeout>
- </discovery-group>
- </discovery-groups>
-
- <cluster-connections>
- <cluster-connection name="my-cluster">
- <address>jms</address>
- <connector-ref>netty-connector</connector-ref>
- <discovery-group-ref discovery-group-name="dg-group1"/>
- </cluster-connection>
- </cluster-connections>
-
- <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/client-side-failoverlistener/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server0/activemq-jms.xml
deleted file mode 100644
index 0d5c953..0000000
--- a/examples/jms/client-side-failoverlistener/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/client-side-failoverlistener/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/client-side-failoverlistener/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/client-side-failoverlistener/src/main/resources/hornetq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server1/activemq-configuration.xml b/examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server1/activemq-configuration.xml
deleted file mode 100644
index 00f88be..0000000
--- a/examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server1/activemq-configuration.xml
+++ /dev/null
@@ -1,71 +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>
-
- <ha-policy>
- <shared-store>
- <slave/>
- </shared-store>
- </ha-policy>
-
- <!-- Connectors -->
- <connectors>
- <connector name="netty-connector">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
- <param key="port" value="5446"/>
- </connector>
- </connectors>
-
- <!-- Acceptors -->
- <acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- <param key="port" value="5446"/>
- </acceptor>
- </acceptors>
-
- <broadcast-groups>
- <broadcast-group name="bg-group1">
- <group-address>${udp-address:231.7.7.7}</group-address>
- <group-port>9876</group-port>
- <broadcast-period>1000</broadcast-period>
- <connector-ref>netty-connector</connector-ref>
- </broadcast-group>
- </broadcast-groups>
-
- <discovery-groups>
- <discovery-group name="dg-group1">
- <group-address>${udp-address:231.7.7.7}</group-address>
- <group-port>9876</group-port>
- <refresh-timeout>60000</refresh-timeout>
- </discovery-group>
- </discovery-groups>
-
- <cluster-connections>
- <cluster-connection name="my-cluster">
- <address>jms</address>
- <connector-ref>netty-connector</connector-ref>
- <discovery-group-ref discovery-group-name="dg-group1"/>
- </cluster-connection>
- </cluster-connections>
-
- <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/client-side-failoverlistener/src/main/resources/hornetq/server1/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server1/activemq-jms.xml b/examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server1/activemq-jms.xml
deleted file mode 100644
index 0d5c953..0000000
--- a/examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server1/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/client-side-failoverlistener/src/main/resources/hornetq/server1/activemq-users.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server1/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/client-side-failoverlistener/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/client-side-failoverlistener/src/main/resources/jndi.properties b/examples/jms/client-side-failoverlistener/src/main/resources/jndi.properties
new file mode 100644
index 0000000..4aa3c29
--- /dev/null
+++ b/examples/jms/client-side-failoverlistener/src/main/resources/jndi.properties
@@ -0,0 +1,7 @@
+java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
+java.naming.provider.url=tcp://localhost:5445
+queue.queue/exampleQueue=exampleQueue
+connection.ConnectionFactory.ha=true
+connection.ConnectionFactory.retryInterval=1000
+connection.ConnectionFactory.retryIntervalMultiplier=1.0
+connection.ConnectionFactory.reconnectAttempts=-1
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/client-side-load-balancing/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/client-side-load-balancing/pom.xml b/examples/jms/client-side-load-balancing/pom.xml
index 9ce2b28..2ef08c4 100644
--- a/examples/jms/client-side-load-balancing/pom.xml
+++ b/examples/jms/client-side-load-balancing/pom.xml
@@ -36,16 +36,12 @@
<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>
<value>${basedir}/target/</value>
</property>
- <property>
- <name>udp-address</name>
- <value>${udp-address}</value>
- </property>
</systemProperties>
</configuration>
</execution>
@@ -55,9 +51,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>
@@ -77,19 +71,13 @@
<goal>start</goal>
</goals>
<configuration>
- <jndiPort>1299</jndiPort>
- <jndiRmiPort>1298</jndiRmiPort>
- <hornetqConfigurationDir>${basedir}/target/classes/activemq/server2</hornetqConfigurationDir>
+ <configurationDir>${basedir}/target/classes/activemq/server2</configurationDir>
<fork>true</fork>
<systemProperties>
<property>
<name>build.directory</name>
<value>${basedir}/target/</value>
</property>
- <property>
- <name>udp-address</name>
- <value>${udp-address}</value>
- </property>
</systemProperties>
</configuration>
</execution>
@@ -100,10 +88,6 @@
</goals>
<configuration>
<clientClass>org.apache.activemq.jms.example.ClientSideLoadBalancingExample</clientClass>
- <args>
- <param>tcp://localhost:5445</param>
- <param>tcp://localhost:5446</param>
- </args>
<systemProperties>
<property>
<name>exampleConfigDir</name>
@@ -118,7 +102,7 @@
<goal>stop</goal>
</goals>
<configuration>
- <hornetqConfigurationDir>${basedir}/target/classes/activemq/server0</hornetqConfigurationDir>
+ <configurationDir>${basedir}/target/classes/activemq/server0</configurationDir>
</configuration>
</execution>
<execution>
@@ -127,7 +111,7 @@
<goal>stop</goal>
</goals>
<configuration>
- <hornetqConfigurationDir>${basedir}/target/classes/activemq/server1</hornetqConfigurationDir>
+ <configurationDir>${basedir}/target/classes/activemq/server1</configurationDir>
</configuration>
</execution>
<execution>
@@ -136,7 +120,7 @@
<goal>stop</goal>
</goals>
<configuration>
- <hornetqConfigurationDir>${basedir}/target/classes/activemq/server2</hornetqConfigurationDir>
+ <configurationDir>${basedir}/target/classes/activemq/server2</configurationDir>
</configuration>
</execution>
</executions>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/client-side-load-balancing/src/main/java/org/apache/activemq/jms/example/ClientSideLoadBalancingExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/client-side-load-balancing/src/main/java/org/apache/activemq/jms/example/ClientSideLoadBalancingExample.java b/examples/jms/client-side-load-balancing/src/main/java/org/apache/activemq/jms/example/ClientSideLoadBalancingExample.java
index be1895a..1536107 100644
--- a/examples/jms/client-side-load-balancing/src/main/java/org/apache/activemq/jms/example/ClientSideLoadBalancingExample.java
+++ b/examples/jms/client-side-load-balancing/src/main/java/org/apache/activemq/jms/example/ClientSideLoadBalancingExample.java
@@ -56,7 +56,7 @@ public class ClientSideLoadBalancingExample extends ActiveMQExample
try
{
// Step 1. Get an initial context for looking up JNDI from server 0
- initialContext = getContext(0);
+ initialContext = new InitialContext();
// Step 2. Look-up the JMS Queue object from JNDI
Queue queue = (Queue)initialContext.lookup("queue/exampleQueue");
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/client-side-load-balancing/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/client-side-load-balancing/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/client-side-load-balancing/src/main/resources/activemq/server0/activemq-configuration.xml
new file mode 100644
index 0000000..96c4ee2
--- /dev/null
+++ b/examples/jms/client-side-load-balancing/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -0,0 +1,73 @@
+<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>
+ <max-hops>0</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>
+
+</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/client-side-load-balancing/src/main/resources/activemq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/client-side-load-balancing/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/client-side-load-balancing/src/main/resources/activemq/server0/activemq-jms.xml
new file mode 100644
index 0000000..847659f
--- /dev/null
+++ b/examples/jms/client-side-load-balancing/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>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/client-side-load-balancing/src/main/resources/activemq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/client-side-load-balancing/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/client-side-load-balancing/src/main/resources/activemq/server0/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/client-side-load-balancing/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/client-side-load-balancing/src/main/resources/activemq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/client-side-load-balancing/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/client-side-load-balancing/src/main/resources/activemq/server1/activemq-configuration.xml
new file mode 100644
index 0000000..b86baae
--- /dev/null
+++ b/examples/jms/client-side-load-balancing/src/main/resources/activemq/server1/activemq-configuration.xml
@@ -0,0 +1,72 @@
+<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}/server1/data/messaging/bindings</bindings-directory>
+
+ <journal-directory>${build.directory}/server1/data/messaging/journal</journal-directory>
+
+ <large-messages-directory>${build.directory}/server1/data/messaging/largemessages</large-messages-directory>
+
+ <paging-directory>${build.directory}/server1/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="5446"/>
+ </connector>
+ </connectors>
+
+ <!-- Acceptors -->
+ <acceptors>
+ <acceptor name="netty-acceptor">
+ <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
+ <param key="port" value="5446"/>
+ </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>
+ <max-hops>0</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>
+
+</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/client-side-load-balancing/src/main/resources/activemq/server1/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/client-side-load-balancing/src/main/resources/activemq/server1/activemq-jms.xml b/examples/jms/client-side-load-balancing/src/main/resources/activemq/server1/activemq-jms.xml
new file mode 100644
index 0000000..847659f
--- /dev/null
+++ b/examples/jms/client-side-load-balancing/src/main/resources/activemq/server1/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>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/client-side-load-balancing/src/main/resources/activemq/server1/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/client-side-load-balancing/src/main/resources/activemq/server1/activemq-users.xml b/examples/jms/client-side-load-balancing/src/main/resources/activemq/server1/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/client-side-load-balancing/src/main/resources/activemq/server1/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/client-side-load-balancing/src/main/resources/activemq/server2/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/client-side-load-balancing/src/main/resources/activemq/server2/activemq-configuration.xml b/examples/jms/client-side-load-balancing/src/main/resources/activemq/server2/activemq-configuration.xml
new file mode 100644
index 0000000..8e056d5
--- /dev/null
+++ b/examples/jms/client-side-load-balancing/src/main/resources/activemq/server2/activemq-configuration.xml
@@ -0,0 +1,72 @@
+<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}/server2/data/messaging/bindings</bindings-directory>
+
+ <journal-directory>${build.directory}/server2/data/messaging/journal</journal-directory>
+
+ <large-messages-directory>${build.directory}/server2/data/messaging/largemessages</large-messages-directory>
+
+ <paging-directory>${build.directory}/server2/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="5447"/>
+ </connector>
+ </connectors>
+
+ <!-- Acceptors -->
+ <acceptors>
+ <acceptor name="netty-acceptor">
+ <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
+ <param key="port" value="5447"/>
+ </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>
+ <max-hops>0</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>
+
+</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/client-side-load-balancing/src/main/resources/activemq/server2/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/client-side-load-balancing/src/main/resources/activemq/server2/activemq-jms.xml b/examples/jms/client-side-load-balancing/src/main/resources/activemq/server2/activemq-jms.xml
new file mode 100644
index 0000000..847659f
--- /dev/null
+++ b/examples/jms/client-side-load-balancing/src/main/resources/activemq/server2/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>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/client-side-load-balancing/src/main/resources/activemq/server2/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/client-side-load-balancing/src/main/resources/activemq/server2/activemq-users.xml b/examples/jms/client-side-load-balancing/src/main/resources/activemq/server2/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/client-side-load-balancing/src/main/resources/activemq/server2/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/client-side-load-balancing/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server0/activemq-configuration.xml
deleted file mode 100644
index 96c4ee2..0000000
--- a/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ /dev/null
@@ -1,73 +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>
- <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>
- <max-hops>0</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>
-
-</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server0/activemq-jms.xml
deleted file mode 100644
index 847659f..0000000
--- a/examples/jms/client-side-load-balancing/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>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/client-side-load-balancing/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/client-side-load-balancing/src/main/resources/hornetq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server1/activemq-configuration.xml b/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server1/activemq-configuration.xml
deleted file mode 100644
index b86baae..0000000
--- a/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server1/activemq-configuration.xml
+++ /dev/null
@@ -1,72 +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}/server1/data/messaging/bindings</bindings-directory>
-
- <journal-directory>${build.directory}/server1/data/messaging/journal</journal-directory>
-
- <large-messages-directory>${build.directory}/server1/data/messaging/largemessages</large-messages-directory>
-
- <paging-directory>${build.directory}/server1/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="5446"/>
- </connector>
- </connectors>
-
- <!-- Acceptors -->
- <acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- <param key="port" value="5446"/>
- </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>
- <max-hops>0</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>
-
-</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server1/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server1/activemq-jms.xml b/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server1/activemq-jms.xml
deleted file mode 100644
index 847659f..0000000
--- a/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server1/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>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server1/activemq-users.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/client-side-load-balancing/src/main/resources/hornetq/server1/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
[28/37] activemq-6 git commit: ACTIVEMQ6-51 Example server
bootstrapping
Posted by jb...@apache.org.
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/expiry/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/expiry/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/expiry/src/main/resources/hornetq/server0/activemq-configuration.xml
deleted file mode 100644
index 7e44235..0000000
--- a/examples/jms/expiry/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 -->
-
- <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.#">
- <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>
- <!--override the expiry address for the example-->
- <address-setting match="jms.queue.exampleQueue">
- <expiry-address>jms.queue.expiryQueue</expiry-address>
- </address-setting>
- </address-settings>
-
-</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/expiry/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/expiry/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/expiry/src/main/resources/hornetq/server0/activemq-jms.xml
deleted file mode 100644
index d41da70..0000000
--- a/examples/jms/expiry/src/main/resources/hornetq/server0/activemq-jms.xml
+++ /dev/null
@@ -1,11 +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"/>
-
- <!--the expiry queue where expired messages will be sent-->
- <queue name="expiryQueue"/>
-
-</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/expiry/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/expiry/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/expiry/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/expiry/src/main/resources/jndi.properties b/examples/jms/expiry/src/main/resources/jndi.properties
new file mode 100644
index 0000000..065794b
--- /dev/null
+++ b/examples/jms/expiry/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/expiryQueue=expiryQueue
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/ha-policy-autobackup/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/ha-policy-autobackup/pom.xml b/examples/jms/ha-policy-autobackup/pom.xml
index 86f5d47..1056602 100644
--- a/examples/jms/ha-policy-autobackup/pom.xml
+++ b/examples/jms/ha-policy-autobackup/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>udp-address</name>
@@ -53,7 +53,7 @@
<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>
@@ -88,7 +88,7 @@
<goal>stop</goal>
</goals>
<configuration>
- <hornetqConfigurationDir>${basedir}/target/classes/activemq/server0</hornetqConfigurationDir>
+ <configurationDir>${basedir}/target/classes/activemq/server0</configurationDir>
</configuration>
</execution>
<execution>
@@ -97,7 +97,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/ha-policy-autobackup/src/main/java/org/apache/activemq/jms/example/HAPolicyAutoBackupExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/ha-policy-autobackup/src/main/java/org/apache/activemq/jms/example/HAPolicyAutoBackupExample.java b/examples/jms/ha-policy-autobackup/src/main/java/org/apache/activemq/jms/example/HAPolicyAutoBackupExample.java
index 3eebb40..4fbcdcb 100644
--- a/examples/jms/ha-policy-autobackup/src/main/java/org/apache/activemq/jms/example/HAPolicyAutoBackupExample.java
+++ b/examples/jms/ha-policy-autobackup/src/main/java/org/apache/activemq/jms/example/HAPolicyAutoBackupExample.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;
@@ -63,8 +65,24 @@ public class HAPolicyAutoBackupExample extends ActiveMQExample
try
{
// Step 1. Get an initial context for looking up JNDI from server 0 and 1
- ic0 = getContext(0);
- ic1 = getContext(1);
+ 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");
+ properties.put("connection.ConnectionFactory.ha", true);
+ properties.put("connection.ConnectionFactory.retryInterval", 1000);
+ properties.put("connection.ConnectionFactory.retryIntervalMultiplier", 1.0);
+ properties.put("connection.ConnectionFactory.reconnectAttempts", -1);
+ ic0 = new InitialContext(properties);
+
+ properties = new Hashtable<String, Object>();
+ properties.put("java.naming.factory.initial", "org.apache.activemq.jndi.ActiveMQInitialContextFactory");
+ properties.put("java.naming.provider.url", args[1]);
+ properties.put("connection.ConnectionFactory.ha", true);
+ properties.put("connection.ConnectionFactory.retryInterval", 1000);
+ properties.put("connection.ConnectionFactory.retryIntervalMultiplier", 1.0);
+ properties.put("connection.ConnectionFactory.reconnectAttempts", -1);
+ ic1 = new InitialContext(properties);
// Step 2. Look-up the JMS Queue object from JNDI
Queue queue = (Queue) ic0.lookup("queue/exampleQueue");
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/ha-policy-autobackup/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/ha-policy-autobackup/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/ha-policy-autobackup/src/main/resources/activemq/server0/activemq-configuration.xml
new file mode 100644
index 0000000..6a21e1d
--- /dev/null
+++ b/examples/jms/ha-policy-autobackup/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -0,0 +1,93 @@
+<configuration xmlns="urn:activemq"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
+
+ <bindings-directory>target/server0/data/messaging/bindings</bindings-directory>
+
+ <journal-directory>target/server0/data/messaging/journal</journal-directory>
+
+ <large-messages-directory>target/server0/data/messaging/largemessages</large-messages-directory>
+
+ <paging-directory>target/server0/data/messaging/paging</paging-directory>
+ <!-- Connectors -->
+
+ <connectors>
+ <connector name="invm-connector">
+ <factory-class>org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory</factory-class>
+ </connector>
+ <connector name="netty-connector">
+ <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
+ <param key="port" value="5445"/>
+ </connector>
+ <!-- connector to the server1 -->
+ <connector name="server1-connector">
+ <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
+ <param key="port" value="5446"/>
+ </connector>
+ </connectors>
+
+ <!-- Acceptors -->
+ <acceptors>
+ <acceptor name="invm-acceptor">
+ <factory-class>org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory</factory-class>
+ </acceptor>
+ <acceptor name="netty-acceptor">
+ <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
+ <param key="port" value="5445"/>
+ </acceptor>
+ </acceptors>
+
+ <!-- HA configuration -->
+ <ha-policy>
+ <replication>
+ <colocated>
+ <max-backups>1</max-backups>
+ <request-backup>true</request-backup>
+ <backup-request-retry-interval>1000</backup-request-retry-interval>
+ <excludes>
+ <connector-ref>invm-connector</connector-ref>
+ <connector-ref>server1-connector</connector-ref>
+ <connector-ref>netty-connector</connector-ref>
+ </excludes>
+ <master/>
+ <slave>
+ <scale-down>
+ <connectors>
+ <connector-ref>invm-connector</connector-ref>
+ </connectors>
+ </scale-down>
+ </slave>
+ </colocated>
+ </replication>
+ </ha-policy>
+
+ <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>true</forward-when-no-consumers>
+ <max-hops>1</max-hops>
+ <static-connectors>
+ <connector-ref>server1-connector</connector-ref>
+ </static-connectors>
+ </cluster-connection>
+ </cluster-connections>
+
+ <!-- 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"/>
+ <permission type="manage" roles="guest"/>
+ </security-setting>
+ </security-settings>
+
+</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/ha-policy-autobackup/src/main/resources/activemq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/ha-policy-autobackup/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/ha-policy-autobackup/src/main/resources/activemq/server0/activemq-jms.xml
new file mode 100644
index 0000000..847659f
--- /dev/null
+++ b/examples/jms/ha-policy-autobackup/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>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/ha-policy-autobackup/src/main/resources/activemq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/ha-policy-autobackup/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/ha-policy-autobackup/src/main/resources/activemq/server0/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/ha-policy-autobackup/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/ha-policy-autobackup/src/main/resources/activemq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/ha-policy-autobackup/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/ha-policy-autobackup/src/main/resources/activemq/server1/activemq-configuration.xml
new file mode 100644
index 0000000..adaeb82
--- /dev/null
+++ b/examples/jms/ha-policy-autobackup/src/main/resources/activemq/server1/activemq-configuration.xml
@@ -0,0 +1,93 @@
+<configuration xmlns="urn:activemq"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
+
+ <bindings-directory>target/server1/data/messaging/bindings</bindings-directory>
+
+ <journal-directory>target/server1/data/messaging/journal</journal-directory>
+
+ <large-messages-directory>target/server1/data/messaging/largemessages</large-messages-directory>
+
+ <paging-directory>target/server1/data/messaging/paging</paging-directory>
+
+ <!-- Connectors -->
+ <connectors>
+ <connector name="invm-connector">
+ <factory-class>org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory</factory-class>
+ </connector>
+ <connector name="netty-connector">
+ <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
+ <param key="port" value="5446"/>
+ </connector>
+ <!-- connector to the server0 -->
+ <connector name="server0-connector">
+ <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
+ <param key="port" value="5445"/>
+ </connector>
+ </connectors>
+
+ <!-- Acceptors -->
+ <acceptors>
+ <acceptor name="invm-acceptor">
+ <factory-class>org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory</factory-class>
+ </acceptor>
+ <acceptor name="netty-acceptor">
+ <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
+ <param key="port" value="5446"/>
+ </acceptor>
+ </acceptors>
+
+ <!-- HA configuration -->
+ <ha-policy>
+ <replication>
+ <colocated>
+ <max-backups>1</max-backups>
+ <request-backup>true</request-backup>
+ <backup-request-retry-interval>1000</backup-request-retry-interval>
+ <excludes>
+ <connector-ref>invm-connector</connector-ref>
+ <connector-ref>server0-connector</connector-ref>
+ <connector-ref>netty-connector</connector-ref>
+ </excludes>
+ <master/>
+ <slave>
+ <scale-down>
+ <connectors>
+ <connector-ref>invm-connector</connector-ref>
+ </connectors>
+ </scale-down>
+ </slave>
+ </colocated>
+ </replication>
+ </ha-policy>
+
+ <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>true</forward-when-no-consumers>
+ <max-hops>1</max-hops>
+ <static-connectors>
+ <connector-ref>server0-connector</connector-ref>
+ </static-connectors>
+ </cluster-connection>
+ </cluster-connections>
+
+ <!-- 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"/>
+ <permission type="manage" roles="guest"/>
+ </security-setting>
+ </security-settings>
+
+</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/ha-policy-autobackup/src/main/resources/activemq/server1/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/ha-policy-autobackup/src/main/resources/activemq/server1/activemq-jms.xml b/examples/jms/ha-policy-autobackup/src/main/resources/activemq/server1/activemq-jms.xml
new file mode 100644
index 0000000..847659f
--- /dev/null
+++ b/examples/jms/ha-policy-autobackup/src/main/resources/activemq/server1/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>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/ha-policy-autobackup/src/main/resources/activemq/server1/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/ha-policy-autobackup/src/main/resources/activemq/server1/activemq-users.xml b/examples/jms/ha-policy-autobackup/src/main/resources/activemq/server1/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/ha-policy-autobackup/src/main/resources/activemq/server1/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/ha-policy-autobackup/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/ha-policy-autobackup/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/ha-policy-autobackup/src/main/resources/hornetq/server0/activemq-configuration.xml
deleted file mode 100644
index 6a21e1d..0000000
--- a/examples/jms/ha-policy-autobackup/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ /dev/null
@@ -1,93 +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>target/server0/data/messaging/bindings</bindings-directory>
-
- <journal-directory>target/server0/data/messaging/journal</journal-directory>
-
- <large-messages-directory>target/server0/data/messaging/largemessages</large-messages-directory>
-
- <paging-directory>target/server0/data/messaging/paging</paging-directory>
- <!-- Connectors -->
-
- <connectors>
- <connector name="invm-connector">
- <factory-class>org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory</factory-class>
- </connector>
- <connector name="netty-connector">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
- <param key="port" value="5445"/>
- </connector>
- <!-- connector to the server1 -->
- <connector name="server1-connector">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
- <param key="port" value="5446"/>
- </connector>
- </connectors>
-
- <!-- Acceptors -->
- <acceptors>
- <acceptor name="invm-acceptor">
- <factory-class>org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory</factory-class>
- </acceptor>
- <acceptor name="netty-acceptor">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- <param key="port" value="5445"/>
- </acceptor>
- </acceptors>
-
- <!-- HA configuration -->
- <ha-policy>
- <replication>
- <colocated>
- <max-backups>1</max-backups>
- <request-backup>true</request-backup>
- <backup-request-retry-interval>1000</backup-request-retry-interval>
- <excludes>
- <connector-ref>invm-connector</connector-ref>
- <connector-ref>server1-connector</connector-ref>
- <connector-ref>netty-connector</connector-ref>
- </excludes>
- <master/>
- <slave>
- <scale-down>
- <connectors>
- <connector-ref>invm-connector</connector-ref>
- </connectors>
- </scale-down>
- </slave>
- </colocated>
- </replication>
- </ha-policy>
-
- <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>true</forward-when-no-consumers>
- <max-hops>1</max-hops>
- <static-connectors>
- <connector-ref>server1-connector</connector-ref>
- </static-connectors>
- </cluster-connection>
- </cluster-connections>
-
- <!-- 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"/>
- <permission type="manage" roles="guest"/>
- </security-setting>
- </security-settings>
-
-</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/ha-policy-autobackup/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index 847659f..0000000
--- a/examples/jms/ha-policy-autobackup/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>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/ha-policy-autobackup/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/ha-policy-autobackup/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/ha-policy-autobackup/src/main/resources/hornetq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/ha-policy-autobackup/src/main/resources/hornetq/server1/activemq-configuration.xml b/examples/jms/ha-policy-autobackup/src/main/resources/hornetq/server1/activemq-configuration.xml
deleted file mode 100644
index adaeb82..0000000
--- a/examples/jms/ha-policy-autobackup/src/main/resources/hornetq/server1/activemq-configuration.xml
+++ /dev/null
@@ -1,93 +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>target/server1/data/messaging/bindings</bindings-directory>
-
- <journal-directory>target/server1/data/messaging/journal</journal-directory>
-
- <large-messages-directory>target/server1/data/messaging/largemessages</large-messages-directory>
-
- <paging-directory>target/server1/data/messaging/paging</paging-directory>
-
- <!-- Connectors -->
- <connectors>
- <connector name="invm-connector">
- <factory-class>org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory</factory-class>
- </connector>
- <connector name="netty-connector">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
- <param key="port" value="5446"/>
- </connector>
- <!-- connector to the server0 -->
- <connector name="server0-connector">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
- <param key="port" value="5445"/>
- </connector>
- </connectors>
-
- <!-- Acceptors -->
- <acceptors>
- <acceptor name="invm-acceptor">
- <factory-class>org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory</factory-class>
- </acceptor>
- <acceptor name="netty-acceptor">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- <param key="port" value="5446"/>
- </acceptor>
- </acceptors>
-
- <!-- HA configuration -->
- <ha-policy>
- <replication>
- <colocated>
- <max-backups>1</max-backups>
- <request-backup>true</request-backup>
- <backup-request-retry-interval>1000</backup-request-retry-interval>
- <excludes>
- <connector-ref>invm-connector</connector-ref>
- <connector-ref>server0-connector</connector-ref>
- <connector-ref>netty-connector</connector-ref>
- </excludes>
- <master/>
- <slave>
- <scale-down>
- <connectors>
- <connector-ref>invm-connector</connector-ref>
- </connectors>
- </scale-down>
- </slave>
- </colocated>
- </replication>
- </ha-policy>
-
- <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>true</forward-when-no-consumers>
- <max-hops>1</max-hops>
- <static-connectors>
- <connector-ref>server0-connector</connector-ref>
- </static-connectors>
- </cluster-connection>
- </cluster-connections>
-
- <!-- 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"/>
- <permission type="manage" roles="guest"/>
- </security-setting>
- </security-settings>
-
-</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/ha-policy-autobackup/src/main/resources/hornetq/server1/activemq-users.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/ha-policy-autobackup/src/main/resources/hornetq/server1/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/http-transport/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/http-transport/pom.xml b/examples/jms/http-transport/pom.xml
index 24a5f54..9bc6c63 100644
--- a/examples/jms/http-transport/pom.xml
+++ b/examples/jms/http-transport/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>
<systemProperties>
<property>
<name>build.directory</name>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/http-transport/src/main/java/org/apache/activemq/jms/example/HttpTransportExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/http-transport/src/main/java/org/apache/activemq/jms/example/HttpTransportExample.java b/examples/jms/http-transport/src/main/java/org/apache/activemq/jms/example/HttpTransportExample.java
index efba974..914c017 100644
--- a/examples/jms/http-transport/src/main/java/org/apache/activemq/jms/example/HttpTransportExample.java
+++ b/examples/jms/http-transport/src/main/java/org/apache/activemq/jms/example/HttpTransportExample.java
@@ -47,7 +47,7 @@ public class HttpTransportExample 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/http-transport/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/http-transport/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/http-transport/src/main/resources/activemq/server0/activemq-configuration.xml
new file mode 100644
index 0000000..5bc2739
--- /dev/null
+++ b/examples/jms/http-transport/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -0,0 +1,36 @@
+<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>
+ <param key="port" value="8080"/>
+ </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/http-transport/src/main/resources/activemq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/http-transport/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/http-transport/src/main/resources/activemq/server0/activemq-jms.xml
new file mode 100644
index 0000000..847659f
--- /dev/null
+++ b/examples/jms/http-transport/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>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/http-transport/src/main/resources/activemq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/http-transport/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/http-transport/src/main/resources/activemq/server0/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/http-transport/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/http-transport/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/http-transport/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/http-transport/src/main/resources/hornetq/server0/activemq-configuration.xml
deleted file mode 100644
index 61eab50..0000000
--- a/examples/jms/http-transport/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>
- <param key="http-enabled" value="true"/>
- <param key="port" value="8080"/>
- </connector>
- </connectors>
-
- <!-- Acceptors -->
-
- <acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- <param key="port" value="8080"/>
- </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/http-transport/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index 847659f..0000000
--- a/examples/jms/http-transport/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>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/http-transport/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/http-transport/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/http-transport/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/http-transport/src/main/resources/jndi.properties b/examples/jms/http-transport/src/main/resources/jndi.properties
new file mode 100644
index 0000000..fee3aac
--- /dev/null
+++ b/examples/jms/http-transport/src/main/resources/jndi.properties
@@ -0,0 +1,3 @@
+java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
+java.naming.provider.url=tcp://localhost:8080?http-enabled=true
+queue.queue/exampleQueue=exampleQueue
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/instantiate-connection-factory/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/instantiate-connection-factory/pom.xml b/examples/jms/instantiate-connection-factory/pom.xml
index 4b60d79..bb9f409 100644
--- a/examples/jms/instantiate-connection-factory/pom.xml
+++ b/examples/jms/instantiate-connection-factory/pom.xml
@@ -112,7 +112,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/instantiate-connection-factory/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/instantiate-connection-factory/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/instantiate-connection-factory/src/main/resources/activemq/server0/activemq-configuration.xml
new file mode 100644
index 0000000..afaec1c
--- /dev/null
+++ b/examples/jms/instantiate-connection-factory/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="netty-acceptor">
+ <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
+ <param key="port" value="5446"/>
+ </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/instantiate-connection-factory/src/main/resources/activemq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/instantiate-connection-factory/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/instantiate-connection-factory/src/main/resources/activemq/server0/activemq-jms.xml
new file mode 100644
index 0000000..9dd800b
--- /dev/null
+++ b/examples/jms/instantiate-connection-factory/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/instantiate-connection-factory/src/main/resources/activemq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/instantiate-connection-factory/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/instantiate-connection-factory/src/main/resources/activemq/server0/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/instantiate-connection-factory/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/instantiate-connection-factory/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/instantiate-connection-factory/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/instantiate-connection-factory/src/main/resources/hornetq/server0/activemq-configuration.xml
deleted file mode 100644
index 1cb9416..0000000
--- a/examples/jms/instantiate-connection-factory/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ /dev/null
@@ -1,45 +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>
- <param key="port" value="5446"/>
- </connector>
- </connectors>
-
- <!-- Acceptors -->
- <acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- <param key="port" value="5446"/>
- </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/instantiate-connection-factory/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/instantiate-connection-factory/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/instantiate-connection-factory/src/main/resources/hornetq/server0/activemq-jms.xml
deleted file mode 100644
index d05e31e..0000000
--- a/examples/jms/instantiate-connection-factory/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/instantiate-connection-factory/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/instantiate-connection-factory/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/interceptor/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/interceptor/pom.xml b/examples/jms/interceptor/pom.xml
index 34dff8c..5ff60f5 100644
--- a/examples/jms/interceptor/pom.xml
+++ b/examples/jms/interceptor/pom.xml
@@ -107,7 +107,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/interceptor/src/main/java/org/apache/activemq/jms/example/InterceptorExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/interceptor/src/main/java/org/apache/activemq/jms/example/InterceptorExample.java b/examples/jms/interceptor/src/main/java/org/apache/activemq/jms/example/InterceptorExample.java
index e2b2b40..70f0231 100644
--- a/examples/jms/interceptor/src/main/java/org/apache/activemq/jms/example/InterceptorExample.java
+++ b/examples/jms/interceptor/src/main/java/org/apache/activemq/jms/example/InterceptorExample.java
@@ -47,7 +47,7 @@ public class InterceptorExample 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 queue
Queue queue = (Queue)initialContext.lookup("queue/exampleQueue");
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/interceptor/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/interceptor/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/interceptor/src/main/resources/activemq/server0/activemq-configuration.xml
new file mode 100644
index 0000000..e9dabca
--- /dev/null
+++ b/examples/jms/interceptor/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -0,0 +1,39 @@
+<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>
+
+
+ <remoting-incoming-interceptors>
+ <class-name>org.apache.activemq.jms.example.SimpleInterceptor</class-name>
+ </remoting-incoming-interceptors>
+
+ <!-- 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/interceptor/src/main/resources/activemq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/interceptor/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/interceptor/src/main/resources/activemq/server0/activemq-jms.xml
new file mode 100644
index 0000000..0d5c953
--- /dev/null
+++ b/examples/jms/interceptor/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/interceptor/src/main/resources/activemq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/interceptor/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/interceptor/src/main/resources/activemq/server0/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/interceptor/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/interceptor/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/interceptor/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/interceptor/src/main/resources/hornetq/server0/activemq-configuration.xml
deleted file mode 100644
index 2433360..0000000
--- a/examples/jms/interceptor/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ /dev/null
@@ -1,47 +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>
-
-
- <remoting-incoming-interceptors>
- <class-name>org.apache.activemq.jms.example.SimpleInterceptor</class-name>
- </remoting-incoming-interceptors>
-
- <!-- 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/interceptor/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/interceptor/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/interceptor/src/main/resources/hornetq/server0/activemq-jms.xml
deleted file mode 100644
index 0d5c953..0000000
--- a/examples/jms/interceptor/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/interceptor/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/interceptor/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/interceptor/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/interceptor/src/main/resources/jndi.properties b/examples/jms/interceptor/src/main/resources/jndi.properties
new file mode 100644
index 0000000..d9b5c6a
--- /dev/null
+++ b/examples/jms/interceptor/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/jaas/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/jaas/pom.xml b/examples/jms/jaas/pom.xml
index 1ce345b..a6ba21c 100644
--- a/examples/jms/jaas/pom.xml
+++ b/examples/jms/jaas/pom.xml
@@ -39,7 +39,6 @@
<plugin>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-maven-plugin</artifactId>
- <version>1.1.0</version>
<executions>
<execution>
<id>start</id>
@@ -125,7 +124,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/jaas/src/main/java/org/apache/activemq/jms/example/JAASExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/jaas/src/main/java/org/apache/activemq/jms/example/JAASExample.java b/examples/jms/jaas/src/main/java/org/apache/activemq/jms/example/JAASExample.java
index 7813924..be797d1 100644
--- a/examples/jms/jaas/src/main/java/org/apache/activemq/jms/example/JAASExample.java
+++ b/examples/jms/jaas/src/main/java/org/apache/activemq/jms/example/JAASExample.java
@@ -48,7 +48,7 @@ public class JAASExample 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/jaas/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/jaas/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/jaas/src/main/resources/activemq/server0/activemq-configuration.xml
new file mode 100644
index 0000000..52d9570
--- /dev/null
+++ b/examples/jms/jaas/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/jaas/src/main/resources/activemq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/jaas/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/jaas/src/main/resources/activemq/server0/activemq-jms.xml
new file mode 100644
index 0000000..0d5c953
--- /dev/null
+++ b/examples/jms/jaas/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/jaas/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/jaas/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/jaas/src/main/resources/hornetq/server0/activemq-configuration.xml
deleted file mode 100644
index e0acd1d..0000000
--- a/examples/jms/jaas/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/jaas/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/jaas/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/jaas/src/main/resources/hornetq/server0/activemq-jms.xml
deleted file mode 100644
index 0d5c953..0000000
--- a/examples/jms/jaas/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/jaas/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/jaas/src/main/resources/jndi.properties b/examples/jms/jaas/src/main/resources/jndi.properties
new file mode 100644
index 0000000..d9b5c6a
--- /dev/null
+++ b/examples/jms/jaas/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/jms-auto-closeable/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/jms-auto-closeable/pom.xml b/examples/jms/jms-auto-closeable/pom.xml
index d0c49da..084ddf9 100644
--- a/examples/jms/jms-auto-closeable/pom.xml
+++ b/examples/jms/jms-auto-closeable/pom.xml
@@ -51,9 +51,6 @@
</goals>
<configuration>
<clientClass>org.apache.activemq.jms.example.JMSAutoCloseableExample</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/jms-auto-closeable/src/main/java/org/apache/activemq/jms/example/JMSAutoCloseableExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/jms-auto-closeable/src/main/java/org/apache/activemq/jms/example/JMSAutoCloseableExample.java b/examples/jms/jms-auto-closeable/src/main/java/org/apache/activemq/jms/example/JMSAutoCloseableExample.java
index d832771..646fdeb 100644
--- a/examples/jms/jms-auto-closeable/src/main/java/org/apache/activemq/jms/example/JMSAutoCloseableExample.java
+++ b/examples/jms/jms-auto-closeable/src/main/java/org/apache/activemq/jms/example/JMSAutoCloseableExample.java
@@ -40,7 +40,7 @@ public class JMSAutoCloseableExample 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/jms-auto-closeable/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/jms-auto-closeable/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/jms-auto-closeable/src/main/resources/activemq/server0/activemq-configuration.xml
new file mode 100644
index 0000000..0d65f69
--- /dev/null
+++ b/examples/jms/jms-auto-closeable/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -0,0 +1,33 @@
+<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, note we have removed send privs-->
+ <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"/>
+ </security-setting>
+ </security-settings>
+
+</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/jms-auto-closeable/src/main/resources/activemq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/jms-auto-closeable/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/jms-auto-closeable/src/main/resources/activemq/server0/activemq-jms.xml
new file mode 100644
index 0000000..0d5c953
--- /dev/null
+++ b/examples/jms/jms-auto-closeable/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/jms-auto-closeable/src/main/resources/activemq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/jms-auto-closeable/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/jms-auto-closeable/src/main/resources/activemq/server0/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/jms-auto-closeable/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/jms-auto-closeable/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/jms-auto-closeable/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/jms-auto-closeable/src/main/resources/hornetq/server0/activemq-configuration.xml
deleted file mode 100644
index 9ff5b8a..0000000
--- a/examples/jms/jms-auto-closeable/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>
-
-
- <!-- 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, note we have removed send privs-->
- <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"/>
- </security-setting>
- </security-settings>
-
-</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/jms-auto-closeable/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index 0d5c953..0000000
--- a/examples/jms/jms-auto-closeable/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/jms-auto-closeable/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/jms-auto-closeable/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/jms-auto-closeable/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/jms-auto-closeable/src/main/resources/jndi.properties b/examples/jms/jms-auto-closeable/src/main/resources/jndi.properties
new file mode 100644
index 0000000..d9b5c6a
--- /dev/null
+++ b/examples/jms/jms-auto-closeable/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/jms-bridge/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/jms-bridge/pom.xml b/examples/jms/jms-bridge/pom.xml
index f014b5b..67ca1ea 100644
--- a/examples/jms/jms-bridge/pom.xml
+++ b/examples/jms/jms-bridge/pom.xml
@@ -45,7 +45,7 @@
<goal>start</goal>
</goals>
<configuration>
- <hornetqConfigurationDir>${basedir}/target/classes/activemq/server0</hornetqConfigurationDir>
+ <configurationDir>${basedir}/target/classes/activemq/server0</configurationDir>
</configuration>
</execution>
<execution>
@@ -54,9 +54,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>
</configuration>
</execution>
@@ -85,7 +83,7 @@
<goal>stop</goal>
</goals>
<configuration>
- <hornetqConfigurationDir>${basedir}/target/classes/activemq/server0</hornetqConfigurationDir>
+ <configurationDir>${basedir}/target/classes/activemq/server0</configurationDir>
</configuration>
</execution>
<execution>
@@ -94,7 +92,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/jms-bridge/src/main/java/org/apache/activemq/jms/example/JMSBridgeExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/jms-bridge/src/main/java/org/apache/activemq/jms/example/JMSBridgeExample.java b/examples/jms/jms-bridge/src/main/java/org/apache/activemq/jms/example/JMSBridgeExample.java
index 0126251..f6ff686 100644
--- a/examples/jms/jms-bridge/src/main/java/org/apache/activemq/jms/example/JMSBridgeExample.java
+++ b/examples/jms/jms-bridge/src/main/java/org/apache/activemq/jms/example/JMSBridgeExample.java
@@ -66,8 +66,8 @@ public class JMSBridgeExample
// Step 2. Create and start a JMS Bridge
// Note, the Bridge needs a transaction manager, in this instance we will use the JBoss TM
JMSBridge jmsBridge = new JMSBridgeImpl(
- new JNDIConnectionFactoryFactory(sourceJndiParams, "source/ConnectionFactory"),
- new JNDIConnectionFactoryFactory(targetJndiParams, "target/ConnectionFactory"),
+ new JNDIConnectionFactoryFactory(sourceJndiParams, "ConnectionFactory"),
+ new JNDIConnectionFactoryFactory(targetJndiParams, "ConnectionFactory"),
new JNDIDestinationFactory(sourceJndiParams, "source/topic"),
new JNDIDestinationFactory(targetJndiParams, "target/queue"),
null,
@@ -91,8 +91,8 @@ public class JMSBridgeExample
{
jmsBridge.start();
// Step 3. Lookup the *source* JMS resources
- ConnectionFactory sourceConnectionFactory = (ConnectionFactory)sourceContext.lookup("/client/ConnectionFactory");
- Topic sourceTopic = (Topic)sourceContext.lookup("/source/topic");
+ ConnectionFactory sourceConnectionFactory = (ConnectionFactory)sourceContext.lookup("ConnectionFactory");
+ Topic sourceTopic = (Topic)sourceContext.lookup("source/topic");
// Step 4. Create a connection, a session and a message producer for the *source* topic
sourceConnection = sourceConnectionFactory.createConnection();
@@ -111,7 +111,7 @@ public class JMSBridgeExample
sourceConnection.close();
// Step 7. Lookup the *target* JMS resources
- ConnectionFactory targetConnectionFactory = (ConnectionFactory)targetContext.lookup("client/ConnectionFactory");
+ ConnectionFactory targetConnectionFactory = (ConnectionFactory)targetContext.lookup("ConnectionFactory");
Queue targetQueue = (Queue)targetContext.lookup("target/queue");
// Step 8. Create a connection, a session and a message consumer for the *target* queue
@@ -169,6 +169,8 @@ public class JMSBridgeExample
Hashtable<String, String> jndiProps = new Hashtable<String, String>();
jndiProps.put("java.naming.provider.url", server);
jndiProps.put("java.naming.factory.initial", "org.apache.activemq.jndi.ActiveMQInitialContextFactory");
+ jndiProps.put("queue.target/queue", "target");
+ jndiProps.put("topic.source/topic", "topic");
return jndiProps;
}
}
[15/37] activemq-6 git commit: ACTIVEMQ6-41 Drop Java EE examples
Posted by jb...@apache.org.
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/jca-config/server/standalone/configuration/standalone-example.xml
----------------------------------------------------------------------
diff --git a/examples/javaee/jca-config/server/standalone/configuration/standalone-example.xml b/examples/javaee/jca-config/server/standalone/configuration/standalone-example.xml
deleted file mode 100644
index 314ae8d..0000000
--- a/examples/javaee/jca-config/server/standalone/configuration/standalone-example.xml
+++ /dev/null
@@ -1,493 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-
-<server xmlns="urn:jboss:domain:2.0">
- <extensions>
- <extension module="org.jboss.as.clustering.infinispan"/>
- <extension module="org.jboss.as.connector"/>
- <extension module="org.jboss.as.deployment-scanner"/>
- <extension module="org.jboss.as.ee"/>
- <extension module="org.jboss.as.ejb3"/>
- <extension module="org.jboss.as.jacorb"/>
- <extension module="org.jboss.as.jaxrs"/>
- <extension module="org.jboss.as.jdr"/>
- <extension module="org.jboss.as.jmx"/>
- <extension module="org.jboss.as.jpa"/>
- <extension module="org.jboss.as.jsf"/>
- <extension module="org.jboss.as.jsr77"/>
- <extension module="org.jboss.as.logging"/>
- <extension module="org.jboss.as.mail"/>
- <extension module="org.jboss.as.messaging"/>
- <extension module="org.jboss.as.naming"/>
- <extension module="org.jboss.as.pojo"/>
- <extension module="org.jboss.as.remoting"/>
- <extension module="org.jboss.as.sar"/>
- <extension module="org.jboss.as.security"/>
- <extension module="org.jboss.as.threads"/>
- <extension module="org.jboss.as.transactions"/>
- <extension module="org.jboss.as.webservices"/>
- <extension module="org.jboss.as.weld"/>
- <extension module="org.wildfly.extension.batch"/>
- <extension module="org.wildfly.extension.io"/>
- <extension module="org.wildfly.extension.undertow"/>
- </extensions>
- <management>
- <security-realms>
- <security-realm name="ManagementRealm">
- <authentication>
- <local default-user="$local"/>
- <properties path="mgmt-users.properties" relative-to="jboss.server.config.dir"/>
- </authentication>
- <authorization map-groups-to-roles="false">
- <properties path="mgmt-groups.properties" relative-to="jboss.server.config.dir"/>
- </authorization>
- </security-realm>
- <security-realm name="ApplicationRealm">
- <authentication>
- <local default-user="$local" allowed-users="*"/>
- <properties path="application-users.properties" relative-to="jboss.server.config.dir"/>
- </authentication>
- <authorization>
- <properties path="application-roles.properties" relative-to="jboss.server.config.dir"/>
- </authorization>
- </security-realm>
- </security-realms>
- <audit-log>
- <formatters>
- <json-formatter name="json-formatter"/>
- </formatters>
- <handlers>
- <file-handler name="file" formatter="json-formatter" relative-to="jboss.server.data.dir" path="audit-log.log"/>
- </handlers>
- <logger log-boot="true" log-read-only="false" enabled="false">
- <handlers>
- <handler name="file"/>
- </handlers>
- </logger>
- </audit-log>
- <management-interfaces>
- <http-interface security-realm="ManagementRealm" http-upgrade-enabled="true">
- <socket-binding http="management-http"/>
- </http-interface>
- </management-interfaces>
- <access-control provider="simple">
- <role-mapping>
- <role name="SuperUser">
- <include>
- <user name="$local"/>
- </include>
- </role>
- </role-mapping>
- </access-control>
- </management>
- <profile>
- <subsystem xmlns="urn:jboss:domain:logging:2.0">
- <console-handler name="CONSOLE">
- <level name="INFO"/>
- <formatter>
- <named-formatter name="COLOR-PATTERN"/>
- </formatter>
- </console-handler>
- <periodic-rotating-file-handler name="FILE" autoflush="true">
- <formatter>
- <named-formatter name="PATTERN"/>
- </formatter>
- <file relative-to="jboss.server.log.dir" path="server.log"/>
- <suffix value=".yyyy-MM-dd"/>
- <append value="true"/>
- </periodic-rotating-file-handler>
- <logger category="com.arjuna">
- <level name="WARN"/>
- </logger>
- <logger category="org.apache.tomcat.util.modeler">
- <level name="WARN"/>
- </logger>
- <logger category="org.jboss.as.config">
- <level name="DEBUG"/>
- </logger>
- <logger category="sun.rmi">
- <level name="WARN"/>
- </logger>
- <logger category="jacorb">
- <level name="WARN"/>
- </logger>
- <logger category="jacorb.config">
- <level name="ERROR"/>
- </logger>
- <root-logger>
- <level name="INFO"/>
- <handlers>
- <handler name="CONSOLE"/>
- <handler name="FILE"/>
- </handlers>
- </root-logger>
- <formatter name="PATTERN">
- <pattern-formatter pattern="%d{yyyy-MM-dd HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/>
- </formatter>
- <formatter name="COLOR-PATTERN">
- <pattern-formatter pattern="%K{level}%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/>
- </formatter>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:batch:1.0">
- <job-repository>
- <in-memory/>
- </job-repository>
- <thread-pool>
- <max-threads count="10"/>
- <keepalive-time time="100" unit="milliseconds"/>
- </thread-pool>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:datasources:2.0">
- <datasources>
- <datasource jndi-name="java:jboss/datasources/ExampleDS" pool-name="ExampleDS" enabled="true" use-java-context="true">
- <connection-url>jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE</connection-url>
- <driver>h2</driver>
- <security>
- <user-name>sa</user-name>
- <password>sa</password>
- </security>
- </datasource>
- <drivers>
- <driver name="h2" module="com.h2database.h2">
- <xa-datasource-class>org.h2.jdbcx.JdbcDataSource</xa-datasource-class>
- </driver>
- </drivers>
- </datasources>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:deployment-scanner:2.0">
- <deployment-scanner path="deployments" relative-to="jboss.server.base.dir" scan-interval="5000" runtime-failure-causes-rollback="${jboss.deployment.scanner.rollback.on.failure:false}"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:ee:2.0">
- <spec-descriptor-property-replacement>false</spec-descriptor-property-replacement>
- <jboss-descriptor-property-replacement>true</jboss-descriptor-property-replacement>
- <annotation-property-replacement>false</annotation-property-replacement>
- <concurrent>
- <context-services>
- <context-service name="default" jndi-name="java:jboss/ee/concurrency/context/default" use-transaction-setup-provider="true"/>
- </context-services>
- <managed-executor-services>
- <managed-executor-service name="default" jndi-name="java:jboss/ee/concurrency/executor/default" context-service="default" hung-task-threshold="60000" core-threads="5" max-threads="25" keepalive-time="5000"/>
- </managed-executor-services>
- <managed-scheduled-executor-services>
- <managed-scheduled-executor-service name="default" jndi-name="java:jboss/ee/concurrency/scheduler/default" context-service="default" hung-task-threshold="60000" core-threads="2" keepalive-time="3000"/>
- </managed-scheduled-executor-services>
- <managed-thread-factories>
- <managed-thread-factory name="default" jndi-name="java:jboss/ee/concurrency/factory/default" context-service="default"/>
- </managed-thread-factories>
- </concurrent>
- <default-bindings context-service="java:jboss/ee/concurrency/context/default" datasource="java:jboss/datasources/ExampleDS" jms-connection-factory="java:jboss/DefaultJMSConnectionFactory" managed-executor-service="java:jboss/ee/concurrency/executor/default" managed-scheduled-executor-service="java:jboss/ee/concurrency/scheduler/default" managed-thread-factory="java:jboss/ee/concurrency/factory/default"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:ejb3:2.0">
- <session-bean>
- <stateful default-access-timeout="5000" cache-ref="simple" passivation-disabled-cache-ref="simple"/>
- <singleton default-access-timeout="5000"/>
- </session-bean>
- <mdb>
- <resource-adapter-ref resource-adapter-name="${ejb.resource-adapter-name:activemq-ra.rar}"/>
- <bean-instance-pool-ref pool-name="mdb-strict-max-pool"/>
- </mdb>
- <pools>
- <bean-instance-pools>
- <!-- A sample strict max pool configuration -->
- <strict-max-pool name="slsb-strict-max-pool" max-pool-size="20" instance-acquisition-timeout="5" instance-acquisition-timeout-unit="MINUTES"/>
- <strict-max-pool name="mdb-strict-max-pool" max-pool-size="20" instance-acquisition-timeout="5" instance-acquisition-timeout-unit="MINUTES"/>
- </bean-instance-pools>
- </pools>
- <caches>
- <cache name="simple"/>
- <cache name="distributable" aliases="passivating clustered" passivation-store-ref="infinispan"/>
- </caches>
- <passivation-stores>
- <passivation-store name="infinispan" cache-container="ejb" max-size="10000"/>
- </passivation-stores>
- <async thread-pool-name="default"/>
- <timer-service thread-pool-name="default" default-data-store="default-file-store">
- <data-stores>
- <file-data-store name="default-file-store" path="timer-service-data" relative-to="jboss.server.data.dir"/>
- </data-stores>
- </timer-service>
- <remote connector-ref="http-remoting-connector" thread-pool-name="default"/>
- <thread-pools>
- <thread-pool name="default">
- <max-threads count="10"/>
- <keepalive-time time="100" unit="milliseconds"/>
- </thread-pool>
- </thread-pools>
- <iiop enable-by-default="false" use-qualified-name="false"/>
- <default-security-domain value="other"/>
- <default-missing-method-permissions-deny-access value="true"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:io:1.0">
- <worker name="default" io-threads="3"/>
- <buffer-pool name="default" buffer-size="16384" buffers-per-slice="128"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:infinispan:2.0">
- <cache-container name="web" default-cache="passivation" module="org.wildfly.clustering.web.infinispan">
- <local-cache name="passivation" batching="true">
- <file-store passivation="true" purge="false"/>
- </local-cache>
- <local-cache name="persistent" batching="true">
- <file-store passivation="false" purge="false"/>
- </local-cache>
- </cache-container>
- <cache-container name="ejb" aliases="sfsb" default-cache="passivation" module="org.wildfly.clustering.ejb.infinispan">
- <local-cache name="passivation" batching="true">
- <file-store passivation="true" purge="false"/>
- </local-cache>
- <local-cache name="persistent" batching="true">
- <file-store passivation="false" purge="false"/>
- </local-cache>
- </cache-container>
- <cache-container name="hibernate" default-cache="local-query" module="org.hibernate">
- <local-cache name="entity">
- <transaction mode="NON_XA"/>
- <eviction strategy="LRU" max-entries="10000"/>
- <expiration max-idle="100000"/>
- </local-cache>
- <local-cache name="local-query">
- <transaction mode="NONE"/>
- <eviction strategy="LRU" max-entries="10000"/>
- <expiration max-idle="100000"/>
- </local-cache>
- <local-cache name="timestamps">
- <transaction mode="NONE"/>
- <eviction strategy="NONE"/>
- </local-cache>
- </cache-container>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:jacorb:1.3">
- <orb socket-binding="jacorb" ssl-socket-binding="jacorb-ssl">
- <initializers transactions="spec" security="identity"/>
- </orb>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:jaxrs:1.0"/>
- <subsystem xmlns="urn:jboss:domain:jca:2.0">
- <archive-validation enabled="true" fail-on-error="true" fail-on-warn="false"/>
- <bean-validation enabled="true"/>
- <default-workmanager>
- <short-running-threads>
- <core-threads count="50"/>
- <queue-length count="50"/>
- <max-threads count="50"/>
- <keepalive-time time="10" unit="seconds"/>
- </short-running-threads>
- <long-running-threads>
- <core-threads count="50"/>
- <queue-length count="50"/>
- <max-threads count="50"/>
- <keepalive-time time="10" unit="seconds"/>
- </long-running-threads>
- </default-workmanager>
- <cached-connection-manager/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:jdr:1.0"/>
- <subsystem xmlns="urn:jboss:domain:jmx:1.3">
- <expose-resolved-model/>
- <expose-expression-model/>
- <remoting-connector/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:jpa:1.1">
- <jpa default-datasource="" default-extended-persistence-inheritance="DEEP"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:jsf:1.0"/>
- <subsystem xmlns="urn:jboss:domain:jsr77:1.0"/>
- <subsystem xmlns="urn:jboss:domain:mail:2.0">
- <mail-session name="default" jndi-name="java:jboss/mail/Default">
- <smtp-server outbound-socket-binding-ref="mail-smtp"/>
- </mail-session>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:messaging:2.0">
- <activemq-server>
- <persistence-enabled>true</persistence-enabled>
- <journal-file-size>102400</journal-file-size>
- <journal-min-files>2</journal-min-files>
- <connectors>
- <http-connector name="http-connector" socket-binding="http">
- <param key="http-upgrade-endpoint" value="http-acceptor"/>
- </http-connector>
- <http-connector name="http-connector-throughput" socket-binding="http">
- <param key="http-upgrade-endpoint" value="http-acceptor-throughput"/>
- <param key="batch-delay" value="50"/>
- </http-connector>
- <in-vm-connector name="in-vm" server-id="0"/>
- </connectors>
- <acceptors>
- <http-acceptor name="http-acceptor" http-listener="default"/>
- <http-acceptor name="http-acceptor-throughput" http-listener="default">
- <param key="batch-delay" value="50"/>
- <param key="direct-deliver" value="false"/>
- </http-acceptor>
- <in-vm-acceptor name="in-vm" server-id="0"/>
- </acceptors>
- <security-settings>
- <security-setting match="#">
- <permission type="send" roles="guest"/>
- <permission type="consume" roles="guest"/>
- <permission type="createNonDurableQueue" roles="guest"/>
- <permission type="deleteNonDurableQueue" roles="guest"/>
- </security-setting>
- </security-settings>
- <address-settings>
- <!--default for catch all-->
- <address-setting match="#">
- <dead-letter-address>jms.queue.DLQ</dead-letter-address>
- <expiry-address>jms.queue.ExpiryQueue</expiry-address>
- <redelivery-delay>0</redelivery-delay>
- <max-size-bytes>10485760</max-size-bytes>
- <address-full-policy>PAGE</address-full-policy>
- <page-size-bytes>2097152</page-size-bytes>
- <message-counter-history-day-limit>10</message-counter-history-day-limit>
- </address-setting>
- </address-settings>
- <jms-connection-factories>
- <connection-factory name="InVmConnectionFactory">
- <connectors>
- <connector-ref connector-name="in-vm"/>
- </connectors>
- <entries>
- <entry name="java:/ConnectionFactory"/>
- </entries>
- </connection-factory>
- <connection-factory name="RemoteConnectionFactory">
- <connectors>
- <connector-ref connector-name="http-connector"/>
- </connectors>
- <entries>
- <entry name="java:jboss/exported/jms/RemoteConnectionFactory"/>
- </entries>
- </connection-factory>
- <pooled-connection-factory name="activemq-ra">
- <transaction mode="xa"/>
- <connectors>
- <connector-ref connector-name="in-vm"/>
- </connectors>
- <entries>
- <entry name="java:/JmsXA"/>
- <!-- Global JNDI entry used to provide a default JMS Connection factory to EE application -->
- <entry name="java:jboss/DefaultJMSConnectionFactory"/>
- </entries>
- </pooled-connection-factory>
- </jms-connection-factories>
- <jms-destinations>
- <jms-queue name="A">
- <entry name="queue/A"/>
- <entry name="java:jboss/exported/queues/A"/>
- </jms-queue>
- <jms-queue name="B">
- <entry name="queue/B"/>
- <entry name="java:jboss/exported/queues/B"/>
- </jms-queue>
- </jms-destinations>
- </activemq-server>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:naming:2.0">
- <remote-naming/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:pojo:1.0"/>
- <subsystem xmlns="urn:jboss:domain:remoting:2.0">
- <endpoint worker="default"/>
- <http-connector name="http-remoting-connector" connector-ref="default" security-realm="ApplicationRealm"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:resource-adapters:2.0"/>
- <subsystem xmlns="urn:jboss:domain:sar:1.0"/>
- <subsystem xmlns="urn:jboss:domain:security:1.2">
- <security-domains>
- <security-domain name="other" cache-type="default">
- <authentication>
- <login-module code="Remoting" flag="optional">
- <module-option name="password-stacking" value="useFirstPass"/>
- </login-module>
- <login-module code="RealmDirect" flag="required">
- <module-option name="password-stacking" value="useFirstPass"/>
- </login-module>
- </authentication>
- </security-domain>
- <security-domain name="jboss-web-policy" cache-type="default">
- <authorization>
- <policy-module code="Delegating" flag="required"/>
- </authorization>
- </security-domain>
- <security-domain name="jboss-ejb-policy" cache-type="default">
- <authorization>
- <policy-module code="Delegating" flag="required"/>
- </authorization>
- </security-domain>
- </security-domains>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:threads:1.1"/>
- <subsystem xmlns="urn:jboss:domain:transactions:2.0">
- <core-environment>
- <process-id>
- <uuid/>
- </process-id>
- </core-environment>
- <recovery-environment socket-binding="txn-recovery-environment" status-socket-binding="txn-status-manager"/>
- <coordinator-environment default-timeout="300"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:undertow:1.0">
- <buffer-caches>
- <buffer-cache name="default" buffer-size="1024" buffers-per-region="1024" max-regions="10"/>
- </buffer-caches>
- <server name="default-server">
- <http-listener name="default" socket-binding="http"/>
- <host name="default-host" alias="localhost">
- <location name="/" handler="welcome-content"/>
- <filter-ref name="server-header"/>
- <filter-ref name="x-powered-by-header"/>
- </host>
- </server>
- <servlet-container name="default" default-buffer-cache="default" stack-trace-on-error="local-only">
- <jsp-config/>
- </servlet-container>
- <handlers>
- <file name="welcome-content" path="${jboss.home.dir}/welcome-content" directory-listing="true"/>
- </handlers>
- <filters>
- <response-header name="server-header" header-name="Server" header-value="Wildfly 8"/>
- <response-header name="x-powered-by-header" header-name="X-Powered-By" header-value="Undertow 1"/>
- </filters>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:webservices:1.2">
- <modify-wsdl-address>true</modify-wsdl-address>
- <wsdl-host>${jboss.bind.address:127.0.0.1}</wsdl-host>
- <endpoint-config name="Standard-Endpoint-Config"/>
- <endpoint-config name="Recording-Endpoint-Config">
- <pre-handler-chain name="recording-handlers" protocol-bindings="##SOAP11_HTTP ##SOAP11_HTTP_MTOM ##SOAP12_HTTP ##SOAP12_HTTP_MTOM">
- <handler name="RecordingHandler" class="org.jboss.ws.common.invocation.RecordingServerHandler"/>
- </pre-handler-chain>
- </endpoint-config>
- <client-config name="Standard-Client-Config"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:weld:2.0"/>
- </profile>
- <interfaces>
- <interface name="management">
- <inet-address value="${jboss.bind.address.management:127.0.0.1}"/>
- </interface>
- <interface name="public">
- <inet-address value="${jboss.bind.address:127.0.0.1}"/>
- </interface>
- <!-- TODO - only show this if the jacorb subsystem is added -->
- <interface name="unsecure">
- <!--
- ~ Used for IIOP sockets in the standard configuration.
- ~ To secure JacORB you need to setup SSL
- -->
- <inet-address value="${jboss.bind.address.unsecure:127.0.0.1}"/>
- </interface>
- </interfaces>
- <socket-binding-group name="standard-sockets" default-interface="public" port-offset="${jboss.socket.binding.port-offset:0}">
- <socket-binding name="management-http" interface="management" port="${jboss.management.http.port:9990}"/>
- <socket-binding name="management-https" interface="management" port="${jboss.management.https.port:9993}"/>
- <socket-binding name="ajp" port="${jboss.ajp.port:8009}"/>
- <socket-binding name="http" port="${jboss.http.port:8080}"/>
- <socket-binding name="https" port="${jboss.https.port:8443}"/>
- <socket-binding name="jacorb" interface="unsecure" port="3528"/>
- <socket-binding name="jacorb-ssl" interface="unsecure" port="3529"/>
- <socket-binding name="messaging-group" port="0" multicast-address="${jboss.messaging.group.address:231.7.7.7}" multicast-port="${jboss.messaging.group.port:9876}"/>
- <socket-binding name="txn-recovery-environment" port="4712"/>
- <socket-binding name="txn-status-manager" port="4713"/>
- <outbound-socket-binding name="mail-smtp">
- <remote-destination host="localhost" port="25"/>
- </outbound-socket-binding>
- </socket-binding-group>
-</server>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/jca-config/server/standalone/configuration/standalone-example2.xml
----------------------------------------------------------------------
diff --git a/examples/javaee/jca-config/server/standalone/configuration/standalone-example2.xml b/examples/javaee/jca-config/server/standalone/configuration/standalone-example2.xml
deleted file mode 100644
index 109e61a..0000000
--- a/examples/javaee/jca-config/server/standalone/configuration/standalone-example2.xml
+++ /dev/null
@@ -1,496 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-
-<server xmlns="urn:jboss:domain:2.0">
- <extensions>
- <extension module="org.jboss.as.clustering.infinispan"/>
- <extension module="org.jboss.as.connector"/>
- <extension module="org.jboss.as.deployment-scanner"/>
- <extension module="org.jboss.as.ee"/>
- <extension module="org.jboss.as.ejb3"/>
- <extension module="org.jboss.as.jacorb"/>
- <extension module="org.jboss.as.jaxrs"/>
- <extension module="org.jboss.as.jdr"/>
- <extension module="org.jboss.as.jmx"/>
- <extension module="org.jboss.as.jpa"/>
- <extension module="org.jboss.as.jsf"/>
- <extension module="org.jboss.as.jsr77"/>
- <extension module="org.jboss.as.logging"/>
- <extension module="org.jboss.as.mail"/>
- <extension module="org.jboss.as.messaging"/>
- <extension module="org.jboss.as.naming"/>
- <extension module="org.jboss.as.pojo"/>
- <extension module="org.jboss.as.remoting"/>
- <extension module="org.jboss.as.sar"/>
- <extension module="org.jboss.as.security"/>
- <extension module="org.jboss.as.threads"/>
- <extension module="org.jboss.as.transactions"/>
- <extension module="org.jboss.as.webservices"/>
- <extension module="org.jboss.as.weld"/>
- <extension module="org.wildfly.extension.batch"/>
- <extension module="org.wildfly.extension.io"/>
- <extension module="org.wildfly.extension.undertow"/>
- </extensions>
- <management>
- <security-realms>
- <security-realm name="ManagementRealm">
- <authentication>
- <local default-user="$local"/>
- <properties path="mgmt-users.properties" relative-to="jboss.server.config.dir"/>
- </authentication>
- <authorization map-groups-to-roles="false">
- <properties path="mgmt-groups.properties" relative-to="jboss.server.config.dir"/>
- </authorization>
- </security-realm>
- <security-realm name="ApplicationRealm">
- <authentication>
- <local default-user="$local" allowed-users="*"/>
- <properties path="application-users.properties" relative-to="jboss.server.config.dir"/>
- </authentication>
- <authorization>
- <properties path="application-roles.properties" relative-to="jboss.server.config.dir"/>
- </authorization>
- </security-realm>
- </security-realms>
- <audit-log>
- <formatters>
- <json-formatter name="json-formatter"/>
- </formatters>
- <handlers>
- <file-handler name="file" formatter="json-formatter" relative-to="jboss.server.data.dir" path="audit-log.log"/>
- </handlers>
- <logger log-boot="true" log-read-only="false" enabled="false">
- <handlers>
- <handler name="file"/>
- </handlers>
- </logger>
- </audit-log>
- <management-interfaces>
- <http-interface security-realm="ManagementRealm" http-upgrade-enabled="true">
- <socket-binding http="management-http"/>
- </http-interface>
- </management-interfaces>
- <access-control provider="simple">
- <role-mapping>
- <role name="SuperUser">
- <include>
- <user name="$local"/>
- </include>
- </role>
- </role-mapping>
- </access-control>
- </management>
- <profile>
- <subsystem xmlns="urn:jboss:domain:logging:2.0">
- <console-handler name="CONSOLE">
- <level name="INFO"/>
- <formatter>
- <named-formatter name="COLOR-PATTERN"/>
- </formatter>
- </console-handler>
- <periodic-rotating-file-handler name="FILE" autoflush="true">
- <formatter>
- <named-formatter name="PATTERN"/>
- </formatter>
- <file relative-to="jboss.server.log.dir" path="server.log"/>
- <suffix value=".yyyy-MM-dd"/>
- <append value="true"/>
- </periodic-rotating-file-handler>
- <logger category="com.arjuna">
- <level name="WARN"/>
- </logger>
- <logger category="org.apache.tomcat.util.modeler">
- <level name="WARN"/>
- </logger>
- <logger category="org.jboss.as.config">
- <level name="DEBUG"/>
- </logger>
- <logger category="sun.rmi">
- <level name="WARN"/>
- </logger>
- <logger category="jacorb">
- <level name="WARN"/>
- </logger>
- <logger category="jacorb.config">
- <level name="ERROR"/>
- </logger>
- <root-logger>
- <level name="INFO"/>
- <handlers>
- <handler name="CONSOLE"/>
- <handler name="FILE"/>
- </handlers>
- </root-logger>
- <formatter name="PATTERN">
- <pattern-formatter pattern="%d{yyyy-MM-dd HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/>
- </formatter>
- <formatter name="COLOR-PATTERN">
- <pattern-formatter pattern="%K{level}%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/>
- </formatter>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:batch:1.0">
- <job-repository>
- <in-memory/>
- </job-repository>
- <thread-pool>
- <max-threads count="10"/>
- <keepalive-time time="100" unit="milliseconds"/>
- </thread-pool>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:datasources:2.0">
- <datasources>
- <datasource jndi-name="java:jboss/datasources/ExampleDS" pool-name="ExampleDS" enabled="true" use-java-context="true">
- <connection-url>jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE</connection-url>
- <driver>h2</driver>
- <security>
- <user-name>sa</user-name>
- <password>sa</password>
- </security>
- </datasource>
- <drivers>
- <driver name="h2" module="com.h2database.h2">
- <xa-datasource-class>org.h2.jdbcx.JdbcDataSource</xa-datasource-class>
- </driver>
- </drivers>
- </datasources>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:deployment-scanner:2.0">
- <deployment-scanner path="deployments" relative-to="jboss.server.base.dir" scan-interval="5000" runtime-failure-causes-rollback="${jboss.deployment.scanner.rollback.on.failure:false}"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:ee:2.0">
- <spec-descriptor-property-replacement>false</spec-descriptor-property-replacement>
- <jboss-descriptor-property-replacement>true</jboss-descriptor-property-replacement>
- <annotation-property-replacement>false</annotation-property-replacement>
- <concurrent>
- <context-services>
- <context-service name="default" jndi-name="java:jboss/ee/concurrency/context/default" use-transaction-setup-provider="true"/>
- </context-services>
- <managed-executor-services>
- <managed-executor-service name="default" jndi-name="java:jboss/ee/concurrency/executor/default" context-service="default" hung-task-threshold="60000" core-threads="5" max-threads="25" keepalive-time="5000"/>
- </managed-executor-services>
- <managed-scheduled-executor-services>
- <managed-scheduled-executor-service name="default" jndi-name="java:jboss/ee/concurrency/scheduler/default" context-service="default" hung-task-threshold="60000" core-threads="2" keepalive-time="3000"/>
- </managed-scheduled-executor-services>
- <managed-thread-factories>
- <managed-thread-factory name="default" jndi-name="java:jboss/ee/concurrency/factory/default" context-service="default"/>
- </managed-thread-factories>
- </concurrent>
- <default-bindings context-service="java:jboss/ee/concurrency/context/default" datasource="java:jboss/datasources/ExampleDS" jms-connection-factory="java:jboss/DefaultJMSConnectionFactory" managed-executor-service="java:jboss/ee/concurrency/executor/default" managed-scheduled-executor-service="java:jboss/ee/concurrency/scheduler/default" managed-thread-factory="java:jboss/ee/concurrency/factory/default"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:ejb3:2.0">
- <session-bean>
- <stateful default-access-timeout="5000" cache-ref="simple" passivation-disabled-cache-ref="simple"/>
- <singleton default-access-timeout="5000"/>
- </session-bean>
- <mdb>
- <resource-adapter-ref resource-adapter-name="${ejb.resource-adapter-name:activemq-ra.rar}"/>
- <bean-instance-pool-ref pool-name="mdb-strict-max-pool"/>
- </mdb>
- <pools>
- <bean-instance-pools>
- <!-- A sample strict max pool configuration -->
- <strict-max-pool name="slsb-strict-max-pool" max-pool-size="20" instance-acquisition-timeout="5" instance-acquisition-timeout-unit="MINUTES"/>
- <strict-max-pool name="mdb-strict-max-pool" max-pool-size="20" instance-acquisition-timeout="5" instance-acquisition-timeout-unit="MINUTES"/>
- </bean-instance-pools>
- </pools>
- <caches>
- <cache name="simple"/>
- <cache name="distributable" aliases="passivating clustered" passivation-store-ref="infinispan"/>
- </caches>
- <passivation-stores>
- <passivation-store name="infinispan" cache-container="ejb" max-size="10000"/>
- </passivation-stores>
- <async thread-pool-name="default"/>
- <timer-service thread-pool-name="default" default-data-store="default-file-store">
- <data-stores>
- <file-data-store name="default-file-store" path="timer-service-data" relative-to="jboss.server.data.dir"/>
- </data-stores>
- </timer-service>
- <remote connector-ref="http-remoting-connector" thread-pool-name="default"/>
- <thread-pools>
- <thread-pool name="default">
- <max-threads count="10"/>
- <keepalive-time time="100" unit="milliseconds"/>
- </thread-pool>
- </thread-pools>
- <iiop enable-by-default="false" use-qualified-name="false"/>
- <default-security-domain value="other"/>
- <default-missing-method-permissions-deny-access value="true"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:io:1.0">
- <worker name="default" io-threads="3"/>
- <buffer-pool name="default" buffer-size="16384" buffers-per-slice="128"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:infinispan:2.0">
- <cache-container name="web" default-cache="passivation" module="org.wildfly.clustering.web.infinispan">
- <local-cache name="passivation" batching="true">
- <file-store passivation="true" purge="false"/>
- </local-cache>
- <local-cache name="persistent" batching="true">
- <file-store passivation="false" purge="false"/>
- </local-cache>
- </cache-container>
- <cache-container name="ejb" aliases="sfsb" default-cache="passivation" module="org.wildfly.clustering.ejb.infinispan">
- <local-cache name="passivation" batching="true">
- <file-store passivation="true" purge="false"/>
- </local-cache>
- <local-cache name="persistent" batching="true">
- <file-store passivation="false" purge="false"/>
- </local-cache>
- </cache-container>
- <cache-container name="hibernate" default-cache="local-query" module="org.hibernate">
- <local-cache name="entity">
- <transaction mode="NON_XA"/>
- <eviction strategy="LRU" max-entries="10000"/>
- <expiration max-idle="100000"/>
- </local-cache>
- <local-cache name="local-query">
- <transaction mode="NONE"/>
- <eviction strategy="LRU" max-entries="10000"/>
- <expiration max-idle="100000"/>
- </local-cache>
- <local-cache name="timestamps">
- <transaction mode="NONE"/>
- <eviction strategy="NONE"/>
- </local-cache>
- </cache-container>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:jacorb:1.3">
- <orb socket-binding="jacorb" ssl-socket-binding="jacorb-ssl">
- <initializers transactions="spec" security="identity"/>
- </orb>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:jaxrs:1.0"/>
- <subsystem xmlns="urn:jboss:domain:jca:2.0">
- <archive-validation enabled="true" fail-on-error="true" fail-on-warn="false"/>
- <bean-validation enabled="true"/>
- <default-workmanager>
- <short-running-threads>
- <core-threads count="50"/>
- <queue-length count="50"/>
- <max-threads count="50"/>
- <keepalive-time time="10" unit="seconds"/>
- </short-running-threads>
- <long-running-threads>
- <core-threads count="50"/>
- <queue-length count="50"/>
- <max-threads count="50"/>
- <keepalive-time time="10" unit="seconds"/>
- </long-running-threads>
- </default-workmanager>
- <cached-connection-manager/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:jdr:1.0"/>
- <subsystem xmlns="urn:jboss:domain:jmx:1.3">
- <expose-resolved-model/>
- <expose-expression-model/>
- <remoting-connector/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:jpa:1.1">
- <jpa default-datasource="" default-extended-persistence-inheritance="DEEP"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:jsf:1.0"/>
- <subsystem xmlns="urn:jboss:domain:jsr77:1.0"/>
- <subsystem xmlns="urn:jboss:domain:mail:2.0">
- <mail-session name="default" jndi-name="java:jboss/mail/Default">
- <smtp-server outbound-socket-binding-ref="mail-smtp"/>
- </mail-session>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:messaging:2.0">
- <activemq-server>
- <persistence-enabled>true</persistence-enabled>
- <journal-file-size>102400</journal-file-size>
- <journal-min-files>2</journal-min-files>
- <connectors>
- <http-connector name="http-connector" socket-binding="http">
- <param key="http-upgrade-endpoint" value="http-acceptor"/>
- </http-connector>
- <http-connector name="http-connector-throughput" socket-binding="http">
- <param key="http-upgrade-endpoint" value="http-acceptor-throughput"/>
- <param key="batch-delay" value="50"/>
- </http-connector>
- <in-vm-connector name="in-vm" server-id="0"/>
- <http-connector name="remote-http-connector" socket-binding="remote-messaging"/>
- </connectors>
- <acceptors>
- <http-acceptor name="http-acceptor" http-listener="default"/>
- <http-acceptor name="http-acceptor-throughput" http-listener="default">
- <param key="batch-delay" value="50"/>
- <param key="direct-deliver" value="false"/>
- </http-acceptor>
- <in-vm-acceptor name="in-vm" server-id="0"/>
- </acceptors>
- <security-settings>
- <security-setting match="#">
- <permission type="send" roles="guest"/>
- <permission type="consume" roles="guest"/>
- <permission type="createNonDurableQueue" roles="guest"/>
- <permission type="deleteNonDurableQueue" roles="guest"/>
- </security-setting>
- </security-settings>
- <address-settings>
- <!--default for catch all-->
- <address-setting match="#">
- <dead-letter-address>jms.queue.DLQ</dead-letter-address>
- <expiry-address>jms.queue.ExpiryQueue</expiry-address>
- <redelivery-delay>0</redelivery-delay>
- <max-size-bytes>10485760</max-size-bytes>
- <address-full-policy>PAGE</address-full-policy>
- <page-size-bytes>2097152</page-size-bytes>
- <message-counter-history-day-limit>10</message-counter-history-day-limit>
- </address-setting>
- </address-settings>
- <jms-connection-factories>
- <connection-factory name="InVmConnectionFactory">
- <connectors>
- <connector-ref connector-name="in-vm"/>
- </connectors>
- <entries>
- <entry name="java:/ConnectionFactory"/>
- </entries>
- </connection-factory>
- <connection-factory name="RemoteConnectionFactory">
- <connectors>
- <connector-ref connector-name="http-connector"/>
- </connectors>
- <entries>
- <entry name="java:jboss/exported/jms/RemoteConnectionFactory"/>
- </entries>
- </connection-factory>
- <pooled-connection-factory name="activemq-ra">
- <transaction mode="xa"/>
- <connectors>
- <connector-ref connector-name="in-vm"/>
- </connectors>
- <entries>
- <entry name="java:/JmsXA"/>
- <!-- Global JNDI entry used to provide a default JMS Connection factory to EE application -->
- <entry name="java:jboss/DefaultJMSConnectionFactory"/>
- </entries>
- </pooled-connection-factory>
- <pooled-connection-factory name="activemq-ra-remote">
- <transaction mode="xa"/>
- <user>guest</user>
- <password>password</password>
- <connectors>
- <connector-ref connector-name="remote-http-connector"/>
- </connectors>
- <entries>
- <entry name="java:/RemoteJmsXA"/>
- </entries>
- </pooled-connection-factory>
- </jms-connection-factories>
- </activemq-server>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:naming:2.0">
- <remote-naming/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:pojo:1.0"/>
- <subsystem xmlns="urn:jboss:domain:remoting:2.0">
- <endpoint worker="default"/>
- <http-connector name="http-remoting-connector" connector-ref="default" security-realm="ApplicationRealm"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:resource-adapters:2.0"/>
- <subsystem xmlns="urn:jboss:domain:sar:1.0"/>
- <subsystem xmlns="urn:jboss:domain:security:1.2">
- <security-domains>
- <security-domain name="other" cache-type="default">
- <authentication>
- <login-module code="Remoting" flag="optional">
- <module-option name="password-stacking" value="useFirstPass"/>
- </login-module>
- <login-module code="RealmDirect" flag="required">
- <module-option name="password-stacking" value="useFirstPass"/>
- </login-module>
- </authentication>
- </security-domain>
- <security-domain name="jboss-web-policy" cache-type="default">
- <authorization>
- <policy-module code="Delegating" flag="required"/>
- </authorization>
- </security-domain>
- <security-domain name="jboss-ejb-policy" cache-type="default">
- <authorization>
- <policy-module code="Delegating" flag="required"/>
- </authorization>
- </security-domain>
- </security-domains>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:threads:1.1"/>
- <subsystem xmlns="urn:jboss:domain:transactions:2.0">
- <core-environment>
- <process-id>
- <uuid/>
- </process-id>
- </core-environment>
- <recovery-environment socket-binding="txn-recovery-environment" status-socket-binding="txn-status-manager"/>
- <coordinator-environment default-timeout="300"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:undertow:1.0">
- <buffer-caches>
- <buffer-cache name="default" buffer-size="1024" buffers-per-region="1024" max-regions="10"/>
- </buffer-caches>
- <server name="default-server">
- <http-listener name="default" socket-binding="http"/>
- <host name="default-host" alias="localhost">
- <location name="/" handler="welcome-content"/>
- <filter-ref name="server-header"/>
- <filter-ref name="x-powered-by-header"/>
- </host>
- </server>
- <servlet-container name="default" default-buffer-cache="default" stack-trace-on-error="local-only">
- <jsp-config/>
- </servlet-container>
- <handlers>
- <file name="welcome-content" path="${jboss.home.dir}/welcome-content" directory-listing="true"/>
- </handlers>
- <filters>
- <response-header name="server-header" header-name="Server" header-value="Wildfly 8"/>
- <response-header name="x-powered-by-header" header-name="X-Powered-By" header-value="Undertow 1"/>
- </filters>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:webservices:1.2">
- <modify-wsdl-address>true</modify-wsdl-address>
- <wsdl-host>${jboss.bind.address:127.0.0.1}</wsdl-host>
- <endpoint-config name="Standard-Endpoint-Config"/>
- <endpoint-config name="Recording-Endpoint-Config">
- <pre-handler-chain name="recording-handlers" protocol-bindings="##SOAP11_HTTP ##SOAP11_HTTP_MTOM ##SOAP12_HTTP ##SOAP12_HTTP_MTOM">
- <handler name="RecordingHandler" class="org.jboss.ws.common.invocation.RecordingServerHandler"/>
- </pre-handler-chain>
- </endpoint-config>
- <client-config name="Standard-Client-Config"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:weld:2.0"/>
- </profile>
- <interfaces>
- <interface name="management">
- <inet-address value="${jboss.bind.address.management:127.0.0.1}"/>
- </interface>
- <interface name="public">
- <inet-address value="${jboss.bind.address:127.0.0.1}"/>
- </interface>
- <!-- TODO - only show this if the jacorb subsystem is added -->
- <interface name="unsecure">
- <!--
- ~ Used for IIOP sockets in the standard configuration.
- ~ To secure JacORB you need to setup SSL
- -->
- <inet-address value="${jboss.bind.address.unsecure:127.0.0.1}"/>
- </interface>
- </interfaces>
- <socket-binding-group name="standard-sockets" default-interface="public" port-offset="${jboss.socket.binding.port-offset:0}">
- <socket-binding name="management-http" interface="management" port="${jboss.management.http.port:9990}"/>
- <socket-binding name="management-https" interface="management" port="${jboss.management.https.port:9993}"/>
- <socket-binding name="ajp" port="${jboss.ajp.port:8009}"/>
- <socket-binding name="http" port="${jboss.http.port:8080}"/>
- <socket-binding name="https" port="${jboss.https.port:8443}"/>
- <socket-binding name="jacorb" interface="unsecure" port="3528"/>
- <socket-binding name="jacorb-ssl" interface="unsecure" port="3529"/>
- <socket-binding name="messaging-group" port="0" multicast-address="${jboss.messaging.group.address:231.7.7.7}" multicast-port="${jboss.messaging.group.port:9876}"/>
- <socket-binding name="remote-messaging" port="8080" fixed-port="true"/>
- <socket-binding name="txn-recovery-environment" port="4712"/>
- <socket-binding name="txn-status-manager" port="4713"/>
- <outbound-socket-binding name="mail-smtp">
- <remote-destination host="localhost" port="25"/>
- </outbound-socket-binding>
- </socket-binding-group>
-</server>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/jca-config/src/main/java/org/apache/activemq/javaee/example/MDBRemoteClientExample.java
----------------------------------------------------------------------
diff --git a/examples/javaee/jca-config/src/main/java/org/apache/activemq/javaee/example/MDBRemoteClientExample.java b/examples/javaee/jca-config/src/main/java/org/apache/activemq/javaee/example/MDBRemoteClientExample.java
deleted file mode 100644
index e556c5d..0000000
--- a/examples/javaee/jca-config/src/main/java/org/apache/activemq/javaee/example/MDBRemoteClientExample.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.activemq.javaee.example;
-
-import org.apache.activemq.javaee.example.server2.StatelessSenderService;
-
-import javax.jms.Connection;
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import java.util.Properties;
-
-/**
- *
- * MDB Remote & JCA Configuration Example.
- *
- * @author <a href="mailto:clebert.suconic@jboss.org">Clebert Suconic</a>
- */
-public class MDBRemoteClientExample
-{
- public static void main(String[] args) throws Exception
- {
- Connection connection = null;
- InitialContext initialContext = null;
- try
- {
- // Step 1. Create an initial context to perform the EJB lookup.
- Properties env = new Properties();
- env.put(Context.URL_PKG_PREFIXES, "org.jboss.ejb.client.naming");
- initialContext = new InitialContext(env);
-
- // Step 2. Lookup the EJB
- StatelessSenderService sender = (StatelessSenderService)initialContext.lookup("ejb:/test//StatelessSender!org.apache.activemq.javaee.example.server2.StatelessSenderService");
-
- //Step 3. Calling a Stateless Session Bean. You will have more steps on the SessionBean
- sender.sendHello("Hello there MDB!");
-
- System.out.println("Step 3: Invoking the Stateless Bean");
-
- initialContext.close();
- }
- finally
- {
- //Step 11. Be sure to close our JMS resources!
- if (initialContext != null)
- {
- initialContext.close();
- }
- if(connection != null)
- {
- connection.close();
- }
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/jca-config/src/main/java/org/apache/activemq/javaee/example/server/MDBQueueA.java
----------------------------------------------------------------------
diff --git a/examples/javaee/jca-config/src/main/java/org/apache/activemq/javaee/example/server/MDBQueueA.java b/examples/javaee/jca-config/src/main/java/org/apache/activemq/javaee/example/server/MDBQueueA.java
deleted file mode 100644
index bc095af..0000000
--- a/examples/javaee/jca-config/src/main/java/org/apache/activemq/javaee/example/server/MDBQueueA.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.activemq.javaee.example.server;
-
-import javax.ejb.ActivationConfigProperty;
-import javax.ejb.MessageDriven;
-import javax.jms.Message;
-import javax.jms.MessageListener;
-import javax.jms.TextMessage;
-
-/**
- * MDB that is connected to the remote queue.
- * @author <a href="mailto:clebert.suconic@jboss.org">Clebert Suconic</a>
- */
-
-//Step 9. The message is received on the MDB, using a local queue.
-@MessageDriven(name = "MDB_QueueA",
- activationConfig =
- {
- @ActivationConfigProperty(propertyName = "destinationType", propertyValue = "javax.jms.Queue"),
- @ActivationConfigProperty(propertyName = "destination", propertyValue = "queue/A")
- })
-public class MDBQueueA implements MessageListener
-{
- public void onMessage(Message message)
- {
- try
- {
- TextMessage tm = (TextMessage)message;
-
- String text = tm.getText();
-
- System.out.println("Step 10: (MDBQueueA.java) Message received using the default adapter. Message = \"" + text + "\"" );
-
- }
- catch (Exception e)
- {
- e.printStackTrace();
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/jca-config/src/main/java/org/apache/activemq/javaee/example/server2/MDBQueueB.java
----------------------------------------------------------------------
diff --git a/examples/javaee/jca-config/src/main/java/org/apache/activemq/javaee/example/server2/MDBQueueB.java b/examples/javaee/jca-config/src/main/java/org/apache/activemq/javaee/example/server2/MDBQueueB.java
deleted file mode 100644
index 1b471f0..0000000
--- a/examples/javaee/jca-config/src/main/java/org/apache/activemq/javaee/example/server2/MDBQueueB.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.activemq.javaee.example.server2;
-
-import org.jboss.ejb3.annotation.ResourceAdapter;
-
-import javax.ejb.ActivationConfigProperty;
-import javax.ejb.MessageDriven;
-import javax.jms.Message;
-import javax.jms.MessageListener;
-import javax.jms.TextMessage;
-
-/**
- * MDB that is connected to the remote queue.
- * @author <a href="mailto:clebert.suconic@jboss.org">Clebert Suconic</a>
- */
-
-//Step 10. The message is received on the MDB, using a remote queue.
-@MessageDriven(name = "MDB_QueueB",
- activationConfig =
- {
- @ActivationConfigProperty(propertyName = "destinationType", propertyValue = "javax.jms.Queue"),
- @ActivationConfigProperty(propertyName = "destination", propertyValue = "B"),
- @ActivationConfigProperty(propertyName = "useJNDI", propertyValue = "false")
- })
-@ResourceAdapter("activemq-ra-remote.rar")
-public class MDBQueueB implements MessageListener
-{
- public void onMessage(Message message)
- {
- try
- {
- TextMessage tm = (TextMessage)message;
-
- String text = tm.getText();
-
- System.out.println("Step 11: (MDBQueueB.java) Message received using the remote adapter. Message = \"" + text + "\"" );
-
- }
- catch (Exception e)
- {
- e.printStackTrace();
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/jca-config/src/main/java/org/apache/activemq/javaee/example/server2/StatelessSender.java
----------------------------------------------------------------------
diff --git a/examples/javaee/jca-config/src/main/java/org/apache/activemq/javaee/example/server2/StatelessSender.java b/examples/javaee/jca-config/src/main/java/org/apache/activemq/javaee/example/server2/StatelessSender.java
deleted file mode 100644
index 5dd6784..0000000
--- a/examples/javaee/jca-config/src/main/java/org/apache/activemq/javaee/example/server2/StatelessSender.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.activemq.javaee.example.server2;
-
-import org.apache.activemq.api.jms.ActiveMQJMSClient;
-import org.apache.activemq.ra.ActiveMQRAConnectionFactoryImpl;
-
-import javax.annotation.Resource;
-import javax.ejb.Remote;
-import javax.ejb.Stateless;
-import javax.jms.*;
-
-/**
- * A Stateless Bean that will connect to a remote JBM.
- *
- * @author <a href="mailto:clebert.suconic@jboss.org">Clebert Suconic</a>
- */
-@Remote(StatelessSenderService.class)
-@Stateless
-public class StatelessSender implements StatelessSenderService
-{
- @Resource(mappedName="java:/RemoteJmsXA")
- private ConnectionFactory connectionFactory;
-
- public void sendHello(String message) throws Exception
- {
- // Step 4. Define the destinations that will receive the message (instead of using JNDI to the remote server)
- Queue destQueueA = ActiveMQJMSClient.createQueue("A");
- Queue destQueueB = ActiveMQJMSClient.createQueue("B");
- // Step 5. Create a connection to a remote server using a connection-factory (look at the deployed file jms-remote-ds.xml)
- Connection conn = connectionFactory.createConnection("guest", "password");
-
- // Step 6. Send a message to a QueueA on the remote server, which will be received by MDBQueueA
- Session sess = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
- MessageProducer prodA = sess.createProducer(destQueueA);
- prodA.send(sess.createTextMessage(message));
-
- // Step 7. Send a message to a QueueB on the remote server, which will be received by MDBQueueA
- MessageProducer prodB = sess.createProducer(destQueueB);
- prodB.send(sess.createTextMessage(message));
-
- // Step 8. Close the connection. (Since this is a JCA connection, this will just place the connection back to a connection pool)
- conn.close();
- }
-}
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/jca-config/src/main/java/org/apache/activemq/javaee/example/server2/StatelessSenderService.java
----------------------------------------------------------------------
diff --git a/examples/javaee/jca-config/src/main/java/org/apache/activemq/javaee/example/server2/StatelessSenderService.java b/examples/javaee/jca-config/src/main/java/org/apache/activemq/javaee/example/server2/StatelessSenderService.java
deleted file mode 100644
index 65190e8..0000000
--- a/examples/javaee/jca-config/src/main/java/org/apache/activemq/javaee/example/server2/StatelessSenderService.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.activemq.javaee.example.server2;
-
-/**
- * A StatelessSenderService
- *
- * @author <a href="mailto:clebert.suconic@jboss.org">Clebert Suconic</a>
- *
- *
- */
-public interface StatelessSenderService
-{
-
- public void sendHello(String message) throws Exception;
-
-}
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/jca-config/src/main/resources/jboss-ejb-client.properties
----------------------------------------------------------------------
diff --git a/examples/javaee/jca-config/src/main/resources/jboss-ejb-client.properties b/examples/javaee/jca-config/src/main/resources/jboss-ejb-client.properties
deleted file mode 100644
index f31d441..0000000
--- a/examples/javaee/jca-config/src/main/resources/jboss-ejb-client.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-remote.connectionprovider.create.options.org.xnio.Options.SSL_ENABLED=false
-
-remote.connections=default
-
-remote.connection.default.host=localhost
-remote.connection.default.port = 8180
-remote.connection.default.connect.options.org.xnio.Options.SASL_POLICY_NOANONYMOUS=false
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/jca-config/src/test/java/org/apache/activemq/javaee/example/server/ExampleRunner2Test.java
----------------------------------------------------------------------
diff --git a/examples/javaee/jca-config/src/test/java/org/apache/activemq/javaee/example/server/ExampleRunner2Test.java b/examples/javaee/jca-config/src/test/java/org/apache/activemq/javaee/example/server/ExampleRunner2Test.java
deleted file mode 100644
index d875ce1..0000000
--- a/examples/javaee/jca-config/src/test/java/org/apache/activemq/javaee/example/server/ExampleRunner2Test.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.activemq.javaee.example.server;
-
-import org.apache.activemq.javaee.example.MDBRemoteClientExample;
-import org.apache.activemq.javaee.example.server2.MDBQueueB;
-import org.apache.activemq.javaee.example.server2.StatelessSender;
-import org.apache.activemq.javaee.example.server2.StatelessSenderService;
-import org.jboss.arquillian.container.test.api.ContainerController;
-import org.jboss.arquillian.container.test.api.Deployer;
-import org.jboss.arquillian.container.test.api.Deployment;
-import org.jboss.arquillian.container.test.api.RunAsClient;
-import org.jboss.arquillian.container.test.api.TargetsContainer;
-import org.jboss.arquillian.junit.Arquillian;
-import org.jboss.arquillian.junit.InSequence;
-import org.jboss.arquillian.test.api.ArquillianResource;
-import org.jboss.shrinkwrap.api.Archive;
-import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.spec.JavaArchive;
-import org.jboss.shrinkwrap.api.spec.WebArchive;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-/**
- * @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a>
- * @author Justin Bertram
- */
-@RunAsClient
-@RunWith(Arquillian.class)
-public class ExampleRunner2Test
-{
- @ArquillianResource
- private ContainerController controller;
- @ArquillianResource
- private Deployer deployer;
-
- @Deployment(name = "deploy-0", managed = false)
- @TargetsContainer("node-0")
- public static Archive getDeployment()
- {
- final JavaArchive ejbJar = ShrinkWrap.create(JavaArchive.class, "mdb.jar");
- ejbJar.addClass(MDBQueueA.class);
- System.out.println(ejbJar.toString(true));
- return ejbJar;
- }
-
- @Deployment(name = "deploy-1", managed = false)
- @TargetsContainer("node-1")
- public static Archive getDeployment2()
- {
- final JavaArchive ejbJar = ShrinkWrap.create(JavaArchive.class, "mdb2.jar");
- ejbJar.addClass(MDBQueueB.class);
- ejbJar.addClass(StatelessSenderService.class);
- ejbJar.addClass(StatelessSender.class);
-
- final WebArchive war = ShrinkWrap.create(WebArchive.class, "test.war");
- war.addAsManifestResource("jboss-deployment-structure.xml", "jboss-deployment-structure.xml");
- war.addAsLibrary(ejbJar);
- System.out.println(war.toString(true));
- return war;
- }
-
- @Test
- public void runExample() throws Exception
- {
- MDBRemoteClientExample.main(null);
- }
-
- @Test
- @InSequence(-1)
- public void startServer()
- {
- System.out.println("*****************************************************************************************************************************************************************");
- controller.start("node-0");
- System.out.println("*****************************************************************************************************************************************************************");
- deployer.deploy("deploy-0");
- System.out.println("*****************************************************************************************************************************************************************");
- controller.start("node-1");
- System.out.println("*****************************************************************************************************************************************************************");
- deployer.deploy("deploy-1");
- System.out.println("*****************************************************************************************************************************************************************");
- }
-
- @Test
- @InSequence(1)
- public void stopServer()
- {
- deployer.undeploy("deploy-1");
- controller.stop("node-1");
- deployer.undeploy("deploy-0");
- controller.stop("node-0");
- }
-}
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/jca-config/src/test/resources/arquillian.xml
----------------------------------------------------------------------
diff --git a/examples/javaee/jca-config/src/test/resources/arquillian.xml b/examples/javaee/jca-config/src/test/resources/arquillian.xml
deleted file mode 100644
index 33b56aa..0000000
--- a/examples/javaee/jca-config/src/test/resources/arquillian.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<arquillian xmlns="http://jboss.org/schema/arquillian"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://jboss.org/schema/arquillian http://jboss.org/schema/arquillian/arquillian_1_0.xsd">
-
- <!-- Uncomment to have test archives exported to the file system for inspection.
-This feature can also be controlled using the system property arquillian.deploymentExportPath -->
- <!--
-<engine>
-<property name="deploymentExportPath">target</property>
-</engine>
--->
-
- <defaultProtocol type="Servlet 3.0"/>
-
- <group qualifier="clustering-all">
-
- <container qualifier="node-0" mode="manual" default="true" managed="false">
- <configuration>
- <property name="jbossHome">${basedir}/target/jbossas-node0</property>
- <property name="javaVmArguments">-Djboss.node.name=node-0</property>
- <property name="serverConfig">standalone-example.xml</property>
- <property name="allowConnectingToRunningServer">true</property>
- <property name="managementAddress">${node0:127.0.0.1}</property>
- </configuration>
- </container>
- <container qualifier="node-1" mode="manual" managed="false">
- <configuration>
- <property name="jbossHome">${basedir}/target/jbossas-node1</property>
- <property name="javaVmArguments">-Djboss.node.name=node-1 -Djboss.socket.binding.port-offset=100</property>
- <property name="serverConfig">standalone-example2.xml</property>
- <property name="allowConnectingToRunningServer">true</property>
- <property name="managementAddress">${node0:127.0.0.1}</property>
- <property name="managementPort">${as.managementPort:10090}</property>
- </configuration>
- </container>
- </group>
-
- <!-- logThreshold proposed -->
- <!--
-<container qualifier="jbossas-managed">
-<configuration>
-<property name="logThreshold">ERROR</property>
-</configuration>
-</container>
--->
-
-</arquillian>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/jca-config/src/test/resources/jboss-deployment-structure.xml
----------------------------------------------------------------------
diff --git a/examples/javaee/jca-config/src/test/resources/jboss-deployment-structure.xml b/examples/javaee/jca-config/src/test/resources/jboss-deployment-structure.xml
deleted file mode 100644
index c49e8cf..0000000
--- a/examples/javaee/jca-config/src/test/resources/jboss-deployment-structure.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<jboss-deployment-structure>
- <deployment>
- <dependencies>
- <module name="org.apache.activemq"/>
- </dependencies>
- </deployment>
-</jboss-deployment-structure>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/jca-remote/pom.xml
----------------------------------------------------------------------
diff --git a/examples/javaee/jca-remote/pom.xml b/examples/javaee/jca-remote/pom.xml
deleted file mode 100644
index 9a59608..0000000
--- a/examples/javaee/jca-remote/pom.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.activemq.example.javaee</groupId>
- <artifactId>javaee-examples</artifactId>
- <version>6.0.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>activemq-javaee-jca-remote-example</artifactId>
- <packaging>jar</packaging>
- <name>ActiveMQ6 Java EE JCA Remote Example</name>
-
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <executions>
- <!-- Copy the AS for the second node into current_submodule/target/as-node1.-->
- <execution>
- <id>as-node1</id>
- <inherited>true</inherited>
- <phase>generate-test-resources</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <outputDirectory>${basedir}/target/jbossas-node1</outputDirectory>
- <overwrite>true</overwrite>
- <resources>
- <resource>
- <directory>${jboss.home}</directory>
- <excludes>
- <exclude>standalone/data</exclude>
- <exclude>standalone/log</exclude>
- <exclude>standalone/tmp</exclude>
- </excludes>
- </resource>
- <resource>
- <directory>${basedir}/server</directory>
- </resource>
- </resources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.12</version>
- <configuration>
- <argLine>-Dlogging.configuration=file:///${user.dir}/test/config/logging.properties</argLine>
- <!-- Parameters to test cases. -->
- <systemPropertyVariables>
- <arquillian.launch>clustering-all</arquillian.launch>
- </systemPropertyVariables>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/jca-remote/readme.html
----------------------------------------------------------------------
diff --git a/examples/javaee/jca-remote/readme.html b/examples/javaee/jca-remote/readme.html
deleted file mode 100644
index ddc2939..0000000
--- a/examples/javaee/jca-remote/readme.html
+++ /dev/null
@@ -1,160 +0,0 @@
-<html>
- <head>
- <title>ActiveMQ Java EE JCA Remote Server Configuration Example</title>
- <link rel="stylesheet" type="text/css" href="../../common/common.css" />
- <link rel="stylesheet" type="text/css" href="../../common/prettify.css" />
- <script type="text/javascript" src="../../common/prettify.js"></script>
- </head>
- <body onload="prettyPrint()">
- <h1>Java EE JCA Resource Adapter Remote Server Configuration Example</h1>
- <p>This example demonstrates how to configure the Resource adapter to connect to a remote ActiveMQ server</p>
- <p>This example is composed of a message driven bean and a client<p>
- <p>MDBRemoteServerClientExample will send a message to the MDB via a queue and wait for the MDB to send a response via
- a reply queue</p>
-
- <h2>WildFly configuration</h2>
-
- <p>The example leverages the Arquillian framework to run a WildFly instance and deploy the MDB.</p>
-
- <h2>Configuring the incoming JCA resource adapter</h2>
-
- <p>The MDB will consume messages via the inflow JCA resource adapter. This can be configured in 2 ways:</p>
- <ol>
- <li>via a pooled-connection-factory in the "messaging" subsystem</li>
- <li>via the activation configuration properties on the MDB set either via annotations or ejb-jar.xml</li>
- </ol>
- <p>In this example the MDB is annotated with <code>@ResourceAdapter("activemq-ra-remote.rar")</code> which refers to
- this pooled-connection-factory:</p>
- <pre class="prettyprint">
- <pooled-connection-factory name="activemq-ra-remote">
- <transaction mode="xa"/>
- <user>guest</user>
- <password>password</password>
- <connectors>
- <connector-ref connector-name="remote-http-connector"/>
- </connectors>
- <entries>
- <entry name="java:/RemoteJmsXA"/>
- </entries>
- </pooled-connection-factory>
- </pre>
- <p>This configuration ensures the MDB will consume from the remote queue.</p>
-
- <h2>Configuring the outgoing JCA resource adapter</h2>
-
- <p>The same pooled-connection-factory used for JCA inflow also configures an outgoing JCA connection factory which Java EE components can use to send messages to the same remote ActiveMQ Server.</p>
- <pre class="prettyprint">
- <pooled-connection-factory name="activemq-ra-remote">
- <transaction mode="xa"/>
- <user>guest</user>
- <password>password</password>
- <connectors>
- <connector-ref connector-name="remote-http-connector"/>
- </connectors>
- <entries>
- <entry name="java:/RemoteJmsXA"/>
- </entries>
- </pooled-connection-factory>
- </pre>
-
- <h2>Example step-by-step</h2>
-
- <p><i>download WildFly 8.0.0.Final from <a href="http://wildfly.org/downloads/">here</a> and install.</i></p>
- <p><i>set the JBOSS_HOME property to point to the WildFly install directory</i></p>
- <p><i>type <code>mvn verify</code> from the example directory to run</i></p>
-
- <ol>
- <li>First we need to get an initial context so we can send a JMS message to the second server.</li>
- <pre class="prettyprint">
- final Properties env = new Properties();
-
- env.put(Context.URL_PKG_PREFIXES, "org.jboss.ejb.client.naming");
-
- env.put(Context.INITIAL_CONTEXT_FACTORY, "org.jboss.naming.remote.client.InitialContextFactory");
-
- env.put(Context.PROVIDER_URL, "http-remoting://localhost:8180");
-
- initialContext = new InitialContext(env);
- </pre>
- <li>Look up the MDB's queue</li>
- <pre class="prettyprint">
- Queue queue = (Queue) initialContext.lookup("queues/mdbQueue");
- </pre>
- <li>look up the connection factory</li>
- <pre class="prettyprint">
- ConnectionFactory cf = (ConnectionFactory) initialContext.lookup("jms/RemoteConnectionFactory");
- </pre>
- <li>We then create a connection</li>
- <pre class="prettyprint">
- connection = cf.createConnection("guest", "password");
- </pre>
- <li>we then create a session</li>
- <pre class="prettyprint">
- Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
- </pre>
- <li>we now create a message producer to send the message</li>
- <pre class="prettyprint">
- MessageProducer producer = session.createProducer(queue);
- </pre>
- <li>create a text message and send it</li>
- <pre class="prettyprint">
- producer.send(session.createTextMessage("a message"));
- </pre>
- <li>The MDB receives the text message</li>
- <pre class="prettyprint">
- TextMessage tm = (TextMessage)message;
- </pre>
- <li>The MDB looks up the reply queue</li>
- <pre class="prettyprint">
- Queue destQueue = ActiveMQJMSClient.createQueue("mdbReplyQueue");
- </pre>
- <li>The MDB creates a connection</li>
- <pre class="prettyprint">
- Connection connection = connectionFactory.createConnection();
- </pre>
- <li>The MDB creates a session</li>
- <pre class="prettyprint">
- Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
- </pre>
- <li>The MDB creates a message producer to send the message</li>
- <pre class="prettyprint">
- MessageProducer producer = session.createProducer(destQueue);
- </pre>
- <li>The MDB creates and sends a text message</li>
- <pre class="prettyprint">
- producer.send(session.createTextMessage("A reply message"));
- </pre>
- <li>The MDB closes the connection which returns it to the pool</li>
- <pre class="prettyprint">
- connection.close();
- </pre>
- <li>The client now looks up the reply queue</li>
- <pre class="prettyprint">
- Queue replyQueue = (Queue) initialContext.lookup("queues/mdbReplyQueue");
- </pre>
- <li>and creates a message consumer to receive the message</li>
- <pre class="prettyprint">
- MessageConsumer consumer = session.createConsumer(replyQueue);
- </pre>
- <li>starting the connection starts delivery</li>
- <pre class="prettyprint">
- connection.start();
- </pre>
- <li>The message consumer receives the text message</li>
- <pre class="prettyprint">
- TextMessage textMessage = (TextMessage) consumer.receive(5000);
- </pre>
- <li>and we always clear up out JMS resources</li>
- <pre class="prettyprint">
- if (initialContext != null)
- {
- initialContext.close();
- }
- if (connection != null)
- {
- connection.close();
- }
- </pre>
- </ol>
- </body>
-</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/76d0cee5/examples/javaee/jca-remote/server/standalone/configuration/application-roles.properties
----------------------------------------------------------------------
diff --git a/examples/javaee/jca-remote/server/standalone/configuration/application-roles.properties b/examples/javaee/jca-remote/server/standalone/configuration/application-roles.properties
deleted file mode 100644
index 0ade8fb..0000000
--- a/examples/javaee/jca-remote/server/standalone/configuration/application-roles.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# Properties declaration of users roles for the realm 'ApplicationRealm'.
-#
-# This includes the following protocols: remote ejb, remote jndi, web, remote jms
-#
-# Users can be added to this properties file at any time, updates after the server has started
-# will be automatically detected.
-#
-# The format of this file is as follows: -
-# username=role1,role2,role3
-#
-# A utility script is provided which can be executed from the bin folder to add the users: -
-# - Linux
-# bin/add-user.sh
-#
-# - Windows
-# bin\add-user.bat
-#
-# The following illustrates how an admin user could be defined.
-#
-#admin=PowerUser,BillingAdmin,
-guest=guest
[02/37] activemq-6 git commit: ACTIVEMQ6-14 NPE during init
Posted by jb...@apache.org.
ACTIVEMQ6-14 NPE during init
Project: http://git-wip-us.apache.org/repos/asf/activemq-6/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-6/commit/4f925c5a
Tree: http://git-wip-us.apache.org/repos/asf/activemq-6/tree/4f925c5a
Diff: http://git-wip-us.apache.org/repos/asf/activemq-6/diff/4f925c5a
Branch: refs/heads/master
Commit: 4f925c5a44c592bda02d5e23335f35a0291a5590
Parents: 77bdb9d
Author: jbertram <jb...@redhat.com>
Authored: Fri Dec 5 14:00:49 2014 -0600
Committer: jbertram <jb...@redhat.com>
Committed: Wed Dec 10 09:49:12 2014 -0600
----------------------------------------------------------------------
.../jms/server/impl/JMSServerManagerImpl.java | 33 +++++++++++++-------
1 file changed, 22 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4f925c5a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/impl/JMSServerManagerImpl.java
----------------------------------------------------------------------
diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/impl/JMSServerManagerImpl.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/impl/JMSServerManagerImpl.java
index 3261033..85e7032 100644
--- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/impl/JMSServerManagerImpl.java
+++ b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/impl/JMSServerManagerImpl.java
@@ -620,18 +620,23 @@ public class JMSServerManagerImpl implements JMSServerManager, ActivateCallback
throw new IllegalArgumentException("Queue does not exist");
}
- ArrayList<String> bindings = new ArrayList<String>();
+ String[] usedJNDI = null;
- for (String jndiItem : jndi)
+ if (jndi != null)
{
- if (bindToJndi(jndiItem, destination))
+ ArrayList<String> bindings = new ArrayList<String>();
+
+ for (String jndiItem : jndi)
{
- bindings.add(jndiItem);
+ if (bindToJndi(jndiItem, destination))
+ {
+ bindings.add(jndiItem);
+ }
}
- }
- String[] usedJNDI = bindings.toArray(new String[bindings.size()]);
- addToBindings(queueJNDI, queueName, usedJNDI);
+ usedJNDI = bindings.toArray(new String[bindings.size()]);
+ addToBindings(queueJNDI, queueName, usedJNDI);
+ }
if (storeConfig && durable)
{
@@ -639,7 +644,10 @@ public class JMSServerManagerImpl implements JMSServerManager, ActivateCallback
queueName,
selectorString,
durable));
- storage.addJNDI(PersistedType.Queue, queueName, usedJNDI);
+ if (usedJNDI != null)
+ {
+ storage.addJNDI(PersistedType.Queue, queueName, usedJNDI);
+ }
}
}
}
@@ -1734,11 +1742,14 @@ public class JMSServerManagerImpl implements JMSServerManager, ActivateCallback
private void checkJNDI(final String... jndiNames) throws NamingException
{
- for (String jndiName : jndiNames)
+ if (jndiNames != null)
{
- if (registry != null && registry.lookup(jndiName) != null)
+ for (String jndiName : jndiNames)
{
- throw new NamingException(jndiName + " already has an object bound");
+ if (registry != null && registry.lookup(jndiName) != null)
+ {
+ throw new NamingException(jndiName + " already has an object bound");
+ }
}
}
}
[03/37] activemq-6 git commit: ACTIVEMQ6-14 Remove naming from
bootstrap
Posted by jb...@apache.org.
ACTIVEMQ6-14 Remove naming from bootstrap
Project: http://git-wip-us.apache.org/repos/asf/activemq-6/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-6/commit/77bdb9d5
Tree: http://git-wip-us.apache.org/repos/asf/activemq-6/tree/77bdb9d5
Diff: http://git-wip-us.apache.org/repos/asf/activemq-6/diff/77bdb9d5
Branch: refs/heads/master
Commit: 77bdb9d50266392278347a60e05de668ff983623
Parents: 76d0cee
Author: jbertram <jb...@redhat.com>
Authored: Fri Dec 5 13:45:19 2014 -0600
Committer: jbertram <jb...@redhat.com>
Committed: Wed Dec 10 09:49:12 2014 -0600
----------------------------------------------------------------------
.../activemq/src/main/resources/config/clustered/bootstrap.xml | 2 --
.../activemq/src/main/resources/config/non-clustered/bootstrap.xml | 2 --
.../activemq/src/main/resources/config/replicated/bootstrap.xml | 2 --
.../activemq/src/main/resources/config/shared-store/bootstrap.xml | 2 --
4 files changed, 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/77bdb9d5/distribution/activemq/src/main/resources/config/clustered/bootstrap.xml
----------------------------------------------------------------------
diff --git a/distribution/activemq/src/main/resources/config/clustered/bootstrap.xml b/distribution/activemq/src/main/resources/config/clustered/bootstrap.xml
index 76f88d1..681a1f5 100644
--- a/distribution/activemq/src/main/resources/config/clustered/bootstrap.xml
+++ b/distribution/activemq/src/main/resources/config/clustered/bootstrap.xml
@@ -24,8 +24,6 @@
<basic-security/>
- <naming bindAddress="localhost" port="1099" rmiBindAddress="localhost" rmiPort="1098"/>
-
<web bind="http://localhost:8161" path="web">
<app url="jolokia" war="jolokia-war-1.2.3.war"/>
</web>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/77bdb9d5/distribution/activemq/src/main/resources/config/non-clustered/bootstrap.xml
----------------------------------------------------------------------
diff --git a/distribution/activemq/src/main/resources/config/non-clustered/bootstrap.xml b/distribution/activemq/src/main/resources/config/non-clustered/bootstrap.xml
index a88b777..e031b16 100644
--- a/distribution/activemq/src/main/resources/config/non-clustered/bootstrap.xml
+++ b/distribution/activemq/src/main/resources/config/non-clustered/bootstrap.xml
@@ -24,8 +24,6 @@
<basic-security/>
- <naming bindAddress="localhost" port="1099" rmiBindAddress="localhost" rmiPort="1098"/>
-
<web bind="http://localhost:8161" path="web">
<app url="jolokia" war="jolokia-war-1.2.3.war"/>
</web>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/77bdb9d5/distribution/activemq/src/main/resources/config/replicated/bootstrap.xml
----------------------------------------------------------------------
diff --git a/distribution/activemq/src/main/resources/config/replicated/bootstrap.xml b/distribution/activemq/src/main/resources/config/replicated/bootstrap.xml
index 6fd5686..037f5d2 100644
--- a/distribution/activemq/src/main/resources/config/replicated/bootstrap.xml
+++ b/distribution/activemq/src/main/resources/config/replicated/bootstrap.xml
@@ -24,8 +24,6 @@
<basic-security/>
- <naming bindAddress="localhost" port="1099" rmiBindAddress="localhost" rmiPort="1098"/>
-
<web bind="http://localhost:8161" path="web">
<app url="jolokia" war="jolokia-war-1.2.3.war"/>
</web>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/77bdb9d5/distribution/activemq/src/main/resources/config/shared-store/bootstrap.xml
----------------------------------------------------------------------
diff --git a/distribution/activemq/src/main/resources/config/shared-store/bootstrap.xml b/distribution/activemq/src/main/resources/config/shared-store/bootstrap.xml
index 344157b..3620709 100644
--- a/distribution/activemq/src/main/resources/config/shared-store/bootstrap.xml
+++ b/distribution/activemq/src/main/resources/config/shared-store/bootstrap.xml
@@ -24,8 +24,6 @@
<basic-security/>
- <naming bindAddress="localhost" port="1099" rmiBindAddress="localhost" rmiPort="1098"/>
-
<web bind="http://localhost:8161" path="web">
<app url="jolokia" war="jolokia-war-1.2.3.war"/>
</web>
[36/37] activemq-6 git commit: ACTIVEMQ6-51 Example server
bootstrapping
Posted by jb...@apache.org.
ACTIVEMQ6-51 Example server bootstrapping
Project: http://git-wip-us.apache.org/repos/asf/activemq-6/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-6/commit/a102983d
Tree: http://git-wip-us.apache.org/repos/asf/activemq-6/tree/a102983d
Diff: http://git-wip-us.apache.org/repos/asf/activemq-6/diff/a102983d
Branch: refs/heads/master
Commit: a102983d7aa01d44c76c44100cbf9af30c977fa5
Parents: 4f925c5
Author: jbertram <jb...@redhat.com>
Authored: Mon Dec 8 22:31:39 2014 -0600
Committer: jbertram <jb...@redhat.com>
Committed: Wed Dec 10 09:49:13 2014 -0600
----------------------------------------------------------------------
activemq-maven-plugin/pom.xml | 61 +++++
.../apache/activemq/maven/ActiveMQClient.java | 27 ++
.../activemq/maven/ActiveMQClientPlugin.java | 72 ++++++
.../activemq/maven/ActiveMQStartPlugin.java | 228 ++++++++++++++++
.../activemq/maven/ActiveMQStopPlugin.java | 78 ++++++
.../activemq/maven/InVMNodeManagerServer.java | 73 ++++++
.../org/apache/activemq/maven/PluginUtil.java | 50 ++++
.../activemq/maven/TestClusterManager.java | 52 ++++
.../activemq/maven/TestClusterManagerMBean.java | 29 +++
.../org/apache/activemq/maven/TestNode.java | 49 ++++
.../activemq/server/ActiveMQBootstrap.java | 258 +++++++++++++++++++
.../server/SpawnedActiveMQBootstrap.java | 41 +++
.../activemq/server/SpawnedVMSupport.java | 257 ++++++++++++++++++
examples/core/perf/pom.xml | 4 +-
examples/core/vertx-connector/pom.xml | 2 +-
.../common/example/ActiveMQExample.java | 16 +-
examples/jms/aerogear/pom.xml | 2 +-
examples/jms/aerogear/readme.html | 8 +-
.../activemq/jms/example/AerogearExample.java | 2 +-
.../activemq/server0/activemq-configuration.xml | 52 ++++
.../resources/activemq/server0/activemq-jms.xml | 8 +
.../activemq/server0/activemq-users.xml | 7 +
.../hornetq/server0/activemq-configuration.xml | 61 -----
.../resources/hornetq/server0/activemq-jms.xml | 8 -
.../hornetq/server0/activemq-users.xml | 7 -
.../aerogear/src/main/resources/jndi.properties | 3 +
examples/jms/applet/pom.xml | 4 +-
.../jms/example/HttpStaticFileServer.java | 4 +-
.../example/HttpStaticFileServerHandler.java | 36 +--
.../HttpStaticFileServerPipelineFactory.java | 12 +-
.../activemq/server0/activemq-configuration.xml | 34 +++
.../resources/activemq/server0/activemq-jms.xml | 8 +
.../activemq/server0/activemq-users.xml | 7 +
.../hornetq/server0/activemq-configuration.xml | 41 ---
.../resources/hornetq/server0/activemq-jms.xml | 8 -
.../hornetq/server0/activemq-users.xml | 7 -
examples/jms/application-layer-failover/pom.xml | 14 +-
.../ApplicationLayerFailoverExample.java | 9 +-
.../activemq/server0/activemq-configuration.xml | 30 +++
.../resources/activemq/server0/activemq-jms.xml | 8 +
.../activemq/server0/activemq-users.xml | 7 +
.../activemq/server1/activemq-configuration.xml | 31 +++
.../resources/activemq/server1/activemq-jms.xml | 8 +
.../activemq/server1/activemq-users.xml | 7 +
.../hornetq/server0/activemq-configuration.xml | 39 ---
.../resources/hornetq/server0/activemq-jms.xml | 8 -
.../hornetq/server0/activemq-users.xml | 7 -
.../hornetq/server1/activemq-configuration.xml | 40 ---
.../resources/hornetq/server1/activemq-jms.xml | 8 -
.../hornetq/server1/activemq-users.xml | 7 -
examples/jms/bridge/pom.xml | 8 +-
.../activemq/jms/example/BridgeExample.java | 18 +-
.../activemq/server0/activemq-configuration.xml | 67 +++++
.../resources/activemq/server0/activemq-jms.xml | 8 +
.../activemq/server0/activemq-users.xml | 7 +
.../activemq/server1/activemq-configuration.xml | 35 +++
.../resources/activemq/server1/activemq-jms.xml | 8 +
.../activemq/server1/activemq-users.xml | 7 +
.../hornetq/server0/activemq-configuration.xml | 72 ------
.../resources/hornetq/server0/activemq-jms.xml | 8 -
.../hornetq/server0/activemq-users.xml | 7 -
.../hornetq/server1/activemq-configuration.xml | 44 ----
.../resources/hornetq/server1/activemq-jms.xml | 8 -
.../hornetq/server1/activemq-users.xml | 7 -
examples/jms/browser/pom.xml | 2 +-
.../jms/example/QueueBrowserExample.java | 2 +-
.../activemq/server0/activemq-configuration.xml | 34 +++
.../resources/activemq/server0/activemq-jms.xml | 8 +
.../activemq/server0/activemq-users.xml | 7 +
.../hornetq/server0/activemq-configuration.xml | 42 ---
.../resources/hornetq/server0/activemq-jms.xml | 8 -
.../hornetq/server0/activemq-users.xml | 7 -
.../browser/src/main/resources/jndi.properties | 3 +
examples/jms/client-kickoff/pom.xml | 2 +-
.../jms/example/ClientKickoffExample.java | 2 +-
.../activemq/server0/activemq-configuration.xml | 23 ++
.../resources/activemq/server0/activemq-jms.xml | 5 +
.../activemq/server0/activemq-users.xml | 7 +
.../hornetq/server0/activemq-configuration.xml | 30 ---
.../resources/hornetq/server0/activemq-jms.xml | 5 -
.../hornetq/server0/activemq-users.xml | 7 -
.../src/main/resources/jndi.properties | 2 +
.../jms/client-side-failoverlistener/pom.xml | 14 +-
.../client-side-failoverlistener/readme.html | 2 +-
.../ClientSideFailoverListerExample.java | 2 +-
.../activemq/server0/activemq-configuration.xml | 71 +++++
.../resources/activemq/server0/activemq-jms.xml | 8 +
.../activemq/server0/activemq-users.xml | 7 +
.../activemq/server1/activemq-configuration.xml | 71 +++++
.../resources/activemq/server1/activemq-jms.xml | 8 +
.../activemq/server1/activemq-users.xml | 7 +
.../hornetq/server0/activemq-configuration.xml | 71 -----
.../resources/hornetq/server0/activemq-jms.xml | 8 -
.../hornetq/server0/activemq-users.xml | 7 -
.../hornetq/server1/activemq-configuration.xml | 71 -----
.../resources/hornetq/server1/activemq-jms.xml | 8 -
.../hornetq/server1/activemq-users.xml | 7 -
.../src/main/resources/jndi.properties | 7 +
examples/jms/client-side-load-balancing/pom.xml | 28 +-
.../example/ClientSideLoadBalancingExample.java | 2 +-
.../activemq/server0/activemq-configuration.xml | 73 ++++++
.../resources/activemq/server0/activemq-jms.xml | 8 +
.../activemq/server0/activemq-users.xml | 7 +
.../activemq/server1/activemq-configuration.xml | 72 ++++++
.../resources/activemq/server1/activemq-jms.xml | 8 +
.../activemq/server1/activemq-users.xml | 7 +
.../activemq/server2/activemq-configuration.xml | 72 ++++++
.../resources/activemq/server2/activemq-jms.xml | 8 +
.../activemq/server2/activemq-users.xml | 7 +
.../hornetq/server0/activemq-configuration.xml | 73 ------
.../resources/hornetq/server0/activemq-jms.xml | 8 -
.../hornetq/server0/activemq-users.xml | 7 -
.../hornetq/server1/activemq-configuration.xml | 72 ------
.../resources/hornetq/server1/activemq-jms.xml | 8 -
.../hornetq/server1/activemq-users.xml | 7 -
.../hornetq/server2/activemq-configuration.xml | 72 ------
.../resources/hornetq/server2/activemq-jms.xml | 8 -
.../hornetq/server2/activemq-users.xml | 7 -
.../src/main/resources/jndi.properties | 3 +
.../jms/clustered-durable-subscription/pom.xml | 18 +-
.../ClusteredDurableSubscriptionExample.java | 14 +-
.../activemq/server0/activemq-configuration.xml | 75 ++++++
.../resources/activemq/server0/activemq-jms.xml | 8 +
.../activemq/server0/activemq-users.xml | 7 +
.../activemq/server1/activemq-configuration.xml | 76 ++++++
.../resources/activemq/server1/activemq-jms.xml | 8 +
.../activemq/server1/activemq-users.xml | 7 +
.../hornetq/server0/activemq-configuration.xml | 75 ------
.../resources/hornetq/server0/activemq-jms.xml | 8 -
.../hornetq/server0/activemq-users.xml | 7 -
.../hornetq/server1/activemq-configuration.xml | 76 ------
.../resources/hornetq/server1/activemq-jms.xml | 8 -
.../hornetq/server1/activemq-users.xml | 7 -
examples/jms/clustered-grouping/pom.xml | 16 +-
.../jms/example/ClusteredGroupingExample.java | 25 +-
.../activemq/server0/activemq-configuration.xml | 83 ++++++
.../resources/activemq/server0/activemq-jms.xml | 8 +
.../activemq/server0/activemq-users.xml | 7 +
.../activemq/server1/activemq-configuration.xml | 80 ++++++
.../resources/activemq/server1/activemq-jms.xml | 8 +
.../activemq/server1/activemq-users.xml | 7 +
.../activemq/server2/activemq-configuration.xml | 80 ++++++
.../resources/activemq/server2/activemq-jms.xml | 8 +
.../activemq/server2/activemq-users.xml | 7 +
.../hornetq/server0/activemq-configuration.xml | 83 ------
.../resources/hornetq/server0/activemq-jms.xml | 8 -
.../hornetq/server0/activemq-users.xml | 7 -
.../hornetq/server1/activemq-configuration.xml | 80 ------
.../resources/hornetq/server1/activemq-jms.xml | 8 -
.../hornetq/server1/activemq-users.xml | 7 -
.../hornetq/server2/activemq-configuration.xml | 80 ------
.../resources/hornetq/server2/activemq-jms.xml | 8 -
.../hornetq/server2/activemq-users.xml | 7 -
examples/jms/clustered-jgroups/pom.xml | 10 +-
.../jms/example/ClusteredJgroupsExample.java | 13 +-
.../activemq/server0/activemq-configuration.xml | 76 ++++++
.../resources/activemq/server0/activemq-jms.xml | 8 +
.../activemq/server0/activemq-users.xml | 7 +
.../activemq/server0/client-jndi.properties | 2 +
.../activemq/server0/test-jgroups-file_ping.xml | 52 ++++
.../activemq/server1/activemq-configuration.xml | 75 ++++++
.../resources/activemq/server1/activemq-jms.xml | 8 +
.../activemq/server1/activemq-users.xml | 7 +
.../activemq/server1/client-jndi.properties | 2 +
.../activemq/server1/test-jgroups-file_ping.xml | 52 ++++
.../hornetq/server0/activemq-configuration.xml | 76 ------
.../resources/hornetq/server0/activemq-jms.xml | 8 -
.../hornetq/server0/activemq-users.xml | 7 -
.../hornetq/server0/client-jndi.properties | 2 -
.../hornetq/server0/test-jgroups-file_ping.xml | 52 ----
.../hornetq/server1/activemq-configuration.xml | 75 ------
.../resources/hornetq/server1/activemq-jms.xml | 8 -
.../hornetq/server1/activemq-users.xml | 7 -
.../hornetq/server1/client-jndi.properties | 2 -
.../hornetq/server1/test-jgroups-file_ping.xml | 52 ----
examples/jms/clustered-queue/pom.xml | 10 +-
.../jms/example/ClusteredQueueExample.java | 13 +-
.../activemq/server0/activemq-configuration.xml | 74 ++++++
.../resources/activemq/server0/activemq-jms.xml | 8 +
.../activemq/server0/activemq-users.xml | 7 +
.../activemq/server1/activemq-configuration.xml | 75 ++++++
.../resources/activemq/server1/activemq-jms.xml | 8 +
.../activemq/server1/activemq-users.xml | 7 +
.../hornetq/server0/activemq-configuration.xml | 74 ------
.../resources/hornetq/server0/activemq-jms.xml | 8 -
.../hornetq/server0/activemq-users.xml | 7 -
.../hornetq/server1/activemq-configuration.xml | 75 ------
.../resources/hornetq/server1/activemq-jms.xml | 8 -
.../hornetq/server1/activemq-users.xml | 7 -
examples/jms/clustered-standalone/pom.xml | 16 +-
.../jms/example/ClusteredStandaloneExample.java | 39 ++-
.../activemq/server0/activemq-configuration.xml | 74 ++++++
.../resources/activemq/server0/activemq-jms.xml | 8 +
.../activemq/server0/activemq-users.xml | 7 +
.../activemq/server1/activemq-configuration.xml | 75 ++++++
.../resources/activemq/server1/activemq-jms.xml | 8 +
.../activemq/server1/activemq-users.xml | 7 +
.../activemq/server2/activemq-configuration.xml | 75 ++++++
.../resources/activemq/server2/activemq-jms.xml | 8 +
.../activemq/server2/activemq-users.xml | 7 +
.../hornetq/server0/activemq-configuration.xml | 74 ------
.../resources/hornetq/server0/activemq-jms.xml | 8 -
.../hornetq/server0/activemq-users.xml | 7 -
.../hornetq/server1/activemq-configuration.xml | 75 ------
.../resources/hornetq/server1/activemq-jms.xml | 9 -
.../hornetq/server1/activemq-users.xml | 7 -
.../hornetq/server2/activemq-configuration.xml | 75 ------
.../resources/hornetq/server2/activemq-jms.xml | 8 -
.../hornetq/server2/activemq-users.xml | 7 -
examples/jms/clustered-static-discovery/pom.xml | 22 +-
.../example/StaticClusteredQueueExample.java | 10 +-
.../activemq/server0/activemq-configuration.xml | 64 +++++
.../resources/activemq/server0/activemq-jms.xml | 8 +
.../activemq/server0/activemq-users.xml | 7 +
.../activemq/server1/activemq-configuration.xml | 64 +++++
.../resources/activemq/server1/activemq-jms.xml | 8 +
.../activemq/server1/activemq-users.xml | 7 +
.../activemq/server2/activemq-configuration.xml | 81 ++++++
.../resources/activemq/server2/activemq-jms.xml | 25 ++
.../activemq/server2/activemq-users.xml | 7 +
.../activemq/server3/activemq-configuration.xml | 81 ++++++
.../resources/activemq/server3/activemq-jms.xml | 25 ++
.../activemq/server3/activemq-users.xml | 7 +
.../hornetq/server0/activemq-configuration.xml | 64 -----
.../resources/hornetq/server0/activemq-jms.xml | 8 -
.../hornetq/server0/activemq-users.xml | 7 -
.../hornetq/server1/activemq-configuration.xml | 64 -----
.../resources/hornetq/server1/activemq-jms.xml | 8 -
.../hornetq/server1/activemq-users.xml | 7 -
.../hornetq/server2/activemq-configuration.xml | 81 ------
.../resources/hornetq/server2/activemq-jms.xml | 25 --
.../hornetq/server2/activemq-users.xml | 7 -
.../hornetq/server3/activemq-configuration.xml | 81 ------
.../resources/hornetq/server3/activemq-jms.xml | 25 --
.../hornetq/server3/activemq-users.xml | 7 -
examples/jms/clustered-static-oneway/pom.xml | 16 +-
.../jms/example/ClusterStaticOnewayExample.java | 8 +-
.../activemq/server0/activemq-configuration.xml | 81 ++++++
.../resources/activemq/server0/activemq-jms.xml | 8 +
.../activemq/server0/activemq-users.xml | 7 +
.../activemq/server1/activemq-configuration.xml | 81 ++++++
.../resources/activemq/server1/activemq-jms.xml | 8 +
.../activemq/server1/activemq-users.xml | 7 +
.../activemq/server2/activemq-configuration.xml | 73 ++++++
.../resources/activemq/server2/activemq-jms.xml | 25 ++
.../activemq/server2/activemq-users.xml | 7 +
.../hornetq/server0/activemq-configuration.xml | 81 ------
.../resources/hornetq/server0/activemq-jms.xml | 8 -
.../hornetq/server0/activemq-users.xml | 7 -
.../hornetq/server1/activemq-configuration.xml | 81 ------
.../resources/hornetq/server1/activemq-jms.xml | 8 -
.../hornetq/server1/activemq-users.xml | 7 -
.../hornetq/server2/activemq-configuration.xml | 73 ------
.../resources/hornetq/server2/activemq-jms.xml | 25 --
.../hornetq/server2/activemq-users.xml | 7 -
examples/jms/clustered-topic/pom.xml | 10 +-
.../jms/example/ClusteredTopicExample.java | 13 +-
.../activemq/server0/activemq-configuration.xml | 76 ++++++
.../resources/activemq/server0/activemq-jms.xml | 8 +
.../activemq/server0/activemq-users.xml | 7 +
.../activemq/server1/activemq-configuration.xml | 74 ++++++
.../resources/activemq/server1/activemq-jms.xml | 8 +
.../activemq/server1/activemq-users.xml | 7 +
.../hornetq/server0/activemq-configuration.xml | 76 ------
.../resources/hornetq/server0/activemq-jms.xml | 8 -
.../hornetq/server0/activemq-users.xml | 7 -
.../hornetq/server1/activemq-configuration.xml | 74 ------
.../resources/hornetq/server1/activemq-jms.xml | 8 -
.../hornetq/server1/activemq-users.xml | 7 -
.../jms/colocated-failover-scale-down/pom.xml | 10 +-
.../ColocatedFailoverScaleDownExample.java | 18 +-
.../activemq/server0/activemq-configuration.xml | 110 ++++++++
.../resources/activemq/server0/activemq-jms.xml | 8 +
.../activemq/server0/activemq-users.xml | 7 +
.../activemq/server1/activemq-configuration.xml | 111 ++++++++
.../resources/activemq/server1/activemq-jms.xml | 8 +
.../activemq/server1/activemq-users.xml | 7 +
.../hornetq/server0/activemq-configuration.xml | 99 -------
.../resources/hornetq/server0/activemq-jms.xml | 8 -
.../hornetq/server0/activemq-users.xml | 7 -
.../hornetq/server1/activemq-configuration.xml | 100 -------
.../resources/hornetq/server1/activemq-jms.xml | 8 -
.../hornetq/server1/activemq-users.xml | 7 -
examples/jms/colocated-failover/pom.xml | 14 +-
.../jms/example/ColocatedFailoverExample.java | 18 +-
.../activemq/server0/activemq-configuration.xml | 90 +++++++
.../resources/activemq/server0/activemq-jms.xml | 8 +
.../activemq/server0/activemq-users.xml | 7 +
.../activemq/server1/activemq-configuration.xml | 90 +++++++
.../resources/activemq/server1/activemq-jms.xml | 7 +
.../activemq/server1/activemq-users.xml | 7 +
.../hornetq/server0/activemq-configuration.xml | 90 -------
.../resources/hornetq/server0/activemq-jms.xml | 8 -
.../hornetq/server0/activemq-users.xml | 7 -
.../hornetq/server1/activemq-configuration.xml | 90 -------
.../resources/hornetq/server1/activemq-jms.xml | 7 -
.../hornetq/server1/activemq-users.xml | 7 -
examples/jms/consumer-rate-limit/pom.xml | 2 +-
.../jms/example/ConsumerRateLimitExample.java | 2 +-
.../activemq/server0/activemq-configuration.xml | 34 +++
.../resources/activemq/server0/activemq-jms.xml | 8 +
.../activemq/server0/activemq-users.xml | 7 +
.../hornetq/server0/activemq-configuration.xml | 42 ---
.../resources/hornetq/server0/activemq-jms.xml | 8 -
.../hornetq/server0/activemq-users.xml | 7 -
.../hornetq/server0/client-jndi.properties | 2 -
.../src/main/resources/jndi.properties | 4 +
examples/jms/dead-letter/pom.xml | 2 +-
.../activemq/jms/example/DeadLetterExample.java | 2 +-
.../activemq/server0/activemq-configuration.xml | 42 +++
.../resources/activemq/server0/activemq-jms.xml | 11 +
.../activemq/server0/activemq-users.xml | 7 +
.../hornetq/server0/activemq-configuration.xml | 50 ----
.../resources/hornetq/server0/activemq-jms.xml | 11 -
.../hornetq/server0/activemq-users.xml | 7 -
.../hornetq/server0/client-jndi.properties | 2 -
.../src/main/resources/jndi.properties | 4 +
examples/jms/delayed-redelivery/pom.xml | 2 +-
.../jms/example/DelayedRedeliveryExample.java | 2 +-
.../activemq/server0/activemq-configuration.xml | 41 +++
.../resources/activemq/server0/activemq-jms.xml | 11 +
.../activemq/server0/activemq-users.xml | 7 +
.../hornetq/server0/activemq-configuration.xml | 49 ----
.../resources/hornetq/server0/activemq-jms.xml | 11 -
.../hornetq/server0/activemq-users.xml | 7 -
.../hornetq/server0/client-jndi.properties | 2 -
.../src/main/resources/jndi.properties | 3 +
examples/jms/divert/pom.xml | 10 +-
.../activemq/jms/example/DivertExample.java | 16 +-
.../activemq/server0/activemq-configuration.xml | 90 +++++++
.../resources/activemq/server0/activemq-jms.xml | 18 ++
.../activemq/server0/activemq-users.xml | 7 +
.../activemq/server1/activemq-configuration.xml | 36 +++
.../resources/activemq/server1/activemq-jms.xml | 11 +
.../activemq/server1/activemq-users.xml | 7 +
.../hornetq/server0/activemq-configuration.xml | 96 -------
.../resources/hornetq/server0/activemq-jms.xml | 18 --
.../hornetq/server0/activemq-users.xml | 7 -
.../hornetq/server1/activemq-configuration.xml | 45 ----
.../resources/hornetq/server1/activemq-jms.xml | 11 -
.../hornetq/server1/activemq-users.xml | 7 -
examples/jms/durable-subscription/pom.xml | 2 +-
.../jms/example/DurableSubscriptionExample.java | 2 +-
.../activemq/server0/activemq-configuration.xml | 36 +++
.../resources/activemq/server0/activemq-jms.xml | 8 +
.../activemq/server0/activemq-users.xml | 7 +
.../hornetq/server0/activemq-configuration.xml | 44 ----
.../resources/hornetq/server0/activemq-jms.xml | 8 -
.../hornetq/server0/activemq-users.xml | 7 -
.../hornetq/server0/client-jndi.properties | 2 -
.../src/main/resources/jndi.properties | 3 +
examples/jms/embedded-simple/pom.xml | 2 +-
.../activemq/jms/example/EmbeddedExample.java | 9 +
.../main/resources/activemq-configuration.xml | 7 -
.../activemq/jms/example/EmbeddedExample.java | 12 +-
examples/jms/expiry/pom.xml | 2 +-
.../activemq/jms/example/ExpiryExample.java | 2 +-
.../activemq/server0/activemq-configuration.xml | 41 +++
.../resources/activemq/server0/activemq-jms.xml | 11 +
.../activemq/server0/activemq-users.xml | 7 +
.../hornetq/server0/activemq-configuration.xml | 50 ----
.../resources/hornetq/server0/activemq-jms.xml | 11 -
.../hornetq/server0/activemq-users.xml | 7 -
.../expiry/src/main/resources/jndi.properties | 4 +
examples/jms/ha-policy-autobackup/pom.xml | 8 +-
.../jms/example/HAPolicyAutoBackupExample.java | 22 +-
.../activemq/server0/activemq-configuration.xml | 93 +++++++
.../resources/activemq/server0/activemq-jms.xml | 8 +
.../activemq/server0/activemq-users.xml | 7 +
.../activemq/server1/activemq-configuration.xml | 93 +++++++
.../resources/activemq/server1/activemq-jms.xml | 8 +
.../activemq/server1/activemq-users.xml | 7 +
.../hornetq/server0/activemq-configuration.xml | 93 -------
.../resources/hornetq/server0/activemq-jms.xml | 8 -
.../hornetq/server0/activemq-users.xml | 7 -
.../hornetq/server1/activemq-configuration.xml | 93 -------
.../hornetq/server1/activemq-users.xml | 7 -
examples/jms/http-transport/pom.xml | 2 +-
.../jms/example/HttpTransportExample.java | 2 +-
.../activemq/server0/activemq-configuration.xml | 36 +++
.../resources/activemq/server0/activemq-jms.xml | 8 +
.../activemq/server0/activemq-users.xml | 7 +
.../hornetq/server0/activemq-configuration.xml | 46 ----
.../resources/hornetq/server0/activemq-jms.xml | 8 -
.../hornetq/server0/activemq-users.xml | 7 -
.../src/main/resources/jndi.properties | 3 +
.../jms/instantiate-connection-factory/pom.xml | 2 +-
.../activemq/server0/activemq-configuration.xml | 35 +++
.../resources/activemq/server0/activemq-jms.xml | 8 +
.../activemq/server0/activemq-users.xml | 7 +
.../hornetq/server0/activemq-configuration.xml | 45 ----
.../resources/hornetq/server0/activemq-jms.xml | 10 -
.../hornetq/server0/activemq-users.xml | 7 -
examples/jms/interceptor/pom.xml | 2 +-
.../jms/example/InterceptorExample.java | 2 +-
.../activemq/server0/activemq-configuration.xml | 39 +++
.../resources/activemq/server0/activemq-jms.xml | 8 +
.../activemq/server0/activemq-users.xml | 7 +
.../hornetq/server0/activemq-configuration.xml | 47 ----
.../resources/hornetq/server0/activemq-jms.xml | 8 -
.../hornetq/server0/activemq-users.xml | 7 -
.../src/main/resources/jndi.properties | 3 +
examples/jms/jaas/pom.xml | 3 +-
.../activemq/jms/example/JAASExample.java | 2 +-
.../activemq/server0/activemq-configuration.xml | 34 +++
.../resources/activemq/server0/activemq-jms.xml | 8 +
.../hornetq/server0/activemq-configuration.xml | 43 ----
.../resources/hornetq/server0/activemq-jms.xml | 8 -
.../jms/jaas/src/main/resources/jndi.properties | 3 +
examples/jms/jms-auto-closeable/pom.xml | 5 +-
.../jms/example/JMSAutoCloseableExample.java | 2 +-
.../activemq/server0/activemq-configuration.xml | 33 +++
.../resources/activemq/server0/activemq-jms.xml | 8 +
.../activemq/server0/activemq-users.xml | 7 +
.../hornetq/server0/activemq-configuration.xml | 42 ---
.../resources/hornetq/server0/activemq-jms.xml | 8 -
.../hornetq/server0/activemq-users.xml | 7 -
.../src/main/resources/jndi.properties | 3 +
examples/jms/jms-bridge/pom.xml | 10 +-
.../activemq/jms/example/JMSBridgeExample.java | 12 +-
.../activemq/server0/activemq-configuration.xml | 28 ++
.../resources/activemq/server0/activemq-jms.xml | 7 +
.../activemq/server0/activemq-users.xml | 7 +
.../activemq/server1/activemq-configuration.xml | 31 +++
.../resources/activemq/server1/activemq-jms.xml | 7 +
.../activemq/server1/activemq-users.xml | 7 +
.../hornetq/server0/activemq-configuration.xml | 35 ---
.../resources/hornetq/server0/activemq-jms.xml | 7 -
.../resources/hornetq/server0/hornetq-users.xml | 7 -
.../hornetq/server1/activemq-configuration.xml | 42 ---
.../resources/hornetq/server1/activemq-jms.xml | 7 -
.../hornetq/server1/activemq-users.xml | 7 -
examples/jms/jms-completion-listener/pom.xml | 5 +-
.../example/JMSCompletionListenerExample.java | 2 +-
.../activemq/server0/activemq-configuration.xml | 34 +++
.../resources/activemq/server0/activemq-jms.xml | 8 +
.../activemq/server0/activemq-users.xml | 7 +
.../hornetq/server0/activemq-configuration.xml | 43 ----
.../resources/hornetq/server0/activemq-jms.xml | 8 -
.../hornetq/server0/activemq-users.xml | 7 -
.../src/main/resources/jndi.properties | 3 +
examples/jms/jms-context/pom.xml | 5 +-
.../activemq/jms/example/JMSContextExample.java | 2 +-
.../activemq/server0/activemq-configuration.xml | 34 +++
.../resources/activemq/server0/activemq-jms.xml | 8 +
.../activemq/server0/activemq-users.xml | 7 +
.../hornetq/server0/activemq-configuration.xml | 43 ----
.../hornetq/server0/activemq-users.xml | 7 -
.../src/main/resources/jndi.properties | 3 +
examples/jms/jms-shared-consumer/pom.xml | 2 +-
.../jms/example/JMSSharedConsumerExample.java | 2 +-
.../activemq/server0/activemq-configuration.xml | 34 +++
.../resources/activemq/server0/activemq-jms.xml | 8 +
.../activemq/server0/activemq-users.xml | 7 +
.../hornetq/server0/activemq-configuration.xml | 43 ----
.../resources/hornetq/server0/activemq-jms.xml | 8 -
.../hornetq/server0/activemq-users.xml | 7 -
.../src/main/resources/jndi.properties | 3 +
examples/jms/jmx/pom.xml | 5 +-
.../apache/activemq/jms/example/JMXExample.java | 2 +-
.../activemq/server0/activemq-configuration.xml | 38 +++
.../resources/activemq/server0/activemq-jms.xml | 8 +
.../activemq/server0/activemq-users.xml | 7 +
.../hornetq/server0/activemq-configuration.xml | 45 ----
.../resources/hornetq/server0/activemq-jms.xml | 9 -
.../hornetq/server0/activemq-users.xml | 7 -
.../jms/jmx/src/main/resources/jndi.properties | 3 +
examples/jms/large-message/pom.xml | 5 +-
.../jms/example/LargeMessageExample.java | 8 +-
.../activemq/server0/activemq-configuration.xml | 34 +++
.../resources/activemq/server0/activemq-jms.xml | 8 +
.../activemq/server0/activemq-users.xml | 7 +
.../hornetq/server0/activemq-configuration.xml | 42 ---
.../resources/hornetq/server0/activemq-jms.xml | 8 -
.../hornetq/server0/activemq-users.xml | 7 -
.../src/main/resources/jndi.properties | 3 +
examples/jms/last-value-queue/pom.xml | 5 +-
.../jms/example/LastValueQueueExample.java | 2 +-
.../activemq/server0/activemq-configuration.xml | 41 +++
.../resources/activemq/server0/activemq-jms.xml | 8 +
.../activemq/server0/activemq-users.xml | 7 +
.../hornetq/server0/activemq-configuration.xml | 50 ----
.../resources/hornetq/server0/activemq-jms.xml | 8 -
.../hornetq/server0/activemq-users.xml | 7 -
.../src/main/resources/jndi.properties | 3 +
examples/jms/management-notifications/pom.xml | 5 +-
.../example/ManagementNotificationExample.java | 2 +-
.../activemq/server0/activemq-configuration.xml | 52 ++++
.../resources/activemq/server0/activemq-jms.xml | 11 +
.../activemq/server0/activemq-users.xml | 7 +
.../hornetq/server0/activemq-configuration.xml | 58 -----
.../resources/hornetq/server0/activemq-jms.xml | 11 -
.../hornetq/server0/activemq-users.xml | 7 -
.../src/main/resources/jndi.properties | 4 +
examples/jms/management/pom.xml | 5 +-
.../activemq/jms/example/ManagementExample.java | 2 +-
.../activemq/server0/activemq-configuration.xml | 50 ++++
.../resources/activemq/server0/activemq-jms.xml | 8 +
.../activemq/server0/activemq-users.xml | 7 +
.../hornetq/server0/activemq-configuration.xml | 56 ----
.../resources/hornetq/server0/activemq-jms.xml | 8 -
.../hornetq/server0/activemq-users.xml | 7 -
.../src/main/resources/jndi.properties | 3 +
examples/jms/message-counters/pom.xml | 5 +-
.../jms/example/MessageCounterExample.java | 2 +-
.../activemq/server0/activemq-configuration.xml | 57 ++++
.../resources/activemq/server0/activemq-jms.xml | 11 +
.../activemq/server0/activemq-users.xml | 7 +
.../hornetq/server0/activemq-configuration.xml | 64 -----
.../resources/hornetq/server0/activemq-jms.xml | 11 -
.../hornetq/server0/activemq-users.xml | 7 -
.../src/main/resources/jndi.properties | 4 +
examples/jms/message-group/pom.xml | 5 +-
.../jms/example/MessageGroupExample.java | 2 +-
.../activemq/server0/activemq-configuration.xml | 34 +++
.../resources/activemq/server0/activemq-jms.xml | 8 +
.../activemq/server0/activemq-users.xml | 7 +
.../hornetq/server0/activemq-configuration.xml | 42 ---
.../hornetq/server0/activemq-users.xml | 7 -
.../resources/hornetq/server0/hornetq-jms.xml | 8 -
.../src/main/resources/jndi.properties | 3 +
examples/jms/message-group2/pom.xml | 5 +-
.../jms/example/MessageGroup2Example.java | 2 +-
.../activemq/server0/activemq-configuration.xml | 34 +++
.../resources/activemq/server0/activemq-jms.xml | 8 +
.../activemq/server0/activemq-users.xml | 7 +
.../hornetq/server0/activemq-configuration.xml | 42 ---
.../resources/hornetq/server0/activemq-jms.xml | 8 -
.../hornetq/server0/activemq-users.xml | 7 -
.../src/main/resources/jndi.properties | 4 +
examples/jms/message-priority/pom.xml | 5 +-
.../jms/example/MessagePriorityExample.java | 2 +-
.../activemq/server0/activemq-configuration.xml | 34 +++
.../resources/activemq/server0/activemq-jms.xml | 8 +
.../activemq/server0/activemq-users.xml | 7 +
.../hornetq/server0/activemq-configuration.xml | 42 ---
.../resources/hornetq/server0/activemq-jms.xml | 8 -
.../hornetq/server0/activemq-users.xml | 7 -
.../src/main/resources/jndi.properties | 3 +
examples/jms/multiple-failover-failback/pom.xml | 21 +-
.../MultipleFailoverFailbackExample.java | 2 +-
.../activemq/server0/activemq-configuration.xml | 71 +++++
.../resources/activemq/server0/activemq-jms.xml | 8 +
.../activemq/server0/activemq-users.xml | 7 +
.../activemq/server1/activemq-configuration.xml | 71 +++++
.../resources/activemq/server1/activemq-jms.xml | 8 +
.../activemq/server1/activemq-users.xml | 7 +
.../activemq/server2/activemq-configuration.xml | 72 ++++++
.../resources/activemq/server2/activemq-jms.xml | 8 +
.../activemq/server2/activemq-users.xml | 7 +
.../hornetq/server0/activemq-configuration.xml | 71 -----
.../resources/hornetq/server0/activemq-jms.xml | 8 -
.../hornetq/server0/activemq-users.xml | 7 -
.../hornetq/server1/activemq-configuration.xml | 71 -----
.../resources/hornetq/server1/activemq-jms.xml | 8 -
.../hornetq/server1/activemq-users.xml | 7 -
.../hornetq/server2/activemq-configuration.xml | 72 ------
.../resources/hornetq/server2/activemq-jms.xml | 8 -
.../hornetq/server2/activemq-users.xml | 7 -
.../src/main/resources/jndi.properties | 7 +
examples/jms/multiple-failover/pom.xml | 21 +-
.../jms/example/MultipleFailoverExample.java | 3 +-
.../activemq/server0/activemq-configuration.xml | 73 ++++++
.../resources/activemq/server0/activemq-jms.xml | 8 +
.../activemq/server0/activemq-users.xml | 7 +
.../activemq/server1/activemq-configuration.xml | 71 +++++
.../resources/activemq/server1/activemq-jms.xml | 8 +
.../activemq/server1/activemq-users.xml | 7 +
.../activemq/server2/activemq-configuration.xml | 71 +++++
.../resources/activemq/server2/activemq-jms.xml | 8 +
.../activemq/server2/activemq-users.xml | 7 +
.../hornetq/server0/activemq-configuration.xml | 73 ------
.../resources/hornetq/server0/activemq-jms.xml | 8 -
.../hornetq/server0/activemq-users.xml | 7 -
.../hornetq/server1/activemq-configuration.xml | 71 -----
.../resources/hornetq/server1/activemq-jms.xml | 8 -
.../hornetq/server1/activemq-users.xml | 7 -
.../hornetq/server2/activemq-configuration.xml | 71 -----
.../resources/hornetq/server2/activemq-jms.xml | 8 -
.../hornetq/server2/activemq-users.xml | 7 -
.../src/main/resources/jndi.properties | 7 +
examples/jms/no-consumer-buffering/pom.xml | 5 +-
.../jms/example/NoConsumerBufferingExample.java | 2 +-
.../activemq/server0/activemq-configuration.xml | 34 +++
.../resources/activemq/server0/activemq-jms.xml | 8 +
.../activemq/server0/activemq-users.xml | 7 +
.../hornetq/server0/activemq-configuration.xml | 43 ----
.../resources/hornetq/server0/activemq-jms.xml | 8 -
.../hornetq/server0/activemq-users.xml | 7 -
.../src/main/resources/jndi.properties | 4 +
examples/jms/non-transaction-failover/pom.xml | 20 +-
.../example/NonTransactionFailoverExample.java | 2 +-
.../activemq/server0/activemq-configuration.xml | 71 +++++
.../resources/activemq/server0/activemq-jms.xml | 8 +
.../activemq/server0/activemq-users.xml | 7 +
.../activemq/server1/activemq-configuration.xml | 72 ++++++
.../resources/activemq/server1/activemq-jms.xml | 8 +
.../activemq/server1/activemq-users.xml | 7 +
.../hornetq/server0/activemq-configuration.xml | 71 -----
.../resources/hornetq/server0/activemq-jms.xml | 8 -
.../hornetq/server0/activemq-users.xml | 7 -
.../hornetq/server1/activemq-configuration.xml | 72 ------
.../resources/hornetq/server1/activemq-jms.xml | 8 -
.../hornetq/server1/activemq-users.xml | 7 -
.../src/main/resources/jndi.properties | 7 +
examples/jms/openwire/pom.xml | 5 +-
.../activemq/server0/activemq-configuration.xml | 50 ++++
.../resources/activemq/server0/activemq-jms.xml | 8 +
.../activemq/server0/activemq-users.xml | 7 +
.../hornetq/server0/activemq-configuration.xml | 50 ----
.../resources/hornetq/server0/activemq-jms.xml | 8 -
.../hornetq/server0/activemq-users.xml | 7 -
examples/jms/paging/pom.xml | 5 +-
.../activemq/jms/example/PagingExample.java | 4 +-
.../activemq/server0/activemq-configuration.xml | 67 +++++
.../resources/activemq/server0/activemq-jms.xml | 10 +
.../activemq/server0/activemq-users.xml | 7 +
.../hornetq/server0/activemq-configuration.xml | 67 -----
.../resources/hornetq/server0/activemq-jms.xml | 10 -
.../hornetq/server0/activemq-users.xml | 7 -
.../paging/src/main/resources/jndi.properties | 4 +
examples/jms/perf/pom.xml | 4 +-
.../apache/activemq/jms/example/PerfBase.java | 48 +---
.../activemq/jms/example/PerfListener.java | 10 +-
.../apache/activemq/jms/example/PerfSender.java | 10 +-
.../activemq/server0/activemq-configuration.xml | 24 ++
.../resources/activemq/server0/activemq-jms.xml | 7 +
.../src/main/resources/client.jndi.properties | 2 -
.../hornetq/server0/activemq-configuration.xml | 34 ---
.../resources/hornetq/server0/activemq-jms.xml | 7 -
.../hornetq-configuration-messaging-lab.xml | 32 ---
.../jms/perf/src/main/resources/jndi.properties | 3 +
.../jms/perf/src/main/resources/perf.properties | 2 +-
examples/jms/pre-acknowledge/pom.xml | 2 +-
.../jms/example/PreacknowledgeExample.java | 2 +-
.../activemq/server0/activemq-configuration.xml | 37 +++
.../resources/activemq/server0/activemq-jms.xml | 8 +
.../activemq/server0/activemq-users.xml | 7 +
.../hornetq/server0/activemq-configuration.xml | 46 ----
.../resources/hornetq/server0/activemq-jms.xml | 8 -
.../hornetq/server0/activemq-users.xml | 7 -
.../src/main/resources/jndi.properties | 3 +
examples/jms/producer-rate-limit/pom.xml | 5 +-
.../jms/example/ProducerRateLimitExample.java | 2 +-
.../activemq/server0/activemq-configuration.xml | 34 +++
.../resources/activemq/server0/activemq-jms.xml | 8 +
.../activemq/server0/activemq-users.xml | 7 +
.../hornetq/server0/activemq-configuration.xml | 43 ----
.../resources/hornetq/server0/activemq-jms.xml | 8 -
.../hornetq/server0/activemq-users.xml | 7 -
.../src/main/resources/jndi.properties | 4 +
examples/jms/proton-cpp/pom.xml | 4 +-
.../activemq/server0/activemq-configuration.xml | 35 +++
.../resources/activemq/server0/activemq-jms.xml | 10 +
.../activemq/server0/activemq-users.xml | 7 +
.../hornetq/server0/activemq-configuration.xml | 35 ---
.../resources/hornetq/server0/activemq-jms.xml | 10 -
.../hornetq/server0/activemq-users.xml | 7 -
examples/jms/proton-j/pom.xml | 2 +-
.../activemq/server0/activemq-configuration.xml | 42 +++
.../resources/activemq/server0/activemq-jms.xml | 10 +
.../activemq/server0/activemq-users.xml | 7 +
.../hornetq/server0/activemq-configuration.xml | 42 ---
.../resources/hornetq/server0/activemq-jms.xml | 10 -
.../hornetq/server0/activemq-users.xml | 7 -
examples/jms/proton-ruby/pom.xml | 2 +-
.../activemq/server0/activemq-configuration.xml | 41 +++
.../resources/activemq/server0/activemq-jms.xml | 9 +
.../activemq/server0/activemq-users.xml | 7 +
.../hornetq/server0/activemq-configuration.xml | 41 ---
.../resources/hornetq/server0/activemq-jms.xml | 9 -
.../hornetq/server0/activemq-users.xml | 7 -
.../jms/queue-message-redistribution/pom.xml | 10 +-
.../QueueMessageRedistributionExample.java | 13 +-
.../activemq/server0/activemq-configuration.xml | 86 +++++++
.../resources/activemq/server0/activemq-jms.xml | 8 +
.../activemq/server0/activemq-users.xml | 7 +
.../activemq/server1/activemq-configuration.xml | 87 +++++++
.../resources/activemq/server1/activemq-jms.xml | 8 +
.../activemq/server1/activemq-users.xml | 7 +
.../hornetq/server0/activemq-configuration.xml | 86 -------
.../resources/hornetq/server0/activemq-jms.xml | 8 -
.../hornetq/server0/activemq-users.xml | 7 -
.../hornetq/server1/activemq-configuration.xml | 87 -------
.../resources/hornetq/server1/activemq-jms.xml | 8 -
.../hornetq/server1/activemq-users.xml | 7 -
examples/jms/queue-requestor/pom.xml | 5 +-
.../jms/example/QueueRequestorExample.java | 2 +-
.../activemq/server0/activemq-configuration.xml | 41 +++
.../resources/activemq/server0/activemq-jms.xml | 8 +
.../activemq/server0/activemq-users.xml | 7 +
.../hornetq/server0/activemq-configuration.xml | 50 ----
.../resources/hornetq/server0/activemq-jms.xml | 8 -
.../hornetq/server0/activemq-users.xml | 7 -
.../src/main/resources/jndi.properties | 3 +
examples/jms/queue-selector/pom.xml | 5 +-
.../jms/example/QueueSelectorExample.java | 2 +-
.../activemq/server0/activemq-configuration.xml | 33 +++
.../resources/activemq/server0/activemq-jms.xml | 8 +
.../activemq/server0/activemq-users.xml | 7 +
.../hornetq/server0/activemq-configuration.xml | 41 ---
.../resources/hornetq/server0/activemq-jms.xml | 8 -
.../hornetq/server0/activemq-users.xml | 7 -
.../src/main/resources/jndi.properties | 3 +
examples/jms/queue/pom.xml | 6 +-
.../activemq/jms/example/QueueExample.java | 2 +-
.../activemq/server0/activemq-configuration.xml | 34 +++
.../resources/activemq/server0/activemq-jms.xml | 8 +
.../activemq/server0/activemq-users.xml | 7 +
.../hornetq/server0/activemq-configuration.xml | 43 ----
.../resources/hornetq/server0/activemq-jms.xml | 8 -
.../hornetq/server0/activemq-users.xml | 7 -
.../queue/src/main/resources/jndi.properties | 3 +
examples/jms/reattach-node/pom.xml | 7 +-
.../activemq/jms/example/ReattachExample.java | 24 +-
.../activemq/server0/activemq-configuration.xml | 66 +++++
.../resources/activemq/server0/activemq-jms.xml | 8 +
.../activemq/server0/activemq-users.xml | 11 +
.../hornetq/server0/activemq-configuration.xml | 66 -----
.../resources/hornetq/server0/activemq-jms.xml | 8 -
.../hornetq/server0/activemq-users.xml | 11 -
.../src/main/resources/jndi.properties | 8 +
examples/jms/replicated-failback-static/pom.xml | 14 +-
.../ReplicatedFailbackStaticExample.java | 4 +-
.../activemq/server0/activemq-configuration.xml | 68 +++++
.../resources/activemq/server0/activemq-jms.xml | 8 +
.../activemq/server0/activemq-users.xml | 7 +
.../activemq/server1/activemq-configuration.xml | 70 +++++
.../resources/activemq/server1/activemq-jms.xml | 8 +
.../activemq/server1/activemq-users.xml | 7 +
.../hornetq/server0/activemq-configuration.xml | 69 -----
.../resources/hornetq/server0/activemq-jms.xml | 8 -
.../hornetq/server0/activemq-users.xml | 7 -
.../hornetq/server1/activemq-configuration.xml | 70 -----
.../resources/hornetq/server1/activemq-jms.xml | 8 -
.../hornetq/server1/activemq-users.xml | 7 -
.../src/main/resources/jndi.properties | 7 +
examples/jms/replicated-failback/pom.xml | 14 +-
.../jms/example/ReplicatedFailbackExample.java | 4 +-
.../activemq/server0/activemq-configuration.xml | 79 ++++++
.../resources/activemq/server0/activemq-jms.xml | 8 +
.../activemq/server0/activemq-users.xml | 7 +
.../activemq/server1/activemq-configuration.xml | 83 ++++++
.../resources/activemq/server1/activemq-jms.xml | 8 +
.../activemq/server1/activemq-users.xml | 7 +
.../hornetq/server0/activemq-configuration.xml | 80 ------
.../resources/hornetq/server0/activemq-jms.xml | 8 -
.../hornetq/server0/activemq-users.xml | 7 -
.../hornetq/server1/activemq-configuration.xml | 83 ------
.../resources/hornetq/server1/activemq-jms.xml | 8 -
.../hornetq/server1/activemq-users.xml | 7 -
.../src/main/resources/jndi.properties | 7 +
.../jms/replicated-multiple-failover/pom.xml | 21 +-
.../ReplicatedMultipleFailoverExample.java | 6 +-
.../activemq/server0/activemq-configuration.xml | 73 ++++++
.../resources/activemq/server0/activemq-jms.xml | 8 +
.../activemq/server0/activemq-users.xml | 7 +
.../activemq/server1/activemq-configuration.xml | 73 ++++++
.../resources/activemq/server1/activemq-jms.xml | 8 +
.../activemq/server1/activemq-users.xml | 7 +
.../activemq/server2/activemq-configuration.xml | 72 ++++++
.../resources/activemq/server2/activemq-jms.xml | 8 +
.../activemq/server2/activemq-users.xml | 7 +
.../hornetq/server0/activemq-configuration.xml | 73 ------
.../resources/hornetq/server0/activemq-jms.xml | 8 -
.../hornetq/server0/activemq-users.xml | 7 -
.../hornetq/server1/activemq-configuration.xml | 77 ------
.../resources/hornetq/server1/activemq-jms.xml | 8 -
.../hornetq/server1/activemq-users.xml | 7 -
.../hornetq/server2/activemq-configuration.xml | 76 ------
.../resources/hornetq/server2/activemq-jms.xml | 8 -
.../hornetq/server2/activemq-users.xml | 7 -
.../src/main/resources/jndi.properties | 7 +
.../jms/replicated-transaction-failover/pom.xml | 14 +-
.../ReplicatedTransactionFailoverExample.java | 4 +-
.../activemq/server0/activemq-configuration.xml | 74 ++++++
.../resources/activemq/server0/activemq-jms.xml | 8 +
.../activemq/server0/activemq-users.xml | 7 +
.../activemq/server1/activemq-configuration.xml | 75 ++++++
.../resources/activemq/server1/activemq-jms.xml | 8 +
.../activemq/server1/activemq-users.xml | 7 +
.../hornetq/server0/activemq-configuration.xml | 74 ------
.../resources/hornetq/server0/activemq-jms.xml | 8 -
.../hornetq/server0/activemq-users.xml | 7 -
.../hornetq/server1/activemq-configuration.xml | 79 ------
.../resources/hornetq/server1/activemq-jms.xml | 8 -
.../hornetq/server1/activemq-users.xml | 7 -
.../src/main/resources/jndi.properties | 7 +
examples/jms/request-reply/pom.xml | 5 +-
.../jms/example/RequestReplyExample.java | 4 +-
.../activemq/server0/activemq-configuration.xml | 41 +++
.../resources/activemq/server0/activemq-jms.xml | 8 +
.../activemq/server0/activemq-users.xml | 7 +
.../hornetq/server0/activemq-configuration.xml | 49 ----
.../resources/hornetq/server0/activemq-jms.xml | 8 -
.../hornetq/server0/activemq-users.xml | 7 -
.../src/main/resources/jndi.properties | 7 +
.../src/main/resources/activemq-client.xml | 12 +
.../src/main/resources/activemq-rest.xml | 3 +
.../src/main/resources/hornetq-client.xml | 12 -
.../src/main/resources/hornetq-rest.xml | 3 -
.../src/main/resources/activemq-client.xml | 12 +
.../src/main/resources/hornetq-client.xml | 12 -
.../push/src/main/resources/activemq-client.xml | 12 +
.../push/src/main/resources/hornetq-client.xml | 12 -
examples/jms/scale-down/pom.xml | 14 +-
.../activemq/jms/example/ScaleDownExample.java | 26 +-
.../activemq/server0/activemq-configuration.xml | 96 +++++++
.../resources/activemq/server0/activemq-jms.xml | 8 +
.../activemq/server0/activemq-users.xml | 7 +
.../activemq/server1/activemq-configuration.xml | 91 +++++++
.../resources/activemq/server1/activemq-jms.xml | 8 +
.../activemq/server1/activemq-users.xml | 7 +
.../hornetq/server0/activemq-configuration.xml | 100 -------
.../resources/hornetq/server0/activemq-jms.xml | 8 -
.../hornetq/server0/activemq-users.xml | 7 -
.../hornetq/server1/activemq-configuration.xml | 91 -------
.../resources/hornetq/server1/activemq-jms.xml | 8 -
.../hornetq/server1/activemq-users.xml | 7 -
examples/jms/scheduled-message/pom.xml | 5 +-
.../jms/example/ScheduledMessageExample.java | 2 +-
.../activemq/server0/activemq-configuration.xml | 34 +++
.../resources/activemq/server0/activemq-jms.xml | 8 +
.../activemq/server0/activemq-users.xml | 7 +
.../hornetq/server0/activemq-configuration.xml | 42 ---
.../resources/hornetq/server0/activemq-jms.xml | 8 -
.../hornetq/server0/activemq-users.xml | 7 -
.../src/main/resources/jndi.properties | 3 +
examples/jms/security/pom.xml | 5 +-
.../activemq/jms/example/SecurityExample.java | 2 +-
.../activemq/server0/activemq-configuration.xml | 52 ++++
.../resources/activemq/server0/activemq-jms.xml | 11 +
.../activemq/server0/activemq-users.xml | 25 ++
.../hornetq/server0/activemq-configuration.xml | 60 -----
.../resources/hornetq/server0/activemq-jms.xml | 11 -
.../hornetq/server0/activemq-users.xml | 25 --
.../security/src/main/resources/jndi.properties | 5 +
examples/jms/send-acknowledgements/pom.xml | 5 +-
.../example/SendAcknowledgementsExample.java | 2 +-
.../activemq/server0/activemq-configuration.xml | 34 +++
.../resources/activemq/server0/activemq-jms.xml | 8 +
.../activemq/server0/activemq-users.xml | 7 +
.../hornetq/server0/activemq-configuration.xml | 43 ----
.../resources/hornetq/server0/activemq-jms.xml | 8 -
.../hornetq/server0/activemq-users.xml | 7 -
.../src/main/resources/jndi.properties | 4 +
examples/jms/spring-integration/pom.xml | 5 +-
.../main/resources/activemq-configuration.xml | 7 -
.../src/main/resources/spring-jms-beans.xml | 38 ++-
examples/jms/ssl-enabled/pom.xml | 5 +-
.../apache/activemq/jms/example/SSLExample.java | 2 +-
.../activemq/server0/activemq-configuration.xml | 39 +++
.../resources/activemq/server0/activemq-jms.xml | 8 +
.../activemq/server0/activemq-users.xml | 7 +
.../activemq/server0/activemq.example.keystore | Bin 0 -> 1273 bytes
.../server0/activemq.example.truststore | Bin 0 -> 866 bytes
.../hornetq/server0/activemq-configuration.xml | 53 ----
.../resources/hornetq/server0/activemq-jms.xml | 8 -
.../hornetq/server0/activemq-users.xml | 7 -
.../hornetq/server0/hornetq.example.keystore | Bin 1259 -> 0 bytes
.../hornetq/server0/hornetq.example.truststore | Bin 852 -> 0 bytes
.../src/main/resources/jndi.properties | 3 +
examples/jms/static-selector-jms/pom.xml | 2 +-
.../jms/example/StaticSelectorJMSExample.java | 7 +-
.../activemq/server0/activemq-configuration.xml | 34 +++
.../resources/activemq/server0/activemq-jms.xml | 10 +
.../activemq/server0/activemq-users.xml | 7 +
.../hornetq/server0/activemq-configuration.xml | 42 ---
.../resources/hornetq/server0/activemq-jms.xml | 10 -
.../hornetq/server0/activemq-users.xml | 7 -
.../src/main/resources/jndi.properties | 3 +
examples/jms/static-selector/pom.xml | 5 +-
examples/jms/static-selector/readme.html | 2 +-
.../jms/example/StaticSelectorExample.java | 7 +-
.../activemq/server0/activemq-configuration.xml | 41 +++
.../resources/activemq/server0/activemq-jms.xml | 8 +
.../activemq/server0/activemq-users.xml | 7 +
.../hornetq/server0/activemq-configuration.xml | 49 ----
.../resources/hornetq/server0/activemq-jms.xml | 8 -
.../hornetq/server0/activemq-users.xml | 7 -
.../src/main/resources/jndi.properties | 3 +
examples/jms/stomp-websockets/pom.xml | 4 +-
.../jms/example/StompWebSocketExample.java | 2 +-
.../activemq/server0/activemq-configuration.xml | 41 +++
.../resources/activemq/server0/activemq-jms.xml | 8 +
.../activemq/server0/activemq-users.xml | 7 +
.../hornetq/server0/activemq-configuration.xml | 49 ----
.../resources/hornetq/server0/activemq-jms.xml | 8 -
.../hornetq/server0/activemq-users.xml | 7 -
.../src/main/resources/jndi.properties | 3 +
examples/jms/stomp/pom.xml | 5 +-
.../activemq/jms/example/StompExample.java | 2 +-
.../activemq/server0/activemq-configuration.xml | 42 +++
.../resources/activemq/server0/activemq-jms.xml | 8 +
.../activemq/server0/activemq-users.xml | 7 +
.../hornetq/server0/activemq-configuration.xml | 51 ----
.../resources/hornetq/server0/activemq-jms.xml | 8 -
.../hornetq/server0/activemq-users.xml | 7 -
.../stomp/src/main/resources/jndi.properties | 3 +
examples/jms/stomp1.1/pom.xml | 5 +-
.../activemq/jms/example/StompExample.java | 2 +-
.../activemq/server0/activemq-configuration.xml | 42 +++
.../resources/activemq/server0/activemq-jms.xml | 8 +
.../activemq/server0/activemq-users.xml | 7 +
.../hornetq/server0/activemq-configuration.xml | 51 ----
.../resources/hornetq/server0/activemq-jms.xml | 8 -
.../hornetq/server0/activemq-users.xml | 7 -
.../stomp1.1/src/main/resources/jndi.properties | 3 +
examples/jms/stomp1.2/pom.xml | 5 +-
.../activemq/jms/example/StompExample.java | 2 +-
.../activemq/server0/activemq-configuration.xml | 42 +++
.../resources/activemq/server0/activemq-jms.xml | 8 +
.../activemq/server0/activemq-users.xml | 7 +
.../hornetq/server0/activemq-configuration.xml | 51 ----
.../resources/hornetq/server0/activemq-jms.xml | 8 -
.../hornetq/server0/activemq-users.xml | 7 -
.../stomp1.2/src/main/resources/jndi.properties | 3 +
examples/jms/stop-server-failover/pom.xml | 8 +-
.../jms/example/StopServerFailoverExample.java | 4 +-
.../activemq/server0/activemq-configuration.xml | 72 ++++++
.../resources/activemq/server0/activemq-jms.xml | 8 +
.../activemq/server0/activemq-users.xml | 7 +
.../activemq/server1/activemq-configuration.xml | 72 ++++++
.../resources/activemq/server1/activemq-jms.xml | 8 +
.../activemq/server1/activemq-users.xml | 7 +
.../hornetq/server0/activemq-configuration.xml | 72 ------
.../resources/hornetq/server0/activemq-jms.xml | 8 -
.../hornetq/server0/activemq-users.xml | 7 -
.../hornetq/server1/activemq-configuration.xml | 72 ------
.../resources/hornetq/server1/activemq-jms.xml | 8 -
.../hornetq/server1/activemq-users.xml | 7 -
.../src/main/resources/jndi.properties | 7 +
examples/jms/symmetric-cluster/pom.xml | 24 +-
.../activemq/server0/activemq-configuration.xml | 78 ++++++
.../resources/activemq/server0/activemq-jms.xml | 9 +
.../activemq/server0/activemq-users.xml | 7 +
.../activemq/server1/activemq-configuration.xml | 76 ++++++
.../resources/activemq/server1/activemq-jms.xml | 9 +
.../activemq/server1/activemq-users.xml | 7 +
.../activemq/server2/activemq-configuration.xml | 76 ++++++
.../resources/activemq/server2/activemq-jms.xml | 9 +
.../activemq/server2/activemq-users.xml | 7 +
.../activemq/server3/activemq-configuration.xml | 76 ++++++
.../resources/activemq/server3/activemq-jms.xml | 9 +
.../activemq/server3/activemq-users.xml | 7 +
.../activemq/server4/activemq-configuration.xml | 75 ++++++
.../resources/activemq/server4/activemq-jms.xml | 9 +
.../activemq/server4/activemq-users.xml | 7 +
.../activemq/server5/activemq-configuration.xml | 75 ++++++
.../resources/activemq/server5/activemq-jms.xml | 9 +
.../activemq/server5/activemq-users.xml | 7 +
.../hornetq/server0/activemq-configuration.xml | 78 ------
.../resources/hornetq/server0/activemq-jms.xml | 9 -
.../hornetq/server0/activemq-users.xml | 7 -
.../hornetq/server1/activemq-configuration.xml | 76 ------
.../resources/hornetq/server1/activemq-jms.xml | 9 -
.../hornetq/server1/activemq-users.xml | 7 -
.../hornetq/server2/activemq-configuration.xml | 76 ------
.../resources/hornetq/server2/activemq-jms.xml | 9 -
.../hornetq/server2/activemq-users.xml | 7 -
.../hornetq/server3/activemq-configuration.xml | 76 ------
.../resources/hornetq/server3/activemq-jms.xml | 9 -
.../hornetq/server3/activemq-users.xml | 7 -
.../hornetq/server4/activemq-configuration.xml | 75 ------
.../resources/hornetq/server4/activemq-jms.xml | 9 -
.../hornetq/server4/activemq-users.xml | 7 -
.../hornetq/server5/activemq-configuration.xml | 75 ------
.../resources/hornetq/server5/activemq-jms.xml | 9 -
.../hornetq/server5/activemq-users.xml | 7 -
examples/jms/temp-queue/pom.xml | 5 +-
.../jms/example/TemporaryQueueExample.java | 2 +-
.../activemq/server0/activemq-configuration.xml | 50 ++++
.../resources/activemq/server0/activemq-jms.xml | 8 +
.../activemq/server0/activemq-users.xml | 7 +
.../hornetq/server0/activemq-configuration.xml | 50 ----
.../resources/hornetq/server0/activemq-jms.xml | 8 -
.../hornetq/server0/activemq-users.xml | 7 -
.../src/main/resources/jndi.properties | 3 +
examples/jms/topic-hierarchies/pom.xml | 5 +-
.../jms/example/TopicHierarchyExample.java | 2 +-
.../activemq/server0/activemq-configuration.xml | 34 +++
.../resources/activemq/server0/activemq-jms.xml | 19 ++
.../activemq/server0/activemq-users.xml | 7 +
.../hornetq/server0/activemq-configuration.xml | 43 ----
.../resources/hornetq/server0/activemq-jms.xml | 19 --
.../hornetq/server0/activemq-users.xml | 7 -
.../src/main/resources/jndi.properties | 2 +
examples/jms/topic-selector-example1/pom.xml | 5 +-
.../jms/example/TopicSelectorExample1.java | 2 +-
.../activemq/server0/activemq-configuration.xml | 34 +++
.../resources/activemq/server0/activemq-jms.xml | 8 +
.../activemq/server0/activemq-users.xml | 7 +
.../hornetq/server0/activemq-configuration.xml | 42 ---
.../resources/hornetq/server0/activemq-jms.xml | 8 -
.../hornetq/server0/activemq-users.xml | 7 -
.../src/main/resources/jndi.properties | 3 +
examples/jms/topic-selector-example2/pom.xml | 5 +-
.../jms/example/TopicSelectorExample2.java | 2 +-
.../activemq/server0/activemq-configuration.xml | 34 +++
.../resources/activemq/server0/activemq-jms.xml | 8 +
.../activemq/server0/activemq-users.xml | 7 +
.../hornetq/server0/activemq-configuration.xml | 42 ---
.../resources/hornetq/server0/activemq-jms.xml | 8 -
.../hornetq/server0/activemq-users.xml | 7 -
.../src/main/resources/jndi.properties | 3 +
examples/jms/topic/pom.xml | 2 +-
.../activemq/jms/example/TopicExample.java | 2 +-
.../activemq/server0/activemq-configuration.xml | 34 +++
.../resources/activemq/server0/activemq-jms.xml | 8 +
.../activemq/server0/activemq-users.xml | 7 +
.../hornetq/server0/activemq-configuration.xml | 42 ---
.../resources/hornetq/server0/activemq-jms.xml | 8 -
.../hornetq/server0/activemq-users.xml | 7 -
.../hornetq/server0/client-jndi.properties | 2 -
.../topic/src/main/resources/jndi.properties | 3 +
examples/jms/transaction-failover/pom.xml | 14 +-
.../jms/example/TransactionFailoverExample.java | 4 +-
.../activemq/server0/activemq-configuration.xml | 74 ++++++
.../resources/activemq/server0/activemq-jms.xml | 8 +
.../activemq/server0/activemq-users.xml | 7 +
.../activemq/server1/activemq-configuration.xml | 74 ++++++
.../resources/activemq/server1/activemq-jms.xml | 8 +
.../activemq/server1/activemq-users.xml | 7 +
.../hornetq/server0/activemq-configuration.xml | 74 ------
.../resources/hornetq/server0/activemq-jms.xml | 8 -
.../hornetq/server0/activemq-users.xml | 7 -
.../hornetq/server1/activemq-configuration.xml | 74 ------
.../resources/hornetq/server1/activemq-jms.xml | 8 -
.../hornetq/server1/activemq-users.xml | 7 -
.../src/main/resources/jndi.properties | 7 +
examples/jms/transactional/pom.xml | 5 +-
.../jms/example/TransactionalExample.java | 2 +-
.../activemq/server0/activemq-configuration.xml | 34 +++
.../resources/activemq/server0/activemq-jms.xml | 8 +
.../activemq/server0/activemq-users.xml | 7 +
.../hornetq/server0/activemq-configuration.xml | 42 ---
.../resources/hornetq/server0/activemq-jms.xml | 8 -
.../hornetq/server0/activemq-users.xml | 7 -
.../src/main/resources/jndi.properties | 3 +
examples/jms/xa-heuristic/pom.xml | 5 +-
.../jms/example/XAHeuristicExample.java | 2 +-
.../activemq/server0/activemq-configuration.xml | 34 +++
.../resources/activemq/server0/activemq-jms.xml | 8 +
.../activemq/server0/activemq-users.xml | 7 +
.../hornetq/server0/activemq-configuration.xml | 42 ---
.../resources/hornetq/server0/activemq-jms.xml | 8 -
.../hornetq/server0/activemq-users.xml | 7 -
.../src/main/resources/jndi.properties | 3 +
examples/jms/xa-receive/pom.xml | 5 +-
.../activemq/jms/example/XAReceiveExample.java | 2 +-
.../activemq/server0/activemq-configuration.xml | 34 +++
.../resources/activemq/server0/activemq-jms.xml | 8 +
.../activemq/server0/activemq-users.xml | 7 +
.../hornetq/server0/activemq-configuration.xml | 42 ---
.../resources/hornetq/server0/activemq-jms.xml | 8 -
.../hornetq/server0/activemq-users.xml | 7 -
.../src/main/resources/jndi.properties | 3 +
examples/jms/xa-send/pom.xml | 5 +-
.../activemq/jms/example/XASendExample.java | 2 +-
.../activemq/server0/activemq-configuration.xml | 34 +++
.../resources/activemq/server0/activemq-jms.xml | 8 +
.../activemq/server0/activemq-users.xml | 7 +
.../hornetq/server0/activemq-configuration.xml | 42 ---
.../resources/hornetq/server0/activemq-jms.xml | 8 -
.../hornetq/server0/activemq-users.xml | 7 -
.../xa-send/src/main/resources/jndi.properties | 3 +
examples/jms/xa-with-jta/pom.xml | 10 +-
.../activemq/jms/example/XAwithJTAExample.java | 2 +-
.../activemq/server0/activemq-configuration.xml | 34 +++
.../resources/activemq/server0/activemq-jms.xml | 8 +
.../activemq/server0/activemq-users.xml | 7 +
.../hornetq/server0/activemq-configuration.xml | 42 ---
.../resources/hornetq/server0/activemq-jms.xml | 8 -
.../hornetq/server0/activemq-users.xml | 7 -
.../src/main/resources/jndi.properties | 3 +
examples/soak/normal/pom.xml | 6 +-
pom.xml | 7 +-
1077 files changed, 11946 insertions(+), 11085 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/activemq-maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-maven-plugin/pom.xml b/activemq-maven-plugin/pom.xml
new file mode 100644
index 0000000..2b3fac5
--- /dev/null
+++ b/activemq-maven-plugin/pom.xml
@@ -0,0 +1,61 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-pom</artifactId>
+ <version>6.0.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>activemq-maven-plugin</artifactId>
+ <packaging>maven-plugin</packaging>
+ <name>ActiveMQ6 Maven Plugin</name>
+
+ <properties>
+ <activemq.basedir>${project.basedir}/..</activemq.basedir>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-api</artifactId>
+ <version>2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-server</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-jms-server</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-all</artifactId>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.0</version>
+ <configuration>
+ <showWarnings>true</showWarnings>
+ <source>1.6</source>
+ <target>1.6</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/activemq-maven-plugin/src/main/java/org/apache/activemq/maven/ActiveMQClient.java
----------------------------------------------------------------------
diff --git a/activemq-maven-plugin/src/main/java/org/apache/activemq/maven/ActiveMQClient.java b/activemq-maven-plugin/src/main/java/org/apache/activemq/maven/ActiveMQClient.java
new file mode 100644
index 0000000..8327e54
--- /dev/null
+++ b/activemq-maven-plugin/src/main/java/org/apache/activemq/maven/ActiveMQClient.java
@@ -0,0 +1,27 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.maven;
+
+/**
+ * @author <a href="mailto:andy.taylor@jboss.com">Andy Taylor</a>
+ * Date: 8/18/11
+ * Time: 2:35 PM
+ */
+public interface ActiveMQClient
+{
+ void run();
+}
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/activemq-maven-plugin/src/main/java/org/apache/activemq/maven/ActiveMQClientPlugin.java
----------------------------------------------------------------------
diff --git a/activemq-maven-plugin/src/main/java/org/apache/activemq/maven/ActiveMQClientPlugin.java b/activemq-maven-plugin/src/main/java/org/apache/activemq/maven/ActiveMQClientPlugin.java
new file mode 100644
index 0000000..b964f4b
--- /dev/null
+++ b/activemq-maven-plugin/src/main/java/org/apache/activemq/maven/ActiveMQClientPlugin.java
@@ -0,0 +1,72 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.maven;
+
+import java.lang.reflect.Method;
+import java.util.Properties;
+
+import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.MojoFailureException;
+
+/**
+ * @author <a href="mailto:andy.taylor@jboss.com">Andy Taylor</a>
+ *
+ * Allows a Java Client to be run which must hve a static main(String[] args) method
+ */
+
+/**
+ * @phase verify
+ * @goal runClient
+ */
+public class ActiveMQClientPlugin extends AbstractMojo
+{
+
+ /**
+ * @parameter
+ */
+ String clientClass;
+
+ /**
+ * @parameter
+ */
+ String[] args;
+
+ /**
+ * @parameter
+ */
+ private Properties systemProperties;
+
+ public void execute() throws MojoExecutionException, MojoFailureException
+ {
+ try
+ {
+ if (systemProperties != null && !systemProperties.isEmpty())
+ {
+ System.getProperties().putAll(systemProperties);
+ }
+ Class aClass = Class.forName(clientClass);
+ Method method = aClass.getDeclaredMethod("main", new Class[]{String[].class});
+ method.invoke(null, new Object[]{args});
+ }
+ catch (Exception e)
+ {
+ e.printStackTrace();
+ throw new MojoFailureException(e.getMessage());
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/activemq-maven-plugin/src/main/java/org/apache/activemq/maven/ActiveMQStartPlugin.java
----------------------------------------------------------------------
diff --git a/activemq-maven-plugin/src/main/java/org/apache/activemq/maven/ActiveMQStartPlugin.java b/activemq-maven-plugin/src/main/java/org/apache/activemq/maven/ActiveMQStartPlugin.java
new file mode 100644
index 0000000..5bc91aa
--- /dev/null
+++ b/activemq-maven-plugin/src/main/java/org/apache/activemq/maven/ActiveMQStartPlugin.java
@@ -0,0 +1,228 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.maven;
+
+import javax.management.MBeanServer;
+import javax.management.ObjectName;
+import java.io.File;
+import java.lang.management.ManagementFactory;
+import java.util.Arrays;
+import java.util.Properties;
+
+import org.apache.activemq.server.ActiveMQBootstrap;
+import org.apache.activemq.server.SpawnedActiveMQBootstrap;
+import org.apache.activemq.server.SpawnedVMSupport;
+import org.apache.activemq.spi.core.security.ActiveMQSecurityManager;
+import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.MojoFailureException;
+import org.apache.maven.plugin.descriptor.PluginDescriptor;
+import org.codehaus.classworlds.ClassRealm;
+import org.codehaus.classworlds.ClassWorld;
+
+
+/**
+ * @author <a href="mailto:andy.taylor@jboss.com">Andy Taylor</a>
+ */
+
+/**
+ * @phase verify
+ * @goal start
+ */
+public class ActiveMQStartPlugin extends AbstractMojo
+
+{
+ /**
+ * The plugin descriptor
+ */
+ private PluginDescriptor descriptor;
+
+
+ /**
+ * @parameter default-value=false
+ */
+ private Boolean waitOnStart;
+
+ /**
+ * @parameter
+ */
+ private String configurationDir;
+
+ /**
+ * @parameter
+ */
+ private String nodeId;
+
+ /**
+ * @parameter default-value=false;
+ */
+ private Boolean fork;
+
+ /**
+ * @parameter default-value=false
+ */
+ private Boolean debug;
+
+ /**
+ * @parameter
+ */
+ private Properties systemProperties;
+
+ /**
+ * @parameter default-value=STARTED::
+ */
+ private String serverStartString;
+
+ /**
+ * @parameter
+ */
+ private ActiveMQSecurityManager securityManager;
+
+ /**
+ * registers a TestClusterMBean for test clients to use.
+ */
+ private boolean testClusterManager;
+
+ public void execute() throws MojoExecutionException, MojoFailureException
+ {
+ if (testClusterManager)
+ {
+ try
+ {
+ createClusterManagerMBean();
+ }
+ catch (Exception e)
+ {
+ throw new MojoExecutionException("Failed to create cluster manager mbean", e);
+ }
+ }
+
+ if (systemProperties != null && !systemProperties.isEmpty())
+ {
+ System.getProperties()
+ .putAll(systemProperties);
+ }
+
+ String workingPath = new File(".").getAbsolutePath();
+
+ try
+ {
+ registerNode(nodeId, workingPath, configurationDir);
+ }
+ catch (Exception e1)
+ {
+ throw new MojoExecutionException("Failed to create cluster manager mbean", e1);
+ }
+
+ if (fork)
+ {
+ try
+ {
+ PluginDescriptor pd = (PluginDescriptor) getPluginContext().get("pluginDescriptor");
+ final Process p = SpawnedVMSupport.spawnVM(pd.getArtifacts(),
+ "ActiveMQServer_" + (nodeId != null ? nodeId : ""),
+ SpawnedActiveMQBootstrap.class.getName(),
+ systemProperties,
+ true,
+ serverStartString,
+ "FAILED::",
+ ".",
+ configurationDir,
+ debug,
+ configurationDir,
+ "" + waitOnStart,
+ nodeId);
+ Runtime.getRuntime().addShutdownHook(new Thread()
+ {
+ @Override
+ public void run()
+ {
+ //just to be on the safe side
+ p.destroy();
+ }
+ });
+ if (waitOnStart)
+ {
+ p.waitFor();
+ }
+ }
+ catch (Throwable e)
+ {
+ e.printStackTrace();
+ throw new MojoExecutionException(e.getMessage());
+ }
+ }
+ else
+ {
+ ActiveMQBootstrap bootstrap = new ActiveMQBootstrap(configurationDir, waitOnStart, nodeId, securityManager);
+ if (configurationDir != null)
+ {
+ extendPluginClasspath(configurationDir);
+ }
+ try
+ {
+ bootstrap.execute();
+ }
+ catch (Exception e)
+ {
+ throw new MojoExecutionException(e.getMessage(), e);
+ }
+ }
+ }
+
+ private void registerNode(String nodeId, String workingPath,
+ String hornetqConfigurationDir) throws Exception
+ {
+ TestClusterManagerMBean control = PluginUtil.getTestClusterManager();
+ if (control != null)
+ {
+ control.registerNode(nodeId, workingPath, hornetqConfigurationDir);
+ }
+ }
+
+ private void createClusterManagerMBean() throws Exception
+ {
+ MBeanServer mbeanServer = ManagementFactory.getPlatformMBeanServer();
+ ObjectName name = ObjectName.getInstance("hornetq:module=test,type=TestClusterManager");
+ mbeanServer.registerMBean(new TestClusterManager(), name);
+ }
+
+ public void extendPluginClasspath(String element) throws MojoExecutionException
+ {
+ ClassWorld world = new ClassWorld();
+ ClassRealm realm;
+ try
+ {
+ realm = world.newRealm(
+ "maven.plugin." + getClass().getSimpleName() + ((nodeId == null) ? "" : nodeId),
+ Thread.currentThread()
+ .getContextClassLoader()
+ );
+ File elementFile = new File(element);
+ getLog().debug("Adding element to plugin classpath" + elementFile.getPath());
+ realm.addConstituent(elementFile.toURI()
+ .toURL());
+ }
+ catch (Exception ex)
+ {
+ throw new MojoExecutionException(ex.toString(), ex);
+ }
+ System.out.println(Arrays.toString(realm.getConstituents()));
+ Thread.currentThread()
+ .setContextClassLoader(realm.getClassLoader());
+ }
+}
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/activemq-maven-plugin/src/main/java/org/apache/activemq/maven/ActiveMQStopPlugin.java
----------------------------------------------------------------------
diff --git a/activemq-maven-plugin/src/main/java/org/apache/activemq/maven/ActiveMQStopPlugin.java b/activemq-maven-plugin/src/main/java/org/apache/activemq/maven/ActiveMQStopPlugin.java
new file mode 100644
index 0000000..b6b374b
--- /dev/null
+++ b/activemq-maven-plugin/src/main/java/org/apache/activemq/maven/ActiveMQStopPlugin.java
@@ -0,0 +1,78 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.maven;
+
+import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.MojoFailureException;
+
+import java.io.File;
+import java.io.IOException;
+
+/**
+ * @author <a href="mailto:andy.taylor@jboss.com">Andy Taylor</a>
+ * Date: 8/18/11
+ * Time: 12:25 PM
+ */
+
+/**
+ * @phase verify
+ * @goal stop
+ */
+public class ActiveMQStopPlugin extends AbstractMojo
+{
+
+ /**
+ * @parameter
+ */
+ private String configurationDir;
+
+ public void execute() throws MojoExecutionException, MojoFailureException
+ {
+ try
+ {
+ String dirName = configurationDir != null ? configurationDir : ".";
+ final File file = new File(dirName + "/" + "/STOP_ME");
+ file.createNewFile();
+ long time = System.currentTimeMillis();
+ while (System.currentTimeMillis() < time + 60000)
+ {
+ if (!file.exists())
+ {
+ break;
+ }
+ try
+ {
+ Thread.sleep(200);
+ }
+ catch (InterruptedException e)
+ {
+ //ignore
+ }
+ }
+ if (file.exists())
+ {
+ throw new MojoExecutionException("looks like the server hasn't been stopped");
+ }
+ }
+ catch (IOException e)
+ {
+ e.printStackTrace();
+ throw new MojoExecutionException(e.getMessage());
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/activemq-maven-plugin/src/main/java/org/apache/activemq/maven/InVMNodeManagerServer.java
----------------------------------------------------------------------
diff --git a/activemq-maven-plugin/src/main/java/org/apache/activemq/maven/InVMNodeManagerServer.java b/activemq-maven-plugin/src/main/java/org/apache/activemq/maven/InVMNodeManagerServer.java
new file mode 100644
index 0000000..97d3f37
--- /dev/null
+++ b/activemq-maven-plugin/src/main/java/org/apache/activemq/maven/InVMNodeManagerServer.java
@@ -0,0 +1,73 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.maven;
+
+import javax.management.MBeanServer;
+
+import org.apache.activemq.core.config.Configuration;
+import org.apache.activemq.core.server.NodeManager;
+import org.apache.activemq.core.server.impl.ActiveMQServerImpl;
+import org.apache.activemq.spi.core.security.ActiveMQSecurityManager;
+
+public final class InVMNodeManagerServer extends ActiveMQServerImpl
+{
+ final NodeManager nodeManager;
+
+ public InVMNodeManagerServer(final NodeManager nodeManager)
+ {
+ super();
+ this.nodeManager = nodeManager;
+ }
+
+ public InVMNodeManagerServer(final Configuration configuration, final NodeManager nodeManager)
+ {
+ super(configuration);
+ this.nodeManager = nodeManager;
+ }
+
+ public InVMNodeManagerServer(final Configuration configuration,
+ final MBeanServer mbeanServer,
+ final NodeManager nodeManager)
+ {
+ super(configuration, mbeanServer);
+ this.nodeManager = nodeManager;
+ }
+
+ public InVMNodeManagerServer(final Configuration configuration,
+ final ActiveMQSecurityManager securityManager,
+ final NodeManager nodeManager)
+ {
+ super(configuration, securityManager);
+ this.nodeManager = nodeManager;
+ }
+
+ public InVMNodeManagerServer(final Configuration configuration,
+ final MBeanServer mbeanServer,
+ final ActiveMQSecurityManager securityManager,
+ final NodeManager nodeManager)
+ {
+ super(configuration, mbeanServer, securityManager);
+ this.nodeManager = nodeManager;
+ }
+
+ @Override
+ protected NodeManager createNodeManager(final String directory, boolean replicatingBackup)
+ {
+ return nodeManager;
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/activemq-maven-plugin/src/main/java/org/apache/activemq/maven/PluginUtil.java
----------------------------------------------------------------------
diff --git a/activemq-maven-plugin/src/main/java/org/apache/activemq/maven/PluginUtil.java b/activemq-maven-plugin/src/main/java/org/apache/activemq/maven/PluginUtil.java
new file mode 100644
index 0000000..a066f4f
--- /dev/null
+++ b/activemq-maven-plugin/src/main/java/org/apache/activemq/maven/PluginUtil.java
@@ -0,0 +1,50 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.maven;
+
+import javax.management.MBeanServerConnection;
+import javax.management.MBeanServerInvocationHandler;
+import javax.management.ObjectName;
+import javax.management.remote.JMXConnector;
+import javax.management.remote.JMXConnectorFactory;
+import javax.management.remote.JMXServiceURL;
+import java.util.HashMap;
+
+public class PluginUtil
+{
+ public static TestClusterManagerMBean getTestClusterManager()
+ {
+ final String JMX_URL = "service:jmx:rmi:///jndi/rmi://localhost:3000/jmxrmi";
+ try
+ {
+ JMXConnector connector = JMXConnectorFactory.connect(new JMXServiceURL(JMX_URL), new HashMap<String, String>());
+ ObjectName name = ObjectName.getInstance("activemq:module=test,type=TestClusterManager");
+ MBeanServerConnection mbsc = connector.getMBeanServerConnection();
+ TestClusterManagerMBean clusterControl = MBeanServerInvocationHandler.newProxyInstance(mbsc,
+ name,
+ TestClusterManagerMBean.class,
+ false);
+ clusterControl.getNumNodes();//serves as a validation.
+ return clusterControl;
+ }
+ catch (Exception e)
+ {
+ return null;
+ }
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/activemq-maven-plugin/src/main/java/org/apache/activemq/maven/TestClusterManager.java
----------------------------------------------------------------------
diff --git a/activemq-maven-plugin/src/main/java/org/apache/activemq/maven/TestClusterManager.java b/activemq-maven-plugin/src/main/java/org/apache/activemq/maven/TestClusterManager.java
new file mode 100644
index 0000000..b03fa58
--- /dev/null
+++ b/activemq-maven-plugin/src/main/java/org/apache/activemq/maven/TestClusterManager.java
@@ -0,0 +1,52 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.maven;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+public class TestClusterManager implements TestClusterManagerMBean
+{
+ private List<TestNode> testNodes = new ArrayList<TestNode>();
+
+ @Override
+ public int getNumNodes()
+ {
+ synchronized (testNodes)
+ {
+ return testNodes.size();
+ }
+ }
+
+ @Override
+ public void registerNode(String nodeId, String workingDir,
+ String hornetqConfigurationDir)
+ {
+ synchronized (testNodes)
+ {
+ testNodes.add(new TestNode(nodeId, workingDir, hornetqConfigurationDir));
+ }
+ }
+
+ @Override
+ public void killNode(int i) throws IOException
+ {
+ TestNode node = testNodes.get(i);
+ node.kill();
+ }
+}
[18/37] activemq-6 git commit: ACTIVEMQ6-51 Example server
bootstrapping
Posted by jb...@apache.org.
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/symmetric-cluster/src/main/resources/hornetq/server4/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server4/activemq-jms.xml b/examples/jms/symmetric-cluster/src/main/resources/hornetq/server4/activemq-jms.xml
deleted file mode 100644
index 7b26f36..0000000
--- a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server4/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">
-
- <queue name="exampleQueue"/>
-
- <topic name="exampleTopic"/>
-
-</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/symmetric-cluster/src/main/resources/hornetq/server4/activemq-users.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server4/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/symmetric-cluster/src/main/resources/hornetq/server5/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server5/activemq-configuration.xml b/examples/jms/symmetric-cluster/src/main/resources/hornetq/server5/activemq-configuration.xml
deleted file mode 100644
index f8ec355..0000000
--- a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server5/activemq-configuration.xml
+++ /dev/null
@@ -1,75 +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}/server5/data/messaging/bindings</bindings-directory>
-
- <journal-directory>${build.directory}/server5/data/messaging/journal</journal-directory>
-
- <large-messages-directory>${build.directory}/server5/data/messaging/largemessages</large-messages-directory>
-
- <paging-directory>${build.directory}/server5/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="5450"/>
- </connector>
- </connectors>
-
- <!-- Acceptors -->
- <acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- <param key="port" value="5450"/>
- </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>
- <!-- Default JMS security -->
- <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-settings>
-
-</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/symmetric-cluster/src/main/resources/hornetq/server5/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server5/activemq-jms.xml b/examples/jms/symmetric-cluster/src/main/resources/hornetq/server5/activemq-jms.xml
deleted file mode 100644
index 7b26f36..0000000
--- a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server5/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">
-
- <queue name="exampleQueue"/>
-
- <topic name="exampleTopic"/>
-
-</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/symmetric-cluster/src/main/resources/hornetq/server5/activemq-users.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/symmetric-cluster/src/main/resources/hornetq/server5/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/temp-queue/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/temp-queue/pom.xml b/examples/jms/temp-queue/pom.xml
index c1649f1..59dc917 100644
--- a/examples/jms/temp-queue/pom.xml
+++ b/examples/jms/temp-queue/pom.xml
@@ -51,9 +51,6 @@
</goals>
<configuration>
<clientClass>org.apache.activemq.jms.example.TemporaryQueueExample</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/temp-queue/src/main/java/org/apache/activemq/jms/example/TemporaryQueueExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/temp-queue/src/main/java/org/apache/activemq/jms/example/TemporaryQueueExample.java b/examples/jms/temp-queue/src/main/java/org/apache/activemq/jms/example/TemporaryQueueExample.java
index 55b6438..8dfcc1d 100644
--- a/examples/jms/temp-queue/src/main/java/org/apache/activemq/jms/example/TemporaryQueueExample.java
+++ b/examples/jms/temp-queue/src/main/java/org/apache/activemq/jms/example/TemporaryQueueExample.java
@@ -48,7 +48,7 @@ public class TemporaryQueueExample extends ActiveMQExample
try
{
// Step 1. Create an initial context to perform the JNDI lookup.
- initialContext = getContext(0);
+ initialContext = new InitialContext();
// Step 2. Look-up the JMS connection factory
ConnectionFactory cf = (ConnectionFactory)initialContext.lookup("ConnectionFactory");
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/temp-queue/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/temp-queue/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/temp-queue/src/main/resources/activemq/server0/activemq-configuration.xml
new file mode 100644
index 0000000..5f8724a
--- /dev/null
+++ b/examples/jms/temp-queue/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -0,0 +1,50 @@
+<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 queues -->
+ <security-setting match="jms.queue.#">
+ <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 for JMS temporary queue -->
+ <security-setting match="jms.tempqueue.#">
+ <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/temp-queue/src/main/resources/activemq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/temp-queue/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/temp-queue/src/main/resources/activemq/server0/activemq-jms.xml
new file mode 100644
index 0000000..0baa197
--- /dev/null
+++ b/examples/jms/temp-queue/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 topic used by the example-->
+ <queue name="exampleQueue"/>
+
+</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/temp-queue/src/main/resources/activemq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/temp-queue/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/temp-queue/src/main/resources/activemq/server0/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/temp-queue/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/temp-queue/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/temp-queue/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/temp-queue/src/main/resources/hornetq/server0/activemq-configuration.xml
deleted file mode 100644
index 5f8724a..0000000
--- a/examples/jms/temp-queue/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 -->
- <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 queues -->
- <security-setting match="jms.queue.#">
- <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 for JMS temporary queue -->
- <security-setting match="jms.tempqueue.#">
- <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/temp-queue/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/temp-queue/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/temp-queue/src/main/resources/hornetq/server0/activemq-jms.xml
deleted file mode 100644
index 0baa197..0000000
--- a/examples/jms/temp-queue/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 topic used by the example-->
- <queue name="exampleQueue"/>
-
-</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/temp-queue/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/temp-queue/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/temp-queue/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/temp-queue/src/main/resources/jndi.properties b/examples/jms/temp-queue/src/main/resources/jndi.properties
new file mode 100644
index 0000000..d9b5c6a
--- /dev/null
+++ b/examples/jms/temp-queue/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/topic-hierarchies/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/topic-hierarchies/pom.xml b/examples/jms/topic-hierarchies/pom.xml
index dd1b6d9..2974a78 100644
--- a/examples/jms/topic-hierarchies/pom.xml
+++ b/examples/jms/topic-hierarchies/pom.xml
@@ -51,9 +51,6 @@
</goals>
<configuration>
<clientClass>org.apache.activemq.jms.example.TopicHierarchyExample</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/topic-hierarchies/src/main/java/org/apache/activemq/jms/example/TopicHierarchyExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/topic-hierarchies/src/main/java/org/apache/activemq/jms/example/TopicHierarchyExample.java b/examples/jms/topic-hierarchies/src/main/java/org/apache/activemq/jms/example/TopicHierarchyExample.java
index 8fff159..2a7d7b7 100644
--- a/examples/jms/topic-hierarchies/src/main/java/org/apache/activemq/jms/example/TopicHierarchyExample.java
+++ b/examples/jms/topic-hierarchies/src/main/java/org/apache/activemq/jms/example/TopicHierarchyExample.java
@@ -51,7 +51,7 @@ public class TopicHierarchyExample extends ActiveMQExample
try
{
// Step 1. Create an initial context to perform the JNDI lookup.
- initialContext = getContext(0);
+ initialContext = new InitialContext();
// Step 3. Perform a lookup on the Connection Factory
ConnectionFactory cf = (ConnectionFactory)initialContext.lookup("ConnectionFactory");
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/topic-hierarchies/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/topic-hierarchies/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/topic-hierarchies/src/main/resources/activemq/server0/activemq-configuration.xml
new file mode 100644
index 0000000..c4d93e0
--- /dev/null
+++ b/examples/jms/topic-hierarchies/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.#">
+ <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/topic-hierarchies/src/main/resources/activemq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/topic-hierarchies/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/topic-hierarchies/src/main/resources/activemq/server0/activemq-jms.xml
new file mode 100644
index 0000000..dc498cc
--- /dev/null
+++ b/examples/jms/topic-hierarchies/src/main/resources/activemq/server0/activemq-jms.xml
@@ -0,0 +1,19 @@
+<configuration xmlns="urn:activemq"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:activemq /schema/activemq-jms.xsd">
+
+ <!--the topics used by the example-->
+
+ <topic name="news"/>
+
+ <topic name="news.usa"/>
+
+ <topic name="news.usa.wrestling"/>
+
+ <topic name="news.europe"/>
+
+ <topic name="news.europe.sport"/>
+
+ <topic name="news.europe.entertainment"/>
+
+</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/topic-hierarchies/src/main/resources/activemq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/topic-hierarchies/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/topic-hierarchies/src/main/resources/activemq/server0/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/topic-hierarchies/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/topic-hierarchies/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/topic-hierarchies/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/topic-hierarchies/src/main/resources/hornetq/server0/activemq-configuration.xml
deleted file mode 100644
index 2fe40d9..0000000
--- a/examples/jms/topic-hierarchies/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.#">
- <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/topic-hierarchies/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/topic-hierarchies/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/topic-hierarchies/src/main/resources/hornetq/server0/activemq-jms.xml
deleted file mode 100644
index dc498cc..0000000
--- a/examples/jms/topic-hierarchies/src/main/resources/hornetq/server0/activemq-jms.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<configuration xmlns="urn:activemq"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:activemq /schema/activemq-jms.xsd">
-
- <!--the topics used by the example-->
-
- <topic name="news"/>
-
- <topic name="news.usa"/>
-
- <topic name="news.usa.wrestling"/>
-
- <topic name="news.europe"/>
-
- <topic name="news.europe.sport"/>
-
- <topic name="news.europe.entertainment"/>
-
-</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/topic-hierarchies/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/topic-hierarchies/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/topic-hierarchies/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/topic-hierarchies/src/main/resources/jndi.properties b/examples/jms/topic-hierarchies/src/main/resources/jndi.properties
new file mode 100644
index 0000000..6940f75
--- /dev/null
+++ b/examples/jms/topic-hierarchies/src/main/resources/jndi.properties
@@ -0,0 +1,2 @@
+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/topic-selector-example1/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/topic-selector-example1/pom.xml b/examples/jms/topic-selector-example1/pom.xml
index 1779b3b..5a94a8a 100644
--- a/examples/jms/topic-selector-example1/pom.xml
+++ b/examples/jms/topic-selector-example1/pom.xml
@@ -51,9 +51,6 @@
</goals>
<configuration>
<clientClass>org.apache.activemq.jms.example.TopicSelectorExample1</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/topic-selector-example1/src/main/java/org/apache/activemq/jms/example/TopicSelectorExample1.java
----------------------------------------------------------------------
diff --git a/examples/jms/topic-selector-example1/src/main/java/org/apache/activemq/jms/example/TopicSelectorExample1.java b/examples/jms/topic-selector-example1/src/main/java/org/apache/activemq/jms/example/TopicSelectorExample1.java
index 9cda2da..95631ce 100644
--- a/examples/jms/topic-selector-example1/src/main/java/org/apache/activemq/jms/example/TopicSelectorExample1.java
+++ b/examples/jms/topic-selector-example1/src/main/java/org/apache/activemq/jms/example/TopicSelectorExample1.java
@@ -49,7 +49,7 @@ public class TopicSelectorExample1 extends ActiveMQExample
{
// Step 1. Create an initial context to perform the JNDI lookup.
- initialContext = getContext(0);
+ initialContext = new InitialContext();
// Step 2. Look-up the JMS topic
Topic topic = (Topic)initialContext.lookup("topic/exampleTopic");
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/topic-selector-example1/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/topic-selector-example1/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/topic-selector-example1/src/main/resources/activemq/server0/activemq-configuration.xml
new file mode 100644
index 0000000..7e6a27d
--- /dev/null
+++ b/examples/jms/topic-selector-example1/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 topic-->
+ <security-setting match="jms.topic.exampleTopic">
+ <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/topic-selector-example1/src/main/resources/activemq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/topic-selector-example1/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/topic-selector-example1/src/main/resources/activemq/server0/activemq-jms.xml
new file mode 100644
index 0000000..ab4841d
--- /dev/null
+++ b/examples/jms/topic-selector-example1/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 topic used by the example-->
+ <topic name="exampleTopic"/>
+
+</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/topic-selector-example1/src/main/resources/activemq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/topic-selector-example1/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/topic-selector-example1/src/main/resources/activemq/server0/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/topic-selector-example1/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/topic-selector-example1/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/topic-selector-example1/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/topic-selector-example1/src/main/resources/hornetq/server0/activemq-configuration.xml
deleted file mode 100644
index 0f134f2..0000000
--- a/examples/jms/topic-selector-example1/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>
-
-
- <!-- 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 topic-->
- <security-setting match="jms.topic.exampleTopic">
- <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/topic-selector-example1/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index ab4841d..0000000
--- a/examples/jms/topic-selector-example1/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 topic used by the example-->
- <topic name="exampleTopic"/>
-
-</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/topic-selector-example1/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/topic-selector-example1/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/topic-selector-example1/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/topic-selector-example1/src/main/resources/jndi.properties b/examples/jms/topic-selector-example1/src/main/resources/jndi.properties
new file mode 100644
index 0000000..4faa790
--- /dev/null
+++ b/examples/jms/topic-selector-example1/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
+topic.topic/exampleTopic=exampleTopic
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/topic-selector-example2/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/topic-selector-example2/pom.xml b/examples/jms/topic-selector-example2/pom.xml
index 8f43b60..1738558 100644
--- a/examples/jms/topic-selector-example2/pom.xml
+++ b/examples/jms/topic-selector-example2/pom.xml
@@ -51,9 +51,6 @@
</goals>
<configuration>
<clientClass>org.apache.activemq.jms.example.TopicSelectorExample2</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/topic-selector-example2/src/main/java/org/apache/activemq/jms/example/TopicSelectorExample2.java
----------------------------------------------------------------------
diff --git a/examples/jms/topic-selector-example2/src/main/java/org/apache/activemq/jms/example/TopicSelectorExample2.java b/examples/jms/topic-selector-example2/src/main/java/org/apache/activemq/jms/example/TopicSelectorExample2.java
index e322ea1..49ab3f4 100644
--- a/examples/jms/topic-selector-example2/src/main/java/org/apache/activemq/jms/example/TopicSelectorExample2.java
+++ b/examples/jms/topic-selector-example2/src/main/java/org/apache/activemq/jms/example/TopicSelectorExample2.java
@@ -52,7 +52,7 @@ public class TopicSelectorExample2 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 topic
Topic topic = (Topic)initialContext.lookup("topic/exampleTopic");
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/topic-selector-example2/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/topic-selector-example2/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/topic-selector-example2/src/main/resources/activemq/server0/activemq-configuration.xml
new file mode 100644
index 0000000..7e6a27d
--- /dev/null
+++ b/examples/jms/topic-selector-example2/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 topic-->
+ <security-setting match="jms.topic.exampleTopic">
+ <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/topic-selector-example2/src/main/resources/activemq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/topic-selector-example2/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/topic-selector-example2/src/main/resources/activemq/server0/activemq-jms.xml
new file mode 100644
index 0000000..ab4841d
--- /dev/null
+++ b/examples/jms/topic-selector-example2/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 topic used by the example-->
+ <topic name="exampleTopic"/>
+
+</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/topic-selector-example2/src/main/resources/activemq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/topic-selector-example2/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/topic-selector-example2/src/main/resources/activemq/server0/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/topic-selector-example2/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/topic-selector-example2/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/topic-selector-example2/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/topic-selector-example2/src/main/resources/hornetq/server0/activemq-configuration.xml
deleted file mode 100644
index 0f134f2..0000000
--- a/examples/jms/topic-selector-example2/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>
-
-
- <!-- 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 topic-->
- <security-setting match="jms.topic.exampleTopic">
- <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/topic-selector-example2/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index ab4841d..0000000
--- a/examples/jms/topic-selector-example2/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 topic used by the example-->
- <topic name="exampleTopic"/>
-
-</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/topic-selector-example2/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/topic-selector-example2/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/topic-selector-example2/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/topic-selector-example2/src/main/resources/jndi.properties b/examples/jms/topic-selector-example2/src/main/resources/jndi.properties
new file mode 100644
index 0000000..4faa790
--- /dev/null
+++ b/examples/jms/topic-selector-example2/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
+topic.topic/exampleTopic=exampleTopic
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/topic/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/topic/pom.xml b/examples/jms/topic/pom.xml
index f7b8486..3511f51 100644
--- a/examples/jms/topic/pom.xml
+++ b/examples/jms/topic/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/topic/src/main/java/org/apache/activemq/jms/example/TopicExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/topic/src/main/java/org/apache/activemq/jms/example/TopicExample.java b/examples/jms/topic/src/main/java/org/apache/activemq/jms/example/TopicExample.java
index c729638..0d37e65 100644
--- a/examples/jms/topic/src/main/java/org/apache/activemq/jms/example/TopicExample.java
+++ b/examples/jms/topic/src/main/java/org/apache/activemq/jms/example/TopicExample.java
@@ -47,7 +47,7 @@ public class TopicExample 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 topic
Topic topic = (Topic)initialContext.lookup("topic/exampleTopic");
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/topic/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/topic/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/topic/src/main/resources/activemq/server0/activemq-configuration.xml
new file mode 100644
index 0000000..7e6a27d
--- /dev/null
+++ b/examples/jms/topic/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 topic-->
+ <security-setting match="jms.topic.exampleTopic">
+ <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/topic/src/main/resources/activemq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/topic/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/topic/src/main/resources/activemq/server0/activemq-jms.xml
new file mode 100644
index 0000000..ab4841d
--- /dev/null
+++ b/examples/jms/topic/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 topic used by the example-->
+ <topic name="exampleTopic"/>
+
+</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/topic/src/main/resources/activemq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/topic/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/topic/src/main/resources/activemq/server0/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/topic/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/topic/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/topic/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/topic/src/main/resources/hornetq/server0/activemq-configuration.xml
deleted file mode 100644
index 0f134f2..0000000
--- a/examples/jms/topic/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>
-
-
- <!-- 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 topic-->
- <security-setting match="jms.topic.exampleTopic">
- <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/topic/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index ab4841d..0000000
--- a/examples/jms/topic/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 topic used by the example-->
- <topic name="exampleTopic"/>
-
-</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/topic/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/topic/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/topic/src/main/resources/hornetq/server0/client-jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/topic/src/main/resources/hornetq/server0/client-jndi.properties b/examples/jms/topic/src/main/resources/hornetq/server0/client-jndi.properties
deleted file mode 100644
index 6940f75..0000000
--- a/examples/jms/topic/src/main/resources/hornetq/server0/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/topic/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/topic/src/main/resources/jndi.properties b/examples/jms/topic/src/main/resources/jndi.properties
new file mode 100644
index 0000000..4faa790
--- /dev/null
+++ b/examples/jms/topic/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
+topic.topic/exampleTopic=exampleTopic
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/transaction-failover/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/transaction-failover/pom.xml b/examples/jms/transaction-failover/pom.xml
index 177667e..d5c3b11 100644
--- a/examples/jms/transaction-failover/pom.xml
+++ b/examples/jms/transaction-failover/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>
@@ -78,10 +76,6 @@
</goals>
<configuration>
<clientClass>org.apache.activemq.jms.example.TransactionFailoverExample</clientClass>
- <args>
- <param>tcp://localhost:5445</param>
- <param>tcp://localhost:5446</param>
- </args>
<systemProperties>
<property>
<name>exampleConfigDir</name>
@@ -96,7 +90,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 +99,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/transaction-failover/src/main/java/org/apache/activemq/jms/example/TransactionFailoverExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/transaction-failover/src/main/java/org/apache/activemq/jms/example/TransactionFailoverExample.java b/examples/jms/transaction-failover/src/main/java/org/apache/activemq/jms/example/TransactionFailoverExample.java
index 3f31b6e..d9cbd95 100644
--- a/examples/jms/transaction-failover/src/main/java/org/apache/activemq/jms/example/TransactionFailoverExample.java
+++ b/examples/jms/transaction-failover/src/main/java/org/apache/activemq/jms/example/TransactionFailoverExample.java
@@ -54,7 +54,7 @@ public class TransactionFailoverExample extends ActiveMQExample
try
{
// Step 1. Get an initial context for looking up JNDI from the server #1
- initialContext = getContext(0);
+ initialContext = new InitialContext();
// Step 2. Look-up the JMS resources from JNDI
Queue queue = (Queue)initialContext.lookup("queue/exampleQueue");
@@ -155,7 +155,7 @@ public class TransactionFailoverExample extends ActiveMQExample
if (killServer)
{
- Thread.sleep(2000);
+ Thread.sleep(5000);
killServer(0);
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/transaction-failover/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/transaction-failover/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/transaction-failover/src/main/resources/activemq/server0/activemq-configuration.xml
new file mode 100644
index 0000000..5f96c16
--- /dev/null
+++ b/examples/jms/transaction-failover/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -0,0 +1,74 @@
+<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>
+
+ <ha-policy>
+ <shared-store>
+ <master/>
+ </shared-store>
+ </ha-policy>
+
+ <!-- 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>
+
+ <broadcast-groups>
+ <broadcast-group name="bg-group1">
+ <group-address>${udp-address:231.7.7.7}</group-address>
+ <group-port>9876</group-port>
+ <broadcast-period>1000</broadcast-period>
+ <connector-ref>netty-connector</connector-ref>
+ </broadcast-group>
+ </broadcast-groups>
+
+ <discovery-groups>
+ <discovery-group name="dg-group1">
+ <group-address>${udp-address:231.7.7.7}</group-address>
+ <group-port>9876</group-port>
+ <refresh-timeout>60000</refresh-timeout>
+ </discovery-group>
+ </discovery-groups>
+
+ <cluster-connections>
+ <cluster-connection name="my-cluster">
+ <address>jms</address>
+ <connector-ref>netty-connector</connector-ref>
+ <discovery-group-ref discovery-group-name="dg-group1"/>
+ </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>
+
+</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/transaction-failover/src/main/resources/activemq/server0/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/transaction-failover/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/transaction-failover/src/main/resources/activemq/server0/activemq-jms.xml
new file mode 100644
index 0000000..0d5c953
--- /dev/null
+++ b/examples/jms/transaction-failover/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/transaction-failover/src/main/resources/activemq/server0/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/transaction-failover/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/transaction-failover/src/main/resources/activemq/server0/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/transaction-failover/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/transaction-failover/src/main/resources/activemq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/transaction-failover/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/transaction-failover/src/main/resources/activemq/server1/activemq-configuration.xml
new file mode 100644
index 0000000..2089d76
--- /dev/null
+++ b/examples/jms/transaction-failover/src/main/resources/activemq/server1/activemq-configuration.xml
@@ -0,0 +1,74 @@
+<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>
+
+ <ha-policy>
+ <shared-store>
+ <slave/>
+ </shared-store>
+ </ha-policy>
+
+ <!-- Connectors -->
+ <connectors>
+ <connector name="netty-connector">
+ <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
+ <param key="port" value="5446"/>
+ </connector>
+ </connectors>
+
+ <!-- Acceptors -->
+ <acceptors>
+ <acceptor name="netty-acceptor">
+ <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
+ <param key="port" value="5446"/>
+ </acceptor>
+ </acceptors>
+
+ <broadcast-groups>
+ <broadcast-group name="bg-group1">
+ <group-address>${udp-address:231.7.7.7}</group-address>
+ <group-port>9876</group-port>
+ <broadcast-period>1000</broadcast-period>
+ <connector-ref>netty-connector</connector-ref>
+ </broadcast-group>
+ </broadcast-groups>
+
+ <discovery-groups>
+ <discovery-group name="dg-group1">
+ <group-address>${udp-address:231.7.7.7}</group-address>
+ <group-port>9876</group-port>
+ <refresh-timeout>60000</refresh-timeout>
+ </discovery-group>
+ </discovery-groups>
+
+ <cluster-connections>
+ <cluster-connection name="my-cluster">
+ <address>jms</address>
+ <connector-ref>netty-connector</connector-ref>
+ <discovery-group-ref discovery-group-name="dg-group1"/>
+ </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>
+
+</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/transaction-failover/src/main/resources/activemq/server1/activemq-jms.xml
----------------------------------------------------------------------
diff --git a/examples/jms/transaction-failover/src/main/resources/activemq/server1/activemq-jms.xml b/examples/jms/transaction-failover/src/main/resources/activemq/server1/activemq-jms.xml
new file mode 100644
index 0000000..0d5c953
--- /dev/null
+++ b/examples/jms/transaction-failover/src/main/resources/activemq/server1/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/transaction-failover/src/main/resources/activemq/server1/activemq-users.xml
----------------------------------------------------------------------
diff --git a/examples/jms/transaction-failover/src/main/resources/activemq/server1/activemq-users.xml b/examples/jms/transaction-failover/src/main/resources/activemq/server1/activemq-users.xml
new file mode 100644
index 0000000..ae30546
--- /dev/null
+++ b/examples/jms/transaction-failover/src/main/resources/activemq/server1/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/transaction-failover/src/main/resources/hornetq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/transaction-failover/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/transaction-failover/src/main/resources/hornetq/server0/activemq-configuration.xml
deleted file mode 100644
index 5f96c16..0000000
--- a/examples/jms/transaction-failover/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ /dev/null
@@ -1,74 +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>
-
- <ha-policy>
- <shared-store>
- <master/>
- </shared-store>
- </ha-policy>
-
- <!-- 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>
-
- <broadcast-groups>
- <broadcast-group name="bg-group1">
- <group-address>${udp-address:231.7.7.7}</group-address>
- <group-port>9876</group-port>
- <broadcast-period>1000</broadcast-period>
- <connector-ref>netty-connector</connector-ref>
- </broadcast-group>
- </broadcast-groups>
-
- <discovery-groups>
- <discovery-group name="dg-group1">
- <group-address>${udp-address:231.7.7.7}</group-address>
- <group-port>9876</group-port>
- <refresh-timeout>60000</refresh-timeout>
- </discovery-group>
- </discovery-groups>
-
- <cluster-connections>
- <cluster-connection name="my-cluster">
- <address>jms</address>
- <connector-ref>netty-connector</connector-ref>
- <discovery-group-ref discovery-group-name="dg-group1"/>
- </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>
-
-</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/transaction-failover/src/main/resources/hornetq/server0/activemq-jms.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index 0d5c953..0000000
--- a/examples/jms/transaction-failover/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/transaction-failover/src/main/resources/hornetq/server0/activemq-users.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/transaction-failover/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/transaction-failover/src/main/resources/hornetq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/transaction-failover/src/main/resources/hornetq/server1/activemq-configuration.xml b/examples/jms/transaction-failover/src/main/resources/hornetq/server1/activemq-configuration.xml
deleted file mode 100644
index 2089d76..0000000
--- a/examples/jms/transaction-failover/src/main/resources/hornetq/server1/activemq-configuration.xml
+++ /dev/null
@@ -1,74 +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>
-
- <ha-policy>
- <shared-store>
- <slave/>
- </shared-store>
- </ha-policy>
-
- <!-- Connectors -->
- <connectors>
- <connector name="netty-connector">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
- <param key="port" value="5446"/>
- </connector>
- </connectors>
-
- <!-- Acceptors -->
- <acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- <param key="port" value="5446"/>
- </acceptor>
- </acceptors>
-
- <broadcast-groups>
- <broadcast-group name="bg-group1">
- <group-address>${udp-address:231.7.7.7}</group-address>
- <group-port>9876</group-port>
- <broadcast-period>1000</broadcast-period>
- <connector-ref>netty-connector</connector-ref>
- </broadcast-group>
- </broadcast-groups>
-
- <discovery-groups>
- <discovery-group name="dg-group1">
- <group-address>${udp-address:231.7.7.7}</group-address>
- <group-port>9876</group-port>
- <refresh-timeout>60000</refresh-timeout>
- </discovery-group>
- </discovery-groups>
-
- <cluster-connections>
- <cluster-connection name="my-cluster">
- <address>jms</address>
- <connector-ref>netty-connector</connector-ref>
- <discovery-group-ref discovery-group-name="dg-group1"/>
- </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>
-
-</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/transaction-failover/src/main/resources/hornetq/server1/activemq-jms.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index 0d5c953..0000000
--- a/examples/jms/transaction-failover/src/main/resources/hornetq/server1/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/transaction-failover/src/main/resources/hornetq/server1/activemq-users.xml
----------------------------------------------------------------------
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
deleted file mode 100644
index ae30546..0000000
--- a/examples/jms/transaction-failover/src/main/resources/hornetq/server1/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/transaction-failover/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/transaction-failover/src/main/resources/jndi.properties b/examples/jms/transaction-failover/src/main/resources/jndi.properties
new file mode 100644
index 0000000..8fda7c0
--- /dev/null
+++ b/examples/jms/transaction-failover/src/main/resources/jndi.properties
@@ -0,0 +1,7 @@
+java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
+java.naming.provider.url=tcp://localhost:5445
+connection.ConnectionFactory.ha=true
+connection.ConnectionFactory.retryInterval=1000
+connection.ConnectionFactory.retryIntervalMultiplier=1.0
+connection.ConnectionFactory.reconnectAttempts=-1
+queue.queue/exampleQueue=exampleQueue
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/transactional/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/transactional/pom.xml b/examples/jms/transactional/pom.xml
index fd165b6..42738ab 100644
--- a/examples/jms/transactional/pom.xml
+++ b/examples/jms/transactional/pom.xml
@@ -51,9 +51,6 @@
</goals>
<configuration>
<clientClass>org.apache.activemq.jms.example.TransactionalExample</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>