You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by gp...@apache.org on 2011/03/21 17:01:07 UTC
svn commit: r1083851 - in /myfaces/extensions/cdi/trunk/test-modules:
base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/
base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/cargo/
base...
Author: gpetracek
Date: Mon Mar 21 16:01:07 2011
New Revision: 1083851
URL: http://svn.apache.org/viewvc?rev=1083851&view=rev
Log:
EXTCDI-157 cleanup and javadoc
Added:
myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/spi/ServletAwareCdiTestContainer.java
- copied, changed from r1082285, myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/spi/WebAppAwareCdiTestContainer.java
Removed:
myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/spi/WebAppAwareCdiTestContainer.java
Modified:
myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/TestContainerFactory.java
myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/cargo/AbstractContainerAwareCargoTest.java
myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/cargo/AbstractSimpleCargoTest.java
myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/cargo/runner/JUnit4WithCargo.java
myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/junit4/AbstractCdiAwareTest.java
myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/junit4/AbstractJsfAwareTest.java
myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/junit4/AbstractServletAwareTest.java
myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/spi/CdiTestContainer.java
myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/spi/TestContainer.java
myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/spi/WebAppTestContainer.java
myfaces/extensions/cdi/trunk/test-modules/jsf12-support-module/src/main/java/org/apache/myfaces/extensions/cdi/test/jsf/MyFacesCore12WebAppTestContainer.java
myfaces/extensions/cdi/trunk/test-modules/owb10-support-module/src/main/java/org/apache/myfaces/extensions/cdi/test/owb/ServletOpenWebBeans10TestContainer.java
Modified: myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/TestContainerFactory.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/TestContainerFactory.java?rev=1083851&r1=1083850&r2=1083851&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/TestContainerFactory.java (original)
+++ myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/TestContainerFactory.java Mon Mar 21 16:01:07 2011
@@ -20,8 +20,8 @@ package org.apache.myfaces.extensions.cd
import org.apache.myfaces.extensions.cdi.core.api.config.ConfiguredValueDescriptor;
import org.apache.myfaces.extensions.cdi.core.impl.config.ServiceLoaderResolver;
+import org.apache.myfaces.extensions.cdi.test.spi.ServletAwareCdiTestContainer;
import org.apache.myfaces.extensions.cdi.test.spi.TestContainer;
-import org.apache.myfaces.extensions.cdi.test.spi.WebAppAwareCdiTestContainer;
import org.apache.myfaces.extensions.cdi.test.spi.CdiTestContainer;
import org.apache.myfaces.extensions.cdi.test.spi.WebAppTestContainer;
@@ -32,13 +32,24 @@ import java.util.List;
*/
public class TestContainerFactory
{
+ private TestContainerFactory()
+ {
+ }
+
+ /**
+ * Creates a container which fulfills the given interface.
+ *
+ * @param expectedContainer type of the requested container
+ * @param <T> container type
+ * @return a new container for the given type
+ */
public static <T extends TestContainer> T createTestContainer(Class<T> expectedContainer)
{
if(WebAppTestContainer.class.isAssignableFrom(expectedContainer))
{
return (T)getNewJsfTestContainer();
}
- if(WebAppAwareCdiTestContainer.class.isAssignableFrom(expectedContainer))
+ if(ServletAwareCdiTestContainer.class.isAssignableFrom(expectedContainer))
{
return (T)getNewCdiTestContainer(true);
}
@@ -83,7 +94,7 @@ public class TestContainerFactory
return testContainers.iterator().next();
}
- private static CdiTestContainer getNewCdiTestContainer(boolean createServletContext /*TODO*/)
+ private static CdiTestContainer getNewCdiTestContainer(boolean createServletContext)
{
List<CdiTestContainer> testContainers =
new ServiceLoaderResolver().resolveInstances(new ConfiguredValueDescriptor<String, CdiTestContainer>()
@@ -128,6 +139,6 @@ public class TestContainerFactory
private static boolean isServletContextAwareContainer(CdiTestContainer testContainer)
{
- return WebAppAwareCdiTestContainer.class.isAssignableFrom(testContainer.getClass());
+ return ServletAwareCdiTestContainer.class.isAssignableFrom(testContainer.getClass());
}
}
Modified: myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/cargo/AbstractContainerAwareCargoTest.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/cargo/AbstractContainerAwareCargoTest.java?rev=1083851&r1=1083850&r2=1083851&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/cargo/AbstractContainerAwareCargoTest.java (original)
+++ myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/cargo/AbstractContainerAwareCargoTest.java Mon Mar 21 16:01:07 2011
@@ -98,9 +98,12 @@ public abstract class AbstractContainerA
return null;
}
+ /**
+ * {@inheritDoc}
+ */
@Override
@Before
- public void before() throws Exception
+ public void before()
{
super.before();
@@ -108,9 +111,12 @@ public abstract class AbstractContainerA
webClient.setAjaxController(new NicelyResynchronizingAjaxController());
}
+ /**
+ * {@inheritDoc}
+ */
@Override
@After
- public void after() throws Exception
+ public void after()
{
super.after();
Modified: myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/cargo/AbstractSimpleCargoTest.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/cargo/AbstractSimpleCargoTest.java?rev=1083851&r1=1083850&r2=1083851&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/cargo/AbstractSimpleCargoTest.java (original)
+++ myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/cargo/AbstractSimpleCargoTest.java Mon Mar 21 16:01:07 2011
@@ -31,17 +31,23 @@ import org.junit.Before;
*/
public abstract class AbstractSimpleCargoTest extends AbstractContainerAwareCargoTest
{
+ /**
+ * {@inheritDoc}
+ */
@Override
@Before
- public void before() throws Exception
+ public void before()
{
webClient = new WebClient(getBrowserVersion());
webClient.setAjaxController(new NicelyResynchronizingAjaxController());
}
+ /**
+ * {@inheritDoc}
+ */
@Override
@After
- public void after() throws Exception
+ public void after()
{
webClient.closeAllWindows();
webClient = null;
Modified: myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/cargo/runner/JUnit4WithCargo.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/cargo/runner/JUnit4WithCargo.java?rev=1083851&r1=1083850&r2=1083851&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/cargo/runner/JUnit4WithCargo.java (original)
+++ myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/cargo/runner/JUnit4WithCargo.java Mon Mar 21 16:01:07 2011
@@ -38,11 +38,17 @@ public class JUnit4WithCargo extends Blo
{
private static final Logger LOGGER = Logger.getLogger(JUnit4WithCargo.class.getName());
+ /**
+ * {@inheritDoc}
+ */
public JUnit4WithCargo(Class<?> testClass) throws InitializationError
{
super(testClass);
}
+ /**
+ * {@inheritDoc}
+ */
@Override
protected void runChild(FrameworkMethod method, RunNotifier notifier)
{
Modified: myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/junit4/AbstractCdiAwareTest.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/junit4/AbstractCdiAwareTest.java?rev=1083851&r1=1083850&r2=1083851&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/junit4/AbstractCdiAwareTest.java (original)
+++ myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/junit4/AbstractCdiAwareTest.java Mon Mar 21 16:01:07 2011
@@ -25,6 +25,8 @@ import org.junit.Before;
/**
* Allows dependency injection in (standalone) JUnit tests.
+ * For implementing unit tests with servlet-scopes or CODI unit tests use
+ * {@link AbstractServletAwareTest} or {@link AbstractJsfAwareTest}
*
* @author Gerhard Petracek
*/
@@ -32,8 +34,11 @@ public abstract class AbstractCdiAwareTe
{
protected CdiTestContainer testContainer;
+ /**
+ * Bootstraps a new container
+ */
@Before
- public void before() throws Exception
+ public void before()
{
this.testContainer = TestContainerFactory.createTestContainer(CdiTestContainer.class);
this.testContainer.initEnvironment();
@@ -43,8 +48,11 @@ public abstract class AbstractCdiAwareTe
this.testContainer.injectFields(this);
}
+ /**
+ * Stops the current container
+ */
@After
- public void after() throws Exception
+ public void after()
{
this.testContainer.stopContexts();
this.testContainer.stopContainer();
Modified: myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/junit4/AbstractJsfAwareTest.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/junit4/AbstractJsfAwareTest.java?rev=1083851&r1=1083850&r2=1083851&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/junit4/AbstractJsfAwareTest.java (original)
+++ myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/junit4/AbstractJsfAwareTest.java Mon Mar 21 16:01:07 2011
@@ -24,15 +24,20 @@ import org.junit.After;
import org.junit.Before;
/**
+ * Base class which can be used for CODI unit-tests
+ *
* @author Gerhard Petracek
*/
public abstract class AbstractJsfAwareTest extends AbstractServletAwareTest
{
protected WebAppTestContainer webAppTestContainer;
+ /**
+ * {@inheritDoc}
+ */
@Override
@Before
- public void before() throws Exception
+ public void before()
{
this.webAppTestContainer = TestContainerFactory.createTestContainer(WebAppTestContainer.class);
@@ -42,9 +47,12 @@ public abstract class AbstractJsfAwareTe
super.before();
}
+ /**
+ * {@inheritDoc}
+ */
@Override
@After
- public void after() throws Exception
+ public void after()
{
super.after();
this.webAppTestContainer.stopContainer();
Modified: myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/junit4/AbstractServletAwareTest.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/junit4/AbstractServletAwareTest.java?rev=1083851&r1=1083850&r2=1083851&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/junit4/AbstractServletAwareTest.java (original)
+++ myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/junit4/AbstractServletAwareTest.java Mon Mar 21 16:01:07 2011
@@ -19,7 +19,7 @@
package org.apache.myfaces.extensions.cdi.test.junit4;
import org.apache.myfaces.extensions.cdi.test.TestContainerFactory;
-import org.apache.myfaces.extensions.cdi.test.spi.WebAppAwareCdiTestContainer;
+import org.apache.myfaces.extensions.cdi.test.spi.ServletAwareCdiTestContainer;
import org.apache.myfaces.extensions.cdi.test.spi.CdiTestContainer;
import org.junit.After;
import org.junit.Before;
@@ -33,25 +33,31 @@ public abstract class AbstractServletAwa
{
protected CdiTestContainer testContainer;
+ /**
+ * Bootstraps a new container
+ */
@Before
- public void before() throws Exception
+ public void before()
{
- this.testContainer = TestContainerFactory.createTestContainer(WebAppAwareCdiTestContainer.class);
+ this.testContainer = TestContainerFactory.createTestContainer(ServletAwareCdiTestContainer.class);
this.testContainer.initEnvironment();
this.testContainer.startContainer();
this.testContainer.startContexts();
- ((WebAppAwareCdiTestContainer)this.testContainer).beginSession();
- ((WebAppAwareCdiTestContainer)this.testContainer).beginRequest();
+ ((ServletAwareCdiTestContainer)this.testContainer).startSession();
+ ((ServletAwareCdiTestContainer)this.testContainer).startRequest();
this.testContainer.injectFields(this);
}
+ /**
+ * Stops the current container
+ */
@After
- public void after() throws Exception
+ public void after()
{
- ((WebAppAwareCdiTestContainer)this.testContainer).endRequest();
- ((WebAppAwareCdiTestContainer)this.testContainer).endSession();
+ ((ServletAwareCdiTestContainer)this.testContainer).stopRequest();
+ ((ServletAwareCdiTestContainer)this.testContainer).stopSession();
this.testContainer.stopContexts();
this.testContainer.stopContainer();
}
Modified: myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/spi/CdiTestContainer.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/spi/CdiTestContainer.java?rev=1083851&r1=1083850&r2=1083851&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/spi/CdiTestContainer.java (original)
+++ myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/spi/CdiTestContainer.java Mon Mar 21 16:01:07 2011
@@ -21,15 +21,34 @@ package org.apache.myfaces.extensions.cd
import javax.enterprise.inject.spi.BeanManager;
/**
+ * Interface for handling a CDI container
+ *
* @author Gerhard Petracek
*/
public interface CdiTestContainer extends TestContainer
{
+ /**
+ * Starts all contexts of the container
+ */
void startContexts();
+ /**
+ * Stops all contexts of the container
+ */
void stopContexts();
+ /**
+ * Resolves the current {@link BeanManager}
+ * @return current bean-manager
+ */
BeanManager getBeanManager();
+ /**
+ * Performs manual dependency injection.
+ * It's needed for classes which aren't managed by CDI
+ * @param instance instance which isn't managed by CDI
+ * @param <T> current type
+ * @return the given instance with injected beans
+ */
<T> T injectFields(T instance);
}
Copied: myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/spi/ServletAwareCdiTestContainer.java (from r1082285, myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/spi/WebAppAwareCdiTestContainer.java)
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/spi/ServletAwareCdiTestContainer.java?p2=myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/spi/ServletAwareCdiTestContainer.java&p1=myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/spi/WebAppAwareCdiTestContainer.java&r1=1082285&r2=1083851&rev=1083851&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/spi/WebAppAwareCdiTestContainer.java (original)
+++ myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/spi/ServletAwareCdiTestContainer.java Mon Mar 21 16:01:07 2011
@@ -19,15 +19,29 @@
package org.apache.myfaces.extensions.cdi.test.spi;
/**
+ * CDI container which is aware of servlet based applications.
+ *
* @author Gerhard Petracek
*/
-public interface WebAppAwareCdiTestContainer extends CdiTestContainer
+public interface ServletAwareCdiTestContainer extends CdiTestContainer
{
- void beginSession();
+ /**
+ * Starts a new {@link javax.servlet.http.HttpSessionEvent}
+ */
+ void startSession();
- void beginRequest();
+ /**
+ * Starts a new {@link javax.servlet.http.HttpServletRequest}
+ */
+ void startRequest();
- void endRequest();
+ /**
+ * Stops the current {@link javax.servlet.http.HttpServletRequest}
+ */
+ void stopRequest();
- void endSession();
+ /**
+ * Stops the current {@link javax.servlet.http.HttpSessionEvent}
+ */
+ void stopSession();
}
Modified: myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/spi/TestContainer.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/spi/TestContainer.java?rev=1083851&r1=1083850&r2=1083851&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/spi/TestContainer.java (original)
+++ myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/spi/TestContainer.java Mon Mar 21 16:01:07 2011
@@ -19,13 +19,24 @@
package org.apache.myfaces.extensions.cdi.test.spi;
/**
+ * Base interface for all containers
+ *
* @author Gerhard Petracek
*/
public interface TestContainer
{
+ /**
+ * Initializes the environment e.g. project-stage, class-loader,...
+ */
void initEnvironment();
+ /**
+ * Bootstraps the container
+ */
void startContainer();
+ /**
+ * Closes the container
+ */
void stopContainer();
}
Modified: myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/spi/WebAppTestContainer.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/spi/WebAppTestContainer.java?rev=1083851&r1=1083850&r2=1083851&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/spi/WebAppTestContainer.java (original)
+++ myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/spi/WebAppTestContainer.java Mon Mar 21 16:01:07 2011
@@ -19,6 +19,8 @@
package org.apache.myfaces.extensions.cdi.test.spi;
/**
+ * Marker interface for web-app containers like a mocked container for JSF apps.
+ *
* @author Gerhard Petracek
*/
public interface WebAppTestContainer extends TestContainer
Modified: myfaces/extensions/cdi/trunk/test-modules/jsf12-support-module/src/main/java/org/apache/myfaces/extensions/cdi/test/jsf/MyFacesCore12WebAppTestContainer.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/test-modules/jsf12-support-module/src/main/java/org/apache/myfaces/extensions/cdi/test/jsf/MyFacesCore12WebAppTestContainer.java?rev=1083851&r1=1083850&r2=1083851&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/test-modules/jsf12-support-module/src/main/java/org/apache/myfaces/extensions/cdi/test/jsf/MyFacesCore12WebAppTestContainer.java (original)
+++ myfaces/extensions/cdi/trunk/test-modules/jsf12-support-module/src/main/java/org/apache/myfaces/extensions/cdi/test/jsf/MyFacesCore12WebAppTestContainer.java Mon Mar 21 16:01:07 2011
@@ -71,16 +71,14 @@ public class MyFacesCore12WebAppTestCont
public void initEnvironment()
{
- //nothing to do
- }
-
- public void startContainer()
- {
// Set up a new thread context class loader
threadContextClassLoader = Thread.currentThread().getContextClassLoader();
Thread.currentThread()
.setContextClassLoader(new URLClassLoader(new URL[0], this.getClass().getClassLoader()));
+ }
+ public void startContainer()
+ {
try
{
// Set up Servlet API Objects
Modified: myfaces/extensions/cdi/trunk/test-modules/owb10-support-module/src/main/java/org/apache/myfaces/extensions/cdi/test/owb/ServletOpenWebBeans10TestContainer.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/test-modules/owb10-support-module/src/main/java/org/apache/myfaces/extensions/cdi/test/owb/ServletOpenWebBeans10TestContainer.java?rev=1083851&r1=1083850&r2=1083851&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/test-modules/owb10-support-module/src/main/java/org/apache/myfaces/extensions/cdi/test/owb/ServletOpenWebBeans10TestContainer.java (original)
+++ myfaces/extensions/cdi/trunk/test-modules/owb10-support-module/src/main/java/org/apache/myfaces/extensions/cdi/test/owb/ServletOpenWebBeans10TestContainer.java Mon Mar 21 16:01:07 2011
@@ -18,21 +18,21 @@
*/
package org.apache.myfaces.extensions.cdi.test.owb;
-import org.apache.myfaces.extensions.cdi.test.spi.WebAppAwareCdiTestContainer;
+import org.apache.myfaces.extensions.cdi.test.spi.ServletAwareCdiTestContainer;
import org.apache.webbeans.cditest.CdiTestContainerLoader;
/**
* @author Gerhard Petracek
*/
public class ServletOpenWebBeans10TestContainer
- extends AbstractOpenWebBeans10TestContainer implements WebAppAwareCdiTestContainer
+ extends AbstractOpenWebBeans10TestContainer implements ServletAwareCdiTestContainer
{
public ServletOpenWebBeans10TestContainer()
{
this.testContainer = CdiTestContainerLoader.getCdiContainer();
}
- public void beginSession()
+ public void startSession()
{
try
{
@@ -48,7 +48,7 @@ public class ServletOpenWebBeans10TestCo
}
}
- public void beginRequest()
+ public void startRequest()
{
try
{
@@ -64,7 +64,7 @@ public class ServletOpenWebBeans10TestCo
}
}
- public void endRequest()
+ public void stopRequest()
{
try
{
@@ -80,7 +80,7 @@ public class ServletOpenWebBeans10TestCo
}
}
- public void endSession()
+ public void stopSession()
{
try
{