Repository: deltaspike Updated Branches: refs/heads/master f39136039 -> 73d63256a
DELTASPIKE-583 fixed test-setup Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/73d63256 Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/73d63256 Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/73d63256 Branch: refs/heads/master Commit: 73d63256a830d34f4d93305fdec9c5c0c6992ab0 Parents: f391360 Author: gpetracek <[email protected]> Authored: Sun Apr 27 21:23:39 2014 +0200 Committer: gpetracek <[email protected]> Committed: Sun Apr 27 21:23:39 2014 +0200 ---------------------------------------------------------------------- .../test/servlet/impl/event/request/RequestResponseEventsTest.java | 1 - .../test/servlet/impl/event/session/SessionEventsTest.java | 1 - .../test/servlet/impl/producer/EarlyRequestInjectionTest.java | 1 - .../test/servlet/impl/producer/ServletContextInjectionTest.java | 1 - .../test/servlet/impl/producer/ServletObjectInjectionTest.java | 1 - .../test/servlet/impl/resourceloader/WebResourceProviderTest.java | 1 - 6 files changed, 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/deltaspike/blob/73d63256/deltaspike/modules/servlet/impl/src/test/java/org/apache/deltaspike/test/servlet/impl/event/request/RequestResponseEventsTest.java ---------------------------------------------------------------------- diff --git a/deltaspike/modules/servlet/impl/src/test/java/org/apache/deltaspike/test/servlet/impl/event/request/RequestResponseEventsTest.java b/deltaspike/modules/servlet/impl/src/test/java/org/apache/deltaspike/test/servlet/impl/event/request/RequestResponseEventsTest.java index d15e855..83e65a8 100644 --- a/deltaspike/modules/servlet/impl/src/test/java/org/apache/deltaspike/test/servlet/impl/event/request/RequestResponseEventsTest.java +++ b/deltaspike/modules/servlet/impl/src/test/java/org/apache/deltaspike/test/servlet/impl/event/request/RequestResponseEventsTest.java @@ -55,7 +55,6 @@ public class RequestResponseEventsTest { return ShrinkWrap.create(WebArchive.class, RequestResponseEventsTest.class.getSimpleName() + ".war") .addAsLibraries(ArchiveUtils.getDeltaSpikeCoreAndServletModuleArchive()) - .addAsResource("META-INF/web-fragment.xml", "META-INF/web-fragment.xml") .addClass(RequestResponseEventsObserver.class) .addAsWebInfResource(new StringAsset("<beans/>"), "beans.xml") .addAsWebResource(new StringAsset("foobar"), "foobar.txt"); http://git-wip-us.apache.org/repos/asf/deltaspike/blob/73d63256/deltaspike/modules/servlet/impl/src/test/java/org/apache/deltaspike/test/servlet/impl/event/session/SessionEventsTest.java ---------------------------------------------------------------------- diff --git a/deltaspike/modules/servlet/impl/src/test/java/org/apache/deltaspike/test/servlet/impl/event/session/SessionEventsTest.java b/deltaspike/modules/servlet/impl/src/test/java/org/apache/deltaspike/test/servlet/impl/event/session/SessionEventsTest.java index dadb566..567859f 100644 --- a/deltaspike/modules/servlet/impl/src/test/java/org/apache/deltaspike/test/servlet/impl/event/session/SessionEventsTest.java +++ b/deltaspike/modules/servlet/impl/src/test/java/org/apache/deltaspike/test/servlet/impl/event/session/SessionEventsTest.java @@ -62,7 +62,6 @@ public class SessionEventsTest { return ShrinkWrap.create(WebArchive.class, SessionEventsTest.class.getSimpleName() + ".war") .addAsLibraries(ArchiveUtils.getDeltaSpikeCoreAndServletModuleArchive()) - .addAsResource("META-INF/web-fragment.xml", "META-INF/web-fragment.xml") .addClass(SessionEventsObserver.class) .addClass(CreateSessionServlet.class) .addClass(DestroySessionServlet.class) http://git-wip-us.apache.org/repos/asf/deltaspike/blob/73d63256/deltaspike/modules/servlet/impl/src/test/java/org/apache/deltaspike/test/servlet/impl/producer/EarlyRequestInjectionTest.java ---------------------------------------------------------------------- diff --git a/deltaspike/modules/servlet/impl/src/test/java/org/apache/deltaspike/test/servlet/impl/producer/EarlyRequestInjectionTest.java b/deltaspike/modules/servlet/impl/src/test/java/org/apache/deltaspike/test/servlet/impl/producer/EarlyRequestInjectionTest.java index 274a8e0..1119ef2 100644 --- a/deltaspike/modules/servlet/impl/src/test/java/org/apache/deltaspike/test/servlet/impl/producer/EarlyRequestInjectionTest.java +++ b/deltaspike/modules/servlet/impl/src/test/java/org/apache/deltaspike/test/servlet/impl/producer/EarlyRequestInjectionTest.java @@ -55,7 +55,6 @@ public class EarlyRequestInjectionTest { return ShrinkWrap.create(WebArchive.class, EarlyRequestInjectionTest.class.getSimpleName() + ".war") .addAsLibraries(ArchiveUtils.getDeltaSpikeCoreAndServletModuleArchive()) - .addAsResource("META-INF/web-fragment.xml", "META-INF/web-fragment.xml") .addAsWebInfResource(new StringAsset("<beans/>"), "beans.xml") .addClass(EarlyRequestInjectionFilter.class) .addAsWebResource(new StringAsset("foobar"), "foobar.txt") http://git-wip-us.apache.org/repos/asf/deltaspike/blob/73d63256/deltaspike/modules/servlet/impl/src/test/java/org/apache/deltaspike/test/servlet/impl/producer/ServletContextInjectionTest.java ---------------------------------------------------------------------- diff --git a/deltaspike/modules/servlet/impl/src/test/java/org/apache/deltaspike/test/servlet/impl/producer/ServletContextInjectionTest.java b/deltaspike/modules/servlet/impl/src/test/java/org/apache/deltaspike/test/servlet/impl/producer/ServletContextInjectionTest.java index e2f456c..0eb2bd2 100644 --- a/deltaspike/modules/servlet/impl/src/test/java/org/apache/deltaspike/test/servlet/impl/producer/ServletContextInjectionTest.java +++ b/deltaspike/modules/servlet/impl/src/test/java/org/apache/deltaspike/test/servlet/impl/producer/ServletContextInjectionTest.java @@ -52,7 +52,6 @@ public class ServletContextInjectionTest { return ShrinkWrap.create(WebArchive.class, ServletContextInjectionTest.class.getSimpleName() + ".war") .addAsLibraries(ArchiveUtils.getDeltaSpikeCoreAndServletModuleArchive()) - .addAsResource("META-INF/web-fragment.xml", "META-INF/web-fragment.xml") .addAsWebInfResource(new StringAsset("<beans/>"), "beans.xml") .setWebXML(new StringAsset( Descriptors.create(WebAppDescriptor.class) http://git-wip-us.apache.org/repos/asf/deltaspike/blob/73d63256/deltaspike/modules/servlet/impl/src/test/java/org/apache/deltaspike/test/servlet/impl/producer/ServletObjectInjectionTest.java ---------------------------------------------------------------------- diff --git a/deltaspike/modules/servlet/impl/src/test/java/org/apache/deltaspike/test/servlet/impl/producer/ServletObjectInjectionTest.java b/deltaspike/modules/servlet/impl/src/test/java/org/apache/deltaspike/test/servlet/impl/producer/ServletObjectInjectionTest.java index eb2ed67..76d1e32 100644 --- a/deltaspike/modules/servlet/impl/src/test/java/org/apache/deltaspike/test/servlet/impl/producer/ServletObjectInjectionTest.java +++ b/deltaspike/modules/servlet/impl/src/test/java/org/apache/deltaspike/test/servlet/impl/producer/ServletObjectInjectionTest.java @@ -55,7 +55,6 @@ public class ServletObjectInjectionTest { return ShrinkWrap.create(WebArchive.class, ServletObjectInjectionTest.class.getSimpleName() + ".war") .addAsLibraries(ArchiveUtils.getDeltaSpikeCoreAndServletModuleArchive()) - .addAsResource("META-INF/web-fragment.xml", "META-INF/web-fragment.xml") .addClass(ServletObjectInjectionBean.class) .addClass(ServletObjectInjectionServlet.class) .addAsWebInfResource(new StringAsset("<beans/>"), "beans.xml") http://git-wip-us.apache.org/repos/asf/deltaspike/blob/73d63256/deltaspike/modules/servlet/impl/src/test/java/org/apache/deltaspike/test/servlet/impl/resourceloader/WebResourceProviderTest.java ---------------------------------------------------------------------- diff --git a/deltaspike/modules/servlet/impl/src/test/java/org/apache/deltaspike/test/servlet/impl/resourceloader/WebResourceProviderTest.java b/deltaspike/modules/servlet/impl/src/test/java/org/apache/deltaspike/test/servlet/impl/resourceloader/WebResourceProviderTest.java index f7d4698..ac950cc 100644 --- a/deltaspike/modules/servlet/impl/src/test/java/org/apache/deltaspike/test/servlet/impl/resourceloader/WebResourceProviderTest.java +++ b/deltaspike/modules/servlet/impl/src/test/java/org/apache/deltaspike/test/servlet/impl/resourceloader/WebResourceProviderTest.java @@ -50,7 +50,6 @@ public class WebResourceProviderTest return ShrinkWrap.create(WebArchive.class, WebResourceProviderTest.class.getSimpleName() + ".war") .addClass(WebResourceProvider.class) .addAsLibraries(ArchiveUtils.getDeltaSpikeCoreAndServletModuleArchive()) - .addAsResource("META-INF/web-fragment.xml", "META-INF/web-fragment.xml") .addAsWebInfResource(new StringAsset("<beans/>"), "beans.xml") .addAsWebResource(new StringAsset("foobar"), "foobar.txt") .addAsWebResource(new StringAsset("foobar"), "foo/bar.txt")
