[jboss-cvs] JBossAS SVN: r64437 - in branches/Branch_4_4: server/src/etc/conf/default and 6 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Aug 2 19:02:07 EDT 2007
Author: clebert.suconic at jboss.com
Date: 2007-08-02 19:02:06 -0400 (Thu, 02 Aug 2007)
New Revision: 64437
Added:
branches/Branch_4_4/testsuite/src/resources/mdb4jbm/
branches/Branch_4_4/testsuite/src/resources/mdb4jbm/META-INF/
branches/Branch_4_4/testsuite/src/resources/mdb4jbm/META-INF/ejb-jar.xml
branches/Branch_4_4/testsuite/src/resources/mdb4jbm/META-INF/jboss.xml
branches/Branch_4_4/testsuite/src/resources/mdb4jbm/client.policy
branches/Branch_4_4/testsuite/src/resources/mdb4jbm/jboss-service.xml
Modified:
branches/Branch_4_4/build/build-distr.xml
branches/Branch_4_4/server/src/etc/conf/default/standardjboss.xml
branches/Branch_4_4/server/src/main/org/jboss/ejb/plugins/jms/JMSContainerInvoker.java
branches/Branch_4_4/testsuite/imports/sections/mdb.xml
branches/Branch_4_4/testsuite/src/main/org/jboss/test/mdb/test/MDBUnitTestCase.java
Log:
http://jira.jboss.org/jira/browse/JBAS-4591 - Making createDestination independent of MQ on MDB 2.0 container
Modified: branches/Branch_4_4/build/build-distr.xml
===================================================================
--- branches/Branch_4_4/build/build-distr.xml 2007-08-02 23:00:18 UTC (rev 64436)
+++ branches/Branch_4_4/build/build-distr.xml 2007-08-02 23:02:06 UTC (rev 64437)
@@ -552,7 +552,11 @@
</fileset>
</copy>
-
+ <replace file="${install.server}/${target}/conf/standardjboss.xml">
+ <replacefilter token="jboss.mq:service=DestinationManager" value="jboss.messaging:service=ServerPeer"/>
+ <replacefilter token=">createTopic<" value=">deployTopic<"/>
+ <replacefilter token=">createQueue<" value=">deployQueue<"/>
+ </replace>
<delete dir="${install.server}/${target}/deploy/jms"/>
<delete dir="${install.server}/${target}/deploy-hasingleton/jms"/>
Modified: branches/Branch_4_4/server/src/etc/conf/default/standardjboss.xml
===================================================================
--- branches/Branch_4_4/server/src/etc/conf/default/standardjboss.xml 2007-08-02 23:00:18 UTC (rev 64436)
+++ branches/Branch_4_4/server/src/etc/conf/default/standardjboss.xml 2007-08-02 23:02:06 UTC (rev 64437)
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE jboss PUBLIC
- "-//JBoss//DTD JBOSS 4.0//EN"
- "http://www.jboss.org/j2ee/dtd/jboss_4_0.dtd">
+ "-//JBoss//DTD JBOSS 4.2//EN"
+ "http://www.jboss.org/j2ee/dtd/jboss_4_2.dtd">
<!-- ===================================================================== -->
<!-- Standard JBoss EJB Configurations -->
@@ -358,7 +358,12 @@
<proxy-factory-config>
<JMSProviderAdapterJNDI>DefaultJMSProvider</JMSProviderAdapterJNDI>
<ServerSessionPoolFactoryJNDI>StdJMSPool</ServerSessionPoolFactoryJNDI>
- <CreateJBossMQDestination>true</CreateJBossMQDestination>
+ <!-- Deprecated parameter (still supported for backward compatibility)
+ <CreateJBossMQDestination>true</CreateJBossMQDestination> -->
+ <CreateDestination>true</CreateDestination>
+ <DestinationManager>jboss.mq:service=DestinationManager</DestinationManager>
+ <CreateTopicMethod>createTopic</CreateTopicMethod>
+ <CreateQueueMethod>createQueue</CreateQueueMethod>
<!-- WARN: Don't set this to zero until a bug in the pooled executor is fixed -->
<MinimumSize>1</MinimumSize>
<MaximumSize>15</MaximumSize>
@@ -440,7 +445,12 @@
<proxy-factory-config>
<JMSProviderAdapterJNDI>DefaultJMSProvider</JMSProviderAdapterJNDI>
<ServerSessionPoolFactoryJNDI>StdJMSPool</ServerSessionPoolFactoryJNDI>
- <CreateJBossMQDestination>true</CreateJBossMQDestination>
+ <!-- Deprecated parameter (still supported for backward compatibility)
+ <CreateJBossMQDestination>true</CreateJBossMQDestination> -->
+ <CreateDestination>true</CreateDestination>
+ <DestinationManager>jboss.mq:service=DestinationManager</DestinationManager>
+ <CreateTopicMethod>createTopic</CreateTopicMethod>
+ <CreateQueueMethod>createQueue</CreateQueueMethod>
<!-- WARN: Don't set this to zero until a bug in the pooled executor is fixed -->
<MinimumSize>1</MinimumSize>
<MaximumSize>1</MaximumSize>
Modified: branches/Branch_4_4/server/src/main/org/jboss/ejb/plugins/jms/JMSContainerInvoker.java
===================================================================
--- branches/Branch_4_4/server/src/main/org/jboss/ejb/plugins/jms/JMSContainerInvoker.java 2007-08-02 23:00:18 UTC (rev 64436)
+++ branches/Branch_4_4/server/src/main/org/jboss/ejb/plugins/jms/JMSContainerInvoker.java 2007-08-02 23:02:06 UTC (rev 64437)
@@ -190,7 +190,13 @@
protected boolean deliveryActive = true;
- protected boolean createJBossMQDestination = true;
+ protected boolean createDestination = true;
+
+ protected String destinationManager = "jboss.mq:service=DestinationManager";
+
+ protected String createTopicMethod = "createTopic";
+
+ protected String createQueueMethod = "createQueue";
/**
* Set the invoker meta data so that the ProxyFactory can initialize
@@ -273,7 +279,7 @@
public boolean getCreateJBossMQDestination()
{
- return createJBossMQDestination;
+ return createDestination;
}
public void startDelivery()
@@ -363,15 +369,45 @@
{
if ("false".equalsIgnoreCase(MetaData.getElementContent(MetaData.getUniqueChild(element, "CreateJBossMQDestination"))))
{
- createJBossMQDestination = false;
+ createDestination = false;
}
}
catch (Exception ignore)
{
}
+
try
{
+ if ("false".equalsIgnoreCase(MetaData.getElementContent(MetaData.getUniqueChild(element, "CreateDestination"))))
+ {
+ createDestination = false;
+ }
+ }
+ catch (Exception ignore)
+ {
+ }
+
+ String localDestination = getValue(element, "DestinationManager");
+ if (localDestination!=null)
+ {
+ destinationManager = localDestination;
+ }
+
+ String localMethod = getValue(element, "CreateTopicMethod");
+ if (localMethod!=null)
+ {
+ createTopicMethod = localMethod;
+ }
+
+ localMethod = getValue(element, "CreateQueueMethod");
+ if (localMethod!=null)
+ {
+ createQueueMethod = localMethod;
+ }
+
+ try
+ {
String maxMessages = MetaData.getElementContent
(MetaData.getUniqueChild(element, "MaxMessages"));
maxMessagesNr = Integer.parseInt(maxMessages);
@@ -463,6 +499,27 @@
serverSessionPoolFactoryJNDI = "java:/" + serverSessionPoolFactoryJNDI;
}
}
+
+ private String getValue(Element element, String name)
+ {
+ try
+ {
+ Element elementValue = MetaData.getUniqueChild(element, name);
+
+ if (elementValue!=null)
+ {
+ return MetaData.getElementContent(elementValue);
+ }
+ else
+ {
+ return null;
+ }
+ }
+ catch (Exception ignored)
+ {
+ return null;
+ }
+ }
/**
* Initialize the container invoker. Sets up a connection, a server session
@@ -639,13 +696,13 @@
// First we try the specified topic
if (destinationJNDI != null)
topic = (Topic) context.lookup(destinationJNDI);
- else if (createJBossMQDestination == false)
+ else if (createDestination == false)
throw new DeploymentException("Unable to determine destination for '" + container.getBeanMetaData().getEjbName()
+ "' use destination-jndi-name in jboss.xml, an activation config property or a message-destination-link");
}
catch (NamingException e)
{
- if (createJBossMQDestination == false)
+ if (createDestination == false)
throw new DeploymentException("Could not find the topic destination-jndi-name=" + destinationJNDI, e);
log.warn("Could not find the topic destination-jndi-name=" + destinationJNDI, e);
}
@@ -654,7 +711,6 @@
throw new DeploymentException("Expected a Topic destination-jndi-name=" + destinationJNDI, e);
}
- // FIXME: This is not portable, only works for JBossMQ
if (topic == null)
topic = (Topic) createDestination(Topic.class,
context,
@@ -757,13 +813,13 @@
// First we try the specified queue
if (destinationJNDI != null)
queue = (Queue) context.lookup(destinationJNDI);
- else if (createJBossMQDestination == false)
+ else if (createDestination == false)
throw new DeploymentException("Unable to determine destination for '" + container.getBeanMetaData().getEjbName()
+ "' use destination-jndi-name in jboss.xml, an activation config property or a message-destination-link");
}
catch (NamingException e)
{
- if (createJBossMQDestination == false)
+ if (createDestination == false)
throw new DeploymentException("Could not find the queue destination-jndi-name=" + destinationJNDI, e);
log.warn("Could not find the queue destination-jndi-name=" + destinationJNDI);
}
@@ -772,7 +828,6 @@
throw new DeploymentException("Expected a Queue destination-jndi-name=" + destinationJNDI);
}
- // FIXME: This is not portable, only works for JBossMQ
if (queue == null)
queue = (Queue) createDestination(Queue.class,
context,
@@ -1096,11 +1151,11 @@
String methodName;
if (type == Topic.class)
{
- methodName = "createTopic";
+ methodName = createTopicMethod;
}
else if (type == Queue.class)
{
- methodName = "createQueue";
+ methodName = createQueueMethod;
}
else
{
@@ -1109,11 +1164,24 @@
("Expected javax.jms.Queue or javax.jms.Topic: " + type);
}
- // invoke the server to create the destination
- server.invoke(new ObjectName("jboss.mq:service=DestinationManager"),
- methodName,
- new Object[]{jndiSuffix},
- new String[]{"java.lang.String"});
+ try
+ {
+ // invoke the server to create the destination
+ server.invoke(new ObjectName(destinationManager),
+ methodName,
+ new Object[]{jndiSuffix},
+ new String[]{"java.lang.String"});
+ }
+ catch (javax.management.ReflectionException exRefl)
+ {
+ log.debug("Using alternate signature (name, jndiName)");
+ // invoke the server to create the destination
+ server.invoke(new ObjectName(destinationManager),
+ methodName,
+ new Object[]{jndiSuffix, jndiName},
+ new String[]{"java.lang.String", "java.lang.String"});
+
+ }
// try to look it up again
return (Destination) ctx.lookup(jndiName);
Modified: branches/Branch_4_4/testsuite/imports/sections/mdb.xml
===================================================================
--- branches/Branch_4_4/testsuite/imports/sections/mdb.xml 2007-08-02 23:00:18 UTC (rev 64436)
+++ branches/Branch_4_4/testsuite/imports/sections/mdb.xml 2007-08-02 23:02:06 UTC (rev 64437)
@@ -25,6 +25,15 @@
<include name="**/*.xml"/>
</fileset>
</jar>
+ <jar destfile="${build.lib}/mdb4jbm.jar">
+ <fileset dir="${build.classes}">
+ <patternset refid="jboss.test.util.ejb.set"/>
+ <include name="org/jboss/test/mdb/bean/**"/>
+ </fileset>
+ <fileset dir="${build.resources}/mdb4jbm">
+ <include name="**/*.xml"/>
+ </fileset>
+ </jar>
</target>
<!-- messagedriven test -->
Modified: branches/Branch_4_4/testsuite/src/main/org/jboss/test/mdb/test/MDBUnitTestCase.java
===================================================================
--- branches/Branch_4_4/testsuite/src/main/org/jboss/test/mdb/test/MDBUnitTestCase.java 2007-08-02 23:00:18 UTC (rev 64436)
+++ branches/Branch_4_4/testsuite/src/main/org/jboss/test/mdb/test/MDBUnitTestCase.java 2007-08-02 23:02:06 UTC (rev 64437)
@@ -243,7 +243,9 @@
*/
public static Test suite() throws Exception
{
- TestSuite suite = new TestSuite();
+ final boolean useJBM = (System.getProperty("jbosstest.useJBM") != null);
+
+ TestSuite suite = new TestSuite();
suite.addTest(new MDBUnitTestCase("testNoQueueConstructionForAlreadyExists", ""));
suite.addTest(new MDBUnitTestCase("testNoTopicConstructionForAlreadyExists", ""));
suite.addTest(new MDBUnitTestCase("testObjectMessage", ""));
@@ -255,14 +257,15 @@
suite.addTest(new MDBUnitTestCase("testWaitForCompleation", ""));
suite.addTest(new MDBUnitTestCase("testQueue", "queue/B"));
- return new JBossTestSetup(getDeploySetup(suite, "mdb.jar"))
+ return new JBossTestSetup(getDeploySetup(suite, useJBM?"mdb4jbm.jar":"mdb.jar"))
{
protected void tearDown() throws Exception
{
super.tearDown();
+
// Remove the DLQ messages created by the TxTimeout test
- getServer().invoke(new ObjectName("jboss.mq.destination:service=Queue,name=DLQ"), "removeAllMessages",
+ getServer().invoke(new ObjectName(useJBM?"jboss.messaging.destination:service=Queue,name=DLQ":"jboss.mq.destination:service=Queue,name=DLQ"), "removeAllMessages",
new Object[0], new String[0]);
// Remove the durable subscription
Added: branches/Branch_4_4/testsuite/src/resources/mdb4jbm/META-INF/ejb-jar.xml
===================================================================
--- branches/Branch_4_4/testsuite/src/resources/mdb4jbm/META-INF/ejb-jar.xml (rev 0)
+++ branches/Branch_4_4/testsuite/src/resources/mdb4jbm/META-INF/ejb-jar.xml 2007-08-02 23:02:06 UTC (rev 64437)
@@ -0,0 +1,203 @@
+<?xml version="1.0"?>
+
+<!DOCTYPE ejb-jar PUBLIC "-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 2.0//EN" "http://java.sun.com/j2ee/dtds/ejb-jar_2_0.dtd">
+
+<ejb-jar>
+ <enterprise-beans>
+
+ <message-driven>
+ <ejb-name>ObjectMessageBean</ejb-name>
+ <ejb-class>org.jboss.test.mdb.bean.ObjectMessageBean</ejb-class>
+ <message-selector></message-selector>
+ <transaction-type>Bean</transaction-type>
+ <acknowledge-mode>AUTO_ACKNOWLEDGE</acknowledge-mode>
+ <message-driven-destination>
+ <destination-type>javax.jms.Queue</destination-type>
+ <subscription-durability>NonDurable</subscription-durability>
+ </message-driven-destination>
+ </message-driven>
+
+ <message-driven>
+ <ejb-name>BMTTXTimeOutBean</ejb-name>
+ <ejb-class>org.jboss.test.mdb.bean.TXTimeOutBean</ejb-class>
+ <message-selector></message-selector>
+ <transaction-type>Bean</transaction-type>
+ <acknowledge-mode>AUTO_ACKNOWLEDGE</acknowledge-mode>
+ <message-driven-destination>
+ <destination-type>javax.jms.Queue</destination-type>
+ <subscription-durability>NonDurable</subscription-durability>
+ </message-driven-destination>
+ </message-driven>
+
+ <message-driven>
+ <ejb-name>CMTTXTimeOutBean</ejb-name>
+ <ejb-class>org.jboss.test.mdb.bean.TXTimeOutBean</ejb-class>
+ <message-selector></message-selector>
+ <transaction-type>Container</transaction-type>
+ <acknowledge-mode>AUTO_ACKNOWLEDGE</acknowledge-mode>
+ <message-driven-destination>
+ <destination-type>javax.jms.Queue</destination-type>
+ <subscription-durability>NonDurable</subscription-durability>
+ </message-driven-destination>
+ </message-driven>
+
+
+ <message-driven>
+ <ejb-name>QueueBean</ejb-name>
+ <ejb-class>org.jboss.test.mdb.bean.QueueBean</ejb-class>
+<!--
+ <message-selector>JMSType='activityCompletion'</message-selector>
+-->
+ <message-selector></message-selector>
+ <!-- We also have the acknowledge-mode - AUTO_ACKNOWLEDGE | DUPS_OK_AKNOWLEDGE - for bean managed transactions, and the subscription-durability for topic destination types -->
+ <transaction-type>Bean</transaction-type>
+ <acknowledge-mode>AUTO_ACKNOWLEDGE</acknowledge-mode>
+
+ <message-driven-destination>
+ <destination-type>javax.jms.Queue</destination-type>
+<!--
+Only with topic
+ <subscription-durability>Durable</subscription-durability>
+-->
+<subscription-durability>NonDurable</subscription-durability>
+ </message-driven-destination>
+ </message-driven>
+ <message-driven>
+ <ejb-name>TopicBean</ejb-name>
+ <ejb-class>org.jboss.test.mdb.bean.TopicBean</ejb-class>
+<!--
+ <message-selector>JMSType='activityCompletion'</message-selector>
+-->
+ <message-selector></message-selector>
+ <!-- We also have the acknowledge-mode - AUTO_ACKNOWLEDGE | DUPS_OK_AKNOWLEDGE - for bean managed transactions, and the subscription-durability for topic destination types -->
+ <transaction-type>Container</transaction-type>
+ <!-- <acknowledge-mode>AUTO_ACKNOWLEDGE</acknowledge-mode> -->
+
+ <message-driven-destination>
+ <destination-type>javax.jms.Topic</destination-type>
+<!--
+Only with topic
+ <subscription-durability>Durable</subscription-durability>
+-->
+<subscription-durability>NonDurable</subscription-durability>
+ </message-driven-destination>
+ </message-driven>
+ <message-driven>
+ <ejb-name>DurableTopicBean</ejb-name>
+ <ejb-class>org.jboss.test.mdb.bean.TopicBean</ejb-class>
+<!--
+ <message-selector>JMSType='activityCompletion'</message-selector>
+-->
+ <message-selector></message-selector>
+ <!-- We also have the acknowledge-mode - AUTO_ACKNOWLEDGE | DUPS_OK_AKNOWLEDGE - for bean managed transactions, and the subscription-durability for topic destination types -->
+ <transaction-type>Container</transaction-type>
+ <!-- <acknowledge-mode>AUTO_ACKNOWLEDGE</acknowledge-mode> -->
+
+ <message-driven-destination>
+ <destination-type>javax.jms.Topic</destination-type>
+<!--
+Only with topic
+ <subscription-durability>Durable</subscription-durability>
+-->
+<subscription-durability>Durable</subscription-durability>
+ </message-driven-destination>
+ </message-driven>
+ <message-driven>
+ <ejb-name>ExQueueBean</ejb-name>
+ <ejb-class>org.jboss.test.mdb.bean.ExQueueBean</ejb-class>
+ <message-selector></message-selector>
+ <transaction-type>Container</transaction-type>
+
+ <message-driven-destination>
+ <destination-type>javax.jms.Queue</destination-type>
+ <subscription-durability>NonDurable</subscription-durability>
+ </message-driven-destination>
+ </message-driven>
+
+ <message-driven>
+ <ejb-name>QueueInADifferentContext</ejb-name>
+ <ejb-class>org.jboss.test.mdb.bean.ObjectMessageBean</ejb-class>
+ <message-selector></message-selector>
+ <transaction-type>Bean</transaction-type>
+ <acknowledge-mode>AUTO_ACKNOWLEDGE</acknowledge-mode>
+ <message-driven-destination>
+ <destination-type>javax.jms.Queue</destination-type>
+ <subscription-durability>NonDurable</subscription-durability>
+ </message-driven-destination>
+ </message-driven>
+
+ <message-driven>
+ <ejb-name>TopicInADifferentContext</ejb-name>
+ <ejb-class>org.jboss.test.mdb.bean.TopicBean</ejb-class>
+ <message-selector></message-selector>
+ <transaction-type>Container</transaction-type>
+ <message-driven-destination>
+ <destination-type>javax.jms.Topic</destination-type>
+ <subscription-durability>NonDurable</subscription-durability>
+ </message-driven-destination>
+ </message-driven>
+
+ </enterprise-beans>
+
+
+ <assembly-descriptor>
+ <container-transaction>
+
+ <method>
+
+ <ejb-name>TopicBean</ejb-name>
+
+ <method-name>onMessage</method-name>
+ <method-params>
+ <method-param>javax.jms.Message</method-param>
+ </method-params>
+
+ </method>
+ <!-- May also be NotSupported -->
+ <trans-attribute>Required</trans-attribute>
+
+ </container-transaction>
+ <container-transaction>
+
+ <method>
+
+ <ejb-name>DurableTopicBean</ejb-name>
+
+ <method-name>onMessage</method-name>
+
+ </method>
+ <!-- May also be NotSupported -->
+ <trans-attribute>Required</trans-attribute>
+
+ </container-transaction>
+
+ <container-transaction>
+ <method>
+ <ejb-name>BMTTXTimeOutBean</ejb-name>
+ <method-name>*</method-name>
+ </method>
+ <trans-attribute>Required</trans-attribute>
+ </container-transaction>
+
+ <container-transaction>
+ <method>
+ <ejb-name>CMTTXTimeOutBean</ejb-name>
+ <method-name>*</method-name>
+ </method>
+ <trans-attribute>NotSupported</trans-attribute>
+ </container-transaction>
+
+ <container-transaction>
+ <method>
+
+ <ejb-name>ExQueueBean</ejb-name>
+
+ <method-name>*</method-name>
+
+ </method>
+ <!-- May also be NotSupported -->
+ <trans-attribute>Required</trans-attribute>
+
+ </container-transaction>
+ </assembly-descriptor>
+ </ejb-jar>
Property changes on: branches/Branch_4_4/testsuite/src/resources/mdb4jbm/META-INF/ejb-jar.xml
___________________________________________________________________
Name: svn:keywords
+ Id LastChangedDate Author Revision
Added: branches/Branch_4_4/testsuite/src/resources/mdb4jbm/META-INF/jboss.xml
===================================================================
--- branches/Branch_4_4/testsuite/src/resources/mdb4jbm/META-INF/jboss.xml (rev 0)
+++ branches/Branch_4_4/testsuite/src/resources/mdb4jbm/META-INF/jboss.xml 2007-08-02 23:02:06 UTC (rev 64437)
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE jboss PUBLIC
+ "-//JBoss//DTD JBOSS 4.2//EN"
+ "http://www.jboss.org/j2ee/dtd/jboss_4_2.dtd">
+<jboss>
+ <invoker-proxy-bindings>
+ <invoker-proxy-binding>
+ <name>my-message-driven-bean</name>
+ <invoker-mbean>default</invoker-mbean>
+ <proxy-factory>org.jboss.ejb.plugins.jms.JMSContainerInvoker</proxy-factory>
+ <proxy-factory-config>
+ <JMSProviderAdapterJNDI>DefaultJMSProvider</JMSProviderAdapterJNDI>
+ <ServerSessionPoolFactoryJNDI>StdJMSPool</ServerSessionPoolFactoryJNDI>
+ <CreateDestination>true</CreateDestination>
+ <DestinationManager>jboss.messaging:service=ServerPeer</DestinationManager>
+ <CreateTopicMethod>deployTopic</CreateTopicMethod>
+ <CreateQueueMethod>deployQueue</CreateQueueMethod>
+ <MaximumSize>15</MaximumSize>
+ <MaxMessages>1</MaxMessages>
+ <MDBConfig>
+ <ReconnectIntervalSec>10</ReconnectIntervalSec>
+ <DLQConfig>
+ <DestinationQueue>queue/DLQ</DestinationQueue>
+ <MaxTimesRedelivered>10</MaxTimesRedelivered>
+ <TimeToLive>0</TimeToLive>
+ </DLQConfig>
+ </MDBConfig>
+ </proxy-factory-config>
+ </invoker-proxy-binding>
+ </invoker-proxy-bindings>
+
+ <enterprise-beans>
+ <message-driven>
+ <ejb-name>ObjectMessageBean</ejb-name>
+ <configuration-name>Standard Message Driven Bean</configuration-name>
+ <destination-jndi-name>queue/testObjectMessage</destination-jndi-name>
+ <invoker-bindings>
+ <invoker>
+ <invoker-proxy-binding-name>my-message-driven-bean</invoker-proxy-binding-name>
+ </invoker>
+ </invoker-bindings>
+ </message-driven>
+ <message-driven>
+ <ejb-name>BMTTXTimeOutBean</ejb-name>
+ <configuration-name>Standard Message Driven Bean</configuration-name>
+ <destination-jndi-name>queue/A</destination-jndi-name>
+ </message-driven>
+ <message-driven>
+ <ejb-name>CMTTXTimeOutBean</ejb-name>
+ <configuration-name>Standard Message Driven Bean</configuration-name>
+ <destination-jndi-name>queue/B</destination-jndi-name>
+ </message-driven>
+ <message-driven>
+ <ejb-name>QueueBean</ejb-name>
+ <configuration-name>Standard Message Driven Bean</configuration-name>
+ <destination-jndi-name>queue/testQueue</destination-jndi-name>
+ </message-driven>
+ <message-driven>
+ <ejb-name>TopicBean</ejb-name>
+ <configuration-name>Standard Message Driven Bean</configuration-name>
+ <destination-jndi-name>topic/testTopic</destination-jndi-name>
+ </message-driven>
+ <message-driven>
+ <ejb-name>DurableTopicBean</ejb-name>
+ <configuration-name>Standard Message Driven Bean</configuration-name>
+ <destination-jndi-name>topic/testDurableTopic</destination-jndi-name>
+ <mdb-user>john</mdb-user>
+ <mdb-passwd>needle</mdb-passwd>
+ <mdb-subscription-id>DurableSubscriberExample</mdb-subscription-id>
+ </message-driven>
+ <message-driven>
+ <ejb-name>ExQueueBean</ejb-name>
+ <configuration-name>Standard Message Driven Bean</configuration-name>
+ <destination-jndi-name>queue/ex</destination-jndi-name>
+ </message-driven>
+
+ <message-driven>
+ <ejb-name>QueueInADifferentContext</ejb-name>
+ <configuration-name>Standard Message Driven Bean</configuration-name>
+ <destination-jndi-name>anotherContext/QueueInADifferentContext</destination-jndi-name>
+ </message-driven>
+ <message-driven>
+ <ejb-name>TopicInADifferentContext</ejb-name>
+ <configuration-name>Standard Message Driven Bean</configuration-name>
+ <destination-jndi-name>anotherContext/TopicInADifferentContext</destination-jndi-name>
+ </message-driven>
+ </enterprise-beans>
+</jboss>
Property changes on: branches/Branch_4_4/testsuite/src/resources/mdb4jbm/META-INF/jboss.xml
___________________________________________________________________
Name: svn:keywords
+ Id LastChangedDate Author Revision
Added: branches/Branch_4_4/testsuite/src/resources/mdb4jbm/client.policy
===================================================================
--- branches/Branch_4_4/testsuite/src/resources/mdb4jbm/client.policy (rev 0)
+++ branches/Branch_4_4/testsuite/src/resources/mdb4jbm/client.policy 2007-08-02 23:02:06 UTC (rev 64437)
@@ -0,0 +1,4 @@
+grant {
+ // Allow everything for now
+ permission java.security.AllPermission;
+};
Added: branches/Branch_4_4/testsuite/src/resources/mdb4jbm/jboss-service.xml
===================================================================
--- branches/Branch_4_4/testsuite/src/resources/mdb4jbm/jboss-service.xml (rev 0)
+++ branches/Branch_4_4/testsuite/src/resources/mdb4jbm/jboss-service.xml 2007-08-02 23:02:06 UTC (rev 64437)
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE server>
+
+<server>
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.messaging.destination:service=Queue,name=myMDBQueue"
+ 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.TopicService"
+ name="jboss.messaging.destination:service=Topic,name=myMDBTopic"
+ 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.naming.NamingAlias"
+ name="jboss.test:test=mdb,alias=anotherContext/QueueInADifferentContext">
+ <attribute name="FromName">anotherContext/QueueInADifferentContext</attribute>
+ <attribute name="ToName">queue/myMDBQueue</attribute>
+ </mbean>
+ <mbean code="org.jboss.naming.NamingAlias"
+ name="jboss.test:test=mdb,alias=anotherContext/TopicInADifferentContext">
+ <attribute name="FromName">anotherContext/TopicInADifferentContext</attribute>
+ <attribute name="ToName">topic/myMDBTopic</attribute>
+ </mbean>
+</server>
\ No newline at end of file
Property changes on: branches/Branch_4_4/testsuite/src/resources/mdb4jbm/jboss-service.xml
___________________________________________________________________
Name: svn:keywords
+ Id LastChangedDate Author Revision
More information about the jboss-cvs-commits
mailing list