[jboss-cvs] JBossAS SVN: r74965 - in trunk/testsuite/src/resources/refs: ejblink/two and 1 other directories.

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

Author: adrian at jboss.org
Date: 2008-06-24 05:40:42 -0400 (Tue, 24 Jun 2008)
New Revision: 74965

Modified:
   trunk/testsuite/src/resources/refs/ejblink/one/jboss.xml
   trunk/testsuite/src/resources/refs/ejblink/two/jboss.xml
   trunk/testsuite/src/resources/refs/resources/jboss.xml
Log:
Fix some deployment descritptors such that they match the xsd

Modified: trunk/testsuite/src/resources/refs/ejblink/one/jboss.xml
===================================================================
--- trunk/testsuite/src/resources/refs/ejblink/one/jboss.xml	2008-06-24 09:30:59 UTC (rev 74964)
+++ trunk/testsuite/src/resources/refs/ejblink/one/jboss.xml	2008-06-24 09:40:42 UTC (rev 74965)
@@ -6,10 +6,10 @@
     <enterprise-beans>
         <ejb>
             <ejb-name>EjbLink1Bean</ejb-name>
-            <jndi-name>ejb3_stateless_ejblink_one_EjbLink1Bean</jndi-name>
             <ejb-ref>
                 <ejb-ref-name>ejb/EjbLink2Bean</ejb-ref-name>
             </ejb-ref>
+            <jndi-name>ejb3_stateless_ejblink_one_EjbLink1Bean</jndi-name>
         </ejb>
         
     </enterprise-beans>

Modified: trunk/testsuite/src/resources/refs/ejblink/two/jboss.xml
===================================================================
--- trunk/testsuite/src/resources/refs/ejblink/two/jboss.xml	2008-06-24 09:30:59 UTC (rev 74964)
+++ trunk/testsuite/src/resources/refs/ejblink/two/jboss.xml	2008-06-24 09:40:42 UTC (rev 74965)
@@ -6,7 +6,6 @@
     <enterprise-beans>
         <ejb>
             <ejb-name>EjbLink2Bean</ejb-name>
-            <jndi-name>ejb3_stateless_ejblink_one_EjbLink2Bean</jndi-name>
             <ejb-ref>
                 <ejb-ref-name>ejb/EjbLink1Bean</ejb-ref-name>
                 <!-- To avoid the circular reference -->
@@ -15,6 +14,7 @@
             <ejb-ref>
                 <ejb-ref-name>ejb/EjbLink3Bean</ejb-ref-name>
             </ejb-ref>
+            <jndi-name>ejb3_stateless_ejblink_one_EjbLink2Bean</jndi-name>
         </ejb>
         
     </enterprise-beans>

Modified: trunk/testsuite/src/resources/refs/resources/jboss.xml
===================================================================
--- trunk/testsuite/src/resources/refs/resources/jboss.xml	2008-06-24 09:30:59 UTC (rev 74964)
+++ trunk/testsuite/src/resources/refs/resources/jboss.xml	2008-06-24 09:40:42 UTC (rev 74965)
@@ -3,9 +3,8 @@
     http://www.jboss.org/j2ee/schema/jboss_5_0.xsd" version="3.0">
     <unauthenticated-principal>guest</unauthenticated-principal>
     <enterprise-beans>
-        <ejb id="ResourceOnFieldBean">
+        <ejb>
             <ejb-name>ResourceOnFieldBean</ejb-name>
-            <jndi-name>refs/resources/ResourceOnFieldBean</jndi-name>
             <resource-ref>
                 <res-ref-name>dataSource</res-ref-name>
                 <jndi-name>java:DefaultDS</jndi-name>
@@ -46,10 +45,10 @@
                 <message-destination-ref-name>topic</message-destination-ref-name>
                 <jndi-name>topic/testTopic</jndi-name>
             </message-destination-ref>
+            <jndi-name>refs/resources/ResourceOnFieldBean</jndi-name>
         </ejb>
-        <ejb id="ResourceOnMethodBean">
+        <ejb>
             <ejb-name>ResourceOnMethodBean</ejb-name>
-            <jndi-name>refs/resources/ResourceOnMethodBean</jndi-name>
             <resource-ref>
                 <res-ref-name>dataSource</res-ref-name>
                 <jndi-name>java:DefaultDS</jndi-name>
@@ -90,10 +89,10 @@
                 <message-destination-ref-name>topic</message-destination-ref-name>
                 <jndi-name>topic/testTopic</jndi-name>
             </message-destination-ref>
+            <jndi-name>refs/resources/ResourceOnMethodBean</jndi-name>
         </ejb>
-        <ejb id="ResourcesOnClassBean">
+        <ejb>
             <ejb-name>ResourcesOnClassBean</ejb-name>
-            <jndi-name>refs/resources/ResourcesOnClassBean</jndi-name>
             <resource-ref>
                 <res-ref-name>dataSource</res-ref-name>
                 <jndi-name>java:DefaultDS</jndi-name>
@@ -134,6 +133,7 @@
                 <message-destination-ref-name>topic</message-destination-ref-name>
                 <jndi-name>topic/testTopic</jndi-name>
             </message-destination-ref>
+            <jndi-name>refs/resources/ResourcesOnClassBean</jndi-name>
         </ejb>
     </enterprise-beans>
 </jboss>