Skip to content

Commit 643d210

Browse files
arjantijmsarjantijms
authored
Merge pull request #414 from juangon/CDI_unify_to_WAR
Unify CDI JarArchive to WebArchive. …
2 parents ad269e0 + 1f82b70 commit 643d210

7 files changed

Lines changed: 28 additions & 9 deletions

File tree

‎cdi/bean-discovery-none/src/test/java/org/javaee7/cdi/bean/discovery/none/GreetingTest.java‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@
44
import org.jboss.arquillian.junit.Arquillian;
55
import org.jboss.shrinkwrap.api.Archive;
66
import org.jboss.shrinkwrap.api.ShrinkWrap;
7+
import org.jboss.shrinkwrap.api.asset.EmptyAsset;
78
import org.jboss.shrinkwrap.api.spec.JavaArchive;
9+
import org.jboss.shrinkwrap.api.spec.WebArchive;
810
import org.junit.Test;
911
import org.junit.runner.RunWith;
1012

@@ -21,9 +23,12 @@
2123
public class GreetingTest {
2224
@Deployment
2325
public static Archive<?> deploy() {
24-
return ShrinkWrap.create(JavaArchive.class)
26+
JavaArchive library = ShrinkWrap.create(JavaArchive.class)
2527
.addClasses(Greeting.class, FancyGreeting.class)
26-
.addAsManifestResource("beans.xml");
28+
.addAsManifestResource("beans.xml");
29+
return ShrinkWrap.create(WebArchive.class).
30+
addAsLibraries(library).
31+
addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml");
2732
}
2833

2934
@Inject

‎cdi/nobeans-xml/src/test/java/org/javaee7/cdi/nobeans/xml/ScopedBeanTest.java‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import org.jboss.shrinkwrap.api.Archive;
66
import org.jboss.shrinkwrap.api.ShrinkWrap;
77
import org.jboss.shrinkwrap.api.spec.JavaArchive;
8+
import org.jboss.shrinkwrap.api.spec.WebArchive;
89
import org.junit.Test;
910
import org.junit.runner.RunWith;
1011

@@ -21,8 +22,11 @@
2122
public class ScopedBeanTest {
2223
@Deployment
2324
public static Archive<?> deploy() {
24-
return ShrinkWrap.create(JavaArchive.class)
25+
JavaArchive library = ShrinkWrap.create(JavaArchive.class)
2526
.addClass(ScopedBean.class);
27+
28+
return ShrinkWrap.create(WebArchive.class).
29+
addAsLibraries(library);
2630
}
2731

2832
@Inject

‎jaxrs/singleton/src/test/java/org/javaee7/jaxrs/singleton/AnnotatedSingletonResourceTest.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import org.jboss.arquillian.junit.InSequence;
66
import org.jboss.arquillian.test.api.ArquillianResource;
77
import org.jboss.shrinkwrap.api.ShrinkWrap;
8+
import org.jboss.shrinkwrap.api.asset.EmptyAsset;
89
import org.jboss.shrinkwrap.api.spec.WebArchive;
910
import org.junit.After;
1011
import org.junit.Before;
@@ -49,7 +50,8 @@ public static WebArchive createDeployment() {
4950
return ShrinkWrap.create(WebArchive.class)
5051
.addClasses(
5152
MyAnnotatedApplication.class,
52-
AnnotatedSingletonResource.class);
53+
AnnotatedSingletonResource.class)
54+
.addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml");
5355
}
5456

5557
@Test

‎jta/transactional/src/test/java/org/javaee7/jta/transaction/scope/MyTransactionalBeanTest.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import org.jboss.shrinkwrap.api.Archive;
66
import org.jboss.shrinkwrap.api.ShrinkWrap;
77
import org.jboss.shrinkwrap.api.spec.JavaArchive;
8+
import org.jboss.shrinkwrap.api.spec.WebArchive;
89
import org.junit.Test;
910
import org.junit.runner.RunWith;
1011

@@ -23,9 +24,10 @@
2324
public class MyTransactionalBeanTest {
2425
@Deployment
2526
public static Archive<?> deploy() {
26-
return ShrinkWrap.create(JavaArchive.class)
27+
JavaArchive library = ShrinkWrap.create(JavaArchive.class)
2728
.addClasses(MyTransactionalBean.class, MyTransactionScopedBean.class)
2829
.addAsManifestResource("beans.xml");
30+
return ShrinkWrap.create(WebArchive.class).addAsLibraries(library);
2931
}
3032

3133
@Inject

‎jta/transactional/src/test/java/org/javaee7/jta/transaction/scope/MyTransactionalBeanWithUserTransactionTest.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import org.jboss.shrinkwrap.api.Archive;
66
import org.jboss.shrinkwrap.api.ShrinkWrap;
77
import org.jboss.shrinkwrap.api.spec.JavaArchive;
8+
import org.jboss.shrinkwrap.api.spec.WebArchive;
89
import org.junit.Test;
910
import org.junit.runner.RunWith;
1011

@@ -24,9 +25,11 @@
2425
public class MyTransactionalBeanWithUserTransactionTest {
2526
@Deployment
2627
public static Archive<?> deploy() {
27-
return ShrinkWrap.create(JavaArchive.class)
28+
JavaArchive library = ShrinkWrap.create(JavaArchive.class)
2829
.addClasses(MyTransactionalBean.class, MyTransactionScopedBean.class)
2930
.addAsManifestResource("beans.xml");
31+
32+
return ShrinkWrap.create(WebArchive.class).addAsLibraries(library);
3033
}
3134

3235
@Inject

‎jta/transactional/src/test/java/org/javaee7/jta/transactional/MyTransactionalTxTypeBeanTest.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import org.jboss.shrinkwrap.api.Archive;
66
import org.jboss.shrinkwrap.api.ShrinkWrap;
77
import org.jboss.shrinkwrap.api.spec.JavaArchive;
8+
import org.jboss.shrinkwrap.api.spec.WebArchive;
89
import org.junit.Test;
910
import org.junit.runner.RunWith;
1011

@@ -18,8 +19,9 @@
1819
public class MyTransactionalTxTypeBeanTest {
1920
@Deployment
2021
public static Archive<?> deploy() {
21-
return ShrinkWrap.create(JavaArchive.class)
22+
Archive library = ShrinkWrap.create(JavaArchive.class)
2223
.addClass(MyTransactionalTxTypeBean.class);
24+
return ShrinkWrap.create(WebArchive.class).addAsLibraries(library);
2325
}
2426

2527
@Inject

‎jta/user-transaction/src/test/java/org/javaee7/jta/user/transaction/UserTransactionTest.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
import org.jboss.arquillian.junit.Arquillian;
55
import org.jboss.shrinkwrap.api.Archive;
66
import org.jboss.shrinkwrap.api.ShrinkWrap;
7-
import org.jboss.shrinkwrap.api.asset.EmptyAsset;
87
import org.jboss.shrinkwrap.api.spec.JavaArchive;
8+
import org.jboss.shrinkwrap.api.spec.WebArchive;
99
import org.junit.Test;
1010
import org.junit.runner.RunWith;
1111

@@ -22,8 +22,9 @@
2222
public class UserTransactionTest {
2323
@Deployment
2424
public static Archive<?> deploy() {
25-
return ShrinkWrap.create(JavaArchive.class)
25+
Archive<JavaArchive> library = ShrinkWrap.create(JavaArchive.class)
2626
.addAsManifestResource("beans.xml");
27+
return ShrinkWrap.create(WebArchive.class).addAsLibraries(library);
2728
}
2829

2930
@Inject

0 commit comments

Comments
 (0)