[jboss-cvs] JBossAS SVN: r64280 - in branches/Branch_4_2/ejb3/src: test/org/jboss/ejb3/test/clusteredsession and 1 other directory.

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

Author: bdecoste
Date: 2007-07-25 14:38:22 -0400 (Wed, 25 Jul 2007)
New Revision: 64280

Modified:
   branches/Branch_4_2/ejb3/src/resources/test/clusteredsession/islocal/META-INF/ejb-jar.xml
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/VMTesterBase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/VMTesterStatefulBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/VMTesterStatelessBean.java
Log:
removed duplicate bean (from annotation)

Modified: branches/Branch_4_2/ejb3/src/resources/test/clusteredsession/islocal/META-INF/ejb-jar.xml
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/clusteredsession/islocal/META-INF/ejb-jar.xml	2007-07-25 18:15:05 UTC (rev 64279)
+++ branches/Branch_4_2/ejb3/src/resources/test/clusteredsession/islocal/META-INF/ejb-jar.xml	2007-07-25 18:38:22 UTC (rev 64280)
@@ -12,6 +12,11 @@
          <ejb-class>org.jboss.ejb3.test.clusteredsession.VMTesterStatelessBean</ejb-class>
          <session-type>Stateless</session-type>
          <transaction-type>Container</transaction-type>
+         <env-entry>
+            <env-entry-name>ejbName</env-entry-name>
+            <env-entry-type>java.lang.String</env-entry-type>
+            <env-entry-value>NonClusteredStateless</env-entry-value>
+         </env-entry>
       </session>
       <session>
          <ejb-name>ClusteredStateless</ejb-name>
@@ -19,6 +24,11 @@
          <ejb-class>org.jboss.ejb3.test.clusteredsession.VMTesterStatelessBean</ejb-class>
          <session-type>Stateless</session-type>
          <transaction-type>Container</transaction-type>
+         <env-entry>
+            <env-entry-name>ejbName</env-entry-name>
+            <env-entry-type>java.lang.String</env-entry-type>
+            <env-entry-value>ClusteredStateless</env-entry-value>
+         </env-entry>
       </session>
       <session>
          <ejb-name>NonClusteredStateful</ejb-name>

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/VMTesterBase.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/VMTesterBase.java	2007-07-25 18:15:05 UTC (rev 64279)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/VMTesterBase.java	2007-07-25 18:38:22 UTC (rev 64280)
@@ -25,6 +25,7 @@
 import java.rmi.dgc.VMID;
 import java.util.Properties;
 
+import javax.annotation.Resource;
 import javax.naming.Context;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
@@ -38,8 +39,11 @@
 {
    private static final Logger log = Logger.getLogger(VMTesterBase.class);
    
+   @Resource(name="ejbName") private String ejbName;
+   
    public VMID getVMID()
    {
+      log.info("!!!!! getVMID " + ejbName + " " + VMTester.VMID);
       log.debug("Ignore; just a stack trace", new Exception("Ignore; just a stack trace"));
       return VMTester.VMID;
    }
@@ -58,7 +62,9 @@
    
    public VMID getVMIDFromRemote(VMTester remote)
    {
-      return remote.getVMID();
+      VMID vmid = remote.getVMID();
+      log.info("!!!!! getVMIDFromRemote " + ejbName + " " + vmid);
+      return vmid;
    }
 
    

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/VMTesterStatefulBean.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/VMTesterStatefulBean.java	2007-07-25 18:15:05 UTC (rev 64279)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/VMTesterStatefulBean.java	2007-07-25 18:38:22 UTC (rev 64280)
@@ -28,8 +28,6 @@
 /**
  * @author Brian Stansberry
  */
- at Stateful
- at Remote(VMTester.class)
 public class VMTesterStatefulBean extends VMTesterBase implements VMTester
 {
 }

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/VMTesterStatelessBean.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/VMTesterStatelessBean.java	2007-07-25 18:15:05 UTC (rev 64279)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/VMTesterStatelessBean.java	2007-07-25 18:38:22 UTC (rev 64280)
@@ -22,14 +22,9 @@
 
 package org.jboss.ejb3.test.clusteredsession;
 
-import javax.ejb.Remote;
-import javax.ejb.Stateless;
-
 /**
  * @author Brian Stansberry
  */
- at Stateless
- at Remote(VMTester.class)
 public class VMTesterStatelessBean extends VMTesterBase implements VMTester
 {
 }