You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jg...@apache.org on 2015/04/15 18:53:39 UTC
[02/12] tomee git commit: TOMEE-1547 PMD/checkstyle
TOMEE-1547 PMD/checkstyle
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/1c52f1e1
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/1c52f1e1
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/1c52f1e1
Branch: refs/heads/master
Commit: 1c52f1e10ab9feb660fb745dc5f83248af512a1d
Parents: 638bfcb
Author: Jonathan Gallimore <jo...@jrg.me.uk>
Authored: Wed Apr 15 10:18:02 2015 +0100
Committer: Jonathan Gallimore <jo...@jrg.me.uk>
Committed: Wed Apr 15 11:58:29 2015 +0100
----------------------------------------------------------------------
.../apache/openejb/assembler/classic/Assembler.java | 14 +++++---------
.../org/apache/openejb/config/DeploymentLoader.java | 2 --
.../org/apache/openejb/config/ReadDescriptors.java | 1 +
3 files changed, 6 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/1c52f1e1/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
index 9dbe0ca..940c6ab 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
@@ -68,7 +68,6 @@ import org.apache.openejb.config.ConfigurationFactory;
import org.apache.openejb.config.NewLoaderLogic;
import org.apache.openejb.config.QuickJarsTxtParser;
import org.apache.openejb.config.TldScanner;
-import org.apache.openejb.config.sys.Resource;
import org.apache.openejb.core.ConnectorReference;
import org.apache.openejb.core.CoreContainerSystem;
import org.apache.openejb.core.CoreUserTransaction;
@@ -82,7 +81,6 @@ import org.apache.openejb.core.ivm.IntraVmProxy;
import org.apache.openejb.core.ivm.naming.ContextualJndiReference;
import org.apache.openejb.core.ivm.naming.IvmContext;
import org.apache.openejb.core.ivm.naming.IvmJndiFactory;
-import org.apache.openejb.core.ivm.naming.JndiUrlReference;
import org.apache.openejb.core.ivm.naming.LazyObjectReference;
import org.apache.openejb.core.ivm.naming.Reference;
import org.apache.openejb.core.security.SecurityContextHandler;
@@ -137,7 +135,6 @@ import org.apache.openejb.util.classloader.ClassLoaderAwareHandler;
import org.apache.openejb.util.classloader.URLClassLoaderFirst;
import org.apache.openejb.util.proxy.ProxyFactory;
import org.apache.openejb.util.proxy.ProxyManager;
-import org.apache.webbeans.component.ResourceBean;
import org.apache.webbeans.config.WebBeansContext;
import org.apache.webbeans.inject.OWBInjector;
import org.apache.webbeans.logger.JULLoggerFactory;
@@ -206,7 +203,6 @@ import java.lang.annotation.Annotation;
import java.lang.instrument.ClassFileTransformer;
import java.lang.instrument.Instrumentation;
import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.lang.reflect.Proxy;
import java.net.MalformedURLException;
@@ -1105,7 +1101,7 @@ public class Assembler extends AssemblerTool implements org.apache.openejb.spi.A
final Set<String> resourceIds = new HashSet<String>(appInfo.resourceIds);
final List<ResourceInfo> resourceList = config.facilities.resources;
- for (ResourceInfo resourceInfo : resourceList) {
+ for (final ResourceInfo resourceInfo : resourceList) {
if (!resourceIds.contains(resourceInfo.id)) {
continue;
}
@@ -1113,7 +1109,7 @@ public class Assembler extends AssemblerTool implements org.apache.openejb.spi.A
try {
final Class<?> cls = Class.forName(resourceInfo.className, true, classLoader);
final Method postConstruct = findMethodAnnotatedWith(PostConstruct.class, cls);
- boolean initialize = "true".equalsIgnoreCase(String.valueOf(resourceInfo.properties.remove("InitializeAfterDeployment")));
+ final boolean initialize = "true".equalsIgnoreCase(String.valueOf(resourceInfo.properties.remove("InitializeAfterDeployment")));
if (postConstruct != null || initialize) {
Object resource = containerSystemContext.lookup(OPENEJB_RESOURCE_JNDI_PREFIX + resourceInfo.id);
@@ -1840,7 +1836,7 @@ public class Assembler extends AssemblerTool implements org.apache.openejb.spi.A
}
}
- private void preDestroy(Object object) {
+ private void preDestroy(final Object object) {
final Method preDestroy = findMethodAnnotatedWith(PreDestroy.class, object.getClass());
if (preDestroy != null) {
try {
@@ -1858,7 +1854,7 @@ public class Assembler extends AssemblerTool implements org.apache.openejb.spi.A
resource = LazyResource.class.cast(resource).getObject();
}
- Class<? extends Object> cls = resource.getClass();
+ final Class<? extends Object> cls = resource.getClass();
return findMethodAnnotatedWith(PreDestroy.class, cls) != null;
} catch (Exception e) {
return false;
@@ -2538,7 +2534,7 @@ public class Assembler extends AssemblerTool implements org.apache.openejb.spi.A
}
public void createResource(final ResourceInfo serviceInfo) throws OpenEJBException {
- Object service = "true".equalsIgnoreCase(String.valueOf(serviceInfo.properties.remove("Lazy"))) ?
+ final Object service = "true".equalsIgnoreCase(String.valueOf(serviceInfo.properties.remove("Lazy"))) ?
newLazyResource(serviceInfo) :
doCreateResource(serviceInfo);
http://git-wip-us.apache.org/repos/asf/tomee/blob/1c52f1e1/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java b/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
index 6336f33..c90cf2c 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
@@ -26,8 +26,6 @@ import org.apache.openejb.cdi.CompositeBeans;
import org.apache.openejb.classloader.ClassLoaderConfigurer;
import org.apache.openejb.classloader.WebAppEnricher;
import org.apache.openejb.config.event.BeforeDeploymentEvent;
-import org.apache.openejb.config.sys.Resource;
-import org.apache.openejb.config.sys.Resources;
import org.apache.openejb.core.EmptyResourcesClassLoader;
import org.apache.openejb.core.ParentClassLoaderFinder;
import org.apache.openejb.jee.Application;
http://git-wip-us.apache.org/repos/asf/tomee/blob/1c52f1e1/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java b/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java
index 486a331..abd6dfc 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java
@@ -283,6 +283,7 @@ public class ReadDescriptors implements DynamicDeployer {
}
continue;
} catch (Exception e) {
+ // ignore if these classes are found in the classloader
}
// if the resource class cannot be loaded,