You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwebbeans.apache.org by ge...@apache.org on 2010/01/30 01:09:17 UTC

svn commit: r904685 - in /openwebbeans/trunk/webbeans-porting: pom.xml src/main/java/org/apache/webbeans/test/tck/StandaloneContainersImpl.java

Author: gerdogdu
Date: Sat Jan 30 00:09:17 2010
New Revision: 904685

URL: http://svn.apache.org/viewvc?rev=904685&view=rev
Log:
Update for reflecting SPI module

Modified:
    openwebbeans/trunk/webbeans-porting/pom.xml
    openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/StandaloneContainersImpl.java

Modified: openwebbeans/trunk/webbeans-porting/pom.xml
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-porting/pom.xml?rev=904685&r1=904684&r2=904685&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-porting/pom.xml (original)
+++ openwebbeans/trunk/webbeans-porting/pom.xml Sat Jan 30 00:09:17 2010
@@ -71,7 +71,7 @@
         <dependency>
             <groupId>org.jboss.jsr299.tck</groupId>
             <artifactId>jsr299-tck-api</artifactId>
-            <version>1.0.0-CR2</version>
+            <version>1.0.1-SNAPSHOT</version>
             <exclusions>
             	<exclusion>
             		<groupId>javax.enterprise</groupId>

Modified: openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/StandaloneContainersImpl.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/StandaloneContainersImpl.java?rev=904685&r1=904684&r2=904685&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/StandaloneContainersImpl.java (original)
+++ openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/StandaloneContainersImpl.java Sat Jan 30 00:09:17 2010
@@ -26,18 +26,18 @@
 import org.apache.webbeans.container.BeanManagerImpl;
 import org.apache.webbeans.context.ContextFactory;
 import org.apache.webbeans.exception.WebBeansConfigurationException;
-import org.apache.webbeans.lifecycle.EnterpriseLifeCycle;
+import org.apache.webbeans.lifecycle.WebApplicationLifeCycle;
 import org.apache.webbeans.lifecycle.test.MockHttpSession;
 import org.apache.webbeans.lifecycle.test.MockServletContextEvent;
+import org.apache.webbeans.spi.ScannerService;
 import org.apache.webbeans.spi.ServiceLoader;
-import org.apache.webbeans.spi.deployer.MetaDataDiscoveryService;
 import org.apache.webbeans.test.tck.mock.TCKMetaDataDiscoveryImpl;
 import org.jboss.testharness.api.DeploymentException;
 import org.jboss.testharness.spi.StandaloneContainers;
 
 public class StandaloneContainersImpl implements StandaloneContainers
 {
-    private EnterpriseLifeCycle lifeCycle = null;
+    private WebApplicationLifeCycle lifeCycle = null;
     
     private MockServletContextEvent servletContextEvent;
     
@@ -49,9 +49,9 @@
     {
         initializeContexts();
         
-        TCKMetaDataDiscoveryImpl discovery = (TCKMetaDataDiscoveryImpl)ServiceLoader.getService(MetaDataDiscoveryService.class);
+        TCKMetaDataDiscoveryImpl discovery = (TCKMetaDataDiscoveryImpl)ServiceLoader.getService(ScannerService.class);
         
-        this.lifeCycle = new EnterpriseLifeCycle();
+        this.lifeCycle = new WebApplicationLifeCycle();
         
         try
         {
@@ -78,9 +78,9 @@
         {
             initializeContexts();
             
-            TCKMetaDataDiscoveryImpl discovery = (TCKMetaDataDiscoveryImpl)ServiceLoader.getService(MetaDataDiscoveryService.class);
+            TCKMetaDataDiscoveryImpl discovery = (TCKMetaDataDiscoveryImpl)ServiceLoader.getService(ScannerService.class);
             
-            this.lifeCycle = new EnterpriseLifeCycle();
+            this.lifeCycle = new WebApplicationLifeCycle();
             
             Iterator<Class<?>> it = classes.iterator();
             while(it.hasNext())