[jboss-cvs] JBossAS SVN: r91045 - in branches/JBPAPP_5_0/testsuite: src/main/org/jboss/test/ejb3/servlet/servlets and 1 other directory.

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

Author: jason.greene at jboss.com
Date: 2009-07-10 00:12:32 -0400 (Fri, 10 Jul 2009)
New Revision: 91045

Modified:
   branches/JBPAPP_5_0/testsuite/imports/sections/ejb3.xml
   branches/JBPAPP_5_0/testsuite/src/main/org/jboss/test/ejb3/servlet/servlets/EJBServlet.java
Log:
Fix JBAS-6327
Reenable EJB3 servlet tests


Modified: branches/JBPAPP_5_0/testsuite/imports/sections/ejb3.xml
===================================================================
--- branches/JBPAPP_5_0/testsuite/imports/sections/ejb3.xml	2009-07-10 03:48:06 UTC (rev 91044)
+++ branches/JBPAPP_5_0/testsuite/imports/sections/ejb3.xml	2009-07-10 04:12:32 UTC (rev 91045)
@@ -89,9 +89,6 @@
          <classes dir="${build.classes}">
             <include name="org/jboss/test/ejb3/servlet/servlets/**"/>
          </classes>
-         <lib dir="${build.lib}">
-            <include name="ejb3-servlet-client.jar"/>
-         </lib>
       </war>
 
       <ear earfile="${build.lib}/ejb3-servlet.ear"

Modified: branches/JBPAPP_5_0/testsuite/src/main/org/jboss/test/ejb3/servlet/servlets/EJBServlet.java
===================================================================
--- branches/JBPAPP_5_0/testsuite/src/main/org/jboss/test/ejb3/servlet/servlets/EJBServlet.java	2009-07-10 03:48:06 UTC (rev 91044)
+++ branches/JBPAPP_5_0/testsuite/src/main/org/jboss/test/ejb3/servlet/servlets/EJBServlet.java	2009-07-10 04:12:32 UTC (rev 91045)
@@ -43,6 +43,7 @@
 import org.jboss.test.ejb3.servlet.Session30Remote;
 import org.jboss.test.ejb3.servlet.StatelessLocal;
 import org.jboss.test.ejb3.servlet.TestObject;
+import org.jboss.test.ejb3.servlet.WarTestObject;
 
 /** A servlet that accesses an EJB and tests whether the call argument
  is serialized.
@@ -53,13 +54,13 @@
 public class EJBServlet extends HttpServlet
 {
    private static final Logger log = Logger.getLogger(EJBServlet.class);
-   
+
    @EJB
    Session30BusinessRemote injectedSession;
-   
+
    @EJB
    StatelessLocal injectedStateful;
-   
+
    protected void processRequest(HttpServletRequest request, HttpServletResponse response)
          throws ServletException, IOException
    {
@@ -68,44 +69,43 @@
          SecurityClient client = SecurityClientFactory.getSecurityClient();
          client.setSimple("somebody", "password");
          client.login();
-         
+
          injectedSession.hello();
          injectedSession.goodbye();
-         
+
          injectedStateful.hello();
          injectedStateful.goodbye();
-           
+
          InitialContext ctx = new InitialContext();
-        
+
          Session30BusinessRemote remote = (Session30BusinessRemote)ctx.lookup("ejb/Session30");
-         
+
          remote.hello();
          remote.goodbye();
-         
+
          TestObject o = new TestObject();
          remote.access(o);
          o = remote.createTestObject();
-         
+
          Session30BusinessLocal local = (Session30BusinessLocal)ctx.lookup("ejb/Session30Local");
          o = new TestObject();
          local.access(o);
          o = local.createTestObject();
-         
-         // FIXME: this makes the servlet hang sometimes in Class.defineClass1()
-         //WarTestObject warObject = (WarTestObject)local.getWarTestObject();
-         
+
+         WarTestObject warObject = (WarTestObject)local.getWarTestObject();
+
          Session30Home home = (Session30Home)ctx.lookup("ejb/Session30Home");
          Session30Remote remote21 = home.create();
          remote21.access(o);
-         
+
          Session30LocalHome localHome = (Session30LocalHome)ctx.lookup("ejb/Session30LocalHome");
          Session30Local local21 = localHome.create();
          local21.access(o);
-         
+
          home = (Session30Home)ctx.lookup("java:comp/env/ejb/remote/Session30");
          remote21 = home.create();
          remote21.access(o);
-         
+
          localHome = (Session30LocalHome)ctx.lookup("java:comp/env/ejb/local/Session30");
          local21 = localHome.create();
          local21.access(o);
@@ -113,7 +113,7 @@
       catch (Exception e)
       {
          e.printStackTrace();
-        
+
          throw new ServletException("Failed to call OptimizedEJB/Session30 through remote and local interfaces", e);
       }
       response.setContentType("text/html");
@@ -124,7 +124,7 @@
       out.println("</html>");
       out.close();
    }
-   
+
    private void lookup(String name)
    {
       log.info("lookup " + name);