[jboss-cvs] JBossAS SVN: r102576 - in projects/weld-int/branches/6.0.0.Beta7_VFS3_int: ejb/src/main/java/org/jboss/weld/integration/ejb and 1 other directories.

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

Author: marius.bogoevici
Date: 2010-03-18 15:09:11 -0400 (Thu, 18 Mar 2010)
New Revision: 102576

Modified:
   projects/weld-int/branches/6.0.0.Beta7_VFS3_int/assembly/src/main/assembly/resources/META-INF/weld-deployers-jboss-beans.xml
   projects/weld-int/branches/6.0.0.Beta7_VFS3_int/ejb/src/main/java/org/jboss/weld/integration/ejb/SessionBeanInterceptor.java
   projects/weld-int/branches/6.0.0.Beta7_VFS3_int/ejb/src/main/java/org/jboss/weld/integration/ejb/interceptor/Jsr299BindingsInterceptor.java
Log:
temporarily setting the name to which BeanManager is bound to java:BeanManagers/BeanManager

Modified: projects/weld-int/branches/6.0.0.Beta7_VFS3_int/assembly/src/main/assembly/resources/META-INF/weld-deployers-jboss-beans.xml
===================================================================
--- projects/weld-int/branches/6.0.0.Beta7_VFS3_int/assembly/src/main/assembly/resources/META-INF/weld-deployers-jboss-beans.xml	2010-03-18 18:33:02 UTC (rev 102575)
+++ projects/weld-int/branches/6.0.0.Beta7_VFS3_int/assembly/src/main/assembly/resources/META-INF/weld-deployers-jboss-beans.xml	2010-03-18 19:09:11 UTC (rev 102576)
@@ -55,7 +55,7 @@
   <!-- Responsible for adding the Weld Manager object factory to JNDI -->
    <bean name="WeldJndiBinder" class="org.jboss.weld.integration.deployer.env.WeldJndiBinder">
       <start method="startService">
-         <parameter>java:app/BeanManager</parameter>
+         <parameter>java:BeanManagers/BeanManager</parameter>
          <parameter>org.jboss.weld.resources.ManagerObjectFactory</parameter>
       </start>
       <stop method="stopService"/>

Modified: projects/weld-int/branches/6.0.0.Beta7_VFS3_int/ejb/src/main/java/org/jboss/weld/integration/ejb/SessionBeanInterceptor.java
===================================================================
--- projects/weld-int/branches/6.0.0.Beta7_VFS3_int/ejb/src/main/java/org/jboss/weld/integration/ejb/SessionBeanInterceptor.java	2010-03-18 18:33:02 UTC (rev 102575)
+++ projects/weld-int/branches/6.0.0.Beta7_VFS3_int/ejb/src/main/java/org/jboss/weld/integration/ejb/SessionBeanInterceptor.java	2010-03-18 19:09:11 UTC (rev 102576)
@@ -71,7 +71,7 @@
    @Resource
    private EJBContext ejbContext;
    
-   @Resource(mappedName="java:app/BeanManager")
+   @Resource(mappedName="java:BeanManagers/BeanManager")
    private WeldManager beanManager;
    
    private CreationalContext<Object> creationalContext;
@@ -158,4 +158,4 @@
 
 }
 
-   
\ No newline at end of file
+   

Modified: projects/weld-int/branches/6.0.0.Beta7_VFS3_int/ejb/src/main/java/org/jboss/weld/integration/ejb/interceptor/Jsr299BindingsInterceptor.java
===================================================================
--- projects/weld-int/branches/6.0.0.Beta7_VFS3_int/ejb/src/main/java/org/jboss/weld/integration/ejb/interceptor/Jsr299BindingsInterceptor.java	2010-03-18 18:33:02 UTC (rev 102575)
+++ projects/weld-int/branches/6.0.0.Beta7_VFS3_int/ejb/src/main/java/org/jboss/weld/integration/ejb/interceptor/Jsr299BindingsInterceptor.java	2010-03-18 19:09:11 UTC (rev 102576)
@@ -55,7 +55,7 @@
 
    private static final long serialVersionUID = -1999613731498564948L;
 
-   @Resource(mappedName="java:app/BeanManager")
+   @Resource(mappedName="java:BeanManagers/BeanManager")
    private WeldManager beanManager;
 
    private InterceptorBindings interceptorBindings;