Fix beans.xml issue

hasalex · hasalex · commit 2477b255ffe3 · 2013-11-12T16:08:24.000+01:00
diff --git a/jta/tx-exception/src/test/java/org/javaee7/jta/tx/exception/EmployeeBeanTest.java b/jta/tx-exception/src/test/java/org/javaee7/jta/tx/exception/EmployeeBeanTest.java
@@ -24,7 +24,7 @@ public class EmployeeBeanTest {
     public static Archive<?> deploy() {
         return ShrinkWrap.create(JavaArchive.class)
                 .addClasses(EmployeeBean.class, Employee.class)
-                .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml")
+                .addAsManifestResource("beans.xml")
                 .addAsResource("META-INF/persistence.xml")
                 .addAsResource("META-INF/create.sql")
                 .addAsResource("META-INF/load.sql")
diff --git a/jta/tx-exception/src/test/resources/beans.xml b/jta/tx-exception/src/test/resources/beans.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans 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/beans_1_1.xsd"
+       bean-discovery-mode="all">
+</beans>
diff --git a/jta/user-transaction/src/test/java/org/javaee7/jta/UserTransactionTest.java b/jta/user-transaction/src/test/java/org/javaee7/jta/UserTransactionTest.java
@@ -23,8 +23,7 @@ public class UserTransactionTest {
     @Deployment
     public static Archive<?> deploy() {
         return ShrinkWrap.create(JavaArchive.class)
-                         .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml");
-        // WF 8.0.0.Beta1 needs the beans.xml file. Shouldn't be the case with JavaEE 7
+                         .addAsManifestResource("beans.xml");
     }
 
     @Inject UserTransaction ut;
diff --git a/jta/user-transaction/src/test/resources/beans.xml b/jta/user-transaction/src/test/resources/beans.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans 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/beans_1_1.xsd"
+       bean-discovery-mode="all">
+</beans>

Original file line number	Diff line number	Diff line change
`@@ -23,8 +23,7 @@ public class UserTransactionTest {`
`23`	`23`	`@Deployment`
`24`	`24`	`public static Archive<?> deploy() {`
`25`	`25`	`return ShrinkWrap.create(JavaArchive.class)`
`26`		`- .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml");`
`27`		`- // WF 8.0.0.Beta1 needs the beans.xml file. Shouldn't be the case with JavaEE 7`
	`26`	`+ .addAsManifestResource("beans.xml");`
`28`	`27`	`}`
`29`	`28`
`30`	`29`	`@Inject UserTransaction ut;`