svn commit: r578355 - in /openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee: EntityBean.java RemoteBean.java SessionBean.java

[dblevins]

Author: dblevins
Date: Fri Sep 21 19:22:29 2007
New Revision: 578355

URL: http://svn.apache.org/viewvc?rev=578355&view=rev
Log:
Turned the List of remote and local business interfaces into a Set to prevent 
duplication

Modified:
    
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/EntityBean.java
    
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/RemoteBean.java
    
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/SessionBean.java

Modified: 
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/EntityBean.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/EntityBean.java?rev=578355&r1=578354&r2=578355&view=diff
==============================================================================
--- 
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/EntityBean.java
 (original)
+++ 
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/EntityBean.java
 Fri Sep 21 19:22:29 2007
@@ -31,6 +31,7 @@
 import java.util.List;
 import java.util.Collections;
 import java.util.Set;
+import java.util.Collection;
 
 
 /**
@@ -497,12 +498,12 @@
         return this.securityRoleRef;
     }
 
-    public List<String> getBusinessLocal() {
-        return Collections.EMPTY_LIST;
+    public Collection<String> getBusinessLocal() {
+        return Collections.EMPTY_SET;
     }
 
-    public List<String> getBusinessRemote() {
-        return Collections.EMPTY_LIST;
+    public Collection<String> getBusinessRemote() {
+        return Collections.EMPTY_SET;
     }
 
     public SecurityIdentity getSecurityIdentity() {

Modified: 
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/RemoteBean.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/RemoteBean.java?rev=578355&r1=578354&r2=578355&view=diff
==============================================================================
--- 
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/RemoteBean.java
 (original)
+++ 
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/RemoteBean.java
 Fri Sep 21 19:22:29 2007
@@ -18,6 +18,7 @@
 package org.apache.openejb.jee;
 
 import java.util.List;
+import java.util.Collection;
 
 /**
  * @version $Revision$ $Date$
@@ -42,7 +43,7 @@
 
     public List<SecurityRoleRef> getSecurityRoleRef();
 
-    List<String> getBusinessLocal();
+    Collection<String> getBusinessLocal();
 
-    List<String> getBusinessRemote();
+    Collection<String> getBusinessRemote();
 }

Modified: 
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/SessionBean.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/SessionBean.java?rev=578355&r1=578354&r2=578355&view=diff
==============================================================================
--- 
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/SessionBean.java
 (original)
+++ 
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/SessionBean.java
 Fri Sep 21 19:22:29 2007
@@ -29,6 +29,9 @@
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Collection;
+import java.util.Set;
+import java.util.LinkedHashSet;
 
 
 /**
@@ -145,9 +148,9 @@
     protected String localHome;
     protected String local;
     @XmlElement(name = "business-local")
-    protected List<String> businessLocal;
+    protected LinkedHashSet<String> businessLocal;
     @XmlElement(name = "business-remote")
-    protected List<String> businessRemote;
+    protected LinkedHashSet<String> businessRemote;
     @XmlElement(name = "service-endpoint")
     protected String serviceEndpoint;
     @XmlElement(name = "ejb-class")
@@ -334,9 +337,9 @@
         this.local = value;
     }
 
-    public List<String> getBusinessLocal() {
+    public Collection<String> getBusinessLocal() {
         if (businessLocal == null){
-            businessLocal = new ArrayList<String>();
+            businessLocal = new LinkedHashSet<String>();
         }
         return businessLocal;
     }
@@ -346,9 +349,9 @@
         getBusinessLocal().add(businessLocal);
     }
 
-    public List<String> getBusinessRemote() {
+    public Collection<String> getBusinessRemote() {
         if (businessRemote == null){
-            businessRemote = new ArrayList<String>();
+            businessRemote = new LinkedHashSet<String>();
         }
         return businessRemote;
     }
@@ -423,7 +426,7 @@
         assert ejbClass != null: "Set the ejbClass before calling this method";
         getAroundInvoke().add(new AroundInvoke(ejbClass, method));
     }
-    
+
     public List<EnvEntry> getEnvEntry() {
         if (envEntry == null) {
             envEntry = new ArrayList<EnvEntry>();