geronimo-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Shawn Jiang <genspr...@gmail.com>
Subject Re: svn commit: r1145436 - in /geronimo/server/trunk/plugins: openejb/ openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/ openejb/geronimo-openejb-clustering-wadi/ openejb/geronimo-openejb/ openejb/geronimo-openejb
Date Thu, 14 Jul 2011 04:25:22 GMT
Please ignore this.  the log tells everything.  :  )

On Thu, Jul 14, 2011 at 12:10 PM, Shawn Jiang <genspring@gmail.com> wrote:

> Hi David,
>
>
> Modified: geronimo/server/trunk/plugins/
> openwebbeans/pom.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openwebbeans/pom.xml?rev=
> 1145436&r1=1145435&r2=1145436&view=diff
>
> ==============================================================================
> --- geronimo/server/trunk/plugins/openwebbeans/pom.xml (original)
> +++ geronimo/server/trunk/plugins/openwebbeans/pom.xml Tue Jul 12 02:26:54
> 2011
> @@ -91,9 +91,9 @@
>     </dependencyManagement>
>
>     <modules>
> -        <module>geronimo-openwebbeans</module>
> +        <!--<module>geronimo-openwebbeans</module>-->
>         <module>geronimo-openwebbeans-builder</module>
> -        <module>openwebbeans</module>
> +        <!--<module>openwebbeans</module>-->
>         <module>openwebbeans-deployer</module>
>     </modules>
>
>
> What's the reason to disable the build for geronimo-openwebbeans and
> openwebbeans modules  ?
>
>
>
>
>
> On Tue, Jul 12, 2011 at 10:26 AM, <djencks@apache.org> wrote:
>
>> Author: djencks
>> Date: Tue Jul 12 02:26:54 2011
>> New Revision: 1145436
>>
>> URL: http://svn.apache.org/viewvc?rev=1145436&view=rev
>> Log:
>> GERONIMO-5050 Start of always using openejb for owb
>>
>> Added:
>>
>>  geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/cdi/
>>
>>  geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/cdi/BeanManagerReference.java
>>   (contents, props changed)
>>      - copied, changed from r1145434,
>> geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/BeanManagerReference.java
>>
>>  geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/cdi/GeronimoResourceInjectionService.java
>>   (contents, props changed)
>>      - copied, changed from r1145434,
>> geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/GeronimoResourceInjectionService.java
>>
>>  geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/cdi/GeronimoSingletonService.java
>>   (contents, props changed)
>>      - copied, changed from r1145434,
>> geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/GeronimoSingletonService.java
>>
>>  geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/cdi/GeronimoTransactionService.java
>>   (contents, props changed)
>>      - copied, changed from r1145434,
>> geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/GeronimoTransactionService.java
>>
>>  geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/cdi/GeronimoValidatorService.java
>>   (contents, props changed)
>>      - copied, changed from r1145434,
>> geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/GeronimoValidatorService.java
>>
>>  geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/cdi/GeronimoWebBeansPlugin.java
>>   (contents, props changed)
>>      - copied, changed from r1145434,
>> geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/GeronimoWebBeansPlugin.java
>>
>>  geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/cdi/ManagedSecurityService.java
>>   (contents, props changed)
>>      - copied, changed from r1145434,
>> geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/ManagedSecurityService.java
>>
>>  geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/cdi/OpenWebBeansWebInitializer.java
>>   (with props)
>>
>>  geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/cdi/OsgiMetaDataScannerService.java
>>   (contents, props changed)
>>      - copied, changed from r1145434,
>> geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/OsgiMetaDataScannerService.java
>>
>>  geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/cdi/SharedOwbContext.java
>>   (contents, props changed)
>>      - copied, changed from r1145434,
>> geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/SharedOwbContext.java
>>
>>  geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/cdi/SingletonServiceInitializerGBean.java
>>   (contents, props changed)
>>      - copied, changed from r1145434,
>> geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/SingletonServiceInitializerGBean.java
>>
>>  geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/cdi/ThreadSingletonServiceAdapter.java
>>   (with props)
>>
>>  geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/cdi/WebBeansConfigurationListener.java
>>   (contents, props changed)
>>      - copied, changed from r1145434,
>> geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/WebBeansConfigurationListener.java
>>
>>  geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/resources/META-INF/services/
>>
>>  geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/resources/META-INF/services/org.apache.webbeans.spi.plugins.OpenWebBeansPlugin
>> Removed:
>>
>>  geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/ThreadSingletonServiceAdapter.java
>>
>>  geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/BeanManagerReference.java
>>
>>  geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/GeronimoResourceInjectionService.java
>>
>>  geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/GeronimoSingletonService.java
>>
>>  geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/GeronimoTransactionService.java
>>
>>  geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/GeronimoValidatorService.java
>>
>>  geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/GeronimoWebBeansPlugin.java
>>
>>  geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/ManagedSecurityService.java
>>
>>  geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/OpenWebBeansWebInitializer.java
>>
>>  geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/OsgiMetaDataScannerService.java
>>
>>  geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/SharedOwbContext.java
>>
>>  geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/SingletonServiceInitializerGBean.java
>>
>>  geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/WebBeansConfigurationListener.java
>> Modified:
>>
>>  geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java
>>
>>  geronimo/server/trunk/plugins/openejb/geronimo-openejb-clustering-wadi/pom.xml
>>    geronimo/server/trunk/plugins/openejb/geronimo-openejb/pom.xml
>>
>>  geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbModuleImpl.java
>>
>>  geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/OpenEjbSystemGBean.java
>>    geronimo/server/trunk/plugins/openejb/openejb-client/pom.xml
>>    geronimo/server/trunk/plugins/openejb/openejb/pom.xml
>>
>>  geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml
>>    geronimo/server/trunk/plugins/openejb/openejb/src/main/plan/plan.xml
>>    geronimo/server/trunk/plugins/openejb/pom.xml
>>
>>  geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans-builder/pom.xml
>>
>>  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-builder/src/main/java/org/apache/geronimo/openwebbeans/deployment/OpenWebBeansNamingBuilder.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/plan/plan.xml
>>
>>  geronimo/server/trunk/plugins/openwebbeans/openwebbeans/src/main/plan/plan.xml
>>    geronimo/server/trunk/plugins/openwebbeans/pom.xml
>>
>>  geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java
>>    geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/pom.xml
>>
>>  geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/GeronimoStandardContext.java
>>
>>  geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/TomcatInstanceManager.java
>>
>>  geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/TomcatWebAppContext.java
>>
>>  geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/interceptor/OWBBeforeAfter.java
>>    geronimo/server/trunk/plugins/tomcat/tomcat7/pom.xml
>>
>> Modified:
>> geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java
>> URL:
>> http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java?rev=1145436&r1=1145435&r2=1145436&view=diff
>>
>> ==============================================================================
>> ---
>> geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java
>> (original)
>> +++
>> geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java
>> Tue Jul 12 02:26:54 2011
>> @@ -89,8 +89,8 @@ import org.apache.geronimo.openejb.EjbDe
>>  import org.apache.geronimo.openejb.EjbModuleImpl;
>>  import org.apache.geronimo.openejb.GeronimoEjbInfo;
>>  import org.apache.geronimo.openejb.OpenEjbSystem;
>> +import org.apache.geronimo.openejb.cdi.SharedOwbContext;
>>  import
>> org.apache.geronimo.openejb.xbeans.ejbjar.OpenejbGeronimoEjbJarType;
>> -import org.apache.geronimo.openwebbeans.SharedOwbContext;
>>  import org.apache.geronimo.persistence.PersistenceUnitGBean;
>>  import org.apache.geronimo.security.jacc.ComponentPermissions;
>>  import org.apache.openejb.ClassLoaderUtil;
>>
>> Modified:
>> geronimo/server/trunk/plugins/openejb/geronimo-openejb-clustering-wadi/pom.xml
>> URL:
>> http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb-clustering-wadi/pom.xml?rev=1145436&r1=1145435&r2=1145436&view=diff
>>
>> ==============================================================================
>> ---
>> geronimo/server/trunk/plugins/openejb/geronimo-openejb-clustering-wadi/pom.xml
>> (original)
>> +++
>> geronimo/server/trunk/plugins/openejb/geronimo-openejb-clustering-wadi/pom.xml
>> Tue Jul 12 02:26:54 2011
>> @@ -40,10 +40,9 @@
>>         </dependency>
>>
>>         <dependency>
>> -            <groupId>org.apache.geronimo.configs</groupId>
>> -            <artifactId>openejb</artifactId>
>> +            <groupId>org.apache.geronimo.modules</groupId>
>> +            <artifactId>geronimo-openejb</artifactId>
>>             <version>${project.version}</version>
>> -            <type>car</type>
>>         </dependency>
>>     </dependencies>
>>
>>
>> Modified: geronimo/server/trunk/plugins/openejb/geronimo-openejb/pom.xml
>> URL:
>> http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb/pom.xml?rev=1145436&r1=1145435&r2=1145436&view=diff
>>
>> ==============================================================================
>> --- geronimo/server/trunk/plugins/openejb/geronimo-openejb/pom.xml
>> (original)
>> +++ geronimo/server/trunk/plugins/openejb/geronimo-openejb/pom.xml Tue Jul
>> 12 02:26:54 2011
>> @@ -167,11 +167,11 @@
>>             <version>${project.version}</version>
>>         </dependency>
>>
>> -        <dependency>
>> -            <groupId>org.apache.geronimo.modules</groupId>
>> -            <artifactId>geronimo-openwebbeans</artifactId>
>> -            <version>${project.version}</version>
>> -        </dependency>
>> +        <!--<dependency>-->
>> +            <!--<groupId>org.apache.geronimo.modules</groupId>-->
>> +            <!--<artifactId>geronimo-openwebbeans</artifactId>-->
>> +            <!--<version>${project.version}</version>-->
>> +        <!--</dependency>-->
>>
>>         <dependency>
>>             <groupId>org.apache.geronimo.framework</groupId>
>> @@ -180,6 +180,16 @@
>>             <classifier>tests</classifier>
>>             <scope>test</scope>
>>         </dependency>
>> +
>> +        <dependency>
>> +            <groupId>org.apache.openwebbeans</groupId>
>> +            <artifactId>openwebbeans-jsf</artifactId>
>> +        </dependency>
>> +        <dependency>
>> +            <groupId>org.apache.openwebbeans</groupId>
>> +            <artifactId>openwebbeans-web</artifactId>
>> +        </dependency>
>> +
>>     </dependencies>
>>
>>  </project>
>>
>> Modified:
>> geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbModuleImpl.java
>> URL:
>> http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbModuleImpl.java?rev=1145436&r1=1145435&r2=1145436&view=diff
>>
>> ==============================================================================
>> ---
>> geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbModuleImpl.java
>> (original)
>> +++
>> geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbModuleImpl.java
>> Tue Jul 12 02:26:54 2011
>> @@ -43,7 +43,7 @@ import org.apache.geronimo.management.EJ
>>  import org.apache.geronimo.management.EJBModule;
>>  import org.apache.geronimo.management.J2EEApplication;
>>  import org.apache.geronimo.management.J2EEServer;
>> -import org.apache.geronimo.openwebbeans.SharedOwbContext;
>> +import org.apache.geronimo.openejb.cdi.SharedOwbContext;
>>  import org.apache.openejb.AppContext;
>>  import org.apache.openejb.BeanContext;
>>  import org.apache.openejb.NoSuchApplicationException;
>>
>> Modified:
>> geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/OpenEjbSystemGBean.java
>> URL:
>> http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/OpenEjbSystemGBean.java?rev=1145436&r1=1145435&r2=1145436&view=diff
>>
>> ==============================================================================
>> ---
>> geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/OpenEjbSystemGBean.java
>> (original)
>> +++
>> geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/OpenEjbSystemGBean.java
>> Tue Jul 12 02:26:54 2011
>> @@ -46,6 +46,7 @@ import org.apache.geronimo.j2ee.j2eeobje
>>  import org.apache.geronimo.j2ee.jndi.ApplicationJndi;
>>  import org.apache.geronimo.kernel.GBeanNotFoundException;
>>  import org.apache.geronimo.kernel.Kernel;
>> +import org.apache.geronimo.openejb.cdi.ThreadSingletonServiceAdapter;
>>  import org.apache.geronimo.persistence.PersistenceUnitGBean;
>>  import
>> org.apache.geronimo.transaction.manager.RecoverableTransactionManager;
>>  import org.apache.openejb.AppContext;
>>
>> Copied:
>> geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/cdi/BeanManagerReference.java
>> (from r1145434,
>> geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/BeanManagerReference.java)
>> URL:
>> http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/cdi/BeanManagerReference.java?p2=geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/cdi/BeanManagerReference.java&p1=geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/BeanManagerReference.java&r1=1145434&r2=1145436&rev=1145436&view=diff
>>
>> ==============================================================================
>> ---
>> geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/BeanManagerReference.java
>> (original)
>> +++
>> geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/cdi/BeanManagerReference.java
>> Tue Jul 12 02:26:54 2011
>> @@ -18,7 +18,7 @@
>>  */
>>
>>
>> -package org.apache.geronimo.openwebbeans;
>> +package org.apache.geronimo.openejb.cdi;
>>
>>  import javax.naming.NamingException;
>>  import org.apache.webbeans.container.InjectableBeanManager;
>>
>> Propchange:
>> geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/cdi/BeanManagerReference.java
>>
>> ------------------------------------------------------------------------------
>>    svn:eol-style = native
>>
>> Propchange:
>> geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/cdi/BeanManagerReference.java
>>
>> ------------------------------------------------------------------------------
>>    svn:keywords = Date Revision
>>
>> Propchange:
>> geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/cdi/BeanManagerReference.java
>>
>> ------------------------------------------------------------------------------
>>    svn:mime-type = text/plain
>>
>> Copied:
>> geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/cdi/GeronimoResourceInjectionService.java
>> (from r1145434,
>> geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/GeronimoResourceInjectionService.java)
>> URL:
>> http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/cdi/GeronimoResourceInjectionService.java?p2=geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/cdi/GeronimoResourceInjectionService.java&p1=geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/GeronimoResourceInjectionService.java&r1=1145434&r2=1145436&rev=1145436&view=diff
>>
>> ==============================================================================
>> ---
>> geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/GeronimoResourceInjectionService.java
>> (original)
>> +++
>> geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/cdi/GeronimoResourceInjectionService.java
>> Tue Jul 12 02:26:54 2011
>> @@ -18,7 +18,7 @@
>>  */
>>
>>
>> -package org.apache.geronimo.openwebbeans;
>> +package org.apache.geronimo.openejb.cdi;
>>
>>  import java.io.IOException;
>>  import java.io.ObjectInput;
>>
>> Propchange:
>> geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/cdi/GeronimoResourceInjectionService.java
>>
>> ------------------------------------------------------------------------------
>>    svn:eol-style = native
>>
>> Propchange:
>> geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/cdi/GeronimoResourceInjectionService.java
>>
>> ------------------------------------------------------------------------------
>>    svn:keywords = Date Revision
>>
>> Propchange:
>> geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/cdi/GeronimoResourceInjectionService.java
>>
>> ------------------------------------------------------------------------------
>>    svn:mime-type = text/plain
>>
>> Copied:
>> geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/cdi/GeronimoSingletonService.java
>> (from r1145434,
>> geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/GeronimoSingletonService.java)
>> URL:
>> http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/cdi/GeronimoSingletonService.java?p2=geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/cdi/GeronimoSingletonService.java&p1=geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/GeronimoSingletonService.java&r1=1145434&r2=1145436&rev=1145436&view=diff
>>
>> ==============================================================================
>> ---
>> geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/GeronimoSingletonService.java
>> (original)
>> +++
>> geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/cdi/GeronimoSingletonService.java
>> Tue Jul 12 02:26:54 2011
>> @@ -18,7 +18,7 @@
>>  */
>>
>>
>> -package org.apache.geronimo.openwebbeans;
>> +package org.apache.geronimo.openejb.cdi;
>>
>>  import org.apache.webbeans.config.WebBeansContext;
>>  import org.apache.webbeans.config.WebBeansFinder;
>>
>> Propchange:
>> geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/cdi/GeronimoSingletonService.java
>>
>> ------------------------------------------------------------------------------
>>    svn:eol-style = native
>>
>> Propchange:
>> geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/cdi/GeronimoSingletonService.java
>>
>> ------------------------------------------------------------------------------
>>    svn:keywords = Date Revision
>>
>> Propchange:
>> geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/cdi/GeronimoSingletonService.java
>>
>> ------------------------------------------------------------------------------
>>    svn:mime-type = text/plain
>>
>> Copied:
>> geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/cdi/GeronimoTransactionService.java
>> (from r1145434,
>> geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/GeronimoTransactionService.java)
>> URL:
>> http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/cdi/GeronimoTransactionService.java?p2=geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/cdi/GeronimoTransactionService.java&p1=geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/GeronimoTransactionService.java&r1=1145434&r2=1145436&rev=1145436&view=diff
>>
>> ==============================================================================
>> ---
>> geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/GeronimoTransactionService.java
>> (original)
>> +++
>> geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/cdi/GeronimoTransactionService.java
>> Tue Jul 12 02:26:54 2011
>> @@ -18,7 +18,7 @@
>>  */
>>
>>
>> -package org.apache.geronimo.openwebbeans;
>> +package org.apache.geronimo.openejb.cdi;
>>
>>  import javax.enterprise.event.TransactionPhase;
>>  import javax.enterprise.inject.spi.ObserverMethod;
>>
>> Propchange:
>> geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/cdi/GeronimoTransactionService.java
>>
>> ------------------------------------------------------------------------------
>>    svn:eol-style = native
>>
>> Propchange:
>> geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/cdi/GeronimoTransactionService.java
>>
>> ------------------------------------------------------------------------------
>>    svn:keywords = Date Revision
>>
>> Propchange:
>> geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/cdi/GeronimoTransactionService.java
>>
>> ------------------------------------------------------------------------------
>>    svn:mime-type = text/plain
>>
>> Copied:
>> geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/cdi/GeronimoValidatorService.java
>> (from r1145434,
>> geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/GeronimoValidatorService.java)
>> URL:
>> http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/cdi/GeronimoValidatorService.java?p2=geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/cdi/GeronimoValidatorService.java&p1=geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/GeronimoValidatorService.java&r1=1145434&r2=1145436&rev=1145436&view=diff
>>
>> ==============================================================================
>> ---
>> geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/GeronimoValidatorService.java
>> (original)
>> +++
>> geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/cdi/GeronimoValidatorService.java
>> Tue Jul 12 02:26:54 2011
>> @@ -18,7 +18,7 @@
>>  */
>>
>>
>> -package org.apache.geronimo.openwebbeans;
>> +package org.apache.geronimo.openejb.cdi;
>>
>>  import javax.naming.InitialContext;
>>  import javax.naming.NamingException;
>>
>> Propchange:
>> geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/cdi/GeronimoValidatorService.java
>>
>> ------------------------------------------------------------------------------
>>    svn:eol-style = native
>>
>> Propchange:
>> geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/cdi/GeronimoValidatorService.java
>>
>> ------------------------------------------------------------------------------
>>    svn:keywords = Date Revision
>>
>> Propchange:
>> geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/cdi/GeronimoValidatorService.java
>>
>> ------------------------------------------------------------------------------
>>    svn:mime-type = text/plain
>>
>> Copied:
>> geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/cdi/GeronimoWebBeansPlugin.java
>> (from r1145434,
>> geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/GeronimoWebBeansPlugin.java)
>> URL:
>> http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/cdi/GeronimoWebBeansPlugin.java?p2=geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/cdi/GeronimoWebBeansPlugin.java&p1=geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/GeronimoWebBeansPlugin.java&r1=1145434&r2=1145436&rev=1145436&view=diff
>>
>> ==============================================================================
>> ---
>> geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/GeronimoWebBeansPlugin.java
>> (original)
>> +++
>> geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/cdi/GeronimoWebBeansPlugin.java
>> Tue Jul 12 02:26:54 2011
>> @@ -16,7 +16,7 @@
>>  * specific language governing permissions and limitations
>>  * under the License.
>>  */
>> -package org.apache.geronimo.openwebbeans;
>> +package org.apache.geronimo.openejb.cdi;
>>
>>  import javax.enterprise.context.spi.CreationalContext;
>>  import javax.enterprise.event.TransactionPhase;
>>
>> Propchange:
>> geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/cdi/GeronimoWebBeansPlugin.java
>>
>> ------------------------------------------------------------------------------
>>    svn:eol-style = native
>>
>> Propchange:
>> geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/cdi/GeronimoWebBeansPlugin.java
>>
>> ------------------------------------------------------------------------------
>>    svn:keywords = Date Revision
>>
>> Propchange:
>> geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/cdi/GeronimoWebBeansPlugin.java
>>
>> ------------------------------------------------------------------------------
>>    svn:mime-type = text/plain
>>
>> Copied:
>> geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/cdi/ManagedSecurityService.java
>> (from r1145434,
>> geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/ManagedSecurityService.java)
>> URL:
>> http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/cdi/ManagedSecurityService.java?p2=geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/cdi/ManagedSecurityService.java&p1=geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/ManagedSecurityService.java&r1=1145434&r2=1145436&rev=1145436&view=diff
>>
>> ==============================================================================
>> ---
>> geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/ManagedSecurityService.java
>> (original)
>> +++
>> geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/cdi/ManagedSecurityService.java
>> Tue Jul 12 02:26:54 2011
>> @@ -18,7 +18,7 @@
>>  */
>>
>>
>> -package org.apache.geronimo.openwebbeans;
>> +package org.apache.geronimo.openejb.cdi;
>>
>>  import java.lang.reflect.AccessibleObject;
>>  import java.lang.reflect.Constructor;
>>
>> Propchange:
>> geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/cdi/ManagedSecurityService.java
>>
>> ------------------------------------------------------------------------------
>>    svn:eol-style = native
>>
>> Propchange:
>> geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/cdi/ManagedSecurityService.java
>>
>> ------------------------------------------------------------------------------
>>    svn:keywords = Date Revision
>>
>> Propchange:
>> geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/cdi/ManagedSecurityService.java
>>
>> ------------------------------------------------------------------------------
>>    svn:mime-type = text/plain
>>
>> Added:
>> geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/cdi/OpenWebBeansWebInitializer.java
>> URL:
>> http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/cdi/OpenWebBeansWebInitializer.java?rev=1145436&view=auto
>>
>> ==============================================================================
>> ---
>> geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/cdi/OpenWebBeansWebInitializer.java
>> (added)
>> +++
>> geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/cdi/OpenWebBeansWebInitializer.java
>> Tue Jul 12 02:26:54 2011
>> @@ -0,0 +1,168 @@
>> +/*
>> + * 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.openejb.cdi;
>> +
>> +import java.util.Collections;
>> +import java.util.HashMap;
>> +import java.util.Map;
>> +import java.util.Properties;
>> +
>> +import javax.servlet.ServletContext;
>> +import javax.servlet.ServletContextEvent;
>> +import org.apache.openejb.AppContext;
>> +import org.apache.openejb.BeanContext;
>> +import org.apache.openejb.assembler.classic.AppInfo;
>> +import org.apache.openejb.cdi.CdiAppContextsService;
>> +import org.apache.openejb.cdi.CdiResourceInjectionService;
>> +import org.apache.openejb.cdi.OpenEJBLifecycle;
>> +import org.apache.openejb.cdi.OpenEJBTransactionService;
>> +import org.apache.openejb.cdi.StartupObject;
>> +import org.apache.openejb.loader.SystemInstance;
>> +import org.apache.webbeans.config.OpenWebBeansConfiguration;
>> +import org.apache.webbeans.config.WebBeansContext;
>> +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.TransactionService;
>> +import org.apache.webbeans.spi.ValidatorService;
>> +import org.apache.webbeans.spi.adaptor.ELAdaptor;
>> +import org.apache.webbeans.util.WebBeansUtil;
>> +import org.apache.webbeans.web.context.WebContextsService;
>> +import org.apache.webbeans.web.lifecycle.WebContainerLifecycle;
>> +import org.omg.PortableServer.THREAD_POLICY_ID;
>> +
>> +/**
>> + * @version $Rev: 698441 $ $Date: 2008-09-24 00:10:08 -0700 (Wed, 24 Sep
>> 2008) $
>> + */
>> +public class OpenWebBeansWebInitializer {
>> +
>> +    public static WebBeansContext newWebBeansContext(Object startup) {
>> +        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(ValidatorService.class, new
>> GeronimoValidatorService());
>> +        services.put(TransactionService.class, new
>> OpenEJBTransactionService());
>> +        services.put(JNDIService.class, new 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 webBeansContext = new WebBeansContext(services,
>> properties);
>> +        webBeansContext.registerService(ScannerService.class, new
>> OsgiMetaDataScannerService(webBeansContext));
>> +        //must be last since it idiotically copies stuff
>> +        OpenEJBLifecycle lifecycle = new
>> OpenEJBLifecycle(webBeansContext);
>> +        webBeansContext.registerService(ContainerLifecycle.class,
>> lifecycle);
>> +        if (startup != null) {
>> +            GeronimoSingletonService.contextEntered(webBeansContext);
>> +            try {
>> +                //from OWB's WebBeansConfigurationListener
>> +
>> +                try {
>> +                    if (startup instanceof ServletContext) {
>> +                        StartupObject startupObject = new
>> StartupObject(new AppContext("none", SystemInstance.get(),
>> Thread.currentThread().getContextClassLoader(), null, null, true), new
>> AppInfo(), Collections.<BeanContext>emptyList());
>> +                        lifecycle.startApplication(startupObject);
>> +
>>  lifecycle.startServletContext((ServletContext)startup);
>> +                    } else if (startup instanceof StartupObject) {
>> +                        lifecycle.startApplication(startup);
>> +//
>>  ((StartupObject)startup).getAppContext().setWebBeansContext(webBeansContext);
>> +                    }
>> +                } 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);
>> +//            //from OWB's WebBeansConfigurationListener
>> +//            if (servletContext != null) {
>> +//                ContainerLifecycle lifeCycle =
>> webBeansContext.getService(ContainerLifecycle.class);
>> +//
>> +//                try {
>> +//                    lifeCycle.startApplication(new
>> ServletContextEvent(servletContext));
>> +//                }
>> +//                catch (Exception e) {
>> +//                    //             logger.error(OWBLogConst.ERROR_0018,
>> event.getServletContext().getContextPath());
>> +//                    WebBeansUtil.throwRuntimeExceptions(e);
>> +//                }
>> +//            }
>> +//
>> +//        } finally {
>> +//            GeronimoSingletonService.contextExited(null);
>> +//        }
>> +//    }
>> +//
>> +//    private void setConfiguration(WebBeansContext webBeansContext) {
>> +//        OpenWebBeansConfiguration configuration =
>> webBeansContext.getOpenWebBeansConfiguration();
>> +//
>>  configuration.setProperty(OpenWebBeansConfiguration.APPLICATION_IS_JSP,
>> "true");
>> +//
>> +//        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 {
>> +
>> +        public void bind(String name, Object object) {
>> +        }
>> +
>> +        public <T> T lookup(String name, Class<? extends T>
>> expectedClass) {
>> +            return null;
>> +        }
>> +
>> +        public void unbind(String name) {
>> +        }
>> +
>> +    }
>> +
>> +}
>>
>> Propchange:
>> geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/cdi/OpenWebBeansWebInitializer.java
>>
>> ------------------------------------------------------------------------------
>>    svn:eol-style = native
>>
>> Propchange:
>> geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/cdi/OpenWebBeansWebInitializer.java
>>
>> ------------------------------------------------------------------------------
>>    svn:keywords = Date Revision
>>
>> Propchange:
>> geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/cdi/OpenWebBeansWebInitializer.java
>>
>> ------------------------------------------------------------------------------
>>    svn:mime-type = text/plain
>>
>> Copied:
>> geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/cdi/OsgiMetaDataScannerService.java
>> (from r1145434,
>> geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/OsgiMetaDataScannerService.java)
>> URL:
>> http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/cdi/OsgiMetaDataScannerService.java?p2=geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/cdi/OsgiMetaDataScannerService.java&p1=geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/OsgiMetaDataScannerService.java&r1=1145434&r2=1145436&rev=1145436&view=diff
>>
>> ==============================================================================
>> ---
>> geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/OsgiMetaDataScannerService.java
>> (original)
>> +++
>> geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/cdi/OsgiMetaDataScannerService.java
>> Tue Jul 12 02:26:54 2011
>> @@ -16,7 +16,7 @@
>>  * specific language governing permissions and limitations
>>  * under the License.
>>  */
>> -package org.apache.geronimo.openwebbeans;
>> +package org.apache.geronimo.openejb.cdi;
>>
>>  import java.io.InputStream;
>>  import java.net.URL;
>>
>> Propchange:
>> geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/cdi/OsgiMetaDataScannerService.java
>>
>> ------------------------------------------------------------------------------
>>    svn:eol-style = native
>>
>> Propchange:
>> geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/cdi/OsgiMetaDataScannerService.java
>>
>> ------------------------------------------------------------------------------
>>    svn:keywords = Date Revision
>>
>> Propchange:
>> geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/cdi/OsgiMetaDataScannerService.java
>>
>> ------------------------------------------------------------------------------
>>    svn:mime-type = text/plain
>>
>> Copied:
>> geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/cdi/SharedOwbContext.java
>> (from r1145434,
>> geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/SharedOwbContext.java)
>> URL:
>> http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/cdi/SharedOwbContext.java?p2=geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/cdi/SharedOwbContext.java&p1=geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/SharedOwbContext.java&r1=1145434&r2=1145436&rev=1145436&view=diff
>>
>> ==============================================================================
>> ---
>> geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/SharedOwbContext.java
>> (original)
>> +++
>> geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/cdi/SharedOwbContext.java
>> Tue Jul 12 02:26:54 2011
>> @@ -18,7 +18,7 @@
>>  */
>>
>>
>> -package org.apache.geronimo.openwebbeans;
>> +package org.apache.geronimo.openejb.cdi;
>>
>>  import org.apache.webbeans.config.WebBeansContext;
>>
>>
>> Propchange:
>> geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/cdi/SharedOwbContext.java
>>
>> ------------------------------------------------------------------------------
>>    svn:eol-style = native
>>
>> Propchange:
>> geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/cdi/SharedOwbContext.java
>>
>> ------------------------------------------------------------------------------
>>    svn:keywords = Date Revision
>>
>> Propchange:
>> geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/cdi/SharedOwbContext.java
>>
>> ------------------------------------------------------------------------------
>>    svn:mime-type = text/plain
>>
>> Copied:
>> geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/cdi/SingletonServiceInitializerGBean.java
>> (from r1145434,
>> geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/SingletonServiceInitializerGBean.java)
>> URL:
>> http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/cdi/SingletonServiceInitializerGBean.java?p2=geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/cdi/SingletonServiceInitializerGBean.java&p1=geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/SingletonServiceInitializerGBean.java&r1=1145434&r2=1145436&rev=1145436&view=diff
>>
>> ==============================================================================
>> ---
>> geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/SingletonServiceInitializerGBean.java
>> (original)
>> +++
>> geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/cdi/SingletonServiceInitializerGBean.java
>> Tue Jul 12 02:26:54 2011
>> @@ -18,7 +18,7 @@
>>  */
>>
>>
>> -package org.apache.geronimo.openwebbeans;
>> +package org.apache.geronimo.openejb.cdi;
>>
>>  import java.net.URL;
>>  import java.util.Collection;
>>
>> Propchange:
>> geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/cdi/SingletonServiceInitializerGBean.java
>>
>> ------------------------------------------------------------------------------
>>    svn:eol-style = native
>>
>> Propchange:
>> geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/cdi/SingletonServiceInitializerGBean.java
>>
>> ------------------------------------------------------------------------------
>>    svn:keywords = Date Revision
>>
>> Propchange:
>> geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/cdi/SingletonServiceInitializerGBean.java
>>
>> ------------------------------------------------------------------------------
>>    svn:mime-type = text/plain
>>
>> Added:
>> geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/cdi/ThreadSingletonServiceAdapter.java
>> URL:
>> http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/cdi/ThreadSingletonServiceAdapter.java?rev=1145436&view=auto
>>
>> ==============================================================================
>> ---
>> geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/cdi/ThreadSingletonServiceAdapter.java
>> (added)
>> +++
>> geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/cdi/ThreadSingletonServiceAdapter.java
>> Tue Jul 12 02:26:54 2011
>> @@ -0,0 +1,98 @@
>> +/*
>> + * 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.openejb.cdi;
>> +
>> +import java.util.HashMap;
>> +import java.util.Map;
>> +import java.util.Properties;
>> +
>> +import org.apache.openejb.cdi.CdiAppContextsService;
>> +import org.apache.openejb.cdi.CdiResourceInjectionService;
>> +import org.apache.openejb.cdi.OpenEJBLifecycle;
>> +import org.apache.openejb.cdi.OpenEJBTransactionService;
>> +import org.apache.openejb.cdi.StartupObject;
>> +import org.apache.openejb.cdi.ThreadSingletonService;
>> +import org.apache.webbeans.config.OpenWebBeansConfiguration;
>> +import org.apache.webbeans.config.WebBeansContext;
>> +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.TransactionService;
>> +import org.apache.webbeans.spi.ValidatorService;
>> +import org.apache.webbeans.spi.adaptor.ELAdaptor;
>> +
>> +/**
>> + * @version $Rev$ $Date$
>> + */
>> +public class ThreadSingletonServiceAdapter implements
>> ThreadSingletonService {
>> +
>> +    private final GeronimoSingletonService geronimoSingletonService = new
>> GeronimoSingletonService();
>> +
>> +    public ThreadSingletonServiceAdapter() {
>> +        super();
>> +    }
>> +
>> +    @Override
>> +    public void initialize(StartupObject startupObject) {
>> +        //share owb singletons
>> +        WebBeansContext webBeansContext =
>> startupObject.getAppContext().get(WebBeansContext.class);
>> +        if (webBeansContext != null) {
>> +            return;
>> +        }
>> +        Object old = contextEntered(null);
>> +        try {
>> +            if (old == null) {
>> +
>>  OpenWebBeansWebInitializer.newWebBeansContext(startupObject);
>> +            } else {
>> +                // an existing OWBConfiguration will have already been
>> initialized
>> +                startupObject.getAppContext().set(WebBeansContext.class,
>> (WebBeansContext) old);
>> +            }
>> +        } finally {
>> +            contextExited(old);
>> +        }
>> +    }
>> +    @Override
>> +    public Object contextEntered(WebBeansContext owbContext) {
>> +        return GeronimoSingletonService.contextEntered(owbContext);
>> +    }
>> +
>> +    @Override
>> +    public void contextExited(Object oldContext) {
>> +        if (oldContext != null && !(oldContext instanceof
>> WebBeansContext)) throw new IllegalArgumentException("Expecting a
>> WebBeansContext not " + oldContext.getClass().getName());
>> +        GeronimoSingletonService.contextExited((WebBeansContext)
>> oldContext);
>> +    }
>> +
>> +    @Override
>> +    public WebBeansContext get(Object key) {
>> +        return geronimoSingletonService.get(key);
>> +    }
>> +
>> +    @Override
>> +    public void clear(Object key) {
>> +        geronimoSingletonService.clear(key);
>> +    }
>> +}
>>
>> Propchange:
>> geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/cdi/ThreadSingletonServiceAdapter.java
>>
>> ------------------------------------------------------------------------------
>>    svn:eol-style = native
>>
>> Propchange:
>> geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/cdi/ThreadSingletonServiceAdapter.java
>>
>> ------------------------------------------------------------------------------
>>    svn:keywords = Date Revision
>>
>> Propchange:
>> geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/cdi/ThreadSingletonServiceAdapter.java
>>
>> ------------------------------------------------------------------------------
>>    svn:mime-type = text/plain
>>
>> Copied:
>> geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/cdi/WebBeansConfigurationListener.java
>> (from r1145434,
>> geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/WebBeansConfigurationListener.java)
>> URL:
>> http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/cdi/WebBeansConfigurationListener.java?p2=geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/cdi/WebBeansConfigurationListener.java&p1=geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/WebBeansConfigurationListener.java&r1=1145434&r2=1145436&rev=1145436&view=diff
>>
>> ==============================================================================
>> ---
>> geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/WebBeansConfigurationListener.java
>> (original)
>> +++
>> geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/cdi/WebBeansConfigurationListener.java
>> Tue Jul 12 02:26:54 2011
>> @@ -18,7 +18,7 @@
>>  */
>>
>>
>> -package org.apache.geronimo.openwebbeans;
>> +package org.apache.geronimo.openejb.cdi;
>>
>>  import javax.enterprise.context.RequestScoped;
>>  import javax.enterprise.context.SessionScoped;
>>
>> Propchange:
>> geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/cdi/WebBeansConfigurationListener.java
>>
>> ------------------------------------------------------------------------------
>>    svn:eol-style = native
>>
>> Propchange:
>> geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/cdi/WebBeansConfigurationListener.java
>>
>> ------------------------------------------------------------------------------
>>    svn:keywords = Date Revision
>>
>> Propchange:
>> geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/cdi/WebBeansConfigurationListener.java
>>
>> ------------------------------------------------------------------------------
>>    svn:mime-type = text/plain
>>
>> Added:
>> geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/resources/META-INF/services/org.apache.webbeans.spi.plugins.OpenWebBeansPlugin
>> URL:
>> http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/resources/META-INF/services/org.apache.webbeans.spi.plugins.OpenWebBeansPlugin?rev=1145436&view=auto
>>
>> ==============================================================================
>> ---
>> geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/resources/META-INF/services/org.apache.webbeans.spi.plugins.OpenWebBeansPlugin
>> (added)
>> +++
>> geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/resources/META-INF/services/org.apache.webbeans.spi.plugins.OpenWebBeansPlugin
>> Tue Jul 12 02:26:54 2011
>> @@ -0,0 +1,21 @@
>> +#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.
>> +
>> +# this file contains the service implementation for the
>> +# JMS integration into OpenWebBeans
>> +# this file contains information for java.util.ServiceLoader
>> +org.apache.openejb.cdi.CdiPlugin
>> \ No newline at end of file
>>
>> Modified: geronimo/server/trunk/plugins/openejb/openejb-client/pom.xml
>> URL:
>> http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb-client/pom.xml?rev=1145436&r1=1145435&r2=1145436&view=diff
>>
>> ==============================================================================
>> --- geronimo/server/trunk/plugins/openejb/openejb-client/pom.xml
>> (original)
>> +++ geronimo/server/trunk/plugins/openejb/openejb-client/pom.xml Tue Jul
>> 12 02:26:54 2011
>> @@ -72,13 +72,51 @@
>>         </dependency>
>>
>>         <dependency>
>> -            <groupId>org.apache.geronimo.configs</groupId>
>> -            <artifactId>openwebbeans</artifactId>
>> -            <version>${project.version}</version>
>> -            <type>car</type>
>> +            <groupId>org.apache.myfaces.core</groupId>
>> +            <artifactId>myfaces-bundle</artifactId>
>> +        </dependency>
>> +        <dependency>
>> +            <groupId>commons-collections</groupId>
>> +            <artifactId>commons-collections</artifactId>
>>         </dependency>
>>
>> -       <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.geronimo.bundles</groupId>
>> +            <artifactId>jstl</artifactId>
>> +        </dependency>
>> +        <dependency>
>> +            <groupId>org.apache.servicemix.bundles</groupId>
>> +
>>  <artifactId>org.apache.servicemix.bundles.commons-codec</artifactId>
>> +        </dependency>
>> +        <dependency>
>> +            <groupId>org.apache.geronimo.bundles</groupId>
>> +            <artifactId>commons-digester</artifactId>
>> +        </dependency>
>> +
>> +        <dependency>
>> +            <groupId>org.apache.geronimo.bundles</groupId>
>> +            <artifactId>commons-discovery</artifactId>
>> +        </dependency>
>> +
>> +        <dependency>
>> +            <groupId>org.apache.servicemix.bundles</groupId>
>> +            <artifactId>org.apache.servicemix.bundles.dom4j</artifactId>
>> +        </dependency>
>> +
>> +        <dependency>
>> +            <groupId>org.apache.servicemix.bundles</groupId>
>> +
>>  <artifactId>org.apache.servicemix.bundles.javassist</artifactId>
>> +        </dependency>
>> +
>> +        <dependency>
>>             <groupId>org.apache.geronimo.specs</groupId>
>>             <artifactId>geronimo-jaxws_2.2_spec</artifactId>
>>        </dependency>
>>
>> Modified: geronimo/server/trunk/plugins/openejb/openejb/pom.xml
>> URL:
>> http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb/pom.xml?rev=1145436&r1=1145435&r2=1145436&view=diff
>>
>> ==============================================================================
>> --- geronimo/server/trunk/plugins/openejb/openejb/pom.xml (original)
>> +++ geronimo/server/trunk/plugins/openejb/openejb/pom.xml Tue Jul 12
>> 02:26:54 2011
>> @@ -79,13 +79,15 @@
>>         </dependency>
>>
>>         <dependency>
>> -            <groupId>org.apache.geronimo.configs</groupId>
>> -            <artifactId>openwebbeans</artifactId>
>> -            <version>${project.version}</version>
>> -            <type>car</type>
>> +            <groupId>org.apache.myfaces.core</groupId>
>> +            <artifactId>myfaces-bundle</artifactId>
>> +        </dependency>
>> +        <dependency>
>> +            <groupId>commons-collections</groupId>
>> +            <artifactId>commons-collections</artifactId>
>>         </dependency>
>>
>> -       <dependency>
>> +        <dependency>
>>             <groupId>org.apache.geronimo.specs</groupId>
>>             <artifactId>geronimo-jaxws_2.2_spec</artifactId>
>>        </dependency>
>> @@ -93,9 +95,45 @@
>>         <dependency>
>>             <groupId>org.apache.geronimo.specs</groupId>
>>             <artifactId>geronimo-jaxrs_1.1_spec</artifactId>
>> -        </dependency>
>> +        </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.geronimo.bundles</groupId>
>> +            <artifactId>jstl</artifactId>
>> +        </dependency>
>> +        <dependency>
>> +            <groupId>org.apache.servicemix.bundles</groupId>
>> +
>>  <artifactId>org.apache.servicemix.bundles.commons-codec</artifactId>
>> +        </dependency>
>> +        <dependency>
>> +            <groupId>org.apache.geronimo.bundles</groupId>
>> +            <artifactId>commons-digester</artifactId>
>> +        </dependency>
>> +
>> +        <dependency>
>> +            <groupId>org.apache.geronimo.bundles</groupId>
>> +            <artifactId>commons-discovery</artifactId>
>> +        </dependency>
>> +
>> +        <dependency>
>> +            <groupId>org.apache.servicemix.bundles</groupId>
>> +            <artifactId>org.apache.servicemix.bundles.dom4j</artifactId>
>> +        </dependency>
>> +
>> +        <dependency>
>> +            <groupId>org.apache.servicemix.bundles</groupId>
>> +
>>  <artifactId>org.apache.servicemix.bundles.javassist</artifactId>
>> +        </dependency>
>>
>> -       <dependency>
>> +
>> +        <dependency>
>>             <groupId>org.apache.geronimo.javamail</groupId>
>>             <artifactId>geronimo-javamail_1.4_mail</artifactId>
>>         </dependency>
>>
>> Modified:
>> geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml
>> URL:
>> http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml?rev=1145436&r1=1145435&r2=1145436&view=diff
>>
>> ==============================================================================
>> ---
>> geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml
>> (original)
>> +++
>> geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml
>> Tue Jul 12 02:26:54 2011
>> @@ -118,11 +118,6 @@
>>     </dependency>
>>     <dependency>
>>         <groupId>org.apache.openwebbeans</groupId>
>> -        <artifactId>openwebbeans-ee</artifactId>
>> -        <type>jar</type>
>> -    </dependency>
>> -    <dependency>
>> -        <groupId>org.apache.openwebbeans</groupId>
>>         <artifactId>openwebbeans-ejb</artifactId>
>>         <type>jar</type>
>>     </dependency>
>> @@ -142,6 +137,11 @@
>>         <type>jar</type>
>>     </dependency>
>>     <dependency>
>> +        <groupId>org.apache.xbean</groupId>
>> +        <artifactId>xbean-finder</artifactId>
>> +        <type>jar</type>
>> +    </dependency>
>> +    <dependency>
>>         <groupId>org.apache.yoko</groupId>
>>         <artifactId>yoko-spec-corba</artifactId>
>>         <type>jar</type>
>>
>> Modified:
>> geronimo/server/trunk/plugins/openejb/openejb/src/main/plan/plan.xml
>> URL:
>> http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb/src/main/plan/plan.xml?rev=1145436&r1=1145435&r2=1145436&view=diff
>>
>> ==============================================================================
>> --- geronimo/server/trunk/plugins/openejb/openejb/src/main/plan/plan.xml
>> (original)
>> +++ geronimo/server/trunk/plugins/openejb/openejb/src/main/plan/plan.xml
>> Tue Jul 12 02:26:54 2011
>> @@ -102,4 +102,6 @@
>>         </dependency>
>>     </gbean>
>>
>> +    <gbean name="OWBSingletonServiceInitializer"
>> class="org.apache.geronimo.openejb.cdi.SingletonServiceInitializerGBean"/>
>> +
>>  </module>
>>
>> Modified: geronimo/server/trunk/plugins/openejb/pom.xml
>> URL:
>> http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/pom.xml?rev=1145436&r1=1145435&r2=1145436&view=diff
>>
>> ==============================================================================
>> --- geronimo/server/trunk/plugins/openejb/pom.xml (original)
>> +++ geronimo/server/trunk/plugins/openejb/pom.xml Tue Jul 12 02:26:54 2011
>> @@ -77,6 +77,61 @@
>>         <dependencies>
>>             <dependency>
>>                 <groupId>org.apache.geronimo.plugins</groupId>
>> +                <artifactId>myfaces</artifactId>
>> +                <version>${project.version}</version>
>> +                <type>pom</type>
>> +                <scope>import</scope>
>> +            </dependency>
>> +            <dependency>
>> +                <groupId>org.apache.servicemix.bundles</groupId>
>> +
>>  <artifactId>org.apache.servicemix.bundles.dom4j</artifactId>
>> +                <version>1.6.1_2</version>
>> +                <exclusions>
>> +                    <exclusion>
>> +                        <groupId>xml-apis</groupId>
>> +                        <artifactId>xml-apis</artifactId>
>> +                    </exclusion>
>> +                </exclusions>
>> +            </dependency>
>> +            <dependency>
>> +                <groupId>org.apache.openwebbeans</groupId>
>> +                <artifactId>openwebbeans-web</artifactId>
>> +                <version>${openwebbeansVersion}</version>
>> +            </dependency>
>> +            <dependency>
>> +                <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>
>> +                <artifactId>openwebbeans-osgi</artifactId>
>> +                <version>${openwebbeansVersion}</version>
>> +                <exclusions>
>> +                    <exclusion>
>> +                        <groupId>org.apache.geronimo.specs</groupId>
>> +
>>  <artifactId>geronimo-servlet_2.5_spec</artifactId>
>> +                    </exclusion>
>> +                </exclusions>
>> +            </dependency>
>> +            <dependency>
>> +                <groupId>org.apache.openwebbeans</groupId>
>> +                <artifactId>openwebbeans-resource</artifactId>
>> +                <version>${openwebbeansVersion}</version>
>> +            </dependency>
>> +            <dependency>
>> +                <groupId>org.apache.openwebbeans</groupId>
>> +                <artifactId>openwebbeans-ee</artifactId>
>> +                <version>${openwebbeansVersion}</version>
>> +            </dependency>
>> +             <dependency>
>> +                <groupId>org.apache.geronimo.plugins</groupId>
>>                 <artifactId>pluto</artifactId>
>>                 <version>${project.version}</version>
>>                 <type>pom</type>
>>
>> Modified:
>> geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans-builder/pom.xml
>> URL:
>> http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans-builder/pom.xml?rev=1145436&r1=1145435&r2=1145436&view=diff
>>
>> ==============================================================================
>> ---
>> geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans-builder/pom.xml
>> (original)
>> +++
>> geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans-builder/pom.xml
>> Tue Jul 12 02:26:54 2011
>> @@ -48,7 +48,7 @@
>>
>>         <dependency>
>>             <groupId>org.apache.geronimo.modules</groupId>
>> -            <artifactId>geronimo-openwebbeans</artifactId>
>> +            <artifactId>geronimo-openejb</artifactId>
>>             <version>${project.version}</version>
>>         </dependency>
>>
>>
>> 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=1145436&r1=1145435&r2=1145436&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
>> Tue Jul 12 02:26:54 2011
>> @@ -50,7 +50,7 @@ import org.apache.geronimo.j2ee.j2eeobje
>>  import org.apache.geronimo.kernel.Naming;
>>  import org.apache.geronimo.kernel.config.ConfigurationStore;
>>  import org.apache.geronimo.kernel.repository.Environment;
>> -import org.apache.geronimo.openwebbeans.WebBeansConfigurationListener;
>> +import org.apache.geronimo.openejb.cdi.WebBeansConfigurationListener;
>>  import org.apache.geronimo.web.info.WebAppInfo;
>>  import org.apache.openejb.jee.WebApp;
>>  import org.apache.xbean.finder.BundleAnnotationFinder;
>>
>> Modified:
>> geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans-builder/src/main/java/org/apache/geronimo/openwebbeans/deployment/OpenWebBeansNamingBuilder.java
>> URL:
>> http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans-builder/src/main/java/org/apache/geronimo/openwebbeans/deployment/OpenWebBeansNamingBuilder.java?rev=1145436&r1=1145435&r2=1145436&view=diff
>>
>> ==============================================================================
>> ---
>> geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans-builder/src/main/java/org/apache/geronimo/openwebbeans/deployment/OpenWebBeansNamingBuilder.java
>> (original)
>> +++
>> geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans-builder/src/main/java/org/apache/geronimo/openwebbeans/deployment/OpenWebBeansNamingBuilder.java
>> Tue Jul 12 02:26:54 2011
>> @@ -30,7 +30,7 @@ import org.apache.geronimo.j2ee.deployme
>>  import org.apache.geronimo.j2ee.deployment.Module;
>>  import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
>>  import org.apache.geronimo.naming.deployment.AbstractNamingBuilder;
>> -import org.apache.geronimo.openwebbeans.BeanManagerReference;
>> +import org.apache.geronimo.openejb.cdi.BeanManagerReference;
>>  import org.apache.openejb.jee.InjectionTarget;
>>  import org.apache.openejb.jee.JndiConsumer;
>>  import org.apache.xmlbeans.QNameSet;
>>
>> 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=1145436&r1=1145435&r2=1145436&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:54 2011
>> @@ -188,7 +188,7 @@
>>                 <artifactId>maven-bundle-plugin</artifactId>
>>                 <configuration>
>>                     <instructions>
>> -
>>  <Export-SPI-Provider>org.apache.geronimo.openwebbeans.WebBeansConfigurationListener</Export-SPI-Provider>
>> +
>>  <Export-SPI-Provider>org.apache.geronimo.openejb.cdi.WebBeansConfigurationListener</Export-SPI-Provider>
>>                     </instructions>
>>                 </configuration>
>>             </plugin>
>>
>> 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=1145436&r1=1145435&r2=1145436&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:54 2011
>> @@ -53,16 +53,96 @@
>>
>>         <dependency>
>>             <groupId>org.apache.geronimo.configs</groupId>
>> -            <artifactId>openwebbeans</artifactId>
>> +            <artifactId>openejb</artifactId>
>>             <version>${project.version}</version>
>>             <type>car</type>
>>         </dependency>
>> -
>> +
>>         <dependency>
>>             <groupId>org.apache.geronimo.modules</groupId>
>>             <artifactId>geronimo-openwebbeans-builder</artifactId>
>>             <version>${project.version}</version>
>>         </dependency>
>> +        <dependency>
>> +            <groupId>org.apache.geronimo.specs</groupId>
>> +            <artifactId>geronimo-annotation_1.1_spec</artifactId>
>> +        </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-el_2.2_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-jaxws_2.2_spec</artifactId>
>> +        </dependency>
>> +
>> +        <dependency>
>> +            <groupId>org.apache.geronimo.specs</groupId>
>> +            <artifactId>geronimo-jaxrs_1.1_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-jpa_2.0_spec</artifactId>
>> +        </dependency>
>> +
>> +        <dependency>
>> +            <groupId>org.apache.geronimo.specs</groupId>
>> +            <artifactId>geronimo-jsp_2.2_spec</artifactId>
>> +        </dependency>
>> +
>> +        <dependency>
>> +            <groupId>org.apache.geronimo.specs</groupId>
>> +            <artifactId>geronimo-jta_1.1_spec</artifactId>
>> +        </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-validation_1.0_spec</artifactId>
>> +        </dependency>
>> +
>> +        <dependency>
>> +            <groupId>org.apache.myfaces.core</groupId>
>> +            <artifactId>myfaces-bundle</artifactId>
>> +        </dependency>
>> +
>> +        <dependency>
>> +            <groupId>org.apache.geronimo.bundles</groupId>
>> +            <artifactId>jstl</artifactId>
>> +        </dependency>
>> +
>> +        <dependency>
>> +            <groupId>org.apache.servicemix.bundles</groupId>
>> +
>>  <artifactId>org.apache.servicemix.bundles.commons-codec</artifactId>
>> +        </dependency>
>> +        <dependency>
>> +            <groupId>org.apache.geronimo.bundles</groupId>
>> +            <artifactId>commons-digester</artifactId>
>> +        </dependency>
>> +
>> +
>>     </dependencies>
>>
>>     <build>
>> @@ -75,7 +155,7 @@
>>                     <dependencies>
>>                         <dependency>
>>                             <groupId>org.apache.geronimo.configs</groupId>
>> -                            <artifactId>openwebbeans</artifactId>
>> +                            <artifactId>openejb</artifactId>
>>                             <version>3.0-SNAPSHOT</version>
>>                             <type>car</type>
>>                             <import>classes</import>
>>
>> Modified:
>> geronimo/server/trunk/plugins/openwebbeans/openwebbeans-deployer/src/main/plan/plan.xml
>> URL:
>> http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openwebbeans/openwebbeans-deployer/src/main/plan/plan.xml?rev=1145436&r1=1145435&r2=1145436&view=diff
>>
>> ==============================================================================
>> ---
>> geronimo/server/trunk/plugins/openwebbeans/openwebbeans-deployer/src/main/plan/plan.xml
>> (original)
>> +++
>> geronimo/server/trunk/plugins/openwebbeans/openwebbeans-deployer/src/main/plan/plan.xml
>> Tue Jul 12 02:26:54 2011
>> @@ -29,13 +29,13 @@
>>                 <dependencies>
>>                     <dependency>
>>                         <groupId>org.apache.geronimo.configs</groupId>
>> -                        <artifactId>openwebbeans</artifactId>
>> +                        <artifactId>openejb</artifactId>
>>                         <type>car</type>
>>                     </dependency>
>>                     <!-- The dependencies below is to help deployer to
>> find configuration resources while the deployed application is of WAB type
>> GERONIMO-5916 -->
>>                     <dependency>
>>                         <groupId>org.apache.geronimo.modules</groupId>
>> -                        <artifactId>geronimo-openwebbeans</artifactId>
>> +                        <artifactId>geronimo-openejb</artifactId>
>>                         <type>jar</type>
>>                     </dependency>
>>                     <dependency>
>>
>> Modified:
>> geronimo/server/trunk/plugins/openwebbeans/openwebbeans/src/main/plan/plan.xml
>> URL:
>> http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openwebbeans/openwebbeans/src/main/plan/plan.xml?rev=1145436&r1=1145435&r2=1145436&view=diff
>>
>> ==============================================================================
>> ---
>> geronimo/server/trunk/plugins/openwebbeans/openwebbeans/src/main/plan/plan.xml
>> (original)
>> +++
>> geronimo/server/trunk/plugins/openwebbeans/openwebbeans/src/main/plan/plan.xml
>> Tue Jul 12 02:26:54 2011
>> @@ -20,6 +20,6 @@
>>
>>  <module xmlns="
>> http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
>>
>> -    <gbean name="OWBSingletonServiceInitializer"
>> class="org.apache.geronimo.openwebbeans.SingletonServiceInitializerGBean"/>
>> +    <gbean name="OWBSingletonServiceInitializer"
>> class="org.apache.geronimo.openejb.cdi.SingletonServiceInitializerGBean"/>
>>
>>  </module>
>>
>> Modified: geronimo/server/trunk/plugins/openwebbeans/pom.xml
>> URL:
>> http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openwebbeans/pom.xml?rev=1145436&r1=1145435&r2=1145436&view=diff
>>
>> ==============================================================================
>> --- geronimo/server/trunk/plugins/openwebbeans/pom.xml (original)
>> +++ geronimo/server/trunk/plugins/openwebbeans/pom.xml Tue Jul 12 02:26:54
>> 2011
>> @@ -91,9 +91,9 @@
>>     </dependencyManagement>
>>
>>     <modules>
>> -        <module>geronimo-openwebbeans</module>
>> +        <!--<module>geronimo-openwebbeans</module>-->
>>         <mo
>
>


-- 
Shawn

Mime
View raw message