Author: rmannibucau
Date: Thu Jan 26 19:17:40 2012
New Revision: 1236353
URL: http://svn.apache.org/viewvc?rev=1236353&view=rev
Log:
adding PassivationWithEmTest - to fix
Added:
openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/core/stateful/PassivationWithEmTest.java
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/SimpleCache.java
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/SimpleCache.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/SimpleCache.java?rev=1236353&r1=1236352&r2=1236353&view=diff
==============================================================================
---
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/SimpleCache.java
(original)
+++
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/SimpleCache.java
Thu Jan 26 19:17:40 2012
@@ -172,8 +172,20 @@ public class SimpleCache<K, V> implement
return timeOut;
}
- public synchronized void setTimeOut(long timeOut) {
- this.timeOut = timeOut * 60 * 1000;
+ private static long ms(final String durationValue, final TimeUnit
defaultTU) {
+ final Duration duration = new Duration(durationValue.trim());
+ // default was minutes
+ // let say the user uses as before "1" as value
+ // time unit will be null so simply set the unit
+ // to the "old" default
+ if (duration.getUnit() == null) {
+ duration.setUnit(defaultTU);
+ }
+ return duration.getUnit().toMillis(duration.getTime());
+ }
+
+ public synchronized void setTimeOut(final String timeOut) {
+ this.timeOut = ms(timeOut, TimeUnit.MINUTES);
}
public void setScheduledExecutorService(ScheduledExecutorService executor)
{
@@ -184,8 +196,8 @@ public class SimpleCache<K, V> implement
return executor;
}
- public void setFrequency(long frequency) {
- this.frequency = frequency * 1000;
+ public void setFrequency(final String frequency) {
+ this.frequency = ms(frequency, TimeUnit.SECONDS);
}
public long getFrequency() {
Added:
openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/core/stateful/PassivationWithEmTest.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/core/stateful/PassivationWithEmTest.java?rev=1236353&view=auto
==============================================================================
---
openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/core/stateful/PassivationWithEmTest.java
(added)
+++
openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/core/stateful/PassivationWithEmTest.java
Thu Jan 26 19:17:40 2012
@@ -0,0 +1,96 @@
+package org.apache.openejb.core.stateful;
+
+import org.apache.openejb.core.InstanceContext;
+import org.apache.openejb.jee.EnterpriseBean;
+import org.apache.openejb.jee.StatefulBean;
+import org.apache.openejb.jee.jpa.unit.Persistence;
+import org.apache.openejb.jee.jpa.unit.PersistenceUnit;
+import org.apache.openejb.jee.jpa.unit.TransactionType;
+import org.apache.openejb.junit.ApplicationComposer;
+import org.apache.openejb.junit.Configuration;
+import org.apache.openejb.junit.Module;
+import org.apache.openejb.loader.SystemInstance;
+import org.apache.openejb.spi.ContainerSystem;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import javax.naming.NamingException;
+import javax.persistence.Entity;
+import javax.persistence.EntityManager;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.PersistenceContext;
+import java.util.Properties;
+
+@RunWith(ApplicationComposer.class)
+public class PassivationWithEmTest {
+ @Test
+ @Ignore("failing test")
+ public void passivationTest() throws Exception {
+ final PassivationWithEm ejb = (PassivationWithEm) SystemInstance.get()
+ .getComponent(ContainerSystem.class).getJNDIContext()
+ .lookup("global/PassivationWithEmTest/bean/PassivationWithEm");
+ for (int i = 0; i < 5; i++) {
+ Thread.sleep(400); // wait for passivation
+ ejb.nothing();
+ }
+ }
+
+ @Module
+ public EnterpriseBean bean() {
+ return new StatefulBean("PassivationWithEm", PassivationWithEm.class);
+ }
+
+ @Module
+ public Persistence persistence() throws Exception {
+ PersistenceUnit unit = new PersistenceUnit("passivation-unit");
+ unit.addClass(MyEntity.class);
+ unit.setTransactionType(TransactionType.RESOURCE_LOCAL);
+ unit.setProperty("openjpa.jdbc.SynchronizeMappings",
"buildSchema(ForeignKeys=true)");
+ unit.getProperties().setProperty("openjpa.RuntimeUnenhancedClasses",
"supported");
+ unit.setExcludeUnlistedClasses(true);
+
+ Persistence persistence = new
org.apache.openejb.jee.jpa.unit.Persistence(unit);
+ persistence.setVersion("2.0");
+ return persistence;
+ }
+
+ @Configuration
+ public Properties config() {
+ final Properties p = new Properties();
+ p.put("PassivationWithEm Stateful Container",
"new://Container?type=STATEFUL");
+ p.put("PassivationWithEm Stateful Container.TimeOut", "1 seconds");
+ p.put("PassivationWithEm Stateful Container.Capacity", "1");
+ p.put("PassivationWithEm Stateful Container.Frequency", "0");
+
+ p.put("PassivationWithEm", "new://Resource?type=DataSource");
+ p.put("PassivationWithEm.JdbcDriver", "org.hsqldb.jdbcDriver");
+ p.put("PassivationWithEm.JdbcUrl", "jdbc:hsqldb:mem:pwe");
+ return p;
+ }
+
+ @Entity
+ public static class MyEntity {
+ @Id
+ @GeneratedValue
+ private long id;
+
+ public long getId() {
+ return id;
+ }
+
+ public void setId(long id) {
+ this.id = id;
+ }
+ }
+
+ public static class PassivationWithEm {
+ @PersistenceContext
+ private EntityManager em;
+
+ public void nothing() {
+ // no-op
+ }
+ }
+}
