Author: dblevins
Date: Sat Sep 10 02:42:16 2011
New Revision: 1167442
URL: http://svn.apache.org/viewvc?rev=1167442&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/ServletFilterEnvEntryInjectionTest.java
openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded/src/test/java/org/apache/openejb/arquillian/ServletListenerEjbLocalInjectionTest.java
openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded/src/test/java/org/apache/openejb/arquillian/ServletListenerEjbRemoteTest.java
openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded/src/test/java/org/apache/openejb/arquillian/ServletListenerEnvEntryInjectionTest.java
openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded/src/test/java/org/apache/openejb/arquillian/ServletListenerPersistenceInjectionTest.java
Modified:
openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded/src/test/java/org/apache/openejb/arquillian/ServletFilterEnvEntryInjectionTest.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded/src/test/java/org/apache/openejb/arquillian/ServletFilterEnvEntryInjectionTest.java?rev=1167442&r1=1167441&r2=1167442&view=diff
==============================================================================
---
openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded/src/test/java/org/apache/openejb/arquillian/ServletFilterEnvEntryInjectionTest.java
(original)
+++
openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded/src/test/java/org/apache/openejb/arquillian/ServletFilterEnvEntryInjectionTest.java
Sat Sep 10 02:42:16 2011
@@ -147,7 +147,7 @@ public class ServletFilterEnvEntryInject
.addClass(DefaultCompany.class)
.addClass(SuperMarket.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/ServletListenerEjbLocalInjectionTest.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded/src/test/java/org/apache/openejb/arquillian/ServletListenerEjbLocalInjectionTest.java?rev=1167442&r1=1167441&r2=1167442&view=diff
==============================================================================
---
openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded/src/test/java/org/apache/openejb/arquillian/ServletListenerEjbLocalInjectionTest.java
(original)
+++
openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded/src/test/java/org/apache/openejb/arquillian/ServletListenerEjbLocalInjectionTest.java
Sat Sep 10 02:42:16 2011
@@ -232,7 +232,7 @@ public class ServletListenerEjbLocalInje
.addClass(DefaultCompany.class)
.addClass(SuperMarket.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/ServletListenerEjbRemoteTest.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded/src/test/java/org/apache/openejb/arquillian/ServletListenerEjbRemoteTest.java?rev=1167442&r1=1167441&r2=1167442&view=diff
==============================================================================
---
openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded/src/test/java/org/apache/openejb/arquillian/ServletListenerEjbRemoteTest.java
(original)
+++
openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded/src/test/java/org/apache/openejb/arquillian/ServletListenerEjbRemoteTest.java
Sat Sep 10 02:42:16 2011
@@ -76,7 +76,7 @@ public class ServletListenerEjbRemoteTes
.addClass(CompanyRemote.class)
.addClass(DefaultCompany.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/ServletListenerEnvEntryInjectionTest.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded/src/test/java/org/apache/openejb/arquillian/ServletListenerEnvEntryInjectionTest.java?rev=1167442&r1=1167441&r2=1167442&view=diff
==============================================================================
---
openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded/src/test/java/org/apache/openejb/arquillian/ServletListenerEnvEntryInjectionTest.java
(original)
+++
openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded/src/test/java/org/apache/openejb/arquillian/ServletListenerEnvEntryInjectionTest.java
Sat Sep 10 02:42:16 2011
@@ -227,7 +227,7 @@ public class ServletListenerEnvEntryInje
.addClass(DefaultCompany.class)
.addClass(SuperMarket.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/ServletListenerPersistenceInjectionTest.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded/src/test/java/org/apache/openejb/arquillian/ServletListenerPersistenceInjectionTest.java?rev=1167442&r1=1167441&r2=1167442&view=diff
==============================================================================
---
openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded/src/test/java/org/apache/openejb/arquillian/ServletListenerPersistenceInjectionTest.java
(original)
+++
openejb/trunk/sandbox/arquillian-tomee/arquillian-tomee-embedded/src/test/java/org/apache/openejb/arquillian/ServletListenerPersistenceInjectionTest.java
Sat Sep 10 02:42:16 2011
@@ -100,7 +100,7 @@ public class ServletListenerPersistenceI
.addClass(Address.class)
.addAsManifestResource("persistence.xml",
ArchivePaths.create("persistence.xml"))
.setWebXML(new StringAsset(descriptor.exportAsString()))
- .addAsWebResource(EmptyAsset.INSTANCE,
ArchivePaths.create("beans.xml"));
+ .addAsWebInfResource(EmptyAsset.INSTANCE,
ArchivePaths.create("beans.xml"));
System.err.println(descriptor.exportAsString());