geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From genspr...@apache.org
Subject svn commit: r936670 - in /geronimo/server/trunk/plugins/openwebbeans: ./ geronimo-openwebbeans-builder/src/main/java/org/apache/geronimo/openwebbeans/deployment/ geronimo-openwebbeans/ openwebbeans-deployer/ openwebbeans-deployer/src/main/history/ open...
Date Thu, 22 Apr 2010 09:18:12 GMT
Author: genspring
Date: Thu Apr 22 09:18:10 2010
New Revision: 936670

URL: http://svn.apache.org/viewvc?rev=936670&view=rev
Log:
GERONIMO-5219 Java EE Injection annotation scanning for 299 beans, make the sample start to
work.

Added:
    geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans-builder/src/main/java/org/apache/geronimo/openwebbeans/deployment/WebBeansScanner.java
  (with props)
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-deployer/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/openwebbeans/openwebbeans/pom.xml
    geronimo/server/trunk/plugins/openwebbeans/openwebbeans/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/openwebbeans/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=936670&r1=936669&r2=936670&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
Thu Apr 22 09:18:10 2010
@@ -17,14 +17,23 @@
 
 package org.apache.geronimo.openwebbeans.deployment;
 
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.jar.JarFile;
+
+import javax.enterprise.inject.spi.Bean;
+
 import org.apache.geronimo.common.DeploymentException;
 import org.apache.geronimo.deployment.ModuleIDBuilder;
 import org.apache.geronimo.deployment.service.EnvironmentBuilder;
 import org.apache.geronimo.gbean.AbstractName;
-import org.apache.geronimo.gbean.AbstractNameQuery;
 import org.apache.geronimo.gbean.GBeanData;
-import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoBuilder;
+import org.apache.geronimo.gbean.annotation.GBean;
 import org.apache.geronimo.gbean.annotation.ParamAttribute;
 import org.apache.geronimo.gbean.annotation.ParamReference;
 import org.apache.geronimo.j2ee.annotation.Holder;
@@ -39,24 +48,18 @@ import org.apache.geronimo.kernel.config
 import org.apache.geronimo.kernel.repository.Environment;
 import org.apache.geronimo.xbeans.javaee6.FullyQualifiedClassType;
 import org.apache.geronimo.xbeans.javaee6.ListenerType;
-import org.apache.geronimo.xbeans.javaee6.ServletType;
 import org.apache.geronimo.xbeans.javaee6.WebAppType;
+import org.apache.webbeans.servlet.WebBeansConfigurationListener;
 import org.apache.xbean.finder.ClassFinder;
 import org.apache.xmlbeans.XmlObject;
+import org.osgi.framework.Bundle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.jar.JarFile;
-
 /**
  * @version $Rev $Date
  */
+@GBean(j2eeType = NameFactory.MODULE_BUILDER)
 public class OpenWebBeansModuleBuilderExtension implements ModuleBuilderExtension {
 
     private static final Logger log = LoggerFactory.getLogger(OpenWebBeansModuleBuilderExtension.class);
@@ -64,63 +67,81 @@ public class OpenWebBeansModuleBuilderEx
     private final Environment defaultEnvironment;
     private final NamingBuilder namingBuilders;
 
-    private static final String CONTEXT_LISTENER_NAME = "";
+    private static final String CONTEXT_LISTENER_NAME = WebBeansConfigurationListener.class.getName();
 
-    public OpenWebBeansModuleBuilderExtension(Environment defaultEnvironment, NamingBuilder
namingBuilders) {
+    public OpenWebBeansModuleBuilderExtension(
+            @ParamAttribute(name = "defaultEnvironment") Environment defaultEnvironment,
+            @ParamReference(name = "NamingBuilders", namingType = NameFactory.MODULE_BUILDER)
NamingBuilder namingBuilders) {
         this.defaultEnvironment = defaultEnvironment;
         this.namingBuilders = namingBuilders;
     }
 
-    public void createModule(Module module, Object plan, JarFile moduleFile, String targetPath,
URL specDDUrl, Environment environment, Object moduleContextInfo, AbstractName earName, Naming
naming, ModuleIDBuilder idBuilder) throws DeploymentException {
+    public void createModule(Module module, Bundle bundle, Naming naming, ModuleIDBuilder
idBuilder)
+            throws DeploymentException {
         if (!(module instanceof WebModule)) {
-            //not a web module, nothing to do
+            // not a web module, nothing to do
             return;
         }
 
-        EnvironmentBuilder.mergeEnvironments(environment, defaultEnvironment);
+        EnvironmentBuilder.mergeEnvironments(module.getEnvironment(), defaultEnvironment);
+
     }
 
-    public void installModule(JarFile earFile, EARContext earContext, Module module, Collection
configurationStores, ConfigurationStore targetConfigurationStore, Collection repository) throws
DeploymentException {
+    public void createModule(Module module, Object plan, JarFile moduleFile, String targetPath,
URL specDDUrl,
+            Environment environment, Object moduleContextInfo, AbstractName earName, Naming
naming,
+            ModuleIDBuilder idBuilder) throws DeploymentException {
+
+        if (!(module instanceof WebModule)) {
+            // not a web module, nothing to do
+            return;
+        }
+
+        EnvironmentBuilder.mergeEnvironments(module.getEnvironment(), defaultEnvironment);
+
+    }
+
+    public void installModule(JarFile earFile, EARContext earContext, Module module, Collection
configurationStores,
+            ConfigurationStore targetConfigurationStore, Collection repository) throws DeploymentException
{
     }
 
-    public void initContext(EARContext earContext, Module module, ClassLoader cl) throws
DeploymentException {
+    public void initContext(EARContext earContext, Module module, Bundle bundle) throws DeploymentException
{
     }
 
-    public void addGBeans(EARContext earContext, Module module, ClassLoader cl, Collection
repository) throws DeploymentException {
+    public void addGBeans(EARContext earContext, Module module, Bundle bundle, Collection
repository)
+            throws DeploymentException {
         if (!(module instanceof WebModule)) {
-            //not a web module, nothing to do
+            // not a web module, nothing to do
             return;
         }
         WebModule webModule = (WebModule) module;
         WebAppType webApp = (WebAppType) webModule.getSpecDD();
 
-
         EARContext moduleContext = module.getEarContext();
         Map sharedContext = module.getSharedContext();
 
-        //add the ServletContextListener to the web app context
+        // add the ServletContextListener to the web app context
         GBeanData webAppData = (GBeanData) sharedContext.get(WebModule.WEB_APP_DATA);
 
-        //jetty specific support
+        // jetty specific support
         Object value = webAppData.getAttribute("listenerClassNames");
         if (value instanceof Collection && !((Collection) value).contains(CONTEXT_LISTENER_NAME))
{
             ((Collection<String>) value).add(CONTEXT_LISTENER_NAME);
         } else {
-            //try to add listener to the web app xml
+            // try to add listener to the web app xml
             ListenerType listenerType = webApp.addNewListener();
             FullyQualifiedClassType className = listenerType.addNewListenerClass();
             className.setStringValue(CONTEXT_LISTENER_NAME);
         }
 
         AbstractName moduleName = moduleContext.getModuleName();
-        Map<NamingBuilder.Key, Object> buildingContext = new HashMap<NamingBuilder.Key,
Object>();
+        Map<EARContext.Key, Object> buildingContext = new HashMap<EARContext.Key,
Object>();
         buildingContext.put(NamingBuilder.GBEAN_NAME_KEY, moduleName);
 
-        //use the same jndi context as the web app
+        // use the same jndi context as the web app
         Map compContext = NamingBuilder.JNDI_KEY.get(module.getSharedContext());
         buildingContext.put(NamingBuilder.JNDI_KEY, compContext);
 
-        //use the same holder object as the web app.
+        // use the same holder object as the web app.
         Holder holder = NamingBuilder.INJECTION_KEY.get(sharedContext);
         buildingContext.put(NamingBuilder.INJECTION_KEY, holder);
 
@@ -133,47 +154,65 @@ public class OpenWebBeansModuleBuilderEx
 
     }
 
-    protected ClassFinder createOpenWebBeansClassFinder(WebAppType webApp, WebModule webModule)
throws DeploymentException {
+    protected ClassFinder createOpenWebBeansClassFinder(WebAppType webApp, WebModule webModule)
+            throws DeploymentException {
 
         List<Class> classes = getManagedClasses(webApp, webModule);
         return new ClassFinder(classes);
     }
 
-
+    /**
+     * getManagedClasses()
+     * <p/>
+     * <p>
+     * Locations to search for the webbean configuration file(s):
+     * <ol>
+     * <li>META-INF/beans.xml
+     * <li>WEB-INF/beans.xml
+     * </ol>
+     * <p/>
+     * <p>
+     * <strong>Notes:</strong>
+     * <ul>
+     * </ul>
+     * 
+     * @param webApp
+     *            spec DD for module
+     * @param webModule
+     *            module being deployed
+     * @return list of all managed bean classes from all faces-config xml files.
+     * @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("getManagedClasses( " + webApp.toString() + "," + '\n' +
-                (webModule != null ? webModule.getName() : null) + " ): Entry");
+        log.debug("getFacesClasses( " + webApp.toString() + "," + '\n'
+                + (webModule != null ? webModule.getName() : null) + " ): Entry");
 
-        // Get the classloader from the module's EARContext
-        ClassLoader classLoader = webModule.getEarContext().getClassLoader();
-
-        List<Class> classes = new ArrayList<Class>();
 
-        // Look for all META-INF/beans.xml files and process those urls
+        Bundle bundle = webModule.getEarContext().getDeploymentBundle();
+        
+        
 
-        // Add the managed bean classes
-
-        log.debug("getManagedClasses() Exit: " + classes.size() + " " + classes.toString());
-
-        // return the managed bean classes
+        // 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;
     }
 
-    public static final GBeanInfo GBEAN_INFO;
-
-    static {
-        GBeanInfoBuilder infoBuilder = GBeanInfoBuilder.createStatic(OpenWebBeansModuleBuilderExtension.class,
NameFactory.MODULE_BUILDER);
-        infoBuilder.addAttribute("defaultEnvironment", Environment.class, true, true);
-        infoBuilder.addReference("NamingBuilders", NamingBuilder.class, NameFactory.MODULE_BUILDER);
-
-        infoBuilder.setConstructor(new String[]{
-                "defaultEnvironment",
-                "NamingBuilders"});
-        GBEAN_INFO = infoBuilder.getBeanInfo();
-    }
-
-    public static GBeanInfo getGBeanInfo() {
-        return GBEAN_INFO;
-    }
+    
 
 }

Added: geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans-builder/src/main/java/org/apache/geronimo/openwebbeans/deployment/WebBeansScanner.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans-builder/src/main/java/org/apache/geronimo/openwebbeans/deployment/WebBeansScanner.java?rev=936670&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans-builder/src/main/java/org/apache/geronimo/openwebbeans/deployment/WebBeansScanner.java
(added)
+++ geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans-builder/src/main/java/org/apache/geronimo/openwebbeans/deployment/WebBeansScanner.java
Thu Apr 22 09:18:10 2010
@@ -0,0 +1,73 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with this
+ * work for additional information regarding copyright ownership. The ASF
+ * licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law
+ * or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+package org.apache.geronimo.openwebbeans.deployment;
+
+import java.util.Collections;
+import java.util.Set;
+
+import javax.enterprise.inject.spi.Bean;
+
+import org.apache.webbeans.spi.ContextsService;
+import org.apache.webbeans.spi.JNDIService;
+import org.apache.webbeans.spi.ScannerService;
+import org.osgi.framework.Bundle;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * @version $Rev $Date
+ */
+public final class WebBeansScanner {
+    // Logger instance
+    private static final Logger logger = LoggerFactory.getLogger(WebBeansScanner.class);
+
+    /** Root container. */
+    // Activities are removed from the specification.
+   // private final BeanManagerImpl rootManager;
+
+    /** XML discovery. */
+    // XML discovery is removed from the specification. It is here for next revisions of
spec.
+   // private final WebBeansXMLConfigurator xmlDeployer;
+
+    /** Deploy discovered beans */
+   // 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.
+     */
+    public WebBeansScanner(Bundle _bundle) {
+        
+        this.bundle=_bundle;
+    }
+
+    public void scanWebBeans() {
+
+       //scan webbeans here
+
+    }
+
+    Set<Bean<?>> getWebBeans() {
+
+        return Collections.EMPTY_SET;
+    }
+
+}
\ No newline at end of file

Propchange: geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans-builder/src/main/java/org/apache/geronimo/openwebbeans/deployment/WebBeansScanner.java
------------------------------------------------------------------------------
    svn:eol-style = native

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=936670&r1=936669&r2=936670&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans/pom.xml (original)
+++ geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans/pom.xml Thu Apr 22 09:18:10
2010
@@ -34,6 +34,7 @@
     <name>Geronimo Plugins, OpenWebBeans :: Core</name>
     
     <dependencies>
+    
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-j2ee</artifactId>
@@ -46,10 +47,105 @@
             <version>${version}</version>
         </dependency>
         
+         <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-atinject_1.0_spec</artifactId>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jcdi_1.0_spec</artifactId>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-interceptor_1.1_spec</artifactId>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-el_2.2_spec</artifactId>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jta_1.1_spec</artifactId>
+            <optional>true</optional>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-servlet_3.0_spec</artifactId>
+        </dependency>        
+        
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jsp_2.2_spec</artifactId>
+        </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>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-validation_1.0_spec</artifactId>
+        </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.openwebbeans</groupId>
-            <artifactId>openwebbeans-impl</artifactId>
+            <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>
+    
 
 </project>

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=936670&r1=936669&r2=936670&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openwebbeans/openwebbeans-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/openwebbeans/openwebbeans-deployer/pom.xml Thu Apr 22 09:18:10
2010
@@ -1,38 +1,42 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
+    <!--
+        Licensed to the Apache Software Foundation (ASF) under one or
+        more contributor license agreements. See the NOTICE file
+        distributed with this work for additional information regarding
+        copyright ownership. The ASF licenses this file to You under the
+        Apache License, Version 2.0 (the "License"); you may not use
+        this file except in compliance with the License. You may obtain
+        a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0 Unless required by
+        applicable law or agreed to in writing, software distributed
+        under the License is distributed on an "AS IS" BASIS, WITHOUT
+        WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+        See the License for the specific language governing permissions
+        and limitations under the License.
+    -->
+
+    <!--
+        $Rev: 805240 $ $Date: 2009-08-17 18:02:22 -0700 (Mon, 17 Aug
+        2009) $
+    -->
 
-<!-- $Rev: 805240 $ $Date: 2009-08-17 18:02:22 -0700 (Mon, 17 Aug 2009) $ -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
-    
+
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>openwebbeans</artifactId>
         <version>3.0-SNAPSHOT</version>
     </parent>
-    
+
     <groupId>org.apache.geronimo.configs</groupId>
     <artifactId>openwebbeans-deployer</artifactId>
     <name>Geronimo Plugins, OpenWebBeans :: Deployer</name>
     <packaging>car</packaging>
-    
+
     <dependencies>
         <!-- parent -->
         <dependency>
@@ -41,14 +45,15 @@
             <version>${version}</version>
             <type>car</type>
         </dependency>
-        
+
+
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>openwebbeans</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
-        
+
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-openwebbeans-builder</artifactId>

Modified: geronimo/server/trunk/plugins/openwebbeans/openwebbeans-deployer/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openwebbeans/openwebbeans-deployer/src/main/history/dependencies.xml?rev=936670&r1=936669&r2=936670&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openwebbeans/openwebbeans-deployer/src/main/history/dependencies.xml
(original)
+++ geronimo/server/trunk/plugins/openwebbeans/openwebbeans-deployer/src/main/history/dependencies.xml
Thu Apr 22 09:18:10 2010
@@ -11,7 +11,7 @@
         <artifactId>j2ee-deployer</artifactId>
         <type>car</type>
     </dependency>
-    <dependency start="true">
+    <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>openwebbeans</artifactId>
         <type>car</type>

Modified: geronimo/server/trunk/plugins/openwebbeans/openwebbeans/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openwebbeans/openwebbeans/pom.xml?rev=936670&r1=936669&r2=936670&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openwebbeans/openwebbeans/pom.xml (original)
+++ geronimo/server/trunk/plugins/openwebbeans/openwebbeans/pom.xml Thu Apr 22 09:18:10 2010
@@ -58,10 +58,6 @@
             <version>${version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.openwebbeans</groupId>
-            <artifactId>openwebbeans-impl</artifactId>
-        </dependency>
 
     </dependencies>
 

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=936670&r1=936669&r2=936670&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
Thu Apr 22 09:18:10 2010
@@ -7,6 +7,31 @@
         <type>car</type>
     </module-id>
     <dependency>
+        <groupId>org.apache.geronimo.bundles</groupId>
+        <artifactId>openwebbeans-impl</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.bundles</groupId>
+        <artifactId>openwebbeans-jsf</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.bundles</groupId>
+        <artifactId>openwebbeans-spi</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.bundles</groupId>
+        <artifactId>openwebbeans-web</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.bundles</groupId>
+        <artifactId>scannotation</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>j2ee-server</artifactId>
         <type>car</type>
@@ -17,29 +42,48 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.openwebbeans</groupId>
-        <artifactId>openwebbeans-impl</artifactId>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-atinject_1.0_spec</artifactId>
         <type>jar</type>
     </dependency>
-
     <dependency>
-        <groupId>dom4j</groupId>
-        <artifactId>dom4j</artifactId>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-el_2.2_spec</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>javassist</groupId>
-        <artifactId>javassist</artifactId>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-interceptor_1.1_spec</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>net.sf.scannotation</groupId>
-        <artifactId>scannotation</artifactId>
+        <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>
+    <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-validation_1.0_spec</artifactId>
+        <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>
     </dependency>
     <dependency>
-        <groupId>org.apache.openwebbeans</groupId>
-        <artifactId>openwebbeans-api</artifactId>
+        <groupId>org.apache.servicemix.bundles</groupId>
+        <artifactId>org.apache.servicemix.bundles.javassist</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>

Modified: geronimo/server/trunk/plugins/openwebbeans/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openwebbeans/pom.xml?rev=936670&r1=936669&r2=936670&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openwebbeans/pom.xml (original)
+++ geronimo/server/trunk/plugins/openwebbeans/pom.xml Thu Apr 22 09:18:10 2010
@@ -43,14 +43,5 @@
         <module>openwebbeans-deployer</module>
     </modules>
     
-    <dependencyManagement>
-        <dependencies>
-	    <dependency>
-	        <groupId>org.apache.openwebbeans</groupId>
-		<artifactId>openwebbeans-impl</artifactId>
-		<version>1.0.0-incubating-SNAPSHOT</version>
-	    </dependency>
-	</dependencies>
-    </dependencyManagement>
 
 </project>



Mime
View raw message