Workaround for Arquillian creating an illegal application.xml

Author: arjantijms

jpa/datasourcedefinition-applicationxml-pu/src/main/resources/application-web.xml

@@ -3,10 +3,6 @@
     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/application_7.xsd"
     version="7">
 
-    <application-name>OrderApp</application-name>
-    <description>Application description</description>
-    <display-name>OrderApp</display-name>
-
     <module>
         <web>
             <web-uri>test.war</web-uri>
@@ -20,5 +16,4 @@
         <url>jdbc:h2:mem:test</url>
     </data-source>
 
-
 </application>

jpa/datasourcedefinition-applicationxml-pu/src/test/java/org/javaee7/jpa/datasourcedefinition_applicationxml_pu/DataSourceDefinitionApplicationXMLPuEJBTest.java

@@ -14,6 +14,7 @@
 import org.jboss.shrinkwrap.api.Archive;
 import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.jboss.shrinkwrap.resolver.api.maven.Maven;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -58,8 +59,17 @@ public static Archive<?> deploy() {
                         .addAsResource("META-INF/persistence.xml")
 
                         // Service class that uses persistence unit
-                        .addPackages(true, DataSourceDefinitionApplicationXMLPuEJBTest.class.getPackage())
-            );
+                        .addClasses(TestEntity.class, TestService.class)
+                )
+                
+                // Web module
+                // This is needed to prevent Arquillian generating an illegal application.xml
+                .addAsModule(
+                    create(WebArchive.class, "test.war")
+                        // This class containing the test
+                        .addClass(DataSourceDefinitionApplicationXMLPuEJBTest.class)
+                        
+                );
     }
 
     @Test

jpa/pom.xml

@@ -19,6 +19,7 @@
         <module>datasourcedefinition</module>
         <module>datasourcedefinition-webxml-pu</module>
         <module>datasourcedefinition-annotation-pu</module>
+        <module>datasourcedefinition-applicationxml-pu</module>
         <module>dynamic-named-query</module>
         <module>entitygraph</module>
         <module>listeners</module>