geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From genspr...@apache.org
Subject svn commit: r935467 - in /geronimo/sandbox/shawn/openwebbeans: geronimo-openwebbeans-builder/src/main/java/org/apache/geronimo/openwebbeans/deployment/WebBeansScanner.java geronimo-openwebbeans/pom.xml openwebbeans/src/main/history/dependencies.xml
Date Mon, 19 Apr 2010 07:42:15 GMT
Author: genspring
Date: Mon Apr 19 07:42:15 2010
New Revision: 935467

URL: http://svn.apache.org/viewvc?rev=935467&view=rev
Log:
Change the specs to geronimo web beans specs.

Modified:
    geronimo/sandbox/shawn/openwebbeans/geronimo-openwebbeans-builder/src/main/java/org/apache/geronimo/openwebbeans/deployment/WebBeansScanner.java
    geronimo/sandbox/shawn/openwebbeans/geronimo-openwebbeans/pom.xml
    geronimo/sandbox/shawn/openwebbeans/openwebbeans/src/main/history/dependencies.xml

Modified: geronimo/sandbox/shawn/openwebbeans/geronimo-openwebbeans-builder/src/main/java/org/apache/geronimo/openwebbeans/deployment/WebBeansScanner.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/shawn/openwebbeans/geronimo-openwebbeans-builder/src/main/java/org/apache/geronimo/openwebbeans/deployment/WebBeansScanner.java?rev=935467&r1=935466&r2=935467&view=diff
==============================================================================
--- geronimo/sandbox/shawn/openwebbeans/geronimo-openwebbeans-builder/src/main/java/org/apache/geronimo/openwebbeans/deployment/WebBeansScanner.java
(original)
+++ geronimo/sandbox/shawn/openwebbeans/geronimo-openwebbeans-builder/src/main/java/org/apache/geronimo/openwebbeans/deployment/WebBeansScanner.java
Mon Apr 19 07:42:15 2010
@@ -18,10 +18,13 @@ import java.util.Set;
 import javax.enterprise.inject.spi.Bean;
 
 import org.apache.geronimo.kernel.osgi.BundleClassLoader;
-import org.apache.webbeans.config.WebBeansContainerDeployer;
+import org.apache.webbeans.config.BeansDeployer;
+import org.apache.webbeans.config.WebBeansFinder;
 import org.apache.webbeans.container.BeanManagerImpl;
-import org.apache.webbeans.container.activity.ActivityManager;
 import org.apache.webbeans.plugins.PluginLoader;
+import org.apache.webbeans.spi.ContextsService;
+import org.apache.webbeans.spi.JNDIService;
+import org.apache.webbeans.spi.ScannerService;
 import org.apache.webbeans.spi.ServiceLoader;
 import org.apache.webbeans.spi.deployer.MetaDataDiscoveryService;
 import org.apache.webbeans.xml.WebBeansXMLConfigurator;
@@ -48,10 +51,16 @@ public final class WebBeansScanner {
     private MetaDataDiscoveryService discovery = null;
 
     /** Deploy discovered beans */
-    private final WebBeansContainerDeployer deployer;
+    private final BeansDeployer deployer;
 
     private final Bundle bundle;
 
+    private JNDIService jndiService;
+
+    private ScannerService scannerService;
+
+    private ContextsService contextsService;
+
     /**
      * Creates a new WebBeansScanner instance and initializes the instance variables.
      */
@@ -63,11 +72,13 @@ public final class WebBeansScanner {
         Thread.currentThread().setContextClassLoader(bundleClassloader);
         
 
-        this.rootManager = new BeanManagerImpl();
+        this.rootManager = (BeanManagerImpl) WebBeansFinder.getSingletonInstance(WebBeansFinder.SINGLETON_MANAGER);
         this.xmlDeployer = new WebBeansXMLConfigurator();
-        this.deployer = new WebBeansContainerDeployer(this.xmlDeployer);
+        this.deployer = new BeansDeployer(this.xmlDeployer);
+        this.jndiService = ServiceLoader.getService(JNDIService.class);    
         this.rootManager.setXMLConfigurator(this.xmlDeployer);
-        ActivityManager.getInstance().setRootActivity(this.rootManager);
+        this.scannerService = ServiceLoader.getService(ScannerService.class);
+        this.contextsService = ServiceLoader.getService(ContextsService.class);
         
         
 

Modified: geronimo/sandbox/shawn/openwebbeans/geronimo-openwebbeans/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/shawn/openwebbeans/geronimo-openwebbeans/pom.xml?rev=935467&r1=935466&r2=935467&view=diff
==============================================================================
--- geronimo/sandbox/shawn/openwebbeans/geronimo-openwebbeans/pom.xml (original)
+++ geronimo/sandbox/shawn/openwebbeans/geronimo-openwebbeans/pom.xml Mon Apr 19 07:42:15
2010
@@ -47,11 +47,14 @@
             <version>${version}</version>
         </dependency>
         
- 
+         <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-atinject_1.0_spec</artifactId>
+        </dependency>
+        
         <dependency>
-            <groupId>org.apache.geronimo.bundles</groupId>
-            <artifactId>atinject-api</artifactId>
-            <version>1.0.0-incubating-M3_1-SNAPSHOT</version>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jcdi_1.0_spec</artifactId>
         </dependency>
         
         <dependency>
@@ -81,20 +84,12 @@
 		</dependency>
   
         <dependency>
-                <groupId>org.apache.geronimo.specs</groupId>
-                <artifactId>geronimo-annotation_1.1_spec</artifactId>
-		        <optional>true</optional>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-annotation_1.1_spec</artifactId>
+            <optional>true</optional>
         </dependency>
   
         <dependency>
-             <groupId>org.apache.geronimo.bundles</groupId>
-             <artifactId>openwebbeans-api</artifactId>
-            <version>1.0.0-incubating-M3_1-SNAPSHOT</version>
-        </dependency>
-
-
-        
-        <dependency>
             <groupId>org.apache.servicemix.bundles</groupId>
             <artifactId>org.apache.servicemix.bundles.dom4j</artifactId>
             <version>1.6.1_3-SNAPSHOT</version>
@@ -115,13 +110,13 @@
         <dependency>
              <groupId>org.apache.geronimo.bundles</groupId>
              <artifactId>openwebbeans-impl</artifactId>
-            <version>1.0.0-incubating-M3_1-SNAPSHOT</version>
+            <version>1.0.0-incubating-SNAPSHOT_1-SNAPSHOT</version>
         </dependency>
         
         <dependency>
              <groupId>org.apache.geronimo.bundles</groupId>
             <artifactId>openwebbeans-jsf</artifactId>
-            <version>1.0.0-incubating-M3_1-SNAPSHOT</version>            
+            <version>1.0.0-incubating-SNAPSHOT_1-SNAPSHOT</version>         
  
         </dependency>
 
     </dependencies>

Modified: geronimo/sandbox/shawn/openwebbeans/openwebbeans/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/shawn/openwebbeans/openwebbeans/src/main/history/dependencies.xml?rev=935467&r1=935466&r2=935467&view=diff
==============================================================================
--- geronimo/sandbox/shawn/openwebbeans/openwebbeans/src/main/history/dependencies.xml (original)
+++ geronimo/sandbox/shawn/openwebbeans/openwebbeans/src/main/history/dependencies.xml Mon
Apr 19 07:42:15 2010
@@ -8,16 +8,6 @@
     </module-id>
     <dependency>
         <groupId>org.apache.geronimo.bundles</groupId>
-        <artifactId>atinject-api</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.bundles</groupId>
-        <artifactId>openwebbeans-api</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.bundles</groupId>
         <artifactId>openwebbeans-impl</artifactId>
         <type>jar</type>
     </dependency>
@@ -43,6 +33,11 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-atinject_1.0_spec</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
         <artifactId>geronimo-el_2.2_spec</artifactId>
         <type>jar</type>
     </dependency>
@@ -53,6 +48,11 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-jcdi_1.0_spec</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
         <artifactId>geronimo-jsp_2.2_spec</artifactId>
         <type>jar</type>
     </dependency>



Mime
View raw message