[jboss-cvs] JBossAS SVN: r107253 - in branches/JBPAPP_5_0_JBPAPP-4745/testsuite: imports/sections and 12 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Mon Aug 2 01:29:59 EDT 2010


Author: jiwils
Date: 2010-08-02 01:29:58 -0400 (Mon, 02 Aug 2010)
New Revision: 107253

Added:
   branches/JBPAPP_5_0_JBPAPP-4745/testsuite/src/main/org/jboss/test/ejbdepends/
   branches/JBPAPP_5_0_JBPAPP-4745/testsuite/src/main/org/jboss/test/ejbdepends/ejb/
   branches/JBPAPP_5_0_JBPAPP-4745/testsuite/src/main/org/jboss/test/ejbdepends/ejb/MySession.java
   branches/JBPAPP_5_0_JBPAPP-4745/testsuite/src/main/org/jboss/test/ejbdepends/ejb/MySessionBean.java
   branches/JBPAPP_5_0_JBPAPP-4745/testsuite/src/main/org/jboss/test/ejbdepends/ejb/MySessionHome.java
   branches/JBPAPP_5_0_JBPAPP-4745/testsuite/src/main/org/jboss/test/ejbdepends/test/
   branches/JBPAPP_5_0_JBPAPP-4745/testsuite/src/main/org/jboss/test/ejbdepends/test/EjbDependsUnitTestCase.java
   branches/JBPAPP_5_0_JBPAPP-4745/testsuite/src/resources/ejbdepends/
   branches/JBPAPP_5_0_JBPAPP-4745/testsuite/src/resources/ejbdepends/ear/
   branches/JBPAPP_5_0_JBPAPP-4745/testsuite/src/resources/ejbdepends/ear/META-INF/
   branches/JBPAPP_5_0_JBPAPP-4745/testsuite/src/resources/ejbdepends/ear/META-INF/application.xml
   branches/JBPAPP_5_0_JBPAPP-4745/testsuite/src/resources/ejbdepends/ejb1/
   branches/JBPAPP_5_0_JBPAPP-4745/testsuite/src/resources/ejbdepends/ejb1/META-INF/
   branches/JBPAPP_5_0_JBPAPP-4745/testsuite/src/resources/ejbdepends/ejb1/META-INF/ejb-jar.xml
   branches/JBPAPP_5_0_JBPAPP-4745/testsuite/src/resources/ejbdepends/ejb1/META-INF/jboss.xml
   branches/JBPAPP_5_0_JBPAPP-4745/testsuite/src/resources/ejbdepends/ejb2/
   branches/JBPAPP_5_0_JBPAPP-4745/testsuite/src/resources/ejbdepends/ejb2/META-INF/
   branches/JBPAPP_5_0_JBPAPP-4745/testsuite/src/resources/ejbdepends/ejb2/META-INF/ejb-jar.xml
   branches/JBPAPP_5_0_JBPAPP-4745/testsuite/src/resources/ejbdepends/ejb2/META-INF/jboss.xml
Removed:
   branches/JBPAPP_5_0_JBPAPP-4745/testsuite/src/main/org/jboss/test/ejbdepends/ejb/
   branches/JBPAPP_5_0_JBPAPP-4745/testsuite/src/main/org/jboss/test/ejbdepends/ejb/MySession.java
   branches/JBPAPP_5_0_JBPAPP-4745/testsuite/src/main/org/jboss/test/ejbdepends/ejb/MySessionBean.java
   branches/JBPAPP_5_0_JBPAPP-4745/testsuite/src/main/org/jboss/test/ejbdepends/ejb/MySessionHome.java
   branches/JBPAPP_5_0_JBPAPP-4745/testsuite/src/main/org/jboss/test/ejbdepends/test/
   branches/JBPAPP_5_0_JBPAPP-4745/testsuite/src/main/org/jboss/test/ejbdepends/test/EjbDependsUnitTestCase.java
   branches/JBPAPP_5_0_JBPAPP-4745/testsuite/src/resources/ejbdepends/ear/
   branches/JBPAPP_5_0_JBPAPP-4745/testsuite/src/resources/ejbdepends/ear/META-INF/
   branches/JBPAPP_5_0_JBPAPP-4745/testsuite/src/resources/ejbdepends/ear/META-INF/application.xml
   branches/JBPAPP_5_0_JBPAPP-4745/testsuite/src/resources/ejbdepends/ejb1/
   branches/JBPAPP_5_0_JBPAPP-4745/testsuite/src/resources/ejbdepends/ejb1/META-INF/
   branches/JBPAPP_5_0_JBPAPP-4745/testsuite/src/resources/ejbdepends/ejb1/META-INF/ejb-jar.xml
   branches/JBPAPP_5_0_JBPAPP-4745/testsuite/src/resources/ejbdepends/ejb1/META-INF/jboss.xml
   branches/JBPAPP_5_0_JBPAPP-4745/testsuite/src/resources/ejbdepends/ejb2/
   branches/JBPAPP_5_0_JBPAPP-4745/testsuite/src/resources/ejbdepends/ejb2/META-INF/
   branches/JBPAPP_5_0_JBPAPP-4745/testsuite/src/resources/ejbdepends/ejb2/META-INF/ejb-jar.xml
   branches/JBPAPP_5_0_JBPAPP-4745/testsuite/src/resources/ejbdepends/ejb2/META-INF/jboss.xml
Modified:
   branches/JBPAPP_5_0_JBPAPP-4745/testsuite/imports/sections/ejb.xml
   branches/JBPAPP_5_0_JBPAPP-4745/testsuite/imports/test-jars.xml
Log:
Fix for JBPAPP-4745.  Resolve EJB dependancy on another EJB in the same EJB JAR file.

Modified: branches/JBPAPP_5_0_JBPAPP-4745/testsuite/imports/sections/ejb.xml
===================================================================
--- branches/JBPAPP_5_0_JBPAPP-4745/testsuite/imports/sections/ejb.xml	2010-08-02 00:20:04 UTC (rev 107252)
+++ branches/JBPAPP_5_0_JBPAPP-4745/testsuite/imports/sections/ejb.xml	2010-08-02 05:29:58 UTC (rev 107253)
@@ -11,4 +11,35 @@
          </fileset>
       </jar>
    </target>
+
+   <!-- ejbdepends test -->
+   <target name="_jars-ejbdepends">
+      <mkdir dir="${build.lib}"/>
+      <jar destfile="${build.lib}/ejbdepends1.jar">
+         <fileset dir="${build.classes}">
+            <include name="org/jboss/test/ejbdepends/ejb/**"/>
+         </fileset>
+         <fileset dir="${build.resources}/ejbdepends/ejb1">
+            <include name="**"/>
+         </fileset>
+      </jar>
+      <jar destfile="${build.lib}/ejbdepends2.jar">
+         <fileset dir="${build.classes}">
+            <include name="org/jboss/test/ejbdepends/ejb/**"/>
+         </fileset>
+         <fileset dir="${build.resources}/ejbdepends/ejb2">
+            <include name="**"/>
+         </fileset>
+      </jar>
+      <jar destfile="${build.lib}/ejbdepends.ear">
+        <fileset dir="${build.resources}/ejbdepends/ear">
+           <include name="META-INF/*.*"/>
+        </fileset>
+        <fileset dir="${build.lib}">
+           <include name="ejbdepends1.jar"/>
+           <include name="ejbdepends2.jar"/>
+        </fileset>
+      </jar>
+   </target>
+
 </project>
\ No newline at end of file

Modified: branches/JBPAPP_5_0_JBPAPP-4745/testsuite/imports/test-jars.xml
===================================================================
--- branches/JBPAPP_5_0_JBPAPP-4745/testsuite/imports/test-jars.xml	2010-08-02 00:20:04 UTC (rev 107252)
+++ branches/JBPAPP_5_0_JBPAPP-4745/testsuite/imports/test-jars.xml	2010-08-02 05:29:58 UTC (rev 107253)
@@ -115,6 +115,7 @@
         _jars-ejbconf,
         _jars-ejbproxy,        
         _jars-entity,
+        _jars-ejbdepends,
         _jars-entitydepends,
         _jars-entityexc,
         _jars-excepiiop,

Copied: branches/JBPAPP_5_0_JBPAPP-4745/testsuite/src/main/org/jboss/test/ejbdepends (from rev 104880, trunk/testsuite/src/main/org/jboss/test/ejbdepends)

Copied: branches/JBPAPP_5_0_JBPAPP-4745/testsuite/src/main/org/jboss/test/ejbdepends/ejb (from rev 104880, trunk/testsuite/src/main/org/jboss/test/ejbdepends/ejb)

Deleted: branches/JBPAPP_5_0_JBPAPP-4745/testsuite/src/main/org/jboss/test/ejbdepends/ejb/MySession.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/ejbdepends/ejb/MySession.java	2010-05-17 19:25:51 UTC (rev 104880)
+++ branches/JBPAPP_5_0_JBPAPP-4745/testsuite/src/main/org/jboss/test/ejbdepends/ejb/MySession.java	2010-08-02 05:29:58 UTC (rev 107253)
@@ -1,14 +0,0 @@
-package org.jboss.test.ejbdepends.ejb;
-
-import java.rmi.RemoteException;
-
-/**
- * A MySession.
- * 
- * @author <a href="alex at jboss.com">Alexey Loubyansky</a>
- * @version $Revision: 1.1 $
- */
-public interface MySession extends javax.ejb.EJBObject
-{
-   void test() throws RemoteException;
-}

Copied: branches/JBPAPP_5_0_JBPAPP-4745/testsuite/src/main/org/jboss/test/ejbdepends/ejb/MySession.java (from rev 104880, trunk/testsuite/src/main/org/jboss/test/ejbdepends/ejb/MySession.java)
===================================================================
--- branches/JBPAPP_5_0_JBPAPP-4745/testsuite/src/main/org/jboss/test/ejbdepends/ejb/MySession.java	                        (rev 0)
+++ branches/JBPAPP_5_0_JBPAPP-4745/testsuite/src/main/org/jboss/test/ejbdepends/ejb/MySession.java	2010-08-02 05:29:58 UTC (rev 107253)
@@ -0,0 +1,14 @@
+package org.jboss.test.ejbdepends.ejb;
+
+import java.rmi.RemoteException;
+
+/**
+ * A MySession.
+ * 
+ * @author <a href="alex at jboss.com">Alexey Loubyansky</a>
+ * @version $Revision: 1.1 $
+ */
+public interface MySession extends javax.ejb.EJBObject
+{
+   void test() throws RemoteException;
+}

Deleted: branches/JBPAPP_5_0_JBPAPP-4745/testsuite/src/main/org/jboss/test/ejbdepends/ejb/MySessionBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/ejbdepends/ejb/MySessionBean.java	2010-05-17 19:25:51 UTC (rev 104880)
+++ branches/JBPAPP_5_0_JBPAPP-4745/testsuite/src/main/org/jboss/test/ejbdepends/ejb/MySessionBean.java	2010-08-02 05:29:58 UTC (rev 107253)
@@ -1,55 +0,0 @@
-package org.jboss.test.ejbdepends.ejb;
-
-import java.rmi.RemoteException;
-
-import javax.ejb.EJBException;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-
-/**
- * A MySessionBean.
- * 
- * @author <a href="alex at jboss.com">Alexey Loubyansky</a>
- * @version $Revision: 1.1 $
- */
-public class MySessionBean implements SessionBean
-{
-
-   public void test() throws RemoteException
-   {
-      
-   }
-   
-   public void ejbCreate() throws RemoteException
-   {
-   }
-   
-   @Override
-   public void ejbActivate() throws EJBException, RemoteException
-   {
-      // TODO Auto-generated method stub
-      
-   }
-
-   @Override
-   public void ejbPassivate() throws EJBException, RemoteException
-   {
-      // TODO Auto-generated method stub
-      
-   }
-
-   @Override
-   public void ejbRemove() throws EJBException, RemoteException
-   {
-      // TODO Auto-generated method stub
-      
-   }
-
-   @Override
-   public void setSessionContext(SessionContext arg0) throws EJBException, RemoteException
-   {
-      // TODO Auto-generated method stub
-      
-   }
-
-}

Copied: branches/JBPAPP_5_0_JBPAPP-4745/testsuite/src/main/org/jboss/test/ejbdepends/ejb/MySessionBean.java (from rev 104880, trunk/testsuite/src/main/org/jboss/test/ejbdepends/ejb/MySessionBean.java)
===================================================================
--- branches/JBPAPP_5_0_JBPAPP-4745/testsuite/src/main/org/jboss/test/ejbdepends/ejb/MySessionBean.java	                        (rev 0)
+++ branches/JBPAPP_5_0_JBPAPP-4745/testsuite/src/main/org/jboss/test/ejbdepends/ejb/MySessionBean.java	2010-08-02 05:29:58 UTC (rev 107253)
@@ -0,0 +1,55 @@
+package org.jboss.test.ejbdepends.ejb;
+
+import java.rmi.RemoteException;
+
+import javax.ejb.EJBException;
+import javax.ejb.SessionBean;
+import javax.ejb.SessionContext;
+
+/**
+ * A MySessionBean.
+ * 
+ * @author <a href="alex at jboss.com">Alexey Loubyansky</a>
+ * @version $Revision: 1.1 $
+ */
+public class MySessionBean implements SessionBean
+{
+
+   public void test() throws RemoteException
+   {
+      
+   }
+   
+   public void ejbCreate() throws RemoteException
+   {
+   }
+   
+   @Override
+   public void ejbActivate() throws EJBException, RemoteException
+   {
+      // TODO Auto-generated method stub
+      
+   }
+
+   @Override
+   public void ejbPassivate() throws EJBException, RemoteException
+   {
+      // TODO Auto-generated method stub
+      
+   }
+
+   @Override
+   public void ejbRemove() throws EJBException, RemoteException
+   {
+      // TODO Auto-generated method stub
+      
+   }
+
+   @Override
+   public void setSessionContext(SessionContext arg0) throws EJBException, RemoteException
+   {
+      // TODO Auto-generated method stub
+      
+   }
+
+}

Deleted: branches/JBPAPP_5_0_JBPAPP-4745/testsuite/src/main/org/jboss/test/ejbdepends/ejb/MySessionHome.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/ejbdepends/ejb/MySessionHome.java	2010-05-17 19:25:51 UTC (rev 104880)
+++ branches/JBPAPP_5_0_JBPAPP-4745/testsuite/src/main/org/jboss/test/ejbdepends/ejb/MySessionHome.java	2010-08-02 05:29:58 UTC (rev 107253)
@@ -1,17 +0,0 @@
-package org.jboss.test.ejbdepends.ejb;
-
-import java.rmi.RemoteException;
-
-import javax.ejb.CreateException;
-import javax.ejb.EJBHome;
-
-/**
- * A MySessionHome.
- * 
- * @author <a href="alex at jboss.com">Alexey Loubyansky</a>
- * @version $Revision: 1.1 $
- */
-public interface MySessionHome extends EJBHome
-{
-   MySession create() throws CreateException, RemoteException;
-}

Copied: branches/JBPAPP_5_0_JBPAPP-4745/testsuite/src/main/org/jboss/test/ejbdepends/ejb/MySessionHome.java (from rev 104880, trunk/testsuite/src/main/org/jboss/test/ejbdepends/ejb/MySessionHome.java)
===================================================================
--- branches/JBPAPP_5_0_JBPAPP-4745/testsuite/src/main/org/jboss/test/ejbdepends/ejb/MySessionHome.java	                        (rev 0)
+++ branches/JBPAPP_5_0_JBPAPP-4745/testsuite/src/main/org/jboss/test/ejbdepends/ejb/MySessionHome.java	2010-08-02 05:29:58 UTC (rev 107253)
@@ -0,0 +1,17 @@
+package org.jboss.test.ejbdepends.ejb;
+
+import java.rmi.RemoteException;
+
+import javax.ejb.CreateException;
+import javax.ejb.EJBHome;
+
+/**
+ * A MySessionHome.
+ * 
+ * @author <a href="alex at jboss.com">Alexey Loubyansky</a>
+ * @version $Revision: 1.1 $
+ */
+public interface MySessionHome extends EJBHome
+{
+   MySession create() throws CreateException, RemoteException;
+}

Copied: branches/JBPAPP_5_0_JBPAPP-4745/testsuite/src/main/org/jboss/test/ejbdepends/test (from rev 104880, trunk/testsuite/src/main/org/jboss/test/ejbdepends/test)

Deleted: branches/JBPAPP_5_0_JBPAPP-4745/testsuite/src/main/org/jboss/test/ejbdepends/test/EjbDependsUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/ejbdepends/test/EjbDependsUnitTestCase.java	2010-05-17 19:25:51 UTC (rev 104880)
+++ branches/JBPAPP_5_0_JBPAPP-4745/testsuite/src/main/org/jboss/test/ejbdepends/test/EjbDependsUnitTestCase.java	2010-08-02 05:29:58 UTC (rev 107253)
@@ -1,54 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2010, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file 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.ejbdepends.test;
-
-
-import javax.naming.InitialContext;
-
-import org.jboss.test.JBossTestCase;
-import junit.framework.Test;
-
-/**
- * @author <a href="mailto:alex at jboss.org">Alexey Loubyansky</a>
- * @version <tt>$Revision: 81036 $</tt>
- */
-public class EjbDependsUnitTestCase
-   extends JBossTestCase
-{
-   public EjbDependsUnitTestCase(String name)
-   {
-      super(name);
-   }
-
-   public static Test suite() throws Exception
-   {
-      return getDeploySetup(EjbDependsUnitTestCase.class, "ejbdepends.ear");
-   }
-
-   public void testJBAS8032() throws Exception
-   {
-      InitialContext ic = new InitialContext();
-      assertNotNull(ic.lookup("MySession"));
-      assertNotNull(ic.lookup("MySession2"));
-      assertNotNull(ic.lookup("MySession3"));
-   }
-}

Copied: branches/JBPAPP_5_0_JBPAPP-4745/testsuite/src/main/org/jboss/test/ejbdepends/test/EjbDependsUnitTestCase.java (from rev 104880, trunk/testsuite/src/main/org/jboss/test/ejbdepends/test/EjbDependsUnitTestCase.java)
===================================================================
--- branches/JBPAPP_5_0_JBPAPP-4745/testsuite/src/main/org/jboss/test/ejbdepends/test/EjbDependsUnitTestCase.java	                        (rev 0)
+++ branches/JBPAPP_5_0_JBPAPP-4745/testsuite/src/main/org/jboss/test/ejbdepends/test/EjbDependsUnitTestCase.java	2010-08-02 05:29:58 UTC (rev 107253)
@@ -0,0 +1,54 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.ejbdepends.test;
+
+
+import javax.naming.InitialContext;
+
+import org.jboss.test.JBossTestCase;
+import junit.framework.Test;
+
+/**
+ * @author <a href="mailto:alex at jboss.org">Alexey Loubyansky</a>
+ * @version <tt>$Revision: 81036 $</tt>
+ */
+public class EjbDependsUnitTestCase
+   extends JBossTestCase
+{
+   public EjbDependsUnitTestCase(String name)
+   {
+      super(name);
+   }
+
+   public static Test suite() throws Exception
+   {
+      return getDeploySetup(EjbDependsUnitTestCase.class, "ejbdepends.ear");
+   }
+
+   public void testJBAS8032() throws Exception
+   {
+      InitialContext ic = new InitialContext();
+      assertNotNull(ic.lookup("MySession"));
+      assertNotNull(ic.lookup("MySession2"));
+      assertNotNull(ic.lookup("MySession3"));
+   }
+}

Copied: branches/JBPAPP_5_0_JBPAPP-4745/testsuite/src/resources/ejbdepends (from rev 104880, trunk/testsuite/src/resources/ejbdepends)

Copied: branches/JBPAPP_5_0_JBPAPP-4745/testsuite/src/resources/ejbdepends/ear (from rev 104880, trunk/testsuite/src/resources/ejbdepends/ear)

Copied: branches/JBPAPP_5_0_JBPAPP-4745/testsuite/src/resources/ejbdepends/ear/META-INF (from rev 104880, trunk/testsuite/src/resources/ejbdepends/ear/META-INF)

Deleted: branches/JBPAPP_5_0_JBPAPP-4745/testsuite/src/resources/ejbdepends/ear/META-INF/application.xml
===================================================================
--- trunk/testsuite/src/resources/ejbdepends/ear/META-INF/application.xml	2010-05-17 19:25:51 UTC (rev 104880)
+++ branches/JBPAPP_5_0_JBPAPP-4745/testsuite/src/resources/ejbdepends/ear/META-INF/application.xml	2010-08-02 05:29:58 UTC (rev 107253)
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<application xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="5" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/application_5.xsd">
-   <display-name>EE5 client test</display-name>
-   <module>
-      <ejb>ejbdepends1.jar</ejb>
-   </module>
-   <module>
-      <ejb>ejbdepends2.jar</ejb>
-   </module>
-</application>

Copied: branches/JBPAPP_5_0_JBPAPP-4745/testsuite/src/resources/ejbdepends/ear/META-INF/application.xml (from rev 104880, trunk/testsuite/src/resources/ejbdepends/ear/META-INF/application.xml)
===================================================================
--- branches/JBPAPP_5_0_JBPAPP-4745/testsuite/src/resources/ejbdepends/ear/META-INF/application.xml	                        (rev 0)
+++ branches/JBPAPP_5_0_JBPAPP-4745/testsuite/src/resources/ejbdepends/ear/META-INF/application.xml	2010-08-02 05:29:58 UTC (rev 107253)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<application xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="5" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/application_5.xsd">
+   <display-name>EE5 client test</display-name>
+   <module>
+      <ejb>ejbdepends1.jar</ejb>
+   </module>
+   <module>
+      <ejb>ejbdepends2.jar</ejb>
+   </module>
+</application>

Copied: branches/JBPAPP_5_0_JBPAPP-4745/testsuite/src/resources/ejbdepends/ejb1 (from rev 104880, trunk/testsuite/src/resources/ejbdepends/ejb1)

Copied: branches/JBPAPP_5_0_JBPAPP-4745/testsuite/src/resources/ejbdepends/ejb1/META-INF (from rev 104880, trunk/testsuite/src/resources/ejbdepends/ejb1/META-INF)

Deleted: branches/JBPAPP_5_0_JBPAPP-4745/testsuite/src/resources/ejbdepends/ejb1/META-INF/ejb-jar.xml
===================================================================
--- trunk/testsuite/src/resources/ejbdepends/ejb1/META-INF/ejb-jar.xml	2010-05-17 19:25:51 UTC (rev 104880)
+++ branches/JBPAPP_5_0_JBPAPP-4745/testsuite/src/resources/ejbdepends/ejb1/META-INF/ejb-jar.xml	2010-08-02 05:29:58 UTC (rev 107253)
@@ -1,27 +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>
-
-      <session>
-         <ejb-name>MySession</ejb-name>
-         <home>org.jboss.test.ejbdepends.ejb.MySessionHome</home>
-         <remote>org.jboss.test.ejbdepends.ejb.MySession</remote>
-         <ejb-class>org.jboss.test.ejbdepends.ejb.MySessionBean</ejb-class>
-         <session-type>Stateless</session-type>
-         <transaction-type>Container</transaction-type>
-      </session>
-
-      <session>
-         <ejb-name>MySession2</ejb-name>
-         <home>org.jboss.test.ejbdepends.ejb.MySessionHome</home>
-         <remote>org.jboss.test.ejbdepends.ejb.MySession</remote>
-         <ejb-class>org.jboss.test.ejbdepends.ejb.MySessionBean</ejb-class>
-         <session-type>Stateless</session-type>
-         <transaction-type>Container</transaction-type>
-      </session>
-
-   </enterprise-beans>
-</ejb-jar>
\ No newline at end of file

Copied: branches/JBPAPP_5_0_JBPAPP-4745/testsuite/src/resources/ejbdepends/ejb1/META-INF/ejb-jar.xml (from rev 104880, trunk/testsuite/src/resources/ejbdepends/ejb1/META-INF/ejb-jar.xml)
===================================================================
--- branches/JBPAPP_5_0_JBPAPP-4745/testsuite/src/resources/ejbdepends/ejb1/META-INF/ejb-jar.xml	                        (rev 0)
+++ branches/JBPAPP_5_0_JBPAPP-4745/testsuite/src/resources/ejbdepends/ejb1/META-INF/ejb-jar.xml	2010-08-02 05:29:58 UTC (rev 107253)
@@ -0,0 +1,27 @@
+<?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>
+
+      <session>
+         <ejb-name>MySession</ejb-name>
+         <home>org.jboss.test.ejbdepends.ejb.MySessionHome</home>
+         <remote>org.jboss.test.ejbdepends.ejb.MySession</remote>
+         <ejb-class>org.jboss.test.ejbdepends.ejb.MySessionBean</ejb-class>
+         <session-type>Stateless</session-type>
+         <transaction-type>Container</transaction-type>
+      </session>
+
+      <session>
+         <ejb-name>MySession2</ejb-name>
+         <home>org.jboss.test.ejbdepends.ejb.MySessionHome</home>
+         <remote>org.jboss.test.ejbdepends.ejb.MySession</remote>
+         <ejb-class>org.jboss.test.ejbdepends.ejb.MySessionBean</ejb-class>
+         <session-type>Stateless</session-type>
+         <transaction-type>Container</transaction-type>
+      </session>
+
+   </enterprise-beans>
+</ejb-jar>
\ No newline at end of file

Deleted: branches/JBPAPP_5_0_JBPAPP-4745/testsuite/src/resources/ejbdepends/ejb1/META-INF/jboss.xml
===================================================================
--- trunk/testsuite/src/resources/ejbdepends/ejb1/META-INF/jboss.xml	2010-05-17 19:25:51 UTC (rev 104880)
+++ branches/JBPAPP_5_0_JBPAPP-4745/testsuite/src/resources/ejbdepends/ejb1/META-INF/jboss.xml	2010-08-02 05:29:58 UTC (rev 107253)
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 3.0//EN" "http://www.jboss.org/j2ee/dtd/jboss_3_0.dtd">
-
-<jboss>
-   <enterprise-beans>
-      <session>
-         <ejb-name>MySession</ejb-name>
-         <depends>jboss.j2ee:jndiName=MySession2,service=EJB</depends>
-      </session>
-
-      <session>
-         <ejb-name>MySession2</ejb-name>
-         <depends>jboss.j2ee:jndiName=MySession3,service=EJB</depends>
-      </session>
-
-   </enterprise-beans>
-</jboss>

Copied: branches/JBPAPP_5_0_JBPAPP-4745/testsuite/src/resources/ejbdepends/ejb1/META-INF/jboss.xml (from rev 104880, trunk/testsuite/src/resources/ejbdepends/ejb1/META-INF/jboss.xml)
===================================================================
--- branches/JBPAPP_5_0_JBPAPP-4745/testsuite/src/resources/ejbdepends/ejb1/META-INF/jboss.xml	                        (rev 0)
+++ branches/JBPAPP_5_0_JBPAPP-4745/testsuite/src/resources/ejbdepends/ejb1/META-INF/jboss.xml	2010-08-02 05:29:58 UTC (rev 107253)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 3.0//EN" "http://www.jboss.org/j2ee/dtd/jboss_3_0.dtd">
+
+<jboss>
+   <enterprise-beans>
+      <session>
+         <ejb-name>MySession</ejb-name>
+         <depends>jboss.j2ee:jndiName=MySession2,service=EJB</depends>
+      </session>
+
+      <session>
+         <ejb-name>MySession2</ejb-name>
+         <depends>jboss.j2ee:jndiName=MySession3,service=EJB</depends>
+      </session>
+
+   </enterprise-beans>
+</jboss>

Copied: branches/JBPAPP_5_0_JBPAPP-4745/testsuite/src/resources/ejbdepends/ejb2 (from rev 104880, trunk/testsuite/src/resources/ejbdepends/ejb2)

Copied: branches/JBPAPP_5_0_JBPAPP-4745/testsuite/src/resources/ejbdepends/ejb2/META-INF (from rev 104880, trunk/testsuite/src/resources/ejbdepends/ejb2/META-INF)

Deleted: branches/JBPAPP_5_0_JBPAPP-4745/testsuite/src/resources/ejbdepends/ejb2/META-INF/ejb-jar.xml
===================================================================
--- trunk/testsuite/src/resources/ejbdepends/ejb2/META-INF/ejb-jar.xml	2010-05-17 19:25:51 UTC (rev 104880)
+++ branches/JBPAPP_5_0_JBPAPP-4745/testsuite/src/resources/ejbdepends/ejb2/META-INF/ejb-jar.xml	2010-08-02 05:29:58 UTC (rev 107253)
@@ -1,18 +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>
-
-      <session>
-         <ejb-name>MySession3</ejb-name>
-         <home>org.jboss.test.ejbdepends.ejb.MySessionHome</home>
-         <remote>org.jboss.test.ejbdepends.ejb.MySession</remote>
-         <ejb-class>org.jboss.test.ejbdepends.ejb.MySessionBean</ejb-class>
-         <session-type>Stateless</session-type>
-         <transaction-type>Container</transaction-type>
-      </session>
-
-   </enterprise-beans>
-</ejb-jar>
\ No newline at end of file

Copied: branches/JBPAPP_5_0_JBPAPP-4745/testsuite/src/resources/ejbdepends/ejb2/META-INF/ejb-jar.xml (from rev 104880, trunk/testsuite/src/resources/ejbdepends/ejb2/META-INF/ejb-jar.xml)
===================================================================
--- branches/JBPAPP_5_0_JBPAPP-4745/testsuite/src/resources/ejbdepends/ejb2/META-INF/ejb-jar.xml	                        (rev 0)
+++ branches/JBPAPP_5_0_JBPAPP-4745/testsuite/src/resources/ejbdepends/ejb2/META-INF/ejb-jar.xml	2010-08-02 05:29:58 UTC (rev 107253)
@@ -0,0 +1,18 @@
+<?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>
+
+      <session>
+         <ejb-name>MySession3</ejb-name>
+         <home>org.jboss.test.ejbdepends.ejb.MySessionHome</home>
+         <remote>org.jboss.test.ejbdepends.ejb.MySession</remote>
+         <ejb-class>org.jboss.test.ejbdepends.ejb.MySessionBean</ejb-class>
+         <session-type>Stateless</session-type>
+         <transaction-type>Container</transaction-type>
+      </session>
+
+   </enterprise-beans>
+</ejb-jar>
\ No newline at end of file

Deleted: branches/JBPAPP_5_0_JBPAPP-4745/testsuite/src/resources/ejbdepends/ejb2/META-INF/jboss.xml
===================================================================
--- trunk/testsuite/src/resources/ejbdepends/ejb2/META-INF/jboss.xml	2010-05-17 19:25:51 UTC (rev 104880)
+++ branches/JBPAPP_5_0_JBPAPP-4745/testsuite/src/resources/ejbdepends/ejb2/META-INF/jboss.xml	2010-08-02 05:29:58 UTC (rev 107253)
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 3.0//EN" "http://www.jboss.org/j2ee/dtd/jboss_3_0.dtd">
-
-<jboss>
-   <enterprise-beans>
-
-      <session>
-         <ejb-name>MySession3</ejb-name>
-      </session>
-
-   </enterprise-beans>
-</jboss>

Copied: branches/JBPAPP_5_0_JBPAPP-4745/testsuite/src/resources/ejbdepends/ejb2/META-INF/jboss.xml (from rev 104880, trunk/testsuite/src/resources/ejbdepends/ejb2/META-INF/jboss.xml)
===================================================================
--- branches/JBPAPP_5_0_JBPAPP-4745/testsuite/src/resources/ejbdepends/ejb2/META-INF/jboss.xml	                        (rev 0)
+++ branches/JBPAPP_5_0_JBPAPP-4745/testsuite/src/resources/ejbdepends/ejb2/META-INF/jboss.xml	2010-08-02 05:29:58 UTC (rev 107253)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 3.0//EN" "http://www.jboss.org/j2ee/dtd/jboss_3_0.dtd">
+
+<jboss>
+   <enterprise-beans>
+
+      <session>
+         <ejb-name>MySession3</ejb-name>
+      </session>
+
+   </enterprise-beans>
+</jboss>



More information about the jboss-cvs-commits mailing list