[jboss-cvs] JBoss Messaging SVN: r6597 - in trunk: examples/javaee/common and 16 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Apr 28 09:19:19 EDT 2009
Author: jmesnil
Date: 2009-04-28 09:19:18 -0400 (Tue, 28 Apr 2009)
New Revision: 6597
Added:
trunk/examples/javaee/ejb-jms-transaction/config/jbm-jms.xml
trunk/examples/javaee/ejb-jms-transaction/config/jbm-queues.xml
trunk/examples/javaee/hajndi/config/
trunk/examples/javaee/hajndi/config/jbm-jms.xml
trunk/examples/javaee/hajndi/config/jbm-queues.xml
trunk/examples/javaee/jms-bridge/config/jbm-jms.xml
trunk/examples/javaee/jms-bridge/config/jbm-queues.xml
trunk/examples/javaee/mdb/config/jbm-jms.xml
trunk/examples/javaee/mdb/config/jbm-queues.xml
trunk/examples/javaee/servlet-transport/config/jbm-jms.xml
trunk/examples/javaee/servlet-transport/config/jbm-queues.xml
trunk/examples/javaee/xarecovery/config/jbm-jms.xml
trunk/examples/javaee/xarecovery/config/jbm-queues.xml
Removed:
trunk/src/config/jboss-as/clustered/jbm-jms.xml
trunk/src/config/jboss-as/clustered/jbm-queues.xml
trunk/src/config/jboss-as/non-clustered/jbm-jms.xml
trunk/src/config/jboss-as/non-clustered/jbm-queues.xml
Modified:
trunk/build-messaging.xml
trunk/examples/javaee/common/build.xml
trunk/examples/javaee/ejb-jms-transaction/build.xml
trunk/examples/javaee/hajndi/build.xml
trunk/examples/javaee/jms-bridge/build.xml
trunk/examples/javaee/jms-bridge/readme.html
trunk/examples/javaee/mdb-remote/build.xml
trunk/examples/javaee/mdb-remote/readme.html
trunk/examples/javaee/mdb-remote/server-config/jbm-jms.xml
trunk/examples/javaee/mdb-remote/server-config/jbm-queues.xml
trunk/examples/javaee/mdb/build.xml
trunk/examples/javaee/servlet-transport/
trunk/examples/javaee/servlet-transport/build.xml
trunk/examples/javaee/servlet-transport/readme.html
trunk/examples/javaee/xarecovery/readme.html
trunk/src/config/jboss-as/clustered/jbm-configuration.xml
trunk/src/config/jboss-as/non-clustered/jbm-configuration.xml
Log:
JBoss AS 5 profiles have 0 default configurations
* Profiles for JBoss AS 5 do not have default connection factories or queues
* updated the Java EE examples so they have their own configurations
Modified: trunk/build-messaging.xml
===================================================================
--- trunk/build-messaging.xml 2009-04-28 12:13:54 UTC (rev 6596)
+++ trunk/build-messaging.xml 2009-04-28 13:19:18 UTC (rev 6597)
@@ -579,6 +579,7 @@
<schema namespace="urn:jboss:messaging"
file="${src.schemas.dir}/jbm-configuration.xsd"/>
</schemavalidate>
+ <!--
<schemavalidate file="${conf.dir}/jbm-queues.xml">
<schema namespace="urn:jboss:messaging"
file="${src.schemas.dir}/jbm-queues.xsd"/>
@@ -586,7 +587,8 @@
<schemavalidate file="${conf.dir}/jbm-jms.xml">
<schema namespace="urn:jboss:messaging"
file="${src.schemas.dir}/jbm-jms.xsd"/>
- </schemavalidate>
+ </schemavalidate>
+ -->
</target>
<!-- ======================================================================================== -->
Modified: trunk/examples/javaee/common/build.xml
===================================================================
--- trunk/examples/javaee/common/build.xml 2009-04-28 12:13:54 UTC (rev 6596)
+++ trunk/examples/javaee/common/build.xml 2009-04-28 13:19:18 UTC (rev 6597)
@@ -112,17 +112,44 @@
</jar>
</target>
- <target name="deploy">
- <antcall target="do-deploy"></antcall>
+ <target name="deploy" depends="validate-jboss">
+ <property name="deploy.dir" value="${jboss.home}/server/default-with-jbm2/deploy/" />
+ <antcall target="deploy-resources">
+ <param name="deploy.dir" value="${deploy.dir}"/>
+ </antcall>
+ <antcall target="deploy-ear">
+ <param name="deploy.dir" value="${deploy.dir}"/>
+ </antcall>
+ <antcall target="deploy-misc">
+ <param name="deploy.dir" value="${deploy.dir}"/>
+ </antcall>
</target>
- <target name="do-deploy" depends="validate-jboss, ear">
+ <target name="deploy-ear" depends="ear">
<!-- some examples may choose to do a little extra on deploy and call this target directly -->
- <copy file="${build.dir}/mdb-example.ear" todir="${jboss.home}/server/default-with-jbm2/deploy"/>
+ <copy file="${build.dir}/mdb-example.ear" todir="${deploy.dir}"/>
</target>
+ <target name="deploy-resources">
+ <copy file="${example.config.dir}/jbm-queues.xml" todir="${deploy.dir}/messaging.sar/" failonerror="false" />
+ <copy file="${example.config.dir}/jbm-jms.xml" todir="${deploy.dir}/messaging.sar/" failonerror="false" />
+ <sleep seconds="5"/>
+ </target>
+
+ <target name="deploy-misc">
+ </target>
+
+ <target name="undeploy-misc">
+ </target>
+
<target name="undeploy" depends="validate-jboss">
- <delete file="${jboss.home}/server/default-with-jbm2/deploy/mdb-example.ear"/>
+ <property name="deploy.dir" value="${jboss.home}/server/default-with-jbm2/deploy/" />
+ <antcall target="undeploy-misc">
+ <param name="deploy.dir" value="${deploy.dir}"/>
+ </antcall>
+ <delete file="${deploy.dir}/mdb-example.ear"/>
+ <delete file="${deploy.dir}/messaging.sar/jbm-queues.xml" failonerror="false" />
+ <delete file="${deploy.dir}/messaging.sar/jbm-jms.xml" failonerror="false" />
</target>
<target name="validate-jboss">
Modified: trunk/examples/javaee/ejb-jms-transaction/build.xml
===================================================================
--- trunk/examples/javaee/ejb-jms-transaction/build.xml 2009-04-28 12:13:54 UTC (rev 6596)
+++ trunk/examples/javaee/ejb-jms-transaction/build.xml 2009-04-28 13:19:18 UTC (rev 6597)
@@ -25,7 +25,7 @@
<!-- =========================================================================================== -->
-<project default="run" name="JBoss Messaging Java EE EJB using JBM Example">
+<project default="run" name="JBoss Messaging Java EE EJB using JMS Example">
<import file="../common/build.xml"/>
Added: trunk/examples/javaee/ejb-jms-transaction/config/jbm-jms.xml
===================================================================
--- trunk/examples/javaee/ejb-jms-transaction/config/jbm-jms.xml (rev 0)
+++ trunk/examples/javaee/ejb-jms-transaction/config/jbm-jms.xml 2009-04-28 13:19:18 UTC (rev 6597)
@@ -0,0 +1,19 @@
+<deployment xmlns="urn:jboss:messaging"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
+
+ <connection-factory name="ConnectionFactory">
+ <connector-ref connector-name="netty-connector"/>
+ <entries>
+ <entry name="ConnectionFactory"/>
+ <entry name="/ConnectionFactory"/>
+ <entry name="/XAConnectionFactory"/>
+ <entry name="java:/ConnectionFactory"/>
+ <entry name="java:/XAConnectionFactory"/>
+ </entries>
+ </connection-factory>
+
+ <queue name="testQueue">
+ <entry name="/queue/testQueue"/>
+ </queue>
+</deployment>
\ No newline at end of file
Added: trunk/examples/javaee/ejb-jms-transaction/config/jbm-queues.xml
===================================================================
--- trunk/examples/javaee/ejb-jms-transaction/config/jbm-queues.xml (rev 0)
+++ trunk/examples/javaee/ejb-jms-transaction/config/jbm-queues.xml 2009-04-28 13:19:18 UTC (rev 6597)
@@ -0,0 +1,21 @@
+<settings xmlns="urn:jboss:messaging"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-queues.xsd ">
+
+ <security match="jms.queue.testQueue">
+ <permission type="consume" roles="guest,publisher"/>
+ <permission type="send" roles="guest,publisher"/>
+ </security>
+
+ <!--default for catch all-->
+ <address-settings match="#">
+ <clustered>false</clustered>
+ <dead-letter-address>jms.queue.DLQ</dead-letter-address>
+ <expiry-address>jms.queue.ExpiryQueue</expiry-address>
+ <redelivery-delay>0</redelivery-delay>
+ <max-size-bytes>-1</max-size-bytes>
+ <page-size-bytes>10485760</page-size-bytes>
+ <distribution-policy-class>org.jboss.messaging.core.server.impl.RoundRobinDistributor</distribution-policy-class>
+ <message-counter-history-day-limit>10</message-counter-history-day-limit>
+ </address-settings>
+</settings>
Modified: trunk/examples/javaee/hajndi/build.xml
===================================================================
--- trunk/examples/javaee/hajndi/build.xml 2009-04-28 12:13:54 UTC (rev 6596)
+++ trunk/examples/javaee/hajndi/build.xml 2009-04-28 13:19:18 UTC (rev 6597)
@@ -29,6 +29,32 @@
<import file="../common/build.xml"/>
+ <target name="deploy">
+ <property name="deploy.dir" value="${jboss.home}/server/all-with-jbm2/deploy/" />
+ <property name="deploy.dir2" value="${jboss.home}/server/all-with-jbm2_2/deploy/" />
+
+ <!-- copy 1st server resources configuration -->
+ <copy file="${example.config.dir}/jbm-queues.xml" todir="${deploy.dir}/messaging.sar/" overwrite="yes"/>
+ <copy file="${example.config.dir}/jbm-jms.xml" todir="${deploy.dir}/messaging.sar/" overwrite="yes"/>
+
+ <!-- copy 2nd server resources configuration -->
+ <copy file="${example.config.dir}/jbm-queues.xml" todir="${deploy.dir2}/messaging.sar/" overwrite="yes"/>
+ <copy file="${example.config.dir}/jbm-jms.xml" todir="${deploy.dir2}/messaging.sar/" overwrite="yes"/>
+ </target>
+
+ <target name="undeploy">
+ <property name="deploy.dir" value="${jboss.home}/server/all-with-jbm2/deploy/" />
+ <property name="deploy.dir2" value="${jboss.home}/server/all-with-jbm2_2/deploy/" />
+
+ <!-- delete 1st server resources configuration -->
+ <delete file="${deploy.dir}/messaging.sar/jbm-queues.xml" failonerror="false"/>
+ <delete file="${deploy.dir}/messaging.sar/jbm-jms.xml" failonerror="false"/>
+
+ <!-- delete 2nd server resources configuration -->
+ <delete file="${deploy.dir2}/messaging.sar/jbm-queues.xml" failonerror="false"/>
+ <delete file="${deploy.dir2}/messaging.sar/jbm-jms.xml" failonerror="false"/>
+ </target>
+
<target name="run">
<antcall target="runExample">
<param name="example.classname" value="org.jboss.javaee.example.HAJNDIExample"/>
Added: trunk/examples/javaee/hajndi/config/jbm-jms.xml
===================================================================
--- trunk/examples/javaee/hajndi/config/jbm-jms.xml (rev 0)
+++ trunk/examples/javaee/hajndi/config/jbm-jms.xml 2009-04-28 13:19:18 UTC (rev 6597)
@@ -0,0 +1,15 @@
+<deployment xmlns="urn:jboss:messaging"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
+
+ <connection-factory name="ConnectionFactory">
+ <connector-ref connector-name="netty-connector"/>
+ <entries>
+ <entry name="ConnectionFactory"/>
+ <entry name="/ConnectionFactory"/>
+ <entry name="/XAConnectionFactory"/>
+ <entry name="java:/ConnectionFactory"/>
+ <entry name="java:/XAConnectionFactory"/>
+ </entries>
+ </connection-factory>
+</deployment>
\ No newline at end of file
Added: trunk/examples/javaee/hajndi/config/jbm-queues.xml
===================================================================
--- trunk/examples/javaee/hajndi/config/jbm-queues.xml (rev 0)
+++ trunk/examples/javaee/hajndi/config/jbm-queues.xml 2009-04-28 13:19:18 UTC (rev 6597)
@@ -0,0 +1,21 @@
+<settings xmlns="urn:jboss:messaging"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-queues.xsd ">
+
+ <security match="jms.queue.testQueue">
+ <permission type="consume" roles="guest,publisher"/>
+ <permission type="send" roles="guest,publisher"/>
+ </security>
+
+ <!--default for catch all-->
+ <address-settings match="#">
+ <clustered>false</clustered>
+ <dead-letter-address>jms.queue.DLQ</dead-letter-address>
+ <expiry-address>jms.queue.ExpiryQueue</expiry-address>
+ <redelivery-delay>0</redelivery-delay>
+ <max-size-bytes>-1</max-size-bytes>
+ <page-size-bytes>10485760</page-size-bytes>
+ <distribution-policy-class>org.jboss.messaging.core.server.impl.RoundRobinDistributor</distribution-policy-class>
+ <message-counter-history-day-limit>10</message-counter-history-day-limit>
+ </address-settings>
+</settings>
Modified: trunk/examples/javaee/jms-bridge/build.xml
===================================================================
--- trunk/examples/javaee/jms-bridge/build.xml 2009-04-28 12:13:54 UTC (rev 6596)
+++ trunk/examples/javaee/jms-bridge/build.xml 2009-04-28 13:19:18 UTC (rev 6597)
@@ -35,4 +35,13 @@
</antcall>
</target>
+ <target name="deploy-misc">
+ <echo>Deploy JMS Bridge</echo>
+ <copy file="${example.config.dir}/jms-bridge-jboss-beans.xml" todir="${deploy.dir}" />
+ </target>
+
+ <target name="undeploy-misc">
+ <echo>Undeploy JMS Bridge</echo>
+ <delete file="${deploy.dir}/jms-bridge-jboss-beans.xml" />
+ </target>
</project>
\ No newline at end of file
Added: trunk/examples/javaee/jms-bridge/config/jbm-jms.xml
===================================================================
--- trunk/examples/javaee/jms-bridge/config/jbm-jms.xml (rev 0)
+++ trunk/examples/javaee/jms-bridge/config/jbm-jms.xml 2009-04-28 13:19:18 UTC (rev 6597)
@@ -0,0 +1,22 @@
+<deployment xmlns="urn:jboss:messaging"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
+
+ <connection-factory name="ConnectionFactory">
+ <connector-ref connector-name="netty-connector"/>
+ <entries>
+ <entry name="ConnectionFactory"/>
+ <entry name="/ConnectionFactory"/>
+ <entry name="/XAConnectionFactory"/>
+ <entry name="java:/ConnectionFactory"/>
+ <entry name="java:/XAConnectionFactory"/>
+ </entries>
+ </connection-factory>
+
+ <queue name="source">
+ <entry name="/queue/source"/>
+ </queue>
+ <queue name="target">
+ <entry name="/queue/target"/>
+ </queue>
+</deployment>
\ No newline at end of file
Added: trunk/examples/javaee/jms-bridge/config/jbm-queues.xml
===================================================================
--- trunk/examples/javaee/jms-bridge/config/jbm-queues.xml (rev 0)
+++ trunk/examples/javaee/jms-bridge/config/jbm-queues.xml 2009-04-28 13:19:18 UTC (rev 6597)
@@ -0,0 +1,10 @@
+<settings xmlns="urn:jboss:messaging"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-queues.xsd ">
+
+ <security match="jms.queue.#">
+ <permission type="consume" roles="guest,publisher"/>
+ <permission type="send" roles="guest,publisher"/>
+ </security>
+
+</settings>
Modified: trunk/examples/javaee/jms-bridge/readme.html
===================================================================
--- trunk/examples/javaee/jms-bridge/readme.html 2009-04-28 12:13:54 UTC (rev 6596)
+++ trunk/examples/javaee/jms-bridge/readme.html 2009-04-28 13:19:18 UTC (rev 6597)
@@ -41,11 +41,13 @@
</queue></code>
</pre>
+ <p>These 2 queues are deployed in the application server when you run <code>ant deploy</code>.</p>
+
<h3>JMS Bridge configuration</h3>
<p>The JMS Bridge is configured using JBoss microcontainer (<a href="config/jms-bridge-jboss-beans.xml">jms-bridge-jboss-beans.xml</a> contains comments about the various parameters
used to configure the bridge).<br />
- To setup the bridge in JBoss AS 5, copy <a href="config/jms-bridge-jboss-beans.xml">jms-bridge-jboss-beans.xml</a> to <code>${JBOSS_HOME}/server/default-with-jbm2/deploy/</code></p>
+ <p>The Bridge is deployed in the application server when you run <code>ant deploy</code> (it is copied to <code>${JBOSS_HOME}/server/default-with-jbm2/deploy/</code>).</p>
<h2>Example step-by-step</h2>
Modified: trunk/examples/javaee/mdb/build.xml
===================================================================
--- trunk/examples/javaee/mdb/build.xml 2009-04-28 12:13:54 UTC (rev 6596)
+++ trunk/examples/javaee/mdb/build.xml 2009-04-28 13:19:18 UTC (rev 6597)
@@ -34,5 +34,4 @@
<param name="example.classname" value="org.jboss.javaee.example.MDBClientExample"/>
</antcall>
</target>
-
</project>
\ No newline at end of file
Added: trunk/examples/javaee/mdb/config/jbm-jms.xml
===================================================================
--- trunk/examples/javaee/mdb/config/jbm-jms.xml (rev 0)
+++ trunk/examples/javaee/mdb/config/jbm-jms.xml 2009-04-28 13:19:18 UTC (rev 6597)
@@ -0,0 +1,19 @@
+<deployment xmlns="urn:jboss:messaging"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
+
+ <connection-factory name="ConnectionFactory">
+ <connector-ref connector-name="netty-connector"/>
+ <entries>
+ <entry name="ConnectionFactory"/>
+ <entry name="/ConnectionFactory"/>
+ <entry name="/XAConnectionFactory"/>
+ <entry name="java:/ConnectionFactory"/>
+ <entry name="java:/XAConnectionFactory"/>
+ </entries>
+ </connection-factory>
+
+ <queue name="testQueue">
+ <entry name="/queue/testQueue"/>
+ </queue>
+</deployment>
\ No newline at end of file
Added: trunk/examples/javaee/mdb/config/jbm-queues.xml
===================================================================
--- trunk/examples/javaee/mdb/config/jbm-queues.xml (rev 0)
+++ trunk/examples/javaee/mdb/config/jbm-queues.xml 2009-04-28 13:19:18 UTC (rev 6597)
@@ -0,0 +1,21 @@
+<settings xmlns="urn:jboss:messaging"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-queues.xsd ">
+
+ <security match="jms.queue.testQueue">
+ <permission type="consume" roles="guest,publisher"/>
+ <permission type="send" roles="guest,publisher"/>
+ </security>
+
+ <!--default for catch all-->
+ <address-settings match="#">
+ <clustered>false</clustered>
+ <dead-letter-address>jms.queue.DLQ</dead-letter-address>
+ <expiry-address>jms.queue.ExpiryQueue</expiry-address>
+ <redelivery-delay>0</redelivery-delay>
+ <max-size-bytes>-1</max-size-bytes>
+ <page-size-bytes>10485760</page-size-bytes>
+ <distribution-policy-class>org.jboss.messaging.core.server.impl.RoundRobinDistributor</distribution-policy-class>
+ <message-counter-history-day-limit>10</message-counter-history-day-limit>
+ </address-settings>
+</settings>
Modified: trunk/examples/javaee/mdb-remote/build.xml
===================================================================
--- trunk/examples/javaee/mdb-remote/build.xml 2009-04-28 12:13:54 UTC (rev 6596)
+++ trunk/examples/javaee/mdb-remote/build.xml 2009-04-28 13:19:18 UTC (rev 6597)
@@ -30,24 +30,48 @@
<import file="../common/build.xml"/>
<target name="deploy">
- <copy file="./server-config/jms-remote-ds.xml" todir="${jboss.home}/server/default-with-jbm2/deploy" overwrite="yes"/>
- <copy file="./server-config/jbm-queues.xml" tofile="${jboss.home}/server/default-with-jbm2/deploy/messaging.sar/jbm-queues.xml" overwrite="yes"/>
- <copy file="./server-config/jbm-jms.xml" tofile="${jboss.home}/server/default-with-jbm2/deploy/messaging.sar/jbm-jms.xml" overwrite="yes"/>
- <copy file="./server-config/jbm-queues.xml" tofile="${jboss.home}/server/default-with-jbm2_2/deploy/messaging.sar/jbm-queues.xml" overwrite="yes"/>
- <copy file="./server-config/jbm-jms.xml" tofile="${jboss.home}/server/default-with-jbm2_2/deploy/messaging.sar/jbm-jms.xml" overwrite="yes"/>
+ <property name="deploy.dir" value="${jboss.home}/server/default-with-jbm2/deploy/" />
+ <property name="deploy.dir2" value="${jboss.home}/server/default-with-jbm2_2/deploy/" />
- <copy todir="${jboss.home}/server/default-with-jbm2/deploy/example-jbm-ra.rar.tmp" overwrite="yes">
- <fileset dir="${jboss.home}/server/default-with-jbm2/deploy/jms-ra.rar" includes="**/*" excludes="META-INF/ra.xml"/>
- </copy>
- <copy file="./server-config/alternate-ra.xml" tofile="${jboss.home}/server/default-with-jbm2/deploy/example-jbm-ra.rar.tmp/META-INF/ra.xml" overwrite="yes"/>
- <!-- We need the deployment atomic. We only rename the file after the ra.xml was copied -->
- <move file="${jboss.home}/server/default-with-jbm2/deploy/example-jbm-ra.rar.tmp" tofile="${jboss.home}/server/default-with-jbm2/deploy/example-jbm-ra.rar" overwrite="yes"/>
- <sleep seconds="10"/>
- <antcall target="do-deploy"></antcall>
+ <!-- copy 1st server resources configuration -->
+ <copy file="./server-config/jms-remote-ds.xml" todir="${deploy.dir}" overwrite="yes"/>
+ <copy file="./server-config/jbm-queues.xml" tofile="${deploy.dir}/messaging.sar/jbm-queues.xml" overwrite="yes"/>
+ <copy file="./server-config/jbm-jms.xml" tofile="${deploy.dir}/messaging.sar/jbm-jms.xml" overwrite="yes"/>
+
+ <!-- copy 2nd server resources configuration -->
+ <copy file="./server-config/jbm-queues.xml" tofile="${deploy.dir2}/messaging.sar/jbm-queues.xml" overwrite="yes"/>
+ <copy file="./server-config/jbm-jms.xml" tofile="${deploy.dir2}/messaging.sar/jbm-jms.xml" overwrite="yes"/>
+
+ <copy todir="${deploy.dir}/example-jbm-ra.rar.tmp" overwrite="yes">
+ <fileset dir="${deploy.dir}/jms-ra.rar" includes="**/*" excludes="META-INF/ra.xml"/>
+ </copy>
+ <copy file="./server-config/alternate-ra.xml" tofile="${deploy.dir}/example-jbm-ra.rar.tmp/META-INF/ra.xml" overwrite="yes"/>
+ <!-- We need the deployment atomic. We only rename the file after the ra.xml was copied -->
+ <move file="${deploy.dir}/example-jbm-ra.rar.tmp" tofile="${deploy.dir}/example-jbm-ra.rar" overwrite="yes"/>
+ <sleep seconds="10"/>
+ <antcall target="deploy-ear">
+ <param name="deploy.dir" value="${deploy.dir}" />
+ </antcall>
</target>
-
-
+ <target name="undeploy">
+ <property name="deploy.dir" value="${jboss.home}/server/default-with-jbm2/deploy/" />
+ <property name="deploy.dir2" value="${jboss.home}/server/default-with-jbm2_2/deploy/" />
+
+ <delete file="${deploy.dir}/mdb-example.ear" failonerror="false"/>
+
+ <!-- delete 1st server resources configuration -->
+ <delete file="${deploy.dir}/jms-remote-ds.xml" failonerror="false"/>
+ <delete file="${deploy.dir}/messaging.sar/jbm-queues.xml" failonerror="false"/>
+ <delete file="${deploy.dir}/messaging.sar/jbm-jms.xml" failonerror="false"/>
+
+ <delete dir="${deploy.dir}/example-jbm-ra.rar" failonerror="false"/>
+
+ <!-- delete 2nd server resources configuration -->
+ <delete file="${deploy.dir2}/messaging.sar/jbm-queues.xml" failonerror="false"/>
+ <delete file="${deploy.dir2}/messaging.sar/jbm-jms.xml" failonerror="false"/>
+ </target>
+
<target name="run">
<antcall target="runExample">
<param name="example.classname" value="org.jboss.javaee.example.MDBRemoteClientExample"/>
Modified: trunk/examples/javaee/mdb-remote/readme.html
===================================================================
--- trunk/examples/javaee/mdb-remote/readme.html 2009-04-28 12:13:54 UTC (rev 6596)
+++ trunk/examples/javaee/mdb-remote/readme.html 2009-04-28 13:19:18 UTC (rev 6597)
@@ -139,7 +139,7 @@
the JBoss Messaging distribution. This will create a server profile called <code>$JBOSS_HOME/server/default-with-jbm2</code>.</li>
<li>Copy the directory <code>$JBOSS_HOME/server/default-with-jbm2</code> to <code>$JBOSS_HOME/server/default-with-jbm2_2</code>.</li>
<li>Start the first server with <code>./run.sh -c default-with-jbm2</code></li>
- <li>Start the second server with <code>./run.sh -c default-with-jbm2_2 -Djboss.service.binding.set=ports-01</li>
+ <li>Start the second server with <code>./run.sh -c default-with-jbm2_2 -Djboss.service.binding.set=ports-01</code></li>
</ol>
<h2>Example step-by-step</h2>
Modified: trunk/examples/javaee/mdb-remote/server-config/jbm-jms.xml
===================================================================
--- trunk/examples/javaee/mdb-remote/server-config/jbm-jms.xml 2009-04-28 12:13:54 UTC (rev 6596)
+++ trunk/examples/javaee/mdb-remote/server-config/jbm-jms.xml 2009-04-28 13:19:18 UTC (rev 6597)
@@ -1,14 +1,6 @@
<deployment xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
-
- <connection-factory name="testConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
- <entries>
- <entry name="testConnectionFactory"/>
- </entries>
- </connection-factory>
-
<connection-factory name="ConnectionFactory">
<connector-ref connector-name="netty-connector"/>
<entries>
@@ -20,175 +12,10 @@
</entries>
</connection-factory>
- <connection-factory name="ServerAckConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
- <entries>
- <entry name="ServerAckConnectionFactory"/>
- <entry name="/ServerAckConnectionFactory"/>
- <entry name="/ServerAckXAConnectionFactory"/>
- <entry name="java:/ServerAckConnectionFactory"/>
- <entry name="java:/ServerAckXAConnectionFactory"/>
- </entries>
- <pre-acknowledge>true</pre-acknowledge>
- </connection-factory>
-
- <connection-factory name="ClusteredConnectionFactory">
- <connector-ref connector-name="netty-connector" backup-connector-name="netty-backup"/>
- <entries>
- <entry name="/ClusteredConnectionFactory"/>
- <entry name="/ClusteredXAConnectionFactory"/>
- <entry name="java:/ClusteredConnectionFactory"/>
- <entry name="java:/ClusteredXAConnectionFactory"/>
- </entries>
- </connection-factory>
-
- <connection-factory name="ClusteredConnectionFactoryWithDiscovery">
- <discovery-group-ref discovery-group-name="dg-group1"/>
- <entries>
- <entry name="/ClusteredConnectionFactory"/>
- <entry name="/ClusteredXAConnectionFactory"/>
- <entry name="java:/ClusteredConnectionFactory"/>
- <entry name="java:/ClusteredXAConnectionFactory"/>
- </entries>
- </connection-factory>
-
- <connection-factory name="MyExampleConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
- <entries>
- <entry name="/MyExampleConnectionFactory"/>
- <entry name="/acme/MyExampleConnectionFactoryDupe"/>
- <entry name="java:/xyz/CF1"/>
- <entry name="java:/connectionfactories/acme/connection_factory"/>
- </entries>
- <ping-period>5000</ping-period>
- <call-timeout>30000</call-timeout>
- <!-- This is the window size in bytes to use when using consumer window based flow control -->
- <consumer-window-size>1048576</consumer-window-size>
- <!-- This is the maximum producer send rate that will be applied when using rate based consumer flow control -->
- <consumer-max-rate>5000</consumer-max-rate>
- <!-- This is the send window size in bytes -->
- <producer-window-size>1048576</producer-window-size>
- <!-- This is the maximum producer send rate that will be applied when using rate based producer flow control -->
- <producer-max-rate>100</producer-max-rate>
- <!-- When using this ConnectionFactory, messages beyond this limit are considered largeMessages and will be sent using smaller packets -->
- <min-large-message-size>10240</min-large-message-size>
- <!-- You can specify the default Client ID to use for connections created using this factory -->
- <client-id>MyClientID</client-id>
- <!-- The batch size in bytes to use when using the DUPS_OK_ACKNOWLEDGE acknowledgement mode -->
- <dups-ok-batch-size>1048576</dups-ok-batch-size>
- <!-- The batch size in bytes to use when using transactional sessions -->
- <transaction-batch-size>1048576</transaction-batch-size>
- <!--Whether or not we use a blocking call when acknowledging a message-->
- <block-on-acknowledge>false</block-on-acknowledge>
- <!--Whether we send non persistent messages synchronously-->
- <send-np-messages-synchronously>true</send-np-messages-synchronously>
- <!--Whether we send persistent messages synchronously-->
- <send-p-messages-synchronously>true</send-p-messages-synchronously>
- <!--If true, any connections will automatically set a unique group id (per producer) on every message sent-->
- <auto-group-id>true</auto-group-id>
- <!--if true then the server will pre ack any message before delivery to a consumer-->
- <pre-acknowledge>false</pre-acknowledge>
- </connection-factory>
-
- <connection-factory name="TestInVMConnectionFactory">
- <connector-ref connector-name="in-vm"/>
- <entries>
- <entry name="/TestInVMConnectionFactory"/>
- </entries>
- </connection-factory>
-
- <connection-factory name="TestSSLConnectionFactory">
- <connector-ref connector-name="netty-ssl"/>
- <entries>
- <entry name="/TestSSLConnectionFactory"/>
- </entries>
- </connection-factory>
-
- <connection-factory name="TestHttpConnectionFactory">
- <connector-ref connector-name="netty-http"/>
- <entries>
- <entry name="/TestHttpConnectionFactory"/>
- </entries>
- </connection-factory>
-
- <connection-factory name="TestServletConnectionFactory">
- <connector-ref connector-name="netty-servlet"/>
- <entries>
- <entry name="/TestServletConnectionFactory"/>
- </entries>
- </connection-factory>
-
- <queue name="MyQueue">
- <entry name="MyQueue"/>
- </queue>
- <queue name="DLQ">
- <entry name="/queue/DLQ"/>
- </queue>
- <queue name="ExpiryQueue">
- <entry name="/queue/ExpiryQueue"/>
- </queue>
- <topic name="testTopic">
- <entry name="/topic/testTopic"/>
- </topic>
- <topic name="topic.A">
- <entry name="/topic/topicA"/>
- </topic>
- <topic name="topic.B">
- <entry name="/topic/topicB"/>
- </topic>
- <topic name="securedTopic">
- <entry name="/topic/securedTopic"/>
- </topic>
- <topic name="testDurableTopic">
- <entry name="/topic/testDurableTopic"/>
- </topic>
- <queue name="testQueue">
- <entry name="/queue/testQueue"/>
- </queue>
- <queue name="testGroupQueue">
- <entry name="/queue/testGroupQueue"/>
- </queue>
- <queue name="testPerfQueue">
- <entry name="/queue/testPerfQueue"/>
- </queue>
<queue name="A">
<entry name="/queue/A"/>
</queue>
<queue name="B">
<entry name="/queue/B"/>
</queue>
- <queue name="C">
- <entry name="/queue/C"/>
- </queue>
- <queue name="D">
- <entry name="/queue/D"/>
- </queue>
- <queue name="ex">
- <entry name="/queue/ex"/>
- </queue>
- <queue name="PrivateDLQ">
- <entry name="/queue/PrivateDLQ"/>
- </queue>
- <queue name="PrivateExpiryQueue">
- <entry name="/queue/PrivateExpiryQueue"/>
- </queue>
- <queue name="QueueWithOwnDLQAndExpiryQueue">
- <entry name="/queue/QueueWithOwnDLQAndExpiryQueue"/>
- </queue>
- <topic name="TopicWithOwnDLQAndExpiryQueue">
- <entry name="/topic/QueueWithOwnDLQAndExpiryQueue"/>
- </topic>
- <queue name="QueueWithOwnRedeliveryDelay">
- <entry name="/queue/QueueWithOwnRedeliveryDelay"/>
- </queue>
- <topic name="TopicWithOwnRedeliveryDelay">
- <entry name="/topic/TopicWithOwnRedeliveryDelay"/>
- </topic>
- <queue name="testDistributedQueue">
- <entry name="/queue/testDistributedQueue"/>
- </queue>
- <topic name="testDistributedTopic">
- <entry name="/topic/testDistributedTopic"/>
- </topic>
-
</deployment>
\ No newline at end of file
Modified: trunk/examples/javaee/mdb-remote/server-config/jbm-queues.xml
===================================================================
--- trunk/examples/javaee/mdb-remote/server-config/jbm-queues.xml 2009-04-28 12:13:54 UTC (rev 6596)
+++ trunk/examples/javaee/mdb-remote/server-config/jbm-queues.xml 2009-04-28 13:19:18 UTC (rev 6597)
@@ -2,136 +2,9 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-queues.xsd ">
- <!-- manangement address -->
- <security match="jbm.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>
-
- <security match="jms.topic.testTopic">
- <permission type="createDurableQueue" roles="durpublisher"/>
- <permission type="deleteDurableQueue" roles="durpublisher"/>
- <permission type="consume" roles="guest,publisher,durpublisher"/>
- <permission type="send" roles="guest,publisher,durpublisher"/>
- </security>
-
- <security match="jms.topic.securedTopic">
- <permission type="send" roles="publisher"/>
- <permission type="consume" roles="publisher"/>
- </security>
-
- <security match="jms.topic.testDurableTopic">
- <permission type="createDurableQueue" roles="durpublisher"/>
- <permission type="deleteDurableQueue" roles="durpublisher"/>
- <permission type="consume" roles="guest,publisher,durpublisher"/>
- <permission type="send" roles="guest,publisher,durpublisher"/>
- </security>
-
- <security match="jms.queue.testQueue">
+ <security match="jms.queue.#">
<permission type="consume" roles="guest,publisher"/>
<permission type="send" roles="guest,publisher"/>
</security>
- <security match="jms.queue.NoSuchQueue">
- <permission type="consume" roles="guest,publisher"/>
- <permission type="send" roles="guest,publisher"/>
- </security>
-
- <security match="jms.topic.NoSuchTopic">
- <permission type="consume" roles="guest,publisher"/>
- <permission type="send" roles="guest,publisher"/>
- </security>
-
- <security match="jms.tempqueue.#">
- <permission type="createTempQueue" roles="guest,def"/>
- <permission type="deleteTempQueue" roles="guest,def"/>
- <permission type="consume" roles="guest,def"/>
- <permission type="send" roles="guest,def"/>
- </security>
-
- <security match="jms.temptopic.#">
- <permission type="createTempQueue" roles="guest,def"/>
- <permission type="deleteTempQueue" roles="guest,def"/>
- <permission type="consume" roles="guest,def"/>
- <permission type="send" roles="guest,def"/>
- </security>
-
- <!--this will catch any word i.e. jms.queue.anything-->
- <!--<security match="jms.queue.#">
- <permission type="consume" roles="guest,publisher"/>
- <permission type="send" roles="guest,publisher"/>
- </security>-->
-
- <!--this will catch any word i.e. jms.queue.anything-->
- <!--<security match="jms.topic.#">
- <permission type="consume" roles="guest,publisher"/>
- <permission type="send" roles="guest,publisher"/>
- </security>-->
-
- <!--default security to catch all-->
- <security match="#">
- <permission type="createDurableQueue" roles="guest,def"/>
- <permission type="deleteDurableQueue" roles="guest,def"/>
- <permission type="createTempQueue" roles="guest,def"/>
- <permission type="deleteTempQueue" roles="guest,def"/>
- <permission type="consume" roles="guest,def"/>
- <permission type="send" roles="guest,def"/>
- </security>
-
- <address-settings match="jms.queue.QueueWithOwnDLQAndExpiryQueue">
- <dead-letter-address>jms.queue.PrivateDLQ</dead-letter-address>
- <expiry-address>jms.queue.PrivateExpiryQueue</expiry-address>
- </address-settings>
-
- <address-settings match="jms.topic.TopicWithOwnDLQAndExpiryQueue">
- <dead-letter-address>jms.queue.PrivateDLQ</dead-letter-address>
- <expiry-address>jms.queue.PrivateExpiryQueue</expiry-address>
- </address-settings>
-
- <address-settings match="jms.queue.QueueWithOwnRedeliveryDelay">
- <redelivery-delay>5000</redelivery-delay>
- </address-settings>
-
- <address-settings match="jms.topic.TopicWithOwnRedeliveryDelay">
- <redelivery-delay>5000</redelivery-delay>
- </address-settings>
-
- <address-settings match="jms.queue.testDistributedQueue">
- <clustered>true</clustered>
- </address-settings>
-
- <address-settings match="jms.topic.testDistributedTopic">
- <clustered>true</clustered>
- </address-settings>
-
- <address-settings match="jms.queue.testPerfQueue">
- <clustered>false</clustered>
- </address-settings>
-
- <address-settings match="jms.queue.MyQueue">
- <max-size-bytes>-1</max-size-bytes>
- <page-size-bytes>10485760</page-size-bytes>
- <drop-messages-when-full>false</drop-messages-when-full>
- </address-settings>
-
- <address-settings match="jms.queue.testGroupQueue">
- <max-size-bytes>-1</max-size-bytes>
- <page-size-bytes>10485760</page-size-bytes>
- <drop-messages-when-full>false</drop-messages-when-full>
- <distribution-policy-class>org.jboss.messaging.core.server.impl.GroupingRoundRobinDistributor</distribution-policy-class>
- </address-settings>
-
- <!--default for catch all-->
- <address-settings match="#">
- <clustered>false</clustered>
- <dead-letter-address>jms.queue.DLQ</dead-letter-address>
- <expiry-address>jms.queue.ExpiryQueue</expiry-address>
- <redelivery-delay>0</redelivery-delay>
- <max-size-bytes>-1</max-size-bytes>
- <page-size-bytes>10485760</page-size-bytes>
- <distribution-policy-class>org.jboss.messaging.core.server.impl.RoundRobinDistributor</distribution-policy-class>
- <message-counter-history-day-limit>10</message-counter-history-day-limit>
- </address-settings>
</settings>
Property changes on: trunk/examples/javaee/servlet-transport
___________________________________________________________________
Name: svn:ignore
+ build
Modified: trunk/examples/javaee/servlet-transport/build.xml
===================================================================
--- trunk/examples/javaee/servlet-transport/build.xml 2009-04-28 12:13:54 UTC (rev 6596)
+++ trunk/examples/javaee/servlet-transport/build.xml 2009-04-28 13:19:18 UTC (rev 6597)
@@ -29,22 +29,23 @@
<import file="../common/build.xml"/>
- <target name="deploy-servlet">
- <copy todir="${jboss.home}/server/default-with-jbm2/deploy/jms-servlet.war">
- <fileset dir="config/jms-servlet.war"/>
+ <target name="deploy-misc">
+ <echo>Deploy Servlet</echo>
+ <copy todir="${deploy.dir}/jms-servlet.war">
+ <fileset dir="${example.config.dir}/jms-servlet.war"/>
</copy>
<sleep seconds="5"/>
</target>
+
+ <target name="undeploy-misc">
+ <echo>Undeploy Servelt</echo>
+ <delete dir="${deploy.dir}/jms-servlet.war" />
+ </target>
- <target name="undeploy-servlet">
- <delete dir="${jboss.home}/server/default-with-jbm2/deploy/jms-servlet.war" quiet="true"/>
- </target>
-
- <target name="run" depends="deploy-servlet">
+ <target name="run">
<antcall target="runExample">
<param name="example.classname" value="org.jboss.javaee.example.ServletTransportExample"/>
</antcall>
- <antcall target="undeploy-servlet"/>
</target>
</project>
Added: trunk/examples/javaee/servlet-transport/config/jbm-jms.xml
===================================================================
--- trunk/examples/javaee/servlet-transport/config/jbm-jms.xml (rev 0)
+++ trunk/examples/javaee/servlet-transport/config/jbm-jms.xml 2009-04-28 13:19:18 UTC (rev 6597)
@@ -0,0 +1,15 @@
+<deployment xmlns="urn:jboss:messaging"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
+
+ <connection-factory name="TestServletConnectionFactory">
+ <connector-ref connector-name="netty-servlet"/>
+ <entries>
+ <entry name="/TestServletConnectionFactory"/>
+ </entries>
+ </connection-factory>
+
+ <queue name="testQueue">
+ <entry name="/queue/testQueue"/>
+ </queue>
+</deployment>
\ No newline at end of file
Added: trunk/examples/javaee/servlet-transport/config/jbm-queues.xml
===================================================================
--- trunk/examples/javaee/servlet-transport/config/jbm-queues.xml (rev 0)
+++ trunk/examples/javaee/servlet-transport/config/jbm-queues.xml 2009-04-28 13:19:18 UTC (rev 6597)
@@ -0,0 +1,21 @@
+<settings xmlns="urn:jboss:messaging"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-queues.xsd ">
+
+ <security match="jms.queue.testQueue">
+ <permission type="consume" roles="guest,publisher"/>
+ <permission type="send" roles="guest,publisher"/>
+ </security>
+
+ <!--default for catch all-->
+ <address-settings match="#">
+ <clustered>false</clustered>
+ <dead-letter-address>jms.queue.DLQ</dead-letter-address>
+ <expiry-address>jms.queue.ExpiryQueue</expiry-address>
+ <redelivery-delay>0</redelivery-delay>
+ <max-size-bytes>-1</max-size-bytes>
+ <page-size-bytes>10485760</page-size-bytes>
+ <distribution-policy-class>org.jboss.messaging.core.server.impl.RoundRobinDistributor</distribution-policy-class>
+ <message-counter-history-day-limit>10</message-counter-history-day-limit>
+ </address-settings>
+</settings>
Modified: trunk/examples/javaee/servlet-transport/readme.html
===================================================================
--- trunk/examples/javaee/servlet-transport/readme.html 2009-04-28 12:13:54 UTC (rev 6596)
+++ trunk/examples/javaee/servlet-transport/readme.html 2009-04-28 13:19:18 UTC (rev 6597)
@@ -63,11 +63,12 @@
</ol>
</p>
<h2>Example step-by-step</h2>
- <p><i>To run the example, first you need to install a JBoss AS 5 server and set JBOSS_HOME environment accordingly.
- Then you need to create a AS server profile with JBoss Messaging service, and start AS with that profile.
- From this directory, type <code>ant</code>. This will cause the servlet to be deployed to AS and then it runs
- the example undeploy the servlet in the end.</i></p>
-
+ <p><em>To run the example, first you need to install a JBoss AS 5 server and set JBOSS_HOME environment accordingly.
+ Then you need to create a AS server profile with JBoss Messaging service, and start AS with that profile.</p>
+ From this directory, type <code>ant deploy</code> to deploy resources in the application server (including the WAR).</br >
+ Type <code>ant</code> to run the example.<br />
+ Finally type <code>ant undeploy</code> to undeploy the example resources from the application server.</em></p>
+
<br>
<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>
Added: trunk/examples/javaee/xarecovery/config/jbm-jms.xml
===================================================================
--- trunk/examples/javaee/xarecovery/config/jbm-jms.xml (rev 0)
+++ trunk/examples/javaee/xarecovery/config/jbm-jms.xml 2009-04-28 13:19:18 UTC (rev 6597)
@@ -0,0 +1,19 @@
+<deployment xmlns="urn:jboss:messaging"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
+
+ <connection-factory name="ConnectionFactory">
+ <connector-ref connector-name="netty-connector"/>
+ <entries>
+ <entry name="ConnectionFactory"/>
+ <entry name="/ConnectionFactory"/>
+ <entry name="/XAConnectionFactory"/>
+ <entry name="java:/ConnectionFactory"/>
+ <entry name="java:/XAConnectionFactory"/>
+ </entries>
+ </connection-factory>
+
+ <queue name="testQueue">
+ <entry name="/queue/testQueue"/>
+ </queue>
+</deployment>
\ No newline at end of file
Added: trunk/examples/javaee/xarecovery/config/jbm-queues.xml
===================================================================
--- trunk/examples/javaee/xarecovery/config/jbm-queues.xml (rev 0)
+++ trunk/examples/javaee/xarecovery/config/jbm-queues.xml 2009-04-28 13:19:18 UTC (rev 6597)
@@ -0,0 +1,21 @@
+<settings xmlns="urn:jboss:messaging"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-queues.xsd ">
+
+ <security match="jms.queue.testQueue">
+ <permission type="consume" roles="guest,publisher"/>
+ <permission type="send" roles="guest,publisher"/>
+ </security>
+
+ <!--default for catch all-->
+ <address-settings match="#">
+ <clustered>false</clustered>
+ <dead-letter-address>jms.queue.DLQ</dead-letter-address>
+ <expiry-address>jms.queue.ExpiryQueue</expiry-address>
+ <redelivery-delay>0</redelivery-delay>
+ <max-size-bytes>-1</max-size-bytes>
+ <page-size-bytes>10485760</page-size-bytes>
+ <distribution-policy-class>org.jboss.messaging.core.server.impl.RoundRobinDistributor</distribution-policy-class>
+ <message-counter-history-day-limit>10</message-counter-history-day-limit>
+ </address-settings>
+</settings>
Modified: trunk/examples/javaee/xarecovery/readme.html
===================================================================
--- trunk/examples/javaee/xarecovery/readme.html 2009-04-28 12:13:54 UTC (rev 6596)
+++ trunk/examples/javaee/xarecovery/readme.html 2009-04-28 13:19:18 UTC (rev 6597)
@@ -33,12 +33,12 @@
</pre>
<p>This informs the Recovery Manager that it can recovers JBoss Messaging XA Resources using the <code>XAConnectionFactory</code> bound to <code>java:/XAConnectionFactory</code> in JNDI
- (as it is configured in <code>$JBOSS_HOME/server/default-with-jbm2/deploy/messaging.sar/jbm-jms.xml</code>).</p>
+ (as it is configured in <a href="config/jbm-jms.xml">jbm-jms.xml</a> which will be deployed to <code>$JBOSS_HOME/server/default-with-jbm2/deploy/messaging.sar/</code>).</p>
<h2>Example step-by-step</h2>
- <p><em>You need to start JBoss AS 5 with the <code>default-with-jbm2</code> configuration.<br />
- To deploy the example, type <code>ant deploy</code> from this directory<br />
+ <p><em>You need to deploy the example <em>before starting the server</em>, type <code>ant deploy</code> from this directory<br />
+ You need to start JBoss AS 5 with the <code>default-with-jbm2</code> configuration.<br />
Once the example is deployed in JBoss AS 5, type <code>ant sender</code> to start the example.
This will also crash the server, you will need to restart it.<br />
Once it is restarted, type <code>ant receiver</code> to receive the JMS messages which was recovered.<br />
Modified: trunk/src/config/jboss-as/clustered/jbm-configuration.xml
===================================================================
--- trunk/src/config/jboss-as/clustered/jbm-configuration.xml 2009-04-28 12:13:54 UTC (rev 6596)
+++ trunk/src/config/jboss-as/clustered/jbm-configuration.xml 2009-04-28 13:19:18 UTC (rev 6597)
@@ -82,7 +82,7 @@
<param key="jbm.remoting.netty.port" value="${jbm.remoting.netty.port}" type="Integer"/>
</acceptor>
- <!-- Netty In VM Acceptor, needed for the servlet transport-->
+ <!-- Netty In VM Acceptor -->
<!--
<acceptor name="netty-invm">
<factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
Deleted: trunk/src/config/jboss-as/clustered/jbm-jms.xml
===================================================================
--- trunk/src/config/jboss-as/clustered/jbm-jms.xml 2009-04-28 12:13:54 UTC (rev 6596)
+++ trunk/src/config/jboss-as/clustered/jbm-jms.xml 2009-04-28 13:19:18 UTC (rev 6597)
@@ -1,194 +0,0 @@
-<deployment xmlns="urn:jboss:messaging"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
-
- <connection-factory name="testConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
- <entries>
- <entry name="testConnectionFactory"/>
- </entries>
- </connection-factory>
-
- <connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
- <entries>
- <entry name="ConnectionFactory"/>
- <entry name="/ConnectionFactory"/>
- <entry name="/XAConnectionFactory"/>
- <entry name="java:/ConnectionFactory"/>
- <entry name="java:/XAConnectionFactory"/>
- </entries>
- </connection-factory>
-
- <connection-factory name="ServerAckConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
- <entries>
- <entry name="ServerAckConnectionFactory"/>
- <entry name="/ServerAckConnectionFactory"/>
- <entry name="/ServerAckXAConnectionFactory"/>
- <entry name="java:/ServerAckConnectionFactory"/>
- <entry name="java:/ServerAckXAConnectionFactory"/>
- </entries>
- <pre-acknowledge>true</pre-acknowledge>
- </connection-factory>
-
- <connection-factory name="ClusteredConnectionFactory">
- <connector-ref connector-name="netty-connector" backup-connector-name="netty-backup"/>
- <entries>
- <entry name="/ClusteredConnectionFactory"/>
- <entry name="/ClusteredXAConnectionFactory"/>
- <entry name="java:/ClusteredConnectionFactory"/>
- <entry name="java:/ClusteredXAConnectionFactory"/>
- </entries>
- </connection-factory>
-
- <connection-factory name="ClusteredConnectionFactoryWithDiscovery">
- <discovery-group-ref discovery-group-name="dg-group1"/>
- <entries>
- <entry name="/ClusteredConnectionFactory"/>
- <entry name="/ClusteredXAConnectionFactory"/>
- <entry name="java:/ClusteredConnectionFactory"/>
- <entry name="java:/ClusteredXAConnectionFactory"/>
- </entries>
- </connection-factory>
-
- <connection-factory name="MyExampleConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
- <entries>
- <entry name="/MyExampleConnectionFactory"/>
- <entry name="/acme/MyExampleConnectionFactoryDupe"/>
- <entry name="java:/xyz/CF1"/>
- <entry name="java:/connectionfactories/acme/connection_factory"/>
- </entries>
- <ping-period>5000</ping-period>
- <call-timeout>30000</call-timeout>
- <!-- This is the window size in bytes to use when using consumer window based flow control -->
- <consumer-window-size>1048576</consumer-window-size>
- <!-- This is the maximum producer send rate that will be applied when using rate based consumer flow control -->
- <consumer-max-rate>5000</consumer-max-rate>
- <!-- This is the send window size in bytes -->
- <producer-window-size>1048576</producer-window-size>
- <!-- This is the maximum producer send rate that will be applied when using rate based producer flow control -->
- <producer-max-rate>100</producer-max-rate>
- <!-- When using this ConnectionFactory, messages beyond this limit are considered largeMessages and will be sent using smaller packets -->
- <min-large-message-size>10240</min-large-message-size>
- <!-- You can specify the default Client ID to use for connections created using this factory -->
- <client-id>MyClientID</client-id>
- <!-- The batch size in bytes to use when using the DUPS_OK_ACKNOWLEDGE acknowledgement mode -->
- <dups-ok-batch-size>1048576</dups-ok-batch-size>
- <!-- The batch size in bytes to use when using transactional sessions -->
- <transaction-batch-size>1048576</transaction-batch-size>
- <!--Whether or not we use a blocking call when acknowledging a message-->
- <block-on-acknowledge>false</block-on-acknowledge>
- <!--Whether we send non persistent messages synchronously-->
- <send-np-messages-synchronously>true</send-np-messages-synchronously>
- <!--Whether we send persistent messages synchronously-->
- <send-p-messages-synchronously>true</send-p-messages-synchronously>
- <!--If true, any connections will automatically set a unique group id (per producer) on every message sent-->
- <auto-group-id>true</auto-group-id>
- <!--if true then the server will pre ack any message before delivery to a consumer-->
- <pre-acknowledge>false</pre-acknowledge>
- </connection-factory>
-
- <connection-factory name="TestInVMConnectionFactory">
- <connector-ref connector-name="in-vm"/>
- <entries>
- <entry name="/TestInVMConnectionFactory"/>
- </entries>
- </connection-factory>
-
- <connection-factory name="TestSSLConnectionFactory">
- <connector-ref connector-name="netty-ssl"/>
- <entries>
- <entry name="/TestSSLConnectionFactory"/>
- </entries>
- </connection-factory>
-
- <connection-factory name="TestHttpConnectionFactory">
- <connector-ref connector-name="netty-http"/>
- <entries>
- <entry name="/TestHttpConnectionFactory"/>
- </entries>
- </connection-factory>
-
- <connection-factory name="TestServletConnectionFactory">
- <connector-ref connector-name="netty-servlet"/>
- <entries>
- <entry name="/TestServletConnectionFactory"/>
- </entries>
- </connection-factory>
-
- <queue name="MyQueue">
- <entry name="MyQueue"/>
- </queue>
- <queue name="DLQ">
- <entry name="/queue/DLQ"/>
- </queue>
- <queue name="ExpiryQueue">
- <entry name="/queue/ExpiryQueue"/>
- </queue>
- <topic name="testTopic">
- <entry name="/topic/testTopic"/>
- </topic>
- <topic name="topic.A">
- <entry name="/topic/topicA"/>
- </topic>
- <topic name="topic.B">
- <entry name="/topic/topicB"/>
- </topic>
- <topic name="securedTopic">
- <entry name="/topic/securedTopic"/>
- </topic>
- <topic name="testDurableTopic">
- <entry name="/topic/testDurableTopic"/>
- </topic>
- <queue name="testQueue">
- <entry name="/queue/testQueue"/>
- </queue>
- <queue name="testGroupQueue">
- <entry name="/queue/testGroupQueue"/>
- </queue>
- <queue name="testPerfQueue">
- <entry name="/queue/testPerfQueue"/>
- </queue>
- <queue name="A">
- <entry name="/queue/A"/>
- </queue>
- <queue name="B">
- <entry name="/queue/B"/>
- </queue>
- <queue name="C">
- <entry name="/queue/C"/>
- </queue>
- <queue name="D">
- <entry name="/queue/D"/>
- </queue>
- <queue name="ex">
- <entry name="/queue/ex"/>
- </queue>
- <queue name="PrivateDLQ">
- <entry name="/queue/PrivateDLQ"/>
- </queue>
- <queue name="PrivateExpiryQueue">
- <entry name="/queue/PrivateExpiryQueue"/>
- </queue>
- <queue name="QueueWithOwnDLQAndExpiryQueue">
- <entry name="/queue/QueueWithOwnDLQAndExpiryQueue"/>
- </queue>
- <topic name="TopicWithOwnDLQAndExpiryQueue">
- <entry name="/topic/QueueWithOwnDLQAndExpiryQueue"/>
- </topic>
- <queue name="QueueWithOwnRedeliveryDelay">
- <entry name="/queue/QueueWithOwnRedeliveryDelay"/>
- </queue>
- <topic name="TopicWithOwnRedeliveryDelay">
- <entry name="/topic/TopicWithOwnRedeliveryDelay"/>
- </topic>
- <queue name="testDistributedQueue">
- <entry name="/queue/testDistributedQueue"/>
- </queue>
- <topic name="testDistributedTopic">
- <entry name="/topic/testDistributedTopic"/>
- </topic>
-
-</deployment>
\ No newline at end of file
Deleted: trunk/src/config/jboss-as/clustered/jbm-queues.xml
===================================================================
--- trunk/src/config/jboss-as/clustered/jbm-queues.xml 2009-04-28 12:13:54 UTC (rev 6596)
+++ trunk/src/config/jboss-as/clustered/jbm-queues.xml 2009-04-28 13:19:18 UTC (rev 6597)
@@ -1,137 +0,0 @@
-<settings xmlns="urn:jboss:messaging"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-queues.xsd ">
-
- <!-- manangement address -->
- <security match="jbm.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>
-
- <security match="jms.topic.testTopic">
- <permission type="createDurableQueue" roles="durpublisher"/>
- <permission type="deleteDurableQueue" roles="durpublisher"/>
- <permission type="consume" roles="guest,publisher,durpublisher"/>
- <permission type="send" roles="guest,publisher,durpublisher"/>
- </security>
-
- <security match="jms.topic.securedTopic">
- <permission type="send" roles="publisher"/>
- <permission type="consume" roles="publisher"/>
- </security>
-
- <security match="jms.topic.testDurableTopic">
- <permission type="createDurableQueue" roles="durpublisher"/>
- <permission type="deleteDurableQueue" roles="durpublisher"/>
- <permission type="consume" roles="guest,publisher,durpublisher"/>
- <permission type="send" roles="guest,publisher,durpublisher"/>
- </security>
-
- <security match="jms.queue.testQueue">
- <permission type="consume" roles="guest,publisher"/>
- <permission type="send" roles="guest,publisher"/>
- </security>
-
- <security match="jms.queue.NoSuchQueue">
- <permission type="consume" roles="guest,publisher"/>
- <permission type="send" roles="guest,publisher"/>
- </security>
-
- <security match="jms.topic.NoSuchTopic">
- <permission type="consume" roles="guest,publisher"/>
- <permission type="send" roles="guest,publisher"/>
- </security>
-
- <security match="jms.tempqueue.#">
- <permission type="createTempQueue" roles="guest,def"/>
- <permission type="deleteTempQueue" roles="guest,def"/>
- <permission type="consume" roles="guest,def"/>
- <permission type="send" roles="guest,def"/>
- </security>
-
- <security match="jms.temptopic.#">
- <permission type="createTempQueue" roles="guest,def"/>
- <permission type="deleteTempQueue" roles="guest,def"/>
- <permission type="consume" roles="guest,def"/>
- <permission type="send" roles="guest,def"/>
- </security>
-
- <!--this will catch any word i.e. jms.queue.anything-->
- <!--<security match="jms.queue.#">
- <permission type="consume" roles="guest,publisher"/>
- <permission type="send" roles="guest,publisher"/>
- </security>-->
-
- <!--this will catch any word i.e. jms.queue.anything-->
- <!--<security match="jms.topic.#">
- <permission type="consume" roles="guest,publisher"/>
- <permission type="send" roles="guest,publisher"/>
- </security>-->
-
- <!--default security to catch all-->
- <security match="#">
- <permission type="createDurableQueue" roles="guest,def"/>
- <permission type="deleteDurableQueue" roles="guest,def"/>
- <permission type="createTempQueue" roles="guest,def"/>
- <permission type="deleteTempQueue" roles="guest,def"/>
- <permission type="consume" roles="guest,def"/>
- <permission type="send" roles="guest,def"/>
- </security>
-
- <address-settings match="jms.queue.QueueWithOwnDLQAndExpiryQueue">
- <dead-letter-address>jms.queue.PrivateDLQ</dead-letter-address>
- <expiry-address>jms.queue.PrivateExpiryQueue</expiry-address>
- </address-settings>
-
- <address-settings match="jms.topic.TopicWithOwnDLQAndExpiryQueue">
- <dead-letter-address>jms.queue.PrivateDLQ</dead-letter-address>
- <expiry-address>jms.queue.PrivateExpiryQueue</expiry-address>
- </address-settings>
-
- <address-settings match="jms.queue.QueueWithOwnRedeliveryDelay">
- <redelivery-delay>5000</redelivery-delay>
- </address-settings>
-
- <address-settings match="jms.topic.TopicWithOwnRedeliveryDelay">
- <redelivery-delay>5000</redelivery-delay>
- </address-settings>
-
- <address-settings match="jms.queue.testDistributedQueue">
- <clustered>true</clustered>
- </address-settings>
-
- <address-settings match="jms.topic.testDistributedTopic">
- <clustered>true</clustered>
- </address-settings>
-
- <address-settings match="jms.queue.testPerfQueue">
- <clustered>false</clustered>
- </address-settings>
-
- <address-settings match="jms.queue.MyQueue">
- <max-size-bytes>-1</max-size-bytes>
- <page-size-bytes>10485760</page-size-bytes>
- <drop-messages-when-full>false</drop-messages-when-full>
- </address-settings>
-
- <address-settings match="jms.queue.testGroupQueue">
- <max-size-bytes>-1</max-size-bytes>
- <page-size-bytes>10485760</page-size-bytes>
- <drop-messages-when-full>false</drop-messages-when-full>
- <distribution-policy-class>org.jboss.messaging.core.server.impl.GroupingRoundRobinDistributor</distribution-policy-class>
- </address-settings>
-
- <!--default for catch all-->
- <address-settings match="#">
- <clustered>false</clustered>
- <dead-letter-address>jms.queue.DLQ</dead-letter-address>
- <expiry-address>jms.queue.ExpiryQueue</expiry-address>
- <redelivery-delay>0</redelivery-delay>
- <max-size-bytes>-1</max-size-bytes>
- <page-size-bytes>10485760</page-size-bytes>
- <distribution-policy-class>org.jboss.messaging.core.server.impl.RoundRobinDistributor</distribution-policy-class>
- <message-counter-history-day-limit>10</message-counter-history-day-limit>
- </address-settings>
-</settings>
Modified: trunk/src/config/jboss-as/non-clustered/jbm-configuration.xml
===================================================================
--- trunk/src/config/jboss-as/non-clustered/jbm-configuration.xml 2009-04-28 12:13:54 UTC (rev 6596)
+++ trunk/src/config/jboss-as/non-clustered/jbm-configuration.xml 2009-04-28 13:19:18 UTC (rev 6597)
@@ -88,7 +88,7 @@
<param key="jbm.remoting.netty.port" value="${jbm.remoting.netty.port}" type="Integer"/>
</acceptor>
- <!-- Netty In VM Acceptor, needed for the servlet transport-->
+ <!-- Netty In VM Acceptor -->
<!--
<acceptor name="netty-invm">
<factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
Deleted: trunk/src/config/jboss-as/non-clustered/jbm-jms.xml
===================================================================
--- trunk/src/config/jboss-as/non-clustered/jbm-jms.xml 2009-04-28 12:13:54 UTC (rev 6596)
+++ trunk/src/config/jboss-as/non-clustered/jbm-jms.xml 2009-04-28 13:19:18 UTC (rev 6597)
@@ -1,194 +0,0 @@
-<deployment xmlns="urn:jboss:messaging"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
-
- <connection-factory name="testConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
- <entries>
- <entry name="testConnectionFactory"/>
- </entries>
- </connection-factory>
-
- <connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
- <entries>
- <entry name="ConnectionFactory"/>
- <entry name="/ConnectionFactory"/>
- <entry name="/XAConnectionFactory"/>
- <entry name="java:/ConnectionFactory"/>
- <entry name="java:/XAConnectionFactory"/>
- </entries>
- </connection-factory>
-
- <connection-factory name="ServerAckConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
- <entries>
- <entry name="ServerAckConnectionFactory"/>
- <entry name="/ServerAckConnectionFactory"/>
- <entry name="/ServerAckXAConnectionFactory"/>
- <entry name="java:/ServerAckConnectionFactory"/>
- <entry name="java:/ServerAckXAConnectionFactory"/>
- </entries>
- <pre-acknowledge>true</pre-acknowledge>
- </connection-factory>
-
- <connection-factory name="ClusteredConnectionFactory">
- <connector-ref connector-name="netty-connector" backup-connector-name="netty-backup"/>
- <entries>
- <entry name="/ClusteredConnectionFactory"/>
- <entry name="/ClusteredXAConnectionFactory"/>
- <entry name="java:/ClusteredConnectionFactory"/>
- <entry name="java:/ClusteredXAConnectionFactory"/>
- </entries>
- </connection-factory>
-
- <connection-factory name="ClusteredConnectionFactoryWithDiscovery">
- <discovery-group-ref discovery-group-name="dg-group1"/>
- <entries>
- <entry name="/ClusteredConnectionFactory"/>
- <entry name="/ClusteredXAConnectionFactory"/>
- <entry name="java:/ClusteredConnectionFactory"/>
- <entry name="java:/ClusteredXAConnectionFactory"/>
- </entries>
- </connection-factory>
-
- <connection-factory name="MyExampleConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
- <entries>
- <entry name="/MyExampleConnectionFactory"/>
- <entry name="/acme/MyExampleConnectionFactoryDupe"/>
- <entry name="java:/xyz/CF1"/>
- <entry name="java:/connectionfactories/acme/connection_factory"/>
- </entries>
- <ping-period>5000</ping-period>
- <call-timeout>30000</call-timeout>
- <!-- This is the window size in bytes to use when using consumer window based flow control -->
- <consumer-window-size>1048576</consumer-window-size>
- <!-- This is the maximum producer send rate that will be applied when using rate based consumer flow control -->
- <consumer-max-rate>5000</consumer-max-rate>
- <!-- This is the send window size in bytes -->
- <producer-window-size>1048576</producer-window-size>
- <!-- This is the maximum producer send rate that will be applied when using rate based producer flow control -->
- <producer-max-rate>100</producer-max-rate>
- <!-- When using this ConnectionFactory, messages beyond this limit are considered largeMessages and will be sent using smaller packets -->
- <min-large-message-size>10240</min-large-message-size>
- <!-- You can specify the default Client ID to use for connections created using this factory -->
- <client-id>MyClientID</client-id>
- <!-- The batch size in bytes to use when using the DUPS_OK_ACKNOWLEDGE acknowledgement mode -->
- <dups-ok-batch-size>1048576</dups-ok-batch-size>
- <!-- The batch size in bytes to use when using transactional sessions -->
- <transaction-batch-size>1048576</transaction-batch-size>
- <!--Whether or not we use a blocking call when acknowledging a message-->
- <block-on-acknowledge>false</block-on-acknowledge>
- <!--Whether we send non persistent messages synchronously-->
- <send-np-messages-synchronously>true</send-np-messages-synchronously>
- <!--Whether we send persistent messages synchronously-->
- <send-p-messages-synchronously>true</send-p-messages-synchronously>
- <!--If true, any connections will automatically set a unique group id (per producer) on every message sent-->
- <auto-group-id>true</auto-group-id>
- <!--if true then the server will pre ack any message before delivery to a consumer-->
- <pre-acknowledge>false</pre-acknowledge>
- </connection-factory>
-
- <connection-factory name="TestInVMConnectionFactory">
- <connector-ref connector-name="in-vm"/>
- <entries>
- <entry name="/TestInVMConnectionFactory"/>
- </entries>
- </connection-factory>
-
- <connection-factory name="TestSSLConnectionFactory">
- <connector-ref connector-name="netty-ssl"/>
- <entries>
- <entry name="/TestSSLConnectionFactory"/>
- </entries>
- </connection-factory>
-
- <connection-factory name="TestHttpConnectionFactory">
- <connector-ref connector-name="netty-http"/>
- <entries>
- <entry name="/TestHttpConnectionFactory"/>
- </entries>
- </connection-factory>
-
- <connection-factory name="TestServletConnectionFactory">
- <connector-ref connector-name="netty-servlet"/>
- <entries>
- <entry name="/TestServletConnectionFactory"/>
- </entries>
- </connection-factory>
-
- <queue name="MyQueue">
- <entry name="MyQueue"/>
- </queue>
- <queue name="DLQ">
- <entry name="/queue/DLQ"/>
- </queue>
- <queue name="ExpiryQueue">
- <entry name="/queue/ExpiryQueue"/>
- </queue>
- <topic name="testTopic">
- <entry name="/topic/testTopic"/>
- </topic>
- <topic name="topic.A">
- <entry name="/topic/topicA"/>
- </topic>
- <topic name="topic.B">
- <entry name="/topic/topicB"/>
- </topic>
- <topic name="securedTopic">
- <entry name="/topic/securedTopic"/>
- </topic>
- <topic name="testDurableTopic">
- <entry name="/topic/testDurableTopic"/>
- </topic>
- <queue name="testQueue">
- <entry name="/queue/testQueue"/>
- </queue>
- <queue name="testGroupQueue">
- <entry name="/queue/testGroupQueue"/>
- </queue>
- <queue name="testPerfQueue">
- <entry name="/queue/testPerfQueue"/>
- </queue>
- <queue name="A">
- <entry name="/queue/A"/>
- </queue>
- <queue name="B">
- <entry name="/queue/B"/>
- </queue>
- <queue name="C">
- <entry name="/queue/C"/>
- </queue>
- <queue name="D">
- <entry name="/queue/D"/>
- </queue>
- <queue name="ex">
- <entry name="/queue/ex"/>
- </queue>
- <queue name="PrivateDLQ">
- <entry name="/queue/PrivateDLQ"/>
- </queue>
- <queue name="PrivateExpiryQueue">
- <entry name="/queue/PrivateExpiryQueue"/>
- </queue>
- <queue name="QueueWithOwnDLQAndExpiryQueue">
- <entry name="/queue/QueueWithOwnDLQAndExpiryQueue"/>
- </queue>
- <topic name="TopicWithOwnDLQAndExpiryQueue">
- <entry name="/topic/QueueWithOwnDLQAndExpiryQueue"/>
- </topic>
- <queue name="QueueWithOwnRedeliveryDelay">
- <entry name="/queue/QueueWithOwnRedeliveryDelay"/>
- </queue>
- <topic name="TopicWithOwnRedeliveryDelay">
- <entry name="/topic/TopicWithOwnRedeliveryDelay"/>
- </topic>
- <queue name="testDistributedQueue">
- <entry name="/queue/testDistributedQueue"/>
- </queue>
- <topic name="testDistributedTopic">
- <entry name="/topic/testDistributedTopic"/>
- </topic>
-
-</deployment>
\ No newline at end of file
Deleted: trunk/src/config/jboss-as/non-clustered/jbm-queues.xml
===================================================================
--- trunk/src/config/jboss-as/non-clustered/jbm-queues.xml 2009-04-28 12:13:54 UTC (rev 6596)
+++ trunk/src/config/jboss-as/non-clustered/jbm-queues.xml 2009-04-28 13:19:18 UTC (rev 6597)
@@ -1,137 +0,0 @@
-<settings xmlns="urn:jboss:messaging"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-queues.xsd ">
-
- <!-- manangement address -->
- <security match="jbm.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>
-
- <security match="jms.topic.testTopic">
- <permission type="createDurableQueue" roles="durpublisher"/>
- <permission type="deleteDurableQueue" roles="durpublisher"/>
- <permission type="consume" roles="guest,publisher,durpublisher"/>
- <permission type="send" roles="guest,publisher,durpublisher"/>
- </security>
-
- <security match="jms.topic.securedTopic">
- <permission type="send" roles="publisher"/>
- <permission type="consume" roles="publisher"/>
- </security>
-
- <security match="jms.topic.testDurableTopic">
- <permission type="createDurableQueue" roles="durpublisher"/>
- <permission type="deleteDurableQueue" roles="durpublisher"/>
- <permission type="consume" roles="guest,publisher,durpublisher"/>
- <permission type="send" roles="guest,publisher,durpublisher"/>
- </security>
-
- <security match="jms.queue.testQueue">
- <permission type="consume" roles="guest,publisher"/>
- <permission type="send" roles="guest,publisher"/>
- </security>
-
- <security match="jms.queue.NoSuchQueue">
- <permission type="consume" roles="guest,publisher"/>
- <permission type="send" roles="guest,publisher"/>
- </security>
-
- <security match="jms.topic.NoSuchTopic">
- <permission type="consume" roles="guest,publisher"/>
- <permission type="send" roles="guest,publisher"/>
- </security>
-
- <security match="jms.tempqueue.#">
- <permission type="createTempQueue" roles="guest,def"/>
- <permission type="deleteTempQueue" roles="guest,def"/>
- <permission type="consume" roles="guest,def"/>
- <permission type="send" roles="guest,def"/>
- </security>
-
- <security match="jms.temptopic.#">
- <permission type="createTempQueue" roles="guest,def"/>
- <permission type="deleteTempQueue" roles="guest,def"/>
- <permission type="consume" roles="guest,def"/>
- <permission type="send" roles="guest,def"/>
- </security>
-
- <!--this will catch any word i.e. jms.queue.anything-->
- <!--<security match="jms.queue.#">
- <permission type="consume" roles="guest,publisher"/>
- <permission type="send" roles="guest,publisher"/>
- </security>-->
-
- <!--this will catch any word i.e. jms.queue.anything-->
- <!--<security match="jms.topic.#">
- <permission type="consume" roles="guest,publisher"/>
- <permission type="send" roles="guest,publisher"/>
- </security>-->
-
- <!--default security to catch all-->
- <security match="#">
- <permission type="createDurableQueue" roles="guest,def"/>
- <permission type="deleteDurableQueue" roles="guest,def"/>
- <permission type="createTempQueue" roles="guest,def"/>
- <permission type="deleteTempQueue" roles="guest,def"/>
- <permission type="consume" roles="guest,def"/>
- <permission type="send" roles="guest,def"/>
- </security>
-
- <address-settings match="jms.queue.QueueWithOwnDLQAndExpiryQueue">
- <dead-letter-address>jms.queue.PrivateDLQ</dead-letter-address>
- <expiry-address>jms.queue.PrivateExpiryQueue</expiry-address>
- </address-settings>
-
- <address-settings match="jms.topic.TopicWithOwnDLQAndExpiryQueue">
- <dead-letter-address>jms.queue.PrivateDLQ</dead-letter-address>
- <expiry-address>jms.queue.PrivateExpiryQueue</expiry-address>
- </address-settings>
-
- <address-settings match="jms.queue.QueueWithOwnRedeliveryDelay">
- <redelivery-delay>5000</redelivery-delay>
- </address-settings>
-
- <address-settings match="jms.topic.TopicWithOwnRedeliveryDelay">
- <redelivery-delay>5000</redelivery-delay>
- </address-settings>
-
- <address-settings match="jms.queue.testDistributedQueue">
- <clustered>true</clustered>
- </address-settings>
-
- <address-settings match="jms.topic.testDistributedTopic">
- <clustered>true</clustered>
- </address-settings>
-
- <address-settings match="jms.queue.testPerfQueue">
- <clustered>false</clustered>
- </address-settings>
-
- <address-settings match="jms.queue.MyQueue">
- <max-size-bytes>-1</max-size-bytes>
- <page-size-bytes>10485760</page-size-bytes>
- <drop-messages-when-full>false</drop-messages-when-full>
- </address-settings>
-
- <address-settings match="jms.queue.testGroupQueue">
- <max-size-bytes>-1</max-size-bytes>
- <page-size-bytes>10485760</page-size-bytes>
- <drop-messages-when-full>false</drop-messages-when-full>
- <distribution-policy-class>org.jboss.messaging.core.server.impl.GroupingRoundRobinDistributor</distribution-policy-class>
- </address-settings>
-
- <!--default for catch all-->
- <address-settings match="#">
- <clustered>false</clustered>
- <dead-letter-address>jms.queue.DLQ</dead-letter-address>
- <expiry-address>jms.queue.ExpiryQueue</expiry-address>
- <redelivery-delay>0</redelivery-delay>
- <max-size-bytes>-1</max-size-bytes>
- <page-size-bytes>10485760</page-size-bytes>
- <distribution-policy-class>org.jboss.messaging.core.server.impl.RoundRobinDistributor</distribution-policy-class>
- <message-counter-history-day-limit>10</message-counter-history-day-limit>
- </address-settings>
-</settings>
More information about the jboss-cvs-commits
mailing list