[jboss-cvs] JBossAS SVN: r61361 - in branches/Branch_4_2/testsuite: src/resources/classloader/leak/war/ejb3 and 1 other directories.

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

Author: bstansberry at jboss.com
Date: 2007-03-15 23:40:33 -0400 (Thu, 15 Mar 2007)
New Revision: 61361

Added:
   branches/Branch_4_2/testsuite/src/resources/classloader/leak/war/ejb3/WEB-INF/jboss-web.xml
Modified:
   branches/Branch_4_2/testsuite/imports/sections/classloader.xml
   branches/Branch_4_2/testsuite/src/resources/classloader/leak/war/ejb3/WEB-INF/web.xml
   branches/Branch_4_2/testsuite/src/resources/classloader/leak/war/ejb3/ejb.jsp
Log:
Access EJBs via the webapp ENC

Modified: branches/Branch_4_2/testsuite/imports/sections/classloader.xml
===================================================================
--- branches/Branch_4_2/testsuite/imports/sections/classloader.xml	2007-03-16 03:03:56 UTC (rev 61360)
+++ branches/Branch_4_2/testsuite/imports/sections/classloader.xml	2007-03-16 03:40:33 UTC (rev 61361)
@@ -575,6 +575,9 @@
   	<!-- EJB3 versions of the classloader leak deployments -->
     <war destfile="${build.lib}/classloader-leak-simple-ejb3.war"
         webxml="${build.resources}/classloader/leak/war/ejb3/WEB-INF/web.xml">
+    	<webinf dir="${build.resources}/classloader/leak/war/ejb3/WEB-INF">
+    		<include name="jboss-web.xml"/>
+    	</webinf>
     	<classes dir="${build.classes}">
     		<include name="org/jboss/test/classloader/leak/web/*"/>
     		<exclude name="org/jboss/test/classloader/leak/web/EjbServlet"/>

Added: branches/Branch_4_2/testsuite/src/resources/classloader/leak/war/ejb3/WEB-INF/jboss-web.xml
===================================================================
--- branches/Branch_4_2/testsuite/src/resources/classloader/leak/war/ejb3/WEB-INF/jboss-web.xml	                        (rev 0)
+++ branches/Branch_4_2/testsuite/src/resources/classloader/leak/war/ejb3/WEB-INF/jboss-web.xml	2007-03-16 03:40:33 UTC (rev 61361)
@@ -0,0 +1,19 @@
+<jboss-web>
+   <context-root>/classloader-leak</context-root>
+   
+   <ejb-ref>
+        <ejb-ref-name>ejb/ClassloaderLeakEJB3SLSB</ejb-ref-name>
+        <jndi-name>Ejb3StatelessSession/remote</jndi-name>
+   </ejb-ref>
+   
+   <ejb-ref>
+        <ejb-ref-name>ejb/ClassloaderLeakEJB3SFSB</ejb-ref-name>
+        <jndi-name>Ejb3StatefulSession/remote</jndi-name>
+   </ejb-ref>
+   
+   <ejb-ref>
+        <ejb-ref-name>ejb/TLPClassloaderLeakEJB3SLSB</ejb-ref-name>
+        <jndi-name>ThreadLocalPoolEjb3StatelessSession/remote</jndi-name>
+   </ejb-ref>
+   
+</jboss-web>

Modified: branches/Branch_4_2/testsuite/src/resources/classloader/leak/war/ejb3/WEB-INF/web.xml
===================================================================
--- branches/Branch_4_2/testsuite/src/resources/classloader/leak/war/ejb3/WEB-INF/web.xml	2007-03-16 03:03:56 UTC (rev 61360)
+++ branches/Branch_4_2/testsuite/src/resources/classloader/leak/war/ejb3/WEB-INF/web.xml	2007-03-16 03:40:33 UTC (rev 61361)
@@ -29,15 +29,13 @@
       <servlet-name>EJBServlet</servlet-name>
       <url-pattern>/EJBServlet</url-pattern>
    </servlet-mapping>
-   
-   <!-- FIXME: get ENC bindings working -->
-   <!--   
+
    <ejb-ref>
        <ejb-ref-name>ejb/ClassloaderLeakEJB3SLSB</ejb-ref-name>
        <ejb-ref-type>Session</ejb-ref-type>
        <home>org.jboss.test.classloader.leak.ejb3.Ejb3StatelessSession</home>
        <remote>org.jboss.test.classloader.leak.ejb3.Ejb3StatelessSession</remote>
-       <ejb-link>Ejb3StatelessSessionBean</ejb-link>
+       <!--ejb-link>Ejb3StatelessSessionBean</ejb-link-->
    </ejb-ref>
       
    <ejb-ref>
@@ -45,8 +43,16 @@
        <ejb-ref-type>Session</ejb-ref-type>
        <home>org.jboss.test.classloader.leak.ejb3.Ejb3StatefulSession</home>
        <remote>org.jboss.test.classloader.leak.ejb3.Ejb3StatefulSession</remote>
-       <ejb-link>Ejb3StatefulSessionBean</ejb-link>
+       <!--ejb-link>Ejb3StatefulSessionBean</ejb-link-->
    </ejb-ref>
-   -->
+
+   <ejb-ref>
+       <ejb-ref-name>ejb/TLPClassloaderLeakEJB3SLSB</ejb-ref-name>
+       <ejb-ref-type>Session</ejb-ref-type>
+       <home>org.jboss.test.classloader.leak.ejb3.ThreadLocalPoolEjb3StatelessSession</home>
+       <remote>org.jboss.test.classloader.leak.ejb3.ThreadLocalPoolEjb3StatelessSession</remote>
+       <!--ejb-link>Ejb3StatelessSessionBean</ejb-link-->
+   </ejb-ref>
+   
 </web-app>
 

Modified: branches/Branch_4_2/testsuite/src/resources/classloader/leak/war/ejb3/ejb.jsp
===================================================================
--- branches/Branch_4_2/testsuite/src/resources/classloader/leak/war/ejb3/ejb.jsp	2007-03-16 03:03:56 UTC (rev 61360)
+++ branches/Branch_4_2/testsuite/src/resources/classloader/leak/war/ejb3/ejb.jsp	2007-03-16 03:40:33 UTC (rev 61361)
@@ -5,11 +5,11 @@
   try
   {
       InitialContext ctx = new InitialContext();
-      Ejb3StatelessSession ejb3slsb = (Ejb3StatelessSession) ctx.lookup("Ejb3StatelessSession/remote");
+      Ejb3StatelessSession ejb3slsb = (Ejb3StatelessSession) ctx.lookup("java:comp/env/ejb/ClassloaderLeakEJB3SLSB");
       ejb3slsb.log("EJB");
-      Ejb3StatefulSession ejb3sfsb = (Ejb3StatefulSession) ctx.lookup("Ejb3StatefulSession/remote");
+      Ejb3StatefulSession ejb3sfsb = (Ejb3StatefulSession) ctx.lookup("java:comp/env/ejb/ClassloaderLeakEJB3SFSB");
       ejb3sfsb.log("EJB");
-      Ejb3StatelessSession tlpejb3slsb = (Ejb3StatelessSession) ctx.lookup("ThreadLocalPoolEjb3StatelessSession/remote");
+      Ejb3StatelessSession tlpejb3slsb = (Ejb3StatelessSession) ctx.lookup("java:comp/env/ejb/TLPClassloaderLeakEJB3SLSB");
       tlpejb3slsb.log("EJB");
   }
   catch (Exception e)