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 [2/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/assembler/classic/InterceptorInfo.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/InterceptorInfo.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/InterceptorInfo.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/InterceptorInfo.java Tue Nov 19 02:12:21 2013
@@ -16,8 +16,8 @@
*/
package org.apache.openejb.assembler.classic;
-import java.util.List;
import java.util.ArrayList;
+import java.util.List;
public class InterceptorInfo extends InfoObject{
public String clazz;
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JaccPermissionsBuilder.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JaccPermissionsBuilder.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JaccPermissionsBuilder.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JaccPermissionsBuilder.java Tue Nov 19 02:12:21 2013
@@ -295,7 +295,7 @@ public class JaccPermissionsBuilder {
public void addPossibleEjbMethodPermissions(PermissionCollection permissions, String ejbName, String methodInterface, Class clazz) throws OpenEJBException {
if (clazz == null) return;
for (java.lang.reflect.Method method : clazz.getMethods()) {
- String methodIface = ("LocalBean".equals(methodInterface) || "LocalBeanHome".equals(methodInterface)) ? null : methodInterface;
+ String methodIface = "LocalBean".equals(methodInterface) || "LocalBeanHome".equals(methodInterface) ? null : methodInterface;
permissions.add(new EJBMethodPermission(ejbName, methodIface, method));
}
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiBuilder.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiBuilder.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiBuilder.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiBuilder.java Tue Nov 19 02:12:21 2013
@@ -732,7 +732,7 @@ public class JndiBuilder {
boolean bIsRmote = java.rmi.Remote.class.isAssignableFrom(b);
if (aIsRmote == bIsRmote) return 0;
- return (aIsRmote) ? 1 : -1;
+ return aIsRmote ? 1 : -1;
}
}
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiEncBuilder.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiEncBuilder.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiEncBuilder.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiEncBuilder.java Tue Nov 19 02:12:21 2013
@@ -522,7 +522,7 @@ public class JndiEncBuilder {
// if the datasource if defined globally in the currently deployed app originAppname hould not be null
private boolean isNotGobalOrIsHoldByThisApp(final ResourceInfo info, final JndiScope scope) {
return !info.jndiName.startsWith("global/")
- || (info.originAppName != null && info.originAppName.equals(moduleId) && JndiScope.global.equals(scope));
+ || info.originAppName != null && info.originAppName.equals(moduleId) && JndiScope.global.equals(scope);
}
private void addSpecialCompBindings(Map<String, Object> bindings) {
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/LazyEjbReference.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/LazyEjbReference.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/LazyEjbReference.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/LazyEjbReference.java Tue Nov 19 02:12:21 2013
@@ -17,16 +17,16 @@
package org.apache.openejb.assembler.classic;
import org.apache.openejb.BeanContext;
-import org.apache.openejb.loader.SystemInstance;
-import org.apache.openejb.util.Messages;
-import org.apache.openejb.spi.ContainerSystem;
import org.apache.openejb.InterfaceType;
-import org.apache.openejb.core.ivm.naming.Reference;
import org.apache.openejb.core.ivm.naming.CrossClassLoaderJndiReference;
import org.apache.openejb.core.ivm.naming.IntraVmJndiReference;
+import org.apache.openejb.core.ivm.naming.Reference;
+import org.apache.openejb.loader.SystemInstance;
+import org.apache.openejb.spi.ContainerSystem;
+import org.apache.openejb.util.Messages;
-import javax.naming.NamingException;
import javax.naming.NameNotFoundException;
+import javax.naming.NamingException;
import java.net.URI;
/**
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ManagedBeanInfo.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ManagedBeanInfo.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ManagedBeanInfo.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ManagedBeanInfo.java Tue Nov 19 02:12:21 2013
@@ -16,8 +16,8 @@
*/
package org.apache.openejb.assembler.classic;
-import java.util.List;
import java.util.ArrayList;
+import java.util.List;
public class ManagedBeanInfo extends EnterpriseBeanInfo {
public ManagedBeanInfo() {
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MessageDrivenBeanInfo.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MessageDrivenBeanInfo.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MessageDrivenBeanInfo.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MessageDrivenBeanInfo.java Tue Nov 19 02:12:21 2013
@@ -16,8 +16,8 @@
*/
package org.apache.openejb.assembler.classic;
-import java.util.Map;
import java.util.HashMap;
+import java.util.Map;
/**
* @version $Rev$ $Date$
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MethodAttributeInfo.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MethodAttributeInfo.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MethodAttributeInfo.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MethodAttributeInfo.java Tue Nov 19 02:12:21 2013
@@ -16,8 +16,8 @@
*/
package org.apache.openejb.assembler.classic;
-import java.util.List;
import java.util.ArrayList;
+import java.util.List;
/**
* @version $Rev$ $Date$
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MethodConcurrencyBuilder.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MethodConcurrencyBuilder.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MethodConcurrencyBuilder.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MethodConcurrencyBuilder.java Tue Nov 19 02:12:21 2013
@@ -17,20 +17,20 @@
package org.apache.openejb.assembler.classic;
import org.apache.openejb.BeanContext;
+import org.apache.openejb.MethodContext;
+import org.apache.openejb.OpenEJBException;
import org.apache.openejb.util.Duration;
-import org.apache.openejb.util.Logger;
import org.apache.openejb.util.LogCategory;
-import org.apache.openejb.OpenEJBException;
-import org.apache.openejb.MethodContext;
+import org.apache.openejb.util.Logger;
import javax.ejb.LockType;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.ArrayList;
-import java.util.Collections;
import java.util.concurrent.TimeUnit;
-import java.lang.reflect.Method;
/**
* @version $Rev$ $Date$
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MethodInfoUtil.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MethodInfoUtil.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MethodInfoUtil.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MethodInfoUtil.java Tue Nov 19 02:12:21 2013
@@ -21,21 +21,20 @@ import org.apache.openejb.util.Classes;
import org.apache.openejb.util.Join;
import org.apache.openejb.util.SetAccessible;
-import javax.ejb.EJBLocalObject;
-import javax.ejb.EJBObject;
import javax.ejb.EJBHome;
import javax.ejb.EJBLocalHome;
-
-import static java.util.Arrays.asList;
-
-import java.util.Comparator;
-import java.util.List;
+import javax.ejb.EJBLocalObject;
+import javax.ejb.EJBObject;
+import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.Collections;
-import java.util.Map;
-import java.util.LinkedHashMap;
+import java.util.Comparator;
import java.util.Iterator;
-import java.lang.reflect.Method;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import static java.util.Arrays.asList;
/**
* @version $Rev$ $Date$
@@ -590,7 +589,7 @@ public class MethodInfoUtil {
public static String toString(MethodInfo i) {
String s = i.ejbName;
s += " : ";
- s += (i.methodIntf == null) ? "*" : i.methodIntf;
+ s += i.methodIntf == null ? "*" : i.methodIntf;
s += " : ";
s += i.className;
s += " : ";
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MethodPermissionInfo.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MethodPermissionInfo.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MethodPermissionInfo.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MethodPermissionInfo.java Tue Nov 19 02:12:21 2013
@@ -16,10 +16,8 @@
*/
package org.apache.openejb.assembler.classic;
-import org.apache.openejb.util.Join;
-
-import java.util.List;
import java.util.ArrayList;
+import java.util.List;
public class MethodPermissionInfo extends MethodAttributeInfo {
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MethodScheduleBuilder.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MethodScheduleBuilder.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MethodScheduleBuilder.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MethodScheduleBuilder.java Tue Nov 19 02:12:21 2013
@@ -18,9 +18,10 @@ package org.apache.openejb.assembler.cla
import org.apache.openejb.BeanContext;
import org.apache.openejb.MethodContext;
-import org.apache.openejb.util.Logger;
-import org.apache.openejb.util.LogCategory;
import org.apache.openejb.core.timer.ScheduleData;
+import org.apache.openejb.util.LogCategory;
+import org.apache.openejb.util.Logger;
+
import javax.ejb.ScheduleExpression;
import javax.ejb.TimerConfig;
import java.lang.reflect.Method;
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MethodScheduleInfo.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MethodScheduleInfo.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MethodScheduleInfo.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MethodScheduleInfo.java Tue Nov 19 02:12:21 2013
@@ -16,8 +16,8 @@
*/
package org.apache.openejb.assembler.classic;
-import java.util.List;
import java.util.ArrayList;
+import java.util.List;
public class MethodScheduleInfo extends InfoObject {
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MethodTransactionBuilder.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MethodTransactionBuilder.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MethodTransactionBuilder.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MethodTransactionBuilder.java Tue Nov 19 02:12:21 2013
@@ -16,21 +16,20 @@
*/
package org.apache.openejb.assembler.classic;
-import static org.apache.openejb.assembler.classic.MethodInfoUtil.resolveAttributes;
-import static org.apache.openejb.assembler.classic.MethodInfoUtil.resolveViewAttributes;
-
import org.apache.openejb.BeanContext;
-import org.apache.openejb.core.transaction.TransactionType;
import org.apache.openejb.OpenEJBException;
-import org.apache.openejb.util.Logger;
+import org.apache.openejb.core.transaction.TransactionType;
import org.apache.openejb.util.LogCategory;
+import org.apache.openejb.util.Logger;
-import java.util.List;
-import java.util.HashMap;
-import java.util.Map;
+import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.Collections;
-import java.lang.reflect.Method;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static org.apache.openejb.assembler.classic.MethodInfoUtil.resolveViewAttributes;
/**
* @version $Rev$ $Date$
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/OpenEjbConfigurationFactory.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/OpenEjbConfigurationFactory.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/OpenEjbConfigurationFactory.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/OpenEjbConfigurationFactory.java Tue Nov 19 02:12:21 2013
@@ -16,10 +16,10 @@
*/
package org.apache.openejb.assembler.classic;
-import java.util.Properties;
-
import org.apache.openejb.OpenEJBException;
+import java.util.Properties;
+
public interface OpenEjbConfigurationFactory {
void init(Properties props) throws OpenEJBException;
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/PersistenceUnitInfo.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/PersistenceUnitInfo.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/PersistenceUnitInfo.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/PersistenceUnitInfo.java Tue Nov 19 02:12:21 2013
@@ -16,9 +16,9 @@
*/
package org.apache.openejb.assembler.classic;
+import java.util.ArrayList;
import java.util.List;
import java.util.Properties;
-import java.util.ArrayList;
import java.util.Set;
import java.util.TreeSet;
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/PortInfo.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/PortInfo.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/PortInfo.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/PortInfo.java Tue Nov 19 02:12:21 2013
@@ -17,8 +17,8 @@
package org.apache.openejb.assembler.classic;
import javax.xml.namespace.QName;
-import java.util.List;
import java.util.ArrayList;
+import java.util.List;
import java.util.Properties;
public class PortInfo extends InfoObject {
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ProxyInterfaceResolver.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ProxyInterfaceResolver.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ProxyInterfaceResolver.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ProxyInterfaceResolver.java Tue Nov 19 02:12:21 2013
@@ -16,9 +16,9 @@
*/
package org.apache.openejb.assembler.classic;
-import java.util.List;
-import java.util.ArrayList;
import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.List;
/**
* @version $Rev$ $Date$
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ServiceInfo.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ServiceInfo.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ServiceInfo.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ServiceInfo.java Tue Nov 19 02:12:21 2013
@@ -16,9 +16,9 @@
*/
package org.apache.openejb.assembler.classic;
-import java.util.Properties;
-import java.util.List;
import java.util.ArrayList;
+import java.util.List;
+import java.util.Properties;
public class ServiceInfo extends InfoObject {
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ServiceReferenceInfo.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ServiceReferenceInfo.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ServiceReferenceInfo.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ServiceReferenceInfo.java Tue Nov 19 02:12:21 2013
@@ -17,8 +17,8 @@
package org.apache.openejb.assembler.classic;
import javax.xml.namespace.QName;
-import java.util.List;
import java.util.ArrayList;
+import java.util.List;
/**
* @version $Rev$ $Date$
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/StatefulBeanInfo.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/StatefulBeanInfo.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/StatefulBeanInfo.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/StatefulBeanInfo.java Tue Nov 19 02:12:21 2013
@@ -16,8 +16,8 @@
*/
package org.apache.openejb.assembler.classic;
-import java.util.List;
import java.util.ArrayList;
+import java.util.List;
public class StatefulBeanInfo extends EnterpriseBeanInfo {
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/WsBuilder.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/WsBuilder.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/WsBuilder.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/WsBuilder.java Tue Nov 19 02:12:21 2013
@@ -16,18 +16,18 @@
*/
package org.apache.openejb.assembler.classic;
+import org.apache.openejb.Injection;
+import org.apache.openejb.OpenEJBException;
import org.apache.openejb.core.webservices.HandlerChainData;
import org.apache.openejb.core.webservices.HandlerData;
import org.apache.openejb.core.webservices.PortData;
-import org.apache.openejb.OpenEJBException;
-import org.apache.openejb.Injection;
import javax.xml.namespace.QName;
-import java.util.List;
+import java.net.MalformedURLException;
+import java.net.URL;
import java.util.ArrayList;
import java.util.Collection;
-import java.net.URL;
-import java.net.MalformedURLException;
+import java.util.List;
public class WsBuilder {
public static PortData toPortData(PortInfo port, Collection<Injection> injections, URL baseUrl, ClassLoader classLoader) throws OpenEJBException {
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/cmd/Info2Properties.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/cmd/Info2Properties.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/cmd/Info2Properties.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/cmd/Info2Properties.java Tue Nov 19 02:12:21 2013
@@ -16,7 +16,14 @@
*/
package org.apache.openejb.assembler.classic.cmd;
-import org.apache.commons.cli.*;
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.CommandLineParser;
+import org.apache.commons.cli.HelpFormatter;
+import org.apache.commons.cli.Option;
+import org.apache.commons.cli.OptionBuilder;
+import org.apache.commons.cli.Options;
+import org.apache.commons.cli.ParseException;
+import org.apache.commons.cli.PosixParser;
import org.apache.openejb.assembler.classic.OpenEjbConfiguration;
import org.apache.openejb.assembler.classic.ServiceInfo;
import org.apache.openejb.loader.SystemInstance;
@@ -27,7 +34,11 @@ import org.apache.openejb.util.URISuppor
import javax.naming.Context;
import javax.naming.InitialContext;
-import java.io.*;
+import java.io.File;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.PrintStream;
+import java.io.PrintWriter;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/dynamic/PassthroughFactory.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/dynamic/PassthroughFactory.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/dynamic/PassthroughFactory.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/dynamic/PassthroughFactory.java Tue Nov 19 02:12:21 2013
@@ -16,10 +16,10 @@
*/
package org.apache.openejb.assembler.dynamic;
-import java.util.Properties;
-
import org.apache.openejb.assembler.classic.ServiceInfo;
+import java.util.Properties;
+
public class PassthroughFactory {
public static Object create(Object object) {
return object;
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/async/AsynchronousPool.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/async/AsynchronousPool.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/async/AsynchronousPool.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/async/AsynchronousPool.java Tue Nov 19 02:12:21 2013
@@ -223,7 +223,7 @@ public class AsynchronousPool {
e = new NoSuchEJBException(e.getMessage(), (Exception) e);
}
- final boolean isExceptionUnchecked = (e instanceof Error) || (e instanceof RuntimeException);
+ final boolean isExceptionUnchecked = e instanceof Error || e instanceof RuntimeException;
// throw checked excpetion and EJBException directly.
if (!isExceptionUnchecked || e instanceof EJBException) {
@@ -231,7 +231,7 @@ public class AsynchronousPool {
}
// wrap unchecked exception with EJBException before throwing.
- throw (e instanceof Exception) ? new ExecutionException(new EJBException((Exception) e))
+ throw e instanceof Exception ? new ExecutionException(new EJBException((Exception) e))
: new ExecutionException(new EJBException(new Exception(e)));
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiAppContextsService.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiAppContextsService.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiAppContextsService.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiAppContextsService.java Tue Nov 19 02:12:21 2013
@@ -238,7 +238,7 @@ public class CdiAppContextsService exten
|| scopeType.equals(ApplicationScoped.class)
|| scopeType.equals(Dependent.class)
|| scopeType.equals(Singleton.class)
- || (scopeType.equals(ConversationScoped.class) && supportsConversation());
+ || scopeType.equals(ConversationScoped.class) && supportsConversation();
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiBeanInfo.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiBeanInfo.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiBeanInfo.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiBeanInfo.java Tue Nov 19 02:12:21 2013
@@ -17,9 +17,22 @@
package org.apache.openejb.cdi;
import org.apache.openejb.Injection;
-import org.apache.openejb.jee.*;
+import org.apache.openejb.jee.DataSource;
+import org.apache.openejb.jee.EjbLocalRef;
+import org.apache.openejb.jee.EjbRef;
+import org.apache.openejb.jee.EnvEntry;
+import org.apache.openejb.jee.JndiConsumer;
+import org.apache.openejb.jee.KeyedCollection;
+import org.apache.openejb.jee.LifecycleCallback;
+import org.apache.openejb.jee.MessageDestinationRef;
+import org.apache.openejb.jee.PersistenceContextRef;
+import org.apache.openejb.jee.PersistenceUnitRef;
+import org.apache.openejb.jee.ResourceEnvRef;
+import org.apache.openejb.jee.ResourceRef;
+import org.apache.openejb.jee.SecurityIdentity;
+import org.apache.openejb.jee.SecurityRoleRef;
+import org.apache.openejb.jee.ServiceRef;
-import javax.xml.bind.annotation.XmlTransient;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiPlugin.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiPlugin.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiPlugin.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiPlugin.java Tue Nov 19 02:12:21 2013
@@ -269,7 +269,7 @@ public class CdiPlugin extends AbstractO
}
final Map<Class<?>, BeanContext> map = pluginBeans(ctx);
- return map != null && (map.containsKey(clazz) || (clazz.isInterface() && findBeanContext(ctx, clazz) != null));
+ return map != null && (map.containsKey(clazz) || clazz.isInterface() && findBeanContext(ctx, clazz) != null);
}
private static WebBeansContext superContext(final WebBeansContext ctx) {
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiResourceInjectionService.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiResourceInjectionService.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiResourceInjectionService.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiResourceInjectionService.java Tue Nov 19 02:12:21 2013
@@ -16,15 +16,6 @@
*/
package org.apache.openejb.cdi;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-import java.lang.annotation.Annotation;
-
-
-import javax.enterprise.inject.spi.Bean;
-
-
import org.apache.openejb.AppContext;
import org.apache.openejb.BeanContext;
import org.apache.openejb.Injection;
@@ -36,17 +27,18 @@ import org.apache.webbeans.component.Res
import org.apache.webbeans.config.WebBeansContext;
import org.apache.webbeans.spi.ResourceInjectionService;
import org.apache.webbeans.spi.api.ResourceReference;
-import org.apache.webbeans.spi.plugins.OpenWebBeansEjbPlugin;
import org.apache.xbean.recipe.ObjectRecipe;
import org.apache.xbean.recipe.Option;
-import javax.naming.Context;
+import javax.enterprise.inject.spi.Bean;
import javax.naming.InitialContext;
import javax.naming.NamingException;
-
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.lang.annotation.Annotation;
import java.util.ArrayList;
import java.util.List;
-import java.util.Map.Entry;
public class CdiResourceInjectionService implements ResourceInjectionService {
private Logger logger = Logger.getInstance(LogCategory.OPENEJB.createChild("cdi"), CdiResourceInjectionService.class);
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiScanner.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiScanner.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiScanner.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiScanner.java Tue Nov 19 02:12:21 2013
@@ -258,7 +258,7 @@ public class CdiScanner implements Scann
// 1. this classloader is the good one
// 2. the classloader is the appclassloader one and we are in the ear parent
if (!filterByClassLoader
- || comparator.isSame(cl) || (cl.equals(scl) && startupObject.getWebContext() == null)) {
+ || comparator.isSame(cl) || cl.equals(scl) && startupObject.getWebContext() == null) {
classes.add(clazz);
} else {
it.remove();
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/StartupObject.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/StartupObject.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/StartupObject.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/StartupObject.java Tue Nov 19 02:12:21 2013
@@ -18,14 +18,14 @@
package org.apache.openejb.cdi;
-import java.util.List;
-
import org.apache.openejb.AppContext;
import org.apache.openejb.BeanContext;
import org.apache.openejb.assembler.classic.AppInfo;
import org.apache.openejb.core.WebContext;
import org.apache.webbeans.config.WebBeansContext;
+import java.util.List;
+
/**
* @version $Rev:$ $Date:$
*/
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/WebAppElResolver.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/WebAppElResolver.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/WebAppElResolver.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/WebAppElResolver.java Tue Nov 19 02:12:21 2013
@@ -16,13 +16,13 @@
*/
package org.apache.openejb.cdi;
-import java.beans.FeatureDescriptor;
-import java.util.Iterator;
import javax.el.ELContext;
import javax.el.ELException;
import javax.el.ELResolver;
import javax.el.PropertyNotFoundException;
import javax.el.PropertyNotWritableException;
+import java.beans.FeatureDescriptor;
+import java.util.Iterator;
public class WebAppElResolver extends ELResolver {
private final ELResolver parent;
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/WebappWebBeansContext.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/WebappWebBeansContext.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/WebappWebBeansContext.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/WebappWebBeansContext.java Tue Nov 19 02:12:21 2013
@@ -16,11 +16,12 @@
*/
package org.apache.openejb.cdi;
-import java.util.Map;
-import java.util.Properties;
import org.apache.webbeans.config.WebBeansContext;
import org.apache.webbeans.container.BeanManagerImpl;
+import java.util.Map;
+import java.util.Properties;
+
public class WebappWebBeansContext extends WebBeansContext {
private WebBeansContext parent;
private BeanManagerImpl bm;
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ActivationConfigPropertyOverride.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ActivationConfigPropertyOverride.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ActivationConfigPropertyOverride.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ActivationConfigPropertyOverride.java Tue Nov 19 02:12:21 2013
@@ -16,10 +16,6 @@
*/
package org.apache.openejb.config;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-
import org.apache.openejb.OpenEJBException;
import org.apache.openejb.jee.ActivationConfig;
import org.apache.openejb.jee.ActivationConfigProperty;
@@ -32,6 +28,10 @@ import org.apache.openejb.loader.SystemI
import org.apache.openejb.util.LogCategory;
import org.apache.openejb.util.Logger;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+
/**
* @version $Rev$ $Date$
*/
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java Tue Nov 19 02:12:21 2013
@@ -912,7 +912,7 @@ public class AnnotationDeployer implemen
}
private String getConfigPropertyType(javax.resource.spi.ConfigProperty annotation, Class<?> type) {
- Class<?> t = (annotation == null) ? null : annotation.type();
+ Class<?> t = annotation == null ? null : annotation.type();
if (t == null && type != null) {
return type.getName();
} else if (t == null) {
@@ -1045,7 +1045,7 @@ public class AnnotationDeployer implemen
public WebModule deploy(WebModule webModule) throws OpenEJBException {
WebApp webApp = webModule.getWebApp();
- if (webApp != null && (webApp.isMetadataComplete())) return webModule;
+ if (webApp != null && webApp.isMetadataComplete()) return webModule;
try {
if (webModule.getFinder() == null) {
@@ -1162,7 +1162,7 @@ public class AnnotationDeployer implemen
// if we are deplying a webapp we don't need to (re)do it
// or if this module is another webapp we don't need to look it
// otherwise that's a common part of ear we want to scan
- if (appModule.isWebapp() || (module.isWebapp() && !module.getModuleId().equals(webModule.getModuleId()))) {
+ if (appModule.isWebapp() || module.isWebapp() && !module.getModuleId().equals(webModule.getModuleId())) {
continue;
}
@@ -1705,23 +1705,23 @@ public class AnnotationDeployer implemen
}
private String getEjbName(MessageDriven mdb, Class<?> beanClass) {
- return (mdb.name().isEmpty() ? beanClass.getSimpleName() : mdb.name());
+ return mdb.name().isEmpty() ? beanClass.getSimpleName() : mdb.name();
}
private String getEjbName(Stateful stateful, Class<?> beanClass) {
- return (stateful.name().isEmpty() ? beanClass.getSimpleName() : stateful.name());
+ return stateful.name().isEmpty() ? beanClass.getSimpleName() : stateful.name();
}
private String getEjbName(Stateless stateless, Class<?> beanClass) {
- return (stateless.name().isEmpty() ? beanClass.getSimpleName() : stateless.name());
+ return stateless.name().isEmpty() ? beanClass.getSimpleName() : stateless.name();
}
private String getEjbName(Singleton singleton, Class<?> beanClass) {
- return (singleton.name().isEmpty() ? beanClass.getSimpleName() : singleton.name());
+ return singleton.name().isEmpty() ? beanClass.getSimpleName() : singleton.name();
}
private String getEjbName(ManagedBean managed, Class<?> beanClass) {
- return (managed.value().isEmpty() ? beanClass.getSimpleName() : managed.value());
+ return managed.value().isEmpty() ? beanClass.getSimpleName() : managed.value();
}
private boolean isValidEjbAnnotationUsage(Class annotationClass, Annotated<Class<?>> beanClass, String ejbName, EjbModule ejbModule) {
@@ -3404,8 +3404,8 @@ public class AnnotationDeployer implemen
for (javax.ejb.Schedule schedule : scheduleAnnotationList) {
Timer timer = new Timer();
timer.setPersistent(schedule.persistent());
- timer.setInfo((schedule.info() == null || schedule.info().isEmpty()) ? null : schedule.info());
- timer.setTimezone((schedule.timezone() == null || schedule.timezone().isEmpty()) ? null : schedule.timezone());
+ timer.setInfo(schedule.info() == null || schedule.info().isEmpty() ? null : schedule.info());
+ timer.setTimezone(schedule.timezone() == null || schedule.timezone().isEmpty() ? null : schedule.timezone());
//Copy TimerSchedule
TimerSchedule timerSchedule = new TimerSchedule();
timerSchedule.setSecond(schedule.second());
@@ -3462,7 +3462,7 @@ public class AnnotationDeployer implemen
* @AroundTimeout
*/
if (apply(override, invokable.getAroundInvoke())) {
- for (Annotated<Method> method : sortMethods((annotationFinder.findMetaAnnotatedMethods(javax.interceptor.AroundTimeout.class)))) {
+ for (Annotated<Method> method : sortMethods(annotationFinder.findMetaAnnotatedMethods(javax.interceptor.AroundTimeout.class))) {
invokable.getAroundTimeout().add(new AroundTimeout(method.get()));
}
}
@@ -3851,13 +3851,13 @@ public class AnnotationDeployer implemen
Class<?> interfce = ejb.beanInterface();
if (interfce.equals(Object.class)) {
- interfce = (member == null) ? null : member.getType();
+ interfce = member == null ? null : member.getType();
}
boolean localbean = isKnownLocalBean(interfce);
boolean dynamicallyImplemented = DynamicProxyImplFactory.isKnownDynamicallyImplemented(interfce);
- if ((!localbean) && interfce != null && !isValidEjbInterface(name, interfce, ejbRef.getName())) {
+ if (!localbean && interfce != null && !isValidEjbInterface(name, interfce, ejbRef.getName())) {
return;
}
@@ -4100,7 +4100,7 @@ public class AnnotationDeployer implemen
consumer.getResourceEnvRef().add(resourceEnvRef);
}
- if (resourceEnvRef.getResourceEnvRefType() == null || ("").equals(resourceEnvRef.getResourceEnvRefType())) {
+ if (resourceEnvRef.getResourceEnvRefType() == null || "".equals(resourceEnvRef.getResourceEnvRefType())) {
resourceEnvRef.setResourceEnvRefType(type.getName());
}
reference = resourceEnvRef;
@@ -4165,7 +4165,7 @@ public class AnnotationDeployer implemen
}
}
- if (resourceRef.getResType() == null || ("").equals(resourceRef.getResType())) {
+ if (resourceRef.getResType() == null || "".equals(resourceRef.getResType())) {
resourceRef.setResType(type.getName());
}
@@ -4381,7 +4381,7 @@ public class AnnotationDeployer implemen
}
consumer.getPersistenceContextRef().add(persistenceContextRef);
} else {
- if (persistenceContextRef.getPersistenceUnitName() == null || ("").equals(persistenceContextRef.getPersistenceUnitName())) {
+ if (persistenceContextRef.getPersistenceUnitName() == null || "".equals(persistenceContextRef.getPersistenceUnitName())) {
persistenceContextRef.setPersistenceUnitName(persistenceContext.unitName());
}
if (persistenceContextRef.getPersistenceContextType() == null) {
@@ -4548,7 +4548,7 @@ public class AnnotationDeployer implemen
serviceRef.setServiceInterface(serviceInterface.getName());
// reference type
- if (serviceRef.getServiceRefType() == null || ("").equals(serviceRef.getServiceRefType())) {
+ if (serviceRef.getServiceRefType() == null || "".equals(serviceRef.getServiceRefType())) {
if (webService.type() != java.lang.Object.class) {
serviceRef.setServiceRefType(webService.type().getName());
} else {
@@ -4972,7 +4972,7 @@ public class AnnotationDeployer implemen
if (methodAttributes == null) return null;
for (MethodAttribute methodAttribute : methodAttributes) {
- String className = (clazz != null) ? clazz.getName() : null + "";
+ String className = clazz != null ? clazz.getName() : null + "";
if (className.equals(methodAttribute.getClassName() + "")) {
return methodAttribute;
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java Tue Nov 19 02:12:21 2013
@@ -45,7 +45,6 @@ import org.apache.openejb.config.sys.Con
import org.apache.openejb.config.sys.Resource;
import org.apache.openejb.config.sys.ServiceProvider;
import org.apache.openejb.jee.AdminObject;
-import org.apache.openejb.jee.Application;
import org.apache.openejb.jee.ApplicationClient;
import org.apache.openejb.jee.ConfigProperty;
import org.apache.openejb.jee.ConnectionDefinition;
@@ -638,7 +637,7 @@ class AppInfoBuilder {
info.webappName = findRelatedWebApp(appModule, rootUrl);
final Boolean excludeUnlistedClasses = persistenceUnit.isExcludeUnlistedClasses();
- info.excludeUnlistedClasses = persistenceUnit.isScanned() || (excludeUnlistedClasses != null && excludeUnlistedClasses);
+ info.excludeUnlistedClasses = persistenceUnit.isScanned() || excludeUnlistedClasses != null && excludeUnlistedClasses;
info.jtaDataSource = persistenceUnit.getJtaDataSource();
info.nonJtaDataSource = persistenceUnit.getNonJtaDataSource();
@@ -983,7 +982,7 @@ class AppInfoBuilder {
}
private void configureWebserviceScurity(final List<PortInfo> infoList, final Object altDD) {
- if (altDD == null || (! (altDD instanceof OpenejbJar))) return;
+ if (altDD == null || !(altDD instanceof OpenejbJar)) return;
final OpenejbJar openejbJar = (OpenejbJar) altDD;
final Map<String, EjbDeployment> deploymentsByEjbName = openejbJar.getDeploymentsByEjbName();
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AppModule.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AppModule.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AppModule.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AppModule.java Tue Nov 19 02:12:21 2013
@@ -128,7 +128,7 @@ public class AppModule implements Deploy
this.classLoader = classLoader;
this.application = application;
- final File file = (jarLocation == null) ? null : new File(jarLocation);
+ final File file = jarLocation == null ? null : new File(jarLocation);
this.id = new ID(null, application, null, file, null, this);
this.validation = new ValidationContext(this);
this.standaloneModule = standaloneModule;
@@ -256,7 +256,7 @@ public class AppModule implements Deploy
@Override
public String getJarLocation() {
- return (id.getLocation() != null) ? id.getLocation().getAbsolutePath() : null;
+ return id.getLocation() != null ? id.getLocation().getAbsolutePath() : null;
}
public void setModuleId(final String moduleId) {
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AppValidator.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AppValidator.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AppValidator.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AppValidator.java Tue Nov 19 02:12:21 2013
@@ -26,6 +26,7 @@ import org.apache.commons.cli.ParseExcep
import org.apache.commons.cli.PosixParser;
import org.apache.openejb.OpenEJBException;
import org.apache.openejb.cli.SystemExitException;
+import org.apache.openejb.config.rules.CheckAnnotations;
import org.apache.openejb.config.rules.CheckAssemblyBindings;
import org.apache.openejb.config.rules.CheckAsynchronous;
import org.apache.openejb.config.rules.CheckCallbacks;
@@ -33,14 +34,13 @@ import org.apache.openejb.config.rules.C
import org.apache.openejb.config.rules.CheckClasses;
import org.apache.openejb.config.rules.CheckDependsOn;
import org.apache.openejb.config.rules.CheckDescriptorLocation;
+import org.apache.openejb.config.rules.CheckIncorrectPropertyNames;
import org.apache.openejb.config.rules.CheckInjectionPointUsage;
import org.apache.openejb.config.rules.CheckInjectionTargets;
import org.apache.openejb.config.rules.CheckMethods;
import org.apache.openejb.config.rules.CheckPersistenceRefs;
import org.apache.openejb.config.rules.CheckRestMethodArePublic;
import org.apache.openejb.config.rules.CheckUserTransactionRefs;
-import org.apache.openejb.config.rules.CheckAnnotations;
-import org.apache.openejb.config.rules.CheckIncorrectPropertyNames;
import org.apache.openejb.config.rules.ValidationBase;
import org.apache.openejb.util.Messages;
import org.apache.openejb.util.OpenEjbVersion;
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ApplicationProperties.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ApplicationProperties.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ApplicationProperties.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ApplicationProperties.java Tue Nov 19 02:12:21 2013
@@ -21,11 +21,9 @@ import org.apache.openejb.loader.IO;
import org.apache.openejb.loader.SystemInstance;
import org.apache.openejb.util.LogCategory;
import org.apache.openejb.util.Logger;
-import org.apache.openejb.util.SuperProperties;
import java.io.IOException;
import java.net.URL;
-import java.util.Arrays;
import java.util.Collection;
import java.util.Map;
import java.util.Properties;
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java Tue Nov 19 02:12:21 2013
@@ -457,7 +457,7 @@ public class AutoConfig implements Dynam
private boolean isJms(final MessageDrivenBean mdb) {
final String messagingType = mdb.getMessagingType();
- return (messagingType != null && messagingType.startsWith("javax.jms"));
+ return messagingType != null && messagingType.startsWith("javax.jms");
}
/**
@@ -737,7 +737,7 @@ public class AutoConfig implements Dynam
}
// skip destinations with a global jndi name
- final String mappedName = (ref.getMappedName() == null) ? "" : ref.getMappedName();
+ final String mappedName = ref.getMappedName() == null ? "" : ref.getMappedName();
if (mappedName.startsWith("jndi:")) {
continue;
}
@@ -749,7 +749,7 @@ public class AutoConfig implements Dynam
continue;
}
- String destinationId = (mappedName.length() == 0) ? ref.getName() : mappedName;
+ String destinationId = mappedName.length() == 0 ? ref.getName() : mappedName;
try {
destinationId = getResourceId(moduleId, destinationId, refType, appResources);
} catch (OpenEJBException ex) {
@@ -770,7 +770,7 @@ public class AutoConfig implements Dynam
}
// skip destinations with a global jndi name
- final String mappedName = (ref.getMappedName() == null) ? "" : ref.getMappedName();
+ final String mappedName = ref.getMappedName() == null ? "" : ref.getMappedName();
if (mappedName.startsWith("jndi:")) {
continue;
}
@@ -782,7 +782,7 @@ public class AutoConfig implements Dynam
continue;
}
- String destinationId = (mappedName.length() == 0) ? ref.getName() : mappedName;
+ String destinationId = mappedName.length() == 0 ? ref.getName() : mappedName;
destinationId = getResourceEnvId(moduleId, destinationId, refType, appResources);
ref.setMappedName(destinationId);
}
@@ -795,12 +795,12 @@ public class AutoConfig implements Dynam
}
// skip destinations with a global jndi name
- final String mappedName = (ref.getMappedName() == null) ? "" : ref.getMappedName();
+ final String mappedName = ref.getMappedName() == null ? "" : ref.getMappedName();
if (mappedName.startsWith("jndi:")) {
continue;
}
- String destinationId = (mappedName.length() == 0) ? ref.getName() : mappedName;
+ String destinationId = mappedName.length() == 0 ? ref.getName() : mappedName;
destinationId = getResourceEnvId(moduleId, destinationId, ref.getType(), appResources);
ref.setMappedName(destinationId);
}
@@ -1126,7 +1126,7 @@ public class AutoConfig implements Dynam
return;
}
// skip destinations with a global jndi name
- final String mappedName = (ref.getMappedName() == null) ? "" : ref.getMappedName();
+ final String mappedName = ref.getMappedName() == null ? "" : ref.getMappedName();
if (mappedName.startsWith("jndi:")) {
return;
}
@@ -1151,7 +1151,7 @@ public class AutoConfig implements Dynam
try {
ResourceLink link = ejbDeployment.getResourceLink(refName);
if (link == null) {
- String id = (mappedName.length() == 0) ? ref.getName() : mappedName;
+ String id = mappedName.length() == 0 ? ref.getName() : mappedName;
if (id.startsWith("java:")) {
id = id.substring("java:".length());
}
@@ -1200,7 +1200,7 @@ public class AutoConfig implements Dynam
return;
}
// skip destinations with a global jndi name
- final String mappedName = (ref.getMappedName() == null) ? "" : ref.getMappedName();
+ final String mappedName = ref.getMappedName() == null ? "" : ref.getMappedName();
if (mappedName.startsWith("jndi:")) {
return;
}
@@ -1216,7 +1216,7 @@ public class AutoConfig implements Dynam
ResourceLink link = ejbDeployment.getResourceLink(refName);
if (link == null) {
- String id = (mappedName.length() == 0) ? refName : mappedName;
+ String id = mappedName.length() == 0 ? refName : mappedName;
id = getResourceEnvId(ejbDeployment.getDeploymentId(), id, refType, appResources);
if (id == null) {
// could be a session context ref
@@ -1646,7 +1646,7 @@ public class AutoConfig implements Dynam
if (nonJtaDataSourceId != null && jtaDataSourceId == null
// hibernate uses the fact that this ds is missing to get a non jta em instead of a JTA one
&& (!resourceLocal || deduceJtaFromNonJta != null)
- && (deduceJtaFromNonJta == null || (deduceJtaFromNonJta != null && Boolean.parseBoolean(deduceJtaFromNonJta)))) {
+ && (deduceJtaFromNonJta == null || deduceJtaFromNonJta != null && Boolean.parseBoolean(deduceJtaFromNonJta))) {
final ResourceInfo nonJtaResourceInfo = configFactory.getResourceInfo(nonJtaDataSourceId);
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/Cipher.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/Cipher.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/Cipher.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/Cipher.java Tue Nov 19 02:12:21 2013
@@ -16,9 +16,6 @@
*/
package org.apache.openejb.config;
-import java.sql.SQLException;
-import java.util.Map;
-
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.CommandLineParser;
import org.apache.commons.cli.HelpFormatter;
@@ -30,10 +27,13 @@ import org.apache.commons.cli.PosixParse
import org.apache.openejb.cli.SystemExitException;
import org.apache.openejb.resource.jdbc.BasicDataSourceUtil;
import org.apache.openejb.resource.jdbc.cipher.PasswordCipher;
-import org.apache.openejb.util.Messages;
import org.apache.openejb.util.Join;
+import org.apache.openejb.util.Messages;
import org.apache.xbean.finder.ResourceFinder;
+import java.sql.SQLException;
+import java.util.Map;
+
/**
* Command line tool on top of the {@link org.apache.openejb.resource.jdbc.cipher.PasswordCipher} interface. Basically,
* it allows end user to encrypt/decrypt a string (ie. a password) using a cipher
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/CleanEnvEntries.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/CleanEnvEntries.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/CleanEnvEntries.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/CleanEnvEntries.java Tue Nov 19 02:12:21 2013
@@ -161,7 +161,7 @@ public class CleanEnvEntries implements
normalize(types);
- final Class<?> type = (types.size() == 1) ? types.iterator().next() : String.class;
+ final Class<?> type = types.size() == 1 ? types.iterator().next() : String.class;
entry.setType(type.getName());
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ClientModule.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ClientModule.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ClientModule.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ClientModule.java Tue Nov 19 02:12:21 2013
@@ -45,7 +45,7 @@ public class ClientModule extends Module
setClassLoader(classLoader);
this.mainClass = mainClass;
- File file = (jarLocation == null) ? null : new File(jarLocation);
+ File file = jarLocation == null ? null : new File(jarLocation);
this.id = new ID(null, applicationClient, moduleId, file, null, this);
this.validation = new ValidationContext(this);
}
@@ -59,7 +59,7 @@ public class ClientModule extends Module
}
public IAnnotationFinder getFinder() {
- return (finder != null)? finder.get(): null;
+ return finder != null ? finder.get(): null;
}
public void setFinderReference(AtomicReference<IAnnotationFinder> finder) {
@@ -75,7 +75,7 @@ public class ClientModule extends Module
}
public String getJarLocation() {
- return (id.getLocation() != null) ? id.getLocation().getAbsolutePath() : null;
+ return id.getLocation() != null ? id.getLocation().getAbsolutePath() : null;
}
public void setJarLocation(String jarLocation) {
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/CmpJpaConversion.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/CmpJpaConversion.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/CmpJpaConversion.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/CmpJpaConversion.java Tue Nov 19 02:12:21 2013
@@ -16,6 +16,52 @@
*/
package org.apache.openejb.config;
+import org.apache.openejb.OpenEJBException;
+import org.apache.openejb.core.cmp.CmpUtil;
+import org.apache.openejb.core.cmp.jpa.JpaCmpEngine;
+import org.apache.openejb.jee.CmpField;
+import org.apache.openejb.jee.CmpVersion;
+import org.apache.openejb.jee.EjbJar;
+import org.apache.openejb.jee.EjbRelation;
+import org.apache.openejb.jee.EjbRelationshipRole;
+import org.apache.openejb.jee.EnterpriseBean;
+import org.apache.openejb.jee.EntityBean;
+import org.apache.openejb.jee.Multiplicity;
+import org.apache.openejb.jee.PersistenceContextRef;
+import org.apache.openejb.jee.PersistenceType;
+import org.apache.openejb.jee.Query;
+import org.apache.openejb.jee.QueryMethod;
+import org.apache.openejb.jee.RelationshipRoleSource;
+import org.apache.openejb.jee.Relationships;
+import org.apache.openejb.jee.jpa.AttributeOverride;
+import org.apache.openejb.jee.jpa.Attributes;
+import org.apache.openejb.jee.jpa.Basic;
+import org.apache.openejb.jee.jpa.CascadeType;
+import org.apache.openejb.jee.jpa.Entity;
+import org.apache.openejb.jee.jpa.EntityMappings;
+import org.apache.openejb.jee.jpa.GeneratedValue;
+import org.apache.openejb.jee.jpa.GenerationType;
+import org.apache.openejb.jee.jpa.Id;
+import org.apache.openejb.jee.jpa.IdClass;
+import org.apache.openejb.jee.jpa.ManyToMany;
+import org.apache.openejb.jee.jpa.ManyToOne;
+import org.apache.openejb.jee.jpa.MappedSuperclass;
+import org.apache.openejb.jee.jpa.Mapping;
+import org.apache.openejb.jee.jpa.NamedQuery;
+import org.apache.openejb.jee.jpa.OneToMany;
+import org.apache.openejb.jee.jpa.OneToOne;
+import org.apache.openejb.jee.jpa.RelationField;
+import org.apache.openejb.jee.jpa.Transient;
+import org.apache.openejb.jee.jpa.unit.Persistence;
+import org.apache.openejb.jee.jpa.unit.PersistenceUnit;
+import org.apache.openejb.jee.jpa.unit.TransactionType;
+import org.apache.openejb.jee.oejb3.EjbDeployment;
+import org.apache.openejb.jee.oejb3.OpenejbJar;
+import org.apache.openejb.util.LogCategory;
+import org.apache.openejb.util.Logger;
+import org.apache.openejb.util.Strings;
+
+import javax.ejb.EJBLocalObject;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import java.util.Arrays;
@@ -29,22 +75,6 @@ import java.util.Set;
import java.util.TreeMap;
import java.util.TreeSet;
-import javax.ejb.EJBLocalObject;
-
-import org.apache.openejb.OpenEJBException;
-import org.apache.openejb.core.cmp.CmpUtil;
-import org.apache.openejb.core.cmp.jpa.JpaCmpEngine;
-import org.apache.openejb.jee.*;
-import org.apache.openejb.jee.jpa.*;
-import org.apache.openejb.jee.jpa.unit.Persistence;
-import org.apache.openejb.jee.jpa.unit.PersistenceUnit;
-import org.apache.openejb.jee.jpa.unit.TransactionType;
-import org.apache.openejb.jee.oejb3.EjbDeployment;
-import org.apache.openejb.jee.oejb3.OpenejbJar;
-import org.apache.openejb.util.LogCategory;
-import org.apache.openejb.util.Logger;
-import org.apache.openejb.util.Strings;
-
public class CmpJpaConversion implements DynamicDeployer {
private static final Logger logger = Logger.getInstance(LogCategory.OPENEJB_STARTUP_CONFIG, CmpJpaConversion.class);
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigUtils.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigUtils.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigUtils.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigUtils.java Tue Nov 19 02:12:21 2013
@@ -19,8 +19,8 @@ package org.apache.openejb.config;
import org.apache.openejb.EnvProps;
import org.apache.openejb.OpenEJBException;
import org.apache.openejb.config.sys.Deployments;
-import org.apache.openejb.config.sys.Openejb;
import org.apache.openejb.config.sys.JaxbOpenejb;
+import org.apache.openejb.config.sys.Openejb;
import org.apache.openejb.loader.IO;
import org.apache.openejb.loader.SystemInstance;
import org.apache.openejb.util.LogCategory;
@@ -147,7 +147,7 @@ public class ConfigUtils {
throw new OpenEJBException("Could not locate config file: ", e);
}
- return (file == null || !file.exists()) ? null : file.getAbsolutePath();
+ return file == null || !file.exists() ? null : file.getAbsolutePath();
}
public static String[] deducePaths(final String path) {
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java Tue Nov 19 02:12:21 2013
@@ -100,7 +100,6 @@ import java.net.MalformedURLException;
import java.net.URI;
import java.net.URISyntaxException;
import java.net.URL;
-import java.net.URLClassLoader;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@@ -1010,7 +1009,7 @@ public class ConfigurationFactory implem
service = JaxbOpenejb.create(defaultService.type);
service.setType(defaultService.id);
} catch (Exception e) {
- final String name = (defaultService.type == null) ? "null" : defaultService.type.getName();
+ final String name = defaultService.type == null ? "null" : defaultService.type.getName();
throw new OpenEJBException("Cannot instantiate class " + name, e);
}
return service;
@@ -1368,7 +1367,7 @@ public class ConfigurationFactory implem
final OpenEjbConfiguration runningConfig = getRunningConfig();
if (runningConfig != null) {
for (final ResourceInfo resourceInfo : runningConfig.facilities.resources) {
- if (((type != null && type.equals(resourceInfo.className)) || isResourceType(resourceInfo.service, resourceInfo.types, type)) && implies(required, resourceInfo.properties)) {
+ if ((type != null && type.equals(resourceInfo.className) || isResourceType(resourceInfo.service, resourceInfo.types, type)) && implies(required, resourceInfo.properties)) {
resourceIds.add(resourceInfo.id);
resourceIds.addAll(resourceInfo.aliases);
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ConnectorModule.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ConnectorModule.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ConnectorModule.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ConnectorModule.java Tue Nov 19 02:12:21 2013
@@ -23,9 +23,7 @@ import java.io.File;
import java.net.URI;
import java.net.URL;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
import java.util.Set;
import java.util.TreeSet;
@@ -51,7 +49,7 @@ public class ConnectorModule extends Mod
this.connector = connector;
setClassLoader(classLoader);
- File file = (jarLocation == null) ? null : new File(jarLocation);
+ File file = jarLocation == null ? null : new File(jarLocation);
this.id = new ID(null, connector, moduleId, file, null, this);
this.validation = new ValidationContext(this);
}
@@ -61,7 +59,7 @@ public class ConnectorModule extends Mod
}
public String getJarLocation() {
- return (id.getLocation() != null) ? id.getLocation().getAbsolutePath() : null;
+ return id.getLocation() != null ? id.getLocation().getAbsolutePath() : null;
}
public String getModuleId() {
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ConvertDataSourceDefinitions.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ConvertDataSourceDefinitions.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ConvertDataSourceDefinitions.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ConvertDataSourceDefinitions.java Tue Nov 19 02:12:21 2013
@@ -16,12 +16,6 @@
*/
package org.apache.openejb.config;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Properties;
import org.apache.openejb.OpenEJBException;
import org.apache.openejb.OpenEJBRuntimeException;
import org.apache.openejb.config.sys.Resource;
@@ -31,6 +25,13 @@ import org.apache.openejb.jee.KeyedColle
import org.apache.openejb.jee.Property;
import org.apache.openejb.util.PropertyPlaceHolderHelper;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Properties;
+
/**
* @version $Rev$ $Date$
*/
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/DebuggableVmHackery.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/DebuggableVmHackery.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/DebuggableVmHackery.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/DebuggableVmHackery.java Tue Nov 19 02:12:21 2013
@@ -17,28 +17,28 @@
package org.apache.openejb.config;
import org.apache.openejb.OpenEJBException;
-import org.apache.openejb.jee.oejb3.OpenejbJar;
-import org.apache.openejb.jee.oejb3.EjbDeployment;
-import org.apache.openejb.jee.oejb3.ResourceLink;
-import org.apache.openejb.jee.EnterpriseBean;
-import org.apache.openejb.jee.MessageDrivenBean;
-import org.apache.openejb.jee.EjbJar;
-import org.apache.openejb.jee.EntityBean;
import org.apache.openejb.jee.AssemblyDescriptor;
-import org.apache.openejb.jee.MethodPermission;
-import org.apache.openejb.jee.Method;
import org.apache.openejb.jee.ContainerTransaction;
+import org.apache.openejb.jee.EjbJar;
+import org.apache.openejb.jee.EnterpriseBean;
+import org.apache.openejb.jee.EntityBean;
+import org.apache.openejb.jee.Interceptor;
import org.apache.openejb.jee.InterceptorBinding;
-import org.apache.openejb.jee.ResourceEnvRef;
+import org.apache.openejb.jee.JndiConsumer;
import org.apache.openejb.jee.MessageDestinationRef;
+import org.apache.openejb.jee.MessageDrivenBean;
+import org.apache.openejb.jee.Method;
+import org.apache.openejb.jee.MethodPermission;
+import org.apache.openejb.jee.ResourceEnvRef;
import org.apache.openejb.jee.ResourceRef;
-import org.apache.openejb.jee.Interceptor;
-import org.apache.openejb.jee.JndiConsumer;
+import org.apache.openejb.jee.oejb3.EjbDeployment;
+import org.apache.openejb.jee.oejb3.OpenejbJar;
+import org.apache.openejb.jee.oejb3.ResourceLink;
-import java.util.Map;
import java.util.ArrayList;
-import java.util.List;
import java.util.Collection;
+import java.util.List;
+import java.util.Map;
/**
* @version $Rev$ $Date$
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/Deployment.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/Deployment.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/Deployment.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/Deployment.java Tue Nov 19 02:12:21 2013
@@ -16,9 +16,9 @@
*/
package org.apache.openejb.config;
+import java.io.File;
import java.util.Properties;
import java.util.Set;
-import java.io.File;
/**
* @version $Rev$ $Date$
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentsResolver.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentsResolver.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentsResolver.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentsResolver.java Tue Nov 19 02:12:21 2013
@@ -83,7 +83,7 @@ public class DeploymentsResolver impleme
final String[] files = file.list();
- return (null != files && files.length > 0);
+ return null != files && files.length > 0;
}
return false;
@@ -260,7 +260,7 @@ public class DeploymentsResolver impleme
final boolean isWindows = System.getProperty("os.name", "unknown").toLowerCase().startsWith("windows");
for (final URL url : urlSet.getUrls()) {
- final String ef = (isWindows ? url.toExternalForm().toLowerCase() : url.toExternalForm());
+ final String ef = isWindows ? url.toExternalForm().toLowerCase() : url.toExternalForm();
final URL u = new URL(ef);
if (!urls.contains(u)) {
urls.add(u);
@@ -271,7 +271,7 @@ public class DeploymentsResolver impleme
if (size == 0 && include.length() > 0) {
logger.warning("No classpath URLs matched. Current settings: " + CLASSPATH_EXCLUDE + "='" + exclude + "', " + CLASSPATH_INCLUDE + "='" + include + "'");
return;
- } else if (size == 0 && (!filterDescriptors && prefiltered.getUrls().size() == 0)) {
+ } else if (size == 0 && !filterDescriptors && prefiltered.getUrls().size() == 0) {
return;
} else if (size < 20) {
logger.debug("Inspecting classpath for applications: " + urls.size() + " urls.");
@@ -328,11 +328,11 @@ public class DeploymentsResolver impleme
}
if (time < 1000) {
- logger.debug("Searched " + urls.size() + " classpath urls in " + time + " milliseconds. Average " + (time / urls.size()) + " milliseconds per url.");
+ logger.debug("Searched " + urls.size() + " classpath urls in " + time + " milliseconds. Average " + time / urls.size() + " milliseconds per url.");
} else if (time < 4000 || urls.size() < 3) {
- logger.info("Searched " + urls.size() + " classpath urls in " + time + " milliseconds. Average " + (time / urls.size()) + " milliseconds per url.");
+ logger.info("Searched " + urls.size() + " classpath urls in " + time + " milliseconds. Average " + time / urls.size() + " milliseconds per url.");
} else if (time < 10000) {
- logger.warning("Searched " + urls.size() + " classpath urls in " + time + " milliseconds. Average " + (time / urls.size()) + " milliseconds per url.");
+ logger.warning("Searched " + urls.size() + " classpath urls in " + time + " milliseconds. Average " + time / urls.size() + " milliseconds per url.");
logger.warning("Consider adjusting your " +
CLASSPATH_EXCLUDE +
" and " +
@@ -343,7 +343,7 @@ public class DeploymentsResolver impleme
include +
"'");
} else {
- logger.fatal("Searched " + urls.size() + " classpath urls in " + time + " milliseconds. Average " + (time / urls.size()) + " milliseconds per url. TOO LONG!");
+ logger.fatal("Searched " + urls.size() + " classpath urls in " + time + " milliseconds. Average " + time / urls.size() + " milliseconds per url. TOO LONG!");
logger.fatal("ADJUST THE EXCLUDE/INCLUDE!!!. Current settings: " + CLASSPATH_EXCLUDE + "='" + exclude + "', " + CLASSPATH_INCLUDE + "='" + include + "'");
final List<String> list = new ArrayList<String>();
for (final URL url : urls) {
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/EjbJarInfoBuilder.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/EjbJarInfoBuilder.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/EjbJarInfoBuilder.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/EjbJarInfoBuilder.java Tue Nov 19 02:12:21 2013
@@ -539,9 +539,9 @@ public class EjbJarInfoBuilder {
EjbDeployment d = (EjbDeployment) ejbds.get(method.getEjbName());
methodInfo.description = method.getDescription();
- methodInfo.ejbDeploymentId = (d == null)?null:d.getDeploymentId();
+ methodInfo.ejbDeploymentId = d == null ?null:d.getDeploymentId();
methodInfo.ejbName = method.getEjbName();
- methodInfo.methodIntf = (method.getMethodIntf() == null) ? null : method.getMethodIntf().toString();
+ methodInfo.methodIntf = method.getMethodIntf() == null ? null : method.getMethodIntf().toString();
methodInfo.methodName = method.getMethodName();
if (methodInfo.methodName == null || methodInfo.methodName.equals("")){
methodInfo.methodName = "*";
@@ -563,7 +563,7 @@ public class EjbJarInfoBuilder {
if (s.getSessionType() == SessionType.STATEFUL) {
bean = new StatefulBeanInfo();
- StatefulBeanInfo stateful = ((StatefulBeanInfo) bean);
+ StatefulBeanInfo stateful = (StatefulBeanInfo) bean;
copyCallbacks(s.getPostActivate(), stateful.postActivate);
copyCallbacks(s.getPrePassivate(), stateful.prePassivate);
@@ -590,7 +590,7 @@ public class EjbJarInfoBuilder {
} else if (s.getSessionType() == SessionType.MANAGED) {
bean = new ManagedBeanInfo();
- ManagedBeanInfo managed = ((ManagedBeanInfo) bean);
+ ManagedBeanInfo managed = (ManagedBeanInfo) bean;
if (s instanceof ManagedBean) { // this way we support managed beans in ejb-jar.xml (not in the spec but can be useful)
managed.hidden = ((ManagedBean) s).isHidden();
} else {
@@ -610,7 +610,7 @@ public class EjbJarInfoBuilder {
} else if (s.getSessionType() == SessionType.SINGLETON) {
bean = new SingletonBeanInfo();
ConcurrencyManagementType type = s.getConcurrencyManagementType();
- bean.concurrencyType = (type != null) ? type.toString() : ConcurrencyManagementType.CONTAINER.toString();
+ bean.concurrencyType = type != null ? type.toString() : ConcurrencyManagementType.CONTAINER.toString();
bean.loadOnStartup = s.getInitOnStartup();
copyCallbacks(s.getAroundTimeout(),bean.aroundTimeout);
@@ -651,8 +651,8 @@ public class EjbJarInfoBuilder {
bean.containerId = d.getContainerId();
Icon icon = s.getIcon();
- bean.largeIcon = (icon == null) ? null : icon.getLargeIcon();
- bean.smallIcon = (icon == null) ? null : icon.getSmallIcon();
+ bean.largeIcon = icon == null ? null : icon.getLargeIcon();
+ bean.smallIcon = icon == null ? null : icon.getSmallIcon();
bean.description = s.getDescription();
bean.displayName = s.getDisplayName();
bean.ejbClass = s.getEjbClass();
@@ -666,7 +666,7 @@ public class EjbJarInfoBuilder {
bean.businessLocal.addAll(s.getBusinessLocal());
bean.businessRemote.addAll(s.getBusinessRemote());
TransactionType txType = s.getTransactionType();
- bean.transactionType = (txType != null)?txType.toString(): TransactionType.CONTAINER.toString();
+ bean.transactionType = txType != null ?txType.toString(): TransactionType.CONTAINER.toString();
bean.serviceEndpoint = s.getServiceEndpoint();
bean.properties.putAll(d.getProperties());
@@ -719,14 +719,14 @@ public class EjbJarInfoBuilder {
bean.containerId = d.getContainerId();
Icon icon = mdb.getIcon();
- bean.largeIcon = (icon == null) ? null : icon.getLargeIcon();
- bean.smallIcon = (icon == null) ? null : icon.getSmallIcon();
+ bean.largeIcon = icon == null ? null : icon.getLargeIcon();
+ bean.smallIcon = icon == null ? null : icon.getSmallIcon();
bean.description = mdb.getDescription();
bean.displayName = mdb.getDisplayName();
bean.ejbClass = mdb.getEjbClass();
bean.ejbName = mdb.getEjbName();
TransactionType txType = mdb.getTransactionType();
- bean.transactionType = (txType != null)?txType.toString(): TransactionType.CONTAINER.toString();
+ bean.transactionType = txType != null ?txType.toString(): TransactionType.CONTAINER.toString();
bean.properties.putAll(d.getProperties());
if (mdb.getMessagingType() != null) {
@@ -792,8 +792,8 @@ public class EjbJarInfoBuilder {
bean.containerId = d.getContainerId();
Icon icon = e.getIcon();
- bean.largeIcon = (icon == null) ? null : icon.getLargeIcon();
- bean.smallIcon = (icon == null) ? null : icon.getSmallIcon();
+ bean.largeIcon = icon == null ? null : icon.getLargeIcon();
+ bean.smallIcon = icon == null ? null : icon.getSmallIcon();
bean.description = e.getDescription();
bean.displayName = e.getDisplayName();
bean.ejbClass = e.getEjbClass();