[jboss-cvs] JBossAS SVN: r68288 - in trunk/ejb3/src/main/org/jboss/ejb3: stateless and 1 other directory.

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

Author: wolfc
Date: 2007-12-14 10:35:21 -0500 (Fri, 14 Dec 2007)
New Revision: 68288

Modified:
   trunk/ejb3/src/main/org/jboss/ejb3/stateful/StatefulLocalProxyFactory.java
   trunk/ejb3/src/main/org/jboss/ejb3/stateful/StatefulRemoteProxyFactory.java
   trunk/ejb3/src/main/org/jboss/ejb3/stateless/StatelessLocalProxyFactory.java
   trunk/ejb3/src/main/org/jboss/ejb3/stateless/StatelessRemoteProxyFactory.java
Log:
EJBTHREE-1130 JBCTS-738: reverted 68228

Modified: trunk/ejb3/src/main/org/jboss/ejb3/stateful/StatefulLocalProxyFactory.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/stateful/StatefulLocalProxyFactory.java	2007-12-14 14:59:05 UTC (rev 68287)
+++ trunk/ejb3/src/main/org/jboss/ejb3/stateful/StatefulLocalProxyFactory.java	2007-12-14 15:35:21 UTC (rev 68288)
@@ -24,17 +24,18 @@
 import java.io.IOException;
 import java.io.ObjectInput;
 import java.io.ObjectOutput;
-import java.rmi.dgc.VMID;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
 
+import java.rmi.dgc.VMID;
+
 import javax.ejb.LocalHome;
 import javax.naming.NamingException;
 
 import org.jboss.aop.Advisor;
-import org.jboss.ejb3.EJBContainer;
 import org.jboss.ejb3.Ejb3Registry;
+import org.jboss.ejb3.EJBContainer;
 import org.jboss.ejb3.JBossProxy;
 import org.jboss.ejb3.ProxyFactoryHelper;
 import org.jboss.ejb3.annotation.LocalBinding;
@@ -82,25 +83,14 @@
       // Ensure that if EJB 2.1 Components are defined, they're complete
       this.ensureEjb21ViewComplete(localHome == null ? null : localHome.value(), ProxyFactoryHelper
             .getLocalInterfaces(getContainer()));
-      
-      // Ensure local interfaces defined
-      if (localInterfaces.size() > 0)
-      {
-         // Add JBossProxy
-         localInterfaces.add(JBossProxy.class);
 
-         // If binding along w/ home, add home
-         if (bindTogether)
-         {
-            localInterfaces.add(localHome.value());
-         }
-      }
-      else
+      // Add JBossProxy
+      localInterfaces.add(JBossProxy.class);
+
+      // If binding along w/ home, add home
+      if (bindTogether)
       {
-         // No local interfaces defined, throw deployment error
-         throw new RuntimeException("No local interfaces have been defined for " + statefulContainer.toString()
-               + "; specified " + LocalBinding.class.getSimpleName() + " JNDI Binding \"" + this.jndiName
-               + "\" is invalid. [EJBTHREE-1130]");
+         localInterfaces.add(localHome.value());
       }
 
       // Return

Modified: trunk/ejb3/src/main/org/jboss/ejb3/stateful/StatefulRemoteProxyFactory.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/stateful/StatefulRemoteProxyFactory.java	2007-12-14 14:59:05 UTC (rev 68287)
+++ trunk/ejb3/src/main/org/jboss/ejb3/stateful/StatefulRemoteProxyFactory.java	2007-12-14 15:35:21 UTC (rev 68288)
@@ -89,25 +89,14 @@
       this.ensureEjb21ViewComplete(remoteHome == null ? null : remoteHome.value(), ProxyFactoryHelper
             .getRemoteInterfaces(getContainer()));
 
-      // Ensure remote interfaces defined
-      if (remoteInterfaces.size() > 0)
+      // Add JBossProxy
+      remoteInterfaces.add(JBossProxy.class);
+      
+      // If binding along w/ home, add home
+      if (bindTogether)
       {
-         // Add JBossProxy
-         remoteInterfaces.add(JBossProxy.class);
-
-         // If binding along w/ home, add home
-         if (bindTogether)
-         {
-            remoteInterfaces.add(remoteHome.value());
-         }
+         remoteInterfaces.add(remoteHome.value());
       }
-      else
-      {
-         // No remote interfaces defined, throw deployment error
-         throw new RuntimeException("No remote interfaces have been defined for " + statefulContainer.toString()
-               + "; specified " + RemoteBinding.class.getSimpleName() + " JNDI Binding \"" + this.jndiName
-               + "\" is invalid. [EJBTHREE-1130]");
-      }
 
       // Return
       return remoteInterfaces.toArray(new Class<?>[]

Modified: trunk/ejb3/src/main/org/jboss/ejb3/stateless/StatelessLocalProxyFactory.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/stateless/StatelessLocalProxyFactory.java	2007-12-14 14:59:05 UTC (rev 68287)
+++ trunk/ejb3/src/main/org/jboss/ejb3/stateless/StatelessLocalProxyFactory.java	2007-12-14 15:35:21 UTC (rev 68288)
@@ -84,10 +84,8 @@
       }
       else
       {
-         // No local interfaces defined, throw deployment error
-         throw new RuntimeException("No local interfaces have been defined for " + statelessContainer.toString()
-               + "; specified " + LocalBinding.class.getSimpleName() + " JNDI Binding \"" + this.jndiName
-               + "\" is invalid. [EJBTHREE-1130]");
+         // No remote interfaces defined, log warning
+         log.warn("[EJBTHREE-933] NPE when deploying web service beans");
       }
 
       // Return

Modified: trunk/ejb3/src/main/org/jboss/ejb3/stateless/StatelessRemoteProxyFactory.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/stateless/StatelessRemoteProxyFactory.java	2007-12-14 14:59:05 UTC (rev 68287)
+++ trunk/ejb3/src/main/org/jboss/ejb3/stateless/StatelessRemoteProxyFactory.java	2007-12-14 15:35:21 UTC (rev 68288)
@@ -94,10 +94,8 @@
       }
       else
       {
-         // No remote interfaces defined, throw deployment error
-         throw new RuntimeException("No remote interfaces have been defined for " + statelessContainer.toString()
-               + "; specified " + RemoteBinding.class.getSimpleName() + " JNDI Binding \"" + this.jndiName
-               + "\" is invalid. [EJBTHREE-1130]");
+         // No remote interfaces defined, log warning
+         log.warn("[EJBTHREE-933] NPE when deploying web service beans");
       }
 
       // Return