[jboss-cvs] JBossAS SVN: r60816 - in trunk: messaging/src/etc/deploy and 4 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Feb 23 02:11:40 EST 2007
Author: ovidiu.feodorov at jboss.com
Date: 2007-02-23 02:11:40 -0500 (Fri, 23 Feb 2007)
New Revision: 60816
Added:
trunk/messaging/src/etc/deploy/clustered/
trunk/messaging/src/etc/deploy/clustered/clustered-mysql-persistence-service.xml
trunk/messaging/src/etc/deploy/clustered/connection-factories-service.xml
trunk/messaging/src/etc/deploy/clustered/destinations-service.xml
trunk/messaging/src/etc/deploy/clustered/jms-ds.xml
trunk/messaging/src/etc/deploy/clustered/mysql-ds.xml
trunk/messaging/src/etc/deploy/common/
trunk/messaging/src/etc/deploy/common/legacy-service.xml
trunk/messaging/src/etc/deploy/common/messaging-roles.properties
trunk/messaging/src/etc/deploy/common/messaging-service.xml
trunk/messaging/src/etc/deploy/common/messaging-users.properties
trunk/messaging/src/etc/deploy/common/remoting-service.xml
trunk/messaging/src/etc/deploy/non-clustered/
trunk/messaging/src/etc/deploy/non-clustered/connection-factories-service.xml
trunk/messaging/src/etc/deploy/non-clustered/destinations-service.xml
trunk/messaging/src/etc/deploy/non-clustered/hsqldb-persistence-service.xml
trunk/messaging/src/etc/deploy/non-clustered/jms-ds.xml
Removed:
trunk/messaging/src/etc/deploy/connection-factories-service.xml
trunk/messaging/src/etc/deploy/destinations-service.xml
trunk/messaging/src/etc/deploy/hsqldb-persistence-service.xml
trunk/messaging/src/etc/deploy/jms-ds.xml
trunk/messaging/src/etc/deploy/legacy-service.xml
trunk/messaging/src/etc/deploy/messaging-roles.properties
trunk/messaging/src/etc/deploy/messaging-service.xml
trunk/messaging/src/etc/deploy/messaging-users.properties
trunk/messaging/src/etc/deploy/remoting-service.xml
Modified:
trunk/build/build-distr.xml
trunk/build/build-thirdparty.xml
trunk/build/build.xml
trunk/messaging/src/main/org/jboss/mq/server/jmx/Queue.java
trunk/messaging/src/main/org/jboss/mq/server/jmx/QueueMBean.java
trunk/messaging/src/main/org/jboss/mq/server/jmx/Topic.java
trunk/messaging/src/main/org/jboss/mq/server/jmx/TopicMBean.java
Log:
Messaging 1.2.0.CR1 integration (http://jira.jboss.org/jira/browse/JBAS-3909, http://jira.jboss.org/jira/browse/JBMESSAGING-854)
Modified: trunk/build/build-distr.xml
===================================================================
--- trunk/build/build-distr.xml 2007-02-23 05:50:04 UTC (rev 60815)
+++ trunk/build/build-distr.xml 2007-02-23 07:11:40 UTC (rev 60816)
@@ -10,21 +10,21 @@
<!-- ================================================================== -->
<!-- Module Pass-through Hooks -->
<!-- ================================================================== -->
-
+
<!--
| These hooks are executed after the above pass-through targets have
| finished with a given module.
-->
-
+
<!-- ======== -->
<!-- Test -->
<!-- ======== -->
-
+
<target name="_module-test-most">
<property name="_module.name" value="test" override="true"/>
<property name="_module.output" override="true" value="${project.root}/${_module.name}/output"/>
</target>
-
+
<target name="_module-test-all" depends="_module-test-most">
<!-- Copy the generated javadocs -->
<mkdir dir="${install.api}/${_module.name}"/>
@@ -33,17 +33,17 @@
<include name="**/*"/>
</fileset>
</copy>
-
+
</target>
-
+
<!-- ======== -->
<!-- Remoting -->
<!-- ======== -->
-
+
<target name="_module-jbossas/remoting-most">
<property name="_module.name" value="remoting" override="true"/>
<property name="_module.output" override="true" value="${project.root}/jbossas/${_module.name}/output"/>
-
+
<!-- Copy the generated libraries -->
<mkdir dir="${install.all.lib}"/>
<copy todir="${install.all.lib}" filtering="no">
@@ -51,7 +51,7 @@
<include name="jbossas-remoting.jar"/>
</fileset>
</copy>
-
+
<!-- Copy the third party libraries -->
<mkdir dir="${install.all.lib}"/>
<copy todir="${install.all.lib}" filtering="no">
@@ -70,7 +70,7 @@
</fileset>
</copy>
</target>
-
+
<target name="_module-remoting-all" depends="_module-jbossas/remoting-most">
<!-- Copy the generated javadocs -->
<mkdir dir="${install.api}/${_module.name}"/>
@@ -79,17 +79,17 @@
<include name="**/*"/>
</fileset>
</copy>
-
+
</target>
-
+
<!-- ============ -->
<!-- JMX Remoting -->
<!-- ============ -->
-
+
<target name="_module-jmx-remoting-most">
<property name="_module.name" value="jmx-remoting" override="true"/>
<property name="_module.output" override="true" value="${project.root}/${_module.name}/output"/>
-
+
<!-- Copy the generated libraries -->
<mkdir dir="${install.all.lib}"/>
<copy todir="${install.all.lib}" filtering="no">
@@ -98,7 +98,7 @@
</fileset>
</copy>
</target>
-
+
<target name="_module-jmx-remoting-all" depends="_module-jmx-remoting-most">
<!-- Copy the generated javadocs -->
<mkdir dir="${install.api}/${_module.name}"/>
@@ -107,9 +107,9 @@
<include name="**/*"/>
</fileset>
</copy>
-
+
</target>
-
+
<target name="_module-jbossas/jmx-remoting-all" depends="_module-jbossas/jmx-remoting-most">
<!-- Copy the generated javadocs -->
<mkdir dir="${install.api}/${_module.name}"/>
@@ -118,26 +118,26 @@
<include name="**/*"/>
</fileset>
</copy>
-
+
</target>
-
+
<target name="_module-jbossas/jmx-remoting-most">
<property name="_module.name" value="jbossas/jmx-remoting" override="true"/>
<property name="_module.output" override="true" value="${project.root}/${_module.name}/output"/>
-
+
<unjar src="${project.root}/${_module.name}/output/lib/jmx-remoting.sar" dest="${install.default}/deploy/jmx-remoting.sar"/>
<unjar src="${project.root}/${_module.name}/output/lib/jmx-remoting.sar" dest="${install.all}/deploy/jmx-remoting.sar"/>
-
+
</target>
-
+
<!-- ======== -->
<!-- EJB3X -->
<!-- ======== -->
-
+
<target name="_module-ejb3x-most">
<property name="_module.name" value="ejb3x" override="true"/>
<property name="_module.output" override="true" value="${project.root}/${_module.name}/output"/>
-
+
<!-- Copy across client jars -->
<mkdir dir="${install.client}"/>
<copy todir="${install.client}" filtering="no">
@@ -145,22 +145,22 @@
<include name="jboss-ejb3x.jar"/>
</fileset>
</copy>
-
+
<copy todir="${install.all.lib}" filtering="no">
<fileset dir="${hibernate.entitymanager.lib}" includes="*.jar"/>
<fileset dir="${hibernate.annotations.lib}" includes="*.jar"/>
</copy>
-
+
</target>
-
+
<!-- ======== -->
<!-- EJB 3.0 -->
<!-- ======== -->
-
+
<target name="_module-ejb3-most">
<property name="_module.name" value="ejb3" override="true"/>
<property name="_module.output" override="true" value="${project.root}/${_module.name}/output"/>
-
+
<copy todir="${install.server}/all/deploy" filtering="no">
<fileset dir="${_module.output}/lib">
<include name="ejb3-interceptors-aop.xml"/>
@@ -170,20 +170,20 @@
<include name="ejb3-connectors-service.xml"/>
</fileset>
</copy>
-
+
<copy todir="${install.server}/all/deployers" filtering="no">
<fileset dir="${_module.output}/lib">
<include name="ejb3.deployer/**"/>
</fileset>
</copy>
-
+
<!-- Copy the third party libraries -->
<copy todir="${install.all.lib}" filtering="no">
<fileset dir="${hibernate.entitymanager.lib}">
<include name="ejb3-persistence.jar"/>
</fileset>
</copy>
-
+
<!-- Copy across client jars -->
<mkdir dir="${install.client}"/>
<copy todir="${install.client}" filtering="no">
@@ -204,7 +204,7 @@
</fileset>
</copy>
</target>
-
+
<target name="_module-ejb3-all" depends="_module-ejb3-most">
<!-- Copy the generated javadocs -->
<mkdir dir="${install.api}/${_module.name}"/>
@@ -213,22 +213,22 @@
<include name="**/*"/>
</fileset>
</copy>
-
+
</target>
-
+
<!-- ======== -->
<!-- ASPECTS -->
<!-- ======== -->
-
+
<target name="_module-aspects-most">
<property name="_module.name" value="aspects" override="true"/>
<property name="_module.output" override="true" value="${project.root}/${_module.name}/output"/>
-
+
<!--
<condition property="aop.deployer" value="jboss-aop-jdk50.deployer">
<isset property="HAVE_JDK_1.5"/>
</condition>
-
+
<condition property="aop.deployer" value="jboss-aop.deployer">
<not>
<isset property="HAVE_JDK_1.5"/>
@@ -238,7 +238,7 @@
<property name="aop.deployer" value="jboss-aop-jboss5.deployer"/>
<!-- Copy the generated libraries -->
<unjar src="${_module.output}/lib/${aop.deployer}" dest="${install.server}/all/deployers/${aop.deployer}"/>
-
+
<!--
<copy todir="${install.server}/all/deployers" filtering="no">
<fileset dir="${project.root}/${_module.name}/src/resources/META-INF">
@@ -246,14 +246,14 @@
</fileset>
</copy>
-->
-
+
<mkdir dir="${install.lib}"/>
<copy todir="${install.lib}" filtering="no">
<fileset dir="${_module.output}/lib">
<include name="jboss-aop-deployer-jdk50.jar"/>
</fileset>
</copy>
-
+
<!--
<copy todir="${install.server}/all/deployers/${aop.deployer}" filtering="no">
<fileset dir="${jboss.microcontainer.lib}">
@@ -261,7 +261,7 @@
</fileset>
</copy>
-->
-
+
<!-- Copy across client jars -->
<mkdir dir="${install.client}"/>
<copy todir="${install.client}" filtering="no">
@@ -270,7 +270,7 @@
</fileset>
</copy>
</target>
-
+
<target name="_module-aspects-all" depends="_module-aspects-most">
<!-- Copy the generated javadocs -->
<mkdir dir="${install.api}/${_module.name}"/>
@@ -279,17 +279,17 @@
<include name="**/*"/>
</fileset>
</copy>
-
+
</target>
-
+
<!-- ==== -->
<!-- J2EE -->
<!-- ==== -->
-
+
<target name="_module-j2ee-most">
<property name="_module.name" value="j2ee" override="true"/>
<property name="_module.output" override="true" value="${project.root}/${_module.name}/output"/>
-
+
<!-- Copy the generated libraries -->
<mkdir dir="${install.all.lib}"/>
<copy todir="${install.all.lib}" filtering="no">
@@ -297,7 +297,7 @@
<include name="jboss-j2ee.jar"/>
</fileset>
</copy>
-
+
<!-- Copy the generated client libraries -->
<mkdir dir="${install.client}"/>
<copy todir="${install.client}" filtering="no">
@@ -312,7 +312,7 @@
</fileset>
</copy>
</target>
-
+
<target name="_module-j2ee-all" depends="_module-j2ee-most">
<!-- Copy the generated javadocs -->
<mkdir dir="${install.api}/${_module.name}"/>
@@ -322,15 +322,15 @@
</fileset>
</copy>
</target>
-
+
<!-- ====== -->
<!-- System -->
<!-- ====== -->
-
+
<target name="_module-system-most">
<property name="_module.name" value="system" override="true"/>
<property name="_module.output" override="true" value="${project.root}/${_module.name}/output"/>
-
+
<!-- Copy the generated libraries -->
<mkdir dir="${install.lib}"/>
<copy todir="${install.lib}" filtering="no">
@@ -339,7 +339,7 @@
<include name="jboss-system.jar"/>
</fileset>
</copy>
-
+
<!-- Copy the generated client -->
<mkdir dir="${install.client}"/>
<copy todir="${install.client}" filtering="no">
@@ -347,7 +347,7 @@
<include name="*-client.jar"/>
</fileset>
</copy>
-
+
<!-- Copy the generated scripts & runnable jars -->
<mkdir dir="${install.bin}"/>
<copy todir="${install.bin}" filtering="no">
@@ -363,7 +363,7 @@
<include name="**/*.sh"/>
</fileset>
</chmod>
-
+
<!-- Copy thirdparty code -->
<copy todir="${install.lib}" filtering="no">
<fileset dir="${gnu.getopt.lib}">
@@ -377,7 +377,7 @@
</copy>
<copy file="${apache.log4j.lib}/snmpTrapAppender.jar" tofile="${install.all.lib}/log4j-snmp-appender.jar">
</copy>
-
+
<!-- Copy thirdparty client code -->
<copy todir="${install.client}" filtering="no">
<fileset dir="${apache.log4j.lib}">
@@ -387,15 +387,15 @@
<include name="getopt.jar"/>
</fileset>
</copy>
-
+
<!-- Copy the DTDs -->
<mkdir dir="${install.dtd}"/>
<copy todir="${install.dtd}" filtering="no">
<fileset dir="${project.root}/${_module.name}/src/resources/dtd"/>
</copy>
-
+
</target>
-
+
<target name="_module-system-all" depends="_module-system-most">
<!-- Copy the generated javadocs -->
<mkdir dir="${install.api}/${_module.name}"/>
@@ -408,7 +408,7 @@
<target name="_module-system-jmx-most">
<property name="_module.name" value="system-jmx" override="true"/>
<property name="_module.output" override="true" value="${project.root}/${_module.name}/output"/>
-
+
<copy todir="${install.lib}" filtering="no">
<fileset dir="${_module.output}/lib">
<include name="jboss-system-jmx.jar"/>
@@ -422,15 +422,15 @@
</target>
<target name="_module-system-jmx-all" depends="_module-system-jmx-most">
</target>
-
+
<!-- ====== -->
<!-- Naming -->
<!-- ====== -->
-
+
<target name="_module-naming-most">
<property name="_module.name" value="naming" override="true"/>
<property name="_module.output" override="true" value="${project.root}/${_module.name}/output"/>
-
+
<!-- Copy the generated libraries -->
<mkdir dir="${install.all.lib}"/>
<copy todir="${install.all.lib}" filtering="no">
@@ -438,7 +438,7 @@
<include name="jnpserver.jar"/>
</fileset>
</copy>
-
+
<!-- Copy the generated client libraries -->
<mkdir dir="${install.client}"/>
<copy todir="${install.client}" filtering="no">
@@ -446,9 +446,9 @@
<include name="jnp-client.jar"/>
</fileset>
</copy>
-
+
</target>
-
+
<target name="_module-naming-all" depends="_module-naming-most">
<!-- Copy the generated javadocs -->
<mkdir dir="${install.api}/${_module.name}"/>
@@ -458,15 +458,15 @@
</fileset>
</copy>
</target>
-
+
<!-- ====== -->
<!-- Server -->
<!-- ====== -->
-
+
<target name="_module-server-most">
<property name="_module.name" value="server" override="true"/>
<property name="_module.output" override="true" value="${project.root}/${_module.name}/output"/>
-
+
<!-- Copy the generated libraries -->
<mkdir dir="${install.all.lib}"/>
<copy todir="${install.all.lib}" filtering="no">
@@ -476,7 +476,7 @@
<include name="jmx-adaptor-plugin.jar"/>
</fileset>
</copy>
-
+
<!-- Copy the generated client libraries -->
<mkdir dir="${install.client}"/>
<copy todir="${install.client}" filtering="no">
@@ -484,7 +484,7 @@
<include name="*-client.jar"/>
</fileset>
</copy>
-
+
<!-- Copy the generated scripts & runnable jars -->
<mkdir dir="${install.bin}"/>
<copy todir="${install.bin}" filtering="no">
@@ -501,7 +501,7 @@
<include name="**/*.sh"/>
</fileset>
</chmod>
-
+
<!-- Copy thirdparty code -->
<copy todir="${install.lib}" filtering="no">
<fileset dir="${oswego.concurrent.lib}">
@@ -516,23 +516,23 @@
<include name="bcel.jar"/>
</fileset>
</copy>
-
+
<!-- Copy thirdparty client code -->
<copy todir="${install.client}" filtering="no">
<fileset dir="${oswego.concurrent.lib}">
<include name="concurrent.jar"/>
</fileset>
</copy>
-
+
<!-- Default server config -->
-
+
<mkdir dir="${install.server}/all/deploy"/>
<copy todir="${install.server}/all/deploy" filtering="no">
<!-- Deployable xml snipets -->
<fileset dir="${_module.output}/etc/deploy">
<include name="**"/>
</fileset>
-
+
<!-- Deployable archives -->
<fileset dir="${_module.output}/lib">
<include name="uuid-key-generator.sar/**"/>
@@ -540,16 +540,16 @@
<include name="client-deployer-service.xml"/>
</fileset>
</copy>
-
+
<!-- Copy the deployers -->
<copy todir="${install.server}/all/deployers" filtering="no">
<fileset dir="${_module.output}/etc/deployers">
<include name="**"/>
</fileset>
</copy>
-
+
<copy file="${_module.output}/resources/jmx-invoker-adaptor/META-INF/jboss-service.xml" tofile="${install.all.deploy}/jmx-invoker-service.xml"/>
-
+
<!-- Copy the default configuration files -->
<mkdir dir="${install.server}/all/conf"/>
<copy todir="${install.server}/all/conf" filtering="no">
@@ -557,23 +557,23 @@
<include name="**"/>
</fileset>
</copy>
-
+
<!-- Copy the DTDs -->
<mkdir dir="${install.dtd}"/>
<copy todir="${install.dtd}" filtering="no">
<fileset dir="${project.root}/${_module.name}/src/resources/dtd"/>
</copy>
-
+
<!-- Copy the XML Schemas -->
<mkdir dir="${install.schema}"/>
<copy todir="${install.schema}" filtering="no">
<fileset dir="${project.root}/${_module.name}/src/resources/schema"/>
</copy>
-
+
</target>
-
+
<target name="_module-server-all" depends="_module-server-most">
-
+
<!-- Copy the generated javadocs -->
<mkdir dir="${install.api}/${_module.name}"/>
<copy todir="${install.api}/${_module.name}" filtering="no">
@@ -582,22 +582,22 @@
</fileset>
</copy>
</target>
-
+
<!-- ========= -->
<!-- Connector -->
<!-- ========= -->
-
+
<target name="_module-connector-most">
<property name="_module.name" value="connector" override="true"/>
<property name="_module.output" override="true" value="${project.root}/${_module.name}/output"/>
-
+
<mkdir dir="${install.server}/all/deployers"/>
<copy todir="${install.server}/all/deployers" filtering="no">
<fileset dir="${_module.output}/resources/deployers">
<include name="jca-deployers-beans.xml"/>
</fileset>
</copy>
-
+
<!-- Copy the generated deployment libraries -->
<mkdir dir="${install.server}/all/deploy"/>
<copy todir="${install.server}/all/deploy" filtering="no">
@@ -614,7 +614,7 @@
<include name="jms-ra.rar"/>
</fileset>
</copy>
-
+
<mkdir dir="${install.server}/all/lib"/>
<copy todir="${install.server}/all/lib" filtering="no">
<fileset dir="${_module.output}/lib">
@@ -622,13 +622,13 @@
<include name="jboss-jca.jar"/>
</fileset>
</copy>
-
+
<!-- Copy the dtds -->
<mkdir dir="${install.dtd}"/>
<copy todir="${install.dtd}" filtering="no">
<fileset dir="${project.root}/${_module.name}/output/resources/dtd"/>
</copy>
-
+
<!-- Copy example db configs -->
<mkdir dir="${install.examples.jca}"/>
<copy todir="${install.examples.jca}" filtering="no">
@@ -649,7 +649,7 @@
<!--include name="postgres-service.xml"/-->
</fileset>
</copy>
-
+
<!--
<mkdir dir="${install.all.deploy}/jms"/>
<copy todir="${install.all.deploy}/jms" filtering="no">
@@ -658,7 +658,7 @@
</fileset>
</copy>
-->
-
+
<!-- Copy the generated client libraries -->
<mkdir dir="${install.client}"/>
<copy todir="${install.client}" filtering="no">
@@ -666,14 +666,14 @@
<include name="jbosscx-client.jar"/>
</fileset>
</copy>
-
+
<!-- QUARTZ jar -->
<copy todir="${install.all.lib}" filtering="no">
<fileset dir="${quartz.quartz.lib}" includes="quartz.jar"/>
</copy>
-
+
</target>
-
+
<target name="_module-connector-all" depends="_module-connector-most">
<!-- Copy the generated javadocs -->
<mkdir dir="${install.api}/${_module.name}"/>
@@ -682,7 +682,7 @@
<include name="**/*"/>
</fileset>
</copy>
-
+
<!--Copy generated jmx documentation -->
<mkdir dir="${install.jmx-api}"/>
<copy todir="${install.jmx-api}" filtering="no" failonerror="false">
@@ -691,15 +691,15 @@
</fileset>
</copy>
</target>
-
+
<!-- ========= -->
<!-- Legacy JBossMQ -->
<!-- ========= -->
-
+
<target name="_module-jbossmq-most">
<property name="_module.name" value="jbossmq" override="true"/>
<property name="_module.output" override="true" value="${project.root}/${_module.name}/output"/>
-
+
<!-- Copy example jms configs -->
<mkdir dir="${install.examples.jms}"/>
<copy todir="${install.examples.jms}" filtering="no">
@@ -713,69 +713,112 @@
</target>
<target name="_module-jbossmq-all" depends="_module-jbossmq-most">
</target>
-
+
<!-- ========= -->
<!-- Messaging -->
<!-- ========= -->
-
+
<target name="_module-messaging-most">
<property name="_module.name" value="messaging" override="true"/>
<property name="_module.output" override="true" value="${project.root}/${_module.name}/output"/>
-
- <!-- Copy the jboss-messaging libraries -->
- <mkdir dir="${install.all.lib}"/>
- <copy todir="${install.all.lib}" filtering="no">
- <fileset dir="${jboss.messaging.lib}">
- <include name="jboss-messaging.jar"/>
- </fileset>
- <fileset dir="${_module.output}/lib">
- <include name="jboss-messaging-int.jar"/>
- </fileset>
- </copy>
-
- <!-- messaging descriptors, unscoped deployment -->
- <mkdir dir="${install.all.deploy}/messaging"/>
- <copy todir="${install.all.deploy}/messaging">
- <fileset dir="${_module.output}/etc/deploy/">
- <include name="*-service.xml"/>
- </fileset>
- </copy>
-
- <!-- security metadata -->
- <mkdir dir="${install.all.conf}/props"/>
- <copy todir="${install.all.conf}/props">
- <fileset dir="${_module.output}/etc/deploy/">
- <include name="messaging-*.properties"/>
- </fileset>
- </copy>
-
- <!-- the JCA connection factory -->
- <copy todir="${install.all.deploy}" file="${_module.output}/etc/deploy/jms-ds.xml"/>
-
- <!-- Copy the generated client libraries -->
- <mkdir dir="${install.client}"/>
- <copy todir="${install.client}" file="${jboss.messaging.lib}/jboss-messaging.jar" filtering="no"/>
+
+ <!--
+ jboss-messaging libraries, unscoped deployment, same for "all" and "default" configurations.
+ -->
+ <mkdir dir="${install.all.lib}"/>
+ <copy todir="${install.all.lib}" filtering="no">
+ <fileset dir="${jboss.messaging.lib}">
+ <include name="jboss-messaging.jar"/>
+ </fileset>
+ <fileset dir="${_module.output}/lib">
+ <include name="jboss-messaging-int.jar"/>
+ </fileset>
+ </copy>
+
+ <!--
+ Security metadata, same for "all" and "default" configurations.
+ -->
+ <mkdir dir="${install.all.conf}/props"/>
+ <copy todir="${install.all.conf}/props">
+ <fileset dir="${_module.output}/etc/deploy/common">
+ <include name="messaging-*.properties"/>
+ </fileset>
+ </copy>
+
+ <!--
+ Generated client libraries, same for "all" and "default" configurations.
+ -->
+ <mkdir dir="${install.client}"/>
+ <copy todir="${install.client}" file="${jboss.messaging.lib}/jboss-messaging.jar" filtering="no"/>
+
+
+ <!--
+ This would be the "clustered" configuration. However, because we have a dependency on
+ MySQL, we're actually not deploying a 'true' clustered configurtion just yet ...
+ -->
+ <!--
+ <copy todir="${install.all.deploy}" file="${_module.output}/etc/deploy/clustered/jms-ds.xml"/>
+ <mkdir dir="${install.all.deploy}/messaging"/>
+ <copy todir="${install.all.deploy}/messaging">
+ <fileset dir="${_module.output}/etc/deploy/common">
+ <include name="*-service.xml"/>
+ </fileset>
+ <fileset dir="${_module.output}/etc/deploy/clustered">
+ <include name="*-service.xml"/>
+ <include name="mysql-ds.xml"/>
+ </fileset>
+ </copy>
+ -->
+
+ <!--
+ ... but we deploy a configuration identical to a "non-clustered" one.
+ -->
+ <copy todir="${install.all.deploy}" file="${_module.output}/etc/deploy/non-clustered/jms-ds.xml"/>
+ <mkdir dir="${install.all.deploy}/messaging"/>
+ <copy todir="${install.all.deploy}/messaging">
+ <fileset dir="${_module.output}/etc/deploy/common">
+ <include name="*-service.xml"/>
+ </fileset>
+ <fileset dir="${_module.output}/etc/deploy/non-clustered">
+ <include name="*-service.xml"/>
+ </fileset>
+ </copy>
+
+ <!--
+ This is a non-clustered configuration.
+ -->
+ <copy todir="${install.default.deploy}" file="${_module.output}/etc/deploy/non-clustered/jms-ds.xml"/>
+ <mkdir dir="${install.default.deploy}/messaging"/>
+ <copy todir="${install.default.deploy}/messaging">
+ <fileset dir="${_module.output}/etc/deploy/common">
+ <include name="*-service.xml"/>
+ </fileset>
+ <fileset dir="${_module.output}/etc/deploy/non-clustered">
+ <include name="*-service.xml"/>
+ </fileset>
+ </copy>
+
</target>
-
- <target name="_module-messaging-all" depends="_module-messaging-most">
-
- <!-- Copy the generated javadocs -->
- <mkdir dir="${install.api}/${_module.name}"/>
- <copy todir="${install.api}/${_module.name}" filtering="no">
- <fileset dir="${_module.output}/api">
- <include name="**/*"/>
- </fileset>
- </copy>
- </target>
-
+
+ <target name="_module-messaging-all" depends="_module-messaging-most">
+
+ <!-- Copy the generated javadocs -->
+ <mkdir dir="${install.api}/${_module.name}"/>
+ <copy todir="${install.api}/${_module.name}" filtering="no">
+ <fileset dir="${_module.output}/api">
+ <include name="**/*"/>
+ </fileset>
+ </copy>
+ </target>
+
<!-- ==== -->
<!-- J2SE -->
<!-- ==== -->
-
+
<target name="_module-j2se-most">
<property name="_module.name" value="j2se" override="true"/>
<property name="_module.output" override="true" value="${project.root}/${_module.name}/output"/>
-
+
<!-- Copy the generated libraries -->
<mkdir dir="${install.lib}"/>
<copy todir="${install.lib}" filtering="no">
@@ -783,13 +826,13 @@
<include name="jboss-j2se.jar"/>
</fileset>
</copy>
-
+
<!-- Copy the generated client libraries -->
<mkdir dir="${install.client}"/>
<copy tofile="${install.client}/jboss-j2se.jar" file="${_module.output}/lib/jboss-j2se.jar"/>
-
+
</target>
-
+
<target name="_module-j2se-all" depends="_module-j2se-most">
<!-- Copy the generated javadocs -->
<mkdir dir="${install.api}/${_module.name}"/>
@@ -798,17 +841,17 @@
<include name="**/*"/>
</fileset>
</copy>
-
+
</target>
-
+
<!-- ====== -->
<!-- MBeans -->
<!-- ====== -->
-
+
<target name="_module-mbeans-most">
<property name="_module.name" value="mbeans" override="true"/>
<property name="_module.output" override="true" value="${project.root}/${_module.name}/output"/>
-
+
<!-- Copy the generated libraries -->
<mkdir dir="${install.lib}"/>
<copy todir="${install.lib}" filtering="no">
@@ -816,15 +859,15 @@
<include name="jboss-mbeans.jar"/>
</fileset>
</copy>
-
+
<!-- Copy the DTDs -->
<mkdir dir="${install.dtd}"/>
<copy todir="${install.dtd}" filtering="no">
<fileset dir="${project.root}/${_module.name}/src/resources/dtd"/>
</copy>
-
+
</target>
-
+
<target name="_module-mbeans-all" depends="_module-mbeans-most">
<!-- Copy the generated javadocs -->
<mkdir dir="${install.api}/${_module.name}"/>
@@ -833,17 +876,17 @@
<include name="**/*"/>
</fileset>
</copy>
-
+
</target>
-
+
<!-- === -->
<!-- JMX -->
<!-- === -->
-
+
<target name="_module-jmx-most">
<property name="_module.name" value="jmx" override="true"/>
<property name="_module.output" override="true" value="${project.root}/${_module.name}/output"/>
-
+
<!-- Copy the generated libraries -->
<mkdir dir="${install.lib}"/>
<copy todir="${install.lib}" filtering="no">
@@ -851,7 +894,7 @@
<include name="jboss-jmx.jar"/>
</fileset>
</copy>
-
+
<!-- Copy thirdparty code -->
<copy todir="${install.lib}" filtering="no">
<fileset dir="${oswego.concurrent.lib}">
@@ -861,13 +904,13 @@
<include name="dom4j.jar"/>
</fileset>
</copy>
-
+
<!-- Copy the generated client libraries -->
<mkdir dir="${install.client}"/>
<copy tofile="${install.client}/jmx-client.jar" file="${_module.output}/lib/jboss-jmx.jar"/>
-
+
</target>
-
+
<target name="_module-jmx-all" depends="_module-jmx-most">
<!-- Copy the generated javadocs -->
<mkdir dir="${install.api}/${_module.name}"/>
@@ -876,17 +919,17 @@
<include name="**/*"/>
</fileset>
</copy>
-
+
</target>
-
+
<!-- ======== -->
<!-- Security -->
<!-- ======== -->
-
+
<target name="_module-security-most">
<property name="_module.name" value="security" override="true"/>
<property name="_module.output" override="true" value="${project.root}/${_module.name}/output"/>
-
+
<!-- Copy the security-policies-service.xml -->
<copy todir="${install.server}/all/deploy" filtering="no">
<fileset dir="${_module.output}/resources">
@@ -894,7 +937,7 @@
</fileset>
</copy>
</target>
-
+
<target name="_module-security-all" depends="_module-security-most">
<!-- Copy the generated javadocs -->
<mkdir dir="${install.api}/${_module.name}"/>
@@ -904,15 +947,15 @@
</fileset>
</copy>
</target>
-
+
<!-- ======= -->
<!-- Cluster -->
<!-- ======= -->
-
+
<target name="_module-cluster-most">
<property name="_module.name" value="cluster" override="true"/>
<property name="_module.output" override="true" value="${project.root}/${_module.name}/output"/>
-
+
<!-- Copy the generated libraries -->
<mkdir dir="${install.all.lib}"/>
<copy todir="${install.all.lib}" filtering="no">
@@ -921,7 +964,7 @@
<include name="jbossmqha.jar"/>
</fileset>
</copy>
-
+
<!-- Copy the generated client libraries -->
<mkdir dir="${install.client}"/>
<copy todir="${install.client}" filtering="no">
@@ -930,16 +973,16 @@
<include name="jbossmqha.jar"/>
</fileset>
</copy>
-
+
<!-- Copy thirdparty code -->
<copy todir="${install.all.lib}" filtering="no">
<fileset dir="${jgroups.jgroups.lib}">
<include name="jgroups.jar"/>
</fileset>
</copy>
-
+
<!-- Default server config -->
-
+
<!-- Copy the deployables -->
<mkdir dir="${install.server}/all/deploy"/>
<copy todir="${install.server}/all/deploy" filtering="no">
@@ -961,7 +1004,7 @@
<include name="farm-beans.xml"/>
</fileset>
</copy>
-
+
<!- - Copy the farmed deployables - ->
<mkdir dir="${install.server}/all/farm"/>
<copy todir="${install.server}/all/farm" filtering="no">
@@ -970,9 +1013,9 @@
</fileset>
</copy>
-->
-
+
</target>
-
+
<target name="_module-cluster-all" depends="_module-cluster-most">
<!-- Copy the examples -->
<mkdir dir="${install.docs}/${module}"/>
@@ -981,7 +1024,7 @@
<include name="examples/*"/>
</fileset>
</copy>
-
+
<!-- Copy the generated javadocs -->
<mkdir dir="${install.api}/${_module.name}"/>
<copy todir="${install.api}/${_module.name}" filtering="no">
@@ -990,15 +1033,15 @@
</fileset>
</copy>
</target>
-
+
<!-- ===== -->
<!-- Varia -->
<!-- ===== -->
-
+
<target name="_module-varia-most">
<property name="_module.name" value="varia" override="true"/>
<property name="_module.output" override="true" value="${project.root}/${_module.name}/output"/>
-
+
<!-- Copy the generated libraries -->
<mkdir dir="${install.all.lib}"/>
<copy todir="${install.all.lib}" filtering="no">
@@ -1015,7 +1058,7 @@
<include name="jboss-srp.jar"/>
</fileset>
</copy>
-
+
<mkdir dir="${install.examples.varia}"/>
<copy todir="${install.examples.varia}" filtering="no">
<fileset dir="${project.root}/testsuite/src/etc/cluster-test">
@@ -1024,7 +1067,7 @@
</copy>
<mkdir dir="${install.examples}/jmx/persistent-service.sar"/>
<unjar src="${_module.output}/lib/persistent-service.sar" dest="${install.examples}/jmx/persistent-service.sar"/>
-
+
<mkdir dir="${install.examples.varia}/deployment-service"/>
<copy todir="${install.examples.varia}/deployment-service">
<fileset dir="${_module.output}/lib">
@@ -1034,11 +1077,11 @@
<exclude name="META-INF/**"/>
</fileset>
</copy>
-
+
<!-- MBean Configurator sar for setting mbean attributes when registered -->
<mkdir dir="${install.examples}/jmx/mbean-configurator.sar"/>
<unjar src="${_module.output}/lib/mbean-configurator.sar" dest="${install.examples}/jmx/mbean-configurator.sar"/>
-
+
<!-- Client jars -->
<mkdir dir="${install.client}"/>
<copy todir="${install.client}" filtering="no">
@@ -1050,7 +1093,7 @@
<include name="jboss-srp-client.jar"/>
</fileset>
</copy>
-
+
<!-- Copy thirdparty code -->
<copy todir="${install.all.lib}" filtering="no">
<fileset dir="${sun.jaf.lib}">
@@ -1060,9 +1103,9 @@
<include name="mail.jar"/>
</fileset>
</copy>
-
+
<!-- Default server config -->
-
+
<!-- Copy the deployables -->
<mkdir dir="${install.server}/all/deploy"/>
<copy todir="${install.server}/all/deploy" filtering="no">
@@ -1076,7 +1119,7 @@
<include name="properties-service.xml"/>
</fileset>
</copy>
-
+
<!-- copy snmp-adaptor.sar unpacked to deploy -->
<!-- and the used joesnmp.jar library to lib -->
<mkdir dir="${install.server}/all/deploy/snmp-adaptor.sar"/>
@@ -1086,11 +1129,11 @@
<include name="joesnmp.jar"/>
</fileset>
</copy>
-
+
<!-- Include the JMX console war unpacked -->
<mkdir dir="${install.server}/all/deploy/jmx-console.war"/>
<unjar src="${_module.output}/lib/jmx-console.war" dest="${install.server}/all/deploy/jmx-console.war"/>
-
+
<!-- Include the juddi sar unpacked -->
<mkdir dir="${install.server}/all/deploy/juddi-service.sar"/>
<unjar src="${jboss.jaxr.lib}/juddi-service.sar"
@@ -1101,7 +1144,7 @@
<include name="dtdparser121.jar"/>
</fileset>
</copy>
-
+
<copy todir="${install.server}/all/lib" filtering="no">
<fileset dir="${woodstox.woodstox.lib}">
<include name="wstx.jar"/>
@@ -1111,7 +1154,7 @@
<!-- Include the HTTP invoker service unpacked -->
<mkdir dir="${install.server}/all/deploy/httpha-invoker.sar"/>
<unjar src="${_module.output}/lib/httpha-invoker.sar" dest="${install.server}/all/deploy/httpha-invoker.sar"/>
-
+
<!-- copy the ant jmx client -->
<mkdir dir="${install.client}"/>
<copy todir="${install.client}" filtering="no">
@@ -1119,7 +1162,7 @@
<include name="jbossjmx-ant.jar"/>
</fileset>
</copy>
-
+
<!-- copy the netboot war tool -->
<mkdir dir="${install.examples.netboot}"/>
<copy todir="${install.examples.netboot}" filtering="no">
@@ -1127,7 +1170,7 @@
<include name="netboot.war"/>
</fileset>
</copy>
-
+
<!-- copy the bsh-deployer lib and its associated beanshell lib from thirdparty
<copy todir="${install.all.lib}" filtering="no">
<fileset dir="${_module.output}/lib">
@@ -1138,7 +1181,7 @@
</fileset>
</copy>
-->
-
+
<!-- Include the HTTP invoker service unpacked -->
<delete dir="${install.all.deploy.hasingleton}/jms/jbossmq-httpil.sar"/>
<mkdir dir="${install.all.deploy.hasingleton}/jms/jbossmq-httpil.sar"/>
@@ -1147,16 +1190,16 @@
<mkdir dir="${install.all.deploy.hasingleton}/jms/jbossmq-httpil.sar/jbossmq-httpil.war"/>
<unjar src="${install.all.deploy.hasingleton}/jms/jbossmq-httpil.sar/tmp.war" dest="${install.all.deploy.hasingleton}/jms/jbossmq-httpil.sar/jbossmq-httpil.war"/>
<delete file="${install.all.deploy.hasingleton}/jms/jbossmq-httpil.sar/tmp.war"/>
-
+
<!-- copy the jboss-monitoring JAR -->
<copy file="${project.root}/varia/output/lib/jboss-monitoring.jar" todir="${install.server}/all/lib"/>
-
+
<!-- copy the binding-manager sample file and JAR -->
<copy file="${project.root}/varia/output/lib/bindingservice-plugin.jar" todir="${install.server}/all/lib"/>
-
+
<mkdir dir="${install.examples.binding-manager}"/>
<copy file="${project.root}/varia/src/resources/services/binding/sample-bindings.xml" todir="${install.examples.binding-manager}"/>
-
+
<!-- the bean deployer : obsolete in jboss5
<mkdir dir="${install.all.deploy}/jboss-bean.deployer"/>
<copy todir="${install.all.deploy}/jboss-bean.deployer" filtering="no">
@@ -1165,7 +1208,7 @@
</fileset>
</copy>
-->
-
+
<!-- copy the logging-monitor service to examples -->
<mkdir dir="${install.examples}/jmx/logging-monitor/lib"/>
<copy todir="${install.examples}/jmx/logging-monitor/lib" filtering="no">
@@ -1176,16 +1219,16 @@
<copy todir="${install.examples}/jmx/logging-monitor" filtering="no">
<fileset dir="${_module.output}/resources/services/loggingmonitor"/>
</copy>
-
+
<!-- copy bsf.jar used by scripting-listener -->
<copy todir="${install.server}/all/lib" filtering="no">
<fileset dir="${apache.bsf.lib}">
<include name="bsf.jar"/>
</fileset>
</copy>
-
+
</target>
-
+
<target name="_module-varia-all" depends="_module-varia-most">
<!-- Copy the generated javadocs -->
<mkdir dir="${install.api}/${_module.name}"/>
@@ -1195,22 +1238,22 @@
</fileset>
</copy>
</target>
-
+
<!-- ===== -->
<!-- JBoss Web -->
<!-- ===== -->
-
+
<target name="_module-tomcat-most">
<property name="_module.name" value="tomcat" override="true"/>
<property name="_module.output" override="true" value="${project.root}/${_module.name}/output"/>
<property name="_module.ext" override="true" value="${project.root}/${_module.name}/ext"/>
-
+
<!-- Copy the thirdparty libraries -->
<mkdir dir="${install.all.lib}"/>
<copy tofile="${install.all.lib}/javax.servlet.jar" file="${jboss.web.lib}/servlet-api.jar"/>
<copy tofile="${install.all.lib}/javax.servlet.jsp.jar" file="${jboss.web.lib}/jsp-api.jar"/>
<copy tofile="${install.all.lib}/javax.el.jar" file="${jboss.web.lib}/el-api.jar"/>
-
+
<!-- Copy the deployables -->
<mkdir dir="${install.server}/all/deployers/jbossweb.deployer"/>
<copy todir="${install.server}/all/deployers/jbossweb.deployer">
@@ -1219,7 +1262,7 @@
<!-- Use the all war deployers descriptor -->
<copy tofile="${install.server}/all/deployers/jbossweb.deployer/META-INF/war-deployers-beans.xml"
file="${project.root}/${_module.name}/src/resources/war-deployers-all-beans.xml" overwrite="true"/>
-
+
<!-- Copy the ROOT.war -->
<copy todir="${install.server}/all/deploy">
<fileset dir="${_module.output}/deploy">
@@ -1232,62 +1275,62 @@
<include name="tc6-cluster/**"/>
</fileset>
</copy>
-
+
</target>
-
+
<target name="_module-tomcat-all" depends="_module-tomcat-most">
</target>
-
+
<!-- ========== -->
<!-- Webservice -->
<!-- ========== -->
-
+
<target name="_module-webservice-most" depends="module-webservice15">
<property name="_module.name" value="webservice" override="true"/>
<property name="_module.output" value="${project.root}/${_module.name}/output" override="true"/>
-
+
<!-- copy common client stuff -->
<mkdir dir="${install.client}"/>
-
+
<copy todir="${install.all.lib}" filtering="no">
</copy>
-
+
</target>
-
+
<target name="module-webservice15" if="HAVE_JDK_1.5">
-
+
<!-- copy the client stuff -->
<mkdir dir="${install.client}"/>
<copy todir="${install.client}" filtering="no">
</copy>
-
+
</target>
-
+
<target name="_module-webservice-all" depends="_module-webservice-most">
</target>
-
+
<!-- ==== -->
<!-- IIOP -->
<!-- ==== -->
-
+
<target name="_module-iiop-most">
<property name="_module.name" value="iiop" override="true"/>
<property name="_module.output" override="true" value="${project.root}/${_module.name}/output"/>
-
+
<!-- Copy the jboss-iiop.jar -->
<copy todir="${install.all.lib}" filtering="no">
<fileset dir="${_module.output}/lib">
<include name="jboss-iiop.jar"/>
</fileset>
</copy>
-
+
<!-- Copy the jboss-iiop-client.jar -->
<copy todir="${install.client}" filtering="no">
<fileset dir="${_module.output}/lib">
<include name="jboss-iiop-client.jar"/>
</fileset>
</copy>
-
+
<!-- Copy thirdparty code -->
<copy todir="${install.all.lib}" filtering="no">
<fileset dir="${jacorb.jacorb.lib}">
@@ -1297,7 +1340,7 @@
<include name="avalon-framework.jar"/>
</fileset>
</copy>
-
+
<!-- Copy thirdparty client code -->
<copy todir="${install.client}" filtering="no">
<fileset dir="${jacorb.jacorb.lib}">
@@ -1310,7 +1353,7 @@
<include name="logkit.jar"/>
</fileset>
</copy>
-
+
<!-- Copy thirdparty configuration file and jndi.properties file -->
<mkdir dir="${install.server}/all/conf"/>
<copy todir="${install.server}/all/conf" filtering="no" overwrite="true">
@@ -1321,7 +1364,7 @@
<include name="jndi.properties"/>
</fileset>
</copy>
-
+
<mkdir dir="${install.server}/all/deploy"/>
<copy todir="${install.server}/all/deploy" filtering="no">
<!-- Deployable service -->
@@ -1329,9 +1372,9 @@
<include name="iiop-service.xml"/>
</fileset>
</copy>
-
+
</target>
-
+
<target name="_module-iiop-all" depends="_module-iiop-most">
<!-- Copy the generated javadocs -->
<mkdir dir="${install.api}/${_module.name}"/>
@@ -1341,15 +1384,15 @@
</fileset>
</copy>
</target>
-
+
<!-- ========== -->
<!-- Management -->
<!-- ========== -->
-
+
<target name="_module-management-most">
<property name="_module.name" value="management" override="true"/>
<property name="_module.output" override="true" value="${project.root}/${_module.name}/output"/>
-
+
<!-- Copy the generated libraries -->
<mkdir dir="${install.all.lib}"/>
<copy todir="${install.all.lib}" filtering="no">
@@ -1358,7 +1401,7 @@
<include name="jboss-management.jar"/>
</fileset>
</copy>
-
+
<mkdir dir="${install.examples}/jmx"/>
<copy todir="${install.examples}/jmx" filtering="no">
<!-- Deployable archives -->
@@ -1366,7 +1409,7 @@
<include name="ejb-management.jar"/>
</fileset>
</copy>
-
+
<!-- Copy the generated client libraries -->
<mkdir dir="${install.client}"/>
<copy todir="${install.client}" filtering="no">
@@ -1375,7 +1418,7 @@
</fileset>
</copy>
</target>
-
+
<target name="_module-management-all" depends="_module-management-most">
<!-- Copy the generated javadocs -->
<mkdir dir="${install.api}/${_module.name}"/>
@@ -1384,7 +1427,7 @@
<include name="**/*"/>
</fileset>
</copy>
-
+
<!-- Copy the generated todo docs -->
<mkdir dir="${install.todo}/${_module.name}"/>
<copy todir="${install.todo}/${_module.name}" filtering="no" failonerror="false">
@@ -1393,15 +1436,15 @@
</fileset>
</copy>
</target>
-
+
<!-- =========== -->
<!-- Transaction -->
<!-- =========== -->
-
+
<target name="_module-transaction-most">
<property name="_module.name" value="transaction" override="true"/>
<property name="_module.output" override="true" value="${project.root}/${_module.name}/output"/>
-
+
<!-- Copy the generated libraries -->
<mkdir dir="${install.all.lib}"/>
<copy todir="${install.server}/all/lib" filtering="no">
@@ -1418,7 +1461,7 @@
</fileset>
</copy>
<copy todir="${install.all.conf}" filtering="no" file="${project.thirdparty}/jboss/jbossts/resources/jbossjta-properties.xml"/>
-
+
<!-- Copy the generated client libraries -->
<mkdir dir="${install.client}"/>
<copy todir="${install.client}" filtering="no">
@@ -1427,7 +1470,7 @@
</fileset>
</copy>
</target>
-
+
<target name="_module-transaction-all" depends="_module-transaction-most">
<!-- Copy the generated javadocs -->
<mkdir dir="${install.api}/${_module.name}"/>
@@ -1437,15 +1480,15 @@
</fileset>
</copy>
</target>
-
+
<!-- ======= -->
<!-- Console -->
<!-- ======= -->
-
+
<target name="_module-console-most">
<property name="_module.name" value="console" override="true"/>
<property name="_module.output" override="true" value="${project.root}/${_module.name}/output"/>
-
+
<!-- Copy the generated scripts & runnable jars -->
<mkdir dir="${install.bin}"/>
<copy todir="${install.bin}" filtering="no">
@@ -1461,20 +1504,20 @@
<include name="**/*.sh"/>
</fileset>
</chmod>
-
+
<!-- Copy the BeanShell JAR -->
<copy todir="${install.server}/all/lib" filtering="no">
<fileset dir="${beanshell.beanshell.lib}">
<include name="bsh.jar"/>
</fileset>
</copy>
-
+
<!-- Unpack the plugin manager SAR (embedded) and application WAR -->
<unjar src="${_module.output}/lib/console-mgr.sar" dest="${install.all.deploy}/management/console-mgr.sar"/>
<unjar src="${_module.output}/lib/web-console.war" dest="${install.all.deploy}/management/console-mgr.sar/web-console.war"/>
-
+
</target>
-
+
<target name="_module-console-all" depends="_module-console-most">
<!-- Copy the generated javadocs -->
<mkdir dir="${install.api}/${_module.name}"/>
@@ -1484,7 +1527,7 @@
</fileset>
</copy>
</target>
-
+
<!-- ============= -->
<!-- Compatibility -->
<!-- ============= -->
@@ -1492,7 +1535,7 @@
<call target="make-compat"/>
<call target="check-compat"/>
</target>
-
+
<target name="make-compat" if="compatibility.make">
<!-- Create serialized versions of contract classes -->
<mkdir dir="${compatibility.dir}"/>
@@ -1504,7 +1547,7 @@
</classpath>
</java>
</target>
-
+
<target name="check-compat" if="compatibility.check">
<!-- Check compiled contract classes against serialized versions -->
<java classname="${compatibility.bin}" fork="true" failonerror="true" dir="${compatibility.dir}">
@@ -1515,15 +1558,15 @@
</classpath>
</java>
</target>
-
+
<!-- ========== -->
<!-- Deployment -->
<!-- ========== -->
-
+
<target name="_module-deployment-most">
<property name="_module.name" value="deployment" override="true"/>
<property name="_module.output" override="true" value="${project.root}/${_module.name}/output"/>
-
+
<!-- Copy the generated libraries -->
<mkdir dir="${install.all.lib}"/>
<copy todir="${install.all.lib}" filtering="no">
@@ -1536,7 +1579,7 @@
<include name="jsr88-service.xml"/>
</fileset>
</copy>
-
+
<!-- Copy the generated client libraries -->
<mkdir dir="${install.client}"/>
<copy todir="${install.client}" filtering="no">
@@ -1544,9 +1587,9 @@
<include name="jboss-deployment.jar"/>
</fileset>
</copy>
-
+
</target>
-
+
<target name="_module-deployment-all" depends="_module-deployment-most">
<!-- Copy the generated javadocs -->
<mkdir dir="${install.api}/${_module.name}"/>
@@ -1555,7 +1598,7 @@
<include name="**/*"/>
</fileset>
</copy>
-
+
<!-- Copy the generated todo docs -->
<mkdir dir="${install.todo}/${_module.name}"/>
<copy todir="${install.todo}/${_module.name}" filtering="no" failonerror="false">
@@ -1564,33 +1607,33 @@
</fileset>
</copy>
</target>
-
+
<!-- ============ -->
<!-- Hibernate -->
<!-- ============ -->
-
+
<target name="_module-hibernate-int-most">
<property name="_module.name" value="hibernate-int" override="true"/>
<property name="_module.output" override="true" value="${project.root}/${_module.name}/output"/>
-
+
<mkdir dir="${install.all.lib}"/>
-
+
<!-- The hibernate-int module output -->
<copy todir="${install.all.lib}" filtering="no">
<fileset dir="${_module.output}/lib" includes="*.jar"/>
</copy>
-
+
<!-- The hibernate jar -->
<copy todir="${install.all.lib}" filtering="no">
<fileset dir="${hibernate.lib}" includes="*.jar"/>
</copy>
-
+
<!-- ASM jars (cglib dependency)
<copy todir="${install.all.lib}" filtering="no">
<fileset dir="${asm.asm.lib}" includes="*.jar" />
</copy>
-->
-
+
<!-- ANTLR jar -->
<copy todir="${install.all.lib}" filtering="no">
<fileset dir="${antlr.antlr.lib}" includes="antlr.jar"/>
@@ -1600,20 +1643,20 @@
<copy todir="${install.client}" filtering="no">
<fileset dir="${antlr.antlr.lib}" includes="antlr.jar"/>
</copy>
-
+
<!-- CGLIB jar
<copy todir="${install.all.lib}" filtering="no">
<fileset dir="${cglib.lib}" includes="*.jar"/>
</copy>
-->
-
+
<!-- Commons collections jar -->
<copy todir="${install.all.lib}" filtering="no">
<fileset dir="${apache.collections.lib}" includes="*.jar"/>
</copy>
-
+
</target>
-
+
<target name="_module-hibernate-int-all" depends="_module-hibernate-int-most">
<!-- Copy the generated javadocs -->
<mkdir dir="${install.api}/${_module.name}"/>
@@ -1628,30 +1671,30 @@
<target name="_module-profileservice-most">
<property name="_module.name" value="profileservice" override="true"/>
<property name="_module.output" override="true" value="${project.root}/${_module.name}/output"/>
-
+
<mkdir dir="${install.all.lib}"/>
-
+
<!-- The profileservice module output -->
<copy todir="${install.all.lib}" filtering="no">
<fileset dir="${_module.output}/lib" includes="*.jar"/>
</copy>
</target>
-
+
<!-- ============ -->
<!-- Spring -->
<!-- ============ -->
-
+
<!--
<target name="_module-spring-int-most">
<property name="_module.name" value="spring-int" override="true"/>
<property name="_module.output" override="true"
value="${project.root}/${_module.name}/output"/>
-
+
<mkdir dir="${install.server}/all/deploy/jboss-spring-jdk5.deployer"/>
<unjar src="${_module.output}/lib/jboss-spring-jdk5.deployer"
dest="${install.server}/all/deploy/jboss-spring-jdk5.deployer" />
</target>
-
+
<target name="_module-spring-int-all" depends="_module-spring-int-most">
<mkdir dir="${install.api}/${_module.name}"/>
<copy todir="${install.api}/${_module.name}" filtering="no">
@@ -1661,7 +1704,7 @@
</copy>
</target>
-->
-
+
<target name="thirdparty">
<!-- Copy thirdparty libraries -->
<mkdir dir="${install.all.lib}"/>
@@ -1684,7 +1727,7 @@
<include name="sunxacml-support.jar"/>
</fileset>
</copy>
-
+
<!-- Copy the generated libraries -->
<mkdir dir="${install.lib}"/>
<copy todir="${install.lib}" filtering="no">
@@ -1725,7 +1768,7 @@
<include name="trove.jar"/>
</fileset>
</copy>
-
+
<!-- Copy the generated client libraries -->
<mkdir dir="${install.client}"/>
<copy todir="${install.client}" filtering="no">
@@ -1789,7 +1832,7 @@
<include name="jbossws-wsconsume-impl.jar"/>
</fileset>
</copy>
-
+
<!-- Copy thirdparty code to lib/endorsed -->
<mkdir dir="${install.lib}/endorsed"/>
<copy todir="${install.lib}/endorsed" filtering="no">
@@ -1803,7 +1846,7 @@
<include name="serializer.jar"/>
</fileset>
</copy>
-
+
<!-- Copy thirdparty code to server/all/lib -->
<copy todir="${install.all.lib}" filtering="no">
<fileset dir="${apache.logging.lib}">
@@ -1815,15 +1858,15 @@
<include name="jboss-saaj.jar"/>
</fileset>
</copy>
-
+
<!-- Install jbossws.deployer -->
<mkdir dir="${install.server}/all/deployers/jbossws.deployer"/>
<unzip dest="${install.server}/all/deployers/jbossws.deployer" src="${jboss.jbossws.lib}/jbossws50-deployer.zip"/>
-
+
<!-- Install jbossws.sar -->
<mkdir dir="${install.all.deploy}/jbossws.sar"/>
<unjar dest="${install.all.deploy}/jbossws.sar" src="${jboss.jbossws.lib}/jbossws50.sar"/>
-
+
<!-- install wstools shell scripts -->
<unzip dest="${install.bin}" src="${jboss.jbossws.lib}/jbossws-client.jar">
<patternset>
Modified: trunk/build/build-thirdparty.xml
===================================================================
--- trunk/build/build-thirdparty.xml 2007-02-23 05:50:04 UTC (rev 60815)
+++ trunk/build/build-thirdparty.xml 2007-02-23 07:11:40 UTC (rev 60816)
@@ -95,7 +95,7 @@
<componentref name="jboss/jbossxb" version="snapshot"/>
<componentref name="jboss/jbossws" version="2.0.0.CR3"/>
<componentref name="jboss/jbossws-wsconsume-impl" version="2.0.0"/>
- <componentref name="jboss/messaging" version="1.0.1.GA"/>
+ <componentref name="jboss/messaging" version="1.2.0.CR1"/>
<componentref name="jboss/microcontainer" version="snapshot"/>
<componentref name="jboss/jboss-vfs" version="2.0.0.snapshot"/>
<componentref name="jboss/remoting" version="2.2.0.Alpha7"/>
Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml 2007-02-23 05:50:04 UTC (rev 60815)
+++ trunk/build/build.xml 2007-02-23 07:11:40 UTC (rev 60816)
@@ -716,6 +716,8 @@
<exclude name="farm/**"/>
<exclude name="deploy/juddi-service.sar/**"/>
<exclude name="deploy/tc6-cluster/**"/>
+ <exclude name="deploy/messaging/**"/>
+ <exclude name="deploy/jms-ds.xml"/>
</fileset>
</copy>
<copy todir="${install.default.conf}"
Added: trunk/messaging/src/etc/deploy/clustered/clustered-mysql-persistence-service.xml
===================================================================
--- trunk/messaging/src/etc/deploy/clustered/clustered-mysql-persistence-service.xml (rev 0)
+++ trunk/messaging/src/etc/deploy/clustered/clustered-mysql-persistence-service.xml 2007-02-23 07:11:40 UTC (rev 60816)
@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ MySql clustered persistence deployment descriptor.
+
+ Tested with MySQL 4.1.22
+
+ $Id$
+ -->
+
+<server>
+
+ <mbean code="org.jboss.messaging.core.plugin.JDBCPersistenceManagerService"
+ name="jboss.messaging:service=PersistenceManager"
+ xmbean-dd="xmdesc/JDBCPersistenceManager-xmbean.xml">
+ <depends>jboss.jca:service=DataSourceBinding,name=MessagingDS</depends>
+ <depends optional-attribute-name="TransactionManager">jboss:service=TransactionManager</depends>
+ <attribute name="DataSource">java:/MessagingDS</attribute>
+ <attribute name="CreateTablesOnStartup">true</attribute>
+ <attribute name="UsingBatchUpdates">true</attribute>
+ <attribute name="SqlProperties"><![CDATA[
+ CREATE_MESSAGE_REFERENCE=CREATE TABLE JBM_MSG_REF (CHANNEL_ID BIGINT, MESSAGE_ID BIGINT, TRANSACTION_ID BIGINT, STATE CHAR(1), ORD BIGINT, PAGE_ORD BIGINT, DELIVERY_COUNT INTEGER, SCHED_DELIVERY BIGINT, PRIMARY KEY(CHANNEL_ID, MESSAGE_ID))
+ CREATE_IDX_MESSAGE_REF_TX=CREATE INDEX JBM_MSG_REF_TX ON JBM_MSG_REF (TRANSACTION_ID)
+ CREATE_IDX_MESSAGE_REF_ORD=CREATE INDEX JBM_MSG_REF_ORD ON JBM_MSG_REF (ORD)
+ CREATE_IDX_MESSAGE_REF_PAGE_ORD=CREATE INDEX JBM_MSG_REF_PAGE_ORD ON JBM_MSG_REF (PAGE_ORD)
+ CREATE_IDX_MESSAGE_REF_MESSAGE_ID=CREATE INDEX JBM_MSG_REF_MESSAGE_ID ON JBM_MSG_REF (MESSAGE_ID)
+ CREATE_IDX_MESSAGE_REF_SCHED_DELIVERY=CREATE INDEX JBM_MSG_REF_SCHED_DELIVERY ON JBM_MSG_REF (SCHED_DELIVERY)
+ CREATE_MESSAGE=CREATE TABLE JBM_MSG (MESSAGE_ID BIGINT, RELIABLE CHAR(1), EXPIRATION BIGINT, TIMESTAMP BIGINT, PRIORITY TINYINT, HEADERS MEDIUMBLOB, PAYLOAD LONGBLOB, CHANNEL_COUNT INTEGER, TYPE TINYINT, PRIMARY KEY (MESSAGE_ID))
+ CREATE_TRANSACTION=CREATE TABLE JBM_TX (TRANSACTION_ID BIGINT, BRANCH_QUAL VARBINARY(254), FORMAT_ID INTEGER, GLOBAL_TXID VARBINARY(254), PRIMARY KEY (TRANSACTION_ID))
+ CREATE_COUNTER=CREATE TABLE JBM_COUNTER (NAME VARCHAR(255), NEXT_ID BIGINT, PRIMARY KEY(NAME))
+ INSERT_MESSAGE_REF=INSERT INTO JBM_MSG_REF (CHANNEL_ID, MESSAGE_ID, TRANSACTION_ID, STATE, ORD, PAGE_ORD, DELIVERY_COUNT, SCHED_DELIVERY) VALUES (?, ?, ?, ?, ?, ?, ?, ?)
+ DELETE_MESSAGE_REF=DELETE FROM JBM_MSG_REF WHERE MESSAGE_ID=? AND CHANNEL_ID=? AND STATE='C'
+ UPDATE_MESSAGE_REF=UPDATE JBM_MSG_REF SET TRANSACTION_ID=?, STATE='-' WHERE MESSAGE_ID=? AND CHANNEL_ID=? AND STATE='C'
+ UPDATE_PAGE_ORDER=UPDATE JBM_MSG_REF SET PAGE_ORD = ? WHERE MESSAGE_ID=? AND CHANNEL_ID=?
+ COMMIT_MESSAGE_REF1=UPDATE JBM_MSG_REF SET STATE='C', TRANSACTION_ID = NULL WHERE TRANSACTION_ID=? AND STATE='+'
+ COMMIT_MESSAGE_REF2=DELETE FROM JBM_MSG_REF WHERE TRANSACTION_ID=? AND STATE='-'
+ ROLLBACK_MESSAGE_REF1=DELETE FROM JBM_MSG_REF WHERE TRANSACTION_ID=? AND STATE='+'
+ ROLLBACK_MESSAGE_REF2=UPDATE JBM_MSG_REF SET STATE='C', TRANSACTION_ID = NULL WHERE TRANSACTION_ID=? AND STATE='-'
+ LOAD_PAGED_REFS=SELECT MESSAGE_ID, DELIVERY_COUNT, PAGE_ORD, SCHED_DELIVERY FROM JBM_MSG_REF WHERE CHANNEL_ID = ? AND PAGE_ORD BETWEEN ? AND ? ORDER BY PAGE_ORD
+ LOAD_UNPAGED_REFS=SELECT MESSAGE_ID, DELIVERY_COUNT, SCHED_DELIVERY FROM JBM_MSG_REF WHERE STATE = 'C' AND CHANNEL_ID = ? AND PAGE_ORD IS NULL ORDER BY ORD
+ UPDATE_REFS_NOT_PAGED=UPDATE JBM_MSG_REF SET PAGE_ORD = NULL WHERE PAGE_ORD BETWEEN ? AND ? AND CHANNEL_ID=?
+ SELECT_MIN_MAX_PAGE_ORD=SELECT MIN(PAGE_ORD), MAX(PAGE_ORD) FROM JBM_MSG_REF WHERE CHANNEL_ID = ?
+ SELECT_EXISTS_REF=SELECT MESSAGE_ID FROM JBM_MSG_REF WHERE CHANNEL_ID = ? AND MESSAGE_ID = ?
+ SELECT_EXISTS_REF_MESSAGE_ID=SELECT MESSAGE_ID FROM JBM_MSG_REF WHERE MESSAGE_ID = ?
+ UPDATE_DELIVERY_COUNT=UPDATE JBM_MSG_REF SET DELIVERY_COUNT = ? WHERE CHANNEL_ID = ? AND MESSAGE_ID = ?
+ LOAD_MESSAGES=SELECT MESSAGE_ID, RELIABLE, EXPIRATION, TIMESTAMP, PRIORITY, HEADERS, PAYLOAD, TYPE FROM JBM_MSG
+ INSERT_MESSAGE=INSERT INTO JBM_MSG (MESSAGE_ID, RELIABLE, EXPIRATION, TIMESTAMP, PRIORITY, HEADERS, PAYLOAD, CHANNEL_COUNT, TYPE) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)
+ INC_CHANNEL_COUNT=UPDATE JBM_MSG SET CHANNEL_COUNT = CHANNEL_COUNT + 1 WHERE MESSAGE_ID=?
+ DEC_CHANNEL_COUNT=UPDATE JBM_MSG SET CHANNEL_COUNT = CHANNEL_COUNT - 1 WHERE MESSAGE_ID=?
+ DELETE_MESSAGE=DELETE FROM JBM_MSG WHERE MESSAGE_ID=? AND CHANNEL_COUNT=0
+ MESSAGE_ID_COLUMN=MESSAGE_ID
+ MESSAGE_EXISTS=SELECT MESSAGE_ID FROM JBM_MSG WHERE MESSAGE_ID = ? FOR UPDATE
+ INSERT_TRANSACTION=INSERT INTO JBM_TX (TRANSACTION_ID, BRANCH_QUAL, FORMAT_ID, GLOBAL_TXID) VALUES(?, ?, ?, ?)
+ DELETE_TRANSACTION=DELETE FROM JBM_TX WHERE TRANSACTION_ID = ?
+ SELECT_PREPARED_TRANSACTIONS=SELECT TRANSACTION_ID, BRANCH_QUAL, FORMAT_ID, GLOBAL_TXID FROM JBM_TX
+ SELECT_MESSAGE_ID_FOR_REF=SELECT MESSAGE_ID, CHANNEL_ID FROM JBM_MSG_REF WHERE TRANSACTION_ID = ? AND STATE = '+' ORDER BY ORD
+ SELECT_MESSAGE_ID_FOR_ACK=SELECT MESSAGE_ID, CHANNEL_ID FROM JBM_MSG_REF WHERE TRANSACTION_ID = ? AND STATE = '-' ORDER BY ORD
+ UPDATE_COUNTER=UPDATE JBM_COUNTER SET NEXT_ID = ? WHERE NAME=?
+ SELECT_COUNTER=SELECT NEXT_ID FROM JBM_COUNTER WHERE NAME=? FOR UPDATE
+ INSERT_COUNTER=INSERT INTO JBM_COUNTER (NAME, NEXT_ID) VALUES (?, ?)
+ SELECT_ALL_CHANNELS=SELECT DISTINCT(CHANNEL_ID) FROM JBM_MSG_REF
+ ]]></attribute>
+ <attribute name="MaxParams">500</attribute>
+ </mbean>
+
+ <mbean code="org.jboss.messaging.core.plugin.ClusteredPostOfficeService"
+ name="jboss.messaging:service=PostOffice"
+ xmbean-dd="xmdesc/ClusteredPostOffice-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.jca:service=DataSourceBinding,name=MessagingDS</depends>
+ <depends optional-attribute-name="TransactionManager">jboss:service=TransactionManager</depends>
+ <attribute name="PostOfficeName">Clustered JMS</attribute>
+ <attribute name="DataSource">java:/MessagingDS</attribute>
+ <attribute name="CreateTablesOnStartup">true</attribute>
+ <attribute name="SqlProperties"><![CDATA[
+CREATE_POSTOFFICE_TABLE=CREATE TABLE JBM_POSTOFFICE (POSTOFFICE_NAME VARCHAR(255), NODE_ID INTEGER, QUEUE_NAME VARCHAR(1023), COND VARCHAR(1023), SELECTOR VARCHAR(1023), CHANNEL_ID BIGINT, IS_FAILED_OVER CHAR(1), FAILED_NODE_ID INTEGER)
+INSERT_BINDING=INSERT INTO JBM_POSTOFFICE (POSTOFFICE_NAME, NODE_ID, QUEUE_NAME, COND, SELECTOR, CHANNEL_ID, IS_FAILED_OVER, FAILED_NODE_ID) VALUES (?, ?, ?, ?, ?, ?, ?, ?)
+DELETE_BINDING=DELETE FROM JBM_POSTOFFICE WHERE POSTOFFICE_NAME=? AND NODE_ID=? AND QUEUE_NAME=?
+LOAD_BINDINGS=SELECT NODE_ID, QUEUE_NAME, COND, SELECTOR, CHANNEL_ID, IS_FAILED_OVER, FAILED_NODE_ID FROM JBM_POSTOFFICE WHERE POSTOFFICE_NAME = ?
+ ]]></attribute>
+ <attribute name="GroupName">DefaultPostOffice</attribute>
+ <attribute name="StateTimeout">5000</attribute>
+ <attribute name="CastTimeout">5000</attribute>
+ <attribute name="StatsSendPeriod">10000</attribute>
+ <attribute name="MessagePullPolicy">org.jboss.messaging.core.plugin.postoffice.cluster.DefaultMessagePullPolicy</attribute>
+ <attribute name="ClusterRouterFactory">org.jboss.messaging.core.plugin.postoffice.cluster.DefaultRouterFactory</attribute>
+
+
+ <attribute name="ChannelFactoryName">jgroups.mux:name=Multiplexer</attribute>
+ <attribute name="SyncChannelName">udp-sync</attribute>
+ <attribute name="AsyncChannelName">udp</attribute>
+ <attribute name="ChannelPartitionName">${jboss.partition.name:DefaultPartition}-JMS</attribute>
+
+ <attribute name="AsyncChannelConfig">
+ <config>
+ <UDP mcast_recv_buf_size="500000" down_thread="false" ip_mcast="true" mcast_send_buf_size="32000"
+ mcast_port="45567" ucast_recv_buf_size="500000" use_incoming_packet_handler="false"
+ mcast_addr="228.8.8.8" use_outgoing_packet_handler="true" loopback="true" ucast_send_buf_size="32000" ip_ttl="32" bind_addr="127.0.0.1"/>
+ <AUTOCONF down_thread="false" up_thread="false"/>
+ <PING timeout="2000" down_thread="false" num_initial_members="3" up_thread="false"/>
+ <MERGE2 max_interval="10000" down_thread="false" min_interval="5000" up_thread="false"/>
+ <FD_SOCK down_thread="false" up_thread="false"/>
+ <FD timeout="20000" max_tries="3" down_thread="false" up_thread="false" shun="true"/>
+ <VERIFY_SUSPECT timeout="1500" down_thread="false" up_thread="false"/>
+ <pbcast.NAKACK max_xmit_size="8192" down_thread="false" use_mcast_xmit="true" gc_lag="50" up_thread="false"
+ retransmit_timeout="100,200,600,1200,2400,4800"/>
+ <UNICAST timeout="1200,2400,3600" down_thread="false" up_thread="false"/>
+ <pbcast.STABLE stability_delay="1000" desired_avg_gossip="20000" down_thread="false" max_bytes="0" up_thread="false"/>
+ <FRAG frag_size="8192" down_thread="false" up_thread="false"/>
+ <VIEW_SYNC avg_send_interval="60000" down_thread="false" up_thread="false" />
+ <pbcast.GMS print_local_addr="true" join_timeout="3000" down_thread="false" join_retry_timeout="2000" up_thread="false" shun="true"/>
+ </config>
+ </attribute>
+
+ <attribute name="SyncChannelConfig">
+ <config>
+ <UDP mcast_recv_buf_size="500000" down_thread="false" ip_mcast="true" mcast_send_buf_size="32000"
+ mcast_port="45568" ucast_recv_buf_size="500000" use_incoming_packet_handler="false"
+ mcast_addr="228.8.8.8" use_outgoing_packet_handler="true" loopback="true" ucast_send_buf_size="32000" ip_ttl="32" bind_addr="127.0.0.1"/>
+ <AUTOCONF down_thread="false" up_thread="false"/>
+ <PING timeout="2000" down_thread="false" num_initial_members="3" up_thread="false"/>
+ <MERGE2 max_interval="10000" down_thread="false" min_interval="5000" up_thread="false"/>
+ <FD_SOCK down_thread="false" up_thread="false"/>
+ <FD timeout="20000" max_tries="3" down_thread="false" up_thread="false" shun="true"/>
+ <VERIFY_SUSPECT timeout="1500" down_thread="false" up_thread="false"/>
+ <pbcast.NAKACK max_xmit_size="8192" down_thread="false" use_mcast_xmit="true" gc_lag="50" up_thread="false"
+ retransmit_timeout="100,200,600,1200,2400,4800"/>
+ <UNICAST timeout="1200,2400,3600" down_thread="false" up_thread="false"/>
+ <pbcast.STABLE stability_delay="1000" desired_avg_gossip="20000" down_thread="false" max_bytes="0" up_thread="false"/>
+ <FRAG frag_size="8192" down_thread="false" up_thread="false"/>
+ <VIEW_SYNC avg_send_interval="60000" down_thread="false" up_thread="false" />
+ <pbcast.GMS print_local_addr="true" join_timeout="3000" down_thread="false" join_retry_timeout="2000" up_thread="false" shun="true"/>
+ <pbcast.STATE_TRANSFER down_thread="false" up_thread="false"/>
+ </config>
+ </attribute>
+ </mbean>
+
+ <mbean code="org.jboss.jms.server.plugin.JDBCJMSUserManagerService"
+ name="jboss.messaging:service=JMSUserManager"
+ xmbean-dd="xmdesc/JMSUserManager-xmbean.xml">
+ <depends>jboss.jca:service=DataSourceBinding,name=MessagingDS</depends>
+ <depends optional-attribute-name="TransactionManager">jboss:service=TransactionManager</depends>
+ <attribute name="DataSource">java:/MessagingDS</attribute>
+ <attribute name="CreateTablesOnStartup">true</attribute>
+ <attribute name="SqlProperties"><![CDATA[
+CREATE_USER_TABLE=CREATE TABLE JBM_USER (USER_ID VARCHAR(32) NOT NULL, PASSWD VARCHAR(32) NOT NULL, CLIENTID VARCHAR(128), PRIMARY KEY(USER_ID))
+CREATE_ROLE_TABLE=CREATE TABLE JBM_ROLE (ROLE_ID VARCHAR(32) NOT NULL, USER_ID VARCHAR(32) NOT NULL, PRIMARY KEY(USER_ID, ROLE_ID))
+SELECT_PRECONF_CLIENTID=SELECT CLIENTID FROM JBM_USER WHERE USER_ID=?
+POPULATE.TABLES.1=INSERT INTO JBM_USER (USER_ID,PASSWD,CLIENTID) VALUES ('dilbert','dogbert','dilbert-id')
+ ]]></attribute>
+ </mbean>
+
+</server>
\ No newline at end of file
Property changes on: trunk/messaging/src/etc/deploy/clustered/clustered-mysql-persistence-service.xml
___________________________________________________________________
Name: svn:keywords
+ "Id LastChangedDate Author Revision"
Added: trunk/messaging/src/etc/deploy/clustered/connection-factories-service.xml
===================================================================
--- trunk/messaging/src/etc/deploy/clustered/connection-factories-service.xml (rev 0)
+++ trunk/messaging/src/etc/deploy/clustered/connection-factories-service.xml 2007-02-23 07:11:40 UTC (rev 60816)
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Messaging Connection Factories deployment descriptor.
+
+ $Id: connection-factories-service.xml 2386 2007-02-21 18:07:44Z timfox $
+ -->
+
+<server>
+
+ <mbean code="org.jboss.jms.server.connectionfactory.ConnectionFactory"
+ name="jboss.messaging.connectionfactory:service=ConnectionFactory"
+ xmbean-dd="xmdesc/ConnectionFactory-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends optional-attribute-name="Connector">jboss.messaging:service=Connector,transport=bisocket</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+
+ <attribute name="JNDIBindings">
+ <bindings>
+ <binding>/ConnectionFactory</binding>
+ <binding>/XAConnectionFactory</binding>
+ <binding>java:/ConnectionFactory</binding>
+ <binding>java:/XAConnectionFactory</binding>
+ </bindings>
+ </attribute>
+
+ <attribute name="Clustered">true</attribute>
+ <attribute name="LoadBalancingFactory">org.jboss.jms.client.plugin.RoundRobinLoadBalancingFactory</attribute>
+ </mbean>
+
+ <!--
+ A "local" non-clustered ConnectionFactory that doesn't have neither load balancing nor
+ failover capabilities. It creates connections to the server node that deployed it.
+ -->
+
+ <mbean code="org.jboss.jms.server.connectionfactory.ConnectionFactory"
+ name="jboss.messaging.connectionfactory:service=NonClusteredConnectionFactory"
+ xmbean-dd="xmdesc/ConnectionFactory-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends optional-attribute-name="Connector">jboss.messaging:service=Connector,transport=bisocket</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+
+ <attribute name="JNDIBindings">
+ <bindings>
+ <binding>/NonClusteredConnectionFactory</binding>
+ <binding>/NonClusteredXAConnectionFactory</binding>
+ <binding>java:/NonClusteredConnectionFactory</binding>
+ <binding>java:/NonClusteredXAConnectionFactory</binding>
+ </bindings>
+ </attribute>
+
+ <attribute name="Clustered">false</attribute>
+ </mbean>
+
+</server>
\ No newline at end of file
Property changes on: trunk/messaging/src/etc/deploy/clustered/connection-factories-service.xml
___________________________________________________________________
Name: svn:keywords
+ "Id LastChangedDate Author Revision"
Added: trunk/messaging/src/etc/deploy/clustered/destinations-service.xml
===================================================================
--- trunk/messaging/src/etc/deploy/clustered/destinations-service.xml (rev 0)
+++ trunk/messaging/src/etc/deploy/clustered/destinations-service.xml 2007-02-23 07:11:40 UTC (rev 60816)
@@ -0,0 +1,199 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Messaging Destinations deployment descriptor.
+
+ $Id: destinations-service.xml 1930 2007-01-09 18:16:04Z timfox $
+ -->
+
+<server>
+
+ <!--
+ The Default Dead Letter Queue. This destination is a dependency of an EJB MDB container.
+ -->
+
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.messaging.destination:service=Queue,name=DLQ"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+
+ <!--
+ The Default Expiry Queue.
+ -->
+
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.messaging.destination:service=Queue,name=ExpiryQueue"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+
+ <!--
+ Example destinations.
+ -->
+
+ <mbean code="org.jboss.jms.server.destination.TopicService"
+ name="jboss.messaging.destination:service=Topic,name=testTopic"
+ xmbean-dd="xmdesc/Topic-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ <attribute name="SecurityConfig">
+ <security>
+ <role name="guest" read="true" write="true"/>
+ <role name="publisher" read="true" write="true" create="false"/>
+ <role name="durpublisher" read="true" write="true" create="true"/>
+ </security>
+ </attribute>
+ </mbean>
+
+ <mbean code="org.jboss.jms.server.destination.TopicService"
+ name="jboss.messaging.destination:service=Topic,name=securedTopic"
+ xmbean-dd="xmdesc/Topic-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ <attribute name="SecurityConfig">
+ <security>
+ <role name="publisher" read="true" write="true" create="false"/>
+ </security>
+ </attribute>
+ </mbean>
+
+ <mbean code="org.jboss.jms.server.destination.TopicService"
+ name="jboss.messaging.destination:service=Topic,name=testDurableTopic"
+ xmbean-dd="xmdesc/Topic-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ <attribute name="SecurityConfig">
+ <security>
+ <role name="guest" read="true" write="true"/>
+ <role name="publisher" read="true" write="true" create="false"/>
+ <role name="durpublisher" read="true" write="true" create="true"/>
+ </security>
+ </attribute>
+ </mbean>
+
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.messaging.destination:service=Queue,name=testQueue"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ <attribute name="SecurityConfig">
+ <security>
+ <role name="guest" read="true" write="true"/>
+ <role name="publisher" read="true" write="true" create="false"/>
+ <role name="noacc" read="false" write="false" create="false"/>
+ </security>
+ </attribute>
+ </mbean>
+
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.messaging.destination:service=Queue,name=A"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.messaging.destination:service=Queue,name=B"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.messaging.destination:service=Queue,name=C"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.messaging.destination:service=Queue,name=D"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.messaging.destination:service=Queue,name=ex"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+
+ <!-- It's possible for indiviual queues and topics to use a specific queue for
+ an expiry or DLQ -->
+
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.messaging.destination:service=Queue,name=PrivateDLQ"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.messaging.destination:service=Queue,name=PrivateExpiryQueue"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.messaging.destination:service=Queue,name=QueueWithOwnDLQAndExpiryQueue"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ <attribute name="DLQ">jboss.messaging.destination:service=Queue,name=PrivateDLQ</attribute>
+ <attribute name="ExpiryQueue">jboss.messaging.destination:service=Queue,name=PrivateExpiryQueue</attribute>
+ </mbean>
+
+ <mbean code="org.jboss.jms.server.destination.TopicService"
+ name="jboss.messaging.destination:service=Topic,name=TopicWithOwnDLQAndExpiryQueue"
+ xmbean-dd="xmdesc/Topic-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ <attribute name="DLQ">jboss.messaging.destination:service=Queue,name=PrivateDLQ</attribute>
+ <attribute name="ExpiryQueue">jboss.messaging.destination:service=Queue,name=PrivateExpiryQueue</attribute>
+ </mbean>
+
+ <!-- Queues and Topics can also specify their own redelivery delay -->
+
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.messaging.destination:service=Queue,name=QueueWithOwnRedeliveryDelay"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ <attribute name="RedeliveryDelay">5000</attribute>
+ </mbean>
+
+ <mbean code="org.jboss.jms.server.destination.TopicService"
+ name="jboss.messaging.destination:service=Topic,name=TopicWithOwnRedeliveryDelay"
+ xmbean-dd="xmdesc/Topic-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ <attribute name="RedeliveryDelay">5000</attribute>
+ </mbean>
+
+ <!--
+ Example clustered destinations.
+ -->
+
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.messaging.destination:service=Queue,name=testDistributedQueue"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ <attribute name="Clustered">true</attribute>
+ </mbean>
+
+ <mbean code="org.jboss.jms.server.destination.TopicService"
+ name="jboss.messaging.destination:service=Topic,name=testDistributedTopic"
+ xmbean-dd="xmdesc/Topic-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ <attribute name="Clustered">true</attribute>
+ </mbean>
+
+</server>
\ No newline at end of file
Property changes on: trunk/messaging/src/etc/deploy/clustered/destinations-service.xml
___________________________________________________________________
Name: svn:keywords
+ "Id LastChangedDate Author Revision"
Added: trunk/messaging/src/etc/deploy/clustered/jms-ds.xml
===================================================================
--- trunk/messaging/src/etc/deploy/clustered/jms-ds.xml (rev 0)
+++ trunk/messaging/src/etc/deploy/clustered/jms-ds.xml 2007-02-23 07:11:40 UTC (rev 60816)
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<connection-factories>
+
+ <!-- ==================================================================== -->
+ <!-- JMS Stuff -->
+ <!-- ==================================================================== -->
+
+ <!--
+ The JMS provider loader. Currently pointing to a non-clustered ConnectionFactory. Need to
+ be replaced with a clustered non-load-balanced ConnectionFactory when it becomes available.
+ See http://jira.jboss.org/jira/browse/JBMESSAGING-843.
+ -->
+ <mbean code="org.jboss.jms.jndi.JMSProviderLoader"
+ name="jboss.messaging:service=JMSProviderLoader,name=JMSProvider">
+ <attribute name="ProviderName">DefaultJMSProvider</attribute>
+ <attribute name="ProviderAdapterClass">org.jboss.jms.jndi.JNDIProviderAdapter</attribute>
+ <attribute name="FactoryRef">java:/NonClusteredXAConnectionFactory</attribute>
+ <attribute name="QueueFactoryRef">java:/NonClusteredXAConnectionFactory</attribute>
+ <attribute name="TopicFactoryRef">java:/NonClusteredXAConnectionFactory</attribute>
+ </mbean>
+
+ <mbean code="org.jboss.jms.asf.ServerSessionPoolLoader"
+ name="jboss.messaging:service=ServerSessionPoolMBean,name=StdJMSPool">
+ <depends optional-attribute-name="XidFactory">jboss:service=XidFactory</depends>
+ <attribute name="PoolName">StdJMSPool</attribute>
+ <attribute name="PoolFactoryClass">org.jboss.jms.asf.StdServerSessionPoolFactory</attribute>
+ </mbean>
+
+ <!-- JMS XA Resource adapter, use this to get transacted JMS in beans -->
+ <tx-connection-factory>
+ <jndi-name>JmsXA</jndi-name>
+ <xa-transaction/>
+ <rar-name>jms-ra.rar</rar-name>
+ <connection-definition>org.jboss.resource.adapter.jms.JmsConnectionFactory</connection-definition>
+ <config-property name="SessionDefaultType" type="java.lang.String">javax.jms.Topic</config-property>
+ <config-property name="JmsProviderAdapterJNDI" type="java.lang.String">java:/DefaultJMSProvider</config-property>
+ <max-pool-size>20</max-pool-size>
+ <security-domain-and-application>JmsXARealm</security-domain-and-application>
+ <depends>jboss.messaging:service=ServerPeer</depends>
+ </tx-connection-factory>
+
+</connection-factories>
Property changes on: trunk/messaging/src/etc/deploy/clustered/jms-ds.xml
___________________________________________________________________
Name: svn:keywords
+ "Id LastChangedDate Author Revision"
Added: trunk/messaging/src/etc/deploy/clustered/mysql-ds.xml
===================================================================
--- trunk/messaging/src/etc/deploy/clustered/mysql-ds.xml (rev 0)
+++ trunk/messaging/src/etc/deploy/clustered/mysql-ds.xml 2007-02-23 07:11:40 UTC (rev 60816)
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Datasource configuration for MySQL.
+
+ WARNING! MAY REQUIRE ADDITIONAL CUSTOMIZATION FOR YOUR ENVIRONMENT.
+
+ Specifically, you may want to modify the connection-url, username and password so it matches
+ your installed database instance.
+
+
+ $Id: mysql-ds.xml,v 1.3.2.1 2004/12/01 11:46:00 schrouf Exp $
+-->
+
+<datasources>
+
+ <local-tx-datasource>
+
+ <jndi-name>MessagingDS</jndi-name>
+
+ <connection-url>jdbc:mysql://localhost:3306/messaging</connection-url>
+ <driver-class>com.mysql.jdbc.Driver</driver-class>
+ <user-name>sa</user-name>
+ <password></password>
+ <exception-sorter-class-name>org.jboss.resource.adapter.jdbc.vendor.MySQLExceptionSorter</exception-sorter-class-name>
+
+ <!--
+ SQL to call when connection is created.
+ -->
+ <!--
+ <new-connection-sql>some arbitrary sql</new-connection-sql>
+ -->
+
+ <!--
+ SQL to call on an existing pooled connection when it is obtained from pool.
+ -->
+ <!--
+ <check-valid-connection-sql>some arbitrary sql</check-valid-connection-sql>
+ -->
+
+ <!--
+ Corresponding type-mapping in the standardjbosscmp-jdbc.xml (optional).
+ -->
+ <metadata>
+ <type-mapping>mySQL</type-mapping>
+ </metadata>
+
+ </local-tx-datasource>
+
+</datasources>
+
Property changes on: trunk/messaging/src/etc/deploy/clustered/mysql-ds.xml
___________________________________________________________________
Name: svn:keywords
+ "Id LastChangedDate Author Revision"
Added: trunk/messaging/src/etc/deploy/common/legacy-service.xml
===================================================================
--- trunk/messaging/src/etc/deploy/common/legacy-service.xml (rev 0)
+++ trunk/messaging/src/etc/deploy/common/legacy-service.xml 2007-02-23 07:11:40 UTC (rev 60816)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Messaging Destinations deployment descriptor.
+
+ $Id: destinations-service.xml 927 2006-05-03 01:51:14Z ovidiu $
+-->
+
+<server>
+ <mbean code="org.jboss.mq.server.jmx.DummyDestMgr"
+ name="jboss.mq:service=DestinationManager">
+ <depends>jboss.messaging:service=ServerPeer</depends>
+ </mbean>
+ <mbean code="org.jboss.mq.server.jmx.DummySecurityMgr"
+ name="jboss.mq:service=SecurityManager" />
+
+</server>
Property changes on: trunk/messaging/src/etc/deploy/common/legacy-service.xml
___________________________________________________________________
Name: svn:keywords
+ "Id LastChangedDate Author Revision"
Added: trunk/messaging/src/etc/deploy/common/messaging-roles.properties
===================================================================
--- trunk/messaging/src/etc/deploy/common/messaging-roles.properties (rev 0)
+++ trunk/messaging/src/etc/deploy/common/messaging-roles.properties 2007-02-23 07:11:40 UTC (rev 60816)
@@ -0,0 +1,4 @@
+#
+# user=role1,role2,...
+#
+guest=guest
Added: trunk/messaging/src/etc/deploy/common/messaging-service.xml
===================================================================
--- trunk/messaging/src/etc/deploy/common/messaging-service.xml (rev 0)
+++ trunk/messaging/src/etc/deploy/common/messaging-service.xml 2007-02-23 07:11:40 UTC (rev 60816)
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ The JBoss Messaging service deployment descriptor.
+
+ $Id: messaging-service.xml 2386 2007-02-21 18:07:44Z timfox $
+ -->
+
+<server>
+
+ <mbean code="org.jboss.jms.server.ServerPeer"
+ name="jboss.messaging:service=ServerPeer"
+ xmbean-dd="xmdesc/ServerPeer-xmbean.xml">
+
+ <constructor>
+ <!-- ServerPeerID -->
+ <arg type="int" value="0"/>
+ <!-- DefaultQueueJNDIContext -->
+ <arg type="java.lang.String" value="/queue"/>
+ <!-- DefaultTopicJNDIContext -->
+ <arg type="java.lang.String" value="/topic"/>
+ </constructor>
+
+ <attribute name="PostOffice">jboss.messaging:service=PostOffice</attribute>
+ <attribute name="SecurityDomain">java:/jaas/messaging</attribute>
+ <attribute name="DefaultSecurityConfig">
+ <security>
+ <role name="guest" read="true" write="true" create="true"/>
+ </security>
+ </attribute>
+ <attribute name="DefaultDLQ">jboss.messaging.destination:service=Queue,name=DLQ</attribute>
+ <attribute name="DefaultMaxDeliveryAttempts">10</attribute>
+ <attribute name="DefaultExpiryQueue">jboss.messaging.destination:service=Queue,name=ExpiryQueue</attribute>
+ <attribute name="DefaultRedeliveryDelay">0</attribute>
+ <attribute name="QueueStatsSamplePeriod">5000</attribute>
+ <attribute name="FailoverStartTimeout">3000</attribute>
+ <attribute name="FailoverCompleteTimeout">12000</attribute>
+ <attribute name="DefaultMessageCounterHistoryDayLimit">-1</attribute>
+
+ <depends optional-attribute-name="PersistenceManager">jboss.messaging:service=PersistenceManager</depends>
+ <depends optional-attribute-name="JMSUserManager">jboss.messaging:service=JMSUserManager</depends>
+ <depends>jboss.messaging:service=Connector,transport=bisocket</depends>
+
+ </mbean>
+
+</server>
\ No newline at end of file
Property changes on: trunk/messaging/src/etc/deploy/common/messaging-service.xml
___________________________________________________________________
Name: svn:keywords
+ "Id LastChangedDate Author Revision"
Added: trunk/messaging/src/etc/deploy/common/messaging-users.properties
===================================================================
--- trunk/messaging/src/etc/deploy/common/messaging-users.properties (rev 0)
+++ trunk/messaging/src/etc/deploy/common/messaging-users.properties 2007-02-23 07:11:40 UTC (rev 60816)
@@ -0,0 +1,4 @@
+#
+# user=password
+#
+guest=guest
Added: trunk/messaging/src/etc/deploy/common/remoting-service.xml
===================================================================
--- trunk/messaging/src/etc/deploy/common/remoting-service.xml (rev 0)
+++ trunk/messaging/src/etc/deploy/common/remoting-service.xml 2007-02-23 07:11:40 UTC (rev 60816)
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Messaging Remoting service deployment descriptor.
+
+ $Id: remoting-service.xml 2399 2007-02-23 01:21:29Z ovidiu.feodorov at jboss.com $
+ -->
+
+<server>
+
+ <mbean code="org.jboss.remoting.transport.Connector"
+ name="jboss.messaging:service=Connector,transport=bisocket"
+ display-name="Bisocket transport Connector">
+ <attribute name="Configuration">
+ <config>
+ <invoker transport="bisocket">
+ <attribute name="marshaller" isParam="true">org.jboss.jms.server.remoting.JMSWireFormat</attribute>
+ <attribute name="unmarshaller" isParam="true">org.jboss.jms.server.remoting.JMSWireFormat</attribute>
+ <!-- Serialization type must be jms - do not change! -->
+ <attribute name="serializationtype" isParam="true">jms</attribute>
+ <attribute name="dataType" isParam="true">jms</attribute>
+ <attribute name="socket.check_connection" isParam="true">false</attribute>
+ <attribute name="timeout">0</attribute>
+ <attribute name="serverBindAddress">${jboss.bind.address}</attribute>
+ <attribute name="serverBindPort">4457</attribute>
+ <attribute name="leasePeriod">10000</attribute>
+ <attribute name="callbackStore">org.jboss.remoting.callback.CallbackStore</attribute>
+ <attribute name="clientSocketClass" isParam="true">org.jboss.jms.client.remoting.ClientSocketWrapper</attribute>
+ <attribute name="serverSocketClass">org.jboss.jms.server.remoting.ServerSocketWrapper</attribute>
+ <attribute name="callbackErrorsAllowed">1</attribute>
+ <attribute name="numberOfRetries" isParam="true">1</attribute>
+ <attribute name="NumberOfCallRetries" isParam="true">2</attribute>
+ <attribute name="clientMaxPoolSize" isParam="true">50</attribute>
+ </invoker>
+ <handlers>
+ <handler subsystem="JMS">org.jboss.jms.server.remoting.JMSServerInvocationHandler</handler>
+ </handlers>
+ </config>
+ </attribute>
+ <depends>jboss.messaging:service=NetworkRegistry</depends>
+ </mbean>
+
+ <!--
+ HTTP Connector example
+ -->
+ <!--
+ <mbean code="org.jboss.remoting.transport.Connector"
+ name="jboss.messaging:service=Connector,transport=http"
+ display-name="HTTP transport Connector">
+ <attribute name="Configuration">
+ <config>
+ <invoker transport="http">
+ <attribute name="marshaller" isParam="true">org.jboss.jms.server.remoting.JMSWireFormat</attribute>
+ <attribute name="unmarshaller" isParam="true">org.jboss.jms.server.remoting.JMSWireFormat</attribute>
+ <!== Serialization type must be jms - do not change! ==>
+ <attribute name="serializationtype" isParam="true">jms</attribute>
+ <attribute name="dataType" isParam="true">jms</attribute>
+ <attribute name="serverBindAddress">${jboss.bind.address}</attribute>
+ <attribute name="serverBindPort">4458</attribute>
+ <attribute name="leasePeriod">20000</attribute>
+ <attribute name="callbackStore">org.jboss.remoting.callback.CallbackStore</attribute>
+ <attribute name="callbackPollPeriod" isParam="true">100</attribute>
+ </invoker>
+ <handlers>
+ <handler subsystem="JMS">org.jboss.jms.server.remoting.JMSServerInvocationHandler</handler>
+ </handlers>
+ </config>
+ </attribute>
+ <depends>jboss.messaging:service=NetworkRegistry</depends>
+ </mbean>
+ -->
+
+
+ <!-- TODO: Do I need this> -->
+ <mbean code="org.jboss.remoting.network.NetworkRegistry"
+ name="jboss.messaging:service=NetworkRegistry"/>
+
+</server>
\ No newline at end of file
Property changes on: trunk/messaging/src/etc/deploy/common/remoting-service.xml
___________________________________________________________________
Name: svn:keywords
+ "Id LastChangedDate Author Revision"
Deleted: trunk/messaging/src/etc/deploy/connection-factories-service.xml
===================================================================
--- trunk/messaging/src/etc/deploy/connection-factories-service.xml 2007-02-23 05:50:04 UTC (rev 60815)
+++ trunk/messaging/src/etc/deploy/connection-factories-service.xml 2007-02-23 07:11:40 UTC (rev 60816)
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- Messaging Connection Factories deployment descriptor.
-
- $Id: connection-factories-service.xml 920 2006-05-02 02:45:42Z ovidiu $
- -->
-
-<server>
-
- <mbean code="org.jboss.jms.server.connectionfactory.ConnectionFactory"
- name="jboss.messaging.destination:service=ConnectionFactory"
- xmbean-dd="xmdesc/ConnectionFactory-xmbean.xml">
- <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
- <depends optional-attribute-name="Connector">jboss.messaging:service=Connector,transport=socket</depends>
- <attribute name="JNDIBindings">
- <bindings>
- <binding>/ConnectionFactory</binding>
- <binding>/XAConnectionFactory</binding>
- <binding>java:/ConnectionFactory</binding>
- <binding>java:/XAConnectionFactory</binding>
- </bindings>
- </attribute>
- </mbean>
-
-</server>
\ No newline at end of file
Deleted: trunk/messaging/src/etc/deploy/destinations-service.xml
===================================================================
--- trunk/messaging/src/etc/deploy/destinations-service.xml 2007-02-23 05:50:04 UTC (rev 60815)
+++ trunk/messaging/src/etc/deploy/destinations-service.xml 2007-02-23 07:11:40 UTC (rev 60816)
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Messaging Destinations deployment descriptor.
-
- $Id: destinations-service.xml 927 2006-05-03 01:51:14Z ovidiu $
--->
-
-<server>
-
- <!--
- The Dead Letter Queue. This destination is a dependency of an EJB MDB container.
- -->
-
- <mbean code="org.jboss.jms.server.destination.Queue"
- name="jboss.messaging.destination:service=Queue,name=DLQ"
- xmbean-dd="xmdesc/Queue-xmbean.xml">
- <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
- </mbean>
-
- <!--
- Default test destination. Smoke tests assume they are available.
- -->
- <mbean code="org.jboss.jms.server.destination.Topic"
- name="jboss.messaging.destination:service=Topic,name=testTopic"
- xmbean-dd="xmdesc/Topic-xmbean.xml">
- <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
- </mbean>
-
- <mbean code="org.jboss.jms.server.destination.Queue"
- name="jboss.messaging.destination:service=Queue,name=testQueue"
- xmbean-dd="xmdesc/Queue-xmbean.xml">
- <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
- </mbean>
-
-</server>
Deleted: trunk/messaging/src/etc/deploy/hsqldb-persistence-service.xml
===================================================================
--- trunk/messaging/src/etc/deploy/hsqldb-persistence-service.xml 2007-02-23 05:50:04 UTC (rev 60815)
+++ trunk/messaging/src/etc/deploy/hsqldb-persistence-service.xml 2007-02-23 07:11:40 UTC (rev 60816)
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- Hypersonic persistence deployment descriptor.
-
- $Id: hsqldb-persistence-service.xml 1222 2006-08-10 18:51:44Z ovidiu.feodorov at jboss.com $
- -->
-
-<server>
-
- <mbean code="org.jboss.messaging.core.plugin.JDBCPersistenceManager"
- name="jboss.messaging:service=PersistenceManager"
- xmbean-dd="xmdesc/JDBCPersistenceManager-xmbean.xml">
- <!-- TODO this insures the fact that dependency exists. However I need to redundantly specifiy
- the DataSource JNDI name in order to actually get a reference to it. Fix this.
- -->
- <depends>jboss.jca:service=DataSourceBinding,name=DefaultDS</depends>
- <depends optional-attribute-name="TransactionManager">jboss:service=TransactionManager</depends>
- <depends optional-attribute-name="ChannelMapper">jboss.messaging:service=ChannelMapper</depends>
- <attribute name="DataSource">java:/DefaultDS</attribute>
- <attribute name="CreateTablesOnStartup">true</attribute>
- <attribute name="UsingBatchUpdates">true</attribute>
- </mbean>
-
- <mbean code="org.jboss.jms.server.plugin.JDBCChannelMapper"
- name="jboss.messaging:service=ChannelMapper"
- xmbean-dd="xmdesc/JDBCChannelMapper-xmbean.xml">
- <!-- TODO this insures the fact that dependency exists. However I need to redundantly specifiy
- the DataSource JNDI name in order to actually get a reference to it. Fix this.
- -->
- <depends>jboss.jca:service=DataSourceBinding,name=DefaultDS</depends>
- <depends optional-attribute-name="TransactionManager">jboss:service=TransactionManager</depends>
- <attribute name="DataSource">java:/DefaultDS</attribute>
- <attribute name="CreateTablesOnStartup">true</attribute>
- </mbean>
-
-</server>
\ No newline at end of file
Deleted: trunk/messaging/src/etc/deploy/jms-ds.xml
===================================================================
--- trunk/messaging/src/etc/deploy/jms-ds.xml 2007-02-23 05:50:04 UTC (rev 60815)
+++ trunk/messaging/src/etc/deploy/jms-ds.xml 2007-02-23 07:11:40 UTC (rev 60816)
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<connection-factories>
-
- <!-- ==================================================================== -->
- <!-- JMS Stuff -->
- <!-- ==================================================================== -->
-
- <!-- The JMS provider loader -->
- <mbean code="org.jboss.jms.jndi.JMSProviderLoader"
- name="jboss.messaging:service=JMSProviderLoader,name=JMSProvider">
- <attribute name="ProviderName">DefaultJMSProvider</attribute>
- <attribute name="ProviderAdapterClass">org.jboss.jms.jndi.JNDIProviderAdapter</attribute>
- <attribute name="FactoryRef">java:/XAConnectionFactory</attribute>
- <attribute name="QueueFactoryRef">java:/XAConnectionFactory</attribute>
- <attribute name="TopicFactoryRef">java:/XAConnectionFactory</attribute>
- </mbean>
-
- <mbean code="org.jboss.jms.asf.ServerSessionPoolLoader"
- name="jboss.messaging:service=ServerSessionPoolMBean,name=StdJMSPool">
- <depends optional-attribute-name="XidFactory">jboss:service=XidFactory</depends>
- <attribute name="PoolName">StdJMSPool</attribute>
- <attribute name="PoolFactoryClass">org.jboss.jms.asf.StdServerSessionPoolFactory</attribute>
- </mbean>
-
- <!-- JMS XA Resource adapter, use this to get transacted JMS in beans -->
- <tx-connection-factory>
- <jndi-name>JmsXA</jndi-name>
- <xa-transaction/>
- <rar-name>jms-ra.rar</rar-name>
- <connection-definition>org.jboss.resource.adapter.jms.JmsConnectionFactory</connection-definition>
- <config-property name="SessionDefaultType" type="java.lang.String">javax.jms.Topic</config-property>
- <config-property name="JmsProviderAdapterJNDI" type="java.lang.String">java:/DefaultJMSProvider</config-property>
- <max-pool-size>20</max-pool-size>
- <security-domain-and-application>JmsXARealm</security-domain-and-application>
- <depends>jboss.messaging:service=ServerPeer</depends>
- </tx-connection-factory>
-
-</connection-factories>
Deleted: trunk/messaging/src/etc/deploy/legacy-service.xml
===================================================================
--- trunk/messaging/src/etc/deploy/legacy-service.xml 2007-02-23 05:50:04 UTC (rev 60815)
+++ trunk/messaging/src/etc/deploy/legacy-service.xml 2007-02-23 07:11:40 UTC (rev 60816)
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Messaging Destinations deployment descriptor.
-
- $Id: destinations-service.xml 927 2006-05-03 01:51:14Z ovidiu $
--->
-
-<server>
- <mbean code="org.jboss.mq.server.jmx.DummyDestMgr"
- name="jboss.mq:service=DestinationManager">
- <depends>jboss.messaging:service=ServerPeer</depends>
- </mbean>
- <mbean code="org.jboss.mq.server.jmx.DummySecurityMgr"
- name="jboss.mq:service=SecurityManager" />
-
-</server>
Deleted: trunk/messaging/src/etc/deploy/messaging-roles.properties
===================================================================
--- trunk/messaging/src/etc/deploy/messaging-roles.properties 2007-02-23 05:50:04 UTC (rev 60815)
+++ trunk/messaging/src/etc/deploy/messaging-roles.properties 2007-02-23 07:11:40 UTC (rev 60816)
@@ -1,4 +0,0 @@
-#
-# user=role1,role2,...
-#
-guest=guest
Deleted: trunk/messaging/src/etc/deploy/messaging-service.xml
===================================================================
--- trunk/messaging/src/etc/deploy/messaging-service.xml 2007-02-23 05:50:04 UTC (rev 60815)
+++ trunk/messaging/src/etc/deploy/messaging-service.xml 2007-02-23 07:11:40 UTC (rev 60816)
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- The JBoss Messaging service deployment descriptor.
-
- $Id: messaging-service.xml 1019 2006-07-17 17:15:04Z timfox $
- -->
-
-<server>
-
- <mbean code="org.jboss.jms.server.ServerPeer"
- name="jboss.messaging:service=ServerPeer"
- xmbean-dd="xmdesc/ServerPeer-xmbean.xml">
-
- <constructor>
- <!-- ServerPeerID -->
- <arg type="java.lang.String" value="server.0" />
- <!-- DefaultQueueJNDIContext -->
- <arg type="java.lang.String" value="/queue" />
- <!-- DefaultTopicJNDIContext -->
- <arg type="java.lang.String" value="/topic" />
- </constructor>
-
- <depends optional-attribute-name="PersistenceManager">jboss.messaging:service=PersistenceManager</depends>
- <depends optional-attribute-name="MessageStore">jboss.messaging:service=MessageStore</depends>
- <depends optional-attribute-name="ChannelMapper">jboss.messaging:service=ChannelMapper</depends>
-
- <!-- Set to -1 to completely disable client leasing -->
- <attribute name="SecurityDomain">java:/jaas/messaging</attribute>
- <attribute name="DefaultSecurityConfig">
- <security>
- <role name="guest" read="true" write="true" create="true"/>
- </security>
- </attribute>
- </mbean>
-
- <!-- Plug-ins -->
-
- <mbean code="org.jboss.messaging.core.plugin.SimpleMessageStore"
- name="jboss.messaging:service=MessageStore"
- xmbean-dd="xmdesc/SimpleMessageStore-xmbean.xml">
- <constructor>
- <!-- StoreID -->
- <arg type="java.lang.String" value="store.0" />
- </constructor>
- </mbean>
-
-</server>
\ No newline at end of file
Deleted: trunk/messaging/src/etc/deploy/messaging-users.properties
===================================================================
--- trunk/messaging/src/etc/deploy/messaging-users.properties 2007-02-23 05:50:04 UTC (rev 60815)
+++ trunk/messaging/src/etc/deploy/messaging-users.properties 2007-02-23 07:11:40 UTC (rev 60816)
@@ -1,4 +0,0 @@
-#
-# user=password
-#
-guest=guest
Added: trunk/messaging/src/etc/deploy/non-clustered/connection-factories-service.xml
===================================================================
--- trunk/messaging/src/etc/deploy/non-clustered/connection-factories-service.xml (rev 0)
+++ trunk/messaging/src/etc/deploy/non-clustered/connection-factories-service.xml 2007-02-23 07:11:40 UTC (rev 60816)
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Messaging Connection Factories deployment descriptor.
+
+ $Id: connection-factories-service.xml 2386 2007-02-21 18:07:44Z timfox $
+ -->
+
+<server>
+
+ <mbean code="org.jboss.jms.server.connectionfactory.ConnectionFactory"
+ name="jboss.messaging.connectionfactory:service=ConnectionFactory"
+ xmbean-dd="xmdesc/ConnectionFactory-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends optional-attribute-name="Connector">jboss.messaging:service=Connector,transport=bisocket</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+
+ <attribute name="JNDIBindings">
+ <bindings>
+ <binding>/ConnectionFactory</binding>
+ <binding>/XAConnectionFactory</binding>
+ <binding>java:/ConnectionFactory</binding>
+ <binding>java:/XAConnectionFactory</binding>
+ </bindings>
+ </attribute>
+
+ </mbean>
+
+</server>
\ No newline at end of file
Property changes on: trunk/messaging/src/etc/deploy/non-clustered/connection-factories-service.xml
___________________________________________________________________
Name: svn:keywords
+ "Id LastChangedDate Author Revision"
Added: trunk/messaging/src/etc/deploy/non-clustered/destinations-service.xml
===================================================================
--- trunk/messaging/src/etc/deploy/non-clustered/destinations-service.xml (rev 0)
+++ trunk/messaging/src/etc/deploy/non-clustered/destinations-service.xml 2007-02-23 07:11:40 UTC (rev 60816)
@@ -0,0 +1,179 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Messaging Destinations deployment descriptor.
+
+ $Id: destinations-service.xml 1930 2007-01-09 18:16:04Z timfox $
+ -->
+
+<server>
+
+ <!--
+ The Default Dead Letter Queue. This destination is a dependency of an EJB MDB container.
+ -->
+
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.messaging.destination:service=Queue,name=DLQ"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+
+ <!--
+ The Default Expiry Queue.
+ -->
+
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.messaging.destination:service=Queue,name=ExpiryQueue"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+
+ <!--
+ Example destinations.
+ -->
+
+ <mbean code="org.jboss.jms.server.destination.TopicService"
+ name="jboss.messaging.destination:service=Topic,name=testTopic"
+ xmbean-dd="xmdesc/Topic-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ <attribute name="SecurityConfig">
+ <security>
+ <role name="guest" read="true" write="true"/>
+ <role name="publisher" read="true" write="true" create="false"/>
+ <role name="durpublisher" read="true" write="true" create="true"/>
+ </security>
+ </attribute>
+ </mbean>
+
+ <mbean code="org.jboss.jms.server.destination.TopicService"
+ name="jboss.messaging.destination:service=Topic,name=securedTopic"
+ xmbean-dd="xmdesc/Topic-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ <attribute name="SecurityConfig">
+ <security>
+ <role name="publisher" read="true" write="true" create="false"/>
+ </security>
+ </attribute>
+ </mbean>
+
+ <mbean code="org.jboss.jms.server.destination.TopicService"
+ name="jboss.messaging.destination:service=Topic,name=testDurableTopic"
+ xmbean-dd="xmdesc/Topic-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ <attribute name="SecurityConfig">
+ <security>
+ <role name="guest" read="true" write="true"/>
+ <role name="publisher" read="true" write="true" create="false"/>
+ <role name="durpublisher" read="true" write="true" create="true"/>
+ </security>
+ </attribute>
+ </mbean>
+
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.messaging.destination:service=Queue,name=testQueue"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ <attribute name="SecurityConfig">
+ <security>
+ <role name="guest" read="true" write="true"/>
+ <role name="publisher" read="true" write="true" create="false"/>
+ <role name="noacc" read="false" write="false" create="false"/>
+ </security>
+ </attribute>
+ </mbean>
+
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.messaging.destination:service=Queue,name=A"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.messaging.destination:service=Queue,name=B"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.messaging.destination:service=Queue,name=C"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.messaging.destination:service=Queue,name=D"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.messaging.destination:service=Queue,name=ex"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+
+ <!-- It's possible for indiviual queues and topics to use a specific queue for
+ an expiry or DLQ -->
+
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.messaging.destination:service=Queue,name=PrivateDLQ"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.messaging.destination:service=Queue,name=PrivateExpiryQueue"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.messaging.destination:service=Queue,name=QueueWithOwnDLQAndExpiryQueue"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ <attribute name="DLQ">jboss.messaging.destination:service=Queue,name=PrivateDLQ</attribute>
+ <attribute name="ExpiryQueue">jboss.messaging.destination:service=Queue,name=PrivateExpiryQueue</attribute>
+ </mbean>
+
+ <mbean code="org.jboss.jms.server.destination.TopicService"
+ name="jboss.messaging.destination:service=Topic,name=TopicWithOwnDLQAndExpiryQueue"
+ xmbean-dd="xmdesc/Topic-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ <attribute name="DLQ">jboss.messaging.destination:service=Queue,name=PrivateDLQ</attribute>
+ <attribute name="ExpiryQueue">jboss.messaging.destination:service=Queue,name=PrivateExpiryQueue</attribute>
+ </mbean>
+
+ <!-- Queues and Topics can also specify their own redelivery delay -->
+
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.messaging.destination:service=Queue,name=QueueWithOwnRedeliveryDelay"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ <attribute name="RedeliveryDelay">5000</attribute>
+ </mbean>
+
+ <mbean code="org.jboss.jms.server.destination.TopicService"
+ name="jboss.messaging.destination:service=Topic,name=TopicWithOwnRedeliveryDelay"
+ xmbean-dd="xmdesc/Topic-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ <attribute name="RedeliveryDelay">5000</attribute>
+ </mbean>
+
+</server>
\ No newline at end of file
Property changes on: trunk/messaging/src/etc/deploy/non-clustered/destinations-service.xml
___________________________________________________________________
Name: svn:keywords
+ "Id LastChangedDate Author Revision"
Added: trunk/messaging/src/etc/deploy/non-clustered/hsqldb-persistence-service.xml
===================================================================
--- trunk/messaging/src/etc/deploy/non-clustered/hsqldb-persistence-service.xml (rev 0)
+++ trunk/messaging/src/etc/deploy/non-clustered/hsqldb-persistence-service.xml 2007-02-23 07:11:40 UTC (rev 60816)
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Hypersonic persistence deployment descriptor.
+
+ $Id: hsqldb-persistence-service.xml 2277 2007-02-12 21:51:57Z clebert.suconic at jboss.com $
+ -->
+
+<server>
+
+ <mbean code="org.jboss.messaging.core.plugin.JDBCPersistenceManagerService"
+ name="jboss.messaging:service=PersistenceManager"
+ xmbean-dd="xmdesc/JDBCPersistenceManager-xmbean.xml">
+ <depends>jboss.jca:service=DataSourceBinding,name=DefaultDS</depends>
+ <depends optional-attribute-name="TransactionManager">jboss:service=TransactionManager</depends>
+ <attribute name="DataSource">java:/DefaultDS</attribute>
+ <attribute name="CreateTablesOnStartup">true</attribute>
+ <attribute name="UsingBatchUpdates">false</attribute>
+ <attribute name="MaxParams">500</attribute>
+ </mbean>
+
+ <!-- Note that Hypersonic CANNOT be used for clustered post offices -->
+
+ <mbean code="org.jboss.messaging.core.plugin.DefaultPostOfficeService"
+ name="jboss.messaging:service=PostOffice"
+ xmbean-dd="xmdesc/DefaultPostOffice-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.jca:service=DataSourceBinding,name=DefaultDS</depends>
+ <depends optional-attribute-name="TransactionManager">jboss:service=TransactionManager</depends>
+ <attribute name="PostOfficeName">JMS</attribute>
+ <attribute name="DataSource">java:/DefaultDS</attribute>
+ <attribute name="CreateTablesOnStartup">true</attribute>
+ </mbean>
+
+ <mbean code="org.jboss.jms.server.plugin.JDBCJMSUserManagerService"
+ name="jboss.messaging:service=JMSUserManager"
+ xmbean-dd="xmdesc/JMSUserManager-xmbean.xml">
+ <depends>jboss.jca:service=DataSourceBinding,name=DefaultDS</depends>
+ <depends optional-attribute-name="TransactionManager">jboss:service=TransactionManager</depends>
+ <attribute name="DataSource">java:/DefaultDS</attribute>
+ <attribute name="CreateTablesOnStartup">true</attribute>
+ <attribute name="SqlProperties"><![CDATA[
+POPULATE.TABLES.1=INSERT INTO JBM_USER (USER_ID,PASSWD,CLIENTID) VALUES ('dilbert','dogbert','dilbert-id')
+ ]]></attribute>
+ </mbean>
+
+</server>
\ No newline at end of file
Property changes on: trunk/messaging/src/etc/deploy/non-clustered/hsqldb-persistence-service.xml
___________________________________________________________________
Name: svn:keywords
+ "Id LastChangedDate Author Revision"
Added: trunk/messaging/src/etc/deploy/non-clustered/jms-ds.xml
===================================================================
--- trunk/messaging/src/etc/deploy/non-clustered/jms-ds.xml (rev 0)
+++ trunk/messaging/src/etc/deploy/non-clustered/jms-ds.xml 2007-02-23 07:11:40 UTC (rev 60816)
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<connection-factories>
+
+ <!-- ==================================================================== -->
+ <!-- JMS Stuff -->
+ <!-- ==================================================================== -->
+
+ <!--
+ The JMS provider loader. Currently pointing to a non-clustered ConnectionFactory. Need to
+ be replaced with a clustered non-load-balanced ConnectionFactory when it becomes available.
+ See http://jira.jboss.org/jira/browse/JBMESSAGING-843.
+ -->
+ <mbean code="org.jboss.jms.jndi.JMSProviderLoader"
+ name="jboss.messaging:service=JMSProviderLoader,name=JMSProvider">
+ <attribute name="ProviderName">DefaultJMSProvider</attribute>
+ <attribute name="ProviderAdapterClass">org.jboss.jms.jndi.JNDIProviderAdapter</attribute>
+ <attribute name="FactoryRef">java:/XAConnectionFactory</attribute>
+ <attribute name="QueueFactoryRef">java:/XAConnectionFactory</attribute>
+ <attribute name="TopicFactoryRef">java:/XAConnectionFactory</attribute>
+ </mbean>
+
+ <mbean code="org.jboss.jms.asf.ServerSessionPoolLoader"
+ name="jboss.messaging:service=ServerSessionPoolMBean,name=StdJMSPool">
+ <depends optional-attribute-name="XidFactory">jboss:service=XidFactory</depends>
+ <attribute name="PoolName">StdJMSPool</attribute>
+ <attribute name="PoolFactoryClass">org.jboss.jms.asf.StdServerSessionPoolFactory</attribute>
+ </mbean>
+
+ <!-- JMS XA Resource adapter, use this to get transacted JMS in beans -->
+ <tx-connection-factory>
+ <jndi-name>JmsXA</jndi-name>
+ <xa-transaction/>
+ <rar-name>jms-ra.rar</rar-name>
+ <connection-definition>org.jboss.resource.adapter.jms.JmsConnectionFactory</connection-definition>
+ <config-property name="SessionDefaultType" type="java.lang.String">javax.jms.Topic</config-property>
+ <config-property name="JmsProviderAdapterJNDI" type="java.lang.String">java:/DefaultJMSProvider</config-property>
+ <max-pool-size>20</max-pool-size>
+ <security-domain-and-application>JmsXARealm</security-domain-and-application>
+ <depends>jboss.messaging:service=ServerPeer</depends>
+ </tx-connection-factory>
+
+</connection-factories>
Property changes on: trunk/messaging/src/etc/deploy/non-clustered/jms-ds.xml
___________________________________________________________________
Name: svn:keywords
+ "Id LastChangedDate Author Revision"
Deleted: trunk/messaging/src/etc/deploy/remoting-service.xml
===================================================================
--- trunk/messaging/src/etc/deploy/remoting-service.xml 2007-02-23 05:50:04 UTC (rev 60815)
+++ trunk/messaging/src/etc/deploy/remoting-service.xml 2007-02-23 07:11:40 UTC (rev 60816)
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- Messaging Remoting service deployment descriptor.
-
- $Id: remoting-service.xml 943 2006-05-08 21:35:39Z ovidiu $
- -->
-
-<server>
-
- <mbean code="org.jboss.remoting.transport.Connector"
- name="jboss.messaging:service=Connector,transport=socket"
- display-name="Socket transport Connector">
- <attribute name="Configuration">
- <config>
- <invoker transport="socket">
- <attribute name="marshaller" isParam="true">org.jboss.jms.server.remoting.JMSWireFormat</attribute>
- <attribute name="unmarshaller" isParam="true">org.jboss.jms.server.remoting.JMSWireFormat</attribute>
- <attribute name="serializationtype" isParam="true">jboss</attribute>
- <attribute name="dataType" isParam="true">jms</attribute>
- <attribute name="socket.check_connection" isParam="true">false</attribute>
- <attribute name="timeout">0</attribute>
- <attribute name="serverBindAddress">${jboss.bind.address}</attribute>
- <attribute name="serverBindPort">4457</attribute>
- <attribute name="leasePeriod">20000</attribute>
- </invoker>
- <handlers>
- <handler subsystem="JMS">org.jboss.jms.server.remoting.JMSServerInvocationHandler</handler>
- </handlers>
- </config>
- </attribute>
- <depends>jboss.messaging:service=NetworkRegistry</depends>
- </mbean>
-
- <!-- TODO: Do I need this> -->
- <mbean code="org.jboss.remoting.network.NetworkRegistry"
- name="jboss.messaging:service=NetworkRegistry"/>
-
-</server>
\ No newline at end of file
Modified: trunk/messaging/src/main/org/jboss/mq/server/jmx/Queue.java
===================================================================
--- trunk/messaging/src/main/org/jboss/mq/server/jmx/Queue.java 2007-02-23 05:50:04 UTC (rev 60815)
+++ trunk/messaging/src/main/org/jboss/mq/server/jmx/Queue.java 2007-02-23 07:11:40 UTC (rev 60816)
@@ -21,8 +21,8 @@
*/
package org.jboss.mq.server.jmx;
-import java.util.Hashtable;
import java.util.List;
+import java.util.Collections;
import javax.management.MBeanRegistration;
import javax.management.MBeanServer;
@@ -31,10 +31,10 @@
import javax.management.ObjectName;
import org.w3c.dom.Element;
+import org.jboss.jms.server.destination.QueueService;
/**
- * Portability class that maps the mbean ops onto the
- * org.jboss.jms.server.destination.Queue
+ * Portability class that maps the mbean ops onto the org.jboss.jms.server.destination.QueueService.
*
* @author Scott.Stark at jboss.org
* @version $Revision:$
@@ -42,18 +42,19 @@
public class Queue
implements MBeanRegistration, QueueMBean
{
- private org.jboss.jms.server.destination.Queue delegate;
+ private QueueService delegate;
public Queue()
{
- delegate = new org.jboss.jms.server.destination.Queue();
+ delegate = new QueueService();
}
public Queue(boolean createProgramatically)
{
- delegate = new org.jboss.jms.server.destination.Queue(createProgramatically);
+ delegate = new QueueService(createProgramatically);
}
- public void addNotificationListener(NotificationListener listener, NotificationFilter filter, Object handback)
+ public void addNotificationListener(NotificationListener listener,
+ NotificationFilter filter, Object handback)
{
delegate.addNotificationListener(listener, filter, handback);
}
@@ -148,7 +149,8 @@
*/
public List listMessages(String arg0) throws Exception
{
- return delegate.listMessages(arg0);
+ //return delegate.listMessages(arg0);
+ return Collections.EMPTY_LIST;
}
/* (non-Javadoc)
@@ -178,7 +180,7 @@
/* (non-Javadoc)
* @see org.jboss.mq.server.jmx.QueueMBean#setJNDIName(java.lang.String)
*/
- public void setJNDIName(String arg0)
+ public void setJNDIName(String arg0) throws Exception
{
delegate.setJNDIName(arg0);
}
@@ -218,7 +220,7 @@
public void setDestinationManager(ObjectName arg0) throws Exception
{
ObjectName peer = new ObjectName("jboss.messaging:service=ServerPeer");
- delegate.setServerPeer(peer);
+ delegate.setServerPeer(peer);
}
/* (non-Javadoc)
Modified: trunk/messaging/src/main/org/jboss/mq/server/jmx/QueueMBean.java
===================================================================
--- trunk/messaging/src/main/org/jboss/mq/server/jmx/QueueMBean.java 2007-02-23 05:50:04 UTC (rev 60815)
+++ trunk/messaging/src/main/org/jboss/mq/server/jmx/QueueMBean.java 2007-02-23 07:11:40 UTC (rev 60816)
@@ -58,7 +58,7 @@
public void setFullSize(int arg0);
- public void setJNDIName(String arg0);
+ public void setJNDIName(String arg0) throws Exception;
public void setPageSize(int arg0);
Modified: trunk/messaging/src/main/org/jboss/mq/server/jmx/Topic.java
===================================================================
--- trunk/messaging/src/main/org/jboss/mq/server/jmx/Topic.java 2007-02-23 05:50:04 UTC (rev 60815)
+++ trunk/messaging/src/main/org/jboss/mq/server/jmx/Topic.java 2007-02-23 07:11:40 UTC (rev 60816)
@@ -21,19 +21,17 @@
*/
package org.jboss.mq.server.jmx;
-import java.util.Hashtable;
import java.util.List;
-import javax.jms.InvalidSelectorException;
import javax.management.MBeanRegistration;
import javax.management.MBeanServer;
import javax.management.ObjectName;
import org.w3c.dom.Element;
+import org.jboss.jms.server.destination.TopicService;
/**
- * Portability class that maps the mbean ops onto the
- * org.jboss.jms.server.destination.Topic
+ * Portability class that maps the mbean ops onto the org.jboss.jms.server.destination.TopicService.
*
* @author Scott.Stark at jboss.org
* @version $Revision:$
@@ -41,15 +39,15 @@
public class Topic
implements MBeanRegistration, TopicMBean
{
- private org.jboss.jms.server.destination.Topic delegate;
+ private TopicService delegate;
public Topic()
{
- delegate = new org.jboss.jms.server.destination.Topic();
+ delegate = new TopicService();
}
public Topic(boolean createProgramatically)
{
- delegate = new org.jboss.jms.server.destination.Topic(createProgramatically);
+ delegate = new TopicService(createProgramatically);
}
/* (non-Javadoc)
@@ -92,13 +90,9 @@
return delegate.getJNDIName();
}
- /* (non-Javadoc)
- * @see org.jboss.mq.server.jmx.TopicMBean#getMessagesFromNonDurableSub(org.jboss.messaging.core.local.Topic, long, java.lang.String)
- */
- public List getMessagesFromNonDurableSub(org.jboss.messaging.core.local.Topic arg0,
- long arg1, String arg2) throws InvalidSelectorException
+ public List listNonDurableMessages(String subscriptionId) throws Exception
{
- return delegate.getMessagesFromNonDurableSub(arg0, arg1, arg2);
+ return delegate.listNonDurableMessages(subscriptionId);
}
/* (non-Javadoc)
@@ -146,7 +140,7 @@
*/
public List listMessagesDurableSub(String arg0, String arg1, String arg2) throws Exception
{
- return delegate.listMessagesDurableSub(arg0, arg1, arg2);
+ return delegate.listDurableMessages(arg0, arg1);
}
/* (non-Javadoc)
@@ -154,7 +148,7 @@
*/
public List listMessagesNonDurableSub(long arg0, String arg1) throws Exception
{
- return delegate.listMessagesNonDurableSub(arg0, arg1);
+ return delegate.listNonDurableMessages(arg1);
}
/* (non-Javadoc)
@@ -162,7 +156,7 @@
*/
public String listSubscriptionsAsText() throws Exception
{
- return delegate.listSubscriptionsAsText();
+ return delegate.listAllSubscriptionsAsHTML();
}
/* (non-Javadoc)
@@ -170,7 +164,7 @@
*/
public String listSubscriptionsAsText(boolean arg0) throws Exception
{
- return delegate.listSubscriptionsAsText(arg0);
+ return delegate.listAllSubscriptionsAsHTML();
}
/* (non-Javadoc)
@@ -200,7 +194,7 @@
/* (non-Javadoc)
* @see org.jboss.mq.server.jmx.TopicMBean#setJNDIName(java.lang.String)
*/
- public void setJNDIName(String arg0)
+ public void setJNDIName(String arg0) throws Exception
{
delegate.setJNDIName(arg0);
}
@@ -249,7 +243,7 @@
public void setDestinationManager(ObjectName arg0) throws Exception
{
ObjectName peer = new ObjectName("jboss.messaging:service=ServerPeer");
- delegate.setServerPeer(peer);
+ delegate.setServerPeer(peer);
}
/* (non-Javadoc)
@@ -273,7 +267,7 @@
*/
public int subscriptionCount() throws Exception
{
- return delegate.subscriptionCount();
+ return delegate.getAllSubscriptionsCount();
}
/* (non-Javadoc)
@@ -281,7 +275,7 @@
*/
public int subscriptionCount(boolean arg0) throws Exception
{
- return delegate.subscriptionCount(arg0);
+ return arg0 ? delegate.getDurableSubscriptionsCount() : delegate.getNonDurableSubscriptionsCount();
}
public ObjectName getExpiryDestination()
Modified: trunk/messaging/src/main/org/jboss/mq/server/jmx/TopicMBean.java
===================================================================
--- trunk/messaging/src/main/org/jboss/mq/server/jmx/TopicMBean.java 2007-02-23 05:50:04 UTC (rev 60815)
+++ trunk/messaging/src/main/org/jboss/mq/server/jmx/TopicMBean.java 2007-02-23 07:11:40 UTC (rev 60816)
@@ -21,9 +21,7 @@
public abstract String getJNDIName();
- public abstract List getMessagesFromNonDurableSub(
- org.jboss.messaging.core.local.Topic arg0, long arg1, String arg2)
- throws InvalidSelectorException;
+ public List listNonDurableMessages(String subscriptionId) throws Exception;
public abstract String getName();
@@ -52,7 +50,7 @@
public abstract void setFullSize(int arg0);
- public abstract void setJNDIName(String arg0);
+ public abstract void setJNDIName(String arg0) throws Exception;
public abstract void setPageSize(int arg0);
More information about the jboss-cvs-commits
mailing list