[Jboss-cvs] JBossAS SVN: r55832 - in trunk/ejb3: . src/resources/test/dd/web/META-INF src/test/org/jboss/ejb3/test/dd/web src/test/org/jboss/ejb3/test/dd/web/jsp src/test/org/jboss/ejb3/test/dd/web/unit
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Aug 11 14:57:44 EDT 2006
Author: bill.burke at jboss.com
Date: 2006-08-11 14:57:42 -0400 (Fri, 11 Aug 2006)
New Revision: 55832
Added:
trunk/ejb3/src/test/org/jboss/ejb3/test/dd/web/jsp/
trunk/ejb3/src/test/org/jboss/ejb3/test/dd/web/jsp/InjectionTest.jsp
Modified:
trunk/ejb3/build-test.xml
trunk/ejb3/src/resources/test/dd/web/META-INF/application.xml
trunk/ejb3/src/test/org/jboss/ejb3/test/dd/web/unit/WebIntegrationUnitTestCase.java
Log:
expand unit test for injection to include JSP
Modified: trunk/ejb3/build-test.xml
===================================================================
--- trunk/ejb3/build-test.xml 2006-08-11 18:56:53 UTC (rev 55831)
+++ trunk/ejb3/build-test.xml 2006-08-11 18:57:42 UTC (rev 55832)
@@ -1334,6 +1334,9 @@
<include name="**/*.jsp"/>
<include name="**/*.html"/>
</fileset>
+ <fileset dir="${source.java}/org/jboss/ejb3/test/dd/web/jsp">
+ <include name="*.jsp"/>
+ </fileset>
</war>
<ear earfile="${build.lib}/dd-web.ear"
Modified: trunk/ejb3/src/resources/test/dd/web/META-INF/application.xml
===================================================================
--- trunk/ejb3/src/resources/test/dd/web/META-INF/application.xml 2006-08-11 18:56:53 UTC (rev 55831)
+++ trunk/ejb3/src/resources/test/dd/web/META-INF/application.xml 2006-08-11 18:57:42 UTC (rev 55832)
@@ -3,6 +3,10 @@
<application>
<display-name>EJB3 Web Container Testsuite</display-name>
+ <module>
+ <ejb>dd-web-ejbs.jar</ejb>
+ </module>
+
<module>
<web>
<description>The testsuite war</description>
@@ -11,8 +15,5 @@
</web>
</module>
- <module>
- <ejb>dd-web-ejbs.jar</ejb>
- </module>
</application>
Added: trunk/ejb3/src/test/org/jboss/ejb3/test/dd/web/jsp/InjectionTest.jsp
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/dd/web/jsp/InjectionTest.jsp 2006-08-11 18:56:53 UTC (rev 55831)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/dd/web/jsp/InjectionTest.jsp 2006-08-11 18:57:42 UTC (rev 55832)
@@ -0,0 +1,63 @@
+<%@ page import="java.util.Hashtable,
+ javax.naming.*" %>
+<%@ page import="java.lang.reflect.Proxy"%>
+<%@ page import="org.jboss.ejb3.Ejb3Registry"%>
+<%@ page import="org.jboss.ejb3.Container"%>
+<%@ page import="java.util.Iterator"%>
+<%@ page import="javax.ejb.EJB"%>
+<%@ page import="org.jboss.ejb3.test.dd.web.interfaces.Session30"%>
+<%@ page import="javax.persistence.PersistenceContext"%>
+<%@ page import="javax.persistence.EntityManager"%>
+<%@ page import="javax.persistence.PersistenceUnit"%>
+<%@ page import="javax.persistence.EntityManagerFactory"%>
+<%@ page import="javax.annotation.Resource"%>
+<%@ page import="javax.transaction.UserTransaction"%>
+<%@ page import="org.jboss.ejb3.test.dd.web.ejb.Address"%>
+
+<%!
+
+ @EJB Session30 injectedSession30;
+ @PersistenceContext(unitName="../dd-web-ejbs.jar#tempdb") EntityManager injectedEntityManager;
+ @PersistenceUnit(unitName="../dd-web-ejbs.jar#tempdb") EntityManagerFactory injectedEntityManagerFactory;
+ @Resource int nonOverridentConstant = 5;
+ @Resource(name="overridenConstant") int overridenConstant = 1;
+ @Resource UserTransaction tx;
+
+%>
+
+<html>
+<body>
+<%
+ System.out.println("HERE!!!!!!!!!!!!!!!!!!!!!!!!");
+ String access = injectedSession30.access();
+ System.out.println("After injectSession30.access() HERE!!!!!!!!!!!!!!!!!!!!!!!!");
+
+ Address address = new Address();
+ address.setStreet("Clarendon Street");
+ address.setCity("Boston");
+ address.setState("MA");
+ address.setZip("02116");
+
+ Address address2 = new Address();
+ address.setStreet("Clarendon Street");
+ address.setCity("Boston");
+ address.setState("MA");
+ address.setZip("02116");
+
+ Address address3 = new Address();
+ address.setStreet("Clarendon Street");
+ address.setCity("Boston");
+ address.setState("MA");
+ address.setZip("02116");
+
+ //tx = (UserTransaction)ctx.lookup("UserTransaction");
+ EntityManager em = injectedEntityManagerFactory.createEntityManager();
+ tx.begin();
+ injectedEntityManager.persist(address2);
+ em.persist(address3);
+ tx.commit();
+ em.close();
+%>
+<h1>Test passed!</h1>
+</body>
+</html>
\ No newline at end of file
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/dd/web/unit/WebIntegrationUnitTestCase.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/dd/web/unit/WebIntegrationUnitTestCase.java 2006-08-11 18:56:53 UTC (rev 55831)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/dd/web/unit/WebIntegrationUnitTestCase.java 2006-08-11 18:57:42 UTC (rev 55832)
@@ -63,7 +63,18 @@
}
}
-/*
+ public void testInjectionJsp() throws Exception
+ {
+ try {
+ URL url = new URL(baseURL+"dd/InjectionTest.jsp");
+ HttpUtils.accessURL(url);
+ } catch (Exception e){
+ e.printStackTrace();
+ throw e;
+ }
+ }
+
+/*
public void testRealPath() throws Exception
{
URL url = new URL(baseURL+"dd/APIServlet?op=testGetRealPath");
More information about the jboss-cvs-commits
mailing list