You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jg...@apache.org on 2011/10/04 23:56:59 UTC
svn commit: r1178974 [2/4] - in
/openejb/trunk/arquillian-tomee/arquillian-tomee-tests: ./
src/test/java/org/apache/openejb/arquillian/tests/
src/test/java/org/apache/openejb/arquillian/tests/cdiinject/
src/test/java/org/apache/openejb/arquillian/tests...
Copied: openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterpersistence/ServletFilterPersistenceInjectionTest.java (from r1178936, openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/ServletFilterPersistenceInjectionTest.java)
URL: http://svn.apache.org/viewvc/openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterpersistence/ServletFilterPersistenceInjectionTest.java?p2=openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterpersistence/ServletFilterPersistenceInjectionTest.java&p1=openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/ServletFilterPersistenceInjectionTest.java&r1=1178936&r2=1178974&rev=1178974&view=diff
==============================================================================
--- openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/ServletFilterPersistenceInjectionTest.java (original)
+++ openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterpersistence/ServletFilterPersistenceInjectionTest.java Tue Oct 4 21:56:55 2011
@@ -14,22 +14,20 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.openejb.arquillian.tests;
+package org.apache.openejb.arquillian.tests.filterpersistence;
+import org.apache.openejb.arquillian.tests.TestRun;
+import org.apache.openejb.arquillian.tests.TestSetup;
import org.jboss.arquillian.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.shrinkwrap.api.ArchivePaths;
import org.jboss.shrinkwrap.api.spec.WebArchive;
import org.jboss.shrinkwrap.descriptor.api.spec.servlet.web.WebAppDescriptor;
-import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
-import javax.annotation.Resource;
import javax.persistence.*;
import javax.servlet.*;
-import javax.transaction.UserTransaction;
-import java.io.IOException;
@RunWith(Arquillian.class)
public class ServletFilterPersistenceInjectionTest extends TestSetup {
@@ -54,7 +52,7 @@ public class ServletFilterPersistenceInj
@Deployment(testable = false)
public static WebArchive getArchive() {
- return new ServletFilterPersistenceInjectionTest().createDeployment(PersistenceServletFilter.class, Address.class);
+ return new ServletFilterPersistenceInjectionTest().createDeployment(TestRun.class, PersistenceServletFilter.class, Address.class);
}
protected void decorateDescriptor(WebAppDescriptor descriptor) {
@@ -65,91 +63,6 @@ public class ServletFilterPersistenceInj
archive.addAsManifestResource("persistence.xml", ArchivePaths.create("persistence.xml"));
}
- public static class PersistenceServletFilter implements Filter {
-
- @Resource
- private UserTransaction transaction;
-
- @PersistenceUnit
- private EntityManagerFactory entityMgrFactory;
-
- @PersistenceContext
- private EntityManager entityManager;
-
- public void init(FilterConfig config) {
- }
-
- public void destroy() {
- }
-
- @Override
- public void doFilter(ServletRequest req, ServletResponse resp, FilterChain chain) throws ServletException, IOException {
- run(req, resp, this);
- }
-
- public void testEntityManagerFactory() {
- Assert.assertNotNull(entityMgrFactory);
-
- Address a = new Address();
- EntityManager em = entityMgrFactory.createEntityManager();
- em.contains(a);
- }
-
- public void testEntityManager() {
- Assert.assertNotNull(entityManager);
- Address a = new Address();
- entityManager.contains(a);
- }
-
- public void testUserTransaction() throws Exception{
- Assert.assertNotNull(transaction);
- transaction.begin();
- transaction.commit();
- }
-
- }
-
- @Entity
- public static class Address {
- public String getStreet() {
- return street;
- }
-
- public void setStreet(String street) {
- this.street = street;
- }
-
- public String getCity() {
- return city;
- }
-
- public void setCity(String city) {
- this.city = city;
- }
-
- public String getState() {
- return state;
- }
-
- public void setState(String state) {
- this.state = state;
- }
-
- public String getZip() {
- return zip;
- }
-
- public void setZip(String zip) {
- this.zip = zip;
- }
-
- private String street = "123 Lakeview St.", city = "Paradise", state = "ZZ", zip = "00000";
-
- public String toString() {
- return "Street: " + street + ", City: " + city + ", State: " + state + ", Zip: " + zip;
- }
- }
-
}
Added: openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterremote/CompanyRemote.java
URL: http://svn.apache.org/viewvc/openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterremote/CompanyRemote.java?rev=1178974&view=auto
==============================================================================
--- openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterremote/CompanyRemote.java (added)
+++ openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterremote/CompanyRemote.java Tue Oct 4 21:56:55 2011
@@ -0,0 +1,8 @@
+package org.apache.openejb.arquillian.tests.filterremote;
+
+import javax.ejb.Remote;
+
+@Remote
+public interface CompanyRemote {
+ public String employ(String employeeName);
+}
\ No newline at end of file
Added: openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterremote/DefaultCompany.java
URL: http://svn.apache.org/viewvc/openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterremote/DefaultCompany.java?rev=1178974&view=auto
==============================================================================
--- openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterremote/DefaultCompany.java (added)
+++ openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterremote/DefaultCompany.java Tue Oct 4 21:56:55 2011
@@ -0,0 +1,14 @@
+package org.apache.openejb.arquillian.tests.filterremote;
+
+import javax.ejb.Stateless;
+
+@Stateless
+public class DefaultCompany implements CompanyRemote {
+
+ private final String name = "TomEE Software Inc.";
+
+ public String employ(String employeeName) {
+ return employeeName + " is employed at " + name;
+ }
+
+}
\ No newline at end of file
Added: openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterremote/RemoteServletFilter.java
URL: http://svn.apache.org/viewvc/openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterremote/RemoteServletFilter.java?rev=1178974&view=auto
==============================================================================
--- openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterremote/RemoteServletFilter.java (added)
+++ openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterremote/RemoteServletFilter.java Tue Oct 4 21:56:55 2011
@@ -0,0 +1,37 @@
+package org.apache.openejb.arquillian.tests.filterremote;
+
+import java.io.IOException;
+
+import javax.ejb.EJB;
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+
+import org.apache.openejb.arquillian.tests.TestRun;
+import org.junit.Assert;
+
+public class RemoteServletFilter implements Filter {
+
+ @EJB
+ private CompanyRemote remoteCompany;
+
+ public void init(FilterConfig config) {
+ }
+
+ public void destroy() {
+ }
+
+ @Override
+ public void doFilter(ServletRequest req, ServletResponse resp, FilterChain chain) throws ServletException, IOException {
+ TestRun.run(req, resp, this);
+ }
+
+ public void testEjb () {
+ Assert.assertNotNull(remoteCompany);
+ remoteCompany.employ("test");
+ }
+
+}
\ No newline at end of file
Copied: openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterremote/ServletFilterEjbRemoteInjectionTest.java (from r1178936, openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/ServletFilterEjbRemoteInjectionTest.java)
URL: http://svn.apache.org/viewvc/openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterremote/ServletFilterEjbRemoteInjectionTest.java?p2=openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterremote/ServletFilterEjbRemoteInjectionTest.java&p1=openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/ServletFilterEjbRemoteInjectionTest.java&r1=1178936&r2=1178974&rev=1178974&view=diff
==============================================================================
--- openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/ServletFilterEjbRemoteInjectionTest.java (original)
+++ openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterremote/ServletFilterEjbRemoteInjectionTest.java Tue Oct 4 21:56:55 2011
@@ -14,21 +14,18 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.openejb.arquillian.tests;
+package org.apache.openejb.arquillian.tests.filterremote;
+import org.apache.openejb.arquillian.tests.TestRun;
+import org.apache.openejb.arquillian.tests.TestSetup;
import org.jboss.arquillian.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.shrinkwrap.api.spec.WebArchive;
import org.jboss.shrinkwrap.descriptor.api.spec.servlet.web.WebAppDescriptor;
-import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
-import javax.ejb.EJB;
-import javax.ejb.Remote;
-import javax.ejb.Stateless;
import javax.servlet.*;
-import java.io.IOException;
@RunWith(Arquillian.class)
public class ServletFilterEjbRemoteInjectionTest extends TestSetup {
@@ -41,52 +38,13 @@ public class ServletFilterEjbRemoteInjec
@Deployment(testable = false)
public static WebArchive getArchive() {
- return new ServletFilterEjbRemoteInjectionTest().createDeployment(RemoteServletFilter.class, CompanyRemote.class, DefaultCompany.class);
+ return new ServletFilterEjbRemoteInjectionTest().createDeployment(TestRun.class, RemoteServletFilter.class, CompanyRemote.class, DefaultCompany.class);
}
protected void decorateDescriptor(WebAppDescriptor descriptor) {
descriptor.filter(RemoteServletFilter.class, "/" + getTestContextName());
}
- public static class RemoteServletFilter implements Filter {
-
- @EJB
- private CompanyRemote remoteCompany;
-
- public void init(FilterConfig config) {
- }
-
- public void destroy() {
- }
-
- @Override
- public void doFilter(ServletRequest req, ServletResponse resp, FilterChain chain) throws ServletException, IOException {
- run(req, resp, this);
- }
-
- public void testEjb () {
- Assert.assertNotNull(remoteCompany);
- remoteCompany.employ("test");
- }
-
- }
-
- @Remote
- public static interface CompanyRemote {
- public String employ(String employeeName);
- }
-
- @Stateless
- public static class DefaultCompany implements CompanyRemote {
-
- private final String name = "TomEE Software Inc.";
-
- public String employ(String employeeName) {
- return employeeName + " is employed at " + name;
- }
-
- }
-
}
Added: openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerenventry/Car.java
URL: http://svn.apache.org/viewvc/openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerenventry/Car.java?rev=1178974&view=auto
==============================================================================
--- openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerenventry/Car.java (added)
+++ openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerenventry/Car.java Tue Oct 4 21:56:55 2011
@@ -0,0 +1,10 @@
+package org.apache.openejb.arquillian.tests.listenerenventry;
+
+public class Car {
+ private final String make = "Lexus", model = "IS 350";
+ private final int year = 2011;
+
+ public String drive(String name) {
+ return name + " is on the wheel of a " + year + " " + make + " " + model;
+ }
+}
\ No newline at end of file
Added: openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerenventry/Code.java
URL: http://svn.apache.org/viewvc/openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerenventry/Code.java?rev=1178974&view=auto
==============================================================================
--- openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerenventry/Code.java (added)
+++ openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerenventry/Code.java Tue Oct 4 21:56:55 2011
@@ -0,0 +1,6 @@
+package org.apache.openejb.arquillian.tests.listenerenventry;
+
+public enum Code {
+ OK,
+ ERROR;
+}
\ No newline at end of file
Added: openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerenventry/Company.java
URL: http://svn.apache.org/viewvc/openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerenventry/Company.java?rev=1178974&view=auto
==============================================================================
--- openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerenventry/Company.java (added)
+++ openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerenventry/Company.java Tue Oct 4 21:56:55 2011
@@ -0,0 +1,5 @@
+package org.apache.openejb.arquillian.tests.listenerenventry;
+
+public interface Company {
+ public String employ(String employeeName);
+}
\ No newline at end of file
Added: openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerenventry/CompanyLocal.java
URL: http://svn.apache.org/viewvc/openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerenventry/CompanyLocal.java?rev=1178974&view=auto
==============================================================================
--- openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerenventry/CompanyLocal.java (added)
+++ openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerenventry/CompanyLocal.java Tue Oct 4 21:56:55 2011
@@ -0,0 +1,7 @@
+package org.apache.openejb.arquillian.tests.listenerenventry;
+
+import javax.ejb.Local;
+
+@Local
+public interface CompanyLocal extends Company {
+}
\ No newline at end of file
Added: openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerenventry/ContextAttributeName.java
URL: http://svn.apache.org/viewvc/openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerenventry/ContextAttributeName.java?rev=1178974&view=auto
==============================================================================
--- openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerenventry/ContextAttributeName.java (added)
+++ openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerenventry/ContextAttributeName.java Tue Oct 4 21:56:55 2011
@@ -0,0 +1,16 @@
+package org.apache.openejb.arquillian.tests.listenerenventry;
+
+public enum ContextAttributeName {
+ KEY_Car,
+ KEY_LocalEjb,
+ KEY_Market,
+ KEY_ConnPool,
+ KEY_StartCount,
+ KEY_InitSize,
+ KEY_TotalQuantity,
+ KEY_EnableEmail,
+ KEY_DefaultOption,
+ KEY_ReturnEmail,
+ KEY_AuditWriter,
+ KEY_DefaultCode,;
+}
\ No newline at end of file
Added: openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerenventry/DefaultCompany.java
URL: http://svn.apache.org/viewvc/openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerenventry/DefaultCompany.java?rev=1178974&view=auto
==============================================================================
--- openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerenventry/DefaultCompany.java (added)
+++ openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerenventry/DefaultCompany.java Tue Oct 4 21:56:55 2011
@@ -0,0 +1,14 @@
+package org.apache.openejb.arquillian.tests.listenerenventry;
+
+import javax.ejb.Stateless;
+
+@Stateless
+public class DefaultCompany implements CompanyLocal {
+
+ private final String name = "TomEE Software Inc.";
+
+ public String employ(String employeeName) {
+ return employeeName + " is employed at " + name;
+ }
+
+}
\ No newline at end of file
Added: openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerenventry/PojoServletContextListener.java
URL: http://svn.apache.org/viewvc/openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerenventry/PojoServletContextListener.java?rev=1178974&view=auto
==============================================================================
--- openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerenventry/PojoServletContextListener.java (added)
+++ openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerenventry/PojoServletContextListener.java Tue Oct 4 21:56:55 2011
@@ -0,0 +1,101 @@
+package org.apache.openejb.arquillian.tests.listenerenventry;
+
+import javax.annotation.Resource;
+import javax.ejb.EJB;
+import javax.inject.Inject;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
+
+import org.apache.commons.lang.StringUtils;
+
+public class PojoServletContextListener implements ServletContextListener {
+
+ @Inject
+ private Car car;
+
+ @EJB
+ private CompanyLocal localCompany;
+
+ @EJB
+ private SuperMarket market;
+
+ @Resource(name = "returnEmail")
+ private String returnEmail;
+
+ @Resource(name = "connectionPool")
+ private Integer connectionPool;
+
+ @Resource(name = "startCount")
+ private Long startCount;
+
+ @Resource(name = "initSize")
+ private Short initSize;
+
+ @Resource(name = "totalQuantity")
+ private Byte totalQuantity;
+
+ @Resource(name = "enableEmail")
+ private Boolean enableEmail;
+
+ @Resource(name = "optionDefault")
+ private Character optionDefault;
+
+ /* TODO: Enable this resource after functionality is fixed
+ @Resource
+ */
+ private Code defaultCode;
+
+ /* TODO: Enable this resource after functionality is fixed
+ @Resource
+ @SuppressWarnings("unchecked")
+ */
+ private Class auditWriter;
+
+
+ public void contextInitialized(ServletContextEvent event) {
+ final String name = "OpenEJB";
+ final ServletContext context = event.getServletContext();
+
+ if (car != null) {
+ context.setAttribute(ContextAttributeName.KEY_Car.name(), car.drive(name));
+ }
+ if (localCompany != null) {
+ context.setAttribute(ContextAttributeName.KEY_LocalEjb.name(), "Local: " + localCompany.employ(name));
+ }
+ if (market != null) {
+ context.setAttribute(ContextAttributeName.KEY_Market.name(), market.shop(name));
+ }
+ if (connectionPool != null) {
+ context.setAttribute(ContextAttributeName.KEY_ConnPool.name(), "Connection Pool: " + connectionPool);
+ }
+ if (startCount != null) {
+ context.setAttribute(ContextAttributeName.KEY_StartCount.name(), "Start Expressions.Count: " + startCount);
+ }
+ if (initSize != null) {
+ context.setAttribute(ContextAttributeName.KEY_InitSize.name(), "Init Size: " + initSize);
+ }
+ if (totalQuantity != null) {
+ context.setAttribute(ContextAttributeName.KEY_TotalQuantity.name(), "Total Quantity: " + totalQuantity);
+ }
+ if (enableEmail != null) {
+ context.setAttribute(ContextAttributeName.KEY_EnableEmail.name(), "Enable Email: " + enableEmail);
+ }
+ if (optionDefault != null) {
+ context.setAttribute(ContextAttributeName.KEY_DefaultOption.name(), "Option Default: " + optionDefault);
+ }
+ if (StringUtils.isNotEmpty(returnEmail) && returnEmail.equals("tomee@apache.org")) {
+ context.setAttribute(ContextAttributeName.KEY_ReturnEmail.name(), returnEmail);
+ }
+ if (auditWriter != null) {
+ context.setAttribute(ContextAttributeName.KEY_AuditWriter.name(), auditWriter.getClass().getName());
+ }
+ if (defaultCode != null) {
+ context.setAttribute(ContextAttributeName.KEY_DefaultCode.name(), "DefaultCode: " + defaultCode);
+ }
+ }
+
+ public void contextDestroyed(ServletContextEvent event) {
+ }
+
+}
\ No newline at end of file
Added: openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerenventry/PojoServletSessionListener.java
URL: http://svn.apache.org/viewvc/openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerenventry/PojoServletSessionListener.java?rev=1178974&view=auto
==============================================================================
--- openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerenventry/PojoServletSessionListener.java (added)
+++ openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerenventry/PojoServletSessionListener.java Tue Oct 4 21:56:55 2011
@@ -0,0 +1,101 @@
+package org.apache.openejb.arquillian.tests.listenerenventry;
+
+import javax.annotation.Resource;
+import javax.ejb.EJB;
+import javax.inject.Inject;
+import javax.servlet.http.HttpSession;
+import javax.servlet.http.HttpSessionEvent;
+import javax.servlet.http.HttpSessionListener;
+
+import org.apache.commons.lang.StringUtils;
+
+public class PojoServletSessionListener implements HttpSessionListener {
+
+ @Inject
+ private Car car;
+
+ @EJB
+ private CompanyLocal localCompany;
+
+ @EJB
+ private SuperMarket market;
+
+ @Resource(name = "returnEmail")
+ private String returnEmail;
+
+ @Resource(name = "connectionPool")
+ private Integer connectionPool;
+
+ @Resource(name = "startCount")
+ private Long startCount;
+
+ @Resource(name = "initSize")
+ private Short initSize;
+
+ @Resource(name = "totalQuantity")
+ private Byte totalQuantity;
+
+ @Resource(name = "enableEmail")
+ private Boolean enableEmail;
+
+ @Resource(name = "optionDefault")
+ private Character optionDefault;
+
+ /* TODO: Enable this resource after functionality is fixed
+ @Resource
+ */
+ private Code defaultCode;
+
+ /* TODO: Enable this resource after functionality is fixed
+ @Resource
+ @SuppressWarnings("unchecked")
+ */
+ private Class auditWriter;
+
+
+ public void sessionCreated(HttpSessionEvent event) {
+ final String name = "OpenEJB";
+ final HttpSession context = event.getSession();
+
+ if (car != null) {
+ context.setAttribute(ContextAttributeName.KEY_Car.name(), car.drive(name));
+ }
+ if (localCompany != null) {
+ context.setAttribute(ContextAttributeName.KEY_LocalEjb.name(), "Local: " + localCompany.employ(name));
+ }
+ if (market != null) {
+ context.setAttribute(ContextAttributeName.KEY_Market.name(), market.shop(name));
+ }
+ if (connectionPool != null) {
+ context.setAttribute(ContextAttributeName.KEY_ConnPool.name(), "Connection Pool: " + connectionPool);
+ }
+ if (startCount != null) {
+ context.setAttribute(ContextAttributeName.KEY_StartCount.name(), "Start Expressions.Count: " + startCount);
+ }
+ if (initSize != null) {
+ context.setAttribute(ContextAttributeName.KEY_InitSize.name(), "Init Size: " + initSize);
+ }
+ if (totalQuantity != null) {
+ context.setAttribute(ContextAttributeName.KEY_TotalQuantity.name(), "Total Quantity: " + totalQuantity);
+ }
+ if (enableEmail != null) {
+ context.setAttribute(ContextAttributeName.KEY_EnableEmail.name(), "Enable Email: " + enableEmail);
+ }
+ if (optionDefault != null) {
+ context.setAttribute(ContextAttributeName.KEY_DefaultOption.name(), "Option Default: " + optionDefault);
+ }
+ if (StringUtils.isNotEmpty(returnEmail) && returnEmail.equals("tomee@apache.org")) {
+ context.setAttribute(ContextAttributeName.KEY_ReturnEmail.name(), returnEmail);
+ }
+ if (auditWriter != null) {
+ context.setAttribute(ContextAttributeName.KEY_AuditWriter.name(), auditWriter.getClass().getName());
+ }
+ if (defaultCode != null) {
+ context.setAttribute(ContextAttributeName.KEY_DefaultCode.name(), "DefaultCode: " + defaultCode);
+ }
+ }
+
+ public void sessionDestroyed(HttpSessionEvent event) {
+ }
+
+}
\ No newline at end of file
Copied: openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerenventry/ServletListenerEnvEntryInjectionTest.java (from r1178936, openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/ServletListenerEnvEntryInjectionTest.java)
URL: http://svn.apache.org/viewvc/openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerenventry/ServletListenerEnvEntryInjectionTest.java?p2=openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerenventry/ServletListenerEnvEntryInjectionTest.java&p1=openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/ServletListenerEnvEntryInjectionTest.java&r1=1178936&r2=1178974&rev=1178974&view=diff
==============================================================================
--- openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/ServletListenerEnvEntryInjectionTest.java (original)
+++ openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerenventry/ServletListenerEnvEntryInjectionTest.java Tue Oct 4 21:56:55 2011
@@ -14,9 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.openejb.arquillian.tests;
+package org.apache.openejb.arquillian.tests.listenerenventry;
-import org.apache.commons.lang.StringUtils;
import org.jboss.arquillian.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.shrinkwrap.api.ArchivePaths;
@@ -31,16 +30,6 @@ import org.jboss.shrinkwrap.descriptor.s
import org.junit.Test;
import org.junit.runner.RunWith;
-import javax.annotation.Resource;
-import javax.ejb.EJB;
-import javax.ejb.Local;
-import javax.ejb.LocalBean;
-import javax.ejb.Stateless;
-import javax.inject.Inject;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
-import javax.servlet.ServletException;
import javax.servlet.http.*;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
@@ -215,7 +204,7 @@ public class ServletListenerEnvEntryInje
addEnvEntry(descriptor, "totalQuantity", "java.lang.Byte", "5");
addEnvEntry(descriptor, "optionDefault", "java.lang.Character", "X");
addEnvEntry(descriptor, "auditWriter", "java.lang.Class", "java.lang.String");
- addEnvEntry(descriptor, "defaultCode", "java.lang.Enum", "org.apache.openejb.arquillian.ServletListenerPojoInjectionTest$Code.OK");
+ //addEnvEntry(descriptor, "defaultCode", "java.lang.Enum", "org.apache.openejb.arquillian.ServletListenerPojoInjectionTest$Code.OK");
final WebArchive archive = ShrinkWrap.create(WebArchive.class, TEST_NAME + ".war")
.addClass(PojoServletContextListener.class)
@@ -226,6 +215,8 @@ public class ServletListenerEnvEntryInje
.addClass(Company.class)
.addClass(DefaultCompany.class)
.addClass(SuperMarket.class)
+ .addClass(Code.class)
+ .addClass(ContextAttributeName.class)
.setWebXML(new StringAsset(descriptor.exportAsString()))
.addAsWebInfResource(EmptyAsset.INSTANCE, ArchivePaths.create("beans.xml"));
@@ -234,265 +225,6 @@ public class ServletListenerEnvEntryInje
return archive;
}
- public static enum Code {
- OK,
- ERROR;
- }
-
- public static enum ContextAttributeName {
- KEY_Car,
- KEY_LocalEjb,
- KEY_Market,
- KEY_ConnPool,
- KEY_StartCount,
- KEY_InitSize,
- KEY_TotalQuantity,
- KEY_EnableEmail,
- KEY_DefaultOption,
- KEY_ReturnEmail,
- KEY_AuditWriter,
- KEY_DefaultCode,;
- }
-
- public static class ServletToCheckListener extends HttpServlet {
-
- @Override
- public void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
- final ServletContext ctxt = req.getServletContext();
- for (ContextAttributeName s : ContextAttributeName.values()) {
- resp.getOutputStream().println("Context: " + ctxt.getAttribute(s.name()));
- }
-
- final HttpSession session = req.getSession();
- for (ContextAttributeName s : ContextAttributeName.values()) {
- resp.getOutputStream().println("Session: " + session.getAttribute(s.name()));
- }
- }
- }
-
- public static class PojoServletContextListener implements ServletContextListener {
-
- @Inject
- private Car car;
-
- @EJB
- private CompanyLocal localCompany;
-
- @EJB
- private SuperMarket market;
-
- @Resource(name = "returnEmail")
- private String returnEmail;
-
- @Resource(name = "connectionPool")
- private Integer connectionPool;
-
- @Resource(name = "startCount")
- private Long startCount;
-
- @Resource(name = "initSize")
- private Short initSize;
-
- @Resource(name = "totalQuantity")
- private Byte totalQuantity;
-
- @Resource(name = "enableEmail")
- private Boolean enableEmail;
-
- @Resource(name = "optionDefault")
- private Character optionDefault;
-
- /* TODO: Enable this resource after functionality is fixed
- @Resource
- */
- private Code defaultCode;
-
- /* TODO: Enable this resource after functionality is fixed
- @Resource
- @SuppressWarnings("unchecked")
- */
- private Class auditWriter;
-
-
- public void contextInitialized(ServletContextEvent event) {
- final String name = "OpenEJB";
- final ServletContext context = event.getServletContext();
-
- if (car != null) {
- context.setAttribute(ContextAttributeName.KEY_Car.name(), car.drive(name));
- }
- if (localCompany != null) {
- context.setAttribute(ContextAttributeName.KEY_LocalEjb.name(), "Local: " + localCompany.employ(name));
- }
- if (market != null) {
- context.setAttribute(ContextAttributeName.KEY_Market.name(), market.shop(name));
- }
- if (connectionPool != null) {
- context.setAttribute(ContextAttributeName.KEY_ConnPool.name(), "Connection Pool: " + connectionPool);
- }
- if (startCount != null) {
- context.setAttribute(ContextAttributeName.KEY_StartCount.name(), "Start Expressions.Count: " + startCount);
- }
- if (initSize != null) {
- context.setAttribute(ContextAttributeName.KEY_InitSize.name(), "Init Size: " + initSize);
- }
- if (totalQuantity != null) {
- context.setAttribute(ContextAttributeName.KEY_TotalQuantity.name(), "Total Quantity: " + totalQuantity);
- }
- if (enableEmail != null) {
- context.setAttribute(ContextAttributeName.KEY_EnableEmail.name(), "Enable Email: " + enableEmail);
- }
- if (optionDefault != null) {
- context.setAttribute(ContextAttributeName.KEY_DefaultOption.name(), "Option Default: " + optionDefault);
- }
- if (StringUtils.isNotEmpty(returnEmail) && returnEmail.equals("tomee@apache.org")) {
- context.setAttribute(ContextAttributeName.KEY_ReturnEmail.name(), returnEmail);
- }
- if (auditWriter != null) {
- context.setAttribute(ContextAttributeName.KEY_AuditWriter.name(), auditWriter.getClass().getName());
- }
- if (defaultCode != null) {
- context.setAttribute(ContextAttributeName.KEY_DefaultCode.name(), "DefaultCode: " + defaultCode);
- }
- }
-
- public void contextDestroyed(ServletContextEvent event) {
- }
-
- }
-
- public static class PojoServletSessionListener implements HttpSessionListener {
-
- @Inject
- private Car car;
-
- @EJB
- private CompanyLocal localCompany;
-
- @EJB
- private SuperMarket market;
-
- @Resource(name = "returnEmail")
- private String returnEmail;
-
- @Resource(name = "connectionPool")
- private Integer connectionPool;
-
- @Resource(name = "startCount")
- private Long startCount;
-
- @Resource(name = "initSize")
- private Short initSize;
-
- @Resource(name = "totalQuantity")
- private Byte totalQuantity;
-
- @Resource(name = "enableEmail")
- private Boolean enableEmail;
-
- @Resource(name = "optionDefault")
- private Character optionDefault;
-
- /* TODO: Enable this resource after functionality is fixed
- @Resource
- */
- private Code defaultCode;
-
- /* TODO: Enable this resource after functionality is fixed
- @Resource
- @SuppressWarnings("unchecked")
- */
- private Class auditWriter;
-
-
- public void sessionCreated(HttpSessionEvent event) {
- final String name = "OpenEJB";
- final HttpSession context = event.getSession();
-
- if (car != null) {
- context.setAttribute(ContextAttributeName.KEY_Car.name(), car.drive(name));
- }
- if (localCompany != null) {
- context.setAttribute(ContextAttributeName.KEY_LocalEjb.name(), "Local: " + localCompany.employ(name));
- }
- if (market != null) {
- context.setAttribute(ContextAttributeName.KEY_Market.name(), market.shop(name));
- }
- if (connectionPool != null) {
- context.setAttribute(ContextAttributeName.KEY_ConnPool.name(), "Connection Pool: " + connectionPool);
- }
- if (startCount != null) {
- context.setAttribute(ContextAttributeName.KEY_StartCount.name(), "Start Expressions.Count: " + startCount);
- }
- if (initSize != null) {
- context.setAttribute(ContextAttributeName.KEY_InitSize.name(), "Init Size: " + initSize);
- }
- if (totalQuantity != null) {
- context.setAttribute(ContextAttributeName.KEY_TotalQuantity.name(), "Total Quantity: " + totalQuantity);
- }
- if (enableEmail != null) {
- context.setAttribute(ContextAttributeName.KEY_EnableEmail.name(), "Enable Email: " + enableEmail);
- }
- if (optionDefault != null) {
- context.setAttribute(ContextAttributeName.KEY_DefaultOption.name(), "Option Default: " + optionDefault);
- }
- if (StringUtils.isNotEmpty(returnEmail) && returnEmail.equals("tomee@apache.org")) {
- context.setAttribute(ContextAttributeName.KEY_ReturnEmail.name(), returnEmail);
- }
- if (auditWriter != null) {
- context.setAttribute(ContextAttributeName.KEY_AuditWriter.name(), auditWriter.getClass().getName());
- }
- if (defaultCode != null) {
- context.setAttribute(ContextAttributeName.KEY_DefaultCode.name(), "DefaultCode: " + defaultCode);
- }
- }
-
- public void sessionDestroyed(HttpSessionEvent event) {
- }
-
- }
-
- public static class Car {
- private final String make = "Lexus", model = "IS 350";
- private final int year = 2011;
-
- public String drive(String name) {
- return name + " is on the wheel of a " + year + " " + make + " " + model;
- }
- }
-
-
- public static interface Company {
- public String employ(String employeeName);
- }
-
- @Local
- public static interface CompanyLocal extends Company {
- }
-
- @Stateless
- public static class DefaultCompany implements CompanyLocal {
-
- private final String name = "TomEE Software Inc.";
-
- public String employ(String employeeName) {
- return employeeName + " is employed at " + name;
- }
-
- }
-
- @Stateless
- @LocalBean
- public static class SuperMarket {
-
- private final String name = "Apache Marketplace";
-
- public String shop(String employeeName) {
- return employeeName + " shops at " + name;
- }
-
- }
-
private static void addEnvEntry(WebAppDescriptor descriptor, String name, String type, String value) {
Node rootNode = ((NodeProvider) descriptor).getRootNode();
Node appNode = rootNode.get("/web-app").iterator().next();
Added: openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerenventry/ServletToCheckListener.java
URL: http://svn.apache.org/viewvc/openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerenventry/ServletToCheckListener.java?rev=1178974&view=auto
==============================================================================
--- openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerenventry/ServletToCheckListener.java (added)
+++ openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerenventry/ServletToCheckListener.java Tue Oct 4 21:56:55 2011
@@ -0,0 +1,26 @@
+package org.apache.openejb.arquillian.tests.listenerenventry;
+
+import java.io.IOException;
+
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+
+public class ServletToCheckListener extends HttpServlet {
+
+ @Override
+ public void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+ final ServletContext ctxt = req.getServletContext();
+ for (ContextAttributeName s : ContextAttributeName.values()) {
+ resp.getOutputStream().println("Context: " + ctxt.getAttribute(s.name()));
+ }
+
+ final HttpSession session = req.getSession();
+ for (ContextAttributeName s : ContextAttributeName.values()) {
+ resp.getOutputStream().println("Session: " + session.getAttribute(s.name()));
+ }
+ }
+}
\ No newline at end of file
Added: openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerenventry/SuperMarket.java
URL: http://svn.apache.org/viewvc/openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerenventry/SuperMarket.java?rev=1178974&view=auto
==============================================================================
--- openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerenventry/SuperMarket.java (added)
+++ openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerenventry/SuperMarket.java Tue Oct 4 21:56:55 2011
@@ -0,0 +1,16 @@
+package org.apache.openejb.arquillian.tests.listenerenventry;
+
+import javax.ejb.LocalBean;
+import javax.ejb.Stateless;
+
+@Stateless
+@LocalBean
+public class SuperMarket {
+
+ private final String name = "Apache Marketplace";
+
+ public String shop(String employeeName) {
+ return employeeName + " shops at " + name;
+ }
+
+}
\ No newline at end of file
Added: openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerlocalinject/Car.java
URL: http://svn.apache.org/viewvc/openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerlocalinject/Car.java?rev=1178974&view=auto
==============================================================================
--- openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerlocalinject/Car.java (added)
+++ openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerlocalinject/Car.java Tue Oct 4 21:56:55 2011
@@ -0,0 +1,10 @@
+package org.apache.openejb.arquillian.tests.listenerlocalinject;
+
+public class Car {
+ private final String make = "Lexus", model = "IS 350";
+ private final int year = 2011;
+
+ public String drive(String name) {
+ return name + " is on the wheel of a " + year + " " + make + " " + model;
+ }
+}
\ No newline at end of file
Added: openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerlocalinject/Code.java
URL: http://svn.apache.org/viewvc/openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerlocalinject/Code.java?rev=1178974&view=auto
==============================================================================
--- openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerlocalinject/Code.java (added)
+++ openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerlocalinject/Code.java Tue Oct 4 21:56:55 2011
@@ -0,0 +1,6 @@
+package org.apache.openejb.arquillian.tests.listenerlocalinject;
+
+public enum Code {
+ OK,
+ ERROR;
+}
\ No newline at end of file
Added: openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerlocalinject/Company.java
URL: http://svn.apache.org/viewvc/openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerlocalinject/Company.java?rev=1178974&view=auto
==============================================================================
--- openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerlocalinject/Company.java (added)
+++ openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerlocalinject/Company.java Tue Oct 4 21:56:55 2011
@@ -0,0 +1,5 @@
+package org.apache.openejb.arquillian.tests.listenerlocalinject;
+
+public interface Company {
+ public String employ(String employeeName);
+}
\ No newline at end of file
Added: openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerlocalinject/CompanyLocal.java
URL: http://svn.apache.org/viewvc/openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerlocalinject/CompanyLocal.java?rev=1178974&view=auto
==============================================================================
--- openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerlocalinject/CompanyLocal.java (added)
+++ openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerlocalinject/CompanyLocal.java Tue Oct 4 21:56:55 2011
@@ -0,0 +1,7 @@
+package org.apache.openejb.arquillian.tests.listenerlocalinject;
+
+import javax.ejb.Local;
+
+@Local
+public interface CompanyLocal extends Company {
+}
\ No newline at end of file
Added: openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerlocalinject/ContextAttributeName.java
URL: http://svn.apache.org/viewvc/openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerlocalinject/ContextAttributeName.java?rev=1178974&view=auto
==============================================================================
--- openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerlocalinject/ContextAttributeName.java (added)
+++ openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerlocalinject/ContextAttributeName.java Tue Oct 4 21:56:55 2011
@@ -0,0 +1,16 @@
+package org.apache.openejb.arquillian.tests.listenerlocalinject;
+
+public enum ContextAttributeName {
+ KEY_Car,
+ KEY_LocalEjb,
+ KEY_Market,
+ KEY_ConnPool,
+ KEY_StartCount,
+ KEY_InitSize,
+ KEY_TotalQuantity,
+ KEY_EnableEmail,
+ KEY_DefaultOption,
+ KEY_ReturnEmail,
+ KEY_AuditWriter,
+ KEY_DefaultCode,;
+}
\ No newline at end of file
Added: openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerlocalinject/DefaultCompany.java
URL: http://svn.apache.org/viewvc/openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerlocalinject/DefaultCompany.java?rev=1178974&view=auto
==============================================================================
--- openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerlocalinject/DefaultCompany.java (added)
+++ openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerlocalinject/DefaultCompany.java Tue Oct 4 21:56:55 2011
@@ -0,0 +1,14 @@
+package org.apache.openejb.arquillian.tests.listenerlocalinject;
+
+import javax.ejb.Stateless;
+
+@Stateless
+public class DefaultCompany implements CompanyLocal {
+
+ private final String name = "TomEE Software Inc.";
+
+ public String employ(String employeeName) {
+ return employeeName + " is employed at " + name;
+ }
+
+}
\ No newline at end of file
Added: openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerlocalinject/PojoServletContextListener.java
URL: http://svn.apache.org/viewvc/openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerlocalinject/PojoServletContextListener.java?rev=1178974&view=auto
==============================================================================
--- openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerlocalinject/PojoServletContextListener.java (added)
+++ openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerlocalinject/PojoServletContextListener.java Tue Oct 4 21:56:55 2011
@@ -0,0 +1,101 @@
+package org.apache.openejb.arquillian.tests.listenerlocalinject;
+
+import javax.annotation.Resource;
+import javax.ejb.EJB;
+import javax.inject.Inject;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
+
+import org.apache.commons.lang.StringUtils;
+
+public class PojoServletContextListener implements ServletContextListener {
+
+ @Inject
+ private Car car;
+
+ @EJB
+ private CompanyLocal localCompany;
+
+ @EJB
+ private SuperMarket market;
+
+ @Resource(name = "returnEmail")
+ private String returnEmail;
+
+ @Resource(name = "connectionPool")
+ private Integer connectionPool;
+
+ @Resource(name = "startCount")
+ private Long startCount;
+
+ @Resource(name = "initSize")
+ private Short initSize;
+
+ @Resource(name = "totalQuantity")
+ private Byte totalQuantity;
+
+ @Resource(name = "enableEmail")
+ private Boolean enableEmail;
+
+ @Resource(name = "optionDefault")
+ private Character optionDefault;
+
+ /* TODO: Enable this resource after functionality is fixed
+ @Resource
+ */
+ private Code defaultCode;
+
+ /* TODO: Enable this resource after functionality is fixed
+ @Resource
+ @SuppressWarnings("unchecked")
+ */
+ private Class auditWriter;
+
+
+ public void contextInitialized(ServletContextEvent event) {
+ final String name = "OpenEJB";
+ final ServletContext context = event.getServletContext();
+
+ if (car != null) {
+ context.setAttribute(ContextAttributeName.KEY_Car.name(), car.drive(name));
+ }
+ if (localCompany != null) {
+ context.setAttribute(ContextAttributeName.KEY_LocalEjb.name(), "Local: " + localCompany.employ(name));
+ }
+ if (market != null) {
+ context.setAttribute(ContextAttributeName.KEY_Market.name(), market.shop(name));
+ }
+ if (connectionPool != null) {
+ context.setAttribute(ContextAttributeName.KEY_ConnPool.name(), "Connection Pool: " + connectionPool);
+ }
+ if (startCount != null) {
+ context.setAttribute(ContextAttributeName.KEY_StartCount.name(), "Start Expressions.Count: " + startCount);
+ }
+ if (initSize != null) {
+ context.setAttribute(ContextAttributeName.KEY_InitSize.name(), "Init Size: " + initSize);
+ }
+ if (totalQuantity != null) {
+ context.setAttribute(ContextAttributeName.KEY_TotalQuantity.name(), "Total Quantity: " + totalQuantity);
+ }
+ if (enableEmail != null) {
+ context.setAttribute(ContextAttributeName.KEY_EnableEmail.name(), "Enable Email: " + enableEmail);
+ }
+ if (optionDefault != null) {
+ context.setAttribute(ContextAttributeName.KEY_DefaultOption.name(), "Option Default: " + optionDefault);
+ }
+ if (StringUtils.isNotEmpty(returnEmail) && returnEmail.equals("tomee@apache.org")) {
+ context.setAttribute(ContextAttributeName.KEY_ReturnEmail.name(), returnEmail);
+ }
+ if (auditWriter != null) {
+ context.setAttribute(ContextAttributeName.KEY_AuditWriter.name(), auditWriter.getClass().getName());
+ }
+ if (defaultCode != null) {
+ context.setAttribute(ContextAttributeName.KEY_DefaultCode.name(), "DefaultCode: " + defaultCode);
+ }
+ }
+
+ public void contextDestroyed(ServletContextEvent event) {
+ }
+
+}
\ No newline at end of file
Added: openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerlocalinject/PojoServletSessionListener.java
URL: http://svn.apache.org/viewvc/openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerlocalinject/PojoServletSessionListener.java?rev=1178974&view=auto
==============================================================================
--- openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerlocalinject/PojoServletSessionListener.java (added)
+++ openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerlocalinject/PojoServletSessionListener.java Tue Oct 4 21:56:55 2011
@@ -0,0 +1,101 @@
+package org.apache.openejb.arquillian.tests.listenerlocalinject;
+
+import javax.annotation.Resource;
+import javax.ejb.EJB;
+import javax.inject.Inject;
+import javax.servlet.http.HttpSession;
+import javax.servlet.http.HttpSessionEvent;
+import javax.servlet.http.HttpSessionListener;
+
+import org.apache.commons.lang.StringUtils;
+
+public class PojoServletSessionListener implements HttpSessionListener {
+
+ @Inject
+ private Car car;
+
+ @EJB
+ private CompanyLocal localCompany;
+
+ @EJB
+ private SuperMarket market;
+
+ @Resource(name = "returnEmail")
+ private String returnEmail;
+
+ @Resource(name = "connectionPool")
+ private Integer connectionPool;
+
+ @Resource(name = "startCount")
+ private Long startCount;
+
+ @Resource(name = "initSize")
+ private Short initSize;
+
+ @Resource(name = "totalQuantity")
+ private Byte totalQuantity;
+
+ @Resource(name = "enableEmail")
+ private Boolean enableEmail;
+
+ @Resource(name = "optionDefault")
+ private Character optionDefault;
+
+ /* TODO: Enable this resource after functionality is fixed
+ @Resource
+ */
+ private Code defaultCode;
+
+ /* TODO: Enable this resource after functionality is fixed
+ @Resource
+ @SuppressWarnings("unchecked")
+ */
+ private Class auditWriter;
+
+
+ public void sessionCreated(HttpSessionEvent event) {
+ final String name = "OpenEJB";
+ final HttpSession context = event.getSession();
+
+ if (car != null) {
+ context.setAttribute(ContextAttributeName.KEY_Car.name(), car.drive(name));
+ }
+ if (localCompany != null) {
+ context.setAttribute(ContextAttributeName.KEY_LocalEjb.name(), "Local: " + localCompany.employ(name));
+ }
+ if (market != null) {
+ context.setAttribute(ContextAttributeName.KEY_Market.name(), market.shop(name));
+ }
+ if (connectionPool != null) {
+ context.setAttribute(ContextAttributeName.KEY_ConnPool.name(), "Connection Pool: " + connectionPool);
+ }
+ if (startCount != null) {
+ context.setAttribute(ContextAttributeName.KEY_StartCount.name(), "Start Expressions.Count: " + startCount);
+ }
+ if (initSize != null) {
+ context.setAttribute(ContextAttributeName.KEY_InitSize.name(), "Init Size: " + initSize);
+ }
+ if (totalQuantity != null) {
+ context.setAttribute(ContextAttributeName.KEY_TotalQuantity.name(), "Total Quantity: " + totalQuantity);
+ }
+ if (enableEmail != null) {
+ context.setAttribute(ContextAttributeName.KEY_EnableEmail.name(), "Enable Email: " + enableEmail);
+ }
+ if (optionDefault != null) {
+ context.setAttribute(ContextAttributeName.KEY_DefaultOption.name(), "Option Default: " + optionDefault);
+ }
+ if (StringUtils.isNotEmpty(returnEmail) && returnEmail.equals("tomee@apache.org")) {
+ context.setAttribute(ContextAttributeName.KEY_ReturnEmail.name(), returnEmail);
+ }
+ if (auditWriter != null) {
+ context.setAttribute(ContextAttributeName.KEY_AuditWriter.name(), auditWriter.getClass().getName());
+ }
+ if (defaultCode != null) {
+ context.setAttribute(ContextAttributeName.KEY_DefaultCode.name(), "DefaultCode: " + defaultCode);
+ }
+ }
+
+ public void sessionDestroyed(HttpSessionEvent event) {
+ }
+
+}
\ No newline at end of file
Copied: openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerlocalinject/ServletListenerEjbLocalInjectionTest.java (from r1178936, openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/ServletListenerEjbLocalInjectionTest.java)
URL: http://svn.apache.org/viewvc/openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerlocalinject/ServletListenerEjbLocalInjectionTest.java?p2=openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerlocalinject/ServletListenerEjbLocalInjectionTest.java&p1=openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/ServletListenerEjbLocalInjectionTest.java&r1=1178936&r2=1178974&rev=1178974&view=diff
==============================================================================
--- openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/ServletListenerEjbLocalInjectionTest.java (original)
+++ openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerlocalinject/ServletListenerEjbLocalInjectionTest.java Tue Oct 4 21:56:55 2011
@@ -14,9 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.openejb.arquillian.tests;
+package org.apache.openejb.arquillian.tests.listenerlocalinject;
-import org.apache.commons.lang.StringUtils;
import org.jboss.arquillian.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.shrinkwrap.api.ArchivePaths;
@@ -31,22 +30,6 @@ import org.jboss.shrinkwrap.descriptor.s
import org.junit.Test;
import org.junit.runner.RunWith;
-import javax.annotation.Resource;
-import javax.ejb.EJB;
-import javax.ejb.Local;
-import javax.ejb.LocalBean;
-import javax.ejb.Stateless;
-import javax.inject.Inject;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-import javax.servlet.http.HttpSessionEvent;
-import javax.servlet.http.HttpSessionListener;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
@@ -220,7 +203,7 @@ public class ServletListenerEjbLocalInje
addEnvEntry(descriptor, "totalQuantity", "java.lang.Byte", "5");
addEnvEntry(descriptor, "optionDefault", "java.lang.Character", "X");
addEnvEntry(descriptor, "auditWriter", "java.lang.Class", "java.lang.String");
- addEnvEntry(descriptor, "defaultCode", "java.lang.Enum", "org.apache.openejb.arquillian.ServletListenerPojoInjectionTest$Code.OK");
+ //addEnvEntry(descriptor, "defaultCode", "java.lang.Enum", "org.apache.openejb.arquillian.ServletListenerPojoInjectionTest$Code.OK");
final WebArchive archive = ShrinkWrap.create(WebArchive.class, TEST_NAME + ".war")
.addClass(PojoServletContextListener.class)
@@ -231,6 +214,8 @@ public class ServletListenerEjbLocalInje
.addClass(Company.class)
.addClass(DefaultCompany.class)
.addClass(SuperMarket.class)
+ .addClass(Code.class)
+ .addClass(ContextAttributeName.class)
.setWebXML(new StringAsset(descriptor.exportAsString()))
.addAsWebInfResource(EmptyAsset.INSTANCE, ArchivePaths.create("beans.xml"));
@@ -239,265 +224,6 @@ public class ServletListenerEjbLocalInje
return archive;
}
- public static enum Code {
- OK,
- ERROR;
- }
-
- public static enum ContextAttributeName {
- KEY_Car,
- KEY_LocalEjb,
- KEY_Market,
- KEY_ConnPool,
- KEY_StartCount,
- KEY_InitSize,
- KEY_TotalQuantity,
- KEY_EnableEmail,
- KEY_DefaultOption,
- KEY_ReturnEmail,
- KEY_AuditWriter,
- KEY_DefaultCode,;
- }
-
- public static class ServletToCheckListener extends HttpServlet {
-
- @Override
- public void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
- final ServletContext ctxt = req.getServletContext();
- for (ContextAttributeName s : ContextAttributeName.values()) {
- resp.getOutputStream().println("Context: " + ctxt.getAttribute(s.name()));
- }
-
- final HttpSession session = req.getSession();
- for (ContextAttributeName s : ContextAttributeName.values()) {
- resp.getOutputStream().println("Session: " + session.getAttribute(s.name()));
- }
- }
- }
-
- public static class PojoServletContextListener implements ServletContextListener {
-
- @Inject
- private Car car;
-
- @EJB
- private CompanyLocal localCompany;
-
- @EJB
- private SuperMarket market;
-
- @Resource(name = "returnEmail")
- private String returnEmail;
-
- @Resource(name = "connectionPool")
- private Integer connectionPool;
-
- @Resource(name = "startCount")
- private Long startCount;
-
- @Resource(name = "initSize")
- private Short initSize;
-
- @Resource(name = "totalQuantity")
- private Byte totalQuantity;
-
- @Resource(name = "enableEmail")
- private Boolean enableEmail;
-
- @Resource(name = "optionDefault")
- private Character optionDefault;
-
- /* TODO: Enable this resource after functionality is fixed
- @Resource
- */
- private Code defaultCode;
-
- /* TODO: Enable this resource after functionality is fixed
- @Resource
- @SuppressWarnings("unchecked")
- */
- private Class auditWriter;
-
-
- public void contextInitialized(ServletContextEvent event) {
- final String name = "OpenEJB";
- final ServletContext context = event.getServletContext();
-
- if (car != null) {
- context.setAttribute(ContextAttributeName.KEY_Car.name(), car.drive(name));
- }
- if (localCompany != null) {
- context.setAttribute(ContextAttributeName.KEY_LocalEjb.name(), "Local: " + localCompany.employ(name));
- }
- if (market != null) {
- context.setAttribute(ContextAttributeName.KEY_Market.name(), market.shop(name));
- }
- if (connectionPool != null) {
- context.setAttribute(ContextAttributeName.KEY_ConnPool.name(), "Connection Pool: " + connectionPool);
- }
- if (startCount != null) {
- context.setAttribute(ContextAttributeName.KEY_StartCount.name(), "Start Expressions.Count: " + startCount);
- }
- if (initSize != null) {
- context.setAttribute(ContextAttributeName.KEY_InitSize.name(), "Init Size: " + initSize);
- }
- if (totalQuantity != null) {
- context.setAttribute(ContextAttributeName.KEY_TotalQuantity.name(), "Total Quantity: " + totalQuantity);
- }
- if (enableEmail != null) {
- context.setAttribute(ContextAttributeName.KEY_EnableEmail.name(), "Enable Email: " + enableEmail);
- }
- if (optionDefault != null) {
- context.setAttribute(ContextAttributeName.KEY_DefaultOption.name(), "Option Default: " + optionDefault);
- }
- if (StringUtils.isNotEmpty(returnEmail) && returnEmail.equals("tomee@apache.org")) {
- context.setAttribute(ContextAttributeName.KEY_ReturnEmail.name(), returnEmail);
- }
- if (auditWriter != null) {
- context.setAttribute(ContextAttributeName.KEY_AuditWriter.name(), auditWriter.getClass().getName());
- }
- if (defaultCode != null) {
- context.setAttribute(ContextAttributeName.KEY_DefaultCode.name(), "DefaultCode: " + defaultCode);
- }
- }
-
- public void contextDestroyed(ServletContextEvent event) {
- }
-
- }
-
- public static class PojoServletSessionListener implements HttpSessionListener {
-
- @Inject
- private Car car;
-
- @EJB
- private CompanyLocal localCompany;
-
- @EJB
- private SuperMarket market;
-
- @Resource(name = "returnEmail")
- private String returnEmail;
-
- @Resource(name = "connectionPool")
- private Integer connectionPool;
-
- @Resource(name = "startCount")
- private Long startCount;
-
- @Resource(name = "initSize")
- private Short initSize;
-
- @Resource(name = "totalQuantity")
- private Byte totalQuantity;
-
- @Resource(name = "enableEmail")
- private Boolean enableEmail;
-
- @Resource(name = "optionDefault")
- private Character optionDefault;
-
- /* TODO: Enable this resource after functionality is fixed
- @Resource
- */
- private Code defaultCode;
-
- /* TODO: Enable this resource after functionality is fixed
- @Resource
- @SuppressWarnings("unchecked")
- */
- private Class auditWriter;
-
-
- public void sessionCreated(HttpSessionEvent event) {
- final String name = "OpenEJB";
- final HttpSession context = event.getSession();
-
- if (car != null) {
- context.setAttribute(ContextAttributeName.KEY_Car.name(), car.drive(name));
- }
- if (localCompany != null) {
- context.setAttribute(ContextAttributeName.KEY_LocalEjb.name(), "Local: " + localCompany.employ(name));
- }
- if (market != null) {
- context.setAttribute(ContextAttributeName.KEY_Market.name(), market.shop(name));
- }
- if (connectionPool != null) {
- context.setAttribute(ContextAttributeName.KEY_ConnPool.name(), "Connection Pool: " + connectionPool);
- }
- if (startCount != null) {
- context.setAttribute(ContextAttributeName.KEY_StartCount.name(), "Start Expressions.Count: " + startCount);
- }
- if (initSize != null) {
- context.setAttribute(ContextAttributeName.KEY_InitSize.name(), "Init Size: " + initSize);
- }
- if (totalQuantity != null) {
- context.setAttribute(ContextAttributeName.KEY_TotalQuantity.name(), "Total Quantity: " + totalQuantity);
- }
- if (enableEmail != null) {
- context.setAttribute(ContextAttributeName.KEY_EnableEmail.name(), "Enable Email: " + enableEmail);
- }
- if (optionDefault != null) {
- context.setAttribute(ContextAttributeName.KEY_DefaultOption.name(), "Option Default: " + optionDefault);
- }
- if (StringUtils.isNotEmpty(returnEmail) && returnEmail.equals("tomee@apache.org")) {
- context.setAttribute(ContextAttributeName.KEY_ReturnEmail.name(), returnEmail);
- }
- if (auditWriter != null) {
- context.setAttribute(ContextAttributeName.KEY_AuditWriter.name(), auditWriter.getClass().getName());
- }
- if (defaultCode != null) {
- context.setAttribute(ContextAttributeName.KEY_DefaultCode.name(), "DefaultCode: " + defaultCode);
- }
- }
-
- public void sessionDestroyed(HttpSessionEvent event) {
- }
-
- }
-
- public static class Car {
- private final String make = "Lexus", model = "IS 350";
- private final int year = 2011;
-
- public String drive(String name) {
- return name + " is on the wheel of a " + year + " " + make + " " + model;
- }
- }
-
-
- public static interface Company {
- public String employ(String employeeName);
- }
-
- @Local
- public static interface CompanyLocal extends Company {
- }
-
- @Stateless
- public static class DefaultCompany implements CompanyLocal {
-
- private final String name = "TomEE Software Inc.";
-
- public String employ(String employeeName) {
- return employeeName + " is employed at " + name;
- }
-
- }
-
- @Stateless
- @LocalBean
- public static class SuperMarket {
-
- private final String name = "Apache Marketplace";
-
- public String shop(String employeeName) {
- return employeeName + " shops at " + name;
- }
-
- }
-
private static void addEnvEntry(WebAppDescriptor descriptor, String name, String type, String value) {
Node rootNode = ((NodeProvider) descriptor).getRootNode();
Node appNode = rootNode.get("/web-app").iterator().next();
Added: openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerlocalinject/ServletToCheckListener.java
URL: http://svn.apache.org/viewvc/openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerlocalinject/ServletToCheckListener.java?rev=1178974&view=auto
==============================================================================
--- openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerlocalinject/ServletToCheckListener.java (added)
+++ openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerlocalinject/ServletToCheckListener.java Tue Oct 4 21:56:55 2011
@@ -0,0 +1,26 @@
+package org.apache.openejb.arquillian.tests.listenerlocalinject;
+
+import java.io.IOException;
+
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+
+public class ServletToCheckListener extends HttpServlet {
+
+ @Override
+ public void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+ final ServletContext ctxt = req.getServletContext();
+ for (ContextAttributeName s : ContextAttributeName.values()) {
+ resp.getOutputStream().println("Context: " + ctxt.getAttribute(s.name()));
+ }
+
+ final HttpSession session = req.getSession();
+ for (ContextAttributeName s : ContextAttributeName.values()) {
+ resp.getOutputStream().println("Session: " + session.getAttribute(s.name()));
+ }
+ }
+}
\ No newline at end of file
Added: openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerlocalinject/SuperMarket.java
URL: http://svn.apache.org/viewvc/openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerlocalinject/SuperMarket.java?rev=1178974&view=auto
==============================================================================
--- openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerlocalinject/SuperMarket.java (added)
+++ openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerlocalinject/SuperMarket.java Tue Oct 4 21:56:55 2011
@@ -0,0 +1,16 @@
+package org.apache.openejb.arquillian.tests.listenerlocalinject;
+
+import javax.ejb.LocalBean;
+import javax.ejb.Stateless;
+
+@Stateless
+@LocalBean
+public class SuperMarket {
+
+ private final String name = "Apache Marketplace";
+
+ public String shop(String employeeName) {
+ return employeeName + " shops at " + name;
+ }
+
+}
\ No newline at end of file
Added: openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerpersistence/Address.java
URL: http://svn.apache.org/viewvc/openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerpersistence/Address.java?rev=1178974&view=auto
==============================================================================
--- openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerpersistence/Address.java (added)
+++ openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerpersistence/Address.java Tue Oct 4 21:56:55 2011
@@ -0,0 +1,44 @@
+package org.apache.openejb.arquillian.tests.listenerpersistence;
+
+import javax.persistence.Entity;
+
+@Entity
+public class Address {
+ public String getStreet() {
+ return street;
+ }
+
+ public void setStreet(String street) {
+ this.street = street;
+ }
+
+ public String getCity() {
+ return city;
+ }
+
+ public void setCity(String city) {
+ this.city = city;
+ }
+
+ public String getState() {
+ return state;
+ }
+
+ public void setState(String state) {
+ this.state = state;
+ }
+
+ public String getZip() {
+ return zip;
+ }
+
+ public void setZip(String zip) {
+ this.zip = zip;
+ }
+
+ private String street = "123 Lakeview St.", city = "Paradise", state = "ZZ", zip = "00000";
+
+ public String toString() {
+ return "Street: " + street + ", City: " + city + ", State: " + state + ", Zip: " + zip;
+ }
+}
\ No newline at end of file
Added: openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerpersistence/ContextAttributeName.java
URL: http://svn.apache.org/viewvc/openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerpersistence/ContextAttributeName.java?rev=1178974&view=auto
==============================================================================
--- openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerpersistence/ContextAttributeName.java (added)
+++ openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerpersistence/ContextAttributeName.java Tue Oct 4 21:56:55 2011
@@ -0,0 +1,7 @@
+package org.apache.openejb.arquillian.tests.listenerpersistence;
+
+public enum ContextAttributeName {
+ KEY_EntityManagerFactory,
+ KEY_EntityManager,
+ KEY_Transaction,;
+}
\ No newline at end of file
Added: openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerpersistence/PersistenceServletContextListener.java
URL: http://svn.apache.org/viewvc/openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerpersistence/PersistenceServletContextListener.java?rev=1178974&view=auto
==============================================================================
--- openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerpersistence/PersistenceServletContextListener.java (added)
+++ openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerpersistence/PersistenceServletContextListener.java Tue Oct 4 21:56:55 2011
@@ -0,0 +1,63 @@
+package org.apache.openejb.arquillian.tests.listenerpersistence;
+
+import javax.annotation.Resource;
+import javax.persistence.EntityManager;
+import javax.persistence.EntityManagerFactory;
+import javax.persistence.PersistenceContext;
+import javax.persistence.PersistenceUnit;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
+import javax.transaction.UserTransaction;
+
+
+public class PersistenceServletContextListener implements ServletContextListener {
+
+ @Resource
+ private UserTransaction transaction;
+
+ @PersistenceUnit
+ private EntityManagerFactory entityMgrFactory;
+
+ @PersistenceContext
+ private EntityManager entityManager;
+
+ public void contextInitialized(ServletContextEvent event) {
+ final ServletContext context = event.getServletContext();
+
+ if (transaction != null) {
+ try {
+ transaction.begin();
+ transaction.commit();
+ context.setAttribute(ContextAttributeName.KEY_Transaction.name(), "Transaction injection successful");
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
+ }
+ if (entityManager != null) {
+ Address a = new Address();
+ try {
+ entityManager.contains(a);
+ context.setAttribute(ContextAttributeName.KEY_EntityManager.name(), "Transaction manager injection successful");
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
+ }
+ if (entityMgrFactory != null) {
+ Address a = new Address();
+ try {
+ EntityManager em = entityMgrFactory.createEntityManager();
+ em.contains(a);
+ context.setAttribute(ContextAttributeName.KEY_EntityManagerFactory.name(), "Transaction manager factory injection successful");
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
+ }
+
+
+ }
+
+ public void contextDestroyed(ServletContextEvent event) {
+ }
+
+}
\ No newline at end of file
Added: openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerpersistence/PersistenceServletSessionListener.java
URL: http://svn.apache.org/viewvc/openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerpersistence/PersistenceServletSessionListener.java?rev=1178974&view=auto
==============================================================================
--- openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerpersistence/PersistenceServletSessionListener.java (added)
+++ openejb/trunk/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerpersistence/PersistenceServletSessionListener.java Tue Oct 4 21:56:55 2011
@@ -0,0 +1,63 @@
+package org.apache.openejb.arquillian.tests.listenerpersistence;
+
+import javax.annotation.Resource;
+import javax.persistence.EntityManager;
+import javax.persistence.EntityManagerFactory;
+import javax.persistence.PersistenceContext;
+import javax.persistence.PersistenceUnit;
+import javax.servlet.http.HttpSession;
+import javax.servlet.http.HttpSessionEvent;
+import javax.servlet.http.HttpSessionListener;
+import javax.transaction.UserTransaction;
+
+
+public class PersistenceServletSessionListener implements HttpSessionListener {
+
+ @Resource
+ private UserTransaction transaction;
+
+ @PersistenceUnit
+ private EntityManagerFactory entityMgrFactory;
+
+ @PersistenceContext
+ private EntityManager entityManager;
+
+ public void sessionCreated(HttpSessionEvent event) {
+ final HttpSession context = event.getSession();
+
+ if (transaction != null) {
+ try {
+ transaction.begin();
+ transaction.commit();
+ context.setAttribute(ContextAttributeName.KEY_Transaction.name(), "Transaction injection successful");
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
+ }
+ if (entityManager != null) {
+ Address a = new Address();
+ try {
+ entityManager.contains(a);
+ context.setAttribute(ContextAttributeName.KEY_EntityManager.name(), "Transaction manager injection successful");
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
+ }
+ if (entityMgrFactory != null) {
+ Address a = new Address();
+ try {
+ EntityManager em = entityMgrFactory.createEntityManager();
+ em.contains(a);
+ context.setAttribute(ContextAttributeName.KEY_EntityManagerFactory.name(), "Transaction manager factory injection successful");
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
+ }
+
+
+ }
+
+ public void sessionDestroyed(HttpSessionEvent event) {
+ }
+
+}
\ No newline at end of file