You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2007/01/14 04:27:17 UTC
svn commit: r496026 - in
/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb:
./ alt/config/ core/ core/cmp/ core/entity/ core/mdb/ core/stateful/
core/stateless/ core/transaction/
Author: dblevins
Date: Sat Jan 13 19:27:16 2007
New Revision: 496026
URL: http://svn.apache.org/viewvc?view=rev&rev=496026
Log:
Switched the container type int constants to an enum
Added:
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/ContainerType.java
Modified:
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/Container.java
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/OpenEJB.java
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/ConfigurationFactory.java
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/RpcContainerWrapper.java
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/CmpContainer.java
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/entity/Cmp2EntityContainer.java
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/entity/EntityContainer.java
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbContainer.java
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MessageDrivenBeanManagedTxPolicy.java
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/SessionSynchronizationTxPolicy.java
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulBeanManagedTxPolicy.java
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulContainer.java
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulContainerManagedTxPolicy.java
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessBeanManagedTxPolicy.java
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessContainer.java
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TransactionContainer.java
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/Container.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/Container.java?view=diff&rev=496026&r1=496025&r2=496026
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/Container.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/Container.java Sat Jan 13 19:27:16 2007
@@ -18,12 +18,7 @@
public interface Container {
- final public static int STATELESS = 1;
- final public static int STATEFUL = 2;
- final public static int ENTITY = 3;
- final public static int MESSAGE_DRIVEN = 4;
-
- public int getContainerType();
+ public ContainerType getContainerType();
public Object getContainerID();
Added: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/ContainerType.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/ContainerType.java?view=auto&rev=496026
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/ContainerType.java (added)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/ContainerType.java Sat Jan 13 19:27:16 2007
@@ -0,0 +1,28 @@
+/**
+ * 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;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public enum ContainerType {
+ STATELESS,
+ STATEFUL,
+ BMP_ENTITY,
+ CMP_ENTITY,
+ MESSAGE_DRIVEN;
+}
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/OpenEJB.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/OpenEJB.java?view=diff&rev=496026&r1=496025&r2=496026
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/OpenEJB.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/OpenEJB.java Sat Jan 13 19:27:16 2007
@@ -175,16 +175,19 @@
for (int i = 0; i < c.length; i++) {
String entry = " ";
switch (c[i].getContainerType()) {
- case Container.ENTITY:
- entry += "ENTITY ";
+ case BMP_ENTITY:
+ entry += "BMP ENTITY ";
+ break;
+ case CMP_ENTITY:
+ entry += "CMP ENTITY ";
break;
- case Container.STATEFUL:
+ case STATEFUL:
entry += "STATEFUL ";
break;
- case Container.STATELESS:
+ case STATELESS:
entry += "STATELESS ";
break;
- case Container.MESSAGE_DRIVEN:
+ case MESSAGE_DRIVEN:
entry += "MESSAGE ";
break;
}
@@ -211,6 +214,9 @@
break;
case STATELESS:
entry += "STATELESS ";
+ break;
+ case MESSAGE_DRIVEN:
+ entry += "MESSAGE ";
break;
}
entry += d[i].getDeploymentID();
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/ConfigurationFactory.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/ConfigurationFactory.java?view=diff&rev=496026&r1=496025&r2=496026
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/ConfigurationFactory.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/ConfigurationFactory.java Sat Jan 13 19:27:16 2007
@@ -65,8 +65,8 @@
public class ConfigurationFactory implements OpenEjbConfigurationFactory, ProviderDefaults {
- public static final Logger logger = Logger.getInstance("OpenEJB.startup", "org.apache.openejb.alt.config.rules");
- protected static final Messages messages = new Messages("org.apache.openejb.alt.config.rules");
+ public static final Logger logger = Logger.getInstance("OpenEJB.startup", "org.apache.openejb.util.resources");
+ protected static final Messages messages = new Messages("org.apache.openejb.util.resources");
private String configLocation = "";
@@ -123,18 +123,18 @@
for (String pathname : jarList) {
File jarFile = new File(pathname);
- DeploymentLoader.logger.debug("Beginning load: " + jarFile.getAbsolutePath());
+ logger.debug("Beginning load: " + jarFile.getAbsolutePath());
try {
AppModule appModule = deploymentLoader.load(jarFile, deployer);
appModules.add(appModule);
- DeploymentLoader.logger.info("Loaded Module: " + appModule.getJarLocation());
+ logger.info("Loaded Module: " + appModule.getJarLocation());
} catch (OpenEJBException e) {
e.printStackTrace();
- ConfigUtils.logger.i18n.warning("conf.0004", jarFile.getAbsolutePath(), e.getMessage());
+ logger.i18n.warning("conf.0004", jarFile.getAbsolutePath(), e.getMessage());
}
}
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/RpcContainerWrapper.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/RpcContainerWrapper.java?view=diff&rev=496026&r1=496025&r2=496026
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/RpcContainerWrapper.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/RpcContainerWrapper.java Sat Jan 13 19:27:16 2007
@@ -18,6 +18,7 @@
import org.apache.openejb.RpcContainer;
import org.apache.openejb.OpenEJBException;
+import org.apache.openejb.ContainerType;
import org.apache.openejb.core.transaction.TransactionContainer;
import java.lang.reflect.Method;
@@ -34,7 +35,7 @@
return container.invoke(deployID, callMethod, args, primKey, securityIdentity);
}
- public int getContainerType() {
+ public ContainerType getContainerType() {
return container.getContainerType();
}
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/CmpContainer.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/CmpContainer.java?view=diff&rev=496026&r1=496025&r2=496026
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/CmpContainer.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/CmpContainer.java Sat Jan 13 19:27:16 2007
@@ -45,6 +45,7 @@
import org.apache.openejb.OpenEJBException;
import org.apache.openejb.ProxyInfo;
import org.apache.openejb.RpcContainer;
+import org.apache.openejb.ContainerType;
import org.apache.openejb.core.CoreDeploymentInfo;
import org.apache.openejb.core.Operation;
import org.apache.openejb.core.ThreadContext;
@@ -103,8 +104,8 @@
return containerID;
}
- public int getContainerType() {
- return Container.ENTITY;
+ public ContainerType getContainerType() {
+ return ContainerType.CMP_ENTITY;
}
public synchronized DeploymentInfo[] deployments() {
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/entity/Cmp2EntityContainer.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/entity/Cmp2EntityContainer.java?view=diff&rev=496026&r1=496025&r2=496026
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/entity/Cmp2EntityContainer.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/entity/Cmp2EntityContainer.java Sat Jan 13 19:27:16 2007
@@ -19,6 +19,7 @@
import org.apache.openejb.Container;
import org.apache.openejb.DeploymentInfo;
import org.apache.openejb.OpenEJBException;
+import org.apache.openejb.ContainerType;
import org.apache.openejb.spi.SecurityService;
import org.apache.openejb.core.ThreadContext;
import org.apache.openejb.core.transaction.TransactionContainer;
@@ -61,8 +62,8 @@
return containerID;
}
- public int getContainerType() {
- return Container.ENTITY;
+ public ContainerType getContainerType() {
+ return ContainerType.CMP_ENTITY;
}
public DeploymentInfo getDeploymentInfo(Object deploymentID) {
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/entity/EntityContainer.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/entity/EntityContainer.java?view=diff&rev=496026&r1=496025&r2=496026
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/entity/EntityContainer.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/entity/EntityContainer.java Sat Jan 13 19:27:16 2007
@@ -34,6 +34,7 @@
import org.apache.openejb.OpenEJBException;
import org.apache.openejb.ProxyInfo;
import org.apache.openejb.SystemException;
+import org.apache.openejb.ContainerType;
import org.apache.openejb.spi.SecurityService;
import org.apache.openejb.core.Operation;
import org.apache.openejb.core.ThreadContext;
@@ -74,8 +75,8 @@
return deploymentRegistry.get(deploymentID);
}
- public int getContainerType() {
- return Container.ENTITY;
+ public ContainerType getContainerType() {
+ return ContainerType.BMP_ENTITY;
}
public Object getContainerID() {
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbContainer.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbContainer.java?view=diff&rev=496026&r1=496025&r2=496026
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbContainer.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbContainer.java Sat Jan 13 19:27:16 2007
@@ -22,6 +22,7 @@
import org.apache.openejb.Container;
import org.apache.openejb.SystemException;
import org.apache.openejb.ApplicationException;
+import org.apache.openejb.ContainerType;
import org.apache.openejb.spi.SecurityService;
import org.apache.openejb.core.ThreadContext;
import org.apache.openejb.core.CoreDeploymentInfo;
@@ -73,8 +74,8 @@
return deployments.get(deploymentID);
}
- public int getContainerType() {
- return Container.MESSAGE_DRIVEN;
+ public ContainerType getContainerType() {
+ return ContainerType.MESSAGE_DRIVEN;
}
public Object getContainerID() {
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MessageDrivenBeanManagedTxPolicy.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MessageDrivenBeanManagedTxPolicy.java?view=diff&rev=496026&r1=496025&r2=496026
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MessageDrivenBeanManagedTxPolicy.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MessageDrivenBeanManagedTxPolicy.java Sat Jan 13 19:27:16 2007
@@ -21,6 +21,7 @@
import org.apache.openejb.ApplicationException;
import org.apache.openejb.SystemException;
+import org.apache.openejb.ContainerType;
import org.apache.openejb.core.transaction.TransactionContainer;
import org.apache.openejb.core.transaction.TransactionContext;
import org.apache.openejb.core.transaction.TransactionPolicy;
@@ -30,9 +31,7 @@
public MessageDrivenBeanManagedTxPolicy(TransactionContainer container) {
this();
- if (container instanceof org.apache.openejb.Container &&
- ((org.apache.openejb.Container) container).getContainerType() != org.apache.openejb.Container.MESSAGE_DRIVEN)
- {
+ if (container.getContainerType() != ContainerType.MESSAGE_DRIVEN) {
throw new IllegalArgumentException();
}
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/SessionSynchronizationTxPolicy.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/SessionSynchronizationTxPolicy.java?view=diff&rev=496026&r1=496025&r2=496026
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/SessionSynchronizationTxPolicy.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/SessionSynchronizationTxPolicy.java Sat Jan 13 19:27:16 2007
@@ -18,6 +18,7 @@
import org.apache.openejb.ApplicationException;
import org.apache.openejb.InvalidateReferenceException;
+import org.apache.openejb.ContainerType;
import org.apache.openejb.core.transaction.TransactionContext;
import org.apache.openejb.core.transaction.TransactionPolicy;
@@ -31,8 +32,7 @@
this.policy = policy;
this.container = policy.getContainer();
this.policyType = policy.policyType;
- if (container instanceof org.apache.openejb.Container &&
- ((org.apache.openejb.Container) container).getContainerType() != org.apache.openejb.Container.STATEFUL ||
+ if (container.getContainerType() != ContainerType.STATEFUL ||
policyType == TransactionPolicy.Never ||
policyType == TransactionPolicy.NotSupported) {
throw new IllegalArgumentException();
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulBeanManagedTxPolicy.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulBeanManagedTxPolicy.java?view=diff&rev=496026&r1=496025&r2=496026
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulBeanManagedTxPolicy.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulBeanManagedTxPolicy.java Sat Jan 13 19:27:16 2007
@@ -23,13 +23,14 @@
import org.apache.openejb.Container;
import org.apache.openejb.OpenEJBException;
import org.apache.openejb.SystemException;
+import org.apache.openejb.ContainerType;
import org.apache.openejb.core.transaction.TransactionContainer;
import org.apache.openejb.core.transaction.TransactionContext;
import org.apache.openejb.core.transaction.TransactionPolicy;
public class StatefulBeanManagedTxPolicy extends TransactionPolicy {
public StatefulBeanManagedTxPolicy(TransactionContainer container) {
- if (container instanceof Container && ((Container) container).getContainerType() != Container.STATEFUL) {
+ if (container.getContainerType() != ContainerType.STATEFUL) {
throw new IllegalArgumentException("Container is not an StatefulContainer");
}
this.container = container;
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulContainer.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulContainer.java?view=diff&rev=496026&r1=496025&r2=496026
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulContainer.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulContainer.java Sat Jan 13 19:27:16 2007
@@ -22,6 +22,7 @@
import org.apache.openejb.ProxyInfo;
import org.apache.openejb.ApplicationException;
import org.apache.openejb.RpcContainer;
+import org.apache.openejb.ContainerType;
import org.apache.openejb.loader.SystemInstance;
import org.apache.openejb.persistence.JtaEntityManagerRegistry;
import org.apache.openejb.persistence.EntityManagerAlreadyRegisteredException;
@@ -178,8 +179,8 @@
CREATE, REMOVE, BUSINESS
}
- public int getContainerType() {
- return Container.STATEFUL;
+ public ContainerType getContainerType() {
+ return ContainerType.STATEFUL;
}
public Object getContainerID() {
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulContainerManagedTxPolicy.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulContainerManagedTxPolicy.java?view=diff&rev=496026&r1=496025&r2=496026
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulContainerManagedTxPolicy.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulContainerManagedTxPolicy.java Sat Jan 13 19:27:16 2007
@@ -18,6 +18,7 @@
import org.apache.openejb.ApplicationException;
import org.apache.openejb.InvalidateReferenceException;
+import org.apache.openejb.ContainerType;
import org.apache.openejb.core.transaction.TransactionContext;
import org.apache.openejb.core.transaction.TransactionPolicy;
@@ -29,8 +30,7 @@
this.policy = policy;
this.container = policy.getContainer();
this.policyType = policy.policyType;
- if (container instanceof org.apache.openejb.Container &&
- ((org.apache.openejb.Container) container).getContainerType() != org.apache.openejb.Container.STATEFUL) {
+ if (container.getContainerType() != ContainerType.STATEFUL) {
throw new IllegalArgumentException();
}
}
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessBeanManagedTxPolicy.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessBeanManagedTxPolicy.java?view=diff&rev=496026&r1=496025&r2=496026
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessBeanManagedTxPolicy.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessBeanManagedTxPolicy.java Sat Jan 13 19:27:16 2007
@@ -17,6 +17,7 @@
package org.apache.openejb.core.stateless;
import org.apache.openejb.ApplicationException;
+import org.apache.openejb.ContainerType;
import org.apache.openejb.core.transaction.TransactionContainer;
import org.apache.openejb.core.transaction.TransactionContext;
import org.apache.openejb.core.transaction.TransactionPolicy;
@@ -28,8 +29,7 @@
public StatelessBeanManagedTxPolicy(TransactionContainer container) {
this();
- if (container instanceof org.apache.openejb.Container &&
- ((org.apache.openejb.Container) container).getContainerType() != org.apache.openejb.Container.STATELESS) {
+ if (container.getContainerType() != ContainerType.STATELESS) {
throw new IllegalArgumentException();
}
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessContainer.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessContainer.java?view=diff&rev=496026&r1=496025&r2=496026
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessContainer.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessContainer.java Sat Jan 13 19:27:16 2007
@@ -20,6 +20,7 @@
import org.apache.openejb.DeploymentInfo;
import org.apache.openejb.OpenEJBException;
import org.apache.openejb.ProxyInfo;
+import org.apache.openejb.ContainerType;
import org.apache.openejb.core.Operation;
import org.apache.openejb.core.ThreadContext;
import org.apache.openejb.core.CoreDeploymentInfo;
@@ -71,8 +72,8 @@
return (DeploymentInfo) deploymentRegistry.get(deploymentID);
}
- public int getContainerType() {
- return Container.STATELESS;
+ public ContainerType getContainerType() {
+ return ContainerType.STATELESS;
}
public Object getContainerID() {
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TransactionContainer.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TransactionContainer.java?view=diff&rev=496026&r1=496025&r2=496026
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TransactionContainer.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TransactionContainer.java Sat Jan 13 19:27:16 2007
@@ -17,8 +17,9 @@
package org.apache.openejb.core.transaction;
import org.apache.openejb.core.ThreadContext;
+import org.apache.openejb.Container;
-public interface TransactionContainer {
+public interface TransactionContainer extends Container {
public void discardInstance(Object instance, ThreadContext context);