You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by dj...@apache.org on 2010/08/12 09:07:43 UTC
svn commit: r984659 - in /openejb/trunk/openejb3/container:
openejb-core/src/main/java/org/apache/openejb/config/
openejb-core/src/test/java/org/apache/openejb/core/stateful/
openejb-jee/src/main/java/org/apache/openejb/jee/
Author: djencks
Date: Thu Aug 12 07:07:42 2010
New Revision: 984659
URL: http://svn.apache.org/viewvc?rev=984659&view=rev
Log:
use concurrency TimeUnit directly
Added:
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/TimeUnitAdapter.java
Removed:
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/TimeUnitType.java
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/EjbJarInfoBuilder.java
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/stateful/StatefulConcurrencyTest.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/Timeout.java
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java?rev=984659&r1=984658&r2=984659&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java Thu Aug 12 07:07:42 2010
@@ -158,7 +158,6 @@ import org.apache.openejb.jee.SingletonB
import org.apache.openejb.jee.StatefulBean;
import org.apache.openejb.jee.StatelessBean;
import org.apache.openejb.jee.Tag;
-import org.apache.openejb.jee.TimeUnitType;
import org.apache.openejb.jee.Timeout;
import org.apache.openejb.jee.Timer;
import org.apache.openejb.jee.TimerConsumer;
@@ -1104,7 +1103,7 @@ public class AnnotationDeployer implemen
if(annotation != null) {
final Timeout timeout = new Timeout();
timeout.setTimeout(annotation.value());
- timeout.setUnit(TimeUnitType.valueOf(annotation.unit().toString()));
+ timeout.setUnit(annotation.unit());
sessionBean.setAccessTimeout(timeout);
}
}
@@ -1115,7 +1114,7 @@ public class AnnotationDeployer implemen
if(annotation != null) {
final Timeout timeout = new Timeout();
timeout.setTimeout(annotation.value());
- timeout.setUnit(TimeUnitType.valueOf(annotation.unit().toString()));
+ timeout.setUnit(annotation.unit());
sessionBean.setStatefulTimeout(timeout);
}
}
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/EjbJarInfoBuilder.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/EjbJarInfoBuilder.java?rev=984659&r1=984658&r2=984659&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/EjbJarInfoBuilder.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/EjbJarInfoBuilder.java Thu Aug 12 07:07:42 2010
@@ -599,14 +599,14 @@ public class EjbJarInfoBuilder {
if(statefulTimeout != null) {
bean.statefulTimeout = new TimeoutInfo();
bean.statefulTimeout.time = statefulTimeout.getTimeout();
- bean.statefulTimeout.unit = statefulTimeout.getUnit().toTimeUnit().toString();
+ bean.statefulTimeout.unit = statefulTimeout.getUnit().toString();
}
final Timeout accessTimeout = s.getAccessTimeout();
if(accessTimeout != null) {
bean.accessTimeout = new TimeoutInfo();
bean.accessTimeout.time = accessTimeout.getTimeout();
- bean.accessTimeout.unit = accessTimeout.getUnit().toTimeUnit().toString();
+ bean.accessTimeout.unit = accessTimeout.getUnit().toString();
}
return bean;
Modified: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/stateful/StatefulConcurrencyTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/stateful/StatefulConcurrencyTest.java?rev=984659&r1=984658&r2=984659&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/stateful/StatefulConcurrencyTest.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/stateful/StatefulConcurrencyTest.java Thu Aug 12 07:07:42 2010
@@ -27,13 +27,13 @@ import org.apache.openejb.config.Configu
import org.apache.openejb.jee.Timeout;
import org.apache.openejb.jee.EjbJar;
import org.apache.openejb.jee.StatefulBean;
-import org.apache.openejb.jee.TimeUnitType;
import javax.ejb.ConcurrentAccessTimeoutException;
import javax.ejb.Local;
import javax.ejb.Stateful;
import javax.naming.InitialContext;
import java.util.concurrent.CyclicBarrier;
+import java.util.concurrent.TimeUnit;
public class StatefulConcurrencyTest extends TestCase {
@@ -59,7 +59,7 @@ public class StatefulConcurrencyTest ext
final Timeout timeout = new Timeout();
timeout.setTimeout(1000);
- timeout.setUnit(TimeUnitType.Milliseconds);
+ timeout.setUnit(TimeUnit.MILLISECONDS);
bean.setAccessTimeout(timeout);
ejbJar.addEnterpriseBean(bean);
Added: openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/TimeUnitAdapter.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/TimeUnitAdapter.java?rev=984659&view=auto
==============================================================================
--- openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/TimeUnitAdapter.java (added)
+++ openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/TimeUnitAdapter.java Thu Aug 12 07:07:42 2010
@@ -0,0 +1,47 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+package org.apache.openejb.jee;
+
+import java.util.concurrent.TimeUnit;
+
+import javax.xml.bind.annotation.adapters.XmlAdapter;
+
+/**
+ * @version $Rev:$ $Date:$
+ */
+public class TimeUnitAdapter extends XmlAdapter<String, TimeUnit> {
+ @Override
+ public TimeUnit unmarshal(String s) throws Exception {
+ return TimeUnit.valueOf(s.toUpperCase());
+ }
+
+ @Override
+ public String marshal(TimeUnit t) throws Exception {
+ if (t == TimeUnit.DAYS) return "Days";
+ if (t == TimeUnit.HOURS) return "Hours";
+ if (t == TimeUnit.MINUTES) return "Minutes";
+ if (t == TimeUnit.SECONDS) return "Seconds";
+ if (t == TimeUnit.MILLISECONDS) return "Milliseconds";
+ if (t == TimeUnit.MICROSECONDS) return "Microseconds";
+ if (t == TimeUnit.NANOSECONDS) return "Nanoseconds";
+ throw new IllegalArgumentException("Unknown time unit: " + t);
+ }
+}
Modified: openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/Timeout.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/Timeout.java?rev=984659&r1=984658&r2=984659&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/Timeout.java (original)
+++ openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/Timeout.java Thu Aug 12 07:07:42 2010
@@ -16,6 +16,8 @@
*/
package org.apache.openejb.jee;
+import java.util.concurrent.TimeUnit;
+
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
@@ -80,7 +82,8 @@ public class Timeout {
@XmlElement(required = true)
protected long timeout;
@XmlElement(required = true)
- protected TimeUnitType unit;
+ @XmlJavaTypeAdapter(TimeUnitAdapter.class)
+ protected TimeUnit unit;
@XmlAttribute
@XmlJavaTypeAdapter(CollapsedStringAdapter.class)
@XmlID
@@ -95,11 +98,11 @@ public class Timeout {
this.timeout = value;
}
- public TimeUnitType getUnit() {
+ public TimeUnit getUnit() {
return unit;
}
- public void setUnit(TimeUnitType value) {
+ public void setUnit(TimeUnit value) {
this.unit = value;
}