Factor out appInfo.containerIds as we now have appInfo.containers
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/065654df Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/065654df Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/065654df Branch: refs/heads/fb_tomee8 Commit: 065654df7ace4566fb914731c2449fc7203eccc4 Parents: 515e435 Author: Jonathan Gallimore <j...@jrg.me.uk> Authored: Fri Jan 19 16:13:06 2018 +0000 Committer: Jonathan Gallimore <j...@jrg.me.uk> Committed: Fri Jan 19 16:13:06 2018 +0000 ---------------------------------------------------------------------- .../openejb/assembler/classic/AppInfo.java | 1 - .../openejb/assembler/classic/Assembler.java | 3 --- .../apache/openejb/config/AppInfoBuilder.java | 22 ++++++++++++-------- 3 files changed, 13 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/065654df/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/AppInfo.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/AppInfo.java b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/AppInfo.java index fa4153c..6481792 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/AppInfo.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/AppInfo.java @@ -46,7 +46,6 @@ public class AppInfo extends InfoObject { public List<ContainerInfo> containers = new ArrayList<ContainerInfo>(); public final List<String> libs = new ArrayList<String>(); public final Set<String> watchedResources = new TreeSet<String>(); - public final Set<String> containerIds = new TreeSet<String>(); public final Set<String> resourceIds = new TreeSet<String>(); public final Set<String> resourceAliases = new TreeSet<String>(); public final JndiEncInfo globalJndiEnc = new JndiEncInfo(); http://git-wip-us.apache.org/repos/asf/tomee/blob/065654df/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 e3414bb..69cfb5f 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 @@ -2559,9 +2559,6 @@ public class Assembler extends AssemblerTool implements org.apache.openejb.spi.A } } - for (final String id : appInfo.containerIds) { - removeContainer(id); - } for (final ContainerInfo containerInfo : appInfo.containers) { removeContainer(containerInfo.id); } http://git-wip-us.apache.org/repos/asf/tomee/blob/065654df/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java b/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java index 6d112e1..248c491 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java @@ -166,7 +166,10 @@ class AppInfoBuilder { containerIds.add(containerInfo.id); } } - containerIds.addAll(appInfo.containerIds); + + for (final ContainerInfo containerInfo : appInfo.containers) { + containerIds.add(containerInfo.id); + } // // EJB Jars @@ -182,9 +185,9 @@ class AppInfoBuilder { for (final EnterpriseBeanInfo bean : ejbJarInfo.enterpriseBeans) { final EjbDeployment d = deploymentsByEjbName.get(bean.ejbName); if (d.getContainerId() != null && !containerIds.contains(d.getContainerId())) { - for (final String cId : appInfo.containerIds) { - if (cId.endsWith("/" + d.getContainerId())) { - d.setContainerId(cId); + for (final ContainerInfo containerInfo : appInfo.containers) { + if (containerInfo.id.endsWith("/" + d.getContainerId())) { + d.setContainerId(containerInfo.id); break; } } @@ -361,11 +364,12 @@ class AppInfoBuilder { info.resourceAliases.addAll(def.getAliases()); } } - for (final Container def : module.getContainers()) { - if (!def.getProperties().containsKey("ApplicationWide")) { - info.containerIds.add(def.getId()); - } - } + +// for (final Container def : module.getContainers()) { +// if (!def.getProperties().containsKey("ApplicationWide")) { +// info.containerIds.add(def.getId()); +// } +// } } private void buildAppContainers(final AppModule module, final AppInfo info) throws OpenEJBException {
