[jboss-cvs] JBossAS SVN: r102035 - in trunk: testsuite/imports/sections and 13 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sun Mar 7 08:52:40 EST 2010
Author: jaikiran
Date: 2010-03-07 08:52:39 -0500 (Sun, 07 Mar 2010)
New Revision: 102035
Added:
trunk/testsuite/src/main/org/jboss/test/deployment/jbas7760/
trunk/testsuite/src/main/org/jboss/test/deployment/jbas7760/appone/
trunk/testsuite/src/main/org/jboss/test/deployment/jbas7760/appone/AppOneEJB2xHome.java
trunk/testsuite/src/main/org/jboss/test/deployment/jbas7760/appone/AppOneEJB2xImpl.java
trunk/testsuite/src/main/org/jboss/test/deployment/jbas7760/appone/AppOneEJB2xRemote.java
trunk/testsuite/src/main/org/jboss/test/deployment/jbas7760/apptwo/
trunk/testsuite/src/main/org/jboss/test/deployment/jbas7760/apptwo/AppTwoEJB2xHome.java
trunk/testsuite/src/main/org/jboss/test/deployment/jbas7760/apptwo/AppTwoEJB2xImpl.java
trunk/testsuite/src/main/org/jboss/test/deployment/jbas7760/apptwo/AppTwoEJB2xRemote.java
trunk/testsuite/src/main/org/jboss/test/deployment/jbas7760/unit/
trunk/testsuite/src/main/org/jboss/test/deployment/jbas7760/unit/MultipleEarWithSameEjbModuleNameTestCase.java
trunk/testsuite/src/resources/jbas7760/
trunk/testsuite/src/resources/jbas7760/appone/
trunk/testsuite/src/resources/jbas7760/appone/META-INF/
trunk/testsuite/src/resources/jbas7760/appone/META-INF/application.xml
trunk/testsuite/src/resources/jbas7760/appone/META-INF/ejb-jar.xml
trunk/testsuite/src/resources/jbas7760/appone/META-INF/jboss.xml
trunk/testsuite/src/resources/jbas7760/appone/WEB-INF/
trunk/testsuite/src/resources/jbas7760/appone/WEB-INF/jboss-web.xml
trunk/testsuite/src/resources/jbas7760/appone/WEB-INF/web.xml
trunk/testsuite/src/resources/jbas7760/apptwo/
trunk/testsuite/src/resources/jbas7760/apptwo/META-INF/
trunk/testsuite/src/resources/jbas7760/apptwo/META-INF/application.xml
trunk/testsuite/src/resources/jbas7760/apptwo/META-INF/ejb-jar.xml
trunk/testsuite/src/resources/jbas7760/apptwo/META-INF/jboss.xml
trunk/testsuite/src/resources/jbas7760/apptwo/WEB-INF/
trunk/testsuite/src/resources/jbas7760/apptwo/WEB-INF/jboss-web.xml
trunk/testsuite/src/resources/jbas7760/apptwo/WEB-INF/web.xml
Modified:
trunk/server/src/main/java/org/jboss/ejb/deployers/EjbDeployer.java
trunk/testsuite/imports/sections/deployers.xml
Log:
JBAS-7789 JBAS-7760 Made the default jmx name for EJB2.x deployments, deterministic and also fixed the original issue which used to cause InstanceAlreadyExistsException for multiple .ears containing a EJB2.x jar file with the same name
Modified: trunk/server/src/main/java/org/jboss/ejb/deployers/EjbDeployer.java
===================================================================
--- trunk/server/src/main/java/org/jboss/ejb/deployers/EjbDeployer.java 2010-03-06 19:32:13 UTC (rev 102034)
+++ trunk/server/src/main/java/org/jboss/ejb/deployers/EjbDeployer.java 2010-03-07 13:52:39 UTC (rev 102035)
@@ -47,6 +47,7 @@
import org.jboss.kernel.spi.deployment.KernelDeployment;
import org.jboss.logging.Logger;
import org.jboss.metadata.ApplicationMetaData;
+import org.jboss.metadata.ear.jboss.JBossAppMetaData;
import org.jboss.metadata.ejb.jboss.ContainerConfigurationMetaData;
import org.jboss.metadata.ejb.jboss.InvokerProxyBindingMetaData;
import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeanMetaData;
@@ -474,12 +475,19 @@
/**
* Get the object name of the ServiceMetaData instance associated with
- * the EjbModule. This uses the pattern:
+ * the EjbModule. For standalone jar files, this uses the pattern:
* "jboss.j2ee:service=EjbModule,module="+unit.getSimpleName()
+ * <p>
+ * For EJB deployment in ear it uses this pattern:
+ *
+ * "jboss.j2ee:service=EjbModule,ear=earname,module="+unit.getSimpleName()
+ * </p>
*
* @param unit the deployment unit
* @param metaData - the ejb jar metaData
* @return "jboss.j2ee:service=EjbModule,module="+unit.getSimpleName()
+ * or "jboss.j2ee:service=EjbModule,ear=earname,module="+unit.getSimpleName()
+ *
* @throws MalformedObjectNameException
*/
protected ObjectName getObjectName(VFSDeploymentUnit unit, JBossMetaData metaData)
@@ -488,6 +496,22 @@
String name = metaData.getJmxName();
if( name == null )
{
+ StringBuilder objectName = new StringBuilder(EjbModule.BASE_EJB_MODULE_NAME);
+ // Get the top level unit for this unit (ex: the top level might be an ear and this unit might be the jar
+ // in that ear
+ VFSDeploymentUnit toplevelUnit = unit.getTopLevel();
+ if (toplevelUnit != null)
+ {
+ // if top level is an ear, then create the name with the ear reference
+ if (isEar(toplevelUnit))
+ {
+
+ String earName = ObjectName.quote(toplevelUnit.getSimpleName());
+ objectName.append(",ear=");
+ objectName.append(earName);
+ }
+ }
+
String unitShortName = unit.getName();
if (unitShortName.endsWith("/"))
{
@@ -502,7 +526,10 @@
unitShortName = unitShortName.substring(unitShortName.lastIndexOf("/") + 1);
//
unitShortName = ObjectName.quote(unitShortName);
- name = EjbModule.BASE_EJB_MODULE_NAME + ",module=" + unitShortName + ",uid=" + System.identityHashCode(metaData);
+ objectName.append(",module=");
+ objectName.append(unitShortName);
+ name = objectName.toString();
+ log.debug("Generated ObjectName for EjbModule, in unit " + unit.getName() + " is " + name);
}
return new ObjectName(name);
@@ -537,4 +564,15 @@
{
this.verifyDeployments = verify;
}
+
+ /**
+ * Returns true if this <code>unit</code> represents an .ear deployment
+ *
+ * @param unit
+ * @return
+ */
+ private boolean isEar(VFSDeploymentUnit unit)
+ {
+ return unit.getSimpleName().endsWith(".ear") || unit.getAttachment(JBossAppMetaData.class) != null;
+ }
}
Modified: trunk/testsuite/imports/sections/deployers.xml
===================================================================
--- trunk/testsuite/imports/sections/deployers.xml 2010-03-06 19:32:13 UTC (rev 102034)
+++ trunk/testsuite/imports/sections/deployers.xml 2010-03-07 13:52:39 UTC (rev 102035)
@@ -342,6 +342,75 @@
</ear>
</target>
+
+ <!-- JBAS-7760 -->
+ <target name="jbas-7760">
+ <mkdir dir="${build.lib}"/>
+
+ <!-- build EJB jar for app one -->
+ <mkdir dir="${build.lib}/jbas-7760-appone"/>
+ <jar destfile="${build.lib}/jbas-7760-appone/jbas-7760-ejb.jar">
+
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/deployment/jbas7760/appone/*"/>
+ </fileset>
+
+ <fileset dir="${build.resources}/jbas7760/appone/">
+ <include name="META-INF/ejb-jar.xml"/>
+ <include name="META-INF/jboss.xml"/>
+ </fileset>
+ </jar>
+ <!-- build war for first app -->
+ <jar destfile="${build.lib}/jbas-7760-appone/appone.war">
+
+ <fileset dir="${build.resources}/jbas7760/appone">
+ <include name="WEB-INF/*.xml"/>
+ </fileset>
+ </jar>
+
+
+ <!-- create first ear -->
+ <ear destfile="${build.lib}/jbas-7760-earone.ear"
+ appxml="${build.resources}/jbas7760/appone/META-INF/application.xml"
+ update="true">
+ <fileset dir="${build.lib}/jbas-7760-appone">
+ <include name="jbas-7760-ejb.jar"/>
+ <include name="appone.war"/>
+ </fileset>
+ </ear>
+
+ <!-- build EJB jar for app two -->
+ <mkdir dir="${build.lib}/jbas-7760-apptwo"/>
+ <jar destfile="${build.lib}/jbas-7760-apptwo/jbas-7760-ejb.jar">
+
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/deployment/jbas7760/apptwo/*"/>
+ </fileset>
+
+ <fileset dir="${build.resources}/jbas7760/apptwo/">
+ <include name="META-INF/ejb-jar.xml"/>
+ <include name="META-INF/jboss.xml"/>
+ </fileset>
+ </jar>
+ <!-- build war for second app -->
+ <jar destfile="${build.lib}/jbas-7760-apptwo/apptwo.war">
+
+ <fileset dir="${build.resources}/jbas7760/apptwo">
+ <include name="WEB-INF/*.xml"/>
+ </fileset>
+ </jar>
+ <!-- create second ear -->
+ <ear destfile="${build.lib}/jbas-7760-eartwo.ear"
+ appxml="${build.resources}/jbas7760/apptwo/META-INF/application.xml"
+ update="true">
+ <fileset dir="${build.lib}/jbas-7760-apptwo">
+ <include name="jbas-7760-ejb.jar"/>
+ <include name="apptwo.war"/>
+ </fileset>
+ </ear>
+
+ </target>
+
<!-- deployment test -->
<target name="_jars-deployment">
@@ -419,6 +488,10 @@
<copy tofile="${build.lib}/deployers-failing-jboss-beans.xml"
file="${build.resources}/deployers/failed/failing-jboss-beans.xml"/>
+
+ <!--call jbas-7760 target -->
+ <antcall target="jbas-7760"/>
+
</target>
</project>
Added: trunk/testsuite/src/main/org/jboss/test/deployment/jbas7760/appone/AppOneEJB2xHome.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/deployment/jbas7760/appone/AppOneEJB2xHome.java (rev 0)
+++ trunk/testsuite/src/main/org/jboss/test/deployment/jbas7760/appone/AppOneEJB2xHome.java 2010-03-07 13:52:39 UTC (rev 102035)
@@ -0,0 +1,20 @@
+/**
+ *
+ */
+package org.jboss.test.deployment.jbas7760.appone;
+
+import java.rmi.RemoteException;
+
+import javax.ejb.CreateException;
+import javax.ejb.EJBHome;
+
+/**
+ * AppOneEJB2xHome
+ *
+ * @author Jaikiran Pai
+ * @version $Revision: $
+ */
+public interface AppOneEJB2xHome extends EJBHome
+{
+ AppOneEJB2xRemote create() throws CreateException, RemoteException;
+}
Added: trunk/testsuite/src/main/org/jboss/test/deployment/jbas7760/appone/AppOneEJB2xImpl.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/deployment/jbas7760/appone/AppOneEJB2xImpl.java (rev 0)
+++ trunk/testsuite/src/main/org/jboss/test/deployment/jbas7760/appone/AppOneEJB2xImpl.java 2010-03-07 13:52:39 UTC (rev 102035)
@@ -0,0 +1,98 @@
+/**
+ *
+ */
+package org.jboss.test.deployment.jbas7760.appone;
+
+import java.rmi.RemoteException;
+
+import javax.ejb.CreateException;
+import javax.ejb.EJBException;
+import javax.ejb.EJBHome;
+import javax.ejb.EJBObject;
+import javax.ejb.Handle;
+import javax.ejb.RemoveException;
+import javax.ejb.SessionBean;
+import javax.ejb.SessionContext;
+
+/**
+ * FirstEJB2xImpl
+ *
+ * @author Jaikiran Pai
+ * @version $Revision: $
+ */
+public class AppOneEJB2xImpl implements SessionBean, AppOneEJB2xRemote
+{
+
+ public void ejbCreate() throws CreateException, RemoteException
+ {
+
+ }
+
+
+ public void ejbActivate() throws EJBException, RemoteException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ public void ejbPassivate() throws EJBException, RemoteException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ public void ejbRemove() throws EJBException, RemoteException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ public void setSessionContext(SessionContext ctx) throws EJBException, RemoteException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+
+ public void doNothing() throws RemoteException
+ {
+ // do nothing
+
+ }
+
+
+ public EJBHome getEJBHome() throws RemoteException
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+
+ public Handle getHandle() throws RemoteException
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+
+ public Object getPrimaryKey() throws RemoteException
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+
+ public boolean isIdentical(EJBObject ejbo) throws RemoteException
+ {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
+
+ public void remove() throws RemoteException, RemoveException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+}
Added: trunk/testsuite/src/main/org/jboss/test/deployment/jbas7760/appone/AppOneEJB2xRemote.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/deployment/jbas7760/appone/AppOneEJB2xRemote.java (rev 0)
+++ trunk/testsuite/src/main/org/jboss/test/deployment/jbas7760/appone/AppOneEJB2xRemote.java 2010-03-07 13:52:39 UTC (rev 102035)
@@ -0,0 +1,20 @@
+/**
+ *
+ */
+package org.jboss.test.deployment.jbas7760.appone;
+
+import java.rmi.RemoteException;
+
+import javax.ejb.EJBObject;
+
+/**
+ * AppOneEJB2xRemote
+ *
+ * @author Jaikiran Pai
+ * @version $Revision: $
+ */
+public interface AppOneEJB2xRemote extends EJBObject
+{
+
+ void doNothing() throws RemoteException;
+}
Added: trunk/testsuite/src/main/org/jboss/test/deployment/jbas7760/apptwo/AppTwoEJB2xHome.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/deployment/jbas7760/apptwo/AppTwoEJB2xHome.java (rev 0)
+++ trunk/testsuite/src/main/org/jboss/test/deployment/jbas7760/apptwo/AppTwoEJB2xHome.java 2010-03-07 13:52:39 UTC (rev 102035)
@@ -0,0 +1,20 @@
+/**
+ *
+ */
+package org.jboss.test.deployment.jbas7760.apptwo;
+
+import java.rmi.RemoteException;
+
+import javax.ejb.CreateException;
+import javax.ejb.EJBHome;
+
+/**
+ * AppOneEJB2xHome
+ *
+ * @author Jaikiran Pai
+ * @version $Revision: $
+ */
+public interface AppTwoEJB2xHome extends EJBHome
+{
+ AppTwoEJB2xRemote create() throws CreateException, RemoteException;
+}
Added: trunk/testsuite/src/main/org/jboss/test/deployment/jbas7760/apptwo/AppTwoEJB2xImpl.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/deployment/jbas7760/apptwo/AppTwoEJB2xImpl.java (rev 0)
+++ trunk/testsuite/src/main/org/jboss/test/deployment/jbas7760/apptwo/AppTwoEJB2xImpl.java 2010-03-07 13:52:39 UTC (rev 102035)
@@ -0,0 +1,91 @@
+/**
+ *
+ */
+package org.jboss.test.deployment.jbas7760.apptwo;
+
+import java.rmi.RemoteException;
+
+import javax.ejb.CreateException;
+import javax.ejb.EJBException;
+import javax.ejb.EJBHome;
+import javax.ejb.EJBObject;
+import javax.ejb.Handle;
+import javax.ejb.RemoveException;
+import javax.ejb.SessionBean;
+import javax.ejb.SessionContext;
+
+/**
+ * FirstEJB2xImpl
+ *
+ * @author Jaikiran Pai
+ * @version $Revision: $
+ */
+public class AppTwoEJB2xImpl implements SessionBean, AppTwoEJB2xRemote
+{
+
+ public void ejbCreate() throws CreateException, RemoteException
+ {
+
+ }
+
+ public void ejbActivate() throws EJBException, RemoteException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ public void ejbPassivate() throws EJBException, RemoteException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ public void ejbRemove() throws EJBException, RemoteException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ public void setSessionContext(SessionContext ctx) throws EJBException, RemoteException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ public void doNothing() throws RemoteException
+ {
+ // do nothing
+
+ }
+
+ public EJBHome getEJBHome() throws RemoteException
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public Handle getHandle() throws RemoteException
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public Object getPrimaryKey() throws RemoteException
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public boolean isIdentical(EJBObject ejbo) throws RemoteException
+ {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
+ public void remove() throws RemoteException, RemoveException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+}
Added: trunk/testsuite/src/main/org/jboss/test/deployment/jbas7760/apptwo/AppTwoEJB2xRemote.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/deployment/jbas7760/apptwo/AppTwoEJB2xRemote.java (rev 0)
+++ trunk/testsuite/src/main/org/jboss/test/deployment/jbas7760/apptwo/AppTwoEJB2xRemote.java 2010-03-07 13:52:39 UTC (rev 102035)
@@ -0,0 +1,20 @@
+/**
+ *
+ */
+package org.jboss.test.deployment.jbas7760.apptwo;
+
+import java.rmi.RemoteException;
+
+import javax.ejb.EJBObject;
+
+/**
+ * AppOneEJB2xRemote
+ *
+ * @author Jaikiran Pai
+ * @version $Revision: $
+ */
+public interface AppTwoEJB2xRemote extends EJBObject
+{
+
+ void doNothing() throws RemoteException;
+}
Added: trunk/testsuite/src/main/org/jboss/test/deployment/jbas7760/unit/MultipleEarWithSameEjbModuleNameTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/deployment/jbas7760/unit/MultipleEarWithSameEjbModuleNameTestCase.java (rev 0)
+++ trunk/testsuite/src/main/org/jboss/test/deployment/jbas7760/unit/MultipleEarWithSameEjbModuleNameTestCase.java 2010-03-07 13:52:39 UTC (rev 102035)
@@ -0,0 +1,75 @@
+/**
+ *
+ */
+package org.jboss.test.deployment.jbas7760.unit;
+
+import javax.rmi.PortableRemoteObject;
+
+import junit.framework.Test;
+
+import org.jboss.test.JBossTestCase;
+import org.jboss.test.deployment.jbas7760.appone.AppOneEJB2xHome;
+import org.jboss.test.deployment.jbas7760.appone.AppOneEJB2xRemote;
+import org.jboss.test.deployment.jbas7760.apptwo.AppTwoEJB2xHome;
+import org.jboss.test.deployment.jbas7760.apptwo.AppTwoEJB2xRemote;
+
+/**
+ * Test case for:
+ *
+ * https://jira.jboss.org/jira/browse/JBAS-7760
+ * https://jira.jboss.org/jira/browse/JBAS-7789
+ *
+ * <p>
+ * Tests that multiple EAR files containing a EJB2.x jar with the same name
+ * deploy fine without throwing any InstanceAlreadyExists exception while
+ * registering the deployment as a MBean. Also tests that the jmx names for
+ * such deployments is deterministic.
+ * </p>
+ *
+ *
+ *
+ * @author Jaikiran Pai
+ * @version $Revision: $
+ */
+public class MultipleEarWithSameEjbModuleNameTestCase extends JBossTestCase
+{
+
+ private static final String EAR_ONE_NAME = "jbas-7760-earone.ear";
+
+ private static final String EAR_TWO_NAME = "jbas-7760-eartwo.ear";
+
+ public MultipleEarWithSameEjbModuleNameTestCase(String name)
+ {
+ super(name);
+ }
+
+ /**
+ * Test that the 2 ears containing a EJB2.x jar with the same name deploys
+ * fine and the <depends> element in a .war of the .ear can use a
+ * deterministic jmx name to depend on the EJB2.x deployment
+ * @throws Exception
+ */
+ public void testDeploymentOfSameEjbJarNameInMultipleEar() throws Exception
+ {
+ AppOneEJB2xHome appOneHome = (AppOneEJB2xHome) this.getInitialContext().lookup("jbas-7760-appone-ejb");
+ AppOneEJB2xRemote appOneRemote = (AppOneEJB2xRemote) PortableRemoteObject.narrow(appOneHome.create(), AppOneEJB2xRemote.class);
+
+ // just test a simple invocation
+ appOneRemote.doNothing();
+
+ // do the same with the other app
+ AppTwoEJB2xHome appTwoHome = (AppTwoEJB2xHome) this.getInitialContext().lookup("jbas-7760-apptwo-ejb");
+ AppTwoEJB2xRemote appTwoRemote = (AppTwoEJB2xRemote) PortableRemoteObject.narrow(appTwoHome.create(), AppTwoEJB2xRemote.class);
+
+ // just test a simple invocation
+ appTwoRemote.doNothing();
+
+
+
+ }
+
+ public static Test suite() throws Exception
+ {
+ return getDeploySetup(MultipleEarWithSameEjbModuleNameTestCase.class, EAR_ONE_NAME + "," + EAR_TWO_NAME);
+ }
+}
Added: trunk/testsuite/src/resources/jbas7760/appone/META-INF/application.xml
===================================================================
--- trunk/testsuite/src/resources/jbas7760/appone/META-INF/application.xml (rev 0)
+++ trunk/testsuite/src/resources/jbas7760/appone/META-INF/application.xml 2010-03-07 13:52:39 UTC (rev 102035)
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<application xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
+ http://java.sun.com/xml/ns/j2ee/application_1_4.xsd"
+ version="1.4">
+
+ <display-name>JBAS-7760-appone</display-name>
+ <module>
+ <web>
+ <web-uri>appone.war</web-uri>
+ <context-root>jbas7760AppOne</context-root>
+ </web>
+ </module>
+ <module>
+ <ejb>jbas-7760-ejb.jar</ejb>
+ </module>
+
+</application>
\ No newline at end of file
Added: trunk/testsuite/src/resources/jbas7760/appone/META-INF/ejb-jar.xml
===================================================================
--- trunk/testsuite/src/resources/jbas7760/appone/META-INF/ejb-jar.xml (rev 0)
+++ trunk/testsuite/src/resources/jbas7760/appone/META-INF/ejb-jar.xml 2010-03-07 13:52:39 UTC (rev 102035)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ejb-jar xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
+ http://java.sun.com/xml/ns/j2ee/ejb-jar_2_1.xsd"
+ version="2.1">
+ <enterprise-beans>
+ <session>
+ <ejb-name>AppOneBean</ejb-name>
+ <home>org.jboss.test.deployment.jbas7760.appone.AppOneEJB2xHome</home>
+ <remote>org.jboss.test.deployment.jbas7760.appone.AppOneEJB2xRemote</remote>
+ <ejb-class>org.jboss.test.deployment.jbas7760.appone.AppOneEJB2xImpl</ejb-class>
+ <session-type>Stateless</session-type>
+ <transaction-type>Container</transaction-type>
+ </session>
+ </enterprise-beans>
+</ejb-jar>
\ No newline at end of file
Added: trunk/testsuite/src/resources/jbas7760/appone/META-INF/jboss.xml
===================================================================
--- trunk/testsuite/src/resources/jbas7760/appone/META-INF/jboss.xml (rev 0)
+++ trunk/testsuite/src/resources/jbas7760/appone/META-INF/jboss.xml 2010-03-07 13:52:39 UTC (rev 102035)
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 4.0//EN"
+ "http://www.jboss.org/j2ee/dtd/jboss_4_0.dtd">
+<jboss>
+ <enterprise-beans>
+ <session>
+ <ejb-name>AppOneBean</ejb-name>
+ <jndi-name>jbas-7760-appone-ejb</jndi-name>
+ </session>
+ </enterprise-beans>
+
+
+</jboss>
\ No newline at end of file
Added: trunk/testsuite/src/resources/jbas7760/appone/WEB-INF/jboss-web.xml
===================================================================
--- trunk/testsuite/src/resources/jbas7760/appone/WEB-INF/jboss-web.xml (rev 0)
+++ trunk/testsuite/src/resources/jbas7760/appone/WEB-INF/jboss-web.xml 2010-03-07 13:52:39 UTC (rev 102035)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jboss-web
+ PUBLIC "-//JBoss//DTD Web Application 2.4//EN"
+ "http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd">
+<jboss-web>
+ <depends>jboss.j2ee:ear="jbas-7760-earone.ear",module="jbas-7760-ejb.jar",service=EjbModule</depends>
+</jboss-web>
\ No newline at end of file
Added: trunk/testsuite/src/resources/jbas7760/appone/WEB-INF/web.xml
===================================================================
--- trunk/testsuite/src/resources/jbas7760/appone/WEB-INF/web.xml (rev 0)
+++ trunk/testsuite/src/resources/jbas7760/appone/WEB-INF/web.xml 2010-03-07 13:52:39 UTC (rev 102035)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!DOCTYPE web-app
+ PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+ "http://java.sun.com/dtd/web-app_2_3.dtd">
+
+<web-app>
+ <display-name>JBAS-7760 AppOne</display-name>
+
+</web-app>
\ No newline at end of file
Added: trunk/testsuite/src/resources/jbas7760/apptwo/META-INF/application.xml
===================================================================
--- trunk/testsuite/src/resources/jbas7760/apptwo/META-INF/application.xml (rev 0)
+++ trunk/testsuite/src/resources/jbas7760/apptwo/META-INF/application.xml 2010-03-07 13:52:39 UTC (rev 102035)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<application xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
+ http://java.sun.com/xml/ns/j2ee/application_1_4.xsd"
+ version="1.4">
+
+ <display-name>JBAS-7760-apptwo</display-name>
+ <module>
+ <web>
+ <web-uri>apptwo.war</web-uri>
+ <context-root>jbas7760AppTwo</context-root>
+ </web>
+ </module>
+
+ <module>
+ <ejb>jbas-7760-ejb.jar</ejb>
+ </module>
+
+</application>
\ No newline at end of file
Added: trunk/testsuite/src/resources/jbas7760/apptwo/META-INF/ejb-jar.xml
===================================================================
--- trunk/testsuite/src/resources/jbas7760/apptwo/META-INF/ejb-jar.xml (rev 0)
+++ trunk/testsuite/src/resources/jbas7760/apptwo/META-INF/ejb-jar.xml 2010-03-07 13:52:39 UTC (rev 102035)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ejb-jar xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
+ http://java.sun.com/xml/ns/j2ee/ejb-jar_2_1.xsd"
+ version="2.1">
+ <enterprise-beans>
+ <session>
+ <ejb-name>AppTwoBean</ejb-name>
+ <home>org.jboss.test.deployment.jbas7760.apptwo.AppTwoEJB2xHome</home>
+ <remote>org.jboss.test.deployment.jbas7760.apptwo.AppTwoEJB2xRemote</remote>
+ <ejb-class>org.jboss.test.deployment.jbas7760.apptwo.AppTwoEJB2xImpl</ejb-class>
+ <session-type>Stateless</session-type>
+ <transaction-type>Container</transaction-type>
+ </session>
+ </enterprise-beans>
+</ejb-jar>
\ No newline at end of file
Added: trunk/testsuite/src/resources/jbas7760/apptwo/META-INF/jboss.xml
===================================================================
--- trunk/testsuite/src/resources/jbas7760/apptwo/META-INF/jboss.xml (rev 0)
+++ trunk/testsuite/src/resources/jbas7760/apptwo/META-INF/jboss.xml 2010-03-07 13:52:39 UTC (rev 102035)
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 4.0//EN"
+ "http://www.jboss.org/j2ee/dtd/jboss_4_0.dtd">
+<jboss>
+ <enterprise-beans>
+ <session>
+ <ejb-name>AppTwoBean</ejb-name>
+ <jndi-name>jbas-7760-apptwo-ejb</jndi-name>
+ </session>
+ </enterprise-beans>
+
+
+</jboss>
\ No newline at end of file
Added: trunk/testsuite/src/resources/jbas7760/apptwo/WEB-INF/jboss-web.xml
===================================================================
--- trunk/testsuite/src/resources/jbas7760/apptwo/WEB-INF/jboss-web.xml (rev 0)
+++ trunk/testsuite/src/resources/jbas7760/apptwo/WEB-INF/jboss-web.xml 2010-03-07 13:52:39 UTC (rev 102035)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jboss-web
+ PUBLIC "-//JBoss//DTD Web Application 2.4//EN"
+ "http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd">
+<jboss-web>
+ <depends>jboss.j2ee:ear="jbas-7760-eartwo.ear",module="jbas-7760-ejb.jar",service=EjbModule</depends>
+</jboss-web>
\ No newline at end of file
Added: trunk/testsuite/src/resources/jbas7760/apptwo/WEB-INF/web.xml
===================================================================
--- trunk/testsuite/src/resources/jbas7760/apptwo/WEB-INF/web.xml (rev 0)
+++ trunk/testsuite/src/resources/jbas7760/apptwo/WEB-INF/web.xml 2010-03-07 13:52:39 UTC (rev 102035)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!DOCTYPE web-app
+ PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+ "http://java.sun.com/dtd/web-app_2_3.dtd">
+
+<web-app>
+ <display-name>JBAS-7760 AppTwo</display-name>
+
+</web-app>
\ No newline at end of file
More information about the jboss-cvs-commits
mailing list