Tue Oct 24 09:08:57 EDT 2006

Author: wolfc
Date: 2006-10-24 09:08:23 -0400 (Tue, 24 Oct 2006)
New Revision: 57789

Added:
   trunk/ejb3x/src/main/javax/ejb/NoSuchEJBException.java
Removed:
   trunk/ejb3x/src/main/javax/ejb/EJBNoSuchObjectException.java
Modified:
   trunk/ejb3/docs/tutorial/jboss_deployment_descriptor/src/org/jboss/tutorial/jboss_deployment_descriptor/client/Client.java
   trunk/ejb3/docs/tutorial/stateful/src/org/jboss/tutorial/stateful/client/Client.java
   trunk/ejb3/docs/tutorial/stateful_deployment_descriptor/src/org/jboss/tutorial/stateful_deployment_descriptor/client/Client.java
   trunk/ejb3/src/main/org/jboss/ejb3/cache/NoPassivationCache.java
   trunk/ejb3/src/main/org/jboss/ejb3/cache/simple/SimpleStatefulCache.java
   trunk/ejb3/src/main/org/jboss/ejb3/cache/tree/StatefulTreeCache.java
   trunk/ejb3/src/test/org/jboss/ejb3/test/standalone/unit/DeployerTestCase.java
   trunk/ejb3/src/test/org/jboss/ejb3/test/standalone/unit/JavaClassPathTestCase.java
   trunk/ejb3/src/test/org/jboss/ejb3/test/standalone/unit/XmlDeployerTestCase.java
   trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/unit/RemoteUnitTestCase.java
   trunk/ejb3/src/test/org/jboss/ejb3/test/webservices/unit/WsUnitTestCase.java
Log:
EJBTHREE-758: merged 57788

Modified: trunk/ejb3/docs/tutorial/jboss_deployment_descriptor/src/org/jboss/tutorial/jboss_deployment_descriptor/client/Client.java
===================================================================

--- trunk/ejb3/docs/tutorial/jboss_deployment_descriptor/src/org/jboss/tutorial/jboss_deployment_descriptor/client/Client.java	2006-10-24 12:45:25 UTC (rev 57788)
+++ trunk/ejb3/docs/tutorial/jboss_deployment_descriptor/src/org/jboss/tutorial/jboss_deployment_descriptor/client/Client.java	2006-10-24 13:08:23 UTC (rev 57789)
@@ -23,7 +23,7 @@
 
 import java.util.HashMap;
 import java.util.Properties;
-import javax.ejb.EJBNoSuchObjectException;
+import javax.ejb.NoSuchEJBException;
 import javax.naming.Context;
 import javax.naming.InitialContext;
 import org.jboss.tutorial.jboss_deployment_descriptor.bean.ShoppingCart;
@@ -107,7 +107,7 @@
       {
          cart.getCartContents();
       }
-      catch (EJBNoSuchObjectException e)
+      catch (NoSuchEJBException e)
       {
          System.out.println("Successfully caught no such object exception.");
       }

Modified: trunk/ejb3/docs/tutorial/stateful/src/org/jboss/tutorial/stateful/client/Client.java
===================================================================
--- trunk/ejb3/docs/tutorial/stateful/src/org/jboss/tutorial/stateful/client/Client.java	2006-10-24 12:45:25 UTC (rev 57788)
+++ trunk/ejb3/docs/tutorial/stateful/src/org/jboss/tutorial/stateful/client/Client.java	2006-10-24 13:08:23 UTC (rev 57789)
@@ -62,7 +62,7 @@
       {
          cart.getCartContents();
       }
-      catch (javax.ejb.EJBNoSuchObjectException e)
+      catch (javax.ejb.NoSuchEJBException e)
       {
          System.out.println("Successfully caught no such object exception.");
       }

Modified: trunk/ejb3/docs/tutorial/stateful_deployment_descriptor/src/org/jboss/tutorial/stateful_deployment_descriptor/client/Client.java
===================================================================
--- trunk/ejb3/docs/tutorial/stateful_deployment_descriptor/src/org/jboss/tutorial/stateful_deployment_descriptor/client/Client.java	2006-10-24 12:45:25 UTC (rev 57788)
+++ trunk/ejb3/docs/tutorial/stateful_deployment_descriptor/src/org/jboss/tutorial/stateful_deployment_descriptor/client/Client.java	2006-10-24 13:08:23 UTC (rev 57789)
@@ -25,7 +25,7 @@
 import org.jboss.tutorial.stateful_deployment_descriptor.bean.ShoppingCart;
 
 import javax.ejb.EJBException;
-import javax.ejb.EJBNoSuchObjectException;
+import javax.ejb.NoSuchEJBException;
 import javax.naming.InitialContext;
 
 import java.rmi.NoSuchObjectException;
@@ -67,7 +67,7 @@
       {
          cart.getCartContents();
       }
-      catch (EJBNoSuchObjectException e)
+      catch (NoSuchEJBException e)
       {
             System.out.println("Successfully caught no such object exception.");
       }

Modified: trunk/ejb3/src/main/org/jboss/ejb3/cache/NoPassivationCache.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/cache/NoPassivationCache.java	2006-10-24 12:45:25 UTC (rev 57788)
+++ trunk/ejb3/src/main/org/jboss/ejb3/cache/NoPassivationCache.java	2006-10-24 13:08:23 UTC (rev 57789)
@@ -23,7 +23,7 @@
 
 import java.util.HashMap;
 import javax.ejb.EJBException;
-import javax.ejb.EJBNoSuchObjectException;
+import javax.ejb.NoSuchEJBException;
 import org.jboss.ejb3.Container;
 import org.jboss.ejb3.Pool;
 import org.jboss.ejb3.stateful.StatefulBeanContext;
@@ -117,7 +117,7 @@
       }
       if (entry == null)
       {
-         throw new EJBNoSuchObjectException("Could not find Stateful bean: " + key);
+         throw new NoSuchEJBException("Could not find Stateful bean: " + key);
       }
       entry.inUse = true;
       entry.lastUsed = System.currentTimeMillis();

Modified: trunk/ejb3/src/main/org/jboss/ejb3/cache/simple/SimpleStatefulCache.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/cache/simple/SimpleStatefulCache.java	2006-10-24 12:45:25 UTC (rev 57788)
+++ trunk/ejb3/src/main/org/jboss/ejb3/cache/simple/SimpleStatefulCache.java	2006-10-24 13:08:23 UTC (rev 57789)
@@ -25,7 +25,7 @@
 import java.util.LinkedHashMap;
 import java.util.Map;
 import javax.ejb.EJBException;
-import javax.ejb.EJBNoSuchObjectException;
+import javax.ejb.NoSuchEJBException;
 import org.jboss.annotation.ejb.cache.simple.CacheConfig;
 import org.jboss.annotation.ejb.cache.simple.PersistenceManager;
 import org.jboss.aop.Advisor;
@@ -265,7 +265,7 @@
          Object bean = pm.activateSession(key);
          if (bean == null)
          {
-            throw new EJBNoSuchObjectException("Could not find Stateful bean: " + key);
+            throw new NoSuchEJBException("Could not find Stateful bean: " + key);
          }
          entry = (StatefulBeanContext) bean;
          synchronized (cacheMap)

Modified: trunk/ejb3/src/main/org/jboss/ejb3/cache/tree/StatefulTreeCache.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/cache/tree/StatefulTreeCache.java	2006-10-24 12:45:25 UTC (rev 57788)
+++ trunk/ejb3/src/main/org/jboss/ejb3/cache/tree/StatefulTreeCache.java	2006-10-24 13:08:23 UTC (rev 57789)
@@ -22,7 +22,7 @@
 package org.jboss.ejb3.cache.tree;
 
 import javax.ejb.EJBException;
-import javax.ejb.EJBNoSuchObjectException;
+import javax.ejb.NoSuchEJBException;
 import javax.management.MBeanServer;
 import javax.management.ObjectName;
 
@@ -124,7 +124,7 @@
       }
       if (entry == null)
       {
-         throw new EJBNoSuchObjectException("Could not find Stateful bean: " + key);
+         throw new NoSuchEJBException("Could not find Stateful bean: " + key);
       }
       entry.inUse = true;
       // Mark it to eviction thread that don't passivate it yet.

Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/standalone/unit/DeployerTestCase.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/standalone/unit/DeployerTestCase.java	2006-10-24 12:45:25 UTC (rev 57788)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/standalone/unit/DeployerTestCase.java	2006-10-24 13:08:23 UTC (rev 57789)
@@ -26,7 +26,7 @@
 import java.net.URL;
 import java.util.Hashtable;
 import java.util.Properties;
-import javax.ejb.EJBNoSuchObjectException;
+import javax.ejb.NoSuchEJBException;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
 import org.jboss.ejb3.embedded.EJB3StandaloneBootstrap;
@@ -136,6 +136,7 @@
       deployer.setKernel(EJB3StandaloneBootstrap.getKernel());
       deployer.setJndiProperties(getInitialContextProperties());
       deployer.setDefaultPersistenceProperties(getDefaultPersistenceProperties());
+      System.out.println("deployDir = " + deployDir);
       deployer.getDeployDirs().add(deployDir);
 
       completeTest(deployer, ctx);
@@ -225,7 +226,7 @@
       {
          cart.getCart();
       }
-      catch (EJBNoSuchObjectException e)
+      catch (NoSuchEJBException e)
       {
          exceptionThrown = true;
       }

Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/standalone/unit/JavaClassPathTestCase.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/standalone/unit/JavaClassPathTestCase.java	2006-10-24 12:45:25 UTC (rev 57788)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/standalone/unit/JavaClassPathTestCase.java	2006-10-24 13:08:23 UTC (rev 57789)
@@ -33,7 +33,7 @@
 import org.jboss.ejb3.test.standalone.ShoppingCart;
 import org.jboss.ejb3.test.standalone.StupidInterceptor;
 
-import javax.ejb.EJBNoSuchObjectException;
+import javax.ejb.NoSuchEJBException;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
 import java.util.Hashtable;
@@ -122,7 +122,7 @@
       {
          cart.getCart();
       }
-      catch (EJBNoSuchObjectException e)
+      catch (NoSuchEJBException e)
       {
          exceptionThrown = true;
       }

Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/standalone/unit/XmlDeployerTestCase.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/standalone/unit/XmlDeployerTestCase.java	2006-10-24 12:45:25 UTC (rev 57788)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/standalone/unit/XmlDeployerTestCase.java	2006-10-24 13:08:23 UTC (rev 57789)
@@ -22,7 +22,7 @@
 package org.jboss.ejb3.test.standalone.unit;
 
 import java.util.Hashtable;
-import javax.ejb.EJBNoSuchObjectException;
+import javax.ejb.NoSuchEJBException;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
 import org.jboss.ejb3.embedded.EJB3StandaloneBootstrap;
@@ -136,7 +136,7 @@
       {
          cart.getCart();
       }
-      catch (EJBNoSuchObjectException e)
+      catch (NoSuchEJBException e)
       {
          exceptionThrown = true;
       }

Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/unit/RemoteUnitTestCase.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/unit/RemoteUnitTestCase.java	2006-10-24 12:45:25 UTC (rev 57788)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/unit/RemoteUnitTestCase.java	2006-10-24 13:08:23 UTC (rev 57789)
@@ -21,7 +21,7 @@
   */
 package org.jboss.ejb3.test.stateful.unit;
 
-import javax.ejb.EJBNoSuchObjectException;
+import javax.ejb.NoSuchEJBException;
 import javax.management.ObjectName;
 import javax.naming.InitialContext;
 
@@ -417,7 +417,7 @@
       {
          stateful.getState();
          fail("Bean should have been removed");
-      } catch (EJBNoSuchObjectException e)
+      } catch (NoSuchEJBException e)
       {
          
       }

Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/webservices/unit/WsUnitTestCase.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/webservices/unit/WsUnitTestCase.java	2006-10-24 12:45:25 UTC (rev 57788)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/webservices/unit/WsUnitTestCase.java	2006-10-24 13:08:23 UTC (rev 57789)
@@ -28,7 +28,7 @@
 import org.jboss.security.SecurityAssociation;
 import org.jboss.security.SimplePrincipal;
 
-import javax.ejb.EJBNoSuchObjectException;
+import javax.ejb.NoSuchEJBException;
 
 import junit.framework.Test;
 

Deleted: trunk/ejb3x/src/main/javax/ejb/EJBNoSuchObjectException.java
===================================================================
--- trunk/ejb3x/src/main/javax/ejb/EJBNoSuchObjectException.java	2006-10-24 12:45:25 UTC (rev 57788)
+++ trunk/ejb3x/src/main/javax/ejb/EJBNoSuchObjectException.java	2006-10-24 13:08:23 UTC (rev 57789)
@@ -1,57 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package javax.ejb;
-
-/**
- * A NoSuchObjectLocalException is thrown if an attempt is made to invoke
- * a method on an object that no longer exists.
- * @version $Revision$
- */
-public class EJBNoSuchObjectException extends EJBException {
-
-  /**
-   * Constructs a NoSuchObjectLocalException with no detail message.
-   */
-  public EJBNoSuchObjectException() {
-    super();
-  }
-
-  /**
-   * Constructs a NoSuchObjectLocalException with the specified detailed message.
-   *
-   * @param message - The detailed message.
-   */
-  public EJBNoSuchObjectException(String message) {
-    super(message);
-  }
-
-  /**
-   * Constructs a NoSuchObjectLocalException with the specified detail message and a
-   * nested exception.
-   *
-   * @param message - The detailed message.
-   * @param ex - The originally thrown exception.
-   */
-  public EJBNoSuchObjectException(String message, Exception ex) {
-    super(message,ex);
-  }
-}

Copied: trunk/ejb3x/src/main/javax/ejb/NoSuchEJBException.java (from rev 57788, branches/JEE5_TCK/ejb3x/src/main/javax/ejb/NoSuchEJBException.java)


