[jboss-cvs] JBossAS SVN: r76408 - trunk/testsuite/src/resources/web/simple-xmlonly.

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

Author: adrian at jboss.org
Date: 2008-07-29 08:32:58 -0400 (Tue, 29 Jul 2008)
New Revision: 76408

Added:
   trunk/testsuite/src/resources/web/simple-xmlonly/encbinding-jboss-beans.xml
Removed:
   trunk/testsuite/src/resources/web/simple-xmlonly/encbinding-beans.xml
Log:
[JBAS-5803] beans.xml -> jboss-beans.xml

Deleted: trunk/testsuite/src/resources/web/simple-xmlonly/encbinding-beans.xml
===================================================================
--- trunk/testsuite/src/resources/web/simple-xmlonly/encbinding-beans.xml	2008-07-29 12:30:02 UTC (rev 76407)
+++ trunk/testsuite/src/resources/web/simple-xmlonly/encbinding-beans.xml	2008-07-29 12:32:58 UTC (rev 76408)
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- $Id:$ -->
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-    
-    <!-- Define a Jndi binding aspect/annotation that exposes beans via jndi
-    when they are registered with the kernel.
-    -->
-    <aop:lifecycle-configure xmlns:aop="urn:jboss:aop-beans:1.0"
-        name="DependencyAdvice"
-        class="org.jboss.aop.microcontainer.aspects.jndi.JndiLifecycleCallback"
-        classes="@org.jboss.aop.microcontainer.aspects.jndi.JndiBinding"
-        manager-bean="AspectManager"
-        manager-property="aspectManager">
-    </aop:lifecycle-configure>
-
-    <!-- The jndi bindings -->
-    <bean name="ENC.MockDS" class="org.jboss.test.web.mock.MockDataSource">
-        <annotation>@org.jboss.aop.microcontainer.aspects.jndi.JndiBinding(name="java:/MockDS")</annotation>
-    </bean>
-    <bean name="ENC/ejb/bean3" class="org.jboss.test.web.mock.StatelessHomeBean">
-        <annotation>@org.jboss.aop.microcontainer.aspects.jndi.JndiBinding(name="jbosstest/ejbs/UnsecuredEJB")</annotation>
-    </bean>
-    <bean name="ENC/ejb/local/bean3" class="org.jboss.test.web.mock.StatelessLocalHomeBean">
-        <annotation>@org.jboss.aop.microcontainer.aspects.jndi.JndiBinding(name="jbosstest/ejbs/local/ENCBean1")</annotation>
-    </bean>
-    <bean name="ENC/ejb/CtsBmp" class="org.jboss.test.web.mock.EntityHomeBean">
-        <annotation>@org.jboss.aop.microcontainer.aspects.jndi.JndiBinding(name="jbosstest/ejbs/CtsBmp")</annotation>
-    </bean>
-    
-    <bean name="ENC/mdr/ConsumesProducesJNDIName" class="org.jboss.test.web.mock.QueueBean">
-        <annotation>@org.jboss.aop.microcontainer.aspects.jndi.JndiBinding(name="MockQueueA")</annotation>
-    </bean>
-    <bean name="ENC/TestQueue" class="org.jboss.test.web.mock.QueueBean">
-        <annotation>@org.jboss.aop.microcontainer.aspects.jndi.JndiBinding(name="MockQueueB")</annotation>
-    </bean>
-    <bean name="ENC/TestTopic" class="org.jboss.test.web.mock.TopicBean">
-        <annotation>@org.jboss.aop.microcontainer.aspects.jndi.JndiBinding(name="MockTopicA")</annotation>
-    </bean>
-
-</deployment>

Copied: trunk/testsuite/src/resources/web/simple-xmlonly/encbinding-jboss-beans.xml (from rev 76407, trunk/testsuite/src/resources/web/simple-xmlonly/encbinding-beans.xml)
===================================================================
--- trunk/testsuite/src/resources/web/simple-xmlonly/encbinding-jboss-beans.xml	                        (rev 0)
+++ trunk/testsuite/src/resources/web/simple-xmlonly/encbinding-jboss-beans.xml	2008-07-29 12:32:58 UTC (rev 76408)
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- $Id:$ -->
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+    
+    <!-- Define a Jndi binding aspect/annotation that exposes beans via jndi
+    when they are registered with the kernel.
+    -->
+    <aop:lifecycle-configure xmlns:aop="urn:jboss:aop-beans:1.0"
+        name="DependencyAdvice"
+        class="org.jboss.aop.microcontainer.aspects.jndi.JndiLifecycleCallback"
+        classes="@org.jboss.aop.microcontainer.aspects.jndi.JndiBinding"
+        manager-bean="AspectManager"
+        manager-property="aspectManager">
+    </aop:lifecycle-configure>
+
+    <!-- The jndi bindings -->
+    <bean name="ENC.MockDS" class="org.jboss.test.web.mock.MockDataSource">
+        <annotation>@org.jboss.aop.microcontainer.aspects.jndi.JndiBinding(name="java:/MockDS")</annotation>
+    </bean>
+    <bean name="ENC/ejb/bean3" class="org.jboss.test.web.mock.StatelessHomeBean">
+        <annotation>@org.jboss.aop.microcontainer.aspects.jndi.JndiBinding(name="jbosstest/ejbs/UnsecuredEJB")</annotation>
+    </bean>
+    <bean name="ENC/ejb/local/bean3" class="org.jboss.test.web.mock.StatelessLocalHomeBean">
+        <annotation>@org.jboss.aop.microcontainer.aspects.jndi.JndiBinding(name="jbosstest/ejbs/local/ENCBean1")</annotation>
+    </bean>
+    <bean name="ENC/ejb/CtsBmp" class="org.jboss.test.web.mock.EntityHomeBean">
+        <annotation>@org.jboss.aop.microcontainer.aspects.jndi.JndiBinding(name="jbosstest/ejbs/CtsBmp")</annotation>
+    </bean>
+    
+    <bean name="ENC/mdr/ConsumesProducesJNDIName" class="org.jboss.test.web.mock.QueueBean">
+        <annotation>@org.jboss.aop.microcontainer.aspects.jndi.JndiBinding(name="MockQueueA")</annotation>
+    </bean>
+    <bean name="ENC/TestQueue" class="org.jboss.test.web.mock.QueueBean">
+        <annotation>@org.jboss.aop.microcontainer.aspects.jndi.JndiBinding(name="MockQueueB")</annotation>
+    </bean>
+    <bean name="ENC/TestTopic" class="org.jboss.test.web.mock.TopicBean">
+        <annotation>@org.jboss.aop.microcontainer.aspects.jndi.JndiBinding(name="MockTopicA")</annotation>
+    </bean>
+
+</deployment>