Repository: tomee Updated Branches: refs/heads/master 0bd243542 -> c165b2389
tomee::common naming convention Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/4e07471d Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/4e07471d Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/4e07471d Branch: refs/heads/master Commit: 4e07471da871abc578c1c8a9c453c9be39dbe238 Parents: b4cf3cf Author: Hayri Cicek <[email protected]> Authored: Mon Dec 3 19:08:39 2018 +0100 Committer: Hayri Cicek <[email protected]> Committed: Mon Dec 3 19:08:39 2018 +0100 ---------------------------------------------------------------------- .../java/org/apache/tomee/common/NamingUtil.java | 12 ++++++------ .../org/apache/tomee/installer/Installer.java | 18 +++++++++--------- 2 files changed, 15 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/4e07471d/tomee/tomee-common/src/main/java/org/apache/tomee/common/NamingUtil.java ---------------------------------------------------------------------- diff --git a/tomee/tomee-common/src/main/java/org/apache/tomee/common/NamingUtil.java b/tomee/tomee-common/src/main/java/org/apache/tomee/common/NamingUtil.java index 5a8a27f..6031c5c 100644 --- a/tomee/tomee-common/src/main/java/org/apache/tomee/common/NamingUtil.java +++ b/tomee/tomee-common/src/main/java/org/apache/tomee/common/NamingUtil.java @@ -49,8 +49,8 @@ public class NamingUtil { public static final String WS_PORT_QNAME = "wsportqname"; public static final String WSDL_URL = "wsdlurl"; - private static final AtomicInteger id = new AtomicInteger(31); - private static final Map<String,Object> registry = new ConcurrentHashMap<String, Object>(); + private static final AtomicInteger ID = new AtomicInteger(31); + private static final Map<String,Object> REGISTRY = new ConcurrentHashMap<String, Object>(); // these two attributes are used to be able to cleanup quickly the registry (otherwise we need to duplicate a lot of logic) private static StandardContext currentContext; @@ -79,8 +79,8 @@ public class NamingUtil { } public static void setStaticValue(final Resource resource, final String name, final Object value) { - final String token = String.valueOf(id.incrementAndGet()); - registry.put(token, value); + final String token = String.valueOf(ID.incrementAndGet()); + REGISTRY.put(token, value); resource.setProperty("static-token" + (name != null ? "-" + name : ""), token); if (currentContext != null) { Collection<String> ids = ID_BY_CONTEXT.get(currentContext); @@ -104,7 +104,7 @@ public class NamingUtil { if (token == null) { return null; } - final T object = (T) registry.get(token); + final T object = (T) REGISTRY.get(token); return object; } @@ -144,7 +144,7 @@ public class NamingUtil { final Collection<String> keys = ID_BY_CONTEXT.remove(context); if (keys != null) { for (final String k : keys) { - registry.remove(k); + REGISTRY.remove(k); } } } http://git-wip-us.apache.org/repos/asf/tomee/blob/4e07471d/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java ---------------------------------------------------------------------- diff --git a/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java b/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java index 01d2c90..36ec230 100644 --- a/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java +++ b/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java @@ -32,31 +32,31 @@ public class Installer implements InstallerInterface { private Status status = Status.NONE; private boolean force; - private static final boolean listenerInstalled; - private static final boolean agentInstalled; + private static final boolean LISTENERINSTALLED; + private static final boolean AGENTINSTALLED; static { final Options opts = SystemInstance.get().getOptions(); // is the OpenEJB listener installed - listenerInstalled = "OpenEJBListener".equals(opts.get("openejb.embedder.source", "")) + LISTENERINSTALLED = "OpenEJBListener".equals(opts.get("openejb.embedder.source", "")) || "ServerListener".equals(opts.get("openejb.embedder.source", "")); // is the OpenEJB javaagent installed - agentInstalled = InstallerTools.invokeStaticNoArgMethod( + AGENTINSTALLED = InstallerTools.invokeStaticNoArgMethod( "org.apache.openejb.javaagent.Agent", "getInstrumentation") != null; } public static boolean isListenerInstalled() { - return listenerInstalled; + return LISTENERINSTALLED; } public static boolean isAgentInstalled() { - return agentInstalled; + return AGENTINSTALLED; } public Installer(final Paths paths) { this.paths = paths; - if (listenerInstalled && agentInstalled) { + if (LISTENERINSTALLED && AGENTINSTALLED) { status = Status.INSTALLED; } } @@ -377,7 +377,7 @@ public class Installer implements InstallerInterface { } public void installListener(final String listener) { - if (listenerInstalled && !force) { + if (LISTENERINSTALLED && !force) { // OpenEJB Listener already installed return; } @@ -460,7 +460,7 @@ public class Installer implements InstallerInterface { // the geronimo locator to find the implementation // because it needs some OSGi API we don't want to add public void installJavaagent() { - if (agentInstalled && !force) { + if (AGENTINSTALLED && !force) { // OpenEJB Agent already installed" return; }
