[jboss-cvs] JBossAS SVN: r89436 - in projects/webbeans-ri-int/trunk: deployer/src/main/java/org/jboss/webbeans/integration/deployer/env and 3 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: dallen6
Date: 2009-05-26 08:47:26 -0400 (Tue, 26 May 2009)
New Revision: 89436

Modified:
   projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/env/WebBeansJndiBinder.java
   projects/webbeans-ri-int/trunk/deployer/src/test/java/org/jboss/test/webbeans/deployers/support/MockEjbServices.java
   projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/ejb/JBossEjbServices.java
   projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/persistence/JBossJpaServices.java
   projects/webbeans-ri-int/trunk/pom.xml
Log:
Updated RI Integration to latest JSR-299 API

Modified: projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/env/WebBeansJndiBinder.java
===================================================================
--- projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/env/WebBeansJndiBinder.java	2009-05-26 12:46:09 UTC (rev 89435)
+++ projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/env/WebBeansJndiBinder.java	2009-05-26 12:47:26 UTC (rev 89436)
@@ -17,8 +17,8 @@
 
 package org.jboss.webbeans.integration.deployer.env;
 
+import javax.enterprise.inject.spi.BeanManager;
 import javax.inject.ExecutionException;
-import javax.inject.manager.Manager;
 import javax.naming.Context;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
@@ -46,7 +46,7 @@
    public void startService(String jndiContextPath, String managerObjectFactoryClass) throws Exception
    {
       jndiName = jndiContextPath;
-      Reference managerReference = new Reference(Manager.class.getName(), managerObjectFactoryClass, null);
+      Reference managerReference = new Reference(BeanManager.class.getName(), managerObjectFactoryClass, null);
       bind(jndiContextPath, managerReference);
    }
 

Modified: projects/webbeans-ri-int/trunk/deployer/src/test/java/org/jboss/test/webbeans/deployers/support/MockEjbServices.java
===================================================================
--- projects/webbeans-ri-int/trunk/deployer/src/test/java/org/jboss/test/webbeans/deployers/support/MockEjbServices.java	2009-05-26 12:46:09 UTC (rev 89435)
+++ projects/webbeans-ri-int/trunk/deployer/src/test/java/org/jboss/test/webbeans/deployers/support/MockEjbServices.java	2009-05-26 12:47:26 UTC (rev 89436)
@@ -23,7 +23,7 @@
 
 import java.util.Collections;
 
-import javax.inject.manager.InjectionPoint;
+import javax.enterprise.inject.spi.InjectionPoint;
 
 import org.jboss.deployers.structure.spi.DeploymentUnit;
 import org.jboss.webbeans.ejb.api.SessionObjectReference;

Modified: projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/ejb/JBossEjbServices.java
===================================================================
--- projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/ejb/JBossEjbServices.java	2009-05-26 12:46:09 UTC (rev 89435)
+++ projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/ejb/JBossEjbServices.java	2009-05-26 12:47:26 UTC (rev 89436)
@@ -7,8 +7,8 @@
 import java.util.List;
 
 import javax.ejb.EJB;
+import javax.enterprise.inject.spi.InjectionPoint;
 import javax.inject.ExecutionException;
-import javax.inject.manager.InjectionPoint;
 import javax.naming.NamingException;
 
 import org.jboss.deployers.structure.spi.DeploymentUnit;
@@ -69,7 +69,6 @@
       // Get properties from the annotation
       String beanName = annotation.beanName();
       String beanInterface = annotation.beanInterface().getName();
-      String mappedName = annotation.mappedName();
    
       // Supply beanInterface from reflection if not explicitly-defined
       if (beanInterface == null || beanInterface.equals(Object.class.getName()))

Modified: projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/persistence/JBossJpaServices.java
===================================================================
--- projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/persistence/JBossJpaServices.java	2009-05-26 12:46:09 UTC (rev 89435)
+++ projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/persistence/JBossJpaServices.java	2009-05-26 12:47:26 UTC (rev 89436)
@@ -4,7 +4,7 @@
 import java.util.Collection;
 import java.util.Collections;
 
-import javax.inject.manager.InjectionPoint;
+import javax.enterprise.inject.spi.InjectionPoint;
 import javax.naming.NamingException;
 import javax.persistence.EntityManager;
 import javax.persistence.EntityManagerFactory;

Modified: projects/webbeans-ri-int/trunk/pom.xml
===================================================================
--- projects/webbeans-ri-int/trunk/pom.xml	2009-05-26 12:46:09 UTC (rev 89435)
+++ projects/webbeans-ri-int/trunk/pom.xml	2009-05-26 12:47:26 UTC (rev 89436)
@@ -22,7 +22,7 @@
   </modules>
   
   <properties>
-    <version.webbeans>1.0.0.PREVIEW1</version.webbeans>
+    <version.webbeans>1.0.0-SNAPSHOT</version.webbeans>
     <version.jboss.vfs>2.1.1.GA</version.jboss.vfs>
     <version.jboss.man>2.1.0.CR8</version.jboss.man>
     <version.jboss.microcontainer>2.0.5.GA</version.jboss.microcontainer>