You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by tv...@apache.org on 2013/11/19 03:12:29 UTC
svn commit: r1543287 [4/9] - in
/tomee/tomee/trunk/container/openejb-core/src:
main/java/javax/xml/ws/wsaddressing/ main/java/org/apache/openejb/
main/java/org/apache/openejb/assembler/
main/java/org/apache/openejb/assembler/classic/ main/java/org/apac...
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/Cmp1Generator.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/Cmp1Generator.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/Cmp1Generator.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/Cmp1Generator.java Tue Nov 19 02:12:21 2013
@@ -17,10 +17,10 @@
package org.apache.openejb.core.cmp.cmp2;
import org.apache.xbean.asm4.ClassWriter;
+import org.apache.xbean.asm4.FieldVisitor;
import org.apache.xbean.asm4.MethodVisitor;
import org.apache.xbean.asm4.Opcodes;
import org.apache.xbean.asm4.Type;
-import org.apache.xbean.asm4.FieldVisitor;
/**
* Class for generating a class file that implements
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/Cmp2Generator.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/Cmp2Generator.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/Cmp2Generator.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/Cmp2Generator.java Tue Nov 19 02:12:21 2013
@@ -16,6 +16,15 @@
*/
package org.apache.openejb.core.cmp.cmp2;
+import org.apache.openejb.OpenEJBRuntimeException;
+import org.apache.xbean.asm4.ClassWriter;
+import org.apache.xbean.asm4.FieldVisitor;
+import org.apache.xbean.asm4.Label;
+import org.apache.xbean.asm4.MethodVisitor;
+import org.apache.xbean.asm4.Opcodes;
+import org.apache.xbean.asm4.Type;
+
+import javax.ejb.EntityContext;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
@@ -26,16 +35,6 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-import javax.ejb.EntityContext;
-
-import org.apache.openejb.OpenEJBRuntimeException;
-import org.apache.xbean.asm4.ClassWriter;
-import org.apache.xbean.asm4.FieldVisitor;
-import org.apache.xbean.asm4.Label;
-import org.apache.xbean.asm4.MethodVisitor;
-import org.apache.xbean.asm4.Opcodes;
-import org.apache.xbean.asm4.Type;
-
/**
* Code generate for CMP level 2 beans. This will
* generate the concrete class used to instantiate
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/Cmp2KeyGenerator.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/Cmp2KeyGenerator.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/Cmp2KeyGenerator.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/Cmp2KeyGenerator.java Tue Nov 19 02:12:21 2013
@@ -16,10 +16,10 @@
*/
package org.apache.openejb.core.cmp.cmp2;
-import javax.ejb.EntityBean;
-
import org.apache.openejb.core.cmp.KeyGenerator;
+import javax.ejb.EntityBean;
+
public class Cmp2KeyGenerator implements KeyGenerator {
public Object getPrimaryKey(EntityBean entity) {
Cmp2Entity cmp2Entity = (Cmp2Entity) entity;
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/Cmp2Util.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/Cmp2Util.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/Cmp2Util.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/Cmp2Util.java Tue Nov 19 02:12:21 2013
@@ -17,15 +17,15 @@
package org.apache.openejb.core.cmp.cmp2;
import org.apache.openejb.BeanContext;
-import org.apache.openejb.core.ivm.EjbObjectProxyHandler;
+import org.apache.openejb.InterfaceType;
import org.apache.openejb.core.cmp.CmpContainer;
import org.apache.openejb.core.cmp.KeyGenerator;
+import org.apache.openejb.core.ivm.EjbObjectProxyHandler;
import org.apache.openejb.util.proxy.ProxyManager;
-import org.apache.openejb.InterfaceType;
import javax.ejb.EJBLocalObject;
-import javax.ejb.EntityBean;
import javax.ejb.EJBObject;
+import javax.ejb.EntityBean;
import java.lang.reflect.Field;
public class Cmp2Util {
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/CmpField.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/CmpField.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/CmpField.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/CmpField.java Tue Nov 19 02:12:21 2013
@@ -16,10 +16,10 @@
*/
package org.apache.openejb.core.cmp.cmp2;
-import java.lang.reflect.Method;
-
import org.apache.xbean.asm4.Type;
+import java.lang.reflect.Method;
+
public class CmpField {
private final String name;
private final Type type;
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/CmrSet.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/CmrSet.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/CmrSet.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/CmrSet.java Tue Nov 19 02:12:21 2013
@@ -22,15 +22,15 @@ import org.apache.openejb.loader.SystemI
import javax.ejb.EJBException;
import javax.ejb.EJBLocalObject;
import javax.ejb.EntityBean;
-import javax.transaction.TransactionSynchronizationRegistry;
import javax.transaction.Synchronization;
+import javax.transaction.TransactionSynchronizationRegistry;
import java.util.AbstractSet;
import java.util.Collection;
+import java.util.Collections;
+import java.util.ConcurrentModificationException;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;
-import java.util.Collections;
-import java.util.ConcurrentModificationException;
public class CmrSet<Bean extends EntityBean, Proxy extends EJBLocalObject> extends AbstractSet {
private final EntityBean source;
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/CmrStyle.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/CmrStyle.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/CmrStyle.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/CmrStyle.java Tue Nov 19 02:12:21 2013
@@ -16,13 +16,13 @@
*/
package org.apache.openejb.core.cmp.cmp2;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.Collection;
-import java.lang.reflect.Method;
-
import org.apache.xbean.asm4.Type;
+import java.lang.reflect.Method;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Set;
+
public enum CmrStyle {
SINGLE(SingleValuedCmr.class, null, null),
COLLECTION(SetValuedCmr.class, Collection.class, HashSet.class),
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/PostCreateGenerator.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/PostCreateGenerator.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/PostCreateGenerator.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/PostCreateGenerator.java Tue Nov 19 02:12:21 2013
@@ -17,9 +17,9 @@
package org.apache.openejb.core.cmp.cmp2;
import org.apache.xbean.asm4.ClassWriter;
-import org.apache.xbean.asm4.Type;
import org.apache.xbean.asm4.MethodVisitor;
import org.apache.xbean.asm4.Opcodes;
+import org.apache.xbean.asm4.Type;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/SetValuedCmr.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/SetValuedCmr.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/SetValuedCmr.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/SetValuedCmr.java Tue Nov 19 02:12:21 2013
@@ -16,17 +16,17 @@
*/
package org.apache.openejb.core.cmp.cmp2;
+import org.apache.openejb.BeanContext;
+import org.apache.openejb.loader.SystemInstance;
+
+import javax.ejb.EJBException;
import javax.ejb.EJBLocalObject;
import javax.ejb.EntityBean;
-import javax.ejb.EJBException;
import javax.transaction.TransactionSynchronizationRegistry;
-import java.util.Set;
-import java.util.Iterator;
-import java.util.Collection;
import java.util.ArrayList;
-
-import org.apache.openejb.BeanContext;
-import org.apache.openejb.loader.SystemInstance;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Set;
//
// WARNING: Do not refactor this class. It is used by the Cmp2Generator.
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/jpa/JpaCmpEngine.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/jpa/JpaCmpEngine.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/jpa/JpaCmpEngine.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/jpa/JpaCmpEngine.java Tue Nov 19 02:12:21 2013
@@ -17,23 +17,6 @@
*/
package org.apache.openejb.core.cmp.jpa;
-import java.lang.reflect.Method;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import javax.ejb.CreateException;
-import javax.ejb.EJBException;
-import javax.ejb.EJBLocalObject;
-import javax.ejb.EJBObject;
-import javax.ejb.EntityBean;
-import javax.ejb.FinderException;
-import javax.ejb.RemoveException;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceException;
-import javax.persistence.Query;
-
import org.apache.openejb.BeanContext;
import org.apache.openejb.OpenEJBException;
import org.apache.openejb.core.ThreadContext;
@@ -44,15 +27,33 @@ import org.apache.openejb.core.cmp.KeyGe
import org.apache.openejb.core.cmp.SimpleKeyGenerator;
import org.apache.openejb.core.cmp.cmp2.Cmp2KeyGenerator;
import org.apache.openejb.core.cmp.cmp2.Cmp2Util;
-import org.apache.openejb.core.transaction.TransactionType;
import org.apache.openejb.core.transaction.TransactionPolicy;
-import static org.apache.openejb.core.transaction.EjbTransactionUtil.afterInvoke;
-import static org.apache.openejb.core.transaction.EjbTransactionUtil.createTransactionPolicy;
+import org.apache.openejb.core.transaction.TransactionType;
import org.apache.openjpa.event.AbstractLifecycleListener;
import org.apache.openjpa.event.LifecycleEvent;
import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI;
import org.apache.openjpa.persistence.OpenJPAEntityManagerSPI;
+import javax.ejb.CreateException;
+import javax.ejb.EJBException;
+import javax.ejb.EJBLocalObject;
+import javax.ejb.EJBObject;
+import javax.ejb.EntityBean;
+import javax.ejb.FinderException;
+import javax.ejb.RemoveException;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceException;
+import javax.persistence.Query;
+import java.lang.reflect.Method;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import static org.apache.openejb.core.transaction.EjbTransactionUtil.afterInvoke;
+import static org.apache.openejb.core.transaction.EjbTransactionUtil.createTransactionPolicy;
+
public class JpaCmpEngine implements CmpEngine {
private static final Object[] NO_ARGS = new Object[0];
public static final String CMP_PERSISTENCE_CONTEXT_REF_NAME = "comp/env/openejb/cmp";
@@ -257,10 +258,10 @@ public class JpaCmpEngine implements Cmp
Object arg = args[i];
// ejb proxies need to be swapped out for real instance classes
if (arg instanceof EJBObject) {
- arg = Cmp2Util.getEntityBean(((EJBObject) arg));
+ arg = Cmp2Util.getEntityBean((EJBObject) arg);
}
if (arg instanceof EJBLocalObject) {
- arg = Cmp2Util.getEntityBean(((EJBLocalObject) arg));
+ arg = Cmp2Util.getEntityBean((EJBLocalObject) arg);
}
try {
query.getParameter(i + 1);
@@ -310,10 +311,10 @@ public class JpaCmpEngine implements Cmp
Object arg = args[i];
// ejb proxies need to be swapped out for real instance classes
if (arg instanceof EJBObject) {
- arg = Cmp2Util.getEntityBean(((EJBObject) arg));
+ arg = Cmp2Util.getEntityBean((EJBObject) arg);
}
if (arg instanceof EJBLocalObject) {
- arg = Cmp2Util.getEntityBean(((EJBLocalObject) arg));
+ arg = Cmp2Util.getEntityBean((EJBLocalObject) arg);
}
query.setParameter(i + 1, arg);
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/jpa/JpaCmpEngineFactory.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/jpa/JpaCmpEngineFactory.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/jpa/JpaCmpEngineFactory.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/jpa/JpaCmpEngineFactory.java Tue Nov 19 02:12:21 2013
@@ -16,10 +16,10 @@
*/
package org.apache.openejb.core.cmp.jpa;
-import org.apache.openejb.core.cmp.CmpEngineFactory;
+import org.apache.openejb.OpenEJBException;
import org.apache.openejb.core.cmp.CmpCallback;
import org.apache.openejb.core.cmp.CmpEngine;
-import org.apache.openejb.OpenEJBException;
+import org.apache.openejb.core.cmp.CmpEngineFactory;
import javax.transaction.TransactionManager;
import javax.transaction.TransactionSynchronizationRegistry;
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/entity/EntityEjbHomeHandler.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/entity/EntityEjbHomeHandler.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/entity/EntityEjbHomeHandler.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/entity/EntityEjbHomeHandler.java Tue Nov 19 02:12:21 2013
@@ -16,21 +16,20 @@
*/
package org.apache.openejb.core.entity;
-import java.lang.reflect.Method;
-import java.util.Vector;
-import java.util.List;
-
import org.apache.openejb.BeanContext;
-import org.apache.openejb.ProxyInfo;
import org.apache.openejb.InterfaceType;
import org.apache.openejb.OpenEJBException;
+import org.apache.openejb.ProxyInfo;
import org.apache.openejb.core.ivm.EjbHomeProxyHandler;
import org.apache.openejb.core.ivm.EjbObjectProxyHandler;
import org.apache.openejb.util.proxy.ProxyManager;
import javax.ejb.EJBLocalObject;
-import javax.ejb.RemoveException;
import javax.ejb.EJBObject;
+import javax.ejb.RemoveException;
+import java.lang.reflect.Method;
+import java.util.List;
+import java.util.Vector;
public class EntityEjbHomeHandler extends EjbHomeProxyHandler {
@@ -75,7 +74,7 @@ public class EntityEjbHomeHandler extend
} else if (retValue instanceof org.apache.openejb.util.ArrayEnumeration) {
org.apache.openejb.util.ArrayEnumeration enumeration = (org.apache.openejb.util.ArrayEnumeration) retValue;
for (int i = enumeration.size() - 1; i >= 0; --i) {
- ProxyInfo proxyInfo = ((ProxyInfo) enumeration.get(i));
+ ProxyInfo proxyInfo = (ProxyInfo) enumeration.get(i);
enumeration.set(i, createProxy(proxyInfo.getPrimaryKey(), getMainInterface()));
}
return enumeration;
@@ -84,7 +83,7 @@ public class EntityEjbHomeHandler extend
java.util.List proxies = new java.util.ArrayList();
while (enumeration.hasMoreElements()) {
- ProxyInfo proxyInfo = ((ProxyInfo) enumeration.nextElement());
+ ProxyInfo proxyInfo = (ProxyInfo) enumeration.nextElement();
proxies.add(createProxy(proxyInfo.getPrimaryKey(), getMainInterface()));
}
return new org.apache.openejb.util.ArrayEnumeration(proxies);
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/entity/EntityEjbObjectHandler.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/entity/EntityEjbObjectHandler.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/entity/EntityEjbObjectHandler.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/entity/EntityEjbObjectHandler.java Tue Nov 19 02:12:21 2013
@@ -16,16 +16,16 @@
*/
package org.apache.openejb.core.entity;
-import java.lang.reflect.Method;
-import java.util.List;
-import java.io.Serializable;
-
import org.apache.openejb.BeanContext;
import org.apache.openejb.Container;
import org.apache.openejb.InterfaceType;
import org.apache.openejb.core.ivm.EjbObjectProxyHandler;
import org.apache.openejb.util.proxy.ProxyManager;
+import java.io.Serializable;
+import java.lang.reflect.Method;
+import java.util.List;
+
public class EntityEjbObjectHandler extends EjbObjectProxyHandler {
/*
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/entity/EntityInstanceManager.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/entity/EntityInstanceManager.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/entity/EntityInstanceManager.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/entity/EntityInstanceManager.java Tue Nov 19 02:12:21 2013
@@ -18,16 +18,16 @@ package org.apache.openejb.core.entity;
import org.apache.openejb.ApplicationException;
import org.apache.openejb.BeanContext;
+import org.apache.openejb.InvalidateReferenceException;
import org.apache.openejb.OpenEJBException;
import org.apache.openejb.SystemException;
-import org.apache.openejb.InvalidateReferenceException;
-import org.apache.openejb.spi.SecurityService;
+import org.apache.openejb.core.NoSuchObjectException;
import org.apache.openejb.core.Operation;
import org.apache.openejb.core.ThreadContext;
-import org.apache.openejb.core.NoSuchObjectException;
-import org.apache.openejb.core.transaction.TransactionRolledbackException;
import org.apache.openejb.core.transaction.TransactionPolicy;
import org.apache.openejb.core.transaction.TransactionPolicy.TransactionSynchronization;
+import org.apache.openejb.core.transaction.TransactionRolledbackException;
+import org.apache.openejb.spi.SecurityService;
import org.apache.openejb.util.LinkedListStack;
import org.apache.openejb.util.LogCategory;
import org.apache.openejb.util.Logger;
@@ -36,9 +36,9 @@ import org.apache.openejb.util.Stack;
import javax.ejb.EJBContext;
import javax.ejb.EntityBean;
import javax.ejb.NoSuchEntityException;
+import java.rmi.RemoteException;
import java.util.HashMap;
import java.util.Map;
-import java.rmi.RemoteException;
public class EntityInstanceManager {
private static final Logger logger = Logger.getInstance(LogCategory.OPENEJB, "org.apache.openejb.util.resources");
@@ -225,7 +225,7 @@ public class EntityInstanceManager {
reusingBean(bean, callContext);
}
- if ((callContext.getCurrentOperation() == Operation.BUSINESS) || (callContext.getCurrentOperation() == Operation.REMOVE)) {
+ if (callContext.getCurrentOperation() == Operation.BUSINESS || callContext.getCurrentOperation() == Operation.REMOVE) {
/*
* When a bean is retrieved from the bean pool to service a client's business method request it must be
* notified that its about to enter service by invoking its ejbActivate( ) method. A bean instance
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/entity/EntrancyTracker.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/entity/EntrancyTracker.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/entity/EntrancyTracker.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/entity/EntrancyTracker.java Tue Nov 19 02:12:21 2013
@@ -16,13 +16,13 @@
*/
package org.apache.openejb.core.entity;
-import org.apache.openejb.BeanContext;
import org.apache.openejb.ApplicationException;
+import org.apache.openejb.BeanContext;
import javax.transaction.TransactionSynchronizationRegistry;
-import java.util.Set;
-import java.util.HashSet;
import java.rmi.RemoteException;
+import java.util.HashSet;
+import java.util.Set;
public class EntrancyTracker {
/**
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/interceptor/Interceptor.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/interceptor/Interceptor.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/interceptor/Interceptor.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/interceptor/Interceptor.java Tue Nov 19 02:12:21 2013
@@ -16,7 +16,6 @@
*/
package org.apache.openejb.core.interceptor;
-import javax.interceptor.InvocationContext;
import java.lang.reflect.Method;
/**
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/interceptor/InterceptorData.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/interceptor/InterceptorData.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/interceptor/InterceptorData.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/interceptor/InterceptorData.java Tue Nov 19 02:12:21 2013
@@ -135,7 +135,7 @@ public class InterceptorData {
}
public int hashCode() {
- return (clazz != null ? clazz.hashCode() : 0);
+ return clazz != null ? clazz.hashCode() : 0;
}
public static void cacheScan(final Class<?> clazz) {
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/interceptor/JaxRpcInvocationContext.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/interceptor/JaxRpcInvocationContext.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/interceptor/JaxRpcInvocationContext.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/interceptor/JaxRpcInvocationContext.java Tue Nov 19 02:12:21 2013
@@ -19,8 +19,8 @@ package org.apache.openejb.core.intercep
import org.apache.openejb.core.Operation;
import javax.xml.rpc.handler.MessageContext;
-import java.util.List;
import java.lang.reflect.Method;
+import java.util.List;
/**
* We could really get by with usinga plain ReflectionInvocationContext
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/interceptor/JaxWsInvocationContext.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/interceptor/JaxWsInvocationContext.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/interceptor/JaxWsInvocationContext.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/interceptor/JaxWsInvocationContext.java Tue Nov 19 02:12:21 2013
@@ -19,9 +19,9 @@ package org.apache.openejb.core.intercep
import org.apache.openejb.core.Operation;
import javax.xml.ws.handler.MessageContext;
+import java.lang.reflect.Method;
import java.util.List;
import java.util.Map;
-import java.lang.reflect.Method;
/**
* @version $Rev$ $Date$
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/interceptor/ReflectionInvocationContext.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/interceptor/ReflectionInvocationContext.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/interceptor/ReflectionInvocationContext.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/interceptor/ReflectionInvocationContext.java Tue Nov 19 02:12:21 2013
@@ -20,12 +20,12 @@ import org.apache.openejb.core.Operation
import org.apache.openejb.util.Classes;
import javax.interceptor.InvocationContext;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
import java.util.Iterator;
-import java.util.Map;
import java.util.List;
+import java.util.Map;
import java.util.TreeMap;
-import java.lang.reflect.Method;
-import java.lang.reflect.InvocationTargetException;
/**
* @version $Rev$ $Date$
@@ -252,7 +252,7 @@ public class ReflectionInvocationContext
}
public String toString() {
- String methodName = (method != null)? method.getName(): null;
+ String methodName = method != null ? method.getName(): null;
return "InvocationContext(operation=" + operation + ", target="+target.getClass().getName()+", method="+methodName+")";
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/BaseEjbProxyHandler.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/BaseEjbProxyHandler.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/BaseEjbProxyHandler.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/BaseEjbProxyHandler.java Tue Nov 19 02:12:21 2013
@@ -104,7 +104,7 @@ public abstract class BaseEjbProxyHandle
this.setBeanContext(beanContext);
if (interfaces == null || interfaces.size() == 0) {
- final InterfaceType objectInterfaceType = (interfaceType.isHome()) ? interfaceType.getCounterpart() : interfaceType;
+ final InterfaceType objectInterfaceType = interfaceType.isHome() ? interfaceType.getCounterpart() : interfaceType;
interfaces = new ArrayList<Class>(beanContext.getInterfaces(objectInterfaceType));
}
@@ -476,7 +476,7 @@ public abstract class BaseEjbProxyHandle
return false;
}
try {
- obj = (ProxyManager.getInvocationHandler(obj));
+ obj = ProxyManager.getInvocationHandler(obj);
} catch (IllegalArgumentException e) {
return false;
}
@@ -521,22 +521,22 @@ public abstract class BaseEjbProxyHandle
return null;
}
final Class ooc = object.getClass();
- if ((ooc == int.class) ||
- (ooc == String.class) ||
- (ooc == long.class) ||
- (ooc == boolean.class) ||
- (ooc == byte.class) ||
- (ooc == float.class) ||
- (ooc == double.class) ||
- (ooc == short.class) ||
- (ooc == Long.class) ||
- (ooc == Boolean.class) ||
- (ooc == Byte.class) ||
- (ooc == Character.class) ||
- (ooc == Float.class) ||
- (ooc == Double.class) ||
- (ooc == Short.class) ||
- (ooc == BigDecimal.class)) {
+ if (ooc == int.class ||
+ ooc == String.class ||
+ ooc == long.class ||
+ ooc == boolean.class ||
+ ooc == byte.class ||
+ ooc == float.class ||
+ ooc == double.class ||
+ ooc == short.class ||
+ ooc == Long.class ||
+ ooc == Boolean.class ||
+ ooc == Byte.class ||
+ ooc == Character.class ||
+ ooc == Float.class ||
+ ooc == Double.class ||
+ ooc == Short.class ||
+ ooc == BigDecimal.class) {
return object;
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/EjbHomeProxyHandler.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/EjbHomeProxyHandler.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/EjbHomeProxyHandler.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/EjbHomeProxyHandler.java Tue Nov 19 02:12:21 2013
@@ -238,7 +238,7 @@ public abstract class EjbHomeProxyHandle
Throwable cause = ire.getRootCause();
if (cause instanceof RemoteException && interfaceType.isLocal()) {
final RemoteException re = (RemoteException) cause;
- final Throwable detail = (re.detail != null) ? re.detail : re;
+ final Throwable detail = re.detail != null ? re.detail : re;
cause = new EJBException(re.getMessage()).initCause(detail);
}
throw cause;
@@ -247,7 +247,7 @@ public abstract class EjbHomeProxyHandle
* do not impact the viability of the proxy.
*/
} catch (org.apache.openejb.ApplicationException ae) {
- final Throwable exc = (ae.getRootCause() != null) ? ae.getRootCause() : ae;
+ final Throwable exc = ae.getRootCause() != null ? ae.getRootCause() : ae;
if (exc instanceof EJBAccessException) {
if (interfaceType.isBusiness()) {
throw exc;
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/EjbObjectProxyHandler.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/EjbObjectProxyHandler.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/EjbObjectProxyHandler.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/EjbObjectProxyHandler.java Tue Nov 19 02:12:21 2013
@@ -79,7 +79,7 @@ public abstract class EjbObjectProxyHand
operation = null;
}
} else {
- operation = (m.getParameterTypes().length == 0) ? operation : null;
+ operation = m.getParameterTypes().length == 0 ? operation : null;
}
}
if (operation == null || !interfaceType.isComponent()) {
@@ -117,14 +117,14 @@ public abstract class EjbObjectProxyHand
*/
} catch (org.apache.openejb.InvalidateReferenceException ire) {
invalidateAllHandlers(getRegistryId());
- exc = (ire.getRootCause() != null) ? ire.getRootCause() : new RemoteException("InvalidateReferenceException: " + ire);
+ exc = ire.getRootCause() != null ? ire.getRootCause() : new RemoteException("InvalidateReferenceException: " + ire);
throw exc;
/*
* Application exceptions must be reported dirctly to the client. They
* do not impact the viability of the proxy.
*/
} catch (org.apache.openejb.ApplicationException ae) {
- exc = (ae.getRootCause() != null) ? ae.getRootCause() : ae;
+ exc = ae.getRootCause() != null ? ae.getRootCause() : ae;
if (exc instanceof EJBAccessException) {
if (interfaceType.isBusiness()) {
throw exc;
@@ -145,11 +145,11 @@ public abstract class EjbObjectProxyHand
*/
} catch (org.apache.openejb.SystemException se) {
invalidateReference();
- exc = (se.getRootCause() != null) ? se.getRootCause() : se;
+ exc = se.getRootCause() != null ? se.getRootCause() : se;
logger.debug("The container received an unexpected exception: ", exc);
throw new RemoteException("Container has suffered a SystemException", exc);
} catch (org.apache.openejb.OpenEJBException oe) {
- exc = (oe.getRootCause() != null) ? oe.getRootCause() : oe;
+ exc = oe.getRootCause() != null ? oe.getRootCause() : oe;
logger.debug("The container received an unexpected exception: ", exc);
throw new RemoteException("Unknown Container Exception", oe.getRootCause());
} finally {
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/IntraVmArtifact.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/IntraVmArtifact.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/IntraVmArtifact.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/IntraVmArtifact.java Tue Nov 19 02:12:21 2013
@@ -61,7 +61,7 @@ public class IntraVmArtifact implements
}
private static Handles getHandles(boolean staticArtifact) {
- return (staticArtifact) ? staticHandles : threadHandles.get();
+ return staticArtifact ? staticHandles : threadHandles.get();
}
public IntraVmArtifact() {
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/IntraVmCopyMonitor.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/IntraVmCopyMonitor.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/IntraVmCopyMonitor.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/IntraVmCopyMonitor.java Tue Nov 19 02:12:21 2013
@@ -43,7 +43,7 @@ public class IntraVmCopyMonitor {
}
public static boolean exists() {
- return (threadMonitor.get() != null);
+ return threadMonitor.get() != null;
}
public static void release() {
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/IntraVmMetaData.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/IntraVmMetaData.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/IntraVmMetaData.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/IntraVmMetaData.java Tue Nov 19 02:12:21 2013
@@ -16,15 +16,14 @@
*/
package org.apache.openejb.core.ivm;
-import java.io.ObjectStreamException;
-
-import javax.ejb.EJBHome;
-
import org.apache.openejb.BeanType;
import org.apache.openejb.core.ServerFederation;
import org.apache.openejb.spi.ApplicationServer;
import org.apache.openejb.util.proxy.ProxyManager;
+import javax.ejb.EJBHome;
+import java.io.ObjectStreamException;
+
public class IntraVmMetaData implements javax.ejb.EJBMetaData, java.io.Serializable {
protected Class homeClass;
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/IntraVmServer.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/IntraVmServer.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/IntraVmServer.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/IntraVmServer.java Tue Nov 19 02:12:21 2013
@@ -16,15 +16,15 @@
*/
package org.apache.openejb.core.ivm;
+import org.apache.openejb.BeanContext;
+import org.apache.openejb.ProxyInfo;
+
import javax.ejb.EJBHome;
import javax.ejb.EJBMetaData;
import javax.ejb.EJBObject;
import javax.ejb.Handle;
import javax.ejb.HomeHandle;
-import org.apache.openejb.BeanContext;
-import org.apache.openejb.ProxyInfo;
-
public class IntraVmServer implements org.apache.openejb.spi.ApplicationServer {
public EJBMetaData getEJBMetaData(ProxyInfo pi) {
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/ContextWrapper.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/ContextWrapper.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/ContextWrapper.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/ContextWrapper.java Tue Nov 19 02:12:21 2013
@@ -16,13 +16,13 @@
*/
package org.apache.openejb.core.ivm.naming;
+import javax.naming.Binding;
import javax.naming.Context;
-import javax.naming.NamingException;
import javax.naming.Name;
+import javax.naming.NameClassPair;
import javax.naming.NameParser;
import javax.naming.NamingEnumeration;
-import javax.naming.NameClassPair;
-import javax.naming.Binding;
+import javax.naming.NamingException;
import java.util.Hashtable;
/**
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/InitContextFactory.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/InitContextFactory.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/InitContextFactory.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/InitContextFactory.java Tue Nov 19 02:12:21 2013
@@ -16,18 +16,17 @@
*/
package org.apache.openejb.core.ivm.naming;
-import java.util.Hashtable;
-import java.util.Properties;
-
-import javax.naming.Context;
-import javax.naming.AuthenticationException;
-import javax.security.auth.login.LoginException;
-
import org.apache.openejb.EnvProps;
import org.apache.openejb.loader.SystemInstance;
import org.apache.openejb.spi.ContainerSystem;
import org.apache.openejb.spi.SecurityService;
+import javax.naming.AuthenticationException;
+import javax.naming.Context;
+import javax.security.auth.login.LoginException;
+import java.util.Hashtable;
+import java.util.Properties;
+
/**
* @deprecated Use org.apache.openejb.core.LocalInitialContextFactory
*/
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/IntraVmJndiReference.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/IntraVmJndiReference.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/IntraVmJndiReference.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/IntraVmJndiReference.java Tue Nov 19 02:12:21 2013
@@ -16,13 +16,13 @@
*/
package org.apache.openejb.core.ivm.naming;
-import javax.naming.NameNotFoundException;
-import javax.naming.NamingException;
-
import org.apache.openejb.loader.SystemInstance;
import org.apache.openejb.spi.ContainerSystem;
import org.apache.openejb.util.Strings;
+import javax.naming.NameNotFoundException;
+import javax.naming.NamingException;
+
public class IntraVmJndiReference extends Reference {
private String jndiName;
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/IvmContext.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/IvmContext.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/IvmContext.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/IvmContext.java Tue Nov 19 02:12:21 2013
@@ -16,14 +16,12 @@
*/
package org.apache.openejb.core.ivm.naming;
-import java.util.concurrent.ConcurrentHashMap;
import org.apache.openejb.ClassLoaderUtil;
import org.apache.openejb.core.ivm.IntraVmCopyMonitor;
import org.apache.openejb.core.ivm.IntraVmProxy;
import org.apache.openejb.core.ivm.naming.java.javaURLContextFactory;
import org.apache.openejb.core.ivm.naming.openejb.openejbURLContextFactory;
import org.apache.openejb.loader.IO;
-import org.apache.openejb.util.proxy.LocalBeanProxyFactory;
import org.apache.xbean.naming.context.ContextUtil;
import javax.naming.Binding;
@@ -39,7 +37,6 @@ import javax.naming.NamingException;
import javax.naming.OperationNotSupportedException;
import javax.naming.spi.ObjectFactory;
import java.io.File;
-import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
@@ -49,7 +46,6 @@ import java.io.PrintStream;
import java.io.Serializable;
import java.net.URL;
import java.util.Enumeration;
-import java.util.HashMap;
import java.util.HashSet;
import java.util.Hashtable;
import java.util.Map;
@@ -57,6 +53,7 @@ import java.util.Properties;
import java.util.Set;
import java.util.StringTokenizer;
import java.util.Vector;
+import java.util.concurrent.ConcurrentHashMap;
/*
* This class wrappers a specific NameNode which is the data model for the JNDI
@@ -431,7 +428,7 @@ public class IvmContext implements Conte
}
public Name composeName(Name name, Name prefix) throws NamingException {
- Name result = (Name) (prefix.clone());
+ Name result = (Name) prefix.clone();
result.addAll(name);
return result;
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/JaxWsServiceReference.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/JaxWsServiceReference.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/JaxWsServiceReference.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/JaxWsServiceReference.java Tue Nov 19 02:12:21 2013
@@ -20,11 +20,11 @@ import org.apache.openejb.Injection;
import org.apache.openejb.OpenEJBRuntimeException;
import org.apache.openejb.core.webservices.HandlerChainData;
import org.apache.openejb.core.webservices.HandlerResolverImpl;
+import org.apache.openejb.core.webservices.PortAddress;
+import org.apache.openejb.core.webservices.PortAddressRegistry;
import org.apache.openejb.core.webservices.PortRefData;
import org.apache.openejb.core.webservices.ProviderWrapper;
import org.apache.openejb.core.webservices.ServiceRefData;
-import org.apache.openejb.core.webservices.PortAddressRegistry;
-import org.apache.openejb.core.webservices.PortAddress;
import org.apache.openejb.loader.SystemInstance;
import javax.naming.InitialContext;
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/JndiReference.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/JndiReference.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/JndiReference.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/JndiReference.java Tue Nov 19 02:12:21 2013
@@ -16,14 +16,13 @@
*/
package org.apache.openejb.core.ivm.naming;
-import org.apache.openejb.spi.ContainerSystem;
import org.apache.openejb.loader.SystemInstance;
-
-import java.util.Hashtable;
+import org.apache.openejb.spi.ContainerSystem;
import javax.naming.Context;
import javax.naming.InitialContext;
import javax.naming.NamingException;
+import java.util.Hashtable;
public class JndiReference extends Reference {
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/NameNode.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/NameNode.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/NameNode.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/NameNode.java Tue Nov 19 02:12:21 2013
@@ -18,7 +18,8 @@ package org.apache.openejb.core.ivm.nami
import org.apache.openejb.OpenEJBRuntimeException;
-import javax.naming.*;
+import javax.naming.Context;
+import javax.naming.NameNotFoundException;
import java.io.PrintStream;
import java.util.ArrayList;
@@ -309,7 +310,7 @@ public class NameNode implements java.io
if (grtrTree != null && grtrTree.hasChildren(node)) return true;
if (lessTree != null && lessTree.hasChildren(node)) return true;
- return (parent == node);
+ return parent == node;
}
protected void clearCache() {
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/ParsedName.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/ParsedName.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/ParsedName.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/ParsedName.java Tue Nov 19 02:12:21 2013
@@ -138,14 +138,14 @@ with a slash. It may be the empty strin
private String normalize(String pathname, int len, int off) {
if (len == 0) return pathname;
int n = len;
- while ((n > 0) && (pathname.charAt(n - 1) == '/')) n--;
+ while (n > 0 && pathname.charAt(n - 1) == '/') n--;
if (n == 0) return "/";
StringBuilder sb = new StringBuilder(pathname.length());
if (off > 0) sb.append(pathname.substring(0, off));
char prevChar = 0;
for (int i = off; i < n; i++) {
char c = pathname.charAt(i);
- if ((prevChar == '/') && (c == '/')) continue;
+ if (prevChar == '/' && c == '/') continue;
sb.append(c);
prevChar = c;
}
@@ -160,7 +160,7 @@ with a slash. It may be the empty strin
char prevChar = 0;
for (int i = 0; i < n; i++) {
char c = pathname.charAt(i);
- if ((prevChar == '/') && (c == '/'))
+ if (prevChar == '/' && c == '/')
return normalize(pathname, n, i - 1);
prevChar = c;
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/Reference.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/Reference.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/Reference.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/Reference.java Tue Nov 19 02:12:21 2013
@@ -19,9 +19,6 @@ package org.apache.openejb.core.ivm.nami
import org.apache.xbean.naming.reference.SimpleReference;
import javax.naming.NamingException;
-import javax.naming.Name;
-import javax.naming.Context;
-import java.util.Hashtable;
/**
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/SystemComponentReference.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/SystemComponentReference.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/SystemComponentReference.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/SystemComponentReference.java Tue Nov 19 02:12:21 2013
@@ -18,8 +18,8 @@ package org.apache.openejb.core.ivm.nami
import org.apache.openejb.loader.SystemInstance;
-import javax.naming.NamingException;
import javax.naming.NameNotFoundException;
+import javax.naming.NamingException;
/**
* @version $Rev$ $Date$
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/openejb/openejbURLContextFactory.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/openejb/openejbURLContextFactory.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/openejb/openejbURLContextFactory.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/openejb/openejbURLContextFactory.java Tue Nov 19 02:12:21 2013
@@ -16,13 +16,13 @@
*/
package org.apache.openejb.core.ivm.naming.openejb;
-import org.apache.openejb.spi.ContainerSystem;
import org.apache.openejb.loader.SystemInstance;
+import org.apache.openejb.spi.ContainerSystem;
-import javax.naming.spi.ObjectFactory;
-import javax.naming.Name;
import javax.naming.Context;
+import javax.naming.Name;
import javax.naming.NamingException;
+import javax.naming.spi.ObjectFactory;
import java.util.Hashtable;
/**
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/managed/Instance.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/managed/Instance.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/managed/Instance.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/managed/Instance.java Tue Nov 19 02:12:21 2013
@@ -98,7 +98,7 @@ public class Instance implements Seriali
}
public synchronized Transaction getTransaction() {
- return (transaction.size() > 0)? transaction.peek(): null;
+ return transaction.size() > 0 ? transaction.peek(): null;
}
public Lock getLock() {
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/managed/ManagedContainer.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/managed/ManagedContainer.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/managed/ManagedContainer.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/managed/ManagedContainer.java Tue Nov 19 02:12:21 2013
@@ -340,7 +340,7 @@ public class ManagedContainer implements
final Data data = (Data) beanContext.getContainerData();
MethodType methodType = data.getMethodIndex().get(callMethod);
- methodType = (methodType != null) ? methodType : MethodType.BUSINESS;
+ methodType = methodType != null ? methodType : MethodType.BUSINESS;
switch (methodType) {
case CREATE:
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/managed/ManagedHomeHandler.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/managed/ManagedHomeHandler.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/managed/ManagedHomeHandler.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/managed/ManagedHomeHandler.java Tue Nov 19 02:12:21 2013
@@ -16,18 +16,17 @@
*/
package org.apache.openejb.core.managed;
-import java.lang.reflect.Method;
-import java.lang.reflect.Field;
-import java.util.List;
-
-import javax.ejb.RemoveException;
-
import org.apache.openejb.BeanContext;
import org.apache.openejb.InterfaceType;
import org.apache.openejb.core.ivm.EjbHomeProxyHandler;
import org.apache.openejb.core.ivm.EjbObjectProxyHandler;
import org.apache.openejb.util.proxy.ProxyManager;
+import javax.ejb.RemoveException;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.List;
+
public class ManagedHomeHandler extends EjbHomeProxyHandler {
public ManagedHomeHandler(BeanContext beanContext, InterfaceType interfaceType, List<Class> interfaces, Class mainInterface) {
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/managed/ManagedObjectHandler.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/managed/ManagedObjectHandler.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/managed/ManagedObjectHandler.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/managed/ManagedObjectHandler.java Tue Nov 19 02:12:21 2013
@@ -17,15 +17,15 @@
package org.apache.openejb.core.managed;
import org.apache.openejb.BeanContext;
-import org.apache.openejb.InterfaceType;
import org.apache.openejb.Container;
+import org.apache.openejb.InterfaceType;
import org.apache.openejb.core.ivm.EjbObjectProxyHandler;
import org.apache.openejb.util.proxy.ProxyManager;
+import java.io.Serializable;
import java.lang.reflect.Method;
import java.rmi.RemoteException;
import java.util.List;
-import java.io.Serializable;
public class ManagedObjectHandler extends EjbObjectProxyHandler {
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/managed/ManagedUserTransaction.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/managed/ManagedUserTransaction.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/managed/ManagedUserTransaction.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/managed/ManagedUserTransaction.java Tue Nov 19 02:12:21 2013
@@ -16,17 +16,17 @@
*/
package org.apache.openejb.core.managed;
-import javax.transaction.UserTransaction;
-import javax.transaction.NotSupportedException;
-import javax.transaction.SystemException;
+import org.apache.openejb.BeanContext;
+import org.apache.openejb.BeanType;
+import org.apache.openejb.core.ThreadContext;
+import org.apache.openejb.persistence.JtaEntityManagerRegistry;
+
import javax.transaction.HeuristicMixedException;
import javax.transaction.HeuristicRollbackException;
+import javax.transaction.NotSupportedException;
import javax.transaction.RollbackException;
-
-import org.apache.openejb.persistence.JtaEntityManagerRegistry;
-import org.apache.openejb.core.ThreadContext;
-import org.apache.openejb.BeanType;
-import org.apache.openejb.BeanContext;
+import javax.transaction.SystemException;
+import javax.transaction.UserTransaction;
public class ManagedUserTransaction implements UserTransaction {
private final UserTransaction userTransaction;
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/managed/PassivationStrategy.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/managed/PassivationStrategy.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/managed/PassivationStrategy.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/managed/PassivationStrategy.java Tue Nov 19 02:12:21 2013
@@ -16,11 +16,11 @@
*/
package org.apache.openejb.core.managed;
+import org.apache.openejb.SystemException;
+
import java.util.Map;
import java.util.Properties;
-import org.apache.openejb.SystemException;
-
public interface PassivationStrategy {
void init(Properties props) throws SystemException;
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/managed/RAFPassivater.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/managed/RAFPassivater.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/managed/RAFPassivater.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/managed/RAFPassivater.java Tue Nov 19 02:12:21 2013
@@ -20,11 +20,10 @@ import org.apache.openejb.spi.Serializer
import java.io.File;
import java.io.RandomAccessFile;
-import java.util.Enumeration;
import java.util.Hashtable;
-import java.util.Properties;
-import java.util.Map;
import java.util.Iterator;
+import java.util.Map;
+import java.util.Properties;
// optimization: replace HashTable with HashMap (vc no debug hashmap)
@@ -62,7 +61,7 @@ public class RAFPassivater implements Pa
byte [] bytes = Serializer.serialize(obj);
long filepointer = ras.getFilePointer();
- if (lastPointer == null) lastPointer = new Pointer(fileID, filepointer, (int) (filepointer));
+ if (lastPointer == null) lastPointer = new Pointer(fileID, filepointer, (int) filepointer);
else
lastPointer = new Pointer(fileID, filepointer, (int) (filepointer - lastPointer.filepointer));
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/managed/SimpleCache.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/managed/SimpleCache.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/managed/SimpleCache.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/managed/SimpleCache.java Tue Nov 19 02:12:21 2013
@@ -16,6 +16,11 @@
*/
package org.apache.openejb.core.managed;
+import org.apache.openejb.OpenEJBRuntimeException;
+import org.apache.openejb.util.Duration;
+import org.apache.openejb.util.LogCategory;
+import org.apache.openejb.util.Logger;
+
import java.util.ArrayList;
import java.util.Iterator;
import java.util.LinkedHashMap;
@@ -27,11 +32,6 @@ import java.util.concurrent.LinkedBlocki
import java.util.concurrent.TimeUnit;
import java.util.concurrent.locks.ReentrantLock;
-import org.apache.openejb.OpenEJBRuntimeException;
-import org.apache.openejb.util.LogCategory;
-import org.apache.openejb.util.Logger;
-import org.apache.openejb.util.Duration;
-
public class SimpleCache<K, V> implements Cache<K, V> {
public static final Logger logger = Logger.getInstance(LogCategory.OPENEJB, "org.apache.openejb.util.resources");
@@ -521,7 +521,7 @@ public class SimpleCache<K, V> implement
return false;
}
long now = System.currentTimeMillis();
- return (now - lastAccess) > timeOut;
+ return now - lastAccess > timeOut;
}
private void resetTimeOut() {
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/EndpointHandler.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/EndpointHandler.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/EndpointHandler.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/EndpointHandler.java Tue Nov 19 02:12:21 2013
@@ -17,8 +17,8 @@
package org.apache.openejb.core.mdb;
import org.apache.openejb.ApplicationException;
-import org.apache.openejb.SystemException;
import org.apache.openejb.BeanContext;
+import org.apache.openejb.SystemException;
import javax.ejb.EJBException;
import javax.resource.spi.ApplicationServerInternalException;
@@ -187,7 +187,7 @@ public class EndpointHandler implements
try {
container.beforeDelivery(deployment, instance, method, xaResource);
} catch (SystemException se) {
- Throwable throwable = (se.getRootCause() != null) ? se.getRootCause() : se;
+ Throwable throwable = se.getRootCause() != null ? se.getRootCause() : se;
throw new ApplicationServerInternalException(throwable);
}
@@ -226,10 +226,10 @@ public class EndpointHandler implements
// deliver the message
value = container.invoke(instance, method, null, args);
} catch (SystemException se) {
- throwable = (se.getRootCause() != null) ? se.getRootCause() : se;
+ throwable = se.getRootCause() != null ? se.getRootCause() : se;
state = State.SYSTEM_EXCEPTION;
} catch (ApplicationException ae) {
- throwable = (ae.getRootCause() != null) ? ae.getRootCause() : ae;
+ throwable = ae.getRootCause() != null ? ae.getRootCause() : ae;
} finally {
// if the adapter is not using before/after, we must call afterDelivery to clean up
if (callBeforeAfter) {
@@ -273,7 +273,7 @@ public class EndpointHandler implements
} catch (SystemException se) {
exceptionThrown = true;
- Throwable throwable = (se.getRootCause() != null) ? se.getRootCause() : se;
+ Throwable throwable = se.getRootCause() != null ? se.getRootCause() : se;
throwable.printStackTrace();
throw new ApplicationServerInternalException(throwable);
} finally {
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/InboundRecovery.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/InboundRecovery.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/InboundRecovery.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/InboundRecovery.java Tue Nov 19 02:12:21 2013
@@ -18,9 +18,10 @@
package org.apache.openejb.core.mdb;
+import org.apache.openejb.OpenEJBException;
+
import javax.resource.spi.ActivationSpec;
import javax.resource.spi.ResourceAdapter;
-import org.apache.openejb.OpenEJBException;
/**
* @version $Rev:$ $Date:$
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbContainer.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbContainer.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbContainer.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbContainer.java Tue Nov 19 02:12:21 2013
@@ -384,7 +384,7 @@ public class MdbContainer implements Rpc
if (openEjbException == null) {
logger.debug("finished invoking method " + method.getName() + ". Return value:" + returnValue);
} else {
- Throwable exception = (openEjbException.getRootCause() != null) ? openEjbException.getRootCause() : openEjbException;
+ Throwable exception = openEjbException.getRootCause() != null ? openEjbException.getRootCause() : openEjbException;
logger.debug("finished invoking method " + method.getName() + " with exception " + exception);
}
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbInstanceFactory.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbInstanceFactory.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbInstanceFactory.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbInstanceFactory.java Tue Nov 19 02:12:21 2013
@@ -16,17 +16,6 @@
*/
package org.apache.openejb.core.mdb;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-
-import javax.ejb.EJBContext;
-import javax.ejb.MessageDrivenBean;
-import javax.naming.Context;
-import javax.naming.NamingException;
-import javax.resource.spi.UnavailableException;
-
import org.apache.openejb.BeanContext;
import org.apache.openejb.OpenEJBException;
import org.apache.openejb.core.BaseContext;
@@ -40,6 +29,16 @@ import org.apache.openejb.spi.SecuritySe
import org.apache.openejb.util.LogCategory;
import org.apache.openejb.util.Logger;
+import javax.ejb.EJBContext;
+import javax.ejb.MessageDrivenBean;
+import javax.naming.Context;
+import javax.naming.NamingException;
+import javax.resource.spi.UnavailableException;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
/**
* A MdbInstanceFactory creates instances of message driven beans for a single instance. This class differs from other
* instance managers in OpenEJB as it doesn't do pooling and it creates instances for only a single EJB deployment.
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/security/AbstractSecurityService.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/security/AbstractSecurityService.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/security/AbstractSecurityService.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/security/AbstractSecurityService.java Tue Nov 19 02:12:21 2013
@@ -145,7 +145,7 @@ public abstract class AbstractSecuritySe
runAsSubject = getRunAsSubject(oldContext.getBeanContext());
}
- SecurityContext securityContext = (oldContext != null) ? oldContext.get(SecurityContext.class) : null;
+ SecurityContext securityContext = oldContext != null ? oldContext.get(SecurityContext.class) : null;
if (runAsSubject != null) {
securityContext = new SecurityContext(runAsSubject);
@@ -225,7 +225,7 @@ public abstract class AbstractSecuritySe
public UUID disassociate() {
try {
final Identity identity = clientIdentity.get();
- return (identity == null) ? null : identity.getToken();
+ return identity == null ? null : identity.getToken();
} finally {
clientIdentity.remove();
}
@@ -283,7 +283,7 @@ public abstract class AbstractSecuritySe
final String ejbName = beanContext.getEjbName();
- String name = (type == null) ? null : type.getSpecName();
+ String name = type == null ? null : type.getSpecName();
if ("LocalBean".equals(name) || "LocalBeanHome".equals(name)) {
name = null;
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/security/ConnectorCallbackHandler.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/security/ConnectorCallbackHandler.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/security/ConnectorCallbackHandler.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/security/ConnectorCallbackHandler.java Tue Nov 19 02:12:21 2013
@@ -16,10 +16,8 @@
*/
package org.apache.openejb.core.security;
-import java.io.IOException;
-import java.security.Principal;
-import java.util.Arrays;
-import java.util.List;
+import org.apache.openejb.loader.SystemInstance;
+import org.apache.openejb.spi.SecurityService;
import javax.security.auth.Subject;
import javax.security.auth.callback.Callback;
@@ -33,9 +31,10 @@ import javax.security.auth.message.callb
import javax.security.auth.message.callback.PrivateKeyCallback;
import javax.security.auth.message.callback.SecretKeyCallback;
import javax.security.auth.message.callback.TrustStoreCallback;
-
-import org.apache.openejb.loader.SystemInstance;
-import org.apache.openejb.spi.SecurityService;
+import java.io.IOException;
+import java.security.Principal;
+import java.util.Arrays;
+import java.util.List;
/**
* Spec 16.4.1: must support CallerPrincipalCallback, GroupPrincipalCallback, PasswordValidationCallback. Recommended to support CertStoreCallback, PrivateKeyCallback, SecretKeyCallback, and TrustStoreCallback.
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/security/SecurityServiceImpl.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/security/SecurityServiceImpl.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/security/SecurityServiceImpl.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/security/SecurityServiceImpl.java Tue Nov 19 02:12:21 2013
@@ -26,8 +26,8 @@ import javax.security.auth.login.LoginCo
import javax.security.auth.login.LoginException;
import java.net.URL;
import java.net.URLDecoder;
-import java.util.UUID;
import java.util.Map;
+import java.util.UUID;
import java.util.concurrent.ConcurrentHashMap;
/**
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/security/jaas/ServiceProviderLoginModule.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/security/jaas/ServiceProviderLoginModule.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/security/jaas/ServiceProviderLoginModule.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/security/jaas/ServiceProviderLoginModule.java Tue Nov 19 02:12:21 2013
@@ -20,13 +20,23 @@ import org.apache.openejb.util.LogCatego
import org.apache.openejb.util.Logger;
import javax.security.auth.Subject;
-import javax.security.auth.callback.*;
+import javax.security.auth.callback.Callback;
+import javax.security.auth.callback.CallbackHandler;
+import javax.security.auth.callback.NameCallback;
+import javax.security.auth.callback.PasswordCallback;
+import javax.security.auth.callback.UnsupportedCallbackException;
import javax.security.auth.login.FailedLoginException;
import javax.security.auth.login.LoginException;
import javax.security.auth.spi.LoginModule;
import java.io.IOException;
import java.security.Principal;
-import java.util.*;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.ServiceLoader;
+import java.util.Set;
public class ServiceProviderLoginModule implements LoginModule {
private static Logger log = Logger.getInstance(LogCategory.OPENEJB_SECURITY, "org.apache.openejb.util.resources");
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/security/jacc/BasicJaccProvider.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/security/jacc/BasicJaccProvider.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/security/jacc/BasicJaccProvider.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/security/jacc/BasicJaccProvider.java Tue Nov 19 02:12:21 2013
@@ -84,6 +84,6 @@ public class BasicJaccProvider extends J
}
}
- return (systemPolicy != null)? systemPolicy.implies(domain, permission): false;
+ return systemPolicy != null ? systemPolicy.implies(domain, permission): false;
}
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/security/jacc/BasicPolicyConfiguration.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/security/jacc/BasicPolicyConfiguration.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/security/jacc/BasicPolicyConfiguration.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/security/jacc/BasicPolicyConfiguration.java Tue Nov 19 02:12:21 2013
@@ -168,7 +168,7 @@ public class BasicPolicyConfiguration im
}
public boolean inService() throws PolicyContextException {
- return (state == IN_SERVICE);
+ return state == IN_SERVICE;
}
//TODO I have no idea what side effects this might have, but it's needed in some form from PolicyConfigurationFactoryImpl.
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/singleton/EjbWsContext.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/singleton/EjbWsContext.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/singleton/EjbWsContext.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/singleton/EjbWsContext.java Tue Nov 19 02:12:21 2013
@@ -16,16 +16,15 @@
*/
package org.apache.openejb.core.singleton;
-import java.security.Principal;
+import org.apache.openejb.core.ThreadContext;
+import org.apache.openejb.core.webservices.AddressingSupport;
+import org.w3c.dom.Element;
import javax.ejb.SessionContext;
-import javax.xml.ws.WebServiceContext;
import javax.xml.ws.EndpointReference;
+import javax.xml.ws.WebServiceContext;
import javax.xml.ws.handler.MessageContext;
-
-import org.apache.openejb.core.ThreadContext;
-import org.apache.openejb.core.webservices.AddressingSupport;
-import org.w3c.dom.Element;
+import java.security.Principal;
public class EjbWsContext implements WebServiceContext {
private SessionContext context;
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/singleton/SingletonEjbHomeHandler.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/singleton/SingletonEjbHomeHandler.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/singleton/SingletonEjbHomeHandler.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/singleton/SingletonEjbHomeHandler.java Tue Nov 19 02:12:21 2013
@@ -16,16 +16,15 @@
*/
package org.apache.openejb.core.singleton;
-import java.lang.reflect.Method;
-import java.util.List;
-
-import javax.ejb.RemoveException;
-
import org.apache.openejb.BeanContext;
import org.apache.openejb.InterfaceType;
import org.apache.openejb.core.ivm.EjbHomeProxyHandler;
import org.apache.openejb.core.ivm.EjbObjectProxyHandler;
+import javax.ejb.RemoveException;
+import java.lang.reflect.Method;
+import java.util.List;
+
public class SingletonEjbHomeHandler extends EjbHomeProxyHandler {
public SingletonEjbHomeHandler(BeanContext beanContext, InterfaceType interfaceType, List<Class> interfaces, Class mainInterface) {
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/singleton/SingletonEjbObjectHandler.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/singleton/SingletonEjbObjectHandler.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/singleton/SingletonEjbObjectHandler.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/singleton/SingletonEjbObjectHandler.java Tue Nov 19 02:12:21 2013
@@ -16,9 +16,9 @@
*/
package org.apache.openejb.core.singleton;
+import org.apache.openejb.BeanContext;
import org.apache.openejb.Container;
import org.apache.openejb.InterfaceType;
-import org.apache.openejb.BeanContext;
import org.apache.openejb.core.ivm.EjbObjectProxyHandler;
import org.apache.openejb.util.proxy.ProxyManager;
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/Instance.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/Instance.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/Instance.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/Instance.java Tue Nov 19 02:12:21 2013
@@ -99,7 +99,7 @@ public class Instance implements Seriali
}
public synchronized Transaction getTransaction() {
- return (transaction.size() > 0)? transaction.peek(): null;
+ return transaction.size() > 0 ? transaction.peek(): null;
}
public Lock getLock() {
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/PassivationStrategy.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/PassivationStrategy.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/PassivationStrategy.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/PassivationStrategy.java Tue Nov 19 02:12:21 2013
@@ -16,11 +16,11 @@
*/
package org.apache.openejb.core.stateful;
+import org.apache.openejb.SystemException;
+
import java.util.Map;
import java.util.Properties;
-import org.apache.openejb.SystemException;
-
public interface PassivationStrategy {
void init(Properties props) throws SystemException;
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/RAFPassivater.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/RAFPassivater.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/RAFPassivater.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/RAFPassivater.java Tue Nov 19 02:12:21 2013
@@ -63,7 +63,7 @@ public class RAFPassivater implements Pa
final long filepointer = ras.getFilePointer();
if (lastPointer == null)
- lastPointer = new Pointer(fileID, filepointer, (int) (filepointer));
+ lastPointer = new Pointer(fileID, filepointer, (int) filepointer);
else
lastPointer = new Pointer(fileID, filepointer, (int) (filepointer - lastPointer.filepointer));