You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by an...@apache.org on 2014/06/25 14:16:45 UTC
svn commit: r1605367 - in /tomee/tomee/trunk:
container/openejb-core/src/main/java/org/apache/openejb/cdi/
tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/
tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/naming/resources/
tome...
Author: andygumbrecht
Date: Wed Jun 25 12:16:45 2014
New Revision: 1605367
URL: http://svn.apache.org/r1605367
Log:
PMD
Modified:
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/WebappBeanManager.java
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/naming/resources/EmptyDirContext.java
tomee/tomee/trunk/tomee/tomee-overlay-runner/ (props changed)
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/WebappBeanManager.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/WebappBeanManager.java?rev=1605367&r1=1605366&r2=1605367&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/WebappBeanManager.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/WebappBeanManager.java Wed Jun 25 12:16:45 2014
@@ -57,7 +57,7 @@ public class WebappBeanManager extends B
@Override
public void fireEvent(final Object event, final EventMetadata metadata, final boolean isLifecycleEvent) {
final Class<?> eventClass = event.getClass();
- if(ClassUtil.isDefinitionContainsTypeVariables(ClassUtil.getClass(metadata.getType()))) {
+ if (ClassUtil.isDefinitionContainsTypeVariables(ClassUtil.getClass(metadata.getType()))) {
throw new IllegalArgumentException("Event class : " + event.getClass().getName() + " can not be defined as generic type");
}
@@ -70,7 +70,7 @@ public class WebappBeanManager extends B
@Override
public <T> Set<ObserverMethod<? super T>> resolveObserverMethods(final T event, final EventMetadata metadata) {
final Class<?> eventClass = event.getClass();
- if(ClassUtil.isDefinitionContainsTypeVariables(ClassUtil.getClass(metadata.getType()))) {
+ if (ClassUtil.isDefinitionContainsTypeVariables(ClassUtil.getClass(metadata.getType()))) {
throw new IllegalArgumentException("Event type can not contain type variables. Event class is : " + eventClass);
}
@@ -251,10 +251,10 @@ public class WebappBeanManager extends B
// so reuse parent beans
// this can happen for validations
return new IteratorSet<Bean<?>>(
- new MultipleIterator<Bean<?>>(
- InheritedBeanFilter.INSTANCE,
- deploymentBeans.iterator(),
- getParentBm().getComponents().iterator()));
+ new MultipleIterator<Bean<?>>(
+ InheritedBeanFilter.INSTANCE,
+ deploymentBeans.iterator(),
+ getParentBm().getComponents().iterator()));
}
return deploymentBeans;
}
@@ -323,7 +323,7 @@ public class WebappBeanManager extends B
private int idx/* = 0*/;
/**
- * @param filter used to filter delegates from index 1 to N-1 (0 is not filtered)
+ * @param filter used to filter delegates from index 1 to N-1 (0 is not filtered)
* @param delegates iterator this Iterator merges, one delegates is mandatory
*/
private MultipleIterator(final Filter<A> filter, final Iterator<A>... delegates) {
Modified: tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java?rev=1605367&r1=1605366&r2=1605367&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java (original)
+++ tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java Wed Jun 25 12:16:45 2014
@@ -166,6 +166,7 @@ import java.util.Properties;
import java.util.Set;
import java.util.TreeMap;
import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicReference;
import java.util.jar.JarEntry;
import java.util.jar.JarFile;
@@ -178,6 +179,7 @@ import static org.apache.tomee.catalina.
* @version $Rev$ $Date$
*/
public class TomcatWebAppBuilder implements WebAppBuilder, ContextListener, ParentClassLoaderFinder {
+
public static final String OPENEJB_CROSSCONTEXT_PROPERTY = "openejb.crosscontext";
public static final String OPENEJB_SESSION_MANAGER_PROPERTY = "openejb.session.manager";
public static final String OPENEJB_JSESSION_ID_SUPPORT = "openejb.jsessionid-support";
@@ -202,7 +204,7 @@ public class TomcatWebAppBuilder impleme
private static final boolean FORCE_RELOADABLE = SystemInstance.get().getOptions().get("tomee.force-reloadable", false);
private static final boolean SKIP_TLD = SystemInstance.get().getOptions().get("tomee.skip-tld", false);
- private static Method getNamingContextName; // it just sucks but that's private
+ private static final Method getNamingContextName; // it just sucks but that's private
static {
try {
@@ -255,11 +257,11 @@ public class TomcatWebAppBuilder impleme
*/
private CoreContainerSystem containerSystem;
- private Map<ClassLoader, Map<String, Set<String>>> jsfClasses = new HashMap<ClassLoader, Map<String, Set<String>>>();
+ private final Map<ClassLoader, Map<String, Set<String>>> jsfClasses = new HashMap<ClassLoader, Map<String, Set<String>>>();
private Class<?> sessionManagerClass;
- private Set<CatalinaCluster> clusters = new HashSet<CatalinaCluster>();
+ private final Set<CatalinaCluster> clusters = new HashSet<CatalinaCluster>();
private ClassLoader parentClassLoader;
private boolean initJEEInfo = true;
@@ -684,20 +686,20 @@ public class TomcatWebAppBuilder impleme
}
// TODO: find something more sexy
- private static Field HOST_CONFIG_HOST;
+ private static final AtomicReference<Field> HOST_CONFIG_HOST = new AtomicReference<Field>(null);
static {
try { // do it only once
- HOST_CONFIG_HOST = HostConfig.class.getDeclaredField("host");
+ HOST_CONFIG_HOST.set(HostConfig.class.getDeclaredField("host"));
} catch (final NoSuchFieldException e) {
// no-op
}
}
private static boolean isReady(final HostConfig deployer) {
- if (deployer != null && HOST_CONFIG_HOST != null) {
+ if (deployer != null && HOST_CONFIG_HOST.get() != null) {
try {
- return HOST_CONFIG_HOST.get(deployer) != null;
+ return HOST_CONFIG_HOST.get().get(deployer) != null;
} catch (final Exception e) {
// no-op
}
@@ -1758,7 +1760,7 @@ public class TomcatWebAppBuilder impleme
addConfiguredDocBases(standardContext, contextInfo);
}
- private void addConfiguredDocBases(StandardContext standardContext, ContextInfo contextInfo) {
+ private void addConfiguredDocBases(final StandardContext standardContext, final ContextInfo contextInfo) {
if (contextInfo.appInfo.path != null) { // add external web resources
final String webResources = SystemInstance.get().getProperty("tomee." + new File(contextInfo.appInfo.path).getName() + ".docBases", contextInfo.appInfo.properties.getProperty("docBases"));
final String cache = SystemInstance.get().getProperty("tomee." + new File(contextInfo.appInfo.path).getName() + ".docBases.cache", contextInfo.appInfo.properties.getProperty("docBases.cache"));
@@ -2386,7 +2388,7 @@ public class TomcatWebAppBuilder impleme
private static class DeployedApplication {
- private AppInfo appInfo;
+ private final AppInfo appInfo;
private final Map<File, Long> watchedResource = new HashMap<File, Long>();
public DeployedApplication(final File base, final AppInfo appInfo) {
Modified: tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/naming/resources/EmptyDirContext.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/naming/resources/EmptyDirContext.java?rev=1605367&r1=1605366&r2=1605367&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/naming/resources/EmptyDirContext.java (original)
+++ tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/naming/resources/EmptyDirContext.java Wed Jun 25 12:16:45 2014
@@ -24,12 +24,17 @@ import java.io.File;
// we need a FileDirContext (so doesn't work with not exploded wars) for boot time
// note lifecycle is a quick one mainly used internally, other listeners are not intended to be used
public class EmptyDirContext extends FileDirContext {
+
private final StandardContext context;
public EmptyDirContext(final StandardContext standardContext) {
this.context = standardContext;
}
+ public StandardContext getContext() {
+ return context;
+ }
+
@Override
public boolean isCached() {
return false;
Propchange: tomee/tomee/trunk/tomee/tomee-overlay-runner/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Jun 25 12:16:45 2014
@@ -0,0 +1,3 @@
+*.iml
+.idea
+target