[jboss-cvs] JBossAS SVN: r74669 - in trunk/testsuite/src: resources/web/simple-xmlonly and 1 other directory.

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

Author: jeff.zhang
Date: 2008-06-17 03:57:12 -0400 (Tue, 17 Jun 2008)
New Revision: 74669

Modified:
   trunk/testsuite/src/main/org/jboss/test/web/servlets/StandaloneENCAnnotationsServlet.java
   trunk/testsuite/src/resources/web/simple-xmlonly/encbinding-beans.xml
Log:
[JBAS-5626] fix EncXmlUnitTestCase and EncAnnotationsUnitTestCase tests

Modified: trunk/testsuite/src/main/org/jboss/test/web/servlets/StandaloneENCAnnotationsServlet.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/web/servlets/StandaloneENCAnnotationsServlet.java	2008-06-17 07:32:29 UTC (rev 74668)
+++ trunk/testsuite/src/main/org/jboss/test/web/servlets/StandaloneENCAnnotationsServlet.java	2008-06-17 07:57:12 UTC (rev 74669)
@@ -50,7 +50,6 @@
  */
 @Resources({
       @Resource(name="mail/DefaultMail", type=javax.mail.Session.class, mappedName="java:/Mail"),
-      @Resource(name="url/JBossHome", type=java.net.URL.class, mappedName="http://www.jboss.org"),
       @Resource(name="mdr/ConsumesLink", type=javax.jms.Queue.class, mappedName="MockQueueA"),
       @Resource(name="mdr/ProducesLink", type=javax.jms.Topic.class, mappedName="MockTopicA")
 })
@@ -77,14 +76,18 @@
    @EJB(name="ejb/local/bean3", beanInterface=StatelessSessionLocalHome.class, 
          mappedName="jbosstest/ejbs/local/ENCBean1")
    StatelessSessionLocalHome localHome;
+
+   @Resource(name="url/JBossHome", mappedName="http://www.jboss.org")
+   java.net.URL url;
+
    @Resource(name="Ints/i0", mappedName="0")
-   int i0;
+   Integer i0;
    @Resource(name="Ints/i1", mappedName="1")
-   int i1;
+   Integer i1;
    @Resource(name="Floats/f0", mappedName="0.0")
-   float f0;
+   Float f0;
    @Resource(name="Floats/f1", mappedName="1.1")
-   float f1;
+   Float f1;
    @Resource(name="Strings/s0", mappedName="String0")
    String s0;
    @Resource(name="Strings/s1", mappedName="String1")

Modified: trunk/testsuite/src/resources/web/simple-xmlonly/encbinding-beans.xml
===================================================================
--- trunk/testsuite/src/resources/web/simple-xmlonly/encbinding-beans.xml	2008-06-17 07:32:29 UTC (rev 74668)
+++ trunk/testsuite/src/resources/web/simple-xmlonly/encbinding-beans.xml	2008-06-17 07:57:12 UTC (rev 74669)
@@ -6,14 +6,13 @@
     <!-- Define a Jndi binding aspect/annotation that exposes beans via jndi
     when they are registered with the kernel.
     -->
-    <aop:lifecycle xmlns:aop="urn:jboss:aop-beans:1.0"
+    <aop:lifecycle-configure xmlns:aop="urn:jboss:aop-beans:1.0"
         name="DependencyAdvice"
-        class="org.jboss.aop.microcontainer.aspects.jndi.JndiIntroduction"
+        class="org.jboss.aop.microcontainer.aspects.jndi.JndiLifecycleCallback"
         classes="@org.jboss.aop.microcontainer.aspects.jndi.JndiBinding"
         manager-bean="AspectManager"
-        manager-property="aspectManager"
-        pointcut="execution(* @org.jboss.aop.microcontainer.aspects.jndi.JndiBinding->$implements{org.jboss.kernel.spi.dependency.KernelControllerContextAware}(..))">
-    </aop:lifecycle>
+        manager-property="aspectManager">
+    </aop:lifecycle-configure>
 
     <!-- The jndi bindings -->
     <bean name="ENC.MockDS" class="org.jboss.test.web.mock.MockDataSource">