[jboss-cvs] JBossAS SVN: r86199 - in branches/Branch_5_x/testsuite/src: resources/cluster/ejb2/basic/META-INF and 3 other directories.

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

Author: alex.loubyansky at jboss.com
Date: 2009-03-23 07:19:23 -0400 (Mon, 23 Mar 2009)
New Revision: 86199

Modified:
   branches/Branch_5_x/testsuite/src/main/org/jboss/test/refs/ejbs2x/interfaces/Session.java
   branches/Branch_5_x/testsuite/src/resources/cluster/ejb2/basic/META-INF/ejb-jar.xml
   branches/Branch_5_x/testsuite/src/resources/jca/bank/META-INF/ejb-jar.xml
   branches/Branch_5_x/testsuite/src/resources/testbean/META-INF/ejb-jar.xml
   branches/Branch_5_x/testsuite/src/resources/testbyvalue/META-INF/ejb-jar.xml
Log:
fixing EJB verification errors (related to JBAS-4666)

Modified: branches/Branch_5_x/testsuite/src/main/org/jboss/test/refs/ejbs2x/interfaces/Session.java
===================================================================
--- branches/Branch_5_x/testsuite/src/main/org/jboss/test/refs/ejbs2x/interfaces/Session.java	2009-03-23 11:15:46 UTC (rev 86198)
+++ branches/Branch_5_x/testsuite/src/main/org/jboss/test/refs/ejbs2x/interfaces/Session.java	2009-03-23 11:19:23 UTC (rev 86199)
@@ -21,11 +21,13 @@
  */
 package org.jboss.test.refs.ejbs2x.interfaces;
 
+import java.rmi.RemoteException;
+
 /**
  * @author Scott.Stark at jboss.org
  * @version $Revision$
  */
 public interface Session extends javax.ejb.EJBObject
 {
-   public void checkRefs(String[] encNames) throws Exception;
+   public void checkRefs(String[] encNames) throws Exception, RemoteException;
 }

Modified: branches/Branch_5_x/testsuite/src/resources/cluster/ejb2/basic/META-INF/ejb-jar.xml
===================================================================
--- branches/Branch_5_x/testsuite/src/resources/cluster/ejb2/basic/META-INF/ejb-jar.xml	2009-03-23 11:15:46 UTC (rev 86198)
+++ branches/Branch_5_x/testsuite/src/resources/cluster/ejb2/basic/META-INF/ejb-jar.xml	2009-03-23 11:19:23 UTC (rev 86199)
@@ -94,7 +94,6 @@
          <persistence-type>Bean</persistence-type>
          <prim-key-class>java.lang.String</prim-key-class>
          <reentrant>False</reentrant>
-         <primkey-field>name</primkey-field>
          <ejb-ref>
             <description>An EJB ref for this bean to test</description>
             <ejb-ref-name>ejb/myEJBRef</ejb-ref-name>

Modified: branches/Branch_5_x/testsuite/src/resources/jca/bank/META-INF/ejb-jar.xml
===================================================================
--- branches/Branch_5_x/testsuite/src/resources/jca/bank/META-INF/ejb-jar.xml	2009-03-23 11:15:46 UTC (rev 86198)
+++ branches/Branch_5_x/testsuite/src/resources/jca/bank/META-INF/ejb-jar.xml	2009-03-23 11:19:23 UTC (rev 86199)
@@ -43,7 +43,6 @@
          <persistence-type>Bean</persistence-type>
          <prim-key-class>java.lang.Integer</prim-key-class>
          <reentrant>False</reentrant>
-         <primkey-field>id</primkey-field>
 
       </entity>
 
@@ -56,12 +55,10 @@
          <remote>org.jboss.test.jca.bank.interfaces.Account</remote>
          <local-home>org.jboss.test.jca.bank.interfaces.AccountLocalHome</local-home>
          <local>org.jboss.test.jca.bank.interfaces.AccountLocal</local>
-
          <ejb-class>org.jboss.test.jca.bank.ejb.AccountBean</ejb-class>
          <persistence-type>Bean</persistence-type>
          <prim-key-class>java.lang.Integer</prim-key-class>
          <reentrant>False</reentrant>
-         <primkey-field>id</primkey-field>
 
       </entity>
 

Modified: branches/Branch_5_x/testsuite/src/resources/testbean/META-INF/ejb-jar.xml
===================================================================
--- branches/Branch_5_x/testsuite/src/resources/testbean/META-INF/ejb-jar.xml	2009-03-23 11:15:46 UTC (rev 86198)
+++ branches/Branch_5_x/testsuite/src/resources/testbean/META-INF/ejb-jar.xml	2009-03-23 11:19:23 UTC (rev 86199)
@@ -93,11 +93,10 @@
             <persistence-type>Bean</persistence-type>
             <prim-key-class>java.lang.String</prim-key-class>
             <reentrant>False</reentrant>
-            <primkey-field>name</primkey-field>
             <ejb-ref>
                 <description>An EJB ref for this bean to test</description>
                 <ejb-ref-name>ejb/myEJBRef</ejb-ref-name>
-          <ejb-ref-type>Session</ejb-ref-type>
+                <ejb-ref-type>Session</ejb-ref-type>
                 <home>org.jboss.test.testbean.interfaces.StatelessSessionHome</home>
                 <remote>org.jboss.test.testbean.interfaces.StatelessSession</remote>
                 <ejb-link>nextgen.StatelessSession</ejb-link>

Modified: branches/Branch_5_x/testsuite/src/resources/testbyvalue/META-INF/ejb-jar.xml
===================================================================
--- branches/Branch_5_x/testsuite/src/resources/testbyvalue/META-INF/ejb-jar.xml	2009-03-23 11:15:46 UTC (rev 86198)
+++ branches/Branch_5_x/testsuite/src/resources/testbyvalue/META-INF/ejb-jar.xml	2009-03-23 11:19:23 UTC (rev 86199)
@@ -68,7 +68,6 @@
              <persistence-type>Bean</persistence-type>
              <prim-key-class>java.lang.String</prim-key-class>
              <reentrant>False</reentrant>
-             <primkey-field>name</primkey-field>
          </entity>
         <entity>
              <description>TestByValue beans</description>
@@ -79,7 +78,6 @@
              <persistence-type>Bean</persistence-type>
              <prim-key-class>java.lang.String</prim-key-class>
              <reentrant>False</reentrant>
-             <primkey-field>name</primkey-field>
          </entity>
     </enterprise-beans>
     <assembly-descriptor>