Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
8c6bc7a
commit afa81bf
Showing
30 changed files
with
95 additions
and
96 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
12 changes: 5 additions & 7 deletions
12
.../src/test/java/org/jboss/weld/environment/servlet/test/injection/FilterInjectionTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,25 +1,23 @@ | ||
| package org.jboss.weld.environment.servlet.test.injection; | ||
|
|
||
| import static org.jboss.arquillian.api.RunModeType.AS_CLIENT; | ||
| import static org.jboss.weld.environment.servlet.test.util.JettyDeployments.JETTY_ENV; | ||
| import static org.jboss.weld.environment.servlet.test.util.JettyDeployments.JETTY_WEB; | ||
|
|
||
| import org.jboss.arquillian.api.Deployment; | ||
| import org.jboss.arquillian.api.Run; | ||
| import org.jboss.arquillian.container.test.api.Deployment; | ||
| import org.jboss.arquillian.container.test.api.RunAsClient; | ||
| import org.jboss.arquillian.junit.Arquillian; | ||
| import org.jboss.shrinkwrap.api.spec.WebArchive; | ||
| import org.jboss.weld.environment.servlet.test.injection.FilterInjectionTestBase; | ||
| import org.junit.runner.RunWith; | ||
|
|
||
| @RunWith(Arquillian.class) | ||
| @Run(AS_CLIENT) | ||
| @RunAsClient | ||
| public class FilterInjectionTest extends FilterInjectionTestBase | ||
| { | ||
|
|
||
| @Deployment | ||
| public static WebArchive deployment() | ||
| { | ||
| return FilterInjectionTestBase.deployment().addWebResource(JETTY_ENV, "jetty-env.xml").addWebResource(JETTY_WEB, "jetty-web.xml"); | ||
| return FilterInjectionTestBase.deployment().addAsWebResource(JETTY_ENV, "jetty-env.xml").addAsWebResource(JETTY_WEB, "jetty-web.xml"); | ||
| } | ||
|
|
||
| } |
10 changes: 4 additions & 6 deletions
10
...rc/test/java/org/jboss/weld/environment/servlet/test/injection/ListenerInjectionTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,25 +1,23 @@ | ||
| package org.jboss.weld.environment.servlet.test.injection; | ||
|
|
||
| import static org.jboss.arquillian.api.RunModeType.AS_CLIENT; | ||
| import static org.jboss.weld.environment.servlet.test.util.JettyDeployments.JETTY_ENV; | ||
| import static org.jboss.weld.environment.servlet.test.util.JettyDeployments.JETTY_WEB; | ||
|
|
||
| import org.jboss.arquillian.api.Deployment; | ||
| import org.jboss.arquillian.api.Run; | ||
| import org.jboss.arquillian.container.test.api.Deployment; | ||
| import org.jboss.arquillian.container.test.api.RunAsClient; | ||
| import org.jboss.arquillian.junit.Arquillian; | ||
| import org.jboss.shrinkwrap.api.spec.WebArchive; | ||
| import org.jboss.weld.environment.servlet.test.injection.ListenerInjectionTestBase; | ||
| import org.junit.runner.RunWith; | ||
|
|
||
| @RunWith(Arquillian.class) | ||
| @Run(AS_CLIENT) | ||
| @RunAsClient | ||
| public class ListenerInjectionTest extends ListenerInjectionTestBase | ||
| { | ||
|
|
||
| @Deployment | ||
| public static WebArchive deployment() | ||
| { | ||
| return ListenerInjectionTestBase.deployment().addWebResource(JETTY_ENV, "jetty-env.xml").addWebResource(JETTY_WEB, "jetty-web.xml"); | ||
| return ListenerInjectionTestBase.deployment().addAsWebResource(JETTY_ENV, "jetty-env.xml").addAsWebResource(JETTY_WEB, "jetty-web.xml"); | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
10 changes: 4 additions & 6 deletions
10
...src/test/java/org/jboss/weld/environment/servlet/test/injection/ServletInjectionTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,25 +1,23 @@ | ||
| package org.jboss.weld.environment.servlet.test.injection; | ||
|
|
||
| import static org.jboss.arquillian.api.RunModeType.AS_CLIENT; | ||
| import static org.jboss.weld.environment.servlet.test.util.JettyDeployments.JETTY_ENV; | ||
| import static org.jboss.weld.environment.servlet.test.util.JettyDeployments.JETTY_WEB; | ||
|
|
||
| import org.jboss.arquillian.api.Deployment; | ||
| import org.jboss.arquillian.api.Run; | ||
| import org.jboss.arquillian.container.test.api.Deployment; | ||
| import org.jboss.arquillian.container.test.api.RunAsClient; | ||
| import org.jboss.arquillian.junit.Arquillian; | ||
| import org.jboss.shrinkwrap.api.spec.WebArchive; | ||
| import org.jboss.weld.environment.servlet.test.injection.ServletInjectionTestBase; | ||
| import org.junit.runner.RunWith; | ||
|
|
||
| @RunWith(Arquillian.class) | ||
| @Run(AS_CLIENT) | ||
| @RunAsClient | ||
| public class ServletInjectionTest extends ServletInjectionTestBase | ||
| { | ||
|
|
||
| @Deployment | ||
| public static WebArchive deployment() | ||
| { | ||
| return ServletInjectionTestBase.deployment().addWebResource(JETTY_ENV, "jetty-env.xml").addWebResource(JETTY_WEB, "jetty-web.xml"); | ||
| return ServletInjectionTestBase.deployment().addAsWebResource(JETTY_ENV, "jetty-env.xml").addAsWebResource(JETTY_WEB, "jetty-web.xml"); | ||
| } | ||
|
|
||
| } |
6 changes: 3 additions & 3 deletions
6
...ts/jetty/src/test/java/org/jboss/weld/environment/servlet/test/util/JettyDeployments.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,13 @@ | ||
| package org.jboss.weld.environment.servlet.test.util; | ||
|
|
||
| import org.jboss.shrinkwrap.api.asset.Asset; | ||
| import org.jboss.shrinkwrap.api.asset.ByteArrayAsset; | ||
| import org.jboss.shrinkwrap.api.asset.StringAsset; | ||
|
|
||
| public class JettyDeployments | ||
| { | ||
|
|
||
| public static final Asset JETTY_ENV = new ByteArrayAsset("<Configure id=\"webAppCtx\" class=\"org.mortbay.jetty.webapp.WebAppContext\"><New class=\"org.mortbay.jetty.plus.naming.EnvEntry\"><Arg><Ref id=\"webAppCtx\"/></Arg><Arg>BeanManager</Arg><Arg><New class=\"javax.naming.Reference\"><Arg>javax.enterprise.inject.spi.BeanManager</Arg><Arg>org.jboss.weld.resources.ManagerObjectFactory</Arg><Arg/></New></Arg><Arg type=\"boolean\">true</Arg></New></Configure>".getBytes()); | ||
| public static final Asset JETTY_ENV = new StringAsset("<Configure id=\"webAppCtx\" class=\"org.mortbay.jetty.webapp.WebAppContext\"><New class=\"org.mortbay.jetty.plus.naming.EnvEntry\"><Arg><Ref id=\"webAppCtx\"/></Arg><Arg>BeanManager</Arg><Arg><New class=\"javax.naming.Reference\"><Arg>javax.enterprise.inject.spi.BeanManager</Arg><Arg>org.jboss.weld.resources.ManagerObjectFactory</Arg><Arg/></New></Arg><Arg type=\"boolean\">true</Arg></New></Configure>"); | ||
|
|
||
| public static final Asset JETTY_WEB = new ByteArrayAsset("<Configure id=\"webAppCtx\" class=\"org.mortbay.jetty.webapp.WebAppContext\"><Call class=\"org.jboss.weld.environment.jetty.WeldServletHandler\" name=\"process\"><Arg><Ref id=\"webAppCtx\"/></Arg></Call></Configure>".getBytes()); | ||
| public static final Asset JETTY_WEB = new StringAsset("<Configure id=\"webAppCtx\" class=\"org.mortbay.jetty.webapp.WebAppContext\"><Call class=\"org.jboss.weld.environment.jetty.WeldServletHandler\" name=\"process\"><Arg><Ref id=\"webAppCtx\"/></Arg></Call></Configure>"); | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.