svn commit: r1040677 - in /openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi: CdiPlugin.java CdiScanner.java

[dblevins]

Author: dblevins
Date: Tue Nov 30 18:31:49 2010
New Revision: 1040677

URL: http://svn.apache.org/viewvc?rev=1040677&view=rev
Log:
Fix compile issues with latest OWB trunk

Modified:
    
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiPlugin.java
    
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiScanner.java

Modified: 
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiPlugin.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiPlugin.java?rev=1040677&r1=1040676&r2=1040677&view=diff
==============================================================================
--- 
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiPlugin.java
 (original)
+++ 
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiPlugin.java
 Tue Nov 30 18:31:49 2010
@@ -132,9 +132,6 @@ public class CdiPlugin extends AbstractO
             CdiResourceInjectionService injectionServices = 
(CdiResourceInjectionService) 
WebBeansFinder.getSingletonInstance("org.apache.openejb.cdi.CdiResourceInjectionService",
 appContext.getClassLoader());
             injectionServices.clear();
 
-            //ContextFactory cleanup
-            ContextFactory.cleanUpContextFactory();
-
             //Clear singleton list
             
WebBeansFinder.clearInstances(WebBeansUtil.getCurrentClassLoader());
 

Modified: 
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiScanner.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiScanner.java?rev=1040677&r1=1040676&r2=1040677&view=diff
==============================================================================
--- 
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiScanner.java
 (original)
+++ 
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiScanner.java
 Tue Nov 30 18:31:49 2010
@@ -35,6 +35,7 @@ import org.apache.webbeans.decorator.Dec
 import org.apache.webbeans.exception.WebBeansConfigurationException;
 import org.apache.webbeans.inject.AlternativesManager;
 import org.apache.webbeans.intercept.InterceptorsManager;
+import org.apache.webbeans.spi.BDABeansXmlScanner;
 import org.apache.webbeans.spi.ScannerService;
 import org.apache.webbeans.util.AnnotationUtil;
 
@@ -102,13 +103,13 @@ public class CdiScanner implements Scann
 
             for (String className : beans.alternativeStereotypes) {
                 Class<?> clazz = load(className, "alternative-stereotype", 
classLoader);
-                alternativesManager.addStereoTypeAlternative(clazz);
+                alternativesManager.addStereoTypeAlternative(clazz, null, 
null);
                 classes.add(clazz);
             }
 
             for (String className : beans.alternativeClasses) {
                 Class<?> clazz = load(className, "alternative-class", 
classLoader);
-                alternativesManager.addClazzAlternative(clazz);
+                alternativesManager.addClazzAlternative(clazz, null, null);
                 classes.add(clazz);
             }
 
@@ -121,6 +122,14 @@ public class CdiScanner implements Scann
 
     }
 
+    public boolean isBDABeansXmlScanningEnabled() {
+        return false;
+    }
+
+    public BDABeansXmlScanner getBDABeansXmlScanner() {
+        return null;
+    }
+
     private Class load(String className, String type, ClassLoader classLoader) 
{
 //        System.out.println("cdi.load = " + className);
         try {