Author: pete.muir(a)jboss.org Date: 2009-10-15 20:17:34 -0400 (Thu, 15 Oct 2009) New Revision: 4129 Modified: cdi-tck/trunk/impl/pom.xml cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractJSR299Test.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/JSR299ConfigurationImpl.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ConversationTestPhaseListener.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/Tarantula.java cdi-tck/trunk/pom.xml Log: CDITCK-37, CDITCK-34 Modified: cdi-tck/trunk/impl/pom.xml =================================================================== --- cdi-tck/trunk/impl/pom.xml 2009-10-15 19:45:03 UTC (rev 4128) +++ cdi-tck/trunk/impl/pom.xml 2009-10-16 00:17:34 UTC (rev 4129) @@ -81,11 +81,6 @@ </dependency> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </dependency> - - <dependency> <groupId>javax.el</groupId> <artifactId>el-api</artifactId> </dependency> Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractJSR299Test.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractJSR299Test.java 2009-10-15 19:45:03 UTC (rev 4128) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractJSR299Test.java 2009-10-16 00:17:34 UTC (rev 4129) @@ -21,9 +21,9 @@ import javax.enterprise.inject.spi.BeanManager; import org.jboss.jsr299.tck.api.JSR299Configuration; -import org.jboss.jsr299.tck.impl.JSR299ConfigurationImpl; import org.jboss.jsr299.tck.impl.OldSPIBridge; import org.jboss.testharness.api.DeploymentException; +import org.jboss.testharness.impl.ConfigurationFactory; public abstract class AbstractJSR299Test extends org.jboss.testharness.AbstractTest { @@ -64,7 +64,7 @@ @Override protected JSR299Configuration getCurrentConfiguration() { - return JSR299ConfigurationImpl.get(); + return ConfigurationFactory.get(JSR299Configuration.class); } /** Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/JSR299ConfigurationImpl.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/JSR299ConfigurationImpl.java 2009-10-15 19:45:03 UTC (rev 4128) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/JSR299ConfigurationImpl.java 2009-10-16 00:17:34 UTC (rev 4129) @@ -12,11 +12,6 @@ public class JSR299ConfigurationImpl extends ConfigurationImpl implements JSR299Configuration { - public static JSR299Configuration get() - { - return ConfigurationImpl.get(JSR299Configuration.class); - } - public static final String INTEGRATION_TEST_PACKAGE_NAME = "org.jboss.jsr299.tck.integration"; public static final String UNIT_TEST_PACKAGE_NAME = "org.jboss.jsr299.tck.unit"; Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ConversationTestPhaseListener.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ConversationTestPhaseListener.java 2009-10-15 19:45:03 UTC (rev 4128) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ConversationTestPhaseListener.java 2009-10-16 00:17:34 UTC (rev 4129) @@ -9,41 +9,34 @@ import javax.faces.event.PhaseListener; import javax.servlet.http.HttpServletResponse; -import org.jboss.jsr299.tck.impl.JSR299ConfigurationImpl; +import org.jboss.jsr299.tck.api.JSR299Configuration; import org.jboss.jsr299.tck.impl.OldSPIBridge; +import org.jboss.testharness.impl.ConfigurationFactory; public class ConversationTestPhaseListener implements PhaseListener { - + /** * */ - private static final long serialVersionUID = 1197355854770726526L; + private static final long serialVersionUID = 1197355854770726526L; -public static final String ACTIVE_BEFORE_APPLY_REQUEST_VALUES_HEADER_NAME = "org.jboss.jsr299.tck.activeBeforeApplyRequestValues"; + public static final String ACTIVE_BEFORE_APPLY_REQUEST_VALUES_HEADER_NAME = "org.jboss.jsr299.tck.activeBeforeApplyRequestValues"; private boolean activeBeforeApplyRequestValues; - + public void afterPhase(PhaseEvent event) { } public void beforePhase(PhaseEvent event) { - try - { - JSR299ConfigurationImpl.get(); - } - catch (NoClassDefFoundError e) - { - e.printStackTrace(); - e.getCause().printStackTrace(); - } + JSR299Configuration configuration = ConfigurationFactory.get(JSR299Configuration.class); if (event.getPhaseId().equals(PhaseId.APPLY_REQUEST_VALUES)) { try { - JSR299ConfigurationImpl.get().getManagers().getManager().getContext(ConversationScoped.class); + configuration.getManagers().getManager().getContext(ConversationScoped.class); activeBeforeApplyRequestValues = true; } catch (ContextNotActiveException e) @@ -53,7 +46,7 @@ } if (event.getPhaseId().equals(PhaseId.RENDER_RESPONSE)) { - BeanManager beanManager = JSR299ConfigurationImpl.get().getManagers().getManager(); + BeanManager beanManager = configuration.getManagers().getManager(); Conversation conversation = OldSPIBridge.getInstanceByType(beanManager, Conversation.class); HttpServletResponse response = (HttpServletResponse) event.getFacesContext().getExternalContext().getResponse(); response.addHeader(AbstractConversationTest.CID_HEADER_NAME, conversation.getId()); @@ -67,5 +60,5 @@ { return PhaseId.ANY_PHASE; } - + } Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/Tarantula.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/Tarantula.java 2009-10-15 19:45:03 UTC (rev 4128) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/Tarantula.java 2009-10-16 00:17:34 UTC (rev 4129) @@ -2,7 +2,9 @@ import javax.annotation.PreDestroy; +import org.jboss.jsr299.tck.api.JSR299Configuration; import org.jboss.jsr299.tck.impl.JSR299ConfigurationImpl; +import org.jboss.testharness.impl.ConfigurationFactory; class Tarantula extends Spider implements DeadlySpider { @@ -13,7 +15,7 @@ public Tarantula() { - dependentContextActive = JSR299ConfigurationImpl.get().getContexts().getDependentContext().isActive(); + dependentContextActive = ConfigurationFactory.get(JSR299Configuration.class).getContexts().getDependentContext().isActive(); } @PreDestroy Modified: cdi-tck/trunk/pom.xml =================================================================== --- cdi-tck/trunk/pom.xml 2009-10-15 19:45:03 UTC (rev 4128) +++ cdi-tck/trunk/pom.xml 2009-10-16 00:17:34 UTC (rev 4129) @@ -75,8 +75,8 @@ <properties> <jboss.test.audit.version>1.0.0</jboss.test.audit.version> - <jboss.test.harness.version>1.1.0-CR1</jboss.test.harness.version> - <testng.version>5.9</testng.version> + <jboss.test.harness.version>1.1.0-SNAPSHOT</jboss.test.harness.version> + <testng.version>5.10</testng.version> <jsr250.api.version>1.0</jsr250.api.version> <cdi.api.version>1.0-CR1</cdi.api.version> <atinject.api.version>1.0-PFD-1</atinject.api.version> @@ -93,7 +93,6 @@ <jsf.api.version>1.2_13</jsf.api.version> <jaxws.api.version>2.1</jaxws.api.version> <interceptor.api.version>3.1.0-CR1</interceptor.api.version> - <log4j.version>1.2.14</log4j.version> <jws.api.version>1.0-MR1</jws.api.version> <apache.httpclient.version>3.1</apache.httpclient.version> <htmlunit.version>2.4</htmlunit.version> @@ -174,12 +173,6 @@ </dependency> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>${log4j.version}</version> - </dependency> - - <dependency> <groupId>javax.el</groupId> <artifactId>el-api</artifactId> <version>${uel.api.version}</version>