Mon Oct 2 21:03:29 EDT 2006

Author: ryan.campbell at jboss.com
Date: 2006-10-02 21:03:27 -0400 (Mon, 02 Oct 2006)
New Revision: 57371

Added:
   branches/JBoss_4_0_4_GA_CP/testsuite/src/main/org/jboss/test/entitydepends/
   branches/JBoss_4_0_4_GA_CP/testsuite/src/main/org/jboss/test/entitydepends/ejb/
   branches/JBoss_4_0_4_GA_CP/testsuite/src/main/org/jboss/test/entitydepends/ejb/ABean.java
   branches/JBoss_4_0_4_GA_CP/testsuite/src/main/org/jboss/test/entitydepends/ejb/ALocal.java
   branches/JBoss_4_0_4_GA_CP/testsuite/src/main/org/jboss/test/entitydepends/ejb/ALocalHome.java
   branches/JBoss_4_0_4_GA_CP/testsuite/src/main/org/jboss/test/entitydepends/service/
   branches/JBoss_4_0_4_GA_CP/testsuite/src/main/org/jboss/test/entitydepends/service/MyService.java
   branches/JBoss_4_0_4_GA_CP/testsuite/src/main/org/jboss/test/entitydepends/service/MyServiceMBean.java
   branches/JBoss_4_0_4_GA_CP/testsuite/src/main/org/jboss/test/entitydepends/test/
   branches/JBoss_4_0_4_GA_CP/testsuite/src/main/org/jboss/test/entitydepends/test/EntityDependencyUnitTestCase.java
   branches/JBoss_4_0_4_GA_CP/testsuite/src/resources/entitydepends/
   branches/JBoss_4_0_4_GA_CP/testsuite/src/resources/entitydepends/ejb/
   branches/JBoss_4_0_4_GA_CP/testsuite/src/resources/entitydepends/ejb/META-INF/
   branches/JBoss_4_0_4_GA_CP/testsuite/src/resources/entitydepends/ejb/META-INF/ejb-jar.xml
   branches/JBoss_4_0_4_GA_CP/testsuite/src/resources/entitydepends/ejb/META-INF/jboss.xml
   branches/JBoss_4_0_4_GA_CP/testsuite/src/resources/entitydepends/ejb/META-INF/jbosscmp-jdbc.xml
   branches/JBoss_4_0_4_GA_CP/testsuite/src/resources/entitydepends/sar/
   branches/JBoss_4_0_4_GA_CP/testsuite/src/resources/entitydepends/sar/META-INF/
   branches/JBoss_4_0_4_GA_CP/testsuite/src/resources/entitydepends/sar/META-INF/jboss-service.xml
Removed:
   branches/JBoss_4_0_4_GA_CP/testsuite/src/main/org/jboss/test/entitydepends/ejb/
   branches/JBoss_4_0_4_GA_CP/testsuite/src/main/org/jboss/test/entitydepends/ejb/ABean.java
   branches/JBoss_4_0_4_GA_CP/testsuite/src/main/org/jboss/test/entitydepends/ejb/ALocal.java
   branches/JBoss_4_0_4_GA_CP/testsuite/src/main/org/jboss/test/entitydepends/ejb/ALocalHome.java
   branches/JBoss_4_0_4_GA_CP/testsuite/src/main/org/jboss/test/entitydepends/service/
   branches/JBoss_4_0_4_GA_CP/testsuite/src/main/org/jboss/test/entitydepends/service/MyService.java
   branches/JBoss_4_0_4_GA_CP/testsuite/src/main/org/jboss/test/entitydepends/service/MyServiceMBean.java
   branches/JBoss_4_0_4_GA_CP/testsuite/src/main/org/jboss/test/entitydepends/test/
   branches/JBoss_4_0_4_GA_CP/testsuite/src/main/org/jboss/test/entitydepends/test/EntityDependencyUnitTestCase.java
   branches/JBoss_4_0_4_GA_CP/testsuite/src/resources/entitydepends/ejb/
   branches/JBoss_4_0_4_GA_CP/testsuite/src/resources/entitydepends/ejb/META-INF/
   branches/JBoss_4_0_4_GA_CP/testsuite/src/resources/entitydepends/ejb/META-INF/ejb-jar.xml
   branches/JBoss_4_0_4_GA_CP/testsuite/src/resources/entitydepends/ejb/META-INF/jboss.xml
   branches/JBoss_4_0_4_GA_CP/testsuite/src/resources/entitydepends/ejb/META-INF/jbosscmp-jdbc.xml
   branches/JBoss_4_0_4_GA_CP/testsuite/src/resources/entitydepends/sar/
   branches/JBoss_4_0_4_GA_CP/testsuite/src/resources/entitydepends/sar/META-INF/
   branches/JBoss_4_0_4_GA_CP/testsuite/src/resources/entitydepends/sar/META-INF/jboss-service.xml
Modified:
   branches/JBoss_4_0_4_GA_CP/server/src/main/org/jboss/ejb/EjbModule.java
   branches/JBoss_4_0_4_GA_CP/server/src/main/org/jboss/ejb/EntityContainer.java
   branches/JBoss_4_0_4_GA_CP/testsuite/imports/sections/entity.xml
   branches/JBoss_4_0_4_GA_CP/testsuite/imports/test-jars.xml
Log:
ASPATCH-59: JBAS-3361: JBAS-3341 Entity container is not ready after its startService

Modified: branches/JBoss_4_0_4_GA_CP/server/src/main/org/jboss/ejb/EjbModule.java
===================================================================

--- branches/JBoss_4_0_4_GA_CP/server/src/main/org/jboss/ejb/EjbModule.java	2006-10-02 21:34:26 UTC (rev 57370)
+++ branches/JBoss_4_0_4_GA_CP/server/src/main/org/jboss/ejb/EjbModule.java	2006-10-03 01:03:27 UTC (rev 57371)
@@ -401,26 +401,23 @@
     */
    protected void startService() throws Exception
    {
+      // before EntityContainer returns from the startService, its PM should be usable
       ListIterator iter = containerOrdering.listIterator();
-      ArrayList entityList = new ArrayList();
       while( iter.hasNext() )
       {
          Container con = (Container) iter.next();
-         log.debug("startService, starting container: " + con.getBeanMetaData().getEjbName());
-         serviceController.start(con.getJmxName());
          if(con.getBeanMetaData().isEntity())
          {
-            entityList.add(con);
+            ((EntityContainer)con).getPersistenceManager().start();
          }
       }
 
-      if(!entityList.isEmpty())
+      iter = containerOrdering.listIterator();
+      while( iter.hasNext() )
       {
-         for(int i = 0; i < entityList.size(); ++i)
-         {
-            EntityContainer con = (EntityContainer)entityList.get(i);
-            con.startPmAndInterceptors();
-         }
+         Container con = (Container) iter.next();
+         log.debug("startService, starting container: " + con.getBeanMetaData().getEjbName());
+         serviceController.start(con.getJmxName());
       }
    }
 

Modified: branches/JBoss_4_0_4_GA_CP/server/src/main/org/jboss/ejb/EntityContainer.java
===================================================================
--- branches/JBoss_4_0_4_GA_CP/server/src/main/org/jboss/ejb/EntityContainer.java	2006-10-02 21:34:26 UTC (rev 57370)
+++ branches/JBoss_4_0_4_GA_CP/server/src/main/org/jboss/ejb/EntityContainer.java	2006-10-03 01:03:27 UTC (rev 57371)
@@ -353,6 +353,13 @@
          // Start the instance pool
          instancePool.start();
 
+         Interceptor i = interceptor;
+         while(i != null)
+         {
+            i.start();
+            i = i.getNext();
+         }
+
          // Restore persisted ejb timers
          restoreTimers();
       }
@@ -1058,17 +1065,6 @@
       }
    }
 
-   void startPmAndInterceptors() throws Exception
-   {
-      persistenceManager.start();
-      Interceptor i = interceptor;
-      while(i != null)
-      {
-         i.start();
-         i = i.getNext();
-      }
-   }
-
    private Object findSingleObject(Transaction tx,
                                    Method method,
                                    Object[] args,

Modified: branches/JBoss_4_0_4_GA_CP/testsuite/imports/sections/entity.xml
===================================================================
--- branches/JBoss_4_0_4_GA_CP/testsuite/imports/sections/entity.xml	2006-10-02 21:34:26 UTC (rev 57370)
+++ branches/JBoss_4_0_4_GA_CP/testsuite/imports/sections/entity.xml	2006-10-03 01:03:27 UTC (rev 57371)
@@ -84,4 +84,32 @@
          </fileset>
       </jar>
    </target>
+
+   <!-- entitydepends test -->
+   <target name="_jars-entitydepends">
+      <mkdir dir="${build.lib}"/>
+      <!-- build entitydepends.sar -->
+      <jar destfile="${build.lib}/entitydepends.sar" manifest="${build.etc}/manifest.mf">
+         <fileset dir="${build.classes}">
+            <include name="org/jboss/test/entitydepends/service/**"/>
+         </fileset>
+         <fileset dir="${build.resources}/entitydepends/sar">
+            <include name="**"/>
+         </fileset>
+      </jar>
+      <!-- build entitydepends.jar -->
+      <jar destfile="${build.lib}/entitydepends.jar" manifest="${build.etc}/manifest.mf">
+         <fileset dir="${build.classes}">
+            <patternset refid="common.test.client.classes"/>
+            <include name="org/jboss/test/entitydepends/ejb/**"/>
+            <include name="org/jboss/test/entitydepends/test/**"/>
+         </fileset>
+         <fileset dir="${build.lib}">
+            <include name="entitydepends.sar"/>
+         </fileset>
+         <fileset dir="${build.resources}/entitydepends/ejb">
+            <include name="**"/>
+         </fileset>
+      </jar>
+   </target>
 </project>

Modified: branches/JBoss_4_0_4_GA_CP/testsuite/imports/test-jars.xml
===================================================================
--- branches/JBoss_4_0_4_GA_CP/testsuite/imports/test-jars.xml	2006-10-02 21:34:26 UTC (rev 57370)
+++ branches/JBoss_4_0_4_GA_CP/testsuite/imports/test-jars.xml	2006-10-03 01:03:27 UTC (rev 57371)
@@ -90,6 +90,7 @@
       _jars-deployment,
       _jars-ejbconf,
       _jars-entity,
+      _jars-entitydepends,
       _jars-entityexc,
       _jars-excepiiop,
       _jars-exception,

Copied: branches/JBoss_4_0_4_GA_CP/testsuite/src/main/org/jboss/test/entitydepends (from rev 57370, branches/JBoss_4_0_4_GA_JBAS-3361/testsuite/src/main/org/jboss/test/entitydepends)

Copied: branches/JBoss_4_0_4_GA_CP/testsuite/src/main/org/jboss/test/entitydepends/ejb (from rev 57370, branches/JBoss_4_0_4_GA_JBAS-3361/testsuite/src/main/org/jboss/test/entitydepends/ejb)

Deleted: branches/JBoss_4_0_4_GA_CP/testsuite/src/main/org/jboss/test/entitydepends/ejb/ABean.java
===================================================================
--- branches/JBoss_4_0_4_GA_JBAS-3361/testsuite/src/main/org/jboss/test/entitydepends/ejb/ABean.java	2006-10-02 21:34:26 UTC (rev 57370)
+++ branches/JBoss_4_0_4_GA_CP/testsuite/src/main/org/jboss/test/entitydepends/ejb/ABean.java	2006-10-03 01:03:27 UTC (rev 57371)
@@ -1,92 +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 org.jboss.test.entitydepends.ejb;
-
-
-import javax.ejb.EntityBean;
-import javax.ejb.EntityContext;
-import javax.ejb.RemoveException;
-import javax.ejb.CreateException;
-
-
-/**
- * @author <a href="mailto:alex at jboss.org">Alexey Loubyansky</a>
- * @version <tt>$Revision$</tt>
- */
-public abstract class ABean implements EntityBean
-{
-   private EntityContext ctx;
-
-   public abstract Long getId();
-   public abstract void setId(Long id);
-
-   public abstract String getName();
-   public abstract void setName(String name);
-
-   public Long ejbCreate(Long id, String name)
-      throws CreateException
-   {
-      setId(id);
-      setName(name);
-      return null;
-   }
-
-   public void ejbPostCreate(Long id, String name)
-   {
-   }
-
-   /**
-    * @param ctx The new entityContext value
-    */
-   public void setEntityContext(EntityContext ctx)
-   {
-      this.ctx = ctx;
-   }
-
-   /**
-    * Unset the associated entity context.
-    */
-   public void unsetEntityContext()
-   {
-      this.ctx = null;
-   }
-
-   public void ejbActivate()
-   {
-   }
-
-   public void ejbLoad()
-   {
-   }
-
-   public void ejbPassivate()
-   {
-   }
-
-   public void ejbRemove() throws RemoveException
-   {
-   }
-
-   public void ejbStore()
-   {
-   }
-}

Copied: branches/JBoss_4_0_4_GA_CP/testsuite/src/main/org/jboss/test/entitydepends/ejb/ABean.java (from rev 57370, branches/JBoss_4_0_4_GA_JBAS-3361/testsuite/src/main/org/jboss/test/entitydepends/ejb/ABean.java)

Deleted: branches/JBoss_4_0_4_GA_CP/testsuite/src/main/org/jboss/test/entitydepends/ejb/ALocal.java
===================================================================
--- branches/JBoss_4_0_4_GA_JBAS-3361/testsuite/src/main/org/jboss/test/entitydepends/ejb/ALocal.java	2006-10-02 21:34:26 UTC (rev 57370)
+++ branches/JBoss_4_0_4_GA_CP/testsuite/src/main/org/jboss/test/entitydepends/ejb/ALocal.java	2006-10-03 01:03:27 UTC (rev 57371)
@@ -1,32 +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 org.jboss.test.entitydepends.ejb;
-
-public interface ALocal
-   extends javax.ejb.EJBLocalObject
-{
-   public Long getId(  ) ;
-
-   public String getName(  ) ;
-
-   public void setName( String name ) ;
-}

Copied: branches/JBoss_4_0_4_GA_CP/testsuite/src/main/org/jboss/test/entitydepends/ejb/ALocal.java (from rev 57370, branches/JBoss_4_0_4_GA_JBAS-3361/testsuite/src/main/org/jboss/test/entitydepends/ejb/ALocal.java)

Deleted: branches/JBoss_4_0_4_GA_CP/testsuite/src/main/org/jboss/test/entitydepends/ejb/ALocalHome.java
===================================================================
--- branches/JBoss_4_0_4_GA_JBAS-3361/testsuite/src/main/org/jboss/test/entitydepends/ejb/ALocalHome.java	2006-10-02 21:34:26 UTC (rev 57370)
+++ branches/JBoss_4_0_4_GA_CP/testsuite/src/main/org/jboss/test/entitydepends/ejb/ALocalHome.java	2006-10-03 01:03:27 UTC (rev 57371)
@@ -1,35 +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 org.jboss.test.entitydepends.ejb;
-
-public interface ALocalHome
-   extends javax.ejb.EJBLocalHome
-{
-   public ALocal create(Long id , String name)
-      throws javax.ejb.CreateException;
-
-   public java.util.Collection findAll()
-      throws javax.ejb.FinderException;
-
-   public ALocal findByPrimaryKey(Long pk)
-      throws javax.ejb.FinderException;
-}

Copied: branches/JBoss_4_0_4_GA_CP/testsuite/src/main/org/jboss/test/entitydepends/ejb/ALocalHome.java (from rev 57370, branches/JBoss_4_0_4_GA_JBAS-3361/testsuite/src/main/org/jboss/test/entitydepends/ejb/ALocalHome.java)

Copied: branches/JBoss_4_0_4_GA_CP/testsuite/src/main/org/jboss/test/entitydepends/service (from rev 57370, branches/JBoss_4_0_4_GA_JBAS-3361/testsuite/src/main/org/jboss/test/entitydepends/service)

Deleted: branches/JBoss_4_0_4_GA_CP/testsuite/src/main/org/jboss/test/entitydepends/service/MyService.java
===================================================================
--- branches/JBoss_4_0_4_GA_JBAS-3361/testsuite/src/main/org/jboss/test/entitydepends/service/MyService.java	2006-10-02 21:34:26 UTC (rev 57370)
+++ branches/JBoss_4_0_4_GA_CP/testsuite/src/main/org/jboss/test/entitydepends/service/MyService.java	2006-10-03 01:03:27 UTC (rev 57371)
@@ -1,43 +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 org.jboss.test.entitydepends.service;
-
-import javax.naming.InitialContext;
-import org.jboss.test.entitydepends.ejb.ALocalHome;
-import org.jboss.system.ServiceMBeanSupport;
-
-
-/**
- * @author <a href="mailto:alex at jboss.org">Alexey Loubyansky</a>
- * @version <tt>$Revision$</tt>
- */
-public class MyService
-   extends ServiceMBeanSupport
-   implements MyServiceMBean
-{
-   public void startService() throws Exception
-   {
-      ALocalHome ah = (ALocalHome)new InitialContext().lookup("ALocal");
-      ah.create(new Long(1), "test");
-      ah.remove(new Long(1));
-   }
-}

Copied: branches/JBoss_4_0_4_GA_CP/testsuite/src/main/org/jboss/test/entitydepends/service/MyService.java (from rev 57370, branches/JBoss_4_0_4_GA_JBAS-3361/testsuite/src/main/org/jboss/test/entitydepends/service/MyService.java)

Deleted: branches/JBoss_4_0_4_GA_CP/testsuite/src/main/org/jboss/test/entitydepends/service/MyServiceMBean.java
===================================================================
--- branches/JBoss_4_0_4_GA_JBAS-3361/testsuite/src/main/org/jboss/test/entitydepends/service/MyServiceMBean.java	2006-10-02 21:34:26 UTC (rev 57370)
+++ branches/JBoss_4_0_4_GA_CP/testsuite/src/main/org/jboss/test/entitydepends/service/MyServiceMBean.java	2006-10-03 01:03:27 UTC (rev 57371)
@@ -1,33 +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 org.jboss.test.entitydepends.service;
-
-import org.jboss.system.ServiceMBean;
-
-/**
- * @author <a href="mailto:alex at jboss.org">Alexey Loubyansky</a>
- * @version <tt>$Revision$</tt>
- */
-public interface MyServiceMBean
-   extends ServiceMBean
-{
-}

Copied: branches/JBoss_4_0_4_GA_CP/testsuite/src/main/org/jboss/test/entitydepends/service/MyServiceMBean.java (from rev 57370, branches/JBoss_4_0_4_GA_JBAS-3361/testsuite/src/main/org/jboss/test/entitydepends/service/MyServiceMBean.java)

Copied: branches/JBoss_4_0_4_GA_CP/testsuite/src/main/org/jboss/test/entitydepends/test (from rev 57370, branches/JBoss_4_0_4_GA_JBAS-3361/testsuite/src/main/org/jboss/test/entitydepends/test)

Deleted: branches/JBoss_4_0_4_GA_CP/testsuite/src/main/org/jboss/test/entitydepends/test/EntityDependencyUnitTestCase.java
===================================================================
--- branches/JBoss_4_0_4_GA_JBAS-3361/testsuite/src/main/org/jboss/test/entitydepends/test/EntityDependencyUnitTestCase.java	2006-10-02 21:34:26 UTC (rev 57370)
+++ branches/JBoss_4_0_4_GA_CP/testsuite/src/main/org/jboss/test/entitydepends/test/EntityDependencyUnitTestCase.java	2006-10-03 01:03:27 UTC (rev 57371)
@@ -1,53 +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 org.jboss.test.entitydepends.test;
-
-import javax.management.ObjectName;
-import javax.management.MBeanServerConnection;
-import org.jboss.test.JBossTestCase;
-import junit.framework.Test;
-
-/**
- * @author <a href="mailto:alex at jboss.org">Alexey Loubyansky</a>
- * @version <tt>$Revision$</tt>
- */
-public class EntityDependencyUnitTestCase
-   extends JBossTestCase
-{
-   public EntityDependencyUnitTestCase(String name)
-   {
-      super(name);
-   }
-
-   public static Test suite() throws Exception
-   {
-      return getDeploySetup(EntityDependencyUnitTestCase.class, "entitydepends.jar");
-   }
-
-   public void testJBAS3341() throws Exception
-   {
-      MBeanServerConnection server = getServer();
-      ObjectName name = new ObjectName("jboss.test:name=EntityDependencyTest");
-      assertTrue(server.isRegistered(name));
-      assertEquals("Started", server.getAttribute(name, "StateString"));
-   }
-}

Copied: branches/JBoss_4_0_4_GA_CP/testsuite/src/main/org/jboss/test/entitydepends/test/EntityDependencyUnitTestCase.java (from rev 57370, branches/JBoss_4_0_4_GA_JBAS-3361/testsuite/src/main/org/jboss/test/entitydepends/test/EntityDependencyUnitTestCase.java)

Copied: branches/JBoss_4_0_4_GA_CP/testsuite/src/resources/entitydepends (from rev 57370, branches/JBoss_4_0_4_GA_JBAS-3361/testsuite/src/resources/entitydepends)

Copied: branches/JBoss_4_0_4_GA_CP/testsuite/src/resources/entitydepends/ejb (from rev 57370, branches/JBoss_4_0_4_GA_JBAS-3361/testsuite/src/resources/entitydepends/ejb)

Copied: branches/JBoss_4_0_4_GA_CP/testsuite/src/resources/entitydepends/ejb/META-INF (from rev 57370, branches/JBoss_4_0_4_GA_JBAS-3361/testsuite/src/resources/entitydepends/ejb/META-INF)

Deleted: branches/JBoss_4_0_4_GA_CP/testsuite/src/resources/entitydepends/ejb/META-INF/ejb-jar.xml
===================================================================
--- branches/JBoss_4_0_4_GA_JBAS-3361/testsuite/src/resources/entitydepends/ejb/META-INF/ejb-jar.xml	2006-10-02 21:34:26 UTC (rev 57370)
+++ branches/JBoss_4_0_4_GA_CP/testsuite/src/resources/entitydepends/ejb/META-INF/ejb-jar.xml	2006-10-03 01:03:27 UTC (rev 57371)
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE ejb-jar PUBLIC "-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 2.0//EN" "http://java.sun.com/dtd/ejb-jar_2_0.dtd">
-
-<ejb-jar >
-   <enterprise-beans>
-      <entity >
-         <ejb-name>A</ejb-name>
-         <local-home>org.jboss.test.entitydepends.ejb.ALocalHome</local-home>
-         <local>org.jboss.test.entitydepends.ejb.ALocal</local>
-         <ejb-class>org.jboss.test.entitydepends.ejb.ABean</ejb-class>
-         <persistence-type>Container</persistence-type>
-         <prim-key-class>java.lang.Long</prim-key-class>
-         <reentrant>false</reentrant>
-         <cmp-version>2.x</cmp-version>
-         <abstract-schema-name>A</abstract-schema-name>
-         <cmp-field >
-            <field-name>id</field-name>
-         </cmp-field>
-         <cmp-field >
-            <field-name>name</field-name>
-         </cmp-field>
-         <primkey-field>id</primkey-field>
-      </entity>
-   </enterprise-beans>
-</ejb-jar>

Copied: branches/JBoss_4_0_4_GA_CP/testsuite/src/resources/entitydepends/ejb/META-INF/ejb-jar.xml (from rev 57370, branches/JBoss_4_0_4_GA_JBAS-3361/testsuite/src/resources/entitydepends/ejb/META-INF/ejb-jar.xml)

Deleted: branches/JBoss_4_0_4_GA_CP/testsuite/src/resources/entitydepends/ejb/META-INF/jboss.xml
===================================================================
--- branches/JBoss_4_0_4_GA_JBAS-3361/testsuite/src/resources/entitydepends/ejb/META-INF/jboss.xml	2006-10-02 21:34:26 UTC (rev 57370)
+++ branches/JBoss_4_0_4_GA_CP/testsuite/src/resources/entitydepends/ejb/META-INF/jboss.xml	2006-10-03 01:03:27 UTC (rev 57371)
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 3.2//EN" "http://www.jboss.org/j2ee/dtd/jboss_3_2.dtd">
-
-<jboss>
-   <enterprise-beans>
-      <entity>
-         <ejb-name>A</ejb-name>
-         <local-jndi-name>ALocal</local-jndi-name>
-      </entity>
-   </enterprise-beans>
-</jboss>

Copied: branches/JBoss_4_0_4_GA_CP/testsuite/src/resources/entitydepends/ejb/META-INF/jboss.xml (from rev 57370, branches/JBoss_4_0_4_GA_JBAS-3361/testsuite/src/resources/entitydepends/ejb/META-INF/jboss.xml)

Deleted: branches/JBoss_4_0_4_GA_CP/testsuite/src/resources/entitydepends/ejb/META-INF/jbosscmp-jdbc.xml
===================================================================
--- branches/JBoss_4_0_4_GA_JBAS-3361/testsuite/src/resources/entitydepends/ejb/META-INF/jbosscmp-jdbc.xml	2006-10-02 21:34:26 UTC (rev 57370)
+++ branches/JBoss_4_0_4_GA_CP/testsuite/src/resources/entitydepends/ejb/META-INF/jbosscmp-jdbc.xml	2006-10-03 01:03:27 UTC (rev 57371)
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE jbosscmp-jdbc PUBLIC "-//JBoss//DTD JBOSSCMP-JDBC 3.2//EN" "http://www.jboss.org/j2ee/dtd/jbosscmp-jdbc_3_2.dtd">
-
-<jbosscmp-jdbc>
-   <defaults>
-      <remove-table>true</remove-table>
-   </defaults>
-</jbosscmp-jdbc>

Copied: branches/JBoss_4_0_4_GA_CP/testsuite/src/resources/entitydepends/ejb/META-INF/jbosscmp-jdbc.xml (from rev 57370, branches/JBoss_4_0_4_GA_JBAS-3361/testsuite/src/resources/entitydepends/ejb/META-INF/jbosscmp-jdbc.xml)

Copied: branches/JBoss_4_0_4_GA_CP/testsuite/src/resources/entitydepends/sar (from rev 57370, branches/JBoss_4_0_4_GA_JBAS-3361/testsuite/src/resources/entitydepends/sar)

Copied: branches/JBoss_4_0_4_GA_CP/testsuite/src/resources/entitydepends/sar/META-INF (from rev 57370, branches/JBoss_4_0_4_GA_JBAS-3361/testsuite/src/resources/entitydepends/sar/META-INF)

Deleted: branches/JBoss_4_0_4_GA_CP/testsuite/src/resources/entitydepends/sar/META-INF/jboss-service.xml
===================================================================
--- branches/JBoss_4_0_4_GA_JBAS-3361/testsuite/src/resources/entitydepends/sar/META-INF/jboss-service.xml	2006-10-02 21:34:26 UTC (rev 57370)
+++ branches/JBoss_4_0_4_GA_CP/testsuite/src/resources/entitydepends/sar/META-INF/jboss-service.xml	2006-10-03 01:03:27 UTC (rev 57371)
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!DOCTYPE server
-    PUBLIC "-//JBoss//DTD MBean Service 3.2//EN"
-    "http://www.jboss.org/j2ee/dtd/jboss-service_3_2.dtd">
-
-<server>
-   <mbean code="org.jboss.test.entitydepends.service.MyService"
-      name="jboss.test:name=EntityDependencyTest">
-      <depends>jboss.j2ee:jndiName=ALocal,service=EJB</depends>
-   </mbean>
-</server>

Copied: branches/JBoss_4_0_4_GA_CP/testsuite/src/resources/entitydepends/sar/META-INF/jboss-service.xml (from rev 57370, branches/JBoss_4_0_4_GA_JBAS-3361/testsuite/src/resources/entitydepends/sar/META-INF/jboss-service.xml)


