[jboss-cvs] JBossAS SVN: r86355 - in trunk: testsuite/imports/sections and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Mar 25 11:16:34 EDT 2009
Author: alex.loubyansky at jboss.com
Date: 2009-03-25 11:16:34 -0400 (Wed, 25 Mar 2009)
New Revision: 86355
Added:
trunk/testsuite/src/main/org/jboss/test/messagedriven/test/DurableTopicMessageDrivenWithClientIdUnitTestCase.java
trunk/testsuite/src/resources/messagedriven/jar/META-INF/jboss-mdb-client-id.xml
Modified:
trunk/server/src/main/org/jboss/ejb/plugins/inflow/JBossJMSMessageEndpointFactory.java
trunk/testsuite/imports/sections/mdb.xml
Log:
JBAS-6606
Modified: trunk/server/src/main/org/jboss/ejb/plugins/inflow/JBossJMSMessageEndpointFactory.java
===================================================================
--- trunk/server/src/main/org/jboss/ejb/plugins/inflow/JBossJMSMessageEndpointFactory.java 2009-03-25 14:47:03 UTC (rev 86354)
+++ trunk/server/src/main/org/jboss/ejb/plugins/inflow/JBossJMSMessageEndpointFactory.java 2009-03-25 15:16:34 UTC (rev 86355)
@@ -84,7 +84,7 @@
checkActivationConfig("subscriptionDurability", "Durable");
else
checkActivationConfig("subscriptionDurability", "NonDurable");
- checkActivationConfig("clientID", metaData.getClientId());
+ checkActivationConfig("clientId", metaData.getClientId());
checkActivationConfig("subscriptionName", metaData.getSubscriptionId());
// Only for JBoss's resource adapter
Modified: trunk/testsuite/imports/sections/mdb.xml
===================================================================
--- trunk/testsuite/imports/sections/mdb.xml 2009-03-25 14:47:03 UTC (rev 86354)
+++ trunk/testsuite/imports/sections/mdb.xml 2009-03-25 15:16:34 UTC (rev 86355)
@@ -61,5 +61,26 @@
<include name="**/*.xml"/>
</fileset>
</jar>
+
+ <!-- build testmessagedriven.jar -->
+ <copy file="${build.resources}/messagedriven/jar/META-INF/jboss.xml"
+ tofile="${build.resources}/messagedriven/jar/META-INF/original-jboss.xml"
+ overwrite="true"/>
+ <copy file="${build.resources}/messagedriven/jar/META-INF/jboss-mdb-client-id.xml"
+ tofile="${build.resources}/messagedriven/jar/META-INF/jboss.xml"
+ overwrite="true"/>
+ <jar destfile="${build.lib}/testmessagedriven-clientid.jar">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/messagedriven/beans/**"/>
+ </fileset>
+ <fileset dir="${build.resources}/messagedriven/jar">
+ <include name="**/*.xml"/>
+ </fileset>
+ </jar>
+ <copy file="${build.resources}/messagedriven/jar/META-INF/original-jboss.xml"
+ tofile="${build.resources}/messagedriven/jar/META-INF/jboss.xml"
+ overwrite="true"/>
+ <delete file="${build.resources}/messagedriven/jar/META-INF/original-jboss.xml"/>
+
</target>
</project>
Added: trunk/testsuite/src/main/org/jboss/test/messagedriven/test/DurableTopicMessageDrivenWithClientIdUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/messagedriven/test/DurableTopicMessageDrivenWithClientIdUnitTestCase.java (rev 0)
+++ trunk/testsuite/src/main/org/jboss/test/messagedriven/test/DurableTopicMessageDrivenWithClientIdUnitTestCase.java 2009-03-25 15:16:34 UTC (rev 86355)
@@ -0,0 +1,55 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.messagedriven.test;
+
+import java.util.Properties;
+
+import org.jboss.test.messagedriven.support.SimpleMessageDrivenUnitTest;
+
+/**
+ * Durable topic MDB tests with mdb-client-id
+ *
+ * @author <a href="mailto:alex at jboss.com>Alexey Loubyansky</a>
+ * @version <tt>$Revision: 1.4</tt>
+ */
+public class DurableTopicMessageDrivenWithClientIdUnitTestCase extends SimpleMessageDrivenUnitTest
+{
+ private static Properties props;
+
+ static
+ {
+ props = new Properties();
+ props.putAll(testDurableTopicProps);
+ props.setProperty("user", "dynsub");
+ props.setProperty("password", "dynsub");
+ }
+
+ public DurableTopicMessageDrivenWithClientIdUnitTestCase(String name)
+ {
+ super(name, testDurableTopic, props);
+ }
+
+ public String getMDBDeployment()
+ {
+ return "testmessagedriven-clientid.jar";
+ }
+}
Added: trunk/testsuite/src/resources/messagedriven/jar/META-INF/jboss-mdb-client-id.xml
===================================================================
--- trunk/testsuite/src/resources/messagedriven/jar/META-INF/jboss-mdb-client-id.xml (rev 0)
+++ trunk/testsuite/src/resources/messagedriven/jar/META-INF/jboss-mdb-client-id.xml 2009-03-25 15:16:34 UTC (rev 86355)
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<jboss xmlns="http://www.jboss.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.jboss.com/xml/ns/javaee http://www.jboss.org/j2ee/schema/jboss_5_0.xsd"
+ version="3.0">
+
+ <enterprise-beans>
+ <message-driven>
+ <ejb-name>TestMDB</ejb-name>
+ <activation-config>
+ <activation-config-property>
+ <activation-config-property-name>destination</activation-config-property-name>
+ <activation-config-property-value>${test.messagedriven.destination}</activation-config-property-value>
+ </activation-config-property>
+ <activation-config-property>
+ <activation-config-property-name>destinationType</activation-config-property-name>
+ <activation-config-property-value>${test.messagedriven.destinationType}</activation-config-property-value>
+ </activation-config-property>
+ <activation-config-property>
+ <activation-config-property-name>subscriptionDurability</activation-config-property-name>
+ <activation-config-property-value>${test.messagedriven.durability}</activation-config-property-value>
+ </activation-config-property>
+ <!-- When not using preconfigured client ids
+ <activation-config-property>
+ <activation-config-property-name>clientID</activation-config-property-name>
+ <activation-config-property-value>${test.messagedriven.clientID}</activation-config-property-value>
+ </activation-config-property-->
+ <activation-config-property>
+ <activation-config-property-name>subscriptionName</activation-config-property-name>
+ <activation-config-property-value>${test.messagedriven.subscriptionName}</activation-config-property-value>
+ </activation-config-property>
+ <activation-config-property>
+ <activation-config-property-name>user</activation-config-property-name>
+ <activation-config-property-value>${test.messagedriven.user}</activation-config-property-value>
+ </activation-config-property>
+ <activation-config-property>
+ <activation-config-property-name>password</activation-config-property-name>
+ <activation-config-property-value>${test.messagedriven.password}</activation-config-property-value>
+ </activation-config-property>
+ <activation-config-property>
+ <activation-config-property-name>DLQMaxResent</activation-config-property-name>
+ <activation-config-property-value>${test.messagedriven.DLQMaxResent}</activation-config-property-value>
+ </activation-config-property>
+ </activation-config>
+ <mdb-client-id>testclient1</mdb-client-id>
+ <invoker-bindings>
+ <invoker>
+ <invoker-proxy-binding-name>jms-message-inflow-driven-bean</invoker-proxy-binding-name>
+ </invoker>
+ </invoker-bindings>
+ <create-destination>${test.messagedriven.createDestination}</create-destination>
+ </message-driven>
+ <message-driven>
+ <ejb-name>TestDLQ</ejb-name>
+ <invoker-bindings>
+ <invoker>
+ <invoker-proxy-binding-name>jms-message-inflow-driven-bean</invoker-proxy-binding-name>
+ </invoker>
+ </invoker-bindings>
+ </message-driven>
+ </enterprise-beans>
+</jboss>
More information about the jboss-cvs-commits
mailing list