geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r1145433 - in /geronimo/server/trunk/plugins: jetty8/geronimo-jetty8/src/main/java/org/apache/geronimo/jetty8/ jetty8/geronimo-jetty8/src/main/java/org/apache/geronimo/jetty8/handler/ openejb/geronimo-openejb/src/main/java/org/apache/geroni...
Date Tue, 12 Jul 2011 02:26:30 GMT
Author: djencks
Date: Tue Jul 12 02:26:29 2011
New Revision: 1145433

URL: http://svn.apache.org/viewvc?rev=1145433&view=rev
Log:
GERONIMO-5050 Use more explicit initialization of owb rather than relying on properties. 
Start integrating the needed changes

Modified:
    geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/src/main/java/org/apache/geronimo/jetty8/WebAppContextWrapper.java
    geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/src/main/java/org/apache/geronimo/jetty8/handler/IntegrationContext.java
    geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/ThreadSingletonServiceAdapter.java
    geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans/pom.xml
    geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/OpenWebBeansWebInitializer.java
    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
    geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/GeronimoStandardContext.java
    geronimo/server/trunk/plugins/tomcat/tomcat7/src/main/history/dependencies.xml

Modified: geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/src/main/java/org/apache/geronimo/jetty8/WebAppContextWrapper.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/src/main/java/org/apache/geronimo/jetty8/WebAppContextWrapper.java?rev=1145433&r1=1145432&r2=1145433&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/src/main/java/org/apache/geronimo/jetty8/WebAppContextWrapper.java
(original)
+++ geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/src/main/java/org/apache/geronimo/jetty8/WebAppContextWrapper.java
Tue Jul 12 02:26:29 2011
@@ -220,9 +220,7 @@ public class WebAppContextWrapper implem
             }
         }
 
-        final WebBeansContext owbContext = (sharedOwbContext == null) ? new WebBeansContext()
: sharedOwbContext.getOWBContext();
-
-        IntegrationContext integrationContext = new IntegrationContext(componentContext,
unshareableResources, applicationManagedSecurityResources, trackedConnectionAssociator, userTransaction,
bundle, holder, servletContainerInitializerMap, owbContext);
+        IntegrationContext integrationContext = new IntegrationContext(componentContext,
unshareableResources, applicationManagedSecurityResources, trackedConnectionAssociator, userTransaction,
bundle, holder, servletContainerInitializerMap);
         webAppContext = new GeronimoWebAppContext(securityHandler, sessionHandler, servletHandler,
null, integrationContext, classLoader, modulePath, webAppInfo, policyContextID, applicationPolicyConfigurationManager);
         webAppContext.setContextPath(contextPath);
         //See Jetty-386.  Setting this to true can expose secured content.
@@ -305,7 +303,16 @@ public class WebAppContextWrapper implem
         webAppContext.setAttribute(JASPER_WEB_XML_NAME, originalSpecDD);
         if (sharedOwbContext == null) {
             //we have to initialize the owb context
-            new OpenWebBeansWebInitializer(integrationContext.getOWBContext(), webAppContext.getServletContext());
+            Thread thread = Thread.currentThread();
+            ClassLoader cl = thread.getContextClassLoader();
+            thread.setContextClassLoader(classLoader);
+            try {
+                integrationContext.setOwbContext(OpenWebBeansWebInitializer.newWebBeansContext(webAppContext.getServletContext()));
+            } finally {
+                thread.setContextClassLoader(cl);
+            }
+        } else {
+            integrationContext.setOwbContext(sharedOwbContext.getOWBContext());
         }
     }
 

Modified: geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/src/main/java/org/apache/geronimo/jetty8/handler/IntegrationContext.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/src/main/java/org/apache/geronimo/jetty8/handler/IntegrationContext.java?rev=1145433&r1=1145432&r2=1145433&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/src/main/java/org/apache/geronimo/jetty8/handler/IntegrationContext.java
(original)
+++ geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/src/main/java/org/apache/geronimo/jetty8/handler/IntegrationContext.java
Tue Jul 12 02:26:29 2011
@@ -56,9 +56,9 @@ public class IntegrationContext {
     private final Bundle bundle;
     private final Holder holder;
     private final Map<ServletContainerInitializer, Set<Class<?>>> servletContainerInitializerMap;
-    private final WebBeansContext owbContext;
+    private WebBeansContext owbContext;
 
-    public IntegrationContext(Context componentContext, Set<String> unshareableResources,
Set<String> applicationManagedSecurityResources, TrackedConnectionAssociator trackedConnectionAssociator,
UserTransaction userTransaction, Bundle bundle, Holder holder, Map<ServletContainerInitializer,
Set<Class<?>>> servletContainerInitializerMap, WebBeansContext webBeansContext)
{
+    public IntegrationContext(Context componentContext, Set<String> unshareableResources,
Set<String> applicationManagedSecurityResources, TrackedConnectionAssociator trackedConnectionAssociator,
UserTransaction userTransaction, Bundle bundle, Holder holder, Map<ServletContainerInitializer,
Set<Class<?>>> servletContainerInitializerMap) {
         this.componentContext = componentContext;
         this.unshareableResources = unshareableResources;
         this.applicationManagedSecurityResources = applicationManagedSecurityResources;
@@ -67,7 +67,6 @@ public class IntegrationContext {
         this.bundle = bundle;
         this.holder = holder;
         this.servletContainerInitializerMap = servletContainerInitializerMap == null? Collections.<ServletContainerInitializer,
Set<Class<?>>>emptyMap(): servletContainerInitializerMap;
-        this.owbContext = webBeansContext;
     }
 
     public Context getComponentContext() {
@@ -186,6 +185,10 @@ public class IntegrationContext {
         GeronimoSingletonService.contextExited(oldOWBContext);
     }
 
+    public void setOwbContext(WebBeansContext owbContext) {
+        this.owbContext = owbContext;
+    }
+
     public WebBeansContext getOWBContext() {
         return owbContext;
     }

Modified: geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/ThreadSingletonServiceAdapter.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/ThreadSingletonServiceAdapter.java?rev=1145433&r1=1145432&r2=1145433&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/ThreadSingletonServiceAdapter.java
(original)
+++ geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/ThreadSingletonServiceAdapter.java
Tue Jul 12 02:26:29 2011
@@ -20,6 +20,11 @@
 
 package org.apache.geronimo.openejb;
 
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+
+import org.apache.geronimo.openwebbeans.GeronimoResourceInjectionService;
 import org.apache.geronimo.openwebbeans.GeronimoSingletonService;
 import org.apache.geronimo.openwebbeans.OpenWebBeansWebInitializer;
 import org.apache.geronimo.openwebbeans.OsgiMetaDataScannerService;
@@ -30,8 +35,19 @@ import org.apache.openejb.cdi.StartupObj
 import org.apache.openejb.cdi.ThreadSingletonService;
 import org.apache.webbeans.config.OpenWebBeansConfiguration;
 import org.apache.webbeans.config.WebBeansContext;
+import org.apache.webbeans.corespi.security.ManagedSecurityService;
+import org.apache.webbeans.el.el22.EL22Adaptor;
+import org.apache.webbeans.jsf.DefaultConversationService;
 import org.apache.webbeans.spi.ContainerLifecycle;
+import org.apache.webbeans.spi.ContextsService;
+import org.apache.webbeans.spi.ConversationService;
+import org.apache.webbeans.spi.JNDIService;
 import org.apache.webbeans.spi.ResourceInjectionService;
+import org.apache.webbeans.spi.ScannerService;
+import org.apache.webbeans.spi.SecurityService;
+import org.apache.webbeans.spi.adaptor.ELAdaptor;
+import org.apache.webbeans.web.context.WebContextsService;
+import org.apache.webbeans.web.lifecycle.WebContainerLifecycle;
 
 /**
  * @version $Rev$ $Date$
@@ -54,13 +70,33 @@ public class ThreadSingletonServiceAdapt
         Object old = contextEntered(null);
         try {
             if (old == null) {
-                webBeansContext = new WebBeansContext();
+                Properties properties = new Properties();
+                Map<Class<?>, Object> services = new HashMap<Class<?>,
Object>();
+//                properties.setProperty(OpenWebBeansConfiguration.APPLICATION_IS_JSP, "true");
+                properties.setProperty(OpenWebBeansConfiguration.USE_EJB_DISCOVERY, "true");
+                //from CDI builder
+                properties.setProperty(OpenWebBeansConfiguration.INTERCEPTOR_FORCE_NO_CHECKED_EXCEPTIONS,
"false");
+
+                properties.setProperty(SecurityService.class.getName(), ManagedSecurityService.class.getName());
+                properties.setProperty(OpenWebBeansConfiguration.CONVERSATION_PERIODIC_DELAY,
"1800000");
+                properties.setProperty(OpenWebBeansConfiguration.APPLICATION_SUPPORTS_CONVERSATION,
"true");
+                properties.setProperty(OpenWebBeansConfiguration.IGNORED_INTERFACES, "org.apache.aries.proxy.weaving.WovenProxy");
+
+                services.put(JNDIService.class, new OpenWebBeansWebInitializer.NoopJndiService());
+                services.put(ELAdaptor.class, new EL22Adaptor());
+                services.put(ConversationService.class, new DefaultConversationService());
+                services.put(ContextsService.class, new CdiAppContextsService());
+                services.put(ResourceInjectionService.class, new CdiResourceInjectionService());
+                webBeansContext = new WebBeansContext(services, properties);
+                webBeansContext.registerService(ScannerService.class, new OsgiMetaDataScannerService(webBeansContext));
                 contextEntered(webBeansContext);
+                ContainerLifecycle lifecycle = new OpenEJBLifecycle();
+                webBeansContext.registerService(ContainerLifecycle.class, lifecycle);
                 try {
                     //not embedded. Are we the first ejb module to try this?
                     startupObject.getAppContext().set(WebBeansContext.class, webBeansContext);
-                    setConfiguration(webBeansContext.getOpenWebBeansConfiguration());
-                    webBeansContext.getService(ContainerLifecycle.class).startApplication(startupObject);
+//                    setConfiguration(webBeansContext.getOpenWebBeansConfiguration());
+                    lifecycle.startApplication(startupObject);
                 } catch (Exception e) {
                     throw new RuntimeException("couldn't start owb context", e);
                 } finally {
@@ -76,18 +112,18 @@ public class ThreadSingletonServiceAdapt
         }
     }
 
-    private void setConfiguration(OpenWebBeansConfiguration configuration) {
-        configuration.setProperty(OpenWebBeansConfiguration.USE_EJB_DISCOVERY, "true");
-        //from CDI builder
-        configuration.setProperty(OpenWebBeansConfiguration.INTERCEPTOR_FORCE_NO_CHECKED_EXCEPTIONS,
"false");
-
-        configuration.setProperty(OpenWebBeansConfiguration.CONTAINER_LIFECYCLE, OpenEJBLifecycle.class.getName());
-        configuration.setProperty(OpenWebBeansConfiguration.JNDI_SERVICE, OpenWebBeansWebInitializer.NoopJndiService.class.getName());
-        configuration.setProperty(OpenWebBeansConfiguration.SCANNER_SERVICE, OsgiMetaDataScannerService.class.getName());
-        configuration.setProperty(OpenWebBeansConfiguration.CONTEXTS_SERVICE, CdiAppContextsService.class.getName());
-        configuration.setProperty(ResourceInjectionService.class.getName(), CdiResourceInjectionService.class.getName());
-//        configuration.setProperty(ELAdaptor.class.getName(), EL22Adaptor.class.getName());
-    }
+//    private void setConfiguration(OpenWebBeansConfiguration configuration) {
+//        configuration.setProperty(OpenWebBeansConfiguration.USE_EJB_DISCOVERY, "true");
+//        //from CDI builder
+//        configuration.setProperty(OpenWebBeansConfiguration.INTERCEPTOR_FORCE_NO_CHECKED_EXCEPTIONS,
"false");
+//
+//        configuration.setProperty(OpenWebBeansConfiguration.CONTAINER_LIFECYCLE, OpenEJBLifecycle.class.getName());
+//        configuration.setProperty(OpenWebBeansConfiguration.JNDI_SERVICE, OpenWebBeansWebInitializer.NoopJndiService.class.getName());
+//        configuration.setProperty(OpenWebBeansConfiguration.SCANNER_SERVICE, OsgiMetaDataScannerService.class.getName());
+//        configuration.setProperty(OpenWebBeansConfiguration.CONTEXTS_SERVICE, CdiAppContextsService.class.getName());
+//        configuration.setProperty(ResourceInjectionService.class.getName(), CdiResourceInjectionService.class.getName());
+////        configuration.setProperty(ELAdaptor.class.getName(), EL22Adaptor.class.getName());
+//    }
 
     @Override
     public Object contextEntered(WebBeansContext owbContext) {

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=1145433&r1=1145432&r2=1145433&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans/pom.xml (original)
+++ geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans/pom.xml Tue Jul 12 02:26:29
2011
@@ -154,11 +154,6 @@
     
         <dependency>
             <groupId>org.apache.openwebbeans</groupId>
-            <artifactId>openwebbeans-impl</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.openwebbeans</groupId>
             <artifactId>openwebbeans-web</artifactId>         
         </dependency>              
 
@@ -167,7 +162,30 @@
             <artifactId>openwebbeans-resource</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.openwebbeans</groupId>
+            <artifactId>openwebbeans-impl</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.openwebbeans</groupId>
+            <artifactId>openwebbeans-jsf</artifactId>
+        </dependency>
+
     </dependencies>
-    
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Export-SPI-Provider>org.apache.geronimo.openwebbeans.WebBeansConfigurationListener</Export-SPI-Provider>
+                    </instructions>
+                </configuration>
+            </plugin>
+
+        </plugins>
+    </build>
+
 
 </project>

Modified: geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/OpenWebBeansWebInitializer.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/OpenWebBeansWebInitializer.java?rev=1145433&r1=1145432&r2=1145433&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/OpenWebBeansWebInitializer.java
(original)
+++ geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/OpenWebBeansWebInitializer.java
Tue Jul 12 02:26:29 2011
@@ -19,14 +19,25 @@
 
 package org.apache.geronimo.openwebbeans;
 
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+
 import javax.servlet.ServletContext;
 import javax.servlet.ServletContextEvent;
 import org.apache.webbeans.config.OpenWebBeansConfiguration;
 import org.apache.webbeans.config.WebBeansContext;
+import org.apache.webbeans.corespi.security.ManagedSecurityService;
 import org.apache.webbeans.el.el22.EL22Adaptor;
+import org.apache.webbeans.jsf.DefaultConversationService;
 import org.apache.webbeans.spi.ContainerLifecycle;
+import org.apache.webbeans.spi.ContextsService;
+import org.apache.webbeans.spi.ConversationService;
 import org.apache.webbeans.spi.JNDIService;
 import org.apache.webbeans.spi.ResourceInjectionService;
+import org.apache.webbeans.spi.ScannerService;
+import org.apache.webbeans.spi.SecurityService;
 import org.apache.webbeans.spi.adaptor.ELAdaptor;
 import org.apache.webbeans.util.WebBeansUtil;
 import org.apache.webbeans.web.context.WebContextsService;
@@ -37,11 +48,49 @@ import org.apache.webbeans.web.lifecycle
  */
 public class OpenWebBeansWebInitializer {
 
+    public static WebBeansContext newWebBeansContext(ServletContext servletContext) {
+        Properties properties = new Properties();
+        Map<Class<?>, Object> services = new HashMap<Class<?>, Object>();
+        properties.setProperty(OpenWebBeansConfiguration.APPLICATION_IS_JSP, "true");
+        properties.setProperty(SecurityService.class.getName(), ManagedSecurityService.class.getName());
+        properties.setProperty(OpenWebBeansConfiguration.CONVERSATION_PERIODIC_DELAY, "1800000");
+        properties.setProperty(OpenWebBeansConfiguration.APPLICATION_SUPPORTS_CONVERSATION,
"true");
+        properties.setProperty(OpenWebBeansConfiguration.IGNORED_INTERFACES, "org.apache.aries.proxy.weaving.WovenProxy");
+
+        services.put(JNDIService.class, new NoopJndiService());
+        services.put(ELAdaptor.class, new EL22Adaptor());
+        services.put(ConversationService.class, new DefaultConversationService());
+        WebBeansContext webBeansContext = new WebBeansContext(services, properties);
+        webBeansContext.registerService(ScannerService.class, new OsgiMetaDataScannerService(webBeansContext));
+        webBeansContext.registerService(ContextsService.class, new WebContextsService(webBeansContext));
+        webBeansContext.registerService(ResourceInjectionService.class, new GeronimoResourceInjectionService(webBeansContext));
+        //must be last since it idiotically copies stuff
+        WebContainerLifecycle lifecycle = new WebContainerLifecycle(webBeansContext);
+        webBeansContext.registerService(ContainerLifecycle.class, lifecycle);
+        if (servletContext != null) {
+            GeronimoSingletonService.contextEntered(webBeansContext);
+            try {
+                //from OWB's WebBeansConfigurationListener
+
+                try {
+                    lifecycle.startApplication(new ServletContextEvent(servletContext));
+                } catch (Exception e) {
+                    //             logger.error(OWBLogConst.ERROR_0018, event.getServletContext().getContextPath());
+                    WebBeansUtil.throwRuntimeExceptions(e);
+                }
+
+            } finally {
+                GeronimoSingletonService.contextExited(null);
+            }
+        }
+        return webBeansContext;
+    }
+
     public OpenWebBeansWebInitializer(WebBeansContext webBeansContext, ServletContext servletContext)
{
         GeronimoSingletonService.contextEntered(webBeansContext);
 
         try {
-            setConfiguration(webBeansContext.getOpenWebBeansConfiguration());
+            setConfiguration(webBeansContext);
             //from OWB's WebBeansConfigurationListener
             if (servletContext != null) {
                 ContainerLifecycle lifeCycle = webBeansContext.getService(ContainerLifecycle.class);
@@ -60,15 +109,23 @@ public class OpenWebBeansWebInitializer 
         }
     }
 
-    private void setConfiguration(OpenWebBeansConfiguration configuration) {
+    private void setConfiguration(WebBeansContext webBeansContext) {
+        OpenWebBeansConfiguration configuration = webBeansContext.getOpenWebBeansConfiguration();
         configuration.setProperty(OpenWebBeansConfiguration.APPLICATION_IS_JSP, "true");
 
-        configuration.setProperty(OpenWebBeansConfiguration.CONTAINER_LIFECYCLE, WebContainerLifecycle.class.getName());
-        configuration.setProperty(OpenWebBeansConfiguration.JNDI_SERVICE, NoopJndiService.class.getName());
-        configuration.setProperty(OpenWebBeansConfiguration.SCANNER_SERVICE, OsgiMetaDataScannerService.class.getName());
-        configuration.setProperty(OpenWebBeansConfiguration.CONTEXTS_SERVICE, WebContextsService.class.getName());
-        configuration.setProperty(OpenWebBeansConfiguration.RESOURCE_INJECTION_SERVICE, GeronimoResourceInjectionService.class.getName());
-        configuration.setProperty(OpenWebBeansConfiguration.EL_ADAPTOR_CLASS, EL22Adaptor.class.getName());
+        webBeansContext.registerService(JNDIService.class, new NoopJndiService());
+        webBeansContext.registerService(ScannerService.class, new OsgiMetaDataScannerService(webBeansContext));
+        webBeansContext.registerService(ContextsService.class, new WebContextsService(webBeansContext));
+        webBeansContext.registerService(ResourceInjectionService.class, new GeronimoResourceInjectionService(webBeansContext));
+        webBeansContext.registerService(ELAdaptor.class, new EL22Adaptor());
+        //must be last since it idiotically copies stuff
+        webBeansContext.registerService(ContainerLifecycle.class, new WebContainerLifecycle());
+//        configuration.setProperty(OpenWebBeansConfiguration.CONTAINER_LIFECYCLE, WebContainerLifecycle.class.getName());
+//        configuration.setProperty(OpenWebBeansConfiguration.JNDI_SERVICE, NoopJndiService.class.getName());
+//        configuration.setProperty(OpenWebBeansConfiguration.SCANNER_SERVICE, OsgiMetaDataScannerService.class.getName());
+//        configuration.setProperty(OpenWebBeansConfiguration.CONTEXTS_SERVICE, WebContextsService.class.getName());
+//        configuration.setProperty(OpenWebBeansConfiguration.RESOURCE_INJECTION_SERVICE,
GeronimoResourceInjectionService.class.getName());
+//        configuration.setProperty(OpenWebBeansConfiguration.EL_ADAPTOR_CLASS, EL22Adaptor.class.getName());
     }
 
     public static class NoopJndiService implements JNDIService {

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=1145433&r1=1145432&r2=1145433&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openwebbeans/openwebbeans-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/openwebbeans/openwebbeans-deployer/pom.xml Tue Jul 12 02:26:29
2011
@@ -47,6 +47,11 @@
 
 
         <dependency>
+            <groupId>org.apache.openwebbeans</groupId>
+            <artifactId>openwebbeans-jsf</artifactId>
+        </dependency>
+
+        <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>openwebbeans</artifactId>
             <version>${project.version}</version>
@@ -54,11 +59,6 @@
         </dependency>
         
         <dependency>
-            <groupId>org.apache.openwebbeans</groupId>
-            <artifactId>openwebbeans-jsf</artifactId>
-        </dependency>
-
-        <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-openwebbeans-builder</artifactId>
             <version>${project.version}</version>

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=1145433&r1=1145432&r2=1145433&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
Tue Jul 12 02:26:29 2011
@@ -21,9 +21,4 @@
         <artifactId>geronimo-openwebbeans-builder</artifactId>
         <type>jar</type>
     </dependency>
-    <dependency>
-        <groupId>org.apache.openwebbeans</groupId>
-        <artifactId>openwebbeans-jsf</artifactId>
-        <type>jar</type>
-    </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/plugins/openwebbeans/openwebbeans/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openwebbeans/openwebbeans/pom.xml?rev=1145433&r1=1145432&r2=1145433&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openwebbeans/openwebbeans/pom.xml (original)
+++ geronimo/server/trunk/plugins/openwebbeans/openwebbeans/pom.xml Tue Jul 12 02:26:29 2011
@@ -34,7 +34,19 @@
     <packaging>car</packaging>
 
     <description>Geronimo OpenWebBeans 299 integration</description>
-    
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>myfaces</artifactId>
+                <version>${project.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
@@ -57,7 +69,14 @@
             <artifactId>geronimo-openwebbeans</artifactId>
             <version>${project.version}</version>
         </dependency>
-
+        <dependency>
+            <groupId>org.apache.myfaces.core</groupId>
+            <artifactId>myfaces-bundle</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>commons-collections</groupId>
+            <artifactId>commons-collections</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

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=1145433&r1=1145432&r2=1145433&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
Tue Jul 12 02:26:29 2011
@@ -12,6 +12,11 @@
         <type>jar</type>
     </dependency>
     <dependency>
+        <groupId>commons-collections</groupId>
+        <artifactId>commons-collections</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>org.apache.geronimo.bundles</groupId>
         <artifactId>commons-digester</artifactId>
         <type>jar</type>
@@ -58,6 +63,11 @@
     </dependency>
     <dependency>
         <groupId>org.apache.openwebbeans</groupId>
+        <artifactId>openwebbeans-jsf</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.openwebbeans</groupId>
         <artifactId>openwebbeans-resource</artifactId>
         <type>jar</type>
     </dependency>

Modified: geronimo/server/trunk/plugins/openwebbeans/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openwebbeans/pom.xml?rev=1145433&r1=1145432&r2=1145433&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openwebbeans/pom.xml (original)
+++ geronimo/server/trunk/plugins/openwebbeans/pom.xml Tue Jul 12 02:26:29 2011
@@ -59,6 +59,12 @@
                 <groupId>org.apache.openwebbeans</groupId>
                 <artifactId>openwebbeans-jsf</artifactId>
                 <version>${openwebbeansVersion}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.apache.myfaces.core</groupId>
+                        <artifactId>myfaces-api</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
             <dependency>
                 <groupId>org.apache.openwebbeans</groupId>

Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/GeronimoStandardContext.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/GeronimoStandardContext.java?rev=1145433&r1=1145432&r2=1145433&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/GeronimoStandardContext.java
(original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/GeronimoStandardContext.java
Tue Jul 12 02:26:29 2011
@@ -245,8 +245,7 @@ public class GeronimoStandardContext ext
 
         WebBeansContext owbContext = ctx.getOWBContext();
         if (owbContext == null) {
-            owbContext = new WebBeansContext();
-            new OpenWebBeansWebInitializer(owbContext, servletContext);
+            owbContext = OpenWebBeansWebInitializer.newWebBeansContext(servletContext);
         }
         if (getInstanceManager() instanceof TomcatInstanceManager) {
             ((TomcatInstanceManager) getInstanceManager()).setOWBContext(owbContext);

Modified: geronimo/server/trunk/plugins/tomcat/tomcat7/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/tomcat7/src/main/history/dependencies.xml?rev=1145433&r1=1145432&r2=1145433&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/tomcat7/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/tomcat/tomcat7/src/main/history/dependencies.xml Tue Jul
12 02:26:29 2011
@@ -102,13 +102,13 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.myfaces.core</groupId>
-        <artifactId>myfaces-bundle</artifactId>
+        <groupId>org.apache.openejb</groupId>
+        <artifactId>openejb-jee</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.openejb</groupId>
-        <artifactId>openejb-jee</artifactId>
+        <groupId>org.apache.openwebbeans</groupId>
+        <artifactId>openwebbeans-jsf</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>



Mime
View raw message