[jboss-cvs] JBossAS SVN: r82295 - in projects/ejb3/trunk/testsuite/src/test: resources/test/dd/web/META-INF and 1 other directory.

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

Author: ALRubinger
Date: 2008-12-15 20:44:09 -0500 (Mon, 15 Dec 2008)
New Revision: 82295

Modified:
   projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/dd/web/servlets/EJBServlet.java
   projects/ejb3/trunk/testsuite/src/test/resources/test/dd/web/META-INF/ejb-jar.xml
Log:
[EJBTHREE-1241] Fix deployment failures, show injection fails in dd/web tests

Modified: projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/dd/web/servlets/EJBServlet.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/dd/web/servlets/EJBServlet.java	2008-12-16 01:32:08 UTC (rev 82294)
+++ projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/dd/web/servlets/EJBServlet.java	2008-12-16 01:44:09 UTC (rev 82295)
@@ -24,20 +24,21 @@
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.net.URL;
+
+import javax.annotation.Resource;
+import javax.ejb.EJB;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
 import javax.persistence.EntityManager;
+import javax.persistence.EntityManagerFactory;
 import javax.persistence.PersistenceContext;
 import javax.persistence.PersistenceUnit;
-import javax.persistence.EntityManagerFactory;
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.transaction.UserTransaction;
-import javax.ejb.EJB;
-import javax.annotation.Resource;
 
 import org.jboss.ejb3.test.dd.web.ejb.Address;
 import org.jboss.ejb3.test.dd.web.interfaces.ReferenceTest;
@@ -46,8 +47,6 @@
 import org.jboss.ejb3.test.dd.web.interfaces.StatelessSessionLocal;
 import org.jboss.ejb3.test.dd.web.util.Util;
 import org.jboss.logging.Logger;
-import org.jboss.security.SecurityAssociation;
-import org.jboss.security.SimplePrincipal;
 import org.jboss.security.client.SecurityClient;
 import org.jboss.security.client.SecurityClientFactory;
 
@@ -60,6 +59,8 @@
  */
 public class EJBServlet extends HttpServlet
 {
+   private static final long serialVersionUID = 1L;
+
    private static final Logger log = Logger.getLogger(EJBServlet.class);
 
    @EJB Session30 injectedSession30;
@@ -129,10 +130,10 @@
          address.setZip("02116");
          
          Address address2 = new Address();
-         address.setStreet("Clarendon Street");
+         address.setStreet("Newbury Street");
          address.setCity("Boston");
          address.setState("MA");
-         address.setZip("02116");
+         address.setZip("02115");
 
          Address address3 = new Address();
          address.setStreet("Clarendon Street");

Modified: projects/ejb3/trunk/testsuite/src/test/resources/test/dd/web/META-INF/ejb-jar.xml
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/resources/test/dd/web/META-INF/ejb-jar.xml	2008-12-16 01:32:08 UTC (rev 82294)
+++ projects/ejb3/trunk/testsuite/src/test/resources/test/dd/web/META-INF/ejb-jar.xml	2008-12-16 01:44:09 UTC (rev 82295)
@@ -93,8 +93,8 @@
       <session>
          <description>An EJB for testing in vm call optimization</description>
          <ejb-name>OptimizedEJB</ejb-name>
-         <remote>org.jboss.ejb3.test.dd.web.interfaces.StatelessSession</remote>
-         <local>org.jboss.ejb3.test.dd.web.interfaces.StatelessSessionLocal</local>
+         <business-local>org.jboss.ejb3.test.dd.web.interfaces.StatelessSessionLocal</business-local>
+         <business-remote>org.jboss.ejb3.test.dd.web.interfaces.StatelessSession</business-remote>
          <ejb-class>org.jboss.ejb3.test.dd.web.ejb.StatelessSessionBean2</ejb-class>
          <session-type>Stateless</session-type>
          <transaction-type>Container</transaction-type>