Explicit module name for test JARs

appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/embedasync/build.xml

@@ -46,14 +46,15 @@
     <target name="build" depends="compile">
         <mkdir dir="${assemble.dir}"/>
         <mkdir dir="${build.classes.dir}/META-INF"/>
-	<copy file="descriptor/beans.xml" todir="${build.classes.dir}/META-INF"/>
-	<!--
-        <jar jarfile="${assemble.dir}/${appname}-ejb.jar" 
-             basedir="${build.classes.dir}" 
+        <copy file="descriptor/beans.xml" todir="${build.classes.dir}/META-INF"/>
+        <!--
+        <jar jarfile="${assemble.dir}/${appname}-ejb.jar"
+             basedir="${build.classes.dir}"
              update="true"
              includes ="**/*.class">
         </jar>
 -->
+        <copy file="descriptor/ejb-jar.xml" todir="${build.classes.dir}/META-INF"/>
         <antcall target="compile-common">
             <param name="src" value="client"/>
         </antcall>

appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/embedasync/descriptor/ejb-jar.xml

@@ -0,0 +1,21 @@
+<ejb-jar xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/ejb-jar_3_2.xsd" version="3.2">
+<!--
+
+    Copyright (c) 2023 Contributors to the Eclipse Foundation. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+    <module-name>classes</module-name>
+</ejb-jar>

appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/mdb/build.xml

@@ -55,6 +55,9 @@
              basedir="${build.classes.dir}" 
              update="true"
              includes ="**/S*.class">
+            <metainf dir="descriptor">
+                <include name="ejb-jar.xml"/>
+            </metainf>
         </jar>
         <delete dir="${build.classes.dir}/org"/>
     </target> 

appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/mdb/descriptor/ejb-jar.xml

@@ -0,0 +1,21 @@
+<ejb-jar xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/ejb-jar_3_2.xsd" version="3.2">
+<!--
+
+    Copyright (c) 2023 Contributors to the Eclipse Foundation. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+    <module-name>ejb-ejb31-embedded-mdb-ejb</module-name>
+</ejb-jar>

appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/remote/build.xml

@@ -55,6 +55,9 @@
              basedir="${build.classes.dir}" 
              update="true"
              includes ="**/S*.class">
+            <metainf dir="descriptor">
+                <include name="ejb-jar.xml"/>
+            </metainf>
         </jar>
         <delete dir="${build.classes.dir}/org"/>
     </target> 

appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/remote/descriptor/ejb-jar.xml

@@ -0,0 +1,21 @@
+<ejb-jar xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/ejb-jar_3_2.xsd" version="3.2">
+<!--
+
+    Copyright (c) 2023 Contributors to the Eclipse Foundation. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+    <module-name>ejb-ejb31-embedded-remote-ejb</module-name>
+</ejb-jar>

appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/testclose/build.xml

@@ -54,8 +54,9 @@
              update="true"
              includes ="**/S*.class">
              <metainf dir="descriptor">
+                  <include name="ejb-jar.xml"/>
                   <include name="persistence.xml"/>
-             </metainf> 
+             </metainf>
         </jar>
         <delete dir="${build.classes.dir}/org"/>
     </target> 

appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/testclose/descriptor/META-INF/ejb-jar.xml

@@ -0,0 +1,21 @@
+<ejb-jar xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/ejb-jar_3_2.xsd" version="3.2">
+<!--
+
+    Copyright (c) 2023 Contributors to the Eclipse Foundation. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+    <module-name>ejb-ejb31-embedded-testclose-ejb</module-name>
+</ejb-jar>

appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/timertest/build.xml

@@ -54,6 +54,9 @@
              basedir="${build.classes.dir}" 
              update="true"
              includes ="**/S*.class">
+            <metainf dir="descriptor">
+                <include name="ejb-jar.xml"/>
+            </metainf>
         </jar>
         <delete dir="${build.classes.dir}/org"/>
     </target> 

appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/timertest/descriptor/ejb-jar.xml

@@ -0,0 +1,21 @@
+<ejb-jar xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/ejb-jar_3_2.xsd" version="3.2">
+<!--
+
+    Copyright (c) 2023 Contributors to the Eclipse Foundation. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+    <module-name>ejb-ejb31-embedded-timertest-ejb</module-name>
+</ejb-jar>