geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From genspr...@apache.org
Subject svn commit: r944092 - in /geronimo/server/trunk: ./ plugins/openwebbeans/ plugins/openwebbeans/geronimo-openwebbeans-builder/src/main/java/org/apache/geronimo/openwebbeans/deployment/ plugins/openwebbeans/geronimo-openwebbeans/ plugins/openwebbeans/ope...
Date Fri, 14 May 2010 03:32:55 GMT
Author: genspring
Date: Fri May 14 03:32:54 2010
New Revision: 944092

URL: http://svn.apache.org/viewvc?rev=944092&view=rev
Log:
Cleanup some owb dependencies.

Removed:
    geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans-builder/src/main/java/org/apache/geronimo/openwebbeans/deployment/WebBeansScanner.java
Modified:
    geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans-builder/src/main/java/org/apache/geronimo/openwebbeans/deployment/OpenWebBeansModuleBuilderExtension.java
    geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans/pom.xml
    geronimo/server/trunk/plugins/openwebbeans/openwebbeans-deployer/pom.xml
    geronimo/server/trunk/plugins/openwebbeans/openwebbeans/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/openwebbeans/pom.xml
    geronimo/server/trunk/pom.xml

Modified: geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans-builder/src/main/java/org/apache/geronimo/openwebbeans/deployment/OpenWebBeansModuleBuilderExtension.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans-builder/src/main/java/org/apache/geronimo/openwebbeans/deployment/OpenWebBeansModuleBuilderExtension.java?rev=944092&r1=944091&r2=944092&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans-builder/src/main/java/org/apache/geronimo/openwebbeans/deployment/OpenWebBeansModuleBuilderExtension.java
(original)
+++ geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans-builder/src/main/java/org/apache/geronimo/openwebbeans/deployment/OpenWebBeansModuleBuilderExtension.java
Fri May 14 03:32:54 2010
@@ -20,6 +20,7 @@ package org.apache.geronimo.openwebbeans
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -180,37 +181,13 @@ public class OpenWebBeansModuleBuilderEx
      *            spec DD for module
      * @param webModule
      *            module being deployed
-     * @return list of all managed bean classes from all faces-config xml files.
+     * @return list of all bean classes from libs that contains beans.xml.
      * @throws org.apache.geronimo.common.DeploymentException
-     *             if a faces-config.xml file is located but cannot be parsed.
+     *           
      */
     private List<Class> getManagedClasses(WebAppType webApp, WebModule webModule) throws
DeploymentException {
-        log.debug("getFacesClasses( " + webApp.toString() + "," + '\n'
-                + (webModule != null ? webModule.getName() : null) + " ): Entry");
-
-
-        Bundle bundle = webModule.getEarContext().getDeploymentBundle();
-        
-        
-
-        // 1. META-INF/beans.xml
-        List<Class> classes = new ArrayList<Class>();
-        
-        WebBeansScanner ws=new WebBeansScanner(bundle);
-        
-        ws.scanWebBeans();
-        
-        Set<Bean<?>> beanSet=ws.getWebBeans();
-        
-        for (Bean<?> bean:beanSet){
-            
-            classes.add(bean.getBeanClass()) ;
-            
-            log.error("-------------------------------bean.getBeanClass()="+bean.getBeanClass());
-            
-        }
-        
-        return classes;
+     
+        return Collections.EMPTY_LIST;
     }
 
     

Modified: geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans/pom.xml?rev=944092&r1=944091&r2=944092&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans/pom.xml (original)
+++ geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans/pom.xml Fri May 14 03:32:54
2010
@@ -84,11 +84,6 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.myfaces.core</groupId>
-            <artifactId>myfaces-api</artifactId>
-        </dependency>
-        
-        <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-annotation_1.1_spec</artifactId>
             <optional>true</optional>
@@ -102,47 +97,36 @@
         <dependency>
             <groupId>org.apache.servicemix.bundles</groupId>
             <artifactId>org.apache.servicemix.bundles.dom4j</artifactId>
-            <version>1.6.1_3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.servicemix.bundles</groupId>
             <artifactId>org.apache.servicemix.bundles.javassist</artifactId>
-            <version>3.7.ga_1-SNAPSHOT</version>
         </dependency>
         
         <dependency>
              <groupId>org.apache.geronimo.bundles</groupId>
              <artifactId>scannotation</artifactId>
-            <version>1.0.2_1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
              <groupId>org.apache.geronimo.bundles</groupId>
-            <artifactId>openwebbeans-spi</artifactId>
-            <version>1.0.0-SNAPSHOT_1-SNAPSHOT</version>            
+            <artifactId>openwebbeans-spi</artifactId>           
         </dependency>         
     
         <dependency>
              <groupId>org.apache.geronimo.bundles</groupId>
              <artifactId>openwebbeans-impl</artifactId>
-            <version>1.0.0-SNAPSHOT_1-SNAPSHOT</version>
         </dependency>
 
-       
-
         <dependency>
              <groupId>org.apache.geronimo.bundles</groupId>
-            <artifactId>openwebbeans-web</artifactId>
-            <version>1.0.0-SNAPSHOT_1-SNAPSHOT</version>            
+            <artifactId>openwebbeans-web</artifactId>         
         </dependency>  
-
-
-        
+      
         <dependency>
              <groupId>org.apache.geronimo.bundles</groupId>
-            <artifactId>openwebbeans-jsf</artifactId>
-            <version>1.0.0-SNAPSHOT_1-SNAPSHOT</version>            
+            <artifactId>openwebbeans-jsf</artifactId>        
         </dependency>
 
     </dependencies>

Modified: geronimo/server/trunk/plugins/openwebbeans/openwebbeans-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openwebbeans/openwebbeans-deployer/pom.xml?rev=944092&r1=944091&r2=944092&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openwebbeans/openwebbeans-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/openwebbeans/openwebbeans-deployer/pom.xml Fri May 14 03:32:54
2010
@@ -72,6 +72,7 @@
                         <dependency>
                             <groupId>org.apache.geronimo.configs</groupId>
                             <artifactId>openwebbeans</artifactId>
+                            <version>3.0-SNAPSHOT</version>
                             <type>car</type>
                             <import>classes</import>
                         </dependency>

Modified: geronimo/server/trunk/plugins/openwebbeans/openwebbeans/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openwebbeans/openwebbeans/src/main/history/dependencies.xml?rev=944092&r1=944091&r2=944092&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openwebbeans/openwebbeans/src/main/history/dependencies.xml
(original)
+++ geronimo/server/trunk/plugins/openwebbeans/openwebbeans/src/main/history/dependencies.xml
Fri May 14 03:32:54 2010
@@ -72,11 +72,6 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.myfaces.core</groupId>
-        <artifactId>myfaces-api</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.servicemix.bundles</groupId>
         <artifactId>org.apache.servicemix.bundles.dom4j</artifactId>
         <type>jar</type>

Modified: geronimo/server/trunk/plugins/openwebbeans/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openwebbeans/pom.xml?rev=944092&r1=944091&r2=944092&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openwebbeans/pom.xml (original)
+++ geronimo/server/trunk/plugins/openwebbeans/pom.xml Fri May 14 03:32:54 2010
@@ -36,6 +36,72 @@
         OpenWebBeans plugin
     </description>
 
+    <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.apache.geronimo.plugins</groupId>
+        <artifactId>myfaces</artifactId>
+        <version>3.0-SNAPSHOT</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+     
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-atinject_1.0_spec</artifactId>
+            <version>1.0</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jcdi_1.0_spec</artifactId>
+            <version>1.0</version>
+        </dependency>
+     
+     <dependency>
+            <groupId>org.apache.servicemix.bundles</groupId>
+            <artifactId>org.apache.servicemix.bundles.dom4j</artifactId>
+            <version>1.6.1_3-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.servicemix.bundles</groupId>
+            <artifactId>org.apache.servicemix.bundles.javassist</artifactId>
+            <version>3.7.ga_1-SNAPSHOT</version>
+        </dependency>
+        
+        <dependency>
+             <groupId>org.apache.geronimo.bundles</groupId>
+             <artifactId>scannotation</artifactId>
+            <version>1.0.2_1-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+             <groupId>org.apache.geronimo.bundles</groupId>
+            <artifactId>openwebbeans-spi</artifactId>
+            <version>1.0.0-SNAPSHOT_1-SNAPSHOT</version>            
+        </dependency>         
+    
+        <dependency>
+             <groupId>org.apache.geronimo.bundles</groupId>
+             <artifactId>openwebbeans-impl</artifactId>
+            <version>1.0.0-SNAPSHOT_1-SNAPSHOT</version>
+        </dependency>
+     
+        <dependency>
+             <groupId>org.apache.geronimo.bundles</groupId>
+            <artifactId>openwebbeans-web</artifactId>
+            <version>1.0.0-SNAPSHOT_1-SNAPSHOT</version>            
+        </dependency>  
+     
+        <dependency>
+             <groupId>org.apache.geronimo.bundles</groupId>
+            <artifactId>openwebbeans-jsf</artifactId>
+            <version>1.0.0-SNAPSHOT_1-SNAPSHOT</version>            
+        </dependency>
+    </dependencies>
+  </dependencyManagement>
+    
     <modules>
         <module>geronimo-openwebbeans</module>
         <module>geronimo-openwebbeans-builder</module>

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=944092&r1=944091&r2=944092&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Fri May 14 03:32:54 2010
@@ -88,6 +88,7 @@
         <!-- Deployers -->
         <gbeanDeployerBootstrap>org.apache.geronimo.framework/geronimo-gbean-deployer-bootstrap/${project.version}/car
         </gbeanDeployerBootstrap>
+
         <gbeanDeployer>org.apache.geronimo.framework/geronimo-gbean-deployer/${project.version}/car</gbeanDeployer>
         <j2eeDeployer>org.apache.geronimo.configs/j2ee-deployer/${project.version}/car</j2eeDeployer>
         <clientDeployer>org.apache.geronimo.configs/client-deployer/${project.version}/car</clientDeployer>
@@ -101,6 +102,9 @@
         <jettyDeployer>org.apache.geronimo.configs/${jetty}-deployer/${project.version}/car</jettyDeployer>
         <jasperDeployer>org.apache.geronimo.configs/jasper-deployer/${project.version}/car</jasperDeployer>
         <jpaDeployer>org.apache.geronimo.configs/persistence-jpa20-deployer/${project.version}/car</jpaDeployer>
+        <myfacesDeployer>org.apache.geronimo.configs/myfaces-deployer/${project.version}/car</myfacesDeployer>
+        <openwebbeansDeployer>org.apache.geronimo.configs/openwebbeans-deployer/${project.version}/car</openwebbeansDeployer>
+
 
         <!-- Common plan properties -->
         <planServerHostname>0.0.0.0</planServerHostname>



Mime
View raw message