[jboss-cvs] JBossAS SVN: r66784 - in branches/JBPAPP_4_2/ejb3: src/resources/test/service/META-INF and 1 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: wolfc
Date: 2007-11-06 09:26:30 -0500 (Tue, 06 Nov 2007)
New Revision: 66784

Modified:
   branches/JBPAPP_4_2/ejb3/build-test.xml
   branches/JBPAPP_4_2/ejb3/src/resources/test/service/META-INF/jboss.xml
   branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/service/TestResourceInjectionService.java
Log:
JBPAPP-347: Fixed service test

Modified: branches/JBPAPP_4_2/ejb3/build-test.xml
===================================================================
--- branches/JBPAPP_4_2/ejb3/build-test.xml	2007-11-06 14:05:22 UTC (rev 66783)
+++ branches/JBPAPP_4_2/ejb3/build-test.xml	2007-11-06 14:26:30 UTC (rev 66784)
@@ -45,10 +45,16 @@
      <isset property="build.soa"/>
    </condition>
 
+   <!-- TODO: integrate jboss.jms.provider and jboss.jms.product -->
+   
    <condition property="jboss.jms.provider" value="jbm" else="mq">
       <isset property="build.soa"/>
    </condition>
    
+   <condition property="jboss.jms.product" value="messaging" else="mq">
+      <isset property="build.soa"/>
+   </condition>
+   
    <!-- Set a hostname property based on COMPUTERNAME for win32, HOSTNAME
    otherwise and initialize the node0/node1 cluster hostnames to localhost
    and ${hostname} by default. If you cannot route multicast traffic between
@@ -3086,16 +3092,20 @@
       
       <build-jms-dd name="service" descriptor="test-destination-service.xml"/>
       
+      <mkdir dir="${target.resources}/test/service/META-INF"/>
+      <copy file="${resources}/test/service/META-INF/jboss.xml" todir="${target.resources}/test/service/META-INF"/>
+      <replace file="${target.resources}/test/service/META-INF/jboss.xml" token="@@jboss.jms.product@@" value="${jboss.jms.product}"/>
+      
       <jar jarfile="${build.lib}/service-test.jar">
          <fileset dir="${build.classes}">
             <include name="org/jboss/ejb3/test/service/*.class"/>
          </fileset>
          <fileset dir="${resources}/test/service">
             <include name="META-INF/ejb-jar.xml"/>
-            <include name="META-INF/jboss.xml"/>
             <include name="META-INF/persistence.xml"/>
          </fileset>
          <fileset dir="${target.resources}/test/service">
+            <include name="META-INF/jboss.xml"/>
             <include name="test-destination-service.xml"/>
          </fileset>
          <fileset dir="${resources}/test">

Modified: branches/JBPAPP_4_2/ejb3/src/resources/test/service/META-INF/jboss.xml
===================================================================
--- branches/JBPAPP_4_2/ejb3/src/resources/test/service/META-INF/jboss.xml	2007-11-06 14:05:22 UTC (rev 66783)
+++ branches/JBPAPP_4_2/ejb3/src/resources/test/service/META-INF/jboss.xml	2007-11-06 14:26:30 UTC (rev 66784)
@@ -54,5 +54,10 @@
             <jndi-name>queue/mdbtest</jndi-name>
          </resource-env-ref>
       </service>
+      <service>
+         <ejb-name>TestResourceInjectionService</ejb-name>
+         <ejb-class>org.jboss.ejb3.test.service.TestResourceInjectionService</ejb-class>
+         <depends>jboss.@@jboss.jms.product@@.destination:name=myTestTopic,service=Topic</depends>
+      </service>
    </enterprise-beans>
 </jboss>

Modified: branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/service/TestResourceInjectionService.java
===================================================================
--- branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/service/TestResourceInjectionService.java	2007-11-06 14:05:22 UTC (rev 66783)
+++ branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/service/TestResourceInjectionService.java	2007-11-06 14:26:30 UTC (rev 66784)
@@ -4,7 +4,6 @@
 import javax.jms.Topic;
 import javax.jms.TopicConnectionFactory;
 
-import org.jboss.annotation.ejb.Depends;
 import org.jboss.annotation.ejb.Management;
 import org.jboss.annotation.ejb.Service;
 import org.jboss.logging.Logger;
@@ -17,7 +16,8 @@
  */
 @Service(objectName = "jboss.ejb3.bugs:service=TestResourceInjectionService")
 @Management(TestResourceInjectionServiceIF.class)
- at Depends("jboss.mq.destination:name=myTestTopic,service=Topic")
+// We can't be certain that we use MQ, so the depends is dynamically inserted into the dd 
+//@Depends("jboss.mq.destination:name=myTestTopic,service=Topic")
 public class TestResourceInjectionService implements TestResourceInjectionServiceIF {
 
 	private static Logger log = Logger.getLogger(TestResourceInjectionService.class);