[weld-commits] Weld SVN: r6117 - core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current and 1 other directories.

[weld-commits at lists.jboss.org]

Author: marius.bogoevici
Date: 2010-04-14 15:33:39 -0400 (Wed, 14 Apr 2010)
New Revision: 6117

Modified:
   cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/ResourceProducer.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/Donkey.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/HelloBean.java
Log:
CDITCK-141: use java:comp/BeanManager instead of java:app/BeanManager

Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/ResourceProducer.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/ResourceProducer.java	2010-04-14 10:33:59 UTC (rev 6116)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/ResourceProducer.java	2010-04-14 19:33:39 UTC (rev 6117)
@@ -23,6 +23,6 @@
 class ResourceProducer
 {
    @Produces @Another 
-   @Resource(mappedName = "java:app/BeanManager") 
+   @Resource(mappedName = "java:comp/BeanManager") 
    private BeanManager manager;
 }

Modified: core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/Donkey.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/Donkey.java	2010-04-14 10:33:59 UTC (rev 6116)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/activities/current/Donkey.java	2010-04-14 19:33:39 UTC (rev 6117)
@@ -27,7 +27,7 @@
    
    public Donkey() throws NamingException
    {
-      beanManager = (BeanManager) new InitialContext().lookup("java:app/BeanManager");
+      beanManager = (BeanManager) new InitialContext().lookup("java:comp/BeanManager");
    }
    
    public BeanManager getManager()

Modified: core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/HelloBean.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/HelloBean.java	2010-04-14 10:33:59 UTC (rev 6116)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/HelloBean.java	2010-04-14 19:33:39 UTC (rev 6117)
@@ -13,7 +13,7 @@
 @CacheConfig(idleTimeoutSeconds=1)
 public class HelloBean implements IHelloBean
 {
-   @Resource(mappedName = "java:app/BeanManager")
+   @Resource(mappedName = "java:comp/BeanManager")
    private BeanManager beanManager;
 
    public String sayHello()