svn commit: r1167437 - in /openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded/src/test/java/org/apache/openejb/arquillian: ServletCdiInjectionTest.java TestSetup.java

[dblevins]

Author: dblevins
Date: Sat Sep 10 02:23:44 2011
New Revision: 1167437

URL: http://svn.apache.org/viewvc?rev=1167437&view=rev
Log:
Use the addAsWebInfResource() method for the beans.xml

Modified:
    
openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded/src/test/java/org/apache/openejb/arquillian/ServletCdiInjectionTest.java
    
openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded/src/test/java/org/apache/openejb/arquillian/TestSetup.java

Modified: 
openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded/src/test/java/org/apache/openejb/arquillian/ServletCdiInjectionTest.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded/src/test/java/org/apache/openejb/arquillian/ServletCdiInjectionTest.java?rev=1167437&r1=1167436&r2=1167437&view=diff
==============================================================================
--- 
openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded/src/test/java/org/apache/openejb/arquillian/ServletCdiInjectionTest.java
 (original)
+++ 
openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded/src/test/java/org/apache/openejb/arquillian/ServletCdiInjectionTest.java
 Sat Sep 10 02:23:44 2011
@@ -74,7 +74,7 @@ public class ServletCdiInjectionTest {
                 .addClass(PojoServlet.class)
                 .addClass(Car.class)
                 .setWebXML(new StringAsset(descriptor.exportAsString()))
-                .addAsWebResource(EmptyAsset.INSTANCE, 
ArchivePaths.create("beans.xml"));
+                .addAsWebInfResource(EmptyAsset.INSTANCE, 
ArchivePaths.create("beans.xml"));
 
         System.err.println(descriptor.exportAsString());
 

Modified: 
openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded/src/test/java/org/apache/openejb/arquillian/TestSetup.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded/src/test/java/org/apache/openejb/arquillian/TestSetup.java?rev=1167437&r1=1167436&r2=1167437&view=diff
==============================================================================
--- 
openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded/src/test/java/org/apache/openejb/arquillian/TestSetup.java
 (original)
+++ 
openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded/src/test/java/org/apache/openejb/arquillian/TestSetup.java
 Sat Sep 10 02:23:44 2011
@@ -45,7 +45,7 @@ public abstract class TestSetup {
 
         WebArchive archive = ShrinkWrap.create(WebArchive.class, 
getTestContextName() + ".war")
                 .setWebXML(new StringAsset(descriptor.exportAsString()))
-                .addAsWebResource(EmptyAsset.INSTANCE, 
ArchivePaths.create("beans.xml"));
+                .addAsWebInfResource(EmptyAsset.INSTANCE, 
ArchivePaths.create("beans.xml"));
         if (archiveClasses != null) {
             for (Class c: archiveClasses) {
                 archive.addClass(c);